]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.0-3.18.5-201502050849.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.5-201502050849.patch
CommitLineData
6883c528
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 f4c71d4..66811b1 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@@ -2260,6 +2264,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@@ -2552,6 +2560,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 6276fca..e21ed81 100644
374--- a/Makefile
375+++ b/Makefile
376@@ -298,7 +298,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
377 HOSTCC = gcc
378 HOSTCXX = g++
379 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
380-HOSTCXXFLAGS = -O2
381+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -std=gnu89 -fno-delete-null-pointer-checks
382+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
383+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
384
385 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
386 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
387@@ -445,8 +447,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
388 # Rules shared between *config targets and build targets
389
390 # Basic helpers built in scripts/
391-PHONY += scripts_basic
392-scripts_basic:
393+PHONY += scripts_basic gcc-plugins
394+scripts_basic: gcc-plugins
395 $(Q)$(MAKE) $(build)=scripts/basic
396 $(Q)rm -f .tmp_quiet_recordmcount
397
398@@ -620,6 +622,72 @@ endif
399 # Tell gcc to never replace conditional load with a non-conditional one
400 KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
401
402+ifndef DISABLE_PAX_PLUGINS
403+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
404+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
405+else
406+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
407+endif
408+ifneq ($(PLUGINCC),)
409+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
410+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
411+endif
412+ifdef CONFIG_PAX_MEMORY_STACKLEAK
413+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
414+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
415+endif
416+ifdef CONFIG_KALLOCSTAT_PLUGIN
417+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
418+endif
419+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
420+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
421+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
422+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
423+endif
424+ifdef CONFIG_GRKERNSEC_RANDSTRUCT
425+RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
426+ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
427+RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
428+endif
429+endif
430+ifdef CONFIG_CHECKER_PLUGIN
431+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
432+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
433+endif
434+endif
435+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
436+ifdef CONFIG_PAX_SIZE_OVERFLOW
437+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
438+endif
439+ifdef CONFIG_PAX_LATENT_ENTROPY
440+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
441+endif
442+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
443+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
444+endif
445+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
446+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
447+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
448+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
449+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
450+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
451+ifeq ($(KBUILD_EXTMOD),)
452+gcc-plugins:
453+ $(Q)$(MAKE) $(build)=tools/gcc
454+else
455+gcc-plugins: ;
456+endif
457+else
458+gcc-plugins:
459+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
460+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
461+else
462+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
463+endif
464+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
465+endif
466+endif
467+
468 ifdef CONFIG_READABLE_ASM
469 # Disable optimizations that make assembler listings hard to read.
470 # reorder blocks reorders the control in the function
471@@ -712,7 +780,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
472 else
473 KBUILD_CFLAGS += -g
474 endif
475-KBUILD_AFLAGS += -Wa,-gdwarf-2
476+KBUILD_AFLAGS += -Wa,--gdwarf-2
477 endif
478 ifdef CONFIG_DEBUG_INFO_DWARF4
479 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
480@@ -877,7 +945,7 @@ export mod_sign_cmd
481
482
483 ifeq ($(KBUILD_EXTMOD),)
484-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
485+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
486
487 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
488 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
489@@ -924,6 +992,8 @@ endif
490
491 # The actual objects are generated when descending,
492 # make sure no implicit rule kicks in
493+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
494+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
495 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
496
497 # Handle descending into subdirectories listed in $(vmlinux-dirs)
498@@ -933,7 +1003,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
499 # Error messages still appears in the original language
500
501 PHONY += $(vmlinux-dirs)
502-$(vmlinux-dirs): prepare scripts
503+$(vmlinux-dirs): gcc-plugins prepare scripts
504 $(Q)$(MAKE) $(build)=$@
505
506 define filechk_kernel.release
507@@ -976,10 +1046,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
508
509 archprepare: archheaders archscripts prepare1 scripts_basic
510
511+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
512+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
513 prepare0: archprepare FORCE
514 $(Q)$(MAKE) $(build)=.
515
516 # All the preparing..
517+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
518 prepare: prepare0
519
520 # Generate some files
521@@ -1094,6 +1167,8 @@ all: modules
522 # using awk while concatenating to the final file.
523
524 PHONY += modules
525+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
526+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
527 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
528 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
529 @$(kecho) ' Building modules, stage 2.';
530@@ -1109,7 +1184,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
531
532 # Target to prepare building external modules
533 PHONY += modules_prepare
534-modules_prepare: prepare scripts
535+modules_prepare: gcc-plugins prepare scripts
536
537 # Target to install modules
538 PHONY += modules_install
539@@ -1175,7 +1250,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
540 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
541 signing_key.priv signing_key.x509 x509.genkey \
542 extra_certificates signing_key.x509.keyid \
543- signing_key.x509.signer include/linux/version.h
544+ signing_key.x509.signer include/linux/version.h \
545+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
546+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
547+ tools/gcc/randomize_layout_seed.h
548
549 # clean - Delete most, but leave enough to build external modules
550 #
551@@ -1214,7 +1292,7 @@ distclean: mrproper
552 @find $(srctree) $(RCS_FIND_IGNORE) \
553 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
554 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
555- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
556+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
557 -type f -print | xargs rm -f
558
559
560@@ -1380,6 +1458,8 @@ PHONY += $(module-dirs) modules
561 $(module-dirs): crmodverdir $(objtree)/Module.symvers
562 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
563
564+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
565+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
566 modules: $(module-dirs)
567 @$(kecho) ' Building modules, stage 2.';
568 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
569@@ -1520,17 +1600,21 @@ else
570 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
571 endif
572
573-%.s: %.c prepare scripts FORCE
574+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
575+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
576+%.s: %.c gcc-plugins prepare scripts FORCE
577 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
578 %.i: %.c prepare scripts FORCE
579 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
580-%.o: %.c prepare scripts FORCE
581+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
582+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
583+%.o: %.c gcc-plugins prepare scripts FORCE
584 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
585 %.lst: %.c prepare scripts FORCE
586 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
587-%.s: %.S prepare scripts FORCE
588+%.s: %.S gcc-plugins prepare scripts FORCE
589 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
590-%.o: %.S prepare scripts FORCE
591+%.o: %.S gcc-plugins prepare scripts FORCE
592 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
593 %.symtypes: %.c prepare scripts FORCE
594 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
595@@ -1542,11 +1626,15 @@ endif
596 $(build)=$(build-dir)
597 # Make sure the latest headers are built for Documentation
598 Documentation/: headers_install
599-%/: prepare scripts FORCE
600+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
601+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
602+%/: gcc-plugins prepare scripts FORCE
603 $(cmd_crmodverdir)
604 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
605 $(build)=$(build-dir)
606-%.ko: prepare scripts FORCE
607+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
608+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
609+%.ko: gcc-plugins prepare scripts FORCE
610 $(cmd_crmodverdir)
611 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
612 $(build)=$(build-dir) $(@:.ko=.o)
613diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
614index 8f8eafb..3405f46 100644
615--- a/arch/alpha/include/asm/atomic.h
616+++ b/arch/alpha/include/asm/atomic.h
617@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
618 #define atomic_dec(v) atomic_sub(1,(v))
619 #define atomic64_dec(v) atomic64_sub(1,(v))
620
621+#define atomic64_read_unchecked(v) atomic64_read(v)
622+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
623+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
624+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
625+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
626+#define atomic64_inc_unchecked(v) atomic64_inc(v)
627+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
628+#define atomic64_dec_unchecked(v) atomic64_dec(v)
629+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
630+
631 #endif /* _ALPHA_ATOMIC_H */
632diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
633index ad368a9..fbe0f25 100644
634--- a/arch/alpha/include/asm/cache.h
635+++ b/arch/alpha/include/asm/cache.h
636@@ -4,19 +4,19 @@
637 #ifndef __ARCH_ALPHA_CACHE_H
638 #define __ARCH_ALPHA_CACHE_H
639
640+#include <linux/const.h>
641
642 /* Bytes per L1 (data) cache line. */
643 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
644-# define L1_CACHE_BYTES 64
645 # define L1_CACHE_SHIFT 6
646 #else
647 /* Both EV4 and EV5 are write-through, read-allocate,
648 direct-mapped, physical.
649 */
650-# define L1_CACHE_BYTES 32
651 # define L1_CACHE_SHIFT 5
652 #endif
653
654+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
655 #define SMP_CACHE_BYTES L1_CACHE_BYTES
656
657 #endif
658diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
659index 968d999..d36b2df 100644
660--- a/arch/alpha/include/asm/elf.h
661+++ b/arch/alpha/include/asm/elf.h
662@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
663
664 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
665
666+#ifdef CONFIG_PAX_ASLR
667+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
668+
669+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
670+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
671+#endif
672+
673 /* $0 is set by ld.so to a pointer to a function which might be
674 registered using atexit. This provides a mean for the dynamic
675 linker to call DT_FINI functions for shared libraries that have
676diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
677index aab14a0..b4fa3e7 100644
678--- a/arch/alpha/include/asm/pgalloc.h
679+++ b/arch/alpha/include/asm/pgalloc.h
680@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
681 pgd_set(pgd, pmd);
682 }
683
684+static inline void
685+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
686+{
687+ pgd_populate(mm, pgd, pmd);
688+}
689+
690 extern pgd_t *pgd_alloc(struct mm_struct *mm);
691
692 static inline void
693diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
694index d8f9b7e..f6222fa 100644
695--- a/arch/alpha/include/asm/pgtable.h
696+++ b/arch/alpha/include/asm/pgtable.h
697@@ -102,6 +102,17 @@ struct vm_area_struct;
698 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
699 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
700 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
701+
702+#ifdef CONFIG_PAX_PAGEEXEC
703+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
704+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
705+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
706+#else
707+# define PAGE_SHARED_NOEXEC PAGE_SHARED
708+# define PAGE_COPY_NOEXEC PAGE_COPY
709+# define PAGE_READONLY_NOEXEC PAGE_READONLY
710+#endif
711+
712 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
713
714 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
715diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
716index 2fd00b7..cfd5069 100644
717--- a/arch/alpha/kernel/module.c
718+++ b/arch/alpha/kernel/module.c
719@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
720
721 /* The small sections were sorted to the end of the segment.
722 The following should definitely cover them. */
723- gp = (u64)me->module_core + me->core_size - 0x8000;
724+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
725 got = sechdrs[me->arch.gotsecindex].sh_addr;
726
727 for (i = 0; i < n; i++) {
728diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
729index f9c732e..78fbb0f 100644
730--- a/arch/alpha/kernel/osf_sys.c
731+++ b/arch/alpha/kernel/osf_sys.c
732@@ -1295,10 +1295,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
733 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
734
735 static unsigned long
736-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
737- unsigned long limit)
738+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
739+ unsigned long limit, unsigned long flags)
740 {
741 struct vm_unmapped_area_info info;
742+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
743
744 info.flags = 0;
745 info.length = len;
746@@ -1306,6 +1307,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
747 info.high_limit = limit;
748 info.align_mask = 0;
749 info.align_offset = 0;
750+ info.threadstack_offset = offset;
751 return vm_unmapped_area(&info);
752 }
753
754@@ -1338,20 +1340,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
755 merely specific addresses, but regions of memory -- perhaps
756 this feature should be incorporated into all ports? */
757
758+#ifdef CONFIG_PAX_RANDMMAP
759+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
760+#endif
761+
762 if (addr) {
763- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
764+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
765 if (addr != (unsigned long) -ENOMEM)
766 return addr;
767 }
768
769 /* Next, try allocating at TASK_UNMAPPED_BASE. */
770- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
771- len, limit);
772+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
773+
774 if (addr != (unsigned long) -ENOMEM)
775 return addr;
776
777 /* Finally, try allocating in low memory. */
778- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
779+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
780
781 return addr;
782 }
783diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
784index 98838a0..b304fb4 100644
785--- a/arch/alpha/mm/fault.c
786+++ b/arch/alpha/mm/fault.c
787@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
788 __reload_thread(pcb);
789 }
790
791+#ifdef CONFIG_PAX_PAGEEXEC
792+/*
793+ * PaX: decide what to do with offenders (regs->pc = fault address)
794+ *
795+ * returns 1 when task should be killed
796+ * 2 when patched PLT trampoline was detected
797+ * 3 when unpatched PLT trampoline was detected
798+ */
799+static int pax_handle_fetch_fault(struct pt_regs *regs)
800+{
801+
802+#ifdef CONFIG_PAX_EMUPLT
803+ int err;
804+
805+ do { /* PaX: patched PLT emulation #1 */
806+ unsigned int ldah, ldq, jmp;
807+
808+ err = get_user(ldah, (unsigned int *)regs->pc);
809+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
810+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
811+
812+ if (err)
813+ break;
814+
815+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
816+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
817+ jmp == 0x6BFB0000U)
818+ {
819+ unsigned long r27, addr;
820+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
821+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
822+
823+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
824+ err = get_user(r27, (unsigned long *)addr);
825+ if (err)
826+ break;
827+
828+ regs->r27 = r27;
829+ regs->pc = r27;
830+ return 2;
831+ }
832+ } while (0);
833+
834+ do { /* PaX: patched PLT emulation #2 */
835+ unsigned int ldah, lda, br;
836+
837+ err = get_user(ldah, (unsigned int *)regs->pc);
838+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
839+ err |= get_user(br, (unsigned int *)(regs->pc+8));
840+
841+ if (err)
842+ break;
843+
844+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
845+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
846+ (br & 0xFFE00000U) == 0xC3E00000U)
847+ {
848+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
849+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
850+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
851+
852+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
853+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
854+ return 2;
855+ }
856+ } while (0);
857+
858+ do { /* PaX: unpatched PLT emulation */
859+ unsigned int br;
860+
861+ err = get_user(br, (unsigned int *)regs->pc);
862+
863+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
864+ unsigned int br2, ldq, nop, jmp;
865+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
866+
867+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
868+ err = get_user(br2, (unsigned int *)addr);
869+ err |= get_user(ldq, (unsigned int *)(addr+4));
870+ err |= get_user(nop, (unsigned int *)(addr+8));
871+ err |= get_user(jmp, (unsigned int *)(addr+12));
872+ err |= get_user(resolver, (unsigned long *)(addr+16));
873+
874+ if (err)
875+ break;
876+
877+ if (br2 == 0xC3600000U &&
878+ ldq == 0xA77B000CU &&
879+ nop == 0x47FF041FU &&
880+ jmp == 0x6B7B0000U)
881+ {
882+ regs->r28 = regs->pc+4;
883+ regs->r27 = addr+16;
884+ regs->pc = resolver;
885+ return 3;
886+ }
887+ }
888+ } while (0);
889+#endif
890+
891+ return 1;
892+}
893+
894+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
895+{
896+ unsigned long i;
897+
898+ printk(KERN_ERR "PAX: bytes at PC: ");
899+ for (i = 0; i < 5; i++) {
900+ unsigned int c;
901+ if (get_user(c, (unsigned int *)pc+i))
902+ printk(KERN_CONT "???????? ");
903+ else
904+ printk(KERN_CONT "%08x ", c);
905+ }
906+ printk("\n");
907+}
908+#endif
909
910 /*
911 * This routine handles page faults. It determines the address,
912@@ -133,8 +251,29 @@ retry:
913 good_area:
914 si_code = SEGV_ACCERR;
915 if (cause < 0) {
916- if (!(vma->vm_flags & VM_EXEC))
917+ if (!(vma->vm_flags & VM_EXEC)) {
918+
919+#ifdef CONFIG_PAX_PAGEEXEC
920+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
921+ goto bad_area;
922+
923+ up_read(&mm->mmap_sem);
924+ switch (pax_handle_fetch_fault(regs)) {
925+
926+#ifdef CONFIG_PAX_EMUPLT
927+ case 2:
928+ case 3:
929+ return;
930+#endif
931+
932+ }
933+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
934+ do_group_exit(SIGKILL);
935+#else
936 goto bad_area;
937+#endif
938+
939+ }
940 } else if (!cause) {
941 /* Allow reads even for write-only mappings */
942 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
943diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
944index 89c4b5c..847a7be 100644
945--- a/arch/arm/Kconfig
946+++ b/arch/arm/Kconfig
947@@ -1740,7 +1740,7 @@ config ALIGNMENT_TRAP
948
949 config UACCESS_WITH_MEMCPY
950 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
951- depends on MMU
952+ depends on MMU && !PAX_MEMORY_UDEREF
953 default y if CPU_FEROCEON
954 help
955 Implement faster copy_to_user and clear_user methods for CPU
956@@ -2004,6 +2004,7 @@ config XIP_PHYS_ADDR
957 config KEXEC
958 bool "Kexec system call (EXPERIMENTAL)"
959 depends on (!SMP || PM_SLEEP_SMP)
960+ depends on !GRKERNSEC_KMEM
961 help
962 kexec is a system call that implements the ability to shutdown your
963 current kernel, and to start another kernel. It is like a reboot
964diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
965index e22c119..eaa807d 100644
966--- a/arch/arm/include/asm/atomic.h
967+++ b/arch/arm/include/asm/atomic.h
968@@ -18,17 +18,41 @@
969 #include <asm/barrier.h>
970 #include <asm/cmpxchg.h>
971
972+#ifdef CONFIG_GENERIC_ATOMIC64
973+#include <asm-generic/atomic64.h>
974+#endif
975+
976 #define ATOMIC_INIT(i) { (i) }
977
978 #ifdef __KERNEL__
979
980+#ifdef CONFIG_THUMB2_KERNEL
981+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
982+#else
983+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
984+#endif
985+
986+#define _ASM_EXTABLE(from, to) \
987+" .pushsection __ex_table,\"a\"\n"\
988+" .align 3\n" \
989+" .long " #from ", " #to"\n" \
990+" .popsection"
991+
992 /*
993 * On ARM, ordinary assignment (str instruction) doesn't clear the local
994 * strex/ldrex monitor on some implementations. The reason we can use it for
995 * atomic_set() is the clrex or dummy strex done on every exception return.
996 */
997 #define atomic_read(v) ACCESS_ONCE((v)->counter)
998+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
999+{
1000+ return ACCESS_ONCE(v->counter);
1001+}
1002 #define atomic_set(v,i) (((v)->counter) = (i))
1003+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1004+{
1005+ v->counter = i;
1006+}
1007
1008 #if __LINUX_ARM_ARCH__ >= 6
1009
1010@@ -38,26 +62,50 @@
1011 * to ensure that the update happens.
1012 */
1013
1014-#define ATOMIC_OP(op, c_op, asm_op) \
1015-static inline void atomic_##op(int i, atomic_t *v) \
1016+#ifdef CONFIG_PAX_REFCOUNT
1017+#define __OVERFLOW_POST \
1018+ " bvc 3f\n" \
1019+ "2: " REFCOUNT_TRAP_INSN "\n"\
1020+ "3:\n"
1021+#define __OVERFLOW_POST_RETURN \
1022+ " bvc 3f\n" \
1023+" mov %0, %1\n" \
1024+ "2: " REFCOUNT_TRAP_INSN "\n"\
1025+ "3:\n"
1026+#define __OVERFLOW_EXTABLE \
1027+ "4:\n" \
1028+ _ASM_EXTABLE(2b, 4b)
1029+#else
1030+#define __OVERFLOW_POST
1031+#define __OVERFLOW_POST_RETURN
1032+#define __OVERFLOW_EXTABLE
1033+#endif
1034+
1035+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1036+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1037 { \
1038 unsigned long tmp; \
1039 int result; \
1040 \
1041 prefetchw(&v->counter); \
1042- __asm__ __volatile__("@ atomic_" #op "\n" \
1043+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1044 "1: ldrex %0, [%3]\n" \
1045 " " #asm_op " %0, %0, %4\n" \
1046+ post_op \
1047 " strex %1, %0, [%3]\n" \
1048 " teq %1, #0\n" \
1049-" bne 1b" \
1050+" bne 1b\n" \
1051+ extable \
1052 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1053 : "r" (&v->counter), "Ir" (i) \
1054 : "cc"); \
1055 } \
1056
1057-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1058-static inline int atomic_##op##_return(int i, atomic_t *v) \
1059+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op, , )\
1060+ __ATOMIC_OP(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1061+
1062+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1063+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1064 { \
1065 unsigned long tmp; \
1066 int result; \
1067@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1068 smp_mb(); \
1069 prefetchw(&v->counter); \
1070 \
1071- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1072+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1073 "1: ldrex %0, [%3]\n" \
1074 " " #asm_op " %0, %0, %4\n" \
1075+ post_op \
1076 " strex %1, %0, [%3]\n" \
1077 " teq %1, #0\n" \
1078-" bne 1b" \
1079+" bne 1b\n" \
1080+ extable \
1081 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1082 : "r" (&v->counter), "Ir" (i) \
1083 : "cc"); \
1084@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1085 return result; \
1086 }
1087
1088+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op, , )\
1089+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1090+
1091 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1092 {
1093 int oldval;
1094@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1095 __asm__ __volatile__ ("@ atomic_add_unless\n"
1096 "1: ldrex %0, [%4]\n"
1097 " teq %0, %5\n"
1098-" beq 2f\n"
1099-" add %1, %0, %6\n"
1100+" beq 4f\n"
1101+" adds %1, %0, %6\n"
1102+
1103+#ifdef CONFIG_PAX_REFCOUNT
1104+" bvc 3f\n"
1105+"2: " REFCOUNT_TRAP_INSN "\n"
1106+"3:\n"
1107+#endif
1108+
1109 " strex %2, %1, [%4]\n"
1110 " teq %2, #0\n"
1111 " bne 1b\n"
1112-"2:"
1113+"4:"
1114+
1115+#ifdef CONFIG_PAX_REFCOUNT
1116+ _ASM_EXTABLE(2b, 4b)
1117+#endif
1118+
1119 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1120 : "r" (&v->counter), "r" (u), "r" (a)
1121 : "cc");
1122@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1123 return oldval;
1124 }
1125
1126+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1127+{
1128+ unsigned long oldval, res;
1129+
1130+ smp_mb();
1131+
1132+ do {
1133+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1134+ "ldrex %1, [%3]\n"
1135+ "mov %0, #0\n"
1136+ "teq %1, %4\n"
1137+ "strexeq %0, %5, [%3]\n"
1138+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1139+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1140+ : "cc");
1141+ } while (res);
1142+
1143+ smp_mb();
1144+
1145+ return oldval;
1146+}
1147+
1148 #else /* ARM_ARCH_6 */
1149
1150 #ifdef CONFIG_SMP
1151 #error SMP not supported on pre-ARMv6 CPUs
1152 #endif
1153
1154-#define ATOMIC_OP(op, c_op, asm_op) \
1155-static inline void atomic_##op(int i, atomic_t *v) \
1156+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1157+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1158 { \
1159 unsigned long flags; \
1160 \
1161@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1162 raw_local_irq_restore(flags); \
1163 } \
1164
1165-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1166-static inline int atomic_##op##_return(int i, atomic_t *v) \
1167+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1168+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1169+
1170+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1171+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1172 { \
1173 unsigned long flags; \
1174 int val; \
1175@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1176 return val; \
1177 }
1178
1179+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1180+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1181+
1182 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1183 {
1184 int ret;
1185@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1186 return ret;
1187 }
1188
1189+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1190+{
1191+ return atomic_cmpxchg((atomic_t *)v, old, new);
1192+}
1193+
1194 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1195 {
1196 int c, old;
1197@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1198
1199 #undef ATOMIC_OPS
1200 #undef ATOMIC_OP_RETURN
1201+#undef __ATOMIC_OP_RETURN
1202 #undef ATOMIC_OP
1203+#undef __ATOMIC_OP
1204
1205 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1206+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1207+{
1208+ return xchg(&v->counter, new);
1209+}
1210
1211 #define atomic_inc(v) atomic_add(1, v)
1212+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1213+{
1214+ atomic_add_unchecked(1, v);
1215+}
1216 #define atomic_dec(v) atomic_sub(1, v)
1217+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1218+{
1219+ atomic_sub_unchecked(1, v);
1220+}
1221
1222 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1223+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1224+{
1225+ return atomic_add_return_unchecked(1, v) == 0;
1226+}
1227 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1228 #define atomic_inc_return(v) (atomic_add_return(1, v))
1229+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1230+{
1231+ return atomic_add_return_unchecked(1, v);
1232+}
1233 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1234 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1235
1236@@ -216,6 +336,14 @@ typedef struct {
1237 long long counter;
1238 } atomic64_t;
1239
1240+#ifdef CONFIG_PAX_REFCOUNT
1241+typedef struct {
1242+ long long counter;
1243+} atomic64_unchecked_t;
1244+#else
1245+typedef atomic64_t atomic64_unchecked_t;
1246+#endif
1247+
1248 #define ATOMIC64_INIT(i) { (i) }
1249
1250 #ifdef CONFIG_ARM_LPAE
1251@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1252 return result;
1253 }
1254
1255+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1256+{
1257+ long long result;
1258+
1259+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1260+" ldrd %0, %H0, [%1]"
1261+ : "=&r" (result)
1262+ : "r" (&v->counter), "Qo" (v->counter)
1263+ );
1264+
1265+ return result;
1266+}
1267+
1268 static inline void atomic64_set(atomic64_t *v, long long i)
1269 {
1270 __asm__ __volatile__("@ atomic64_set\n"
1271@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1272 : "r" (&v->counter), "r" (i)
1273 );
1274 }
1275+
1276+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1277+{
1278+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1279+" strd %2, %H2, [%1]"
1280+ : "=Qo" (v->counter)
1281+ : "r" (&v->counter), "r" (i)
1282+ );
1283+}
1284 #else
1285 static inline long long atomic64_read(const atomic64_t *v)
1286 {
1287@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1288 return result;
1289 }
1290
1291+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1292+{
1293+ long long result;
1294+
1295+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1296+" ldrexd %0, %H0, [%1]"
1297+ : "=&r" (result)
1298+ : "r" (&v->counter), "Qo" (v->counter)
1299+ );
1300+
1301+ return result;
1302+}
1303+
1304 static inline void atomic64_set(atomic64_t *v, long long i)
1305 {
1306 long long tmp;
1307@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1308 : "r" (&v->counter), "r" (i)
1309 : "cc");
1310 }
1311+
1312+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1313+{
1314+ long long tmp;
1315+
1316+ prefetchw(&v->counter);
1317+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1318+"1: ldrexd %0, %H0, [%2]\n"
1319+" strexd %0, %3, %H3, [%2]\n"
1320+" teq %0, #0\n"
1321+" bne 1b"
1322+ : "=&r" (tmp), "=Qo" (v->counter)
1323+ : "r" (&v->counter), "r" (i)
1324+ : "cc");
1325+}
1326 #endif
1327
1328-#define ATOMIC64_OP(op, op1, op2) \
1329-static inline void atomic64_##op(long long i, atomic64_t *v) \
1330+#undef __OVERFLOW_POST_RETURN
1331+#define __OVERFLOW_POST_RETURN \
1332+ " bvc 3f\n" \
1333+" mov %0, %1\n" \
1334+" mov %H0, %H1\n" \
1335+ "2: " REFCOUNT_TRAP_INSN "\n"\
1336+ "3:\n"
1337+
1338+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1339+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1340 { \
1341 long long result; \
1342 unsigned long tmp; \
1343 \
1344 prefetchw(&v->counter); \
1345- __asm__ __volatile__("@ atomic64_" #op "\n" \
1346+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1347 "1: ldrexd %0, %H0, [%3]\n" \
1348 " " #op1 " %Q0, %Q0, %Q4\n" \
1349 " " #op2 " %R0, %R0, %R4\n" \
1350+ post_op \
1351 " strexd %1, %0, %H0, [%3]\n" \
1352 " teq %1, #0\n" \
1353-" bne 1b" \
1354+" bne 1b\n" \
1355+ extable \
1356 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1357 : "r" (&v->counter), "r" (i) \
1358 : "cc"); \
1359 } \
1360
1361-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1362-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1363+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, , op1, op2, , ) \
1364+ __ATOMIC64_OP(op, _unchecked, op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1365+
1366+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1367+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1368 { \
1369 long long result; \
1370 unsigned long tmp; \
1371@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1372 smp_mb(); \
1373 prefetchw(&v->counter); \
1374 \
1375- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1376+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1377 "1: ldrexd %0, %H0, [%3]\n" \
1378 " " #op1 " %Q0, %Q0, %Q4\n" \
1379 " " #op2 " %R0, %R0, %R4\n" \
1380+ post_op \
1381 " strexd %1, %0, %H0, [%3]\n" \
1382 " teq %1, #0\n" \
1383-" bne 1b" \
1384+" bne 1b\n" \
1385+ extable \
1386 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1387 : "r" (&v->counter), "r" (i) \
1388 : "cc"); \
1389@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1390 return result; \
1391 }
1392
1393+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, , op1, op2, , ) \
1394+ __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1395+
1396 #define ATOMIC64_OPS(op, op1, op2) \
1397 ATOMIC64_OP(op, op1, op2) \
1398 ATOMIC64_OP_RETURN(op, op1, op2)
1399@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1400
1401 #undef ATOMIC64_OPS
1402 #undef ATOMIC64_OP_RETURN
1403+#undef __ATOMIC64_OP_RETURN
1404 #undef ATOMIC64_OP
1405+#undef __ATOMIC64_OP
1406+#undef __OVERFLOW_EXTABLE
1407+#undef __OVERFLOW_POST_RETURN
1408+#undef __OVERFLOW_POST
1409
1410 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1411 long long new)
1412@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1413 return oldval;
1414 }
1415
1416+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1417+ long long new)
1418+{
1419+ long long oldval;
1420+ unsigned long res;
1421+
1422+ smp_mb();
1423+
1424+ do {
1425+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1426+ "ldrexd %1, %H1, [%3]\n"
1427+ "mov %0, #0\n"
1428+ "teq %1, %4\n"
1429+ "teqeq %H1, %H4\n"
1430+ "strexdeq %0, %5, %H5, [%3]"
1431+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1432+ : "r" (&ptr->counter), "r" (old), "r" (new)
1433+ : "cc");
1434+ } while (res);
1435+
1436+ smp_mb();
1437+
1438+ return oldval;
1439+}
1440+
1441 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1442 {
1443 long long result;
1444@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1445 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1446 {
1447 long long result;
1448- unsigned long tmp;
1449+ u64 tmp;
1450
1451 smp_mb();
1452 prefetchw(&v->counter);
1453
1454 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1455-"1: ldrexd %0, %H0, [%3]\n"
1456-" subs %Q0, %Q0, #1\n"
1457-" sbc %R0, %R0, #0\n"
1458+"1: ldrexd %1, %H1, [%3]\n"
1459+" subs %Q0, %Q1, #1\n"
1460+" sbcs %R0, %R1, #0\n"
1461+
1462+#ifdef CONFIG_PAX_REFCOUNT
1463+" bvc 3f\n"
1464+" mov %Q0, %Q1\n"
1465+" mov %R0, %R1\n"
1466+"2: " REFCOUNT_TRAP_INSN "\n"
1467+"3:\n"
1468+#endif
1469+
1470 " teq %R0, #0\n"
1471-" bmi 2f\n"
1472+" bmi 4f\n"
1473 " strexd %1, %0, %H0, [%3]\n"
1474 " teq %1, #0\n"
1475 " bne 1b\n"
1476-"2:"
1477+"4:\n"
1478+
1479+#ifdef CONFIG_PAX_REFCOUNT
1480+ _ASM_EXTABLE(2b, 4b)
1481+#endif
1482+
1483 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1484 : "r" (&v->counter)
1485 : "cc");
1486@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1487 " teq %0, %5\n"
1488 " teqeq %H0, %H5\n"
1489 " moveq %1, #0\n"
1490-" beq 2f\n"
1491+" beq 4f\n"
1492 " adds %Q0, %Q0, %Q6\n"
1493-" adc %R0, %R0, %R6\n"
1494+" adcs %R0, %R0, %R6\n"
1495+
1496+#ifdef CONFIG_PAX_REFCOUNT
1497+" bvc 3f\n"
1498+"2: " REFCOUNT_TRAP_INSN "\n"
1499+"3:\n"
1500+#endif
1501+
1502 " strexd %2, %0, %H0, [%4]\n"
1503 " teq %2, #0\n"
1504 " bne 1b\n"
1505-"2:"
1506+"4:\n"
1507+
1508+#ifdef CONFIG_PAX_REFCOUNT
1509+ _ASM_EXTABLE(2b, 4b)
1510+#endif
1511+
1512 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1513 : "r" (&v->counter), "r" (u), "r" (a)
1514 : "cc");
1515@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1516
1517 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1518 #define atomic64_inc(v) atomic64_add(1LL, (v))
1519+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1520 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1521+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1522 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1523 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1524 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1525+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1526 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1527 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1528 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1529diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1530index c6a3e73..35cca85 100644
1531--- a/arch/arm/include/asm/barrier.h
1532+++ b/arch/arm/include/asm/barrier.h
1533@@ -63,7 +63,7 @@
1534 do { \
1535 compiletime_assert_atomic_type(*p); \
1536 smp_mb(); \
1537- ACCESS_ONCE(*p) = (v); \
1538+ ACCESS_ONCE_RW(*p) = (v); \
1539 } while (0)
1540
1541 #define smp_load_acquire(p) \
1542diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1543index 75fe66b..ba3dee4 100644
1544--- a/arch/arm/include/asm/cache.h
1545+++ b/arch/arm/include/asm/cache.h
1546@@ -4,8 +4,10 @@
1547 #ifndef __ASMARM_CACHE_H
1548 #define __ASMARM_CACHE_H
1549
1550+#include <linux/const.h>
1551+
1552 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1553-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1554+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1555
1556 /*
1557 * Memory returned by kmalloc() may be used for DMA, so we must make
1558@@ -24,5 +26,6 @@
1559 #endif
1560
1561 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1562+#define __read_only __attribute__ ((__section__(".data..read_only")))
1563
1564 #endif
1565diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1566index 10e78d0..dc8505d 100644
1567--- a/arch/arm/include/asm/cacheflush.h
1568+++ b/arch/arm/include/asm/cacheflush.h
1569@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1570 void (*dma_unmap_area)(const void *, size_t, int);
1571
1572 void (*dma_flush_range)(const void *, const void *);
1573-};
1574+} __no_const;
1575
1576 /*
1577 * Select the calling method
1578diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1579index 5233151..87a71fa 100644
1580--- a/arch/arm/include/asm/checksum.h
1581+++ b/arch/arm/include/asm/checksum.h
1582@@ -37,7 +37,19 @@ __wsum
1583 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1584
1585 __wsum
1586-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1587+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1588+
1589+static inline __wsum
1590+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1591+{
1592+ __wsum ret;
1593+ pax_open_userland();
1594+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1595+ pax_close_userland();
1596+ return ret;
1597+}
1598+
1599+
1600
1601 /*
1602 * Fold a partial checksum without adding pseudo headers
1603diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1604index abb2c37..96db950 100644
1605--- a/arch/arm/include/asm/cmpxchg.h
1606+++ b/arch/arm/include/asm/cmpxchg.h
1607@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1608
1609 #define xchg(ptr,x) \
1610 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1611+#define xchg_unchecked(ptr,x) \
1612+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1613
1614 #include <asm-generic/cmpxchg-local.h>
1615
1616diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1617index 6ddbe44..b5e38b1 100644
1618--- a/arch/arm/include/asm/domain.h
1619+++ b/arch/arm/include/asm/domain.h
1620@@ -48,18 +48,37 @@
1621 * Domain types
1622 */
1623 #define DOMAIN_NOACCESS 0
1624-#define DOMAIN_CLIENT 1
1625 #ifdef CONFIG_CPU_USE_DOMAINS
1626+#define DOMAIN_USERCLIENT 1
1627+#define DOMAIN_KERNELCLIENT 1
1628 #define DOMAIN_MANAGER 3
1629+#define DOMAIN_VECTORS DOMAIN_USER
1630 #else
1631+
1632+#ifdef CONFIG_PAX_KERNEXEC
1633 #define DOMAIN_MANAGER 1
1634+#define DOMAIN_KERNEXEC 3
1635+#else
1636+#define DOMAIN_MANAGER 1
1637+#endif
1638+
1639+#ifdef CONFIG_PAX_MEMORY_UDEREF
1640+#define DOMAIN_USERCLIENT 0
1641+#define DOMAIN_UDEREF 1
1642+#define DOMAIN_VECTORS DOMAIN_KERNEL
1643+#else
1644+#define DOMAIN_USERCLIENT 1
1645+#define DOMAIN_VECTORS DOMAIN_USER
1646+#endif
1647+#define DOMAIN_KERNELCLIENT 1
1648+
1649 #endif
1650
1651 #define domain_val(dom,type) ((type) << (2*(dom)))
1652
1653 #ifndef __ASSEMBLY__
1654
1655-#ifdef CONFIG_CPU_USE_DOMAINS
1656+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1657 static inline void set_domain(unsigned val)
1658 {
1659 asm volatile(
1660@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1661 isb();
1662 }
1663
1664-#define modify_domain(dom,type) \
1665- do { \
1666- struct thread_info *thread = current_thread_info(); \
1667- unsigned int domain = thread->cpu_domain; \
1668- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1669- thread->cpu_domain = domain | domain_val(dom, type); \
1670- set_domain(thread->cpu_domain); \
1671- } while (0)
1672-
1673+extern void modify_domain(unsigned int dom, unsigned int type);
1674 #else
1675 static inline void set_domain(unsigned val) { }
1676 static inline void modify_domain(unsigned dom, unsigned type) { }
1677diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1678index afb9caf..9a0bac0 100644
1679--- a/arch/arm/include/asm/elf.h
1680+++ b/arch/arm/include/asm/elf.h
1681@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1682 the loader. We need to make sure that it is out of the way of the program
1683 that it will "exec", and that there is sufficient room for the brk. */
1684
1685-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1686+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1687+
1688+#ifdef CONFIG_PAX_ASLR
1689+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1690+
1691+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1692+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1693+#endif
1694
1695 /* When the program starts, a1 contains a pointer to a function to be
1696 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1697@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1698 extern void elf_set_personality(const struct elf32_hdr *);
1699 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1700
1701-struct mm_struct;
1702-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1703-#define arch_randomize_brk arch_randomize_brk
1704-
1705 #ifdef CONFIG_MMU
1706 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1707 struct linux_binprm;
1708diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1709index de53547..52b9a28 100644
1710--- a/arch/arm/include/asm/fncpy.h
1711+++ b/arch/arm/include/asm/fncpy.h
1712@@ -81,7 +81,9 @@
1713 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1714 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1715 \
1716+ pax_open_kernel(); \
1717 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1718+ pax_close_kernel(); \
1719 flush_icache_range((unsigned long)(dest_buf), \
1720 (unsigned long)(dest_buf) + (size)); \
1721 \
1722diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1723index 53e69da..3fdc896 100644
1724--- a/arch/arm/include/asm/futex.h
1725+++ b/arch/arm/include/asm/futex.h
1726@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1727 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1728 return -EFAULT;
1729
1730+ pax_open_userland();
1731+
1732 smp_mb();
1733 /* Prefetching cannot fault */
1734 prefetchw(uaddr);
1735@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1736 : "cc", "memory");
1737 smp_mb();
1738
1739+ pax_close_userland();
1740+
1741 *uval = val;
1742 return ret;
1743 }
1744@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1745 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1746 return -EFAULT;
1747
1748+ pax_open_userland();
1749+
1750 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1751 "1: " TUSER(ldr) " %1, [%4]\n"
1752 " teq %1, %2\n"
1753@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1754 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1755 : "cc", "memory");
1756
1757+ pax_close_userland();
1758+
1759 *uval = val;
1760 return ret;
1761 }
1762@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1763 return -EFAULT;
1764
1765 pagefault_disable(); /* implies preempt_disable() */
1766+ pax_open_userland();
1767
1768 switch (op) {
1769 case FUTEX_OP_SET:
1770@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1771 ret = -ENOSYS;
1772 }
1773
1774+ pax_close_userland();
1775 pagefault_enable(); /* subsumes preempt_enable() */
1776
1777 if (!ret) {
1778diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1779index 83eb2f7..ed77159 100644
1780--- a/arch/arm/include/asm/kmap_types.h
1781+++ b/arch/arm/include/asm/kmap_types.h
1782@@ -4,6 +4,6 @@
1783 /*
1784 * This is the "bare minimum". AIO seems to require this.
1785 */
1786-#define KM_TYPE_NR 16
1787+#define KM_TYPE_NR 17
1788
1789 #endif
1790diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1791index 9e614a1..3302cca 100644
1792--- a/arch/arm/include/asm/mach/dma.h
1793+++ b/arch/arm/include/asm/mach/dma.h
1794@@ -22,7 +22,7 @@ struct dma_ops {
1795 int (*residue)(unsigned int, dma_t *); /* optional */
1796 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1797 const char *type;
1798-};
1799+} __do_const;
1800
1801 struct dma_struct {
1802 void *addr; /* single DMA address */
1803diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1804index f98c7f3..e5c626d 100644
1805--- a/arch/arm/include/asm/mach/map.h
1806+++ b/arch/arm/include/asm/mach/map.h
1807@@ -23,17 +23,19 @@ struct map_desc {
1808
1809 /* types 0-3 are defined in asm/io.h */
1810 enum {
1811- MT_UNCACHED = 4,
1812- MT_CACHECLEAN,
1813- MT_MINICLEAN,
1814+ MT_UNCACHED_RW = 4,
1815+ MT_CACHECLEAN_RO,
1816+ MT_MINICLEAN_RO,
1817 MT_LOW_VECTORS,
1818 MT_HIGH_VECTORS,
1819- MT_MEMORY_RWX,
1820+ __MT_MEMORY_RWX,
1821 MT_MEMORY_RW,
1822- MT_ROM,
1823- MT_MEMORY_RWX_NONCACHED,
1824+ MT_MEMORY_RX,
1825+ MT_ROM_RX,
1826+ MT_MEMORY_RW_NONCACHED,
1827+ MT_MEMORY_RX_NONCACHED,
1828 MT_MEMORY_RW_DTCM,
1829- MT_MEMORY_RWX_ITCM,
1830+ MT_MEMORY_RX_ITCM,
1831 MT_MEMORY_RW_SO,
1832 MT_MEMORY_DMA_READY,
1833 };
1834diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1835index 891a56b..48f337e 100644
1836--- a/arch/arm/include/asm/outercache.h
1837+++ b/arch/arm/include/asm/outercache.h
1838@@ -36,7 +36,7 @@ struct outer_cache_fns {
1839
1840 /* This is an ARM L2C thing */
1841 void (*write_sec)(unsigned long, unsigned);
1842-};
1843+} __no_const;
1844
1845 extern struct outer_cache_fns outer_cache;
1846
1847diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1848index 4355f0e..cd9168e 100644
1849--- a/arch/arm/include/asm/page.h
1850+++ b/arch/arm/include/asm/page.h
1851@@ -23,6 +23,7 @@
1852
1853 #else
1854
1855+#include <linux/compiler.h>
1856 #include <asm/glue.h>
1857
1858 /*
1859@@ -114,7 +115,7 @@ struct cpu_user_fns {
1860 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1861 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1862 unsigned long vaddr, struct vm_area_struct *vma);
1863-};
1864+} __no_const;
1865
1866 #ifdef MULTI_USER
1867 extern struct cpu_user_fns cpu_user;
1868diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1869index 78a7793..e3dc06c 100644
1870--- a/arch/arm/include/asm/pgalloc.h
1871+++ b/arch/arm/include/asm/pgalloc.h
1872@@ -17,6 +17,7 @@
1873 #include <asm/processor.h>
1874 #include <asm/cacheflush.h>
1875 #include <asm/tlbflush.h>
1876+#include <asm/system_info.h>
1877
1878 #define check_pgt_cache() do { } while (0)
1879
1880@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1881 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1882 }
1883
1884+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1885+{
1886+ pud_populate(mm, pud, pmd);
1887+}
1888+
1889 #else /* !CONFIG_ARM_LPAE */
1890
1891 /*
1892@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1893 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1894 #define pmd_free(mm, pmd) do { } while (0)
1895 #define pud_populate(mm,pmd,pte) BUG()
1896+#define pud_populate_kernel(mm,pmd,pte) BUG()
1897
1898 #endif /* CONFIG_ARM_LPAE */
1899
1900@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1901 __free_page(pte);
1902 }
1903
1904+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1905+{
1906+#ifdef CONFIG_ARM_LPAE
1907+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1908+#else
1909+ if (addr & SECTION_SIZE)
1910+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1911+ else
1912+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1913+#endif
1914+ flush_pmd_entry(pmdp);
1915+}
1916+
1917 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1918 pmdval_t prot)
1919 {
1920@@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1921 static inline void
1922 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1923 {
1924- __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1925+ __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1926 }
1927 #define pmd_pgtable(pmd) pmd_page(pmd)
1928
1929diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1930index 5cfba15..f415e1a 100644
1931--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1932+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1933@@ -20,12 +20,15 @@
1934 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1935 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1936 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1937+#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1938 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1939 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1940 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1941+
1942 /*
1943 * - section
1944 */
1945+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1946 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1947 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1948 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1949@@ -37,6 +40,7 @@
1950 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1951 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1952 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1953+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1954
1955 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1956 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1957@@ -66,6 +70,7 @@
1958 * - extended small page/tiny page
1959 */
1960 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1961+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1962 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1963 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1964 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1965diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1966index f027941..f36ce30 100644
1967--- a/arch/arm/include/asm/pgtable-2level.h
1968+++ b/arch/arm/include/asm/pgtable-2level.h
1969@@ -126,6 +126,9 @@
1970 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1971 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1972
1973+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1974+#define L_PTE_PXN (_AT(pteval_t, 0))
1975+
1976 /*
1977 * These are the memory types, defined to be compatible with
1978 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1979diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1980index 9fd61c7..f8f1cff 100644
1981--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1982+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1983@@ -76,6 +76,7 @@
1984 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1985 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1986 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1987+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1988 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1989
1990 /*
1991diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1992index a31ecdad..95e98d4 100644
1993--- a/arch/arm/include/asm/pgtable-3level.h
1994+++ b/arch/arm/include/asm/pgtable-3level.h
1995@@ -81,6 +81,7 @@
1996 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1997 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1998 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1999+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2000 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2001 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2002 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2003@@ -92,10 +93,12 @@
2004 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2005 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2006 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2007+#define PMD_SECT_RDONLY PMD_SECT_AP2
2008
2009 /*
2010 * To be used in assembly code with the upper page attributes.
2011 */
2012+#define L_PTE_PXN_HIGH (1 << (53 - 32))
2013 #define L_PTE_XN_HIGH (1 << (54 - 32))
2014 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2015
2016diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2017index 3b30062..01a5f9d 100644
2018--- a/arch/arm/include/asm/pgtable.h
2019+++ b/arch/arm/include/asm/pgtable.h
2020@@ -33,6 +33,9 @@
2021 #include <asm/pgtable-2level.h>
2022 #endif
2023
2024+#define ktla_ktva(addr) (addr)
2025+#define ktva_ktla(addr) (addr)
2026+
2027 /*
2028 * Just any arbitrary offset to the start of the vmalloc VM area: the
2029 * current 8MB value just means that there will be a 8MB "hole" after the
2030@@ -48,6 +51,9 @@
2031 #define LIBRARY_TEXT_START 0x0c000000
2032
2033 #ifndef __ASSEMBLY__
2034+extern pteval_t __supported_pte_mask;
2035+extern pmdval_t __supported_pmd_mask;
2036+
2037 extern void __pte_error(const char *file, int line, pte_t);
2038 extern void __pmd_error(const char *file, int line, pmd_t);
2039 extern void __pgd_error(const char *file, int line, pgd_t);
2040@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2041 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2042 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2043
2044+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2045+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2046+
2047+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2048+#include <asm/domain.h>
2049+#include <linux/thread_info.h>
2050+#include <linux/preempt.h>
2051+
2052+static inline int test_domain(int domain, int domaintype)
2053+{
2054+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2055+}
2056+#endif
2057+
2058+#ifdef CONFIG_PAX_KERNEXEC
2059+static inline unsigned long pax_open_kernel(void) {
2060+#ifdef CONFIG_ARM_LPAE
2061+ /* TODO */
2062+#else
2063+ preempt_disable();
2064+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2065+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2066+#endif
2067+ return 0;
2068+}
2069+
2070+static inline unsigned long pax_close_kernel(void) {
2071+#ifdef CONFIG_ARM_LPAE
2072+ /* TODO */
2073+#else
2074+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2075+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2076+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2077+ preempt_enable_no_resched();
2078+#endif
2079+ return 0;
2080+}
2081+#else
2082+static inline unsigned long pax_open_kernel(void) { return 0; }
2083+static inline unsigned long pax_close_kernel(void) { return 0; }
2084+#endif
2085+
2086 /*
2087 * This is the lowest virtual address we can permit any user space
2088 * mapping to be mapped at. This is particularly important for
2089@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2090 /*
2091 * The pgprot_* and protection_map entries will be fixed up in runtime
2092 * to include the cachable and bufferable bits based on memory policy,
2093- * as well as any architecture dependent bits like global/ASID and SMP
2094- * shared mapping bits.
2095+ * as well as any architecture dependent bits like global/ASID, PXN,
2096+ * and SMP shared mapping bits.
2097 */
2098 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2099
2100@@ -267,7 +315,7 @@ PTE_BIT_FUNC(mknexec, |= L_PTE_XN);
2101 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2102 {
2103 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2104- L_PTE_NONE | L_PTE_VALID;
2105+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2106 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2107 return pte;
2108 }
2109diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2110index c25ef3e..735f14b 100644
2111--- a/arch/arm/include/asm/psci.h
2112+++ b/arch/arm/include/asm/psci.h
2113@@ -32,7 +32,7 @@ struct psci_operations {
2114 int (*affinity_info)(unsigned long target_affinity,
2115 unsigned long lowest_affinity_level);
2116 int (*migrate_info_type)(void);
2117-};
2118+} __no_const;
2119
2120 extern struct psci_operations psci_ops;
2121 extern struct smp_operations psci_smp_ops;
2122diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2123index 18f5a55..5072a40 100644
2124--- a/arch/arm/include/asm/smp.h
2125+++ b/arch/arm/include/asm/smp.h
2126@@ -107,7 +107,7 @@ struct smp_operations {
2127 int (*cpu_disable)(unsigned int cpu);
2128 #endif
2129 #endif
2130-};
2131+} __no_const;
2132
2133 struct of_cpu_method {
2134 const char *method;
2135diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2136index ce73ab6..7310f8a 100644
2137--- a/arch/arm/include/asm/thread_info.h
2138+++ b/arch/arm/include/asm/thread_info.h
2139@@ -78,9 +78,9 @@ struct thread_info {
2140 .flags = 0, \
2141 .preempt_count = INIT_PREEMPT_COUNT, \
2142 .addr_limit = KERNEL_DS, \
2143- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2144- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2145- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2146+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2147+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2148+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2149 .restart_block = { \
2150 .fn = do_no_restart_syscall, \
2151 }, \
2152@@ -154,7 +154,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2153 #define TIF_SYSCALL_AUDIT 9
2154 #define TIF_SYSCALL_TRACEPOINT 10
2155 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2156-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2157+/* within 8 bits of TIF_SYSCALL_TRACE
2158+ * to meet flexible second operand requirements
2159+ */
2160+#define TIF_GRSEC_SETXID 12
2161+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2162 #define TIF_USING_IWMMXT 17
2163 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2164 #define TIF_RESTORE_SIGMASK 20
2165@@ -168,10 +172,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2166 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2167 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2168 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2169+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2170
2171 /* Checks for any syscall work in entry-common.S */
2172 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2173- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2174+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2175
2176 /*
2177 * Change these and you break ASM code in entry-common.S
2178diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2179index 5f833f7..76e6644 100644
2180--- a/arch/arm/include/asm/tls.h
2181+++ b/arch/arm/include/asm/tls.h
2182@@ -3,6 +3,7 @@
2183
2184 #include <linux/compiler.h>
2185 #include <asm/thread_info.h>
2186+#include <asm/pgtable.h>
2187
2188 #ifdef __ASSEMBLY__
2189 #include <asm/asm-offsets.h>
2190@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2191 * at 0xffff0fe0 must be used instead. (see
2192 * entry-armv.S for details)
2193 */
2194+ pax_open_kernel();
2195 *((unsigned int *)0xffff0ff0) = val;
2196+ pax_close_kernel();
2197 #endif
2198 }
2199
2200diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2201index 4767eb9..bf00668 100644
2202--- a/arch/arm/include/asm/uaccess.h
2203+++ b/arch/arm/include/asm/uaccess.h
2204@@ -18,6 +18,7 @@
2205 #include <asm/domain.h>
2206 #include <asm/unified.h>
2207 #include <asm/compiler.h>
2208+#include <asm/pgtable.h>
2209
2210 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2211 #include <asm-generic/uaccess-unaligned.h>
2212@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2213 static inline void set_fs(mm_segment_t fs)
2214 {
2215 current_thread_info()->addr_limit = fs;
2216- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2217+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2218 }
2219
2220 #define segment_eq(a,b) ((a) == (b))
2221
2222+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2223+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2224+
2225+static inline void pax_open_userland(void)
2226+{
2227+
2228+#ifdef CONFIG_PAX_MEMORY_UDEREF
2229+ if (segment_eq(get_fs(), USER_DS)) {
2230+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2231+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2232+ }
2233+#endif
2234+
2235+}
2236+
2237+static inline void pax_close_userland(void)
2238+{
2239+
2240+#ifdef CONFIG_PAX_MEMORY_UDEREF
2241+ if (segment_eq(get_fs(), USER_DS)) {
2242+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2243+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2244+ }
2245+#endif
2246+
2247+}
2248+
2249 #define __addr_ok(addr) ({ \
2250 unsigned long flag; \
2251 __asm__("cmp %2, %0; movlo %0, #0" \
2252@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2253
2254 #define get_user(x,p) \
2255 ({ \
2256+ int __e; \
2257 might_fault(); \
2258- __get_user_check(x,p); \
2259+ pax_open_userland(); \
2260+ __e = __get_user_check(x,p); \
2261+ pax_close_userland(); \
2262+ __e; \
2263 })
2264
2265 extern int __put_user_1(void *, unsigned int);
2266@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2267
2268 #define put_user(x,p) \
2269 ({ \
2270+ int __e; \
2271 might_fault(); \
2272- __put_user_check(x,p); \
2273+ pax_open_userland(); \
2274+ __e = __put_user_check(x,p); \
2275+ pax_close_userland(); \
2276+ __e; \
2277 })
2278
2279 #else /* CONFIG_MMU */
2280@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2281
2282 #endif /* CONFIG_MMU */
2283
2284+#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2285 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2286
2287 #define user_addr_max() \
2288@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2289 #define __get_user(x,ptr) \
2290 ({ \
2291 long __gu_err = 0; \
2292+ pax_open_userland(); \
2293 __get_user_err((x),(ptr),__gu_err); \
2294+ pax_close_userland(); \
2295 __gu_err; \
2296 })
2297
2298 #define __get_user_error(x,ptr,err) \
2299 ({ \
2300+ pax_open_userland(); \
2301 __get_user_err((x),(ptr),err); \
2302+ pax_close_userland(); \
2303 (void) 0; \
2304 })
2305
2306@@ -368,13 +409,17 @@ do { \
2307 #define __put_user(x,ptr) \
2308 ({ \
2309 long __pu_err = 0; \
2310+ pax_open_userland(); \
2311 __put_user_err((x),(ptr),__pu_err); \
2312+ pax_close_userland(); \
2313 __pu_err; \
2314 })
2315
2316 #define __put_user_error(x,ptr,err) \
2317 ({ \
2318+ pax_open_userland(); \
2319 __put_user_err((x),(ptr),err); \
2320+ pax_close_userland(); \
2321 (void) 0; \
2322 })
2323
2324@@ -474,11 +519,44 @@ do { \
2325
2326
2327 #ifdef CONFIG_MMU
2328-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2329-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2330+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2331+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2332+
2333+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2334+{
2335+ unsigned long ret;
2336+
2337+ check_object_size(to, n, false);
2338+ pax_open_userland();
2339+ ret = ___copy_from_user(to, from, n);
2340+ pax_close_userland();
2341+ return ret;
2342+}
2343+
2344+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2345+{
2346+ unsigned long ret;
2347+
2348+ check_object_size(from, n, true);
2349+ pax_open_userland();
2350+ ret = ___copy_to_user(to, from, n);
2351+ pax_close_userland();
2352+ return ret;
2353+}
2354+
2355 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2356-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2357+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2358 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2359+
2360+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2361+{
2362+ unsigned long ret;
2363+ pax_open_userland();
2364+ ret = ___clear_user(addr, n);
2365+ pax_close_userland();
2366+ return ret;
2367+}
2368+
2369 #else
2370 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2371 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2372@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2373
2374 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2375 {
2376+ if ((long)n < 0)
2377+ return n;
2378+
2379 if (access_ok(VERIFY_READ, from, n))
2380 n = __copy_from_user(to, from, n);
2381 else /* security hole - plug it */
2382@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2383
2384 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2385 {
2386+ if ((long)n < 0)
2387+ return n;
2388+
2389 if (access_ok(VERIFY_WRITE, to, n))
2390 n = __copy_to_user(to, from, n);
2391 return n;
2392diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2393index 5af0ed1..cea83883 100644
2394--- a/arch/arm/include/uapi/asm/ptrace.h
2395+++ b/arch/arm/include/uapi/asm/ptrace.h
2396@@ -92,7 +92,7 @@
2397 * ARMv7 groups of PSR bits
2398 */
2399 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2400-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2401+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2402 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2403 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2404
2405diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2406index a88671c..1cc895e 100644
2407--- a/arch/arm/kernel/armksyms.c
2408+++ b/arch/arm/kernel/armksyms.c
2409@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2410
2411 /* networking */
2412 EXPORT_SYMBOL(csum_partial);
2413-EXPORT_SYMBOL(csum_partial_copy_from_user);
2414+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2415 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2416 EXPORT_SYMBOL(__csum_ipv6_magic);
2417
2418@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2419 #ifdef CONFIG_MMU
2420 EXPORT_SYMBOL(copy_page);
2421
2422-EXPORT_SYMBOL(__copy_from_user);
2423-EXPORT_SYMBOL(__copy_to_user);
2424-EXPORT_SYMBOL(__clear_user);
2425+EXPORT_SYMBOL(___copy_from_user);
2426+EXPORT_SYMBOL(___copy_to_user);
2427+EXPORT_SYMBOL(___clear_user);
2428
2429 EXPORT_SYMBOL(__get_user_1);
2430 EXPORT_SYMBOL(__get_user_2);
2431diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2432index 2f5555d..d493c91 100644
2433--- a/arch/arm/kernel/entry-armv.S
2434+++ b/arch/arm/kernel/entry-armv.S
2435@@ -47,6 +47,87 @@
2436 9997:
2437 .endm
2438
2439+ .macro pax_enter_kernel
2440+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2441+ @ make aligned space for saved DACR
2442+ sub sp, sp, #8
2443+ @ save regs
2444+ stmdb sp!, {r1, r2}
2445+ @ read DACR from cpu_domain into r1
2446+ mov r2, sp
2447+ @ assume 8K pages, since we have to split the immediate in two
2448+ bic r2, r2, #(0x1fc0)
2449+ bic r2, r2, #(0x3f)
2450+ ldr r1, [r2, #TI_CPU_DOMAIN]
2451+ @ store old DACR on stack
2452+ str r1, [sp, #8]
2453+#ifdef CONFIG_PAX_KERNEXEC
2454+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2455+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2456+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2457+#endif
2458+#ifdef CONFIG_PAX_MEMORY_UDEREF
2459+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2460+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2461+#endif
2462+ @ write r1 to current_thread_info()->cpu_domain
2463+ str r1, [r2, #TI_CPU_DOMAIN]
2464+ @ write r1 to DACR
2465+ mcr p15, 0, r1, c3, c0, 0
2466+ @ instruction sync
2467+ instr_sync
2468+ @ restore regs
2469+ ldmia sp!, {r1, r2}
2470+#endif
2471+ .endm
2472+
2473+ .macro pax_open_userland
2474+#ifdef CONFIG_PAX_MEMORY_UDEREF
2475+ @ save regs
2476+ stmdb sp!, {r0, r1}
2477+ @ read DACR from cpu_domain into r1
2478+ mov r0, sp
2479+ @ assume 8K pages, since we have to split the immediate in two
2480+ bic r0, r0, #(0x1fc0)
2481+ bic r0, r0, #(0x3f)
2482+ ldr r1, [r0, #TI_CPU_DOMAIN]
2483+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2484+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2485+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2486+ @ write r1 to current_thread_info()->cpu_domain
2487+ str r1, [r0, #TI_CPU_DOMAIN]
2488+ @ write r1 to DACR
2489+ mcr p15, 0, r1, c3, c0, 0
2490+ @ instruction sync
2491+ instr_sync
2492+ @ restore regs
2493+ ldmia sp!, {r0, r1}
2494+#endif
2495+ .endm
2496+
2497+ .macro pax_close_userland
2498+#ifdef CONFIG_PAX_MEMORY_UDEREF
2499+ @ save regs
2500+ stmdb sp!, {r0, r1}
2501+ @ read DACR from cpu_domain into r1
2502+ mov r0, sp
2503+ @ assume 8K pages, since we have to split the immediate in two
2504+ bic r0, r0, #(0x1fc0)
2505+ bic r0, r0, #(0x3f)
2506+ ldr r1, [r0, #TI_CPU_DOMAIN]
2507+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2508+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2509+ @ write r1 to current_thread_info()->cpu_domain
2510+ str r1, [r0, #TI_CPU_DOMAIN]
2511+ @ write r1 to DACR
2512+ mcr p15, 0, r1, c3, c0, 0
2513+ @ instruction sync
2514+ instr_sync
2515+ @ restore regs
2516+ ldmia sp!, {r0, r1}
2517+#endif
2518+ .endm
2519+
2520 .macro pabt_helper
2521 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2522 #ifdef MULTI_PABORT
2523@@ -89,11 +170,15 @@
2524 * Invalid mode handlers
2525 */
2526 .macro inv_entry, reason
2527+
2528+ pax_enter_kernel
2529+
2530 sub sp, sp, #S_FRAME_SIZE
2531 ARM( stmib sp, {r1 - lr} )
2532 THUMB( stmia sp, {r0 - r12} )
2533 THUMB( str sp, [sp, #S_SP] )
2534 THUMB( str lr, [sp, #S_LR] )
2535+
2536 mov r1, #\reason
2537 .endm
2538
2539@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2540 .macro svc_entry, stack_hole=0, trace=1
2541 UNWIND(.fnstart )
2542 UNWIND(.save {r0 - pc} )
2543+
2544+ pax_enter_kernel
2545+
2546 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2547+
2548 #ifdef CONFIG_THUMB2_KERNEL
2549 SPFIX( str r0, [sp] ) @ temporarily saved
2550 SPFIX( mov r0, sp )
2551@@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2552 ldmia r0, {r3 - r5}
2553 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2554 mov r6, #-1 @ "" "" "" ""
2555+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2556+ @ offset sp by 8 as done in pax_enter_kernel
2557+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2558+#else
2559 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2560+#endif
2561 SPFIX( addeq r2, r2, #4 )
2562 str r3, [sp, #-4]! @ save the "real" r0 copied
2563 @ from the exception stack
2564@@ -368,6 +462,9 @@ ENDPROC(__fiq_abt)
2565 .macro usr_entry, trace=1
2566 UNWIND(.fnstart )
2567 UNWIND(.cantunwind ) @ don't unwind the user space
2568+
2569+ pax_enter_kernel_user
2570+
2571 sub sp, sp, #S_FRAME_SIZE
2572 ARM( stmib sp, {r1 - r12} )
2573 THUMB( stmia sp, {r0 - r12} )
2574@@ -478,7 +575,9 @@ __und_usr:
2575 tst r3, #PSR_T_BIT @ Thumb mode?
2576 bne __und_usr_thumb
2577 sub r4, r2, #4 @ ARM instr at LR - 4
2578+ pax_open_userland
2579 1: ldrt r0, [r4]
2580+ pax_close_userland
2581 ARM_BE8(rev r0, r0) @ little endian instruction
2582
2583 @ r0 = 32-bit ARM instruction which caused the exception
2584@@ -512,11 +611,15 @@ __und_usr_thumb:
2585 */
2586 .arch armv6t2
2587 #endif
2588+ pax_open_userland
2589 2: ldrht r5, [r4]
2590+ pax_close_userland
2591 ARM_BE8(rev16 r5, r5) @ little endian instruction
2592 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2593 blo __und_usr_fault_16 @ 16bit undefined instruction
2594+ pax_open_userland
2595 3: ldrht r0, [r2]
2596+ pax_close_userland
2597 ARM_BE8(rev16 r0, r0) @ little endian instruction
2598 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2599 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2600@@ -546,7 +649,8 @@ ENDPROC(__und_usr)
2601 */
2602 .pushsection .fixup, "ax"
2603 .align 2
2604-4: str r4, [sp, #S_PC] @ retry current instruction
2605+4: pax_close_userland
2606+ str r4, [sp, #S_PC] @ retry current instruction
2607 ret r9
2608 .popsection
2609 .pushsection __ex_table,"a"
2610@@ -766,7 +870,7 @@ ENTRY(__switch_to)
2611 THUMB( str lr, [ip], #4 )
2612 ldr r4, [r2, #TI_TP_VALUE]
2613 ldr r5, [r2, #TI_TP_VALUE + 4]
2614-#ifdef CONFIG_CPU_USE_DOMAINS
2615+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2616 ldr r6, [r2, #TI_CPU_DOMAIN]
2617 #endif
2618 switch_tls r1, r4, r5, r3, r7
2619@@ -775,7 +879,7 @@ ENTRY(__switch_to)
2620 ldr r8, =__stack_chk_guard
2621 ldr r7, [r7, #TSK_STACK_CANARY]
2622 #endif
2623-#ifdef CONFIG_CPU_USE_DOMAINS
2624+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2625 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2626 #endif
2627 mov r5, r0
2628diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2629index 6bb09d4..113e875 100644
2630--- a/arch/arm/kernel/entry-common.S
2631+++ b/arch/arm/kernel/entry-common.S
2632@@ -11,18 +11,46 @@
2633 #include <asm/assembler.h>
2634 #include <asm/unistd.h>
2635 #include <asm/ftrace.h>
2636+#include <asm/domain.h>
2637 #include <asm/unwind.h>
2638
2639+#include "entry-header.S"
2640+
2641 #ifdef CONFIG_NEED_RET_TO_USER
2642 #include <mach/entry-macro.S>
2643 #else
2644 .macro arch_ret_to_user, tmp1, tmp2
2645+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2646+ @ save regs
2647+ stmdb sp!, {r1, r2}
2648+ @ read DACR from cpu_domain into r1
2649+ mov r2, sp
2650+ @ assume 8K pages, since we have to split the immediate in two
2651+ bic r2, r2, #(0x1fc0)
2652+ bic r2, r2, #(0x3f)
2653+ ldr r1, [r2, #TI_CPU_DOMAIN]
2654+#ifdef CONFIG_PAX_KERNEXEC
2655+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2656+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2657+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2658+#endif
2659+#ifdef CONFIG_PAX_MEMORY_UDEREF
2660+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2661+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2662+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2663+#endif
2664+ @ write r1 to current_thread_info()->cpu_domain
2665+ str r1, [r2, #TI_CPU_DOMAIN]
2666+ @ write r1 to DACR
2667+ mcr p15, 0, r1, c3, c0, 0
2668+ @ instruction sync
2669+ instr_sync
2670+ @ restore regs
2671+ ldmia sp!, {r1, r2}
2672+#endif
2673 .endm
2674 #endif
2675
2676-#include "entry-header.S"
2677-
2678-
2679 .align 5
2680 /*
2681 * This is the fast syscall return path. We do as little as
2682@@ -406,6 +434,12 @@ ENTRY(vector_swi)
2683 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2684 #endif
2685
2686+ /*
2687+ * do this here to avoid a performance hit of wrapping the code above
2688+ * that directly dereferences userland to parse the SWI instruction
2689+ */
2690+ pax_enter_kernel_user
2691+
2692 adr tbl, sys_call_table @ load syscall table pointer
2693
2694 #if defined(CONFIG_OABI_COMPAT)
2695diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2696index 4176df7..a901f8d 100644
2697--- a/arch/arm/kernel/entry-header.S
2698+++ b/arch/arm/kernel/entry-header.S
2699@@ -196,6 +196,60 @@
2700 msr cpsr_c, \rtemp @ switch back to the SVC mode
2701 .endm
2702
2703+ .macro pax_enter_kernel_user
2704+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2705+ @ save regs
2706+ stmdb sp!, {r0, r1}
2707+ @ read DACR from cpu_domain into r1
2708+ mov r0, sp
2709+ @ assume 8K pages, since we have to split the immediate in two
2710+ bic r0, r0, #(0x1fc0)
2711+ bic r0, r0, #(0x3f)
2712+ ldr r1, [r0, #TI_CPU_DOMAIN]
2713+#ifdef CONFIG_PAX_MEMORY_UDEREF
2714+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2715+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2716+#endif
2717+#ifdef CONFIG_PAX_KERNEXEC
2718+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2719+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2720+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2721+#endif
2722+ @ write r1 to current_thread_info()->cpu_domain
2723+ str r1, [r0, #TI_CPU_DOMAIN]
2724+ @ write r1 to DACR
2725+ mcr p15, 0, r1, c3, c0, 0
2726+ @ instruction sync
2727+ instr_sync
2728+ @ restore regs
2729+ ldmia sp!, {r0, r1}
2730+#endif
2731+ .endm
2732+
2733+ .macro pax_exit_kernel
2734+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2735+ @ save regs
2736+ stmdb sp!, {r0, r1}
2737+ @ read old DACR from stack into r1
2738+ ldr r1, [sp, #(8 + S_SP)]
2739+ sub r1, r1, #8
2740+ ldr r1, [r1]
2741+
2742+ @ write r1 to current_thread_info()->cpu_domain
2743+ mov r0, sp
2744+ @ assume 8K pages, since we have to split the immediate in two
2745+ bic r0, r0, #(0x1fc0)
2746+ bic r0, r0, #(0x3f)
2747+ str r1, [r0, #TI_CPU_DOMAIN]
2748+ @ write r1 to DACR
2749+ mcr p15, 0, r1, c3, c0, 0
2750+ @ instruction sync
2751+ instr_sync
2752+ @ restore regs
2753+ ldmia sp!, {r0, r1}
2754+#endif
2755+ .endm
2756+
2757 #ifndef CONFIG_THUMB2_KERNEL
2758 .macro svc_exit, rpsr, irq = 0
2759 .if \irq != 0
2760@@ -215,6 +269,9 @@
2761 blne trace_hardirqs_off
2762 #endif
2763 .endif
2764+
2765+ pax_exit_kernel
2766+
2767 msr spsr_cxsf, \rpsr
2768 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2769 @ We must avoid clrex due to Cortex-A15 erratum #830321
2770@@ -290,6 +347,9 @@
2771 blne trace_hardirqs_off
2772 #endif
2773 .endif
2774+
2775+ pax_exit_kernel
2776+
2777 ldr lr, [sp, #S_SP] @ top of the stack
2778 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2779
2780diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2781index b37752a..ff5cb72 100644
2782--- a/arch/arm/kernel/fiq.c
2783+++ b/arch/arm/kernel/fiq.c
2784@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2785 void *base = vectors_page;
2786 unsigned offset = FIQ_OFFSET;
2787
2788+ pax_open_kernel();
2789 memcpy(base + offset, start, length);
2790+ pax_close_kernel();
2791+
2792 if (!cache_is_vipt_nonaliasing())
2793 flush_icache_range((unsigned long)base + offset, offset +
2794 length);
2795diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2796index 664eee8..f470938 100644
2797--- a/arch/arm/kernel/head.S
2798+++ b/arch/arm/kernel/head.S
2799@@ -437,7 +437,7 @@ __enable_mmu:
2800 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2801 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2802 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2803- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2804+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2805 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2806 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2807 #endif
2808diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2809index 6a4dffe..4a86a70 100644
2810--- a/arch/arm/kernel/module.c
2811+++ b/arch/arm/kernel/module.c
2812@@ -38,12 +38,39 @@
2813 #endif
2814
2815 #ifdef CONFIG_MMU
2816-void *module_alloc(unsigned long size)
2817+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2818 {
2819+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2820+ return NULL;
2821 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2822- GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2823+ GFP_KERNEL, prot, NUMA_NO_NODE,
2824 __builtin_return_address(0));
2825 }
2826+
2827+void *module_alloc(unsigned long size)
2828+{
2829+
2830+#ifdef CONFIG_PAX_KERNEXEC
2831+ return __module_alloc(size, PAGE_KERNEL);
2832+#else
2833+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2834+#endif
2835+
2836+}
2837+
2838+#ifdef CONFIG_PAX_KERNEXEC
2839+void module_free_exec(struct module *mod, void *module_region)
2840+{
2841+ module_free(mod, module_region);
2842+}
2843+EXPORT_SYMBOL(module_free_exec);
2844+
2845+void *module_alloc_exec(unsigned long size)
2846+{
2847+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2848+}
2849+EXPORT_SYMBOL(module_alloc_exec);
2850+#endif
2851 #endif
2852
2853 int
2854diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2855index 07314af..c46655c 100644
2856--- a/arch/arm/kernel/patch.c
2857+++ b/arch/arm/kernel/patch.c
2858@@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2859 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2860 int size;
2861
2862+ pax_open_kernel();
2863 if (thumb2 && __opcode_is_thumb16(insn)) {
2864 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2865 size = sizeof(u16);
2866@@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2867 *(u32 *)addr = insn;
2868 size = sizeof(u32);
2869 }
2870+ pax_close_kernel();
2871
2872 flush_icache_range((uintptr_t)(addr),
2873 (uintptr_t)(addr) + size);
2874diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2875index fe972a2..a772d83 100644
2876--- a/arch/arm/kernel/process.c
2877+++ b/arch/arm/kernel/process.c
2878@@ -207,6 +207,7 @@ void machine_power_off(void)
2879
2880 if (pm_power_off)
2881 pm_power_off();
2882+ BUG();
2883 }
2884
2885 /*
2886@@ -220,7 +221,7 @@ void machine_power_off(void)
2887 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2888 * to use. Implementing such co-ordination would be essentially impossible.
2889 */
2890-void machine_restart(char *cmd)
2891+__noreturn void machine_restart(char *cmd)
2892 {
2893 local_irq_disable();
2894 smp_send_stop();
2895@@ -246,8 +247,8 @@ void __show_regs(struct pt_regs *regs)
2896
2897 show_regs_print_info(KERN_DEFAULT);
2898
2899- print_symbol("PC is at %s\n", instruction_pointer(regs));
2900- print_symbol("LR is at %s\n", regs->ARM_lr);
2901+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2902+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2903 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2904 "sp : %08lx ip : %08lx fp : %08lx\n",
2905 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2906@@ -424,12 +425,6 @@ unsigned long get_wchan(struct task_struct *p)
2907 return 0;
2908 }
2909
2910-unsigned long arch_randomize_brk(struct mm_struct *mm)
2911-{
2912- unsigned long range_end = mm->brk + 0x02000000;
2913- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2914-}
2915-
2916 #ifdef CONFIG_MMU
2917 #ifdef CONFIG_KUSER_HELPERS
2918 /*
2919@@ -445,7 +440,7 @@ static struct vm_area_struct gate_vma = {
2920
2921 static int __init gate_vma_init(void)
2922 {
2923- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2924+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2925 return 0;
2926 }
2927 arch_initcall(gate_vma_init);
2928@@ -474,81 +469,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2929 return is_gate_vma(vma) ? "[vectors]" : NULL;
2930 }
2931
2932-/* If possible, provide a placement hint at a random offset from the
2933- * stack for the signal page.
2934- */
2935-static unsigned long sigpage_addr(const struct mm_struct *mm,
2936- unsigned int npages)
2937-{
2938- unsigned long offset;
2939- unsigned long first;
2940- unsigned long last;
2941- unsigned long addr;
2942- unsigned int slots;
2943-
2944- first = PAGE_ALIGN(mm->start_stack);
2945-
2946- last = TASK_SIZE - (npages << PAGE_SHIFT);
2947-
2948- /* No room after stack? */
2949- if (first > last)
2950- return 0;
2951-
2952- /* Just enough room? */
2953- if (first == last)
2954- return first;
2955-
2956- slots = ((last - first) >> PAGE_SHIFT) + 1;
2957-
2958- offset = get_random_int() % slots;
2959-
2960- addr = first + (offset << PAGE_SHIFT);
2961-
2962- return addr;
2963-}
2964-
2965-static struct page *signal_page;
2966-extern struct page *get_signal_page(void);
2967-
2968-static const struct vm_special_mapping sigpage_mapping = {
2969- .name = "[sigpage]",
2970- .pages = &signal_page,
2971-};
2972-
2973 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2974 {
2975 struct mm_struct *mm = current->mm;
2976- struct vm_area_struct *vma;
2977- unsigned long addr;
2978- unsigned long hint;
2979- int ret = 0;
2980-
2981- if (!signal_page)
2982- signal_page = get_signal_page();
2983- if (!signal_page)
2984- return -ENOMEM;
2985
2986 down_write(&mm->mmap_sem);
2987- hint = sigpage_addr(mm, 1);
2988- addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2989- if (IS_ERR_VALUE(addr)) {
2990- ret = addr;
2991- goto up_fail;
2992- }
2993-
2994- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2995- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2996- &sigpage_mapping);
2997-
2998- if (IS_ERR(vma)) {
2999- ret = PTR_ERR(vma);
3000- goto up_fail;
3001- }
3002-
3003- mm->context.sigpage = addr;
3004-
3005- up_fail:
3006+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
3007 up_write(&mm->mmap_sem);
3008- return ret;
3009+ return 0;
3010 }
3011 #endif
3012diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3013index f73891b..cf3004e 100644
3014--- a/arch/arm/kernel/psci.c
3015+++ b/arch/arm/kernel/psci.c
3016@@ -28,7 +28,7 @@
3017 #include <asm/psci.h>
3018 #include <asm/system_misc.h>
3019
3020-struct psci_operations psci_ops;
3021+struct psci_operations psci_ops __read_only;
3022
3023 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3024 typedef int (*psci_initcall_t)(const struct device_node *);
3025diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3026index ef9119f..31995a3 100644
3027--- a/arch/arm/kernel/ptrace.c
3028+++ b/arch/arm/kernel/ptrace.c
3029@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3030 regs->ARM_ip = ip;
3031 }
3032
3033+#ifdef CONFIG_GRKERNSEC_SETXID
3034+extern void gr_delayed_cred_worker(void);
3035+#endif
3036+
3037 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3038 {
3039 current_thread_info()->syscall = scno;
3040
3041+#ifdef CONFIG_GRKERNSEC_SETXID
3042+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3043+ gr_delayed_cred_worker();
3044+#endif
3045+
3046 /* Do the secure computing check first; failures should be fast. */
3047 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3048 if (secure_computing() == -1)
3049diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3050index 306e1ac..1b477ed 100644
3051--- a/arch/arm/kernel/setup.c
3052+++ b/arch/arm/kernel/setup.c
3053@@ -104,21 +104,23 @@ EXPORT_SYMBOL(elf_hwcap);
3054 unsigned int elf_hwcap2 __read_mostly;
3055 EXPORT_SYMBOL(elf_hwcap2);
3056
3057+pteval_t __supported_pte_mask __read_only;
3058+pmdval_t __supported_pmd_mask __read_only;
3059
3060 #ifdef MULTI_CPU
3061-struct processor processor __read_mostly;
3062+struct processor processor __read_only;
3063 #endif
3064 #ifdef MULTI_TLB
3065-struct cpu_tlb_fns cpu_tlb __read_mostly;
3066+struct cpu_tlb_fns cpu_tlb __read_only;
3067 #endif
3068 #ifdef MULTI_USER
3069-struct cpu_user_fns cpu_user __read_mostly;
3070+struct cpu_user_fns cpu_user __read_only;
3071 #endif
3072 #ifdef MULTI_CACHE
3073-struct cpu_cache_fns cpu_cache __read_mostly;
3074+struct cpu_cache_fns cpu_cache __read_only;
3075 #endif
3076 #ifdef CONFIG_OUTER_CACHE
3077-struct outer_cache_fns outer_cache __read_mostly;
3078+struct outer_cache_fns outer_cache __read_only;
3079 EXPORT_SYMBOL(outer_cache);
3080 #endif
3081
3082@@ -252,9 +254,13 @@ static int __get_cpu_architecture(void)
3083 asm("mrc p15, 0, %0, c0, c1, 4"
3084 : "=r" (mmfr0));
3085 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3086- (mmfr0 & 0x000000f0) >= 0x00000030)
3087+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3088 cpu_arch = CPU_ARCH_ARMv7;
3089- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3090+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3091+ __supported_pte_mask |= L_PTE_PXN;
3092+ __supported_pmd_mask |= PMD_PXNTABLE;
3093+ }
3094+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3095 (mmfr0 & 0x000000f0) == 0x00000020)
3096 cpu_arch = CPU_ARCH_ARMv6;
3097 else
3098diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3099index bd19834..e4d8c66 100644
3100--- a/arch/arm/kernel/signal.c
3101+++ b/arch/arm/kernel/signal.c
3102@@ -24,8 +24,6 @@
3103
3104 extern const unsigned long sigreturn_codes[7];
3105
3106-static unsigned long signal_return_offset;
3107-
3108 #ifdef CONFIG_CRUNCH
3109 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3110 {
3111@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3112 * except when the MPU has protected the vectors
3113 * page from PL0
3114 */
3115- retcode = mm->context.sigpage + signal_return_offset +
3116- (idx << 2) + thumb;
3117+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3118 } else
3119 #endif
3120 {
3121@@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3122 } while (thread_flags & _TIF_WORK_MASK);
3123 return 0;
3124 }
3125-
3126-struct page *get_signal_page(void)
3127-{
3128- unsigned long ptr;
3129- unsigned offset;
3130- struct page *page;
3131- void *addr;
3132-
3133- page = alloc_pages(GFP_KERNEL, 0);
3134-
3135- if (!page)
3136- return NULL;
3137-
3138- addr = page_address(page);
3139-
3140- /* Give the signal return code some randomness */
3141- offset = 0x200 + (get_random_int() & 0x7fc);
3142- signal_return_offset = offset;
3143-
3144- /*
3145- * Copy signal return handlers into the vector page, and
3146- * set sigreturn to be a pointer to these.
3147- */
3148- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3149-
3150- ptr = (unsigned long)addr + offset;
3151- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3152-
3153- return page;
3154-}
3155diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3156index a8e32aa..b2f7198 100644
3157--- a/arch/arm/kernel/smp.c
3158+++ b/arch/arm/kernel/smp.c
3159@@ -76,7 +76,7 @@ enum ipi_msg_type {
3160
3161 static DECLARE_COMPLETION(cpu_running);
3162
3163-static struct smp_operations smp_ops;
3164+static struct smp_operations smp_ops __read_only;
3165
3166 void __init smp_set_ops(struct smp_operations *ops)
3167 {
3168diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3169index 7a3be1d..b00c7de 100644
3170--- a/arch/arm/kernel/tcm.c
3171+++ b/arch/arm/kernel/tcm.c
3172@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3173 .virtual = ITCM_OFFSET,
3174 .pfn = __phys_to_pfn(ITCM_OFFSET),
3175 .length = 0,
3176- .type = MT_MEMORY_RWX_ITCM,
3177+ .type = MT_MEMORY_RX_ITCM,
3178 }
3179 };
3180
3181@@ -267,7 +267,9 @@ no_dtcm:
3182 start = &__sitcm_text;
3183 end = &__eitcm_text;
3184 ram = &__itcm_start;
3185+ pax_open_kernel();
3186 memcpy(start, ram, itcm_code_sz);
3187+ pax_close_kernel();
3188 pr_debug("CPU ITCM: copied code from %p - %p\n",
3189 start, end);
3190 itcm_present = true;
3191diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3192index 9f5d818..e013427 100644
3193--- a/arch/arm/kernel/traps.c
3194+++ b/arch/arm/kernel/traps.c
3195@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3196 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3197 {
3198 #ifdef CONFIG_KALLSYMS
3199- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3200+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3201 #else
3202 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3203 #endif
3204@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3205 static int die_owner = -1;
3206 static unsigned int die_nest_count;
3207
3208+extern void gr_handle_kernel_exploit(void);
3209+
3210 static unsigned long oops_begin(void)
3211 {
3212 int cpu;
3213@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3214 panic("Fatal exception in interrupt");
3215 if (panic_on_oops)
3216 panic("Fatal exception");
3217+
3218+ gr_handle_kernel_exploit();
3219+
3220 if (signr)
3221 do_exit(signr);
3222 }
3223@@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3224 kuser_init(vectors_base);
3225
3226 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3227- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3228+
3229+#ifndef CONFIG_PAX_MEMORY_UDEREF
3230+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3231+#endif
3232+
3233 #else /* ifndef CONFIG_CPU_V7M */
3234 /*
3235 * on V7-M there is no need to copy the vector table to a dedicated
3236diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3237index 8e95aa4..595dfc8 100644
3238--- a/arch/arm/kernel/vmlinux.lds.S
3239+++ b/arch/arm/kernel/vmlinux.lds.S
3240@@ -8,7 +8,11 @@
3241 #include <asm/thread_info.h>
3242 #include <asm/memory.h>
3243 #include <asm/page.h>
3244-
3245+
3246+#ifdef CONFIG_PAX_KERNEXEC
3247+#include <asm/pgtable.h>
3248+#endif
3249+
3250 #define PROC_INFO \
3251 . = ALIGN(4); \
3252 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3253@@ -34,7 +38,7 @@
3254 #endif
3255
3256 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3257- defined(CONFIG_GENERIC_BUG)
3258+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3259 #define ARM_EXIT_KEEP(x) x
3260 #define ARM_EXIT_DISCARD(x)
3261 #else
3262@@ -90,6 +94,11 @@ SECTIONS
3263 _text = .;
3264 HEAD_TEXT
3265 }
3266+
3267+#ifdef CONFIG_PAX_KERNEXEC
3268+ . = ALIGN(1<<SECTION_SHIFT);
3269+#endif
3270+
3271 .text : { /* Real text segment */
3272 _stext = .; /* Text and read-only data */
3273 __exception_text_start = .;
3274@@ -112,6 +121,8 @@ SECTIONS
3275 ARM_CPU_KEEP(PROC_INFO)
3276 }
3277
3278+ _etext = .; /* End of text section */
3279+
3280 RO_DATA(PAGE_SIZE)
3281
3282 . = ALIGN(4);
3283@@ -142,7 +153,9 @@ SECTIONS
3284
3285 NOTES
3286
3287- _etext = .; /* End of text and rodata section */
3288+#ifdef CONFIG_PAX_KERNEXEC
3289+ . = ALIGN(1<<SECTION_SHIFT);
3290+#endif
3291
3292 #ifndef CONFIG_XIP_KERNEL
3293 . = ALIGN(PAGE_SIZE);
3294@@ -221,6 +234,11 @@ SECTIONS
3295 #else
3296 . = ALIGN(THREAD_SIZE);
3297 __init_end = .;
3298+
3299+#ifdef CONFIG_PAX_KERNEXEC
3300+ . = ALIGN(1<<SECTION_SHIFT);
3301+#endif
3302+
3303 __data_loc = .;
3304 #endif
3305
3306diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3307index 9e193c8..3560fe6 100644
3308--- a/arch/arm/kvm/arm.c
3309+++ b/arch/arm/kvm/arm.c
3310@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3311 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3312
3313 /* The VMID used in the VTTBR */
3314-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3315+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3316 static u8 kvm_next_vmid;
3317 static DEFINE_SPINLOCK(kvm_vmid_lock);
3318
3319@@ -354,7 +354,7 @@ void force_vm_exit(const cpumask_t *mask)
3320 */
3321 static bool need_new_vmid_gen(struct kvm *kvm)
3322 {
3323- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3324+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3325 }
3326
3327 /**
3328@@ -387,7 +387,7 @@ static void update_vttbr(struct kvm *kvm)
3329
3330 /* First user of a new VMID generation? */
3331 if (unlikely(kvm_next_vmid == 0)) {
3332- atomic64_inc(&kvm_vmid_gen);
3333+ atomic64_inc_unchecked(&kvm_vmid_gen);
3334 kvm_next_vmid = 1;
3335
3336 /*
3337@@ -404,7 +404,7 @@ static void update_vttbr(struct kvm *kvm)
3338 kvm_call_hyp(__kvm_flush_vm_context);
3339 }
3340
3341- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3342+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3343 kvm->arch.vmid = kvm_next_vmid;
3344 kvm_next_vmid++;
3345
3346@@ -980,7 +980,7 @@ static void check_kvm_target_cpu(void *ret)
3347 /**
3348 * Initialize Hyp-mode and memory mappings on all CPUs.
3349 */
3350-int kvm_arch_init(void *opaque)
3351+int kvm_arch_init(const void *opaque)
3352 {
3353 int err;
3354 int ret, cpu;
3355diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3356index 14a0d98..7771a7d 100644
3357--- a/arch/arm/lib/clear_user.S
3358+++ b/arch/arm/lib/clear_user.S
3359@@ -12,14 +12,14 @@
3360
3361 .text
3362
3363-/* Prototype: int __clear_user(void *addr, size_t sz)
3364+/* Prototype: int ___clear_user(void *addr, size_t sz)
3365 * Purpose : clear some user memory
3366 * Params : addr - user memory address to clear
3367 * : sz - number of bytes to clear
3368 * Returns : number of bytes NOT cleared
3369 */
3370 ENTRY(__clear_user_std)
3371-WEAK(__clear_user)
3372+WEAK(___clear_user)
3373 stmfd sp!, {r1, lr}
3374 mov r2, #0
3375 cmp r1, #4
3376@@ -44,7 +44,7 @@ WEAK(__clear_user)
3377 USER( strnebt r2, [r0])
3378 mov r0, #0
3379 ldmfd sp!, {r1, pc}
3380-ENDPROC(__clear_user)
3381+ENDPROC(___clear_user)
3382 ENDPROC(__clear_user_std)
3383
3384 .pushsection .fixup,"ax"
3385diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3386index 66a477a..bee61d3 100644
3387--- a/arch/arm/lib/copy_from_user.S
3388+++ b/arch/arm/lib/copy_from_user.S
3389@@ -16,7 +16,7 @@
3390 /*
3391 * Prototype:
3392 *
3393- * size_t __copy_from_user(void *to, const void *from, size_t n)
3394+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3395 *
3396 * Purpose:
3397 *
3398@@ -84,11 +84,11 @@
3399
3400 .text
3401
3402-ENTRY(__copy_from_user)
3403+ENTRY(___copy_from_user)
3404
3405 #include "copy_template.S"
3406
3407-ENDPROC(__copy_from_user)
3408+ENDPROC(___copy_from_user)
3409
3410 .pushsection .fixup,"ax"
3411 .align 0
3412diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3413index 6ee2f67..d1cce76 100644
3414--- a/arch/arm/lib/copy_page.S
3415+++ b/arch/arm/lib/copy_page.S
3416@@ -10,6 +10,7 @@
3417 * ASM optimised string functions
3418 */
3419 #include <linux/linkage.h>
3420+#include <linux/const.h>
3421 #include <asm/assembler.h>
3422 #include <asm/asm-offsets.h>
3423 #include <asm/cache.h>
3424diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3425index d066df6..df28194 100644
3426--- a/arch/arm/lib/copy_to_user.S
3427+++ b/arch/arm/lib/copy_to_user.S
3428@@ -16,7 +16,7 @@
3429 /*
3430 * Prototype:
3431 *
3432- * size_t __copy_to_user(void *to, const void *from, size_t n)
3433+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3434 *
3435 * Purpose:
3436 *
3437@@ -88,11 +88,11 @@
3438 .text
3439
3440 ENTRY(__copy_to_user_std)
3441-WEAK(__copy_to_user)
3442+WEAK(___copy_to_user)
3443
3444 #include "copy_template.S"
3445
3446-ENDPROC(__copy_to_user)
3447+ENDPROC(___copy_to_user)
3448 ENDPROC(__copy_to_user_std)
3449
3450 .pushsection .fixup,"ax"
3451diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3452index 7d08b43..f7ca7ea 100644
3453--- a/arch/arm/lib/csumpartialcopyuser.S
3454+++ b/arch/arm/lib/csumpartialcopyuser.S
3455@@ -57,8 +57,8 @@
3456 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3457 */
3458
3459-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3460-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3461+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3462+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3463
3464 #include "csumpartialcopygeneric.S"
3465
3466diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3467index 312d43e..21d2322 100644
3468--- a/arch/arm/lib/delay.c
3469+++ b/arch/arm/lib/delay.c
3470@@ -29,7 +29,7 @@
3471 /*
3472 * Default to the loop-based delay implementation.
3473 */
3474-struct arm_delay_ops arm_delay_ops = {
3475+struct arm_delay_ops arm_delay_ops __read_only = {
3476 .delay = __loop_delay,
3477 .const_udelay = __loop_const_udelay,
3478 .udelay = __loop_udelay,
3479diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3480index 3e58d71..029817c 100644
3481--- a/arch/arm/lib/uaccess_with_memcpy.c
3482+++ b/arch/arm/lib/uaccess_with_memcpy.c
3483@@ -136,7 +136,7 @@ out:
3484 }
3485
3486 unsigned long
3487-__copy_to_user(void __user *to, const void *from, unsigned long n)
3488+___copy_to_user(void __user *to, const void *from, unsigned long n)
3489 {
3490 /*
3491 * This test is stubbed out of the main function above to keep
3492@@ -190,7 +190,7 @@ out:
3493 return n;
3494 }
3495
3496-unsigned long __clear_user(void __user *addr, unsigned long n)
3497+unsigned long ___clear_user(void __user *addr, unsigned long n)
3498 {
3499 /* See rational for this in __copy_to_user() above. */
3500 if (n < 64)
3501diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3502index 9610792..4dfb851 100644
3503--- a/arch/arm/mach-at91/setup.c
3504+++ b/arch/arm/mach-at91/setup.c
3505@@ -83,7 +83,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3506
3507 desc->pfn = __phys_to_pfn(base);
3508 desc->length = length;
3509- desc->type = MT_MEMORY_RWX_NONCACHED;
3510+ desc->type = MT_MEMORY_RW_NONCACHED;
3511
3512 pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3513 base, length, desc->virtual);
3514diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3515index 7f352de..6dc0929 100644
3516--- a/arch/arm/mach-keystone/keystone.c
3517+++ b/arch/arm/mach-keystone/keystone.c
3518@@ -27,7 +27,7 @@
3519
3520 #include "keystone.h"
3521
3522-static struct notifier_block platform_nb;
3523+static notifier_block_no_const platform_nb;
3524 static unsigned long keystone_dma_pfn_offset __read_mostly;
3525
3526 static int keystone_platform_notifier(struct notifier_block *nb,
3527diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3528index 1163a3e..424adbf 100644
3529--- a/arch/arm/mach-mvebu/coherency.c
3530+++ b/arch/arm/mach-mvebu/coherency.c
3531@@ -316,7 +316,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3532
3533 /*
3534 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3535- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3536+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3537 * is needed as a workaround for a deadlock issue between the PCIe
3538 * interface and the cache controller.
3539 */
3540@@ -329,7 +329,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3541 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3542
3543 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3544- mtype = MT_UNCACHED;
3545+ mtype = MT_UNCACHED_RW;
3546
3547 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3548 }
3549diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3550index 97767a2..9233746 100644
3551--- a/arch/arm/mach-omap2/board-n8x0.c
3552+++ b/arch/arm/mach-omap2/board-n8x0.c
3553@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3554 }
3555 #endif
3556
3557-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3558+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3559 .late_init = n8x0_menelaus_late_init,
3560 };
3561
3562diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3563index 5fa3755..1e8c247 100644
3564--- a/arch/arm/mach-omap2/gpmc.c
3565+++ b/arch/arm/mach-omap2/gpmc.c
3566@@ -151,7 +151,6 @@ struct omap3_gpmc_regs {
3567 };
3568
3569 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3570-static struct irq_chip gpmc_irq_chip;
3571 static int gpmc_irq_start;
3572
3573 static struct resource gpmc_mem_root;
3574@@ -736,6 +735,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3575
3576 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3577
3578+static struct irq_chip gpmc_irq_chip = {
3579+ .name = "gpmc",
3580+ .irq_startup = gpmc_irq_noop_ret,
3581+ .irq_enable = gpmc_irq_enable,
3582+ .irq_disable = gpmc_irq_disable,
3583+ .irq_shutdown = gpmc_irq_noop,
3584+ .irq_ack = gpmc_irq_noop,
3585+ .irq_mask = gpmc_irq_noop,
3586+ .irq_unmask = gpmc_irq_noop,
3587+
3588+};
3589+
3590 static int gpmc_setup_irq(void)
3591 {
3592 int i;
3593@@ -750,15 +761,6 @@ static int gpmc_setup_irq(void)
3594 return gpmc_irq_start;
3595 }
3596
3597- gpmc_irq_chip.name = "gpmc";
3598- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3599- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3600- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3601- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3602- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3603- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3604- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3605-
3606 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3607 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3608
3609diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3610index 6944ae3..bc587ca 100644
3611--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3612+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3613@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3614 void (*resume)(void);
3615 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3616 void (*hotplug_restart)(void);
3617-};
3618+} __no_const;
3619
3620 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3621 static struct powerdomain *mpuss_pd;
3622@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3623 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3624 {}
3625
3626-struct cpu_pm_ops omap_pm_ops = {
3627+static struct cpu_pm_ops omap_pm_ops __read_only = {
3628 .finish_suspend = default_finish_suspend,
3629 .resume = dummy_cpu_resume,
3630 .scu_prepare = dummy_scu_prepare,
3631diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3632index f961c46..4a453dc 100644
3633--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3634+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3635@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3636 return NOTIFY_OK;
3637 }
3638
3639-static struct notifier_block __refdata irq_hotplug_notifier = {
3640+static struct notifier_block irq_hotplug_notifier = {
3641 .notifier_call = irq_cpu_hotplug_notify,
3642 };
3643
3644diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3645index 8c58b71..95b655f 100644
3646--- a/arch/arm/mach-omap2/omap_device.c
3647+++ b/arch/arm/mach-omap2/omap_device.c
3648@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3649 struct platform_device __init *omap_device_build(const char *pdev_name,
3650 int pdev_id,
3651 struct omap_hwmod *oh,
3652- void *pdata, int pdata_len)
3653+ const void *pdata, int pdata_len)
3654 {
3655 struct omap_hwmod *ohs[] = { oh };
3656
3657@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3658 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3659 int pdev_id,
3660 struct omap_hwmod **ohs,
3661- int oh_cnt, void *pdata,
3662+ int oh_cnt, const void *pdata,
3663 int pdata_len)
3664 {
3665 int ret = -ENOMEM;
3666diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3667index 78c02b3..c94109a 100644
3668--- a/arch/arm/mach-omap2/omap_device.h
3669+++ b/arch/arm/mach-omap2/omap_device.h
3670@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3671 /* Core code interface */
3672
3673 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3674- struct omap_hwmod *oh, void *pdata,
3675+ struct omap_hwmod *oh, const void *pdata,
3676 int pdata_len);
3677
3678 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3679 struct omap_hwmod **oh, int oh_cnt,
3680- void *pdata, int pdata_len);
3681+ const void *pdata, int pdata_len);
3682
3683 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3684 struct omap_hwmod **ohs, int oh_cnt);
3685diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3686index 716247e..8df346d 100644
3687--- a/arch/arm/mach-omap2/omap_hwmod.c
3688+++ b/arch/arm/mach-omap2/omap_hwmod.c
3689@@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3690 int (*init_clkdm)(struct omap_hwmod *oh);
3691 void (*update_context_lost)(struct omap_hwmod *oh);
3692 int (*get_context_lost)(struct omap_hwmod *oh);
3693-};
3694+} __no_const;
3695
3696 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3697-static struct omap_hwmod_soc_ops soc_ops;
3698+static struct omap_hwmod_soc_ops soc_ops __read_only;
3699
3700 /* omap_hwmod_list contains all registered struct omap_hwmods */
3701 static LIST_HEAD(omap_hwmod_list);
3702diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3703index 95fee54..cfa9cf1 100644
3704--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3705+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3706@@ -10,6 +10,7 @@
3707
3708 #include <linux/kernel.h>
3709 #include <linux/init.h>
3710+#include <asm/pgtable.h>
3711
3712 #include "powerdomain.h"
3713
3714@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3715
3716 void __init am43xx_powerdomains_init(void)
3717 {
3718- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3719+ pax_open_kernel();
3720+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3721+ pax_close_kernel();
3722 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3723 pwrdm_register_pwrdms(powerdomains_am43xx);
3724 pwrdm_complete_init();
3725diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3726index ff0a68c..b312aa0 100644
3727--- a/arch/arm/mach-omap2/wd_timer.c
3728+++ b/arch/arm/mach-omap2/wd_timer.c
3729@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3730 struct omap_hwmod *oh;
3731 char *oh_name = "wd_timer2";
3732 char *dev_name = "omap_wdt";
3733- struct omap_wd_timer_platform_data pdata;
3734+ static struct omap_wd_timer_platform_data pdata = {
3735+ .read_reset_sources = prm_read_reset_sources
3736+ };
3737
3738 if (!cpu_class_is_omap2() || of_have_populated_dt())
3739 return 0;
3740@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3741 return -EINVAL;
3742 }
3743
3744- pdata.read_reset_sources = prm_read_reset_sources;
3745-
3746 pdev = omap_device_build(dev_name, id, oh, &pdata,
3747 sizeof(struct omap_wd_timer_platform_data));
3748 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3749diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3750index b30bf5c..d0825bf 100644
3751--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3752+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3753@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3754 bool entered_lp2 = false;
3755
3756 if (tegra_pending_sgi())
3757- ACCESS_ONCE(abort_flag) = true;
3758+ ACCESS_ONCE_RW(abort_flag) = true;
3759
3760 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3761
3762diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3763index 2dea8b5..6499da2 100644
3764--- a/arch/arm/mach-ux500/setup.h
3765+++ b/arch/arm/mach-ux500/setup.h
3766@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3767 .type = MT_DEVICE, \
3768 }
3769
3770-#define __MEM_DEV_DESC(x, sz) { \
3771- .virtual = IO_ADDRESS(x), \
3772- .pfn = __phys_to_pfn(x), \
3773- .length = sz, \
3774- .type = MT_MEMORY_RWX, \
3775-}
3776-
3777 extern struct smp_operations ux500_smp_ops;
3778 extern void ux500_cpu_die(unsigned int cpu);
3779
3780diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3781index 7eb94e6..799ad3e 100644
3782--- a/arch/arm/mm/Kconfig
3783+++ b/arch/arm/mm/Kconfig
3784@@ -446,6 +446,7 @@ config CPU_32v5
3785
3786 config CPU_32v6
3787 bool
3788+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3789 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3790
3791 config CPU_32v6K
3792@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3793
3794 config CPU_USE_DOMAINS
3795 bool
3796+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3797 help
3798 This option enables or disables the use of domain switching
3799 via the set_fs() function.
3800@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3801
3802 config KUSER_HELPERS
3803 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3804- depends on MMU
3805+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3806 default y
3807 help
3808 Warning: disabling this option may break user programs.
3809@@ -812,7 +814,7 @@ config KUSER_HELPERS
3810 See Documentation/arm/kernel_user_helpers.txt for details.
3811
3812 However, the fixed address nature of these helpers can be used
3813- by ROP (return orientated programming) authors when creating
3814+ by ROP (Return Oriented Programming) authors when creating
3815 exploits.
3816
3817 If all of the binaries and libraries which run on your platform
3818diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3819index 83792f4..c25d36b 100644
3820--- a/arch/arm/mm/alignment.c
3821+++ b/arch/arm/mm/alignment.c
3822@@ -216,10 +216,12 @@ union offset_union {
3823 #define __get16_unaligned_check(ins,val,addr) \
3824 do { \
3825 unsigned int err = 0, v, a = addr; \
3826+ pax_open_userland(); \
3827 __get8_unaligned_check(ins,v,a,err); \
3828 val = v << ((BE) ? 8 : 0); \
3829 __get8_unaligned_check(ins,v,a,err); \
3830 val |= v << ((BE) ? 0 : 8); \
3831+ pax_close_userland(); \
3832 if (err) \
3833 goto fault; \
3834 } while (0)
3835@@ -233,6 +235,7 @@ union offset_union {
3836 #define __get32_unaligned_check(ins,val,addr) \
3837 do { \
3838 unsigned int err = 0, v, a = addr; \
3839+ pax_open_userland(); \
3840 __get8_unaligned_check(ins,v,a,err); \
3841 val = v << ((BE) ? 24 : 0); \
3842 __get8_unaligned_check(ins,v,a,err); \
3843@@ -241,6 +244,7 @@ union offset_union {
3844 val |= v << ((BE) ? 8 : 16); \
3845 __get8_unaligned_check(ins,v,a,err); \
3846 val |= v << ((BE) ? 0 : 24); \
3847+ pax_close_userland(); \
3848 if (err) \
3849 goto fault; \
3850 } while (0)
3851@@ -254,6 +258,7 @@ union offset_union {
3852 #define __put16_unaligned_check(ins,val,addr) \
3853 do { \
3854 unsigned int err = 0, v = val, a = addr; \
3855+ pax_open_userland(); \
3856 __asm__( FIRST_BYTE_16 \
3857 ARM( "1: "ins" %1, [%2], #1\n" ) \
3858 THUMB( "1: "ins" %1, [%2]\n" ) \
3859@@ -273,6 +278,7 @@ union offset_union {
3860 " .popsection\n" \
3861 : "=r" (err), "=&r" (v), "=&r" (a) \
3862 : "0" (err), "1" (v), "2" (a)); \
3863+ pax_close_userland(); \
3864 if (err) \
3865 goto fault; \
3866 } while (0)
3867@@ -286,6 +292,7 @@ union offset_union {
3868 #define __put32_unaligned_check(ins,val,addr) \
3869 do { \
3870 unsigned int err = 0, v = val, a = addr; \
3871+ pax_open_userland(); \
3872 __asm__( FIRST_BYTE_32 \
3873 ARM( "1: "ins" %1, [%2], #1\n" ) \
3874 THUMB( "1: "ins" %1, [%2]\n" ) \
3875@@ -315,6 +322,7 @@ union offset_union {
3876 " .popsection\n" \
3877 : "=r" (err), "=&r" (v), "=&r" (a) \
3878 : "0" (err), "1" (v), "2" (a)); \
3879+ pax_close_userland(); \
3880 if (err) \
3881 goto fault; \
3882 } while (0)
3883diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3884index 5e65ca8..879e7b3 100644
3885--- a/arch/arm/mm/cache-l2x0.c
3886+++ b/arch/arm/mm/cache-l2x0.c
3887@@ -42,7 +42,7 @@ struct l2c_init_data {
3888 void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
3889 void (*save)(void __iomem *);
3890 struct outer_cache_fns outer_cache;
3891-};
3892+} __do_const;
3893
3894 #define CACHE_LINE_SIZE 32
3895
3896diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3897index 6eb97b3..ac509f6 100644
3898--- a/arch/arm/mm/context.c
3899+++ b/arch/arm/mm/context.c
3900@@ -43,7 +43,7 @@
3901 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3902
3903 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3904-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3905+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3906 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3907
3908 static DEFINE_PER_CPU(atomic64_t, active_asids);
3909@@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3910 {
3911 static u32 cur_idx = 1;
3912 u64 asid = atomic64_read(&mm->context.id);
3913- u64 generation = atomic64_read(&asid_generation);
3914+ u64 generation = atomic64_read_unchecked(&asid_generation);
3915
3916 if (asid != 0 && is_reserved_asid(asid)) {
3917 /*
3918@@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3919 */
3920 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3921 if (asid == NUM_USER_ASIDS) {
3922- generation = atomic64_add_return(ASID_FIRST_VERSION,
3923+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3924 &asid_generation);
3925 flush_context(cpu);
3926 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3927@@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3928 cpu_set_reserved_ttbr0();
3929
3930 asid = atomic64_read(&mm->context.id);
3931- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3932+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3933 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3934 goto switch_mm_fastpath;
3935
3936 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3937 /* Check that our ASID belongs to the current generation. */
3938 asid = atomic64_read(&mm->context.id);
3939- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3940+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3941 asid = new_context(mm, cpu);
3942 atomic64_set(&mm->context.id, asid);
3943 }
3944diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3945index eb8830a..e8ff52e 100644
3946--- a/arch/arm/mm/fault.c
3947+++ b/arch/arm/mm/fault.c
3948@@ -25,6 +25,7 @@
3949 #include <asm/system_misc.h>
3950 #include <asm/system_info.h>
3951 #include <asm/tlbflush.h>
3952+#include <asm/sections.h>
3953
3954 #include "fault.h"
3955
3956@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3957 if (fixup_exception(regs))
3958 return;
3959
3960+#ifdef CONFIG_PAX_MEMORY_UDEREF
3961+ if (addr < TASK_SIZE) {
3962+ if (current->signal->curr_ip)
3963+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3964+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3965+ else
3966+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3967+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3968+ }
3969+#endif
3970+
3971+#ifdef CONFIG_PAX_KERNEXEC
3972+ if ((fsr & FSR_WRITE) &&
3973+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3974+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3975+ {
3976+ if (current->signal->curr_ip)
3977+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3978+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3979+ else
3980+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3981+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3982+ }
3983+#endif
3984+
3985 /*
3986 * No handler, we'll have to terminate things with extreme prejudice.
3987 */
3988@@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3989 }
3990 #endif
3991
3992+#ifdef CONFIG_PAX_PAGEEXEC
3993+ if (fsr & FSR_LNX_PF) {
3994+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3995+ do_group_exit(SIGKILL);
3996+ }
3997+#endif
3998+
3999 tsk->thread.address = addr;
4000 tsk->thread.error_code = fsr;
4001 tsk->thread.trap_no = 14;
4002@@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4003 }
4004 #endif /* CONFIG_MMU */
4005
4006+#ifdef CONFIG_PAX_PAGEEXEC
4007+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4008+{
4009+ long i;
4010+
4011+ printk(KERN_ERR "PAX: bytes at PC: ");
4012+ for (i = 0; i < 20; i++) {
4013+ unsigned char c;
4014+ if (get_user(c, (__force unsigned char __user *)pc+i))
4015+ printk(KERN_CONT "?? ");
4016+ else
4017+ printk(KERN_CONT "%02x ", c);
4018+ }
4019+ printk("\n");
4020+
4021+ printk(KERN_ERR "PAX: bytes at SP-4: ");
4022+ for (i = -1; i < 20; i++) {
4023+ unsigned long c;
4024+ if (get_user(c, (__force unsigned long __user *)sp+i))
4025+ printk(KERN_CONT "???????? ");
4026+ else
4027+ printk(KERN_CONT "%08lx ", c);
4028+ }
4029+ printk("\n");
4030+}
4031+#endif
4032+
4033 /*
4034 * First Level Translation Fault Handler
4035 *
4036@@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4037 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4038 struct siginfo info;
4039
4040+#ifdef CONFIG_PAX_MEMORY_UDEREF
4041+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4042+ if (current->signal->curr_ip)
4043+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4044+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4045+ else
4046+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4047+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4048+ goto die;
4049+ }
4050+#endif
4051+
4052 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4053 return;
4054
4055+die:
4056 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4057 inf->name, fsr, addr);
4058
4059@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4060 ifsr_info[nr].name = name;
4061 }
4062
4063+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4064+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4065+
4066 asmlinkage void __exception
4067 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4068 {
4069 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4070 struct siginfo info;
4071+ unsigned long pc = instruction_pointer(regs);
4072+
4073+ if (user_mode(regs)) {
4074+ unsigned long sigpage = current->mm->context.sigpage;
4075+
4076+ if (sigpage <= pc && pc < sigpage + 7*4) {
4077+ if (pc < sigpage + 3*4)
4078+ sys_sigreturn(regs);
4079+ else
4080+ sys_rt_sigreturn(regs);
4081+ return;
4082+ }
4083+ if (pc == 0xffff0f60UL) {
4084+ /*
4085+ * PaX: __kuser_cmpxchg64 emulation
4086+ */
4087+ // TODO
4088+ //regs->ARM_pc = regs->ARM_lr;
4089+ //return;
4090+ }
4091+ if (pc == 0xffff0fa0UL) {
4092+ /*
4093+ * PaX: __kuser_memory_barrier emulation
4094+ */
4095+ // dmb(); implied by the exception
4096+ regs->ARM_pc = regs->ARM_lr;
4097+ return;
4098+ }
4099+ if (pc == 0xffff0fc0UL) {
4100+ /*
4101+ * PaX: __kuser_cmpxchg emulation
4102+ */
4103+ // TODO
4104+ //long new;
4105+ //int op;
4106+
4107+ //op = FUTEX_OP_SET << 28;
4108+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4109+ //regs->ARM_r0 = old != new;
4110+ //regs->ARM_pc = regs->ARM_lr;
4111+ //return;
4112+ }
4113+ if (pc == 0xffff0fe0UL) {
4114+ /*
4115+ * PaX: __kuser_get_tls emulation
4116+ */
4117+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4118+ regs->ARM_pc = regs->ARM_lr;
4119+ return;
4120+ }
4121+ }
4122+
4123+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4124+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4125+ if (current->signal->curr_ip)
4126+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4127+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4128+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4129+ else
4130+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4131+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4132+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4133+ goto die;
4134+ }
4135+#endif
4136+
4137+#ifdef CONFIG_PAX_REFCOUNT
4138+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4139+#ifdef CONFIG_THUMB2_KERNEL
4140+ unsigned short bkpt;
4141+
4142+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4143+#else
4144+ unsigned int bkpt;
4145+
4146+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4147+#endif
4148+ current->thread.error_code = ifsr;
4149+ current->thread.trap_no = 0;
4150+ pax_report_refcount_overflow(regs);
4151+ fixup_exception(regs);
4152+ return;
4153+ }
4154+ }
4155+#endif
4156
4157 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4158 return;
4159
4160+die:
4161 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4162 inf->name, ifsr, addr);
4163
4164diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4165index cf08bdf..772656c 100644
4166--- a/arch/arm/mm/fault.h
4167+++ b/arch/arm/mm/fault.h
4168@@ -3,6 +3,7 @@
4169
4170 /*
4171 * Fault status register encodings. We steal bit 31 for our own purposes.
4172+ * Set when the FSR value is from an instruction fault.
4173 */
4174 #define FSR_LNX_PF (1 << 31)
4175 #define FSR_WRITE (1 << 11)
4176@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4177 }
4178 #endif
4179
4180+/* valid for LPAE and !LPAE */
4181+static inline int is_xn_fault(unsigned int fsr)
4182+{
4183+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4184+}
4185+
4186+static inline int is_domain_fault(unsigned int fsr)
4187+{
4188+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4189+}
4190+
4191 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4192 unsigned long search_exception_table(unsigned long addr);
4193
4194diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4195index 9481f85..6dae261 100644
4196--- a/arch/arm/mm/init.c
4197+++ b/arch/arm/mm/init.c
4198@@ -31,6 +31,8 @@
4199 #include <asm/setup.h>
4200 #include <asm/tlb.h>
4201 #include <asm/fixmap.h>
4202+#include <asm/system_info.h>
4203+#include <asm/cp15.h>
4204
4205 #include <asm/mach/arch.h>
4206 #include <asm/mach/map.h>
4207@@ -619,7 +621,46 @@ void free_initmem(void)
4208 {
4209 #ifdef CONFIG_HAVE_TCM
4210 extern char __tcm_start, __tcm_end;
4211+#endif
4212
4213+#ifdef CONFIG_PAX_KERNEXEC
4214+ unsigned long addr;
4215+ pgd_t *pgd;
4216+ pud_t *pud;
4217+ pmd_t *pmd;
4218+ int cpu_arch = cpu_architecture();
4219+ unsigned int cr = get_cr();
4220+
4221+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4222+ /* make pages tables, etc before .text NX */
4223+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4224+ pgd = pgd_offset_k(addr);
4225+ pud = pud_offset(pgd, addr);
4226+ pmd = pmd_offset(pud, addr);
4227+ __section_update(pmd, addr, PMD_SECT_XN);
4228+ }
4229+ /* make init NX */
4230+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4231+ pgd = pgd_offset_k(addr);
4232+ pud = pud_offset(pgd, addr);
4233+ pmd = pmd_offset(pud, addr);
4234+ __section_update(pmd, addr, PMD_SECT_XN);
4235+ }
4236+ /* make kernel code/rodata RX */
4237+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4238+ pgd = pgd_offset_k(addr);
4239+ pud = pud_offset(pgd, addr);
4240+ pmd = pmd_offset(pud, addr);
4241+#ifdef CONFIG_ARM_LPAE
4242+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4243+#else
4244+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4245+#endif
4246+ }
4247+ }
4248+#endif
4249+
4250+#ifdef CONFIG_HAVE_TCM
4251 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4252 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4253 #endif
4254diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4255index d1e5ad7..84dcbf2 100644
4256--- a/arch/arm/mm/ioremap.c
4257+++ b/arch/arm/mm/ioremap.c
4258@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4259 unsigned int mtype;
4260
4261 if (cached)
4262- mtype = MT_MEMORY_RWX;
4263+ mtype = MT_MEMORY_RX;
4264 else
4265- mtype = MT_MEMORY_RWX_NONCACHED;
4266+ mtype = MT_MEMORY_RX_NONCACHED;
4267
4268 return __arm_ioremap_caller(phys_addr, size, mtype,
4269 __builtin_return_address(0));
4270diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4271index 5e85ed3..b10a7ed 100644
4272--- a/arch/arm/mm/mmap.c
4273+++ b/arch/arm/mm/mmap.c
4274@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4275 struct vm_area_struct *vma;
4276 int do_align = 0;
4277 int aliasing = cache_is_vipt_aliasing();
4278+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4279 struct vm_unmapped_area_info info;
4280
4281 /*
4282@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4283 if (len > TASK_SIZE)
4284 return -ENOMEM;
4285
4286+#ifdef CONFIG_PAX_RANDMMAP
4287+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4288+#endif
4289+
4290 if (addr) {
4291 if (do_align)
4292 addr = COLOUR_ALIGN(addr, pgoff);
4293@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4294 addr = PAGE_ALIGN(addr);
4295
4296 vma = find_vma(mm, addr);
4297- if (TASK_SIZE - len >= addr &&
4298- (!vma || addr + len <= vma->vm_start))
4299+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4300 return addr;
4301 }
4302
4303@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4304 info.high_limit = TASK_SIZE;
4305 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4306 info.align_offset = pgoff << PAGE_SHIFT;
4307+ info.threadstack_offset = offset;
4308 return vm_unmapped_area(&info);
4309 }
4310
4311@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4312 unsigned long addr = addr0;
4313 int do_align = 0;
4314 int aliasing = cache_is_vipt_aliasing();
4315+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4316 struct vm_unmapped_area_info info;
4317
4318 /*
4319@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4320 return addr;
4321 }
4322
4323+#ifdef CONFIG_PAX_RANDMMAP
4324+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4325+#endif
4326+
4327 /* requesting a specific address */
4328 if (addr) {
4329 if (do_align)
4330@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4331 else
4332 addr = PAGE_ALIGN(addr);
4333 vma = find_vma(mm, addr);
4334- if (TASK_SIZE - len >= addr &&
4335- (!vma || addr + len <= vma->vm_start))
4336+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4337 return addr;
4338 }
4339
4340@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4341 info.high_limit = mm->mmap_base;
4342 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4343 info.align_offset = pgoff << PAGE_SHIFT;
4344+ info.threadstack_offset = offset;
4345 addr = vm_unmapped_area(&info);
4346
4347 /*
4348@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4349 {
4350 unsigned long random_factor = 0UL;
4351
4352+#ifdef CONFIG_PAX_RANDMMAP
4353+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4354+#endif
4355+
4356 /* 8 bits of randomness in 20 address space bits */
4357 if ((current->flags & PF_RANDOMIZE) &&
4358 !(current->personality & ADDR_NO_RANDOMIZE))
4359@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4360
4361 if (mmap_is_legacy()) {
4362 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4363+
4364+#ifdef CONFIG_PAX_RANDMMAP
4365+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4366+ mm->mmap_base += mm->delta_mmap;
4367+#endif
4368+
4369 mm->get_unmapped_area = arch_get_unmapped_area;
4370 } else {
4371 mm->mmap_base = mmap_base(random_factor);
4372+
4373+#ifdef CONFIG_PAX_RANDMMAP
4374+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4375+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4376+#endif
4377+
4378 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4379 }
4380 }
4381diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4382index 9f98cec..115fcb6 100644
4383--- a/arch/arm/mm/mmu.c
4384+++ b/arch/arm/mm/mmu.c
4385@@ -40,6 +40,22 @@
4386 #include "mm.h"
4387 #include "tcm.h"
4388
4389+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4390+void modify_domain(unsigned int dom, unsigned int type)
4391+{
4392+ struct thread_info *thread = current_thread_info();
4393+ unsigned int domain = thread->cpu_domain;
4394+ /*
4395+ * DOMAIN_MANAGER might be defined to some other value,
4396+ * use the arch-defined constant
4397+ */
4398+ domain &= ~domain_val(dom, 3);
4399+ thread->cpu_domain = domain | domain_val(dom, type);
4400+ set_domain(thread->cpu_domain);
4401+}
4402+EXPORT_SYMBOL(modify_domain);
4403+#endif
4404+
4405 /*
4406 * empty_zero_page is a special page that is used for
4407 * zero-initialized data and COW.
4408@@ -239,7 +255,15 @@ __setup("noalign", noalign_setup);
4409 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4410 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4411
4412-static struct mem_type mem_types[] = {
4413+#ifdef CONFIG_PAX_KERNEXEC
4414+#define L_PTE_KERNEXEC L_PTE_RDONLY
4415+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4416+#else
4417+#define L_PTE_KERNEXEC L_PTE_DIRTY
4418+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4419+#endif
4420+
4421+static struct mem_type mem_types[] __read_only = {
4422 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4423 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4424 L_PTE_SHARED,
4425@@ -268,19 +292,19 @@ static struct mem_type mem_types[] = {
4426 .prot_sect = PROT_SECT_DEVICE,
4427 .domain = DOMAIN_IO,
4428 },
4429- [MT_UNCACHED] = {
4430+ [MT_UNCACHED_RW] = {
4431 .prot_pte = PROT_PTE_DEVICE,
4432 .prot_l1 = PMD_TYPE_TABLE,
4433 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4434 .domain = DOMAIN_IO,
4435 },
4436- [MT_CACHECLEAN] = {
4437- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4438+ [MT_CACHECLEAN_RO] = {
4439+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4440 .domain = DOMAIN_KERNEL,
4441 },
4442 #ifndef CONFIG_ARM_LPAE
4443- [MT_MINICLEAN] = {
4444- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4445+ [MT_MINICLEAN_RO] = {
4446+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4447 .domain = DOMAIN_KERNEL,
4448 },
4449 #endif
4450@@ -288,15 +312,15 @@ static struct mem_type mem_types[] = {
4451 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4452 L_PTE_RDONLY,
4453 .prot_l1 = PMD_TYPE_TABLE,
4454- .domain = DOMAIN_USER,
4455+ .domain = DOMAIN_VECTORS,
4456 },
4457 [MT_HIGH_VECTORS] = {
4458 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4459 L_PTE_USER | L_PTE_RDONLY,
4460 .prot_l1 = PMD_TYPE_TABLE,
4461- .domain = DOMAIN_USER,
4462+ .domain = DOMAIN_VECTORS,
4463 },
4464- [MT_MEMORY_RWX] = {
4465+ [__MT_MEMORY_RWX] = {
4466 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4467 .prot_l1 = PMD_TYPE_TABLE,
4468 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4469@@ -309,17 +333,30 @@ static struct mem_type mem_types[] = {
4470 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4471 .domain = DOMAIN_KERNEL,
4472 },
4473- [MT_ROM] = {
4474- .prot_sect = PMD_TYPE_SECT,
4475+ [MT_MEMORY_RX] = {
4476+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4477+ .prot_l1 = PMD_TYPE_TABLE,
4478+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4479+ .domain = DOMAIN_KERNEL,
4480+ },
4481+ [MT_ROM_RX] = {
4482+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4483 .domain = DOMAIN_KERNEL,
4484 },
4485- [MT_MEMORY_RWX_NONCACHED] = {
4486+ [MT_MEMORY_RW_NONCACHED] = {
4487 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4488 L_PTE_MT_BUFFERABLE,
4489 .prot_l1 = PMD_TYPE_TABLE,
4490 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4491 .domain = DOMAIN_KERNEL,
4492 },
4493+ [MT_MEMORY_RX_NONCACHED] = {
4494+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4495+ L_PTE_MT_BUFFERABLE,
4496+ .prot_l1 = PMD_TYPE_TABLE,
4497+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4498+ .domain = DOMAIN_KERNEL,
4499+ },
4500 [MT_MEMORY_RW_DTCM] = {
4501 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4502 L_PTE_XN,
4503@@ -327,9 +364,10 @@ static struct mem_type mem_types[] = {
4504 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4505 .domain = DOMAIN_KERNEL,
4506 },
4507- [MT_MEMORY_RWX_ITCM] = {
4508- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4509+ [MT_MEMORY_RX_ITCM] = {
4510+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4511 .prot_l1 = PMD_TYPE_TABLE,
4512+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4513 .domain = DOMAIN_KERNEL,
4514 },
4515 [MT_MEMORY_RW_SO] = {
4516@@ -547,9 +585,14 @@ static void __init build_mem_type_table(void)
4517 * Mark cache clean areas and XIP ROM read only
4518 * from SVC mode and no access from userspace.
4519 */
4520- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4521- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4522- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4523+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4524+#ifdef CONFIG_PAX_KERNEXEC
4525+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4526+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4527+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4528+#endif
4529+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4530+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4531 #endif
4532
4533 /*
4534@@ -566,13 +609,17 @@ static void __init build_mem_type_table(void)
4535 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4536 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4537 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4538- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4539- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4540+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4541+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4542 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4543 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4544+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4545+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4546 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4547- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4548- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4549+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4550+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4551+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4552+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4553 }
4554 }
4555
4556@@ -583,15 +630,20 @@ static void __init build_mem_type_table(void)
4557 if (cpu_arch >= CPU_ARCH_ARMv6) {
4558 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4559 /* Non-cacheable Normal is XCB = 001 */
4560- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4561+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4562+ PMD_SECT_BUFFERED;
4563+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4564 PMD_SECT_BUFFERED;
4565 } else {
4566 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4567- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4568+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4569+ PMD_SECT_TEX(1);
4570+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4571 PMD_SECT_TEX(1);
4572 }
4573 } else {
4574- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4575+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4576+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4577 }
4578
4579 #ifdef CONFIG_ARM_LPAE
4580@@ -607,6 +659,8 @@ static void __init build_mem_type_table(void)
4581 vecs_pgprot |= PTE_EXT_AF;
4582 #endif
4583
4584+ user_pgprot |= __supported_pte_mask;
4585+
4586 for (i = 0; i < 16; i++) {
4587 pteval_t v = pgprot_val(protection_map[i]);
4588 protection_map[i] = __pgprot(v | user_pgprot);
4589@@ -624,21 +678,24 @@ static void __init build_mem_type_table(void)
4590
4591 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4592 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4593- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4594- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4595+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4596+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4597 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4598 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4599+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4600+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4601 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4602- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4603- mem_types[MT_ROM].prot_sect |= cp->pmd;
4604+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4605+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4606+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4607
4608 switch (cp->pmd) {
4609 case PMD_SECT_WT:
4610- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4611+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4612 break;
4613 case PMD_SECT_WB:
4614 case PMD_SECT_WBWA:
4615- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4616+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4617 break;
4618 }
4619 pr_info("Memory policy: %sData cache %s\n",
4620@@ -856,7 +913,7 @@ static void __init create_mapping(struct map_desc *md)
4621 return;
4622 }
4623
4624- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4625+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4626 md->virtual >= PAGE_OFFSET &&
4627 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4628 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4629@@ -1224,18 +1281,15 @@ void __init arm_mm_memblock_reserve(void)
4630 * called function. This means you can't use any function or debugging
4631 * method which may touch any device, otherwise the kernel _will_ crash.
4632 */
4633+
4634+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4635+
4636 static void __init devicemaps_init(const struct machine_desc *mdesc)
4637 {
4638 struct map_desc map;
4639 unsigned long addr;
4640- void *vectors;
4641
4642- /*
4643- * Allocate the vector page early.
4644- */
4645- vectors = early_alloc(PAGE_SIZE * 2);
4646-
4647- early_trap_init(vectors);
4648+ early_trap_init(&vectors);
4649
4650 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4651 pmd_clear(pmd_off_k(addr));
4652@@ -1248,7 +1302,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4653 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4654 map.virtual = MODULES_VADDR;
4655 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4656- map.type = MT_ROM;
4657+ map.type = MT_ROM_RX;
4658 create_mapping(&map);
4659 #endif
4660
4661@@ -1259,14 +1313,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4662 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4663 map.virtual = FLUSH_BASE;
4664 map.length = SZ_1M;
4665- map.type = MT_CACHECLEAN;
4666+ map.type = MT_CACHECLEAN_RO;
4667 create_mapping(&map);
4668 #endif
4669 #ifdef FLUSH_BASE_MINICACHE
4670 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4671 map.virtual = FLUSH_BASE_MINICACHE;
4672 map.length = SZ_1M;
4673- map.type = MT_MINICLEAN;
4674+ map.type = MT_MINICLEAN_RO;
4675 create_mapping(&map);
4676 #endif
4677
4678@@ -1275,7 +1329,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4679 * location (0xffff0000). If we aren't using high-vectors, also
4680 * create a mapping at the low-vectors virtual address.
4681 */
4682- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4683+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4684 map.virtual = 0xffff0000;
4685 map.length = PAGE_SIZE;
4686 #ifdef CONFIG_KUSER_HELPERS
4687@@ -1335,8 +1389,10 @@ static void __init kmap_init(void)
4688 static void __init map_lowmem(void)
4689 {
4690 struct memblock_region *reg;
4691+#ifndef CONFIG_PAX_KERNEXEC
4692 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4693 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4694+#endif
4695
4696 /* Map all the lowmem memory banks. */
4697 for_each_memblock(memory, reg) {
4698@@ -1349,11 +1405,48 @@ static void __init map_lowmem(void)
4699 if (start >= end)
4700 break;
4701
4702+#ifdef CONFIG_PAX_KERNEXEC
4703+ map.pfn = __phys_to_pfn(start);
4704+ map.virtual = __phys_to_virt(start);
4705+ map.length = end - start;
4706+
4707+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4708+ struct map_desc kernel;
4709+ struct map_desc initmap;
4710+
4711+ /* when freeing initmem we will make this RW */
4712+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4713+ initmap.virtual = (unsigned long)__init_begin;
4714+ initmap.length = _sdata - __init_begin;
4715+ initmap.type = __MT_MEMORY_RWX;
4716+ create_mapping(&initmap);
4717+
4718+ /* when freeing initmem we will make this RX */
4719+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4720+ kernel.virtual = (unsigned long)_stext;
4721+ kernel.length = __init_begin - _stext;
4722+ kernel.type = __MT_MEMORY_RWX;
4723+ create_mapping(&kernel);
4724+
4725+ if (map.virtual < (unsigned long)_stext) {
4726+ map.length = (unsigned long)_stext - map.virtual;
4727+ map.type = __MT_MEMORY_RWX;
4728+ create_mapping(&map);
4729+ }
4730+
4731+ map.pfn = __phys_to_pfn(__pa(_sdata));
4732+ map.virtual = (unsigned long)_sdata;
4733+ map.length = end - __pa(_sdata);
4734+ }
4735+
4736+ map.type = MT_MEMORY_RW;
4737+ create_mapping(&map);
4738+#else
4739 if (end < kernel_x_start || start >= kernel_x_end) {
4740 map.pfn = __phys_to_pfn(start);
4741 map.virtual = __phys_to_virt(start);
4742 map.length = end - start;
4743- map.type = MT_MEMORY_RWX;
4744+ map.type = __MT_MEMORY_RWX;
4745
4746 create_mapping(&map);
4747 } else {
4748@@ -1370,7 +1463,7 @@ static void __init map_lowmem(void)
4749 map.pfn = __phys_to_pfn(kernel_x_start);
4750 map.virtual = __phys_to_virt(kernel_x_start);
4751 map.length = kernel_x_end - kernel_x_start;
4752- map.type = MT_MEMORY_RWX;
4753+ map.type = __MT_MEMORY_RWX;
4754
4755 create_mapping(&map);
4756
4757@@ -1383,6 +1476,7 @@ static void __init map_lowmem(void)
4758 create_mapping(&map);
4759 }
4760 }
4761+#endif
4762 }
4763 }
4764
4765diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4766index e1268f9..a9755a7 100644
4767--- a/arch/arm/net/bpf_jit_32.c
4768+++ b/arch/arm/net/bpf_jit_32.c
4769@@ -20,6 +20,7 @@
4770 #include <asm/cacheflush.h>
4771 #include <asm/hwcap.h>
4772 #include <asm/opcodes.h>
4773+#include <asm/pgtable.h>
4774
4775 #include "bpf_jit_32.h"
4776
4777@@ -71,7 +72,11 @@ struct jit_ctx {
4778 #endif
4779 };
4780
4781+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4782+int bpf_jit_enable __read_only;
4783+#else
4784 int bpf_jit_enable __read_mostly;
4785+#endif
4786
4787 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4788 {
4789@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4790 {
4791 u32 *ptr;
4792 /* We are guaranteed to have aligned memory. */
4793+ pax_open_kernel();
4794 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4795 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4796+ pax_close_kernel();
4797 }
4798
4799 static void build_prologue(struct jit_ctx *ctx)
4800diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4801index 5b217f4..c23f40e 100644
4802--- a/arch/arm/plat-iop/setup.c
4803+++ b/arch/arm/plat-iop/setup.c
4804@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4805 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4806 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4807 .length = IOP3XX_PERIPHERAL_SIZE,
4808- .type = MT_UNCACHED,
4809+ .type = MT_UNCACHED_RW,
4810 },
4811 };
4812
4813diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4814index a5bc92d..0bb4730 100644
4815--- a/arch/arm/plat-omap/sram.c
4816+++ b/arch/arm/plat-omap/sram.c
4817@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4818 * Looks like we need to preserve some bootloader code at the
4819 * beginning of SRAM for jumping to flash for reboot to work...
4820 */
4821+ pax_open_kernel();
4822 memset_io(omap_sram_base + omap_sram_skip, 0,
4823 omap_sram_size - omap_sram_skip);
4824+ pax_close_kernel();
4825 }
4826diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4827index ce6d763..cfea917 100644
4828--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4829+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4830@@ -47,7 +47,7 @@ struct samsung_dma_ops {
4831 int (*started)(unsigned ch);
4832 int (*flush)(unsigned ch);
4833 int (*stop)(unsigned ch);
4834-};
4835+} __no_const;
4836
4837 extern void *samsung_dmadev_get_ops(void);
4838 extern void *s3c_dma_get_ops(void);
4839diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4840index 6389d60..b5d3bdd 100644
4841--- a/arch/arm64/include/asm/barrier.h
4842+++ b/arch/arm64/include/asm/barrier.h
4843@@ -41,7 +41,7 @@
4844 do { \
4845 compiletime_assert_atomic_type(*p); \
4846 barrier(); \
4847- ACCESS_ONCE(*p) = (v); \
4848+ ACCESS_ONCE_RW(*p) = (v); \
4849 } while (0)
4850
4851 #define smp_load_acquire(p) \
4852diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4853index 3bf8f4e..5dd5491 100644
4854--- a/arch/arm64/include/asm/uaccess.h
4855+++ b/arch/arm64/include/asm/uaccess.h
4856@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4857 flag; \
4858 })
4859
4860+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4861 #define access_ok(type, addr, size) __range_ok(addr, size)
4862 #define user_addr_max get_fs
4863
4864diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4865index c3a58a1..78fbf54 100644
4866--- a/arch/avr32/include/asm/cache.h
4867+++ b/arch/avr32/include/asm/cache.h
4868@@ -1,8 +1,10 @@
4869 #ifndef __ASM_AVR32_CACHE_H
4870 #define __ASM_AVR32_CACHE_H
4871
4872+#include <linux/const.h>
4873+
4874 #define L1_CACHE_SHIFT 5
4875-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4876+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4877
4878 /*
4879 * Memory returned by kmalloc() may be used for DMA, so we must make
4880diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4881index d232888..87c8df1 100644
4882--- a/arch/avr32/include/asm/elf.h
4883+++ b/arch/avr32/include/asm/elf.h
4884@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4885 the loader. We need to make sure that it is out of the way of the program
4886 that it will "exec", and that there is sufficient room for the brk. */
4887
4888-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4889+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4890
4891+#ifdef CONFIG_PAX_ASLR
4892+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4893+
4894+#define PAX_DELTA_MMAP_LEN 15
4895+#define PAX_DELTA_STACK_LEN 15
4896+#endif
4897
4898 /* This yields a mask that user programs can use to figure out what
4899 instruction set this CPU supports. This could be done in user space,
4900diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4901index 479330b..53717a8 100644
4902--- a/arch/avr32/include/asm/kmap_types.h
4903+++ b/arch/avr32/include/asm/kmap_types.h
4904@@ -2,9 +2,9 @@
4905 #define __ASM_AVR32_KMAP_TYPES_H
4906
4907 #ifdef CONFIG_DEBUG_HIGHMEM
4908-# define KM_TYPE_NR 29
4909+# define KM_TYPE_NR 30
4910 #else
4911-# define KM_TYPE_NR 14
4912+# define KM_TYPE_NR 15
4913 #endif
4914
4915 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4916diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4917index 0eca933..eb78c7b 100644
4918--- a/arch/avr32/mm/fault.c
4919+++ b/arch/avr32/mm/fault.c
4920@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4921
4922 int exception_trace = 1;
4923
4924+#ifdef CONFIG_PAX_PAGEEXEC
4925+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4926+{
4927+ unsigned long i;
4928+
4929+ printk(KERN_ERR "PAX: bytes at PC: ");
4930+ for (i = 0; i < 20; i++) {
4931+ unsigned char c;
4932+ if (get_user(c, (unsigned char *)pc+i))
4933+ printk(KERN_CONT "???????? ");
4934+ else
4935+ printk(KERN_CONT "%02x ", c);
4936+ }
4937+ printk("\n");
4938+}
4939+#endif
4940+
4941 /*
4942 * This routine handles page faults. It determines the address and the
4943 * problem, and then passes it off to one of the appropriate routines.
4944@@ -176,6 +193,16 @@ bad_area:
4945 up_read(&mm->mmap_sem);
4946
4947 if (user_mode(regs)) {
4948+
4949+#ifdef CONFIG_PAX_PAGEEXEC
4950+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4951+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4952+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4953+ do_group_exit(SIGKILL);
4954+ }
4955+ }
4956+#endif
4957+
4958 if (exception_trace && printk_ratelimit())
4959 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4960 "sp %08lx ecr %lu\n",
4961diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4962index 568885a..f8008df 100644
4963--- a/arch/blackfin/include/asm/cache.h
4964+++ b/arch/blackfin/include/asm/cache.h
4965@@ -7,6 +7,7 @@
4966 #ifndef __ARCH_BLACKFIN_CACHE_H
4967 #define __ARCH_BLACKFIN_CACHE_H
4968
4969+#include <linux/const.h>
4970 #include <linux/linkage.h> /* for asmlinkage */
4971
4972 /*
4973@@ -14,7 +15,7 @@
4974 * Blackfin loads 32 bytes for cache
4975 */
4976 #define L1_CACHE_SHIFT 5
4977-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4978+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4979 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4980
4981 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4982diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4983index aea2718..3639a60 100644
4984--- a/arch/cris/include/arch-v10/arch/cache.h
4985+++ b/arch/cris/include/arch-v10/arch/cache.h
4986@@ -1,8 +1,9 @@
4987 #ifndef _ASM_ARCH_CACHE_H
4988 #define _ASM_ARCH_CACHE_H
4989
4990+#include <linux/const.h>
4991 /* Etrax 100LX have 32-byte cache-lines. */
4992-#define L1_CACHE_BYTES 32
4993 #define L1_CACHE_SHIFT 5
4994+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4995
4996 #endif /* _ASM_ARCH_CACHE_H */
4997diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4998index 7caf25d..ee65ac5 100644
4999--- a/arch/cris/include/arch-v32/arch/cache.h
5000+++ b/arch/cris/include/arch-v32/arch/cache.h
5001@@ -1,11 +1,12 @@
5002 #ifndef _ASM_CRIS_ARCH_CACHE_H
5003 #define _ASM_CRIS_ARCH_CACHE_H
5004
5005+#include <linux/const.h>
5006 #include <arch/hwregs/dma.h>
5007
5008 /* A cache-line is 32 bytes. */
5009-#define L1_CACHE_BYTES 32
5010 #define L1_CACHE_SHIFT 5
5011+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5012
5013 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5014
5015diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5016index 102190a..5334cea 100644
5017--- a/arch/frv/include/asm/atomic.h
5018+++ b/arch/frv/include/asm/atomic.h
5019@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5020 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5021 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5022
5023+#define atomic64_read_unchecked(v) atomic64_read(v)
5024+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5025+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5026+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5027+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5028+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5029+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5030+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5031+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5032+
5033 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5034 {
5035 int c, old;
5036diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5037index 2797163..c2a401df9 100644
5038--- a/arch/frv/include/asm/cache.h
5039+++ b/arch/frv/include/asm/cache.h
5040@@ -12,10 +12,11 @@
5041 #ifndef __ASM_CACHE_H
5042 #define __ASM_CACHE_H
5043
5044+#include <linux/const.h>
5045
5046 /* bytes per L1 cache line */
5047 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5048-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5049+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5050
5051 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5052 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5053diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5054index 43901f2..0d8b865 100644
5055--- a/arch/frv/include/asm/kmap_types.h
5056+++ b/arch/frv/include/asm/kmap_types.h
5057@@ -2,6 +2,6 @@
5058 #ifndef _ASM_KMAP_TYPES_H
5059 #define _ASM_KMAP_TYPES_H
5060
5061-#define KM_TYPE_NR 17
5062+#define KM_TYPE_NR 18
5063
5064 #endif
5065diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5066index 836f147..4cf23f5 100644
5067--- a/arch/frv/mm/elf-fdpic.c
5068+++ b/arch/frv/mm/elf-fdpic.c
5069@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5070 {
5071 struct vm_area_struct *vma;
5072 struct vm_unmapped_area_info info;
5073+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5074
5075 if (len > TASK_SIZE)
5076 return -ENOMEM;
5077@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5078 if (addr) {
5079 addr = PAGE_ALIGN(addr);
5080 vma = find_vma(current->mm, addr);
5081- if (TASK_SIZE - len >= addr &&
5082- (!vma || addr + len <= vma->vm_start))
5083+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5084 goto success;
5085 }
5086
5087@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5088 info.high_limit = (current->mm->start_stack - 0x00200000);
5089 info.align_mask = 0;
5090 info.align_offset = 0;
5091+ info.threadstack_offset = offset;
5092 addr = vm_unmapped_area(&info);
5093 if (!(addr & ~PAGE_MASK))
5094 goto success;
5095diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5096index 2635117..fa223cb 100644
5097--- a/arch/hexagon/include/asm/cache.h
5098+++ b/arch/hexagon/include/asm/cache.h
5099@@ -21,9 +21,11 @@
5100 #ifndef __ASM_CACHE_H
5101 #define __ASM_CACHE_H
5102
5103+#include <linux/const.h>
5104+
5105 /* Bytes per L1 cache line */
5106-#define L1_CACHE_SHIFT (5)
5107-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5108+#define L1_CACHE_SHIFT 5
5109+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5110
5111 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
5112 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
5113diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5114index c84c88b..2a6e1ba 100644
5115--- a/arch/ia64/Kconfig
5116+++ b/arch/ia64/Kconfig
5117@@ -549,6 +549,7 @@ source "drivers/sn/Kconfig"
5118 config KEXEC
5119 bool "kexec system call"
5120 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5121+ depends on !GRKERNSEC_KMEM
5122 help
5123 kexec is a system call that implements the ability to shutdown your
5124 current kernel, and to start another kernel. It is like a reboot
5125diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5126index 5441b14..039a446 100644
5127--- a/arch/ia64/Makefile
5128+++ b/arch/ia64/Makefile
5129@@ -99,5 +99,6 @@ endef
5130 archprepare: make_nr_irqs_h FORCE
5131 PHONY += make_nr_irqs_h FORCE
5132
5133+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5134 make_nr_irqs_h: FORCE
5135 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5136diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5137index 0bf0350..2ad1957 100644
5138--- a/arch/ia64/include/asm/atomic.h
5139+++ b/arch/ia64/include/asm/atomic.h
5140@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5141 #define atomic64_inc(v) atomic64_add(1, (v))
5142 #define atomic64_dec(v) atomic64_sub(1, (v))
5143
5144+#define atomic64_read_unchecked(v) atomic64_read(v)
5145+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5146+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5147+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5148+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5149+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5150+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5151+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5152+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5153+
5154 #endif /* _ASM_IA64_ATOMIC_H */
5155diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5156index a48957c..e097b56 100644
5157--- a/arch/ia64/include/asm/barrier.h
5158+++ b/arch/ia64/include/asm/barrier.h
5159@@ -67,7 +67,7 @@
5160 do { \
5161 compiletime_assert_atomic_type(*p); \
5162 barrier(); \
5163- ACCESS_ONCE(*p) = (v); \
5164+ ACCESS_ONCE_RW(*p) = (v); \
5165 } while (0)
5166
5167 #define smp_load_acquire(p) \
5168diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5169index 988254a..e1ee885 100644
5170--- a/arch/ia64/include/asm/cache.h
5171+++ b/arch/ia64/include/asm/cache.h
5172@@ -1,6 +1,7 @@
5173 #ifndef _ASM_IA64_CACHE_H
5174 #define _ASM_IA64_CACHE_H
5175
5176+#include <linux/const.h>
5177
5178 /*
5179 * Copyright (C) 1998-2000 Hewlett-Packard Co
5180@@ -9,7 +10,7 @@
5181
5182 /* Bytes per L1 (data) cache line. */
5183 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5184-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5185+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5186
5187 #ifdef CONFIG_SMP
5188 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5189diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5190index 5a83c5c..4d7f553 100644
5191--- a/arch/ia64/include/asm/elf.h
5192+++ b/arch/ia64/include/asm/elf.h
5193@@ -42,6 +42,13 @@
5194 */
5195 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5196
5197+#ifdef CONFIG_PAX_ASLR
5198+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5199+
5200+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5201+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5202+#endif
5203+
5204 #define PT_IA_64_UNWIND 0x70000001
5205
5206 /* IA-64 relocations: */
5207diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5208index 5767cdf..7462574 100644
5209--- a/arch/ia64/include/asm/pgalloc.h
5210+++ b/arch/ia64/include/asm/pgalloc.h
5211@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5212 pgd_val(*pgd_entry) = __pa(pud);
5213 }
5214
5215+static inline void
5216+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5217+{
5218+ pgd_populate(mm, pgd_entry, pud);
5219+}
5220+
5221 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5222 {
5223 return quicklist_alloc(0, GFP_KERNEL, NULL);
5224@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5225 pud_val(*pud_entry) = __pa(pmd);
5226 }
5227
5228+static inline void
5229+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5230+{
5231+ pud_populate(mm, pud_entry, pmd);
5232+}
5233+
5234 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5235 {
5236 return quicklist_alloc(0, GFP_KERNEL, NULL);
5237diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5238index 7935115..c0eca6a 100644
5239--- a/arch/ia64/include/asm/pgtable.h
5240+++ b/arch/ia64/include/asm/pgtable.h
5241@@ -12,7 +12,7 @@
5242 * David Mosberger-Tang <davidm@hpl.hp.com>
5243 */
5244
5245-
5246+#include <linux/const.h>
5247 #include <asm/mman.h>
5248 #include <asm/page.h>
5249 #include <asm/processor.h>
5250@@ -142,6 +142,17 @@
5251 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5252 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5253 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5254+
5255+#ifdef CONFIG_PAX_PAGEEXEC
5256+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5257+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5258+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5259+#else
5260+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5261+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5262+# define PAGE_COPY_NOEXEC PAGE_COPY
5263+#endif
5264+
5265 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5266 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5267 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5268diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5269index 45698cd..e8e2dbc 100644
5270--- a/arch/ia64/include/asm/spinlock.h
5271+++ b/arch/ia64/include/asm/spinlock.h
5272@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5273 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5274
5275 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5276- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5277+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5278 }
5279
5280 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5281diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5282index 449c8c0..3d4b1e9 100644
5283--- a/arch/ia64/include/asm/uaccess.h
5284+++ b/arch/ia64/include/asm/uaccess.h
5285@@ -70,6 +70,7 @@
5286 && ((segment).seg == KERNEL_DS.seg \
5287 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5288 })
5289+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5290 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5291
5292 /*
5293@@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5294 static inline unsigned long
5295 __copy_to_user (void __user *to, const void *from, unsigned long count)
5296 {
5297+ if (count > INT_MAX)
5298+ return count;
5299+
5300+ if (!__builtin_constant_p(count))
5301+ check_object_size(from, count, true);
5302+
5303 return __copy_user(to, (__force void __user *) from, count);
5304 }
5305
5306 static inline unsigned long
5307 __copy_from_user (void *to, const void __user *from, unsigned long count)
5308 {
5309+ if (count > INT_MAX)
5310+ return count;
5311+
5312+ if (!__builtin_constant_p(count))
5313+ check_object_size(to, count, false);
5314+
5315 return __copy_user((__force void __user *) to, from, count);
5316 }
5317
5318@@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5319 ({ \
5320 void __user *__cu_to = (to); \
5321 const void *__cu_from = (from); \
5322- long __cu_len = (n); \
5323+ unsigned long __cu_len = (n); \
5324 \
5325- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5326+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5327+ if (!__builtin_constant_p(n)) \
5328+ check_object_size(__cu_from, __cu_len, true); \
5329 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5330+ } \
5331 __cu_len; \
5332 })
5333
5334@@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5335 ({ \
5336 void *__cu_to = (to); \
5337 const void __user *__cu_from = (from); \
5338- long __cu_len = (n); \
5339+ unsigned long __cu_len = (n); \
5340 \
5341 __chk_user_ptr(__cu_from); \
5342- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5343+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5344+ if (!__builtin_constant_p(n)) \
5345+ check_object_size(__cu_to, __cu_len, false); \
5346 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5347+ } \
5348 __cu_len; \
5349 })
5350
5351diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5352index 24603be..948052d 100644
5353--- a/arch/ia64/kernel/module.c
5354+++ b/arch/ia64/kernel/module.c
5355@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5356 void
5357 module_free (struct module *mod, void *module_region)
5358 {
5359- if (mod && mod->arch.init_unw_table &&
5360- module_region == mod->module_init) {
5361+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5362 unw_remove_unwind_table(mod->arch.init_unw_table);
5363 mod->arch.init_unw_table = NULL;
5364 }
5365@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5366 }
5367
5368 static inline int
5369+in_init_rx (const struct module *mod, uint64_t addr)
5370+{
5371+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5372+}
5373+
5374+static inline int
5375+in_init_rw (const struct module *mod, uint64_t addr)
5376+{
5377+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5378+}
5379+
5380+static inline int
5381 in_init (const struct module *mod, uint64_t addr)
5382 {
5383- return addr - (uint64_t) mod->module_init < mod->init_size;
5384+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5385+}
5386+
5387+static inline int
5388+in_core_rx (const struct module *mod, uint64_t addr)
5389+{
5390+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5391+}
5392+
5393+static inline int
5394+in_core_rw (const struct module *mod, uint64_t addr)
5395+{
5396+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5397 }
5398
5399 static inline int
5400 in_core (const struct module *mod, uint64_t addr)
5401 {
5402- return addr - (uint64_t) mod->module_core < mod->core_size;
5403+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5404 }
5405
5406 static inline int
5407@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5408 break;
5409
5410 case RV_BDREL:
5411- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5412+ if (in_init_rx(mod, val))
5413+ val -= (uint64_t) mod->module_init_rx;
5414+ else if (in_init_rw(mod, val))
5415+ val -= (uint64_t) mod->module_init_rw;
5416+ else if (in_core_rx(mod, val))
5417+ val -= (uint64_t) mod->module_core_rx;
5418+ else if (in_core_rw(mod, val))
5419+ val -= (uint64_t) mod->module_core_rw;
5420 break;
5421
5422 case RV_LTV:
5423@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5424 * addresses have been selected...
5425 */
5426 uint64_t gp;
5427- if (mod->core_size > MAX_LTOFF)
5428+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5429 /*
5430 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5431 * at the end of the module.
5432 */
5433- gp = mod->core_size - MAX_LTOFF / 2;
5434+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5435 else
5436- gp = mod->core_size / 2;
5437- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5438+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5439+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5440 mod->arch.gp = gp;
5441 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5442 }
5443diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5444index c39c3cd..3c77738 100644
5445--- a/arch/ia64/kernel/palinfo.c
5446+++ b/arch/ia64/kernel/palinfo.c
5447@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5448 return NOTIFY_OK;
5449 }
5450
5451-static struct notifier_block __refdata palinfo_cpu_notifier =
5452+static struct notifier_block palinfo_cpu_notifier =
5453 {
5454 .notifier_call = palinfo_cpu_callback,
5455 .priority = 0,
5456diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5457index 41e33f8..65180b2a 100644
5458--- a/arch/ia64/kernel/sys_ia64.c
5459+++ b/arch/ia64/kernel/sys_ia64.c
5460@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5461 unsigned long align_mask = 0;
5462 struct mm_struct *mm = current->mm;
5463 struct vm_unmapped_area_info info;
5464+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5465
5466 if (len > RGN_MAP_LIMIT)
5467 return -ENOMEM;
5468@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5469 if (REGION_NUMBER(addr) == RGN_HPAGE)
5470 addr = 0;
5471 #endif
5472+
5473+#ifdef CONFIG_PAX_RANDMMAP
5474+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5475+ addr = mm->free_area_cache;
5476+ else
5477+#endif
5478+
5479 if (!addr)
5480 addr = TASK_UNMAPPED_BASE;
5481
5482@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5483 info.high_limit = TASK_SIZE;
5484 info.align_mask = align_mask;
5485 info.align_offset = 0;
5486+ info.threadstack_offset = offset;
5487 return vm_unmapped_area(&info);
5488 }
5489
5490diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5491index 84f8a52..7c76178 100644
5492--- a/arch/ia64/kernel/vmlinux.lds.S
5493+++ b/arch/ia64/kernel/vmlinux.lds.S
5494@@ -192,7 +192,7 @@ SECTIONS {
5495 /* Per-cpu data: */
5496 . = ALIGN(PERCPU_PAGE_SIZE);
5497 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5498- __phys_per_cpu_start = __per_cpu_load;
5499+ __phys_per_cpu_start = per_cpu_load;
5500 /*
5501 * ensure percpu data fits
5502 * into percpu page size
5503diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5504index 7225dad..2a7c8256 100644
5505--- a/arch/ia64/mm/fault.c
5506+++ b/arch/ia64/mm/fault.c
5507@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5508 return pte_present(pte);
5509 }
5510
5511+#ifdef CONFIG_PAX_PAGEEXEC
5512+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5513+{
5514+ unsigned long i;
5515+
5516+ printk(KERN_ERR "PAX: bytes at PC: ");
5517+ for (i = 0; i < 8; i++) {
5518+ unsigned int c;
5519+ if (get_user(c, (unsigned int *)pc+i))
5520+ printk(KERN_CONT "???????? ");
5521+ else
5522+ printk(KERN_CONT "%08x ", c);
5523+ }
5524+ printk("\n");
5525+}
5526+#endif
5527+
5528 # define VM_READ_BIT 0
5529 # define VM_WRITE_BIT 1
5530 # define VM_EXEC_BIT 2
5531@@ -151,8 +168,21 @@ retry:
5532 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5533 goto bad_area;
5534
5535- if ((vma->vm_flags & mask) != mask)
5536+ if ((vma->vm_flags & mask) != mask) {
5537+
5538+#ifdef CONFIG_PAX_PAGEEXEC
5539+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5540+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5541+ goto bad_area;
5542+
5543+ up_read(&mm->mmap_sem);
5544+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5545+ do_group_exit(SIGKILL);
5546+ }
5547+#endif
5548+
5549 goto bad_area;
5550+ }
5551
5552 /*
5553 * If for any reason at all we couldn't handle the fault, make
5554diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5555index 76069c1..c2aa816 100644
5556--- a/arch/ia64/mm/hugetlbpage.c
5557+++ b/arch/ia64/mm/hugetlbpage.c
5558@@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5559 unsigned long pgoff, unsigned long flags)
5560 {
5561 struct vm_unmapped_area_info info;
5562+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5563
5564 if (len > RGN_MAP_LIMIT)
5565 return -ENOMEM;
5566@@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5567 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5568 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5569 info.align_offset = 0;
5570+ info.threadstack_offset = offset;
5571 return vm_unmapped_area(&info);
5572 }
5573
5574diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5575index 6b33457..88b5124 100644
5576--- a/arch/ia64/mm/init.c
5577+++ b/arch/ia64/mm/init.c
5578@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5579 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5580 vma->vm_end = vma->vm_start + PAGE_SIZE;
5581 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5582+
5583+#ifdef CONFIG_PAX_PAGEEXEC
5584+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5585+ vma->vm_flags &= ~VM_EXEC;
5586+
5587+#ifdef CONFIG_PAX_MPROTECT
5588+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5589+ vma->vm_flags &= ~VM_MAYEXEC;
5590+#endif
5591+
5592+ }
5593+#endif
5594+
5595 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5596 down_write(&current->mm->mmap_sem);
5597 if (insert_vm_struct(current->mm, vma)) {
5598@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5599 gate_vma.vm_start = FIXADDR_USER_START;
5600 gate_vma.vm_end = FIXADDR_USER_END;
5601 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5602- gate_vma.vm_page_prot = __P101;
5603+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5604
5605 return 0;
5606 }
5607diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5608index 40b3ee9..8c2c112 100644
5609--- a/arch/m32r/include/asm/cache.h
5610+++ b/arch/m32r/include/asm/cache.h
5611@@ -1,8 +1,10 @@
5612 #ifndef _ASM_M32R_CACHE_H
5613 #define _ASM_M32R_CACHE_H
5614
5615+#include <linux/const.h>
5616+
5617 /* L1 cache line size */
5618 #define L1_CACHE_SHIFT 4
5619-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5620+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5621
5622 #endif /* _ASM_M32R_CACHE_H */
5623diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5624index 82abd15..d95ae5d 100644
5625--- a/arch/m32r/lib/usercopy.c
5626+++ b/arch/m32r/lib/usercopy.c
5627@@ -14,6 +14,9 @@
5628 unsigned long
5629 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5630 {
5631+ if ((long)n < 0)
5632+ return n;
5633+
5634 prefetch(from);
5635 if (access_ok(VERIFY_WRITE, to, n))
5636 __copy_user(to,from,n);
5637@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5638 unsigned long
5639 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5640 {
5641+ if ((long)n < 0)
5642+ return n;
5643+
5644 prefetchw(to);
5645 if (access_ok(VERIFY_READ, from, n))
5646 __copy_user_zeroing(to,from,n);
5647diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5648index 0395c51..5f26031 100644
5649--- a/arch/m68k/include/asm/cache.h
5650+++ b/arch/m68k/include/asm/cache.h
5651@@ -4,9 +4,11 @@
5652 #ifndef __ARCH_M68K_CACHE_H
5653 #define __ARCH_M68K_CACHE_H
5654
5655+#include <linux/const.h>
5656+
5657 /* bytes per L1 cache line */
5658 #define L1_CACHE_SHIFT 4
5659-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5660+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5661
5662 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5663
5664diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5665index c7591e8..ecef036 100644
5666--- a/arch/metag/include/asm/barrier.h
5667+++ b/arch/metag/include/asm/barrier.h
5668@@ -89,7 +89,7 @@ static inline void fence(void)
5669 do { \
5670 compiletime_assert_atomic_type(*p); \
5671 smp_mb(); \
5672- ACCESS_ONCE(*p) = (v); \
5673+ ACCESS_ONCE_RW(*p) = (v); \
5674 } while (0)
5675
5676 #define smp_load_acquire(p) \
5677diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5678index 3c32075..ae0ae75 100644
5679--- a/arch/metag/mm/hugetlbpage.c
5680+++ b/arch/metag/mm/hugetlbpage.c
5681@@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5682 info.high_limit = TASK_SIZE;
5683 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5684 info.align_offset = 0;
5685+ info.threadstack_offset = 0;
5686 return vm_unmapped_area(&info);
5687 }
5688
5689diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5690index 4efe96a..60e8699 100644
5691--- a/arch/microblaze/include/asm/cache.h
5692+++ b/arch/microblaze/include/asm/cache.h
5693@@ -13,11 +13,12 @@
5694 #ifndef _ASM_MICROBLAZE_CACHE_H
5695 #define _ASM_MICROBLAZE_CACHE_H
5696
5697+#include <linux/const.h>
5698 #include <asm/registers.h>
5699
5700 #define L1_CACHE_SHIFT 5
5701 /* word-granular cache in microblaze */
5702-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5703+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5704
5705 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5706
5707diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5708index 9536ef9..9333776 100644
5709--- a/arch/mips/Kconfig
5710+++ b/arch/mips/Kconfig
5711@@ -2413,6 +2413,7 @@ source "kernel/Kconfig.preempt"
5712
5713 config KEXEC
5714 bool "Kexec system call"
5715+ depends on !GRKERNSEC_KMEM
5716 help
5717 kexec is a system call that implements the ability to shutdown your
5718 current kernel, and to start another kernel. It is like a reboot
5719diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5720index 02f2444..506969c 100644
5721--- a/arch/mips/cavium-octeon/dma-octeon.c
5722+++ b/arch/mips/cavium-octeon/dma-octeon.c
5723@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5724 if (dma_release_from_coherent(dev, order, vaddr))
5725 return;
5726
5727- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5728+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5729 }
5730
5731 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5732diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5733index 6dd6bfc..903b0d6 100644
5734--- a/arch/mips/include/asm/atomic.h
5735+++ b/arch/mips/include/asm/atomic.h
5736@@ -21,15 +21,39 @@
5737 #include <asm/cmpxchg.h>
5738 #include <asm/war.h>
5739
5740+#ifdef CONFIG_GENERIC_ATOMIC64
5741+#include <asm-generic/atomic64.h>
5742+#endif
5743+
5744 #define ATOMIC_INIT(i) { (i) }
5745
5746+#ifdef CONFIG_64BIT
5747+#define _ASM_EXTABLE(from, to) \
5748+" .section __ex_table,\"a\"\n" \
5749+" .dword " #from ", " #to"\n" \
5750+" .previous\n"
5751+#else
5752+#define _ASM_EXTABLE(from, to) \
5753+" .section __ex_table,\"a\"\n" \
5754+" .word " #from ", " #to"\n" \
5755+" .previous\n"
5756+#endif
5757+
5758 /*
5759 * atomic_read - read atomic variable
5760 * @v: pointer of type atomic_t
5761 *
5762 * Atomically reads the value of @v.
5763 */
5764-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5765+static inline int atomic_read(const atomic_t *v)
5766+{
5767+ return ACCESS_ONCE(v->counter);
5768+}
5769+
5770+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5771+{
5772+ return ACCESS_ONCE(v->counter);
5773+}
5774
5775 /*
5776 * atomic_set - set atomic variable
5777@@ -38,47 +62,77 @@
5778 *
5779 * Atomically sets the value of @v to @i.
5780 */
5781-#define atomic_set(v, i) ((v)->counter = (i))
5782+static inline void atomic_set(atomic_t *v, int i)
5783+{
5784+ v->counter = i;
5785+}
5786
5787-#define ATOMIC_OP(op, c_op, asm_op) \
5788-static __inline__ void atomic_##op(int i, atomic_t * v) \
5789+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5790+{
5791+ v->counter = i;
5792+}
5793+
5794+#ifdef CONFIG_PAX_REFCOUNT
5795+#define __OVERFLOW_POST \
5796+ " b 4f \n" \
5797+ " .set noreorder \n" \
5798+ "3: b 5f \n" \
5799+ " move %0, %1 \n" \
5800+ " .set reorder \n"
5801+#define __OVERFLOW_EXTABLE \
5802+ "3:\n" \
5803+ _ASM_EXTABLE(2b, 3b)
5804+#else
5805+#define __OVERFLOW_POST
5806+#define __OVERFLOW_EXTABLE
5807+#endif
5808+
5809+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5810+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5811 { \
5812 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5813 int temp; \
5814 \
5815 __asm__ __volatile__( \
5816- " .set arch=r4000 \n" \
5817- "1: ll %0, %1 # atomic_" #op " \n" \
5818- " " #asm_op " %0, %2 \n" \
5819+ " .set mips3 \n" \
5820+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5821+ "2: " #asm_op " %0, %2 \n" \
5822 " sc %0, %1 \n" \
5823 " beqzl %0, 1b \n" \
5824+ extable \
5825 " .set mips0 \n" \
5826 : "=&r" (temp), "+m" (v->counter) \
5827 : "Ir" (i)); \
5828 } else if (kernel_uses_llsc) { \
5829 int temp; \
5830 \
5831- do { \
5832- __asm__ __volatile__( \
5833- " .set arch=r4000 \n" \
5834- " ll %0, %1 # atomic_" #op "\n" \
5835- " " #asm_op " %0, %2 \n" \
5836- " sc %0, %1 \n" \
5837- " .set mips0 \n" \
5838- : "=&r" (temp), "+m" (v->counter) \
5839- : "Ir" (i)); \
5840- } while (unlikely(!temp)); \
5841+ __asm__ __volatile__( \
5842+ " .set mips3 \n" \
5843+ " ll %0, %1 # atomic_" #op #suffix "\n" \
5844+ "2: " #asm_op " %0, %2 \n" \
5845+ " sc %0, %1 \n" \
5846+ " beqz %0, 1b \n" \
5847+ extable \
5848+ " .set mips0 \n" \
5849+ : "=&r" (temp), "+m" (v->counter) \
5850+ : "Ir" (i)); \
5851 } else { \
5852 unsigned long flags; \
5853 \
5854 raw_local_irq_save(flags); \
5855- v->counter c_op i; \
5856+ __asm__ __volatile__( \
5857+ "2: " #asm_op " %0, %1 \n" \
5858+ extable \
5859+ : "+r" (v->counter) : "Ir" (i)); \
5860 raw_local_irq_restore(flags); \
5861 } \
5862 } \
5863
5864-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5865-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5866+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , asm_op##u) \
5867+ __ATOMIC_OP(op, _unchecked, asm_op)
5868+
5869+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5870+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5871 { \
5872 int result; \
5873 \
5874@@ -88,37 +142,47 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5875 int temp; \
5876 \
5877 __asm__ __volatile__( \
5878- " .set arch=r4000 \n" \
5879- "1: ll %1, %2 # atomic_" #op "_return \n" \
5880- " " #asm_op " %0, %1, %3 \n" \
5881+ " .set mips3 \n" \
5882+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5883+ "2: " #asm_op " %0, %1, %3 \n" \
5884 " sc %0, %2 \n" \
5885 " beqzl %0, 1b \n" \
5886- " " #asm_op " %0, %1, %3 \n" \
5887+ post_op \
5888+ extable \
5889+ "4: " #asm_op " %0, %1, %3 \n" \
5890+ "5: \n" \
5891 " .set mips0 \n" \
5892 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5893 : "Ir" (i)); \
5894 } else if (kernel_uses_llsc) { \
5895 int temp; \
5896 \
5897- do { \
5898- __asm__ __volatile__( \
5899- " .set arch=r4000 \n" \
5900- " ll %1, %2 # atomic_" #op "_return \n" \
5901- " " #asm_op " %0, %1, %3 \n" \
5902- " sc %0, %2 \n" \
5903- " .set mips0 \n" \
5904- : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5905- : "Ir" (i)); \
5906- } while (unlikely(!result)); \
5907+ __asm__ __volatile__( \
5908+ " .set mips3 \n" \
5909+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5910+ "2: " #asm_op " %0, %1, %3 \n" \
5911+ " sc %0, %2 \n" \
5912+ " beqz %0, 1b \n" \
5913+ post_op \
5914+ extable \
5915+ "4: " #asm_op " %0, %1, %3 \n" \
5916+ "5: \n" \
5917+ " .set mips0 \n" \
5918+ : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5919+ : "Ir" (i)); \
5920 \
5921 result = temp; result c_op i; \
5922 } else { \
5923 unsigned long flags; \
5924 \
5925 raw_local_irq_save(flags); \
5926- result = v->counter; \
5927- result c_op i; \
5928- v->counter = result; \
5929+ __asm__ __volatile__( \
5930+ " lw %0, %1 \n" \
5931+ "2: " #asm_op " %0, %1, %2 \n" \
5932+ " sw %0, %1 \n" \
5933+ "3: \n" \
5934+ extable \
5935+ : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
5936 raw_local_irq_restore(flags); \
5937 } \
5938 \
5939@@ -127,16 +191,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5940 return result; \
5941 }
5942
5943-#define ATOMIC_OPS(op, c_op, asm_op) \
5944- ATOMIC_OP(op, c_op, asm_op) \
5945- ATOMIC_OP_RETURN(op, c_op, asm_op)
5946+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
5947+ __ATOMIC_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5948
5949-ATOMIC_OPS(add, +=, addu)
5950-ATOMIC_OPS(sub, -=, subu)
5951+#define ATOMIC_OPS(op, asm_op) \
5952+ ATOMIC_OP(op, asm_op) \
5953+ ATOMIC_OP_RETURN(op, asm_op)
5954+
5955+ATOMIC_OPS(add, add)
5956+ATOMIC_OPS(sub, sub)
5957
5958 #undef ATOMIC_OPS
5959 #undef ATOMIC_OP_RETURN
5960+#undef __ATOMIC_OP_RETURN
5961 #undef ATOMIC_OP
5962+#undef __ATOMIC_OP
5963
5964 /*
5965 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5966@@ -146,7 +215,7 @@ ATOMIC_OPS(sub, -=, subu)
5967 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5968 * The function returns the old value of @v minus @i.
5969 */
5970-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5971+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5972 {
5973 int result;
5974
5975@@ -203,8 +272,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5976 return result;
5977 }
5978
5979-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5980-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5981+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5982+{
5983+ return cmpxchg(&v->counter, old, new);
5984+}
5985+
5986+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5987+ int new)
5988+{
5989+ return cmpxchg(&(v->counter), old, new);
5990+}
5991+
5992+static inline int atomic_xchg(atomic_t *v, int new)
5993+{
5994+ return xchg(&v->counter, new);
5995+}
5996+
5997+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5998+{
5999+ return xchg(&(v->counter), new);
6000+}
6001
6002 /**
6003 * __atomic_add_unless - add unless the number is a given value
6004@@ -232,6 +319,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6005
6006 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6007 #define atomic_inc_return(v) atomic_add_return(1, (v))
6008+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6009+{
6010+ return atomic_add_return_unchecked(1, v);
6011+}
6012
6013 /*
6014 * atomic_sub_and_test - subtract value from variable and test result
6015@@ -253,6 +344,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6016 * other cases.
6017 */
6018 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6019+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6020+{
6021+ return atomic_add_return_unchecked(1, v) == 0;
6022+}
6023
6024 /*
6025 * atomic_dec_and_test - decrement by 1 and test
6026@@ -277,6 +372,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6027 * Atomically increments @v by 1.
6028 */
6029 #define atomic_inc(v) atomic_add(1, (v))
6030+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6031+{
6032+ atomic_add_unchecked(1, v);
6033+}
6034
6035 /*
6036 * atomic_dec - decrement and test
6037@@ -285,6 +384,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6038 * Atomically decrements @v by 1.
6039 */
6040 #define atomic_dec(v) atomic_sub(1, (v))
6041+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6042+{
6043+ atomic_sub_unchecked(1, v);
6044+}
6045
6046 /*
6047 * atomic_add_negative - add and test if negative
6048@@ -306,54 +409,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6049 * @v: pointer of type atomic64_t
6050 *
6051 */
6052-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6053+static inline long atomic64_read(const atomic64_t *v)
6054+{
6055+ return ACCESS_ONCE(v->counter);
6056+}
6057+
6058+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6059+{
6060+ return ACCESS_ONCE(v->counter);
6061+}
6062
6063 /*
6064 * atomic64_set - set atomic variable
6065 * @v: pointer of type atomic64_t
6066 * @i: required value
6067 */
6068-#define atomic64_set(v, i) ((v)->counter = (i))
6069+static inline void atomic64_set(atomic64_t *v, long i)
6070+{
6071+ v->counter = i;
6072+}
6073
6074-#define ATOMIC64_OP(op, c_op, asm_op) \
6075-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6076+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6077+{
6078+ v->counter = i;
6079+}
6080+
6081+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6082+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6083 { \
6084 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6085 long temp; \
6086 \
6087 __asm__ __volatile__( \
6088- " .set arch=r4000 \n" \
6089- "1: lld %0, %1 # atomic64_" #op " \n" \
6090- " " #asm_op " %0, %2 \n" \
6091+ " .set mips3 \n" \
6092+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6093+ "2: " #asm_op " %0, %2 \n" \
6094 " scd %0, %1 \n" \
6095 " beqzl %0, 1b \n" \
6096+ extable \
6097 " .set mips0 \n" \
6098 : "=&r" (temp), "+m" (v->counter) \
6099 : "Ir" (i)); \
6100 } else if (kernel_uses_llsc) { \
6101 long temp; \
6102 \
6103- do { \
6104- __asm__ __volatile__( \
6105- " .set arch=r4000 \n" \
6106- " lld %0, %1 # atomic64_" #op "\n" \
6107- " " #asm_op " %0, %2 \n" \
6108- " scd %0, %1 \n" \
6109- " .set mips0 \n" \
6110- : "=&r" (temp), "+m" (v->counter) \
6111- : "Ir" (i)); \
6112- } while (unlikely(!temp)); \
6113+ __asm__ __volatile__( \
6114+ " .set mips3 \n" \
6115+ " lld %0, %1 # atomic64_" #op #suffix "\n" \
6116+ "2: " #asm_op " %0, %2 \n" \
6117+ " scd %0, %1 \n" \
6118+ " beqz %0, 1b \n" \
6119+ extable \
6120+ " .set mips0 \n" \
6121+ : "=&r" (temp), "+m" (v->counter) \
6122+ : "Ir" (i)); \
6123 } else { \
6124 unsigned long flags; \
6125 \
6126 raw_local_irq_save(flags); \
6127- v->counter c_op i; \
6128+ __asm__ __volatile__( \
6129+ "2: " #asm_op " %0, %1 \n" \
6130+ extable \
6131+ : "+r" (v->counter) : "Ir" (i)); \
6132 raw_local_irq_restore(flags); \
6133 } \
6134 } \
6135
6136-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6137-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6138+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , asm_op##u) \
6139+ __ATOMIC64_OP(op, _unchecked, asm_op)
6140+
6141+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6142+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6143 { \
6144 long result; \
6145 \
6146@@ -363,38 +489,48 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6147 long temp; \
6148 \
6149 __asm__ __volatile__( \
6150- " .set arch=r4000 \n" \
6151+ " .set mips3 \n" \
6152 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6153- " " #asm_op " %0, %1, %3 \n" \
6154+ "2: " #asm_op " %0, %1, %3 \n" \
6155 " scd %0, %2 \n" \
6156 " beqzl %0, 1b \n" \
6157- " " #asm_op " %0, %1, %3 \n" \
6158+ post_op \
6159+ extable \
6160+ "4: " #asm_op " %0, %1, %3 \n" \
6161+ "5: \n" \
6162 " .set mips0 \n" \
6163 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
6164 : "Ir" (i)); \
6165 } else if (kernel_uses_llsc) { \
6166 long temp; \
6167 \
6168- do { \
6169- __asm__ __volatile__( \
6170- " .set arch=r4000 \n" \
6171- " lld %1, %2 # atomic64_" #op "_return\n" \
6172- " " #asm_op " %0, %1, %3 \n" \
6173- " scd %0, %2 \n" \
6174- " .set mips0 \n" \
6175- : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6176- : "Ir" (i), "m" (v->counter) \
6177- : "memory"); \
6178- } while (unlikely(!result)); \
6179+ __asm__ __volatile__( \
6180+ " .set mips3 \n" \
6181+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n" \
6182+ "2: " #asm_op " %0, %1, %3 \n" \
6183+ " scd %0, %2 \n" \
6184+ " beqz %0, 1b \n" \
6185+ post_op \
6186+ extable \
6187+ "4: " #asm_op " %0, %1, %3 \n" \
6188+ "5: \n" \
6189+ " .set mips0 \n" \
6190+ : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6191+ : "Ir" (i), "m" (v->counter) \
6192+ : "memory"); \
6193 \
6194 result = temp; result c_op i; \
6195 } else { \
6196 unsigned long flags; \
6197 \
6198 raw_local_irq_save(flags); \
6199- result = v->counter; \
6200- result c_op i; \
6201- v->counter = result; \
6202+ __asm__ __volatile__( \
6203+ " ld %0, %1 \n" \
6204+ "2: " #asm_op " %0, %1, %2 \n" \
6205+ " sd %0, %1 \n" \
6206+ "3: \n" \
6207+ extable \
6208+ : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
6209 raw_local_irq_restore(flags); \
6210 } \
6211 \
6212@@ -403,16 +539,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6213 return result; \
6214 }
6215
6216-#define ATOMIC64_OPS(op, c_op, asm_op) \
6217- ATOMIC64_OP(op, c_op, asm_op) \
6218- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6219+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
6220+ __ATOMIC64_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6221
6222-ATOMIC64_OPS(add, +=, daddu)
6223-ATOMIC64_OPS(sub, -=, dsubu)
6224+#define ATOMIC64_OPS(op, asm_op) \
6225+ ATOMIC64_OP(op, asm_op) \
6226+ ATOMIC64_OP_RETURN(op, asm_op)
6227+
6228+ATOMIC64_OPS(add, dadd)
6229+ATOMIC64_OPS(sub, dsub)
6230
6231 #undef ATOMIC64_OPS
6232 #undef ATOMIC64_OP_RETURN
6233+#undef __ATOMIC64_OP_RETURN
6234 #undef ATOMIC64_OP
6235+#undef __ATOMIC64_OP
6236+#undef __OVERFLOW_EXTABLE
6237+#undef __OVERFLOW_POST
6238
6239 /*
6240 * atomic64_sub_if_positive - conditionally subtract integer from atomic variable
6241@@ -422,7 +565,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6242 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6243 * The function returns the old value of @v minus @i.
6244 */
6245-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6246+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6247 {
6248 long result;
6249
6250@@ -479,9 +622,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6251 return result;
6252 }
6253
6254-#define atomic64_cmpxchg(v, o, n) \
6255- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6256-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6257+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6258+{
6259+ return cmpxchg(&v->counter, old, new);
6260+}
6261+
6262+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6263+ long new)
6264+{
6265+ return cmpxchg(&(v->counter), old, new);
6266+}
6267+
6268+static inline long atomic64_xchg(atomic64_t *v, long new)
6269+{
6270+ return xchg(&v->counter, new);
6271+}
6272+
6273+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6274+{
6275+ return xchg(&(v->counter), new);
6276+}
6277
6278 /**
6279 * atomic64_add_unless - add unless the number is a given value
6280@@ -511,6 +671,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6281
6282 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6283 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6284+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6285
6286 /*
6287 * atomic64_sub_and_test - subtract value from variable and test result
6288@@ -532,6 +693,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6289 * other cases.
6290 */
6291 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6292+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6293
6294 /*
6295 * atomic64_dec_and_test - decrement by 1 and test
6296@@ -556,6 +718,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6297 * Atomically increments @v by 1.
6298 */
6299 #define atomic64_inc(v) atomic64_add(1, (v))
6300+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6301
6302 /*
6303 * atomic64_dec - decrement and test
6304@@ -564,6 +727,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6305 * Atomically decrements @v by 1.
6306 */
6307 #define atomic64_dec(v) atomic64_sub(1, (v))
6308+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6309
6310 /*
6311 * atomic64_add_negative - add and test if negative
6312diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6313index d0101dd..266982c 100644
6314--- a/arch/mips/include/asm/barrier.h
6315+++ b/arch/mips/include/asm/barrier.h
6316@@ -184,7 +184,7 @@
6317 do { \
6318 compiletime_assert_atomic_type(*p); \
6319 smp_mb(); \
6320- ACCESS_ONCE(*p) = (v); \
6321+ ACCESS_ONCE_RW(*p) = (v); \
6322 } while (0)
6323
6324 #define smp_load_acquire(p) \
6325diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6326index b4db69f..8f3b093 100644
6327--- a/arch/mips/include/asm/cache.h
6328+++ b/arch/mips/include/asm/cache.h
6329@@ -9,10 +9,11 @@
6330 #ifndef _ASM_CACHE_H
6331 #define _ASM_CACHE_H
6332
6333+#include <linux/const.h>
6334 #include <kmalloc.h>
6335
6336 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6337-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6338+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6339
6340 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6341 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6342diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6343index 1d38fe0..9beabc9 100644
6344--- a/arch/mips/include/asm/elf.h
6345+++ b/arch/mips/include/asm/elf.h
6346@@ -381,13 +381,16 @@ extern const char *__elf_platform;
6347 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6348 #endif
6349
6350+#ifdef CONFIG_PAX_ASLR
6351+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6352+
6353+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6354+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6355+#endif
6356+
6357 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6358 struct linux_binprm;
6359 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6360 int uses_interp);
6361
6362-struct mm_struct;
6363-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6364-#define arch_randomize_brk arch_randomize_brk
6365-
6366 #endif /* _ASM_ELF_H */
6367diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6368index c1f6afa..38cc6e9 100644
6369--- a/arch/mips/include/asm/exec.h
6370+++ b/arch/mips/include/asm/exec.h
6371@@ -12,6 +12,6 @@
6372 #ifndef _ASM_EXEC_H
6373 #define _ASM_EXEC_H
6374
6375-extern unsigned long arch_align_stack(unsigned long sp);
6376+#define arch_align_stack(x) ((x) & ~0xfUL)
6377
6378 #endif /* _ASM_EXEC_H */
6379diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6380index 9e8ef59..1139d6b 100644
6381--- a/arch/mips/include/asm/hw_irq.h
6382+++ b/arch/mips/include/asm/hw_irq.h
6383@@ -10,7 +10,7 @@
6384
6385 #include <linux/atomic.h>
6386
6387-extern atomic_t irq_err_count;
6388+extern atomic_unchecked_t irq_err_count;
6389
6390 /*
6391 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6392diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6393index 46dfc3c..a16b13a 100644
6394--- a/arch/mips/include/asm/local.h
6395+++ b/arch/mips/include/asm/local.h
6396@@ -12,15 +12,25 @@ typedef struct
6397 atomic_long_t a;
6398 } local_t;
6399
6400+typedef struct {
6401+ atomic_long_unchecked_t a;
6402+} local_unchecked_t;
6403+
6404 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6405
6406 #define local_read(l) atomic_long_read(&(l)->a)
6407+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6408 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6409+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6410
6411 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6412+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6413 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6414+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6415 #define local_inc(l) atomic_long_inc(&(l)->a)
6416+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6417 #define local_dec(l) atomic_long_dec(&(l)->a)
6418+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6419
6420 /*
6421 * Same as above, but return the result value
6422@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6423 return result;
6424 }
6425
6426+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6427+{
6428+ unsigned long result;
6429+
6430+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6431+ unsigned long temp;
6432+
6433+ __asm__ __volatile__(
6434+ " .set mips3 \n"
6435+ "1:" __LL "%1, %2 # local_add_return \n"
6436+ " addu %0, %1, %3 \n"
6437+ __SC "%0, %2 \n"
6438+ " beqzl %0, 1b \n"
6439+ " addu %0, %1, %3 \n"
6440+ " .set mips0 \n"
6441+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6442+ : "Ir" (i), "m" (l->a.counter)
6443+ : "memory");
6444+ } else if (kernel_uses_llsc) {
6445+ unsigned long temp;
6446+
6447+ __asm__ __volatile__(
6448+ " .set mips3 \n"
6449+ "1:" __LL "%1, %2 # local_add_return \n"
6450+ " addu %0, %1, %3 \n"
6451+ __SC "%0, %2 \n"
6452+ " beqz %0, 1b \n"
6453+ " addu %0, %1, %3 \n"
6454+ " .set mips0 \n"
6455+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6456+ : "Ir" (i), "m" (l->a.counter)
6457+ : "memory");
6458+ } else {
6459+ unsigned long flags;
6460+
6461+ local_irq_save(flags);
6462+ result = l->a.counter;
6463+ result += i;
6464+ l->a.counter = result;
6465+ local_irq_restore(flags);
6466+ }
6467+
6468+ return result;
6469+}
6470+
6471 static __inline__ long local_sub_return(long i, local_t * l)
6472 {
6473 unsigned long result;
6474@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6475
6476 #define local_cmpxchg(l, o, n) \
6477 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6478+#define local_cmpxchg_unchecked(l, o, n) \
6479+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6480 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6481
6482 /**
6483diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6484index 3be8180..c4798d5 100644
6485--- a/arch/mips/include/asm/page.h
6486+++ b/arch/mips/include/asm/page.h
6487@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6488 #ifdef CONFIG_CPU_MIPS32
6489 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6490 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6491- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6492+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6493 #else
6494 typedef struct { unsigned long long pte; } pte_t;
6495 #define pte_val(x) ((x).pte)
6496diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6497index b336037..5b874cc 100644
6498--- a/arch/mips/include/asm/pgalloc.h
6499+++ b/arch/mips/include/asm/pgalloc.h
6500@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6501 {
6502 set_pud(pud, __pud((unsigned long)pmd));
6503 }
6504+
6505+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6506+{
6507+ pud_populate(mm, pud, pmd);
6508+}
6509 #endif
6510
6511 /*
6512diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6513index d6d1928..ce4f822 100644
6514--- a/arch/mips/include/asm/pgtable.h
6515+++ b/arch/mips/include/asm/pgtable.h
6516@@ -20,6 +20,9 @@
6517 #include <asm/io.h>
6518 #include <asm/pgtable-bits.h>
6519
6520+#define ktla_ktva(addr) (addr)
6521+#define ktva_ktla(addr) (addr)
6522+
6523 struct mm_struct;
6524 struct vm_area_struct;
6525
6526diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6527index 7de8658..c109224 100644
6528--- a/arch/mips/include/asm/thread_info.h
6529+++ b/arch/mips/include/asm/thread_info.h
6530@@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
6531 #define TIF_SECCOMP 4 /* secure computing */
6532 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6533 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6534+/* li takes a 32bit immediate */
6535+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6536+
6537 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6538 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6539 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6540@@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
6541 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6542 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6543 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6544+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6545
6546 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6547 _TIF_SYSCALL_AUDIT | \
6548- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6549+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6550+ _TIF_GRSEC_SETXID)
6551
6552 /* work to do in syscall_trace_leave() */
6553 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6554- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6555+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6556
6557 /* work to do on interrupt/exception return */
6558 #define _TIF_WORK_MASK \
6559@@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
6560 /* work to do on any return to u-space */
6561 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6562 _TIF_WORK_SYSCALL_EXIT | \
6563- _TIF_SYSCALL_TRACEPOINT)
6564+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6565
6566 /*
6567 * We stash processor id into a COP0 register to retrieve it fast
6568diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6569index 22a5624..7c96295 100644
6570--- a/arch/mips/include/asm/uaccess.h
6571+++ b/arch/mips/include/asm/uaccess.h
6572@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6573 __ok == 0; \
6574 })
6575
6576+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6577 #define access_ok(type, addr, size) \
6578 likely(__access_ok((addr), (size), __access_mask))
6579
6580diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6581index 1188e00..41cf144 100644
6582--- a/arch/mips/kernel/binfmt_elfn32.c
6583+++ b/arch/mips/kernel/binfmt_elfn32.c
6584@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6585 #undef ELF_ET_DYN_BASE
6586 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6587
6588+#ifdef CONFIG_PAX_ASLR
6589+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6590+
6591+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6592+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6593+#endif
6594+
6595 #include <asm/processor.h>
6596 #include <linux/module.h>
6597 #include <linux/elfcore.h>
6598diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6599index 9287678..f870e47 100644
6600--- a/arch/mips/kernel/binfmt_elfo32.c
6601+++ b/arch/mips/kernel/binfmt_elfo32.c
6602@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6603 #undef ELF_ET_DYN_BASE
6604 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6605
6606+#ifdef CONFIG_PAX_ASLR
6607+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6608+
6609+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6610+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6611+#endif
6612+
6613 #include <asm/processor.h>
6614
6615 #include <linux/module.h>
6616diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6617index 50b3648..c2f3cec 100644
6618--- a/arch/mips/kernel/i8259.c
6619+++ b/arch/mips/kernel/i8259.c
6620@@ -201,7 +201,7 @@ spurious_8259A_irq:
6621 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6622 spurious_irq_mask |= irqmask;
6623 }
6624- atomic_inc(&irq_err_count);
6625+ atomic_inc_unchecked(&irq_err_count);
6626 /*
6627 * Theoretically we do not have to handle this IRQ,
6628 * but in Linux this does not cause problems and is
6629diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6630index 44a1f79..2bd6aa3 100644
6631--- a/arch/mips/kernel/irq-gt641xx.c
6632+++ b/arch/mips/kernel/irq-gt641xx.c
6633@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6634 }
6635 }
6636
6637- atomic_inc(&irq_err_count);
6638+ atomic_inc_unchecked(&irq_err_count);
6639 }
6640
6641 void __init gt641xx_irq_init(void)
6642diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6643index d2bfbc2..a8eacd2 100644
6644--- a/arch/mips/kernel/irq.c
6645+++ b/arch/mips/kernel/irq.c
6646@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6647 printk("unexpected IRQ # %d\n", irq);
6648 }
6649
6650-atomic_t irq_err_count;
6651+atomic_unchecked_t irq_err_count;
6652
6653 int arch_show_interrupts(struct seq_file *p, int prec)
6654 {
6655- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6656+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6657 return 0;
6658 }
6659
6660 asmlinkage void spurious_interrupt(void)
6661 {
6662- atomic_inc(&irq_err_count);
6663+ atomic_inc_unchecked(&irq_err_count);
6664 }
6665
6666 void __init init_IRQ(void)
6667@@ -109,7 +109,10 @@ void __init init_IRQ(void)
6668 #endif
6669 }
6670
6671+
6672 #ifdef DEBUG_STACKOVERFLOW
6673+extern void gr_handle_kernel_exploit(void);
6674+
6675 static inline void check_stack_overflow(void)
6676 {
6677 unsigned long sp;
6678@@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6679 printk("do_IRQ: stack overflow: %ld\n",
6680 sp - sizeof(struct thread_info));
6681 dump_stack();
6682+ gr_handle_kernel_exploit();
6683 }
6684 }
6685 #else
6686diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6687index 0614717..002fa43 100644
6688--- a/arch/mips/kernel/pm-cps.c
6689+++ b/arch/mips/kernel/pm-cps.c
6690@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6691 nc_core_ready_count = nc_addr;
6692
6693 /* Ensure ready_count is zero-initialised before the assembly runs */
6694- ACCESS_ONCE(*nc_core_ready_count) = 0;
6695+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6696 coupled_barrier(&per_cpu(pm_barrier, core), online);
6697
6698 /* Run the generated entry code */
6699diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6700index 636b074..8fbb91f 100644
6701--- a/arch/mips/kernel/process.c
6702+++ b/arch/mips/kernel/process.c
6703@@ -520,15 +520,3 @@ unsigned long get_wchan(struct task_struct *task)
6704 out:
6705 return pc;
6706 }
6707-
6708-/*
6709- * Don't forget that the stack pointer must be aligned on a 8 bytes
6710- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6711- */
6712-unsigned long arch_align_stack(unsigned long sp)
6713-{
6714- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6715- sp -= get_random_int() & ~PAGE_MASK;
6716-
6717- return sp & ALMASK;
6718-}
6719diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6720index 9d1487d..10c5da5 100644
6721--- a/arch/mips/kernel/ptrace.c
6722+++ b/arch/mips/kernel/ptrace.c
6723@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6724 return ret;
6725 }
6726
6727+#ifdef CONFIG_GRKERNSEC_SETXID
6728+extern void gr_delayed_cred_worker(void);
6729+#endif
6730+
6731 /*
6732 * Notification of system call entry/exit
6733 * - triggered by current->work.syscall_trace
6734@@ -777,6 +781,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6735 tracehook_report_syscall_entry(regs))
6736 ret = -1;
6737
6738+#ifdef CONFIG_GRKERNSEC_SETXID
6739+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6740+ gr_delayed_cred_worker();
6741+#endif
6742+
6743 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6744 trace_sys_enter(regs, regs->regs[2]);
6745
6746diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6747index 07fc524..b9d7f28 100644
6748--- a/arch/mips/kernel/reset.c
6749+++ b/arch/mips/kernel/reset.c
6750@@ -13,6 +13,7 @@
6751 #include <linux/reboot.h>
6752
6753 #include <asm/reboot.h>
6754+#include <asm/bug.h>
6755
6756 /*
6757 * Urgs ... Too many MIPS machines to handle this in a generic way.
6758@@ -29,16 +30,19 @@ void machine_restart(char *command)
6759 {
6760 if (_machine_restart)
6761 _machine_restart(command);
6762+ BUG();
6763 }
6764
6765 void machine_halt(void)
6766 {
6767 if (_machine_halt)
6768 _machine_halt();
6769+ BUG();
6770 }
6771
6772 void machine_power_off(void)
6773 {
6774 if (pm_power_off)
6775 pm_power_off();
6776+ BUG();
6777 }
6778diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6779index 2242bdd..b284048 100644
6780--- a/arch/mips/kernel/sync-r4k.c
6781+++ b/arch/mips/kernel/sync-r4k.c
6782@@ -18,8 +18,8 @@
6783 #include <asm/mipsregs.h>
6784
6785 static atomic_t count_start_flag = ATOMIC_INIT(0);
6786-static atomic_t count_count_start = ATOMIC_INIT(0);
6787-static atomic_t count_count_stop = ATOMIC_INIT(0);
6788+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6789+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6790 static atomic_t count_reference = ATOMIC_INIT(0);
6791
6792 #define COUNTON 100
6793@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6794
6795 for (i = 0; i < NR_LOOPS; i++) {
6796 /* slaves loop on '!= 2' */
6797- while (atomic_read(&count_count_start) != 1)
6798+ while (atomic_read_unchecked(&count_count_start) != 1)
6799 mb();
6800- atomic_set(&count_count_stop, 0);
6801+ atomic_set_unchecked(&count_count_stop, 0);
6802 smp_wmb();
6803
6804 /* this lets the slaves write their count register */
6805- atomic_inc(&count_count_start);
6806+ atomic_inc_unchecked(&count_count_start);
6807
6808 /*
6809 * Everyone initialises count in the last loop:
6810@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6811 /*
6812 * Wait for all slaves to leave the synchronization point:
6813 */
6814- while (atomic_read(&count_count_stop) != 1)
6815+ while (atomic_read_unchecked(&count_count_stop) != 1)
6816 mb();
6817- atomic_set(&count_count_start, 0);
6818+ atomic_set_unchecked(&count_count_start, 0);
6819 smp_wmb();
6820- atomic_inc(&count_count_stop);
6821+ atomic_inc_unchecked(&count_count_stop);
6822 }
6823 /* Arrange for an interrupt in a short while */
6824 write_c0_compare(read_c0_count() + COUNTON);
6825@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6826 initcount = atomic_read(&count_reference);
6827
6828 for (i = 0; i < NR_LOOPS; i++) {
6829- atomic_inc(&count_count_start);
6830- while (atomic_read(&count_count_start) != 2)
6831+ atomic_inc_unchecked(&count_count_start);
6832+ while (atomic_read_unchecked(&count_count_start) != 2)
6833 mb();
6834
6835 /*
6836@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6837 if (i == NR_LOOPS-1)
6838 write_c0_count(initcount);
6839
6840- atomic_inc(&count_count_stop);
6841- while (atomic_read(&count_count_stop) != 2)
6842+ atomic_inc_unchecked(&count_count_stop);
6843+ while (atomic_read_unchecked(&count_count_stop) != 2)
6844 mb();
6845 }
6846 /* Arrange for an interrupt in a short while */
6847diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6848index 22b19c2..c5cc8c4 100644
6849--- a/arch/mips/kernel/traps.c
6850+++ b/arch/mips/kernel/traps.c
6851@@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6852 siginfo_t info;
6853
6854 prev_state = exception_enter();
6855- die_if_kernel("Integer overflow", regs);
6856+ if (unlikely(!user_mode(regs))) {
6857+
6858+#ifdef CONFIG_PAX_REFCOUNT
6859+ if (fixup_exception(regs)) {
6860+ pax_report_refcount_overflow(regs);
6861+ exception_exit(prev_state);
6862+ return;
6863+ }
6864+#endif
6865+
6866+ die("Integer overflow", regs);
6867+ }
6868
6869 info.si_code = FPE_INTOVF;
6870 info.si_signo = SIGFPE;
6871diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6872index e3b21e5..ea5ff7c 100644
6873--- a/arch/mips/kvm/mips.c
6874+++ b/arch/mips/kvm/mips.c
6875@@ -805,7 +805,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6876 return r;
6877 }
6878
6879-int kvm_arch_init(void *opaque)
6880+int kvm_arch_init(const void *opaque)
6881 {
6882 if (kvm_mips_callbacks) {
6883 kvm_err("kvm: module already exists\n");
6884diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6885index becc42b..9e43d4b 100644
6886--- a/arch/mips/mm/fault.c
6887+++ b/arch/mips/mm/fault.c
6888@@ -28,6 +28,23 @@
6889 #include <asm/highmem.h> /* For VMALLOC_END */
6890 #include <linux/kdebug.h>
6891
6892+#ifdef CONFIG_PAX_PAGEEXEC
6893+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6894+{
6895+ unsigned long i;
6896+
6897+ printk(KERN_ERR "PAX: bytes at PC: ");
6898+ for (i = 0; i < 5; i++) {
6899+ unsigned int c;
6900+ if (get_user(c, (unsigned int *)pc+i))
6901+ printk(KERN_CONT "???????? ");
6902+ else
6903+ printk(KERN_CONT "%08x ", c);
6904+ }
6905+ printk("\n");
6906+}
6907+#endif
6908+
6909 /*
6910 * This routine handles page faults. It determines the address,
6911 * and the problem, and then passes it off to one of the appropriate
6912@@ -199,6 +216,14 @@ bad_area:
6913 bad_area_nosemaphore:
6914 /* User mode accesses just cause a SIGSEGV */
6915 if (user_mode(regs)) {
6916+
6917+#ifdef CONFIG_PAX_PAGEEXEC
6918+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6919+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6920+ do_group_exit(SIGKILL);
6921+ }
6922+#endif
6923+
6924 tsk->thread.cp0_badvaddr = address;
6925 tsk->thread.error_code = write;
6926 #if 0
6927diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6928index f1baadd..5472dca 100644
6929--- a/arch/mips/mm/mmap.c
6930+++ b/arch/mips/mm/mmap.c
6931@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6932 struct vm_area_struct *vma;
6933 unsigned long addr = addr0;
6934 int do_color_align;
6935+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6936 struct vm_unmapped_area_info info;
6937
6938 if (unlikely(len > TASK_SIZE))
6939@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6940 do_color_align = 1;
6941
6942 /* requesting a specific address */
6943+
6944+#ifdef CONFIG_PAX_RANDMMAP
6945+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6946+#endif
6947+
6948 if (addr) {
6949 if (do_color_align)
6950 addr = COLOUR_ALIGN(addr, pgoff);
6951@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6952 addr = PAGE_ALIGN(addr);
6953
6954 vma = find_vma(mm, addr);
6955- if (TASK_SIZE - len >= addr &&
6956- (!vma || addr + len <= vma->vm_start))
6957+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6958 return addr;
6959 }
6960
6961 info.length = len;
6962 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6963 info.align_offset = pgoff << PAGE_SHIFT;
6964+ info.threadstack_offset = offset;
6965
6966 if (dir == DOWN) {
6967 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6968@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6969 {
6970 unsigned long random_factor = 0UL;
6971
6972+#ifdef CONFIG_PAX_RANDMMAP
6973+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6974+#endif
6975+
6976 if (current->flags & PF_RANDOMIZE) {
6977 random_factor = get_random_int();
6978 random_factor = random_factor << PAGE_SHIFT;
6979@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6980
6981 if (mmap_is_legacy()) {
6982 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
6983+
6984+#ifdef CONFIG_PAX_RANDMMAP
6985+ if (mm->pax_flags & MF_PAX_RANDMMAP)
6986+ mm->mmap_base += mm->delta_mmap;
6987+#endif
6988+
6989 mm->get_unmapped_area = arch_get_unmapped_area;
6990 } else {
6991 mm->mmap_base = mmap_base(random_factor);
6992+
6993+#ifdef CONFIG_PAX_RANDMMAP
6994+ if (mm->pax_flags & MF_PAX_RANDMMAP)
6995+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6996+#endif
6997+
6998 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6999 }
7000 }
7001
7002-static inline unsigned long brk_rnd(void)
7003-{
7004- unsigned long rnd = get_random_int();
7005-
7006- rnd = rnd << PAGE_SHIFT;
7007- /* 8MB for 32bit, 256MB for 64bit */
7008- if (TASK_IS_32BIT_ADDR)
7009- rnd = rnd & 0x7ffffful;
7010- else
7011- rnd = rnd & 0xffffffful;
7012-
7013- return rnd;
7014-}
7015-
7016-unsigned long arch_randomize_brk(struct mm_struct *mm)
7017-{
7018- unsigned long base = mm->brk;
7019- unsigned long ret;
7020-
7021- ret = PAGE_ALIGN(base + brk_rnd());
7022-
7023- if (ret < mm->brk)
7024- return mm->brk;
7025-
7026- return ret;
7027-}
7028-
7029 int __virt_addr_valid(const volatile void *kaddr)
7030 {
7031 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7032diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
7033index 59cccd9..f39ac2f 100644
7034--- a/arch/mips/pci/pci-octeon.c
7035+++ b/arch/mips/pci/pci-octeon.c
7036@@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7037
7038
7039 static struct pci_ops octeon_pci_ops = {
7040- octeon_read_config,
7041- octeon_write_config,
7042+ .read = octeon_read_config,
7043+ .write = octeon_write_config,
7044 };
7045
7046 static struct resource octeon_pci_mem_resource = {
7047diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7048index 5e36c33..eb4a17b 100644
7049--- a/arch/mips/pci/pcie-octeon.c
7050+++ b/arch/mips/pci/pcie-octeon.c
7051@@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7052 }
7053
7054 static struct pci_ops octeon_pcie0_ops = {
7055- octeon_pcie0_read_config,
7056- octeon_pcie0_write_config,
7057+ .read = octeon_pcie0_read_config,
7058+ .write = octeon_pcie0_write_config,
7059 };
7060
7061 static struct resource octeon_pcie0_mem_resource = {
7062@@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7063 };
7064
7065 static struct pci_ops octeon_pcie1_ops = {
7066- octeon_pcie1_read_config,
7067- octeon_pcie1_write_config,
7068+ .read = octeon_pcie1_read_config,
7069+ .write = octeon_pcie1_write_config,
7070 };
7071
7072 static struct resource octeon_pcie1_mem_resource = {
7073@@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7074 };
7075
7076 static struct pci_ops octeon_dummy_ops = {
7077- octeon_dummy_read_config,
7078- octeon_dummy_write_config,
7079+ .read = octeon_dummy_read_config,
7080+ .write = octeon_dummy_write_config,
7081 };
7082
7083 static struct resource octeon_dummy_mem_resource = {
7084diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7085index a2358b4..7cead4f 100644
7086--- a/arch/mips/sgi-ip27/ip27-nmi.c
7087+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7088@@ -187,9 +187,9 @@ void
7089 cont_nmi_dump(void)
7090 {
7091 #ifndef REAL_NMI_SIGNAL
7092- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7093+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7094
7095- atomic_inc(&nmied_cpus);
7096+ atomic_inc_unchecked(&nmied_cpus);
7097 #endif
7098 /*
7099 * Only allow 1 cpu to proceed
7100@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7101 udelay(10000);
7102 }
7103 #else
7104- while (atomic_read(&nmied_cpus) != num_online_cpus());
7105+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7106 #endif
7107
7108 /*
7109diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7110index a046b30..6799527 100644
7111--- a/arch/mips/sni/rm200.c
7112+++ b/arch/mips/sni/rm200.c
7113@@ -270,7 +270,7 @@ spurious_8259A_irq:
7114 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7115 spurious_irq_mask |= irqmask;
7116 }
7117- atomic_inc(&irq_err_count);
7118+ atomic_inc_unchecked(&irq_err_count);
7119 /*
7120 * Theoretically we do not have to handle this IRQ,
7121 * but in Linux this does not cause problems and is
7122diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7123index 41e873b..34d33a7 100644
7124--- a/arch/mips/vr41xx/common/icu.c
7125+++ b/arch/mips/vr41xx/common/icu.c
7126@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7127
7128 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7129
7130- atomic_inc(&irq_err_count);
7131+ atomic_inc_unchecked(&irq_err_count);
7132
7133 return -1;
7134 }
7135diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7136index ae0e4ee..e8f0692 100644
7137--- a/arch/mips/vr41xx/common/irq.c
7138+++ b/arch/mips/vr41xx/common/irq.c
7139@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7140 irq_cascade_t *cascade;
7141
7142 if (irq >= NR_IRQS) {
7143- atomic_inc(&irq_err_count);
7144+ atomic_inc_unchecked(&irq_err_count);
7145 return;
7146 }
7147
7148@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7149 ret = cascade->get_irq(irq);
7150 irq = ret;
7151 if (ret < 0)
7152- atomic_inc(&irq_err_count);
7153+ atomic_inc_unchecked(&irq_err_count);
7154 else
7155 irq_dispatch(irq);
7156 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7157diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7158index 967d144..db12197 100644
7159--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7160+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7161@@ -11,12 +11,14 @@
7162 #ifndef _ASM_PROC_CACHE_H
7163 #define _ASM_PROC_CACHE_H
7164
7165+#include <linux/const.h>
7166+
7167 /* L1 cache */
7168
7169 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7170 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7171-#define L1_CACHE_BYTES 16 /* bytes per entry */
7172 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7173+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7174 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7175
7176 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7177diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7178index bcb5df2..84fabd2 100644
7179--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7180+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7181@@ -16,13 +16,15 @@
7182 #ifndef _ASM_PROC_CACHE_H
7183 #define _ASM_PROC_CACHE_H
7184
7185+#include <linux/const.h>
7186+
7187 /*
7188 * L1 cache
7189 */
7190 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7191 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7192-#define L1_CACHE_BYTES 32 /* bytes per entry */
7193 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7194+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7195 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7196
7197 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7198diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7199index 4ce7a01..449202a 100644
7200--- a/arch/openrisc/include/asm/cache.h
7201+++ b/arch/openrisc/include/asm/cache.h
7202@@ -19,11 +19,13 @@
7203 #ifndef __ASM_OPENRISC_CACHE_H
7204 #define __ASM_OPENRISC_CACHE_H
7205
7206+#include <linux/const.h>
7207+
7208 /* FIXME: How can we replace these with values from the CPU...
7209 * they shouldn't be hard-coded!
7210 */
7211
7212-#define L1_CACHE_BYTES 16
7213 #define L1_CACHE_SHIFT 4
7214+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7215
7216 #endif /* __ASM_OPENRISC_CACHE_H */
7217diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7218index 226f8ca..9d9b87d 100644
7219--- a/arch/parisc/include/asm/atomic.h
7220+++ b/arch/parisc/include/asm/atomic.h
7221@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7222 return dec;
7223 }
7224
7225+#define atomic64_read_unchecked(v) atomic64_read(v)
7226+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7227+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7228+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7229+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7230+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7231+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7232+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7233+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7234+
7235 #endif /* !CONFIG_64BIT */
7236
7237
7238diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7239index 47f11c7..3420df2 100644
7240--- a/arch/parisc/include/asm/cache.h
7241+++ b/arch/parisc/include/asm/cache.h
7242@@ -5,6 +5,7 @@
7243 #ifndef __ARCH_PARISC_CACHE_H
7244 #define __ARCH_PARISC_CACHE_H
7245
7246+#include <linux/const.h>
7247
7248 /*
7249 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7250@@ -15,13 +16,13 @@
7251 * just ruin performance.
7252 */
7253 #ifdef CONFIG_PA20
7254-#define L1_CACHE_BYTES 64
7255 #define L1_CACHE_SHIFT 6
7256 #else
7257-#define L1_CACHE_BYTES 32
7258 #define L1_CACHE_SHIFT 5
7259 #endif
7260
7261+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7262+
7263 #ifndef __ASSEMBLY__
7264
7265 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7266diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7267index 3391d06..c23a2cc 100644
7268--- a/arch/parisc/include/asm/elf.h
7269+++ b/arch/parisc/include/asm/elf.h
7270@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7271
7272 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7273
7274+#ifdef CONFIG_PAX_ASLR
7275+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7276+
7277+#define PAX_DELTA_MMAP_LEN 16
7278+#define PAX_DELTA_STACK_LEN 16
7279+#endif
7280+
7281 /* This yields a mask that user programs can use to figure out what
7282 instruction set this CPU supports. This could be done in user space,
7283 but it's not easy, and we've already done it here. */
7284diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7285index f213f5b..0af3e8e 100644
7286--- a/arch/parisc/include/asm/pgalloc.h
7287+++ b/arch/parisc/include/asm/pgalloc.h
7288@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7289 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7290 }
7291
7292+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7293+{
7294+ pgd_populate(mm, pgd, pmd);
7295+}
7296+
7297 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7298 {
7299 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7300@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7301 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7302 #define pmd_free(mm, x) do { } while (0)
7303 #define pgd_populate(mm, pmd, pte) BUG()
7304+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7305
7306 #endif
7307
7308diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7309index 22b89d1..ce34230 100644
7310--- a/arch/parisc/include/asm/pgtable.h
7311+++ b/arch/parisc/include/asm/pgtable.h
7312@@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7313 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7314 #define PAGE_COPY PAGE_EXECREAD
7315 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7316+
7317+#ifdef CONFIG_PAX_PAGEEXEC
7318+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7319+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7320+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7321+#else
7322+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7323+# define PAGE_COPY_NOEXEC PAGE_COPY
7324+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7325+#endif
7326+
7327 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7328 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7329 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7330diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7331index a5cb070..8604ddc 100644
7332--- a/arch/parisc/include/asm/uaccess.h
7333+++ b/arch/parisc/include/asm/uaccess.h
7334@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7335 const void __user *from,
7336 unsigned long n)
7337 {
7338- int sz = __compiletime_object_size(to);
7339+ size_t sz = __compiletime_object_size(to);
7340 int ret = -EFAULT;
7341
7342- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7343+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7344 ret = __copy_from_user(to, from, n);
7345 else
7346 copy_from_user_overflow();
7347diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7348index 50dfafc..b9fc230 100644
7349--- a/arch/parisc/kernel/module.c
7350+++ b/arch/parisc/kernel/module.c
7351@@ -98,16 +98,38 @@
7352
7353 /* three functions to determine where in the module core
7354 * or init pieces the location is */
7355+static inline int in_init_rx(struct module *me, void *loc)
7356+{
7357+ return (loc >= me->module_init_rx &&
7358+ loc < (me->module_init_rx + me->init_size_rx));
7359+}
7360+
7361+static inline int in_init_rw(struct module *me, void *loc)
7362+{
7363+ return (loc >= me->module_init_rw &&
7364+ loc < (me->module_init_rw + me->init_size_rw));
7365+}
7366+
7367 static inline int in_init(struct module *me, void *loc)
7368 {
7369- return (loc >= me->module_init &&
7370- loc <= (me->module_init + me->init_size));
7371+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7372+}
7373+
7374+static inline int in_core_rx(struct module *me, void *loc)
7375+{
7376+ return (loc >= me->module_core_rx &&
7377+ loc < (me->module_core_rx + me->core_size_rx));
7378+}
7379+
7380+static inline int in_core_rw(struct module *me, void *loc)
7381+{
7382+ return (loc >= me->module_core_rw &&
7383+ loc < (me->module_core_rw + me->core_size_rw));
7384 }
7385
7386 static inline int in_core(struct module *me, void *loc)
7387 {
7388- return (loc >= me->module_core &&
7389- loc <= (me->module_core + me->core_size));
7390+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7391 }
7392
7393 static inline int in_local(struct module *me, void *loc)
7394@@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7395 }
7396
7397 /* align things a bit */
7398- me->core_size = ALIGN(me->core_size, 16);
7399- me->arch.got_offset = me->core_size;
7400- me->core_size += gots * sizeof(struct got_entry);
7401+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7402+ me->arch.got_offset = me->core_size_rw;
7403+ me->core_size_rw += gots * sizeof(struct got_entry);
7404
7405- me->core_size = ALIGN(me->core_size, 16);
7406- me->arch.fdesc_offset = me->core_size;
7407- me->core_size += fdescs * sizeof(Elf_Fdesc);
7408+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7409+ me->arch.fdesc_offset = me->core_size_rw;
7410+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7411
7412 me->arch.got_max = gots;
7413 me->arch.fdesc_max = fdescs;
7414@@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7415
7416 BUG_ON(value == 0);
7417
7418- got = me->module_core + me->arch.got_offset;
7419+ got = me->module_core_rw + me->arch.got_offset;
7420 for (i = 0; got[i].addr; i++)
7421 if (got[i].addr == value)
7422 goto out;
7423@@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7424 #ifdef CONFIG_64BIT
7425 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7426 {
7427- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7428+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7429
7430 if (!value) {
7431 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7432@@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7433
7434 /* Create new one */
7435 fdesc->addr = value;
7436- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7437+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7438 return (Elf_Addr)fdesc;
7439 }
7440 #endif /* CONFIG_64BIT */
7441@@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7442
7443 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7444 end = table + sechdrs[me->arch.unwind_section].sh_size;
7445- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7446+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7447
7448 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7449 me->arch.unwind_section, table, end, gp);
7450diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7451index e1ffea2..46ed66e 100644
7452--- a/arch/parisc/kernel/sys_parisc.c
7453+++ b/arch/parisc/kernel/sys_parisc.c
7454@@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7455 unsigned long task_size = TASK_SIZE;
7456 int do_color_align, last_mmap;
7457 struct vm_unmapped_area_info info;
7458+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7459
7460 if (len > task_size)
7461 return -ENOMEM;
7462@@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7463 goto found_addr;
7464 }
7465
7466+#ifdef CONFIG_PAX_RANDMMAP
7467+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7468+#endif
7469+
7470 if (addr) {
7471 if (do_color_align && last_mmap)
7472 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7473@@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7474 info.high_limit = mmap_upper_limit();
7475 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7476 info.align_offset = shared_align_offset(last_mmap, pgoff);
7477+ info.threadstack_offset = offset;
7478 addr = vm_unmapped_area(&info);
7479
7480 found_addr:
7481@@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7482 unsigned long addr = addr0;
7483 int do_color_align, last_mmap;
7484 struct vm_unmapped_area_info info;
7485+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7486
7487 #ifdef CONFIG_64BIT
7488 /* This should only ever run for 32-bit processes. */
7489@@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7490 }
7491
7492 /* requesting a specific address */
7493+#ifdef CONFIG_PAX_RANDMMAP
7494+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7495+#endif
7496+
7497 if (addr) {
7498 if (do_color_align && last_mmap)
7499 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7500@@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7501 info.high_limit = mm->mmap_base;
7502 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7503 info.align_offset = shared_align_offset(last_mmap, pgoff);
7504+ info.threadstack_offset = offset;
7505 addr = vm_unmapped_area(&info);
7506 if (!(addr & ~PAGE_MASK))
7507 goto found_addr;
7508@@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7509 mm->mmap_legacy_base = mmap_legacy_base();
7510 mm->mmap_base = mmap_upper_limit();
7511
7512+#ifdef CONFIG_PAX_RANDMMAP
7513+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7514+ mm->mmap_legacy_base += mm->delta_mmap;
7515+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7516+ }
7517+#endif
7518+
7519 if (mmap_is_legacy()) {
7520 mm->mmap_base = mm->mmap_legacy_base;
7521 mm->get_unmapped_area = arch_get_unmapped_area;
7522diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7523index 47ee620..1107387 100644
7524--- a/arch/parisc/kernel/traps.c
7525+++ b/arch/parisc/kernel/traps.c
7526@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7527
7528 down_read(&current->mm->mmap_sem);
7529 vma = find_vma(current->mm,regs->iaoq[0]);
7530- if (vma && (regs->iaoq[0] >= vma->vm_start)
7531- && (vma->vm_flags & VM_EXEC)) {
7532-
7533+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7534 fault_address = regs->iaoq[0];
7535 fault_space = regs->iasq[0];
7536
7537diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7538index 3ca9c11..d163ef7 100644
7539--- a/arch/parisc/mm/fault.c
7540+++ b/arch/parisc/mm/fault.c
7541@@ -15,6 +15,7 @@
7542 #include <linux/sched.h>
7543 #include <linux/interrupt.h>
7544 #include <linux/module.h>
7545+#include <linux/unistd.h>
7546
7547 #include <asm/uaccess.h>
7548 #include <asm/traps.h>
7549@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7550 static unsigned long
7551 parisc_acctyp(unsigned long code, unsigned int inst)
7552 {
7553- if (code == 6 || code == 16)
7554+ if (code == 6 || code == 7 || code == 16)
7555 return VM_EXEC;
7556
7557 switch (inst & 0xf0000000) {
7558@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7559 }
7560 #endif
7561
7562+#ifdef CONFIG_PAX_PAGEEXEC
7563+/*
7564+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7565+ *
7566+ * returns 1 when task should be killed
7567+ * 2 when rt_sigreturn trampoline was detected
7568+ * 3 when unpatched PLT trampoline was detected
7569+ */
7570+static int pax_handle_fetch_fault(struct pt_regs *regs)
7571+{
7572+
7573+#ifdef CONFIG_PAX_EMUPLT
7574+ int err;
7575+
7576+ do { /* PaX: unpatched PLT emulation */
7577+ unsigned int bl, depwi;
7578+
7579+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7580+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7581+
7582+ if (err)
7583+ break;
7584+
7585+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7586+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7587+
7588+ err = get_user(ldw, (unsigned int *)addr);
7589+ err |= get_user(bv, (unsigned int *)(addr+4));
7590+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7591+
7592+ if (err)
7593+ break;
7594+
7595+ if (ldw == 0x0E801096U &&
7596+ bv == 0xEAC0C000U &&
7597+ ldw2 == 0x0E881095U)
7598+ {
7599+ unsigned int resolver, map;
7600+
7601+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7602+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7603+ if (err)
7604+ break;
7605+
7606+ regs->gr[20] = instruction_pointer(regs)+8;
7607+ regs->gr[21] = map;
7608+ regs->gr[22] = resolver;
7609+ regs->iaoq[0] = resolver | 3UL;
7610+ regs->iaoq[1] = regs->iaoq[0] + 4;
7611+ return 3;
7612+ }
7613+ }
7614+ } while (0);
7615+#endif
7616+
7617+#ifdef CONFIG_PAX_EMUTRAMP
7618+
7619+#ifndef CONFIG_PAX_EMUSIGRT
7620+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7621+ return 1;
7622+#endif
7623+
7624+ do { /* PaX: rt_sigreturn emulation */
7625+ unsigned int ldi1, ldi2, bel, nop;
7626+
7627+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7628+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7629+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7630+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7631+
7632+ if (err)
7633+ break;
7634+
7635+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7636+ ldi2 == 0x3414015AU &&
7637+ bel == 0xE4008200U &&
7638+ nop == 0x08000240U)
7639+ {
7640+ regs->gr[25] = (ldi1 & 2) >> 1;
7641+ regs->gr[20] = __NR_rt_sigreturn;
7642+ regs->gr[31] = regs->iaoq[1] + 16;
7643+ regs->sr[0] = regs->iasq[1];
7644+ regs->iaoq[0] = 0x100UL;
7645+ regs->iaoq[1] = regs->iaoq[0] + 4;
7646+ regs->iasq[0] = regs->sr[2];
7647+ regs->iasq[1] = regs->sr[2];
7648+ return 2;
7649+ }
7650+ } while (0);
7651+#endif
7652+
7653+ return 1;
7654+}
7655+
7656+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7657+{
7658+ unsigned long i;
7659+
7660+ printk(KERN_ERR "PAX: bytes at PC: ");
7661+ for (i = 0; i < 5; i++) {
7662+ unsigned int c;
7663+ if (get_user(c, (unsigned int *)pc+i))
7664+ printk(KERN_CONT "???????? ");
7665+ else
7666+ printk(KERN_CONT "%08x ", c);
7667+ }
7668+ printk("\n");
7669+}
7670+#endif
7671+
7672 int fixup_exception(struct pt_regs *regs)
7673 {
7674 const struct exception_table_entry *fix;
7675@@ -234,8 +345,33 @@ retry:
7676
7677 good_area:
7678
7679- if ((vma->vm_flags & acc_type) != acc_type)
7680+ if ((vma->vm_flags & acc_type) != acc_type) {
7681+
7682+#ifdef CONFIG_PAX_PAGEEXEC
7683+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7684+ (address & ~3UL) == instruction_pointer(regs))
7685+ {
7686+ up_read(&mm->mmap_sem);
7687+ switch (pax_handle_fetch_fault(regs)) {
7688+
7689+#ifdef CONFIG_PAX_EMUPLT
7690+ case 3:
7691+ return;
7692+#endif
7693+
7694+#ifdef CONFIG_PAX_EMUTRAMP
7695+ case 2:
7696+ return;
7697+#endif
7698+
7699+ }
7700+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7701+ do_group_exit(SIGKILL);
7702+ }
7703+#endif
7704+
7705 goto bad_area;
7706+ }
7707
7708 /*
7709 * If for any reason at all we couldn't handle the fault, make
7710diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7711index 88eace4..4ba2591 100644
7712--- a/arch/powerpc/Kconfig
7713+++ b/arch/powerpc/Kconfig
7714@@ -404,6 +404,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7715 config KEXEC
7716 bool "kexec system call"
7717 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7718+ depends on !GRKERNSEC_KMEM
7719 help
7720 kexec is a system call that implements the ability to shutdown your
7721 current kernel, and to start another kernel. It is like a reboot
7722diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7723index 512d278..d31fadd 100644
7724--- a/arch/powerpc/include/asm/atomic.h
7725+++ b/arch/powerpc/include/asm/atomic.h
7726@@ -12,6 +12,11 @@
7727
7728 #define ATOMIC_INIT(i) { (i) }
7729
7730+#define _ASM_EXTABLE(from, to) \
7731+" .section __ex_table,\"a\"\n" \
7732+ PPC_LONG" " #from ", " #to"\n" \
7733+" .previous\n"
7734+
7735 static __inline__ int atomic_read(const atomic_t *v)
7736 {
7737 int t;
7738@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7739 return t;
7740 }
7741
7742+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7743+{
7744+ int t;
7745+
7746+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7747+
7748+ return t;
7749+}
7750+
7751 static __inline__ void atomic_set(atomic_t *v, int i)
7752 {
7753 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7754 }
7755
7756-#define ATOMIC_OP(op, asm_op) \
7757-static __inline__ void atomic_##op(int a, atomic_t *v) \
7758+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7759+{
7760+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7761+}
7762+
7763+#ifdef CONFIG_PAX_REFCOUNT
7764+#define __REFCOUNT_OP(op) op##o.
7765+#define __OVERFLOW_PRE \
7766+ " mcrxr cr0\n"
7767+#define __OVERFLOW_POST \
7768+ " bf 4*cr0+so, 3f\n" \
7769+ "2: .long 0x00c00b00\n" \
7770+ "3:\n"
7771+#define __OVERFLOW_EXTABLE \
7772+ "\n4:\n"
7773+ _ASM_EXTABLE(2b, 4b)
7774+#else
7775+#define __REFCOUNT_OP(op) op
7776+#define __OVERFLOW_PRE
7777+#define __OVERFLOW_POST
7778+#define __OVERFLOW_EXTABLE
7779+#endif
7780+
7781+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7782+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7783 { \
7784 int t; \
7785 \
7786 __asm__ __volatile__( \
7787-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7788+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7789+ pre_op \
7790 #asm_op " %0,%2,%0\n" \
7791+ post_op \
7792 PPC405_ERR77(0,%3) \
7793 " stwcx. %0,0,%3 \n" \
7794 " bne- 1b\n" \
7795+ extable \
7796 : "=&r" (t), "+m" (v->counter) \
7797 : "r" (a), "r" (&v->counter) \
7798 : "cc"); \
7799 } \
7800
7801-#define ATOMIC_OP_RETURN(op, asm_op) \
7802-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7803+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7804+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7805+
7806+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7807+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7808 { \
7809 int t; \
7810 \
7811 __asm__ __volatile__( \
7812 PPC_ATOMIC_ENTRY_BARRIER \
7813-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7814+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7815+ pre_op \
7816 #asm_op " %0,%1,%0\n" \
7817+ post_op \
7818 PPC405_ERR77(0,%2) \
7819 " stwcx. %0,0,%2 \n" \
7820 " bne- 1b\n" \
7821+ extable \
7822 PPC_ATOMIC_EXIT_BARRIER \
7823 : "=&r" (t) \
7824 : "r" (a), "r" (&v->counter) \
7825@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7826 return t; \
7827 }
7828
7829+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7830+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7831+
7832 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7833
7834 ATOMIC_OPS(add, add)
7835@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7836
7837 #undef ATOMIC_OPS
7838 #undef ATOMIC_OP_RETURN
7839+#undef __ATOMIC_OP_RETURN
7840 #undef ATOMIC_OP
7841+#undef __ATOMIC_OP
7842
7843 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7844
7845-static __inline__ void atomic_inc(atomic_t *v)
7846-{
7847- int t;
7848+/*
7849+ * atomic_inc - increment atomic variable
7850+ * @v: pointer of type atomic_t
7851+ *
7852+ * Automatically increments @v by 1
7853+ */
7854+#define atomic_inc(v) atomic_add(1, (v))
7855+#define atomic_inc_return(v) atomic_add_return(1, (v))
7856
7857- __asm__ __volatile__(
7858-"1: lwarx %0,0,%2 # atomic_inc\n\
7859- addic %0,%0,1\n"
7860- PPC405_ERR77(0,%2)
7861-" stwcx. %0,0,%2 \n\
7862- bne- 1b"
7863- : "=&r" (t), "+m" (v->counter)
7864- : "r" (&v->counter)
7865- : "cc", "xer");
7866+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7867+{
7868+ atomic_add_unchecked(1, v);
7869 }
7870
7871-static __inline__ int atomic_inc_return(atomic_t *v)
7872+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7873 {
7874- int t;
7875-
7876- __asm__ __volatile__(
7877- PPC_ATOMIC_ENTRY_BARRIER
7878-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7879- addic %0,%0,1\n"
7880- PPC405_ERR77(0,%1)
7881-" stwcx. %0,0,%1 \n\
7882- bne- 1b"
7883- PPC_ATOMIC_EXIT_BARRIER
7884- : "=&r" (t)
7885- : "r" (&v->counter)
7886- : "cc", "xer", "memory");
7887-
7888- return t;
7889+ return atomic_add_return_unchecked(1, v);
7890 }
7891
7892 /*
7893@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7894 */
7895 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7896
7897-static __inline__ void atomic_dec(atomic_t *v)
7898+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7899 {
7900- int t;
7901-
7902- __asm__ __volatile__(
7903-"1: lwarx %0,0,%2 # atomic_dec\n\
7904- addic %0,%0,-1\n"
7905- PPC405_ERR77(0,%2)\
7906-" stwcx. %0,0,%2\n\
7907- bne- 1b"
7908- : "=&r" (t), "+m" (v->counter)
7909- : "r" (&v->counter)
7910- : "cc", "xer");
7911+ return atomic_add_return_unchecked(1, v) == 0;
7912 }
7913
7914-static __inline__ int atomic_dec_return(atomic_t *v)
7915+/*
7916+ * atomic_dec - decrement atomic variable
7917+ * @v: pointer of type atomic_t
7918+ *
7919+ * Atomically decrements @v by 1
7920+ */
7921+#define atomic_dec(v) atomic_sub(1, (v))
7922+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7923+
7924+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7925 {
7926- int t;
7927-
7928- __asm__ __volatile__(
7929- PPC_ATOMIC_ENTRY_BARRIER
7930-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7931- addic %0,%0,-1\n"
7932- PPC405_ERR77(0,%1)
7933-" stwcx. %0,0,%1\n\
7934- bne- 1b"
7935- PPC_ATOMIC_EXIT_BARRIER
7936- : "=&r" (t)
7937- : "r" (&v->counter)
7938- : "cc", "xer", "memory");
7939-
7940- return t;
7941+ atomic_sub_unchecked(1, v);
7942 }
7943
7944 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7945 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7946
7947+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7948+{
7949+ return cmpxchg(&(v->counter), old, new);
7950+}
7951+
7952+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7953+{
7954+ return xchg(&(v->counter), new);
7955+}
7956+
7957 /**
7958 * __atomic_add_unless - add unless the number is a given value
7959 * @v: pointer of type atomic_t
7960@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7961 PPC_ATOMIC_ENTRY_BARRIER
7962 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7963 cmpw 0,%0,%3 \n\
7964- beq- 2f \n\
7965- add %0,%2,%0 \n"
7966+ beq- 2f \n"
7967+
7968+#ifdef CONFIG_PAX_REFCOUNT
7969+" mcrxr cr0\n"
7970+" addo. %0,%2,%0\n"
7971+" bf 4*cr0+so, 4f\n"
7972+"3:.long " "0x00c00b00""\n"
7973+"4:\n"
7974+#else
7975+ "add %0,%2,%0 \n"
7976+#endif
7977+
7978 PPC405_ERR77(0,%2)
7979 " stwcx. %0,0,%1 \n\
7980 bne- 1b \n"
7981+"5:"
7982+
7983+#ifdef CONFIG_PAX_REFCOUNT
7984+ _ASM_EXTABLE(3b, 5b)
7985+#endif
7986+
7987 PPC_ATOMIC_EXIT_BARRIER
7988 " subf %0,%2,%0 \n\
7989 2:"
7990@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7991 }
7992 #define atomic_dec_if_positive atomic_dec_if_positive
7993
7994+#define smp_mb__before_atomic_dec() smp_mb()
7995+#define smp_mb__after_atomic_dec() smp_mb()
7996+#define smp_mb__before_atomic_inc() smp_mb()
7997+#define smp_mb__after_atomic_inc() smp_mb()
7998+
7999 #ifdef __powerpc64__
8000
8001 #define ATOMIC64_INIT(i) { (i) }
8002@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8003 return t;
8004 }
8005
8006+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8007+{
8008+ long t;
8009+
8010+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8011+
8012+ return t;
8013+}
8014+
8015 static __inline__ void atomic64_set(atomic64_t *v, long i)
8016 {
8017 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8018 }
8019
8020-#define ATOMIC64_OP(op, asm_op) \
8021-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8022+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8023+{
8024+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8025+}
8026+
8027+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8028+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8029 { \
8030 long t; \
8031 \
8032 __asm__ __volatile__( \
8033 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8034+ pre_op \
8035 #asm_op " %0,%2,%0\n" \
8036+ post_op \
8037 " stdcx. %0,0,%3 \n" \
8038 " bne- 1b\n" \
8039+ extable \
8040 : "=&r" (t), "+m" (v->counter) \
8041 : "r" (a), "r" (&v->counter) \
8042 : "cc"); \
8043 }
8044
8045-#define ATOMIC64_OP_RETURN(op, asm_op) \
8046-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8047+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8048+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8049+
8050+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8051+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8052 { \
8053 long t; \
8054 \
8055 __asm__ __volatile__( \
8056 PPC_ATOMIC_ENTRY_BARRIER \
8057 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8058+ pre_op \
8059 #asm_op " %0,%1,%0\n" \
8060+ post_op \
8061 " stdcx. %0,0,%2 \n" \
8062 " bne- 1b\n" \
8063+ extable \
8064 PPC_ATOMIC_EXIT_BARRIER \
8065 : "=&r" (t) \
8066 : "r" (a), "r" (&v->counter) \
8067@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8068 return t; \
8069 }
8070
8071+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8072+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8073+
8074 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8075
8076 ATOMIC64_OPS(add, add)
8077@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8078
8079 #undef ATOMIC64_OPS
8080 #undef ATOMIC64_OP_RETURN
8081+#undef __ATOMIC64_OP_RETURN
8082 #undef ATOMIC64_OP
8083+#undef __ATOMIC64_OP
8084+#undef __OVERFLOW_EXTABLE
8085+#undef __OVERFLOW_POST
8086+#undef __OVERFLOW_PRE
8087+#undef __REFCOUNT_OP
8088
8089 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8090
8091-static __inline__ void atomic64_inc(atomic64_t *v)
8092-{
8093- long t;
8094+/*
8095+ * atomic64_inc - increment atomic variable
8096+ * @v: pointer of type atomic64_t
8097+ *
8098+ * Automatically increments @v by 1
8099+ */
8100+#define atomic64_inc(v) atomic64_add(1, (v))
8101+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8102
8103- __asm__ __volatile__(
8104-"1: ldarx %0,0,%2 # atomic64_inc\n\
8105- addic %0,%0,1\n\
8106- stdcx. %0,0,%2 \n\
8107- bne- 1b"
8108- : "=&r" (t), "+m" (v->counter)
8109- : "r" (&v->counter)
8110- : "cc", "xer");
8111+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8112+{
8113+ atomic64_add_unchecked(1, v);
8114 }
8115
8116-static __inline__ long atomic64_inc_return(atomic64_t *v)
8117+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8118 {
8119- long t;
8120-
8121- __asm__ __volatile__(
8122- PPC_ATOMIC_ENTRY_BARRIER
8123-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8124- addic %0,%0,1\n\
8125- stdcx. %0,0,%1 \n\
8126- bne- 1b"
8127- PPC_ATOMIC_EXIT_BARRIER
8128- : "=&r" (t)
8129- : "r" (&v->counter)
8130- : "cc", "xer", "memory");
8131-
8132- return t;
8133+ return atomic64_add_return_unchecked(1, v);
8134 }
8135
8136 /*
8137@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8138 */
8139 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8140
8141-static __inline__ void atomic64_dec(atomic64_t *v)
8142+/*
8143+ * atomic64_dec - decrement atomic variable
8144+ * @v: pointer of type atomic64_t
8145+ *
8146+ * Atomically decrements @v by 1
8147+ */
8148+#define atomic64_dec(v) atomic64_sub(1, (v))
8149+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8150+
8151+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8152 {
8153- long t;
8154-
8155- __asm__ __volatile__(
8156-"1: ldarx %0,0,%2 # atomic64_dec\n\
8157- addic %0,%0,-1\n\
8158- stdcx. %0,0,%2\n\
8159- bne- 1b"
8160- : "=&r" (t), "+m" (v->counter)
8161- : "r" (&v->counter)
8162- : "cc", "xer");
8163-}
8164-
8165-static __inline__ long atomic64_dec_return(atomic64_t *v)
8166-{
8167- long t;
8168-
8169- __asm__ __volatile__(
8170- PPC_ATOMIC_ENTRY_BARRIER
8171-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8172- addic %0,%0,-1\n\
8173- stdcx. %0,0,%1\n\
8174- bne- 1b"
8175- PPC_ATOMIC_EXIT_BARRIER
8176- : "=&r" (t)
8177- : "r" (&v->counter)
8178- : "cc", "xer", "memory");
8179-
8180- return t;
8181+ atomic64_sub_unchecked(1, v);
8182 }
8183
8184 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8185@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8186 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8187 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8188
8189+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8190+{
8191+ return cmpxchg(&(v->counter), old, new);
8192+}
8193+
8194+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8195+{
8196+ return xchg(&(v->counter), new);
8197+}
8198+
8199 /**
8200 * atomic64_add_unless - add unless the number is a given value
8201 * @v: pointer of type atomic64_t
8202@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8203
8204 __asm__ __volatile__ (
8205 PPC_ATOMIC_ENTRY_BARRIER
8206-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8207+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8208 cmpd 0,%0,%3 \n\
8209- beq- 2f \n\
8210- add %0,%2,%0 \n"
8211+ beq- 2f \n"
8212+
8213+#ifdef CONFIG_PAX_REFCOUNT
8214+" mcrxr cr0\n"
8215+" addo. %0,%2,%0\n"
8216+" bf 4*cr0+so, 4f\n"
8217+"3:.long " "0x00c00b00""\n"
8218+"4:\n"
8219+#else
8220+ "add %0,%2,%0 \n"
8221+#endif
8222+
8223 " stdcx. %0,0,%1 \n\
8224 bne- 1b \n"
8225 PPC_ATOMIC_EXIT_BARRIER
8226+"5:"
8227+
8228+#ifdef CONFIG_PAX_REFCOUNT
8229+ _ASM_EXTABLE(3b, 5b)
8230+#endif
8231+
8232 " subf %0,%2,%0 \n\
8233 2:"
8234 : "=&r" (t)
8235diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8236index bab79a1..4a3eabc 100644
8237--- a/arch/powerpc/include/asm/barrier.h
8238+++ b/arch/powerpc/include/asm/barrier.h
8239@@ -73,7 +73,7 @@
8240 do { \
8241 compiletime_assert_atomic_type(*p); \
8242 __lwsync(); \
8243- ACCESS_ONCE(*p) = (v); \
8244+ ACCESS_ONCE_RW(*p) = (v); \
8245 } while (0)
8246
8247 #define smp_load_acquire(p) \
8248diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8249index 34a05a1..a1f2c67 100644
8250--- a/arch/powerpc/include/asm/cache.h
8251+++ b/arch/powerpc/include/asm/cache.h
8252@@ -4,6 +4,7 @@
8253 #ifdef __KERNEL__
8254
8255 #include <asm/reg.h>
8256+#include <linux/const.h>
8257
8258 /* bytes per L1 cache line */
8259 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8260@@ -23,7 +24,7 @@
8261 #define L1_CACHE_SHIFT 7
8262 #endif
8263
8264-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8265+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8266
8267 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8268
8269diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8270index 888d8f3..66f581c 100644
8271--- a/arch/powerpc/include/asm/elf.h
8272+++ b/arch/powerpc/include/asm/elf.h
8273@@ -28,8 +28,19 @@
8274 the loader. We need to make sure that it is out of the way of the program
8275 that it will "exec", and that there is sufficient room for the brk. */
8276
8277-extern unsigned long randomize_et_dyn(unsigned long base);
8278-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
8279+#define ELF_ET_DYN_BASE (0x20000000)
8280+
8281+#ifdef CONFIG_PAX_ASLR
8282+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8283+
8284+#ifdef __powerpc64__
8285+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8286+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8287+#else
8288+#define PAX_DELTA_MMAP_LEN 15
8289+#define PAX_DELTA_STACK_LEN 15
8290+#endif
8291+#endif
8292
8293 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8294
8295@@ -129,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8296 (0x7ff >> (PAGE_SHIFT - 12)) : \
8297 (0x3ffff >> (PAGE_SHIFT - 12)))
8298
8299-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8300-#define arch_randomize_brk arch_randomize_brk
8301-
8302-
8303 #ifdef CONFIG_SPU_BASE
8304 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8305 #define NT_SPU 1
8306diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8307index 8196e9c..d83a9f3 100644
8308--- a/arch/powerpc/include/asm/exec.h
8309+++ b/arch/powerpc/include/asm/exec.h
8310@@ -4,6 +4,6 @@
8311 #ifndef _ASM_POWERPC_EXEC_H
8312 #define _ASM_POWERPC_EXEC_H
8313
8314-extern unsigned long arch_align_stack(unsigned long sp);
8315+#define arch_align_stack(x) ((x) & ~0xfUL)
8316
8317 #endif /* _ASM_POWERPC_EXEC_H */
8318diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8319index 5acabbd..7ea14fa 100644
8320--- a/arch/powerpc/include/asm/kmap_types.h
8321+++ b/arch/powerpc/include/asm/kmap_types.h
8322@@ -10,7 +10,7 @@
8323 * 2 of the License, or (at your option) any later version.
8324 */
8325
8326-#define KM_TYPE_NR 16
8327+#define KM_TYPE_NR 17
8328
8329 #endif /* __KERNEL__ */
8330 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8331diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8332index b8da913..c02b593 100644
8333--- a/arch/powerpc/include/asm/local.h
8334+++ b/arch/powerpc/include/asm/local.h
8335@@ -9,21 +9,65 @@ typedef struct
8336 atomic_long_t a;
8337 } local_t;
8338
8339+typedef struct
8340+{
8341+ atomic_long_unchecked_t a;
8342+} local_unchecked_t;
8343+
8344 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8345
8346 #define local_read(l) atomic_long_read(&(l)->a)
8347+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8348 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8349+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8350
8351 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8352+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8353 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8354+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8355 #define local_inc(l) atomic_long_inc(&(l)->a)
8356+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8357 #define local_dec(l) atomic_long_dec(&(l)->a)
8358+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8359
8360 static __inline__ long local_add_return(long a, local_t *l)
8361 {
8362 long t;
8363
8364 __asm__ __volatile__(
8365+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8366+
8367+#ifdef CONFIG_PAX_REFCOUNT
8368+" mcrxr cr0\n"
8369+" addo. %0,%1,%0\n"
8370+" bf 4*cr0+so, 3f\n"
8371+"2:.long " "0x00c00b00""\n"
8372+#else
8373+" add %0,%1,%0\n"
8374+#endif
8375+
8376+"3:\n"
8377+ PPC405_ERR77(0,%2)
8378+ PPC_STLCX "%0,0,%2 \n\
8379+ bne- 1b"
8380+
8381+#ifdef CONFIG_PAX_REFCOUNT
8382+"\n4:\n"
8383+ _ASM_EXTABLE(2b, 4b)
8384+#endif
8385+
8386+ : "=&r" (t)
8387+ : "r" (a), "r" (&(l->a.counter))
8388+ : "cc", "memory");
8389+
8390+ return t;
8391+}
8392+
8393+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8394+{
8395+ long t;
8396+
8397+ __asm__ __volatile__(
8398 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8399 add %0,%1,%0\n"
8400 PPC405_ERR77(0,%2)
8401@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8402
8403 #define local_cmpxchg(l, o, n) \
8404 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8405+#define local_cmpxchg_unchecked(l, o, n) \
8406+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8407 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8408
8409 /**
8410diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8411index 8565c25..2865190 100644
8412--- a/arch/powerpc/include/asm/mman.h
8413+++ b/arch/powerpc/include/asm/mman.h
8414@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8415 }
8416 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8417
8418-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8419+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8420 {
8421 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8422 }
8423diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8424index 26fe1ae..987ffc5 100644
8425--- a/arch/powerpc/include/asm/page.h
8426+++ b/arch/powerpc/include/asm/page.h
8427@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8428 * and needs to be executable. This means the whole heap ends
8429 * up being executable.
8430 */
8431-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8432- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8433+#define VM_DATA_DEFAULT_FLAGS32 \
8434+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8435+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8436
8437 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8438 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8439@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8440 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8441 #endif
8442
8443+#define ktla_ktva(addr) (addr)
8444+#define ktva_ktla(addr) (addr)
8445+
8446 #ifndef CONFIG_PPC_BOOK3S_64
8447 /*
8448 * Use the top bit of the higher-level page table entries to indicate whether
8449diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8450index d908a46..3753f71 100644
8451--- a/arch/powerpc/include/asm/page_64.h
8452+++ b/arch/powerpc/include/asm/page_64.h
8453@@ -172,15 +172,18 @@ do { \
8454 * stack by default, so in the absence of a PT_GNU_STACK program header
8455 * we turn execute permission off.
8456 */
8457-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8458- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8459+#define VM_STACK_DEFAULT_FLAGS32 \
8460+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8461+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8462
8463 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8464 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8465
8466+#ifndef CONFIG_PAX_PAGEEXEC
8467 #define VM_STACK_DEFAULT_FLAGS \
8468 (is_32bit_task() ? \
8469 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8470+#endif
8471
8472 #include <asm-generic/getorder.h>
8473
8474diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8475index 4b0be20..c15a27d 100644
8476--- a/arch/powerpc/include/asm/pgalloc-64.h
8477+++ b/arch/powerpc/include/asm/pgalloc-64.h
8478@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8479 #ifndef CONFIG_PPC_64K_PAGES
8480
8481 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8482+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8483
8484 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8485 {
8486@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8487 pud_set(pud, (unsigned long)pmd);
8488 }
8489
8490+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8491+{
8492+ pud_populate(mm, pud, pmd);
8493+}
8494+
8495 #define pmd_populate(mm, pmd, pte_page) \
8496 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8497 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8498@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8499 #endif
8500
8501 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8502+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8503
8504 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8505 pte_t *pte)
8506diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8507index 316f9a5..ba05c77 100644
8508--- a/arch/powerpc/include/asm/pgtable.h
8509+++ b/arch/powerpc/include/asm/pgtable.h
8510@@ -2,6 +2,7 @@
8511 #define _ASM_POWERPC_PGTABLE_H
8512 #ifdef __KERNEL__
8513
8514+#include <linux/const.h>
8515 #ifndef __ASSEMBLY__
8516 #include <linux/mmdebug.h>
8517 #include <linux/mmzone.h>
8518diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8519index 4aad413..85d86bf 100644
8520--- a/arch/powerpc/include/asm/pte-hash32.h
8521+++ b/arch/powerpc/include/asm/pte-hash32.h
8522@@ -21,6 +21,7 @@
8523 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8524 #define _PAGE_USER 0x004 /* usermode access allowed */
8525 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8526+#define _PAGE_EXEC _PAGE_GUARDED
8527 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8528 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8529 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8530diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8531index a68ee15..552d213 100644
8532--- a/arch/powerpc/include/asm/reg.h
8533+++ b/arch/powerpc/include/asm/reg.h
8534@@ -253,6 +253,7 @@
8535 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8536 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8537 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8538+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8539 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8540 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8541 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8542diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8543index 5a6614a..d89995d1 100644
8544--- a/arch/powerpc/include/asm/smp.h
8545+++ b/arch/powerpc/include/asm/smp.h
8546@@ -51,7 +51,7 @@ struct smp_ops_t {
8547 int (*cpu_disable)(void);
8548 void (*cpu_die)(unsigned int nr);
8549 int (*cpu_bootable)(unsigned int nr);
8550-};
8551+} __no_const;
8552
8553 extern void smp_send_debugger_break(void);
8554 extern void start_secondary_resume(void);
8555diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8556index 4dbe072..b803275 100644
8557--- a/arch/powerpc/include/asm/spinlock.h
8558+++ b/arch/powerpc/include/asm/spinlock.h
8559@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8560 __asm__ __volatile__(
8561 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8562 __DO_SIGN_EXTEND
8563-" addic. %0,%0,1\n\
8564- ble- 2f\n"
8565+
8566+#ifdef CONFIG_PAX_REFCOUNT
8567+" mcrxr cr0\n"
8568+" addico. %0,%0,1\n"
8569+" bf 4*cr0+so, 3f\n"
8570+"2:.long " "0x00c00b00""\n"
8571+#else
8572+" addic. %0,%0,1\n"
8573+#endif
8574+
8575+"3:\n"
8576+ "ble- 4f\n"
8577 PPC405_ERR77(0,%1)
8578 " stwcx. %0,0,%1\n\
8579 bne- 1b\n"
8580 PPC_ACQUIRE_BARRIER
8581-"2:" : "=&r" (tmp)
8582+"4:"
8583+
8584+#ifdef CONFIG_PAX_REFCOUNT
8585+ _ASM_EXTABLE(2b,4b)
8586+#endif
8587+
8588+ : "=&r" (tmp)
8589 : "r" (&rw->lock)
8590 : "cr0", "xer", "memory");
8591
8592@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8593 __asm__ __volatile__(
8594 "# read_unlock\n\t"
8595 PPC_RELEASE_BARRIER
8596-"1: lwarx %0,0,%1\n\
8597- addic %0,%0,-1\n"
8598+"1: lwarx %0,0,%1\n"
8599+
8600+#ifdef CONFIG_PAX_REFCOUNT
8601+" mcrxr cr0\n"
8602+" addico. %0,%0,-1\n"
8603+" bf 4*cr0+so, 3f\n"
8604+"2:.long " "0x00c00b00""\n"
8605+#else
8606+" addic. %0,%0,-1\n"
8607+#endif
8608+
8609+"3:\n"
8610 PPC405_ERR77(0,%1)
8611 " stwcx. %0,0,%1\n\
8612 bne- 1b"
8613+
8614+#ifdef CONFIG_PAX_REFCOUNT
8615+"\n4:\n"
8616+ _ASM_EXTABLE(2b, 4b)
8617+#endif
8618+
8619 : "=&r"(tmp)
8620 : "r"(&rw->lock)
8621 : "cr0", "xer", "memory");
8622diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8623index b034ecd..af7e31f 100644
8624--- a/arch/powerpc/include/asm/thread_info.h
8625+++ b/arch/powerpc/include/asm/thread_info.h
8626@@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8627 #if defined(CONFIG_PPC64)
8628 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8629 #endif
8630+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8631+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8632
8633 /* as above, but as bit values */
8634 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8635@@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8636 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8637 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8638 #define _TIF_NOHZ (1<<TIF_NOHZ)
8639+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8640 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8641 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8642- _TIF_NOHZ)
8643+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8644
8645 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8646 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8647diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8648index 9485b43..3bd3c16 100644
8649--- a/arch/powerpc/include/asm/uaccess.h
8650+++ b/arch/powerpc/include/asm/uaccess.h
8651@@ -58,6 +58,7 @@
8652
8653 #endif
8654
8655+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8656 #define access_ok(type, addr, size) \
8657 (__chk_user_ptr(addr), \
8658 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8659@@ -318,52 +319,6 @@ do { \
8660 extern unsigned long __copy_tofrom_user(void __user *to,
8661 const void __user *from, unsigned long size);
8662
8663-#ifndef __powerpc64__
8664-
8665-static inline unsigned long copy_from_user(void *to,
8666- const void __user *from, unsigned long n)
8667-{
8668- unsigned long over;
8669-
8670- if (access_ok(VERIFY_READ, from, n))
8671- return __copy_tofrom_user((__force void __user *)to, from, n);
8672- if ((unsigned long)from < TASK_SIZE) {
8673- over = (unsigned long)from + n - TASK_SIZE;
8674- return __copy_tofrom_user((__force void __user *)to, from,
8675- n - over) + over;
8676- }
8677- return n;
8678-}
8679-
8680-static inline unsigned long copy_to_user(void __user *to,
8681- const void *from, unsigned long n)
8682-{
8683- unsigned long over;
8684-
8685- if (access_ok(VERIFY_WRITE, to, n))
8686- return __copy_tofrom_user(to, (__force void __user *)from, n);
8687- if ((unsigned long)to < TASK_SIZE) {
8688- over = (unsigned long)to + n - TASK_SIZE;
8689- return __copy_tofrom_user(to, (__force void __user *)from,
8690- n - over) + over;
8691- }
8692- return n;
8693-}
8694-
8695-#else /* __powerpc64__ */
8696-
8697-#define __copy_in_user(to, from, size) \
8698- __copy_tofrom_user((to), (from), (size))
8699-
8700-extern unsigned long copy_from_user(void *to, const void __user *from,
8701- unsigned long n);
8702-extern unsigned long copy_to_user(void __user *to, const void *from,
8703- unsigned long n);
8704-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8705- unsigned long n);
8706-
8707-#endif /* __powerpc64__ */
8708-
8709 static inline unsigned long __copy_from_user_inatomic(void *to,
8710 const void __user *from, unsigned long n)
8711 {
8712@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8713 if (ret == 0)
8714 return 0;
8715 }
8716+
8717+ if (!__builtin_constant_p(n))
8718+ check_object_size(to, n, false);
8719+
8720 return __copy_tofrom_user((__force void __user *)to, from, n);
8721 }
8722
8723@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8724 if (ret == 0)
8725 return 0;
8726 }
8727+
8728+ if (!__builtin_constant_p(n))
8729+ check_object_size(from, n, true);
8730+
8731 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8732 }
8733
8734@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8735 return __copy_to_user_inatomic(to, from, size);
8736 }
8737
8738+#ifndef __powerpc64__
8739+
8740+static inline unsigned long __must_check copy_from_user(void *to,
8741+ const void __user *from, unsigned long n)
8742+{
8743+ unsigned long over;
8744+
8745+ if ((long)n < 0)
8746+ return n;
8747+
8748+ if (access_ok(VERIFY_READ, from, n)) {
8749+ if (!__builtin_constant_p(n))
8750+ check_object_size(to, n, false);
8751+ return __copy_tofrom_user((__force void __user *)to, from, n);
8752+ }
8753+ if ((unsigned long)from < TASK_SIZE) {
8754+ over = (unsigned long)from + n - TASK_SIZE;
8755+ if (!__builtin_constant_p(n - over))
8756+ check_object_size(to, n - over, false);
8757+ return __copy_tofrom_user((__force void __user *)to, from,
8758+ n - over) + over;
8759+ }
8760+ return n;
8761+}
8762+
8763+static inline unsigned long __must_check copy_to_user(void __user *to,
8764+ const void *from, unsigned long n)
8765+{
8766+ unsigned long over;
8767+
8768+ if ((long)n < 0)
8769+ return n;
8770+
8771+ if (access_ok(VERIFY_WRITE, to, n)) {
8772+ if (!__builtin_constant_p(n))
8773+ check_object_size(from, n, true);
8774+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8775+ }
8776+ if ((unsigned long)to < TASK_SIZE) {
8777+ over = (unsigned long)to + n - TASK_SIZE;
8778+ if (!__builtin_constant_p(n))
8779+ check_object_size(from, n - over, true);
8780+ return __copy_tofrom_user(to, (__force void __user *)from,
8781+ n - over) + over;
8782+ }
8783+ return n;
8784+}
8785+
8786+#else /* __powerpc64__ */
8787+
8788+#define __copy_in_user(to, from, size) \
8789+ __copy_tofrom_user((to), (from), (size))
8790+
8791+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8792+{
8793+ if ((long)n < 0 || n > INT_MAX)
8794+ return n;
8795+
8796+ if (!__builtin_constant_p(n))
8797+ check_object_size(to, n, false);
8798+
8799+ if (likely(access_ok(VERIFY_READ, from, n)))
8800+ n = __copy_from_user(to, from, n);
8801+ else
8802+ memset(to, 0, n);
8803+ return n;
8804+}
8805+
8806+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8807+{
8808+ if ((long)n < 0 || n > INT_MAX)
8809+ return n;
8810+
8811+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8812+ if (!__builtin_constant_p(n))
8813+ check_object_size(from, n, true);
8814+ n = __copy_to_user(to, from, n);
8815+ }
8816+ return n;
8817+}
8818+
8819+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8820+ unsigned long n);
8821+
8822+#endif /* __powerpc64__ */
8823+
8824 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8825
8826 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8827diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8828index 502cf69..822e63b 100644
8829--- a/arch/powerpc/kernel/Makefile
8830+++ b/arch/powerpc/kernel/Makefile
8831@@ -27,6 +27,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8832 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8833 endif
8834
8835+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8836+
8837 obj-y := cputable.o ptrace.o syscalls.o \
8838 irq.o align.o signal_32.o pmc.o vdso.o \
8839 process.o systbl.o idle.o \
8840diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8841index 3e68d1c..72a5ee6 100644
8842--- a/arch/powerpc/kernel/exceptions-64e.S
8843+++ b/arch/powerpc/kernel/exceptions-64e.S
8844@@ -1010,6 +1010,7 @@ storage_fault_common:
8845 std r14,_DAR(r1)
8846 std r15,_DSISR(r1)
8847 addi r3,r1,STACK_FRAME_OVERHEAD
8848+ bl save_nvgprs
8849 mr r4,r14
8850 mr r5,r15
8851 ld r14,PACA_EXGEN+EX_R14(r13)
8852@@ -1018,8 +1019,7 @@ storage_fault_common:
8853 cmpdi r3,0
8854 bne- 1f
8855 b ret_from_except_lite
8856-1: bl save_nvgprs
8857- mr r5,r3
8858+1: mr r5,r3
8859 addi r3,r1,STACK_FRAME_OVERHEAD
8860 ld r4,_DAR(r1)
8861 bl bad_page_fault
8862diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8863index 72e783e..fe058e2 100644
8864--- a/arch/powerpc/kernel/exceptions-64s.S
8865+++ b/arch/powerpc/kernel/exceptions-64s.S
8866@@ -1588,10 +1588,10 @@ handle_page_fault:
8867 11: ld r4,_DAR(r1)
8868 ld r5,_DSISR(r1)
8869 addi r3,r1,STACK_FRAME_OVERHEAD
8870+ bl save_nvgprs
8871 bl do_page_fault
8872 cmpdi r3,0
8873 beq+ 12f
8874- bl save_nvgprs
8875 mr r5,r3
8876 addi r3,r1,STACK_FRAME_OVERHEAD
8877 lwz r4,_DAR(r1)
8878diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8879index c143835..5a9697f 100644
8880--- a/arch/powerpc/kernel/irq.c
8881+++ b/arch/powerpc/kernel/irq.c
8882@@ -461,6 +461,8 @@ void migrate_irqs(void)
8883 }
8884 #endif
8885
8886+extern void gr_handle_kernel_exploit(void);
8887+
8888 static inline void check_stack_overflow(void)
8889 {
8890 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8891@@ -473,6 +475,7 @@ static inline void check_stack_overflow(void)
8892 pr_err("do_IRQ: stack overflow: %ld\n",
8893 sp - sizeof(struct thread_info));
8894 dump_stack();
8895+ gr_handle_kernel_exploit();
8896 }
8897 #endif
8898 }
8899diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8900index c94d2e0..992a9ce 100644
8901--- a/arch/powerpc/kernel/module_32.c
8902+++ b/arch/powerpc/kernel/module_32.c
8903@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8904 me->arch.core_plt_section = i;
8905 }
8906 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8907- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8908+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8909 return -ENOEXEC;
8910 }
8911
8912@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8913
8914 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8915 /* Init, or core PLT? */
8916- if (location >= mod->module_core
8917- && location < mod->module_core + mod->core_size)
8918+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8919+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8920 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8921- else
8922+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8923+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8924 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8925+ else {
8926+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8927+ return ~0UL;
8928+ }
8929
8930 /* Find this entry, or if that fails, the next avail. entry */
8931 while (entry->jump[0]) {
8932@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8933 }
8934 #ifdef CONFIG_DYNAMIC_FTRACE
8935 module->arch.tramp =
8936- do_plt_call(module->module_core,
8937+ do_plt_call(module->module_core_rx,
8938 (unsigned long)ftrace_caller,
8939 sechdrs, module);
8940 #endif
8941diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8942index 923cd2d..ae782a9 100644
8943--- a/arch/powerpc/kernel/process.c
8944+++ b/arch/powerpc/kernel/process.c
8945@@ -1040,8 +1040,8 @@ void show_regs(struct pt_regs * regs)
8946 * Lookup NIP late so we have the best change of getting the
8947 * above info out without failing
8948 */
8949- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8950- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8951+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8952+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8953 #endif
8954 show_stack(current, (unsigned long *) regs->gpr[1]);
8955 if (!user_mode(regs))
8956@@ -1560,10 +1560,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8957 newsp = stack[0];
8958 ip = stack[STACK_FRAME_LR_SAVE];
8959 if (!firstframe || ip != lr) {
8960- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8961+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8962 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8963 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8964- printk(" (%pS)",
8965+ printk(" (%pA)",
8966 (void *)current->ret_stack[curr_frame].ret);
8967 curr_frame--;
8968 }
8969@@ -1583,7 +1583,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8970 struct pt_regs *regs = (struct pt_regs *)
8971 (sp + STACK_FRAME_OVERHEAD);
8972 lr = regs->link;
8973- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8974+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8975 regs->trap, (void *)regs->nip, (void *)lr);
8976 firstframe = 1;
8977 }
8978@@ -1619,58 +1619,3 @@ void notrace __ppc64_runlatch_off(void)
8979 mtspr(SPRN_CTRLT, ctrl);
8980 }
8981 #endif /* CONFIG_PPC64 */
8982-
8983-unsigned long arch_align_stack(unsigned long sp)
8984-{
8985- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8986- sp -= get_random_int() & ~PAGE_MASK;
8987- return sp & ~0xf;
8988-}
8989-
8990-static inline unsigned long brk_rnd(void)
8991-{
8992- unsigned long rnd = 0;
8993-
8994- /* 8MB for 32bit, 1GB for 64bit */
8995- if (is_32bit_task())
8996- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8997- else
8998- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8999-
9000- return rnd << PAGE_SHIFT;
9001-}
9002-
9003-unsigned long arch_randomize_brk(struct mm_struct *mm)
9004-{
9005- unsigned long base = mm->brk;
9006- unsigned long ret;
9007-
9008-#ifdef CONFIG_PPC_STD_MMU_64
9009- /*
9010- * If we are using 1TB segments and we are allowed to randomise
9011- * the heap, we can put it above 1TB so it is backed by a 1TB
9012- * segment. Otherwise the heap will be in the bottom 1TB
9013- * which always uses 256MB segments and this may result in a
9014- * performance penalty.
9015- */
9016- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9017- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9018-#endif
9019-
9020- ret = PAGE_ALIGN(base + brk_rnd());
9021-
9022- if (ret < mm->brk)
9023- return mm->brk;
9024-
9025- return ret;
9026-}
9027-
9028-unsigned long randomize_et_dyn(unsigned long base)
9029-{
9030- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
9031-
9032- if (ret < base)
9033- return base;
9034-
9035- return ret;
9036-}
9037diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9038index f21897b..28c0428 100644
9039--- a/arch/powerpc/kernel/ptrace.c
9040+++ b/arch/powerpc/kernel/ptrace.c
9041@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9042 return ret;
9043 }
9044
9045+#ifdef CONFIG_GRKERNSEC_SETXID
9046+extern void gr_delayed_cred_worker(void);
9047+#endif
9048+
9049 /*
9050 * We must return the syscall number to actually look up in the table.
9051 * This can be -1L to skip running any syscall at all.
9052@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9053
9054 secure_computing_strict(regs->gpr[0]);
9055
9056+#ifdef CONFIG_GRKERNSEC_SETXID
9057+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9058+ gr_delayed_cred_worker();
9059+#endif
9060+
9061 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9062 tracehook_report_syscall_entry(regs))
9063 /*
9064@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9065 {
9066 int step;
9067
9068+#ifdef CONFIG_GRKERNSEC_SETXID
9069+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9070+ gr_delayed_cred_worker();
9071+#endif
9072+
9073 audit_syscall_exit(regs);
9074
9075 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9076diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9077index b171001..4ac7ac5 100644
9078--- a/arch/powerpc/kernel/signal_32.c
9079+++ b/arch/powerpc/kernel/signal_32.c
9080@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9081 /* Save user registers on the stack */
9082 frame = &rt_sf->uc.uc_mcontext;
9083 addr = frame;
9084- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9085+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9086 sigret = 0;
9087 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9088 } else {
9089diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9090index 2cb0c94..c0c0bc9 100644
9091--- a/arch/powerpc/kernel/signal_64.c
9092+++ b/arch/powerpc/kernel/signal_64.c
9093@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9094 current->thread.fp_state.fpscr = 0;
9095
9096 /* Set up to return from userspace. */
9097- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9098+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9099 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9100 } else {
9101 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9102diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9103index 0dc43f9..a885d33 100644
9104--- a/arch/powerpc/kernel/traps.c
9105+++ b/arch/powerpc/kernel/traps.c
9106@@ -36,6 +36,7 @@
9107 #include <linux/debugfs.h>
9108 #include <linux/ratelimit.h>
9109 #include <linux/context_tracking.h>
9110+#include <linux/uaccess.h>
9111
9112 #include <asm/emulated_ops.h>
9113 #include <asm/pgtable.h>
9114@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9115 return flags;
9116 }
9117
9118+extern void gr_handle_kernel_exploit(void);
9119+
9120 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9121 int signr)
9122 {
9123@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9124 panic("Fatal exception in interrupt");
9125 if (panic_on_oops)
9126 panic("Fatal exception");
9127+
9128+ gr_handle_kernel_exploit();
9129+
9130 do_exit(signr);
9131 }
9132
9133@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9134 enum ctx_state prev_state = exception_enter();
9135 unsigned int reason = get_reason(regs);
9136
9137+#ifdef CONFIG_PAX_REFCOUNT
9138+ unsigned int bkpt;
9139+ const struct exception_table_entry *entry;
9140+
9141+ if (reason & REASON_ILLEGAL) {
9142+ /* Check if PaX bad instruction */
9143+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9144+ current->thread.trap_nr = 0;
9145+ pax_report_refcount_overflow(regs);
9146+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9147+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9148+ regs->nip = entry->fixup;
9149+ return;
9150+ }
9151+ /* fixup_exception() could not handle */
9152+ goto bail;
9153+ }
9154+ }
9155+#endif
9156+
9157 /* We can now get here via a FP Unavailable exception if the core
9158 * has no FPU, in that case the reason flags will be 0 */
9159
9160diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9161index f174351..5722009 100644
9162--- a/arch/powerpc/kernel/vdso.c
9163+++ b/arch/powerpc/kernel/vdso.c
9164@@ -35,6 +35,7 @@
9165 #include <asm/vdso.h>
9166 #include <asm/vdso_datapage.h>
9167 #include <asm/setup.h>
9168+#include <asm/mman.h>
9169
9170 #undef DEBUG
9171
9172@@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9173 vdso_base = VDSO32_MBASE;
9174 #endif
9175
9176- current->mm->context.vdso_base = 0;
9177+ current->mm->context.vdso_base = ~0UL;
9178
9179 /* vDSO has a problem and was disabled, just don't "enable" it for the
9180 * process
9181@@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9182 vdso_base = get_unmapped_area(NULL, vdso_base,
9183 (vdso_pages << PAGE_SHIFT) +
9184 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9185- 0, 0);
9186+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9187 if (IS_ERR_VALUE(vdso_base)) {
9188 rc = vdso_base;
9189 goto fail_mmapsem;
9190diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9191index c1f8f53..71a3b96 100644
9192--- a/arch/powerpc/kvm/powerpc.c
9193+++ b/arch/powerpc/kvm/powerpc.c
9194@@ -1409,7 +1409,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9195 }
9196 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9197
9198-int kvm_arch_init(void *opaque)
9199+int kvm_arch_init(const void *opaque)
9200 {
9201 return 0;
9202 }
9203diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9204index 5eea6f3..5d10396 100644
9205--- a/arch/powerpc/lib/usercopy_64.c
9206+++ b/arch/powerpc/lib/usercopy_64.c
9207@@ -9,22 +9,6 @@
9208 #include <linux/module.h>
9209 #include <asm/uaccess.h>
9210
9211-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9212-{
9213- if (likely(access_ok(VERIFY_READ, from, n)))
9214- n = __copy_from_user(to, from, n);
9215- else
9216- memset(to, 0, n);
9217- return n;
9218-}
9219-
9220-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9221-{
9222- if (likely(access_ok(VERIFY_WRITE, to, n)))
9223- n = __copy_to_user(to, from, n);
9224- return n;
9225-}
9226-
9227 unsigned long copy_in_user(void __user *to, const void __user *from,
9228 unsigned long n)
9229 {
9230@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9231 return n;
9232 }
9233
9234-EXPORT_SYMBOL(copy_from_user);
9235-EXPORT_SYMBOL(copy_to_user);
9236 EXPORT_SYMBOL(copy_in_user);
9237
9238diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9239index 08d659a..ab329f4 100644
9240--- a/arch/powerpc/mm/fault.c
9241+++ b/arch/powerpc/mm/fault.c
9242@@ -33,6 +33,10 @@
9243 #include <linux/ratelimit.h>
9244 #include <linux/context_tracking.h>
9245 #include <linux/hugetlb.h>
9246+#include <linux/slab.h>
9247+#include <linux/pagemap.h>
9248+#include <linux/compiler.h>
9249+#include <linux/unistd.h>
9250
9251 #include <asm/firmware.h>
9252 #include <asm/page.h>
9253@@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9254 }
9255 #endif
9256
9257+#ifdef CONFIG_PAX_PAGEEXEC
9258+/*
9259+ * PaX: decide what to do with offenders (regs->nip = fault address)
9260+ *
9261+ * returns 1 when task should be killed
9262+ */
9263+static int pax_handle_fetch_fault(struct pt_regs *regs)
9264+{
9265+ return 1;
9266+}
9267+
9268+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9269+{
9270+ unsigned long i;
9271+
9272+ printk(KERN_ERR "PAX: bytes at PC: ");
9273+ for (i = 0; i < 5; i++) {
9274+ unsigned int c;
9275+ if (get_user(c, (unsigned int __user *)pc+i))
9276+ printk(KERN_CONT "???????? ");
9277+ else
9278+ printk(KERN_CONT "%08x ", c);
9279+ }
9280+ printk("\n");
9281+}
9282+#endif
9283+
9284 /*
9285 * Check whether the instruction at regs->nip is a store using
9286 * an update addressing form which will update r1.
9287@@ -228,7 +259,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9288 * indicate errors in DSISR but can validly be set in SRR1.
9289 */
9290 if (trap == 0x400)
9291- error_code &= 0x48200000;
9292+ error_code &= 0x58200000;
9293 else
9294 is_write = error_code & DSISR_ISSTORE;
9295 #else
9296@@ -390,7 +421,7 @@ good_area:
9297 * "undefined". Of those that can be set, this is the only
9298 * one which seems bad.
9299 */
9300- if (error_code & 0x10000000)
9301+ if (error_code & DSISR_GUARDED)
9302 /* Guarded storage error. */
9303 goto bad_area;
9304 #endif /* CONFIG_8xx */
9305@@ -405,7 +436,7 @@ good_area:
9306 * processors use the same I/D cache coherency mechanism
9307 * as embedded.
9308 */
9309- if (error_code & DSISR_PROTFAULT)
9310+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
9311 goto bad_area;
9312 #endif /* CONFIG_PPC_STD_MMU */
9313
9314@@ -495,6 +526,23 @@ bad_area:
9315 bad_area_nosemaphore:
9316 /* User mode accesses cause a SIGSEGV */
9317 if (user_mode(regs)) {
9318+
9319+#ifdef CONFIG_PAX_PAGEEXEC
9320+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9321+#ifdef CONFIG_PPC_STD_MMU
9322+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9323+#else
9324+ if (is_exec && regs->nip == address) {
9325+#endif
9326+ switch (pax_handle_fetch_fault(regs)) {
9327+ }
9328+
9329+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9330+ do_group_exit(SIGKILL);
9331+ }
9332+ }
9333+#endif
9334+
9335 _exception(SIGSEGV, regs, code, address);
9336 goto bail;
9337 }
9338diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9339index cb8bdbe..cde4bc7 100644
9340--- a/arch/powerpc/mm/mmap.c
9341+++ b/arch/powerpc/mm/mmap.c
9342@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9343 return sysctl_legacy_va_layout;
9344 }
9345
9346-static unsigned long mmap_rnd(void)
9347+static unsigned long mmap_rnd(struct mm_struct *mm)
9348 {
9349 unsigned long rnd = 0;
9350
9351+#ifdef CONFIG_PAX_RANDMMAP
9352+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9353+#endif
9354+
9355 if (current->flags & PF_RANDOMIZE) {
9356 /* 8MB for 32bit, 1GB for 64bit */
9357 if (is_32bit_task())
9358@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9359 return rnd << PAGE_SHIFT;
9360 }
9361
9362-static inline unsigned long mmap_base(void)
9363+static inline unsigned long mmap_base(struct mm_struct *mm)
9364 {
9365 unsigned long gap = rlimit(RLIMIT_STACK);
9366
9367@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9368 else if (gap > MAX_GAP)
9369 gap = MAX_GAP;
9370
9371- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9372+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9373 }
9374
9375 /*
9376@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9377 */
9378 if (mmap_is_legacy()) {
9379 mm->mmap_base = TASK_UNMAPPED_BASE;
9380+
9381+#ifdef CONFIG_PAX_RANDMMAP
9382+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9383+ mm->mmap_base += mm->delta_mmap;
9384+#endif
9385+
9386 mm->get_unmapped_area = arch_get_unmapped_area;
9387 } else {
9388- mm->mmap_base = mmap_base();
9389+ mm->mmap_base = mmap_base(mm);
9390+
9391+#ifdef CONFIG_PAX_RANDMMAP
9392+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9393+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9394+#endif
9395+
9396 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9397 }
9398 }
9399diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9400index ded0ea1..f213a9b 100644
9401--- a/arch/powerpc/mm/slice.c
9402+++ b/arch/powerpc/mm/slice.c
9403@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9404 if ((mm->task_size - len) < addr)
9405 return 0;
9406 vma = find_vma(mm, addr);
9407- return (!vma || (addr + len) <= vma->vm_start);
9408+ return check_heap_stack_gap(vma, addr, len, 0);
9409 }
9410
9411 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9412@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9413 info.align_offset = 0;
9414
9415 addr = TASK_UNMAPPED_BASE;
9416+
9417+#ifdef CONFIG_PAX_RANDMMAP
9418+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9419+ addr += mm->delta_mmap;
9420+#endif
9421+
9422 while (addr < TASK_SIZE) {
9423 info.low_limit = addr;
9424 if (!slice_scan_available(addr, available, 1, &addr))
9425@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9426 if (fixed && addr > (mm->task_size - len))
9427 return -ENOMEM;
9428
9429+#ifdef CONFIG_PAX_RANDMMAP
9430+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9431+ addr = 0;
9432+#endif
9433+
9434 /* If hint, make sure it matches our alignment restrictions */
9435 if (!fixed && addr) {
9436 addr = _ALIGN_UP(addr, 1ul << pshift);
9437diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9438index 4278acf..67fd0e6 100644
9439--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9440+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9441@@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9442 }
9443
9444 static struct pci_ops scc_pciex_pci_ops = {
9445- scc_pciex_read_config,
9446- scc_pciex_write_config,
9447+ .read = scc_pciex_read_config,
9448+ .write = scc_pciex_write_config,
9449 };
9450
9451 static void pciex_clear_intr_all(unsigned int __iomem *base)
9452diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9453index d966bbe..372124a 100644
9454--- a/arch/powerpc/platforms/cell/spufs/file.c
9455+++ b/arch/powerpc/platforms/cell/spufs/file.c
9456@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9457 return VM_FAULT_NOPAGE;
9458 }
9459
9460-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9461+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9462 unsigned long address,
9463- void *buf, int len, int write)
9464+ void *buf, size_t len, int write)
9465 {
9466 struct spu_context *ctx = vma->vm_file->private_data;
9467 unsigned long offset = address - vma->vm_start;
9468diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9469index fa934fe..c296056 100644
9470--- a/arch/s390/include/asm/atomic.h
9471+++ b/arch/s390/include/asm/atomic.h
9472@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9473 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9474 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9475
9476+#define atomic64_read_unchecked(v) atomic64_read(v)
9477+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9478+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9479+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9480+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9481+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9482+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9483+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9484+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9485+
9486 #endif /* __ARCH_S390_ATOMIC__ */
9487diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9488index b5dce65..8aca09a 100644
9489--- a/arch/s390/include/asm/barrier.h
9490+++ b/arch/s390/include/asm/barrier.h
9491@@ -39,7 +39,7 @@
9492 do { \
9493 compiletime_assert_atomic_type(*p); \
9494 barrier(); \
9495- ACCESS_ONCE(*p) = (v); \
9496+ ACCESS_ONCE_RW(*p) = (v); \
9497 } while (0)
9498
9499 #define smp_load_acquire(p) \
9500diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9501index 4d7ccac..d03d0ad 100644
9502--- a/arch/s390/include/asm/cache.h
9503+++ b/arch/s390/include/asm/cache.h
9504@@ -9,8 +9,10 @@
9505 #ifndef __ARCH_S390_CACHE_H
9506 #define __ARCH_S390_CACHE_H
9507
9508-#define L1_CACHE_BYTES 256
9509+#include <linux/const.h>
9510+
9511 #define L1_CACHE_SHIFT 8
9512+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9513 #define NET_SKB_PAD 32
9514
9515 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9516diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9517index f6e43d3..5f57681 100644
9518--- a/arch/s390/include/asm/elf.h
9519+++ b/arch/s390/include/asm/elf.h
9520@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9521 the loader. We need to make sure that it is out of the way of the program
9522 that it will "exec", and that there is sufficient room for the brk. */
9523
9524-extern unsigned long randomize_et_dyn(unsigned long base);
9525-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9526+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9527+
9528+#ifdef CONFIG_PAX_ASLR
9529+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9530+
9531+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9532+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9533+#endif
9534
9535 /* This yields a mask that user programs can use to figure out what
9536 instruction set this CPU supports. */
9537@@ -223,9 +229,6 @@ struct linux_binprm;
9538 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9539 int arch_setup_additional_pages(struct linux_binprm *, int);
9540
9541-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9542-#define arch_randomize_brk arch_randomize_brk
9543-
9544 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9545
9546 #endif
9547diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9548index c4a93d6..4d2a9b4 100644
9549--- a/arch/s390/include/asm/exec.h
9550+++ b/arch/s390/include/asm/exec.h
9551@@ -7,6 +7,6 @@
9552 #ifndef __ASM_EXEC_H
9553 #define __ASM_EXEC_H
9554
9555-extern unsigned long arch_align_stack(unsigned long sp);
9556+#define arch_align_stack(x) ((x) & ~0xfUL)
9557
9558 #endif /* __ASM_EXEC_H */
9559diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9560index cd4c68e..6764641 100644
9561--- a/arch/s390/include/asm/uaccess.h
9562+++ b/arch/s390/include/asm/uaccess.h
9563@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9564 __range_ok((unsigned long)(addr), (size)); \
9565 })
9566
9567+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9568 #define access_ok(type, addr, size) __access_ok(addr, size)
9569
9570 /*
9571@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9572 copy_to_user(void __user *to, const void *from, unsigned long n)
9573 {
9574 might_fault();
9575+
9576+ if ((long)n < 0)
9577+ return n;
9578+
9579 return __copy_to_user(to, from, n);
9580 }
9581
9582@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9583 static inline unsigned long __must_check
9584 copy_from_user(void *to, const void __user *from, unsigned long n)
9585 {
9586- unsigned int sz = __compiletime_object_size(to);
9587+ size_t sz = __compiletime_object_size(to);
9588
9589 might_fault();
9590- if (unlikely(sz != -1 && sz < n)) {
9591+
9592+ if ((long)n < 0)
9593+ return n;
9594+
9595+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9596 copy_from_user_overflow();
9597 return n;
9598 }
9599diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9600index b89b591..fd9609d 100644
9601--- a/arch/s390/kernel/module.c
9602+++ b/arch/s390/kernel/module.c
9603@@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9604
9605 /* Increase core size by size of got & plt and set start
9606 offsets for got and plt. */
9607- me->core_size = ALIGN(me->core_size, 4);
9608- me->arch.got_offset = me->core_size;
9609- me->core_size += me->arch.got_size;
9610- me->arch.plt_offset = me->core_size;
9611- me->core_size += me->arch.plt_size;
9612+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9613+ me->arch.got_offset = me->core_size_rw;
9614+ me->core_size_rw += me->arch.got_size;
9615+ me->arch.plt_offset = me->core_size_rx;
9616+ me->core_size_rx += me->arch.plt_size;
9617 return 0;
9618 }
9619
9620@@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9621 if (info->got_initialized == 0) {
9622 Elf_Addr *gotent;
9623
9624- gotent = me->module_core + me->arch.got_offset +
9625+ gotent = me->module_core_rw + me->arch.got_offset +
9626 info->got_offset;
9627 *gotent = val;
9628 info->got_initialized = 1;
9629@@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9630 rc = apply_rela_bits(loc, val, 0, 64, 0);
9631 else if (r_type == R_390_GOTENT ||
9632 r_type == R_390_GOTPLTENT) {
9633- val += (Elf_Addr) me->module_core - loc;
9634+ val += (Elf_Addr) me->module_core_rw - loc;
9635 rc = apply_rela_bits(loc, val, 1, 32, 1);
9636 }
9637 break;
9638@@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9639 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9640 if (info->plt_initialized == 0) {
9641 unsigned int *ip;
9642- ip = me->module_core + me->arch.plt_offset +
9643+ ip = me->module_core_rx + me->arch.plt_offset +
9644 info->plt_offset;
9645 #ifndef CONFIG_64BIT
9646 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9647@@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9648 val - loc + 0xffffUL < 0x1ffffeUL) ||
9649 (r_type == R_390_PLT32DBL &&
9650 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9651- val = (Elf_Addr) me->module_core +
9652+ val = (Elf_Addr) me->module_core_rx +
9653 me->arch.plt_offset +
9654 info->plt_offset;
9655 val += rela->r_addend - loc;
9656@@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9657 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9658 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9659 val = val + rela->r_addend -
9660- ((Elf_Addr) me->module_core + me->arch.got_offset);
9661+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9662 if (r_type == R_390_GOTOFF16)
9663 rc = apply_rela_bits(loc, val, 0, 16, 0);
9664 else if (r_type == R_390_GOTOFF32)
9665@@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9666 break;
9667 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9668 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9669- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9670+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9671 rela->r_addend - loc;
9672 if (r_type == R_390_GOTPC)
9673 rc = apply_rela_bits(loc, val, 1, 32, 0);
9674diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9675index ed84cc2..c05a9d2 100644
9676--- a/arch/s390/kernel/process.c
9677+++ b/arch/s390/kernel/process.c
9678@@ -218,37 +218,3 @@ unsigned long get_wchan(struct task_struct *p)
9679 }
9680 return 0;
9681 }
9682-
9683-unsigned long arch_align_stack(unsigned long sp)
9684-{
9685- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9686- sp -= get_random_int() & ~PAGE_MASK;
9687- return sp & ~0xf;
9688-}
9689-
9690-static inline unsigned long brk_rnd(void)
9691-{
9692- /* 8MB for 32bit, 1GB for 64bit */
9693- if (is_32bit_task())
9694- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9695- else
9696- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9697-}
9698-
9699-unsigned long arch_randomize_brk(struct mm_struct *mm)
9700-{
9701- unsigned long ret;
9702-
9703- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9704- return (ret > mm->brk) ? ret : mm->brk;
9705-}
9706-
9707-unsigned long randomize_et_dyn(unsigned long base)
9708-{
9709- unsigned long ret;
9710-
9711- if (!(current->flags & PF_RANDOMIZE))
9712- return base;
9713- ret = PAGE_ALIGN(base + brk_rnd());
9714- return (ret > base) ? ret : base;
9715-}
9716diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9717index 9b436c2..54fbf0a 100644
9718--- a/arch/s390/mm/mmap.c
9719+++ b/arch/s390/mm/mmap.c
9720@@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9721 */
9722 if (mmap_is_legacy()) {
9723 mm->mmap_base = mmap_base_legacy();
9724+
9725+#ifdef CONFIG_PAX_RANDMMAP
9726+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9727+ mm->mmap_base += mm->delta_mmap;
9728+#endif
9729+
9730 mm->get_unmapped_area = arch_get_unmapped_area;
9731 } else {
9732 mm->mmap_base = mmap_base();
9733+
9734+#ifdef CONFIG_PAX_RANDMMAP
9735+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9736+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9737+#endif
9738+
9739 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9740 }
9741 }
9742@@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9743 */
9744 if (mmap_is_legacy()) {
9745 mm->mmap_base = mmap_base_legacy();
9746+
9747+#ifdef CONFIG_PAX_RANDMMAP
9748+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9749+ mm->mmap_base += mm->delta_mmap;
9750+#endif
9751+
9752 mm->get_unmapped_area = s390_get_unmapped_area;
9753 } else {
9754 mm->mmap_base = mmap_base();
9755+
9756+#ifdef CONFIG_PAX_RANDMMAP
9757+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9758+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9759+#endif
9760+
9761 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9762 }
9763 }
9764diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9765index ae3d59f..f65f075 100644
9766--- a/arch/score/include/asm/cache.h
9767+++ b/arch/score/include/asm/cache.h
9768@@ -1,7 +1,9 @@
9769 #ifndef _ASM_SCORE_CACHE_H
9770 #define _ASM_SCORE_CACHE_H
9771
9772+#include <linux/const.h>
9773+
9774 #define L1_CACHE_SHIFT 4
9775-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9776+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9777
9778 #endif /* _ASM_SCORE_CACHE_H */
9779diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9780index f9f3cd5..58ff438 100644
9781--- a/arch/score/include/asm/exec.h
9782+++ b/arch/score/include/asm/exec.h
9783@@ -1,6 +1,6 @@
9784 #ifndef _ASM_SCORE_EXEC_H
9785 #define _ASM_SCORE_EXEC_H
9786
9787-extern unsigned long arch_align_stack(unsigned long sp);
9788+#define arch_align_stack(x) (x)
9789
9790 #endif /* _ASM_SCORE_EXEC_H */
9791diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9792index a1519ad3..e8ac1ff 100644
9793--- a/arch/score/kernel/process.c
9794+++ b/arch/score/kernel/process.c
9795@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9796
9797 return task_pt_regs(task)->cp0_epc;
9798 }
9799-
9800-unsigned long arch_align_stack(unsigned long sp)
9801-{
9802- return sp;
9803-}
9804diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9805index ef9e555..331bd29 100644
9806--- a/arch/sh/include/asm/cache.h
9807+++ b/arch/sh/include/asm/cache.h
9808@@ -9,10 +9,11 @@
9809 #define __ASM_SH_CACHE_H
9810 #ifdef __KERNEL__
9811
9812+#include <linux/const.h>
9813 #include <linux/init.h>
9814 #include <cpu/cache.h>
9815
9816-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9817+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9818
9819 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9820
9821diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9822index 6777177..cb5e44f 100644
9823--- a/arch/sh/mm/mmap.c
9824+++ b/arch/sh/mm/mmap.c
9825@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9826 struct mm_struct *mm = current->mm;
9827 struct vm_area_struct *vma;
9828 int do_colour_align;
9829+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9830 struct vm_unmapped_area_info info;
9831
9832 if (flags & MAP_FIXED) {
9833@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9834 if (filp || (flags & MAP_SHARED))
9835 do_colour_align = 1;
9836
9837+#ifdef CONFIG_PAX_RANDMMAP
9838+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9839+#endif
9840+
9841 if (addr) {
9842 if (do_colour_align)
9843 addr = COLOUR_ALIGN(addr, pgoff);
9844@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9845 addr = PAGE_ALIGN(addr);
9846
9847 vma = find_vma(mm, addr);
9848- if (TASK_SIZE - len >= addr &&
9849- (!vma || addr + len <= vma->vm_start))
9850+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9851 return addr;
9852 }
9853
9854 info.flags = 0;
9855 info.length = len;
9856- info.low_limit = TASK_UNMAPPED_BASE;
9857+ info.low_limit = mm->mmap_base;
9858 info.high_limit = TASK_SIZE;
9859 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9860 info.align_offset = pgoff << PAGE_SHIFT;
9861@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9862 struct mm_struct *mm = current->mm;
9863 unsigned long addr = addr0;
9864 int do_colour_align;
9865+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9866 struct vm_unmapped_area_info info;
9867
9868 if (flags & MAP_FIXED) {
9869@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9870 if (filp || (flags & MAP_SHARED))
9871 do_colour_align = 1;
9872
9873+#ifdef CONFIG_PAX_RANDMMAP
9874+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9875+#endif
9876+
9877 /* requesting a specific address */
9878 if (addr) {
9879 if (do_colour_align)
9880@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9881 addr = PAGE_ALIGN(addr);
9882
9883 vma = find_vma(mm, addr);
9884- if (TASK_SIZE - len >= addr &&
9885- (!vma || addr + len <= vma->vm_start))
9886+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9887 return addr;
9888 }
9889
9890@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9891 VM_BUG_ON(addr != -ENOMEM);
9892 info.flags = 0;
9893 info.low_limit = TASK_UNMAPPED_BASE;
9894+
9895+#ifdef CONFIG_PAX_RANDMMAP
9896+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9897+ info.low_limit += mm->delta_mmap;
9898+#endif
9899+
9900 info.high_limit = TASK_SIZE;
9901 addr = vm_unmapped_area(&info);
9902 }
9903diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9904index 4082749..fd97781 100644
9905--- a/arch/sparc/include/asm/atomic_64.h
9906+++ b/arch/sparc/include/asm/atomic_64.h
9907@@ -15,18 +15,38 @@
9908 #define ATOMIC64_INIT(i) { (i) }
9909
9910 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9911+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9912+{
9913+ return ACCESS_ONCE(v->counter);
9914+}
9915 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9916+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9917+{
9918+ return ACCESS_ONCE(v->counter);
9919+}
9920
9921 #define atomic_set(v, i) (((v)->counter) = i)
9922+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9923+{
9924+ v->counter = i;
9925+}
9926 #define atomic64_set(v, i) (((v)->counter) = i)
9927+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9928+{
9929+ v->counter = i;
9930+}
9931
9932-#define ATOMIC_OP(op) \
9933-void atomic_##op(int, atomic_t *); \
9934-void atomic64_##op(long, atomic64_t *);
9935+#define __ATOMIC_OP(op, suffix) \
9936+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9937+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9938
9939-#define ATOMIC_OP_RETURN(op) \
9940-int atomic_##op##_return(int, atomic_t *); \
9941-long atomic64_##op##_return(long, atomic64_t *);
9942+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9943+
9944+#define __ATOMIC_OP_RETURN(op, suffix) \
9945+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9946+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9947+
9948+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9949
9950 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9951
9952@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9953
9954 #undef ATOMIC_OPS
9955 #undef ATOMIC_OP_RETURN
9956+#undef __ATOMIC_OP_RETURN
9957 #undef ATOMIC_OP
9958+#undef __ATOMIC_OP
9959
9960 #define atomic_dec_return(v) atomic_sub_return(1, v)
9961 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9962
9963 #define atomic_inc_return(v) atomic_add_return(1, v)
9964+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9965+{
9966+ return atomic_add_return_unchecked(1, v);
9967+}
9968 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9969+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9970+{
9971+ return atomic64_add_return_unchecked(1, v);
9972+}
9973
9974 /*
9975 * atomic_inc_and_test - increment and test
9976@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9977 * other cases.
9978 */
9979 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9980+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9981+{
9982+ return atomic_inc_return_unchecked(v) == 0;
9983+}
9984 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9985
9986 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9987@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9988 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9989
9990 #define atomic_inc(v) atomic_add(1, v)
9991+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9992+{
9993+ atomic_add_unchecked(1, v);
9994+}
9995 #define atomic64_inc(v) atomic64_add(1, v)
9996+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9997+{
9998+ atomic64_add_unchecked(1, v);
9999+}
10000
10001 #define atomic_dec(v) atomic_sub(1, v)
10002+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
10003+{
10004+ atomic_sub_unchecked(1, v);
10005+}
10006 #define atomic64_dec(v) atomic64_sub(1, v)
10007+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
10008+{
10009+ atomic64_sub_unchecked(1, v);
10010+}
10011
10012 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
10013 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
10014
10015 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
10016+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
10017+{
10018+ return cmpxchg(&v->counter, old, new);
10019+}
10020 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
10021+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
10022+{
10023+ return xchg(&v->counter, new);
10024+}
10025
10026 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10027 {
10028- int c, old;
10029+ int c, old, new;
10030 c = atomic_read(v);
10031 for (;;) {
10032- if (unlikely(c == (u)))
10033+ if (unlikely(c == u))
10034 break;
10035- old = atomic_cmpxchg((v), c, c + (a));
10036+
10037+ asm volatile("addcc %2, %0, %0\n"
10038+
10039+#ifdef CONFIG_PAX_REFCOUNT
10040+ "tvs %%icc, 6\n"
10041+#endif
10042+
10043+ : "=r" (new)
10044+ : "0" (c), "ir" (a)
10045+ : "cc");
10046+
10047+ old = atomic_cmpxchg(v, c, new);
10048 if (likely(old == c))
10049 break;
10050 c = old;
10051@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10052 #define atomic64_cmpxchg(v, o, n) \
10053 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10054 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10055+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10056+{
10057+ return xchg(&v->counter, new);
10058+}
10059
10060 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10061 {
10062- long c, old;
10063+ long c, old, new;
10064 c = atomic64_read(v);
10065 for (;;) {
10066- if (unlikely(c == (u)))
10067+ if (unlikely(c == u))
10068 break;
10069- old = atomic64_cmpxchg((v), c, c + (a));
10070+
10071+ asm volatile("addcc %2, %0, %0\n"
10072+
10073+#ifdef CONFIG_PAX_REFCOUNT
10074+ "tvs %%xcc, 6\n"
10075+#endif
10076+
10077+ : "=r" (new)
10078+ : "0" (c), "ir" (a)
10079+ : "cc");
10080+
10081+ old = atomic64_cmpxchg(v, c, new);
10082 if (likely(old == c))
10083 break;
10084 c = old;
10085 }
10086- return c != (u);
10087+ return c != u;
10088 }
10089
10090 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10091diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10092index 305dcc3..7835030 100644
10093--- a/arch/sparc/include/asm/barrier_64.h
10094+++ b/arch/sparc/include/asm/barrier_64.h
10095@@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10096 do { \
10097 compiletime_assert_atomic_type(*p); \
10098 barrier(); \
10099- ACCESS_ONCE(*p) = (v); \
10100+ ACCESS_ONCE_RW(*p) = (v); \
10101 } while (0)
10102
10103 #define smp_load_acquire(p) \
10104diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10105index 5bb6991..5c2132e 100644
10106--- a/arch/sparc/include/asm/cache.h
10107+++ b/arch/sparc/include/asm/cache.h
10108@@ -7,10 +7,12 @@
10109 #ifndef _SPARC_CACHE_H
10110 #define _SPARC_CACHE_H
10111
10112+#include <linux/const.h>
10113+
10114 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10115
10116 #define L1_CACHE_SHIFT 5
10117-#define L1_CACHE_BYTES 32
10118+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10119
10120 #ifdef CONFIG_SPARC32
10121 #define SMP_CACHE_BYTES_SHIFT 5
10122diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10123index a24e41f..47677ff 100644
10124--- a/arch/sparc/include/asm/elf_32.h
10125+++ b/arch/sparc/include/asm/elf_32.h
10126@@ -114,6 +114,13 @@ typedef struct {
10127
10128 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10129
10130+#ifdef CONFIG_PAX_ASLR
10131+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10132+
10133+#define PAX_DELTA_MMAP_LEN 16
10134+#define PAX_DELTA_STACK_LEN 16
10135+#endif
10136+
10137 /* This yields a mask that user programs can use to figure out what
10138 instruction set this cpu supports. This can NOT be done in userspace
10139 on Sparc. */
10140diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10141index 370ca1e..d4f4a98 100644
10142--- a/arch/sparc/include/asm/elf_64.h
10143+++ b/arch/sparc/include/asm/elf_64.h
10144@@ -189,6 +189,13 @@ typedef struct {
10145 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10146 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10147
10148+#ifdef CONFIG_PAX_ASLR
10149+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10150+
10151+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10152+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10153+#endif
10154+
10155 extern unsigned long sparc64_elf_hwcap;
10156 #define ELF_HWCAP sparc64_elf_hwcap
10157
10158diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10159index a3890da..f6a408e 100644
10160--- a/arch/sparc/include/asm/pgalloc_32.h
10161+++ b/arch/sparc/include/asm/pgalloc_32.h
10162@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10163 }
10164
10165 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10166+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10167
10168 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10169 unsigned long address)
10170diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10171index 5e31871..13469c6 100644
10172--- a/arch/sparc/include/asm/pgalloc_64.h
10173+++ b/arch/sparc/include/asm/pgalloc_64.h
10174@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10175 }
10176
10177 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10178+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10179
10180 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10181 {
10182@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10183 }
10184
10185 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10186+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10187
10188 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10189 {
10190diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10191index 59ba6f6..4518128 100644
10192--- a/arch/sparc/include/asm/pgtable.h
10193+++ b/arch/sparc/include/asm/pgtable.h
10194@@ -5,4 +5,8 @@
10195 #else
10196 #include <asm/pgtable_32.h>
10197 #endif
10198+
10199+#define ktla_ktva(addr) (addr)
10200+#define ktva_ktla(addr) (addr)
10201+
10202 #endif
10203diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10204index b9b91ae..950b91e 100644
10205--- a/arch/sparc/include/asm/pgtable_32.h
10206+++ b/arch/sparc/include/asm/pgtable_32.h
10207@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10208 #define PAGE_SHARED SRMMU_PAGE_SHARED
10209 #define PAGE_COPY SRMMU_PAGE_COPY
10210 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10211+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10212+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10213+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10214 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10215
10216 /* Top-level page directory - dummy used by init-mm.
10217@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10218
10219 /* xwr */
10220 #define __P000 PAGE_NONE
10221-#define __P001 PAGE_READONLY
10222-#define __P010 PAGE_COPY
10223-#define __P011 PAGE_COPY
10224+#define __P001 PAGE_READONLY_NOEXEC
10225+#define __P010 PAGE_COPY_NOEXEC
10226+#define __P011 PAGE_COPY_NOEXEC
10227 #define __P100 PAGE_READONLY
10228 #define __P101 PAGE_READONLY
10229 #define __P110 PAGE_COPY
10230 #define __P111 PAGE_COPY
10231
10232 #define __S000 PAGE_NONE
10233-#define __S001 PAGE_READONLY
10234-#define __S010 PAGE_SHARED
10235-#define __S011 PAGE_SHARED
10236+#define __S001 PAGE_READONLY_NOEXEC
10237+#define __S010 PAGE_SHARED_NOEXEC
10238+#define __S011 PAGE_SHARED_NOEXEC
10239 #define __S100 PAGE_READONLY
10240 #define __S101 PAGE_READONLY
10241 #define __S110 PAGE_SHARED
10242diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10243index 79da178..c2eede8 100644
10244--- a/arch/sparc/include/asm/pgtsrmmu.h
10245+++ b/arch/sparc/include/asm/pgtsrmmu.h
10246@@ -115,6 +115,11 @@
10247 SRMMU_EXEC | SRMMU_REF)
10248 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10249 SRMMU_EXEC | SRMMU_REF)
10250+
10251+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10252+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10253+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10254+
10255 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10256 SRMMU_DIRTY | SRMMU_REF)
10257
10258diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10259index 29d64b1..4272fe8 100644
10260--- a/arch/sparc/include/asm/setup.h
10261+++ b/arch/sparc/include/asm/setup.h
10262@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10263 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10264
10265 /* init_64.c */
10266-extern atomic_t dcpage_flushes;
10267-extern atomic_t dcpage_flushes_xcall;
10268+extern atomic_unchecked_t dcpage_flushes;
10269+extern atomic_unchecked_t dcpage_flushes_xcall;
10270
10271 extern int sysctl_tsb_ratio;
10272 #endif
10273diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10274index 9689176..63c18ea 100644
10275--- a/arch/sparc/include/asm/spinlock_64.h
10276+++ b/arch/sparc/include/asm/spinlock_64.h
10277@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10278
10279 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10280
10281-static void inline arch_read_lock(arch_rwlock_t *lock)
10282+static inline void arch_read_lock(arch_rwlock_t *lock)
10283 {
10284 unsigned long tmp1, tmp2;
10285
10286 __asm__ __volatile__ (
10287 "1: ldsw [%2], %0\n"
10288 " brlz,pn %0, 2f\n"
10289-"4: add %0, 1, %1\n"
10290+"4: addcc %0, 1, %1\n"
10291+
10292+#ifdef CONFIG_PAX_REFCOUNT
10293+" tvs %%icc, 6\n"
10294+#endif
10295+
10296 " cas [%2], %0, %1\n"
10297 " cmp %0, %1\n"
10298 " bne,pn %%icc, 1b\n"
10299@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10300 " .previous"
10301 : "=&r" (tmp1), "=&r" (tmp2)
10302 : "r" (lock)
10303- : "memory");
10304+ : "memory", "cc");
10305 }
10306
10307-static int inline arch_read_trylock(arch_rwlock_t *lock)
10308+static inline int arch_read_trylock(arch_rwlock_t *lock)
10309 {
10310 int tmp1, tmp2;
10311
10312@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10313 "1: ldsw [%2], %0\n"
10314 " brlz,a,pn %0, 2f\n"
10315 " mov 0, %0\n"
10316-" add %0, 1, %1\n"
10317+" addcc %0, 1, %1\n"
10318+
10319+#ifdef CONFIG_PAX_REFCOUNT
10320+" tvs %%icc, 6\n"
10321+#endif
10322+
10323 " cas [%2], %0, %1\n"
10324 " cmp %0, %1\n"
10325 " bne,pn %%icc, 1b\n"
10326@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10327 return tmp1;
10328 }
10329
10330-static void inline arch_read_unlock(arch_rwlock_t *lock)
10331+static inline void arch_read_unlock(arch_rwlock_t *lock)
10332 {
10333 unsigned long tmp1, tmp2;
10334
10335 __asm__ __volatile__(
10336 "1: lduw [%2], %0\n"
10337-" sub %0, 1, %1\n"
10338+" subcc %0, 1, %1\n"
10339+
10340+#ifdef CONFIG_PAX_REFCOUNT
10341+" tvs %%icc, 6\n"
10342+#endif
10343+
10344 " cas [%2], %0, %1\n"
10345 " cmp %0, %1\n"
10346 " bne,pn %%xcc, 1b\n"
10347@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10348 : "memory");
10349 }
10350
10351-static void inline arch_write_lock(arch_rwlock_t *lock)
10352+static inline void arch_write_lock(arch_rwlock_t *lock)
10353 {
10354 unsigned long mask, tmp1, tmp2;
10355
10356@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10357 : "memory");
10358 }
10359
10360-static void inline arch_write_unlock(arch_rwlock_t *lock)
10361+static inline void arch_write_unlock(arch_rwlock_t *lock)
10362 {
10363 __asm__ __volatile__(
10364 " stw %%g0, [%0]"
10365@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10366 : "memory");
10367 }
10368
10369-static int inline arch_write_trylock(arch_rwlock_t *lock)
10370+static inline int arch_write_trylock(arch_rwlock_t *lock)
10371 {
10372 unsigned long mask, tmp1, tmp2, result;
10373
10374diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10375index 025c984..a216504 100644
10376--- a/arch/sparc/include/asm/thread_info_32.h
10377+++ b/arch/sparc/include/asm/thread_info_32.h
10378@@ -49,6 +49,8 @@ struct thread_info {
10379 unsigned long w_saved;
10380
10381 struct restart_block restart_block;
10382+
10383+ unsigned long lowest_stack;
10384 };
10385
10386 /*
10387diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10388index 798f027..b009941 100644
10389--- a/arch/sparc/include/asm/thread_info_64.h
10390+++ b/arch/sparc/include/asm/thread_info_64.h
10391@@ -63,6 +63,8 @@ struct thread_info {
10392 struct pt_regs *kern_una_regs;
10393 unsigned int kern_una_insn;
10394
10395+ unsigned long lowest_stack;
10396+
10397 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10398 __attribute__ ((aligned(64)));
10399 };
10400@@ -190,12 +192,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10401 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10402 /* flag bit 4 is available */
10403 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10404-/* flag bit 6 is available */
10405+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10406 #define TIF_32BIT 7 /* 32-bit binary */
10407 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10408 #define TIF_SECCOMP 9 /* secure computing */
10409 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10410 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10411+
10412 /* NOTE: Thread flags >= 12 should be ones we have no interest
10413 * in using in assembly, else we can't use the mask as
10414 * an immediate value in instructions such as andcc.
10415@@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10416 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10417 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10418 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10419+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10420
10421 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10422 _TIF_DO_NOTIFY_RESUME_MASK | \
10423 _TIF_NEED_RESCHED)
10424 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10425
10426+#define _TIF_WORK_SYSCALL \
10427+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10428+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10429+
10430 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10431
10432 /*
10433diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10434index bd56c28..4b63d83 100644
10435--- a/arch/sparc/include/asm/uaccess.h
10436+++ b/arch/sparc/include/asm/uaccess.h
10437@@ -1,5 +1,6 @@
10438 #ifndef ___ASM_SPARC_UACCESS_H
10439 #define ___ASM_SPARC_UACCESS_H
10440+
10441 #if defined(__sparc__) && defined(__arch64__)
10442 #include <asm/uaccess_64.h>
10443 #else
10444diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10445index 9634d08..f55fe4f 100644
10446--- a/arch/sparc/include/asm/uaccess_32.h
10447+++ b/arch/sparc/include/asm/uaccess_32.h
10448@@ -250,27 +250,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10449
10450 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10451 {
10452- if (n && __access_ok((unsigned long) to, n))
10453+ if ((long)n < 0)
10454+ return n;
10455+
10456+ if (n && __access_ok((unsigned long) to, n)) {
10457+ if (!__builtin_constant_p(n))
10458+ check_object_size(from, n, true);
10459 return __copy_user(to, (__force void __user *) from, n);
10460- else
10461+ } else
10462 return n;
10463 }
10464
10465 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10466 {
10467+ if ((long)n < 0)
10468+ return n;
10469+
10470+ if (!__builtin_constant_p(n))
10471+ check_object_size(from, n, true);
10472+
10473 return __copy_user(to, (__force void __user *) from, n);
10474 }
10475
10476 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10477 {
10478- if (n && __access_ok((unsigned long) from, n))
10479+ if ((long)n < 0)
10480+ return n;
10481+
10482+ if (n && __access_ok((unsigned long) from, n)) {
10483+ if (!__builtin_constant_p(n))
10484+ check_object_size(to, n, false);
10485 return __copy_user((__force void __user *) to, from, n);
10486- else
10487+ } else
10488 return n;
10489 }
10490
10491 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10492 {
10493+ if ((long)n < 0)
10494+ return n;
10495+
10496 return __copy_user((__force void __user *) to, from, n);
10497 }
10498
10499diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10500index c990a5e..f17b9c1 100644
10501--- a/arch/sparc/include/asm/uaccess_64.h
10502+++ b/arch/sparc/include/asm/uaccess_64.h
10503@@ -10,6 +10,7 @@
10504 #include <linux/compiler.h>
10505 #include <linux/string.h>
10506 #include <linux/thread_info.h>
10507+#include <linux/kernel.h>
10508 #include <asm/asi.h>
10509 #include <asm/spitfire.h>
10510 #include <asm-generic/uaccess-unaligned.h>
10511@@ -214,8 +215,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10512 static inline unsigned long __must_check
10513 copy_from_user(void *to, const void __user *from, unsigned long size)
10514 {
10515- unsigned long ret = ___copy_from_user(to, from, size);
10516+ unsigned long ret;
10517
10518+ if ((long)size < 0 || size > INT_MAX)
10519+ return size;
10520+
10521+ if (!__builtin_constant_p(size))
10522+ check_object_size(to, size, false);
10523+
10524+ ret = ___copy_from_user(to, from, size);
10525 if (unlikely(ret))
10526 ret = copy_from_user_fixup(to, from, size);
10527
10528@@ -231,8 +239,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10529 static inline unsigned long __must_check
10530 copy_to_user(void __user *to, const void *from, unsigned long size)
10531 {
10532- unsigned long ret = ___copy_to_user(to, from, size);
10533+ unsigned long ret;
10534
10535+ if ((long)size < 0 || size > INT_MAX)
10536+ return size;
10537+
10538+ if (!__builtin_constant_p(size))
10539+ check_object_size(from, size, true);
10540+
10541+ ret = ___copy_to_user(to, from, size);
10542 if (unlikely(ret))
10543 ret = copy_to_user_fixup(to, from, size);
10544 return ret;
10545diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10546index 7cf9c6e..6206648 100644
10547--- a/arch/sparc/kernel/Makefile
10548+++ b/arch/sparc/kernel/Makefile
10549@@ -4,7 +4,7 @@
10550 #
10551
10552 asflags-y := -ansi
10553-ccflags-y := -Werror
10554+#ccflags-y := -Werror
10555
10556 extra-y := head_$(BITS).o
10557
10558diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10559index 50e7b62..79fae35 100644
10560--- a/arch/sparc/kernel/process_32.c
10561+++ b/arch/sparc/kernel/process_32.c
10562@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10563
10564 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10565 r->psr, r->pc, r->npc, r->y, print_tainted());
10566- printk("PC: <%pS>\n", (void *) r->pc);
10567+ printk("PC: <%pA>\n", (void *) r->pc);
10568 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10569 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10570 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10571 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10572 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10573 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10574- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10575+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10576
10577 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10578 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10579@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10580 rw = (struct reg_window32 *) fp;
10581 pc = rw->ins[7];
10582 printk("[%08lx : ", pc);
10583- printk("%pS ] ", (void *) pc);
10584+ printk("%pA ] ", (void *) pc);
10585 fp = rw->ins[6];
10586 } while (++count < 16);
10587 printk("\n");
10588diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10589index 0be7bf9..2b1cba8 100644
10590--- a/arch/sparc/kernel/process_64.c
10591+++ b/arch/sparc/kernel/process_64.c
10592@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10593 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10594 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10595 if (regs->tstate & TSTATE_PRIV)
10596- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10597+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10598 }
10599
10600 void show_regs(struct pt_regs *regs)
10601@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10602
10603 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10604 regs->tpc, regs->tnpc, regs->y, print_tainted());
10605- printk("TPC: <%pS>\n", (void *) regs->tpc);
10606+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10607 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10608 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10609 regs->u_regs[3]);
10610@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10611 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10612 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10613 regs->u_regs[15]);
10614- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10615+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10616 show_regwindow(regs);
10617 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10618 }
10619@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10620 ((tp && tp->task) ? tp->task->pid : -1));
10621
10622 if (gp->tstate & TSTATE_PRIV) {
10623- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10624+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10625 (void *) gp->tpc,
10626 (void *) gp->o7,
10627 (void *) gp->i7,
10628diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10629index 79cc0d1..ec62734 100644
10630--- a/arch/sparc/kernel/prom_common.c
10631+++ b/arch/sparc/kernel/prom_common.c
10632@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10633
10634 unsigned int prom_early_allocated __initdata;
10635
10636-static struct of_pdt_ops prom_sparc_ops __initdata = {
10637+static struct of_pdt_ops prom_sparc_ops __initconst = {
10638 .nextprop = prom_common_nextprop,
10639 .getproplen = prom_getproplen,
10640 .getproperty = prom_getproperty,
10641diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10642index 9ddc492..27a5619 100644
10643--- a/arch/sparc/kernel/ptrace_64.c
10644+++ b/arch/sparc/kernel/ptrace_64.c
10645@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10646 return ret;
10647 }
10648
10649+#ifdef CONFIG_GRKERNSEC_SETXID
10650+extern void gr_delayed_cred_worker(void);
10651+#endif
10652+
10653 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10654 {
10655 int ret = 0;
10656@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10657 if (test_thread_flag(TIF_NOHZ))
10658 user_exit();
10659
10660+#ifdef CONFIG_GRKERNSEC_SETXID
10661+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10662+ gr_delayed_cred_worker();
10663+#endif
10664+
10665 if (test_thread_flag(TIF_SYSCALL_TRACE))
10666 ret = tracehook_report_syscall_entry(regs);
10667
10668@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10669 if (test_thread_flag(TIF_NOHZ))
10670 user_exit();
10671
10672+#ifdef CONFIG_GRKERNSEC_SETXID
10673+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10674+ gr_delayed_cred_worker();
10675+#endif
10676+
10677 audit_syscall_exit(regs);
10678
10679 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10680diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10681index da6f1a7..e5dea8f 100644
10682--- a/arch/sparc/kernel/smp_64.c
10683+++ b/arch/sparc/kernel/smp_64.c
10684@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10685 return;
10686
10687 #ifdef CONFIG_DEBUG_DCFLUSH
10688- atomic_inc(&dcpage_flushes);
10689+ atomic_inc_unchecked(&dcpage_flushes);
10690 #endif
10691
10692 this_cpu = get_cpu();
10693@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10694 xcall_deliver(data0, __pa(pg_addr),
10695 (u64) pg_addr, cpumask_of(cpu));
10696 #ifdef CONFIG_DEBUG_DCFLUSH
10697- atomic_inc(&dcpage_flushes_xcall);
10698+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10699 #endif
10700 }
10701 }
10702@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10703 preempt_disable();
10704
10705 #ifdef CONFIG_DEBUG_DCFLUSH
10706- atomic_inc(&dcpage_flushes);
10707+ atomic_inc_unchecked(&dcpage_flushes);
10708 #endif
10709 data0 = 0;
10710 pg_addr = page_address(page);
10711@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10712 xcall_deliver(data0, __pa(pg_addr),
10713 (u64) pg_addr, cpu_online_mask);
10714 #ifdef CONFIG_DEBUG_DCFLUSH
10715- atomic_inc(&dcpage_flushes_xcall);
10716+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10717 #endif
10718 }
10719 __local_flush_dcache_page(page);
10720diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10721index 646988d..b88905f 100644
10722--- a/arch/sparc/kernel/sys_sparc_32.c
10723+++ b/arch/sparc/kernel/sys_sparc_32.c
10724@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10725 if (len > TASK_SIZE - PAGE_SIZE)
10726 return -ENOMEM;
10727 if (!addr)
10728- addr = TASK_UNMAPPED_BASE;
10729+ addr = current->mm->mmap_base;
10730
10731 info.flags = 0;
10732 info.length = len;
10733diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10734index c85403d..6af95c9 100644
10735--- a/arch/sparc/kernel/sys_sparc_64.c
10736+++ b/arch/sparc/kernel/sys_sparc_64.c
10737@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10738 struct vm_area_struct * vma;
10739 unsigned long task_size = TASK_SIZE;
10740 int do_color_align;
10741+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10742 struct vm_unmapped_area_info info;
10743
10744 if (flags & MAP_FIXED) {
10745 /* We do not accept a shared mapping if it would violate
10746 * cache aliasing constraints.
10747 */
10748- if ((flags & MAP_SHARED) &&
10749+ if ((filp || (flags & MAP_SHARED)) &&
10750 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10751 return -EINVAL;
10752 return addr;
10753@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10754 if (filp || (flags & MAP_SHARED))
10755 do_color_align = 1;
10756
10757+#ifdef CONFIG_PAX_RANDMMAP
10758+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10759+#endif
10760+
10761 if (addr) {
10762 if (do_color_align)
10763 addr = COLOR_ALIGN(addr, pgoff);
10764@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10765 addr = PAGE_ALIGN(addr);
10766
10767 vma = find_vma(mm, addr);
10768- if (task_size - len >= addr &&
10769- (!vma || addr + len <= vma->vm_start))
10770+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10771 return addr;
10772 }
10773
10774 info.flags = 0;
10775 info.length = len;
10776- info.low_limit = TASK_UNMAPPED_BASE;
10777+ info.low_limit = mm->mmap_base;
10778 info.high_limit = min(task_size, VA_EXCLUDE_START);
10779 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10780 info.align_offset = pgoff << PAGE_SHIFT;
10781+ info.threadstack_offset = offset;
10782 addr = vm_unmapped_area(&info);
10783
10784 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10785 VM_BUG_ON(addr != -ENOMEM);
10786 info.low_limit = VA_EXCLUDE_END;
10787+
10788+#ifdef CONFIG_PAX_RANDMMAP
10789+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10790+ info.low_limit += mm->delta_mmap;
10791+#endif
10792+
10793 info.high_limit = task_size;
10794 addr = vm_unmapped_area(&info);
10795 }
10796@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10797 unsigned long task_size = STACK_TOP32;
10798 unsigned long addr = addr0;
10799 int do_color_align;
10800+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10801 struct vm_unmapped_area_info info;
10802
10803 /* This should only ever run for 32-bit processes. */
10804@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10805 /* We do not accept a shared mapping if it would violate
10806 * cache aliasing constraints.
10807 */
10808- if ((flags & MAP_SHARED) &&
10809+ if ((filp || (flags & MAP_SHARED)) &&
10810 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10811 return -EINVAL;
10812 return addr;
10813@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10814 if (filp || (flags & MAP_SHARED))
10815 do_color_align = 1;
10816
10817+#ifdef CONFIG_PAX_RANDMMAP
10818+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10819+#endif
10820+
10821 /* requesting a specific address */
10822 if (addr) {
10823 if (do_color_align)
10824@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10825 addr = PAGE_ALIGN(addr);
10826
10827 vma = find_vma(mm, addr);
10828- if (task_size - len >= addr &&
10829- (!vma || addr + len <= vma->vm_start))
10830+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10831 return addr;
10832 }
10833
10834@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10835 info.high_limit = mm->mmap_base;
10836 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10837 info.align_offset = pgoff << PAGE_SHIFT;
10838+ info.threadstack_offset = offset;
10839 addr = vm_unmapped_area(&info);
10840
10841 /*
10842@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10843 VM_BUG_ON(addr != -ENOMEM);
10844 info.flags = 0;
10845 info.low_limit = TASK_UNMAPPED_BASE;
10846+
10847+#ifdef CONFIG_PAX_RANDMMAP
10848+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10849+ info.low_limit += mm->delta_mmap;
10850+#endif
10851+
10852 info.high_limit = STACK_TOP32;
10853 addr = vm_unmapped_area(&info);
10854 }
10855@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10856 EXPORT_SYMBOL(get_fb_unmapped_area);
10857
10858 /* Essentially the same as PowerPC. */
10859-static unsigned long mmap_rnd(void)
10860+static unsigned long mmap_rnd(struct mm_struct *mm)
10861 {
10862 unsigned long rnd = 0UL;
10863
10864+#ifdef CONFIG_PAX_RANDMMAP
10865+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10866+#endif
10867+
10868 if (current->flags & PF_RANDOMIZE) {
10869 unsigned long val = get_random_int();
10870 if (test_thread_flag(TIF_32BIT))
10871@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10872
10873 void arch_pick_mmap_layout(struct mm_struct *mm)
10874 {
10875- unsigned long random_factor = mmap_rnd();
10876+ unsigned long random_factor = mmap_rnd(mm);
10877 unsigned long gap;
10878
10879 /*
10880@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10881 gap == RLIM_INFINITY ||
10882 sysctl_legacy_va_layout) {
10883 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10884+
10885+#ifdef CONFIG_PAX_RANDMMAP
10886+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10887+ mm->mmap_base += mm->delta_mmap;
10888+#endif
10889+
10890 mm->get_unmapped_area = arch_get_unmapped_area;
10891 } else {
10892 /* We know it's 32-bit */
10893@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10894 gap = (task_size / 6 * 5);
10895
10896 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10897+
10898+#ifdef CONFIG_PAX_RANDMMAP
10899+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10900+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10901+#endif
10902+
10903 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10904 }
10905 }
10906diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10907index 33a17e7..d87fb1f 100644
10908--- a/arch/sparc/kernel/syscalls.S
10909+++ b/arch/sparc/kernel/syscalls.S
10910@@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10911 #endif
10912 .align 32
10913 1: ldx [%g6 + TI_FLAGS], %l5
10914- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10915+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10916 be,pt %icc, rtrap
10917 nop
10918 call syscall_trace_leave
10919@@ -184,7 +184,7 @@ linux_sparc_syscall32:
10920
10921 srl %i3, 0, %o3 ! IEU0
10922 srl %i2, 0, %o2 ! IEU0 Group
10923- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10924+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10925 bne,pn %icc, linux_syscall_trace32 ! CTI
10926 mov %i0, %l5 ! IEU1
10927 5: call %l7 ! CTI Group brk forced
10928@@ -208,7 +208,7 @@ linux_sparc_syscall:
10929
10930 mov %i3, %o3 ! IEU1
10931 mov %i4, %o4 ! IEU0 Group
10932- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10933+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10934 bne,pn %icc, linux_syscall_trace ! CTI Group
10935 mov %i0, %l5 ! IEU0
10936 2: call %l7 ! CTI Group brk forced
10937@@ -223,7 +223,7 @@ ret_sys_call:
10938
10939 cmp %o0, -ERESTART_RESTARTBLOCK
10940 bgeu,pn %xcc, 1f
10941- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10942+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10943 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10944
10945 2:
10946diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10947index 6fd386c5..6907d81 100644
10948--- a/arch/sparc/kernel/traps_32.c
10949+++ b/arch/sparc/kernel/traps_32.c
10950@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10951 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10952 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10953
10954+extern void gr_handle_kernel_exploit(void);
10955+
10956 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10957 {
10958 static int die_counter;
10959@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10960 count++ < 30 &&
10961 (((unsigned long) rw) >= PAGE_OFFSET) &&
10962 !(((unsigned long) rw) & 0x7)) {
10963- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10964+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10965 (void *) rw->ins[7]);
10966 rw = (struct reg_window32 *)rw->ins[6];
10967 }
10968 }
10969 printk("Instruction DUMP:");
10970 instruction_dump ((unsigned long *) regs->pc);
10971- if(regs->psr & PSR_PS)
10972+ if(regs->psr & PSR_PS) {
10973+ gr_handle_kernel_exploit();
10974 do_exit(SIGKILL);
10975+ }
10976 do_exit(SIGSEGV);
10977 }
10978
10979diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10980index 981a769..d906eda 100644
10981--- a/arch/sparc/kernel/traps_64.c
10982+++ b/arch/sparc/kernel/traps_64.c
10983@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10984 i + 1,
10985 p->trapstack[i].tstate, p->trapstack[i].tpc,
10986 p->trapstack[i].tnpc, p->trapstack[i].tt);
10987- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10988+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10989 }
10990 }
10991
10992@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10993
10994 lvl -= 0x100;
10995 if (regs->tstate & TSTATE_PRIV) {
10996+
10997+#ifdef CONFIG_PAX_REFCOUNT
10998+ if (lvl == 6)
10999+ pax_report_refcount_overflow(regs);
11000+#endif
11001+
11002 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
11003 die_if_kernel(buffer, regs);
11004 }
11005@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
11006 void bad_trap_tl1(struct pt_regs *regs, long lvl)
11007 {
11008 char buffer[32];
11009-
11010+
11011 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
11012 0, lvl, SIGTRAP) == NOTIFY_STOP)
11013 return;
11014
11015+#ifdef CONFIG_PAX_REFCOUNT
11016+ if (lvl == 6)
11017+ pax_report_refcount_overflow(regs);
11018+#endif
11019+
11020 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
11021
11022 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
11023@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11024 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11025 printk("%s" "ERROR(%d): ",
11026 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11027- printk("TPC<%pS>\n", (void *) regs->tpc);
11028+ printk("TPC<%pA>\n", (void *) regs->tpc);
11029 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11030 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11031 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11032@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11033 smp_processor_id(),
11034 (type & 0x1) ? 'I' : 'D',
11035 regs->tpc);
11036- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11037+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11038 panic("Irrecoverable Cheetah+ parity error.");
11039 }
11040
11041@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11042 smp_processor_id(),
11043 (type & 0x1) ? 'I' : 'D',
11044 regs->tpc);
11045- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11046+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11047 }
11048
11049 struct sun4v_error_entry {
11050@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11051 /*0x38*/u64 reserved_5;
11052 };
11053
11054-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11055-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11056+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11057+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11058
11059 static const char *sun4v_err_type_to_str(u8 type)
11060 {
11061@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11062 }
11063
11064 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11065- int cpu, const char *pfx, atomic_t *ocnt)
11066+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11067 {
11068 u64 *raw_ptr = (u64 *) ent;
11069 u32 attrs;
11070@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11071
11072 show_regs(regs);
11073
11074- if ((cnt = atomic_read(ocnt)) != 0) {
11075- atomic_set(ocnt, 0);
11076+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11077+ atomic_set_unchecked(ocnt, 0);
11078 wmb();
11079 printk("%s: Queue overflowed %d times.\n",
11080 pfx, cnt);
11081@@ -2048,7 +2059,7 @@ out:
11082 */
11083 void sun4v_resum_overflow(struct pt_regs *regs)
11084 {
11085- atomic_inc(&sun4v_resum_oflow_cnt);
11086+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11087 }
11088
11089 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11090@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11091 /* XXX Actually even this can make not that much sense. Perhaps
11092 * XXX we should just pull the plug and panic directly from here?
11093 */
11094- atomic_inc(&sun4v_nonresum_oflow_cnt);
11095+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11096 }
11097
11098 static void sun4v_tlb_error(struct pt_regs *regs)
11099@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11100
11101 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11102 regs->tpc, tl);
11103- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11104+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11105 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11106- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11107+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11108 (void *) regs->u_regs[UREG_I7]);
11109 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11110 "pte[%lx] error[%lx]\n",
11111@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11112
11113 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11114 regs->tpc, tl);
11115- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11116+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11117 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11118- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11119+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11120 (void *) regs->u_regs[UREG_I7]);
11121 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11122 "pte[%lx] error[%lx]\n",
11123@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11124 fp = (unsigned long)sf->fp + STACK_BIAS;
11125 }
11126
11127- printk(" [%016lx] %pS\n", pc, (void *) pc);
11128+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11129 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11130 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11131 int index = tsk->curr_ret_stack;
11132 if (tsk->ret_stack && index >= graph) {
11133 pc = tsk->ret_stack[index - graph].ret;
11134- printk(" [%016lx] %pS\n", pc, (void *) pc);
11135+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11136 graph++;
11137 }
11138 }
11139@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11140 return (struct reg_window *) (fp + STACK_BIAS);
11141 }
11142
11143+extern void gr_handle_kernel_exploit(void);
11144+
11145 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11146 {
11147 static int die_counter;
11148@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11149 while (rw &&
11150 count++ < 30 &&
11151 kstack_valid(tp, (unsigned long) rw)) {
11152- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11153+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11154 (void *) rw->ins[7]);
11155
11156 rw = kernel_stack_up(rw);
11157@@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11158 }
11159 user_instruction_dump ((unsigned int __user *) regs->tpc);
11160 }
11161- if (regs->tstate & TSTATE_PRIV)
11162+ if (regs->tstate & TSTATE_PRIV) {
11163+ gr_handle_kernel_exploit();
11164 do_exit(SIGKILL);
11165+ }
11166 do_exit(SIGSEGV);
11167 }
11168 EXPORT_SYMBOL(die_if_kernel);
11169diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11170index 62098a8..547ab2c 100644
11171--- a/arch/sparc/kernel/unaligned_64.c
11172+++ b/arch/sparc/kernel/unaligned_64.c
11173@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11174 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11175
11176 if (__ratelimit(&ratelimit)) {
11177- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11178+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11179 regs->tpc, (void *) regs->tpc);
11180 }
11181 }
11182diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11183index 3269b02..64f5231 100644
11184--- a/arch/sparc/lib/Makefile
11185+++ b/arch/sparc/lib/Makefile
11186@@ -2,7 +2,7 @@
11187 #
11188
11189 asflags-y := -ansi -DST_DIV0=0x02
11190-ccflags-y := -Werror
11191+#ccflags-y := -Werror
11192
11193 lib-$(CONFIG_SPARC32) += ashrdi3.o
11194 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11195diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11196index 05dac43..76f8ed4 100644
11197--- a/arch/sparc/lib/atomic_64.S
11198+++ b/arch/sparc/lib/atomic_64.S
11199@@ -15,11 +15,22 @@
11200 * a value and does the barriers.
11201 */
11202
11203-#define ATOMIC_OP(op) \
11204-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11205+#ifdef CONFIG_PAX_REFCOUNT
11206+#define __REFCOUNT_OP(op) op##cc
11207+#define __OVERFLOW_IOP tvs %icc, 6;
11208+#define __OVERFLOW_XOP tvs %xcc, 6;
11209+#else
11210+#define __REFCOUNT_OP(op) op
11211+#define __OVERFLOW_IOP
11212+#define __OVERFLOW_XOP
11213+#endif
11214+
11215+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11216+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11217 BACKOFF_SETUP(%o2); \
11218 1: lduw [%o1], %g1; \
11219- op %g1, %o0, %g7; \
11220+ asm_op %g1, %o0, %g7; \
11221+ post_op \
11222 cas [%o1], %g1, %g7; \
11223 cmp %g1, %g7; \
11224 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11225@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11226 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11227 ENDPROC(atomic_##op); \
11228
11229-#define ATOMIC_OP_RETURN(op) \
11230-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11231+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11232+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11233+
11234+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11235+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11236 BACKOFF_SETUP(%o2); \
11237 1: lduw [%o1], %g1; \
11238- op %g1, %o0, %g7; \
11239+ asm_op %g1, %o0, %g7; \
11240+ post_op \
11241 cas [%o1], %g1, %g7; \
11242 cmp %g1, %g7; \
11243 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11244@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11245 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11246 ENDPROC(atomic_##op##_return);
11247
11248+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11249+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11250+
11251 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11252
11253 ATOMIC_OPS(add)
11254@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11255
11256 #undef ATOMIC_OPS
11257 #undef ATOMIC_OP_RETURN
11258+#undef __ATOMIC_OP_RETURN
11259 #undef ATOMIC_OP
11260+#undef __ATOMIC_OP
11261
11262-#define ATOMIC64_OP(op) \
11263-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11264+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11265+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11266 BACKOFF_SETUP(%o2); \
11267 1: ldx [%o1], %g1; \
11268- op %g1, %o0, %g7; \
11269+ asm_op %g1, %o0, %g7; \
11270+ post_op \
11271 casx [%o1], %g1, %g7; \
11272 cmp %g1, %g7; \
11273 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11274@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11275 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11276 ENDPROC(atomic64_##op); \
11277
11278-#define ATOMIC64_OP_RETURN(op) \
11279-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11280+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11281+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11282+
11283+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11284+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11285 BACKOFF_SETUP(%o2); \
11286 1: ldx [%o1], %g1; \
11287- op %g1, %o0, %g7; \
11288+ asm_op %g1, %o0, %g7; \
11289+ post_op \
11290 casx [%o1], %g1, %g7; \
11291 cmp %g1, %g7; \
11292 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11293@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11294 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11295 ENDPROC(atomic64_##op##_return);
11296
11297+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11298+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11299+
11300 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11301
11302 ATOMIC64_OPS(add)
11303@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11304
11305 #undef ATOMIC64_OPS
11306 #undef ATOMIC64_OP_RETURN
11307+#undef __ATOMIC64_OP_RETURN
11308 #undef ATOMIC64_OP
11309+#undef __ATOMIC64_OP
11310+#undef __OVERFLOW_XOP
11311+#undef __OVERFLOW_IOP
11312+#undef __REFCOUNT_OP
11313
11314 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11315 BACKOFF_SETUP(%o2)
11316diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11317index 1d649a9..fbc5bfc 100644
11318--- a/arch/sparc/lib/ksyms.c
11319+++ b/arch/sparc/lib/ksyms.c
11320@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11321 /* Atomic counter implementation. */
11322 #define ATOMIC_OP(op) \
11323 EXPORT_SYMBOL(atomic_##op); \
11324-EXPORT_SYMBOL(atomic64_##op);
11325+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11326+EXPORT_SYMBOL(atomic64_##op); \
11327+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11328
11329 #define ATOMIC_OP_RETURN(op) \
11330 EXPORT_SYMBOL(atomic_##op##_return); \
11331@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11332 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11333
11334 ATOMIC_OPS(add)
11335+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11336+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11337 ATOMIC_OPS(sub)
11338
11339 #undef ATOMIC_OPS
11340diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11341index 30c3ecc..736f015 100644
11342--- a/arch/sparc/mm/Makefile
11343+++ b/arch/sparc/mm/Makefile
11344@@ -2,7 +2,7 @@
11345 #
11346
11347 asflags-y := -ansi
11348-ccflags-y := -Werror
11349+#ccflags-y := -Werror
11350
11351 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11352 obj-y += fault_$(BITS).o
11353diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11354index 908e8c1..1524793 100644
11355--- a/arch/sparc/mm/fault_32.c
11356+++ b/arch/sparc/mm/fault_32.c
11357@@ -21,6 +21,9 @@
11358 #include <linux/perf_event.h>
11359 #include <linux/interrupt.h>
11360 #include <linux/kdebug.h>
11361+#include <linux/slab.h>
11362+#include <linux/pagemap.h>
11363+#include <linux/compiler.h>
11364
11365 #include <asm/page.h>
11366 #include <asm/pgtable.h>
11367@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11368 return safe_compute_effective_address(regs, insn);
11369 }
11370
11371+#ifdef CONFIG_PAX_PAGEEXEC
11372+#ifdef CONFIG_PAX_DLRESOLVE
11373+static void pax_emuplt_close(struct vm_area_struct *vma)
11374+{
11375+ vma->vm_mm->call_dl_resolve = 0UL;
11376+}
11377+
11378+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11379+{
11380+ unsigned int *kaddr;
11381+
11382+ vmf->page = alloc_page(GFP_HIGHUSER);
11383+ if (!vmf->page)
11384+ return VM_FAULT_OOM;
11385+
11386+ kaddr = kmap(vmf->page);
11387+ memset(kaddr, 0, PAGE_SIZE);
11388+ kaddr[0] = 0x9DE3BFA8U; /* save */
11389+ flush_dcache_page(vmf->page);
11390+ kunmap(vmf->page);
11391+ return VM_FAULT_MAJOR;
11392+}
11393+
11394+static const struct vm_operations_struct pax_vm_ops = {
11395+ .close = pax_emuplt_close,
11396+ .fault = pax_emuplt_fault
11397+};
11398+
11399+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11400+{
11401+ int ret;
11402+
11403+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11404+ vma->vm_mm = current->mm;
11405+ vma->vm_start = addr;
11406+ vma->vm_end = addr + PAGE_SIZE;
11407+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11408+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11409+ vma->vm_ops = &pax_vm_ops;
11410+
11411+ ret = insert_vm_struct(current->mm, vma);
11412+ if (ret)
11413+ return ret;
11414+
11415+ ++current->mm->total_vm;
11416+ return 0;
11417+}
11418+#endif
11419+
11420+/*
11421+ * PaX: decide what to do with offenders (regs->pc = fault address)
11422+ *
11423+ * returns 1 when task should be killed
11424+ * 2 when patched PLT trampoline was detected
11425+ * 3 when unpatched PLT trampoline was detected
11426+ */
11427+static int pax_handle_fetch_fault(struct pt_regs *regs)
11428+{
11429+
11430+#ifdef CONFIG_PAX_EMUPLT
11431+ int err;
11432+
11433+ do { /* PaX: patched PLT emulation #1 */
11434+ unsigned int sethi1, sethi2, jmpl;
11435+
11436+ err = get_user(sethi1, (unsigned int *)regs->pc);
11437+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11438+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11439+
11440+ if (err)
11441+ break;
11442+
11443+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11444+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11445+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11446+ {
11447+ unsigned int addr;
11448+
11449+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11450+ addr = regs->u_regs[UREG_G1];
11451+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11452+ regs->pc = addr;
11453+ regs->npc = addr+4;
11454+ return 2;
11455+ }
11456+ } while (0);
11457+
11458+ do { /* PaX: patched PLT emulation #2 */
11459+ unsigned int ba;
11460+
11461+ err = get_user(ba, (unsigned int *)regs->pc);
11462+
11463+ if (err)
11464+ break;
11465+
11466+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11467+ unsigned int addr;
11468+
11469+ if ((ba & 0xFFC00000U) == 0x30800000U)
11470+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11471+ else
11472+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11473+ regs->pc = addr;
11474+ regs->npc = addr+4;
11475+ return 2;
11476+ }
11477+ } while (0);
11478+
11479+ do { /* PaX: patched PLT emulation #3 */
11480+ unsigned int sethi, bajmpl, nop;
11481+
11482+ err = get_user(sethi, (unsigned int *)regs->pc);
11483+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11484+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11485+
11486+ if (err)
11487+ break;
11488+
11489+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11490+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11491+ nop == 0x01000000U)
11492+ {
11493+ unsigned int addr;
11494+
11495+ addr = (sethi & 0x003FFFFFU) << 10;
11496+ regs->u_regs[UREG_G1] = addr;
11497+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11498+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11499+ else
11500+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11501+ regs->pc = addr;
11502+ regs->npc = addr+4;
11503+ return 2;
11504+ }
11505+ } while (0);
11506+
11507+ do { /* PaX: unpatched PLT emulation step 1 */
11508+ unsigned int sethi, ba, nop;
11509+
11510+ err = get_user(sethi, (unsigned int *)regs->pc);
11511+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11512+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11513+
11514+ if (err)
11515+ break;
11516+
11517+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11518+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11519+ nop == 0x01000000U)
11520+ {
11521+ unsigned int addr, save, call;
11522+
11523+ if ((ba & 0xFFC00000U) == 0x30800000U)
11524+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11525+ else
11526+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11527+
11528+ err = get_user(save, (unsigned int *)addr);
11529+ err |= get_user(call, (unsigned int *)(addr+4));
11530+ err |= get_user(nop, (unsigned int *)(addr+8));
11531+ if (err)
11532+ break;
11533+
11534+#ifdef CONFIG_PAX_DLRESOLVE
11535+ if (save == 0x9DE3BFA8U &&
11536+ (call & 0xC0000000U) == 0x40000000U &&
11537+ nop == 0x01000000U)
11538+ {
11539+ struct vm_area_struct *vma;
11540+ unsigned long call_dl_resolve;
11541+
11542+ down_read(&current->mm->mmap_sem);
11543+ call_dl_resolve = current->mm->call_dl_resolve;
11544+ up_read(&current->mm->mmap_sem);
11545+ if (likely(call_dl_resolve))
11546+ goto emulate;
11547+
11548+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11549+
11550+ down_write(&current->mm->mmap_sem);
11551+ if (current->mm->call_dl_resolve) {
11552+ call_dl_resolve = current->mm->call_dl_resolve;
11553+ up_write(&current->mm->mmap_sem);
11554+ if (vma)
11555+ kmem_cache_free(vm_area_cachep, vma);
11556+ goto emulate;
11557+ }
11558+
11559+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11560+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11561+ up_write(&current->mm->mmap_sem);
11562+ if (vma)
11563+ kmem_cache_free(vm_area_cachep, vma);
11564+ return 1;
11565+ }
11566+
11567+ if (pax_insert_vma(vma, call_dl_resolve)) {
11568+ up_write(&current->mm->mmap_sem);
11569+ kmem_cache_free(vm_area_cachep, vma);
11570+ return 1;
11571+ }
11572+
11573+ current->mm->call_dl_resolve = call_dl_resolve;
11574+ up_write(&current->mm->mmap_sem);
11575+
11576+emulate:
11577+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11578+ regs->pc = call_dl_resolve;
11579+ regs->npc = addr+4;
11580+ return 3;
11581+ }
11582+#endif
11583+
11584+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11585+ if ((save & 0xFFC00000U) == 0x05000000U &&
11586+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11587+ nop == 0x01000000U)
11588+ {
11589+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11590+ regs->u_regs[UREG_G2] = addr + 4;
11591+ addr = (save & 0x003FFFFFU) << 10;
11592+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11593+ regs->pc = addr;
11594+ regs->npc = addr+4;
11595+ return 3;
11596+ }
11597+ }
11598+ } while (0);
11599+
11600+ do { /* PaX: unpatched PLT emulation step 2 */
11601+ unsigned int save, call, nop;
11602+
11603+ err = get_user(save, (unsigned int *)(regs->pc-4));
11604+ err |= get_user(call, (unsigned int *)regs->pc);
11605+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11606+ if (err)
11607+ break;
11608+
11609+ if (save == 0x9DE3BFA8U &&
11610+ (call & 0xC0000000U) == 0x40000000U &&
11611+ nop == 0x01000000U)
11612+ {
11613+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11614+
11615+ regs->u_regs[UREG_RETPC] = regs->pc;
11616+ regs->pc = dl_resolve;
11617+ regs->npc = dl_resolve+4;
11618+ return 3;
11619+ }
11620+ } while (0);
11621+#endif
11622+
11623+ return 1;
11624+}
11625+
11626+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11627+{
11628+ unsigned long i;
11629+
11630+ printk(KERN_ERR "PAX: bytes at PC: ");
11631+ for (i = 0; i < 8; i++) {
11632+ unsigned int c;
11633+ if (get_user(c, (unsigned int *)pc+i))
11634+ printk(KERN_CONT "???????? ");
11635+ else
11636+ printk(KERN_CONT "%08x ", c);
11637+ }
11638+ printk("\n");
11639+}
11640+#endif
11641+
11642 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11643 int text_fault)
11644 {
11645@@ -226,6 +500,24 @@ good_area:
11646 if (!(vma->vm_flags & VM_WRITE))
11647 goto bad_area;
11648 } else {
11649+
11650+#ifdef CONFIG_PAX_PAGEEXEC
11651+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11652+ up_read(&mm->mmap_sem);
11653+ switch (pax_handle_fetch_fault(regs)) {
11654+
11655+#ifdef CONFIG_PAX_EMUPLT
11656+ case 2:
11657+ case 3:
11658+ return;
11659+#endif
11660+
11661+ }
11662+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11663+ do_group_exit(SIGKILL);
11664+ }
11665+#endif
11666+
11667 /* Allow reads even for write-only mappings */
11668 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11669 goto bad_area;
11670diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11671index 18fcd71..e4fe821 100644
11672--- a/arch/sparc/mm/fault_64.c
11673+++ b/arch/sparc/mm/fault_64.c
11674@@ -22,6 +22,9 @@
11675 #include <linux/kdebug.h>
11676 #include <linux/percpu.h>
11677 #include <linux/context_tracking.h>
11678+#include <linux/slab.h>
11679+#include <linux/pagemap.h>
11680+#include <linux/compiler.h>
11681
11682 #include <asm/page.h>
11683 #include <asm/pgtable.h>
11684@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11685 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11686 regs->tpc);
11687 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11688- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11689+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11690 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11691 dump_stack();
11692 unhandled_fault(regs->tpc, current, regs);
11693@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11694 show_regs(regs);
11695 }
11696
11697+#ifdef CONFIG_PAX_PAGEEXEC
11698+#ifdef CONFIG_PAX_DLRESOLVE
11699+static void pax_emuplt_close(struct vm_area_struct *vma)
11700+{
11701+ vma->vm_mm->call_dl_resolve = 0UL;
11702+}
11703+
11704+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11705+{
11706+ unsigned int *kaddr;
11707+
11708+ vmf->page = alloc_page(GFP_HIGHUSER);
11709+ if (!vmf->page)
11710+ return VM_FAULT_OOM;
11711+
11712+ kaddr = kmap(vmf->page);
11713+ memset(kaddr, 0, PAGE_SIZE);
11714+ kaddr[0] = 0x9DE3BFA8U; /* save */
11715+ flush_dcache_page(vmf->page);
11716+ kunmap(vmf->page);
11717+ return VM_FAULT_MAJOR;
11718+}
11719+
11720+static const struct vm_operations_struct pax_vm_ops = {
11721+ .close = pax_emuplt_close,
11722+ .fault = pax_emuplt_fault
11723+};
11724+
11725+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11726+{
11727+ int ret;
11728+
11729+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11730+ vma->vm_mm = current->mm;
11731+ vma->vm_start = addr;
11732+ vma->vm_end = addr + PAGE_SIZE;
11733+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11734+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11735+ vma->vm_ops = &pax_vm_ops;
11736+
11737+ ret = insert_vm_struct(current->mm, vma);
11738+ if (ret)
11739+ return ret;
11740+
11741+ ++current->mm->total_vm;
11742+ return 0;
11743+}
11744+#endif
11745+
11746+/*
11747+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11748+ *
11749+ * returns 1 when task should be killed
11750+ * 2 when patched PLT trampoline was detected
11751+ * 3 when unpatched PLT trampoline was detected
11752+ */
11753+static int pax_handle_fetch_fault(struct pt_regs *regs)
11754+{
11755+
11756+#ifdef CONFIG_PAX_EMUPLT
11757+ int err;
11758+
11759+ do { /* PaX: patched PLT emulation #1 */
11760+ unsigned int sethi1, sethi2, jmpl;
11761+
11762+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11763+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11764+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11765+
11766+ if (err)
11767+ break;
11768+
11769+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11770+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11771+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11772+ {
11773+ unsigned long addr;
11774+
11775+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11776+ addr = regs->u_regs[UREG_G1];
11777+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11778+
11779+ if (test_thread_flag(TIF_32BIT))
11780+ addr &= 0xFFFFFFFFUL;
11781+
11782+ regs->tpc = addr;
11783+ regs->tnpc = addr+4;
11784+ return 2;
11785+ }
11786+ } while (0);
11787+
11788+ do { /* PaX: patched PLT emulation #2 */
11789+ unsigned int ba;
11790+
11791+ err = get_user(ba, (unsigned int *)regs->tpc);
11792+
11793+ if (err)
11794+ break;
11795+
11796+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11797+ unsigned long addr;
11798+
11799+ if ((ba & 0xFFC00000U) == 0x30800000U)
11800+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11801+ else
11802+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11803+
11804+ if (test_thread_flag(TIF_32BIT))
11805+ addr &= 0xFFFFFFFFUL;
11806+
11807+ regs->tpc = addr;
11808+ regs->tnpc = addr+4;
11809+ return 2;
11810+ }
11811+ } while (0);
11812+
11813+ do { /* PaX: patched PLT emulation #3 */
11814+ unsigned int sethi, bajmpl, nop;
11815+
11816+ err = get_user(sethi, (unsigned int *)regs->tpc);
11817+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11818+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11819+
11820+ if (err)
11821+ break;
11822+
11823+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11824+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11825+ nop == 0x01000000U)
11826+ {
11827+ unsigned long addr;
11828+
11829+ addr = (sethi & 0x003FFFFFU) << 10;
11830+ regs->u_regs[UREG_G1] = addr;
11831+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11832+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11833+ else
11834+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11835+
11836+ if (test_thread_flag(TIF_32BIT))
11837+ addr &= 0xFFFFFFFFUL;
11838+
11839+ regs->tpc = addr;
11840+ regs->tnpc = addr+4;
11841+ return 2;
11842+ }
11843+ } while (0);
11844+
11845+ do { /* PaX: patched PLT emulation #4 */
11846+ unsigned int sethi, mov1, call, mov2;
11847+
11848+ err = get_user(sethi, (unsigned int *)regs->tpc);
11849+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11850+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11851+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11852+
11853+ if (err)
11854+ break;
11855+
11856+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11857+ mov1 == 0x8210000FU &&
11858+ (call & 0xC0000000U) == 0x40000000U &&
11859+ mov2 == 0x9E100001U)
11860+ {
11861+ unsigned long addr;
11862+
11863+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11864+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11865+
11866+ if (test_thread_flag(TIF_32BIT))
11867+ addr &= 0xFFFFFFFFUL;
11868+
11869+ regs->tpc = addr;
11870+ regs->tnpc = addr+4;
11871+ return 2;
11872+ }
11873+ } while (0);
11874+
11875+ do { /* PaX: patched PLT emulation #5 */
11876+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11877+
11878+ err = get_user(sethi, (unsigned int *)regs->tpc);
11879+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11880+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11881+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11882+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11883+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11884+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11885+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11886+
11887+ if (err)
11888+ break;
11889+
11890+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11891+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11892+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11893+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11894+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11895+ sllx == 0x83287020U &&
11896+ jmpl == 0x81C04005U &&
11897+ nop == 0x01000000U)
11898+ {
11899+ unsigned long addr;
11900+
11901+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11902+ regs->u_regs[UREG_G1] <<= 32;
11903+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11904+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11905+ regs->tpc = addr;
11906+ regs->tnpc = addr+4;
11907+ return 2;
11908+ }
11909+ } while (0);
11910+
11911+ do { /* PaX: patched PLT emulation #6 */
11912+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11913+
11914+ err = get_user(sethi, (unsigned int *)regs->tpc);
11915+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11916+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11917+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11918+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11919+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11920+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11921+
11922+ if (err)
11923+ break;
11924+
11925+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11926+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11927+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11928+ sllx == 0x83287020U &&
11929+ (or & 0xFFFFE000U) == 0x8A116000U &&
11930+ jmpl == 0x81C04005U &&
11931+ nop == 0x01000000U)
11932+ {
11933+ unsigned long addr;
11934+
11935+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11936+ regs->u_regs[UREG_G1] <<= 32;
11937+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11938+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11939+ regs->tpc = addr;
11940+ regs->tnpc = addr+4;
11941+ return 2;
11942+ }
11943+ } while (0);
11944+
11945+ do { /* PaX: unpatched PLT emulation step 1 */
11946+ unsigned int sethi, ba, nop;
11947+
11948+ err = get_user(sethi, (unsigned int *)regs->tpc);
11949+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11950+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11951+
11952+ if (err)
11953+ break;
11954+
11955+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11956+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11957+ nop == 0x01000000U)
11958+ {
11959+ unsigned long addr;
11960+ unsigned int save, call;
11961+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11962+
11963+ if ((ba & 0xFFC00000U) == 0x30800000U)
11964+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11965+ else
11966+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11967+
11968+ if (test_thread_flag(TIF_32BIT))
11969+ addr &= 0xFFFFFFFFUL;
11970+
11971+ err = get_user(save, (unsigned int *)addr);
11972+ err |= get_user(call, (unsigned int *)(addr+4));
11973+ err |= get_user(nop, (unsigned int *)(addr+8));
11974+ if (err)
11975+ break;
11976+
11977+#ifdef CONFIG_PAX_DLRESOLVE
11978+ if (save == 0x9DE3BFA8U &&
11979+ (call & 0xC0000000U) == 0x40000000U &&
11980+ nop == 0x01000000U)
11981+ {
11982+ struct vm_area_struct *vma;
11983+ unsigned long call_dl_resolve;
11984+
11985+ down_read(&current->mm->mmap_sem);
11986+ call_dl_resolve = current->mm->call_dl_resolve;
11987+ up_read(&current->mm->mmap_sem);
11988+ if (likely(call_dl_resolve))
11989+ goto emulate;
11990+
11991+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11992+
11993+ down_write(&current->mm->mmap_sem);
11994+ if (current->mm->call_dl_resolve) {
11995+ call_dl_resolve = current->mm->call_dl_resolve;
11996+ up_write(&current->mm->mmap_sem);
11997+ if (vma)
11998+ kmem_cache_free(vm_area_cachep, vma);
11999+ goto emulate;
12000+ }
12001+
12002+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
12003+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
12004+ up_write(&current->mm->mmap_sem);
12005+ if (vma)
12006+ kmem_cache_free(vm_area_cachep, vma);
12007+ return 1;
12008+ }
12009+
12010+ if (pax_insert_vma(vma, call_dl_resolve)) {
12011+ up_write(&current->mm->mmap_sem);
12012+ kmem_cache_free(vm_area_cachep, vma);
12013+ return 1;
12014+ }
12015+
12016+ current->mm->call_dl_resolve = call_dl_resolve;
12017+ up_write(&current->mm->mmap_sem);
12018+
12019+emulate:
12020+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12021+ regs->tpc = call_dl_resolve;
12022+ regs->tnpc = addr+4;
12023+ return 3;
12024+ }
12025+#endif
12026+
12027+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12028+ if ((save & 0xFFC00000U) == 0x05000000U &&
12029+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12030+ nop == 0x01000000U)
12031+ {
12032+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12033+ regs->u_regs[UREG_G2] = addr + 4;
12034+ addr = (save & 0x003FFFFFU) << 10;
12035+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12036+
12037+ if (test_thread_flag(TIF_32BIT))
12038+ addr &= 0xFFFFFFFFUL;
12039+
12040+ regs->tpc = addr;
12041+ regs->tnpc = addr+4;
12042+ return 3;
12043+ }
12044+
12045+ /* PaX: 64-bit PLT stub */
12046+ err = get_user(sethi1, (unsigned int *)addr);
12047+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12048+ err |= get_user(or1, (unsigned int *)(addr+8));
12049+ err |= get_user(or2, (unsigned int *)(addr+12));
12050+ err |= get_user(sllx, (unsigned int *)(addr+16));
12051+ err |= get_user(add, (unsigned int *)(addr+20));
12052+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12053+ err |= get_user(nop, (unsigned int *)(addr+28));
12054+ if (err)
12055+ break;
12056+
12057+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12058+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12059+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12060+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12061+ sllx == 0x89293020U &&
12062+ add == 0x8A010005U &&
12063+ jmpl == 0x89C14000U &&
12064+ nop == 0x01000000U)
12065+ {
12066+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12067+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12068+ regs->u_regs[UREG_G4] <<= 32;
12069+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12070+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12071+ regs->u_regs[UREG_G4] = addr + 24;
12072+ addr = regs->u_regs[UREG_G5];
12073+ regs->tpc = addr;
12074+ regs->tnpc = addr+4;
12075+ return 3;
12076+ }
12077+ }
12078+ } while (0);
12079+
12080+#ifdef CONFIG_PAX_DLRESOLVE
12081+ do { /* PaX: unpatched PLT emulation step 2 */
12082+ unsigned int save, call, nop;
12083+
12084+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12085+ err |= get_user(call, (unsigned int *)regs->tpc);
12086+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12087+ if (err)
12088+ break;
12089+
12090+ if (save == 0x9DE3BFA8U &&
12091+ (call & 0xC0000000U) == 0x40000000U &&
12092+ nop == 0x01000000U)
12093+ {
12094+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12095+
12096+ if (test_thread_flag(TIF_32BIT))
12097+ dl_resolve &= 0xFFFFFFFFUL;
12098+
12099+ regs->u_regs[UREG_RETPC] = regs->tpc;
12100+ regs->tpc = dl_resolve;
12101+ regs->tnpc = dl_resolve+4;
12102+ return 3;
12103+ }
12104+ } while (0);
12105+#endif
12106+
12107+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12108+ unsigned int sethi, ba, nop;
12109+
12110+ err = get_user(sethi, (unsigned int *)regs->tpc);
12111+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12112+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12113+
12114+ if (err)
12115+ break;
12116+
12117+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12118+ (ba & 0xFFF00000U) == 0x30600000U &&
12119+ nop == 0x01000000U)
12120+ {
12121+ unsigned long addr;
12122+
12123+ addr = (sethi & 0x003FFFFFU) << 10;
12124+ regs->u_regs[UREG_G1] = addr;
12125+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12126+
12127+ if (test_thread_flag(TIF_32BIT))
12128+ addr &= 0xFFFFFFFFUL;
12129+
12130+ regs->tpc = addr;
12131+ regs->tnpc = addr+4;
12132+ return 2;
12133+ }
12134+ } while (0);
12135+
12136+#endif
12137+
12138+ return 1;
12139+}
12140+
12141+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12142+{
12143+ unsigned long i;
12144+
12145+ printk(KERN_ERR "PAX: bytes at PC: ");
12146+ for (i = 0; i < 8; i++) {
12147+ unsigned int c;
12148+ if (get_user(c, (unsigned int *)pc+i))
12149+ printk(KERN_CONT "???????? ");
12150+ else
12151+ printk(KERN_CONT "%08x ", c);
12152+ }
12153+ printk("\n");
12154+}
12155+#endif
12156+
12157 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12158 {
12159 enum ctx_state prev_state = exception_enter();
12160@@ -353,6 +816,29 @@ retry:
12161 if (!vma)
12162 goto bad_area;
12163
12164+#ifdef CONFIG_PAX_PAGEEXEC
12165+ /* PaX: detect ITLB misses on non-exec pages */
12166+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12167+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12168+ {
12169+ if (address != regs->tpc)
12170+ goto good_area;
12171+
12172+ up_read(&mm->mmap_sem);
12173+ switch (pax_handle_fetch_fault(regs)) {
12174+
12175+#ifdef CONFIG_PAX_EMUPLT
12176+ case 2:
12177+ case 3:
12178+ return;
12179+#endif
12180+
12181+ }
12182+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12183+ do_group_exit(SIGKILL);
12184+ }
12185+#endif
12186+
12187 /* Pure DTLB misses do not tell us whether the fault causing
12188 * load/store/atomic was a write or not, it only says that there
12189 * was no match. So in such a case we (carefully) read the
12190diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12191index d329537..2c3746a 100644
12192--- a/arch/sparc/mm/hugetlbpage.c
12193+++ b/arch/sparc/mm/hugetlbpage.c
12194@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12195 unsigned long addr,
12196 unsigned long len,
12197 unsigned long pgoff,
12198- unsigned long flags)
12199+ unsigned long flags,
12200+ unsigned long offset)
12201 {
12202+ struct mm_struct *mm = current->mm;
12203 unsigned long task_size = TASK_SIZE;
12204 struct vm_unmapped_area_info info;
12205
12206@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12207
12208 info.flags = 0;
12209 info.length = len;
12210- info.low_limit = TASK_UNMAPPED_BASE;
12211+ info.low_limit = mm->mmap_base;
12212 info.high_limit = min(task_size, VA_EXCLUDE_START);
12213 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12214 info.align_offset = 0;
12215+ info.threadstack_offset = offset;
12216 addr = vm_unmapped_area(&info);
12217
12218 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12219 VM_BUG_ON(addr != -ENOMEM);
12220 info.low_limit = VA_EXCLUDE_END;
12221+
12222+#ifdef CONFIG_PAX_RANDMMAP
12223+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12224+ info.low_limit += mm->delta_mmap;
12225+#endif
12226+
12227 info.high_limit = task_size;
12228 addr = vm_unmapped_area(&info);
12229 }
12230@@ -55,7 +64,8 @@ static unsigned long
12231 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12232 const unsigned long len,
12233 const unsigned long pgoff,
12234- const unsigned long flags)
12235+ const unsigned long flags,
12236+ const unsigned long offset)
12237 {
12238 struct mm_struct *mm = current->mm;
12239 unsigned long addr = addr0;
12240@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12241 info.high_limit = mm->mmap_base;
12242 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12243 info.align_offset = 0;
12244+ info.threadstack_offset = offset;
12245 addr = vm_unmapped_area(&info);
12246
12247 /*
12248@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12249 VM_BUG_ON(addr != -ENOMEM);
12250 info.flags = 0;
12251 info.low_limit = TASK_UNMAPPED_BASE;
12252+
12253+#ifdef CONFIG_PAX_RANDMMAP
12254+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12255+ info.low_limit += mm->delta_mmap;
12256+#endif
12257+
12258 info.high_limit = STACK_TOP32;
12259 addr = vm_unmapped_area(&info);
12260 }
12261@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12262 struct mm_struct *mm = current->mm;
12263 struct vm_area_struct *vma;
12264 unsigned long task_size = TASK_SIZE;
12265+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12266
12267 if (test_thread_flag(TIF_32BIT))
12268 task_size = STACK_TOP32;
12269@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12270 return addr;
12271 }
12272
12273+#ifdef CONFIG_PAX_RANDMMAP
12274+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12275+#endif
12276+
12277 if (addr) {
12278 addr = ALIGN(addr, HPAGE_SIZE);
12279 vma = find_vma(mm, addr);
12280- if (task_size - len >= addr &&
12281- (!vma || addr + len <= vma->vm_start))
12282+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12283 return addr;
12284 }
12285 if (mm->get_unmapped_area == arch_get_unmapped_area)
12286 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12287- pgoff, flags);
12288+ pgoff, flags, offset);
12289 else
12290 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12291- pgoff, flags);
12292+ pgoff, flags, offset);
12293 }
12294
12295 pte_t *huge_pte_alloc(struct mm_struct *mm,
12296diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12297index 2d91c62..17a8fff 100644
12298--- a/arch/sparc/mm/init_64.c
12299+++ b/arch/sparc/mm/init_64.c
12300@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12301 int num_kernel_image_mappings;
12302
12303 #ifdef CONFIG_DEBUG_DCFLUSH
12304-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12305+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12306 #ifdef CONFIG_SMP
12307-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12308+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12309 #endif
12310 #endif
12311
12312@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12313 {
12314 BUG_ON(tlb_type == hypervisor);
12315 #ifdef CONFIG_DEBUG_DCFLUSH
12316- atomic_inc(&dcpage_flushes);
12317+ atomic_inc_unchecked(&dcpage_flushes);
12318 #endif
12319
12320 #ifdef DCACHE_ALIASING_POSSIBLE
12321@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12322
12323 #ifdef CONFIG_DEBUG_DCFLUSH
12324 seq_printf(m, "DCPageFlushes\t: %d\n",
12325- atomic_read(&dcpage_flushes));
12326+ atomic_read_unchecked(&dcpage_flushes));
12327 #ifdef CONFIG_SMP
12328 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12329- atomic_read(&dcpage_flushes_xcall));
12330+ atomic_read_unchecked(&dcpage_flushes_xcall));
12331 #endif /* CONFIG_SMP */
12332 #endif /* CONFIG_DEBUG_DCFLUSH */
12333 }
12334diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12335index 7cca418..53fc030 100644
12336--- a/arch/tile/Kconfig
12337+++ b/arch/tile/Kconfig
12338@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12339
12340 config KEXEC
12341 bool "kexec system call"
12342+ depends on !GRKERNSEC_KMEM
12343 ---help---
12344 kexec is a system call that implements the ability to shutdown your
12345 current kernel, and to start another kernel. It is like a reboot
12346diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12347index 7b11c5f..755a026 100644
12348--- a/arch/tile/include/asm/atomic_64.h
12349+++ b/arch/tile/include/asm/atomic_64.h
12350@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12351
12352 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12353
12354+#define atomic64_read_unchecked(v) atomic64_read(v)
12355+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12356+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12357+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12358+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12359+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12360+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12361+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12362+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12363+
12364 /* Define this to indicate that cmpxchg is an efficient operation. */
12365 #define __HAVE_ARCH_CMPXCHG
12366
12367diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12368index 6160761..00cac88 100644
12369--- a/arch/tile/include/asm/cache.h
12370+++ b/arch/tile/include/asm/cache.h
12371@@ -15,11 +15,12 @@
12372 #ifndef _ASM_TILE_CACHE_H
12373 #define _ASM_TILE_CACHE_H
12374
12375+#include <linux/const.h>
12376 #include <arch/chip.h>
12377
12378 /* bytes per L1 data cache line */
12379 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12380-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12381+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12382
12383 /* bytes per L2 cache line */
12384 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12385diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12386index b6cde32..c0cb736 100644
12387--- a/arch/tile/include/asm/uaccess.h
12388+++ b/arch/tile/include/asm/uaccess.h
12389@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12390 const void __user *from,
12391 unsigned long n)
12392 {
12393- int sz = __compiletime_object_size(to);
12394+ size_t sz = __compiletime_object_size(to);
12395
12396- if (likely(sz == -1 || sz >= n))
12397+ if (likely(sz == (size_t)-1 || sz >= n))
12398 n = _copy_from_user(to, from, n);
12399 else
12400 copy_from_user_overflow();
12401diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12402index e514899..f8743c4 100644
12403--- a/arch/tile/mm/hugetlbpage.c
12404+++ b/arch/tile/mm/hugetlbpage.c
12405@@ -207,6 +207,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12406 info.high_limit = TASK_SIZE;
12407 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12408 info.align_offset = 0;
12409+ info.threadstack_offset = 0;
12410 return vm_unmapped_area(&info);
12411 }
12412
12413@@ -224,6 +225,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12414 info.high_limit = current->mm->mmap_base;
12415 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12416 info.align_offset = 0;
12417+ info.threadstack_offset = 0;
12418 addr = vm_unmapped_area(&info);
12419
12420 /*
12421diff --git a/arch/um/Makefile b/arch/um/Makefile
12422index e4b1a96..16162f8 100644
12423--- a/arch/um/Makefile
12424+++ b/arch/um/Makefile
12425@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12426 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12427 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12428
12429+ifdef CONSTIFY_PLUGIN
12430+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12431+endif
12432+
12433 #This will adjust *FLAGS accordingly to the platform.
12434 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12435
12436diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12437index 19e1bdd..3665b77 100644
12438--- a/arch/um/include/asm/cache.h
12439+++ b/arch/um/include/asm/cache.h
12440@@ -1,6 +1,7 @@
12441 #ifndef __UM_CACHE_H
12442 #define __UM_CACHE_H
12443
12444+#include <linux/const.h>
12445
12446 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12447 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12448@@ -12,6 +13,6 @@
12449 # define L1_CACHE_SHIFT 5
12450 #endif
12451
12452-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12453+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12454
12455 #endif
12456diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12457index 2e0a6b1..a64d0f5 100644
12458--- a/arch/um/include/asm/kmap_types.h
12459+++ b/arch/um/include/asm/kmap_types.h
12460@@ -8,6 +8,6 @@
12461
12462 /* No more #include "asm/arch/kmap_types.h" ! */
12463
12464-#define KM_TYPE_NR 14
12465+#define KM_TYPE_NR 15
12466
12467 #endif
12468diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12469index 71c5d13..4c7b9f1 100644
12470--- a/arch/um/include/asm/page.h
12471+++ b/arch/um/include/asm/page.h
12472@@ -14,6 +14,9 @@
12473 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12474 #define PAGE_MASK (~(PAGE_SIZE-1))
12475
12476+#define ktla_ktva(addr) (addr)
12477+#define ktva_ktla(addr) (addr)
12478+
12479 #ifndef __ASSEMBLY__
12480
12481 struct page;
12482diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12483index 0032f92..cd151e0 100644
12484--- a/arch/um/include/asm/pgtable-3level.h
12485+++ b/arch/um/include/asm/pgtable-3level.h
12486@@ -58,6 +58,7 @@
12487 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12488 #define pud_populate(mm, pud, pmd) \
12489 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12490+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12491
12492 #ifdef CONFIG_64BIT
12493 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12494diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12495index f17bca8..48adb87 100644
12496--- a/arch/um/kernel/process.c
12497+++ b/arch/um/kernel/process.c
12498@@ -356,22 +356,6 @@ int singlestepping(void * t)
12499 return 2;
12500 }
12501
12502-/*
12503- * Only x86 and x86_64 have an arch_align_stack().
12504- * All other arches have "#define arch_align_stack(x) (x)"
12505- * in their asm/exec.h
12506- * As this is included in UML from asm-um/system-generic.h,
12507- * we can use it to behave as the subarch does.
12508- */
12509-#ifndef arch_align_stack
12510-unsigned long arch_align_stack(unsigned long sp)
12511-{
12512- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12513- sp -= get_random_int() % 8192;
12514- return sp & ~0xf;
12515-}
12516-#endif
12517-
12518 unsigned long get_wchan(struct task_struct *p)
12519 {
12520 unsigned long stack_page, sp, ip;
12521diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12522index ad8f795..2c7eec6 100644
12523--- a/arch/unicore32/include/asm/cache.h
12524+++ b/arch/unicore32/include/asm/cache.h
12525@@ -12,8 +12,10 @@
12526 #ifndef __UNICORE_CACHE_H__
12527 #define __UNICORE_CACHE_H__
12528
12529-#define L1_CACHE_SHIFT (5)
12530-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12531+#include <linux/const.h>
12532+
12533+#define L1_CACHE_SHIFT 5
12534+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12535
12536 /*
12537 * Memory returned by kmalloc() may be used for DMA, so we must make
12538diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12539index 3635fff..c1f9fab 100644
12540--- a/arch/x86/Kconfig
12541+++ b/arch/x86/Kconfig
12542@@ -129,7 +129,7 @@ config X86
12543 select RTC_LIB
12544 select HAVE_DEBUG_STACKOVERFLOW
12545 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12546- select HAVE_CC_STACKPROTECTOR
12547+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12548 select GENERIC_CPU_AUTOPROBE
12549 select HAVE_ARCH_AUDITSYSCALL
12550 select ARCH_SUPPORTS_ATOMIC_RMW
12551@@ -262,7 +262,7 @@ config X86_HT
12552
12553 config X86_32_LAZY_GS
12554 def_bool y
12555- depends on X86_32 && !CC_STACKPROTECTOR
12556+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12557
12558 config ARCH_HWEIGHT_CFLAGS
12559 string
12560@@ -600,6 +600,7 @@ config SCHED_OMIT_FRAME_POINTER
12561
12562 menuconfig HYPERVISOR_GUEST
12563 bool "Linux guest support"
12564+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12565 ---help---
12566 Say Y here to enable options for running Linux under various hyper-
12567 visors. This option enables basic hypervisor detection and platform
12568@@ -977,6 +978,7 @@ config VM86
12569
12570 config X86_16BIT
12571 bool "Enable support for 16-bit segments" if EXPERT
12572+ depends on !GRKERNSEC
12573 default y
12574 ---help---
12575 This option is required by programs like Wine to run 16-bit
12576@@ -1132,6 +1134,7 @@ choice
12577
12578 config NOHIGHMEM
12579 bool "off"
12580+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12581 ---help---
12582 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12583 However, the address space of 32-bit x86 processors is only 4
12584@@ -1168,6 +1171,7 @@ config NOHIGHMEM
12585
12586 config HIGHMEM4G
12587 bool "4GB"
12588+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12589 ---help---
12590 Select this if you have a 32-bit processor and between 1 and 4
12591 gigabytes of physical RAM.
12592@@ -1220,7 +1224,7 @@ config PAGE_OFFSET
12593 hex
12594 default 0xB0000000 if VMSPLIT_3G_OPT
12595 default 0x80000000 if VMSPLIT_2G
12596- default 0x78000000 if VMSPLIT_2G_OPT
12597+ default 0x70000000 if VMSPLIT_2G_OPT
12598 default 0x40000000 if VMSPLIT_1G
12599 default 0xC0000000
12600 depends on X86_32
12601@@ -1635,6 +1639,7 @@ source kernel/Kconfig.hz
12602
12603 config KEXEC
12604 bool "kexec system call"
12605+ depends on !GRKERNSEC_KMEM
12606 ---help---
12607 kexec is a system call that implements the ability to shutdown your
12608 current kernel, and to start another kernel. It is like a reboot
12609@@ -1820,7 +1825,9 @@ config X86_NEED_RELOCS
12610
12611 config PHYSICAL_ALIGN
12612 hex "Alignment value to which kernel should be aligned"
12613- default "0x200000"
12614+ default "0x1000000"
12615+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12616+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12617 range 0x2000 0x1000000 if X86_32
12618 range 0x200000 0x1000000 if X86_64
12619 ---help---
12620@@ -1903,6 +1910,7 @@ config COMPAT_VDSO
12621 def_bool n
12622 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12623 depends on X86_32 || IA32_EMULATION
12624+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12625 ---help---
12626 Certain buggy versions of glibc will crash if they are
12627 presented with a 32-bit vDSO that is not mapped at the address
12628diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12629index 6983314..54ad7e8 100644
12630--- a/arch/x86/Kconfig.cpu
12631+++ b/arch/x86/Kconfig.cpu
12632@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12633
12634 config X86_F00F_BUG
12635 def_bool y
12636- depends on M586MMX || M586TSC || M586 || M486
12637+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12638
12639 config X86_INVD_BUG
12640 def_bool y
12641@@ -327,7 +327,7 @@ config X86_INVD_BUG
12642
12643 config X86_ALIGNMENT_16
12644 def_bool y
12645- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12646+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12647
12648 config X86_INTEL_USERCOPY
12649 def_bool y
12650@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12651 # generates cmov.
12652 config X86_CMOV
12653 def_bool y
12654- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12655+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12656
12657 config X86_MINIMUM_CPU_FAMILY
12658 int
12659diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12660index 61bd2ad..50b625d 100644
12661--- a/arch/x86/Kconfig.debug
12662+++ b/arch/x86/Kconfig.debug
12663@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12664 config DEBUG_RODATA
12665 bool "Write protect kernel read-only data structures"
12666 default y
12667- depends on DEBUG_KERNEL
12668+ depends on DEBUG_KERNEL && BROKEN
12669 ---help---
12670 Mark the kernel read-only data as write-protected in the pagetables,
12671 in order to catch accidental (and incorrect) writes to such const
12672@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12673
12674 config DEBUG_SET_MODULE_RONX
12675 bool "Set loadable kernel module data as NX and text as RO"
12676- depends on MODULES
12677+ depends on MODULES && BROKEN
12678 ---help---
12679 This option helps catch unintended modifications to loadable
12680 kernel module's text and read-only data. It also prevents execution
12681diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12682index 920e616..ac3d4df 100644
12683--- a/arch/x86/Makefile
12684+++ b/arch/x86/Makefile
12685@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12686 # CPU-specific tuning. Anything which can be shared with UML should go here.
12687 include $(srctree)/arch/x86/Makefile_32.cpu
12688 KBUILD_CFLAGS += $(cflags-y)
12689-
12690- # temporary until string.h is fixed
12691- KBUILD_CFLAGS += -ffreestanding
12692 else
12693 BITS := 64
12694 UTS_MACHINE := x86_64
12695@@ -107,6 +104,9 @@ else
12696 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12697 endif
12698
12699+# temporary until string.h is fixed
12700+KBUILD_CFLAGS += -ffreestanding
12701+
12702 # Make sure compiler does not have buggy stack-protector support.
12703 ifdef CONFIG_CC_STACKPROTECTOR
12704 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12705@@ -180,6 +180,7 @@ archheaders:
12706 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12707
12708 archprepare:
12709+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12710 ifeq ($(CONFIG_KEXEC_FILE),y)
12711 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12712 endif
12713@@ -263,3 +264,9 @@ define archhelp
12714 echo ' FDARGS="..." arguments for the booted kernel'
12715 echo ' FDINITRD=file initrd for the booted kernel'
12716 endef
12717+
12718+define OLD_LD
12719+
12720+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12721+*** Please upgrade your binutils to 2.18 or newer
12722+endef
12723diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12724index 3db07f3..9d81d0f 100644
12725--- a/arch/x86/boot/Makefile
12726+++ b/arch/x86/boot/Makefile
12727@@ -56,6 +56,9 @@ clean-files += cpustr.h
12728 # ---------------------------------------------------------------------------
12729
12730 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12731+ifdef CONSTIFY_PLUGIN
12732+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12733+endif
12734 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12735 GCOV_PROFILE := n
12736
12737diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12738index 878e4b9..20537ab 100644
12739--- a/arch/x86/boot/bitops.h
12740+++ b/arch/x86/boot/bitops.h
12741@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12742 u8 v;
12743 const u32 *p = (const u32 *)addr;
12744
12745- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12746+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12747 return v;
12748 }
12749
12750@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12751
12752 static inline void set_bit(int nr, void *addr)
12753 {
12754- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12755+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12756 }
12757
12758 #endif /* BOOT_BITOPS_H */
12759diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12760index bd49ec6..94c7f58 100644
12761--- a/arch/x86/boot/boot.h
12762+++ b/arch/x86/boot/boot.h
12763@@ -84,7 +84,7 @@ static inline void io_delay(void)
12764 static inline u16 ds(void)
12765 {
12766 u16 seg;
12767- asm("movw %%ds,%0" : "=rm" (seg));
12768+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12769 return seg;
12770 }
12771
12772diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12773index 45abc36..97bea2d 100644
12774--- a/arch/x86/boot/compressed/Makefile
12775+++ b/arch/x86/boot/compressed/Makefile
12776@@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12777 KBUILD_CFLAGS += -mno-mmx -mno-sse
12778 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12779 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12780+ifdef CONSTIFY_PLUGIN
12781+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12782+endif
12783
12784 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12785 GCOV_PROFILE := n
12786diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12787index a53440e..c3dbf1e 100644
12788--- a/arch/x86/boot/compressed/efi_stub_32.S
12789+++ b/arch/x86/boot/compressed/efi_stub_32.S
12790@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12791 * parameter 2, ..., param n. To make things easy, we save the return
12792 * address of efi_call_phys in a global variable.
12793 */
12794- popl %ecx
12795- movl %ecx, saved_return_addr(%edx)
12796- /* get the function pointer into ECX*/
12797- popl %ecx
12798- movl %ecx, efi_rt_function_ptr(%edx)
12799+ popl saved_return_addr(%edx)
12800+ popl efi_rt_function_ptr(%edx)
12801
12802 /*
12803 * 3. Call the physical function.
12804 */
12805- call *%ecx
12806+ call *efi_rt_function_ptr(%edx)
12807
12808 /*
12809 * 4. Balance the stack. And because EAX contain the return value,
12810@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12811 1: popl %edx
12812 subl $1b, %edx
12813
12814- movl efi_rt_function_ptr(%edx), %ecx
12815- pushl %ecx
12816+ pushl efi_rt_function_ptr(%edx)
12817
12818 /*
12819 * 10. Push the saved return address onto the stack and return.
12820 */
12821- movl saved_return_addr(%edx), %ecx
12822- pushl %ecx
12823- ret
12824+ jmpl *saved_return_addr(%edx)
12825 ENDPROC(efi_call_phys)
12826 .previous
12827
12828diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12829index 1d7fbbc..36ecd58 100644
12830--- a/arch/x86/boot/compressed/head_32.S
12831+++ b/arch/x86/boot/compressed/head_32.S
12832@@ -140,10 +140,10 @@ preferred_addr:
12833 addl %eax, %ebx
12834 notl %eax
12835 andl %eax, %ebx
12836- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12837+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12838 jge 1f
12839 #endif
12840- movl $LOAD_PHYSICAL_ADDR, %ebx
12841+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12842 1:
12843
12844 /* Target address to relocate to for decompression */
12845diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12846index 6b1766c..ad465c9 100644
12847--- a/arch/x86/boot/compressed/head_64.S
12848+++ b/arch/x86/boot/compressed/head_64.S
12849@@ -94,10 +94,10 @@ ENTRY(startup_32)
12850 addl %eax, %ebx
12851 notl %eax
12852 andl %eax, %ebx
12853- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12854+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12855 jge 1f
12856 #endif
12857- movl $LOAD_PHYSICAL_ADDR, %ebx
12858+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12859 1:
12860
12861 /* Target address to relocate to for decompression */
12862@@ -322,10 +322,10 @@ preferred_addr:
12863 addq %rax, %rbp
12864 notq %rax
12865 andq %rax, %rbp
12866- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12867+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12868 jge 1f
12869 #endif
12870- movq $LOAD_PHYSICAL_ADDR, %rbp
12871+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12872 1:
12873
12874 /* Target address to relocate to for decompression */
12875@@ -434,8 +434,8 @@ gdt:
12876 .long gdt
12877 .word 0
12878 .quad 0x0000000000000000 /* NULL descriptor */
12879- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12880- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12881+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12882+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12883 .quad 0x0080890000000000 /* TS descriptor */
12884 .quad 0x0000000000000000 /* TS continued */
12885 gdt_end:
12886diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12887index 0c33a7c..be226ed 100644
12888--- a/arch/x86/boot/compressed/misc.c
12889+++ b/arch/x86/boot/compressed/misc.c
12890@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12891 * Calculate the delta between where vmlinux was linked to load
12892 * and where it was actually loaded.
12893 */
12894- delta = min_addr - LOAD_PHYSICAL_ADDR;
12895+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12896 if (!delta) {
12897 debug_putstr("No relocation needed... ");
12898 return;
12899@@ -312,7 +312,7 @@ static void parse_elf(void *output)
12900 Elf32_Ehdr ehdr;
12901 Elf32_Phdr *phdrs, *phdr;
12902 #endif
12903- void *dest;
12904+ void *dest, *prev;
12905 int i;
12906
12907 memcpy(&ehdr, output, sizeof(ehdr));
12908@@ -339,13 +339,16 @@ static void parse_elf(void *output)
12909 case PT_LOAD:
12910 #ifdef CONFIG_RELOCATABLE
12911 dest = output;
12912- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12913+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12914 #else
12915 dest = (void *)(phdr->p_paddr);
12916 #endif
12917 memcpy(dest,
12918 output + phdr->p_offset,
12919 phdr->p_filesz);
12920+ if (i)
12921+ memset(prev, 0xff, dest - prev);
12922+ prev = dest + phdr->p_filesz;
12923 break;
12924 default: /* Ignore other PT_* */ break;
12925 }
12926@@ -404,7 +407,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12927 error("Destination address too large");
12928 #endif
12929 #ifndef CONFIG_RELOCATABLE
12930- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12931+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12932 error("Wrong destination address");
12933 #endif
12934
12935diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12936index 1fd7d57..0f7d096 100644
12937--- a/arch/x86/boot/cpucheck.c
12938+++ b/arch/x86/boot/cpucheck.c
12939@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12940 u32 ecx = MSR_K7_HWCR;
12941 u32 eax, edx;
12942
12943- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12944+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12945 eax &= ~(1 << 15);
12946- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12947+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12948
12949 get_cpuflags(); /* Make sure it really did something */
12950 err = check_cpuflags();
12951@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12952 u32 ecx = MSR_VIA_FCR;
12953 u32 eax, edx;
12954
12955- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12956+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12957 eax |= (1<<1)|(1<<7);
12958- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12959+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12960
12961 set_bit(X86_FEATURE_CX8, cpu.flags);
12962 err = check_cpuflags();
12963@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12964 u32 eax, edx;
12965 u32 level = 1;
12966
12967- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12968- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12969- asm("cpuid"
12970+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12971+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12972+ asm volatile("cpuid"
12973 : "+a" (level), "=d" (cpu.flags[0])
12974 : : "ecx", "ebx");
12975- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12976+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12977
12978 err = check_cpuflags();
12979 } else if (err == 0x01 &&
12980diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12981index 16ef025..91e033b 100644
12982--- a/arch/x86/boot/header.S
12983+++ b/arch/x86/boot/header.S
12984@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12985 # single linked list of
12986 # struct setup_data
12987
12988-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12989+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12990
12991 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12992+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12993+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12994+#else
12995 #define VO_INIT_SIZE (VO__end - VO__text)
12996+#endif
12997 #if ZO_INIT_SIZE > VO_INIT_SIZE
12998 #define INIT_SIZE ZO_INIT_SIZE
12999 #else
13000diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
13001index db75d07..8e6d0af 100644
13002--- a/arch/x86/boot/memory.c
13003+++ b/arch/x86/boot/memory.c
13004@@ -19,7 +19,7 @@
13005
13006 static int detect_memory_e820(void)
13007 {
13008- int count = 0;
13009+ unsigned int count = 0;
13010 struct biosregs ireg, oreg;
13011 struct e820entry *desc = boot_params.e820_map;
13012 static struct e820entry buf; /* static so it is zeroed */
13013diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13014index ba3e100..6501b8f 100644
13015--- a/arch/x86/boot/video-vesa.c
13016+++ b/arch/x86/boot/video-vesa.c
13017@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13018
13019 boot_params.screen_info.vesapm_seg = oreg.es;
13020 boot_params.screen_info.vesapm_off = oreg.di;
13021+ boot_params.screen_info.vesapm_size = oreg.cx;
13022 }
13023
13024 /*
13025diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13026index 43eda28..5ab5fdb 100644
13027--- a/arch/x86/boot/video.c
13028+++ b/arch/x86/boot/video.c
13029@@ -96,7 +96,7 @@ static void store_mode_params(void)
13030 static unsigned int get_entry(void)
13031 {
13032 char entry_buf[4];
13033- int i, len = 0;
13034+ unsigned int i, len = 0;
13035 int key;
13036 unsigned int v;
13037
13038diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13039index 9105655..41779c1 100644
13040--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13041+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13042@@ -8,6 +8,8 @@
13043 * including this sentence is retained in full.
13044 */
13045
13046+#include <asm/alternative-asm.h>
13047+
13048 .extern crypto_ft_tab
13049 .extern crypto_it_tab
13050 .extern crypto_fl_tab
13051@@ -70,6 +72,8 @@
13052 je B192; \
13053 leaq 32(r9),r9;
13054
13055+#define ret pax_force_retaddr; ret
13056+
13057 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13058 movq r1,r2; \
13059 movq r3,r4; \
13060diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13061index 477e9d7..c92c7d8 100644
13062--- a/arch/x86/crypto/aesni-intel_asm.S
13063+++ b/arch/x86/crypto/aesni-intel_asm.S
13064@@ -31,6 +31,7 @@
13065
13066 #include <linux/linkage.h>
13067 #include <asm/inst.h>
13068+#include <asm/alternative-asm.h>
13069
13070 #ifdef __x86_64__
13071 .data
13072@@ -205,7 +206,7 @@ enc: .octa 0x2
13073 * num_initial_blocks = b mod 4
13074 * encrypt the initial num_initial_blocks blocks and apply ghash on
13075 * the ciphertext
13076-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13077+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13078 * are clobbered
13079 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13080 */
13081@@ -214,8 +215,8 @@ enc: .octa 0x2
13082 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13083 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13084 mov arg7, %r10 # %r10 = AAD
13085- mov arg8, %r12 # %r12 = aadLen
13086- mov %r12, %r11
13087+ mov arg8, %r15 # %r15 = aadLen
13088+ mov %r15, %r11
13089 pxor %xmm\i, %xmm\i
13090 _get_AAD_loop\num_initial_blocks\operation:
13091 movd (%r10), \TMP1
13092@@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13093 psrldq $4, %xmm\i
13094 pxor \TMP1, %xmm\i
13095 add $4, %r10
13096- sub $4, %r12
13097+ sub $4, %r15
13098 jne _get_AAD_loop\num_initial_blocks\operation
13099 cmp $16, %r11
13100 je _get_AAD_loop2_done\num_initial_blocks\operation
13101- mov $16, %r12
13102+ mov $16, %r15
13103 _get_AAD_loop2\num_initial_blocks\operation:
13104 psrldq $4, %xmm\i
13105- sub $4, %r12
13106- cmp %r11, %r12
13107+ sub $4, %r15
13108+ cmp %r11, %r15
13109 jne _get_AAD_loop2\num_initial_blocks\operation
13110 _get_AAD_loop2_done\num_initial_blocks\operation:
13111 movdqa SHUF_MASK(%rip), %xmm14
13112@@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13113 * num_initial_blocks = b mod 4
13114 * encrypt the initial num_initial_blocks blocks and apply ghash on
13115 * the ciphertext
13116-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13117+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13118 * are clobbered
13119 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13120 */
13121@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13122 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13123 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13124 mov arg7, %r10 # %r10 = AAD
13125- mov arg8, %r12 # %r12 = aadLen
13126- mov %r12, %r11
13127+ mov arg8, %r15 # %r15 = aadLen
13128+ mov %r15, %r11
13129 pxor %xmm\i, %xmm\i
13130 _get_AAD_loop\num_initial_blocks\operation:
13131 movd (%r10), \TMP1
13132@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13133 psrldq $4, %xmm\i
13134 pxor \TMP1, %xmm\i
13135 add $4, %r10
13136- sub $4, %r12
13137+ sub $4, %r15
13138 jne _get_AAD_loop\num_initial_blocks\operation
13139 cmp $16, %r11
13140 je _get_AAD_loop2_done\num_initial_blocks\operation
13141- mov $16, %r12
13142+ mov $16, %r15
13143 _get_AAD_loop2\num_initial_blocks\operation:
13144 psrldq $4, %xmm\i
13145- sub $4, %r12
13146- cmp %r11, %r12
13147+ sub $4, %r15
13148+ cmp %r11, %r15
13149 jne _get_AAD_loop2\num_initial_blocks\operation
13150 _get_AAD_loop2_done\num_initial_blocks\operation:
13151 movdqa SHUF_MASK(%rip), %xmm14
13152@@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
13153 *
13154 *****************************************************************************/
13155 ENTRY(aesni_gcm_dec)
13156- push %r12
13157+ push %r15
13158 push %r13
13159 push %r14
13160 mov %rsp, %r14
13161@@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
13162 */
13163 sub $VARIABLE_OFFSET, %rsp
13164 and $~63, %rsp # align rsp to 64 bytes
13165- mov %arg6, %r12
13166- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13167+ mov %arg6, %r15
13168+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13169 movdqa SHUF_MASK(%rip), %xmm2
13170 PSHUFB_XMM %xmm2, %xmm13
13171
13172@@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
13173 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13174 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13175 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13176- mov %r13, %r12
13177- and $(3<<4), %r12
13178+ mov %r13, %r15
13179+ and $(3<<4), %r15
13180 jz _initial_num_blocks_is_0_decrypt
13181- cmp $(2<<4), %r12
13182+ cmp $(2<<4), %r15
13183 jb _initial_num_blocks_is_1_decrypt
13184 je _initial_num_blocks_is_2_decrypt
13185 _initial_num_blocks_is_3_decrypt:
13186@@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
13187 sub $16, %r11
13188 add %r13, %r11
13189 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13190- lea SHIFT_MASK+16(%rip), %r12
13191- sub %r13, %r12
13192+ lea SHIFT_MASK+16(%rip), %r15
13193+ sub %r13, %r15
13194 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13195 # (%r13 is the number of bytes in plaintext mod 16)
13196- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13197+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13198 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13199
13200 movdqa %xmm1, %xmm2
13201 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13202- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13203+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13204 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13205 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13206 pand %xmm1, %xmm2
13207@@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
13208 sub $1, %r13
13209 jne _less_than_8_bytes_left_decrypt
13210 _multiple_of_16_bytes_decrypt:
13211- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13212- shl $3, %r12 # convert into number of bits
13213- movd %r12d, %xmm15 # len(A) in %xmm15
13214+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13215+ shl $3, %r15 # convert into number of bits
13216+ movd %r15d, %xmm15 # len(A) in %xmm15
13217 shl $3, %arg4 # len(C) in bits (*128)
13218 MOVQ_R64_XMM %arg4, %xmm1
13219 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13220@@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
13221 mov %r14, %rsp
13222 pop %r14
13223 pop %r13
13224- pop %r12
13225+ pop %r15
13226+ pax_force_retaddr
13227 ret
13228 ENDPROC(aesni_gcm_dec)
13229
13230@@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
13231 * poly = x^128 + x^127 + x^126 + x^121 + 1
13232 ***************************************************************************/
13233 ENTRY(aesni_gcm_enc)
13234- push %r12
13235+ push %r15
13236 push %r13
13237 push %r14
13238 mov %rsp, %r14
13239@@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
13240 #
13241 sub $VARIABLE_OFFSET, %rsp
13242 and $~63, %rsp
13243- mov %arg6, %r12
13244- movdqu (%r12), %xmm13
13245+ mov %arg6, %r15
13246+ movdqu (%r15), %xmm13
13247 movdqa SHUF_MASK(%rip), %xmm2
13248 PSHUFB_XMM %xmm2, %xmm13
13249
13250@@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
13251 movdqa %xmm13, HashKey(%rsp)
13252 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13253 and $-16, %r13
13254- mov %r13, %r12
13255+ mov %r13, %r15
13256
13257 # Encrypt first few blocks
13258
13259- and $(3<<4), %r12
13260+ and $(3<<4), %r15
13261 jz _initial_num_blocks_is_0_encrypt
13262- cmp $(2<<4), %r12
13263+ cmp $(2<<4), %r15
13264 jb _initial_num_blocks_is_1_encrypt
13265 je _initial_num_blocks_is_2_encrypt
13266 _initial_num_blocks_is_3_encrypt:
13267@@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13268 sub $16, %r11
13269 add %r13, %r11
13270 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13271- lea SHIFT_MASK+16(%rip), %r12
13272- sub %r13, %r12
13273+ lea SHIFT_MASK+16(%rip), %r15
13274+ sub %r13, %r15
13275 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13276 # (%r13 is the number of bytes in plaintext mod 16)
13277- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13278+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13279 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13280 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13281- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13282+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13283 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13284 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13285 movdqa SHUF_MASK(%rip), %xmm10
13286@@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13287 sub $1, %r13
13288 jne _less_than_8_bytes_left_encrypt
13289 _multiple_of_16_bytes_encrypt:
13290- mov arg8, %r12 # %r12 = addLen (number of bytes)
13291- shl $3, %r12
13292- movd %r12d, %xmm15 # len(A) in %xmm15
13293+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13294+ shl $3, %r15
13295+ movd %r15d, %xmm15 # len(A) in %xmm15
13296 shl $3, %arg4 # len(C) in bits (*128)
13297 MOVQ_R64_XMM %arg4, %xmm1
13298 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13299@@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13300 mov %r14, %rsp
13301 pop %r14
13302 pop %r13
13303- pop %r12
13304+ pop %r15
13305+ pax_force_retaddr
13306 ret
13307 ENDPROC(aesni_gcm_enc)
13308
13309@@ -1722,6 +1725,7 @@ _key_expansion_256a:
13310 pxor %xmm1, %xmm0
13311 movaps %xmm0, (TKEYP)
13312 add $0x10, TKEYP
13313+ pax_force_retaddr
13314 ret
13315 ENDPROC(_key_expansion_128)
13316 ENDPROC(_key_expansion_256a)
13317@@ -1748,6 +1752,7 @@ _key_expansion_192a:
13318 shufps $0b01001110, %xmm2, %xmm1
13319 movaps %xmm1, 0x10(TKEYP)
13320 add $0x20, TKEYP
13321+ pax_force_retaddr
13322 ret
13323 ENDPROC(_key_expansion_192a)
13324
13325@@ -1768,6 +1773,7 @@ _key_expansion_192b:
13326
13327 movaps %xmm0, (TKEYP)
13328 add $0x10, TKEYP
13329+ pax_force_retaddr
13330 ret
13331 ENDPROC(_key_expansion_192b)
13332
13333@@ -1781,6 +1787,7 @@ _key_expansion_256b:
13334 pxor %xmm1, %xmm2
13335 movaps %xmm2, (TKEYP)
13336 add $0x10, TKEYP
13337+ pax_force_retaddr
13338 ret
13339 ENDPROC(_key_expansion_256b)
13340
13341@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13342 #ifndef __x86_64__
13343 popl KEYP
13344 #endif
13345+ pax_force_retaddr
13346 ret
13347 ENDPROC(aesni_set_key)
13348
13349@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13350 popl KLEN
13351 popl KEYP
13352 #endif
13353+ pax_force_retaddr
13354 ret
13355 ENDPROC(aesni_enc)
13356
13357@@ -1974,6 +1983,7 @@ _aesni_enc1:
13358 AESENC KEY STATE
13359 movaps 0x70(TKEYP), KEY
13360 AESENCLAST KEY STATE
13361+ pax_force_retaddr
13362 ret
13363 ENDPROC(_aesni_enc1)
13364
13365@@ -2083,6 +2093,7 @@ _aesni_enc4:
13366 AESENCLAST KEY STATE2
13367 AESENCLAST KEY STATE3
13368 AESENCLAST KEY STATE4
13369+ pax_force_retaddr
13370 ret
13371 ENDPROC(_aesni_enc4)
13372
13373@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13374 popl KLEN
13375 popl KEYP
13376 #endif
13377+ pax_force_retaddr
13378 ret
13379 ENDPROC(aesni_dec)
13380
13381@@ -2164,6 +2176,7 @@ _aesni_dec1:
13382 AESDEC KEY STATE
13383 movaps 0x70(TKEYP), KEY
13384 AESDECLAST KEY STATE
13385+ pax_force_retaddr
13386 ret
13387 ENDPROC(_aesni_dec1)
13388
13389@@ -2273,6 +2286,7 @@ _aesni_dec4:
13390 AESDECLAST KEY STATE2
13391 AESDECLAST KEY STATE3
13392 AESDECLAST KEY STATE4
13393+ pax_force_retaddr
13394 ret
13395 ENDPROC(_aesni_dec4)
13396
13397@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13398 popl KEYP
13399 popl LEN
13400 #endif
13401+ pax_force_retaddr
13402 ret
13403 ENDPROC(aesni_ecb_enc)
13404
13405@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13406 popl KEYP
13407 popl LEN
13408 #endif
13409+ pax_force_retaddr
13410 ret
13411 ENDPROC(aesni_ecb_dec)
13412
13413@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13414 popl LEN
13415 popl IVP
13416 #endif
13417+ pax_force_retaddr
13418 ret
13419 ENDPROC(aesni_cbc_enc)
13420
13421@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13422 popl LEN
13423 popl IVP
13424 #endif
13425+ pax_force_retaddr
13426 ret
13427 ENDPROC(aesni_cbc_dec)
13428
13429@@ -2550,6 +2568,7 @@ _aesni_inc_init:
13430 mov $1, TCTR_LOW
13431 MOVQ_R64_XMM TCTR_LOW INC
13432 MOVQ_R64_XMM CTR TCTR_LOW
13433+ pax_force_retaddr
13434 ret
13435 ENDPROC(_aesni_inc_init)
13436
13437@@ -2579,6 +2598,7 @@ _aesni_inc:
13438 .Linc_low:
13439 movaps CTR, IV
13440 PSHUFB_XMM BSWAP_MASK IV
13441+ pax_force_retaddr
13442 ret
13443 ENDPROC(_aesni_inc)
13444
13445@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13446 .Lctr_enc_ret:
13447 movups IV, (IVP)
13448 .Lctr_enc_just_ret:
13449+ pax_force_retaddr
13450 ret
13451 ENDPROC(aesni_ctr_enc)
13452
13453@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13454 pxor INC, STATE4
13455 movdqu STATE4, 0x70(OUTP)
13456
13457+ pax_force_retaddr
13458 ret
13459 ENDPROC(aesni_xts_crypt8)
13460
13461diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13462index 246c670..466e2d6 100644
13463--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13464+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13465@@ -21,6 +21,7 @@
13466 */
13467
13468 #include <linux/linkage.h>
13469+#include <asm/alternative-asm.h>
13470
13471 .file "blowfish-x86_64-asm.S"
13472 .text
13473@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13474 jnz .L__enc_xor;
13475
13476 write_block();
13477+ pax_force_retaddr
13478 ret;
13479 .L__enc_xor:
13480 xor_block();
13481+ pax_force_retaddr
13482 ret;
13483 ENDPROC(__blowfish_enc_blk)
13484
13485@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13486
13487 movq %r11, %rbp;
13488
13489+ pax_force_retaddr
13490 ret;
13491 ENDPROC(blowfish_dec_blk)
13492
13493@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13494
13495 popq %rbx;
13496 popq %rbp;
13497+ pax_force_retaddr
13498 ret;
13499
13500 .L__enc_xor4:
13501@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13502
13503 popq %rbx;
13504 popq %rbp;
13505+ pax_force_retaddr
13506 ret;
13507 ENDPROC(__blowfish_enc_blk_4way)
13508
13509@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13510 popq %rbx;
13511 popq %rbp;
13512
13513+ pax_force_retaddr
13514 ret;
13515 ENDPROC(blowfish_dec_blk_4way)
13516diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13517index ce71f92..1dce7ec 100644
13518--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13519+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13520@@ -16,6 +16,7 @@
13521 */
13522
13523 #include <linux/linkage.h>
13524+#include <asm/alternative-asm.h>
13525
13526 #define CAMELLIA_TABLE_BYTE_LEN 272
13527
13528@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13529 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13530 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13531 %rcx, (%r9));
13532+ pax_force_retaddr
13533 ret;
13534 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13535
13536@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13537 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13538 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13539 %rax, (%r9));
13540+ pax_force_retaddr
13541 ret;
13542 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13543
13544@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13545 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13546 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13547
13548+ pax_force_retaddr
13549 ret;
13550
13551 .align 8
13552@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13553 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13554 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13555
13556+ pax_force_retaddr
13557 ret;
13558
13559 .align 8
13560@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13561 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13562 %xmm8, %rsi);
13563
13564+ pax_force_retaddr
13565 ret;
13566 ENDPROC(camellia_ecb_enc_16way)
13567
13568@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13569 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13570 %xmm8, %rsi);
13571
13572+ pax_force_retaddr
13573 ret;
13574 ENDPROC(camellia_ecb_dec_16way)
13575
13576@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13577 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13578 %xmm8, %rsi);
13579
13580+ pax_force_retaddr
13581 ret;
13582 ENDPROC(camellia_cbc_dec_16way)
13583
13584@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13585 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13586 %xmm8, %rsi);
13587
13588+ pax_force_retaddr
13589 ret;
13590 ENDPROC(camellia_ctr_16way)
13591
13592@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13593 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13594 %xmm8, %rsi);
13595
13596+ pax_force_retaddr
13597 ret;
13598 ENDPROC(camellia_xts_crypt_16way)
13599
13600diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13601index 0e0b886..5a3123c 100644
13602--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13603+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13604@@ -11,6 +11,7 @@
13605 */
13606
13607 #include <linux/linkage.h>
13608+#include <asm/alternative-asm.h>
13609
13610 #define CAMELLIA_TABLE_BYTE_LEN 272
13611
13612@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13613 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13614 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13615 %rcx, (%r9));
13616+ pax_force_retaddr
13617 ret;
13618 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13619
13620@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13621 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13622 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13623 %rax, (%r9));
13624+ pax_force_retaddr
13625 ret;
13626 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13627
13628@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13629 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13630 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13631
13632+ pax_force_retaddr
13633 ret;
13634
13635 .align 8
13636@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13637 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13638 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13639
13640+ pax_force_retaddr
13641 ret;
13642
13643 .align 8
13644@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13645
13646 vzeroupper;
13647
13648+ pax_force_retaddr
13649 ret;
13650 ENDPROC(camellia_ecb_enc_32way)
13651
13652@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13653
13654 vzeroupper;
13655
13656+ pax_force_retaddr
13657 ret;
13658 ENDPROC(camellia_ecb_dec_32way)
13659
13660@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13661
13662 vzeroupper;
13663
13664+ pax_force_retaddr
13665 ret;
13666 ENDPROC(camellia_cbc_dec_32way)
13667
13668@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13669
13670 vzeroupper;
13671
13672+ pax_force_retaddr
13673 ret;
13674 ENDPROC(camellia_ctr_32way)
13675
13676@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13677
13678 vzeroupper;
13679
13680+ pax_force_retaddr
13681 ret;
13682 ENDPROC(camellia_xts_crypt_32way)
13683
13684diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13685index 310319c..db3d7b5 100644
13686--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13687+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13688@@ -21,6 +21,7 @@
13689 */
13690
13691 #include <linux/linkage.h>
13692+#include <asm/alternative-asm.h>
13693
13694 .file "camellia-x86_64-asm_64.S"
13695 .text
13696@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13697 enc_outunpack(mov, RT1);
13698
13699 movq RRBP, %rbp;
13700+ pax_force_retaddr
13701 ret;
13702
13703 .L__enc_xor:
13704 enc_outunpack(xor, RT1);
13705
13706 movq RRBP, %rbp;
13707+ pax_force_retaddr
13708 ret;
13709 ENDPROC(__camellia_enc_blk)
13710
13711@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13712 dec_outunpack();
13713
13714 movq RRBP, %rbp;
13715+ pax_force_retaddr
13716 ret;
13717 ENDPROC(camellia_dec_blk)
13718
13719@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13720
13721 movq RRBP, %rbp;
13722 popq %rbx;
13723+ pax_force_retaddr
13724 ret;
13725
13726 .L__enc2_xor:
13727@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13728
13729 movq RRBP, %rbp;
13730 popq %rbx;
13731+ pax_force_retaddr
13732 ret;
13733 ENDPROC(__camellia_enc_blk_2way)
13734
13735@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13736
13737 movq RRBP, %rbp;
13738 movq RXOR, %rbx;
13739+ pax_force_retaddr
13740 ret;
13741 ENDPROC(camellia_dec_blk_2way)
13742diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13743index c35fd5d..2d8c7db 100644
13744--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13745+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13746@@ -24,6 +24,7 @@
13747 */
13748
13749 #include <linux/linkage.h>
13750+#include <asm/alternative-asm.h>
13751
13752 .file "cast5-avx-x86_64-asm_64.S"
13753
13754@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13755 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13756 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13757
13758+ pax_force_retaddr
13759 ret;
13760 ENDPROC(__cast5_enc_blk16)
13761
13762@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13763 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13764 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13765
13766+ pax_force_retaddr
13767 ret;
13768
13769 .L__skip_dec:
13770@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13771 vmovdqu RR4, (6*4*4)(%r11);
13772 vmovdqu RL4, (7*4*4)(%r11);
13773
13774+ pax_force_retaddr
13775 ret;
13776 ENDPROC(cast5_ecb_enc_16way)
13777
13778@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13779 vmovdqu RR4, (6*4*4)(%r11);
13780 vmovdqu RL4, (7*4*4)(%r11);
13781
13782+ pax_force_retaddr
13783 ret;
13784 ENDPROC(cast5_ecb_dec_16way)
13785
13786@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13787 * %rdx: src
13788 */
13789
13790- pushq %r12;
13791+ pushq %r14;
13792
13793 movq %rsi, %r11;
13794- movq %rdx, %r12;
13795+ movq %rdx, %r14;
13796
13797 vmovdqu (0*16)(%rdx), RL1;
13798 vmovdqu (1*16)(%rdx), RR1;
13799@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13800 call __cast5_dec_blk16;
13801
13802 /* xor with src */
13803- vmovq (%r12), RX;
13804+ vmovq (%r14), RX;
13805 vpshufd $0x4f, RX, RX;
13806 vpxor RX, RR1, RR1;
13807- vpxor 0*16+8(%r12), RL1, RL1;
13808- vpxor 1*16+8(%r12), RR2, RR2;
13809- vpxor 2*16+8(%r12), RL2, RL2;
13810- vpxor 3*16+8(%r12), RR3, RR3;
13811- vpxor 4*16+8(%r12), RL3, RL3;
13812- vpxor 5*16+8(%r12), RR4, RR4;
13813- vpxor 6*16+8(%r12), RL4, RL4;
13814+ vpxor 0*16+8(%r14), RL1, RL1;
13815+ vpxor 1*16+8(%r14), RR2, RR2;
13816+ vpxor 2*16+8(%r14), RL2, RL2;
13817+ vpxor 3*16+8(%r14), RR3, RR3;
13818+ vpxor 4*16+8(%r14), RL3, RL3;
13819+ vpxor 5*16+8(%r14), RR4, RR4;
13820+ vpxor 6*16+8(%r14), RL4, RL4;
13821
13822 vmovdqu RR1, (0*16)(%r11);
13823 vmovdqu RL1, (1*16)(%r11);
13824@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13825 vmovdqu RR4, (6*16)(%r11);
13826 vmovdqu RL4, (7*16)(%r11);
13827
13828- popq %r12;
13829+ popq %r14;
13830
13831+ pax_force_retaddr
13832 ret;
13833 ENDPROC(cast5_cbc_dec_16way)
13834
13835@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13836 * %rcx: iv (big endian, 64bit)
13837 */
13838
13839- pushq %r12;
13840+ pushq %r14;
13841
13842 movq %rsi, %r11;
13843- movq %rdx, %r12;
13844+ movq %rdx, %r14;
13845
13846 vpcmpeqd RTMP, RTMP, RTMP;
13847 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13848@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13849 call __cast5_enc_blk16;
13850
13851 /* dst = src ^ iv */
13852- vpxor (0*16)(%r12), RR1, RR1;
13853- vpxor (1*16)(%r12), RL1, RL1;
13854- vpxor (2*16)(%r12), RR2, RR2;
13855- vpxor (3*16)(%r12), RL2, RL2;
13856- vpxor (4*16)(%r12), RR3, RR3;
13857- vpxor (5*16)(%r12), RL3, RL3;
13858- vpxor (6*16)(%r12), RR4, RR4;
13859- vpxor (7*16)(%r12), RL4, RL4;
13860+ vpxor (0*16)(%r14), RR1, RR1;
13861+ vpxor (1*16)(%r14), RL1, RL1;
13862+ vpxor (2*16)(%r14), RR2, RR2;
13863+ vpxor (3*16)(%r14), RL2, RL2;
13864+ vpxor (4*16)(%r14), RR3, RR3;
13865+ vpxor (5*16)(%r14), RL3, RL3;
13866+ vpxor (6*16)(%r14), RR4, RR4;
13867+ vpxor (7*16)(%r14), RL4, RL4;
13868 vmovdqu RR1, (0*16)(%r11);
13869 vmovdqu RL1, (1*16)(%r11);
13870 vmovdqu RR2, (2*16)(%r11);
13871@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13872 vmovdqu RR4, (6*16)(%r11);
13873 vmovdqu RL4, (7*16)(%r11);
13874
13875- popq %r12;
13876+ popq %r14;
13877
13878+ pax_force_retaddr
13879 ret;
13880 ENDPROC(cast5_ctr_16way)
13881diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13882index e3531f8..e123f35 100644
13883--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13884+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13885@@ -24,6 +24,7 @@
13886 */
13887
13888 #include <linux/linkage.h>
13889+#include <asm/alternative-asm.h>
13890 #include "glue_helper-asm-avx.S"
13891
13892 .file "cast6-avx-x86_64-asm_64.S"
13893@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13894 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13895 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13896
13897+ pax_force_retaddr
13898 ret;
13899 ENDPROC(__cast6_enc_blk8)
13900
13901@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13902 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13903 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13904
13905+ pax_force_retaddr
13906 ret;
13907 ENDPROC(__cast6_dec_blk8)
13908
13909@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13910
13911 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13912
13913+ pax_force_retaddr
13914 ret;
13915 ENDPROC(cast6_ecb_enc_8way)
13916
13917@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13918
13919 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13920
13921+ pax_force_retaddr
13922 ret;
13923 ENDPROC(cast6_ecb_dec_8way)
13924
13925@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13926 * %rdx: src
13927 */
13928
13929- pushq %r12;
13930+ pushq %r14;
13931
13932 movq %rsi, %r11;
13933- movq %rdx, %r12;
13934+ movq %rdx, %r14;
13935
13936 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13937
13938 call __cast6_dec_blk8;
13939
13940- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13941+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13942
13943- popq %r12;
13944+ popq %r14;
13945
13946+ pax_force_retaddr
13947 ret;
13948 ENDPROC(cast6_cbc_dec_8way)
13949
13950@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13951 * %rcx: iv (little endian, 128bit)
13952 */
13953
13954- pushq %r12;
13955+ pushq %r14;
13956
13957 movq %rsi, %r11;
13958- movq %rdx, %r12;
13959+ movq %rdx, %r14;
13960
13961 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13962 RD2, RX, RKR, RKM);
13963
13964 call __cast6_enc_blk8;
13965
13966- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13967+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13968
13969- popq %r12;
13970+ popq %r14;
13971
13972+ pax_force_retaddr
13973 ret;
13974 ENDPROC(cast6_ctr_8way)
13975
13976@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13977 /* dst <= regs xor IVs(in dst) */
13978 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13979
13980+ pax_force_retaddr
13981 ret;
13982 ENDPROC(cast6_xts_enc_8way)
13983
13984@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13985 /* dst <= regs xor IVs(in dst) */
13986 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13987
13988+ pax_force_retaddr
13989 ret;
13990 ENDPROC(cast6_xts_dec_8way)
13991diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13992index 26d49eb..c0a8c84 100644
13993--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13994+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13995@@ -45,6 +45,7 @@
13996
13997 #include <asm/inst.h>
13998 #include <linux/linkage.h>
13999+#include <asm/alternative-asm.h>
14000
14001 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14002
14003@@ -309,6 +310,7 @@ do_return:
14004 popq %rsi
14005 popq %rdi
14006 popq %rbx
14007+ pax_force_retaddr
14008 ret
14009
14010 ################################################################
14011diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14012index 5d1e007..098cb4f 100644
14013--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14014+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14015@@ -18,6 +18,7 @@
14016
14017 #include <linux/linkage.h>
14018 #include <asm/inst.h>
14019+#include <asm/alternative-asm.h>
14020
14021 .data
14022
14023@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14024 psrlq $1, T2
14025 pxor T2, T1
14026 pxor T1, DATA
14027+ pax_force_retaddr
14028 ret
14029 ENDPROC(__clmul_gf128mul_ble)
14030
14031@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14032 call __clmul_gf128mul_ble
14033 PSHUFB_XMM BSWAP DATA
14034 movups DATA, (%rdi)
14035+ pax_force_retaddr
14036 ret
14037 ENDPROC(clmul_ghash_mul)
14038
14039@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14040 PSHUFB_XMM BSWAP DATA
14041 movups DATA, (%rdi)
14042 .Lupdate_just_ret:
14043+ pax_force_retaddr
14044 ret
14045 ENDPROC(clmul_ghash_update)
14046diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14047index 9279e0b..c4b3d2c 100644
14048--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14049+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14050@@ -1,4 +1,5 @@
14051 #include <linux/linkage.h>
14052+#include <asm/alternative-asm.h>
14053
14054 # enter salsa20_encrypt_bytes
14055 ENTRY(salsa20_encrypt_bytes)
14056@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14057 add %r11,%rsp
14058 mov %rdi,%rax
14059 mov %rsi,%rdx
14060+ pax_force_retaddr
14061 ret
14062 # bytesatleast65:
14063 ._bytesatleast65:
14064@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14065 add %r11,%rsp
14066 mov %rdi,%rax
14067 mov %rsi,%rdx
14068+ pax_force_retaddr
14069 ret
14070 ENDPROC(salsa20_keysetup)
14071
14072@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14073 add %r11,%rsp
14074 mov %rdi,%rax
14075 mov %rsi,%rdx
14076+ pax_force_retaddr
14077 ret
14078 ENDPROC(salsa20_ivsetup)
14079diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14080index 2f202f4..d9164d6 100644
14081--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14082+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14083@@ -24,6 +24,7 @@
14084 */
14085
14086 #include <linux/linkage.h>
14087+#include <asm/alternative-asm.h>
14088 #include "glue_helper-asm-avx.S"
14089
14090 .file "serpent-avx-x86_64-asm_64.S"
14091@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14092 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14093 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14094
14095+ pax_force_retaddr
14096 ret;
14097 ENDPROC(__serpent_enc_blk8_avx)
14098
14099@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14100 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14101 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14102
14103+ pax_force_retaddr
14104 ret;
14105 ENDPROC(__serpent_dec_blk8_avx)
14106
14107@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14108
14109 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14110
14111+ pax_force_retaddr
14112 ret;
14113 ENDPROC(serpent_ecb_enc_8way_avx)
14114
14115@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14116
14117 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14118
14119+ pax_force_retaddr
14120 ret;
14121 ENDPROC(serpent_ecb_dec_8way_avx)
14122
14123@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14124
14125 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14126
14127+ pax_force_retaddr
14128 ret;
14129 ENDPROC(serpent_cbc_dec_8way_avx)
14130
14131@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14132
14133 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14134
14135+ pax_force_retaddr
14136 ret;
14137 ENDPROC(serpent_ctr_8way_avx)
14138
14139@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14140 /* dst <= regs xor IVs(in dst) */
14141 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14142
14143+ pax_force_retaddr
14144 ret;
14145 ENDPROC(serpent_xts_enc_8way_avx)
14146
14147@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14148 /* dst <= regs xor IVs(in dst) */
14149 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14150
14151+ pax_force_retaddr
14152 ret;
14153 ENDPROC(serpent_xts_dec_8way_avx)
14154diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14155index b222085..abd483c 100644
14156--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14157+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14158@@ -15,6 +15,7 @@
14159 */
14160
14161 #include <linux/linkage.h>
14162+#include <asm/alternative-asm.h>
14163 #include "glue_helper-asm-avx2.S"
14164
14165 .file "serpent-avx2-asm_64.S"
14166@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14167 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14168 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14169
14170+ pax_force_retaddr
14171 ret;
14172 ENDPROC(__serpent_enc_blk16)
14173
14174@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14175 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14176 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14177
14178+ pax_force_retaddr
14179 ret;
14180 ENDPROC(__serpent_dec_blk16)
14181
14182@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14183
14184 vzeroupper;
14185
14186+ pax_force_retaddr
14187 ret;
14188 ENDPROC(serpent_ecb_enc_16way)
14189
14190@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14191
14192 vzeroupper;
14193
14194+ pax_force_retaddr
14195 ret;
14196 ENDPROC(serpent_ecb_dec_16way)
14197
14198@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14199
14200 vzeroupper;
14201
14202+ pax_force_retaddr
14203 ret;
14204 ENDPROC(serpent_cbc_dec_16way)
14205
14206@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14207
14208 vzeroupper;
14209
14210+ pax_force_retaddr
14211 ret;
14212 ENDPROC(serpent_ctr_16way)
14213
14214@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14215
14216 vzeroupper;
14217
14218+ pax_force_retaddr
14219 ret;
14220 ENDPROC(serpent_xts_enc_16way)
14221
14222@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14223
14224 vzeroupper;
14225
14226+ pax_force_retaddr
14227 ret;
14228 ENDPROC(serpent_xts_dec_16way)
14229diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14230index acc066c..1559cc4 100644
14231--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14232+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14233@@ -25,6 +25,7 @@
14234 */
14235
14236 #include <linux/linkage.h>
14237+#include <asm/alternative-asm.h>
14238
14239 .file "serpent-sse2-x86_64-asm_64.S"
14240 .text
14241@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14242 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14243 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14244
14245+ pax_force_retaddr
14246 ret;
14247
14248 .L__enc_xor8:
14249 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14250 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14251
14252+ pax_force_retaddr
14253 ret;
14254 ENDPROC(__serpent_enc_blk_8way)
14255
14256@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14257 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14258 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14259
14260+ pax_force_retaddr
14261 ret;
14262 ENDPROC(serpent_dec_blk_8way)
14263diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14264index a410950..9dfe7ad 100644
14265--- a/arch/x86/crypto/sha1_ssse3_asm.S
14266+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14267@@ -29,6 +29,7 @@
14268 */
14269
14270 #include <linux/linkage.h>
14271+#include <asm/alternative-asm.h>
14272
14273 #define CTX %rdi // arg1
14274 #define BUF %rsi // arg2
14275@@ -75,9 +76,9 @@
14276
14277 push %rbx
14278 push %rbp
14279- push %r12
14280+ push %r14
14281
14282- mov %rsp, %r12
14283+ mov %rsp, %r14
14284 sub $64, %rsp # allocate workspace
14285 and $~15, %rsp # align stack
14286
14287@@ -99,11 +100,12 @@
14288 xor %rax, %rax
14289 rep stosq
14290
14291- mov %r12, %rsp # deallocate workspace
14292+ mov %r14, %rsp # deallocate workspace
14293
14294- pop %r12
14295+ pop %r14
14296 pop %rbp
14297 pop %rbx
14298+ pax_force_retaddr
14299 ret
14300
14301 ENDPROC(\name)
14302diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14303index 642f156..51a513c 100644
14304--- a/arch/x86/crypto/sha256-avx-asm.S
14305+++ b/arch/x86/crypto/sha256-avx-asm.S
14306@@ -49,6 +49,7 @@
14307
14308 #ifdef CONFIG_AS_AVX
14309 #include <linux/linkage.h>
14310+#include <asm/alternative-asm.h>
14311
14312 ## assume buffers not aligned
14313 #define VMOVDQ vmovdqu
14314@@ -460,6 +461,7 @@ done_hash:
14315 popq %r13
14316 popq %rbp
14317 popq %rbx
14318+ pax_force_retaddr
14319 ret
14320 ENDPROC(sha256_transform_avx)
14321
14322diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14323index 9e86944..3795e6a 100644
14324--- a/arch/x86/crypto/sha256-avx2-asm.S
14325+++ b/arch/x86/crypto/sha256-avx2-asm.S
14326@@ -50,6 +50,7 @@
14327
14328 #ifdef CONFIG_AS_AVX2
14329 #include <linux/linkage.h>
14330+#include <asm/alternative-asm.h>
14331
14332 ## assume buffers not aligned
14333 #define VMOVDQ vmovdqu
14334@@ -720,6 +721,7 @@ done_hash:
14335 popq %r12
14336 popq %rbp
14337 popq %rbx
14338+ pax_force_retaddr
14339 ret
14340 ENDPROC(sha256_transform_rorx)
14341
14342diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14343index f833b74..8c62a9e 100644
14344--- a/arch/x86/crypto/sha256-ssse3-asm.S
14345+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14346@@ -47,6 +47,7 @@
14347 ########################################################################
14348
14349 #include <linux/linkage.h>
14350+#include <asm/alternative-asm.h>
14351
14352 ## assume buffers not aligned
14353 #define MOVDQ movdqu
14354@@ -471,6 +472,7 @@ done_hash:
14355 popq %rbp
14356 popq %rbx
14357
14358+ pax_force_retaddr
14359 ret
14360 ENDPROC(sha256_transform_ssse3)
14361
14362diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14363index 974dde9..a823ff9 100644
14364--- a/arch/x86/crypto/sha512-avx-asm.S
14365+++ b/arch/x86/crypto/sha512-avx-asm.S
14366@@ -49,6 +49,7 @@
14367
14368 #ifdef CONFIG_AS_AVX
14369 #include <linux/linkage.h>
14370+#include <asm/alternative-asm.h>
14371
14372 .text
14373
14374@@ -364,6 +365,7 @@ updateblock:
14375 mov frame_RSPSAVE(%rsp), %rsp
14376
14377 nowork:
14378+ pax_force_retaddr
14379 ret
14380 ENDPROC(sha512_transform_avx)
14381
14382diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14383index 568b961..ed20c37 100644
14384--- a/arch/x86/crypto/sha512-avx2-asm.S
14385+++ b/arch/x86/crypto/sha512-avx2-asm.S
14386@@ -51,6 +51,7 @@
14387
14388 #ifdef CONFIG_AS_AVX2
14389 #include <linux/linkage.h>
14390+#include <asm/alternative-asm.h>
14391
14392 .text
14393
14394@@ -678,6 +679,7 @@ done_hash:
14395
14396 # Restore Stack Pointer
14397 mov frame_RSPSAVE(%rsp), %rsp
14398+ pax_force_retaddr
14399 ret
14400 ENDPROC(sha512_transform_rorx)
14401
14402diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14403index fb56855..6edd768 100644
14404--- a/arch/x86/crypto/sha512-ssse3-asm.S
14405+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14406@@ -48,6 +48,7 @@
14407 ########################################################################
14408
14409 #include <linux/linkage.h>
14410+#include <asm/alternative-asm.h>
14411
14412 .text
14413
14414@@ -363,6 +364,7 @@ updateblock:
14415 mov frame_RSPSAVE(%rsp), %rsp
14416
14417 nowork:
14418+ pax_force_retaddr
14419 ret
14420 ENDPROC(sha512_transform_ssse3)
14421
14422diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14423index 0505813..b067311 100644
14424--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14425+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14426@@ -24,6 +24,7 @@
14427 */
14428
14429 #include <linux/linkage.h>
14430+#include <asm/alternative-asm.h>
14431 #include "glue_helper-asm-avx.S"
14432
14433 .file "twofish-avx-x86_64-asm_64.S"
14434@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14435 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14436 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14437
14438+ pax_force_retaddr
14439 ret;
14440 ENDPROC(__twofish_enc_blk8)
14441
14442@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14443 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14444 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14445
14446+ pax_force_retaddr
14447 ret;
14448 ENDPROC(__twofish_dec_blk8)
14449
14450@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14451
14452 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14453
14454+ pax_force_retaddr
14455 ret;
14456 ENDPROC(twofish_ecb_enc_8way)
14457
14458@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14459
14460 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14461
14462+ pax_force_retaddr
14463 ret;
14464 ENDPROC(twofish_ecb_dec_8way)
14465
14466@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14467 * %rdx: src
14468 */
14469
14470- pushq %r12;
14471+ pushq %r14;
14472
14473 movq %rsi, %r11;
14474- movq %rdx, %r12;
14475+ movq %rdx, %r14;
14476
14477 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14478
14479 call __twofish_dec_blk8;
14480
14481- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14482+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14483
14484- popq %r12;
14485+ popq %r14;
14486
14487+ pax_force_retaddr
14488 ret;
14489 ENDPROC(twofish_cbc_dec_8way)
14490
14491@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14492 * %rcx: iv (little endian, 128bit)
14493 */
14494
14495- pushq %r12;
14496+ pushq %r14;
14497
14498 movq %rsi, %r11;
14499- movq %rdx, %r12;
14500+ movq %rdx, %r14;
14501
14502 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14503 RD2, RX0, RX1, RY0);
14504
14505 call __twofish_enc_blk8;
14506
14507- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14508+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14509
14510- popq %r12;
14511+ popq %r14;
14512
14513+ pax_force_retaddr
14514 ret;
14515 ENDPROC(twofish_ctr_8way)
14516
14517@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14518 /* dst <= regs xor IVs(in dst) */
14519 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14520
14521+ pax_force_retaddr
14522 ret;
14523 ENDPROC(twofish_xts_enc_8way)
14524
14525@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14526 /* dst <= regs xor IVs(in dst) */
14527 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14528
14529+ pax_force_retaddr
14530 ret;
14531 ENDPROC(twofish_xts_dec_8way)
14532diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14533index 1c3b7ce..02f578d 100644
14534--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14535+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14536@@ -21,6 +21,7 @@
14537 */
14538
14539 #include <linux/linkage.h>
14540+#include <asm/alternative-asm.h>
14541
14542 .file "twofish-x86_64-asm-3way.S"
14543 .text
14544@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14545 popq %r13;
14546 popq %r14;
14547 popq %r15;
14548+ pax_force_retaddr
14549 ret;
14550
14551 .L__enc_xor3:
14552@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14553 popq %r13;
14554 popq %r14;
14555 popq %r15;
14556+ pax_force_retaddr
14557 ret;
14558 ENDPROC(__twofish_enc_blk_3way)
14559
14560@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14561 popq %r13;
14562 popq %r14;
14563 popq %r15;
14564+ pax_force_retaddr
14565 ret;
14566 ENDPROC(twofish_dec_blk_3way)
14567diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14568index a039d21..524b8b2 100644
14569--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14570+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14571@@ -22,6 +22,7 @@
14572
14573 #include <linux/linkage.h>
14574 #include <asm/asm-offsets.h>
14575+#include <asm/alternative-asm.h>
14576
14577 #define a_offset 0
14578 #define b_offset 4
14579@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14580
14581 popq R1
14582 movq $1,%rax
14583+ pax_force_retaddr
14584 ret
14585 ENDPROC(twofish_enc_blk)
14586
14587@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14588
14589 popq R1
14590 movq $1,%rax
14591+ pax_force_retaddr
14592 ret
14593 ENDPROC(twofish_dec_blk)
14594diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14595index df91466..74b31cb 100644
14596--- a/arch/x86/ia32/ia32_aout.c
14597+++ b/arch/x86/ia32/ia32_aout.c
14598@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14599 unsigned long dump_start, dump_size;
14600 struct user32 dump;
14601
14602+ memset(&dump, 0, sizeof(dump));
14603+
14604 fs = get_fs();
14605 set_fs(KERNEL_DS);
14606 has_dumped = 1;
14607diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14608index f9e181a..300544c 100644
14609--- a/arch/x86/ia32/ia32_signal.c
14610+++ b/arch/x86/ia32/ia32_signal.c
14611@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14612 if (__get_user(set.sig[0], &frame->sc.oldmask)
14613 || (_COMPAT_NSIG_WORDS > 1
14614 && __copy_from_user((((char *) &set.sig) + 4),
14615- &frame->extramask,
14616+ frame->extramask,
14617 sizeof(frame->extramask))))
14618 goto badframe;
14619
14620@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14621 sp -= frame_size;
14622 /* Align the stack pointer according to the i386 ABI,
14623 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14624- sp = ((sp + 4) & -16ul) - 4;
14625+ sp = ((sp - 12) & -16ul) - 4;
14626 return (void __user *) sp;
14627 }
14628
14629@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14630 } else {
14631 /* Return stub is in 32bit vsyscall page */
14632 if (current->mm->context.vdso)
14633- restorer = current->mm->context.vdso +
14634- selected_vdso32->sym___kernel_sigreturn;
14635+ restorer = (void __force_user *)(current->mm->context.vdso +
14636+ selected_vdso32->sym___kernel_sigreturn);
14637 else
14638- restorer = &frame->retcode;
14639+ restorer = frame->retcode;
14640 }
14641
14642 put_user_try {
14643@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14644 * These are actually not used anymore, but left because some
14645 * gdb versions depend on them as a marker.
14646 */
14647- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14648+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14649 } put_user_catch(err);
14650
14651 if (err)
14652@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14653 0xb8,
14654 __NR_ia32_rt_sigreturn,
14655 0x80cd,
14656- 0,
14657+ 0
14658 };
14659
14660 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14661@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14662
14663 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14664 restorer = ksig->ka.sa.sa_restorer;
14665+ else if (current->mm->context.vdso)
14666+ /* Return stub is in 32bit vsyscall page */
14667+ restorer = (void __force_user *)(current->mm->context.vdso +
14668+ selected_vdso32->sym___kernel_rt_sigreturn);
14669 else
14670- restorer = current->mm->context.vdso +
14671- selected_vdso32->sym___kernel_rt_sigreturn;
14672+ restorer = frame->retcode;
14673 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14674
14675 /*
14676 * Not actually used anymore, but left because some gdb
14677 * versions need it.
14678 */
14679- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14680+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14681 } put_user_catch(err);
14682
14683 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14684diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14685index ffe7122..899bad3 100644
14686--- a/arch/x86/ia32/ia32entry.S
14687+++ b/arch/x86/ia32/ia32entry.S
14688@@ -15,8 +15,10 @@
14689 #include <asm/irqflags.h>
14690 #include <asm/asm.h>
14691 #include <asm/smap.h>
14692+#include <asm/pgtable.h>
14693 #include <linux/linkage.h>
14694 #include <linux/err.h>
14695+#include <asm/alternative-asm.h>
14696
14697 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14698 #include <linux/elf-em.h>
14699@@ -62,12 +64,12 @@
14700 */
14701 .macro LOAD_ARGS32 offset, _r9=0
14702 .if \_r9
14703- movl \offset+16(%rsp),%r9d
14704+ movl \offset+R9(%rsp),%r9d
14705 .endif
14706- movl \offset+40(%rsp),%ecx
14707- movl \offset+48(%rsp),%edx
14708- movl \offset+56(%rsp),%esi
14709- movl \offset+64(%rsp),%edi
14710+ movl \offset+RCX(%rsp),%ecx
14711+ movl \offset+RDX(%rsp),%edx
14712+ movl \offset+RSI(%rsp),%esi
14713+ movl \offset+RDI(%rsp),%edi
14714 movl %eax,%eax /* zero extension */
14715 .endm
14716
14717@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14718 ENDPROC(native_irq_enable_sysexit)
14719 #endif
14720
14721+ .macro pax_enter_kernel_user
14722+ pax_set_fptr_mask
14723+#ifdef CONFIG_PAX_MEMORY_UDEREF
14724+ call pax_enter_kernel_user
14725+#endif
14726+ .endm
14727+
14728+ .macro pax_exit_kernel_user
14729+#ifdef CONFIG_PAX_MEMORY_UDEREF
14730+ call pax_exit_kernel_user
14731+#endif
14732+#ifdef CONFIG_PAX_RANDKSTACK
14733+ pushq %rax
14734+ pushq %r11
14735+ call pax_randomize_kstack
14736+ popq %r11
14737+ popq %rax
14738+#endif
14739+ .endm
14740+
14741+ .macro pax_erase_kstack
14742+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14743+ call pax_erase_kstack
14744+#endif
14745+ .endm
14746+
14747 /*
14748 * 32bit SYSENTER instruction entry.
14749 *
14750@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14751 CFI_REGISTER rsp,rbp
14752 SWAPGS_UNSAFE_STACK
14753 movq PER_CPU_VAR(kernel_stack), %rsp
14754- addq $(KERNEL_STACK_OFFSET),%rsp
14755- /*
14756- * No need to follow this irqs on/off section: the syscall
14757- * disabled irqs, here we enable it straight after entry:
14758- */
14759- ENABLE_INTERRUPTS(CLBR_NONE)
14760 movl %ebp,%ebp /* zero extension */
14761 pushq_cfi $__USER32_DS
14762 /*CFI_REL_OFFSET ss,0*/
14763@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14764 CFI_REL_OFFSET rsp,0
14765 pushfq_cfi
14766 /*CFI_REL_OFFSET rflags,0*/
14767- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14768- CFI_REGISTER rip,r10
14769+ orl $X86_EFLAGS_IF,(%rsp)
14770+ GET_THREAD_INFO(%r11)
14771+ movl TI_sysenter_return(%r11), %r11d
14772+ CFI_REGISTER rip,r11
14773 pushq_cfi $__USER32_CS
14774 /*CFI_REL_OFFSET cs,0*/
14775 movl %eax, %eax
14776- pushq_cfi %r10
14777+ pushq_cfi %r11
14778 CFI_REL_OFFSET rip,0
14779 pushq_cfi %rax
14780 cld
14781 SAVE_ARGS 0,1,0
14782+ pax_enter_kernel_user
14783+
14784+#ifdef CONFIG_PAX_RANDKSTACK
14785+ pax_erase_kstack
14786+#endif
14787+
14788+ /*
14789+ * No need to follow this irqs on/off section: the syscall
14790+ * disabled irqs, here we enable it straight after entry:
14791+ */
14792+ ENABLE_INTERRUPTS(CLBR_NONE)
14793 /* no need to do an access_ok check here because rbp has been
14794 32bit zero extended */
14795+
14796+#ifdef CONFIG_PAX_MEMORY_UDEREF
14797+ addq pax_user_shadow_base,%rbp
14798+ ASM_PAX_OPEN_USERLAND
14799+#endif
14800+
14801 ASM_STAC
14802 1: movl (%rbp),%ebp
14803 _ASM_EXTABLE(1b,ia32_badarg)
14804 ASM_CLAC
14805
14806+#ifdef CONFIG_PAX_MEMORY_UDEREF
14807+ ASM_PAX_CLOSE_USERLAND
14808+#endif
14809+
14810 /*
14811 * Sysenter doesn't filter flags, so we need to clear NT
14812 * ourselves. To save a few cycles, we can check whether
14813@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14814 jnz sysenter_fix_flags
14815 sysenter_flags_fixed:
14816
14817- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14818- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14819+ GET_THREAD_INFO(%r11)
14820+ orl $TS_COMPAT,TI_status(%r11)
14821+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14822 CFI_REMEMBER_STATE
14823 jnz sysenter_tracesys
14824 cmpq $(IA32_NR_syscalls-1),%rax
14825@@ -172,15 +218,18 @@ sysenter_do_call:
14826 sysenter_dispatch:
14827 call *ia32_sys_call_table(,%rax,8)
14828 movq %rax,RAX-ARGOFFSET(%rsp)
14829+ GET_THREAD_INFO(%r11)
14830 DISABLE_INTERRUPTS(CLBR_NONE)
14831 TRACE_IRQS_OFF
14832- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14833+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14834 jnz sysexit_audit
14835 sysexit_from_sys_call:
14836- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14837+ pax_exit_kernel_user
14838+ pax_erase_kstack
14839+ andl $~TS_COMPAT,TI_status(%r11)
14840 /* clear IF, that popfq doesn't enable interrupts early */
14841- andl $~0x200,EFLAGS-R11(%rsp)
14842- movl RIP-R11(%rsp),%edx /* User %eip */
14843+ andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14844+ movl RIP(%rsp),%edx /* User %eip */
14845 CFI_REGISTER rip,rdx
14846 RESTORE_ARGS 0,24,0,0,0,0
14847 xorq %r8,%r8
14848@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14849 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14850 movl %eax,%edi /* 1st arg: syscall number */
14851 call __audit_syscall_entry
14852+
14853+ pax_erase_kstack
14854+
14855 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14856 cmpq $(IA32_NR_syscalls-1),%rax
14857 ja ia32_badsys
14858@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14859 .endm
14860
14861 .macro auditsys_exit exit
14862- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14863+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14864 jnz ia32_ret_from_sys_call
14865 TRACE_IRQS_ON
14866 ENABLE_INTERRUPTS(CLBR_NONE)
14867@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14868 1: setbe %al /* 1 if error, 0 if not */
14869 movzbl %al,%edi /* zero-extend that into %edi */
14870 call __audit_syscall_exit
14871+ GET_THREAD_INFO(%r11)
14872 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14873 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14874 DISABLE_INTERRUPTS(CLBR_NONE)
14875 TRACE_IRQS_OFF
14876- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14877+ testl %edi,TI_flags(%r11)
14878 jz \exit
14879 CLEAR_RREGS -ARGOFFSET
14880 jmp int_with_check
14881@@ -253,7 +306,7 @@ sysenter_fix_flags:
14882
14883 sysenter_tracesys:
14884 #ifdef CONFIG_AUDITSYSCALL
14885- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14886+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14887 jz sysenter_auditsys
14888 #endif
14889 SAVE_REST
14890@@ -265,6 +318,9 @@ sysenter_tracesys:
14891 RESTORE_REST
14892 cmpq $(IA32_NR_syscalls-1),%rax
14893 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14894+
14895+ pax_erase_kstack
14896+
14897 jmp sysenter_do_call
14898 CFI_ENDPROC
14899 ENDPROC(ia32_sysenter_target)
14900@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14901 ENTRY(ia32_cstar_target)
14902 CFI_STARTPROC32 simple
14903 CFI_SIGNAL_FRAME
14904- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14905+ CFI_DEF_CFA rsp,0
14906 CFI_REGISTER rip,rcx
14907 /*CFI_REGISTER rflags,r11*/
14908 SWAPGS_UNSAFE_STACK
14909 movl %esp,%r8d
14910 CFI_REGISTER rsp,r8
14911 movq PER_CPU_VAR(kernel_stack),%rsp
14912+ SAVE_ARGS 8*6,0,0
14913+ pax_enter_kernel_user
14914+
14915+#ifdef CONFIG_PAX_RANDKSTACK
14916+ pax_erase_kstack
14917+#endif
14918+
14919 /*
14920 * No need to follow this irqs on/off section: the syscall
14921 * disabled irqs and here we enable it straight after entry:
14922 */
14923 ENABLE_INTERRUPTS(CLBR_NONE)
14924- SAVE_ARGS 8,0,0
14925 movl %eax,%eax /* zero extension */
14926 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14927 movq %rcx,RIP-ARGOFFSET(%rsp)
14928@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14929 /* no need to do an access_ok check here because r8 has been
14930 32bit zero extended */
14931 /* hardware stack frame is complete now */
14932+
14933+#ifdef CONFIG_PAX_MEMORY_UDEREF
14934+ ASM_PAX_OPEN_USERLAND
14935+ movq pax_user_shadow_base,%r8
14936+ addq RSP-ARGOFFSET(%rsp),%r8
14937+#endif
14938+
14939 ASM_STAC
14940 1: movl (%r8),%r9d
14941 _ASM_EXTABLE(1b,ia32_badarg)
14942 ASM_CLAC
14943- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14944- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14945+
14946+#ifdef CONFIG_PAX_MEMORY_UDEREF
14947+ ASM_PAX_CLOSE_USERLAND
14948+#endif
14949+
14950+ GET_THREAD_INFO(%r11)
14951+ orl $TS_COMPAT,TI_status(%r11)
14952+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14953 CFI_REMEMBER_STATE
14954 jnz cstar_tracesys
14955 cmpq $IA32_NR_syscalls-1,%rax
14956@@ -335,13 +410,16 @@ cstar_do_call:
14957 cstar_dispatch:
14958 call *ia32_sys_call_table(,%rax,8)
14959 movq %rax,RAX-ARGOFFSET(%rsp)
14960+ GET_THREAD_INFO(%r11)
14961 DISABLE_INTERRUPTS(CLBR_NONE)
14962 TRACE_IRQS_OFF
14963- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14964+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14965 jnz sysretl_audit
14966 sysretl_from_sys_call:
14967- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14968- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14969+ pax_exit_kernel_user
14970+ pax_erase_kstack
14971+ andl $~TS_COMPAT,TI_status(%r11)
14972+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14973 movl RIP-ARGOFFSET(%rsp),%ecx
14974 CFI_REGISTER rip,rcx
14975 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14976@@ -368,7 +446,7 @@ sysretl_audit:
14977
14978 cstar_tracesys:
14979 #ifdef CONFIG_AUDITSYSCALL
14980- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14981+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14982 jz cstar_auditsys
14983 #endif
14984 xchgl %r9d,%ebp
14985@@ -382,11 +460,19 @@ cstar_tracesys:
14986 xchgl %ebp,%r9d
14987 cmpq $(IA32_NR_syscalls-1),%rax
14988 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14989+
14990+ pax_erase_kstack
14991+
14992 jmp cstar_do_call
14993 END(ia32_cstar_target)
14994
14995 ia32_badarg:
14996 ASM_CLAC
14997+
14998+#ifdef CONFIG_PAX_MEMORY_UDEREF
14999+ ASM_PAX_CLOSE_USERLAND
15000+#endif
15001+
15002 movq $-EFAULT,%rax
15003 jmp ia32_sysret
15004 CFI_ENDPROC
15005@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15006 CFI_REL_OFFSET rip,RIP-RIP
15007 PARAVIRT_ADJUST_EXCEPTION_FRAME
15008 SWAPGS
15009- /*
15010- * No need to follow this irqs on/off section: the syscall
15011- * disabled irqs and here we enable it straight after entry:
15012- */
15013- ENABLE_INTERRUPTS(CLBR_NONE)
15014 movl %eax,%eax
15015 pushq_cfi %rax
15016 cld
15017 /* note the registers are not zero extended to the sf.
15018 this could be a problem. */
15019 SAVE_ARGS 0,1,0
15020- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15021- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15022+ pax_enter_kernel_user
15023+
15024+#ifdef CONFIG_PAX_RANDKSTACK
15025+ pax_erase_kstack
15026+#endif
15027+
15028+ /*
15029+ * No need to follow this irqs on/off section: the syscall
15030+ * disabled irqs and here we enable it straight after entry:
15031+ */
15032+ ENABLE_INTERRUPTS(CLBR_NONE)
15033+ GET_THREAD_INFO(%r11)
15034+ orl $TS_COMPAT,TI_status(%r11)
15035+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15036 jnz ia32_tracesys
15037 cmpq $(IA32_NR_syscalls-1),%rax
15038 ja ia32_badsys
15039@@ -458,6 +551,9 @@ ia32_tracesys:
15040 RESTORE_REST
15041 cmpq $(IA32_NR_syscalls-1),%rax
15042 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15043+
15044+ pax_erase_kstack
15045+
15046 jmp ia32_do_call
15047 END(ia32_syscall)
15048
15049diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15050index 8e0ceec..af13504 100644
15051--- a/arch/x86/ia32/sys_ia32.c
15052+++ b/arch/x86/ia32/sys_ia32.c
15053@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15054 */
15055 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15056 {
15057- typeof(ubuf->st_uid) uid = 0;
15058- typeof(ubuf->st_gid) gid = 0;
15059+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15060+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15061 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15062 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15063 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15064diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15065index 372231c..51b537d 100644
15066--- a/arch/x86/include/asm/alternative-asm.h
15067+++ b/arch/x86/include/asm/alternative-asm.h
15068@@ -18,6 +18,45 @@
15069 .endm
15070 #endif
15071
15072+#ifdef KERNEXEC_PLUGIN
15073+ .macro pax_force_retaddr_bts rip=0
15074+ btsq $63,\rip(%rsp)
15075+ .endm
15076+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15077+ .macro pax_force_retaddr rip=0, reload=0
15078+ btsq $63,\rip(%rsp)
15079+ .endm
15080+ .macro pax_force_fptr ptr
15081+ btsq $63,\ptr
15082+ .endm
15083+ .macro pax_set_fptr_mask
15084+ .endm
15085+#endif
15086+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15087+ .macro pax_force_retaddr rip=0, reload=0
15088+ .if \reload
15089+ pax_set_fptr_mask
15090+ .endif
15091+ orq %r12,\rip(%rsp)
15092+ .endm
15093+ .macro pax_force_fptr ptr
15094+ orq %r12,\ptr
15095+ .endm
15096+ .macro pax_set_fptr_mask
15097+ movabs $0x8000000000000000,%r12
15098+ .endm
15099+#endif
15100+#else
15101+ .macro pax_force_retaddr rip=0, reload=0
15102+ .endm
15103+ .macro pax_force_fptr ptr
15104+ .endm
15105+ .macro pax_force_retaddr_bts rip=0
15106+ .endm
15107+ .macro pax_set_fptr_mask
15108+ .endm
15109+#endif
15110+
15111 .macro altinstruction_entry orig alt feature orig_len alt_len
15112 .long \orig - .
15113 .long \alt - .
15114diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15115index 473bdbe..b1e3377 100644
15116--- a/arch/x86/include/asm/alternative.h
15117+++ b/arch/x86/include/asm/alternative.h
15118@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15119 ".pushsection .discard,\"aw\",@progbits\n" \
15120 DISCARD_ENTRY(1) \
15121 ".popsection\n" \
15122- ".pushsection .altinstr_replacement, \"ax\"\n" \
15123+ ".pushsection .altinstr_replacement, \"a\"\n" \
15124 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15125 ".popsection"
15126
15127@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15128 DISCARD_ENTRY(1) \
15129 DISCARD_ENTRY(2) \
15130 ".popsection\n" \
15131- ".pushsection .altinstr_replacement, \"ax\"\n" \
15132+ ".pushsection .altinstr_replacement, \"a\"\n" \
15133 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15134 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15135 ".popsection"
15136diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15137index 465b309..ab7e51f 100644
15138--- a/arch/x86/include/asm/apic.h
15139+++ b/arch/x86/include/asm/apic.h
15140@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15141
15142 #ifdef CONFIG_X86_LOCAL_APIC
15143
15144-extern unsigned int apic_verbosity;
15145+extern int apic_verbosity;
15146 extern int local_apic_timer_c2_ok;
15147
15148 extern int disable_apic;
15149diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15150index 20370c6..a2eb9b0 100644
15151--- a/arch/x86/include/asm/apm.h
15152+++ b/arch/x86/include/asm/apm.h
15153@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15154 __asm__ __volatile__(APM_DO_ZERO_SEGS
15155 "pushl %%edi\n\t"
15156 "pushl %%ebp\n\t"
15157- "lcall *%%cs:apm_bios_entry\n\t"
15158+ "lcall *%%ss:apm_bios_entry\n\t"
15159 "setc %%al\n\t"
15160 "popl %%ebp\n\t"
15161 "popl %%edi\n\t"
15162@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15163 __asm__ __volatile__(APM_DO_ZERO_SEGS
15164 "pushl %%edi\n\t"
15165 "pushl %%ebp\n\t"
15166- "lcall *%%cs:apm_bios_entry\n\t"
15167+ "lcall *%%ss:apm_bios_entry\n\t"
15168 "setc %%bl\n\t"
15169 "popl %%ebp\n\t"
15170 "popl %%edi\n\t"
15171diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15172index 5e5cd12..3d18208 100644
15173--- a/arch/x86/include/asm/atomic.h
15174+++ b/arch/x86/include/asm/atomic.h
15175@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15176 }
15177
15178 /**
15179+ * atomic_read_unchecked - read atomic variable
15180+ * @v: pointer of type atomic_unchecked_t
15181+ *
15182+ * Atomically reads the value of @v.
15183+ */
15184+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15185+{
15186+ return ACCESS_ONCE((v)->counter);
15187+}
15188+
15189+/**
15190 * atomic_set - set atomic variable
15191 * @v: pointer of type atomic_t
15192 * @i: required value
15193@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15194 }
15195
15196 /**
15197+ * atomic_set_unchecked - set atomic variable
15198+ * @v: pointer of type atomic_unchecked_t
15199+ * @i: required value
15200+ *
15201+ * Atomically sets the value of @v to @i.
15202+ */
15203+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15204+{
15205+ v->counter = i;
15206+}
15207+
15208+/**
15209 * atomic_add - add integer to atomic variable
15210 * @i: integer value to add
15211 * @v: pointer of type atomic_t
15212@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15213 */
15214 static inline void atomic_add(int i, atomic_t *v)
15215 {
15216- asm volatile(LOCK_PREFIX "addl %1,%0"
15217+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15218+
15219+#ifdef CONFIG_PAX_REFCOUNT
15220+ "jno 0f\n"
15221+ LOCK_PREFIX "subl %1,%0\n"
15222+ "int $4\n0:\n"
15223+ _ASM_EXTABLE(0b, 0b)
15224+#endif
15225+
15226+ : "+m" (v->counter)
15227+ : "ir" (i));
15228+}
15229+
15230+/**
15231+ * atomic_add_unchecked - add integer to atomic variable
15232+ * @i: integer value to add
15233+ * @v: pointer of type atomic_unchecked_t
15234+ *
15235+ * Atomically adds @i to @v.
15236+ */
15237+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15238+{
15239+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15240 : "+m" (v->counter)
15241 : "ir" (i));
15242 }
15243@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15244 */
15245 static inline void atomic_sub(int i, atomic_t *v)
15246 {
15247- asm volatile(LOCK_PREFIX "subl %1,%0"
15248+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15249+
15250+#ifdef CONFIG_PAX_REFCOUNT
15251+ "jno 0f\n"
15252+ LOCK_PREFIX "addl %1,%0\n"
15253+ "int $4\n0:\n"
15254+ _ASM_EXTABLE(0b, 0b)
15255+#endif
15256+
15257+ : "+m" (v->counter)
15258+ : "ir" (i));
15259+}
15260+
15261+/**
15262+ * atomic_sub_unchecked - subtract integer from atomic variable
15263+ * @i: integer value to subtract
15264+ * @v: pointer of type atomic_unchecked_t
15265+ *
15266+ * Atomically subtracts @i from @v.
15267+ */
15268+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15269+{
15270+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15271 : "+m" (v->counter)
15272 : "ir" (i));
15273 }
15274@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15275 */
15276 static inline int atomic_sub_and_test(int i, atomic_t *v)
15277 {
15278- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15279+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15280 }
15281
15282 /**
15283@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15284 */
15285 static inline void atomic_inc(atomic_t *v)
15286 {
15287- asm volatile(LOCK_PREFIX "incl %0"
15288+ asm volatile(LOCK_PREFIX "incl %0\n"
15289+
15290+#ifdef CONFIG_PAX_REFCOUNT
15291+ "jno 0f\n"
15292+ LOCK_PREFIX "decl %0\n"
15293+ "int $4\n0:\n"
15294+ _ASM_EXTABLE(0b, 0b)
15295+#endif
15296+
15297+ : "+m" (v->counter));
15298+}
15299+
15300+/**
15301+ * atomic_inc_unchecked - increment atomic variable
15302+ * @v: pointer of type atomic_unchecked_t
15303+ *
15304+ * Atomically increments @v by 1.
15305+ */
15306+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15307+{
15308+ asm volatile(LOCK_PREFIX "incl %0\n"
15309 : "+m" (v->counter));
15310 }
15311
15312@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15313 */
15314 static inline void atomic_dec(atomic_t *v)
15315 {
15316- asm volatile(LOCK_PREFIX "decl %0"
15317+ asm volatile(LOCK_PREFIX "decl %0\n"
15318+
15319+#ifdef CONFIG_PAX_REFCOUNT
15320+ "jno 0f\n"
15321+ LOCK_PREFIX "incl %0\n"
15322+ "int $4\n0:\n"
15323+ _ASM_EXTABLE(0b, 0b)
15324+#endif
15325+
15326+ : "+m" (v->counter));
15327+}
15328+
15329+/**
15330+ * atomic_dec_unchecked - decrement atomic variable
15331+ * @v: pointer of type atomic_unchecked_t
15332+ *
15333+ * Atomically decrements @v by 1.
15334+ */
15335+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15336+{
15337+ asm volatile(LOCK_PREFIX "decl %0\n"
15338 : "+m" (v->counter));
15339 }
15340
15341@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15342 */
15343 static inline int atomic_dec_and_test(atomic_t *v)
15344 {
15345- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15346+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15347 }
15348
15349 /**
15350@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15351 */
15352 static inline int atomic_inc_and_test(atomic_t *v)
15353 {
15354- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15355+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15356+}
15357+
15358+/**
15359+ * atomic_inc_and_test_unchecked - increment and test
15360+ * @v: pointer of type atomic_unchecked_t
15361+ *
15362+ * Atomically increments @v by 1
15363+ * and returns true if the result is zero, or false for all
15364+ * other cases.
15365+ */
15366+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15367+{
15368+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15369 }
15370
15371 /**
15372@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15373 */
15374 static inline int atomic_add_negative(int i, atomic_t *v)
15375 {
15376- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15377+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15378 }
15379
15380 /**
15381@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15382 *
15383 * Atomically adds @i to @v and returns @i + @v
15384 */
15385-static inline int atomic_add_return(int i, atomic_t *v)
15386+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15387+{
15388+ return i + xadd_check_overflow(&v->counter, i);
15389+}
15390+
15391+/**
15392+ * atomic_add_return_unchecked - add integer and return
15393+ * @i: integer value to add
15394+ * @v: pointer of type atomic_unchecked_t
15395+ *
15396+ * Atomically adds @i to @v and returns @i + @v
15397+ */
15398+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15399 {
15400 return i + xadd(&v->counter, i);
15401 }
15402@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15403 *
15404 * Atomically subtracts @i from @v and returns @v - @i
15405 */
15406-static inline int atomic_sub_return(int i, atomic_t *v)
15407+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15408 {
15409 return atomic_add_return(-i, v);
15410 }
15411
15412 #define atomic_inc_return(v) (atomic_add_return(1, v))
15413+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15414+{
15415+ return atomic_add_return_unchecked(1, v);
15416+}
15417 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15418
15419-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15420+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15421+{
15422+ return cmpxchg(&v->counter, old, new);
15423+}
15424+
15425+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15426 {
15427 return cmpxchg(&v->counter, old, new);
15428 }
15429@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15430 return xchg(&v->counter, new);
15431 }
15432
15433+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15434+{
15435+ return xchg(&v->counter, new);
15436+}
15437+
15438 /**
15439 * __atomic_add_unless - add unless the number is already a given value
15440 * @v: pointer of type atomic_t
15441@@ -191,14 +337,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15442 * Atomically adds @a to @v, so long as @v was not already @u.
15443 * Returns the old value of @v.
15444 */
15445-static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15446+static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15447 {
15448- int c, old;
15449+ int c, old, new;
15450 c = atomic_read(v);
15451 for (;;) {
15452- if (unlikely(c == (u)))
15453+ if (unlikely(c == u))
15454 break;
15455- old = atomic_cmpxchg((v), c, c + (a));
15456+
15457+ asm volatile("addl %2,%0\n"
15458+
15459+#ifdef CONFIG_PAX_REFCOUNT
15460+ "jno 0f\n"
15461+ "subl %2,%0\n"
15462+ "int $4\n0:\n"
15463+ _ASM_EXTABLE(0b, 0b)
15464+#endif
15465+
15466+ : "=r" (new)
15467+ : "0" (c), "ir" (a));
15468+
15469+ old = atomic_cmpxchg(v, c, new);
15470 if (likely(old == c))
15471 break;
15472 c = old;
15473@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15474 }
15475
15476 /**
15477+ * atomic_inc_not_zero_hint - increment if not null
15478+ * @v: pointer of type atomic_t
15479+ * @hint: probable value of the atomic before the increment
15480+ *
15481+ * This version of atomic_inc_not_zero() gives a hint of probable
15482+ * value of the atomic. This helps processor to not read the memory
15483+ * before doing the atomic read/modify/write cycle, lowering
15484+ * number of bus transactions on some arches.
15485+ *
15486+ * Returns: 0 if increment was not done, 1 otherwise.
15487+ */
15488+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15489+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15490+{
15491+ int val, c = hint, new;
15492+
15493+ /* sanity test, should be removed by compiler if hint is a constant */
15494+ if (!hint)
15495+ return __atomic_add_unless(v, 1, 0);
15496+
15497+ do {
15498+ asm volatile("incl %0\n"
15499+
15500+#ifdef CONFIG_PAX_REFCOUNT
15501+ "jno 0f\n"
15502+ "decl %0\n"
15503+ "int $4\n0:\n"
15504+ _ASM_EXTABLE(0b, 0b)
15505+#endif
15506+
15507+ : "=r" (new)
15508+ : "0" (c));
15509+
15510+ val = atomic_cmpxchg(v, c, new);
15511+ if (val == c)
15512+ return 1;
15513+ c = val;
15514+ } while (c);
15515+
15516+ return 0;
15517+}
15518+
15519+/**
15520 * atomic_inc_short - increment of a short integer
15521 * @v: pointer to type int
15522 *
15523@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15524 }
15525
15526 /* These are x86-specific, used by some header files */
15527-#define atomic_clear_mask(mask, addr) \
15528- asm volatile(LOCK_PREFIX "andl %0,%1" \
15529- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15530+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15531+{
15532+ asm volatile(LOCK_PREFIX "andl %1,%0"
15533+ : "+m" (v->counter)
15534+ : "r" (~(mask))
15535+ : "memory");
15536+}
15537
15538-#define atomic_set_mask(mask, addr) \
15539- asm volatile(LOCK_PREFIX "orl %0,%1" \
15540- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15541- : "memory")
15542+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15543+{
15544+ asm volatile(LOCK_PREFIX "andl %1,%0"
15545+ : "+m" (v->counter)
15546+ : "r" (~(mask))
15547+ : "memory");
15548+}
15549+
15550+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15551+{
15552+ asm volatile(LOCK_PREFIX "orl %1,%0"
15553+ : "+m" (v->counter)
15554+ : "r" (mask)
15555+ : "memory");
15556+}
15557+
15558+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15559+{
15560+ asm volatile(LOCK_PREFIX "orl %1,%0"
15561+ : "+m" (v->counter)
15562+ : "r" (mask)
15563+ : "memory");
15564+}
15565
15566 #ifdef CONFIG_X86_32
15567 # include <asm/atomic64_32.h>
15568diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15569index b154de7..bf18a5a 100644
15570--- a/arch/x86/include/asm/atomic64_32.h
15571+++ b/arch/x86/include/asm/atomic64_32.h
15572@@ -12,6 +12,14 @@ typedef struct {
15573 u64 __aligned(8) counter;
15574 } atomic64_t;
15575
15576+#ifdef CONFIG_PAX_REFCOUNT
15577+typedef struct {
15578+ u64 __aligned(8) counter;
15579+} atomic64_unchecked_t;
15580+#else
15581+typedef atomic64_t atomic64_unchecked_t;
15582+#endif
15583+
15584 #define ATOMIC64_INIT(val) { (val) }
15585
15586 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15587@@ -37,21 +45,31 @@ typedef struct {
15588 ATOMIC64_DECL_ONE(sym##_386)
15589
15590 ATOMIC64_DECL_ONE(add_386);
15591+ATOMIC64_DECL_ONE(add_unchecked_386);
15592 ATOMIC64_DECL_ONE(sub_386);
15593+ATOMIC64_DECL_ONE(sub_unchecked_386);
15594 ATOMIC64_DECL_ONE(inc_386);
15595+ATOMIC64_DECL_ONE(inc_unchecked_386);
15596 ATOMIC64_DECL_ONE(dec_386);
15597+ATOMIC64_DECL_ONE(dec_unchecked_386);
15598 #endif
15599
15600 #define alternative_atomic64(f, out, in...) \
15601 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15602
15603 ATOMIC64_DECL(read);
15604+ATOMIC64_DECL(read_unchecked);
15605 ATOMIC64_DECL(set);
15606+ATOMIC64_DECL(set_unchecked);
15607 ATOMIC64_DECL(xchg);
15608 ATOMIC64_DECL(add_return);
15609+ATOMIC64_DECL(add_return_unchecked);
15610 ATOMIC64_DECL(sub_return);
15611+ATOMIC64_DECL(sub_return_unchecked);
15612 ATOMIC64_DECL(inc_return);
15613+ATOMIC64_DECL(inc_return_unchecked);
15614 ATOMIC64_DECL(dec_return);
15615+ATOMIC64_DECL(dec_return_unchecked);
15616 ATOMIC64_DECL(dec_if_positive);
15617 ATOMIC64_DECL(inc_not_zero);
15618 ATOMIC64_DECL(add_unless);
15619@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15620 }
15621
15622 /**
15623+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15624+ * @p: pointer to type atomic64_unchecked_t
15625+ * @o: expected value
15626+ * @n: new value
15627+ *
15628+ * Atomically sets @v to @n if it was equal to @o and returns
15629+ * the old value.
15630+ */
15631+
15632+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15633+{
15634+ return cmpxchg64(&v->counter, o, n);
15635+}
15636+
15637+/**
15638 * atomic64_xchg - xchg atomic64 variable
15639 * @v: pointer to type atomic64_t
15640 * @n: value to assign
15641@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15642 }
15643
15644 /**
15645+ * atomic64_set_unchecked - set atomic64 variable
15646+ * @v: pointer to type atomic64_unchecked_t
15647+ * @n: value to assign
15648+ *
15649+ * Atomically sets the value of @v to @n.
15650+ */
15651+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15652+{
15653+ unsigned high = (unsigned)(i >> 32);
15654+ unsigned low = (unsigned)i;
15655+ alternative_atomic64(set, /* no output */,
15656+ "S" (v), "b" (low), "c" (high)
15657+ : "eax", "edx", "memory");
15658+}
15659+
15660+/**
15661 * atomic64_read - read atomic64 variable
15662 * @v: pointer to type atomic64_t
15663 *
15664@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15665 }
15666
15667 /**
15668+ * atomic64_read_unchecked - read atomic64 variable
15669+ * @v: pointer to type atomic64_unchecked_t
15670+ *
15671+ * Atomically reads the value of @v and returns it.
15672+ */
15673+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15674+{
15675+ long long r;
15676+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15677+ return r;
15678+ }
15679+
15680+/**
15681 * atomic64_add_return - add and return
15682 * @i: integer value to add
15683 * @v: pointer to type atomic64_t
15684@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15685 return i;
15686 }
15687
15688+/**
15689+ * atomic64_add_return_unchecked - add and return
15690+ * @i: integer value to add
15691+ * @v: pointer to type atomic64_unchecked_t
15692+ *
15693+ * Atomically adds @i to @v and returns @i + *@v
15694+ */
15695+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15696+{
15697+ alternative_atomic64(add_return_unchecked,
15698+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15699+ ASM_NO_INPUT_CLOBBER("memory"));
15700+ return i;
15701+}
15702+
15703 /*
15704 * Other variants with different arithmetic operators:
15705 */
15706@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15707 return a;
15708 }
15709
15710+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15711+{
15712+ long long a;
15713+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15714+ "S" (v) : "memory", "ecx");
15715+ return a;
15716+}
15717+
15718 static inline long long atomic64_dec_return(atomic64_t *v)
15719 {
15720 long long a;
15721@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15722 }
15723
15724 /**
15725+ * atomic64_add_unchecked - add integer to atomic64 variable
15726+ * @i: integer value to add
15727+ * @v: pointer to type atomic64_unchecked_t
15728+ *
15729+ * Atomically adds @i to @v.
15730+ */
15731+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15732+{
15733+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15734+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15735+ ASM_NO_INPUT_CLOBBER("memory"));
15736+ return i;
15737+}
15738+
15739+/**
15740 * atomic64_sub - subtract the atomic64 variable
15741 * @i: integer value to subtract
15742 * @v: pointer to type atomic64_t
15743diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15744index f8d273e..02f39f3 100644
15745--- a/arch/x86/include/asm/atomic64_64.h
15746+++ b/arch/x86/include/asm/atomic64_64.h
15747@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15748 }
15749
15750 /**
15751+ * atomic64_read_unchecked - read atomic64 variable
15752+ * @v: pointer of type atomic64_unchecked_t
15753+ *
15754+ * Atomically reads the value of @v.
15755+ * Doesn't imply a read memory barrier.
15756+ */
15757+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15758+{
15759+ return ACCESS_ONCE((v)->counter);
15760+}
15761+
15762+/**
15763 * atomic64_set - set atomic64 variable
15764 * @v: pointer to type atomic64_t
15765 * @i: required value
15766@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15767 }
15768
15769 /**
15770+ * atomic64_set_unchecked - set atomic64 variable
15771+ * @v: pointer to type atomic64_unchecked_t
15772+ * @i: required value
15773+ *
15774+ * Atomically sets the value of @v to @i.
15775+ */
15776+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15777+{
15778+ v->counter = i;
15779+}
15780+
15781+/**
15782 * atomic64_add - add integer to atomic64 variable
15783 * @i: integer value to add
15784 * @v: pointer to type atomic64_t
15785@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15786 */
15787 static inline void atomic64_add(long i, atomic64_t *v)
15788 {
15789+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15790+
15791+#ifdef CONFIG_PAX_REFCOUNT
15792+ "jno 0f\n"
15793+ LOCK_PREFIX "subq %1,%0\n"
15794+ "int $4\n0:\n"
15795+ _ASM_EXTABLE(0b, 0b)
15796+#endif
15797+
15798+ : "=m" (v->counter)
15799+ : "er" (i), "m" (v->counter));
15800+}
15801+
15802+/**
15803+ * atomic64_add_unchecked - add integer to atomic64 variable
15804+ * @i: integer value to add
15805+ * @v: pointer to type atomic64_unchecked_t
15806+ *
15807+ * Atomically adds @i to @v.
15808+ */
15809+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15810+{
15811 asm volatile(LOCK_PREFIX "addq %1,%0"
15812 : "=m" (v->counter)
15813 : "er" (i), "m" (v->counter));
15814@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15815 */
15816 static inline void atomic64_sub(long i, atomic64_t *v)
15817 {
15818- asm volatile(LOCK_PREFIX "subq %1,%0"
15819+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15820+
15821+#ifdef CONFIG_PAX_REFCOUNT
15822+ "jno 0f\n"
15823+ LOCK_PREFIX "addq %1,%0\n"
15824+ "int $4\n0:\n"
15825+ _ASM_EXTABLE(0b, 0b)
15826+#endif
15827+
15828+ : "=m" (v->counter)
15829+ : "er" (i), "m" (v->counter));
15830+}
15831+
15832+/**
15833+ * atomic64_sub_unchecked - subtract the atomic64 variable
15834+ * @i: integer value to subtract
15835+ * @v: pointer to type atomic64_unchecked_t
15836+ *
15837+ * Atomically subtracts @i from @v.
15838+ */
15839+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15840+{
15841+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15842 : "=m" (v->counter)
15843 : "er" (i), "m" (v->counter));
15844 }
15845@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15846 */
15847 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15848 {
15849- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15850+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15851 }
15852
15853 /**
15854@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15855 */
15856 static inline void atomic64_inc(atomic64_t *v)
15857 {
15858+ asm volatile(LOCK_PREFIX "incq %0\n"
15859+
15860+#ifdef CONFIG_PAX_REFCOUNT
15861+ "jno 0f\n"
15862+ LOCK_PREFIX "decq %0\n"
15863+ "int $4\n0:\n"
15864+ _ASM_EXTABLE(0b, 0b)
15865+#endif
15866+
15867+ : "=m" (v->counter)
15868+ : "m" (v->counter));
15869+}
15870+
15871+/**
15872+ * atomic64_inc_unchecked - increment atomic64 variable
15873+ * @v: pointer to type atomic64_unchecked_t
15874+ *
15875+ * Atomically increments @v by 1.
15876+ */
15877+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15878+{
15879 asm volatile(LOCK_PREFIX "incq %0"
15880 : "=m" (v->counter)
15881 : "m" (v->counter));
15882@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15883 */
15884 static inline void atomic64_dec(atomic64_t *v)
15885 {
15886- asm volatile(LOCK_PREFIX "decq %0"
15887+ asm volatile(LOCK_PREFIX "decq %0\n"
15888+
15889+#ifdef CONFIG_PAX_REFCOUNT
15890+ "jno 0f\n"
15891+ LOCK_PREFIX "incq %0\n"
15892+ "int $4\n0:\n"
15893+ _ASM_EXTABLE(0b, 0b)
15894+#endif
15895+
15896+ : "=m" (v->counter)
15897+ : "m" (v->counter));
15898+}
15899+
15900+/**
15901+ * atomic64_dec_unchecked - decrement atomic64 variable
15902+ * @v: pointer to type atomic64_t
15903+ *
15904+ * Atomically decrements @v by 1.
15905+ */
15906+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15907+{
15908+ asm volatile(LOCK_PREFIX "decq %0\n"
15909 : "=m" (v->counter)
15910 : "m" (v->counter));
15911 }
15912@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15913 */
15914 static inline int atomic64_dec_and_test(atomic64_t *v)
15915 {
15916- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15917+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15918 }
15919
15920 /**
15921@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15922 */
15923 static inline int atomic64_inc_and_test(atomic64_t *v)
15924 {
15925- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15926+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15927 }
15928
15929 /**
15930@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15931 */
15932 static inline int atomic64_add_negative(long i, atomic64_t *v)
15933 {
15934- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15935+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15936 }
15937
15938 /**
15939@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15940 */
15941 static inline long atomic64_add_return(long i, atomic64_t *v)
15942 {
15943+ return i + xadd_check_overflow(&v->counter, i);
15944+}
15945+
15946+/**
15947+ * atomic64_add_return_unchecked - add and return
15948+ * @i: integer value to add
15949+ * @v: pointer to type atomic64_unchecked_t
15950+ *
15951+ * Atomically adds @i to @v and returns @i + @v
15952+ */
15953+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15954+{
15955 return i + xadd(&v->counter, i);
15956 }
15957
15958@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15959 }
15960
15961 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15962+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15963+{
15964+ return atomic64_add_return_unchecked(1, v);
15965+}
15966 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15967
15968 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15969@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15970 return cmpxchg(&v->counter, old, new);
15971 }
15972
15973+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15974+{
15975+ return cmpxchg(&v->counter, old, new);
15976+}
15977+
15978 static inline long atomic64_xchg(atomic64_t *v, long new)
15979 {
15980 return xchg(&v->counter, new);
15981@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15982 */
15983 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15984 {
15985- long c, old;
15986+ long c, old, new;
15987 c = atomic64_read(v);
15988 for (;;) {
15989- if (unlikely(c == (u)))
15990+ if (unlikely(c == u))
15991 break;
15992- old = atomic64_cmpxchg((v), c, c + (a));
15993+
15994+ asm volatile("add %2,%0\n"
15995+
15996+#ifdef CONFIG_PAX_REFCOUNT
15997+ "jno 0f\n"
15998+ "sub %2,%0\n"
15999+ "int $4\n0:\n"
16000+ _ASM_EXTABLE(0b, 0b)
16001+#endif
16002+
16003+ : "=r" (new)
16004+ : "0" (c), "ir" (a));
16005+
16006+ old = atomic64_cmpxchg(v, c, new);
16007 if (likely(old == c))
16008 break;
16009 c = old;
16010 }
16011- return c != (u);
16012+ return c != u;
16013 }
16014
16015 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16016diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16017index 0f4460b..fa1ee19 100644
16018--- a/arch/x86/include/asm/barrier.h
16019+++ b/arch/x86/include/asm/barrier.h
16020@@ -107,7 +107,7 @@
16021 do { \
16022 compiletime_assert_atomic_type(*p); \
16023 smp_mb(); \
16024- ACCESS_ONCE(*p) = (v); \
16025+ ACCESS_ONCE_RW(*p) = (v); \
16026 } while (0)
16027
16028 #define smp_load_acquire(p) \
16029@@ -124,7 +124,7 @@ do { \
16030 do { \
16031 compiletime_assert_atomic_type(*p); \
16032 barrier(); \
16033- ACCESS_ONCE(*p) = (v); \
16034+ ACCESS_ONCE_RW(*p) = (v); \
16035 } while (0)
16036
16037 #define smp_load_acquire(p) \
16038diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16039index cfe3b95..d01b118 100644
16040--- a/arch/x86/include/asm/bitops.h
16041+++ b/arch/x86/include/asm/bitops.h
16042@@ -50,7 +50,7 @@
16043 * a mask operation on a byte.
16044 */
16045 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16046-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16047+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16048 #define CONST_MASK(nr) (1 << ((nr) & 7))
16049
16050 /**
16051@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16052 */
16053 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16054 {
16055- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16056+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16057 }
16058
16059 /**
16060@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16061 */
16062 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16063 {
16064- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16065+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16066 }
16067
16068 /**
16069@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16070 */
16071 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16072 {
16073- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16074+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16075 }
16076
16077 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16078@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16079 *
16080 * Undefined if no bit exists, so code should check against 0 first.
16081 */
16082-static inline unsigned long __ffs(unsigned long word)
16083+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16084 {
16085 asm("rep; bsf %1,%0"
16086 : "=r" (word)
16087@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16088 *
16089 * Undefined if no zero exists, so code should check against ~0UL first.
16090 */
16091-static inline unsigned long ffz(unsigned long word)
16092+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16093 {
16094 asm("rep; bsf %1,%0"
16095 : "=r" (word)
16096@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16097 *
16098 * Undefined if no set bit exists, so code should check against 0 first.
16099 */
16100-static inline unsigned long __fls(unsigned long word)
16101+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16102 {
16103 asm("bsr %1,%0"
16104 : "=r" (word)
16105@@ -434,7 +434,7 @@ static inline int ffs(int x)
16106 * set bit if value is nonzero. The last (most significant) bit is
16107 * at position 32.
16108 */
16109-static inline int fls(int x)
16110+static inline int __intentional_overflow(-1) fls(int x)
16111 {
16112 int r;
16113
16114@@ -476,7 +476,7 @@ static inline int fls(int x)
16115 * at position 64.
16116 */
16117 #ifdef CONFIG_X86_64
16118-static __always_inline int fls64(__u64 x)
16119+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16120 {
16121 int bitpos = -1;
16122 /*
16123diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16124index 4fa687a..60f2d39 100644
16125--- a/arch/x86/include/asm/boot.h
16126+++ b/arch/x86/include/asm/boot.h
16127@@ -6,10 +6,15 @@
16128 #include <uapi/asm/boot.h>
16129
16130 /* Physical address where kernel should be loaded. */
16131-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16132+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16133 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16134 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16135
16136+#ifndef __ASSEMBLY__
16137+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16138+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16139+#endif
16140+
16141 /* Minimum kernel alignment, as a power of two */
16142 #ifdef CONFIG_X86_64
16143 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16144diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16145index 48f99f1..d78ebf9 100644
16146--- a/arch/x86/include/asm/cache.h
16147+++ b/arch/x86/include/asm/cache.h
16148@@ -5,12 +5,13 @@
16149
16150 /* L1 cache line size */
16151 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16152-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16153+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16154
16155 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16156+#define __read_only __attribute__((__section__(".data..read_only")))
16157
16158 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16159-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16160+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16161
16162 #ifdef CONFIG_X86_VSMP
16163 #ifdef CONFIG_SMP
16164diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
16165index 9863ee3..4a1f8e1 100644
16166--- a/arch/x86/include/asm/cacheflush.h
16167+++ b/arch/x86/include/asm/cacheflush.h
16168@@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
16169 unsigned long pg_flags = pg->flags & _PGMT_MASK;
16170
16171 if (pg_flags == _PGMT_DEFAULT)
16172- return -1;
16173+ return ~0UL;
16174 else if (pg_flags == _PGMT_WC)
16175 return _PAGE_CACHE_WC;
16176 else if (pg_flags == _PGMT_UC_MINUS)
16177diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16178index 76659b6..72b8439 100644
16179--- a/arch/x86/include/asm/calling.h
16180+++ b/arch/x86/include/asm/calling.h
16181@@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16182 #define RSP 152
16183 #define SS 160
16184
16185-#define ARGOFFSET R11
16186-#define SWFRAME ORIG_RAX
16187+#define ARGOFFSET R15
16188
16189 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16190- subq $9*8+\addskip, %rsp
16191- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16192- movq_cfi rdi, 8*8
16193- movq_cfi rsi, 7*8
16194- movq_cfi rdx, 6*8
16195+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16196+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16197+ movq_cfi rdi, RDI
16198+ movq_cfi rsi, RSI
16199+ movq_cfi rdx, RDX
16200
16201 .if \save_rcx
16202- movq_cfi rcx, 5*8
16203+ movq_cfi rcx, RCX
16204 .endif
16205
16206 .if \rax_enosys
16207- movq $-ENOSYS, 4*8(%rsp)
16208+ movq $-ENOSYS, RAX(%rsp)
16209 .else
16210- movq_cfi rax, 4*8
16211+ movq_cfi rax, RAX
16212 .endif
16213
16214 .if \save_r891011
16215- movq_cfi r8, 3*8
16216- movq_cfi r9, 2*8
16217- movq_cfi r10, 1*8
16218- movq_cfi r11, 0*8
16219+ movq_cfi r8, R8
16220+ movq_cfi r9, R9
16221+ movq_cfi r10, R10
16222+ movq_cfi r11, R11
16223 .endif
16224
16225+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16226+ movq_cfi r12, R12
16227+#endif
16228+
16229 .endm
16230
16231-#define ARG_SKIP (9*8)
16232+#define ARG_SKIP ORIG_RAX
16233
16234 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16235 rstor_r8910=1, rstor_rdx=1
16236+
16237+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16238+ movq_cfi_restore R12, r12
16239+#endif
16240+
16241 .if \rstor_r11
16242- movq_cfi_restore 0*8, r11
16243+ movq_cfi_restore R11, r11
16244 .endif
16245
16246 .if \rstor_r8910
16247- movq_cfi_restore 1*8, r10
16248- movq_cfi_restore 2*8, r9
16249- movq_cfi_restore 3*8, r8
16250+ movq_cfi_restore R10, r10
16251+ movq_cfi_restore R9, r9
16252+ movq_cfi_restore R8, r8
16253 .endif
16254
16255 .if \rstor_rax
16256- movq_cfi_restore 4*8, rax
16257+ movq_cfi_restore RAX, rax
16258 .endif
16259
16260 .if \rstor_rcx
16261- movq_cfi_restore 5*8, rcx
16262+ movq_cfi_restore RCX, rcx
16263 .endif
16264
16265 .if \rstor_rdx
16266- movq_cfi_restore 6*8, rdx
16267+ movq_cfi_restore RDX, rdx
16268 .endif
16269
16270- movq_cfi_restore 7*8, rsi
16271- movq_cfi_restore 8*8, rdi
16272+ movq_cfi_restore RSI, rsi
16273+ movq_cfi_restore RDI, rdi
16274
16275- .if ARG_SKIP+\addskip > 0
16276- addq $ARG_SKIP+\addskip, %rsp
16277- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16278+ .if ORIG_RAX+\addskip > 0
16279+ addq $ORIG_RAX+\addskip, %rsp
16280+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16281 .endif
16282 .endm
16283
16284- .macro LOAD_ARGS offset, skiprax=0
16285- movq \offset(%rsp), %r11
16286- movq \offset+8(%rsp), %r10
16287- movq \offset+16(%rsp), %r9
16288- movq \offset+24(%rsp), %r8
16289- movq \offset+40(%rsp), %rcx
16290- movq \offset+48(%rsp), %rdx
16291- movq \offset+56(%rsp), %rsi
16292- movq \offset+64(%rsp), %rdi
16293+ .macro LOAD_ARGS skiprax=0
16294+ movq R11(%rsp), %r11
16295+ movq R10(%rsp), %r10
16296+ movq R9(%rsp), %r9
16297+ movq R8(%rsp), %r8
16298+ movq RCX(%rsp), %rcx
16299+ movq RDX(%rsp), %rdx
16300+ movq RSI(%rsp), %rsi
16301+ movq RDI(%rsp), %rdi
16302 .if \skiprax
16303 .else
16304- movq \offset+72(%rsp), %rax
16305+ movq ORIG_RAX(%rsp), %rax
16306 .endif
16307 .endm
16308
16309-#define REST_SKIP (6*8)
16310-
16311 .macro SAVE_REST
16312- subq $REST_SKIP, %rsp
16313- CFI_ADJUST_CFA_OFFSET REST_SKIP
16314- movq_cfi rbx, 5*8
16315- movq_cfi rbp, 4*8
16316- movq_cfi r12, 3*8
16317- movq_cfi r13, 2*8
16318- movq_cfi r14, 1*8
16319- movq_cfi r15, 0*8
16320+ movq_cfi rbx, RBX
16321+ movq_cfi rbp, RBP
16322+
16323+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16324+ movq_cfi r12, R12
16325+#endif
16326+
16327+ movq_cfi r13, R13
16328+ movq_cfi r14, R14
16329+ movq_cfi r15, R15
16330 .endm
16331
16332 .macro RESTORE_REST
16333- movq_cfi_restore 0*8, r15
16334- movq_cfi_restore 1*8, r14
16335- movq_cfi_restore 2*8, r13
16336- movq_cfi_restore 3*8, r12
16337- movq_cfi_restore 4*8, rbp
16338- movq_cfi_restore 5*8, rbx
16339- addq $REST_SKIP, %rsp
16340- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16341+ movq_cfi_restore R15, r15
16342+ movq_cfi_restore R14, r14
16343+ movq_cfi_restore R13, r13
16344+
16345+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16346+ movq_cfi_restore R12, r12
16347+#endif
16348+
16349+ movq_cfi_restore RBP, rbp
16350+ movq_cfi_restore RBX, rbx
16351 .endm
16352
16353 .macro SAVE_ALL
16354diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16355index f50de69..2b0a458 100644
16356--- a/arch/x86/include/asm/checksum_32.h
16357+++ b/arch/x86/include/asm/checksum_32.h
16358@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16359 int len, __wsum sum,
16360 int *src_err_ptr, int *dst_err_ptr);
16361
16362+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16363+ int len, __wsum sum,
16364+ int *src_err_ptr, int *dst_err_ptr);
16365+
16366+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16367+ int len, __wsum sum,
16368+ int *src_err_ptr, int *dst_err_ptr);
16369+
16370 /*
16371 * Note: when you get a NULL pointer exception here this means someone
16372 * passed in an incorrect kernel address to one of these functions.
16373@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16374
16375 might_sleep();
16376 stac();
16377- ret = csum_partial_copy_generic((__force void *)src, dst,
16378+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16379 len, sum, err_ptr, NULL);
16380 clac();
16381
16382@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16383 might_sleep();
16384 if (access_ok(VERIFY_WRITE, dst, len)) {
16385 stac();
16386- ret = csum_partial_copy_generic(src, (__force void *)dst,
16387+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16388 len, sum, NULL, err_ptr);
16389 clac();
16390 return ret;
16391diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16392index 99c105d7..2f667ac 100644
16393--- a/arch/x86/include/asm/cmpxchg.h
16394+++ b/arch/x86/include/asm/cmpxchg.h
16395@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16396 __compiletime_error("Bad argument size for cmpxchg");
16397 extern void __xadd_wrong_size(void)
16398 __compiletime_error("Bad argument size for xadd");
16399+extern void __xadd_check_overflow_wrong_size(void)
16400+ __compiletime_error("Bad argument size for xadd_check_overflow");
16401 extern void __add_wrong_size(void)
16402 __compiletime_error("Bad argument size for add");
16403+extern void __add_check_overflow_wrong_size(void)
16404+ __compiletime_error("Bad argument size for add_check_overflow");
16405
16406 /*
16407 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16408@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16409 __ret; \
16410 })
16411
16412+#ifdef CONFIG_PAX_REFCOUNT
16413+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16414+ ({ \
16415+ __typeof__ (*(ptr)) __ret = (arg); \
16416+ switch (sizeof(*(ptr))) { \
16417+ case __X86_CASE_L: \
16418+ asm volatile (lock #op "l %0, %1\n" \
16419+ "jno 0f\n" \
16420+ "mov %0,%1\n" \
16421+ "int $4\n0:\n" \
16422+ _ASM_EXTABLE(0b, 0b) \
16423+ : "+r" (__ret), "+m" (*(ptr)) \
16424+ : : "memory", "cc"); \
16425+ break; \
16426+ case __X86_CASE_Q: \
16427+ asm volatile (lock #op "q %q0, %1\n" \
16428+ "jno 0f\n" \
16429+ "mov %0,%1\n" \
16430+ "int $4\n0:\n" \
16431+ _ASM_EXTABLE(0b, 0b) \
16432+ : "+r" (__ret), "+m" (*(ptr)) \
16433+ : : "memory", "cc"); \
16434+ break; \
16435+ default: \
16436+ __ ## op ## _check_overflow_wrong_size(); \
16437+ } \
16438+ __ret; \
16439+ })
16440+#else
16441+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16442+#endif
16443+
16444 /*
16445 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16446 * Since this is generally used to protect other memory information, we
16447@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16448 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16449 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16450
16451+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16452+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16453+
16454 #define __add(ptr, inc, lock) \
16455 ({ \
16456 __typeof__ (*(ptr)) __ret = (inc); \
16457diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16458index 59c6c40..5e0b22c 100644
16459--- a/arch/x86/include/asm/compat.h
16460+++ b/arch/x86/include/asm/compat.h
16461@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16462 typedef u32 compat_uint_t;
16463 typedef u32 compat_ulong_t;
16464 typedef u64 __attribute__((aligned(4))) compat_u64;
16465-typedef u32 compat_uptr_t;
16466+typedef u32 __user compat_uptr_t;
16467
16468 struct compat_timespec {
16469 compat_time_t tv_sec;
16470diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16471index 0bb1335..8f1aec7 100644
16472--- a/arch/x86/include/asm/cpufeature.h
16473+++ b/arch/x86/include/asm/cpufeature.h
16474@@ -207,7 +207,7 @@
16475 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16476 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16477 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16478-
16479+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16480
16481 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16482 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16483@@ -215,7 +215,7 @@
16484 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16485 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16486 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16487-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16488+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16489 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16490 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16491 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16492@@ -383,6 +383,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16493 #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16)
16494 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16495 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16496+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16497
16498 #if __GNUC__ >= 4
16499 extern void warn_pre_alternatives(void);
16500@@ -434,7 +435,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16501
16502 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16503 t_warn:
16504- warn_pre_alternatives();
16505+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16506+ warn_pre_alternatives();
16507 return false;
16508 #endif
16509
16510@@ -454,7 +456,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16511 ".section .discard,\"aw\",@progbits\n"
16512 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16513 ".previous\n"
16514- ".section .altinstr_replacement,\"ax\"\n"
16515+ ".section .altinstr_replacement,\"a\"\n"
16516 "3: movb $1,%0\n"
16517 "4:\n"
16518 ".previous\n"
16519@@ -491,7 +493,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16520 " .byte 2b - 1b\n" /* src len */
16521 " .byte 4f - 3f\n" /* repl len */
16522 ".previous\n"
16523- ".section .altinstr_replacement,\"ax\"\n"
16524+ ".section .altinstr_replacement,\"a\"\n"
16525 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16526 "4:\n"
16527 ".previous\n"
16528@@ -524,7 +526,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16529 ".section .discard,\"aw\",@progbits\n"
16530 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16531 ".previous\n"
16532- ".section .altinstr_replacement,\"ax\"\n"
16533+ ".section .altinstr_replacement,\"a\"\n"
16534 "3: movb $0,%0\n"
16535 "4:\n"
16536 ".previous\n"
16537@@ -538,7 +540,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16538 ".section .discard,\"aw\",@progbits\n"
16539 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16540 ".previous\n"
16541- ".section .altinstr_replacement,\"ax\"\n"
16542+ ".section .altinstr_replacement,\"a\"\n"
16543 "5: movb $1,%0\n"
16544 "6:\n"
16545 ".previous\n"
16546diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16547index a94b82e..59ecefa 100644
16548--- a/arch/x86/include/asm/desc.h
16549+++ b/arch/x86/include/asm/desc.h
16550@@ -4,6 +4,7 @@
16551 #include <asm/desc_defs.h>
16552 #include <asm/ldt.h>
16553 #include <asm/mmu.h>
16554+#include <asm/pgtable.h>
16555
16556 #include <linux/smp.h>
16557 #include <linux/percpu.h>
16558@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16559
16560 desc->type = (info->read_exec_only ^ 1) << 1;
16561 desc->type |= info->contents << 2;
16562+ desc->type |= info->seg_not_present ^ 1;
16563
16564 desc->s = 1;
16565 desc->dpl = 0x3;
16566@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16567 }
16568
16569 extern struct desc_ptr idt_descr;
16570-extern gate_desc idt_table[];
16571-extern struct desc_ptr debug_idt_descr;
16572-extern gate_desc debug_idt_table[];
16573-
16574-struct gdt_page {
16575- struct desc_struct gdt[GDT_ENTRIES];
16576-} __attribute__((aligned(PAGE_SIZE)));
16577-
16578-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16579+extern gate_desc idt_table[IDT_ENTRIES];
16580+extern const struct desc_ptr debug_idt_descr;
16581+extern gate_desc debug_idt_table[IDT_ENTRIES];
16582
16583+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16584 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16585 {
16586- return per_cpu(gdt_page, cpu).gdt;
16587+ return cpu_gdt_table[cpu];
16588 }
16589
16590 #ifdef CONFIG_X86_64
16591@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16592 unsigned long base, unsigned dpl, unsigned flags,
16593 unsigned short seg)
16594 {
16595- gate->a = (seg << 16) | (base & 0xffff);
16596- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16597+ gate->gate.offset_low = base;
16598+ gate->gate.seg = seg;
16599+ gate->gate.reserved = 0;
16600+ gate->gate.type = type;
16601+ gate->gate.s = 0;
16602+ gate->gate.dpl = dpl;
16603+ gate->gate.p = 1;
16604+ gate->gate.offset_high = base >> 16;
16605 }
16606
16607 #endif
16608@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16609
16610 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16611 {
16612+ pax_open_kernel();
16613 memcpy(&idt[entry], gate, sizeof(*gate));
16614+ pax_close_kernel();
16615 }
16616
16617 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16618 {
16619+ pax_open_kernel();
16620 memcpy(&ldt[entry], desc, 8);
16621+ pax_close_kernel();
16622 }
16623
16624 static inline void
16625@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16626 default: size = sizeof(*gdt); break;
16627 }
16628
16629+ pax_open_kernel();
16630 memcpy(&gdt[entry], desc, size);
16631+ pax_close_kernel();
16632 }
16633
16634 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16635@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16636
16637 static inline void native_load_tr_desc(void)
16638 {
16639+ pax_open_kernel();
16640 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16641+ pax_close_kernel();
16642 }
16643
16644 static inline void native_load_gdt(const struct desc_ptr *dtr)
16645@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16646 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16647 unsigned int i;
16648
16649+ pax_open_kernel();
16650 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16651 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16652+ pax_close_kernel();
16653 }
16654
16655 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16656@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16657 preempt_enable();
16658 }
16659
16660-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16661+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16662 {
16663 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16664 }
16665@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16666 }
16667
16668 #ifdef CONFIG_X86_64
16669-static inline void set_nmi_gate(int gate, void *addr)
16670+static inline void set_nmi_gate(int gate, const void *addr)
16671 {
16672 gate_desc s;
16673
16674@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16675 #endif
16676
16677 #ifdef CONFIG_TRACING
16678-extern struct desc_ptr trace_idt_descr;
16679-extern gate_desc trace_idt_table[];
16680+extern const struct desc_ptr trace_idt_descr;
16681+extern gate_desc trace_idt_table[IDT_ENTRIES];
16682 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16683 {
16684 write_idt_entry(trace_idt_table, entry, gate);
16685 }
16686
16687-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16688+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16689 unsigned dpl, unsigned ist, unsigned seg)
16690 {
16691 gate_desc s;
16692@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16693 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16694 #endif
16695
16696-static inline void _set_gate(int gate, unsigned type, void *addr,
16697+static inline void _set_gate(int gate, unsigned type, const void *addr,
16698 unsigned dpl, unsigned ist, unsigned seg)
16699 {
16700 gate_desc s;
16701@@ -379,9 +392,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16702 #define set_intr_gate(n, addr) \
16703 do { \
16704 BUG_ON((unsigned)n > 0xFF); \
16705- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16706+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16707 __KERNEL_CS); \
16708- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16709+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16710 0, 0, __KERNEL_CS); \
16711 } while (0)
16712
16713@@ -409,19 +422,19 @@ static inline void alloc_system_vector(int vector)
16714 /*
16715 * This routine sets up an interrupt gate at directory privilege level 3.
16716 */
16717-static inline void set_system_intr_gate(unsigned int n, void *addr)
16718+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16719 {
16720 BUG_ON((unsigned)n > 0xFF);
16721 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16722 }
16723
16724-static inline void set_system_trap_gate(unsigned int n, void *addr)
16725+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16726 {
16727 BUG_ON((unsigned)n > 0xFF);
16728 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16729 }
16730
16731-static inline void set_trap_gate(unsigned int n, void *addr)
16732+static inline void set_trap_gate(unsigned int n, const void *addr)
16733 {
16734 BUG_ON((unsigned)n > 0xFF);
16735 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16736@@ -430,16 +443,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16737 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16738 {
16739 BUG_ON((unsigned)n > 0xFF);
16740- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16741+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16742 }
16743
16744-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16745+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16746 {
16747 BUG_ON((unsigned)n > 0xFF);
16748 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16749 }
16750
16751-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16752+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16753 {
16754 BUG_ON((unsigned)n > 0xFF);
16755 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16756@@ -511,4 +524,17 @@ static inline void load_current_idt(void)
16757 else
16758 load_idt((const struct desc_ptr *)&idt_descr);
16759 }
16760+
16761+#ifdef CONFIG_X86_32
16762+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16763+{
16764+ struct desc_struct d;
16765+
16766+ if (likely(limit))
16767+ limit = (limit - 1UL) >> PAGE_SHIFT;
16768+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16769+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16770+}
16771+#endif
16772+
16773 #endif /* _ASM_X86_DESC_H */
16774diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16775index 278441f..b95a174 100644
16776--- a/arch/x86/include/asm/desc_defs.h
16777+++ b/arch/x86/include/asm/desc_defs.h
16778@@ -31,6 +31,12 @@ struct desc_struct {
16779 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16780 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16781 };
16782+ struct {
16783+ u16 offset_low;
16784+ u16 seg;
16785+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16786+ unsigned offset_high: 16;
16787+ } gate;
16788 };
16789 } __attribute__((packed));
16790
16791diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16792index ced283a..ffe04cc 100644
16793--- a/arch/x86/include/asm/div64.h
16794+++ b/arch/x86/include/asm/div64.h
16795@@ -39,7 +39,7 @@
16796 __mod; \
16797 })
16798
16799-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16800+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16801 {
16802 union {
16803 u64 v64;
16804diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16805index ca3347a..1a5082a 100644
16806--- a/arch/x86/include/asm/elf.h
16807+++ b/arch/x86/include/asm/elf.h
16808@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16809
16810 #include <asm/vdso.h>
16811
16812-#ifdef CONFIG_X86_64
16813-extern unsigned int vdso64_enabled;
16814-#endif
16815 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16816 extern unsigned int vdso32_enabled;
16817 #endif
16818@@ -249,7 +246,25 @@ extern int force_personality32;
16819 the loader. We need to make sure that it is out of the way of the program
16820 that it will "exec", and that there is sufficient room for the brk. */
16821
16822+#ifdef CONFIG_PAX_SEGMEXEC
16823+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16824+#else
16825 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16826+#endif
16827+
16828+#ifdef CONFIG_PAX_ASLR
16829+#ifdef CONFIG_X86_32
16830+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16831+
16832+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16833+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16834+#else
16835+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16836+
16837+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16838+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16839+#endif
16840+#endif
16841
16842 /* This yields a mask that user programs can use to figure out what
16843 instruction set this CPU supports. This could be done in user space,
16844@@ -298,17 +313,13 @@ do { \
16845
16846 #define ARCH_DLINFO \
16847 do { \
16848- if (vdso64_enabled) \
16849- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16850- (unsigned long __force)current->mm->context.vdso); \
16851+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16852 } while (0)
16853
16854 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16855 #define ARCH_DLINFO_X32 \
16856 do { \
16857- if (vdso64_enabled) \
16858- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16859- (unsigned long __force)current->mm->context.vdso); \
16860+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16861 } while (0)
16862
16863 #define AT_SYSINFO 32
16864@@ -323,10 +334,10 @@ else \
16865
16866 #endif /* !CONFIG_X86_32 */
16867
16868-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16869+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16870
16871 #define VDSO_ENTRY \
16872- ((unsigned long)current->mm->context.vdso + \
16873+ (current->mm->context.vdso + \
16874 selected_vdso32->sym___kernel_vsyscall)
16875
16876 struct linux_binprm;
16877@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16878 int uses_interp);
16879 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16880
16881-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16882-#define arch_randomize_brk arch_randomize_brk
16883-
16884 /*
16885 * True on X86_32 or when emulating IA32 on X86_64
16886 */
16887diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16888index 77a99ac..39ff7f5 100644
16889--- a/arch/x86/include/asm/emergency-restart.h
16890+++ b/arch/x86/include/asm/emergency-restart.h
16891@@ -1,6 +1,6 @@
16892 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16893 #define _ASM_X86_EMERGENCY_RESTART_H
16894
16895-extern void machine_emergency_restart(void);
16896+extern void machine_emergency_restart(void) __noreturn;
16897
16898 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16899diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16900index 1c7eefe..d0e4702 100644
16901--- a/arch/x86/include/asm/floppy.h
16902+++ b/arch/x86/include/asm/floppy.h
16903@@ -229,18 +229,18 @@ static struct fd_routine_l {
16904 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16905 } fd_routine[] = {
16906 {
16907- request_dma,
16908- free_dma,
16909- get_dma_residue,
16910- dma_mem_alloc,
16911- hard_dma_setup
16912+ ._request_dma = request_dma,
16913+ ._free_dma = free_dma,
16914+ ._get_dma_residue = get_dma_residue,
16915+ ._dma_mem_alloc = dma_mem_alloc,
16916+ ._dma_setup = hard_dma_setup
16917 },
16918 {
16919- vdma_request_dma,
16920- vdma_nop,
16921- vdma_get_dma_residue,
16922- vdma_mem_alloc,
16923- vdma_dma_setup
16924+ ._request_dma = vdma_request_dma,
16925+ ._free_dma = vdma_nop,
16926+ ._get_dma_residue = vdma_get_dma_residue,
16927+ ._dma_mem_alloc = vdma_mem_alloc,
16928+ ._dma_setup = vdma_dma_setup
16929 }
16930 };
16931
16932diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16933index e97622f..d0ba77a 100644
16934--- a/arch/x86/include/asm/fpu-internal.h
16935+++ b/arch/x86/include/asm/fpu-internal.h
16936@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16937 #define user_insn(insn, output, input...) \
16938 ({ \
16939 int err; \
16940+ pax_open_userland(); \
16941 asm volatile(ASM_STAC "\n" \
16942- "1:" #insn "\n\t" \
16943+ "1:" \
16944+ __copyuser_seg \
16945+ #insn "\n\t" \
16946 "2: " ASM_CLAC "\n" \
16947 ".section .fixup,\"ax\"\n" \
16948 "3: movl $-1,%[err]\n" \
16949@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16950 _ASM_EXTABLE(1b, 3b) \
16951 : [err] "=r" (err), output \
16952 : "0"(0), input); \
16953+ pax_close_userland(); \
16954 err; \
16955 })
16956
16957@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16958 "fnclex\n\t"
16959 "emms\n\t"
16960 "fildl %P[addr]" /* set F?P to defined value */
16961- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16962+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16963 }
16964
16965 return fpu_restore_checking(&tsk->thread.fpu);
16966diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16967index b4c1f54..e290c08 100644
16968--- a/arch/x86/include/asm/futex.h
16969+++ b/arch/x86/include/asm/futex.h
16970@@ -12,6 +12,7 @@
16971 #include <asm/smap.h>
16972
16973 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16974+ typecheck(u32 __user *, uaddr); \
16975 asm volatile("\t" ASM_STAC "\n" \
16976 "1:\t" insn "\n" \
16977 "2:\t" ASM_CLAC "\n" \
16978@@ -20,15 +21,16 @@
16979 "\tjmp\t2b\n" \
16980 "\t.previous\n" \
16981 _ASM_EXTABLE(1b, 3b) \
16982- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16983+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16984 : "i" (-EFAULT), "0" (oparg), "1" (0))
16985
16986 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16987+ typecheck(u32 __user *, uaddr); \
16988 asm volatile("\t" ASM_STAC "\n" \
16989 "1:\tmovl %2, %0\n" \
16990 "\tmovl\t%0, %3\n" \
16991 "\t" insn "\n" \
16992- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16993+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16994 "\tjnz\t1b\n" \
16995 "3:\t" ASM_CLAC "\n" \
16996 "\t.section .fixup,\"ax\"\n" \
16997@@ -38,7 +40,7 @@
16998 _ASM_EXTABLE(1b, 4b) \
16999 _ASM_EXTABLE(2b, 4b) \
17000 : "=&a" (oldval), "=&r" (ret), \
17001- "+m" (*uaddr), "=&r" (tem) \
17002+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
17003 : "r" (oparg), "i" (-EFAULT), "1" (0))
17004
17005 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17006@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17007
17008 pagefault_disable();
17009
17010+ pax_open_userland();
17011 switch (op) {
17012 case FUTEX_OP_SET:
17013- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
17014+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
17015 break;
17016 case FUTEX_OP_ADD:
17017- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17018+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17019 uaddr, oparg);
17020 break;
17021 case FUTEX_OP_OR:
17022@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17023 default:
17024 ret = -ENOSYS;
17025 }
17026+ pax_close_userland();
17027
17028 pagefault_enable();
17029
17030diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17031index 4615906..788c817 100644
17032--- a/arch/x86/include/asm/hw_irq.h
17033+++ b/arch/x86/include/asm/hw_irq.h
17034@@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
17035 extern void enable_IO_APIC(void);
17036
17037 /* Statistics */
17038-extern atomic_t irq_err_count;
17039-extern atomic_t irq_mis_count;
17040+extern atomic_unchecked_t irq_err_count;
17041+extern atomic_unchecked_t irq_mis_count;
17042
17043 /* EISA */
17044 extern void eisa_set_level_irq(unsigned int irq);
17045diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17046index ccffa53..3c90c87 100644
17047--- a/arch/x86/include/asm/i8259.h
17048+++ b/arch/x86/include/asm/i8259.h
17049@@ -62,7 +62,7 @@ struct legacy_pic {
17050 void (*init)(int auto_eoi);
17051 int (*irq_pending)(unsigned int irq);
17052 void (*make_irq)(unsigned int irq);
17053-};
17054+} __do_const;
17055
17056 extern struct legacy_pic *legacy_pic;
17057 extern struct legacy_pic null_legacy_pic;
17058diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17059index b8237d8..3e8864e 100644
17060--- a/arch/x86/include/asm/io.h
17061+++ b/arch/x86/include/asm/io.h
17062@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17063 "m" (*(volatile type __force *)addr) barrier); }
17064
17065 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17066-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17067-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17068+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17069+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17070
17071 build_mmio_read(__readb, "b", unsigned char, "=q", )
17072-build_mmio_read(__readw, "w", unsigned short, "=r", )
17073-build_mmio_read(__readl, "l", unsigned int, "=r", )
17074+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17075+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17076
17077 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17078 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17079@@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17080 * this function
17081 */
17082
17083-static inline phys_addr_t virt_to_phys(volatile void *address)
17084+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17085 {
17086 return __pa(address);
17087 }
17088@@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17089 return ioremap_nocache(offset, size);
17090 }
17091
17092-extern void iounmap(volatile void __iomem *addr);
17093+extern void iounmap(const volatile void __iomem *addr);
17094
17095 extern void set_iounmap_nonlazy(void);
17096
17097@@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
17098
17099 #include <linux/vmalloc.h>
17100
17101+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17102+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17103+{
17104+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17105+}
17106+
17107+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17108+{
17109+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17110+}
17111+
17112 /*
17113 * Convert a virtual cached pointer to an uncached pointer
17114 */
17115diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17116index 0a8b519..80e7d5b 100644
17117--- a/arch/x86/include/asm/irqflags.h
17118+++ b/arch/x86/include/asm/irqflags.h
17119@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17120 sti; \
17121 sysexit
17122
17123+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17124+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17125+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17126+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17127+
17128 #else
17129 #define INTERRUPT_RETURN iret
17130 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17131diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17132index 4421b5d..8543006 100644
17133--- a/arch/x86/include/asm/kprobes.h
17134+++ b/arch/x86/include/asm/kprobes.h
17135@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17136 #define RELATIVEJUMP_SIZE 5
17137 #define RELATIVECALL_OPCODE 0xe8
17138 #define RELATIVE_ADDR_SIZE 4
17139-#define MAX_STACK_SIZE 64
17140-#define MIN_STACK_SIZE(ADDR) \
17141- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17142- THREAD_SIZE - (unsigned long)(ADDR))) \
17143- ? (MAX_STACK_SIZE) \
17144- : (((unsigned long)current_thread_info()) + \
17145- THREAD_SIZE - (unsigned long)(ADDR)))
17146+#define MAX_STACK_SIZE 64UL
17147+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17148
17149 #define flush_insn_slot(p) do { } while (0)
17150
17151diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
17152index 6ed0c30..74fb6c3 100644
17153--- a/arch/x86/include/asm/kvm_host.h
17154+++ b/arch/x86/include/asm/kvm_host.h
17155@@ -51,6 +51,7 @@
17156 | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
17157
17158 #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
17159+#define CR3_PCID_INVD (1UL << 63)
17160 #define CR4_RESERVED_BITS \
17161 (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
17162 | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
17163diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17164index 4ad6560..75c7bdd 100644
17165--- a/arch/x86/include/asm/local.h
17166+++ b/arch/x86/include/asm/local.h
17167@@ -10,33 +10,97 @@ typedef struct {
17168 atomic_long_t a;
17169 } local_t;
17170
17171+typedef struct {
17172+ atomic_long_unchecked_t a;
17173+} local_unchecked_t;
17174+
17175 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17176
17177 #define local_read(l) atomic_long_read(&(l)->a)
17178+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17179 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17180+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17181
17182 static inline void local_inc(local_t *l)
17183 {
17184- asm volatile(_ASM_INC "%0"
17185+ asm volatile(_ASM_INC "%0\n"
17186+
17187+#ifdef CONFIG_PAX_REFCOUNT
17188+ "jno 0f\n"
17189+ _ASM_DEC "%0\n"
17190+ "int $4\n0:\n"
17191+ _ASM_EXTABLE(0b, 0b)
17192+#endif
17193+
17194+ : "+m" (l->a.counter));
17195+}
17196+
17197+static inline void local_inc_unchecked(local_unchecked_t *l)
17198+{
17199+ asm volatile(_ASM_INC "%0\n"
17200 : "+m" (l->a.counter));
17201 }
17202
17203 static inline void local_dec(local_t *l)
17204 {
17205- asm volatile(_ASM_DEC "%0"
17206+ asm volatile(_ASM_DEC "%0\n"
17207+
17208+#ifdef CONFIG_PAX_REFCOUNT
17209+ "jno 0f\n"
17210+ _ASM_INC "%0\n"
17211+ "int $4\n0:\n"
17212+ _ASM_EXTABLE(0b, 0b)
17213+#endif
17214+
17215+ : "+m" (l->a.counter));
17216+}
17217+
17218+static inline void local_dec_unchecked(local_unchecked_t *l)
17219+{
17220+ asm volatile(_ASM_DEC "%0\n"
17221 : "+m" (l->a.counter));
17222 }
17223
17224 static inline void local_add(long i, local_t *l)
17225 {
17226- asm volatile(_ASM_ADD "%1,%0"
17227+ asm volatile(_ASM_ADD "%1,%0\n"
17228+
17229+#ifdef CONFIG_PAX_REFCOUNT
17230+ "jno 0f\n"
17231+ _ASM_SUB "%1,%0\n"
17232+ "int $4\n0:\n"
17233+ _ASM_EXTABLE(0b, 0b)
17234+#endif
17235+
17236+ : "+m" (l->a.counter)
17237+ : "ir" (i));
17238+}
17239+
17240+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17241+{
17242+ asm volatile(_ASM_ADD "%1,%0\n"
17243 : "+m" (l->a.counter)
17244 : "ir" (i));
17245 }
17246
17247 static inline void local_sub(long i, local_t *l)
17248 {
17249- asm volatile(_ASM_SUB "%1,%0"
17250+ asm volatile(_ASM_SUB "%1,%0\n"
17251+
17252+#ifdef CONFIG_PAX_REFCOUNT
17253+ "jno 0f\n"
17254+ _ASM_ADD "%1,%0\n"
17255+ "int $4\n0:\n"
17256+ _ASM_EXTABLE(0b, 0b)
17257+#endif
17258+
17259+ : "+m" (l->a.counter)
17260+ : "ir" (i));
17261+}
17262+
17263+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17264+{
17265+ asm volatile(_ASM_SUB "%1,%0\n"
17266 : "+m" (l->a.counter)
17267 : "ir" (i));
17268 }
17269@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17270 */
17271 static inline int local_sub_and_test(long i, local_t *l)
17272 {
17273- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17274+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17275 }
17276
17277 /**
17278@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17279 */
17280 static inline int local_dec_and_test(local_t *l)
17281 {
17282- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17283+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17284 }
17285
17286 /**
17287@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17288 */
17289 static inline int local_inc_and_test(local_t *l)
17290 {
17291- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17292+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17293 }
17294
17295 /**
17296@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17297 */
17298 static inline int local_add_negative(long i, local_t *l)
17299 {
17300- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17301+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17302 }
17303
17304 /**
17305@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17306 static inline long local_add_return(long i, local_t *l)
17307 {
17308 long __i = i;
17309+ asm volatile(_ASM_XADD "%0, %1\n"
17310+
17311+#ifdef CONFIG_PAX_REFCOUNT
17312+ "jno 0f\n"
17313+ _ASM_MOV "%0,%1\n"
17314+ "int $4\n0:\n"
17315+ _ASM_EXTABLE(0b, 0b)
17316+#endif
17317+
17318+ : "+r" (i), "+m" (l->a.counter)
17319+ : : "memory");
17320+ return i + __i;
17321+}
17322+
17323+/**
17324+ * local_add_return_unchecked - add and return
17325+ * @i: integer value to add
17326+ * @l: pointer to type local_unchecked_t
17327+ *
17328+ * Atomically adds @i to @l and returns @i + @l
17329+ */
17330+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17331+{
17332+ long __i = i;
17333 asm volatile(_ASM_XADD "%0, %1;"
17334 : "+r" (i), "+m" (l->a.counter)
17335 : : "memory");
17336@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17337
17338 #define local_cmpxchg(l, o, n) \
17339 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17340+#define local_cmpxchg_unchecked(l, o, n) \
17341+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17342 /* Always has a lock prefix */
17343 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17344
17345diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17346new file mode 100644
17347index 0000000..2bfd3ba
17348--- /dev/null
17349+++ b/arch/x86/include/asm/mman.h
17350@@ -0,0 +1,15 @@
17351+#ifndef _X86_MMAN_H
17352+#define _X86_MMAN_H
17353+
17354+#include <uapi/asm/mman.h>
17355+
17356+#ifdef __KERNEL__
17357+#ifndef __ASSEMBLY__
17358+#ifdef CONFIG_X86_32
17359+#define arch_mmap_check i386_mmap_check
17360+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17361+#endif
17362+#endif
17363+#endif
17364+
17365+#endif /* X86_MMAN_H */
17366diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17367index 876e74e..e20bfb1 100644
17368--- a/arch/x86/include/asm/mmu.h
17369+++ b/arch/x86/include/asm/mmu.h
17370@@ -9,7 +9,7 @@
17371 * we put the segment information here.
17372 */
17373 typedef struct {
17374- void *ldt;
17375+ struct desc_struct *ldt;
17376 int size;
17377
17378 #ifdef CONFIG_X86_64
17379@@ -18,7 +18,19 @@ typedef struct {
17380 #endif
17381
17382 struct mutex lock;
17383- void __user *vdso;
17384+ unsigned long vdso;
17385+
17386+#ifdef CONFIG_X86_32
17387+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17388+ unsigned long user_cs_base;
17389+ unsigned long user_cs_limit;
17390+
17391+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17392+ cpumask_t cpu_user_cs_mask;
17393+#endif
17394+
17395+#endif
17396+#endif
17397 } mm_context_t;
17398
17399 #ifdef CONFIG_SMP
17400diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17401index 166af2a..648c200 100644
17402--- a/arch/x86/include/asm/mmu_context.h
17403+++ b/arch/x86/include/asm/mmu_context.h
17404@@ -28,6 +28,20 @@ void destroy_context(struct mm_struct *mm);
17405
17406 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17407 {
17408+
17409+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17410+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17411+ unsigned int i;
17412+ pgd_t *pgd;
17413+
17414+ pax_open_kernel();
17415+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17416+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17417+ set_pgd_batched(pgd+i, native_make_pgd(0));
17418+ pax_close_kernel();
17419+ }
17420+#endif
17421+
17422 #ifdef CONFIG_SMP
17423 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17424 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17425@@ -38,16 +52,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17426 struct task_struct *tsk)
17427 {
17428 unsigned cpu = smp_processor_id();
17429+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17430+ int tlbstate = TLBSTATE_OK;
17431+#endif
17432
17433 if (likely(prev != next)) {
17434 #ifdef CONFIG_SMP
17435+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17436+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17437+#endif
17438 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17439 this_cpu_write(cpu_tlbstate.active_mm, next);
17440 #endif
17441 cpumask_set_cpu(cpu, mm_cpumask(next));
17442
17443 /* Re-load page tables */
17444+#ifdef CONFIG_PAX_PER_CPU_PGD
17445+ pax_open_kernel();
17446+
17447+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17448+ if (static_cpu_has(X86_FEATURE_PCID))
17449+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17450+ else
17451+#endif
17452+
17453+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17454+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17455+ pax_close_kernel();
17456+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17457+
17458+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17459+ if (static_cpu_has(X86_FEATURE_PCID)) {
17460+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17461+ u64 descriptor[2];
17462+ descriptor[0] = PCID_USER;
17463+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17464+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17465+ descriptor[0] = PCID_KERNEL;
17466+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17467+ }
17468+ } else {
17469+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17470+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17471+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17472+ else
17473+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17474+ }
17475+ } else
17476+#endif
17477+
17478+ load_cr3(get_cpu_pgd(cpu, kernel));
17479+#else
17480 load_cr3(next->pgd);
17481+#endif
17482 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17483
17484 /* Stop flush ipis for the previous mm */
17485@@ -56,9 +113,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17486 /* Load the LDT, if the LDT is different: */
17487 if (unlikely(prev->context.ldt != next->context.ldt))
17488 load_LDT_nolock(&next->context);
17489+
17490+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17491+ if (!(__supported_pte_mask & _PAGE_NX)) {
17492+ smp_mb__before_atomic();
17493+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17494+ smp_mb__after_atomic();
17495+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17496+ }
17497+#endif
17498+
17499+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17500+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17501+ prev->context.user_cs_limit != next->context.user_cs_limit))
17502+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17503+#ifdef CONFIG_SMP
17504+ else if (unlikely(tlbstate != TLBSTATE_OK))
17505+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17506+#endif
17507+#endif
17508+
17509 }
17510+ else {
17511+
17512+#ifdef CONFIG_PAX_PER_CPU_PGD
17513+ pax_open_kernel();
17514+
17515+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17516+ if (static_cpu_has(X86_FEATURE_PCID))
17517+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17518+ else
17519+#endif
17520+
17521+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17522+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17523+ pax_close_kernel();
17524+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17525+
17526+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17527+ if (static_cpu_has(X86_FEATURE_PCID)) {
17528+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17529+ u64 descriptor[2];
17530+ descriptor[0] = PCID_USER;
17531+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17532+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17533+ descriptor[0] = PCID_KERNEL;
17534+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17535+ }
17536+ } else {
17537+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17538+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17539+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17540+ else
17541+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17542+ }
17543+ } else
17544+#endif
17545+
17546+ load_cr3(get_cpu_pgd(cpu, kernel));
17547+#endif
17548+
17549 #ifdef CONFIG_SMP
17550- else {
17551 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17552 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17553
17554@@ -75,12 +190,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17555 * tlb flush IPI delivery. We must reload CR3
17556 * to make sure to use no freed page tables.
17557 */
17558+
17559+#ifndef CONFIG_PAX_PER_CPU_PGD
17560 load_cr3(next->pgd);
17561 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17562+#endif
17563+
17564 load_LDT_nolock(&next->context);
17565+
17566+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17567+ if (!(__supported_pte_mask & _PAGE_NX))
17568+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17569+#endif
17570+
17571+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17572+#ifdef CONFIG_PAX_PAGEEXEC
17573+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17574+#endif
17575+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17576+#endif
17577+
17578 }
17579+#endif
17580 }
17581-#endif
17582 }
17583
17584 #define activate_mm(prev, next) \
17585diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17586index e3b7819..b257c64 100644
17587--- a/arch/x86/include/asm/module.h
17588+++ b/arch/x86/include/asm/module.h
17589@@ -5,6 +5,7 @@
17590
17591 #ifdef CONFIG_X86_64
17592 /* X86_64 does not define MODULE_PROC_FAMILY */
17593+#define MODULE_PROC_FAMILY ""
17594 #elif defined CONFIG_M486
17595 #define MODULE_PROC_FAMILY "486 "
17596 #elif defined CONFIG_M586
17597@@ -57,8 +58,20 @@
17598 #error unknown processor family
17599 #endif
17600
17601-#ifdef CONFIG_X86_32
17602-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17603+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17604+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17605+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17606+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17607+#else
17608+#define MODULE_PAX_KERNEXEC ""
17609 #endif
17610
17611+#ifdef CONFIG_PAX_MEMORY_UDEREF
17612+#define MODULE_PAX_UDEREF "UDEREF "
17613+#else
17614+#define MODULE_PAX_UDEREF ""
17615+#endif
17616+
17617+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17618+
17619 #endif /* _ASM_X86_MODULE_H */
17620diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17621index 5f2fc44..106caa6 100644
17622--- a/arch/x86/include/asm/nmi.h
17623+++ b/arch/x86/include/asm/nmi.h
17624@@ -36,26 +36,35 @@ enum {
17625
17626 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17627
17628+struct nmiaction;
17629+
17630+struct nmiwork {
17631+ const struct nmiaction *action;
17632+ u64 max_duration;
17633+ struct irq_work irq_work;
17634+};
17635+
17636 struct nmiaction {
17637 struct list_head list;
17638 nmi_handler_t handler;
17639- u64 max_duration;
17640- struct irq_work irq_work;
17641 unsigned long flags;
17642 const char *name;
17643-};
17644+ struct nmiwork *work;
17645+} __do_const;
17646
17647 #define register_nmi_handler(t, fn, fg, n, init...) \
17648 ({ \
17649- static struct nmiaction init fn##_na = { \
17650+ static struct nmiwork fn##_nw; \
17651+ static const struct nmiaction init fn##_na = { \
17652 .handler = (fn), \
17653 .name = (n), \
17654 .flags = (fg), \
17655+ .work = &fn##_nw, \
17656 }; \
17657 __register_nmi_handler((t), &fn##_na); \
17658 })
17659
17660-int __register_nmi_handler(unsigned int, struct nmiaction *);
17661+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17662
17663 void unregister_nmi_handler(unsigned int, const char *);
17664
17665diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17666index 802dde3..9183e68 100644
17667--- a/arch/x86/include/asm/page.h
17668+++ b/arch/x86/include/asm/page.h
17669@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17670 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17671
17672 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17673+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17674
17675 #define __boot_va(x) __va(x)
17676 #define __boot_pa(x) __pa(x)
17677@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17678 * virt_to_page(kaddr) returns a valid pointer if and only if
17679 * virt_addr_valid(kaddr) returns true.
17680 */
17681-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17682 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17683 extern bool __virt_addr_valid(unsigned long kaddr);
17684 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17685
17686+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17687+#define virt_to_page(kaddr) \
17688+ ({ \
17689+ const void *__kaddr = (const void *)(kaddr); \
17690+ BUG_ON(!virt_addr_valid(__kaddr)); \
17691+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17692+ })
17693+#else
17694+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17695+#endif
17696+
17697 #endif /* __ASSEMBLY__ */
17698
17699 #include <asm-generic/memory_model.h>
17700diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17701index f408caf..4a0455e 100644
17702--- a/arch/x86/include/asm/page_64.h
17703+++ b/arch/x86/include/asm/page_64.h
17704@@ -7,9 +7,9 @@
17705
17706 /* duplicated to the one in bootmem.h */
17707 extern unsigned long max_pfn;
17708-extern unsigned long phys_base;
17709+extern const unsigned long phys_base;
17710
17711-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17712+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17713 {
17714 unsigned long y = x - __START_KERNEL_map;
17715
17716diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17717index cd6e1610..70f4418 100644
17718--- a/arch/x86/include/asm/paravirt.h
17719+++ b/arch/x86/include/asm/paravirt.h
17720@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17721 return (pmd_t) { ret };
17722 }
17723
17724-static inline pmdval_t pmd_val(pmd_t pmd)
17725+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17726 {
17727 pmdval_t ret;
17728
17729@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17730 val);
17731 }
17732
17733+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17734+{
17735+ pgdval_t val = native_pgd_val(pgd);
17736+
17737+ if (sizeof(pgdval_t) > sizeof(long))
17738+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17739+ val, (u64)val >> 32);
17740+ else
17741+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17742+ val);
17743+}
17744+
17745 static inline void pgd_clear(pgd_t *pgdp)
17746 {
17747 set_pgd(pgdp, __pgd(0));
17748@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17749 pv_mmu_ops.set_fixmap(idx, phys, flags);
17750 }
17751
17752+#ifdef CONFIG_PAX_KERNEXEC
17753+static inline unsigned long pax_open_kernel(void)
17754+{
17755+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17756+}
17757+
17758+static inline unsigned long pax_close_kernel(void)
17759+{
17760+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17761+}
17762+#else
17763+static inline unsigned long pax_open_kernel(void) { return 0; }
17764+static inline unsigned long pax_close_kernel(void) { return 0; }
17765+#endif
17766+
17767 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17768
17769 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17770@@ -906,7 +933,7 @@ extern void default_banner(void);
17771
17772 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17773 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17774-#define PARA_INDIRECT(addr) *%cs:addr
17775+#define PARA_INDIRECT(addr) *%ss:addr
17776 #endif
17777
17778 #define INTERRUPT_RETURN \
17779@@ -981,6 +1008,21 @@ extern void default_banner(void);
17780 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17781 CLBR_NONE, \
17782 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17783+
17784+#define GET_CR0_INTO_RDI \
17785+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17786+ mov %rax,%rdi
17787+
17788+#define SET_RDI_INTO_CR0 \
17789+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17790+
17791+#define GET_CR3_INTO_RDI \
17792+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17793+ mov %rax,%rdi
17794+
17795+#define SET_RDI_INTO_CR3 \
17796+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17797+
17798 #endif /* CONFIG_X86_32 */
17799
17800 #endif /* __ASSEMBLY__ */
17801diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17802index 7549b8b..f0edfda 100644
17803--- a/arch/x86/include/asm/paravirt_types.h
17804+++ b/arch/x86/include/asm/paravirt_types.h
17805@@ -84,7 +84,7 @@ struct pv_init_ops {
17806 */
17807 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17808 unsigned long addr, unsigned len);
17809-};
17810+} __no_const __no_randomize_layout;
17811
17812
17813 struct pv_lazy_ops {
17814@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17815 void (*enter)(void);
17816 void (*leave)(void);
17817 void (*flush)(void);
17818-};
17819+} __no_randomize_layout;
17820
17821 struct pv_time_ops {
17822 unsigned long long (*sched_clock)(void);
17823 unsigned long long (*steal_clock)(int cpu);
17824 unsigned long (*get_tsc_khz)(void);
17825-};
17826+} __no_const __no_randomize_layout;
17827
17828 struct pv_cpu_ops {
17829 /* hooks for various privileged instructions */
17830@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17831
17832 void (*start_context_switch)(struct task_struct *prev);
17833 void (*end_context_switch)(struct task_struct *next);
17834-};
17835+} __no_const __no_randomize_layout;
17836
17837 struct pv_irq_ops {
17838 /*
17839@@ -215,7 +215,7 @@ struct pv_irq_ops {
17840 #ifdef CONFIG_X86_64
17841 void (*adjust_exception_frame)(void);
17842 #endif
17843-};
17844+} __no_randomize_layout;
17845
17846 struct pv_apic_ops {
17847 #ifdef CONFIG_X86_LOCAL_APIC
17848@@ -223,7 +223,7 @@ struct pv_apic_ops {
17849 unsigned long start_eip,
17850 unsigned long start_esp);
17851 #endif
17852-};
17853+} __no_const __no_randomize_layout;
17854
17855 struct pv_mmu_ops {
17856 unsigned long (*read_cr2)(void);
17857@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17858 struct paravirt_callee_save make_pud;
17859
17860 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17861+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17862 #endif /* PAGETABLE_LEVELS == 4 */
17863 #endif /* PAGETABLE_LEVELS >= 3 */
17864
17865@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17866 an mfn. We can tell which is which from the index. */
17867 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17868 phys_addr_t phys, pgprot_t flags);
17869-};
17870+
17871+#ifdef CONFIG_PAX_KERNEXEC
17872+ unsigned long (*pax_open_kernel)(void);
17873+ unsigned long (*pax_close_kernel)(void);
17874+#endif
17875+
17876+} __no_randomize_layout;
17877
17878 struct arch_spinlock;
17879 #ifdef CONFIG_SMP
17880@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17881 struct pv_lock_ops {
17882 struct paravirt_callee_save lock_spinning;
17883 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17884-};
17885+} __no_randomize_layout;
17886
17887 /* This contains all the paravirt structures: we get a convenient
17888 * number for each function using the offset which we use to indicate
17889- * what to patch. */
17890+ * what to patch.
17891+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17892+ */
17893+
17894 struct paravirt_patch_template {
17895 struct pv_init_ops pv_init_ops;
17896 struct pv_time_ops pv_time_ops;
17897@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17898 struct pv_apic_ops pv_apic_ops;
17899 struct pv_mmu_ops pv_mmu_ops;
17900 struct pv_lock_ops pv_lock_ops;
17901-};
17902+} __no_randomize_layout;
17903
17904 extern struct pv_info pv_info;
17905 extern struct pv_init_ops pv_init_ops;
17906diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17907index c4412e9..90e88c5 100644
17908--- a/arch/x86/include/asm/pgalloc.h
17909+++ b/arch/x86/include/asm/pgalloc.h
17910@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17911 pmd_t *pmd, pte_t *pte)
17912 {
17913 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17914+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17915+}
17916+
17917+static inline void pmd_populate_user(struct mm_struct *mm,
17918+ pmd_t *pmd, pte_t *pte)
17919+{
17920+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17921 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17922 }
17923
17924@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17925
17926 #ifdef CONFIG_X86_PAE
17927 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17928+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17929+{
17930+ pud_populate(mm, pudp, pmd);
17931+}
17932 #else /* !CONFIG_X86_PAE */
17933 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17934 {
17935 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17936 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17937 }
17938+
17939+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17940+{
17941+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17942+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17943+}
17944 #endif /* CONFIG_X86_PAE */
17945
17946 #if PAGETABLE_LEVELS > 3
17947@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17948 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17949 }
17950
17951+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17952+{
17953+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17954+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17955+}
17956+
17957 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17958 {
17959 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17960diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17961index 206a87f..1623b06 100644
17962--- a/arch/x86/include/asm/pgtable-2level.h
17963+++ b/arch/x86/include/asm/pgtable-2level.h
17964@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17965
17966 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17967 {
17968+ pax_open_kernel();
17969 *pmdp = pmd;
17970+ pax_close_kernel();
17971 }
17972
17973 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17974diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17975index 81bb91b..9392125 100644
17976--- a/arch/x86/include/asm/pgtable-3level.h
17977+++ b/arch/x86/include/asm/pgtable-3level.h
17978@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17979
17980 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17981 {
17982+ pax_open_kernel();
17983 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17984+ pax_close_kernel();
17985 }
17986
17987 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17988 {
17989+ pax_open_kernel();
17990 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17991+ pax_close_kernel();
17992 }
17993
17994 /*
17995diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17996index aa97a07..5c53c32 100644
17997--- a/arch/x86/include/asm/pgtable.h
17998+++ b/arch/x86/include/asm/pgtable.h
17999@@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18000
18001 #ifndef __PAGETABLE_PUD_FOLDED
18002 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18003+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18004 #define pgd_clear(pgd) native_pgd_clear(pgd)
18005 #endif
18006
18007@@ -83,12 +84,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18008
18009 #define arch_end_context_switch(prev) do {} while(0)
18010
18011+#define pax_open_kernel() native_pax_open_kernel()
18012+#define pax_close_kernel() native_pax_close_kernel()
18013 #endif /* CONFIG_PARAVIRT */
18014
18015+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18016+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18017+
18018+#ifdef CONFIG_PAX_KERNEXEC
18019+static inline unsigned long native_pax_open_kernel(void)
18020+{
18021+ unsigned long cr0;
18022+
18023+ preempt_disable();
18024+ barrier();
18025+ cr0 = read_cr0() ^ X86_CR0_WP;
18026+ BUG_ON(cr0 & X86_CR0_WP);
18027+ write_cr0(cr0);
18028+ barrier();
18029+ return cr0 ^ X86_CR0_WP;
18030+}
18031+
18032+static inline unsigned long native_pax_close_kernel(void)
18033+{
18034+ unsigned long cr0;
18035+
18036+ barrier();
18037+ cr0 = read_cr0() ^ X86_CR0_WP;
18038+ BUG_ON(!(cr0 & X86_CR0_WP));
18039+ write_cr0(cr0);
18040+ barrier();
18041+ preempt_enable_no_resched();
18042+ return cr0 ^ X86_CR0_WP;
18043+}
18044+#else
18045+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18046+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18047+#endif
18048+
18049 /*
18050 * The following only work if pte_present() is true.
18051 * Undefined behaviour if not..
18052 */
18053+static inline int pte_user(pte_t pte)
18054+{
18055+ return pte_val(pte) & _PAGE_USER;
18056+}
18057+
18058 static inline int pte_dirty(pte_t pte)
18059 {
18060 return pte_flags(pte) & _PAGE_DIRTY;
18061@@ -155,6 +197,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18062 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18063 }
18064
18065+static inline unsigned long pgd_pfn(pgd_t pgd)
18066+{
18067+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18068+}
18069+
18070 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18071
18072 static inline int pmd_large(pmd_t pte)
18073@@ -208,9 +255,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18074 return pte_clear_flags(pte, _PAGE_RW);
18075 }
18076
18077+static inline pte_t pte_mkread(pte_t pte)
18078+{
18079+ return __pte(pte_val(pte) | _PAGE_USER);
18080+}
18081+
18082 static inline pte_t pte_mkexec(pte_t pte)
18083 {
18084- return pte_clear_flags(pte, _PAGE_NX);
18085+#ifdef CONFIG_X86_PAE
18086+ if (__supported_pte_mask & _PAGE_NX)
18087+ return pte_clear_flags(pte, _PAGE_NX);
18088+ else
18089+#endif
18090+ return pte_set_flags(pte, _PAGE_USER);
18091+}
18092+
18093+static inline pte_t pte_exprotect(pte_t pte)
18094+{
18095+#ifdef CONFIG_X86_PAE
18096+ if (__supported_pte_mask & _PAGE_NX)
18097+ return pte_set_flags(pte, _PAGE_NX);
18098+ else
18099+#endif
18100+ return pte_clear_flags(pte, _PAGE_USER);
18101 }
18102
18103 static inline pte_t pte_mkdirty(pte_t pte)
18104@@ -440,6 +507,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18105 #endif
18106
18107 #ifndef __ASSEMBLY__
18108+
18109+#ifdef CONFIG_PAX_PER_CPU_PGD
18110+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18111+enum cpu_pgd_type {kernel = 0, user = 1};
18112+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18113+{
18114+ return cpu_pgd[cpu][type];
18115+}
18116+#endif
18117+
18118 #include <linux/mm_types.h>
18119 #include <linux/mmdebug.h>
18120 #include <linux/log2.h>
18121@@ -586,7 +663,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18122 * Currently stuck as a macro due to indirect forward reference to
18123 * linux/mmzone.h's __section_mem_map_addr() definition:
18124 */
18125-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18126+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18127
18128 /* Find an entry in the second-level page table.. */
18129 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18130@@ -626,7 +703,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18131 * Currently stuck as a macro due to indirect forward reference to
18132 * linux/mmzone.h's __section_mem_map_addr() definition:
18133 */
18134-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18135+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18136
18137 /* to find an entry in a page-table-directory. */
18138 static inline unsigned long pud_index(unsigned long address)
18139@@ -641,7 +718,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18140
18141 static inline int pgd_bad(pgd_t pgd)
18142 {
18143- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18144+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18145 }
18146
18147 static inline int pgd_none(pgd_t pgd)
18148@@ -664,7 +741,12 @@ static inline int pgd_none(pgd_t pgd)
18149 * pgd_offset() returns a (pgd_t *)
18150 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18151 */
18152-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18153+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18154+
18155+#ifdef CONFIG_PAX_PER_CPU_PGD
18156+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18157+#endif
18158+
18159 /*
18160 * a shortcut which implies the use of the kernel's pgd, instead
18161 * of a process's
18162@@ -675,6 +757,23 @@ static inline int pgd_none(pgd_t pgd)
18163 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18164 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18165
18166+#ifdef CONFIG_X86_32
18167+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18168+#else
18169+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18170+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18171+
18172+#ifdef CONFIG_PAX_MEMORY_UDEREF
18173+#ifdef __ASSEMBLY__
18174+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18175+#else
18176+extern unsigned long pax_user_shadow_base;
18177+extern pgdval_t clone_pgd_mask;
18178+#endif
18179+#endif
18180+
18181+#endif
18182+
18183 #ifndef __ASSEMBLY__
18184
18185 extern int direct_gbpages;
18186@@ -841,11 +940,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18187 * dst and src can be on the same page, but the range must not overlap,
18188 * and must not cross a page boundary.
18189 */
18190-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18191+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18192 {
18193- memcpy(dst, src, count * sizeof(pgd_t));
18194+ pax_open_kernel();
18195+ while (count--)
18196+ *dst++ = *src++;
18197+ pax_close_kernel();
18198 }
18199
18200+#ifdef CONFIG_PAX_PER_CPU_PGD
18201+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18202+#endif
18203+
18204+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18205+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18206+#else
18207+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18208+#endif
18209+
18210 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18211 static inline int page_level_shift(enum pg_level level)
18212 {
18213diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18214index b6c0b40..3535d47 100644
18215--- a/arch/x86/include/asm/pgtable_32.h
18216+++ b/arch/x86/include/asm/pgtable_32.h
18217@@ -25,9 +25,6 @@
18218 struct mm_struct;
18219 struct vm_area_struct;
18220
18221-extern pgd_t swapper_pg_dir[1024];
18222-extern pgd_t initial_page_table[1024];
18223-
18224 static inline void pgtable_cache_init(void) { }
18225 static inline void check_pgt_cache(void) { }
18226 void paging_init(void);
18227@@ -45,6 +42,12 @@ void paging_init(void);
18228 # include <asm/pgtable-2level.h>
18229 #endif
18230
18231+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18232+extern pgd_t initial_page_table[PTRS_PER_PGD];
18233+#ifdef CONFIG_X86_PAE
18234+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18235+#endif
18236+
18237 #if defined(CONFIG_HIGHPTE)
18238 #define pte_offset_map(dir, address) \
18239 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18240@@ -59,12 +62,17 @@ void paging_init(void);
18241 /* Clear a kernel PTE and flush it from the TLB */
18242 #define kpte_clear_flush(ptep, vaddr) \
18243 do { \
18244+ pax_open_kernel(); \
18245 pte_clear(&init_mm, (vaddr), (ptep)); \
18246+ pax_close_kernel(); \
18247 __flush_tlb_one((vaddr)); \
18248 } while (0)
18249
18250 #endif /* !__ASSEMBLY__ */
18251
18252+#define HAVE_ARCH_UNMAPPED_AREA
18253+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18254+
18255 /*
18256 * kern_addr_valid() is (1) for FLATMEM and (0) for
18257 * SPARSEMEM and DISCONTIGMEM
18258diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18259index ed5903b..c7fe163 100644
18260--- a/arch/x86/include/asm/pgtable_32_types.h
18261+++ b/arch/x86/include/asm/pgtable_32_types.h
18262@@ -8,7 +8,7 @@
18263 */
18264 #ifdef CONFIG_X86_PAE
18265 # include <asm/pgtable-3level_types.h>
18266-# define PMD_SIZE (1UL << PMD_SHIFT)
18267+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18268 # define PMD_MASK (~(PMD_SIZE - 1))
18269 #else
18270 # include <asm/pgtable-2level_types.h>
18271@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18272 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18273 #endif
18274
18275+#ifdef CONFIG_PAX_KERNEXEC
18276+#ifndef __ASSEMBLY__
18277+extern unsigned char MODULES_EXEC_VADDR[];
18278+extern unsigned char MODULES_EXEC_END[];
18279+#endif
18280+#include <asm/boot.h>
18281+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18282+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18283+#else
18284+#define ktla_ktva(addr) (addr)
18285+#define ktva_ktla(addr) (addr)
18286+#endif
18287+
18288 #define MODULES_VADDR VMALLOC_START
18289 #define MODULES_END VMALLOC_END
18290 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18291diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18292index 4572b2f..4430113 100644
18293--- a/arch/x86/include/asm/pgtable_64.h
18294+++ b/arch/x86/include/asm/pgtable_64.h
18295@@ -16,11 +16,16 @@
18296
18297 extern pud_t level3_kernel_pgt[512];
18298 extern pud_t level3_ident_pgt[512];
18299+extern pud_t level3_vmalloc_start_pgt[512];
18300+extern pud_t level3_vmalloc_end_pgt[512];
18301+extern pud_t level3_vmemmap_pgt[512];
18302+extern pud_t level2_vmemmap_pgt[512];
18303 extern pmd_t level2_kernel_pgt[512];
18304 extern pmd_t level2_fixmap_pgt[512];
18305-extern pmd_t level2_ident_pgt[512];
18306+extern pmd_t level2_ident_pgt[512*2];
18307 extern pte_t level1_fixmap_pgt[512];
18308-extern pgd_t init_level4_pgt[];
18309+extern pte_t level1_vsyscall_pgt[512];
18310+extern pgd_t init_level4_pgt[512];
18311
18312 #define swapper_pg_dir init_level4_pgt
18313
18314@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18315
18316 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18317 {
18318+ pax_open_kernel();
18319 *pmdp = pmd;
18320+ pax_close_kernel();
18321 }
18322
18323 static inline void native_pmd_clear(pmd_t *pmd)
18324@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18325
18326 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18327 {
18328+ pax_open_kernel();
18329 *pudp = pud;
18330+ pax_close_kernel();
18331 }
18332
18333 static inline void native_pud_clear(pud_t *pud)
18334@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18335
18336 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18337 {
18338+ pax_open_kernel();
18339+ *pgdp = pgd;
18340+ pax_close_kernel();
18341+}
18342+
18343+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18344+{
18345 *pgdp = pgd;
18346 }
18347
18348diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18349index 7166e25..baaa6fe 100644
18350--- a/arch/x86/include/asm/pgtable_64_types.h
18351+++ b/arch/x86/include/asm/pgtable_64_types.h
18352@@ -61,9 +61,14 @@ typedef struct { pteval_t pte; } pte_t;
18353 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18354 #define MODULES_END _AC(0xffffffffff000000, UL)
18355 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18356+#define MODULES_EXEC_VADDR MODULES_VADDR
18357+#define MODULES_EXEC_END MODULES_END
18358 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18359 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18360
18361+#define ktla_ktva(addr) (addr)
18362+#define ktva_ktla(addr) (addr)
18363+
18364 #define EARLY_DYNAMIC_PAGE_TABLES 64
18365
18366 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18367diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18368index 0778964..0e94758 100644
18369--- a/arch/x86/include/asm/pgtable_types.h
18370+++ b/arch/x86/include/asm/pgtable_types.h
18371@@ -110,8 +110,10 @@
18372
18373 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18374 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18375-#else
18376+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18377 #define _PAGE_NX (_AT(pteval_t, 0))
18378+#else
18379+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18380 #endif
18381
18382 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18383@@ -150,6 +152,9 @@
18384 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18385 _PAGE_ACCESSED)
18386
18387+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18388+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18389+
18390 #define __PAGE_KERNEL_EXEC \
18391 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18392 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18393@@ -160,7 +165,7 @@
18394 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
18395 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
18396 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
18397-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18398+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18399 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18400 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
18401 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18402@@ -217,7 +222,7 @@
18403 #ifdef CONFIG_X86_64
18404 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18405 #else
18406-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18407+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18408 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18409 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18410 #endif
18411@@ -256,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18412 {
18413 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18414 }
18415+#endif
18416
18417+#if PAGETABLE_LEVELS == 3
18418+#include <asm-generic/pgtable-nopud.h>
18419+#endif
18420+
18421+#if PAGETABLE_LEVELS == 2
18422+#include <asm-generic/pgtable-nopmd.h>
18423+#endif
18424+
18425+#ifndef __ASSEMBLY__
18426 #if PAGETABLE_LEVELS > 3
18427 typedef struct { pudval_t pud; } pud_t;
18428
18429@@ -270,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18430 return pud.pud;
18431 }
18432 #else
18433-#include <asm-generic/pgtable-nopud.h>
18434-
18435 static inline pudval_t native_pud_val(pud_t pud)
18436 {
18437 return native_pgd_val(pud.pgd);
18438@@ -291,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18439 return pmd.pmd;
18440 }
18441 #else
18442-#include <asm-generic/pgtable-nopmd.h>
18443-
18444 static inline pmdval_t native_pmd_val(pmd_t pmd)
18445 {
18446 return native_pgd_val(pmd.pud.pgd);
18447@@ -346,7 +357,6 @@ typedef struct page *pgtable_t;
18448
18449 extern pteval_t __supported_pte_mask;
18450 extern void set_nx(void);
18451-extern int nx_enabled;
18452
18453 #define pgprot_writecombine pgprot_writecombine
18454 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18455diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18456index 4008734..48f0d81 100644
18457--- a/arch/x86/include/asm/preempt.h
18458+++ b/arch/x86/include/asm/preempt.h
18459@@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
18460 */
18461 static __always_inline bool __preempt_count_dec_and_test(void)
18462 {
18463- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18464+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18465 }
18466
18467 /*
18468diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18469index eb71ec7..f06532a 100644
18470--- a/arch/x86/include/asm/processor.h
18471+++ b/arch/x86/include/asm/processor.h
18472@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18473 /* Index into per_cpu list: */
18474 u16 cpu_index;
18475 u32 microcode;
18476-} __attribute__((__aligned__(SMP_CACHE_BYTES)));
18477+} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
18478
18479 #define X86_VENDOR_INTEL 0
18480 #define X86_VENDOR_CYRIX 1
18481@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18482 : "memory");
18483 }
18484
18485+/* invpcid (%rdx),%rax */
18486+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18487+
18488+#define INVPCID_SINGLE_ADDRESS 0UL
18489+#define INVPCID_SINGLE_CONTEXT 1UL
18490+#define INVPCID_ALL_GLOBAL 2UL
18491+#define INVPCID_ALL_NONGLOBAL 3UL
18492+
18493+#define PCID_KERNEL 0UL
18494+#define PCID_USER 1UL
18495+#define PCID_NOFLUSH (1UL << 63)
18496+
18497 static inline void load_cr3(pgd_t *pgdir)
18498 {
18499- write_cr3(__pa(pgdir));
18500+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18501 }
18502
18503 #ifdef CONFIG_X86_32
18504@@ -282,7 +294,7 @@ struct tss_struct {
18505
18506 } ____cacheline_aligned;
18507
18508-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18509+extern struct tss_struct init_tss[NR_CPUS];
18510
18511 /*
18512 * Save the original ist values for checking stack pointers during debugging
18513@@ -478,6 +490,7 @@ struct thread_struct {
18514 unsigned short ds;
18515 unsigned short fsindex;
18516 unsigned short gsindex;
18517+ unsigned short ss;
18518 #endif
18519 #ifdef CONFIG_X86_32
18520 unsigned long ip;
18521@@ -587,29 +600,8 @@ static inline void load_sp0(struct tss_struct *tss,
18522 extern unsigned long mmu_cr4_features;
18523 extern u32 *trampoline_cr4_features;
18524
18525-static inline void set_in_cr4(unsigned long mask)
18526-{
18527- unsigned long cr4;
18528-
18529- mmu_cr4_features |= mask;
18530- if (trampoline_cr4_features)
18531- *trampoline_cr4_features = mmu_cr4_features;
18532- cr4 = read_cr4();
18533- cr4 |= mask;
18534- write_cr4(cr4);
18535-}
18536-
18537-static inline void clear_in_cr4(unsigned long mask)
18538-{
18539- unsigned long cr4;
18540-
18541- mmu_cr4_features &= ~mask;
18542- if (trampoline_cr4_features)
18543- *trampoline_cr4_features = mmu_cr4_features;
18544- cr4 = read_cr4();
18545- cr4 &= ~mask;
18546- write_cr4(cr4);
18547-}
18548+extern void set_in_cr4(unsigned long mask);
18549+extern void clear_in_cr4(unsigned long mask);
18550
18551 typedef struct {
18552 unsigned long seg;
18553@@ -837,11 +829,18 @@ static inline void spin_lock_prefetch(const void *x)
18554 */
18555 #define TASK_SIZE PAGE_OFFSET
18556 #define TASK_SIZE_MAX TASK_SIZE
18557+
18558+#ifdef CONFIG_PAX_SEGMEXEC
18559+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18560+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18561+#else
18562 #define STACK_TOP TASK_SIZE
18563-#define STACK_TOP_MAX STACK_TOP
18564+#endif
18565+
18566+#define STACK_TOP_MAX TASK_SIZE
18567
18568 #define INIT_THREAD { \
18569- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18570+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18571 .vm86_info = NULL, \
18572 .sysenter_cs = __KERNEL_CS, \
18573 .io_bitmap_ptr = NULL, \
18574@@ -855,7 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18575 */
18576 #define INIT_TSS { \
18577 .x86_tss = { \
18578- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18579+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18580 .ss0 = __KERNEL_DS, \
18581 .ss1 = __KERNEL_CS, \
18582 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18583@@ -866,11 +865,7 @@ static inline void spin_lock_prefetch(const void *x)
18584 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18585
18586 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18587-#define KSTK_TOP(info) \
18588-({ \
18589- unsigned long *__ptr = (unsigned long *)(info); \
18590- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18591-})
18592+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18593
18594 /*
18595 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18596@@ -885,7 +880,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18597 #define task_pt_regs(task) \
18598 ({ \
18599 struct pt_regs *__regs__; \
18600- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18601+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18602 __regs__ - 1; \
18603 })
18604
18605@@ -895,13 +890,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18606 /*
18607 * User space process size. 47bits minus one guard page.
18608 */
18609-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18610+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18611
18612 /* This decides where the kernel will search for a free chunk of vm
18613 * space during mmap's.
18614 */
18615 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18616- 0xc0000000 : 0xFFFFe000)
18617+ 0xc0000000 : 0xFFFFf000)
18618
18619 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18620 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18621@@ -912,11 +907,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18622 #define STACK_TOP_MAX TASK_SIZE_MAX
18623
18624 #define INIT_THREAD { \
18625- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18626+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18627 }
18628
18629 #define INIT_TSS { \
18630- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18631+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18632 }
18633
18634 /*
18635@@ -944,6 +939,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18636 */
18637 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18638
18639+#ifdef CONFIG_PAX_SEGMEXEC
18640+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18641+#endif
18642+
18643 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18644
18645 /* Get/set a process' ability to use the timestamp counter instruction */
18646@@ -970,7 +969,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18647 return 0;
18648 }
18649
18650-extern unsigned long arch_align_stack(unsigned long sp);
18651+#define arch_align_stack(x) ((x) & ~0xfUL)
18652 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18653
18654 void default_idle(void);
18655@@ -980,6 +979,6 @@ bool xen_set_default_idle(void);
18656 #define xen_set_default_idle 0
18657 #endif
18658
18659-void stop_this_cpu(void *dummy);
18660+void stop_this_cpu(void *dummy) __noreturn;
18661 void df_debug(struct pt_regs *regs, long error_code);
18662 #endif /* _ASM_X86_PROCESSOR_H */
18663diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18664index 86fc2bb..bd5049a 100644
18665--- a/arch/x86/include/asm/ptrace.h
18666+++ b/arch/x86/include/asm/ptrace.h
18667@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18668 }
18669
18670 /*
18671- * user_mode_vm(regs) determines whether a register set came from user mode.
18672+ * user_mode(regs) determines whether a register set came from user mode.
18673 * This is true if V8086 mode was enabled OR if the register set was from
18674 * protected mode with RPL-3 CS value. This tricky test checks that with
18675 * one comparison. Many places in the kernel can bypass this full check
18676- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18677+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18678+ * be used.
18679 */
18680-static inline int user_mode(struct pt_regs *regs)
18681+static inline int user_mode_novm(struct pt_regs *regs)
18682 {
18683 #ifdef CONFIG_X86_32
18684 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18685 #else
18686- return !!(regs->cs & 3);
18687+ return !!(regs->cs & SEGMENT_RPL_MASK);
18688 #endif
18689 }
18690
18691-static inline int user_mode_vm(struct pt_regs *regs)
18692+static inline int user_mode(struct pt_regs *regs)
18693 {
18694 #ifdef CONFIG_X86_32
18695 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18696 USER_RPL;
18697 #else
18698- return user_mode(regs);
18699+ return user_mode_novm(regs);
18700 #endif
18701 }
18702
18703@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18704 #ifdef CONFIG_X86_64
18705 static inline bool user_64bit_mode(struct pt_regs *regs)
18706 {
18707+ unsigned long cs = regs->cs & 0xffff;
18708 #ifndef CONFIG_PARAVIRT
18709 /*
18710 * On non-paravirt systems, this is the only long mode CPL 3
18711 * selector. We do not allow long mode selectors in the LDT.
18712 */
18713- return regs->cs == __USER_CS;
18714+ return cs == __USER_CS;
18715 #else
18716 /* Headers are too twisted for this to go in paravirt.h. */
18717- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18718+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18719 #endif
18720 }
18721
18722@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18723 * Traps from the kernel do not save sp and ss.
18724 * Use the helper function to retrieve sp.
18725 */
18726- if (offset == offsetof(struct pt_regs, sp) &&
18727- regs->cs == __KERNEL_CS)
18728- return kernel_stack_pointer(regs);
18729+ if (offset == offsetof(struct pt_regs, sp)) {
18730+ unsigned long cs = regs->cs & 0xffff;
18731+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18732+ return kernel_stack_pointer(regs);
18733+ }
18734 #endif
18735 return *(unsigned long *)((unsigned long)regs + offset);
18736 }
18737diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18738index ae0e241..e80b10b 100644
18739--- a/arch/x86/include/asm/qrwlock.h
18740+++ b/arch/x86/include/asm/qrwlock.h
18741@@ -7,8 +7,8 @@
18742 #define queue_write_unlock queue_write_unlock
18743 static inline void queue_write_unlock(struct qrwlock *lock)
18744 {
18745- barrier();
18746- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18747+ barrier();
18748+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18749 }
18750 #endif
18751
18752diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18753index 9c6b890..5305f53 100644
18754--- a/arch/x86/include/asm/realmode.h
18755+++ b/arch/x86/include/asm/realmode.h
18756@@ -22,16 +22,14 @@ struct real_mode_header {
18757 #endif
18758 /* APM/BIOS reboot */
18759 u32 machine_real_restart_asm;
18760-#ifdef CONFIG_X86_64
18761 u32 machine_real_restart_seg;
18762-#endif
18763 };
18764
18765 /* This must match data at trampoline_32/64.S */
18766 struct trampoline_header {
18767 #ifdef CONFIG_X86_32
18768 u32 start;
18769- u16 gdt_pad;
18770+ u16 boot_cs;
18771 u16 gdt_limit;
18772 u32 gdt_base;
18773 #else
18774diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18775index a82c4f1..ac45053 100644
18776--- a/arch/x86/include/asm/reboot.h
18777+++ b/arch/x86/include/asm/reboot.h
18778@@ -6,13 +6,13 @@
18779 struct pt_regs;
18780
18781 struct machine_ops {
18782- void (*restart)(char *cmd);
18783- void (*halt)(void);
18784- void (*power_off)(void);
18785+ void (* __noreturn restart)(char *cmd);
18786+ void (* __noreturn halt)(void);
18787+ void (* __noreturn power_off)(void);
18788 void (*shutdown)(void);
18789 void (*crash_shutdown)(struct pt_regs *);
18790- void (*emergency_restart)(void);
18791-};
18792+ void (* __noreturn emergency_restart)(void);
18793+} __no_const;
18794
18795 extern struct machine_ops machine_ops;
18796
18797diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18798index 8f7866a..e442f20 100644
18799--- a/arch/x86/include/asm/rmwcc.h
18800+++ b/arch/x86/include/asm/rmwcc.h
18801@@ -3,7 +3,34 @@
18802
18803 #ifdef CC_HAVE_ASM_GOTO
18804
18805-#define __GEN_RMWcc(fullop, var, cc, ...) \
18806+#ifdef CONFIG_PAX_REFCOUNT
18807+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18808+do { \
18809+ asm_volatile_goto (fullop \
18810+ ";jno 0f\n" \
18811+ fullantiop \
18812+ ";int $4\n0:\n" \
18813+ _ASM_EXTABLE(0b, 0b) \
18814+ ";j" cc " %l[cc_label]" \
18815+ : : "m" (var), ## __VA_ARGS__ \
18816+ : "memory" : cc_label); \
18817+ return 0; \
18818+cc_label: \
18819+ return 1; \
18820+} while (0)
18821+#else
18822+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18823+do { \
18824+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18825+ : : "m" (var), ## __VA_ARGS__ \
18826+ : "memory" : cc_label); \
18827+ return 0; \
18828+cc_label: \
18829+ return 1; \
18830+} while (0)
18831+#endif
18832+
18833+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18834 do { \
18835 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18836 : : "m" (var), ## __VA_ARGS__ \
18837@@ -13,15 +40,46 @@ cc_label: \
18838 return 1; \
18839 } while (0)
18840
18841-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18842- __GEN_RMWcc(op " " arg0, var, cc)
18843+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18844+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18845
18846-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18847- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18848+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18849+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18850+
18851+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18852+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18853+
18854+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18855+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18856
18857 #else /* !CC_HAVE_ASM_GOTO */
18858
18859-#define __GEN_RMWcc(fullop, var, cc, ...) \
18860+#ifdef CONFIG_PAX_REFCOUNT
18861+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18862+do { \
18863+ char c; \
18864+ asm volatile (fullop \
18865+ ";jno 0f\n" \
18866+ fullantiop \
18867+ ";int $4\n0:\n" \
18868+ _ASM_EXTABLE(0b, 0b) \
18869+ "; set" cc " %1" \
18870+ : "+m" (var), "=qm" (c) \
18871+ : __VA_ARGS__ : "memory"); \
18872+ return c != 0; \
18873+} while (0)
18874+#else
18875+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18876+do { \
18877+ char c; \
18878+ asm volatile (fullop "; set" cc " %1" \
18879+ : "+m" (var), "=qm" (c) \
18880+ : __VA_ARGS__ : "memory"); \
18881+ return c != 0; \
18882+} while (0)
18883+#endif
18884+
18885+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18886 do { \
18887 char c; \
18888 asm volatile (fullop "; set" cc " %1" \
18889@@ -30,11 +88,17 @@ do { \
18890 return c != 0; \
18891 } while (0)
18892
18893-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18894- __GEN_RMWcc(op " " arg0, var, cc)
18895+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18896+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18897+
18898+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18899+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18900+
18901+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18902+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18903
18904-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18905- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18906+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18907+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18908
18909 #endif /* CC_HAVE_ASM_GOTO */
18910
18911diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18912index cad82c9..2e5c5c1 100644
18913--- a/arch/x86/include/asm/rwsem.h
18914+++ b/arch/x86/include/asm/rwsem.h
18915@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18916 {
18917 asm volatile("# beginning down_read\n\t"
18918 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18919+
18920+#ifdef CONFIG_PAX_REFCOUNT
18921+ "jno 0f\n"
18922+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18923+ "int $4\n0:\n"
18924+ _ASM_EXTABLE(0b, 0b)
18925+#endif
18926+
18927 /* adds 0x00000001 */
18928 " jns 1f\n"
18929 " call call_rwsem_down_read_failed\n"
18930@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18931 "1:\n\t"
18932 " mov %1,%2\n\t"
18933 " add %3,%2\n\t"
18934+
18935+#ifdef CONFIG_PAX_REFCOUNT
18936+ "jno 0f\n"
18937+ "sub %3,%2\n"
18938+ "int $4\n0:\n"
18939+ _ASM_EXTABLE(0b, 0b)
18940+#endif
18941+
18942 " jle 2f\n\t"
18943 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18944 " jnz 1b\n\t"
18945@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18946 long tmp;
18947 asm volatile("# beginning down_write\n\t"
18948 LOCK_PREFIX " xadd %1,(%2)\n\t"
18949+
18950+#ifdef CONFIG_PAX_REFCOUNT
18951+ "jno 0f\n"
18952+ "mov %1,(%2)\n"
18953+ "int $4\n0:\n"
18954+ _ASM_EXTABLE(0b, 0b)
18955+#endif
18956+
18957 /* adds 0xffff0001, returns the old value */
18958 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18959 /* was the active mask 0 before? */
18960@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18961 long tmp;
18962 asm volatile("# beginning __up_read\n\t"
18963 LOCK_PREFIX " xadd %1,(%2)\n\t"
18964+
18965+#ifdef CONFIG_PAX_REFCOUNT
18966+ "jno 0f\n"
18967+ "mov %1,(%2)\n"
18968+ "int $4\n0:\n"
18969+ _ASM_EXTABLE(0b, 0b)
18970+#endif
18971+
18972 /* subtracts 1, returns the old value */
18973 " jns 1f\n\t"
18974 " call call_rwsem_wake\n" /* expects old value in %edx */
18975@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18976 long tmp;
18977 asm volatile("# beginning __up_write\n\t"
18978 LOCK_PREFIX " xadd %1,(%2)\n\t"
18979+
18980+#ifdef CONFIG_PAX_REFCOUNT
18981+ "jno 0f\n"
18982+ "mov %1,(%2)\n"
18983+ "int $4\n0:\n"
18984+ _ASM_EXTABLE(0b, 0b)
18985+#endif
18986+
18987 /* subtracts 0xffff0001, returns the old value */
18988 " jns 1f\n\t"
18989 " call call_rwsem_wake\n" /* expects old value in %edx */
18990@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18991 {
18992 asm volatile("# beginning __downgrade_write\n\t"
18993 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18994+
18995+#ifdef CONFIG_PAX_REFCOUNT
18996+ "jno 0f\n"
18997+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18998+ "int $4\n0:\n"
18999+ _ASM_EXTABLE(0b, 0b)
19000+#endif
19001+
19002 /*
19003 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
19004 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
19005@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
19006 */
19007 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19008 {
19009- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
19010+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
19011+
19012+#ifdef CONFIG_PAX_REFCOUNT
19013+ "jno 0f\n"
19014+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
19015+ "int $4\n0:\n"
19016+ _ASM_EXTABLE(0b, 0b)
19017+#endif
19018+
19019 : "+m" (sem->count)
19020 : "er" (delta));
19021 }
19022@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19023 */
19024 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
19025 {
19026- return delta + xadd(&sem->count, delta);
19027+ return delta + xadd_check_overflow(&sem->count, delta);
19028 }
19029
19030 #endif /* __KERNEL__ */
19031diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
19032index 6f1c3a8..7744f19 100644
19033--- a/arch/x86/include/asm/segment.h
19034+++ b/arch/x86/include/asm/segment.h
19035@@ -64,10 +64,15 @@
19036 * 26 - ESPFIX small SS
19037 * 27 - per-cpu [ offset to per-cpu data area ]
19038 * 28 - stack_canary-20 [ for stack protector ]
19039- * 29 - unused
19040- * 30 - unused
19041+ * 29 - PCI BIOS CS
19042+ * 30 - PCI BIOS DS
19043 * 31 - TSS for double fault handler
19044 */
19045+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19046+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19047+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19048+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19049+
19050 #define GDT_ENTRY_TLS_MIN 6
19051 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19052
19053@@ -79,6 +84,8 @@
19054
19055 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19056
19057+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19058+
19059 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19060
19061 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19062@@ -104,6 +111,12 @@
19063 #define __KERNEL_STACK_CANARY 0
19064 #endif
19065
19066+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19067+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19068+
19069+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19070+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19071+
19072 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19073
19074 /*
19075@@ -141,7 +154,7 @@
19076 */
19077
19078 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19079-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19080+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19081
19082
19083 #else
19084@@ -165,6 +178,8 @@
19085 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19086 #define __USER32_DS __USER_DS
19087
19088+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19089+
19090 #define GDT_ENTRY_TSS 8 /* needs two entries */
19091 #define GDT_ENTRY_LDT 10 /* needs two entries */
19092 #define GDT_ENTRY_TLS_MIN 12
19093@@ -173,6 +188,8 @@
19094 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19095 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19096
19097+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19098+
19099 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19100 #define FS_TLS 0
19101 #define GS_TLS 1
19102@@ -180,12 +197,14 @@
19103 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19104 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19105
19106-#define GDT_ENTRIES 16
19107+#define GDT_ENTRIES 17
19108
19109 #endif
19110
19111 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19112+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19113 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19114+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19115 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19116 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19117 #ifndef CONFIG_PARAVIRT
19118@@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
19119 {
19120 unsigned long __limit;
19121 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19122- return __limit + 1;
19123+ return __limit;
19124 }
19125
19126 #endif /* !__ASSEMBLY__ */
19127diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19128index 8d3120f..352b440 100644
19129--- a/arch/x86/include/asm/smap.h
19130+++ b/arch/x86/include/asm/smap.h
19131@@ -25,11 +25,40 @@
19132
19133 #include <asm/alternative-asm.h>
19134
19135+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19136+#define ASM_PAX_OPEN_USERLAND \
19137+ 661: jmp 663f; \
19138+ .pushsection .altinstr_replacement, "a" ; \
19139+ 662: pushq %rax; nop; \
19140+ .popsection ; \
19141+ .pushsection .altinstructions, "a" ; \
19142+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19143+ .popsection ; \
19144+ call __pax_open_userland; \
19145+ popq %rax; \
19146+ 663:
19147+
19148+#define ASM_PAX_CLOSE_USERLAND \
19149+ 661: jmp 663f; \
19150+ .pushsection .altinstr_replacement, "a" ; \
19151+ 662: pushq %rax; nop; \
19152+ .popsection; \
19153+ .pushsection .altinstructions, "a" ; \
19154+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19155+ .popsection; \
19156+ call __pax_close_userland; \
19157+ popq %rax; \
19158+ 663:
19159+#else
19160+#define ASM_PAX_OPEN_USERLAND
19161+#define ASM_PAX_CLOSE_USERLAND
19162+#endif
19163+
19164 #ifdef CONFIG_X86_SMAP
19165
19166 #define ASM_CLAC \
19167 661: ASM_NOP3 ; \
19168- .pushsection .altinstr_replacement, "ax" ; \
19169+ .pushsection .altinstr_replacement, "a" ; \
19170 662: __ASM_CLAC ; \
19171 .popsection ; \
19172 .pushsection .altinstructions, "a" ; \
19173@@ -38,7 +67,7 @@
19174
19175 #define ASM_STAC \
19176 661: ASM_NOP3 ; \
19177- .pushsection .altinstr_replacement, "ax" ; \
19178+ .pushsection .altinstr_replacement, "a" ; \
19179 662: __ASM_STAC ; \
19180 .popsection ; \
19181 .pushsection .altinstructions, "a" ; \
19182@@ -56,6 +85,37 @@
19183
19184 #include <asm/alternative.h>
19185
19186+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19187+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19188+
19189+extern void __pax_open_userland(void);
19190+static __always_inline unsigned long pax_open_userland(void)
19191+{
19192+
19193+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19194+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19195+ :
19196+ : [open] "i" (__pax_open_userland)
19197+ : "memory", "rax");
19198+#endif
19199+
19200+ return 0;
19201+}
19202+
19203+extern void __pax_close_userland(void);
19204+static __always_inline unsigned long pax_close_userland(void)
19205+{
19206+
19207+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19208+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19209+ :
19210+ : [close] "i" (__pax_close_userland)
19211+ : "memory", "rax");
19212+#endif
19213+
19214+ return 0;
19215+}
19216+
19217 #ifdef CONFIG_X86_SMAP
19218
19219 static __always_inline void clac(void)
19220diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19221index 8cd1cc3..827e09e 100644
19222--- a/arch/x86/include/asm/smp.h
19223+++ b/arch/x86/include/asm/smp.h
19224@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19225 /* cpus sharing the last level cache: */
19226 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19227 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19228-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19229+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19230
19231 static inline struct cpumask *cpu_sibling_mask(int cpu)
19232 {
19233@@ -78,7 +78,7 @@ struct smp_ops {
19234
19235 void (*send_call_func_ipi)(const struct cpumask *mask);
19236 void (*send_call_func_single_ipi)(int cpu);
19237-};
19238+} __no_const;
19239
19240 /* Globals due to paravirt */
19241 extern void set_cpu_sibling_map(int cpu);
19242@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19243 extern int safe_smp_processor_id(void);
19244
19245 #elif defined(CONFIG_X86_64_SMP)
19246-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19247-
19248-#define stack_smp_processor_id() \
19249-({ \
19250- struct thread_info *ti; \
19251- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19252- ti->cpu; \
19253-})
19254+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19255+#define stack_smp_processor_id() raw_smp_processor_id()
19256 #define safe_smp_processor_id() smp_processor_id()
19257
19258 #endif
19259diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19260index 6a99859..03cb807 100644
19261--- a/arch/x86/include/asm/stackprotector.h
19262+++ b/arch/x86/include/asm/stackprotector.h
19263@@ -47,7 +47,7 @@
19264 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19265 */
19266 #define GDT_STACK_CANARY_INIT \
19267- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19268+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19269
19270 /*
19271 * Initialize the stackprotector canary value.
19272@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19273
19274 static inline void load_stack_canary_segment(void)
19275 {
19276-#ifdef CONFIG_X86_32
19277+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19278 asm volatile ("mov %0, %%gs" : : "r" (0));
19279 #endif
19280 }
19281diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19282index 70bbe39..4ae2bd4 100644
19283--- a/arch/x86/include/asm/stacktrace.h
19284+++ b/arch/x86/include/asm/stacktrace.h
19285@@ -11,28 +11,20 @@
19286
19287 extern int kstack_depth_to_print;
19288
19289-struct thread_info;
19290+struct task_struct;
19291 struct stacktrace_ops;
19292
19293-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19294- unsigned long *stack,
19295- unsigned long bp,
19296- const struct stacktrace_ops *ops,
19297- void *data,
19298- unsigned long *end,
19299- int *graph);
19300+typedef unsigned long walk_stack_t(struct task_struct *task,
19301+ void *stack_start,
19302+ unsigned long *stack,
19303+ unsigned long bp,
19304+ const struct stacktrace_ops *ops,
19305+ void *data,
19306+ unsigned long *end,
19307+ int *graph);
19308
19309-extern unsigned long
19310-print_context_stack(struct thread_info *tinfo,
19311- unsigned long *stack, unsigned long bp,
19312- const struct stacktrace_ops *ops, void *data,
19313- unsigned long *end, int *graph);
19314-
19315-extern unsigned long
19316-print_context_stack_bp(struct thread_info *tinfo,
19317- unsigned long *stack, unsigned long bp,
19318- const struct stacktrace_ops *ops, void *data,
19319- unsigned long *end, int *graph);
19320+extern walk_stack_t print_context_stack;
19321+extern walk_stack_t print_context_stack_bp;
19322
19323 /* Generic stack tracer with callbacks */
19324
19325@@ -40,7 +32,7 @@ struct stacktrace_ops {
19326 void (*address)(void *data, unsigned long address, int reliable);
19327 /* On negative return stop dumping */
19328 int (*stack)(void *data, char *name);
19329- walk_stack_t walk_stack;
19330+ walk_stack_t *walk_stack;
19331 };
19332
19333 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19334diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19335index d7f3b3b..3cc39f1 100644
19336--- a/arch/x86/include/asm/switch_to.h
19337+++ b/arch/x86/include/asm/switch_to.h
19338@@ -108,7 +108,7 @@ do { \
19339 "call __switch_to\n\t" \
19340 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19341 __switch_canary \
19342- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19343+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19344 "movq %%rax,%%rdi\n\t" \
19345 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19346 "jnz ret_from_fork\n\t" \
19347@@ -119,7 +119,7 @@ do { \
19348 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19349 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19350 [_tif_fork] "i" (_TIF_FORK), \
19351- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19352+ [thread_info] "m" (current_tinfo), \
19353 [current_task] "m" (current_task) \
19354 __switch_canary_iparam \
19355 : "memory", "cc" __EXTRA_CLOBBER)
19356diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19357index 547e344..6be1175 100644
19358--- a/arch/x86/include/asm/thread_info.h
19359+++ b/arch/x86/include/asm/thread_info.h
19360@@ -24,7 +24,6 @@ struct exec_domain;
19361 #include <linux/atomic.h>
19362
19363 struct thread_info {
19364- struct task_struct *task; /* main task structure */
19365 struct exec_domain *exec_domain; /* execution domain */
19366 __u32 flags; /* low level flags */
19367 __u32 status; /* thread synchronous flags */
19368@@ -33,13 +32,13 @@ struct thread_info {
19369 mm_segment_t addr_limit;
19370 struct restart_block restart_block;
19371 void __user *sysenter_return;
19372+ unsigned long lowest_stack;
19373 unsigned int sig_on_uaccess_error:1;
19374 unsigned int uaccess_err:1; /* uaccess failed */
19375 };
19376
19377-#define INIT_THREAD_INFO(tsk) \
19378+#define INIT_THREAD_INFO \
19379 { \
19380- .task = &tsk, \
19381 .exec_domain = &default_exec_domain, \
19382 .flags = 0, \
19383 .cpu = 0, \
19384@@ -50,7 +49,7 @@ struct thread_info {
19385 }, \
19386 }
19387
19388-#define init_thread_info (init_thread_union.thread_info)
19389+#define init_thread_info (init_thread_union.stack)
19390 #define init_stack (init_thread_union.stack)
19391
19392 #else /* !__ASSEMBLY__ */
19393@@ -91,6 +90,7 @@ struct thread_info {
19394 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19395 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19396 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19397+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19398
19399 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19400 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19401@@ -115,17 +115,18 @@ struct thread_info {
19402 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19403 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19404 #define _TIF_X32 (1 << TIF_X32)
19405+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19406
19407 /* work to do in syscall_trace_enter() */
19408 #define _TIF_WORK_SYSCALL_ENTRY \
19409 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19410 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19411- _TIF_NOHZ)
19412+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19413
19414 /* work to do in syscall_trace_leave() */
19415 #define _TIF_WORK_SYSCALL_EXIT \
19416 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19417- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19418+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19419
19420 /* work to do on interrupt/exception return */
19421 #define _TIF_WORK_MASK \
19422@@ -136,7 +137,7 @@ struct thread_info {
19423 /* work to do on any return to user space */
19424 #define _TIF_ALLWORK_MASK \
19425 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19426- _TIF_NOHZ)
19427+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19428
19429 /* Only used for 64 bit */
19430 #define _TIF_DO_NOTIFY_MASK \
19431@@ -151,7 +152,6 @@ struct thread_info {
19432 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19433
19434 #define STACK_WARN (THREAD_SIZE/8)
19435-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19436
19437 /*
19438 * macros/functions for gaining access to the thread information structure
19439@@ -162,26 +162,18 @@ struct thread_info {
19440
19441 DECLARE_PER_CPU(unsigned long, kernel_stack);
19442
19443+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19444+
19445 static inline struct thread_info *current_thread_info(void)
19446 {
19447- struct thread_info *ti;
19448- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19449- KERNEL_STACK_OFFSET - THREAD_SIZE);
19450- return ti;
19451+ return this_cpu_read_stable(current_tinfo);
19452 }
19453
19454 #else /* !__ASSEMBLY__ */
19455
19456 /* how to get the thread information struct from ASM */
19457 #define GET_THREAD_INFO(reg) \
19458- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19459- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19460-
19461-/*
19462- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19463- * a certain register (to be used in assembler memory operands).
19464- */
19465-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19466+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19467
19468 #endif
19469
19470@@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19471 extern void arch_task_cache_init(void);
19472 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19473 extern void arch_release_task_struct(struct task_struct *tsk);
19474+
19475+#define __HAVE_THREAD_FUNCTIONS
19476+#define task_thread_info(task) (&(task)->tinfo)
19477+#define task_stack_page(task) ((task)->stack)
19478+#define setup_thread_stack(p, org) do {} while (0)
19479+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19480+
19481 #endif
19482 #endif /* _ASM_X86_THREAD_INFO_H */
19483diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19484index 04905bf..1178cdf 100644
19485--- a/arch/x86/include/asm/tlbflush.h
19486+++ b/arch/x86/include/asm/tlbflush.h
19487@@ -17,18 +17,44 @@
19488
19489 static inline void __native_flush_tlb(void)
19490 {
19491+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19492+ u64 descriptor[2];
19493+
19494+ descriptor[0] = PCID_KERNEL;
19495+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19496+ return;
19497+ }
19498+
19499+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19500+ if (static_cpu_has(X86_FEATURE_PCID)) {
19501+ unsigned int cpu = raw_get_cpu();
19502+
19503+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19504+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19505+ raw_put_cpu_no_resched();
19506+ return;
19507+ }
19508+#endif
19509+
19510 native_write_cr3(native_read_cr3());
19511 }
19512
19513 static inline void __native_flush_tlb_global_irq_disabled(void)
19514 {
19515- unsigned long cr4;
19516+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19517+ u64 descriptor[2];
19518
19519- cr4 = native_read_cr4();
19520- /* clear PGE */
19521- native_write_cr4(cr4 & ~X86_CR4_PGE);
19522- /* write old PGE again and flush TLBs */
19523- native_write_cr4(cr4);
19524+ descriptor[0] = PCID_KERNEL;
19525+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19526+ } else {
19527+ unsigned long cr4;
19528+
19529+ cr4 = native_read_cr4();
19530+ /* clear PGE */
19531+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19532+ /* write old PGE again and flush TLBs */
19533+ native_write_cr4(cr4);
19534+ }
19535 }
19536
19537 static inline void __native_flush_tlb_global(void)
19538@@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19539
19540 static inline void __native_flush_tlb_single(unsigned long addr)
19541 {
19542+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19543+ u64 descriptor[2];
19544+
19545+ descriptor[0] = PCID_KERNEL;
19546+ descriptor[1] = addr;
19547+
19548+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19549+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19550+ if (addr < TASK_SIZE_MAX)
19551+ descriptor[1] += pax_user_shadow_base;
19552+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19553+ }
19554+
19555+ descriptor[0] = PCID_USER;
19556+ descriptor[1] = addr;
19557+#endif
19558+
19559+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19560+ return;
19561+ }
19562+
19563+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19564+ if (static_cpu_has(X86_FEATURE_PCID)) {
19565+ unsigned int cpu = raw_get_cpu();
19566+
19567+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19568+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19569+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19570+ raw_put_cpu_no_resched();
19571+
19572+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19573+ addr += pax_user_shadow_base;
19574+ }
19575+#endif
19576+
19577 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19578 }
19579
19580diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19581index 0d592e0..526f797 100644
19582--- a/arch/x86/include/asm/uaccess.h
19583+++ b/arch/x86/include/asm/uaccess.h
19584@@ -7,6 +7,7 @@
19585 #include <linux/compiler.h>
19586 #include <linux/thread_info.h>
19587 #include <linux/string.h>
19588+#include <linux/spinlock.h>
19589 #include <asm/asm.h>
19590 #include <asm/page.h>
19591 #include <asm/smap.h>
19592@@ -29,7 +30,12 @@
19593
19594 #define get_ds() (KERNEL_DS)
19595 #define get_fs() (current_thread_info()->addr_limit)
19596+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19597+void __set_fs(mm_segment_t x);
19598+void set_fs(mm_segment_t x);
19599+#else
19600 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19601+#endif
19602
19603 #define segment_eq(a, b) ((a).seg == (b).seg)
19604
19605@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19606 * checks that the pointer is in the user space range - after calling
19607 * this function, memory access functions may still return -EFAULT.
19608 */
19609-#define access_ok(type, addr, size) \
19610- likely(!__range_not_ok(addr, size, user_addr_max()))
19611+extern int _cond_resched(void);
19612+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19613+#define access_ok(type, addr, size) \
19614+({ \
19615+ unsigned long __size = size; \
19616+ unsigned long __addr = (unsigned long)addr; \
19617+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19618+ if (__ret_ao && __size) { \
19619+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19620+ unsigned long __end_ao = __addr + __size - 1; \
19621+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19622+ while (__addr_ao <= __end_ao) { \
19623+ char __c_ao; \
19624+ __addr_ao += PAGE_SIZE; \
19625+ if (__size > PAGE_SIZE) \
19626+ _cond_resched(); \
19627+ if (__get_user(__c_ao, (char __user *)__addr)) \
19628+ break; \
19629+ if (type != VERIFY_WRITE) { \
19630+ __addr = __addr_ao; \
19631+ continue; \
19632+ } \
19633+ if (__put_user(__c_ao, (char __user *)__addr)) \
19634+ break; \
19635+ __addr = __addr_ao; \
19636+ } \
19637+ } \
19638+ } \
19639+ __ret_ao; \
19640+})
19641
19642 /*
19643 * The exception table consists of pairs of addresses relative to the
19644@@ -176,10 +210,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19645 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19646 __chk_user_ptr(ptr); \
19647 might_fault(); \
19648+ pax_open_userland(); \
19649 asm volatile("call __get_user_%P3" \
19650 : "=a" (__ret_gu), "=r" (__val_gu) \
19651 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19652 (x) = (__typeof__(*(ptr))) __val_gu; \
19653+ pax_close_userland(); \
19654 __ret_gu; \
19655 })
19656
19657@@ -187,13 +223,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19658 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19659 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19660
19661-
19662+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19663+#define __copyuser_seg "gs;"
19664+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19665+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19666+#else
19667+#define __copyuser_seg
19668+#define __COPYUSER_SET_ES
19669+#define __COPYUSER_RESTORE_ES
19670+#endif
19671
19672 #ifdef CONFIG_X86_32
19673 #define __put_user_asm_u64(x, addr, err, errret) \
19674 asm volatile(ASM_STAC "\n" \
19675- "1: movl %%eax,0(%2)\n" \
19676- "2: movl %%edx,4(%2)\n" \
19677+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19678+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19679 "3: " ASM_CLAC "\n" \
19680 ".section .fixup,\"ax\"\n" \
19681 "4: movl %3,%0\n" \
19682@@ -206,8 +250,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19683
19684 #define __put_user_asm_ex_u64(x, addr) \
19685 asm volatile(ASM_STAC "\n" \
19686- "1: movl %%eax,0(%1)\n" \
19687- "2: movl %%edx,4(%1)\n" \
19688+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19689+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19690 "3: " ASM_CLAC "\n" \
19691 _ASM_EXTABLE_EX(1b, 2b) \
19692 _ASM_EXTABLE_EX(2b, 3b) \
19693@@ -257,7 +301,8 @@ extern void __put_user_8(void);
19694 __typeof__(*(ptr)) __pu_val; \
19695 __chk_user_ptr(ptr); \
19696 might_fault(); \
19697- __pu_val = x; \
19698+ __pu_val = (x); \
19699+ pax_open_userland(); \
19700 switch (sizeof(*(ptr))) { \
19701 case 1: \
19702 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19703@@ -275,6 +320,7 @@ extern void __put_user_8(void);
19704 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19705 break; \
19706 } \
19707+ pax_close_userland(); \
19708 __ret_pu; \
19709 })
19710
19711@@ -355,8 +401,10 @@ do { \
19712 } while (0)
19713
19714 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19715+do { \
19716+ pax_open_userland(); \
19717 asm volatile(ASM_STAC "\n" \
19718- "1: mov"itype" %2,%"rtype"1\n" \
19719+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19720 "2: " ASM_CLAC "\n" \
19721 ".section .fixup,\"ax\"\n" \
19722 "3: mov %3,%0\n" \
19723@@ -364,8 +412,10 @@ do { \
19724 " jmp 2b\n" \
19725 ".previous\n" \
19726 _ASM_EXTABLE(1b, 3b) \
19727- : "=r" (err), ltype(x) \
19728- : "m" (__m(addr)), "i" (errret), "0" (err))
19729+ : "=r" (err), ltype (x) \
19730+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19731+ pax_close_userland(); \
19732+} while (0)
19733
19734 #define __get_user_size_ex(x, ptr, size) \
19735 do { \
19736@@ -389,7 +439,7 @@ do { \
19737 } while (0)
19738
19739 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19740- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19741+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19742 "2:\n" \
19743 _ASM_EXTABLE_EX(1b, 2b) \
19744 : ltype(x) : "m" (__m(addr)))
19745@@ -406,13 +456,24 @@ do { \
19746 int __gu_err; \
19747 unsigned long __gu_val; \
19748 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19749- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19750+ (x) = (__typeof__(*(ptr)))__gu_val; \
19751 __gu_err; \
19752 })
19753
19754 /* FIXME: this hack is definitely wrong -AK */
19755 struct __large_struct { unsigned long buf[100]; };
19756-#define __m(x) (*(struct __large_struct __user *)(x))
19757+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19758+#define ____m(x) \
19759+({ \
19760+ unsigned long ____x = (unsigned long)(x); \
19761+ if (____x < pax_user_shadow_base) \
19762+ ____x += pax_user_shadow_base; \
19763+ (typeof(x))____x; \
19764+})
19765+#else
19766+#define ____m(x) (x)
19767+#endif
19768+#define __m(x) (*(struct __large_struct __user *)____m(x))
19769
19770 /*
19771 * Tell gcc we read from memory instead of writing: this is because
19772@@ -420,8 +481,10 @@ struct __large_struct { unsigned long buf[100]; };
19773 * aliasing issues.
19774 */
19775 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19776+do { \
19777+ pax_open_userland(); \
19778 asm volatile(ASM_STAC "\n" \
19779- "1: mov"itype" %"rtype"1,%2\n" \
19780+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19781 "2: " ASM_CLAC "\n" \
19782 ".section .fixup,\"ax\"\n" \
19783 "3: mov %3,%0\n" \
19784@@ -429,10 +492,12 @@ struct __large_struct { unsigned long buf[100]; };
19785 ".previous\n" \
19786 _ASM_EXTABLE(1b, 3b) \
19787 : "=r"(err) \
19788- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19789+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19790+ pax_close_userland(); \
19791+} while (0)
19792
19793 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19794- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19795+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19796 "2:\n" \
19797 _ASM_EXTABLE_EX(1b, 2b) \
19798 : : ltype(x), "m" (__m(addr)))
19799@@ -442,11 +507,13 @@ struct __large_struct { unsigned long buf[100]; };
19800 */
19801 #define uaccess_try do { \
19802 current_thread_info()->uaccess_err = 0; \
19803+ pax_open_userland(); \
19804 stac(); \
19805 barrier();
19806
19807 #define uaccess_catch(err) \
19808 clac(); \
19809+ pax_close_userland(); \
19810 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19811 } while (0)
19812
19813@@ -471,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
19814 * On error, the variable @x is set to zero.
19815 */
19816
19817+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19818+#define __get_user(x, ptr) get_user((x), (ptr))
19819+#else
19820 #define __get_user(x, ptr) \
19821 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19822+#endif
19823
19824 /**
19825 * __put_user: - Write a simple value into user space, with less checking.
19826@@ -494,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
19827 * Returns zero on success, or -EFAULT on error.
19828 */
19829
19830+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19831+#define __put_user(x, ptr) put_user((x), (ptr))
19832+#else
19833 #define __put_user(x, ptr) \
19834 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19835+#endif
19836
19837 #define __get_user_unaligned __get_user
19838 #define __put_user_unaligned __put_user
19839@@ -513,7 +588,7 @@ struct __large_struct { unsigned long buf[100]; };
19840 #define get_user_ex(x, ptr) do { \
19841 unsigned long __gue_val; \
19842 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19843- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19844+ (x) = (__typeof__(*(ptr)))__gue_val; \
19845 } while (0)
19846
19847 #define put_user_try uaccess_try
19848@@ -542,18 +617,19 @@ extern void __cmpxchg_wrong_size(void)
19849 __typeof__(ptr) __uval = (uval); \
19850 __typeof__(*(ptr)) __old = (old); \
19851 __typeof__(*(ptr)) __new = (new); \
19852+ pax_open_userland(); \
19853 switch (size) { \
19854 case 1: \
19855 { \
19856 asm volatile("\t" ASM_STAC "\n" \
19857- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19858+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19859 "2:\t" ASM_CLAC "\n" \
19860 "\t.section .fixup, \"ax\"\n" \
19861 "3:\tmov %3, %0\n" \
19862 "\tjmp 2b\n" \
19863 "\t.previous\n" \
19864 _ASM_EXTABLE(1b, 3b) \
19865- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19866+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19867 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870@@ -562,14 +638,14 @@ extern void __cmpxchg_wrong_size(void)
19871 case 2: \
19872 { \
19873 asm volatile("\t" ASM_STAC "\n" \
19874- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19875+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19876 "2:\t" ASM_CLAC "\n" \
19877 "\t.section .fixup, \"ax\"\n" \
19878 "3:\tmov %3, %0\n" \
19879 "\tjmp 2b\n" \
19880 "\t.previous\n" \
19881 _ASM_EXTABLE(1b, 3b) \
19882- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19883+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19884 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19885 : "memory" \
19886 ); \
19887@@ -578,14 +654,14 @@ extern void __cmpxchg_wrong_size(void)
19888 case 4: \
19889 { \
19890 asm volatile("\t" ASM_STAC "\n" \
19891- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19892+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19893 "2:\t" ASM_CLAC "\n" \
19894 "\t.section .fixup, \"ax\"\n" \
19895 "3:\tmov %3, %0\n" \
19896 "\tjmp 2b\n" \
19897 "\t.previous\n" \
19898 _ASM_EXTABLE(1b, 3b) \
19899- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19900+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19901 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19902 : "memory" \
19903 ); \
19904@@ -597,14 +673,14 @@ extern void __cmpxchg_wrong_size(void)
19905 __cmpxchg_wrong_size(); \
19906 \
19907 asm volatile("\t" ASM_STAC "\n" \
19908- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19909+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19910 "2:\t" ASM_CLAC "\n" \
19911 "\t.section .fixup, \"ax\"\n" \
19912 "3:\tmov %3, %0\n" \
19913 "\tjmp 2b\n" \
19914 "\t.previous\n" \
19915 _ASM_EXTABLE(1b, 3b) \
19916- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19917+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19918 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19919 : "memory" \
19920 ); \
19921@@ -613,6 +689,7 @@ extern void __cmpxchg_wrong_size(void)
19922 default: \
19923 __cmpxchg_wrong_size(); \
19924 } \
19925+ pax_close_userland(); \
19926 *__uval = __old; \
19927 __ret; \
19928 })
19929@@ -636,17 +713,6 @@ extern struct movsl_mask {
19930
19931 #define ARCH_HAS_NOCACHE_UACCESS 1
19932
19933-#ifdef CONFIG_X86_32
19934-# include <asm/uaccess_32.h>
19935-#else
19936-# include <asm/uaccess_64.h>
19937-#endif
19938-
19939-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19940- unsigned n);
19941-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19942- unsigned n);
19943-
19944 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19945 # define copy_user_diag __compiletime_error
19946 #else
19947@@ -656,7 +722,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19948 extern void copy_user_diag("copy_from_user() buffer size is too small")
19949 copy_from_user_overflow(void);
19950 extern void copy_user_diag("copy_to_user() buffer size is too small")
19951-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19952+copy_to_user_overflow(void);
19953
19954 #undef copy_user_diag
19955
19956@@ -669,7 +735,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19957
19958 extern void
19959 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19960-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19961+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19962 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19963
19964 #else
19965@@ -684,10 +750,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19966
19967 #endif
19968
19969+#ifdef CONFIG_X86_32
19970+# include <asm/uaccess_32.h>
19971+#else
19972+# include <asm/uaccess_64.h>
19973+#endif
19974+
19975 static inline unsigned long __must_check
19976 copy_from_user(void *to, const void __user *from, unsigned long n)
19977 {
19978- int sz = __compiletime_object_size(to);
19979+ size_t sz = __compiletime_object_size(to);
19980
19981 might_fault();
19982
19983@@ -709,12 +781,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19984 * case, and do only runtime checking for non-constant sizes.
19985 */
19986
19987- if (likely(sz < 0 || sz >= n))
19988- n = _copy_from_user(to, from, n);
19989- else if(__builtin_constant_p(n))
19990- copy_from_user_overflow();
19991- else
19992- __copy_from_user_overflow(sz, n);
19993+ if (likely(sz != (size_t)-1 && sz < n)) {
19994+ if(__builtin_constant_p(n))
19995+ copy_from_user_overflow();
19996+ else
19997+ __copy_from_user_overflow(sz, n);
19998+ } else if (access_ok(VERIFY_READ, from, n))
19999+ n = __copy_from_user(to, from, n);
20000+ else if ((long)n > 0)
20001+ memset(to, 0, n);
20002
20003 return n;
20004 }
20005@@ -722,17 +797,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
20006 static inline unsigned long __must_check
20007 copy_to_user(void __user *to, const void *from, unsigned long n)
20008 {
20009- int sz = __compiletime_object_size(from);
20010+ size_t sz = __compiletime_object_size(from);
20011
20012 might_fault();
20013
20014 /* See the comment in copy_from_user() above. */
20015- if (likely(sz < 0 || sz >= n))
20016- n = _copy_to_user(to, from, n);
20017- else if(__builtin_constant_p(n))
20018- copy_to_user_overflow();
20019- else
20020- __copy_to_user_overflow(sz, n);
20021+ if (likely(sz != (size_t)-1 && sz < n)) {
20022+ if(__builtin_constant_p(n))
20023+ copy_to_user_overflow();
20024+ else
20025+ __copy_to_user_overflow(sz, n);
20026+ } else if (access_ok(VERIFY_WRITE, to, n))
20027+ n = __copy_to_user(to, from, n);
20028
20029 return n;
20030 }
20031diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20032index 3c03a5d..1071638 100644
20033--- a/arch/x86/include/asm/uaccess_32.h
20034+++ b/arch/x86/include/asm/uaccess_32.h
20035@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20036 static __always_inline unsigned long __must_check
20037 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20038 {
20039+ if ((long)n < 0)
20040+ return n;
20041+
20042+ check_object_size(from, n, true);
20043+
20044 if (__builtin_constant_p(n)) {
20045 unsigned long ret;
20046
20047@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20048 __copy_to_user(void __user *to, const void *from, unsigned long n)
20049 {
20050 might_fault();
20051+
20052 return __copy_to_user_inatomic(to, from, n);
20053 }
20054
20055 static __always_inline unsigned long
20056 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20057 {
20058+ if ((long)n < 0)
20059+ return n;
20060+
20061 /* Avoid zeroing the tail if the copy fails..
20062 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20063 * but as the zeroing behaviour is only significant when n is not
20064@@ -137,6 +146,12 @@ static __always_inline unsigned long
20065 __copy_from_user(void *to, const void __user *from, unsigned long n)
20066 {
20067 might_fault();
20068+
20069+ if ((long)n < 0)
20070+ return n;
20071+
20072+ check_object_size(to, n, false);
20073+
20074 if (__builtin_constant_p(n)) {
20075 unsigned long ret;
20076
20077@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20078 const void __user *from, unsigned long n)
20079 {
20080 might_fault();
20081+
20082+ if ((long)n < 0)
20083+ return n;
20084+
20085 if (__builtin_constant_p(n)) {
20086 unsigned long ret;
20087
20088@@ -181,7 +200,10 @@ static __always_inline unsigned long
20089 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20090 unsigned long n)
20091 {
20092- return __copy_from_user_ll_nocache_nozero(to, from, n);
20093+ if ((long)n < 0)
20094+ return n;
20095+
20096+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20097 }
20098
20099 #endif /* _ASM_X86_UACCESS_32_H */
20100diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20101index 12a26b9..206c200 100644
20102--- a/arch/x86/include/asm/uaccess_64.h
20103+++ b/arch/x86/include/asm/uaccess_64.h
20104@@ -10,6 +10,9 @@
20105 #include <asm/alternative.h>
20106 #include <asm/cpufeature.h>
20107 #include <asm/page.h>
20108+#include <asm/pgtable.h>
20109+
20110+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20111
20112 /*
20113 * Copy To/From Userspace
20114@@ -17,14 +20,14 @@
20115
20116 /* Handles exceptions in both to and from, but doesn't do access_ok */
20117 __must_check unsigned long
20118-copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
20119+copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
20120 __must_check unsigned long
20121-copy_user_generic_string(void *to, const void *from, unsigned len);
20122+copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
20123 __must_check unsigned long
20124-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20125+copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
20126
20127 static __always_inline __must_check unsigned long
20128-copy_user_generic(void *to, const void *from, unsigned len)
20129+copy_user_generic(void *to, const void *from, unsigned long len)
20130 {
20131 unsigned ret;
20132
20133@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20134 }
20135
20136 __must_check unsigned long
20137-copy_in_user(void __user *to, const void __user *from, unsigned len);
20138+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20139
20140 static __always_inline __must_check
20141-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20142+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20143 {
20144- int ret = 0;
20145+ size_t sz = __compiletime_object_size(dst);
20146+ unsigned ret = 0;
20147+
20148+ if (size > INT_MAX)
20149+ return size;
20150+
20151+ check_object_size(dst, size, false);
20152+
20153+#ifdef CONFIG_PAX_MEMORY_UDEREF
20154+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20155+ return size;
20156+#endif
20157+
20158+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20159+ if(__builtin_constant_p(size))
20160+ copy_from_user_overflow();
20161+ else
20162+ __copy_from_user_overflow(sz, size);
20163+ return size;
20164+ }
20165
20166 if (!__builtin_constant_p(size))
20167- return copy_user_generic(dst, (__force void *)src, size);
20168+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20169 switch (size) {
20170- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20171+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20172 ret, "b", "b", "=q", 1);
20173 return ret;
20174- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20175+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20176 ret, "w", "w", "=r", 2);
20177 return ret;
20178- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20179+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20180 ret, "l", "k", "=r", 4);
20181 return ret;
20182- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20183+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20184 ret, "q", "", "=r", 8);
20185 return ret;
20186 case 10:
20187- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20188+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20189 ret, "q", "", "=r", 10);
20190 if (unlikely(ret))
20191 return ret;
20192 __get_user_asm(*(u16 *)(8 + (char *)dst),
20193- (u16 __user *)(8 + (char __user *)src),
20194+ (const u16 __user *)(8 + (const char __user *)src),
20195 ret, "w", "w", "=r", 2);
20196 return ret;
20197 case 16:
20198- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20199+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20200 ret, "q", "", "=r", 16);
20201 if (unlikely(ret))
20202 return ret;
20203 __get_user_asm(*(u64 *)(8 + (char *)dst),
20204- (u64 __user *)(8 + (char __user *)src),
20205+ (const u64 __user *)(8 + (const char __user *)src),
20206 ret, "q", "", "=r", 8);
20207 return ret;
20208 default:
20209- return copy_user_generic(dst, (__force void *)src, size);
20210+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20211 }
20212 }
20213
20214 static __always_inline __must_check
20215-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20216+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20217 {
20218 might_fault();
20219 return __copy_from_user_nocheck(dst, src, size);
20220 }
20221
20222 static __always_inline __must_check
20223-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20224+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20225 {
20226- int ret = 0;
20227+ size_t sz = __compiletime_object_size(src);
20228+ unsigned ret = 0;
20229+
20230+ if (size > INT_MAX)
20231+ return size;
20232+
20233+ check_object_size(src, size, true);
20234+
20235+#ifdef CONFIG_PAX_MEMORY_UDEREF
20236+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20237+ return size;
20238+#endif
20239+
20240+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20241+ if(__builtin_constant_p(size))
20242+ copy_to_user_overflow();
20243+ else
20244+ __copy_to_user_overflow(sz, size);
20245+ return size;
20246+ }
20247
20248 if (!__builtin_constant_p(size))
20249- return copy_user_generic((__force void *)dst, src, size);
20250+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20251 switch (size) {
20252- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20253+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20254 ret, "b", "b", "iq", 1);
20255 return ret;
20256- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20257+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20258 ret, "w", "w", "ir", 2);
20259 return ret;
20260- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20261+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20262 ret, "l", "k", "ir", 4);
20263 return ret;
20264- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20265+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20266 ret, "q", "", "er", 8);
20267 return ret;
20268 case 10:
20269- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20270+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20271 ret, "q", "", "er", 10);
20272 if (unlikely(ret))
20273 return ret;
20274 asm("":::"memory");
20275- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20276+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20277 ret, "w", "w", "ir", 2);
20278 return ret;
20279 case 16:
20280- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20281+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20282 ret, "q", "", "er", 16);
20283 if (unlikely(ret))
20284 return ret;
20285 asm("":::"memory");
20286- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20287+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20288 ret, "q", "", "er", 8);
20289 return ret;
20290 default:
20291- return copy_user_generic((__force void *)dst, src, size);
20292+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20293 }
20294 }
20295
20296 static __always_inline __must_check
20297-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20298+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20299 {
20300 might_fault();
20301 return __copy_to_user_nocheck(dst, src, size);
20302 }
20303
20304 static __always_inline __must_check
20305-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20306+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20307 {
20308- int ret = 0;
20309+ unsigned ret = 0;
20310
20311 might_fault();
20312+
20313+ if (size > INT_MAX)
20314+ return size;
20315+
20316+#ifdef CONFIG_PAX_MEMORY_UDEREF
20317+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20318+ return size;
20319+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20320+ return size;
20321+#endif
20322+
20323 if (!__builtin_constant_p(size))
20324- return copy_user_generic((__force void *)dst,
20325- (__force void *)src, size);
20326+ return copy_user_generic((__force_kernel void *)____m(dst),
20327+ (__force_kernel const void *)____m(src), size);
20328 switch (size) {
20329 case 1: {
20330 u8 tmp;
20331- __get_user_asm(tmp, (u8 __user *)src,
20332+ __get_user_asm(tmp, (const u8 __user *)src,
20333 ret, "b", "b", "=q", 1);
20334 if (likely(!ret))
20335 __put_user_asm(tmp, (u8 __user *)dst,
20336@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20337 }
20338 case 2: {
20339 u16 tmp;
20340- __get_user_asm(tmp, (u16 __user *)src,
20341+ __get_user_asm(tmp, (const u16 __user *)src,
20342 ret, "w", "w", "=r", 2);
20343 if (likely(!ret))
20344 __put_user_asm(tmp, (u16 __user *)dst,
20345@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20346
20347 case 4: {
20348 u32 tmp;
20349- __get_user_asm(tmp, (u32 __user *)src,
20350+ __get_user_asm(tmp, (const u32 __user *)src,
20351 ret, "l", "k", "=r", 4);
20352 if (likely(!ret))
20353 __put_user_asm(tmp, (u32 __user *)dst,
20354@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20355 }
20356 case 8: {
20357 u64 tmp;
20358- __get_user_asm(tmp, (u64 __user *)src,
20359+ __get_user_asm(tmp, (const u64 __user *)src,
20360 ret, "q", "", "=r", 8);
20361 if (likely(!ret))
20362 __put_user_asm(tmp, (u64 __user *)dst,
20363@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20364 return ret;
20365 }
20366 default:
20367- return copy_user_generic((__force void *)dst,
20368- (__force void *)src, size);
20369+ return copy_user_generic((__force_kernel void *)____m(dst),
20370+ (__force_kernel const void *)____m(src), size);
20371 }
20372 }
20373
20374-static __must_check __always_inline int
20375-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20376+static __must_check __always_inline unsigned long
20377+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20378 {
20379 return __copy_from_user_nocheck(dst, src, size);
20380 }
20381
20382-static __must_check __always_inline int
20383-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20384+static __must_check __always_inline unsigned long
20385+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20386 {
20387 return __copy_to_user_nocheck(dst, src, size);
20388 }
20389
20390-extern long __copy_user_nocache(void *dst, const void __user *src,
20391- unsigned size, int zerorest);
20392+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20393+ unsigned long size, int zerorest);
20394
20395-static inline int
20396-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20397+static inline unsigned long
20398+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20399 {
20400 might_fault();
20401+
20402+ if (size > INT_MAX)
20403+ return size;
20404+
20405+#ifdef CONFIG_PAX_MEMORY_UDEREF
20406+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20407+ return size;
20408+#endif
20409+
20410 return __copy_user_nocache(dst, src, size, 1);
20411 }
20412
20413-static inline int
20414+static inline unsigned long
20415 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20416- unsigned size)
20417+ unsigned long size)
20418 {
20419+ if (size > INT_MAX)
20420+ return size;
20421+
20422+#ifdef CONFIG_PAX_MEMORY_UDEREF
20423+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20424+ return size;
20425+#endif
20426+
20427 return __copy_user_nocache(dst, src, size, 0);
20428 }
20429
20430 unsigned long
20431-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20432+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20433
20434 #endif /* _ASM_X86_UACCESS_64_H */
20435diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20436index 5b238981..77fdd78 100644
20437--- a/arch/x86/include/asm/word-at-a-time.h
20438+++ b/arch/x86/include/asm/word-at-a-time.h
20439@@ -11,7 +11,7 @@
20440 * and shift, for example.
20441 */
20442 struct word_at_a_time {
20443- const unsigned long one_bits, high_bits;
20444+ unsigned long one_bits, high_bits;
20445 };
20446
20447 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20448diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20449index e45e4da..44e8572 100644
20450--- a/arch/x86/include/asm/x86_init.h
20451+++ b/arch/x86/include/asm/x86_init.h
20452@@ -129,7 +129,7 @@ struct x86_init_ops {
20453 struct x86_init_timers timers;
20454 struct x86_init_iommu iommu;
20455 struct x86_init_pci pci;
20456-};
20457+} __no_const;
20458
20459 /**
20460 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20461@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20462 void (*setup_percpu_clockev)(void);
20463 void (*early_percpu_clock_init)(void);
20464 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20465-};
20466+} __no_const;
20467
20468 struct timespec;
20469
20470@@ -168,7 +168,7 @@ struct x86_platform_ops {
20471 void (*save_sched_clock_state)(void);
20472 void (*restore_sched_clock_state)(void);
20473 void (*apic_post_init)(void);
20474-};
20475+} __no_const;
20476
20477 struct pci_dev;
20478 struct msi_msg;
20479@@ -185,7 +185,7 @@ struct x86_msi_ops {
20480 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20481 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20482 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20483-};
20484+} __no_const;
20485
20486 struct IO_APIC_route_entry;
20487 struct io_apic_irq_attr;
20488@@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20489 unsigned int destination, int vector,
20490 struct io_apic_irq_attr *attr);
20491 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20492-};
20493+} __no_const;
20494
20495 extern struct x86_init_ops x86_init;
20496 extern struct x86_cpuinit_ops x86_cpuinit;
20497diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20498index c949923..c22bfa4 100644
20499--- a/arch/x86/include/asm/xen/page.h
20500+++ b/arch/x86/include/asm/xen/page.h
20501@@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
20502 extern struct page *m2p_find_override(unsigned long mfn);
20503 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20504
20505-static inline unsigned long pfn_to_mfn(unsigned long pfn)
20506+static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20507 {
20508 unsigned long mfn;
20509
20510diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20511index 7e7a79a..0824666 100644
20512--- a/arch/x86/include/asm/xsave.h
20513+++ b/arch/x86/include/asm/xsave.h
20514@@ -228,12 +228,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20515 if (unlikely(err))
20516 return -EFAULT;
20517
20518+ pax_open_userland();
20519 __asm__ __volatile__(ASM_STAC "\n"
20520- "1:"XSAVE"\n"
20521+ "1:"
20522+ __copyuser_seg
20523+ XSAVE"\n"
20524 "2: " ASM_CLAC "\n"
20525 xstate_fault
20526 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20527 : "memory");
20528+ pax_close_userland();
20529 return err;
20530 }
20531
20532@@ -243,16 +247,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20533 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20534 {
20535 int err = 0;
20536- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20537+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20538 u32 lmask = mask;
20539 u32 hmask = mask >> 32;
20540
20541+ pax_open_userland();
20542 __asm__ __volatile__(ASM_STAC "\n"
20543- "1:"XRSTOR"\n"
20544+ "1:"
20545+ __copyuser_seg
20546+ XRSTOR"\n"
20547 "2: " ASM_CLAC "\n"
20548 xstate_fault
20549 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20550 : "memory"); /* memory required? */
20551+ pax_close_userland();
20552 return err;
20553 }
20554
20555diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20556index d993e33..8db1b18 100644
20557--- a/arch/x86/include/uapi/asm/e820.h
20558+++ b/arch/x86/include/uapi/asm/e820.h
20559@@ -58,7 +58,7 @@ struct e820map {
20560 #define ISA_START_ADDRESS 0xa0000
20561 #define ISA_END_ADDRESS 0x100000
20562
20563-#define BIOS_BEGIN 0x000a0000
20564+#define BIOS_BEGIN 0x000c0000
20565 #define BIOS_END 0x00100000
20566
20567 #define BIOS_ROM_BASE 0xffe00000
20568diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20569index 7b0a55a..ad115bf 100644
20570--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20571+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20572@@ -49,7 +49,6 @@
20573 #define EFLAGS 144
20574 #define RSP 152
20575 #define SS 160
20576-#define ARGOFFSET R11
20577 #endif /* __ASSEMBLY__ */
20578
20579 /* top of stack page */
20580diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20581index 8f1e774..9b4c381 100644
20582--- a/arch/x86/kernel/Makefile
20583+++ b/arch/x86/kernel/Makefile
20584@@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20585 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20586 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20587 obj-y += probe_roms.o
20588-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20589+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20590 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20591 obj-$(CONFIG_X86_64) += mcount_64.o
20592 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20593diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20594index a142e77..6222cdd 100644
20595--- a/arch/x86/kernel/acpi/boot.c
20596+++ b/arch/x86/kernel/acpi/boot.c
20597@@ -1276,7 +1276,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20598 * If your system is blacklisted here, but you find that acpi=force
20599 * works for you, please contact linux-acpi@vger.kernel.org
20600 */
20601-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20602+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20603 /*
20604 * Boxes that need ACPI disabled
20605 */
20606@@ -1351,7 +1351,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20607 };
20608
20609 /* second table for DMI checks that should run after early-quirks */
20610-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20611+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20612 /*
20613 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20614 * which includes some code which overrides all temperature
20615diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20616index 3136820..e2c6577 100644
20617--- a/arch/x86/kernel/acpi/sleep.c
20618+++ b/arch/x86/kernel/acpi/sleep.c
20619@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20620 #else /* CONFIG_64BIT */
20621 #ifdef CONFIG_SMP
20622 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20623+
20624+ pax_open_kernel();
20625 early_gdt_descr.address =
20626 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20627+ pax_close_kernel();
20628+
20629 initial_gs = per_cpu_offset(smp_processor_id());
20630 #endif
20631 initial_code = (unsigned long)wakeup_long64;
20632diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20633index 665c6b7..eae4d56 100644
20634--- a/arch/x86/kernel/acpi/wakeup_32.S
20635+++ b/arch/x86/kernel/acpi/wakeup_32.S
20636@@ -29,13 +29,11 @@ wakeup_pmode_return:
20637 # and restore the stack ... but you need gdt for this to work
20638 movl saved_context_esp, %esp
20639
20640- movl %cs:saved_magic, %eax
20641- cmpl $0x12345678, %eax
20642+ cmpl $0x12345678, saved_magic
20643 jne bogus_magic
20644
20645 # jump to place where we left off
20646- movl saved_eip, %eax
20647- jmp *%eax
20648+ jmp *(saved_eip)
20649
20650 bogus_magic:
20651 jmp bogus_magic
20652diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20653index 703130f..27a155d 100644
20654--- a/arch/x86/kernel/alternative.c
20655+++ b/arch/x86/kernel/alternative.c
20656@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20657 */
20658 for (a = start; a < end; a++) {
20659 instr = (u8 *)&a->instr_offset + a->instr_offset;
20660+
20661+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20662+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20663+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20664+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20665+#endif
20666+
20667 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20668 BUG_ON(a->replacementlen > a->instrlen);
20669 BUG_ON(a->instrlen > sizeof(insnbuf));
20670@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20671 add_nops(insnbuf + a->replacementlen,
20672 a->instrlen - a->replacementlen);
20673
20674+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20675+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20676+ instr = ktva_ktla(instr);
20677+#endif
20678+
20679 text_poke_early(instr, insnbuf, a->instrlen);
20680 }
20681 }
20682@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20683 for (poff = start; poff < end; poff++) {
20684 u8 *ptr = (u8 *)poff + *poff;
20685
20686+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20687+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20688+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20689+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20690+#endif
20691+
20692 if (!*poff || ptr < text || ptr >= text_end)
20693 continue;
20694 /* turn DS segment override prefix into lock prefix */
20695- if (*ptr == 0x3e)
20696+ if (*ktla_ktva(ptr) == 0x3e)
20697 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20698 }
20699 mutex_unlock(&text_mutex);
20700@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20701 for (poff = start; poff < end; poff++) {
20702 u8 *ptr = (u8 *)poff + *poff;
20703
20704+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20705+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20706+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20707+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20708+#endif
20709+
20710 if (!*poff || ptr < text || ptr >= text_end)
20711 continue;
20712 /* turn lock prefix into DS segment override prefix */
20713- if (*ptr == 0xf0)
20714+ if (*ktla_ktva(ptr) == 0xf0)
20715 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20716 }
20717 mutex_unlock(&text_mutex);
20718@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20719
20720 BUG_ON(p->len > MAX_PATCH_LEN);
20721 /* prep the buffer with the original instructions */
20722- memcpy(insnbuf, p->instr, p->len);
20723+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20724 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20725 (unsigned long)p->instr, p->len);
20726
20727@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20728 if (!uniproc_patched || num_possible_cpus() == 1)
20729 free_init_pages("SMP alternatives",
20730 (unsigned long)__smp_locks,
20731- (unsigned long)__smp_locks_end);
20732+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20733 #endif
20734
20735 apply_paravirt(__parainstructions, __parainstructions_end);
20736@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20737 * instructions. And on the local CPU you need to be protected again NMI or MCE
20738 * handlers seeing an inconsistent instruction while you patch.
20739 */
20740-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20741+void *__kprobes text_poke_early(void *addr, const void *opcode,
20742 size_t len)
20743 {
20744 unsigned long flags;
20745 local_irq_save(flags);
20746- memcpy(addr, opcode, len);
20747+
20748+ pax_open_kernel();
20749+ memcpy(ktla_ktva(addr), opcode, len);
20750 sync_core();
20751+ pax_close_kernel();
20752+
20753 local_irq_restore(flags);
20754 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20755 that causes hangs on some VIA CPUs. */
20756@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20757 */
20758 void *text_poke(void *addr, const void *opcode, size_t len)
20759 {
20760- unsigned long flags;
20761- char *vaddr;
20762+ unsigned char *vaddr = ktla_ktva(addr);
20763 struct page *pages[2];
20764- int i;
20765+ size_t i;
20766
20767 if (!core_kernel_text((unsigned long)addr)) {
20768- pages[0] = vmalloc_to_page(addr);
20769- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20770+ pages[0] = vmalloc_to_page(vaddr);
20771+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20772 } else {
20773- pages[0] = virt_to_page(addr);
20774+ pages[0] = virt_to_page(vaddr);
20775 WARN_ON(!PageReserved(pages[0]));
20776- pages[1] = virt_to_page(addr + PAGE_SIZE);
20777+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20778 }
20779 BUG_ON(!pages[0]);
20780- local_irq_save(flags);
20781- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20782- if (pages[1])
20783- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20784- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20785- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20786- clear_fixmap(FIX_TEXT_POKE0);
20787- if (pages[1])
20788- clear_fixmap(FIX_TEXT_POKE1);
20789- local_flush_tlb();
20790- sync_core();
20791- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20792- that causes hangs on some VIA CPUs. */
20793+ text_poke_early(addr, opcode, len);
20794 for (i = 0; i < len; i++)
20795- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20796- local_irq_restore(flags);
20797+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20798 return addr;
20799 }
20800
20801@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20802 if (likely(!bp_patching_in_progress))
20803 return 0;
20804
20805- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20806+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20807 return 0;
20808
20809 /* set up the specified breakpoint handler */
20810@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20811 */
20812 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20813 {
20814- unsigned char int3 = 0xcc;
20815+ const unsigned char int3 = 0xcc;
20816
20817 bp_int3_handler = handler;
20818 bp_int3_addr = (u8 *)addr + sizeof(int3);
20819diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20820index ba6cc04..06fd971 100644
20821--- a/arch/x86/kernel/apic/apic.c
20822+++ b/arch/x86/kernel/apic/apic.c
20823@@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
20824 /*
20825 * Debug level, exported for io_apic.c
20826 */
20827-unsigned int apic_verbosity;
20828+int apic_verbosity;
20829
20830 int pic_mode;
20831
20832@@ -1989,7 +1989,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20833 apic_write(APIC_ESR, 0);
20834 v = apic_read(APIC_ESR);
20835 ack_APIC_irq();
20836- atomic_inc(&irq_err_count);
20837+ atomic_inc_unchecked(&irq_err_count);
20838
20839 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20840 smp_processor_id(), v);
20841diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20842index de918c4..32eed23 100644
20843--- a/arch/x86/kernel/apic/apic_flat_64.c
20844+++ b/arch/x86/kernel/apic/apic_flat_64.c
20845@@ -154,7 +154,7 @@ static int flat_probe(void)
20846 return 1;
20847 }
20848
20849-static struct apic apic_flat = {
20850+static struct apic apic_flat __read_only = {
20851 .name = "flat",
20852 .probe = flat_probe,
20853 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20854@@ -260,7 +260,7 @@ static int physflat_probe(void)
20855 return 0;
20856 }
20857
20858-static struct apic apic_physflat = {
20859+static struct apic apic_physflat __read_only = {
20860
20861 .name = "physical flat",
20862 .probe = physflat_probe,
20863diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20864index b205cdb..d8503ff 100644
20865--- a/arch/x86/kernel/apic/apic_noop.c
20866+++ b/arch/x86/kernel/apic/apic_noop.c
20867@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20868 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20869 }
20870
20871-struct apic apic_noop = {
20872+struct apic apic_noop __read_only = {
20873 .name = "noop",
20874 .probe = noop_probe,
20875 .acpi_madt_oem_check = NULL,
20876diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20877index c4a8d63..fe893ac 100644
20878--- a/arch/x86/kernel/apic/bigsmp_32.c
20879+++ b/arch/x86/kernel/apic/bigsmp_32.c
20880@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20881 return dmi_bigsmp;
20882 }
20883
20884-static struct apic apic_bigsmp = {
20885+static struct apic apic_bigsmp __read_only = {
20886
20887 .name = "bigsmp",
20888 .probe = probe_bigsmp,
20889diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20890index 1183d54..6158e47 100644
20891--- a/arch/x86/kernel/apic/io_apic.c
20892+++ b/arch/x86/kernel/apic/io_apic.c
20893@@ -1230,7 +1230,7 @@ out:
20894 }
20895 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20896
20897-void lock_vector_lock(void)
20898+void lock_vector_lock(void) __acquires(vector_lock)
20899 {
20900 /* Used to the online set of cpus does not change
20901 * during assign_irq_vector.
20902@@ -1238,7 +1238,7 @@ void lock_vector_lock(void)
20903 raw_spin_lock(&vector_lock);
20904 }
20905
20906-void unlock_vector_lock(void)
20907+void unlock_vector_lock(void) __releases(vector_lock)
20908 {
20909 raw_spin_unlock(&vector_lock);
20910 }
20911@@ -2465,7 +2465,7 @@ static void ack_apic_edge(struct irq_data *data)
20912 ack_APIC_irq();
20913 }
20914
20915-atomic_t irq_mis_count;
20916+atomic_unchecked_t irq_mis_count;
20917
20918 #ifdef CONFIG_GENERIC_PENDING_IRQ
20919 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20920@@ -2606,7 +2606,7 @@ static void ack_apic_level(struct irq_data *data)
20921 * at the cpu.
20922 */
20923 if (!(v & (1 << (i & 0x1f)))) {
20924- atomic_inc(&irq_mis_count);
20925+ atomic_inc_unchecked(&irq_mis_count);
20926
20927 eoi_ioapic_irq(irq, cfg);
20928 }
20929diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20930index bda4886..f9c7195 100644
20931--- a/arch/x86/kernel/apic/probe_32.c
20932+++ b/arch/x86/kernel/apic/probe_32.c
20933@@ -72,7 +72,7 @@ static int probe_default(void)
20934 return 1;
20935 }
20936
20937-static struct apic apic_default = {
20938+static struct apic apic_default __read_only = {
20939
20940 .name = "default",
20941 .probe = probe_default,
20942diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20943index e658f21..b695a1a 100644
20944--- a/arch/x86/kernel/apic/x2apic_cluster.c
20945+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20946@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20947 return notifier_from_errno(err);
20948 }
20949
20950-static struct notifier_block __refdata x2apic_cpu_notifier = {
20951+static struct notifier_block x2apic_cpu_notifier = {
20952 .notifier_call = update_clusterinfo,
20953 };
20954
20955@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20956 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20957 }
20958
20959-static struct apic apic_x2apic_cluster = {
20960+static struct apic apic_x2apic_cluster __read_only = {
20961
20962 .name = "cluster x2apic",
20963 .probe = x2apic_cluster_probe,
20964diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20965index 6fae733..5ca17af 100644
20966--- a/arch/x86/kernel/apic/x2apic_phys.c
20967+++ b/arch/x86/kernel/apic/x2apic_phys.c
20968@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20969 return apic == &apic_x2apic_phys;
20970 }
20971
20972-static struct apic apic_x2apic_phys = {
20973+static struct apic apic_x2apic_phys __read_only = {
20974
20975 .name = "physical x2apic",
20976 .probe = x2apic_phys_probe,
20977diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20978index 8e9dcfd..c61b3e4 100644
20979--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20980+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20981@@ -348,7 +348,7 @@ static int uv_probe(void)
20982 return apic == &apic_x2apic_uv_x;
20983 }
20984
20985-static struct apic __refdata apic_x2apic_uv_x = {
20986+static struct apic apic_x2apic_uv_x __read_only = {
20987
20988 .name = "UV large system",
20989 .probe = uv_probe,
20990diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20991index 5848744..56cb598 100644
20992--- a/arch/x86/kernel/apm_32.c
20993+++ b/arch/x86/kernel/apm_32.c
20994@@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20995 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20996 * even though they are called in protected mode.
20997 */
20998-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20999+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21000 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21001
21002 static const char driver_version[] = "1.16ac"; /* no spaces */
21003@@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
21004 BUG_ON(cpu != 0);
21005 gdt = get_cpu_gdt_table(cpu);
21006 save_desc_40 = gdt[0x40 / 8];
21007+
21008+ pax_open_kernel();
21009 gdt[0x40 / 8] = bad_bios_desc;
21010+ pax_close_kernel();
21011
21012 apm_irq_save(flags);
21013 APM_DO_SAVE_SEGS;
21014@@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
21015 &call->esi);
21016 APM_DO_RESTORE_SEGS;
21017 apm_irq_restore(flags);
21018+
21019+ pax_open_kernel();
21020 gdt[0x40 / 8] = save_desc_40;
21021+ pax_close_kernel();
21022+
21023 put_cpu();
21024
21025 return call->eax & 0xff;
21026@@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
21027 BUG_ON(cpu != 0);
21028 gdt = get_cpu_gdt_table(cpu);
21029 save_desc_40 = gdt[0x40 / 8];
21030+
21031+ pax_open_kernel();
21032 gdt[0x40 / 8] = bad_bios_desc;
21033+ pax_close_kernel();
21034
21035 apm_irq_save(flags);
21036 APM_DO_SAVE_SEGS;
21037@@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
21038 &call->eax);
21039 APM_DO_RESTORE_SEGS;
21040 apm_irq_restore(flags);
21041+
21042+ pax_open_kernel();
21043 gdt[0x40 / 8] = save_desc_40;
21044+ pax_close_kernel();
21045+
21046 put_cpu();
21047 return error;
21048 }
21049@@ -2350,12 +2364,15 @@ static int __init apm_init(void)
21050 * code to that CPU.
21051 */
21052 gdt = get_cpu_gdt_table(0);
21053+
21054+ pax_open_kernel();
21055 set_desc_base(&gdt[APM_CS >> 3],
21056 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21057 set_desc_base(&gdt[APM_CS_16 >> 3],
21058 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21059 set_desc_base(&gdt[APM_DS >> 3],
21060 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21061+ pax_close_kernel();
21062
21063 proc_create("apm", 0, NULL, &apm_file_ops);
21064
21065diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21066index 9f6b934..cf5ffb3 100644
21067--- a/arch/x86/kernel/asm-offsets.c
21068+++ b/arch/x86/kernel/asm-offsets.c
21069@@ -32,6 +32,8 @@ void common(void) {
21070 OFFSET(TI_flags, thread_info, flags);
21071 OFFSET(TI_status, thread_info, status);
21072 OFFSET(TI_addr_limit, thread_info, addr_limit);
21073+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21074+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21075
21076 BLANK();
21077 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21078@@ -52,8 +54,26 @@ void common(void) {
21079 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21080 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21081 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21082+
21083+#ifdef CONFIG_PAX_KERNEXEC
21084+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21085 #endif
21086
21087+#ifdef CONFIG_PAX_MEMORY_UDEREF
21088+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21089+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21090+#ifdef CONFIG_X86_64
21091+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21092+#endif
21093+#endif
21094+
21095+#endif
21096+
21097+ BLANK();
21098+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21099+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21100+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21101+
21102 #ifdef CONFIG_XEN
21103 BLANK();
21104 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21105diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21106index e7c798b..2b2019b 100644
21107--- a/arch/x86/kernel/asm-offsets_64.c
21108+++ b/arch/x86/kernel/asm-offsets_64.c
21109@@ -77,6 +77,7 @@ int main(void)
21110 BLANK();
21111 #undef ENTRY
21112
21113+ DEFINE(TSS_size, sizeof(struct tss_struct));
21114 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21115 BLANK();
21116
21117diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21118index 80091ae..0c5184f 100644
21119--- a/arch/x86/kernel/cpu/Makefile
21120+++ b/arch/x86/kernel/cpu/Makefile
21121@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21122 CFLAGS_REMOVE_perf_event.o = -pg
21123 endif
21124
21125-# Make sure load_percpu_segment has no stackprotector
21126-nostackp := $(call cc-option, -fno-stack-protector)
21127-CFLAGS_common.o := $(nostackp)
21128-
21129 obj-y := intel_cacheinfo.o scattered.o topology.o
21130 obj-y += common.o
21131 obj-y += rdrand.o
21132diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21133index 813d29d..6e542d4 100644
21134--- a/arch/x86/kernel/cpu/amd.c
21135+++ b/arch/x86/kernel/cpu/amd.c
21136@@ -718,7 +718,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21137 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21138 {
21139 /* AMD errata T13 (order #21922) */
21140- if ((c->x86 == 6)) {
21141+ if (c->x86 == 6) {
21142 /* Duron Rev A0 */
21143 if (c->x86_model == 3 && c->x86_mask == 0)
21144 size = 64;
21145diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21146index cfa9b5b..19b5084 100644
21147--- a/arch/x86/kernel/cpu/common.c
21148+++ b/arch/x86/kernel/cpu/common.c
21149@@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
21150
21151 static const struct cpu_dev *this_cpu = &default_cpu;
21152
21153-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21154-#ifdef CONFIG_X86_64
21155- /*
21156- * We need valid kernel segments for data and code in long mode too
21157- * IRET will check the segment types kkeil 2000/10/28
21158- * Also sysret mandates a special GDT layout
21159- *
21160- * TLS descriptors are currently at a different place compared to i386.
21161- * Hopefully nobody expects them at a fixed place (Wine?)
21162- */
21163- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21164- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21165- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21166- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21167- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21168- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21169-#else
21170- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21171- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21172- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21173- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21174- /*
21175- * Segments used for calling PnP BIOS have byte granularity.
21176- * They code segments and data segments have fixed 64k limits,
21177- * the transfer segment sizes are set at run time.
21178- */
21179- /* 32-bit code */
21180- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21181- /* 16-bit code */
21182- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21183- /* 16-bit data */
21184- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21185- /* 16-bit data */
21186- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21187- /* 16-bit data */
21188- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21189- /*
21190- * The APM segments have byte granularity and their bases
21191- * are set at run time. All have 64k limits.
21192- */
21193- /* 32-bit code */
21194- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21195- /* 16-bit code */
21196- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21197- /* data */
21198- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21199-
21200- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21201- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21202- GDT_STACK_CANARY_INIT
21203-#endif
21204-} };
21205-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21206-
21207 static int __init x86_xsave_setup(char *s)
21208 {
21209 if (strlen(s))
21210@@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21211 }
21212 }
21213
21214+#ifdef CONFIG_X86_64
21215+static __init int setup_disable_pcid(char *arg)
21216+{
21217+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21218+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21219+
21220+#ifdef CONFIG_PAX_MEMORY_UDEREF
21221+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21222+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21223+#endif
21224+
21225+ return 1;
21226+}
21227+__setup("nopcid", setup_disable_pcid);
21228+
21229+static void setup_pcid(struct cpuinfo_x86 *c)
21230+{
21231+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21232+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21233+
21234+#ifdef CONFIG_PAX_MEMORY_UDEREF
21235+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21236+ pax_open_kernel();
21237+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21238+ pax_close_kernel();
21239+ printk("PAX: slow and weak UDEREF enabled\n");
21240+ } else
21241+ printk("PAX: UDEREF disabled\n");
21242+#endif
21243+
21244+ return;
21245+ }
21246+
21247+ printk("PAX: PCID detected\n");
21248+ set_in_cr4(X86_CR4_PCIDE);
21249+
21250+#ifdef CONFIG_PAX_MEMORY_UDEREF
21251+ pax_open_kernel();
21252+ clone_pgd_mask = ~(pgdval_t)0UL;
21253+ pax_close_kernel();
21254+ if (pax_user_shadow_base)
21255+ printk("PAX: weak UDEREF enabled\n");
21256+ else {
21257+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21258+ printk("PAX: strong UDEREF enabled\n");
21259+ }
21260+#endif
21261+
21262+ if (cpu_has(c, X86_FEATURE_INVPCID))
21263+ printk("PAX: INVPCID detected\n");
21264+}
21265+#endif
21266+
21267 /*
21268 * Some CPU features depend on higher CPUID levels, which may not always
21269 * be available due to CPUID level capping or broken virtualization
21270@@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
21271 {
21272 struct desc_ptr gdt_descr;
21273
21274- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21275+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21276 gdt_descr.size = GDT_SIZE - 1;
21277 load_gdt(&gdt_descr);
21278 /* Reload the per-cpu base */
21279@@ -895,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21280 setup_smep(c);
21281 setup_smap(c);
21282
21283+#ifdef CONFIG_X86_64
21284+ setup_pcid(c);
21285+#endif
21286+
21287 /*
21288 * The vendor-specific functions might have changed features.
21289 * Now we do "generic changes."
21290@@ -903,6 +906,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21291 /* Filter out anything that depends on CPUID levels we don't have */
21292 filter_cpuid_features(c, true);
21293
21294+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
21295+ setup_clear_cpu_cap(X86_FEATURE_SEP);
21296+#endif
21297+
21298 /* If the model name is still unset, do table lookup. */
21299 if (!c->x86_model_id[0]) {
21300 const char *p;
21301@@ -985,7 +992,7 @@ static void syscall32_cpu_init(void)
21302 void enable_sep_cpu(void)
21303 {
21304 int cpu = get_cpu();
21305- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21306+ struct tss_struct *tss = init_tss + cpu;
21307
21308 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21309 put_cpu();
21310@@ -1125,14 +1132,16 @@ static __init int setup_disablecpuid(char *arg)
21311 }
21312 __setup("clearcpuid=", setup_disablecpuid);
21313
21314+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21315+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21316+
21317 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21318- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21319+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21320 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21321
21322 #ifdef CONFIG_X86_64
21323-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21324-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21325- (unsigned long) debug_idt_table };
21326+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21327+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21328
21329 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21330 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21331@@ -1309,7 +1318,7 @@ void cpu_init(void)
21332 */
21333 load_ucode_ap();
21334
21335- t = &per_cpu(init_tss, cpu);
21336+ t = init_tss + cpu;
21337 oist = &per_cpu(orig_ist, cpu);
21338
21339 #ifdef CONFIG_NUMA
21340@@ -1341,7 +1350,6 @@ void cpu_init(void)
21341 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21342 barrier();
21343
21344- x86_configure_nx();
21345 enable_x2apic();
21346
21347 /*
21348@@ -1393,7 +1401,7 @@ void cpu_init(void)
21349 {
21350 int cpu = smp_processor_id();
21351 struct task_struct *curr = current;
21352- struct tss_struct *t = &per_cpu(init_tss, cpu);
21353+ struct tss_struct *t = init_tss + cpu;
21354 struct thread_struct *thread = &curr->thread;
21355
21356 wait_for_master_cpu(cpu);
21357diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21358index c703507..28535e3 100644
21359--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21360+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21361@@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
21362 };
21363
21364 #ifdef CONFIG_AMD_NB
21365+static struct attribute *default_attrs_amd_nb[] = {
21366+ &type.attr,
21367+ &level.attr,
21368+ &coherency_line_size.attr,
21369+ &physical_line_partition.attr,
21370+ &ways_of_associativity.attr,
21371+ &number_of_sets.attr,
21372+ &size.attr,
21373+ &shared_cpu_map.attr,
21374+ &shared_cpu_list.attr,
21375+ NULL,
21376+ NULL,
21377+ NULL,
21378+ NULL
21379+};
21380+
21381 static struct attribute **amd_l3_attrs(void)
21382 {
21383 static struct attribute **attrs;
21384@@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
21385
21386 n = ARRAY_SIZE(default_attrs);
21387
21388- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21389- n += 2;
21390-
21391- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21392- n += 1;
21393-
21394- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21395- if (attrs == NULL)
21396- return attrs = default_attrs;
21397-
21398- for (n = 0; default_attrs[n]; n++)
21399- attrs[n] = default_attrs[n];
21400+ attrs = default_attrs_amd_nb;
21401
21402 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21403 attrs[n++] = &cache_disable_0.attr;
21404@@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
21405 .default_attrs = default_attrs,
21406 };
21407
21408+#ifdef CONFIG_AMD_NB
21409+static struct kobj_type ktype_cache_amd_nb = {
21410+ .sysfs_ops = &sysfs_ops,
21411+ .default_attrs = default_attrs_amd_nb,
21412+};
21413+#endif
21414+
21415 static struct kobj_type ktype_percpu_entry = {
21416 .sysfs_ops = &sysfs_ops,
21417 };
21418@@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
21419 return retval;
21420 }
21421
21422+#ifdef CONFIG_AMD_NB
21423+ amd_l3_attrs();
21424+#endif
21425+
21426 for (i = 0; i < num_cache_leaves; i++) {
21427+ struct kobj_type *ktype;
21428+
21429 this_object = INDEX_KOBJECT_PTR(cpu, i);
21430 this_object->cpu = cpu;
21431 this_object->index = i;
21432
21433 this_leaf = CPUID4_INFO_IDX(cpu, i);
21434
21435- ktype_cache.default_attrs = default_attrs;
21436+ ktype = &ktype_cache;
21437 #ifdef CONFIG_AMD_NB
21438 if (this_leaf->base.nb)
21439- ktype_cache.default_attrs = amd_l3_attrs();
21440+ ktype = &ktype_cache_amd_nb;
21441 #endif
21442 retval = kobject_init_and_add(&(this_object->kobj),
21443- &ktype_cache,
21444+ ktype,
21445 per_cpu(ici_cache_kobject, cpu),
21446 "index%1lu", i);
21447 if (unlikely(retval)) {
21448diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21449index 61a9668ce..b446a37 100644
21450--- a/arch/x86/kernel/cpu/mcheck/mce.c
21451+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21452@@ -45,6 +45,7 @@
21453 #include <asm/processor.h>
21454 #include <asm/mce.h>
21455 #include <asm/msr.h>
21456+#include <asm/local.h>
21457
21458 #include "mce-internal.h"
21459
21460@@ -259,7 +260,7 @@ static void print_mce(struct mce *m)
21461 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21462 m->cs, m->ip);
21463
21464- if (m->cs == __KERNEL_CS)
21465+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21466 print_symbol("{%s}", m->ip);
21467 pr_cont("\n");
21468 }
21469@@ -292,10 +293,10 @@ static void print_mce(struct mce *m)
21470
21471 #define PANIC_TIMEOUT 5 /* 5 seconds */
21472
21473-static atomic_t mce_paniced;
21474+static atomic_unchecked_t mce_paniced;
21475
21476 static int fake_panic;
21477-static atomic_t mce_fake_paniced;
21478+static atomic_unchecked_t mce_fake_paniced;
21479
21480 /* Panic in progress. Enable interrupts and wait for final IPI */
21481 static void wait_for_panic(void)
21482@@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21483 /*
21484 * Make sure only one CPU runs in machine check panic
21485 */
21486- if (atomic_inc_return(&mce_paniced) > 1)
21487+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21488 wait_for_panic();
21489 barrier();
21490
21491@@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21492 console_verbose();
21493 } else {
21494 /* Don't log too much for fake panic */
21495- if (atomic_inc_return(&mce_fake_paniced) > 1)
21496+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21497 return;
21498 }
21499 /* First print corrected ones that are still unlogged */
21500@@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21501 if (!fake_panic) {
21502 if (panic_timeout == 0)
21503 panic_timeout = mca_cfg.panic_timeout;
21504- panic(msg);
21505+ panic("%s", msg);
21506 } else
21507 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21508 }
21509@@ -697,7 +698,7 @@ static int mce_timed_out(u64 *t)
21510 * might have been modified by someone else.
21511 */
21512 rmb();
21513- if (atomic_read(&mce_paniced))
21514+ if (atomic_read_unchecked(&mce_paniced))
21515 wait_for_panic();
21516 if (!mca_cfg.monarch_timeout)
21517 goto out;
21518@@ -1674,7 +1675,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21519 }
21520
21521 /* Call the installed machine check handler for this CPU setup. */
21522-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21523+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21524 unexpected_machine_check;
21525
21526 /*
21527@@ -1697,7 +1698,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21528 return;
21529 }
21530
21531+ pax_open_kernel();
21532 machine_check_vector = do_machine_check;
21533+ pax_close_kernel();
21534
21535 __mcheck_cpu_init_generic();
21536 __mcheck_cpu_init_vendor(c);
21537@@ -1711,7 +1714,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21538 */
21539
21540 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21541-static int mce_chrdev_open_count; /* #times opened */
21542+static local_t mce_chrdev_open_count; /* #times opened */
21543 static int mce_chrdev_open_exclu; /* already open exclusive? */
21544
21545 static int mce_chrdev_open(struct inode *inode, struct file *file)
21546@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21547 spin_lock(&mce_chrdev_state_lock);
21548
21549 if (mce_chrdev_open_exclu ||
21550- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21551+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21552 spin_unlock(&mce_chrdev_state_lock);
21553
21554 return -EBUSY;
21555@@ -1727,7 +1730,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21556
21557 if (file->f_flags & O_EXCL)
21558 mce_chrdev_open_exclu = 1;
21559- mce_chrdev_open_count++;
21560+ local_inc(&mce_chrdev_open_count);
21561
21562 spin_unlock(&mce_chrdev_state_lock);
21563
21564@@ -1738,7 +1741,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21565 {
21566 spin_lock(&mce_chrdev_state_lock);
21567
21568- mce_chrdev_open_count--;
21569+ local_dec(&mce_chrdev_open_count);
21570 mce_chrdev_open_exclu = 0;
21571
21572 spin_unlock(&mce_chrdev_state_lock);
21573@@ -2413,7 +2416,7 @@ static __init void mce_init_banks(void)
21574
21575 for (i = 0; i < mca_cfg.banks; i++) {
21576 struct mce_bank *b = &mce_banks[i];
21577- struct device_attribute *a = &b->attr;
21578+ device_attribute_no_const *a = &b->attr;
21579
21580 sysfs_attr_init(&a->attr);
21581 a->attr.name = b->attrname;
21582@@ -2520,7 +2523,7 @@ struct dentry *mce_get_debugfs_dir(void)
21583 static void mce_reset(void)
21584 {
21585 cpu_missing = 0;
21586- atomic_set(&mce_fake_paniced, 0);
21587+ atomic_set_unchecked(&mce_fake_paniced, 0);
21588 atomic_set(&mce_executing, 0);
21589 atomic_set(&mce_callin, 0);
21590 atomic_set(&global_nwo, 0);
21591diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21592index a304298..49b6d06 100644
21593--- a/arch/x86/kernel/cpu/mcheck/p5.c
21594+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21595@@ -10,6 +10,7 @@
21596 #include <asm/processor.h>
21597 #include <asm/mce.h>
21598 #include <asm/msr.h>
21599+#include <asm/pgtable.h>
21600
21601 /* By default disabled */
21602 int mce_p5_enabled __read_mostly;
21603@@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21604 if (!cpu_has(c, X86_FEATURE_MCE))
21605 return;
21606
21607+ pax_open_kernel();
21608 machine_check_vector = pentium_machine_check;
21609+ pax_close_kernel();
21610 /* Make sure the vector pointer is visible before we enable MCEs: */
21611 wmb();
21612
21613diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21614index 7dc5564..1273569 100644
21615--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21616+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21617@@ -9,6 +9,7 @@
21618 #include <asm/processor.h>
21619 #include <asm/mce.h>
21620 #include <asm/msr.h>
21621+#include <asm/pgtable.h>
21622
21623 /* Machine check handler for WinChip C6: */
21624 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21625@@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21626 {
21627 u32 lo, hi;
21628
21629+ pax_open_kernel();
21630 machine_check_vector = winchip_machine_check;
21631+ pax_close_kernel();
21632 /* Make sure the vector pointer is visible before we enable MCEs: */
21633 wmb();
21634
21635diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21636index 15c2909..2cef20c 100644
21637--- a/arch/x86/kernel/cpu/microcode/core.c
21638+++ b/arch/x86/kernel/cpu/microcode/core.c
21639@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21640 return NOTIFY_OK;
21641 }
21642
21643-static struct notifier_block __refdata mc_cpu_notifier = {
21644+static struct notifier_block mc_cpu_notifier = {
21645 .notifier_call = mc_cpu_callback,
21646 };
21647
21648diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21649index c6826d1..ad18e14a 100644
21650--- a/arch/x86/kernel/cpu/microcode/intel.c
21651+++ b/arch/x86/kernel/cpu/microcode/intel.c
21652@@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21653
21654 static int get_ucode_user(void *to, const void *from, size_t n)
21655 {
21656- return copy_from_user(to, from, n);
21657+ return copy_from_user(to, (const void __force_user *)from, n);
21658 }
21659
21660 static enum ucode_state
21661 request_microcode_user(int cpu, const void __user *buf, size_t size)
21662 {
21663- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21664+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21665 }
21666
21667 static void microcode_fini_cpu(int cpu)
21668diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21669index ea5f363..cb0e905 100644
21670--- a/arch/x86/kernel/cpu/mtrr/main.c
21671+++ b/arch/x86/kernel/cpu/mtrr/main.c
21672@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21673 u64 size_or_mask, size_and_mask;
21674 static bool mtrr_aps_delayed_init;
21675
21676-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21677+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21678
21679 const struct mtrr_ops *mtrr_if;
21680
21681diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21682index df5e41f..816c719 100644
21683--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21684+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21685@@ -25,7 +25,7 @@ struct mtrr_ops {
21686 int (*validate_add_page)(unsigned long base, unsigned long size,
21687 unsigned int type);
21688 int (*have_wrcomb)(void);
21689-};
21690+} __do_const;
21691
21692 extern int generic_get_free_region(unsigned long base, unsigned long size,
21693 int replace_reg);
21694diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21695index 143e5f5..5825081 100644
21696--- a/arch/x86/kernel/cpu/perf_event.c
21697+++ b/arch/x86/kernel/cpu/perf_event.c
21698@@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
21699
21700 }
21701
21702-static struct attribute_group x86_pmu_format_group = {
21703+static attribute_group_no_const x86_pmu_format_group = {
21704 .name = "format",
21705 .attrs = NULL,
21706 };
21707@@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
21708 NULL,
21709 };
21710
21711-static struct attribute_group x86_pmu_events_group = {
21712+static attribute_group_no_const x86_pmu_events_group = {
21713 .name = "events",
21714 .attrs = events_attr,
21715 };
21716@@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
21717 if (idx > GDT_ENTRIES)
21718 return 0;
21719
21720- desc = raw_cpu_ptr(gdt_page.gdt);
21721+ desc = get_cpu_gdt_table(smp_processor_id());
21722 }
21723
21724 return get_desc_base(desc + idx);
21725@@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21726 break;
21727
21728 perf_callchain_store(entry, frame.return_address);
21729- fp = frame.next_frame;
21730+ fp = (const void __force_user *)frame.next_frame;
21731 }
21732 }
21733
21734diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21735index 639d128..e92d7e5 100644
21736--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21737+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21738@@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21739 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21740 {
21741 struct attribute **attrs;
21742- struct attribute_group *attr_group;
21743+ attribute_group_no_const *attr_group;
21744 int i = 0, j;
21745
21746 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21747diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21748index 944bf01..4a4392f 100644
21749--- a/arch/x86/kernel/cpu/perf_event_intel.c
21750+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21751@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21752 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21753
21754 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21755- u64 capabilities;
21756+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21757
21758- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21759- x86_pmu.intel_cap.capabilities = capabilities;
21760+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21761+ x86_pmu.intel_cap.capabilities = capabilities;
21762 }
21763
21764 intel_ds_init();
21765diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21766index d64f275..26522ff 100644
21767--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21768+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21769@@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21770 NULL,
21771 };
21772
21773-static struct attribute_group rapl_pmu_events_group = {
21774+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21775 .name = "events",
21776 .attrs = NULL, /* patched at runtime */
21777 };
21778diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21779index e98f68c..1992b15 100644
21780--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21781+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21782@@ -737,7 +737,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21783 static int __init uncore_type_init(struct intel_uncore_type *type)
21784 {
21785 struct intel_uncore_pmu *pmus;
21786- struct attribute_group *attr_group;
21787+ attribute_group_no_const *attr_group;
21788 struct attribute **attrs;
21789 int i, j;
21790
21791diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21792index 863d9b0..6289b63 100644
21793--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21794+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21795@@ -114,7 +114,7 @@ struct intel_uncore_box {
21796 struct uncore_event_desc {
21797 struct kobj_attribute attr;
21798 const char *config;
21799-};
21800+} __do_const;
21801
21802 ssize_t uncore_event_show(struct kobject *kobj,
21803 struct kobj_attribute *attr, char *buf);
21804diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21805index 3225ae6c..ee3c6db 100644
21806--- a/arch/x86/kernel/cpuid.c
21807+++ b/arch/x86/kernel/cpuid.c
21808@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21809 return notifier_from_errno(err);
21810 }
21811
21812-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21813+static struct notifier_block cpuid_class_cpu_notifier =
21814 {
21815 .notifier_call = cpuid_class_cpu_callback,
21816 };
21817diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21818index f5ab56d..d3b201a 100644
21819--- a/arch/x86/kernel/crash.c
21820+++ b/arch/x86/kernel/crash.c
21821@@ -104,7 +104,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21822 #ifdef CONFIG_X86_32
21823 struct pt_regs fixed_regs;
21824
21825- if (!user_mode_vm(regs)) {
21826+ if (!user_mode(regs)) {
21827 crash_fixup_ss_esp(&fixed_regs, regs);
21828 regs = &fixed_regs;
21829 }
21830diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21831index afa64ad..dce67dd 100644
21832--- a/arch/x86/kernel/crash_dump_64.c
21833+++ b/arch/x86/kernel/crash_dump_64.c
21834@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21835 return -ENOMEM;
21836
21837 if (userbuf) {
21838- if (copy_to_user(buf, vaddr + offset, csize)) {
21839+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21840 iounmap(vaddr);
21841 return -EFAULT;
21842 }
21843diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21844index f6dfd93..892ade4 100644
21845--- a/arch/x86/kernel/doublefault.c
21846+++ b/arch/x86/kernel/doublefault.c
21847@@ -12,7 +12,7 @@
21848
21849 #define DOUBLEFAULT_STACKSIZE (1024)
21850 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21851-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21852+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21853
21854 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21855
21856@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21857 unsigned long gdt, tss;
21858
21859 native_store_gdt(&gdt_desc);
21860- gdt = gdt_desc.address;
21861+ gdt = (unsigned long)gdt_desc.address;
21862
21863 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21864
21865@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21866 /* 0x2 bit is always set */
21867 .flags = X86_EFLAGS_SF | 0x2,
21868 .sp = STACK_START,
21869- .es = __USER_DS,
21870+ .es = __KERNEL_DS,
21871 .cs = __KERNEL_CS,
21872 .ss = __KERNEL_DS,
21873- .ds = __USER_DS,
21874+ .ds = __KERNEL_DS,
21875 .fs = __KERNEL_PERCPU,
21876
21877 .__cr3 = __pa_nodebug(swapper_pg_dir),
21878diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21879index b74ebc7..2c95874 100644
21880--- a/arch/x86/kernel/dumpstack.c
21881+++ b/arch/x86/kernel/dumpstack.c
21882@@ -2,6 +2,9 @@
21883 * Copyright (C) 1991, 1992 Linus Torvalds
21884 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21885 */
21886+#ifdef CONFIG_GRKERNSEC_HIDESYM
21887+#define __INCLUDED_BY_HIDESYM 1
21888+#endif
21889 #include <linux/kallsyms.h>
21890 #include <linux/kprobes.h>
21891 #include <linux/uaccess.h>
21892@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21893
21894 void printk_address(unsigned long address)
21895 {
21896- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21897+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21898 }
21899
21900 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21901 static void
21902 print_ftrace_graph_addr(unsigned long addr, void *data,
21903 const struct stacktrace_ops *ops,
21904- struct thread_info *tinfo, int *graph)
21905+ struct task_struct *task, int *graph)
21906 {
21907- struct task_struct *task;
21908 unsigned long ret_addr;
21909 int index;
21910
21911 if (addr != (unsigned long)return_to_handler)
21912 return;
21913
21914- task = tinfo->task;
21915 index = task->curr_ret_stack;
21916
21917 if (!task->ret_stack || index < *graph)
21918@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21919 static inline void
21920 print_ftrace_graph_addr(unsigned long addr, void *data,
21921 const struct stacktrace_ops *ops,
21922- struct thread_info *tinfo, int *graph)
21923+ struct task_struct *task, int *graph)
21924 { }
21925 #endif
21926
21927@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21928 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21929 */
21930
21931-static inline int valid_stack_ptr(struct thread_info *tinfo,
21932- void *p, unsigned int size, void *end)
21933+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21934 {
21935- void *t = tinfo;
21936 if (end) {
21937 if (p < end && p >= (end-THREAD_SIZE))
21938 return 1;
21939@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21940 }
21941
21942 unsigned long
21943-print_context_stack(struct thread_info *tinfo,
21944+print_context_stack(struct task_struct *task, void *stack_start,
21945 unsigned long *stack, unsigned long bp,
21946 const struct stacktrace_ops *ops, void *data,
21947 unsigned long *end, int *graph)
21948 {
21949 struct stack_frame *frame = (struct stack_frame *)bp;
21950
21951- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21952+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21953 unsigned long addr;
21954
21955 addr = *stack;
21956@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21957 } else {
21958 ops->address(data, addr, 0);
21959 }
21960- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21961+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21962 }
21963 stack++;
21964 }
21965@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21966 EXPORT_SYMBOL_GPL(print_context_stack);
21967
21968 unsigned long
21969-print_context_stack_bp(struct thread_info *tinfo,
21970+print_context_stack_bp(struct task_struct *task, void *stack_start,
21971 unsigned long *stack, unsigned long bp,
21972 const struct stacktrace_ops *ops, void *data,
21973 unsigned long *end, int *graph)
21974@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21975 struct stack_frame *frame = (struct stack_frame *)bp;
21976 unsigned long *ret_addr = &frame->return_address;
21977
21978- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21979+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21980 unsigned long addr = *ret_addr;
21981
21982 if (!__kernel_text_address(addr))
21983@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21984 ops->address(data, addr, 1);
21985 frame = frame->next_frame;
21986 ret_addr = &frame->return_address;
21987- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21988+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21989 }
21990
21991 return (unsigned long)frame;
21992@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21993 static void print_trace_address(void *data, unsigned long addr, int reliable)
21994 {
21995 touch_nmi_watchdog();
21996- printk(data);
21997+ printk("%s", (char *)data);
21998 printk_stack_address(addr, reliable);
21999 }
22000
22001@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22002 EXPORT_SYMBOL_GPL(oops_begin);
22003 NOKPROBE_SYMBOL(oops_begin);
22004
22005+extern void gr_handle_kernel_exploit(void);
22006+
22007 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22008 {
22009 if (regs && kexec_should_crash(current))
22010@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22011 panic("Fatal exception in interrupt");
22012 if (panic_on_oops)
22013 panic("Fatal exception");
22014- do_exit(signr);
22015+
22016+ gr_handle_kernel_exploit();
22017+
22018+ do_group_exit(signr);
22019 }
22020 NOKPROBE_SYMBOL(oops_end);
22021
22022@@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22023 print_modules();
22024 show_regs(regs);
22025 #ifdef CONFIG_X86_32
22026- if (user_mode_vm(regs)) {
22027+ if (user_mode(regs)) {
22028 sp = regs->sp;
22029 ss = regs->ss & 0xffff;
22030 } else {
22031@@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22032 unsigned long flags = oops_begin();
22033 int sig = SIGSEGV;
22034
22035- if (!user_mode_vm(regs))
22036+ if (!user_mode(regs))
22037 report_bug(regs->ip, regs);
22038
22039 if (__die(str, regs, err))
22040diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22041index 5abd4cd..c65733b 100644
22042--- a/arch/x86/kernel/dumpstack_32.c
22043+++ b/arch/x86/kernel/dumpstack_32.c
22044@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22045 bp = stack_frame(task, regs);
22046
22047 for (;;) {
22048- struct thread_info *context;
22049+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22050 void *end_stack;
22051
22052 end_stack = is_hardirq_stack(stack, cpu);
22053 if (!end_stack)
22054 end_stack = is_softirq_stack(stack, cpu);
22055
22056- context = task_thread_info(task);
22057- bp = ops->walk_stack(context, stack, bp, ops, data,
22058+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22059 end_stack, &graph);
22060
22061 /* Stop if not on irq stack */
22062@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22063 int i;
22064
22065 show_regs_print_info(KERN_EMERG);
22066- __show_regs(regs, !user_mode_vm(regs));
22067+ __show_regs(regs, !user_mode(regs));
22068
22069 /*
22070 * When in-kernel, we also print out the stack and code at the
22071 * time of the fault..
22072 */
22073- if (!user_mode_vm(regs)) {
22074+ if (!user_mode(regs)) {
22075 unsigned int code_prologue = code_bytes * 43 / 64;
22076 unsigned int code_len = code_bytes;
22077 unsigned char c;
22078 u8 *ip;
22079+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22080
22081 pr_emerg("Stack:\n");
22082 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22083
22084 pr_emerg("Code:");
22085
22086- ip = (u8 *)regs->ip - code_prologue;
22087+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22088 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22089 /* try starting at IP */
22090- ip = (u8 *)regs->ip;
22091+ ip = (u8 *)regs->ip + cs_base;
22092 code_len = code_len - code_prologue + 1;
22093 }
22094 for (i = 0; i < code_len; i++, ip++) {
22095@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22096 pr_cont(" Bad EIP value.");
22097 break;
22098 }
22099- if (ip == (u8 *)regs->ip)
22100+ if (ip == (u8 *)regs->ip + cs_base)
22101 pr_cont(" <%02x>", c);
22102 else
22103 pr_cont(" %02x", c);
22104@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22105 {
22106 unsigned short ud2;
22107
22108+ ip = ktla_ktva(ip);
22109 if (ip < PAGE_OFFSET)
22110 return 0;
22111 if (probe_kernel_address((unsigned short *)ip, ud2))
22112@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22113
22114 return ud2 == 0x0b0f;
22115 }
22116+
22117+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22118+void pax_check_alloca(unsigned long size)
22119+{
22120+ unsigned long sp = (unsigned long)&sp, stack_left;
22121+
22122+ /* all kernel stacks are of the same size */
22123+ stack_left = sp & (THREAD_SIZE - 1);
22124+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22125+}
22126+EXPORT_SYMBOL(pax_check_alloca);
22127+#endif
22128diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22129index ff86f19..a20c62c 100644
22130--- a/arch/x86/kernel/dumpstack_64.c
22131+++ b/arch/x86/kernel/dumpstack_64.c
22132@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22133 const struct stacktrace_ops *ops, void *data)
22134 {
22135 const unsigned cpu = get_cpu();
22136- struct thread_info *tinfo;
22137 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22138 unsigned long dummy;
22139 unsigned used = 0;
22140 int graph = 0;
22141 int done = 0;
22142+ void *stack_start;
22143
22144 if (!task)
22145 task = current;
22146@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22147 * current stack address. If the stacks consist of nested
22148 * exceptions
22149 */
22150- tinfo = task_thread_info(task);
22151 while (!done) {
22152 unsigned long *stack_end;
22153 enum stack_type stype;
22154@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22155 if (ops->stack(data, id) < 0)
22156 break;
22157
22158- bp = ops->walk_stack(tinfo, stack, bp, ops,
22159+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22160 data, stack_end, &graph);
22161 ops->stack(data, "<EOE>");
22162 /*
22163@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22164 * second-to-last pointer (index -2 to end) in the
22165 * exception stack:
22166 */
22167+ if ((u16)stack_end[-1] != __KERNEL_DS)
22168+ goto out;
22169 stack = (unsigned long *) stack_end[-2];
22170 done = 0;
22171 break;
22172@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22173
22174 if (ops->stack(data, "IRQ") < 0)
22175 break;
22176- bp = ops->walk_stack(tinfo, stack, bp,
22177+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22178 ops, data, stack_end, &graph);
22179 /*
22180 * We link to the next stack (which would be
22181@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22182 /*
22183 * This handles the process stack:
22184 */
22185- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22186+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22187+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22188+out:
22189 put_cpu();
22190 }
22191 EXPORT_SYMBOL(dump_trace);
22192@@ -349,3 +352,50 @@ int is_valid_bugaddr(unsigned long ip)
22193
22194 return ud2 == 0x0b0f;
22195 }
22196+
22197+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22198+void pax_check_alloca(unsigned long size)
22199+{
22200+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22201+ unsigned cpu, used;
22202+ char *id;
22203+
22204+ /* check the process stack first */
22205+ stack_start = (unsigned long)task_stack_page(current);
22206+ stack_end = stack_start + THREAD_SIZE;
22207+ if (likely(stack_start <= sp && sp < stack_end)) {
22208+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22209+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22210+ return;
22211+ }
22212+
22213+ cpu = get_cpu();
22214+
22215+ /* check the irq stacks */
22216+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22217+ stack_start = stack_end - IRQ_STACK_SIZE;
22218+ if (stack_start <= sp && sp < stack_end) {
22219+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22220+ put_cpu();
22221+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22222+ return;
22223+ }
22224+
22225+ /* check the exception stacks */
22226+ used = 0;
22227+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22228+ stack_start = stack_end - EXCEPTION_STKSZ;
22229+ if (stack_end && stack_start <= sp && sp < stack_end) {
22230+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22231+ put_cpu();
22232+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22233+ return;
22234+ }
22235+
22236+ put_cpu();
22237+
22238+ /* unknown stack */
22239+ BUG();
22240+}
22241+EXPORT_SYMBOL(pax_check_alloca);
22242+#endif
22243diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22244index 49f8864..1cc6d07 100644
22245--- a/arch/x86/kernel/e820.c
22246+++ b/arch/x86/kernel/e820.c
22247@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22248
22249 static void early_panic(char *msg)
22250 {
22251- early_printk(msg);
22252- panic(msg);
22253+ early_printk("%s", msg);
22254+ panic("%s", msg);
22255 }
22256
22257 static int userdef __initdata;
22258diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22259index 01d1c18..8073693 100644
22260--- a/arch/x86/kernel/early_printk.c
22261+++ b/arch/x86/kernel/early_printk.c
22262@@ -7,6 +7,7 @@
22263 #include <linux/pci_regs.h>
22264 #include <linux/pci_ids.h>
22265 #include <linux/errno.h>
22266+#include <linux/sched.h>
22267 #include <asm/io.h>
22268 #include <asm/processor.h>
22269 #include <asm/fcntl.h>
22270diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22271index 344b63f..55adf14 100644
22272--- a/arch/x86/kernel/entry_32.S
22273+++ b/arch/x86/kernel/entry_32.S
22274@@ -177,13 +177,154 @@
22275 /*CFI_REL_OFFSET gs, PT_GS*/
22276 .endm
22277 .macro SET_KERNEL_GS reg
22278+
22279+#ifdef CONFIG_CC_STACKPROTECTOR
22280 movl $(__KERNEL_STACK_CANARY), \reg
22281+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22282+ movl $(__USER_DS), \reg
22283+#else
22284+ xorl \reg, \reg
22285+#endif
22286+
22287 movl \reg, %gs
22288 .endm
22289
22290 #endif /* CONFIG_X86_32_LAZY_GS */
22291
22292-.macro SAVE_ALL
22293+.macro pax_enter_kernel
22294+#ifdef CONFIG_PAX_KERNEXEC
22295+ call pax_enter_kernel
22296+#endif
22297+.endm
22298+
22299+.macro pax_exit_kernel
22300+#ifdef CONFIG_PAX_KERNEXEC
22301+ call pax_exit_kernel
22302+#endif
22303+.endm
22304+
22305+#ifdef CONFIG_PAX_KERNEXEC
22306+ENTRY(pax_enter_kernel)
22307+#ifdef CONFIG_PARAVIRT
22308+ pushl %eax
22309+ pushl %ecx
22310+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22311+ mov %eax, %esi
22312+#else
22313+ mov %cr0, %esi
22314+#endif
22315+ bts $16, %esi
22316+ jnc 1f
22317+ mov %cs, %esi
22318+ cmp $__KERNEL_CS, %esi
22319+ jz 3f
22320+ ljmp $__KERNEL_CS, $3f
22321+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22322+2:
22323+#ifdef CONFIG_PARAVIRT
22324+ mov %esi, %eax
22325+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22326+#else
22327+ mov %esi, %cr0
22328+#endif
22329+3:
22330+#ifdef CONFIG_PARAVIRT
22331+ popl %ecx
22332+ popl %eax
22333+#endif
22334+ ret
22335+ENDPROC(pax_enter_kernel)
22336+
22337+ENTRY(pax_exit_kernel)
22338+#ifdef CONFIG_PARAVIRT
22339+ pushl %eax
22340+ pushl %ecx
22341+#endif
22342+ mov %cs, %esi
22343+ cmp $__KERNEXEC_KERNEL_CS, %esi
22344+ jnz 2f
22345+#ifdef CONFIG_PARAVIRT
22346+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22347+ mov %eax, %esi
22348+#else
22349+ mov %cr0, %esi
22350+#endif
22351+ btr $16, %esi
22352+ ljmp $__KERNEL_CS, $1f
22353+1:
22354+#ifdef CONFIG_PARAVIRT
22355+ mov %esi, %eax
22356+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22357+#else
22358+ mov %esi, %cr0
22359+#endif
22360+2:
22361+#ifdef CONFIG_PARAVIRT
22362+ popl %ecx
22363+ popl %eax
22364+#endif
22365+ ret
22366+ENDPROC(pax_exit_kernel)
22367+#endif
22368+
22369+ .macro pax_erase_kstack
22370+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22371+ call pax_erase_kstack
22372+#endif
22373+ .endm
22374+
22375+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22376+/*
22377+ * ebp: thread_info
22378+ */
22379+ENTRY(pax_erase_kstack)
22380+ pushl %edi
22381+ pushl %ecx
22382+ pushl %eax
22383+
22384+ mov TI_lowest_stack(%ebp), %edi
22385+ mov $-0xBEEF, %eax
22386+ std
22387+
22388+1: mov %edi, %ecx
22389+ and $THREAD_SIZE_asm - 1, %ecx
22390+ shr $2, %ecx
22391+ repne scasl
22392+ jecxz 2f
22393+
22394+ cmp $2*16, %ecx
22395+ jc 2f
22396+
22397+ mov $2*16, %ecx
22398+ repe scasl
22399+ jecxz 2f
22400+ jne 1b
22401+
22402+2: cld
22403+ or $2*4, %edi
22404+ mov %esp, %ecx
22405+ sub %edi, %ecx
22406+
22407+ cmp $THREAD_SIZE_asm, %ecx
22408+ jb 3f
22409+ ud2
22410+3:
22411+
22412+ shr $2, %ecx
22413+ rep stosl
22414+
22415+ mov TI_task_thread_sp0(%ebp), %edi
22416+ sub $128, %edi
22417+ mov %edi, TI_lowest_stack(%ebp)
22418+
22419+ popl %eax
22420+ popl %ecx
22421+ popl %edi
22422+ ret
22423+ENDPROC(pax_erase_kstack)
22424+#endif
22425+
22426+.macro __SAVE_ALL _DS
22427 cld
22428 PUSH_GS
22429 pushl_cfi %fs
22430@@ -206,7 +347,7 @@
22431 CFI_REL_OFFSET ecx, 0
22432 pushl_cfi %ebx
22433 CFI_REL_OFFSET ebx, 0
22434- movl $(__USER_DS), %edx
22435+ movl $\_DS, %edx
22436 movl %edx, %ds
22437 movl %edx, %es
22438 movl $(__KERNEL_PERCPU), %edx
22439@@ -214,6 +355,15 @@
22440 SET_KERNEL_GS %edx
22441 .endm
22442
22443+.macro SAVE_ALL
22444+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22445+ __SAVE_ALL __KERNEL_DS
22446+ pax_enter_kernel
22447+#else
22448+ __SAVE_ALL __USER_DS
22449+#endif
22450+.endm
22451+
22452 .macro RESTORE_INT_REGS
22453 popl_cfi %ebx
22454 CFI_RESTORE ebx
22455@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22456 popfl_cfi
22457 jmp syscall_exit
22458 CFI_ENDPROC
22459-END(ret_from_fork)
22460+ENDPROC(ret_from_fork)
22461
22462 ENTRY(ret_from_kernel_thread)
22463 CFI_STARTPROC
22464@@ -340,7 +490,15 @@ ret_from_intr:
22465 andl $SEGMENT_RPL_MASK, %eax
22466 #endif
22467 cmpl $USER_RPL, %eax
22468+
22469+#ifdef CONFIG_PAX_KERNEXEC
22470+ jae resume_userspace
22471+
22472+ pax_exit_kernel
22473+ jmp resume_kernel
22474+#else
22475 jb resume_kernel # not returning to v8086 or userspace
22476+#endif
22477
22478 ENTRY(resume_userspace)
22479 LOCKDEP_SYS_EXIT
22480@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22481 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22482 # int/exception return?
22483 jne work_pending
22484- jmp restore_all
22485-END(ret_from_exception)
22486+ jmp restore_all_pax
22487+ENDPROC(ret_from_exception)
22488
22489 #ifdef CONFIG_PREEMPT
22490 ENTRY(resume_kernel)
22491@@ -365,7 +523,7 @@ need_resched:
22492 jz restore_all
22493 call preempt_schedule_irq
22494 jmp need_resched
22495-END(resume_kernel)
22496+ENDPROC(resume_kernel)
22497 #endif
22498 CFI_ENDPROC
22499
22500@@ -395,30 +553,45 @@ sysenter_past_esp:
22501 /*CFI_REL_OFFSET cs, 0*/
22502 /*
22503 * Push current_thread_info()->sysenter_return to the stack.
22504- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22505- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22506 */
22507- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22508+ pushl_cfi $0
22509 CFI_REL_OFFSET eip, 0
22510
22511 pushl_cfi %eax
22512 SAVE_ALL
22513+ GET_THREAD_INFO(%ebp)
22514+ movl TI_sysenter_return(%ebp),%ebp
22515+ movl %ebp,PT_EIP(%esp)
22516 ENABLE_INTERRUPTS(CLBR_NONE)
22517
22518 /*
22519 * Load the potential sixth argument from user stack.
22520 * Careful about security.
22521 */
22522+ movl PT_OLDESP(%esp),%ebp
22523+
22524+#ifdef CONFIG_PAX_MEMORY_UDEREF
22525+ mov PT_OLDSS(%esp),%ds
22526+1: movl %ds:(%ebp),%ebp
22527+ push %ss
22528+ pop %ds
22529+#else
22530 cmpl $__PAGE_OFFSET-3,%ebp
22531 jae syscall_fault
22532 ASM_STAC
22533 1: movl (%ebp),%ebp
22534 ASM_CLAC
22535+#endif
22536+
22537 movl %ebp,PT_EBP(%esp)
22538 _ASM_EXTABLE(1b,syscall_fault)
22539
22540 GET_THREAD_INFO(%ebp)
22541
22542+#ifdef CONFIG_PAX_RANDKSTACK
22543+ pax_erase_kstack
22544+#endif
22545+
22546 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22547 jnz sysenter_audit
22548 sysenter_do_call:
22549@@ -434,12 +607,24 @@ sysenter_after_call:
22550 testl $_TIF_ALLWORK_MASK, %ecx
22551 jne sysexit_audit
22552 sysenter_exit:
22553+
22554+#ifdef CONFIG_PAX_RANDKSTACK
22555+ pushl_cfi %eax
22556+ movl %esp, %eax
22557+ call pax_randomize_kstack
22558+ popl_cfi %eax
22559+#endif
22560+
22561+ pax_erase_kstack
22562+
22563 /* if something modifies registers it must also disable sysexit */
22564 movl PT_EIP(%esp), %edx
22565 movl PT_OLDESP(%esp), %ecx
22566 xorl %ebp,%ebp
22567 TRACE_IRQS_ON
22568 1: mov PT_FS(%esp), %fs
22569+2: mov PT_DS(%esp), %ds
22570+3: mov PT_ES(%esp), %es
22571 PTGS_TO_GS
22572 ENABLE_INTERRUPTS_SYSEXIT
22573
22574@@ -453,6 +638,9 @@ sysenter_audit:
22575 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22576 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22577 call __audit_syscall_entry
22578+
22579+ pax_erase_kstack
22580+
22581 popl_cfi %ecx /* get that remapped edx off the stack */
22582 popl_cfi %ecx /* get that remapped esi off the stack */
22583 movl PT_EAX(%esp),%eax /* reload syscall number */
22584@@ -479,10 +667,16 @@ sysexit_audit:
22585
22586 CFI_ENDPROC
22587 .pushsection .fixup,"ax"
22588-2: movl $0,PT_FS(%esp)
22589+4: movl $0,PT_FS(%esp)
22590+ jmp 1b
22591+5: movl $0,PT_DS(%esp)
22592+ jmp 1b
22593+6: movl $0,PT_ES(%esp)
22594 jmp 1b
22595 .popsection
22596- _ASM_EXTABLE(1b,2b)
22597+ _ASM_EXTABLE(1b,4b)
22598+ _ASM_EXTABLE(2b,5b)
22599+ _ASM_EXTABLE(3b,6b)
22600 PTGS_TO_GS_EX
22601 ENDPROC(ia32_sysenter_target)
22602
22603@@ -493,6 +687,11 @@ ENTRY(system_call)
22604 pushl_cfi %eax # save orig_eax
22605 SAVE_ALL
22606 GET_THREAD_INFO(%ebp)
22607+
22608+#ifdef CONFIG_PAX_RANDKSTACK
22609+ pax_erase_kstack
22610+#endif
22611+
22612 # system call tracing in operation / emulation
22613 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22614 jnz syscall_trace_entry
22615@@ -512,6 +711,15 @@ syscall_exit:
22616 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22617 jne syscall_exit_work
22618
22619+restore_all_pax:
22620+
22621+#ifdef CONFIG_PAX_RANDKSTACK
22622+ movl %esp, %eax
22623+ call pax_randomize_kstack
22624+#endif
22625+
22626+ pax_erase_kstack
22627+
22628 restore_all:
22629 TRACE_IRQS_IRET
22630 restore_all_notrace:
22631@@ -566,14 +774,34 @@ ldt_ss:
22632 * compensating for the offset by changing to the ESPFIX segment with
22633 * a base address that matches for the difference.
22634 */
22635-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22636+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22637 mov %esp, %edx /* load kernel esp */
22638 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22639 mov %dx, %ax /* eax: new kernel esp */
22640 sub %eax, %edx /* offset (low word is 0) */
22641+#ifdef CONFIG_SMP
22642+ movl PER_CPU_VAR(cpu_number), %ebx
22643+ shll $PAGE_SHIFT_asm, %ebx
22644+ addl $cpu_gdt_table, %ebx
22645+#else
22646+ movl $cpu_gdt_table, %ebx
22647+#endif
22648 shr $16, %edx
22649- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22650- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22651+
22652+#ifdef CONFIG_PAX_KERNEXEC
22653+ mov %cr0, %esi
22654+ btr $16, %esi
22655+ mov %esi, %cr0
22656+#endif
22657+
22658+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22659+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22660+
22661+#ifdef CONFIG_PAX_KERNEXEC
22662+ bts $16, %esi
22663+ mov %esi, %cr0
22664+#endif
22665+
22666 pushl_cfi $__ESPFIX_SS
22667 pushl_cfi %eax /* new kernel esp */
22668 /* Disable interrupts, but do not irqtrace this section: we
22669@@ -603,20 +831,18 @@ work_resched:
22670 movl TI_flags(%ebp), %ecx
22671 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22672 # than syscall tracing?
22673- jz restore_all
22674+ jz restore_all_pax
22675 testb $_TIF_NEED_RESCHED, %cl
22676 jnz work_resched
22677
22678 work_notifysig: # deal with pending signals and
22679 # notify-resume requests
22680+ movl %esp, %eax
22681 #ifdef CONFIG_VM86
22682 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22683- movl %esp, %eax
22684 jne work_notifysig_v86 # returning to kernel-space or
22685 # vm86-space
22686 1:
22687-#else
22688- movl %esp, %eax
22689 #endif
22690 TRACE_IRQS_ON
22691 ENABLE_INTERRUPTS(CLBR_NONE)
22692@@ -637,7 +863,7 @@ work_notifysig_v86:
22693 movl %eax, %esp
22694 jmp 1b
22695 #endif
22696-END(work_pending)
22697+ENDPROC(work_pending)
22698
22699 # perform syscall exit tracing
22700 ALIGN
22701@@ -645,11 +871,14 @@ syscall_trace_entry:
22702 movl $-ENOSYS,PT_EAX(%esp)
22703 movl %esp, %eax
22704 call syscall_trace_enter
22705+
22706+ pax_erase_kstack
22707+
22708 /* What it returned is what we'll actually use. */
22709 cmpl $(NR_syscalls), %eax
22710 jnae syscall_call
22711 jmp syscall_exit
22712-END(syscall_trace_entry)
22713+ENDPROC(syscall_trace_entry)
22714
22715 # perform syscall exit tracing
22716 ALIGN
22717@@ -662,26 +891,30 @@ syscall_exit_work:
22718 movl %esp, %eax
22719 call syscall_trace_leave
22720 jmp resume_userspace
22721-END(syscall_exit_work)
22722+ENDPROC(syscall_exit_work)
22723 CFI_ENDPROC
22724
22725 RING0_INT_FRAME # can't unwind into user space anyway
22726 syscall_fault:
22727+#ifdef CONFIG_PAX_MEMORY_UDEREF
22728+ push %ss
22729+ pop %ds
22730+#endif
22731 ASM_CLAC
22732 GET_THREAD_INFO(%ebp)
22733 movl $-EFAULT,PT_EAX(%esp)
22734 jmp resume_userspace
22735-END(syscall_fault)
22736+ENDPROC(syscall_fault)
22737
22738 syscall_badsys:
22739 movl $-ENOSYS,%eax
22740 jmp syscall_after_call
22741-END(syscall_badsys)
22742+ENDPROC(syscall_badsys)
22743
22744 sysenter_badsys:
22745 movl $-ENOSYS,%eax
22746 jmp sysenter_after_call
22747-END(sysenter_badsys)
22748+ENDPROC(sysenter_badsys)
22749 CFI_ENDPROC
22750
22751 .macro FIXUP_ESPFIX_STACK
22752@@ -694,8 +927,15 @@ END(sysenter_badsys)
22753 */
22754 #ifdef CONFIG_X86_ESPFIX32
22755 /* fixup the stack */
22756- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22757- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22758+#ifdef CONFIG_SMP
22759+ movl PER_CPU_VAR(cpu_number), %ebx
22760+ shll $PAGE_SHIFT_asm, %ebx
22761+ addl $cpu_gdt_table, %ebx
22762+#else
22763+ movl $cpu_gdt_table, %ebx
22764+#endif
22765+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22766+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22767 shl $16, %eax
22768 addl %esp, %eax /* the adjusted stack pointer */
22769 pushl_cfi $__KERNEL_DS
22770@@ -751,7 +991,7 @@ vector=vector+1
22771 .endr
22772 2: jmp common_interrupt
22773 .endr
22774-END(irq_entries_start)
22775+ENDPROC(irq_entries_start)
22776
22777 .previous
22778 END(interrupt)
22779@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22780 pushl_cfi $do_coprocessor_error
22781 jmp error_code
22782 CFI_ENDPROC
22783-END(coprocessor_error)
22784+ENDPROC(coprocessor_error)
22785
22786 ENTRY(simd_coprocessor_error)
22787 RING0_INT_FRAME
22788@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22789 .section .altinstructions,"a"
22790 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22791 .previous
22792-.section .altinstr_replacement,"ax"
22793+.section .altinstr_replacement,"a"
22794 663: pushl $do_simd_coprocessor_error
22795 664:
22796 .previous
22797@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22798 #endif
22799 jmp error_code
22800 CFI_ENDPROC
22801-END(simd_coprocessor_error)
22802+ENDPROC(simd_coprocessor_error)
22803
22804 ENTRY(device_not_available)
22805 RING0_INT_FRAME
22806@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22807 pushl_cfi $do_device_not_available
22808 jmp error_code
22809 CFI_ENDPROC
22810-END(device_not_available)
22811+ENDPROC(device_not_available)
22812
22813 #ifdef CONFIG_PARAVIRT
22814 ENTRY(native_iret)
22815 iret
22816 _ASM_EXTABLE(native_iret, iret_exc)
22817-END(native_iret)
22818+ENDPROC(native_iret)
22819
22820 ENTRY(native_irq_enable_sysexit)
22821 sti
22822 sysexit
22823-END(native_irq_enable_sysexit)
22824+ENDPROC(native_irq_enable_sysexit)
22825 #endif
22826
22827 ENTRY(overflow)
22828@@ -860,7 +1100,7 @@ ENTRY(overflow)
22829 pushl_cfi $do_overflow
22830 jmp error_code
22831 CFI_ENDPROC
22832-END(overflow)
22833+ENDPROC(overflow)
22834
22835 ENTRY(bounds)
22836 RING0_INT_FRAME
22837@@ -869,7 +1109,7 @@ ENTRY(bounds)
22838 pushl_cfi $do_bounds
22839 jmp error_code
22840 CFI_ENDPROC
22841-END(bounds)
22842+ENDPROC(bounds)
22843
22844 ENTRY(invalid_op)
22845 RING0_INT_FRAME
22846@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22847 pushl_cfi $do_invalid_op
22848 jmp error_code
22849 CFI_ENDPROC
22850-END(invalid_op)
22851+ENDPROC(invalid_op)
22852
22853 ENTRY(coprocessor_segment_overrun)
22854 RING0_INT_FRAME
22855@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22856 pushl_cfi $do_coprocessor_segment_overrun
22857 jmp error_code
22858 CFI_ENDPROC
22859-END(coprocessor_segment_overrun)
22860+ENDPROC(coprocessor_segment_overrun)
22861
22862 ENTRY(invalid_TSS)
22863 RING0_EC_FRAME
22864@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22865 pushl_cfi $do_invalid_TSS
22866 jmp error_code
22867 CFI_ENDPROC
22868-END(invalid_TSS)
22869+ENDPROC(invalid_TSS)
22870
22871 ENTRY(segment_not_present)
22872 RING0_EC_FRAME
22873@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22874 pushl_cfi $do_segment_not_present
22875 jmp error_code
22876 CFI_ENDPROC
22877-END(segment_not_present)
22878+ENDPROC(segment_not_present)
22879
22880 ENTRY(stack_segment)
22881 RING0_EC_FRAME
22882@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22883 pushl_cfi $do_stack_segment
22884 jmp error_code
22885 CFI_ENDPROC
22886-END(stack_segment)
22887+ENDPROC(stack_segment)
22888
22889 ENTRY(alignment_check)
22890 RING0_EC_FRAME
22891@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22892 pushl_cfi $do_alignment_check
22893 jmp error_code
22894 CFI_ENDPROC
22895-END(alignment_check)
22896+ENDPROC(alignment_check)
22897
22898 ENTRY(divide_error)
22899 RING0_INT_FRAME
22900@@ -928,7 +1168,7 @@ ENTRY(divide_error)
22901 pushl_cfi $do_divide_error
22902 jmp error_code
22903 CFI_ENDPROC
22904-END(divide_error)
22905+ENDPROC(divide_error)
22906
22907 #ifdef CONFIG_X86_MCE
22908 ENTRY(machine_check)
22909@@ -938,7 +1178,7 @@ ENTRY(machine_check)
22910 pushl_cfi machine_check_vector
22911 jmp error_code
22912 CFI_ENDPROC
22913-END(machine_check)
22914+ENDPROC(machine_check)
22915 #endif
22916
22917 ENTRY(spurious_interrupt_bug)
22918@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22919 pushl_cfi $do_spurious_interrupt_bug
22920 jmp error_code
22921 CFI_ENDPROC
22922-END(spurious_interrupt_bug)
22923+ENDPROC(spurious_interrupt_bug)
22924
22925 #ifdef CONFIG_XEN
22926 /* Xen doesn't set %esp to be precisely what the normal sysenter
22927@@ -1054,7 +1294,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22928
22929 ENTRY(mcount)
22930 ret
22931-END(mcount)
22932+ENDPROC(mcount)
22933
22934 ENTRY(ftrace_caller)
22935 pushl %eax
22936@@ -1084,7 +1324,7 @@ ftrace_graph_call:
22937 .globl ftrace_stub
22938 ftrace_stub:
22939 ret
22940-END(ftrace_caller)
22941+ENDPROC(ftrace_caller)
22942
22943 ENTRY(ftrace_regs_caller)
22944 pushf /* push flags before compare (in cs location) */
22945@@ -1182,7 +1422,7 @@ trace:
22946 popl %ecx
22947 popl %eax
22948 jmp ftrace_stub
22949-END(mcount)
22950+ENDPROC(mcount)
22951 #endif /* CONFIG_DYNAMIC_FTRACE */
22952 #endif /* CONFIG_FUNCTION_TRACER */
22953
22954@@ -1200,7 +1440,7 @@ ENTRY(ftrace_graph_caller)
22955 popl %ecx
22956 popl %eax
22957 ret
22958-END(ftrace_graph_caller)
22959+ENDPROC(ftrace_graph_caller)
22960
22961 .globl return_to_handler
22962 return_to_handler:
22963@@ -1261,15 +1501,18 @@ error_code:
22964 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22965 REG_TO_PTGS %ecx
22966 SET_KERNEL_GS %ecx
22967- movl $(__USER_DS), %ecx
22968+ movl $(__KERNEL_DS), %ecx
22969 movl %ecx, %ds
22970 movl %ecx, %es
22971+
22972+ pax_enter_kernel
22973+
22974 TRACE_IRQS_OFF
22975 movl %esp,%eax # pt_regs pointer
22976 call *%edi
22977 jmp ret_from_exception
22978 CFI_ENDPROC
22979-END(page_fault)
22980+ENDPROC(page_fault)
22981
22982 /*
22983 * Debug traps and NMI can happen at the one SYSENTER instruction
22984@@ -1312,7 +1555,7 @@ debug_stack_correct:
22985 call do_debug
22986 jmp ret_from_exception
22987 CFI_ENDPROC
22988-END(debug)
22989+ENDPROC(debug)
22990
22991 /*
22992 * NMI is doubly nasty. It can happen _while_ we're handling
22993@@ -1352,6 +1595,9 @@ nmi_stack_correct:
22994 xorl %edx,%edx # zero error code
22995 movl %esp,%eax # pt_regs pointer
22996 call do_nmi
22997+
22998+ pax_exit_kernel
22999+
23000 jmp restore_all_notrace
23001 CFI_ENDPROC
23002
23003@@ -1389,13 +1635,16 @@ nmi_espfix_stack:
23004 FIXUP_ESPFIX_STACK # %eax == %esp
23005 xorl %edx,%edx # zero error code
23006 call do_nmi
23007+
23008+ pax_exit_kernel
23009+
23010 RESTORE_REGS
23011 lss 12+4(%esp), %esp # back to espfix stack
23012 CFI_ADJUST_CFA_OFFSET -24
23013 jmp irq_return
23014 #endif
23015 CFI_ENDPROC
23016-END(nmi)
23017+ENDPROC(nmi)
23018
23019 ENTRY(int3)
23020 RING0_INT_FRAME
23021@@ -1408,14 +1657,14 @@ ENTRY(int3)
23022 call do_int3
23023 jmp ret_from_exception
23024 CFI_ENDPROC
23025-END(int3)
23026+ENDPROC(int3)
23027
23028 ENTRY(general_protection)
23029 RING0_EC_FRAME
23030 pushl_cfi $do_general_protection
23031 jmp error_code
23032 CFI_ENDPROC
23033-END(general_protection)
23034+ENDPROC(general_protection)
23035
23036 #ifdef CONFIG_KVM_GUEST
23037 ENTRY(async_page_fault)
23038@@ -1424,6 +1673,6 @@ ENTRY(async_page_fault)
23039 pushl_cfi $do_async_page_fault
23040 jmp error_code
23041 CFI_ENDPROC
23042-END(async_page_fault)
23043+ENDPROC(async_page_fault)
23044 #endif
23045
23046diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23047index c0226ab..0d1dc48 100644
23048--- a/arch/x86/kernel/entry_64.S
23049+++ b/arch/x86/kernel/entry_64.S
23050@@ -59,6 +59,8 @@
23051 #include <asm/smap.h>
23052 #include <asm/pgtable_types.h>
23053 #include <linux/err.h>
23054+#include <asm/pgtable.h>
23055+#include <asm/alternative-asm.h>
23056
23057 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23058 #include <linux/elf-em.h>
23059@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23060 ENDPROC(native_usergs_sysret64)
23061 #endif /* CONFIG_PARAVIRT */
23062
23063+ .macro ljmpq sel, off
23064+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23065+ .byte 0x48; ljmp *1234f(%rip)
23066+ .pushsection .rodata
23067+ .align 16
23068+ 1234: .quad \off; .word \sel
23069+ .popsection
23070+#else
23071+ pushq $\sel
23072+ pushq $\off
23073+ lretq
23074+#endif
23075+ .endm
23076+
23077+ .macro pax_enter_kernel
23078+ pax_set_fptr_mask
23079+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23080+ call pax_enter_kernel
23081+#endif
23082+ .endm
23083+
23084+ .macro pax_exit_kernel
23085+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23086+ call pax_exit_kernel
23087+#endif
23088+
23089+ .endm
23090+
23091+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23092+ENTRY(pax_enter_kernel)
23093+ pushq %rdi
23094+
23095+#ifdef CONFIG_PARAVIRT
23096+ PV_SAVE_REGS(CLBR_RDI)
23097+#endif
23098+
23099+#ifdef CONFIG_PAX_KERNEXEC
23100+ GET_CR0_INTO_RDI
23101+ bts $16,%rdi
23102+ jnc 3f
23103+ mov %cs,%edi
23104+ cmp $__KERNEL_CS,%edi
23105+ jnz 2f
23106+1:
23107+#endif
23108+
23109+#ifdef CONFIG_PAX_MEMORY_UDEREF
23110+ 661: jmp 111f
23111+ .pushsection .altinstr_replacement, "a"
23112+ 662: ASM_NOP2
23113+ .popsection
23114+ .pushsection .altinstructions, "a"
23115+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23116+ .popsection
23117+ GET_CR3_INTO_RDI
23118+ cmp $0,%dil
23119+ jnz 112f
23120+ mov $__KERNEL_DS,%edi
23121+ mov %edi,%ss
23122+ jmp 111f
23123+112: cmp $1,%dil
23124+ jz 113f
23125+ ud2
23126+113: sub $4097,%rdi
23127+ bts $63,%rdi
23128+ SET_RDI_INTO_CR3
23129+ mov $__UDEREF_KERNEL_DS,%edi
23130+ mov %edi,%ss
23131+111:
23132+#endif
23133+
23134+#ifdef CONFIG_PARAVIRT
23135+ PV_RESTORE_REGS(CLBR_RDI)
23136+#endif
23137+
23138+ popq %rdi
23139+ pax_force_retaddr
23140+ retq
23141+
23142+#ifdef CONFIG_PAX_KERNEXEC
23143+2: ljmpq __KERNEL_CS,1b
23144+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23145+4: SET_RDI_INTO_CR0
23146+ jmp 1b
23147+#endif
23148+ENDPROC(pax_enter_kernel)
23149+
23150+ENTRY(pax_exit_kernel)
23151+ pushq %rdi
23152+
23153+#ifdef CONFIG_PARAVIRT
23154+ PV_SAVE_REGS(CLBR_RDI)
23155+#endif
23156+
23157+#ifdef CONFIG_PAX_KERNEXEC
23158+ mov %cs,%rdi
23159+ cmp $__KERNEXEC_KERNEL_CS,%edi
23160+ jz 2f
23161+ GET_CR0_INTO_RDI
23162+ bts $16,%rdi
23163+ jnc 4f
23164+1:
23165+#endif
23166+
23167+#ifdef CONFIG_PAX_MEMORY_UDEREF
23168+ 661: jmp 111f
23169+ .pushsection .altinstr_replacement, "a"
23170+ 662: ASM_NOP2
23171+ .popsection
23172+ .pushsection .altinstructions, "a"
23173+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23174+ .popsection
23175+ mov %ss,%edi
23176+ cmp $__UDEREF_KERNEL_DS,%edi
23177+ jnz 111f
23178+ GET_CR3_INTO_RDI
23179+ cmp $0,%dil
23180+ jz 112f
23181+ ud2
23182+112: add $4097,%rdi
23183+ bts $63,%rdi
23184+ SET_RDI_INTO_CR3
23185+ mov $__KERNEL_DS,%edi
23186+ mov %edi,%ss
23187+111:
23188+#endif
23189+
23190+#ifdef CONFIG_PARAVIRT
23191+ PV_RESTORE_REGS(CLBR_RDI);
23192+#endif
23193+
23194+ popq %rdi
23195+ pax_force_retaddr
23196+ retq
23197+
23198+#ifdef CONFIG_PAX_KERNEXEC
23199+2: GET_CR0_INTO_RDI
23200+ btr $16,%rdi
23201+ jnc 4f
23202+ ljmpq __KERNEL_CS,3f
23203+3: SET_RDI_INTO_CR0
23204+ jmp 1b
23205+4: ud2
23206+ jmp 4b
23207+#endif
23208+ENDPROC(pax_exit_kernel)
23209+#endif
23210+
23211+ .macro pax_enter_kernel_user
23212+ pax_set_fptr_mask
23213+#ifdef CONFIG_PAX_MEMORY_UDEREF
23214+ call pax_enter_kernel_user
23215+#endif
23216+ .endm
23217+
23218+ .macro pax_exit_kernel_user
23219+#ifdef CONFIG_PAX_MEMORY_UDEREF
23220+ call pax_exit_kernel_user
23221+#endif
23222+#ifdef CONFIG_PAX_RANDKSTACK
23223+ pushq %rax
23224+ pushq %r11
23225+ call pax_randomize_kstack
23226+ popq %r11
23227+ popq %rax
23228+#endif
23229+ .endm
23230+
23231+#ifdef CONFIG_PAX_MEMORY_UDEREF
23232+ENTRY(pax_enter_kernel_user)
23233+ pushq %rdi
23234+ pushq %rbx
23235+
23236+#ifdef CONFIG_PARAVIRT
23237+ PV_SAVE_REGS(CLBR_RDI)
23238+#endif
23239+
23240+ 661: jmp 111f
23241+ .pushsection .altinstr_replacement, "a"
23242+ 662: ASM_NOP2
23243+ .popsection
23244+ .pushsection .altinstructions, "a"
23245+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23246+ .popsection
23247+ GET_CR3_INTO_RDI
23248+ cmp $1,%dil
23249+ jnz 4f
23250+ sub $4097,%rdi
23251+ bts $63,%rdi
23252+ SET_RDI_INTO_CR3
23253+ jmp 3f
23254+111:
23255+
23256+ GET_CR3_INTO_RDI
23257+ mov %rdi,%rbx
23258+ add $__START_KERNEL_map,%rbx
23259+ sub phys_base(%rip),%rbx
23260+
23261+#ifdef CONFIG_PARAVIRT
23262+ cmpl $0, pv_info+PARAVIRT_enabled
23263+ jz 1f
23264+ pushq %rdi
23265+ i = 0
23266+ .rept USER_PGD_PTRS
23267+ mov i*8(%rbx),%rsi
23268+ mov $0,%sil
23269+ lea i*8(%rbx),%rdi
23270+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23271+ i = i + 1
23272+ .endr
23273+ popq %rdi
23274+ jmp 2f
23275+1:
23276+#endif
23277+
23278+ i = 0
23279+ .rept USER_PGD_PTRS
23280+ movb $0,i*8(%rbx)
23281+ i = i + 1
23282+ .endr
23283+
23284+2: SET_RDI_INTO_CR3
23285+
23286+#ifdef CONFIG_PAX_KERNEXEC
23287+ GET_CR0_INTO_RDI
23288+ bts $16,%rdi
23289+ SET_RDI_INTO_CR0
23290+#endif
23291+
23292+3:
23293+
23294+#ifdef CONFIG_PARAVIRT
23295+ PV_RESTORE_REGS(CLBR_RDI)
23296+#endif
23297+
23298+ popq %rbx
23299+ popq %rdi
23300+ pax_force_retaddr
23301+ retq
23302+4: ud2
23303+ENDPROC(pax_enter_kernel_user)
23304+
23305+ENTRY(pax_exit_kernel_user)
23306+ pushq %rdi
23307+ pushq %rbx
23308+
23309+#ifdef CONFIG_PARAVIRT
23310+ PV_SAVE_REGS(CLBR_RDI)
23311+#endif
23312+
23313+ GET_CR3_INTO_RDI
23314+ 661: jmp 1f
23315+ .pushsection .altinstr_replacement, "a"
23316+ 662: ASM_NOP2
23317+ .popsection
23318+ .pushsection .altinstructions, "a"
23319+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23320+ .popsection
23321+ cmp $0,%dil
23322+ jnz 3f
23323+ add $4097,%rdi
23324+ bts $63,%rdi
23325+ SET_RDI_INTO_CR3
23326+ jmp 2f
23327+1:
23328+
23329+ mov %rdi,%rbx
23330+
23331+#ifdef CONFIG_PAX_KERNEXEC
23332+ GET_CR0_INTO_RDI
23333+ btr $16,%rdi
23334+ jnc 3f
23335+ SET_RDI_INTO_CR0
23336+#endif
23337+
23338+ add $__START_KERNEL_map,%rbx
23339+ sub phys_base(%rip),%rbx
23340+
23341+#ifdef CONFIG_PARAVIRT
23342+ cmpl $0, pv_info+PARAVIRT_enabled
23343+ jz 1f
23344+ i = 0
23345+ .rept USER_PGD_PTRS
23346+ mov i*8(%rbx),%rsi
23347+ mov $0x67,%sil
23348+ lea i*8(%rbx),%rdi
23349+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23350+ i = i + 1
23351+ .endr
23352+ jmp 2f
23353+1:
23354+#endif
23355+
23356+ i = 0
23357+ .rept USER_PGD_PTRS
23358+ movb $0x67,i*8(%rbx)
23359+ i = i + 1
23360+ .endr
23361+2:
23362+
23363+#ifdef CONFIG_PARAVIRT
23364+ PV_RESTORE_REGS(CLBR_RDI)
23365+#endif
23366+
23367+ popq %rbx
23368+ popq %rdi
23369+ pax_force_retaddr
23370+ retq
23371+3: ud2
23372+ENDPROC(pax_exit_kernel_user)
23373+#endif
23374+
23375+ .macro pax_enter_kernel_nmi
23376+ pax_set_fptr_mask
23377+
23378+#ifdef CONFIG_PAX_KERNEXEC
23379+ GET_CR0_INTO_RDI
23380+ bts $16,%rdi
23381+ jc 110f
23382+ SET_RDI_INTO_CR0
23383+ or $2,%ebx
23384+110:
23385+#endif
23386+
23387+#ifdef CONFIG_PAX_MEMORY_UDEREF
23388+ 661: jmp 111f
23389+ .pushsection .altinstr_replacement, "a"
23390+ 662: ASM_NOP2
23391+ .popsection
23392+ .pushsection .altinstructions, "a"
23393+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23394+ .popsection
23395+ GET_CR3_INTO_RDI
23396+ cmp $0,%dil
23397+ jz 111f
23398+ sub $4097,%rdi
23399+ or $4,%ebx
23400+ bts $63,%rdi
23401+ SET_RDI_INTO_CR3
23402+ mov $__UDEREF_KERNEL_DS,%edi
23403+ mov %edi,%ss
23404+111:
23405+#endif
23406+ .endm
23407+
23408+ .macro pax_exit_kernel_nmi
23409+#ifdef CONFIG_PAX_KERNEXEC
23410+ btr $1,%ebx
23411+ jnc 110f
23412+ GET_CR0_INTO_RDI
23413+ btr $16,%rdi
23414+ SET_RDI_INTO_CR0
23415+110:
23416+#endif
23417+
23418+#ifdef CONFIG_PAX_MEMORY_UDEREF
23419+ btr $2,%ebx
23420+ jnc 111f
23421+ GET_CR3_INTO_RDI
23422+ add $4097,%rdi
23423+ bts $63,%rdi
23424+ SET_RDI_INTO_CR3
23425+ mov $__KERNEL_DS,%edi
23426+ mov %edi,%ss
23427+111:
23428+#endif
23429+ .endm
23430+
23431+ .macro pax_erase_kstack
23432+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23433+ call pax_erase_kstack
23434+#endif
23435+ .endm
23436+
23437+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23438+ENTRY(pax_erase_kstack)
23439+ pushq %rdi
23440+ pushq %rcx
23441+ pushq %rax
23442+ pushq %r11
23443+
23444+ GET_THREAD_INFO(%r11)
23445+ mov TI_lowest_stack(%r11), %rdi
23446+ mov $-0xBEEF, %rax
23447+ std
23448+
23449+1: mov %edi, %ecx
23450+ and $THREAD_SIZE_asm - 1, %ecx
23451+ shr $3, %ecx
23452+ repne scasq
23453+ jecxz 2f
23454+
23455+ cmp $2*8, %ecx
23456+ jc 2f
23457+
23458+ mov $2*8, %ecx
23459+ repe scasq
23460+ jecxz 2f
23461+ jne 1b
23462+
23463+2: cld
23464+ or $2*8, %rdi
23465+ mov %esp, %ecx
23466+ sub %edi, %ecx
23467+
23468+ cmp $THREAD_SIZE_asm, %rcx
23469+ jb 3f
23470+ ud2
23471+3:
23472+
23473+ shr $3, %ecx
23474+ rep stosq
23475+
23476+ mov TI_task_thread_sp0(%r11), %rdi
23477+ sub $256, %rdi
23478+ mov %rdi, TI_lowest_stack(%r11)
23479+
23480+ popq %r11
23481+ popq %rax
23482+ popq %rcx
23483+ popq %rdi
23484+ pax_force_retaddr
23485+ ret
23486+ENDPROC(pax_erase_kstack)
23487+#endif
23488
23489 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23490 #ifdef CONFIG_TRACE_IRQFLAGS
23491@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23492 .endm
23493
23494 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23495- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23496+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23497 jnc 1f
23498 TRACE_IRQS_ON_DEBUG
23499 1:
23500@@ -155,27 +582,6 @@ ENDPROC(native_usergs_sysret64)
23501 movq \tmp,R11+\offset(%rsp)
23502 .endm
23503
23504- .macro FAKE_STACK_FRAME child_rip
23505- /* push in order ss, rsp, eflags, cs, rip */
23506- xorl %eax, %eax
23507- pushq_cfi $__KERNEL_DS /* ss */
23508- /*CFI_REL_OFFSET ss,0*/
23509- pushq_cfi %rax /* rsp */
23510- CFI_REL_OFFSET rsp,0
23511- pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23512- /*CFI_REL_OFFSET rflags,0*/
23513- pushq_cfi $__KERNEL_CS /* cs */
23514- /*CFI_REL_OFFSET cs,0*/
23515- pushq_cfi \child_rip /* rip */
23516- CFI_REL_OFFSET rip,0
23517- pushq_cfi %rax /* orig rax */
23518- .endm
23519-
23520- .macro UNFAKE_STACK_FRAME
23521- addq $8*6, %rsp
23522- CFI_ADJUST_CFA_OFFSET -(6*8)
23523- .endm
23524-
23525 /*
23526 * initial frame state for interrupts (and exceptions without error code)
23527 */
23528@@ -241,25 +647,26 @@ ENDPROC(native_usergs_sysret64)
23529 /* save partial stack frame */
23530 .macro SAVE_ARGS_IRQ
23531 cld
23532- /* start from rbp in pt_regs and jump over */
23533- movq_cfi rdi, (RDI-RBP)
23534- movq_cfi rsi, (RSI-RBP)
23535- movq_cfi rdx, (RDX-RBP)
23536- movq_cfi rcx, (RCX-RBP)
23537- movq_cfi rax, (RAX-RBP)
23538- movq_cfi r8, (R8-RBP)
23539- movq_cfi r9, (R9-RBP)
23540- movq_cfi r10, (R10-RBP)
23541- movq_cfi r11, (R11-RBP)
23542+ /* start from r15 in pt_regs and jump over */
23543+ movq_cfi rdi, RDI
23544+ movq_cfi rsi, RSI
23545+ movq_cfi rdx, RDX
23546+ movq_cfi rcx, RCX
23547+ movq_cfi rax, RAX
23548+ movq_cfi r8, R8
23549+ movq_cfi r9, R9
23550+ movq_cfi r10, R10
23551+ movq_cfi r11, R11
23552+ movq_cfi r12, R12
23553
23554 /* Save rbp so that we can unwind from get_irq_regs() */
23555- movq_cfi rbp, 0
23556+ movq_cfi rbp, RBP
23557
23558 /* Save previous stack value */
23559 movq %rsp, %rsi
23560
23561- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23562- testl $3, CS-RBP(%rsi)
23563+ movq %rsp,%rdi /* arg1 for handler */
23564+ testb $3, CS(%rsi)
23565 je 1f
23566 SWAPGS
23567 /*
23568@@ -279,6 +686,18 @@ ENDPROC(native_usergs_sysret64)
23569 0x06 /* DW_OP_deref */, \
23570 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23571 0x22 /* DW_OP_plus */
23572+
23573+#ifdef CONFIG_PAX_MEMORY_UDEREF
23574+ testb $3, CS(%rdi)
23575+ jnz 1f
23576+ pax_enter_kernel
23577+ jmp 2f
23578+1: pax_enter_kernel_user
23579+2:
23580+#else
23581+ pax_enter_kernel
23582+#endif
23583+
23584 /* We entered an interrupt context - irqs are off: */
23585 TRACE_IRQS_OFF
23586 .endm
23587@@ -308,9 +727,52 @@ ENTRY(save_paranoid)
23588 js 1f /* negative -> in kernel */
23589 SWAPGS
23590 xorl %ebx,%ebx
23591-1: ret
23592+1:
23593+#ifdef CONFIG_PAX_MEMORY_UDEREF
23594+ testb $3, CS+8(%rsp)
23595+ jnz 1f
23596+ pax_enter_kernel
23597+ jmp 2f
23598+1: pax_enter_kernel_user
23599+2:
23600+#else
23601+ pax_enter_kernel
23602+#endif
23603+ pax_force_retaddr
23604+ ret
23605 CFI_ENDPROC
23606-END(save_paranoid)
23607+ENDPROC(save_paranoid)
23608+
23609+ENTRY(save_paranoid_nmi)
23610+ XCPT_FRAME 1 RDI+8
23611+ cld
23612+ movq_cfi rdi, RDI+8
23613+ movq_cfi rsi, RSI+8
23614+ movq_cfi rdx, RDX+8
23615+ movq_cfi rcx, RCX+8
23616+ movq_cfi rax, RAX+8
23617+ movq_cfi r8, R8+8
23618+ movq_cfi r9, R9+8
23619+ movq_cfi r10, R10+8
23620+ movq_cfi r11, R11+8
23621+ movq_cfi rbx, RBX+8
23622+ movq_cfi rbp, RBP+8
23623+ movq_cfi r12, R12+8
23624+ movq_cfi r13, R13+8
23625+ movq_cfi r14, R14+8
23626+ movq_cfi r15, R15+8
23627+ movl $1,%ebx
23628+ movl $MSR_GS_BASE,%ecx
23629+ rdmsr
23630+ testl %edx,%edx
23631+ js 1f /* negative -> in kernel */
23632+ SWAPGS
23633+ xorl %ebx,%ebx
23634+1: pax_enter_kernel_nmi
23635+ pax_force_retaddr
23636+ ret
23637+ CFI_ENDPROC
23638+ENDPROC(save_paranoid_nmi)
23639
23640 /*
23641 * A newly forked process directly context switches into this address.
23642@@ -331,7 +793,7 @@ ENTRY(ret_from_fork)
23643
23644 RESTORE_REST
23645
23646- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23647+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23648 jz 1f
23649
23650 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23651@@ -341,15 +803,13 @@ ENTRY(ret_from_fork)
23652 jmp ret_from_sys_call # go to the SYSRET fastpath
23653
23654 1:
23655- subq $REST_SKIP, %rsp # leave space for volatiles
23656- CFI_ADJUST_CFA_OFFSET REST_SKIP
23657 movq %rbp, %rdi
23658 call *%rbx
23659 movl $0, RAX(%rsp)
23660 RESTORE_REST
23661 jmp int_ret_from_sys_call
23662 CFI_ENDPROC
23663-END(ret_from_fork)
23664+ENDPROC(ret_from_fork)
23665
23666 /*
23667 * System call entry. Up to 6 arguments in registers are supported.
23668@@ -386,7 +846,7 @@ END(ret_from_fork)
23669 ENTRY(system_call)
23670 CFI_STARTPROC simple
23671 CFI_SIGNAL_FRAME
23672- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23673+ CFI_DEF_CFA rsp,0
23674 CFI_REGISTER rip,rcx
23675 /*CFI_REGISTER rflags,r11*/
23676 SWAPGS_UNSAFE_STACK
23677@@ -399,16 +859,23 @@ GLOBAL(system_call_after_swapgs)
23678
23679 movq %rsp,PER_CPU_VAR(old_rsp)
23680 movq PER_CPU_VAR(kernel_stack),%rsp
23681+ SAVE_ARGS 8*6, 0, rax_enosys=1
23682+ pax_enter_kernel_user
23683+
23684+#ifdef CONFIG_PAX_RANDKSTACK
23685+ pax_erase_kstack
23686+#endif
23687+
23688 /*
23689 * No need to follow this irqs off/on section - it's straight
23690 * and short:
23691 */
23692 ENABLE_INTERRUPTS(CLBR_NONE)
23693- SAVE_ARGS 8, 0, rax_enosys=1
23694 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23695 movq %rcx,RIP-ARGOFFSET(%rsp)
23696 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23697- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23698+ GET_THREAD_INFO(%rcx)
23699+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23700 jnz tracesys
23701 system_call_fastpath:
23702 #if __SYSCALL_MASK == ~0
23703@@ -432,10 +899,13 @@ sysret_check:
23704 LOCKDEP_SYS_EXIT
23705 DISABLE_INTERRUPTS(CLBR_NONE)
23706 TRACE_IRQS_OFF
23707- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23708+ GET_THREAD_INFO(%rcx)
23709+ movl TI_flags(%rcx),%edx
23710 andl %edi,%edx
23711 jnz sysret_careful
23712 CFI_REMEMBER_STATE
23713+ pax_exit_kernel_user
23714+ pax_erase_kstack
23715 /*
23716 * sysretq will re-enable interrupts:
23717 */
23718@@ -494,12 +964,15 @@ sysret_audit:
23719
23720 /* Do syscall tracing */
23721 tracesys:
23722- leaq -REST_SKIP(%rsp), %rdi
23723+ movq %rsp, %rdi
23724 movq $AUDIT_ARCH_X86_64, %rsi
23725 call syscall_trace_enter_phase1
23726 test %rax, %rax
23727 jnz tracesys_phase2 /* if needed, run the slow path */
23728- LOAD_ARGS 0 /* else restore clobbered regs */
23729+
23730+ pax_erase_kstack
23731+
23732+ LOAD_ARGS /* else restore clobbered regs */
23733 jmp system_call_fastpath /* and return to the fast path */
23734
23735 tracesys_phase2:
23736@@ -510,12 +983,14 @@ tracesys_phase2:
23737 movq %rax,%rdx
23738 call syscall_trace_enter_phase2
23739
23740+ pax_erase_kstack
23741+
23742 /*
23743 * Reload arg registers from stack in case ptrace changed them.
23744 * We don't reload %rax because syscall_trace_entry_phase2() returned
23745 * the value it wants us to use in the table lookup.
23746 */
23747- LOAD_ARGS ARGOFFSET, 1
23748+ LOAD_ARGS 1
23749 RESTORE_REST
23750 #if __SYSCALL_MASK == ~0
23751 cmpq $__NR_syscall_max,%rax
23752@@ -545,7 +1020,9 @@ GLOBAL(int_with_check)
23753 andl %edi,%edx
23754 jnz int_careful
23755 andl $~TS_COMPAT,TI_status(%rcx)
23756- jmp retint_swapgs
23757+ pax_exit_kernel_user
23758+ pax_erase_kstack
23759+ jmp retint_swapgs_pax
23760
23761 /* Either reschedule or signal or syscall exit tracking needed. */
23762 /* First do a reschedule test. */
23763@@ -591,7 +1068,7 @@ int_restore_rest:
23764 TRACE_IRQS_OFF
23765 jmp int_with_check
23766 CFI_ENDPROC
23767-END(system_call)
23768+ENDPROC(system_call)
23769
23770 .macro FORK_LIKE func
23771 ENTRY(stub_\func)
23772@@ -604,9 +1081,10 @@ ENTRY(stub_\func)
23773 DEFAULT_FRAME 0 8 /* offset 8: return address */
23774 call sys_\func
23775 RESTORE_TOP_OF_STACK %r11, 8
23776- ret $REST_SKIP /* pop extended registers */
23777+ pax_force_retaddr
23778+ ret
23779 CFI_ENDPROC
23780-END(stub_\func)
23781+ENDPROC(stub_\func)
23782 .endm
23783
23784 .macro FIXED_FRAME label,func
23785@@ -616,9 +1094,10 @@ ENTRY(\label)
23786 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23787 call \func
23788 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23789+ pax_force_retaddr
23790 ret
23791 CFI_ENDPROC
23792-END(\label)
23793+ENDPROC(\label)
23794 .endm
23795
23796 FORK_LIKE clone
23797@@ -626,19 +1105,6 @@ END(\label)
23798 FORK_LIKE vfork
23799 FIXED_FRAME stub_iopl, sys_iopl
23800
23801-ENTRY(ptregscall_common)
23802- DEFAULT_FRAME 1 8 /* offset 8: return address */
23803- RESTORE_TOP_OF_STACK %r11, 8
23804- movq_cfi_restore R15+8, r15
23805- movq_cfi_restore R14+8, r14
23806- movq_cfi_restore R13+8, r13
23807- movq_cfi_restore R12+8, r12
23808- movq_cfi_restore RBP+8, rbp
23809- movq_cfi_restore RBX+8, rbx
23810- ret $REST_SKIP /* pop extended registers */
23811- CFI_ENDPROC
23812-END(ptregscall_common)
23813-
23814 ENTRY(stub_execve)
23815 CFI_STARTPROC
23816 addq $8, %rsp
23817@@ -650,7 +1116,7 @@ ENTRY(stub_execve)
23818 RESTORE_REST
23819 jmp int_ret_from_sys_call
23820 CFI_ENDPROC
23821-END(stub_execve)
23822+ENDPROC(stub_execve)
23823
23824 /*
23825 * sigreturn is special because it needs to restore all registers on return.
23826@@ -667,7 +1133,7 @@ ENTRY(stub_rt_sigreturn)
23827 RESTORE_REST
23828 jmp int_ret_from_sys_call
23829 CFI_ENDPROC
23830-END(stub_rt_sigreturn)
23831+ENDPROC(stub_rt_sigreturn)
23832
23833 #ifdef CONFIG_X86_X32_ABI
23834 ENTRY(stub_x32_rt_sigreturn)
23835@@ -681,7 +1147,7 @@ ENTRY(stub_x32_rt_sigreturn)
23836 RESTORE_REST
23837 jmp int_ret_from_sys_call
23838 CFI_ENDPROC
23839-END(stub_x32_rt_sigreturn)
23840+ENDPROC(stub_x32_rt_sigreturn)
23841
23842 ENTRY(stub_x32_execve)
23843 CFI_STARTPROC
23844@@ -695,7 +1161,7 @@ ENTRY(stub_x32_execve)
23845 RESTORE_REST
23846 jmp int_ret_from_sys_call
23847 CFI_ENDPROC
23848-END(stub_x32_execve)
23849+ENDPROC(stub_x32_execve)
23850
23851 #endif
23852
23853@@ -732,7 +1198,7 @@ vector=vector+1
23854 2: jmp common_interrupt
23855 .endr
23856 CFI_ENDPROC
23857-END(irq_entries_start)
23858+ENDPROC(irq_entries_start)
23859
23860 .previous
23861 END(interrupt)
23862@@ -749,8 +1215,8 @@ END(interrupt)
23863 /* 0(%rsp): ~(interrupt number) */
23864 .macro interrupt func
23865 /* reserve pt_regs for scratch regs and rbp */
23866- subq $ORIG_RAX-RBP, %rsp
23867- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23868+ subq $ORIG_RAX, %rsp
23869+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23870 SAVE_ARGS_IRQ
23871 call \func
23872 .endm
23873@@ -773,14 +1239,14 @@ ret_from_intr:
23874
23875 /* Restore saved previous stack */
23876 popq %rsi
23877- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23878- leaq ARGOFFSET-RBP(%rsi), %rsp
23879+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23880+ movq %rsi, %rsp
23881 CFI_DEF_CFA_REGISTER rsp
23882- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23883+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23884
23885 exit_intr:
23886 GET_THREAD_INFO(%rcx)
23887- testl $3,CS-ARGOFFSET(%rsp)
23888+ testb $3,CS-ARGOFFSET(%rsp)
23889 je retint_kernel
23890
23891 /* Interrupt came from user space */
23892@@ -802,12 +1268,35 @@ retint_swapgs: /* return to user-space */
23893 * The iretq could re-enable interrupts:
23894 */
23895 DISABLE_INTERRUPTS(CLBR_ANY)
23896+ pax_exit_kernel_user
23897+retint_swapgs_pax:
23898 TRACE_IRQS_IRETQ
23899 SWAPGS
23900 jmp restore_args
23901
23902 retint_restore_args: /* return to kernel space */
23903 DISABLE_INTERRUPTS(CLBR_ANY)
23904+ pax_exit_kernel
23905+
23906+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23907+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23908+ * namely calling EFI runtime services with a phys mapping. We're
23909+ * starting off with NOPs and patch in the real instrumentation
23910+ * (BTS/OR) before starting any userland process; even before starting
23911+ * up the APs.
23912+ */
23913+ .pushsection .altinstr_replacement, "a"
23914+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23915+ 602:
23916+ .popsection
23917+ 603: .fill 602b-601b, 1, 0x90
23918+ .pushsection .altinstructions, "a"
23919+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23920+ .popsection
23921+#else
23922+ pax_force_retaddr (RIP-ARGOFFSET)
23923+#endif
23924+
23925 /*
23926 * The iretq could re-enable interrupts:
23927 */
23928@@ -845,15 +1334,15 @@ native_irq_return_ldt:
23929 SWAPGS
23930 movq PER_CPU_VAR(espfix_waddr),%rdi
23931 movq %rax,(0*8)(%rdi) /* RAX */
23932- movq (2*8)(%rsp),%rax /* RIP */
23933+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23934 movq %rax,(1*8)(%rdi)
23935- movq (3*8)(%rsp),%rax /* CS */
23936+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23937 movq %rax,(2*8)(%rdi)
23938- movq (4*8)(%rsp),%rax /* RFLAGS */
23939+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23940 movq %rax,(3*8)(%rdi)
23941- movq (6*8)(%rsp),%rax /* SS */
23942+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23943 movq %rax,(5*8)(%rdi)
23944- movq (5*8)(%rsp),%rax /* RSP */
23945+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23946 movq %rax,(4*8)(%rdi)
23947 andl $0xffff0000,%eax
23948 popq_cfi %rdi
23949@@ -907,7 +1396,7 @@ ENTRY(retint_kernel)
23950 jmp exit_intr
23951 #endif
23952 CFI_ENDPROC
23953-END(common_interrupt)
23954+ENDPROC(common_interrupt)
23955
23956 /*
23957 * APIC interrupts.
23958@@ -921,7 +1410,7 @@ ENTRY(\sym)
23959 interrupt \do_sym
23960 jmp ret_from_intr
23961 CFI_ENDPROC
23962-END(\sym)
23963+ENDPROC(\sym)
23964 .endm
23965
23966 #ifdef CONFIG_TRACING
23967@@ -994,7 +1483,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23968 /*
23969 * Exception entry points.
23970 */
23971-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23972+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23973
23974 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23975 ENTRY(\sym)
23976@@ -1045,6 +1534,12 @@ ENTRY(\sym)
23977 .endif
23978
23979 .if \shift_ist != -1
23980+#ifdef CONFIG_SMP
23981+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23982+ lea init_tss(%r13), %r13
23983+#else
23984+ lea init_tss(%rip), %r13
23985+#endif
23986 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23987 .endif
23988
23989@@ -1061,7 +1556,7 @@ ENTRY(\sym)
23990 .endif
23991
23992 CFI_ENDPROC
23993-END(\sym)
23994+ENDPROC(\sym)
23995 .endm
23996
23997 #ifdef CONFIG_TRACING
23998@@ -1102,9 +1597,10 @@ gs_change:
23999 2: mfence /* workaround */
24000 SWAPGS
24001 popfq_cfi
24002+ pax_force_retaddr
24003 ret
24004 CFI_ENDPROC
24005-END(native_load_gs_index)
24006+ENDPROC(native_load_gs_index)
24007
24008 _ASM_EXTABLE(gs_change,bad_gs)
24009 .section .fixup,"ax"
24010@@ -1132,9 +1628,10 @@ ENTRY(do_softirq_own_stack)
24011 CFI_DEF_CFA_REGISTER rsp
24012 CFI_ADJUST_CFA_OFFSET -8
24013 decl PER_CPU_VAR(irq_count)
24014+ pax_force_retaddr
24015 ret
24016 CFI_ENDPROC
24017-END(do_softirq_own_stack)
24018+ENDPROC(do_softirq_own_stack)
24019
24020 #ifdef CONFIG_XEN
24021 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24022@@ -1172,7 +1669,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24023 decl PER_CPU_VAR(irq_count)
24024 jmp error_exit
24025 CFI_ENDPROC
24026-END(xen_do_hypervisor_callback)
24027+ENDPROC(xen_do_hypervisor_callback)
24028
24029 /*
24030 * Hypervisor uses this for application faults while it executes.
24031@@ -1231,7 +1728,7 @@ ENTRY(xen_failsafe_callback)
24032 SAVE_ALL
24033 jmp error_exit
24034 CFI_ENDPROC
24035-END(xen_failsafe_callback)
24036+ENDPROC(xen_failsafe_callback)
24037
24038 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24039 xen_hvm_callback_vector xen_evtchn_do_upcall
24040@@ -1278,18 +1775,33 @@ ENTRY(paranoid_exit)
24041 DEFAULT_FRAME
24042 DISABLE_INTERRUPTS(CLBR_NONE)
24043 TRACE_IRQS_OFF_DEBUG
24044- testl %ebx,%ebx /* swapgs needed? */
24045+ testl $1,%ebx /* swapgs needed? */
24046 jnz paranoid_restore
24047- testl $3,CS(%rsp)
24048+ testb $3,CS(%rsp)
24049 jnz paranoid_userspace
24050+#ifdef CONFIG_PAX_MEMORY_UDEREF
24051+ pax_exit_kernel
24052+ TRACE_IRQS_IRETQ 0
24053+ SWAPGS_UNSAFE_STACK
24054+ RESTORE_ALL 8
24055+ pax_force_retaddr_bts
24056+ jmp irq_return
24057+#endif
24058 paranoid_swapgs:
24059+#ifdef CONFIG_PAX_MEMORY_UDEREF
24060+ pax_exit_kernel_user
24061+#else
24062+ pax_exit_kernel
24063+#endif
24064 TRACE_IRQS_IRETQ 0
24065 SWAPGS_UNSAFE_STACK
24066 RESTORE_ALL 8
24067 jmp irq_return
24068 paranoid_restore:
24069+ pax_exit_kernel
24070 TRACE_IRQS_IRETQ_DEBUG 0
24071 RESTORE_ALL 8
24072+ pax_force_retaddr_bts
24073 jmp irq_return
24074 paranoid_userspace:
24075 GET_THREAD_INFO(%rcx)
24076@@ -1318,7 +1830,7 @@ paranoid_schedule:
24077 TRACE_IRQS_OFF
24078 jmp paranoid_userspace
24079 CFI_ENDPROC
24080-END(paranoid_exit)
24081+ENDPROC(paranoid_exit)
24082
24083 /*
24084 * Exception entry point. This expects an error code/orig_rax on the stack.
24085@@ -1345,12 +1857,23 @@ ENTRY(error_entry)
24086 movq %r14, R14+8(%rsp)
24087 movq %r15, R15+8(%rsp)
24088 xorl %ebx,%ebx
24089- testl $3,CS+8(%rsp)
24090+ testb $3,CS+8(%rsp)
24091 je error_kernelspace
24092 error_swapgs:
24093 SWAPGS
24094 error_sti:
24095+#ifdef CONFIG_PAX_MEMORY_UDEREF
24096+ testb $3, CS+8(%rsp)
24097+ jnz 1f
24098+ pax_enter_kernel
24099+ jmp 2f
24100+1: pax_enter_kernel_user
24101+2:
24102+#else
24103+ pax_enter_kernel
24104+#endif
24105 TRACE_IRQS_OFF
24106+ pax_force_retaddr
24107 ret
24108
24109 /*
24110@@ -1385,7 +1908,7 @@ error_bad_iret:
24111 decl %ebx /* Return to usergs */
24112 jmp error_sti
24113 CFI_ENDPROC
24114-END(error_entry)
24115+ENDPROC(error_entry)
24116
24117
24118 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24119@@ -1396,7 +1919,7 @@ ENTRY(error_exit)
24120 DISABLE_INTERRUPTS(CLBR_NONE)
24121 TRACE_IRQS_OFF
24122 GET_THREAD_INFO(%rcx)
24123- testl %eax,%eax
24124+ testl $1,%eax
24125 jne retint_kernel
24126 LOCKDEP_SYS_EXIT_IRQ
24127 movl TI_flags(%rcx),%edx
24128@@ -1405,7 +1928,7 @@ ENTRY(error_exit)
24129 jnz retint_careful
24130 jmp retint_swapgs
24131 CFI_ENDPROC
24132-END(error_exit)
24133+ENDPROC(error_exit)
24134
24135 /*
24136 * Test if a given stack is an NMI stack or not.
24137@@ -1463,9 +1986,11 @@ ENTRY(nmi)
24138 * If %cs was not the kernel segment, then the NMI triggered in user
24139 * space, which means it is definitely not nested.
24140 */
24141+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24142+ je 1f
24143 cmpl $__KERNEL_CS, 16(%rsp)
24144 jne first_nmi
24145-
24146+1:
24147 /*
24148 * Check the special variable on the stack to see if NMIs are
24149 * executing.
24150@@ -1499,8 +2024,7 @@ nested_nmi:
24151
24152 1:
24153 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24154- leaq -1*8(%rsp), %rdx
24155- movq %rdx, %rsp
24156+ subq $8, %rsp
24157 CFI_ADJUST_CFA_OFFSET 1*8
24158 leaq -10*8(%rsp), %rdx
24159 pushq_cfi $__KERNEL_DS
24160@@ -1518,6 +2042,7 @@ nested_nmi_out:
24161 CFI_RESTORE rdx
24162
24163 /* No need to check faults here */
24164+# pax_force_retaddr_bts
24165 INTERRUPT_RETURN
24166
24167 CFI_RESTORE_STATE
24168@@ -1614,13 +2139,13 @@ end_repeat_nmi:
24169 subq $ORIG_RAX-R15, %rsp
24170 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24171 /*
24172- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24173+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24174 * as we should not be calling schedule in NMI context.
24175 * Even with normal interrupts enabled. An NMI should not be
24176 * setting NEED_RESCHED or anything that normal interrupts and
24177 * exceptions might do.
24178 */
24179- call save_paranoid
24180+ call save_paranoid_nmi
24181 DEFAULT_FRAME 0
24182
24183 /*
24184@@ -1630,9 +2155,9 @@ end_repeat_nmi:
24185 * NMI itself takes a page fault, the page fault that was preempted
24186 * will read the information from the NMI page fault and not the
24187 * origin fault. Save it off and restore it if it changes.
24188- * Use the r12 callee-saved register.
24189+ * Use the r13 callee-saved register.
24190 */
24191- movq %cr2, %r12
24192+ movq %cr2, %r13
24193
24194 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24195 movq %rsp,%rdi
24196@@ -1641,29 +2166,34 @@ end_repeat_nmi:
24197
24198 /* Did the NMI take a page fault? Restore cr2 if it did */
24199 movq %cr2, %rcx
24200- cmpq %rcx, %r12
24201+ cmpq %rcx, %r13
24202 je 1f
24203- movq %r12, %cr2
24204+ movq %r13, %cr2
24205 1:
24206
24207- testl %ebx,%ebx /* swapgs needed? */
24208+ testl $1,%ebx /* swapgs needed? */
24209 jnz nmi_restore
24210 nmi_swapgs:
24211 SWAPGS_UNSAFE_STACK
24212 nmi_restore:
24213+ pax_exit_kernel_nmi
24214 /* Pop the extra iret frame at once */
24215 RESTORE_ALL 6*8
24216+ testb $3, 8(%rsp)
24217+ jnz 1f
24218+ pax_force_retaddr_bts
24219+1:
24220
24221 /* Clear the NMI executing stack variable */
24222 movq $0, 5*8(%rsp)
24223 jmp irq_return
24224 CFI_ENDPROC
24225-END(nmi)
24226+ENDPROC(nmi)
24227
24228 ENTRY(ignore_sysret)
24229 CFI_STARTPROC
24230 mov $-ENOSYS,%eax
24231 sysret
24232 CFI_ENDPROC
24233-END(ignore_sysret)
24234+ENDPROC(ignore_sysret)
24235
24236diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24237index 94d857f..5bce89c 100644
24238--- a/arch/x86/kernel/espfix_64.c
24239+++ b/arch/x86/kernel/espfix_64.c
24240@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24241 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24242 static void *espfix_pages[ESPFIX_MAX_PAGES];
24243
24244-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24245- __aligned(PAGE_SIZE);
24246+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24247
24248 static unsigned int page_random, slot_random;
24249
24250@@ -122,14 +121,17 @@ static void init_espfix_random(void)
24251 void __init init_espfix_bsp(void)
24252 {
24253 pgd_t *pgd_p;
24254- pteval_t ptemask;
24255-
24256- ptemask = __supported_pte_mask;
24257+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24258
24259 /* Install the espfix pud into the kernel page directory */
24260- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24261+ pgd_p = &init_level4_pgt[index];
24262 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24263
24264+#ifdef CONFIG_PAX_PER_CPU_PGD
24265+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24266+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24267+#endif
24268+
24269 /* Randomize the locations */
24270 init_espfix_random();
24271
24272@@ -197,7 +199,7 @@ void init_espfix_ap(void)
24273 set_pte(&pte_p[n*PTE_STRIDE], pte);
24274
24275 /* Job is done for this CPU and any CPU which shares this page */
24276- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24277+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24278
24279 unlock_done:
24280 mutex_unlock(&espfix_init_mutex);
24281diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24282index 3386dc9..28bdf81 100644
24283--- a/arch/x86/kernel/ftrace.c
24284+++ b/arch/x86/kernel/ftrace.c
24285@@ -88,7 +88,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24286 * kernel identity mapping to modify code.
24287 */
24288 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24289- ip = (unsigned long)__va(__pa_symbol(ip));
24290+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24291
24292 return ip;
24293 }
24294@@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24295 {
24296 unsigned char replaced[MCOUNT_INSN_SIZE];
24297
24298+ ip = ktla_ktva(ip);
24299+
24300 /*
24301 * Note: Due to modules and __init, code can
24302 * disappear and change, we need to protect against faulting
24303@@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24304 unsigned char old[MCOUNT_INSN_SIZE];
24305 int ret;
24306
24307- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24308+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24309
24310 ftrace_update_func = ip;
24311 /* Make sure the breakpoints see the ftrace_update_func update */
24312@@ -310,7 +312,7 @@ static int add_break(unsigned long ip, const char *old)
24313 unsigned char replaced[MCOUNT_INSN_SIZE];
24314 unsigned char brk = BREAKPOINT_INSTRUCTION;
24315
24316- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24317+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24318 return -EFAULT;
24319
24320 /* Make sure it is what we expect it to be */
24321diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24322index eda1a86..8f6df48 100644
24323--- a/arch/x86/kernel/head64.c
24324+++ b/arch/x86/kernel/head64.c
24325@@ -67,12 +67,12 @@ again:
24326 pgd = *pgd_p;
24327
24328 /*
24329- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24330- * critical -- __PAGE_OFFSET would point us back into the dynamic
24331+ * The use of __early_va rather than __va here is critical:
24332+ * __va would point us back into the dynamic
24333 * range and we might end up looping forever...
24334 */
24335 if (pgd)
24336- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24337+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24338 else {
24339 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24340 reset_early_page_tables();
24341@@ -82,13 +82,13 @@ again:
24342 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24343 for (i = 0; i < PTRS_PER_PUD; i++)
24344 pud_p[i] = 0;
24345- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24346+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24347 }
24348 pud_p += pud_index(address);
24349 pud = *pud_p;
24350
24351 if (pud)
24352- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24353+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24354 else {
24355 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24356 reset_early_page_tables();
24357@@ -98,7 +98,7 @@ again:
24358 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24359 for (i = 0; i < PTRS_PER_PMD; i++)
24360 pmd_p[i] = 0;
24361- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24362+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24363 }
24364 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24365 pmd_p[pmd_index(address)] = pmd;
24366@@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24367 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24368 early_printk("Kernel alive\n");
24369
24370- clear_page(init_level4_pgt);
24371 /* set init_level4_pgt kernel high mapping*/
24372 init_level4_pgt[511] = early_level4_pgt[511];
24373
24374diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24375index f36bd42..0ab4474 100644
24376--- a/arch/x86/kernel/head_32.S
24377+++ b/arch/x86/kernel/head_32.S
24378@@ -26,6 +26,12 @@
24379 /* Physical address */
24380 #define pa(X) ((X) - __PAGE_OFFSET)
24381
24382+#ifdef CONFIG_PAX_KERNEXEC
24383+#define ta(X) (X)
24384+#else
24385+#define ta(X) ((X) - __PAGE_OFFSET)
24386+#endif
24387+
24388 /*
24389 * References to members of the new_cpu_data structure.
24390 */
24391@@ -55,11 +61,7 @@
24392 * and small than max_low_pfn, otherwise will waste some page table entries
24393 */
24394
24395-#if PTRS_PER_PMD > 1
24396-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24397-#else
24398-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24399-#endif
24400+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24401
24402 /* Number of possible pages in the lowmem region */
24403 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24404@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24405 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24406
24407 /*
24408+ * Real beginning of normal "text" segment
24409+ */
24410+ENTRY(stext)
24411+ENTRY(_stext)
24412+
24413+/*
24414 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24415 * %esi points to the real-mode code as a 32-bit pointer.
24416 * CS and DS must be 4 GB flat segments, but we don't depend on
24417@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24418 * can.
24419 */
24420 __HEAD
24421+
24422+#ifdef CONFIG_PAX_KERNEXEC
24423+ jmp startup_32
24424+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24425+.fill PAGE_SIZE-5,1,0xcc
24426+#endif
24427+
24428 ENTRY(startup_32)
24429 movl pa(stack_start),%ecx
24430
24431@@ -106,6 +121,59 @@ ENTRY(startup_32)
24432 2:
24433 leal -__PAGE_OFFSET(%ecx),%esp
24434
24435+#ifdef CONFIG_SMP
24436+ movl $pa(cpu_gdt_table),%edi
24437+ movl $__per_cpu_load,%eax
24438+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24439+ rorl $16,%eax
24440+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24441+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24442+ movl $__per_cpu_end - 1,%eax
24443+ subl $__per_cpu_start,%eax
24444+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24445+#endif
24446+
24447+#ifdef CONFIG_PAX_MEMORY_UDEREF
24448+ movl $NR_CPUS,%ecx
24449+ movl $pa(cpu_gdt_table),%edi
24450+1:
24451+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24452+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24453+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24454+ addl $PAGE_SIZE_asm,%edi
24455+ loop 1b
24456+#endif
24457+
24458+#ifdef CONFIG_PAX_KERNEXEC
24459+ movl $pa(boot_gdt),%edi
24460+ movl $__LOAD_PHYSICAL_ADDR,%eax
24461+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24462+ rorl $16,%eax
24463+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24464+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24465+ rorl $16,%eax
24466+
24467+ ljmp $(__BOOT_CS),$1f
24468+1:
24469+
24470+ movl $NR_CPUS,%ecx
24471+ movl $pa(cpu_gdt_table),%edi
24472+ addl $__PAGE_OFFSET,%eax
24473+1:
24474+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24475+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24476+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24477+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24478+ rorl $16,%eax
24479+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24480+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24481+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24482+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24483+ rorl $16,%eax
24484+ addl $PAGE_SIZE_asm,%edi
24485+ loop 1b
24486+#endif
24487+
24488 /*
24489 * Clear BSS first so that there are no surprises...
24490 */
24491@@ -201,8 +269,11 @@ ENTRY(startup_32)
24492 movl %eax, pa(max_pfn_mapped)
24493
24494 /* Do early initialization of the fixmap area */
24495- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24496- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24497+#ifdef CONFIG_COMPAT_VDSO
24498+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24499+#else
24500+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24501+#endif
24502 #else /* Not PAE */
24503
24504 page_pde_offset = (__PAGE_OFFSET >> 20);
24505@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24506 movl %eax, pa(max_pfn_mapped)
24507
24508 /* Do early initialization of the fixmap area */
24509- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24510- movl %eax,pa(initial_page_table+0xffc)
24511+#ifdef CONFIG_COMPAT_VDSO
24512+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24513+#else
24514+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24515+#endif
24516 #endif
24517
24518 #ifdef CONFIG_PARAVIRT
24519@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24520 cmpl $num_subarch_entries, %eax
24521 jae bad_subarch
24522
24523- movl pa(subarch_entries)(,%eax,4), %eax
24524- subl $__PAGE_OFFSET, %eax
24525- jmp *%eax
24526+ jmp *pa(subarch_entries)(,%eax,4)
24527
24528 bad_subarch:
24529 WEAK(lguest_entry)
24530@@ -261,10 +333,10 @@ WEAK(xen_entry)
24531 __INITDATA
24532
24533 subarch_entries:
24534- .long default_entry /* normal x86/PC */
24535- .long lguest_entry /* lguest hypervisor */
24536- .long xen_entry /* Xen hypervisor */
24537- .long default_entry /* Moorestown MID */
24538+ .long ta(default_entry) /* normal x86/PC */
24539+ .long ta(lguest_entry) /* lguest hypervisor */
24540+ .long ta(xen_entry) /* Xen hypervisor */
24541+ .long ta(default_entry) /* Moorestown MID */
24542 num_subarch_entries = (. - subarch_entries) / 4
24543 .previous
24544 #else
24545@@ -354,6 +426,7 @@ default_entry:
24546 movl pa(mmu_cr4_features),%eax
24547 movl %eax,%cr4
24548
24549+#ifdef CONFIG_X86_PAE
24550 testb $X86_CR4_PAE, %al # check if PAE is enabled
24551 jz enable_paging
24552
24553@@ -382,6 +455,9 @@ default_entry:
24554 /* Make changes effective */
24555 wrmsr
24556
24557+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24558+#endif
24559+
24560 enable_paging:
24561
24562 /*
24563@@ -449,14 +525,20 @@ is486:
24564 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24565 movl %eax,%ss # after changing gdt.
24566
24567- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24568+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24569 movl %eax,%ds
24570 movl %eax,%es
24571
24572 movl $(__KERNEL_PERCPU), %eax
24573 movl %eax,%fs # set this cpu's percpu
24574
24575+#ifdef CONFIG_CC_STACKPROTECTOR
24576 movl $(__KERNEL_STACK_CANARY),%eax
24577+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24578+ movl $(__USER_DS),%eax
24579+#else
24580+ xorl %eax,%eax
24581+#endif
24582 movl %eax,%gs
24583
24584 xorl %eax,%eax # Clear LDT
24585@@ -512,8 +594,11 @@ setup_once:
24586 * relocation. Manually set base address in stack canary
24587 * segment descriptor.
24588 */
24589- movl $gdt_page,%eax
24590+ movl $cpu_gdt_table,%eax
24591 movl $stack_canary,%ecx
24592+#ifdef CONFIG_SMP
24593+ addl $__per_cpu_load,%ecx
24594+#endif
24595 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24596 shrl $16, %ecx
24597 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24598@@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24599 cmpl $2,(%esp) # X86_TRAP_NMI
24600 je is_nmi # Ignore NMI
24601
24602- cmpl $2,%ss:early_recursion_flag
24603+ cmpl $1,%ss:early_recursion_flag
24604 je hlt_loop
24605 incl %ss:early_recursion_flag
24606
24607@@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24608 pushl (20+6*4)(%esp) /* trapno */
24609 pushl $fault_msg
24610 call printk
24611-#endif
24612 call dump_stack
24613+#endif
24614 hlt_loop:
24615 hlt
24616 jmp hlt_loop
24617@@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24618 /* This is the default interrupt "handler" :-) */
24619 ALIGN
24620 ignore_int:
24621- cld
24622 #ifdef CONFIG_PRINTK
24623+ cmpl $2,%ss:early_recursion_flag
24624+ je hlt_loop
24625+ incl %ss:early_recursion_flag
24626+ cld
24627 pushl %eax
24628 pushl %ecx
24629 pushl %edx
24630@@ -617,9 +705,6 @@ ignore_int:
24631 movl $(__KERNEL_DS),%eax
24632 movl %eax,%ds
24633 movl %eax,%es
24634- cmpl $2,early_recursion_flag
24635- je hlt_loop
24636- incl early_recursion_flag
24637 pushl 16(%esp)
24638 pushl 24(%esp)
24639 pushl 32(%esp)
24640@@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24641 /*
24642 * BSS section
24643 */
24644-__PAGE_ALIGNED_BSS
24645- .align PAGE_SIZE
24646 #ifdef CONFIG_X86_PAE
24647+.section .initial_pg_pmd,"a",@progbits
24648 initial_pg_pmd:
24649 .fill 1024*KPMDS,4,0
24650 #else
24651+.section .initial_page_table,"a",@progbits
24652 ENTRY(initial_page_table)
24653 .fill 1024,4,0
24654 #endif
24655+.section .initial_pg_fixmap,"a",@progbits
24656 initial_pg_fixmap:
24657 .fill 1024,4,0
24658+.section .empty_zero_page,"a",@progbits
24659 ENTRY(empty_zero_page)
24660 .fill 4096,1,0
24661+.section .swapper_pg_dir,"a",@progbits
24662 ENTRY(swapper_pg_dir)
24663+#ifdef CONFIG_X86_PAE
24664+ .fill 4,8,0
24665+#else
24666 .fill 1024,4,0
24667+#endif
24668
24669 /*
24670 * This starts the data section.
24671 */
24672 #ifdef CONFIG_X86_PAE
24673-__PAGE_ALIGNED_DATA
24674- /* Page-aligned for the benefit of paravirt? */
24675- .align PAGE_SIZE
24676+.section .initial_page_table,"a",@progbits
24677 ENTRY(initial_page_table)
24678 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24679 # if KPMDS == 3
24680@@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24681 # error "Kernel PMDs should be 1, 2 or 3"
24682 # endif
24683 .align PAGE_SIZE /* needs to be page-sized too */
24684+
24685+#ifdef CONFIG_PAX_PER_CPU_PGD
24686+ENTRY(cpu_pgd)
24687+ .rept 2*NR_CPUS
24688+ .fill 4,8,0
24689+ .endr
24690+#endif
24691+
24692 #endif
24693
24694 .data
24695 .balign 4
24696 ENTRY(stack_start)
24697- .long init_thread_union+THREAD_SIZE
24698+ .long init_thread_union+THREAD_SIZE-8
24699
24700 __INITRODATA
24701 int_msg:
24702@@ -727,7 +825,7 @@ fault_msg:
24703 * segment size, and 32-bit linear address value:
24704 */
24705
24706- .data
24707+.section .rodata,"a",@progbits
24708 .globl boot_gdt_descr
24709 .globl idt_descr
24710
24711@@ -736,7 +834,7 @@ fault_msg:
24712 .word 0 # 32 bit align gdt_desc.address
24713 boot_gdt_descr:
24714 .word __BOOT_DS+7
24715- .long boot_gdt - __PAGE_OFFSET
24716+ .long pa(boot_gdt)
24717
24718 .word 0 # 32-bit align idt_desc.address
24719 idt_descr:
24720@@ -747,7 +845,7 @@ idt_descr:
24721 .word 0 # 32 bit align gdt_desc.address
24722 ENTRY(early_gdt_descr)
24723 .word GDT_ENTRIES*8-1
24724- .long gdt_page /* Overwritten for secondary CPUs */
24725+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24726
24727 /*
24728 * The boot_gdt must mirror the equivalent in setup.S and is
24729@@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24730 .align L1_CACHE_BYTES
24731 ENTRY(boot_gdt)
24732 .fill GDT_ENTRY_BOOT_CS,8,0
24733- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24734- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24735+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24736+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24737+
24738+ .align PAGE_SIZE_asm
24739+ENTRY(cpu_gdt_table)
24740+ .rept NR_CPUS
24741+ .quad 0x0000000000000000 /* NULL descriptor */
24742+ .quad 0x0000000000000000 /* 0x0b reserved */
24743+ .quad 0x0000000000000000 /* 0x13 reserved */
24744+ .quad 0x0000000000000000 /* 0x1b reserved */
24745+
24746+#ifdef CONFIG_PAX_KERNEXEC
24747+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24748+#else
24749+ .quad 0x0000000000000000 /* 0x20 unused */
24750+#endif
24751+
24752+ .quad 0x0000000000000000 /* 0x28 unused */
24753+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24754+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24755+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24756+ .quad 0x0000000000000000 /* 0x4b reserved */
24757+ .quad 0x0000000000000000 /* 0x53 reserved */
24758+ .quad 0x0000000000000000 /* 0x5b reserved */
24759+
24760+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24761+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24762+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24763+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24764+
24765+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24766+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24767+
24768+ /*
24769+ * Segments used for calling PnP BIOS have byte granularity.
24770+ * The code segments and data segments have fixed 64k limits,
24771+ * the transfer segment sizes are set at run time.
24772+ */
24773+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24774+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24775+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24776+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24777+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24778+
24779+ /*
24780+ * The APM segments have byte granularity and their bases
24781+ * are set at run time. All have 64k limits.
24782+ */
24783+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24784+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24785+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24786+
24787+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24788+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24789+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24790+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24791+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24792+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24793+
24794+ /* Be sure this is zeroed to avoid false validations in Xen */
24795+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24796+ .endr
24797diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24798index a468c0a..8b5a879 100644
24799--- a/arch/x86/kernel/head_64.S
24800+++ b/arch/x86/kernel/head_64.S
24801@@ -20,6 +20,8 @@
24802 #include <asm/processor-flags.h>
24803 #include <asm/percpu.h>
24804 #include <asm/nops.h>
24805+#include <asm/cpufeature.h>
24806+#include <asm/alternative-asm.h>
24807
24808 #ifdef CONFIG_PARAVIRT
24809 #include <asm/asm-offsets.h>
24810@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24811 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24812 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24813 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24814+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24815+L3_VMALLOC_START = pud_index(VMALLOC_START)
24816+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24817+L3_VMALLOC_END = pud_index(VMALLOC_END)
24818+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24819+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24820
24821 .text
24822 __HEAD
24823@@ -89,11 +97,24 @@ startup_64:
24824 * Fixup the physical addresses in the page table
24825 */
24826 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24827+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24828+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24829+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24830+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24831+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24832
24833- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24834- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24835+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24836+#ifndef CONFIG_XEN
24837+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24838+#endif
24839+
24840+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24841+
24842+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24843+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24844
24845 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24846+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24847
24848 /*
24849 * Set up the identity mapping for the switchover. These
24850@@ -174,11 +195,12 @@ ENTRY(secondary_startup_64)
24851 * after the boot processor executes this code.
24852 */
24853
24854+ orq $-1, %rbp
24855 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24856 1:
24857
24858- /* Enable PAE mode and PGE */
24859- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24860+ /* Enable PAE mode and PSE/PGE */
24861+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24862 movq %rcx, %cr4
24863
24864 /* Setup early boot stage 4 level pagetables. */
24865@@ -199,10 +221,19 @@ ENTRY(secondary_startup_64)
24866 movl $MSR_EFER, %ecx
24867 rdmsr
24868 btsl $_EFER_SCE, %eax /* Enable System Call */
24869- btl $20,%edi /* No Execute supported? */
24870+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24871 jnc 1f
24872 btsl $_EFER_NX, %eax
24873+ cmpq $-1, %rbp
24874+ je 1f
24875 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24876+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24877+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24878+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24879+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24880+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24881+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24882+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24883 1: wrmsr /* Make changes effective */
24884
24885 /* Setup cr0 */
24886@@ -282,6 +313,7 @@ ENTRY(secondary_startup_64)
24887 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24888 * address given in m16:64.
24889 */
24890+ pax_set_fptr_mask
24891 movq initial_code(%rip),%rax
24892 pushq $0 # fake return address to stop unwinder
24893 pushq $__KERNEL_CS # set correct cs
24894@@ -313,7 +345,7 @@ ENDPROC(start_cpu0)
24895 .quad INIT_PER_CPU_VAR(irq_stack_union)
24896
24897 GLOBAL(stack_start)
24898- .quad init_thread_union+THREAD_SIZE-8
24899+ .quad init_thread_union+THREAD_SIZE-16
24900 .word 0
24901 __FINITDATA
24902
24903@@ -391,7 +423,7 @@ ENTRY(early_idt_handler)
24904 call dump_stack
24905 #ifdef CONFIG_KALLSYMS
24906 leaq early_idt_ripmsg(%rip),%rdi
24907- movq 40(%rsp),%rsi # %rip again
24908+ movq 88(%rsp),%rsi # %rip again
24909 call __print_symbol
24910 #endif
24911 #endif /* EARLY_PRINTK */
24912@@ -420,6 +452,7 @@ ENDPROC(early_idt_handler)
24913 early_recursion_flag:
24914 .long 0
24915
24916+ .section .rodata,"a",@progbits
24917 #ifdef CONFIG_EARLY_PRINTK
24918 early_idt_msg:
24919 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24920@@ -447,29 +480,52 @@ NEXT_PAGE(early_level4_pgt)
24921 NEXT_PAGE(early_dynamic_pgts)
24922 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24923
24924- .data
24925+ .section .rodata,"a",@progbits
24926
24927-#ifndef CONFIG_XEN
24928 NEXT_PAGE(init_level4_pgt)
24929- .fill 512,8,0
24930-#else
24931-NEXT_PAGE(init_level4_pgt)
24932- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24933 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24934 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24935+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24936+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24937+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24938+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24939+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24940+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24941 .org init_level4_pgt + L4_START_KERNEL*8, 0
24942 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24943 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24944
24945+#ifdef CONFIG_PAX_PER_CPU_PGD
24946+NEXT_PAGE(cpu_pgd)
24947+ .rept 2*NR_CPUS
24948+ .fill 512,8,0
24949+ .endr
24950+#endif
24951+
24952 NEXT_PAGE(level3_ident_pgt)
24953 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24954+#ifdef CONFIG_XEN
24955 .fill 511, 8, 0
24956+#else
24957+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24958+ .fill 510,8,0
24959+#endif
24960+
24961+NEXT_PAGE(level3_vmalloc_start_pgt)
24962+ .fill 512,8,0
24963+
24964+NEXT_PAGE(level3_vmalloc_end_pgt)
24965+ .fill 512,8,0
24966+
24967+NEXT_PAGE(level3_vmemmap_pgt)
24968+ .fill L3_VMEMMAP_START,8,0
24969+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24970+
24971 NEXT_PAGE(level2_ident_pgt)
24972- /* Since I easily can, map the first 1G.
24973+ /* Since I easily can, map the first 2G.
24974 * Don't set NX because code runs from these pages.
24975 */
24976- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24977-#endif
24978+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24979
24980 NEXT_PAGE(level3_kernel_pgt)
24981 .fill L3_START_KERNEL,8,0
24982@@ -477,6 +533,9 @@ NEXT_PAGE(level3_kernel_pgt)
24983 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24984 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24985
24986+NEXT_PAGE(level2_vmemmap_pgt)
24987+ .fill 512,8,0
24988+
24989 NEXT_PAGE(level2_kernel_pgt)
24990 /*
24991 * 512 MB kernel mapping. We spend a full page on this pagetable
24992@@ -494,28 +553,64 @@ NEXT_PAGE(level2_kernel_pgt)
24993 NEXT_PAGE(level2_fixmap_pgt)
24994 .fill 506,8,0
24995 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24996- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24997- .fill 5,8,0
24998+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24999+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25000+ .fill 4,8,0
25001
25002 NEXT_PAGE(level1_fixmap_pgt)
25003 .fill 512,8,0
25004
25005+NEXT_PAGE(level1_vsyscall_pgt)
25006+ .fill 512,8,0
25007+
25008 #undef PMDS
25009
25010- .data
25011+ .align PAGE_SIZE
25012+ENTRY(cpu_gdt_table)
25013+ .rept NR_CPUS
25014+ .quad 0x0000000000000000 /* NULL descriptor */
25015+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25016+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25017+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25018+ .quad 0x00cffb000000ffff /* __USER32_CS */
25019+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25020+ .quad 0x00affb000000ffff /* __USER_CS */
25021+
25022+#ifdef CONFIG_PAX_KERNEXEC
25023+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25024+#else
25025+ .quad 0x0 /* unused */
25026+#endif
25027+
25028+ .quad 0,0 /* TSS */
25029+ .quad 0,0 /* LDT */
25030+ .quad 0,0,0 /* three TLS descriptors */
25031+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25032+ /* asm/segment.h:GDT_ENTRIES must match this */
25033+
25034+#ifdef CONFIG_PAX_MEMORY_UDEREF
25035+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25036+#else
25037+ .quad 0x0 /* unused */
25038+#endif
25039+
25040+ /* zero the remaining page */
25041+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25042+ .endr
25043+
25044 .align 16
25045 .globl early_gdt_descr
25046 early_gdt_descr:
25047 .word GDT_ENTRIES*8-1
25048 early_gdt_descr_base:
25049- .quad INIT_PER_CPU_VAR(gdt_page)
25050+ .quad cpu_gdt_table
25051
25052 ENTRY(phys_base)
25053 /* This must match the first entry in level2_kernel_pgt */
25054 .quad 0x0000000000000000
25055
25056 #include "../../x86/xen/xen-head.S"
25057-
25058- __PAGE_ALIGNED_BSS
25059+
25060+ .section .rodata,"a",@progbits
25061 NEXT_PAGE(empty_zero_page)
25062 .skip PAGE_SIZE
25063diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25064index 05fd74f..c3548b1 100644
25065--- a/arch/x86/kernel/i386_ksyms_32.c
25066+++ b/arch/x86/kernel/i386_ksyms_32.c
25067@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25068 EXPORT_SYMBOL(cmpxchg8b_emu);
25069 #endif
25070
25071+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25072+
25073 /* Networking helper routines. */
25074 EXPORT_SYMBOL(csum_partial_copy_generic);
25075+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25076+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25077
25078 EXPORT_SYMBOL(__get_user_1);
25079 EXPORT_SYMBOL(__get_user_2);
25080@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25081 EXPORT_SYMBOL(___preempt_schedule_context);
25082 #endif
25083 #endif
25084+
25085+#ifdef CONFIG_PAX_KERNEXEC
25086+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25087+#endif
25088+
25089+#ifdef CONFIG_PAX_PER_CPU_PGD
25090+EXPORT_SYMBOL(cpu_pgd);
25091+#endif
25092diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25093index a9a4229..6f4d476 100644
25094--- a/arch/x86/kernel/i387.c
25095+++ b/arch/x86/kernel/i387.c
25096@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25097 static inline bool interrupted_user_mode(void)
25098 {
25099 struct pt_regs *regs = get_irq_regs();
25100- return regs && user_mode_vm(regs);
25101+ return regs && user_mode(regs);
25102 }
25103
25104 /*
25105diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25106index e7cc537..67d7372 100644
25107--- a/arch/x86/kernel/i8259.c
25108+++ b/arch/x86/kernel/i8259.c
25109@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25110 static void make_8259A_irq(unsigned int irq)
25111 {
25112 disable_irq_nosync(irq);
25113- io_apic_irqs &= ~(1<<irq);
25114+ io_apic_irqs &= ~(1UL<<irq);
25115 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25116 enable_irq(irq);
25117 }
25118@@ -208,7 +208,7 @@ spurious_8259A_irq:
25119 "spurious 8259A interrupt: IRQ%d.\n", irq);
25120 spurious_irq_mask |= irqmask;
25121 }
25122- atomic_inc(&irq_err_count);
25123+ atomic_inc_unchecked(&irq_err_count);
25124 /*
25125 * Theoretically we do not have to handle this IRQ,
25126 * but in Linux this does not cause problems and is
25127@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25128 /* (slave's support for AEOI in flat mode is to be investigated) */
25129 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25130
25131+ pax_open_kernel();
25132 if (auto_eoi)
25133 /*
25134 * In AEOI mode we just have to mask the interrupt
25135 * when acking.
25136 */
25137- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25138+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25139 else
25140- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25141+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25142+ pax_close_kernel();
25143
25144 udelay(100); /* wait for 8259A to initialize */
25145
25146diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25147index a979b5b..1d6db75 100644
25148--- a/arch/x86/kernel/io_delay.c
25149+++ b/arch/x86/kernel/io_delay.c
25150@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25151 * Quirk table for systems that misbehave (lock up, etc.) if port
25152 * 0x80 is used:
25153 */
25154-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25155+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25156 {
25157 .callback = dmi_io_delay_0xed_port,
25158 .ident = "Compaq Presario V6000",
25159diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25160index 4ddaf66..49d5c18 100644
25161--- a/arch/x86/kernel/ioport.c
25162+++ b/arch/x86/kernel/ioport.c
25163@@ -6,6 +6,7 @@
25164 #include <linux/sched.h>
25165 #include <linux/kernel.h>
25166 #include <linux/capability.h>
25167+#include <linux/security.h>
25168 #include <linux/errno.h>
25169 #include <linux/types.h>
25170 #include <linux/ioport.h>
25171@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25172 return -EINVAL;
25173 if (turn_on && !capable(CAP_SYS_RAWIO))
25174 return -EPERM;
25175+#ifdef CONFIG_GRKERNSEC_IO
25176+ if (turn_on && grsec_disable_privio) {
25177+ gr_handle_ioperm();
25178+ return -ENODEV;
25179+ }
25180+#endif
25181
25182 /*
25183 * If it's the first ioperm() call in this thread's lifetime, set the
25184@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25185 * because the ->io_bitmap_max value must match the bitmap
25186 * contents:
25187 */
25188- tss = &per_cpu(init_tss, get_cpu());
25189+ tss = init_tss + get_cpu();
25190
25191 if (turn_on)
25192 bitmap_clear(t->io_bitmap_ptr, from, num);
25193@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25194 if (level > old) {
25195 if (!capable(CAP_SYS_RAWIO))
25196 return -EPERM;
25197+#ifdef CONFIG_GRKERNSEC_IO
25198+ if (grsec_disable_privio) {
25199+ gr_handle_iopl();
25200+ return -ENODEV;
25201+ }
25202+#endif
25203 }
25204 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25205 t->iopl = level << 12;
25206diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25207index 3790775..53717dc 100644
25208--- a/arch/x86/kernel/irq.c
25209+++ b/arch/x86/kernel/irq.c
25210@@ -22,7 +22,7 @@
25211 #define CREATE_TRACE_POINTS
25212 #include <asm/trace/irq_vectors.h>
25213
25214-atomic_t irq_err_count;
25215+atomic_unchecked_t irq_err_count;
25216
25217 /* Function pointer for generic interrupt vector handling */
25218 void (*x86_platform_ipi_callback)(void) = NULL;
25219@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25220 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25221 seq_printf(p, " Hypervisor callback interrupts\n");
25222 #endif
25223- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25224+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25225 #if defined(CONFIG_X86_IO_APIC)
25226- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25227+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25228 #endif
25229 return 0;
25230 }
25231@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25232
25233 u64 arch_irq_stat(void)
25234 {
25235- u64 sum = atomic_read(&irq_err_count);
25236+ u64 sum = atomic_read_unchecked(&irq_err_count);
25237 return sum;
25238 }
25239
25240diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25241index 63ce838..2ea3e06 100644
25242--- a/arch/x86/kernel/irq_32.c
25243+++ b/arch/x86/kernel/irq_32.c
25244@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25245
25246 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25247
25248+extern void gr_handle_kernel_exploit(void);
25249+
25250 int sysctl_panic_on_stackoverflow __read_mostly;
25251
25252 /* Debugging check for stack overflow: is there less than 1KB free? */
25253@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25254 __asm__ __volatile__("andl %%esp,%0" :
25255 "=r" (sp) : "0" (THREAD_SIZE - 1));
25256
25257- return sp < (sizeof(struct thread_info) + STACK_WARN);
25258+ return sp < STACK_WARN;
25259 }
25260
25261 static void print_stack_overflow(void)
25262 {
25263 printk(KERN_WARNING "low stack detected by irq handler\n");
25264 dump_stack();
25265+ gr_handle_kernel_exploit();
25266 if (sysctl_panic_on_stackoverflow)
25267 panic("low stack detected by irq handler - check messages\n");
25268 }
25269@@ -84,10 +87,9 @@ static inline void *current_stack(void)
25270 static inline int
25271 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25272 {
25273- struct irq_stack *curstk, *irqstk;
25274+ struct irq_stack *irqstk;
25275 u32 *isp, *prev_esp, arg1, arg2;
25276
25277- curstk = (struct irq_stack *) current_stack();
25278 irqstk = __this_cpu_read(hardirq_stack);
25279
25280 /*
25281@@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25282 * handler) we can't do that and just have to keep using the
25283 * current stack (which is the irq stack already after all)
25284 */
25285- if (unlikely(curstk == irqstk))
25286+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25287 return 0;
25288
25289- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25290+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25291
25292 /* Save the next esp at the bottom of the stack */
25293 prev_esp = (u32 *)irqstk;
25294 *prev_esp = current_stack_pointer;
25295
25296+#ifdef CONFIG_PAX_MEMORY_UDEREF
25297+ __set_fs(MAKE_MM_SEG(0));
25298+#endif
25299+
25300 if (unlikely(overflow))
25301 call_on_stack(print_stack_overflow, isp);
25302
25303@@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25304 : "0" (irq), "1" (desc), "2" (isp),
25305 "D" (desc->handle_irq)
25306 : "memory", "cc", "ecx");
25307+
25308+#ifdef CONFIG_PAX_MEMORY_UDEREF
25309+ __set_fs(current_thread_info()->addr_limit);
25310+#endif
25311+
25312 return 1;
25313 }
25314
25315@@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25316 */
25317 void irq_ctx_init(int cpu)
25318 {
25319- struct irq_stack *irqstk;
25320-
25321 if (per_cpu(hardirq_stack, cpu))
25322 return;
25323
25324- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25325- THREADINFO_GFP,
25326- THREAD_SIZE_ORDER));
25327- per_cpu(hardirq_stack, cpu) = irqstk;
25328-
25329- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25330- THREADINFO_GFP,
25331- THREAD_SIZE_ORDER));
25332- per_cpu(softirq_stack, cpu) = irqstk;
25333-
25334- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25335- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25336+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25337+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25338 }
25339
25340 void do_softirq_own_stack(void)
25341 {
25342- struct thread_info *curstk;
25343 struct irq_stack *irqstk;
25344 u32 *isp, *prev_esp;
25345
25346- curstk = current_stack();
25347 irqstk = __this_cpu_read(softirq_stack);
25348
25349 /* build the stack frame on the softirq stack */
25350@@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25351 prev_esp = (u32 *)irqstk;
25352 *prev_esp = current_stack_pointer;
25353
25354+#ifdef CONFIG_PAX_MEMORY_UDEREF
25355+ __set_fs(MAKE_MM_SEG(0));
25356+#endif
25357+
25358 call_on_stack(__do_softirq, isp);
25359+
25360+#ifdef CONFIG_PAX_MEMORY_UDEREF
25361+ __set_fs(current_thread_info()->addr_limit);
25362+#endif
25363+
25364 }
25365
25366 bool handle_irq(unsigned irq, struct pt_regs *regs)
25367@@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25368 if (unlikely(!desc))
25369 return false;
25370
25371- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25372+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25373 if (unlikely(overflow))
25374 print_stack_overflow();
25375 desc->handle_irq(irq, desc);
25376diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25377index e4b503d..824fce8 100644
25378--- a/arch/x86/kernel/irq_64.c
25379+++ b/arch/x86/kernel/irq_64.c
25380@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25381 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25382 EXPORT_PER_CPU_SYMBOL(irq_regs);
25383
25384+extern void gr_handle_kernel_exploit(void);
25385+
25386 int sysctl_panic_on_stackoverflow;
25387
25388 /*
25389@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25390 u64 estack_top, estack_bottom;
25391 u64 curbase = (u64)task_stack_page(current);
25392
25393- if (user_mode_vm(regs))
25394+ if (user_mode(regs))
25395 return;
25396
25397 if (regs->sp >= curbase + sizeof(struct thread_info) +
25398@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25399 irq_stack_top, irq_stack_bottom,
25400 estack_top, estack_bottom);
25401
25402+ gr_handle_kernel_exploit();
25403+
25404 if (sysctl_panic_on_stackoverflow)
25405 panic("low stack detected by irq handler - check messages\n");
25406 #endif
25407diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25408index 26d5a55..a01160a 100644
25409--- a/arch/x86/kernel/jump_label.c
25410+++ b/arch/x86/kernel/jump_label.c
25411@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25412 * Jump label is enabled for the first time.
25413 * So we expect a default_nop...
25414 */
25415- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25416+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25417 != 0))
25418 bug_at((void *)entry->code, __LINE__);
25419 } else {
25420@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25421 * ...otherwise expect an ideal_nop. Otherwise
25422 * something went horribly wrong.
25423 */
25424- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25425+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25426 != 0))
25427 bug_at((void *)entry->code, __LINE__);
25428 }
25429@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25430 * are converting the default nop to the ideal nop.
25431 */
25432 if (init) {
25433- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25434+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25435 bug_at((void *)entry->code, __LINE__);
25436 } else {
25437 code.jump = 0xe9;
25438 code.offset = entry->target -
25439 (entry->code + JUMP_LABEL_NOP_SIZE);
25440- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25441+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25442 bug_at((void *)entry->code, __LINE__);
25443 }
25444 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25445diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25446index 7ec1d5f..5a7d130 100644
25447--- a/arch/x86/kernel/kgdb.c
25448+++ b/arch/x86/kernel/kgdb.c
25449@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25450 #ifdef CONFIG_X86_32
25451 switch (regno) {
25452 case GDB_SS:
25453- if (!user_mode_vm(regs))
25454+ if (!user_mode(regs))
25455 *(unsigned long *)mem = __KERNEL_DS;
25456 break;
25457 case GDB_SP:
25458- if (!user_mode_vm(regs))
25459+ if (!user_mode(regs))
25460 *(unsigned long *)mem = kernel_stack_pointer(regs);
25461 break;
25462 case GDB_GS:
25463@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25464 bp->attr.bp_addr = breakinfo[breakno].addr;
25465 bp->attr.bp_len = breakinfo[breakno].len;
25466 bp->attr.bp_type = breakinfo[breakno].type;
25467- info->address = breakinfo[breakno].addr;
25468+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25469+ info->address = ktla_ktva(breakinfo[breakno].addr);
25470+ else
25471+ info->address = breakinfo[breakno].addr;
25472 info->len = breakinfo[breakno].len;
25473 info->type = breakinfo[breakno].type;
25474 val = arch_install_hw_breakpoint(bp);
25475@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25476 case 'k':
25477 /* clear the trace bit */
25478 linux_regs->flags &= ~X86_EFLAGS_TF;
25479- atomic_set(&kgdb_cpu_doing_single_step, -1);
25480+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25481
25482 /* set the trace bit if we're stepping */
25483 if (remcomInBuffer[0] == 's') {
25484 linux_regs->flags |= X86_EFLAGS_TF;
25485- atomic_set(&kgdb_cpu_doing_single_step,
25486+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25487 raw_smp_processor_id());
25488 }
25489
25490@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25491
25492 switch (cmd) {
25493 case DIE_DEBUG:
25494- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25495+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25496 if (user_mode(regs))
25497 return single_step_cont(regs, args);
25498 break;
25499@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25500 #endif /* CONFIG_DEBUG_RODATA */
25501
25502 bpt->type = BP_BREAKPOINT;
25503- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25504+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25505 BREAK_INSTR_SIZE);
25506 if (err)
25507 return err;
25508- err = probe_kernel_write((char *)bpt->bpt_addr,
25509+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25510 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25511 #ifdef CONFIG_DEBUG_RODATA
25512 if (!err)
25513@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25514 return -EBUSY;
25515 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25516 BREAK_INSTR_SIZE);
25517- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25518+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25519 if (err)
25520 return err;
25521 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25522@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25523 if (mutex_is_locked(&text_mutex))
25524 goto knl_write;
25525 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25526- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25527+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25528 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25529 goto knl_write;
25530 return err;
25531 knl_write:
25532 #endif /* CONFIG_DEBUG_RODATA */
25533- return probe_kernel_write((char *)bpt->bpt_addr,
25534+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25535 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25536 }
25537
25538diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25539index 93d2c04..36d0e94 100644
25540--- a/arch/x86/kernel/kprobes/core.c
25541+++ b/arch/x86/kernel/kprobes/core.c
25542@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25543 s32 raddr;
25544 } __packed *insn;
25545
25546- insn = (struct __arch_relative_insn *)from;
25547+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25548+
25549+ pax_open_kernel();
25550 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25551 insn->op = op;
25552+ pax_close_kernel();
25553 }
25554
25555 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25556@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25557 kprobe_opcode_t opcode;
25558 kprobe_opcode_t *orig_opcodes = opcodes;
25559
25560- if (search_exception_tables((unsigned long)opcodes))
25561+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25562 return 0; /* Page fault may occur on this address. */
25563
25564 retry:
25565@@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25566 * for the first byte, we can recover the original instruction
25567 * from it and kp->opcode.
25568 */
25569- memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25570+ memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25571 buf[0] = kp->opcode;
25572- return (unsigned long)buf;
25573+ return ktva_ktla((unsigned long)buf);
25574 }
25575
25576 /*
25577@@ -336,7 +339,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25578 /* Another subsystem puts a breakpoint, failed to recover */
25579 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25580 return 0;
25581+ pax_open_kernel();
25582 memcpy(dest, insn.kaddr, insn.length);
25583+ pax_close_kernel();
25584
25585 #ifdef CONFIG_X86_64
25586 if (insn_rip_relative(&insn)) {
25587@@ -363,7 +368,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25588 return 0;
25589 }
25590 disp = (u8 *) dest + insn_offset_displacement(&insn);
25591+ pax_open_kernel();
25592 *(s32 *) disp = (s32) newdisp;
25593+ pax_close_kernel();
25594 }
25595 #endif
25596 return insn.length;
25597@@ -505,7 +512,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25598 * nor set current_kprobe, because it doesn't use single
25599 * stepping.
25600 */
25601- regs->ip = (unsigned long)p->ainsn.insn;
25602+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25603 preempt_enable_no_resched();
25604 return;
25605 }
25606@@ -522,9 +529,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25607 regs->flags &= ~X86_EFLAGS_IF;
25608 /* single step inline if the instruction is an int3 */
25609 if (p->opcode == BREAKPOINT_INSTRUCTION)
25610- regs->ip = (unsigned long)p->addr;
25611+ regs->ip = ktla_ktva((unsigned long)p->addr);
25612 else
25613- regs->ip = (unsigned long)p->ainsn.insn;
25614+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25615 }
25616 NOKPROBE_SYMBOL(setup_singlestep);
25617
25618@@ -574,7 +581,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25619 struct kprobe *p;
25620 struct kprobe_ctlblk *kcb;
25621
25622- if (user_mode_vm(regs))
25623+ if (user_mode(regs))
25624 return 0;
25625
25626 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25627@@ -609,7 +616,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25628 setup_singlestep(p, regs, kcb, 0);
25629 return 1;
25630 }
25631- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25632+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25633 /*
25634 * The breakpoint instruction was removed right
25635 * after we hit it. Another cpu has removed
25636@@ -656,6 +663,9 @@ static void __used kretprobe_trampoline_holder(void)
25637 " movq %rax, 152(%rsp)\n"
25638 RESTORE_REGS_STRING
25639 " popfq\n"
25640+#ifdef KERNEXEC_PLUGIN
25641+ " btsq $63,(%rsp)\n"
25642+#endif
25643 #else
25644 " pushf\n"
25645 SAVE_REGS_STRING
25646@@ -796,7 +806,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25647 struct kprobe_ctlblk *kcb)
25648 {
25649 unsigned long *tos = stack_addr(regs);
25650- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25651+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25652 unsigned long orig_ip = (unsigned long)p->addr;
25653 kprobe_opcode_t *insn = p->ainsn.insn;
25654
25655@@ -979,7 +989,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25656 struct die_args *args = data;
25657 int ret = NOTIFY_DONE;
25658
25659- if (args->regs && user_mode_vm(args->regs))
25660+ if (args->regs && user_mode(args->regs))
25661 return ret;
25662
25663 if (val == DIE_GPF) {
25664diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25665index f1314d0..15f3154 100644
25666--- a/arch/x86/kernel/kprobes/opt.c
25667+++ b/arch/x86/kernel/kprobes/opt.c
25668@@ -79,6 +79,7 @@ found:
25669 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25670 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25671 {
25672+ pax_open_kernel();
25673 #ifdef CONFIG_X86_64
25674 *addr++ = 0x48;
25675 *addr++ = 0xbf;
25676@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25677 *addr++ = 0xb8;
25678 #endif
25679 *(unsigned long *)addr = val;
25680+ pax_close_kernel();
25681 }
25682
25683 asm (
25684@@ -337,7 +339,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25685 * Verify if the address gap is in 2GB range, because this uses
25686 * a relative jump.
25687 */
25688- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25689+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25690 if (abs(rel) > 0x7fffffff) {
25691 __arch_remove_optimized_kprobe(op, 0);
25692 return -ERANGE;
25693@@ -354,16 +356,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25694 op->optinsn.size = ret;
25695
25696 /* Copy arch-dep-instance from template */
25697- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25698+ pax_open_kernel();
25699+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25700+ pax_close_kernel();
25701
25702 /* Set probe information */
25703 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25704
25705 /* Set probe function call */
25706- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25707+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25708
25709 /* Set returning jmp instruction at the tail of out-of-line buffer */
25710- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25711+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25712 (u8 *)op->kp.addr + op->optinsn.size);
25713
25714 flush_icache_range((unsigned long) buf,
25715@@ -388,7 +392,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25716 WARN_ON(kprobe_disabled(&op->kp));
25717
25718 /* Backup instructions which will be replaced by jump address */
25719- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25720+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25721 RELATIVE_ADDR_SIZE);
25722
25723 insn_buf[0] = RELATIVEJUMP_OPCODE;
25724@@ -436,7 +440,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25725 /* This kprobe is really able to run optimized path. */
25726 op = container_of(p, struct optimized_kprobe, kp);
25727 /* Detour through copied instructions */
25728- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25729+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25730 if (!reenter)
25731 reset_current_kprobe();
25732 preempt_enable_no_resched();
25733diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25734index c2bedae..25e7ab60 100644
25735--- a/arch/x86/kernel/ksysfs.c
25736+++ b/arch/x86/kernel/ksysfs.c
25737@@ -184,7 +184,7 @@ out:
25738
25739 static struct kobj_attribute type_attr = __ATTR_RO(type);
25740
25741-static struct bin_attribute data_attr = {
25742+static bin_attribute_no_const data_attr __read_only = {
25743 .attr = {
25744 .name = "data",
25745 .mode = S_IRUGO,
25746diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25747index c37886d..d851d32 100644
25748--- a/arch/x86/kernel/ldt.c
25749+++ b/arch/x86/kernel/ldt.c
25750@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25751 if (reload) {
25752 #ifdef CONFIG_SMP
25753 preempt_disable();
25754- load_LDT(pc);
25755+ load_LDT_nolock(pc);
25756 if (!cpumask_equal(mm_cpumask(current->mm),
25757 cpumask_of(smp_processor_id())))
25758 smp_call_function(flush_ldt, current->mm, 1);
25759 preempt_enable();
25760 #else
25761- load_LDT(pc);
25762+ load_LDT_nolock(pc);
25763 #endif
25764 }
25765 if (oldsize) {
25766@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25767 return err;
25768
25769 for (i = 0; i < old->size; i++)
25770- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25771+ write_ldt_entry(new->ldt, i, old->ldt + i);
25772 return 0;
25773 }
25774
25775@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25776 retval = copy_ldt(&mm->context, &old_mm->context);
25777 mutex_unlock(&old_mm->context.lock);
25778 }
25779+
25780+ if (tsk == current) {
25781+ mm->context.vdso = 0;
25782+
25783+#ifdef CONFIG_X86_32
25784+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25785+ mm->context.user_cs_base = 0UL;
25786+ mm->context.user_cs_limit = ~0UL;
25787+
25788+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25789+ cpus_clear(mm->context.cpu_user_cs_mask);
25790+#endif
25791+
25792+#endif
25793+#endif
25794+
25795+ }
25796+
25797 return retval;
25798 }
25799
25800@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25801 }
25802 }
25803
25804+#ifdef CONFIG_PAX_SEGMEXEC
25805+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25806+ error = -EINVAL;
25807+ goto out_unlock;
25808+ }
25809+#endif
25810+
25811 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25812 error = -EINVAL;
25813 goto out_unlock;
25814diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25815index 72e8e31..f2f1605 100644
25816--- a/arch/x86/kernel/machine_kexec_32.c
25817+++ b/arch/x86/kernel/machine_kexec_32.c
25818@@ -25,7 +25,7 @@
25819 #include <asm/cacheflush.h>
25820 #include <asm/debugreg.h>
25821
25822-static void set_idt(void *newidt, __u16 limit)
25823+static void set_idt(struct desc_struct *newidt, __u16 limit)
25824 {
25825 struct desc_ptr curidt;
25826
25827@@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25828 }
25829
25830
25831-static void set_gdt(void *newgdt, __u16 limit)
25832+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25833 {
25834 struct desc_ptr curgdt;
25835
25836@@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25837 }
25838
25839 control_page = page_address(image->control_code_page);
25840- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25841+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25842
25843 relocate_kernel_ptr = control_page;
25844 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25845diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25846index c73aecf..4c63630 100644
25847--- a/arch/x86/kernel/mcount_64.S
25848+++ b/arch/x86/kernel/mcount_64.S
25849@@ -7,7 +7,7 @@
25850 #include <linux/linkage.h>
25851 #include <asm/ptrace.h>
25852 #include <asm/ftrace.h>
25853-
25854+#include <asm/alternative-asm.h>
25855
25856 .code64
25857 .section .entry.text, "ax"
25858@@ -24,8 +24,9 @@
25859 #ifdef CONFIG_DYNAMIC_FTRACE
25860
25861 ENTRY(function_hook)
25862+ pax_force_retaddr
25863 retq
25864-END(function_hook)
25865+ENDPROC(function_hook)
25866
25867 /* skip is set if stack has been adjusted */
25868 .macro ftrace_caller_setup skip=0
25869@@ -62,8 +63,9 @@ GLOBAL(ftrace_graph_call)
25870 #endif
25871
25872 GLOBAL(ftrace_stub)
25873+ pax_force_retaddr
25874 retq
25875-END(ftrace_caller)
25876+ENDPROC(ftrace_caller)
25877
25878 ENTRY(ftrace_regs_caller)
25879 /* Save the current flags before compare (in SS location)*/
25880@@ -127,7 +129,7 @@ GLOBAL(ftrace_regs_call)
25881 popfq
25882 jmp ftrace_stub
25883
25884-END(ftrace_regs_caller)
25885+ENDPROC(ftrace_regs_caller)
25886
25887
25888 #else /* ! CONFIG_DYNAMIC_FTRACE */
25889@@ -145,6 +147,7 @@ ENTRY(function_hook)
25890 #endif
25891
25892 GLOBAL(ftrace_stub)
25893+ pax_force_retaddr
25894 retq
25895
25896 trace:
25897@@ -158,12 +161,13 @@ trace:
25898 #endif
25899 subq $MCOUNT_INSN_SIZE, %rdi
25900
25901+ pax_force_fptr ftrace_trace_function
25902 call *ftrace_trace_function
25903
25904 MCOUNT_RESTORE_FRAME
25905
25906 jmp ftrace_stub
25907-END(function_hook)
25908+ENDPROC(function_hook)
25909 #endif /* CONFIG_DYNAMIC_FTRACE */
25910 #endif /* CONFIG_FUNCTION_TRACER */
25911
25912@@ -185,8 +189,9 @@ ENTRY(ftrace_graph_caller)
25913
25914 MCOUNT_RESTORE_FRAME
25915
25916+ pax_force_retaddr
25917 retq
25918-END(ftrace_graph_caller)
25919+ENDPROC(ftrace_graph_caller)
25920
25921 GLOBAL(return_to_handler)
25922 subq $24, %rsp
25923@@ -202,5 +207,7 @@ GLOBAL(return_to_handler)
25924 movq 8(%rsp), %rdx
25925 movq (%rsp), %rax
25926 addq $24, %rsp
25927+ pax_force_fptr %rdi
25928 jmp *%rdi
25929+ENDPROC(return_to_handler)
25930 #endif
25931diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25932index e69f988..da078ea 100644
25933--- a/arch/x86/kernel/module.c
25934+++ b/arch/x86/kernel/module.c
25935@@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
25936 }
25937 #endif
25938
25939-void *module_alloc(unsigned long size)
25940+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25941 {
25942- if (PAGE_ALIGN(size) > MODULES_LEN)
25943+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25944 return NULL;
25945 return __vmalloc_node_range(size, 1,
25946 MODULES_VADDR + get_module_load_offset(),
25947- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25948- PAGE_KERNEL_EXEC, NUMA_NO_NODE,
25949+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25950+ prot, NUMA_NO_NODE,
25951 __builtin_return_address(0));
25952 }
25953
25954+void *module_alloc(unsigned long size)
25955+{
25956+
25957+#ifdef CONFIG_PAX_KERNEXEC
25958+ return __module_alloc(size, PAGE_KERNEL);
25959+#else
25960+ return __module_alloc(size, PAGE_KERNEL_EXEC);
25961+#endif
25962+
25963+}
25964+
25965+#ifdef CONFIG_PAX_KERNEXEC
25966+#ifdef CONFIG_X86_32
25967+void *module_alloc_exec(unsigned long size)
25968+{
25969+ struct vm_struct *area;
25970+
25971+ if (size == 0)
25972+ return NULL;
25973+
25974+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25975+return area ? area->addr : NULL;
25976+}
25977+EXPORT_SYMBOL(module_alloc_exec);
25978+
25979+void module_free_exec(struct module *mod, void *module_region)
25980+{
25981+ vunmap(module_region);
25982+}
25983+EXPORT_SYMBOL(module_free_exec);
25984+#else
25985+void module_free_exec(struct module *mod, void *module_region)
25986+{
25987+ module_free(mod, module_region);
25988+}
25989+EXPORT_SYMBOL(module_free_exec);
25990+
25991+void *module_alloc_exec(unsigned long size)
25992+{
25993+ return __module_alloc(size, PAGE_KERNEL_RX);
25994+}
25995+EXPORT_SYMBOL(module_alloc_exec);
25996+#endif
25997+#endif
25998+
25999 #ifdef CONFIG_X86_32
26000 int apply_relocate(Elf32_Shdr *sechdrs,
26001 const char *strtab,
26002@@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26003 unsigned int i;
26004 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26005 Elf32_Sym *sym;
26006- uint32_t *location;
26007+ uint32_t *plocation, location;
26008
26009 DEBUGP("Applying relocate section %u to %u\n",
26010 relsec, sechdrs[relsec].sh_info);
26011 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26012 /* This is where to make the change */
26013- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26014- + rel[i].r_offset;
26015+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26016+ location = (uint32_t)plocation;
26017+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26018+ plocation = ktla_ktva((void *)plocation);
26019 /* This is the symbol it is referring to. Note that all
26020 undefined symbols have been resolved. */
26021 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26022@@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26023 switch (ELF32_R_TYPE(rel[i].r_info)) {
26024 case R_386_32:
26025 /* We add the value into the location given */
26026- *location += sym->st_value;
26027+ pax_open_kernel();
26028+ *plocation += sym->st_value;
26029+ pax_close_kernel();
26030 break;
26031 case R_386_PC32:
26032 /* Add the value, subtract its position */
26033- *location += sym->st_value - (uint32_t)location;
26034+ pax_open_kernel();
26035+ *plocation += sym->st_value - location;
26036+ pax_close_kernel();
26037 break;
26038 default:
26039 pr_err("%s: Unknown relocation: %u\n",
26040@@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26041 case R_X86_64_NONE:
26042 break;
26043 case R_X86_64_64:
26044+ pax_open_kernel();
26045 *(u64 *)loc = val;
26046+ pax_close_kernel();
26047 break;
26048 case R_X86_64_32:
26049+ pax_open_kernel();
26050 *(u32 *)loc = val;
26051+ pax_close_kernel();
26052 if (val != *(u32 *)loc)
26053 goto overflow;
26054 break;
26055 case R_X86_64_32S:
26056+ pax_open_kernel();
26057 *(s32 *)loc = val;
26058+ pax_close_kernel();
26059 if ((s64)val != *(s32 *)loc)
26060 goto overflow;
26061 break;
26062 case R_X86_64_PC32:
26063 val -= (u64)loc;
26064+ pax_open_kernel();
26065 *(u32 *)loc = val;
26066+ pax_close_kernel();
26067+
26068 #if 0
26069 if ((s64)val != *(s32 *)loc)
26070 goto overflow;
26071diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26072index c9603ac..9f88728 100644
26073--- a/arch/x86/kernel/msr.c
26074+++ b/arch/x86/kernel/msr.c
26075@@ -37,6 +37,7 @@
26076 #include <linux/notifier.h>
26077 #include <linux/uaccess.h>
26078 #include <linux/gfp.h>
26079+#include <linux/grsecurity.h>
26080
26081 #include <asm/processor.h>
26082 #include <asm/msr.h>
26083@@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26084 int err = 0;
26085 ssize_t bytes = 0;
26086
26087+#ifdef CONFIG_GRKERNSEC_KMEM
26088+ gr_handle_msr_write();
26089+ return -EPERM;
26090+#endif
26091+
26092 if (count % 8)
26093 return -EINVAL; /* Invalid chunk size */
26094
26095@@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26096 err = -EBADF;
26097 break;
26098 }
26099+#ifdef CONFIG_GRKERNSEC_KMEM
26100+ gr_handle_msr_write();
26101+ return -EPERM;
26102+#endif
26103 if (copy_from_user(&regs, uregs, sizeof regs)) {
26104 err = -EFAULT;
26105 break;
26106@@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26107 return notifier_from_errno(err);
26108 }
26109
26110-static struct notifier_block __refdata msr_class_cpu_notifier = {
26111+static struct notifier_block msr_class_cpu_notifier = {
26112 .notifier_call = msr_class_cpu_callback,
26113 };
26114
26115diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26116index c3e985d..110a36a 100644
26117--- a/arch/x86/kernel/nmi.c
26118+++ b/arch/x86/kernel/nmi.c
26119@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26120
26121 static void nmi_max_handler(struct irq_work *w)
26122 {
26123- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26124+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26125 int remainder_ns, decimal_msecs;
26126- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26127+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26128
26129 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26130 decimal_msecs = remainder_ns / 1000;
26131
26132 printk_ratelimited(KERN_INFO
26133 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26134- a->handler, whole_msecs, decimal_msecs);
26135+ n->action->handler, whole_msecs, decimal_msecs);
26136 }
26137
26138 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26139@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26140 delta = sched_clock() - delta;
26141 trace_nmi_handler(a->handler, (int)delta, thishandled);
26142
26143- if (delta < nmi_longest_ns || delta < a->max_duration)
26144+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26145 continue;
26146
26147- a->max_duration = delta;
26148- irq_work_queue(&a->irq_work);
26149+ a->work->max_duration = delta;
26150+ irq_work_queue(&a->work->irq_work);
26151 }
26152
26153 rcu_read_unlock();
26154@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26155 }
26156 NOKPROBE_SYMBOL(nmi_handle);
26157
26158-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26159+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26160 {
26161 struct nmi_desc *desc = nmi_to_desc(type);
26162 unsigned long flags;
26163@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26164 if (!action->handler)
26165 return -EINVAL;
26166
26167- init_irq_work(&action->irq_work, nmi_max_handler);
26168+ action->work->action = action;
26169+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26170
26171 spin_lock_irqsave(&desc->lock, flags);
26172
26173@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26174 * event confuses some handlers (kdump uses this flag)
26175 */
26176 if (action->flags & NMI_FLAG_FIRST)
26177- list_add_rcu(&action->list, &desc->head);
26178+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26179 else
26180- list_add_tail_rcu(&action->list, &desc->head);
26181+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26182
26183 spin_unlock_irqrestore(&desc->lock, flags);
26184 return 0;
26185@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26186 if (!strcmp(n->name, name)) {
26187 WARN(in_nmi(),
26188 "Trying to free NMI (%s) from NMI context!\n", n->name);
26189- list_del_rcu(&n->list);
26190+ pax_list_del_rcu((struct list_head *)&n->list);
26191 break;
26192 }
26193 }
26194@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26195 dotraplinkage notrace void
26196 do_nmi(struct pt_regs *regs, long error_code)
26197 {
26198+
26199+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26200+ if (!user_mode(regs)) {
26201+ unsigned long cs = regs->cs & 0xFFFF;
26202+ unsigned long ip = ktva_ktla(regs->ip);
26203+
26204+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26205+ regs->ip = ip;
26206+ }
26207+#endif
26208+
26209 nmi_nesting_preprocess(regs);
26210
26211 nmi_enter();
26212diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26213index 6d9582e..f746287 100644
26214--- a/arch/x86/kernel/nmi_selftest.c
26215+++ b/arch/x86/kernel/nmi_selftest.c
26216@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26217 {
26218 /* trap all the unknown NMIs we may generate */
26219 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26220- __initdata);
26221+ __initconst);
26222 }
26223
26224 static void __init cleanup_nmi_testsuite(void)
26225@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26226 unsigned long timeout;
26227
26228 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26229- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26230+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26231 nmi_fail = FAILURE;
26232 return;
26233 }
26234diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26235index bbb6c73..24a58ef 100644
26236--- a/arch/x86/kernel/paravirt-spinlocks.c
26237+++ b/arch/x86/kernel/paravirt-spinlocks.c
26238@@ -8,7 +8,7 @@
26239
26240 #include <asm/paravirt.h>
26241
26242-struct pv_lock_ops pv_lock_ops = {
26243+struct pv_lock_ops pv_lock_ops __read_only = {
26244 #ifdef CONFIG_SMP
26245 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26246 .unlock_kick = paravirt_nop,
26247diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26248index 548d25f..f8fb99c 100644
26249--- a/arch/x86/kernel/paravirt.c
26250+++ b/arch/x86/kernel/paravirt.c
26251@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26252 {
26253 return x;
26254 }
26255+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26256+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26257+#endif
26258
26259 void __init default_banner(void)
26260 {
26261@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26262
26263 if (opfunc == NULL)
26264 /* If there's no function, patch it with a ud2a (BUG) */
26265- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26266- else if (opfunc == _paravirt_nop)
26267+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26268+ else if (opfunc == (void *)_paravirt_nop)
26269 /* If the operation is a nop, then nop the callsite */
26270 ret = paravirt_patch_nop();
26271
26272 /* identity functions just return their single argument */
26273- else if (opfunc == _paravirt_ident_32)
26274+ else if (opfunc == (void *)_paravirt_ident_32)
26275 ret = paravirt_patch_ident_32(insnbuf, len);
26276- else if (opfunc == _paravirt_ident_64)
26277+ else if (opfunc == (void *)_paravirt_ident_64)
26278 ret = paravirt_patch_ident_64(insnbuf, len);
26279+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26280+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26281+ ret = paravirt_patch_ident_64(insnbuf, len);
26282+#endif
26283
26284 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26285 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26286@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26287 if (insn_len > len || start == NULL)
26288 insn_len = len;
26289 else
26290- memcpy(insnbuf, start, insn_len);
26291+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26292
26293 return insn_len;
26294 }
26295@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26296 return this_cpu_read(paravirt_lazy_mode);
26297 }
26298
26299-struct pv_info pv_info = {
26300+struct pv_info pv_info __read_only = {
26301 .name = "bare hardware",
26302 .paravirt_enabled = 0,
26303 .kernel_rpl = 0,
26304@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26305 #endif
26306 };
26307
26308-struct pv_init_ops pv_init_ops = {
26309+struct pv_init_ops pv_init_ops __read_only = {
26310 .patch = native_patch,
26311 };
26312
26313-struct pv_time_ops pv_time_ops = {
26314+struct pv_time_ops pv_time_ops __read_only = {
26315 .sched_clock = native_sched_clock,
26316 .steal_clock = native_steal_clock,
26317 };
26318
26319-__visible struct pv_irq_ops pv_irq_ops = {
26320+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26321 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26322 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26323 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26324@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26325 #endif
26326 };
26327
26328-__visible struct pv_cpu_ops pv_cpu_ops = {
26329+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26330 .cpuid = native_cpuid,
26331 .get_debugreg = native_get_debugreg,
26332 .set_debugreg = native_set_debugreg,
26333@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26334 NOKPROBE_SYMBOL(native_set_debugreg);
26335 NOKPROBE_SYMBOL(native_load_idt);
26336
26337-struct pv_apic_ops pv_apic_ops = {
26338+struct pv_apic_ops pv_apic_ops __read_only= {
26339 #ifdef CONFIG_X86_LOCAL_APIC
26340 .startup_ipi_hook = paravirt_nop,
26341 #endif
26342 };
26343
26344-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26345+#ifdef CONFIG_X86_32
26346+#ifdef CONFIG_X86_PAE
26347+/* 64-bit pagetable entries */
26348+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26349+#else
26350 /* 32-bit pagetable entries */
26351 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26352+#endif
26353 #else
26354 /* 64-bit pagetable entries */
26355 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26356 #endif
26357
26358-struct pv_mmu_ops pv_mmu_ops = {
26359+struct pv_mmu_ops pv_mmu_ops __read_only = {
26360
26361 .read_cr2 = native_read_cr2,
26362 .write_cr2 = native_write_cr2,
26363@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26364 .make_pud = PTE_IDENT,
26365
26366 .set_pgd = native_set_pgd,
26367+ .set_pgd_batched = native_set_pgd_batched,
26368 #endif
26369 #endif /* PAGETABLE_LEVELS >= 3 */
26370
26371@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26372 },
26373
26374 .set_fixmap = native_set_fixmap,
26375+
26376+#ifdef CONFIG_PAX_KERNEXEC
26377+ .pax_open_kernel = native_pax_open_kernel,
26378+ .pax_close_kernel = native_pax_close_kernel,
26379+#endif
26380+
26381 };
26382
26383 EXPORT_SYMBOL_GPL(pv_time_ops);
26384diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26385index a1da673..b6f5831 100644
26386--- a/arch/x86/kernel/paravirt_patch_64.c
26387+++ b/arch/x86/kernel/paravirt_patch_64.c
26388@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26389 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26390 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26391 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26392+
26393+#ifndef CONFIG_PAX_MEMORY_UDEREF
26394 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26395+#endif
26396+
26397 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26398 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26399
26400@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26401 PATCH_SITE(pv_mmu_ops, read_cr3);
26402 PATCH_SITE(pv_mmu_ops, write_cr3);
26403 PATCH_SITE(pv_cpu_ops, clts);
26404+
26405+#ifndef CONFIG_PAX_MEMORY_UDEREF
26406 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26407+#endif
26408+
26409 PATCH_SITE(pv_cpu_ops, wbinvd);
26410
26411 patch_site:
26412diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26413index 0497f71..7186c0d 100644
26414--- a/arch/x86/kernel/pci-calgary_64.c
26415+++ b/arch/x86/kernel/pci-calgary_64.c
26416@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26417 tce_space = be64_to_cpu(readq(target));
26418 tce_space = tce_space & TAR_SW_BITS;
26419
26420- tce_space = tce_space & (~specified_table_size);
26421+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26422 info->tce_space = (u64 *)__va(tce_space);
26423 }
26424 }
26425diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26426index 35ccf75..7a15747 100644
26427--- a/arch/x86/kernel/pci-iommu_table.c
26428+++ b/arch/x86/kernel/pci-iommu_table.c
26429@@ -2,7 +2,7 @@
26430 #include <asm/iommu_table.h>
26431 #include <linux/string.h>
26432 #include <linux/kallsyms.h>
26433-
26434+#include <linux/sched.h>
26435
26436 #define DEBUG 1
26437
26438diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26439index 77dd0ad..9ec4723 100644
26440--- a/arch/x86/kernel/pci-swiotlb.c
26441+++ b/arch/x86/kernel/pci-swiotlb.c
26442@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26443 struct dma_attrs *attrs)
26444 {
26445 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26446- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26447+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26448 else
26449 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26450 }
26451diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26452index e127dda..94e384d 100644
26453--- a/arch/x86/kernel/process.c
26454+++ b/arch/x86/kernel/process.c
26455@@ -36,7 +36,8 @@
26456 * section. Since TSS's are completely CPU-local, we want them
26457 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26458 */
26459-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26460+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26461+EXPORT_SYMBOL(init_tss);
26462
26463 #ifdef CONFIG_X86_64
26464 static DEFINE_PER_CPU(unsigned char, is_idle);
26465@@ -94,7 +95,7 @@ void arch_task_cache_init(void)
26466 task_xstate_cachep =
26467 kmem_cache_create("task_xstate", xstate_size,
26468 __alignof__(union thread_xstate),
26469- SLAB_PANIC | SLAB_NOTRACK, NULL);
26470+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26471 setup_xstate_comp();
26472 }
26473
26474@@ -108,7 +109,7 @@ void exit_thread(void)
26475 unsigned long *bp = t->io_bitmap_ptr;
26476
26477 if (bp) {
26478- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26479+ struct tss_struct *tss = init_tss + get_cpu();
26480
26481 t->io_bitmap_ptr = NULL;
26482 clear_thread_flag(TIF_IO_BITMAP);
26483@@ -128,6 +129,9 @@ void flush_thread(void)
26484 {
26485 struct task_struct *tsk = current;
26486
26487+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26488+ loadsegment(gs, 0);
26489+#endif
26490 flush_ptrace_hw_breakpoint(tsk);
26491 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26492 drop_init_fpu(tsk);
26493@@ -274,7 +278,7 @@ static void __exit_idle(void)
26494 void exit_idle(void)
26495 {
26496 /* idle loop has pid 0 */
26497- if (current->pid)
26498+ if (task_pid_nr(current))
26499 return;
26500 __exit_idle();
26501 }
26502@@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
26503 return ret;
26504 }
26505 #endif
26506-void stop_this_cpu(void *dummy)
26507+__noreturn void stop_this_cpu(void *dummy)
26508 {
26509 local_irq_disable();
26510 /*
26511@@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
26512 }
26513 early_param("idle", idle_setup);
26514
26515-unsigned long arch_align_stack(unsigned long sp)
26516+#ifdef CONFIG_PAX_RANDKSTACK
26517+void pax_randomize_kstack(struct pt_regs *regs)
26518 {
26519- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26520- sp -= get_random_int() % 8192;
26521- return sp & ~0xf;
26522-}
26523+ struct thread_struct *thread = &current->thread;
26524+ unsigned long time;
26525
26526-unsigned long arch_randomize_brk(struct mm_struct *mm)
26527-{
26528- unsigned long range_end = mm->brk + 0x02000000;
26529- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26530-}
26531+ if (!randomize_va_space)
26532+ return;
26533+
26534+ if (v8086_mode(regs))
26535+ return;
26536
26537+ rdtscl(time);
26538+
26539+ /* P4 seems to return a 0 LSB, ignore it */
26540+#ifdef CONFIG_MPENTIUM4
26541+ time &= 0x3EUL;
26542+ time <<= 2;
26543+#elif defined(CONFIG_X86_64)
26544+ time &= 0xFUL;
26545+ time <<= 4;
26546+#else
26547+ time &= 0x1FUL;
26548+ time <<= 3;
26549+#endif
26550+
26551+ thread->sp0 ^= time;
26552+ load_sp0(init_tss + smp_processor_id(), thread);
26553+
26554+#ifdef CONFIG_X86_64
26555+ this_cpu_write(kernel_stack, thread->sp0);
26556+#endif
26557+}
26558+#endif
26559diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26560index 8f3ebfe..cbc731b 100644
26561--- a/arch/x86/kernel/process_32.c
26562+++ b/arch/x86/kernel/process_32.c
26563@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26564 unsigned long thread_saved_pc(struct task_struct *tsk)
26565 {
26566 return ((unsigned long *)tsk->thread.sp)[3];
26567+//XXX return tsk->thread.eip;
26568 }
26569
26570 void __show_regs(struct pt_regs *regs, int all)
26571@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26572 unsigned long sp;
26573 unsigned short ss, gs;
26574
26575- if (user_mode_vm(regs)) {
26576+ if (user_mode(regs)) {
26577 sp = regs->sp;
26578 ss = regs->ss & 0xffff;
26579- gs = get_user_gs(regs);
26580 } else {
26581 sp = kernel_stack_pointer(regs);
26582 savesegment(ss, ss);
26583- savesegment(gs, gs);
26584 }
26585+ gs = get_user_gs(regs);
26586
26587 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26588 (u16)regs->cs, regs->ip, regs->flags,
26589- smp_processor_id());
26590+ raw_smp_processor_id());
26591 print_symbol("EIP is at %s\n", regs->ip);
26592
26593 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26594@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26595 int copy_thread(unsigned long clone_flags, unsigned long sp,
26596 unsigned long arg, struct task_struct *p)
26597 {
26598- struct pt_regs *childregs = task_pt_regs(p);
26599+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26600 struct task_struct *tsk;
26601 int err;
26602
26603 p->thread.sp = (unsigned long) childregs;
26604 p->thread.sp0 = (unsigned long) (childregs+1);
26605+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26606 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26607
26608 if (unlikely(p->flags & PF_KTHREAD)) {
26609 /* kernel thread */
26610 memset(childregs, 0, sizeof(struct pt_regs));
26611 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26612- task_user_gs(p) = __KERNEL_STACK_CANARY;
26613- childregs->ds = __USER_DS;
26614- childregs->es = __USER_DS;
26615+ savesegment(gs, childregs->gs);
26616+ childregs->ds = __KERNEL_DS;
26617+ childregs->es = __KERNEL_DS;
26618 childregs->fs = __KERNEL_PERCPU;
26619 childregs->bx = sp; /* function */
26620 childregs->bp = arg;
26621@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26622 struct thread_struct *prev = &prev_p->thread,
26623 *next = &next_p->thread;
26624 int cpu = smp_processor_id();
26625- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26626+ struct tss_struct *tss = init_tss + cpu;
26627 fpu_switch_t fpu;
26628
26629 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26630@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26631 */
26632 lazy_save_gs(prev->gs);
26633
26634+#ifdef CONFIG_PAX_MEMORY_UDEREF
26635+ __set_fs(task_thread_info(next_p)->addr_limit);
26636+#endif
26637+
26638 /*
26639 * Load the per-thread Thread-Local Storage descriptor.
26640 */
26641@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26642 */
26643 arch_end_context_switch(next_p);
26644
26645- this_cpu_write(kernel_stack,
26646- (unsigned long)task_stack_page(next_p) +
26647- THREAD_SIZE - KERNEL_STACK_OFFSET);
26648+ this_cpu_write(current_task, next_p);
26649+ this_cpu_write(current_tinfo, &next_p->tinfo);
26650+ this_cpu_write(kernel_stack, next->sp0);
26651
26652 /*
26653 * Restore %gs if needed (which is common)
26654@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26655
26656 switch_fpu_finish(next_p, fpu);
26657
26658- this_cpu_write(current_task, next_p);
26659-
26660 return prev_p;
26661 }
26662
26663@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26664 } while (count++ < 16);
26665 return 0;
26666 }
26667-
26668diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26669index 5a2c029..ec8611d 100644
26670--- a/arch/x86/kernel/process_64.c
26671+++ b/arch/x86/kernel/process_64.c
26672@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26673 struct pt_regs *childregs;
26674 struct task_struct *me = current;
26675
26676- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26677+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26678 childregs = task_pt_regs(p);
26679 p->thread.sp = (unsigned long) childregs;
26680 p->thread.usersp = me->thread.usersp;
26681+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26682 set_tsk_thread_flag(p, TIF_FORK);
26683 p->thread.io_bitmap_ptr = NULL;
26684
26685@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26686 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26687 savesegment(es, p->thread.es);
26688 savesegment(ds, p->thread.ds);
26689+ savesegment(ss, p->thread.ss);
26690+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26691 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26692
26693 if (unlikely(p->flags & PF_KTHREAD)) {
26694@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26695 struct thread_struct *prev = &prev_p->thread;
26696 struct thread_struct *next = &next_p->thread;
26697 int cpu = smp_processor_id();
26698- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26699+ struct tss_struct *tss = init_tss + cpu;
26700 unsigned fsindex, gsindex;
26701 fpu_switch_t fpu;
26702
26703@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26704 if (unlikely(next->ds | prev->ds))
26705 loadsegment(ds, next->ds);
26706
26707+ savesegment(ss, prev->ss);
26708+ if (unlikely(next->ss != prev->ss))
26709+ loadsegment(ss, next->ss);
26710+
26711 /*
26712 * Switch FS and GS.
26713 *
26714@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26715 prev->usersp = this_cpu_read(old_rsp);
26716 this_cpu_write(old_rsp, next->usersp);
26717 this_cpu_write(current_task, next_p);
26718+ this_cpu_write(current_tinfo, &next_p->tinfo);
26719
26720 /*
26721 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26722@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26723 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26724 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26725
26726- this_cpu_write(kernel_stack,
26727- (unsigned long)task_stack_page(next_p) +
26728- THREAD_SIZE - KERNEL_STACK_OFFSET);
26729+ this_cpu_write(kernel_stack, next->sp0);
26730
26731 /*
26732 * Now maybe reload the debug registers and handle I/O bitmaps
26733@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26734 if (!p || p == current || p->state == TASK_RUNNING)
26735 return 0;
26736 stack = (unsigned long)task_stack_page(p);
26737- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26738+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26739 return 0;
26740 fp = *(u64 *)(p->thread.sp);
26741 do {
26742- if (fp < (unsigned long)stack ||
26743- fp >= (unsigned long)stack+THREAD_SIZE)
26744+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26745 return 0;
26746 ip = *(u64 *)(fp+8);
26747 if (!in_sched_functions(ip))
26748diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26749index e510618..5165ac0 100644
26750--- a/arch/x86/kernel/ptrace.c
26751+++ b/arch/x86/kernel/ptrace.c
26752@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26753 unsigned long sp = (unsigned long)&regs->sp;
26754 u32 *prev_esp;
26755
26756- if (context == (sp & ~(THREAD_SIZE - 1)))
26757+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26758 return sp;
26759
26760- prev_esp = (u32 *)(context);
26761+ prev_esp = *(u32 **)(context);
26762 if (prev_esp)
26763 return (unsigned long)prev_esp;
26764
26765@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26766 if (child->thread.gs != value)
26767 return do_arch_prctl(child, ARCH_SET_GS, value);
26768 return 0;
26769+
26770+ case offsetof(struct user_regs_struct,ip):
26771+ /*
26772+ * Protect against any attempt to set ip to an
26773+ * impossible address. There are dragons lurking if the
26774+ * address is noncanonical. (This explicitly allows
26775+ * setting ip to TASK_SIZE_MAX, because user code can do
26776+ * that all by itself by running off the end of its
26777+ * address space.
26778+ */
26779+ if (value > TASK_SIZE_MAX)
26780+ return -EIO;
26781+ break;
26782+
26783 #endif
26784 }
26785
26786@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26787 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26788 {
26789 int i;
26790- int dr7 = 0;
26791+ unsigned long dr7 = 0;
26792 struct arch_hw_breakpoint *info;
26793
26794 for (i = 0; i < HBP_NUM; i++) {
26795@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26796 unsigned long addr, unsigned long data)
26797 {
26798 int ret;
26799- unsigned long __user *datap = (unsigned long __user *)data;
26800+ unsigned long __user *datap = (__force unsigned long __user *)data;
26801
26802 switch (request) {
26803 /* read the word at location addr in the USER area. */
26804@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26805 if ((int) addr < 0)
26806 return -EIO;
26807 ret = do_get_thread_area(child, addr,
26808- (struct user_desc __user *)data);
26809+ (__force struct user_desc __user *) data);
26810 break;
26811
26812 case PTRACE_SET_THREAD_AREA:
26813 if ((int) addr < 0)
26814 return -EIO;
26815 ret = do_set_thread_area(child, addr,
26816- (struct user_desc __user *)data, 0);
26817+ (__force struct user_desc __user *) data, 0);
26818 break;
26819 #endif
26820
26821@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26822
26823 #ifdef CONFIG_X86_64
26824
26825-static struct user_regset x86_64_regsets[] __read_mostly = {
26826+static user_regset_no_const x86_64_regsets[] __read_only = {
26827 [REGSET_GENERAL] = {
26828 .core_note_type = NT_PRSTATUS,
26829 .n = sizeof(struct user_regs_struct) / sizeof(long),
26830@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26831 #endif /* CONFIG_X86_64 */
26832
26833 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26834-static struct user_regset x86_32_regsets[] __read_mostly = {
26835+static user_regset_no_const x86_32_regsets[] __read_only = {
26836 [REGSET_GENERAL] = {
26837 .core_note_type = NT_PRSTATUS,
26838 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26839@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26840 */
26841 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26842
26843-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26844+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26845 {
26846 #ifdef CONFIG_X86_64
26847 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26848@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26849 memset(info, 0, sizeof(*info));
26850 info->si_signo = SIGTRAP;
26851 info->si_code = si_code;
26852- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26853+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26854 }
26855
26856 void user_single_step_siginfo(struct task_struct *tsk,
26857@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26858 }
26859 }
26860
26861+#ifdef CONFIG_GRKERNSEC_SETXID
26862+extern void gr_delayed_cred_worker(void);
26863+#endif
26864+
26865 /*
26866 * We can return 0 to resume the syscall or anything else to go to phase
26867 * 2. If we resume the syscall, we need to put something appropriate in
26868@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26869
26870 BUG_ON(regs != task_pt_regs(current));
26871
26872+#ifdef CONFIG_GRKERNSEC_SETXID
26873+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26874+ gr_delayed_cred_worker();
26875+#endif
26876+
26877 /*
26878 * If we stepped into a sysenter/syscall insn, it trapped in
26879 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26880@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26881 */
26882 user_exit();
26883
26884+#ifdef CONFIG_GRKERNSEC_SETXID
26885+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26886+ gr_delayed_cred_worker();
26887+#endif
26888+
26889 audit_syscall_exit(regs);
26890
26891 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26892diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26893index 2f355d2..e75ed0a 100644
26894--- a/arch/x86/kernel/pvclock.c
26895+++ b/arch/x86/kernel/pvclock.c
26896@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26897 reset_hung_task_detector();
26898 }
26899
26900-static atomic64_t last_value = ATOMIC64_INIT(0);
26901+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26902
26903 void pvclock_resume(void)
26904 {
26905- atomic64_set(&last_value, 0);
26906+ atomic64_set_unchecked(&last_value, 0);
26907 }
26908
26909 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26910@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26911 * updating at the same time, and one of them could be slightly behind,
26912 * making the assumption that last_value always go forward fail to hold.
26913 */
26914- last = atomic64_read(&last_value);
26915+ last = atomic64_read_unchecked(&last_value);
26916 do {
26917 if (ret < last)
26918 return last;
26919- last = atomic64_cmpxchg(&last_value, last, ret);
26920+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26921 } while (unlikely(last != ret));
26922
26923 return ret;
26924diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26925index 17962e6..47f55db 100644
26926--- a/arch/x86/kernel/reboot.c
26927+++ b/arch/x86/kernel/reboot.c
26928@@ -69,6 +69,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26929
26930 void __noreturn machine_real_restart(unsigned int type)
26931 {
26932+
26933+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26934+ struct desc_struct *gdt;
26935+#endif
26936+
26937 local_irq_disable();
26938
26939 /*
26940@@ -96,7 +101,29 @@ void __noreturn machine_real_restart(unsigned int type)
26941
26942 /* Jump to the identity-mapped low memory code */
26943 #ifdef CONFIG_X86_32
26944- asm volatile("jmpl *%0" : :
26945+
26946+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26947+ gdt = get_cpu_gdt_table(smp_processor_id());
26948+ pax_open_kernel();
26949+#ifdef CONFIG_PAX_MEMORY_UDEREF
26950+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26951+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26952+ loadsegment(ds, __KERNEL_DS);
26953+ loadsegment(es, __KERNEL_DS);
26954+ loadsegment(ss, __KERNEL_DS);
26955+#endif
26956+#ifdef CONFIG_PAX_KERNEXEC
26957+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26958+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26959+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26960+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26961+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26962+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26963+#endif
26964+ pax_close_kernel();
26965+#endif
26966+
26967+ asm volatile("ljmpl *%0" : :
26968 "rm" (real_mode_header->machine_real_restart_asm),
26969 "a" (type));
26970 #else
26971@@ -500,7 +527,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26972 * This means that this function can never return, it can misbehave
26973 * by not rebooting properly and hanging.
26974 */
26975-static void native_machine_emergency_restart(void)
26976+static void __noreturn native_machine_emergency_restart(void)
26977 {
26978 int i;
26979 int attempt = 0;
26980@@ -620,13 +647,13 @@ void native_machine_shutdown(void)
26981 #endif
26982 }
26983
26984-static void __machine_emergency_restart(int emergency)
26985+static void __noreturn __machine_emergency_restart(int emergency)
26986 {
26987 reboot_emergency = emergency;
26988 machine_ops.emergency_restart();
26989 }
26990
26991-static void native_machine_restart(char *__unused)
26992+static void __noreturn native_machine_restart(char *__unused)
26993 {
26994 pr_notice("machine restart\n");
26995
26996@@ -635,7 +662,7 @@ static void native_machine_restart(char *__unused)
26997 __machine_emergency_restart(0);
26998 }
26999
27000-static void native_machine_halt(void)
27001+static void __noreturn native_machine_halt(void)
27002 {
27003 /* Stop other cpus and apics */
27004 machine_shutdown();
27005@@ -645,7 +672,7 @@ static void native_machine_halt(void)
27006 stop_this_cpu(NULL);
27007 }
27008
27009-static void native_machine_power_off(void)
27010+static void __noreturn native_machine_power_off(void)
27011 {
27012 if (pm_power_off) {
27013 if (!reboot_force)
27014@@ -654,9 +681,10 @@ static void native_machine_power_off(void)
27015 }
27016 /* A fallback in case there is no PM info available */
27017 tboot_shutdown(TB_SHUTDOWN_HALT);
27018+ unreachable();
27019 }
27020
27021-struct machine_ops machine_ops = {
27022+struct machine_ops machine_ops __read_only = {
27023 .power_off = native_machine_power_off,
27024 .shutdown = native_machine_shutdown,
27025 .emergency_restart = native_machine_emergency_restart,
27026diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27027index c8e41e9..64049ef 100644
27028--- a/arch/x86/kernel/reboot_fixups_32.c
27029+++ b/arch/x86/kernel/reboot_fixups_32.c
27030@@ -57,7 +57,7 @@ struct device_fixup {
27031 unsigned int vendor;
27032 unsigned int device;
27033 void (*reboot_fixup)(struct pci_dev *);
27034-};
27035+} __do_const;
27036
27037 /*
27038 * PCI ids solely used for fixups_table go here
27039diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27040index 3fd2c69..a444264 100644
27041--- a/arch/x86/kernel/relocate_kernel_64.S
27042+++ b/arch/x86/kernel/relocate_kernel_64.S
27043@@ -96,8 +96,7 @@ relocate_kernel:
27044
27045 /* jump to identity mapped page */
27046 addq $(identity_mapped - relocate_kernel), %r8
27047- pushq %r8
27048- ret
27049+ jmp *%r8
27050
27051 identity_mapped:
27052 /* set return address to 0 if not preserving context */
27053diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27054index ab08aa2..6d74a3a 100644
27055--- a/arch/x86/kernel/setup.c
27056+++ b/arch/x86/kernel/setup.c
27057@@ -110,6 +110,7 @@
27058 #include <asm/mce.h>
27059 #include <asm/alternative.h>
27060 #include <asm/prom.h>
27061+#include <asm/boot.h>
27062
27063 /*
27064 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27065@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
27066 #endif
27067
27068
27069-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27070-__visible unsigned long mmu_cr4_features;
27071+#ifdef CONFIG_X86_64
27072+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27073+#elif defined(CONFIG_X86_PAE)
27074+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27075 #else
27076-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27077+__visible unsigned long mmu_cr4_features __read_only;
27078 #endif
27079
27080+void set_in_cr4(unsigned long mask)
27081+{
27082+ unsigned long cr4 = read_cr4();
27083+
27084+ if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
27085+ return;
27086+
27087+ pax_open_kernel();
27088+ mmu_cr4_features |= mask;
27089+ pax_close_kernel();
27090+
27091+ if (trampoline_cr4_features)
27092+ *trampoline_cr4_features = mmu_cr4_features;
27093+ cr4 |= mask;
27094+ write_cr4(cr4);
27095+}
27096+EXPORT_SYMBOL(set_in_cr4);
27097+
27098+void clear_in_cr4(unsigned long mask)
27099+{
27100+ unsigned long cr4 = read_cr4();
27101+
27102+ if (!(cr4 & mask) && cr4 == mmu_cr4_features)
27103+ return;
27104+
27105+ pax_open_kernel();
27106+ mmu_cr4_features &= ~mask;
27107+ pax_close_kernel();
27108+
27109+ if (trampoline_cr4_features)
27110+ *trampoline_cr4_features = mmu_cr4_features;
27111+ cr4 &= ~mask;
27112+ write_cr4(cr4);
27113+}
27114+EXPORT_SYMBOL(clear_in_cr4);
27115+
27116 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27117 int bootloader_type, bootloader_version;
27118
27119@@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
27120 * area (640->1Mb) as ram even though it is not.
27121 * take them out.
27122 */
27123- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27124+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27125
27126 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27127 }
27128@@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
27129 /* called before trim_bios_range() to spare extra sanitize */
27130 static void __init e820_add_kernel_range(void)
27131 {
27132- u64 start = __pa_symbol(_text);
27133+ u64 start = __pa_symbol(ktla_ktva(_text));
27134 u64 size = __pa_symbol(_end) - start;
27135
27136 /*
27137@@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27138
27139 void __init setup_arch(char **cmdline_p)
27140 {
27141+#ifdef CONFIG_X86_32
27142+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27143+#else
27144 memblock_reserve(__pa_symbol(_text),
27145 (unsigned long)__bss_stop - (unsigned long)_text);
27146+#endif
27147
27148 early_reserve_initrd();
27149
27150@@ -955,14 +998,14 @@ void __init setup_arch(char **cmdline_p)
27151
27152 if (!boot_params.hdr.root_flags)
27153 root_mountflags &= ~MS_RDONLY;
27154- init_mm.start_code = (unsigned long) _text;
27155- init_mm.end_code = (unsigned long) _etext;
27156+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27157+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27158 init_mm.end_data = (unsigned long) _edata;
27159 init_mm.brk = _brk_end;
27160
27161- code_resource.start = __pa_symbol(_text);
27162- code_resource.end = __pa_symbol(_etext)-1;
27163- data_resource.start = __pa_symbol(_etext);
27164+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27165+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27166+ data_resource.start = __pa_symbol(_sdata);
27167 data_resource.end = __pa_symbol(_edata)-1;
27168 bss_resource.start = __pa_symbol(__bss_start);
27169 bss_resource.end = __pa_symbol(__bss_stop)-1;
27170diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27171index 5cdff03..80fa283 100644
27172--- a/arch/x86/kernel/setup_percpu.c
27173+++ b/arch/x86/kernel/setup_percpu.c
27174@@ -21,19 +21,17 @@
27175 #include <asm/cpu.h>
27176 #include <asm/stackprotector.h>
27177
27178-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27179+#ifdef CONFIG_SMP
27180+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27181 EXPORT_PER_CPU_SYMBOL(cpu_number);
27182+#endif
27183
27184-#ifdef CONFIG_X86_64
27185 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27186-#else
27187-#define BOOT_PERCPU_OFFSET 0
27188-#endif
27189
27190 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27191 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27192
27193-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27194+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27195 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27196 };
27197 EXPORT_SYMBOL(__per_cpu_offset);
27198@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27199 {
27200 #ifdef CONFIG_NEED_MULTIPLE_NODES
27201 pg_data_t *last = NULL;
27202- unsigned int cpu;
27203+ int cpu;
27204
27205 for_each_possible_cpu(cpu) {
27206 int node = early_cpu_to_node(cpu);
27207@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27208 {
27209 #ifdef CONFIG_X86_32
27210 struct desc_struct gdt;
27211+ unsigned long base = per_cpu_offset(cpu);
27212
27213- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27214- 0x2 | DESCTYPE_S, 0x8);
27215- gdt.s = 1;
27216+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27217+ 0x83 | DESCTYPE_S, 0xC);
27218 write_gdt_entry(get_cpu_gdt_table(cpu),
27219 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27220 #endif
27221@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27222 /* alrighty, percpu areas up and running */
27223 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27224 for_each_possible_cpu(cpu) {
27225+#ifdef CONFIG_CC_STACKPROTECTOR
27226+#ifdef CONFIG_X86_32
27227+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27228+#endif
27229+#endif
27230 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27231 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27232 per_cpu(cpu_number, cpu) = cpu;
27233@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27234 */
27235 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27236 #endif
27237+#ifdef CONFIG_CC_STACKPROTECTOR
27238+#ifdef CONFIG_X86_32
27239+ if (!cpu)
27240+ per_cpu(stack_canary.canary, cpu) = canary;
27241+#endif
27242+#endif
27243 /*
27244 * Up to this point, the boot CPU has been using .init.data
27245 * area. Reload any changed state for the boot CPU.
27246diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27247index ed37a76..39f936e 100644
27248--- a/arch/x86/kernel/signal.c
27249+++ b/arch/x86/kernel/signal.c
27250@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27251 * Align the stack pointer according to the i386 ABI,
27252 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27253 */
27254- sp = ((sp + 4) & -16ul) - 4;
27255+ sp = ((sp - 12) & -16ul) - 4;
27256 #else /* !CONFIG_X86_32 */
27257 sp = round_down(sp, 16) - 8;
27258 #endif
27259@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27260 }
27261
27262 if (current->mm->context.vdso)
27263- restorer = current->mm->context.vdso +
27264- selected_vdso32->sym___kernel_sigreturn;
27265+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27266 else
27267- restorer = &frame->retcode;
27268+ restorer = (void __user *)&frame->retcode;
27269 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27270 restorer = ksig->ka.sa.sa_restorer;
27271
27272@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27273 * reasons and because gdb uses it as a signature to notice
27274 * signal handler stack frames.
27275 */
27276- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27277+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27278
27279 if (err)
27280 return -EFAULT;
27281@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27282 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27283
27284 /* Set up to return from userspace. */
27285- restorer = current->mm->context.vdso +
27286- selected_vdso32->sym___kernel_rt_sigreturn;
27287+ if (current->mm->context.vdso)
27288+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27289+ else
27290+ restorer = (void __user *)&frame->retcode;
27291 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27292 restorer = ksig->ka.sa.sa_restorer;
27293 put_user_ex(restorer, &frame->pretcode);
27294@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27295 * reasons and because gdb uses it as a signature to notice
27296 * signal handler stack frames.
27297 */
27298- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27299+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27300 } put_user_catch(err);
27301
27302 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27303@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27304 {
27305 int usig = signr_convert(ksig->sig);
27306 sigset_t *set = sigmask_to_save();
27307- compat_sigset_t *cset = (compat_sigset_t *) set;
27308+ sigset_t sigcopy;
27309+ compat_sigset_t *cset;
27310+
27311+ sigcopy = *set;
27312+
27313+ cset = (compat_sigset_t *) &sigcopy;
27314
27315 /* Set up the stack frame */
27316 if (is_ia32_frame()) {
27317@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27318 } else if (is_x32_frame()) {
27319 return x32_setup_rt_frame(ksig, cset, regs);
27320 } else {
27321- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27322+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27323 }
27324 }
27325
27326diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27327index be8e1bd..a3d93fa 100644
27328--- a/arch/x86/kernel/smp.c
27329+++ b/arch/x86/kernel/smp.c
27330@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27331
27332 __setup("nonmi_ipi", nonmi_ipi_setup);
27333
27334-struct smp_ops smp_ops = {
27335+struct smp_ops smp_ops __read_only = {
27336 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27337 .smp_prepare_cpus = native_smp_prepare_cpus,
27338 .smp_cpus_done = native_smp_cpus_done,
27339diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27340index 668d8f2..84a9d54 100644
27341--- a/arch/x86/kernel/smpboot.c
27342+++ b/arch/x86/kernel/smpboot.c
27343@@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
27344
27345 enable_start_cpu0 = 0;
27346
27347-#ifdef CONFIG_X86_32
27348+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27349+ barrier();
27350+
27351 /* switch away from the initial page table */
27352+#ifdef CONFIG_PAX_PER_CPU_PGD
27353+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27354+#else
27355 load_cr3(swapper_pg_dir);
27356+#endif
27357 __flush_tlb_all();
27358-#endif
27359
27360- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27361- barrier();
27362 /*
27363 * Check TSC synchronization with the BP:
27364 */
27365@@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27366 alternatives_enable_smp();
27367
27368 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27369- (THREAD_SIZE + task_stack_page(idle))) - 1);
27370+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27371 per_cpu(current_task, cpu) = idle;
27372+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27373
27374 #ifdef CONFIG_X86_32
27375 /* Stack for startup_32 can be just as for start_secondary onwards */
27376@@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27377 clear_tsk_thread_flag(idle, TIF_FORK);
27378 initial_gs = per_cpu_offset(cpu);
27379 #endif
27380- per_cpu(kernel_stack, cpu) =
27381- (unsigned long)task_stack_page(idle) -
27382- KERNEL_STACK_OFFSET + THREAD_SIZE;
27383+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27384+ pax_open_kernel();
27385 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27386+ pax_close_kernel();
27387 initial_code = (unsigned long)start_secondary;
27388 stack_start = idle->thread.sp;
27389
27390@@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27391 /* the FPU context is blank, nobody can own it */
27392 __cpu_disable_lazy_restore(cpu);
27393
27394+#ifdef CONFIG_PAX_PER_CPU_PGD
27395+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27396+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27397+ KERNEL_PGD_PTRS);
27398+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27399+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27400+ KERNEL_PGD_PTRS);
27401+#endif
27402+
27403 err = do_boot_cpu(apicid, cpu, tidle);
27404 if (err) {
27405 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27406diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27407index 9b4d51d..5d28b58 100644
27408--- a/arch/x86/kernel/step.c
27409+++ b/arch/x86/kernel/step.c
27410@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27411 struct desc_struct *desc;
27412 unsigned long base;
27413
27414- seg &= ~7UL;
27415+ seg >>= 3;
27416
27417 mutex_lock(&child->mm->context.lock);
27418- if (unlikely((seg >> 3) >= child->mm->context.size))
27419+ if (unlikely(seg >= child->mm->context.size))
27420 addr = -1L; /* bogus selector, access would fault */
27421 else {
27422 desc = child->mm->context.ldt + seg;
27423@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27424 addr += base;
27425 }
27426 mutex_unlock(&child->mm->context.lock);
27427- }
27428+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27429+ addr = ktla_ktva(addr);
27430
27431 return addr;
27432 }
27433@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27434 unsigned char opcode[15];
27435 unsigned long addr = convert_ip_to_linear(child, regs);
27436
27437+ if (addr == -EINVAL)
27438+ return 0;
27439+
27440 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27441 for (i = 0; i < copied; i++) {
27442 switch (opcode[i]) {
27443diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27444new file mode 100644
27445index 0000000..5877189
27446--- /dev/null
27447+++ b/arch/x86/kernel/sys_i386_32.c
27448@@ -0,0 +1,189 @@
27449+/*
27450+ * This file contains various random system calls that
27451+ * have a non-standard calling sequence on the Linux/i386
27452+ * platform.
27453+ */
27454+
27455+#include <linux/errno.h>
27456+#include <linux/sched.h>
27457+#include <linux/mm.h>
27458+#include <linux/fs.h>
27459+#include <linux/smp.h>
27460+#include <linux/sem.h>
27461+#include <linux/msg.h>
27462+#include <linux/shm.h>
27463+#include <linux/stat.h>
27464+#include <linux/syscalls.h>
27465+#include <linux/mman.h>
27466+#include <linux/file.h>
27467+#include <linux/utsname.h>
27468+#include <linux/ipc.h>
27469+#include <linux/elf.h>
27470+
27471+#include <linux/uaccess.h>
27472+#include <linux/unistd.h>
27473+
27474+#include <asm/syscalls.h>
27475+
27476+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27477+{
27478+ unsigned long pax_task_size = TASK_SIZE;
27479+
27480+#ifdef CONFIG_PAX_SEGMEXEC
27481+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27482+ pax_task_size = SEGMEXEC_TASK_SIZE;
27483+#endif
27484+
27485+ if (flags & MAP_FIXED)
27486+ if (len > pax_task_size || addr > pax_task_size - len)
27487+ return -EINVAL;
27488+
27489+ return 0;
27490+}
27491+
27492+/*
27493+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27494+ */
27495+static unsigned long get_align_mask(void)
27496+{
27497+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27498+ return 0;
27499+
27500+ if (!(current->flags & PF_RANDOMIZE))
27501+ return 0;
27502+
27503+ return va_align.mask;
27504+}
27505+
27506+unsigned long
27507+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27508+ unsigned long len, unsigned long pgoff, unsigned long flags)
27509+{
27510+ struct mm_struct *mm = current->mm;
27511+ struct vm_area_struct *vma;
27512+ unsigned long pax_task_size = TASK_SIZE;
27513+ struct vm_unmapped_area_info info;
27514+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27515+
27516+#ifdef CONFIG_PAX_SEGMEXEC
27517+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27518+ pax_task_size = SEGMEXEC_TASK_SIZE;
27519+#endif
27520+
27521+ pax_task_size -= PAGE_SIZE;
27522+
27523+ if (len > pax_task_size)
27524+ return -ENOMEM;
27525+
27526+ if (flags & MAP_FIXED)
27527+ return addr;
27528+
27529+#ifdef CONFIG_PAX_RANDMMAP
27530+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27531+#endif
27532+
27533+ if (addr) {
27534+ addr = PAGE_ALIGN(addr);
27535+ if (pax_task_size - len >= addr) {
27536+ vma = find_vma(mm, addr);
27537+ if (check_heap_stack_gap(vma, addr, len, offset))
27538+ return addr;
27539+ }
27540+ }
27541+
27542+ info.flags = 0;
27543+ info.length = len;
27544+ info.align_mask = filp ? get_align_mask() : 0;
27545+ info.align_offset = pgoff << PAGE_SHIFT;
27546+ info.threadstack_offset = offset;
27547+
27548+#ifdef CONFIG_PAX_PAGEEXEC
27549+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27550+ info.low_limit = 0x00110000UL;
27551+ info.high_limit = mm->start_code;
27552+
27553+#ifdef CONFIG_PAX_RANDMMAP
27554+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27555+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27556+#endif
27557+
27558+ if (info.low_limit < info.high_limit) {
27559+ addr = vm_unmapped_area(&info);
27560+ if (!IS_ERR_VALUE(addr))
27561+ return addr;
27562+ }
27563+ } else
27564+#endif
27565+
27566+ info.low_limit = mm->mmap_base;
27567+ info.high_limit = pax_task_size;
27568+
27569+ return vm_unmapped_area(&info);
27570+}
27571+
27572+unsigned long
27573+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27574+ const unsigned long len, const unsigned long pgoff,
27575+ const unsigned long flags)
27576+{
27577+ struct vm_area_struct *vma;
27578+ struct mm_struct *mm = current->mm;
27579+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27580+ struct vm_unmapped_area_info info;
27581+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27582+
27583+#ifdef CONFIG_PAX_SEGMEXEC
27584+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27585+ pax_task_size = SEGMEXEC_TASK_SIZE;
27586+#endif
27587+
27588+ pax_task_size -= PAGE_SIZE;
27589+
27590+ /* requested length too big for entire address space */
27591+ if (len > pax_task_size)
27592+ return -ENOMEM;
27593+
27594+ if (flags & MAP_FIXED)
27595+ return addr;
27596+
27597+#ifdef CONFIG_PAX_PAGEEXEC
27598+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27599+ goto bottomup;
27600+#endif
27601+
27602+#ifdef CONFIG_PAX_RANDMMAP
27603+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27604+#endif
27605+
27606+ /* requesting a specific address */
27607+ if (addr) {
27608+ addr = PAGE_ALIGN(addr);
27609+ if (pax_task_size - len >= addr) {
27610+ vma = find_vma(mm, addr);
27611+ if (check_heap_stack_gap(vma, addr, len, offset))
27612+ return addr;
27613+ }
27614+ }
27615+
27616+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27617+ info.length = len;
27618+ info.low_limit = PAGE_SIZE;
27619+ info.high_limit = mm->mmap_base;
27620+ info.align_mask = filp ? get_align_mask() : 0;
27621+ info.align_offset = pgoff << PAGE_SHIFT;
27622+ info.threadstack_offset = offset;
27623+
27624+ addr = vm_unmapped_area(&info);
27625+ if (!(addr & ~PAGE_MASK))
27626+ return addr;
27627+ VM_BUG_ON(addr != -ENOMEM);
27628+
27629+bottomup:
27630+ /*
27631+ * A failed mmap() very likely causes application failure,
27632+ * so fall back to the bottom-up function here. This scenario
27633+ * can happen with large stack limits and large mmap()
27634+ * allocations.
27635+ */
27636+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27637+}
27638diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27639index 30277e2..5664a29 100644
27640--- a/arch/x86/kernel/sys_x86_64.c
27641+++ b/arch/x86/kernel/sys_x86_64.c
27642@@ -81,8 +81,8 @@ out:
27643 return error;
27644 }
27645
27646-static void find_start_end(unsigned long flags, unsigned long *begin,
27647- unsigned long *end)
27648+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27649+ unsigned long *begin, unsigned long *end)
27650 {
27651 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27652 unsigned long new_begin;
27653@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27654 *begin = new_begin;
27655 }
27656 } else {
27657- *begin = current->mm->mmap_legacy_base;
27658+ *begin = mm->mmap_legacy_base;
27659 *end = TASK_SIZE;
27660 }
27661 }
27662@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27663 struct vm_area_struct *vma;
27664 struct vm_unmapped_area_info info;
27665 unsigned long begin, end;
27666+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27667
27668 if (flags & MAP_FIXED)
27669 return addr;
27670
27671- find_start_end(flags, &begin, &end);
27672+ find_start_end(mm, flags, &begin, &end);
27673
27674 if (len > end)
27675 return -ENOMEM;
27676
27677+#ifdef CONFIG_PAX_RANDMMAP
27678+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27679+#endif
27680+
27681 if (addr) {
27682 addr = PAGE_ALIGN(addr);
27683 vma = find_vma(mm, addr);
27684- if (end - len >= addr &&
27685- (!vma || addr + len <= vma->vm_start))
27686+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27687 return addr;
27688 }
27689
27690@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27691 info.high_limit = end;
27692 info.align_mask = filp ? get_align_mask() : 0;
27693 info.align_offset = pgoff << PAGE_SHIFT;
27694+ info.threadstack_offset = offset;
27695 return vm_unmapped_area(&info);
27696 }
27697
27698@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27699 struct mm_struct *mm = current->mm;
27700 unsigned long addr = addr0;
27701 struct vm_unmapped_area_info info;
27702+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27703
27704 /* requested length too big for entire address space */
27705 if (len > TASK_SIZE)
27706@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27707 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27708 goto bottomup;
27709
27710+#ifdef CONFIG_PAX_RANDMMAP
27711+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27712+#endif
27713+
27714 /* requesting a specific address */
27715 if (addr) {
27716 addr = PAGE_ALIGN(addr);
27717 vma = find_vma(mm, addr);
27718- if (TASK_SIZE - len >= addr &&
27719- (!vma || addr + len <= vma->vm_start))
27720+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27721 return addr;
27722 }
27723
27724@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27725 info.high_limit = mm->mmap_base;
27726 info.align_mask = filp ? get_align_mask() : 0;
27727 info.align_offset = pgoff << PAGE_SHIFT;
27728+ info.threadstack_offset = offset;
27729 addr = vm_unmapped_area(&info);
27730 if (!(addr & ~PAGE_MASK))
27731 return addr;
27732diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27733index 91a4496..bb87552 100644
27734--- a/arch/x86/kernel/tboot.c
27735+++ b/arch/x86/kernel/tboot.c
27736@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27737
27738 void tboot_shutdown(u32 shutdown_type)
27739 {
27740- void (*shutdown)(void);
27741+ void (* __noreturn shutdown)(void);
27742
27743 if (!tboot_enabled())
27744 return;
27745@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27746
27747 switch_to_tboot_pt();
27748
27749- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27750+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27751 shutdown();
27752
27753 /* should not reach here */
27754@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27755 return -ENODEV;
27756 }
27757
27758-static atomic_t ap_wfs_count;
27759+static atomic_unchecked_t ap_wfs_count;
27760
27761 static int tboot_wait_for_aps(int num_aps)
27762 {
27763@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27764 {
27765 switch (action) {
27766 case CPU_DYING:
27767- atomic_inc(&ap_wfs_count);
27768+ atomic_inc_unchecked(&ap_wfs_count);
27769 if (num_online_cpus() == 1)
27770- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27771+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27772 return NOTIFY_BAD;
27773 break;
27774 }
27775@@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27776
27777 tboot_create_trampoline();
27778
27779- atomic_set(&ap_wfs_count, 0);
27780+ atomic_set_unchecked(&ap_wfs_count, 0);
27781 register_hotcpu_notifier(&tboot_cpu_notifier);
27782
27783 #ifdef CONFIG_DEBUG_FS
27784diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27785index 0fa2960..91eabbe 100644
27786--- a/arch/x86/kernel/time.c
27787+++ b/arch/x86/kernel/time.c
27788@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27789 {
27790 unsigned long pc = instruction_pointer(regs);
27791
27792- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27793+ if (!user_mode(regs) && in_lock_functions(pc)) {
27794 #ifdef CONFIG_FRAME_POINTER
27795- return *(unsigned long *)(regs->bp + sizeof(long));
27796+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27797 #else
27798 unsigned long *sp =
27799 (unsigned long *)kernel_stack_pointer(regs);
27800@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27801 * or above a saved flags. Eflags has bits 22-31 zero,
27802 * kernel addresses don't.
27803 */
27804+
27805+#ifdef CONFIG_PAX_KERNEXEC
27806+ return ktla_ktva(sp[0]);
27807+#else
27808 if (sp[0] >> 22)
27809 return sp[0];
27810 if (sp[1] >> 22)
27811 return sp[1];
27812 #endif
27813+
27814+#endif
27815 }
27816 return pc;
27817 }
27818diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27819index 7fc5e84..c6e445a 100644
27820--- a/arch/x86/kernel/tls.c
27821+++ b/arch/x86/kernel/tls.c
27822@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27823 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27824 return -EINVAL;
27825
27826+#ifdef CONFIG_PAX_SEGMEXEC
27827+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27828+ return -EINVAL;
27829+#endif
27830+
27831 set_tls_desc(p, idx, &info, 1);
27832
27833 return 0;
27834@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27835
27836 if (kbuf)
27837 info = kbuf;
27838- else if (__copy_from_user(infobuf, ubuf, count))
27839+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27840 return -EFAULT;
27841 else
27842 info = infobuf;
27843diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27844index 1c113db..287b42e 100644
27845--- a/arch/x86/kernel/tracepoint.c
27846+++ b/arch/x86/kernel/tracepoint.c
27847@@ -9,11 +9,11 @@
27848 #include <linux/atomic.h>
27849
27850 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27851-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27852+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27853 (unsigned long) trace_idt_table };
27854
27855 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27856-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27857+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27858
27859 static int trace_irq_vector_refcount;
27860 static DEFINE_MUTEX(irq_vector_mutex);
27861diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27862index 07ab8e9..99c8456 100644
27863--- a/arch/x86/kernel/traps.c
27864+++ b/arch/x86/kernel/traps.c
27865@@ -67,7 +67,7 @@
27866 #include <asm/proto.h>
27867
27868 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27869-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27870+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27871 #else
27872 #include <asm/processor-flags.h>
27873 #include <asm/setup.h>
27874@@ -76,7 +76,7 @@ asmlinkage int system_call(void);
27875 #endif
27876
27877 /* Must be page-aligned because the real IDT is used in a fixmap. */
27878-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27879+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27880
27881 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27882 EXPORT_SYMBOL_GPL(used_vectors);
27883@@ -108,11 +108,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27884 }
27885
27886 static nokprobe_inline int
27887-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27888+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27889 struct pt_regs *regs, long error_code)
27890 {
27891 #ifdef CONFIG_X86_32
27892- if (regs->flags & X86_VM_MASK) {
27893+ if (v8086_mode(regs)) {
27894 /*
27895 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27896 * On nmi (interrupt 2), do_trap should not be called.
27897@@ -125,12 +125,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27898 return -1;
27899 }
27900 #endif
27901- if (!user_mode(regs)) {
27902+ if (!user_mode_novm(regs)) {
27903 if (!fixup_exception(regs)) {
27904 tsk->thread.error_code = error_code;
27905 tsk->thread.trap_nr = trapnr;
27906+
27907+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27908+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27909+ str = "PAX: suspicious stack segment fault";
27910+#endif
27911+
27912 die(str, regs, error_code);
27913 }
27914+
27915+#ifdef CONFIG_PAX_REFCOUNT
27916+ if (trapnr == X86_TRAP_OF)
27917+ pax_report_refcount_overflow(regs);
27918+#endif
27919+
27920 return 0;
27921 }
27922
27923@@ -169,7 +181,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27924 }
27925
27926 static void
27927-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27928+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27929 long error_code, siginfo_t *info)
27930 {
27931 struct task_struct *tsk = current;
27932@@ -193,7 +205,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27933 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27934 printk_ratelimit()) {
27935 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27936- tsk->comm, tsk->pid, str,
27937+ tsk->comm, task_pid_nr(tsk), str,
27938 regs->ip, regs->sp, error_code);
27939 print_vma_addr(" in ", regs->ip);
27940 pr_cont("\n");
27941@@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27942 tsk->thread.error_code = error_code;
27943 tsk->thread.trap_nr = X86_TRAP_DF;
27944
27945+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27946+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27947+ die("grsec: kernel stack overflow detected", regs, error_code);
27948+#endif
27949+
27950 #ifdef CONFIG_DOUBLEFAULT
27951 df_debug(regs, error_code);
27952 #endif
27953@@ -296,7 +313,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27954 conditional_sti(regs);
27955
27956 #ifdef CONFIG_X86_32
27957- if (regs->flags & X86_VM_MASK) {
27958+ if (v8086_mode(regs)) {
27959 local_irq_enable();
27960 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
27961 goto exit;
27962@@ -304,18 +321,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
27963 #endif
27964
27965 tsk = current;
27966- if (!user_mode(regs)) {
27967+ if (!user_mode_novm(regs)) {
27968 if (fixup_exception(regs))
27969 goto exit;
27970
27971 tsk->thread.error_code = error_code;
27972 tsk->thread.trap_nr = X86_TRAP_GP;
27973 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
27974- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
27975+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
27976+
27977+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27978+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
27979+ die("PAX: suspicious general protection fault", regs, error_code);
27980+ else
27981+#endif
27982+
27983 die("general protection fault", regs, error_code);
27984+ }
27985 goto exit;
27986 }
27987
27988+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
27989+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
27990+ struct mm_struct *mm = tsk->mm;
27991+ unsigned long limit;
27992+
27993+ down_write(&mm->mmap_sem);
27994+ limit = mm->context.user_cs_limit;
27995+ if (limit < TASK_SIZE) {
27996+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
27997+ up_write(&mm->mmap_sem);
27998+ return;
27999+ }
28000+ up_write(&mm->mmap_sem);
28001+ }
28002+#endif
28003+
28004 tsk->thread.error_code = error_code;
28005 tsk->thread.trap_nr = X86_TRAP_GP;
28006
28007@@ -427,13 +468,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28008 container_of(task_pt_regs(current),
28009 struct bad_iret_stack, regs);
28010
28011+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28012+ new_stack = s;
28013+
28014 /* Copy the IRET target to the new stack. */
28015 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28016
28017 /* Copy the remainder of the stack from the current stack. */
28018 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28019
28020- BUG_ON(!user_mode_vm(&new_stack->regs));
28021+ BUG_ON(!user_mode(&new_stack->regs));
28022 return new_stack;
28023 }
28024 NOKPROBE_SYMBOL(fixup_bad_iret);
28025@@ -519,7 +563,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28026 /* It's safe to allow irq's after DR6 has been saved */
28027 preempt_conditional_sti(regs);
28028
28029- if (regs->flags & X86_VM_MASK) {
28030+ if (v8086_mode(regs)) {
28031 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28032 X86_TRAP_DB);
28033 preempt_conditional_cli(regs);
28034@@ -534,7 +578,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28035 * We already checked v86 mode above, so we can check for kernel mode
28036 * by just checking the CPL of CS.
28037 */
28038- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28039+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28040 tsk->thread.debugreg6 &= ~DR_STEP;
28041 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28042 regs->flags &= ~X86_EFLAGS_TF;
28043@@ -567,7 +611,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28044 return;
28045 conditional_sti(regs);
28046
28047- if (!user_mode_vm(regs))
28048+ if (!user_mode(regs))
28049 {
28050 if (!fixup_exception(regs)) {
28051 task->thread.error_code = error_code;
28052diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28053index 5054497..139f8f8 100644
28054--- a/arch/x86/kernel/tsc.c
28055+++ b/arch/x86/kernel/tsc.c
28056@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28057 */
28058 smp_wmb();
28059
28060- ACCESS_ONCE(c2n->head) = data;
28061+ ACCESS_ONCE_RW(c2n->head) = data;
28062 }
28063
28064 /*
28065diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28066index 5d1cbfe..2a21feb 100644
28067--- a/arch/x86/kernel/uprobes.c
28068+++ b/arch/x86/kernel/uprobes.c
28069@@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28070 int ret = NOTIFY_DONE;
28071
28072 /* We are only interested in userspace traps */
28073- if (regs && !user_mode_vm(regs))
28074+ if (regs && !user_mode(regs))
28075 return NOTIFY_DONE;
28076
28077 switch (val) {
28078@@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28079
28080 if (nleft != rasize) {
28081 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28082- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28083+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28084
28085 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28086 }
28087diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28088index b9242ba..50c5edd 100644
28089--- a/arch/x86/kernel/verify_cpu.S
28090+++ b/arch/x86/kernel/verify_cpu.S
28091@@ -20,6 +20,7 @@
28092 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28093 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28094 * arch/x86/kernel/head_32.S: processor startup
28095+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28096 *
28097 * verify_cpu, returns the status of longmode and SSE in register %eax.
28098 * 0: Success 1: Failure
28099diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28100index e8edcf5..27f9344 100644
28101--- a/arch/x86/kernel/vm86_32.c
28102+++ b/arch/x86/kernel/vm86_32.c
28103@@ -44,6 +44,7 @@
28104 #include <linux/ptrace.h>
28105 #include <linux/audit.h>
28106 #include <linux/stddef.h>
28107+#include <linux/grsecurity.h>
28108
28109 #include <asm/uaccess.h>
28110 #include <asm/io.h>
28111@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28112 do_exit(SIGSEGV);
28113 }
28114
28115- tss = &per_cpu(init_tss, get_cpu());
28116+ tss = init_tss + get_cpu();
28117 current->thread.sp0 = current->thread.saved_sp0;
28118 current->thread.sysenter_cs = __KERNEL_CS;
28119 load_sp0(tss, &current->thread);
28120@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28121
28122 if (tsk->thread.saved_sp0)
28123 return -EPERM;
28124+
28125+#ifdef CONFIG_GRKERNSEC_VM86
28126+ if (!capable(CAP_SYS_RAWIO)) {
28127+ gr_handle_vm86();
28128+ return -EPERM;
28129+ }
28130+#endif
28131+
28132 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28133 offsetof(struct kernel_vm86_struct, vm86plus) -
28134 sizeof(info.regs));
28135@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28136 int tmp;
28137 struct vm86plus_struct __user *v86;
28138
28139+#ifdef CONFIG_GRKERNSEC_VM86
28140+ if (!capable(CAP_SYS_RAWIO)) {
28141+ gr_handle_vm86();
28142+ return -EPERM;
28143+ }
28144+#endif
28145+
28146 tsk = current;
28147 switch (cmd) {
28148 case VM86_REQUEST_IRQ:
28149@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28150 tsk->thread.saved_fs = info->regs32->fs;
28151 tsk->thread.saved_gs = get_user_gs(info->regs32);
28152
28153- tss = &per_cpu(init_tss, get_cpu());
28154+ tss = init_tss + get_cpu();
28155 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28156 if (cpu_has_sep)
28157 tsk->thread.sysenter_cs = 0;
28158@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28159 goto cannot_handle;
28160 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28161 goto cannot_handle;
28162- intr_ptr = (unsigned long __user *) (i << 2);
28163+ intr_ptr = (__force unsigned long __user *) (i << 2);
28164 if (get_user(segoffs, intr_ptr))
28165 goto cannot_handle;
28166 if ((segoffs >> 16) == BIOSSEG)
28167diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28168index 49edf2d..c0d1362 100644
28169--- a/arch/x86/kernel/vmlinux.lds.S
28170+++ b/arch/x86/kernel/vmlinux.lds.S
28171@@ -26,6 +26,13 @@
28172 #include <asm/page_types.h>
28173 #include <asm/cache.h>
28174 #include <asm/boot.h>
28175+#include <asm/segment.h>
28176+
28177+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28178+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28179+#else
28180+#define __KERNEL_TEXT_OFFSET 0
28181+#endif
28182
28183 #undef i386 /* in case the preprocessor is a 32bit one */
28184
28185@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28186
28187 PHDRS {
28188 text PT_LOAD FLAGS(5); /* R_E */
28189+#ifdef CONFIG_X86_32
28190+ module PT_LOAD FLAGS(5); /* R_E */
28191+#endif
28192+#ifdef CONFIG_XEN
28193+ rodata PT_LOAD FLAGS(5); /* R_E */
28194+#else
28195+ rodata PT_LOAD FLAGS(4); /* R__ */
28196+#endif
28197 data PT_LOAD FLAGS(6); /* RW_ */
28198-#ifdef CONFIG_X86_64
28199+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28200 #ifdef CONFIG_SMP
28201 percpu PT_LOAD FLAGS(6); /* RW_ */
28202 #endif
28203+ text.init PT_LOAD FLAGS(5); /* R_E */
28204+ text.exit PT_LOAD FLAGS(5); /* R_E */
28205 init PT_LOAD FLAGS(7); /* RWE */
28206-#endif
28207 note PT_NOTE FLAGS(0); /* ___ */
28208 }
28209
28210 SECTIONS
28211 {
28212 #ifdef CONFIG_X86_32
28213- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28214- phys_startup_32 = startup_32 - LOAD_OFFSET;
28215+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28216 #else
28217- . = __START_KERNEL;
28218- phys_startup_64 = startup_64 - LOAD_OFFSET;
28219+ . = __START_KERNEL;
28220 #endif
28221
28222 /* Text and read-only data */
28223- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28224- _text = .;
28225+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28226 /* bootstrapping code */
28227+#ifdef CONFIG_X86_32
28228+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28229+#else
28230+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28231+#endif
28232+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28233+ _text = .;
28234 HEAD_TEXT
28235 . = ALIGN(8);
28236 _stext = .;
28237@@ -104,13 +124,47 @@ SECTIONS
28238 IRQENTRY_TEXT
28239 *(.fixup)
28240 *(.gnu.warning)
28241- /* End of text section */
28242- _etext = .;
28243 } :text = 0x9090
28244
28245- NOTES :text :note
28246+ . += __KERNEL_TEXT_OFFSET;
28247
28248- EXCEPTION_TABLE(16) :text = 0x9090
28249+#ifdef CONFIG_X86_32
28250+ . = ALIGN(PAGE_SIZE);
28251+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28252+
28253+#ifdef CONFIG_PAX_KERNEXEC
28254+ MODULES_EXEC_VADDR = .;
28255+ BYTE(0)
28256+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28257+ . = ALIGN(HPAGE_SIZE) - 1;
28258+ MODULES_EXEC_END = .;
28259+#endif
28260+
28261+ } :module
28262+#endif
28263+
28264+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28265+ /* End of text section */
28266+ BYTE(0)
28267+ _etext = . - __KERNEL_TEXT_OFFSET;
28268+ }
28269+
28270+#ifdef CONFIG_X86_32
28271+ . = ALIGN(PAGE_SIZE);
28272+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28273+ . = ALIGN(PAGE_SIZE);
28274+ *(.empty_zero_page)
28275+ *(.initial_pg_fixmap)
28276+ *(.initial_pg_pmd)
28277+ *(.initial_page_table)
28278+ *(.swapper_pg_dir)
28279+ } :rodata
28280+#endif
28281+
28282+ . = ALIGN(PAGE_SIZE);
28283+ NOTES :rodata :note
28284+
28285+ EXCEPTION_TABLE(16) :rodata
28286
28287 #if defined(CONFIG_DEBUG_RODATA)
28288 /* .text should occupy whole number of pages */
28289@@ -122,16 +176,20 @@ SECTIONS
28290
28291 /* Data */
28292 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28293+
28294+#ifdef CONFIG_PAX_KERNEXEC
28295+ . = ALIGN(HPAGE_SIZE);
28296+#else
28297+ . = ALIGN(PAGE_SIZE);
28298+#endif
28299+
28300 /* Start of data section */
28301 _sdata = .;
28302
28303 /* init_task */
28304 INIT_TASK_DATA(THREAD_SIZE)
28305
28306-#ifdef CONFIG_X86_32
28307- /* 32 bit has nosave before _edata */
28308 NOSAVE_DATA
28309-#endif
28310
28311 PAGE_ALIGNED_DATA(PAGE_SIZE)
28312
28313@@ -174,12 +232,19 @@ SECTIONS
28314 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28315
28316 /* Init code and data - will be freed after init */
28317- . = ALIGN(PAGE_SIZE);
28318 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28319+ BYTE(0)
28320+
28321+#ifdef CONFIG_PAX_KERNEXEC
28322+ . = ALIGN(HPAGE_SIZE);
28323+#else
28324+ . = ALIGN(PAGE_SIZE);
28325+#endif
28326+
28327 __init_begin = .; /* paired with __init_end */
28328- }
28329+ } :init.begin
28330
28331-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28332+#ifdef CONFIG_SMP
28333 /*
28334 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28335 * output PHDR, so the next output section - .init.text - should
28336@@ -188,12 +253,27 @@ SECTIONS
28337 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
28338 #endif
28339
28340- INIT_TEXT_SECTION(PAGE_SIZE)
28341-#ifdef CONFIG_X86_64
28342- :init
28343-#endif
28344+ . = ALIGN(PAGE_SIZE);
28345+ init_begin = .;
28346+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28347+ VMLINUX_SYMBOL(_sinittext) = .;
28348+ INIT_TEXT
28349+ VMLINUX_SYMBOL(_einittext) = .;
28350+ . = ALIGN(PAGE_SIZE);
28351+ } :text.init
28352
28353- INIT_DATA_SECTION(16)
28354+ /*
28355+ * .exit.text is discard at runtime, not link time, to deal with
28356+ * references from .altinstructions and .eh_frame
28357+ */
28358+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28359+ EXIT_TEXT
28360+ . = ALIGN(16);
28361+ } :text.exit
28362+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28363+
28364+ . = ALIGN(PAGE_SIZE);
28365+ INIT_DATA_SECTION(16) :init
28366
28367 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28368 __x86_cpu_dev_start = .;
28369@@ -264,19 +344,12 @@ SECTIONS
28370 }
28371
28372 . = ALIGN(8);
28373- /*
28374- * .exit.text is discard at runtime, not link time, to deal with
28375- * references from .altinstructions and .eh_frame
28376- */
28377- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28378- EXIT_TEXT
28379- }
28380
28381 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28382 EXIT_DATA
28383 }
28384
28385-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28386+#ifndef CONFIG_SMP
28387 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28388 #endif
28389
28390@@ -295,16 +368,10 @@ SECTIONS
28391 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28392 __smp_locks = .;
28393 *(.smp_locks)
28394- . = ALIGN(PAGE_SIZE);
28395 __smp_locks_end = .;
28396+ . = ALIGN(PAGE_SIZE);
28397 }
28398
28399-#ifdef CONFIG_X86_64
28400- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28401- NOSAVE_DATA
28402- }
28403-#endif
28404-
28405 /* BSS */
28406 . = ALIGN(PAGE_SIZE);
28407 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28408@@ -320,6 +387,7 @@ SECTIONS
28409 __brk_base = .;
28410 . += 64 * 1024; /* 64k alignment slop space */
28411 *(.brk_reservation) /* areas brk users have reserved */
28412+ . = ALIGN(HPAGE_SIZE);
28413 __brk_limit = .;
28414 }
28415
28416@@ -346,13 +414,12 @@ SECTIONS
28417 * for the boot processor.
28418 */
28419 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28420-INIT_PER_CPU(gdt_page);
28421 INIT_PER_CPU(irq_stack_union);
28422
28423 /*
28424 * Build-time check on the image size:
28425 */
28426-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28427+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28428 "kernel image bigger than KERNEL_IMAGE_SIZE");
28429
28430 #ifdef CONFIG_SMP
28431diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28432index 957779f..74e405c 100644
28433--- a/arch/x86/kernel/vsyscall_64.c
28434+++ b/arch/x86/kernel/vsyscall_64.c
28435@@ -54,15 +54,13 @@
28436
28437 DEFINE_VVAR(int, vgetcpu_mode);
28438
28439-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28440+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28441
28442 static int __init vsyscall_setup(char *str)
28443 {
28444 if (str) {
28445 if (!strcmp("emulate", str))
28446 vsyscall_mode = EMULATE;
28447- else if (!strcmp("native", str))
28448- vsyscall_mode = NATIVE;
28449 else if (!strcmp("none", str))
28450 vsyscall_mode = NONE;
28451 else
28452@@ -279,8 +277,7 @@ do_ret:
28453 return true;
28454
28455 sigsegv:
28456- force_sig(SIGSEGV, current);
28457- return true;
28458+ do_group_exit(SIGKILL);
28459 }
28460
28461 /*
28462@@ -331,10 +328,7 @@ void __init map_vsyscall(void)
28463 extern char __vsyscall_page;
28464 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28465
28466- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28467- vsyscall_mode == NATIVE
28468- ? PAGE_KERNEL_VSYSCALL
28469- : PAGE_KERNEL_VVAR);
28470+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28471 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28472 (unsigned long)VSYSCALL_ADDR);
28473 }
28474diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28475index 04068192..4d75aa6 100644
28476--- a/arch/x86/kernel/x8664_ksyms_64.c
28477+++ b/arch/x86/kernel/x8664_ksyms_64.c
28478@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28479 EXPORT_SYMBOL(copy_user_generic_unrolled);
28480 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28481 EXPORT_SYMBOL(__copy_user_nocache);
28482-EXPORT_SYMBOL(_copy_from_user);
28483-EXPORT_SYMBOL(_copy_to_user);
28484
28485 EXPORT_SYMBOL(copy_page);
28486 EXPORT_SYMBOL(clear_page);
28487@@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28488 EXPORT_SYMBOL(___preempt_schedule_context);
28489 #endif
28490 #endif
28491+
28492+#ifdef CONFIG_PAX_PER_CPU_PGD
28493+EXPORT_SYMBOL(cpu_pgd);
28494+#endif
28495diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28496index e48b674..a451dd9 100644
28497--- a/arch/x86/kernel/x86_init.c
28498+++ b/arch/x86/kernel/x86_init.c
28499@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28500 static void default_nmi_init(void) { };
28501 static int default_i8042_detect(void) { return 1; };
28502
28503-struct x86_platform_ops x86_platform = {
28504+struct x86_platform_ops x86_platform __read_only = {
28505 .calibrate_tsc = native_calibrate_tsc,
28506 .get_wallclock = mach_get_cmos_time,
28507 .set_wallclock = mach_set_rtc_mmss,
28508@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28509 EXPORT_SYMBOL_GPL(x86_platform);
28510
28511 #if defined(CONFIG_PCI_MSI)
28512-struct x86_msi_ops x86_msi = {
28513+struct x86_msi_ops x86_msi __read_only = {
28514 .setup_msi_irqs = native_setup_msi_irqs,
28515 .compose_msi_msg = native_compose_msi_msg,
28516 .teardown_msi_irq = native_teardown_msi_irq,
28517@@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
28518 }
28519 #endif
28520
28521-struct x86_io_apic_ops x86_io_apic_ops = {
28522+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28523 .init = native_io_apic_init_mappings,
28524 .read = native_io_apic_read,
28525 .write = native_io_apic_write,
28526diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28527index 0de1fae..298d037 100644
28528--- a/arch/x86/kernel/xsave.c
28529+++ b/arch/x86/kernel/xsave.c
28530@@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28531
28532 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28533 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28534- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28535+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28536
28537 if (!use_xsave())
28538 return err;
28539
28540- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28541+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28542
28543 /*
28544 * Read the xstate_bv which we copied (directly from the cpu or
28545 * from the state in task struct) to the user buffers.
28546 */
28547- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28548+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28549
28550 /*
28551 * For legacy compatible, we always set FP/SSE bits in the bit
28552@@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28553 */
28554 xstate_bv |= XSTATE_FPSSE;
28555
28556- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28557+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28558
28559 return err;
28560 }
28561@@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28562 {
28563 int err;
28564
28565+ buf = (struct xsave_struct __user *)____m(buf);
28566 if (use_xsave())
28567 err = xsave_user(buf);
28568 else if (use_fxsr())
28569@@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28570 */
28571 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28572 {
28573+ buf = (void __user *)____m(buf);
28574 if (use_xsave()) {
28575 if ((unsigned long)buf % 64 || fx_only) {
28576 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28577diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28578index 88f9201..0e7f1a3 100644
28579--- a/arch/x86/kvm/cpuid.c
28580+++ b/arch/x86/kvm/cpuid.c
28581@@ -175,15 +175,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28582 struct kvm_cpuid2 *cpuid,
28583 struct kvm_cpuid_entry2 __user *entries)
28584 {
28585- int r;
28586+ int r, i;
28587
28588 r = -E2BIG;
28589 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28590 goto out;
28591 r = -EFAULT;
28592- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28593- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28594+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28595 goto out;
28596+ for (i = 0; i < cpuid->nent; ++i) {
28597+ struct kvm_cpuid_entry2 cpuid_entry;
28598+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28599+ goto out;
28600+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28601+ }
28602 vcpu->arch.cpuid_nent = cpuid->nent;
28603 kvm_apic_set_version(vcpu);
28604 kvm_x86_ops->cpuid_update(vcpu);
28605@@ -196,15 +201,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28606 struct kvm_cpuid2 *cpuid,
28607 struct kvm_cpuid_entry2 __user *entries)
28608 {
28609- int r;
28610+ int r, i;
28611
28612 r = -E2BIG;
28613 if (cpuid->nent < vcpu->arch.cpuid_nent)
28614 goto out;
28615 r = -EFAULT;
28616- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28617- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28618+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28619 goto out;
28620+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28621+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28622+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28623+ goto out;
28624+ }
28625 return 0;
28626
28627 out:
28628diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28629index c7327a7..c3e2419 100644
28630--- a/arch/x86/kvm/emulate.c
28631+++ b/arch/x86/kvm/emulate.c
28632@@ -3508,7 +3508,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28633 int cr = ctxt->modrm_reg;
28634 u64 efer = 0;
28635
28636- static u64 cr_reserved_bits[] = {
28637+ static const u64 cr_reserved_bits[] = {
28638 0xffffffff00000000ULL,
28639 0, 0, 0, /* CR3 checked later */
28640 CR4_RESERVED_BITS,
28641@@ -3543,7 +3543,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28642
28643 ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
28644 if (efer & EFER_LMA)
28645- rsvd = CR3_L_MODE_RESERVED_BITS;
28646+ rsvd = CR3_L_MODE_RESERVED_BITS & ~CR3_PCID_INVD;
28647
28648 if (new_val & rsvd)
28649 return emulate_gp(ctxt, 0);
28650diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28651index b8345dd..f225d71 100644
28652--- a/arch/x86/kvm/lapic.c
28653+++ b/arch/x86/kvm/lapic.c
28654@@ -55,7 +55,7 @@
28655 #define APIC_BUS_CYCLE_NS 1
28656
28657 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28658-#define apic_debug(fmt, arg...)
28659+#define apic_debug(fmt, arg...) do {} while (0)
28660
28661 #define APIC_LVT_NUM 6
28662 /* 14 is the version for Xeon and Pentium 8.4.8*/
28663diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28664index fd49c86..77e1aa0 100644
28665--- a/arch/x86/kvm/paging_tmpl.h
28666+++ b/arch/x86/kvm/paging_tmpl.h
28667@@ -343,7 +343,7 @@ retry_walk:
28668 if (unlikely(kvm_is_error_hva(host_addr)))
28669 goto error;
28670
28671- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28672+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28673 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28674 goto error;
28675 walker->ptep_user[walker->level - 1] = ptep_user;
28676diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28677index 7527cef..c63a838e 100644
28678--- a/arch/x86/kvm/svm.c
28679+++ b/arch/x86/kvm/svm.c
28680@@ -3564,7 +3564,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28681 int cpu = raw_smp_processor_id();
28682
28683 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28684+
28685+ pax_open_kernel();
28686 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28687+ pax_close_kernel();
28688+
28689 load_TR_desc();
28690 }
28691
28692@@ -3965,6 +3969,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28693 #endif
28694 #endif
28695
28696+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28697+ __set_fs(current_thread_info()->addr_limit);
28698+#endif
28699+
28700 reload_tss(vcpu);
28701
28702 local_irq_disable();
28703diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28704index ed70394..c629a68 100644
28705--- a/arch/x86/kvm/vmx.c
28706+++ b/arch/x86/kvm/vmx.c
28707@@ -1366,12 +1366,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28708 #endif
28709 }
28710
28711-static void vmcs_clear_bits(unsigned long field, u32 mask)
28712+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28713 {
28714 vmcs_writel(field, vmcs_readl(field) & ~mask);
28715 }
28716
28717-static void vmcs_set_bits(unsigned long field, u32 mask)
28718+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28719 {
28720 vmcs_writel(field, vmcs_readl(field) | mask);
28721 }
28722@@ -1631,7 +1631,11 @@ static void reload_tss(void)
28723 struct desc_struct *descs;
28724
28725 descs = (void *)gdt->address;
28726+
28727+ pax_open_kernel();
28728 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28729+ pax_close_kernel();
28730+
28731 load_TR_desc();
28732 }
28733
28734@@ -1859,6 +1863,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28735 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28736 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28737
28738+#ifdef CONFIG_PAX_PER_CPU_PGD
28739+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28740+#endif
28741+
28742 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28743 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28744 vmx->loaded_vmcs->cpu = cpu;
28745@@ -2148,7 +2156,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28746 * reads and returns guest's timestamp counter "register"
28747 * guest_tsc = host_tsc + tsc_offset -- 21.3
28748 */
28749-static u64 guest_read_tsc(void)
28750+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28751 {
28752 u64 host_tsc, tsc_offset;
28753
28754@@ -3146,11 +3154,16 @@ static __init int hardware_setup(void)
28755 * page upon invalidation. No need to do anything if the
28756 * processor does not have the APIC_ACCESS_ADDR VMCS field.
28757 */
28758- kvm_x86_ops->set_apic_access_page_addr = NULL;
28759+ pax_open_kernel();
28760+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28761+ pax_close_kernel();
28762 }
28763
28764- if (!cpu_has_vmx_tpr_shadow())
28765- kvm_x86_ops->update_cr8_intercept = NULL;
28766+ if (!cpu_has_vmx_tpr_shadow()) {
28767+ pax_open_kernel();
28768+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28769+ pax_close_kernel();
28770+ }
28771
28772 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28773 kvm_disable_largepages();
28774@@ -3161,13 +3174,15 @@ static __init int hardware_setup(void)
28775 if (!cpu_has_vmx_apicv())
28776 enable_apicv = 0;
28777
28778+ pax_open_kernel();
28779 if (enable_apicv)
28780- kvm_x86_ops->update_cr8_intercept = NULL;
28781+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28782 else {
28783- kvm_x86_ops->hwapic_irr_update = NULL;
28784- kvm_x86_ops->deliver_posted_interrupt = NULL;
28785- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28786+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28787+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28788+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28789 }
28790+ pax_close_kernel();
28791
28792 if (nested)
28793 nested_vmx_setup_ctls_msrs();
28794@@ -4274,7 +4289,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28795 unsigned long cr4;
28796
28797 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28798+
28799+#ifndef CONFIG_PAX_PER_CPU_PGD
28800 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28801+#endif
28802
28803 /* Save the most likely value for this task's CR4 in the VMCS. */
28804 cr4 = read_cr4();
28805@@ -4301,7 +4319,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28806 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28807 vmx->host_idt_base = dt.address;
28808
28809- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28810+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28811
28812 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28813 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28814@@ -7622,6 +7640,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28815 "jmp 2f \n\t"
28816 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28817 "2: "
28818+
28819+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28820+ "ljmp %[cs],$3f\n\t"
28821+ "3: "
28822+#endif
28823+
28824 /* Save guest registers, load host registers, keep flags */
28825 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28826 "pop %0 \n\t"
28827@@ -7674,6 +7698,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28828 #endif
28829 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28830 [wordsize]"i"(sizeof(ulong))
28831+
28832+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28833+ ,[cs]"i"(__KERNEL_CS)
28834+#endif
28835+
28836 : "cc", "memory"
28837 #ifdef CONFIG_X86_64
28838 , "rax", "rbx", "rdi", "rsi"
28839@@ -7687,7 +7716,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28840 if (debugctlmsr)
28841 update_debugctlmsr(debugctlmsr);
28842
28843-#ifndef CONFIG_X86_64
28844+#ifdef CONFIG_X86_32
28845 /*
28846 * The sysexit path does not restore ds/es, so we must set them to
28847 * a reasonable value ourselves.
28848@@ -7696,8 +7725,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28849 * may be executed in interrupt context, which saves and restore segments
28850 * around it, nullifying its effect.
28851 */
28852- loadsegment(ds, __USER_DS);
28853- loadsegment(es, __USER_DS);
28854+ loadsegment(ds, __KERNEL_DS);
28855+ loadsegment(es, __KERNEL_DS);
28856+ loadsegment(ss, __KERNEL_DS);
28857+
28858+#ifdef CONFIG_PAX_KERNEXEC
28859+ loadsegment(fs, __KERNEL_PERCPU);
28860+#endif
28861+
28862+#ifdef CONFIG_PAX_MEMORY_UDEREF
28863+ __set_fs(current_thread_info()->addr_limit);
28864+#endif
28865+
28866 #endif
28867
28868 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28869diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28870index 506488c..f8df17e 100644
28871--- a/arch/x86/kvm/x86.c
28872+++ b/arch/x86/kvm/x86.c
28873@@ -732,6 +732,8 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);
28874
28875 int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
28876 {
28877+ cr3 &= ~CR3_PCID_INVD;
28878+
28879 if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) {
28880 kvm_mmu_sync_roots(vcpu);
28881 kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
28882@@ -1878,8 +1880,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28883 {
28884 struct kvm *kvm = vcpu->kvm;
28885 int lm = is_long_mode(vcpu);
28886- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28887- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28888+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28889+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28890 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28891 : kvm->arch.xen_hvm_config.blob_size_32;
28892 u32 page_num = data & ~PAGE_MASK;
28893@@ -2806,6 +2808,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28894 if (n < msr_list.nmsrs)
28895 goto out;
28896 r = -EFAULT;
28897+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28898+ goto out;
28899 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28900 num_msrs_to_save * sizeof(u32)))
28901 goto out;
28902@@ -5743,7 +5747,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28903 };
28904 #endif
28905
28906-int kvm_arch_init(void *opaque)
28907+int kvm_arch_init(const void *opaque)
28908 {
28909 int r;
28910 struct kvm_x86_ops *ops = opaque;
28911diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28912index aae9413..d11e829 100644
28913--- a/arch/x86/lguest/boot.c
28914+++ b/arch/x86/lguest/boot.c
28915@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28916 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28917 * Launcher to reboot us.
28918 */
28919-static void lguest_restart(char *reason)
28920+static __noreturn void lguest_restart(char *reason)
28921 {
28922 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28923+ BUG();
28924 }
28925
28926 /*G:050
28927diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28928index 00933d5..3a64af9 100644
28929--- a/arch/x86/lib/atomic64_386_32.S
28930+++ b/arch/x86/lib/atomic64_386_32.S
28931@@ -48,6 +48,10 @@ BEGIN(read)
28932 movl (v), %eax
28933 movl 4(v), %edx
28934 RET_ENDP
28935+BEGIN(read_unchecked)
28936+ movl (v), %eax
28937+ movl 4(v), %edx
28938+RET_ENDP
28939 #undef v
28940
28941 #define v %esi
28942@@ -55,6 +59,10 @@ BEGIN(set)
28943 movl %ebx, (v)
28944 movl %ecx, 4(v)
28945 RET_ENDP
28946+BEGIN(set_unchecked)
28947+ movl %ebx, (v)
28948+ movl %ecx, 4(v)
28949+RET_ENDP
28950 #undef v
28951
28952 #define v %esi
28953@@ -70,6 +78,20 @@ RET_ENDP
28954 BEGIN(add)
28955 addl %eax, (v)
28956 adcl %edx, 4(v)
28957+
28958+#ifdef CONFIG_PAX_REFCOUNT
28959+ jno 0f
28960+ subl %eax, (v)
28961+ sbbl %edx, 4(v)
28962+ int $4
28963+0:
28964+ _ASM_EXTABLE(0b, 0b)
28965+#endif
28966+
28967+RET_ENDP
28968+BEGIN(add_unchecked)
28969+ addl %eax, (v)
28970+ adcl %edx, 4(v)
28971 RET_ENDP
28972 #undef v
28973
28974@@ -77,6 +99,24 @@ RET_ENDP
28975 BEGIN(add_return)
28976 addl (v), %eax
28977 adcl 4(v), %edx
28978+
28979+#ifdef CONFIG_PAX_REFCOUNT
28980+ into
28981+1234:
28982+ _ASM_EXTABLE(1234b, 2f)
28983+#endif
28984+
28985+ movl %eax, (v)
28986+ movl %edx, 4(v)
28987+
28988+#ifdef CONFIG_PAX_REFCOUNT
28989+2:
28990+#endif
28991+
28992+RET_ENDP
28993+BEGIN(add_return_unchecked)
28994+ addl (v), %eax
28995+ adcl 4(v), %edx
28996 movl %eax, (v)
28997 movl %edx, 4(v)
28998 RET_ENDP
28999@@ -86,6 +126,20 @@ RET_ENDP
29000 BEGIN(sub)
29001 subl %eax, (v)
29002 sbbl %edx, 4(v)
29003+
29004+#ifdef CONFIG_PAX_REFCOUNT
29005+ jno 0f
29006+ addl %eax, (v)
29007+ adcl %edx, 4(v)
29008+ int $4
29009+0:
29010+ _ASM_EXTABLE(0b, 0b)
29011+#endif
29012+
29013+RET_ENDP
29014+BEGIN(sub_unchecked)
29015+ subl %eax, (v)
29016+ sbbl %edx, 4(v)
29017 RET_ENDP
29018 #undef v
29019
29020@@ -96,6 +150,27 @@ BEGIN(sub_return)
29021 sbbl $0, %edx
29022 addl (v), %eax
29023 adcl 4(v), %edx
29024+
29025+#ifdef CONFIG_PAX_REFCOUNT
29026+ into
29027+1234:
29028+ _ASM_EXTABLE(1234b, 2f)
29029+#endif
29030+
29031+ movl %eax, (v)
29032+ movl %edx, 4(v)
29033+
29034+#ifdef CONFIG_PAX_REFCOUNT
29035+2:
29036+#endif
29037+
29038+RET_ENDP
29039+BEGIN(sub_return_unchecked)
29040+ negl %edx
29041+ negl %eax
29042+ sbbl $0, %edx
29043+ addl (v), %eax
29044+ adcl 4(v), %edx
29045 movl %eax, (v)
29046 movl %edx, 4(v)
29047 RET_ENDP
29048@@ -105,6 +180,20 @@ RET_ENDP
29049 BEGIN(inc)
29050 addl $1, (v)
29051 adcl $0, 4(v)
29052+
29053+#ifdef CONFIG_PAX_REFCOUNT
29054+ jno 0f
29055+ subl $1, (v)
29056+ sbbl $0, 4(v)
29057+ int $4
29058+0:
29059+ _ASM_EXTABLE(0b, 0b)
29060+#endif
29061+
29062+RET_ENDP
29063+BEGIN(inc_unchecked)
29064+ addl $1, (v)
29065+ adcl $0, 4(v)
29066 RET_ENDP
29067 #undef v
29068
29069@@ -114,6 +203,26 @@ BEGIN(inc_return)
29070 movl 4(v), %edx
29071 addl $1, %eax
29072 adcl $0, %edx
29073+
29074+#ifdef CONFIG_PAX_REFCOUNT
29075+ into
29076+1234:
29077+ _ASM_EXTABLE(1234b, 2f)
29078+#endif
29079+
29080+ movl %eax, (v)
29081+ movl %edx, 4(v)
29082+
29083+#ifdef CONFIG_PAX_REFCOUNT
29084+2:
29085+#endif
29086+
29087+RET_ENDP
29088+BEGIN(inc_return_unchecked)
29089+ movl (v), %eax
29090+ movl 4(v), %edx
29091+ addl $1, %eax
29092+ adcl $0, %edx
29093 movl %eax, (v)
29094 movl %edx, 4(v)
29095 RET_ENDP
29096@@ -123,6 +232,20 @@ RET_ENDP
29097 BEGIN(dec)
29098 subl $1, (v)
29099 sbbl $0, 4(v)
29100+
29101+#ifdef CONFIG_PAX_REFCOUNT
29102+ jno 0f
29103+ addl $1, (v)
29104+ adcl $0, 4(v)
29105+ int $4
29106+0:
29107+ _ASM_EXTABLE(0b, 0b)
29108+#endif
29109+
29110+RET_ENDP
29111+BEGIN(dec_unchecked)
29112+ subl $1, (v)
29113+ sbbl $0, 4(v)
29114 RET_ENDP
29115 #undef v
29116
29117@@ -132,6 +255,26 @@ BEGIN(dec_return)
29118 movl 4(v), %edx
29119 subl $1, %eax
29120 sbbl $0, %edx
29121+
29122+#ifdef CONFIG_PAX_REFCOUNT
29123+ into
29124+1234:
29125+ _ASM_EXTABLE(1234b, 2f)
29126+#endif
29127+
29128+ movl %eax, (v)
29129+ movl %edx, 4(v)
29130+
29131+#ifdef CONFIG_PAX_REFCOUNT
29132+2:
29133+#endif
29134+
29135+RET_ENDP
29136+BEGIN(dec_return_unchecked)
29137+ movl (v), %eax
29138+ movl 4(v), %edx
29139+ subl $1, %eax
29140+ sbbl $0, %edx
29141 movl %eax, (v)
29142 movl %edx, 4(v)
29143 RET_ENDP
29144@@ -143,6 +286,13 @@ BEGIN(add_unless)
29145 adcl %edx, %edi
29146 addl (v), %eax
29147 adcl 4(v), %edx
29148+
29149+#ifdef CONFIG_PAX_REFCOUNT
29150+ into
29151+1234:
29152+ _ASM_EXTABLE(1234b, 2f)
29153+#endif
29154+
29155 cmpl %eax, %ecx
29156 je 3f
29157 1:
29158@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29159 1:
29160 addl $1, %eax
29161 adcl $0, %edx
29162+
29163+#ifdef CONFIG_PAX_REFCOUNT
29164+ into
29165+1234:
29166+ _ASM_EXTABLE(1234b, 2f)
29167+#endif
29168+
29169 movl %eax, (v)
29170 movl %edx, 4(v)
29171 movl $1, %eax
29172@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29173 movl 4(v), %edx
29174 subl $1, %eax
29175 sbbl $0, %edx
29176+
29177+#ifdef CONFIG_PAX_REFCOUNT
29178+ into
29179+1234:
29180+ _ASM_EXTABLE(1234b, 1f)
29181+#endif
29182+
29183 js 1f
29184 movl %eax, (v)
29185 movl %edx, 4(v)
29186diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29187index f5cc9eb..51fa319 100644
29188--- a/arch/x86/lib/atomic64_cx8_32.S
29189+++ b/arch/x86/lib/atomic64_cx8_32.S
29190@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29191 CFI_STARTPROC
29192
29193 read64 %ecx
29194+ pax_force_retaddr
29195 ret
29196 CFI_ENDPROC
29197 ENDPROC(atomic64_read_cx8)
29198
29199+ENTRY(atomic64_read_unchecked_cx8)
29200+ CFI_STARTPROC
29201+
29202+ read64 %ecx
29203+ pax_force_retaddr
29204+ ret
29205+ CFI_ENDPROC
29206+ENDPROC(atomic64_read_unchecked_cx8)
29207+
29208 ENTRY(atomic64_set_cx8)
29209 CFI_STARTPROC
29210
29211@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29212 cmpxchg8b (%esi)
29213 jne 1b
29214
29215+ pax_force_retaddr
29216 ret
29217 CFI_ENDPROC
29218 ENDPROC(atomic64_set_cx8)
29219
29220+ENTRY(atomic64_set_unchecked_cx8)
29221+ CFI_STARTPROC
29222+
29223+1:
29224+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29225+ * are atomic on 586 and newer */
29226+ cmpxchg8b (%esi)
29227+ jne 1b
29228+
29229+ pax_force_retaddr
29230+ ret
29231+ CFI_ENDPROC
29232+ENDPROC(atomic64_set_unchecked_cx8)
29233+
29234 ENTRY(atomic64_xchg_cx8)
29235 CFI_STARTPROC
29236
29237@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29238 cmpxchg8b (%esi)
29239 jne 1b
29240
29241+ pax_force_retaddr
29242 ret
29243 CFI_ENDPROC
29244 ENDPROC(atomic64_xchg_cx8)
29245
29246-.macro addsub_return func ins insc
29247-ENTRY(atomic64_\func\()_return_cx8)
29248+.macro addsub_return func ins insc unchecked=""
29249+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29250 CFI_STARTPROC
29251 SAVE ebp
29252 SAVE ebx
29253@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29254 movl %edx, %ecx
29255 \ins\()l %esi, %ebx
29256 \insc\()l %edi, %ecx
29257+
29258+.ifb \unchecked
29259+#ifdef CONFIG_PAX_REFCOUNT
29260+ into
29261+2:
29262+ _ASM_EXTABLE(2b, 3f)
29263+#endif
29264+.endif
29265+
29266 LOCK_PREFIX
29267 cmpxchg8b (%ebp)
29268 jne 1b
29269-
29270-10:
29271 movl %ebx, %eax
29272 movl %ecx, %edx
29273+
29274+.ifb \unchecked
29275+#ifdef CONFIG_PAX_REFCOUNT
29276+3:
29277+#endif
29278+.endif
29279+
29280 RESTORE edi
29281 RESTORE esi
29282 RESTORE ebx
29283 RESTORE ebp
29284+ pax_force_retaddr
29285 ret
29286 CFI_ENDPROC
29287-ENDPROC(atomic64_\func\()_return_cx8)
29288+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29289 .endm
29290
29291 addsub_return add add adc
29292 addsub_return sub sub sbb
29293+addsub_return add add adc _unchecked
29294+addsub_return sub sub sbb _unchecked
29295
29296-.macro incdec_return func ins insc
29297-ENTRY(atomic64_\func\()_return_cx8)
29298+.macro incdec_return func ins insc unchecked=""
29299+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29300 CFI_STARTPROC
29301 SAVE ebx
29302
29303@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29304 movl %edx, %ecx
29305 \ins\()l $1, %ebx
29306 \insc\()l $0, %ecx
29307+
29308+.ifb \unchecked
29309+#ifdef CONFIG_PAX_REFCOUNT
29310+ into
29311+2:
29312+ _ASM_EXTABLE(2b, 3f)
29313+#endif
29314+.endif
29315+
29316 LOCK_PREFIX
29317 cmpxchg8b (%esi)
29318 jne 1b
29319
29320-10:
29321 movl %ebx, %eax
29322 movl %ecx, %edx
29323+
29324+.ifb \unchecked
29325+#ifdef CONFIG_PAX_REFCOUNT
29326+3:
29327+#endif
29328+.endif
29329+
29330 RESTORE ebx
29331+ pax_force_retaddr
29332 ret
29333 CFI_ENDPROC
29334-ENDPROC(atomic64_\func\()_return_cx8)
29335+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29336 .endm
29337
29338 incdec_return inc add adc
29339 incdec_return dec sub sbb
29340+incdec_return inc add adc _unchecked
29341+incdec_return dec sub sbb _unchecked
29342
29343 ENTRY(atomic64_dec_if_positive_cx8)
29344 CFI_STARTPROC
29345@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29346 movl %edx, %ecx
29347 subl $1, %ebx
29348 sbb $0, %ecx
29349+
29350+#ifdef CONFIG_PAX_REFCOUNT
29351+ into
29352+1234:
29353+ _ASM_EXTABLE(1234b, 2f)
29354+#endif
29355+
29356 js 2f
29357 LOCK_PREFIX
29358 cmpxchg8b (%esi)
29359@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29360 movl %ebx, %eax
29361 movl %ecx, %edx
29362 RESTORE ebx
29363+ pax_force_retaddr
29364 ret
29365 CFI_ENDPROC
29366 ENDPROC(atomic64_dec_if_positive_cx8)
29367@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29368 movl %edx, %ecx
29369 addl %ebp, %ebx
29370 adcl %edi, %ecx
29371+
29372+#ifdef CONFIG_PAX_REFCOUNT
29373+ into
29374+1234:
29375+ _ASM_EXTABLE(1234b, 3f)
29376+#endif
29377+
29378 LOCK_PREFIX
29379 cmpxchg8b (%esi)
29380 jne 1b
29381@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29382 CFI_ADJUST_CFA_OFFSET -8
29383 RESTORE ebx
29384 RESTORE ebp
29385+ pax_force_retaddr
29386 ret
29387 4:
29388 cmpl %edx, 4(%esp)
29389@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29390 xorl %ecx, %ecx
29391 addl $1, %ebx
29392 adcl %edx, %ecx
29393+
29394+#ifdef CONFIG_PAX_REFCOUNT
29395+ into
29396+1234:
29397+ _ASM_EXTABLE(1234b, 3f)
29398+#endif
29399+
29400 LOCK_PREFIX
29401 cmpxchg8b (%esi)
29402 jne 1b
29403@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29404 movl $1, %eax
29405 3:
29406 RESTORE ebx
29407+ pax_force_retaddr
29408 ret
29409 CFI_ENDPROC
29410 ENDPROC(atomic64_inc_not_zero_cx8)
29411diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29412index e78b8eee..7e173a8 100644
29413--- a/arch/x86/lib/checksum_32.S
29414+++ b/arch/x86/lib/checksum_32.S
29415@@ -29,7 +29,8 @@
29416 #include <asm/dwarf2.h>
29417 #include <asm/errno.h>
29418 #include <asm/asm.h>
29419-
29420+#include <asm/segment.h>
29421+
29422 /*
29423 * computes a partial checksum, e.g. for TCP/UDP fragments
29424 */
29425@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29426
29427 #define ARGBASE 16
29428 #define FP 12
29429-
29430-ENTRY(csum_partial_copy_generic)
29431+
29432+ENTRY(csum_partial_copy_generic_to_user)
29433 CFI_STARTPROC
29434+
29435+#ifdef CONFIG_PAX_MEMORY_UDEREF
29436+ pushl_cfi %gs
29437+ popl_cfi %es
29438+ jmp csum_partial_copy_generic
29439+#endif
29440+
29441+ENTRY(csum_partial_copy_generic_from_user)
29442+
29443+#ifdef CONFIG_PAX_MEMORY_UDEREF
29444+ pushl_cfi %gs
29445+ popl_cfi %ds
29446+#endif
29447+
29448+ENTRY(csum_partial_copy_generic)
29449 subl $4,%esp
29450 CFI_ADJUST_CFA_OFFSET 4
29451 pushl_cfi %edi
29452@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29453 jmp 4f
29454 SRC(1: movw (%esi), %bx )
29455 addl $2, %esi
29456-DST( movw %bx, (%edi) )
29457+DST( movw %bx, %es:(%edi) )
29458 addl $2, %edi
29459 addw %bx, %ax
29460 adcl $0, %eax
29461@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29462 SRC(1: movl (%esi), %ebx )
29463 SRC( movl 4(%esi), %edx )
29464 adcl %ebx, %eax
29465-DST( movl %ebx, (%edi) )
29466+DST( movl %ebx, %es:(%edi) )
29467 adcl %edx, %eax
29468-DST( movl %edx, 4(%edi) )
29469+DST( movl %edx, %es:4(%edi) )
29470
29471 SRC( movl 8(%esi), %ebx )
29472 SRC( movl 12(%esi), %edx )
29473 adcl %ebx, %eax
29474-DST( movl %ebx, 8(%edi) )
29475+DST( movl %ebx, %es:8(%edi) )
29476 adcl %edx, %eax
29477-DST( movl %edx, 12(%edi) )
29478+DST( movl %edx, %es:12(%edi) )
29479
29480 SRC( movl 16(%esi), %ebx )
29481 SRC( movl 20(%esi), %edx )
29482 adcl %ebx, %eax
29483-DST( movl %ebx, 16(%edi) )
29484+DST( movl %ebx, %es:16(%edi) )
29485 adcl %edx, %eax
29486-DST( movl %edx, 20(%edi) )
29487+DST( movl %edx, %es:20(%edi) )
29488
29489 SRC( movl 24(%esi), %ebx )
29490 SRC( movl 28(%esi), %edx )
29491 adcl %ebx, %eax
29492-DST( movl %ebx, 24(%edi) )
29493+DST( movl %ebx, %es:24(%edi) )
29494 adcl %edx, %eax
29495-DST( movl %edx, 28(%edi) )
29496+DST( movl %edx, %es:28(%edi) )
29497
29498 lea 32(%esi), %esi
29499 lea 32(%edi), %edi
29500@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29501 shrl $2, %edx # This clears CF
29502 SRC(3: movl (%esi), %ebx )
29503 adcl %ebx, %eax
29504-DST( movl %ebx, (%edi) )
29505+DST( movl %ebx, %es:(%edi) )
29506 lea 4(%esi), %esi
29507 lea 4(%edi), %edi
29508 dec %edx
29509@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29510 jb 5f
29511 SRC( movw (%esi), %cx )
29512 leal 2(%esi), %esi
29513-DST( movw %cx, (%edi) )
29514+DST( movw %cx, %es:(%edi) )
29515 leal 2(%edi), %edi
29516 je 6f
29517 shll $16,%ecx
29518 SRC(5: movb (%esi), %cl )
29519-DST( movb %cl, (%edi) )
29520+DST( movb %cl, %es:(%edi) )
29521 6: addl %ecx, %eax
29522 adcl $0, %eax
29523 7:
29524@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29525
29526 6001:
29527 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29528- movl $-EFAULT, (%ebx)
29529+ movl $-EFAULT, %ss:(%ebx)
29530
29531 # zero the complete destination - computing the rest
29532 # is too much work
29533@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29534
29535 6002:
29536 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29537- movl $-EFAULT,(%ebx)
29538+ movl $-EFAULT,%ss:(%ebx)
29539 jmp 5000b
29540
29541 .previous
29542
29543+ pushl_cfi %ss
29544+ popl_cfi %ds
29545+ pushl_cfi %ss
29546+ popl_cfi %es
29547 popl_cfi %ebx
29548 CFI_RESTORE ebx
29549 popl_cfi %esi
29550@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29551 popl_cfi %ecx # equivalent to addl $4,%esp
29552 ret
29553 CFI_ENDPROC
29554-ENDPROC(csum_partial_copy_generic)
29555+ENDPROC(csum_partial_copy_generic_to_user)
29556
29557 #else
29558
29559 /* Version for PentiumII/PPro */
29560
29561 #define ROUND1(x) \
29562+ nop; nop; nop; \
29563 SRC(movl x(%esi), %ebx ) ; \
29564 addl %ebx, %eax ; \
29565- DST(movl %ebx, x(%edi) ) ;
29566+ DST(movl %ebx, %es:x(%edi)) ;
29567
29568 #define ROUND(x) \
29569+ nop; nop; nop; \
29570 SRC(movl x(%esi), %ebx ) ; \
29571 adcl %ebx, %eax ; \
29572- DST(movl %ebx, x(%edi) ) ;
29573+ DST(movl %ebx, %es:x(%edi)) ;
29574
29575 #define ARGBASE 12
29576-
29577-ENTRY(csum_partial_copy_generic)
29578+
29579+ENTRY(csum_partial_copy_generic_to_user)
29580 CFI_STARTPROC
29581+
29582+#ifdef CONFIG_PAX_MEMORY_UDEREF
29583+ pushl_cfi %gs
29584+ popl_cfi %es
29585+ jmp csum_partial_copy_generic
29586+#endif
29587+
29588+ENTRY(csum_partial_copy_generic_from_user)
29589+
29590+#ifdef CONFIG_PAX_MEMORY_UDEREF
29591+ pushl_cfi %gs
29592+ popl_cfi %ds
29593+#endif
29594+
29595+ENTRY(csum_partial_copy_generic)
29596 pushl_cfi %ebx
29597 CFI_REL_OFFSET ebx, 0
29598 pushl_cfi %edi
29599@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29600 subl %ebx, %edi
29601 lea -1(%esi),%edx
29602 andl $-32,%edx
29603- lea 3f(%ebx,%ebx), %ebx
29604+ lea 3f(%ebx,%ebx,2), %ebx
29605 testl %esi, %esi
29606 jmp *%ebx
29607 1: addl $64,%esi
29608@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29609 jb 5f
29610 SRC( movw (%esi), %dx )
29611 leal 2(%esi), %esi
29612-DST( movw %dx, (%edi) )
29613+DST( movw %dx, %es:(%edi) )
29614 leal 2(%edi), %edi
29615 je 6f
29616 shll $16,%edx
29617 5:
29618 SRC( movb (%esi), %dl )
29619-DST( movb %dl, (%edi) )
29620+DST( movb %dl, %es:(%edi) )
29621 6: addl %edx, %eax
29622 adcl $0, %eax
29623 7:
29624 .section .fixup, "ax"
29625 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29626- movl $-EFAULT, (%ebx)
29627+ movl $-EFAULT, %ss:(%ebx)
29628 # zero the complete destination (computing the rest is too much work)
29629 movl ARGBASE+8(%esp),%edi # dst
29630 movl ARGBASE+12(%esp),%ecx # len
29631@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29632 rep; stosb
29633 jmp 7b
29634 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29635- movl $-EFAULT, (%ebx)
29636+ movl $-EFAULT, %ss:(%ebx)
29637 jmp 7b
29638 .previous
29639
29640+#ifdef CONFIG_PAX_MEMORY_UDEREF
29641+ pushl_cfi %ss
29642+ popl_cfi %ds
29643+ pushl_cfi %ss
29644+ popl_cfi %es
29645+#endif
29646+
29647 popl_cfi %esi
29648 CFI_RESTORE esi
29649 popl_cfi %edi
29650@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29651 CFI_RESTORE ebx
29652 ret
29653 CFI_ENDPROC
29654-ENDPROC(csum_partial_copy_generic)
29655+ENDPROC(csum_partial_copy_generic_to_user)
29656
29657 #undef ROUND
29658 #undef ROUND1
29659diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29660index f2145cf..cea889d 100644
29661--- a/arch/x86/lib/clear_page_64.S
29662+++ b/arch/x86/lib/clear_page_64.S
29663@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29664 movl $4096/8,%ecx
29665 xorl %eax,%eax
29666 rep stosq
29667+ pax_force_retaddr
29668 ret
29669 CFI_ENDPROC
29670 ENDPROC(clear_page_c)
29671@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29672 movl $4096,%ecx
29673 xorl %eax,%eax
29674 rep stosb
29675+ pax_force_retaddr
29676 ret
29677 CFI_ENDPROC
29678 ENDPROC(clear_page_c_e)
29679@@ -43,6 +45,7 @@ ENTRY(clear_page)
29680 leaq 64(%rdi),%rdi
29681 jnz .Lloop
29682 nop
29683+ pax_force_retaddr
29684 ret
29685 CFI_ENDPROC
29686 .Lclear_page_end:
29687@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29688
29689 #include <asm/cpufeature.h>
29690
29691- .section .altinstr_replacement,"ax"
29692+ .section .altinstr_replacement,"a"
29693 1: .byte 0xeb /* jmp <disp8> */
29694 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29695 2: .byte 0xeb /* jmp <disp8> */
29696diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29697index 40a1725..5d12ac4 100644
29698--- a/arch/x86/lib/cmpxchg16b_emu.S
29699+++ b/arch/x86/lib/cmpxchg16b_emu.S
29700@@ -8,6 +8,7 @@
29701 #include <linux/linkage.h>
29702 #include <asm/dwarf2.h>
29703 #include <asm/percpu.h>
29704+#include <asm/alternative-asm.h>
29705
29706 .text
29707
29708@@ -46,12 +47,14 @@ CFI_STARTPROC
29709 CFI_REMEMBER_STATE
29710 popfq_cfi
29711 mov $1, %al
29712+ pax_force_retaddr
29713 ret
29714
29715 CFI_RESTORE_STATE
29716 .Lnot_same:
29717 popfq_cfi
29718 xor %al,%al
29719+ pax_force_retaddr
29720 ret
29721
29722 CFI_ENDPROC
29723diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29724index 176cca6..e0d658e 100644
29725--- a/arch/x86/lib/copy_page_64.S
29726+++ b/arch/x86/lib/copy_page_64.S
29727@@ -9,6 +9,7 @@ copy_page_rep:
29728 CFI_STARTPROC
29729 movl $4096/8, %ecx
29730 rep movsq
29731+ pax_force_retaddr
29732 ret
29733 CFI_ENDPROC
29734 ENDPROC(copy_page_rep)
29735@@ -24,8 +25,8 @@ ENTRY(copy_page)
29736 CFI_ADJUST_CFA_OFFSET 2*8
29737 movq %rbx, (%rsp)
29738 CFI_REL_OFFSET rbx, 0
29739- movq %r12, 1*8(%rsp)
29740- CFI_REL_OFFSET r12, 1*8
29741+ movq %r13, 1*8(%rsp)
29742+ CFI_REL_OFFSET r13, 1*8
29743
29744 movl $(4096/64)-5, %ecx
29745 .p2align 4
29746@@ -38,7 +39,7 @@ ENTRY(copy_page)
29747 movq 0x8*4(%rsi), %r9
29748 movq 0x8*5(%rsi), %r10
29749 movq 0x8*6(%rsi), %r11
29750- movq 0x8*7(%rsi), %r12
29751+ movq 0x8*7(%rsi), %r13
29752
29753 prefetcht0 5*64(%rsi)
29754
29755@@ -49,7 +50,7 @@ ENTRY(copy_page)
29756 movq %r9, 0x8*4(%rdi)
29757 movq %r10, 0x8*5(%rdi)
29758 movq %r11, 0x8*6(%rdi)
29759- movq %r12, 0x8*7(%rdi)
29760+ movq %r13, 0x8*7(%rdi)
29761
29762 leaq 64 (%rsi), %rsi
29763 leaq 64 (%rdi), %rdi
29764@@ -68,7 +69,7 @@ ENTRY(copy_page)
29765 movq 0x8*4(%rsi), %r9
29766 movq 0x8*5(%rsi), %r10
29767 movq 0x8*6(%rsi), %r11
29768- movq 0x8*7(%rsi), %r12
29769+ movq 0x8*7(%rsi), %r13
29770
29771 movq %rax, 0x8*0(%rdi)
29772 movq %rbx, 0x8*1(%rdi)
29773@@ -77,7 +78,7 @@ ENTRY(copy_page)
29774 movq %r9, 0x8*4(%rdi)
29775 movq %r10, 0x8*5(%rdi)
29776 movq %r11, 0x8*6(%rdi)
29777- movq %r12, 0x8*7(%rdi)
29778+ movq %r13, 0x8*7(%rdi)
29779
29780 leaq 64(%rdi), %rdi
29781 leaq 64(%rsi), %rsi
29782@@ -85,10 +86,11 @@ ENTRY(copy_page)
29783
29784 movq (%rsp), %rbx
29785 CFI_RESTORE rbx
29786- movq 1*8(%rsp), %r12
29787- CFI_RESTORE r12
29788+ movq 1*8(%rsp), %r13
29789+ CFI_RESTORE r13
29790 addq $2*8, %rsp
29791 CFI_ADJUST_CFA_OFFSET -2*8
29792+ pax_force_retaddr
29793 ret
29794 .Lcopy_page_end:
29795 CFI_ENDPROC
29796@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29797
29798 #include <asm/cpufeature.h>
29799
29800- .section .altinstr_replacement,"ax"
29801+ .section .altinstr_replacement,"a"
29802 1: .byte 0xeb /* jmp <disp8> */
29803 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29804 2:
29805diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29806index dee945d..a84067b 100644
29807--- a/arch/x86/lib/copy_user_64.S
29808+++ b/arch/x86/lib/copy_user_64.S
29809@@ -18,31 +18,7 @@
29810 #include <asm/alternative-asm.h>
29811 #include <asm/asm.h>
29812 #include <asm/smap.h>
29813-
29814-/*
29815- * By placing feature2 after feature1 in altinstructions section, we logically
29816- * implement:
29817- * If CPU has feature2, jmp to alt2 is used
29818- * else if CPU has feature1, jmp to alt1 is used
29819- * else jmp to orig is used.
29820- */
29821- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29822-0:
29823- .byte 0xe9 /* 32bit jump */
29824- .long \orig-1f /* by default jump to orig */
29825-1:
29826- .section .altinstr_replacement,"ax"
29827-2: .byte 0xe9 /* near jump with 32bit immediate */
29828- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29829-3: .byte 0xe9 /* near jump with 32bit immediate */
29830- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29831- .previous
29832-
29833- .section .altinstructions,"a"
29834- altinstruction_entry 0b,2b,\feature1,5,5
29835- altinstruction_entry 0b,3b,\feature2,5,5
29836- .previous
29837- .endm
29838+#include <asm/pgtable.h>
29839
29840 .macro ALIGN_DESTINATION
29841 #ifdef FIX_ALIGNMENT
29842@@ -70,52 +46,6 @@
29843 #endif
29844 .endm
29845
29846-/* Standard copy_to_user with segment limit checking */
29847-ENTRY(_copy_to_user)
29848- CFI_STARTPROC
29849- GET_THREAD_INFO(%rax)
29850- movq %rdi,%rcx
29851- addq %rdx,%rcx
29852- jc bad_to_user
29853- cmpq TI_addr_limit(%rax),%rcx
29854- ja bad_to_user
29855- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29856- copy_user_generic_unrolled,copy_user_generic_string, \
29857- copy_user_enhanced_fast_string
29858- CFI_ENDPROC
29859-ENDPROC(_copy_to_user)
29860-
29861-/* Standard copy_from_user with segment limit checking */
29862-ENTRY(_copy_from_user)
29863- CFI_STARTPROC
29864- GET_THREAD_INFO(%rax)
29865- movq %rsi,%rcx
29866- addq %rdx,%rcx
29867- jc bad_from_user
29868- cmpq TI_addr_limit(%rax),%rcx
29869- ja bad_from_user
29870- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29871- copy_user_generic_unrolled,copy_user_generic_string, \
29872- copy_user_enhanced_fast_string
29873- CFI_ENDPROC
29874-ENDPROC(_copy_from_user)
29875-
29876- .section .fixup,"ax"
29877- /* must zero dest */
29878-ENTRY(bad_from_user)
29879-bad_from_user:
29880- CFI_STARTPROC
29881- movl %edx,%ecx
29882- xorl %eax,%eax
29883- rep
29884- stosb
29885-bad_to_user:
29886- movl %edx,%eax
29887- ret
29888- CFI_ENDPROC
29889-ENDPROC(bad_from_user)
29890- .previous
29891-
29892 /*
29893 * copy_user_generic_unrolled - memory copy with exception handling.
29894 * This version is for CPUs like P4 that don't have efficient micro
29895@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29896 */
29897 ENTRY(copy_user_generic_unrolled)
29898 CFI_STARTPROC
29899+ ASM_PAX_OPEN_USERLAND
29900 ASM_STAC
29901 cmpl $8,%edx
29902 jb 20f /* less then 8 bytes, go to byte copy loop */
29903@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29904 jnz 21b
29905 23: xor %eax,%eax
29906 ASM_CLAC
29907+ ASM_PAX_CLOSE_USERLAND
29908+ pax_force_retaddr
29909 ret
29910
29911 .section .fixup,"ax"
29912@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29913 */
29914 ENTRY(copy_user_generic_string)
29915 CFI_STARTPROC
29916+ ASM_PAX_OPEN_USERLAND
29917 ASM_STAC
29918 cmpl $8,%edx
29919 jb 2f /* less than 8 bytes, go to byte copy loop */
29920@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29921 movsb
29922 xorl %eax,%eax
29923 ASM_CLAC
29924+ ASM_PAX_CLOSE_USERLAND
29925+ pax_force_retaddr
29926 ret
29927
29928 .section .fixup,"ax"
29929@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29930 */
29931 ENTRY(copy_user_enhanced_fast_string)
29932 CFI_STARTPROC
29933+ ASM_PAX_OPEN_USERLAND
29934 ASM_STAC
29935 movl %edx,%ecx
29936 1: rep
29937 movsb
29938 xorl %eax,%eax
29939 ASM_CLAC
29940+ ASM_PAX_CLOSE_USERLAND
29941+ pax_force_retaddr
29942 ret
29943
29944 .section .fixup,"ax"
29945diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29946index 6a4f43c..c70fb52 100644
29947--- a/arch/x86/lib/copy_user_nocache_64.S
29948+++ b/arch/x86/lib/copy_user_nocache_64.S
29949@@ -8,6 +8,7 @@
29950
29951 #include <linux/linkage.h>
29952 #include <asm/dwarf2.h>
29953+#include <asm/alternative-asm.h>
29954
29955 #define FIX_ALIGNMENT 1
29956
29957@@ -16,6 +17,7 @@
29958 #include <asm/thread_info.h>
29959 #include <asm/asm.h>
29960 #include <asm/smap.h>
29961+#include <asm/pgtable.h>
29962
29963 .macro ALIGN_DESTINATION
29964 #ifdef FIX_ALIGNMENT
29965@@ -49,6 +51,16 @@
29966 */
29967 ENTRY(__copy_user_nocache)
29968 CFI_STARTPROC
29969+
29970+#ifdef CONFIG_PAX_MEMORY_UDEREF
29971+ mov pax_user_shadow_base,%rcx
29972+ cmp %rcx,%rsi
29973+ jae 1f
29974+ add %rcx,%rsi
29975+1:
29976+#endif
29977+
29978+ ASM_PAX_OPEN_USERLAND
29979 ASM_STAC
29980 cmpl $8,%edx
29981 jb 20f /* less then 8 bytes, go to byte copy loop */
29982@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
29983 jnz 21b
29984 23: xorl %eax,%eax
29985 ASM_CLAC
29986+ ASM_PAX_CLOSE_USERLAND
29987 sfence
29988+ pax_force_retaddr
29989 ret
29990
29991 .section .fixup,"ax"
29992diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
29993index 2419d5f..fe52d0e 100644
29994--- a/arch/x86/lib/csum-copy_64.S
29995+++ b/arch/x86/lib/csum-copy_64.S
29996@@ -9,6 +9,7 @@
29997 #include <asm/dwarf2.h>
29998 #include <asm/errno.h>
29999 #include <asm/asm.h>
30000+#include <asm/alternative-asm.h>
30001
30002 /*
30003 * Checksum copy with exception handling.
30004@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30005 CFI_ADJUST_CFA_OFFSET 7*8
30006 movq %rbx, 2*8(%rsp)
30007 CFI_REL_OFFSET rbx, 2*8
30008- movq %r12, 3*8(%rsp)
30009- CFI_REL_OFFSET r12, 3*8
30010+ movq %r15, 3*8(%rsp)
30011+ CFI_REL_OFFSET r15, 3*8
30012 movq %r14, 4*8(%rsp)
30013 CFI_REL_OFFSET r14, 4*8
30014 movq %r13, 5*8(%rsp)
30015@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30016 movl %edx, %ecx
30017
30018 xorl %r9d, %r9d
30019- movq %rcx, %r12
30020+ movq %rcx, %r15
30021
30022- shrq $6, %r12
30023+ shrq $6, %r15
30024 jz .Lhandle_tail /* < 64 */
30025
30026 clc
30027
30028 /* main loop. clear in 64 byte blocks */
30029 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30030- /* r11: temp3, rdx: temp4, r12 loopcnt */
30031+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30032 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30033 .p2align 4
30034 .Lloop:
30035@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30036 adcq %r14, %rax
30037 adcq %r13, %rax
30038
30039- decl %r12d
30040+ decl %r15d
30041
30042 dest
30043 movq %rbx, (%rsi)
30044@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30045 .Lende:
30046 movq 2*8(%rsp), %rbx
30047 CFI_RESTORE rbx
30048- movq 3*8(%rsp), %r12
30049- CFI_RESTORE r12
30050+ movq 3*8(%rsp), %r15
30051+ CFI_RESTORE r15
30052 movq 4*8(%rsp), %r14
30053 CFI_RESTORE r14
30054 movq 5*8(%rsp), %r13
30055@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30056 CFI_RESTORE rbp
30057 addq $7*8, %rsp
30058 CFI_ADJUST_CFA_OFFSET -7*8
30059+ pax_force_retaddr
30060 ret
30061 CFI_RESTORE_STATE
30062
30063diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30064index 1318f75..44c30fd 100644
30065--- a/arch/x86/lib/csum-wrappers_64.c
30066+++ b/arch/x86/lib/csum-wrappers_64.c
30067@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30068 len -= 2;
30069 }
30070 }
30071+ pax_open_userland();
30072 stac();
30073- isum = csum_partial_copy_generic((__force const void *)src,
30074+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30075 dst, len, isum, errp, NULL);
30076 clac();
30077+ pax_close_userland();
30078 if (unlikely(*errp))
30079 goto out_err;
30080
30081@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30082 }
30083
30084 *errp = 0;
30085+ pax_open_userland();
30086 stac();
30087- ret = csum_partial_copy_generic(src, (void __force *)dst,
30088+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30089 len, isum, NULL, errp);
30090 clac();
30091+ pax_close_userland();
30092 return ret;
30093 }
30094 EXPORT_SYMBOL(csum_partial_copy_to_user);
30095diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30096index a451235..1daa956 100644
30097--- a/arch/x86/lib/getuser.S
30098+++ b/arch/x86/lib/getuser.S
30099@@ -33,17 +33,40 @@
30100 #include <asm/thread_info.h>
30101 #include <asm/asm.h>
30102 #include <asm/smap.h>
30103+#include <asm/segment.h>
30104+#include <asm/pgtable.h>
30105+#include <asm/alternative-asm.h>
30106+
30107+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30108+#define __copyuser_seg gs;
30109+#else
30110+#define __copyuser_seg
30111+#endif
30112
30113 .text
30114 ENTRY(__get_user_1)
30115 CFI_STARTPROC
30116+
30117+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30118 GET_THREAD_INFO(%_ASM_DX)
30119 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30120 jae bad_get_user
30121 ASM_STAC
30122-1: movzbl (%_ASM_AX),%edx
30123+
30124+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30125+ mov pax_user_shadow_base,%_ASM_DX
30126+ cmp %_ASM_DX,%_ASM_AX
30127+ jae 1234f
30128+ add %_ASM_DX,%_ASM_AX
30129+1234:
30130+#endif
30131+
30132+#endif
30133+
30134+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30135 xor %eax,%eax
30136 ASM_CLAC
30137+ pax_force_retaddr
30138 ret
30139 CFI_ENDPROC
30140 ENDPROC(__get_user_1)
30141@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30142 ENTRY(__get_user_2)
30143 CFI_STARTPROC
30144 add $1,%_ASM_AX
30145+
30146+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30147 jc bad_get_user
30148 GET_THREAD_INFO(%_ASM_DX)
30149 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30150 jae bad_get_user
30151 ASM_STAC
30152-2: movzwl -1(%_ASM_AX),%edx
30153+
30154+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30155+ mov pax_user_shadow_base,%_ASM_DX
30156+ cmp %_ASM_DX,%_ASM_AX
30157+ jae 1234f
30158+ add %_ASM_DX,%_ASM_AX
30159+1234:
30160+#endif
30161+
30162+#endif
30163+
30164+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30165 xor %eax,%eax
30166 ASM_CLAC
30167+ pax_force_retaddr
30168 ret
30169 CFI_ENDPROC
30170 ENDPROC(__get_user_2)
30171@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30172 ENTRY(__get_user_4)
30173 CFI_STARTPROC
30174 add $3,%_ASM_AX
30175+
30176+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30177 jc bad_get_user
30178 GET_THREAD_INFO(%_ASM_DX)
30179 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30180 jae bad_get_user
30181 ASM_STAC
30182-3: movl -3(%_ASM_AX),%edx
30183+
30184+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30185+ mov pax_user_shadow_base,%_ASM_DX
30186+ cmp %_ASM_DX,%_ASM_AX
30187+ jae 1234f
30188+ add %_ASM_DX,%_ASM_AX
30189+1234:
30190+#endif
30191+
30192+#endif
30193+
30194+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30195 xor %eax,%eax
30196 ASM_CLAC
30197+ pax_force_retaddr
30198 ret
30199 CFI_ENDPROC
30200 ENDPROC(__get_user_4)
30201@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30202 GET_THREAD_INFO(%_ASM_DX)
30203 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30204 jae bad_get_user
30205+
30206+#ifdef CONFIG_PAX_MEMORY_UDEREF
30207+ mov pax_user_shadow_base,%_ASM_DX
30208+ cmp %_ASM_DX,%_ASM_AX
30209+ jae 1234f
30210+ add %_ASM_DX,%_ASM_AX
30211+1234:
30212+#endif
30213+
30214 ASM_STAC
30215 4: movq -7(%_ASM_AX),%rdx
30216 xor %eax,%eax
30217 ASM_CLAC
30218+ pax_force_retaddr
30219 ret
30220 #else
30221 add $7,%_ASM_AX
30222@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30223 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30224 jae bad_get_user_8
30225 ASM_STAC
30226-4: movl -7(%_ASM_AX),%edx
30227-5: movl -3(%_ASM_AX),%ecx
30228+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30229+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30230 xor %eax,%eax
30231 ASM_CLAC
30232+ pax_force_retaddr
30233 ret
30234 #endif
30235 CFI_ENDPROC
30236@@ -113,6 +175,7 @@ bad_get_user:
30237 xor %edx,%edx
30238 mov $(-EFAULT),%_ASM_AX
30239 ASM_CLAC
30240+ pax_force_retaddr
30241 ret
30242 CFI_ENDPROC
30243 END(bad_get_user)
30244@@ -124,6 +187,7 @@ bad_get_user_8:
30245 xor %ecx,%ecx
30246 mov $(-EFAULT),%_ASM_AX
30247 ASM_CLAC
30248+ pax_force_retaddr
30249 ret
30250 CFI_ENDPROC
30251 END(bad_get_user_8)
30252diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30253index 54fcffe..7be149e 100644
30254--- a/arch/x86/lib/insn.c
30255+++ b/arch/x86/lib/insn.c
30256@@ -20,8 +20,10 @@
30257
30258 #ifdef __KERNEL__
30259 #include <linux/string.h>
30260+#include <asm/pgtable_types.h>
30261 #else
30262 #include <string.h>
30263+#define ktla_ktva(addr) addr
30264 #endif
30265 #include <asm/inat.h>
30266 #include <asm/insn.h>
30267@@ -53,8 +55,8 @@
30268 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
30269 {
30270 memset(insn, 0, sizeof(*insn));
30271- insn->kaddr = kaddr;
30272- insn->next_byte = kaddr;
30273+ insn->kaddr = ktla_ktva(kaddr);
30274+ insn->next_byte = ktla_ktva(kaddr);
30275 insn->x86_64 = x86_64 ? 1 : 0;
30276 insn->opnd_bytes = 4;
30277 if (x86_64)
30278diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30279index 05a95e7..326f2fa 100644
30280--- a/arch/x86/lib/iomap_copy_64.S
30281+++ b/arch/x86/lib/iomap_copy_64.S
30282@@ -17,6 +17,7 @@
30283
30284 #include <linux/linkage.h>
30285 #include <asm/dwarf2.h>
30286+#include <asm/alternative-asm.h>
30287
30288 /*
30289 * override generic version in lib/iomap_copy.c
30290@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30291 CFI_STARTPROC
30292 movl %edx,%ecx
30293 rep movsd
30294+ pax_force_retaddr
30295 ret
30296 CFI_ENDPROC
30297 ENDPROC(__iowrite32_copy)
30298diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30299index 56313a3..0db417e 100644
30300--- a/arch/x86/lib/memcpy_64.S
30301+++ b/arch/x86/lib/memcpy_64.S
30302@@ -24,7 +24,7 @@
30303 * This gets patched over the unrolled variant (below) via the
30304 * alternative instructions framework:
30305 */
30306- .section .altinstr_replacement, "ax", @progbits
30307+ .section .altinstr_replacement, "a", @progbits
30308 .Lmemcpy_c:
30309 movq %rdi, %rax
30310 movq %rdx, %rcx
30311@@ -33,6 +33,7 @@
30312 rep movsq
30313 movl %edx, %ecx
30314 rep movsb
30315+ pax_force_retaddr
30316 ret
30317 .Lmemcpy_e:
30318 .previous
30319@@ -44,11 +45,12 @@
30320 * This gets patched over the unrolled variant (below) via the
30321 * alternative instructions framework:
30322 */
30323- .section .altinstr_replacement, "ax", @progbits
30324+ .section .altinstr_replacement, "a", @progbits
30325 .Lmemcpy_c_e:
30326 movq %rdi, %rax
30327 movq %rdx, %rcx
30328 rep movsb
30329+ pax_force_retaddr
30330 ret
30331 .Lmemcpy_e_e:
30332 .previous
30333@@ -136,6 +138,7 @@ ENTRY(memcpy)
30334 movq %r9, 1*8(%rdi)
30335 movq %r10, -2*8(%rdi, %rdx)
30336 movq %r11, -1*8(%rdi, %rdx)
30337+ pax_force_retaddr
30338 retq
30339 .p2align 4
30340 .Lless_16bytes:
30341@@ -148,6 +151,7 @@ ENTRY(memcpy)
30342 movq -1*8(%rsi, %rdx), %r9
30343 movq %r8, 0*8(%rdi)
30344 movq %r9, -1*8(%rdi, %rdx)
30345+ pax_force_retaddr
30346 retq
30347 .p2align 4
30348 .Lless_8bytes:
30349@@ -161,6 +165,7 @@ ENTRY(memcpy)
30350 movl -4(%rsi, %rdx), %r8d
30351 movl %ecx, (%rdi)
30352 movl %r8d, -4(%rdi, %rdx)
30353+ pax_force_retaddr
30354 retq
30355 .p2align 4
30356 .Lless_3bytes:
30357@@ -179,6 +184,7 @@ ENTRY(memcpy)
30358 movb %cl, (%rdi)
30359
30360 .Lend:
30361+ pax_force_retaddr
30362 retq
30363 CFI_ENDPROC
30364 ENDPROC(memcpy)
30365diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30366index 65268a6..dd1de11 100644
30367--- a/arch/x86/lib/memmove_64.S
30368+++ b/arch/x86/lib/memmove_64.S
30369@@ -202,14 +202,16 @@ ENTRY(memmove)
30370 movb (%rsi), %r11b
30371 movb %r11b, (%rdi)
30372 13:
30373+ pax_force_retaddr
30374 retq
30375 CFI_ENDPROC
30376
30377- .section .altinstr_replacement,"ax"
30378+ .section .altinstr_replacement,"a"
30379 .Lmemmove_begin_forward_efs:
30380 /* Forward moving data. */
30381 movq %rdx, %rcx
30382 rep movsb
30383+ pax_force_retaddr
30384 retq
30385 .Lmemmove_end_forward_efs:
30386 .previous
30387diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30388index 2dcb380..2eb79fe 100644
30389--- a/arch/x86/lib/memset_64.S
30390+++ b/arch/x86/lib/memset_64.S
30391@@ -16,7 +16,7 @@
30392 *
30393 * rax original destination
30394 */
30395- .section .altinstr_replacement, "ax", @progbits
30396+ .section .altinstr_replacement, "a", @progbits
30397 .Lmemset_c:
30398 movq %rdi,%r9
30399 movq %rdx,%rcx
30400@@ -30,6 +30,7 @@
30401 movl %edx,%ecx
30402 rep stosb
30403 movq %r9,%rax
30404+ pax_force_retaddr
30405 ret
30406 .Lmemset_e:
30407 .previous
30408@@ -45,13 +46,14 @@
30409 *
30410 * rax original destination
30411 */
30412- .section .altinstr_replacement, "ax", @progbits
30413+ .section .altinstr_replacement, "a", @progbits
30414 .Lmemset_c_e:
30415 movq %rdi,%r9
30416 movb %sil,%al
30417 movq %rdx,%rcx
30418 rep stosb
30419 movq %r9,%rax
30420+ pax_force_retaddr
30421 ret
30422 .Lmemset_e_e:
30423 .previous
30424@@ -118,6 +120,7 @@ ENTRY(__memset)
30425
30426 .Lende:
30427 movq %r10,%rax
30428+ pax_force_retaddr
30429 ret
30430
30431 CFI_RESTORE_STATE
30432diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30433index c9f2d9b..e7fd2c0 100644
30434--- a/arch/x86/lib/mmx_32.c
30435+++ b/arch/x86/lib/mmx_32.c
30436@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30437 {
30438 void *p;
30439 int i;
30440+ unsigned long cr0;
30441
30442 if (unlikely(in_interrupt()))
30443 return __memcpy(to, from, len);
30444@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30445 kernel_fpu_begin();
30446
30447 __asm__ __volatile__ (
30448- "1: prefetch (%0)\n" /* This set is 28 bytes */
30449- " prefetch 64(%0)\n"
30450- " prefetch 128(%0)\n"
30451- " prefetch 192(%0)\n"
30452- " prefetch 256(%0)\n"
30453+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30454+ " prefetch 64(%1)\n"
30455+ " prefetch 128(%1)\n"
30456+ " prefetch 192(%1)\n"
30457+ " prefetch 256(%1)\n"
30458 "2: \n"
30459 ".section .fixup, \"ax\"\n"
30460- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30461+ "3: \n"
30462+
30463+#ifdef CONFIG_PAX_KERNEXEC
30464+ " movl %%cr0, %0\n"
30465+ " movl %0, %%eax\n"
30466+ " andl $0xFFFEFFFF, %%eax\n"
30467+ " movl %%eax, %%cr0\n"
30468+#endif
30469+
30470+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30471+
30472+#ifdef CONFIG_PAX_KERNEXEC
30473+ " movl %0, %%cr0\n"
30474+#endif
30475+
30476 " jmp 2b\n"
30477 ".previous\n"
30478 _ASM_EXTABLE(1b, 3b)
30479- : : "r" (from));
30480+ : "=&r" (cr0) : "r" (from) : "ax");
30481
30482 for ( ; i > 5; i--) {
30483 __asm__ __volatile__ (
30484- "1: prefetch 320(%0)\n"
30485- "2: movq (%0), %%mm0\n"
30486- " movq 8(%0), %%mm1\n"
30487- " movq 16(%0), %%mm2\n"
30488- " movq 24(%0), %%mm3\n"
30489- " movq %%mm0, (%1)\n"
30490- " movq %%mm1, 8(%1)\n"
30491- " movq %%mm2, 16(%1)\n"
30492- " movq %%mm3, 24(%1)\n"
30493- " movq 32(%0), %%mm0\n"
30494- " movq 40(%0), %%mm1\n"
30495- " movq 48(%0), %%mm2\n"
30496- " movq 56(%0), %%mm3\n"
30497- " movq %%mm0, 32(%1)\n"
30498- " movq %%mm1, 40(%1)\n"
30499- " movq %%mm2, 48(%1)\n"
30500- " movq %%mm3, 56(%1)\n"
30501+ "1: prefetch 320(%1)\n"
30502+ "2: movq (%1), %%mm0\n"
30503+ " movq 8(%1), %%mm1\n"
30504+ " movq 16(%1), %%mm2\n"
30505+ " movq 24(%1), %%mm3\n"
30506+ " movq %%mm0, (%2)\n"
30507+ " movq %%mm1, 8(%2)\n"
30508+ " movq %%mm2, 16(%2)\n"
30509+ " movq %%mm3, 24(%2)\n"
30510+ " movq 32(%1), %%mm0\n"
30511+ " movq 40(%1), %%mm1\n"
30512+ " movq 48(%1), %%mm2\n"
30513+ " movq 56(%1), %%mm3\n"
30514+ " movq %%mm0, 32(%2)\n"
30515+ " movq %%mm1, 40(%2)\n"
30516+ " movq %%mm2, 48(%2)\n"
30517+ " movq %%mm3, 56(%2)\n"
30518 ".section .fixup, \"ax\"\n"
30519- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30520+ "3:\n"
30521+
30522+#ifdef CONFIG_PAX_KERNEXEC
30523+ " movl %%cr0, %0\n"
30524+ " movl %0, %%eax\n"
30525+ " andl $0xFFFEFFFF, %%eax\n"
30526+ " movl %%eax, %%cr0\n"
30527+#endif
30528+
30529+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30530+
30531+#ifdef CONFIG_PAX_KERNEXEC
30532+ " movl %0, %%cr0\n"
30533+#endif
30534+
30535 " jmp 2b\n"
30536 ".previous\n"
30537 _ASM_EXTABLE(1b, 3b)
30538- : : "r" (from), "r" (to) : "memory");
30539+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30540
30541 from += 64;
30542 to += 64;
30543@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30544 static void fast_copy_page(void *to, void *from)
30545 {
30546 int i;
30547+ unsigned long cr0;
30548
30549 kernel_fpu_begin();
30550
30551@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30552 * but that is for later. -AV
30553 */
30554 __asm__ __volatile__(
30555- "1: prefetch (%0)\n"
30556- " prefetch 64(%0)\n"
30557- " prefetch 128(%0)\n"
30558- " prefetch 192(%0)\n"
30559- " prefetch 256(%0)\n"
30560+ "1: prefetch (%1)\n"
30561+ " prefetch 64(%1)\n"
30562+ " prefetch 128(%1)\n"
30563+ " prefetch 192(%1)\n"
30564+ " prefetch 256(%1)\n"
30565 "2: \n"
30566 ".section .fixup, \"ax\"\n"
30567- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30568+ "3: \n"
30569+
30570+#ifdef CONFIG_PAX_KERNEXEC
30571+ " movl %%cr0, %0\n"
30572+ " movl %0, %%eax\n"
30573+ " andl $0xFFFEFFFF, %%eax\n"
30574+ " movl %%eax, %%cr0\n"
30575+#endif
30576+
30577+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30578+
30579+#ifdef CONFIG_PAX_KERNEXEC
30580+ " movl %0, %%cr0\n"
30581+#endif
30582+
30583 " jmp 2b\n"
30584 ".previous\n"
30585- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30586+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30587
30588 for (i = 0; i < (4096-320)/64; i++) {
30589 __asm__ __volatile__ (
30590- "1: prefetch 320(%0)\n"
30591- "2: movq (%0), %%mm0\n"
30592- " movntq %%mm0, (%1)\n"
30593- " movq 8(%0), %%mm1\n"
30594- " movntq %%mm1, 8(%1)\n"
30595- " movq 16(%0), %%mm2\n"
30596- " movntq %%mm2, 16(%1)\n"
30597- " movq 24(%0), %%mm3\n"
30598- " movntq %%mm3, 24(%1)\n"
30599- " movq 32(%0), %%mm4\n"
30600- " movntq %%mm4, 32(%1)\n"
30601- " movq 40(%0), %%mm5\n"
30602- " movntq %%mm5, 40(%1)\n"
30603- " movq 48(%0), %%mm6\n"
30604- " movntq %%mm6, 48(%1)\n"
30605- " movq 56(%0), %%mm7\n"
30606- " movntq %%mm7, 56(%1)\n"
30607+ "1: prefetch 320(%1)\n"
30608+ "2: movq (%1), %%mm0\n"
30609+ " movntq %%mm0, (%2)\n"
30610+ " movq 8(%1), %%mm1\n"
30611+ " movntq %%mm1, 8(%2)\n"
30612+ " movq 16(%1), %%mm2\n"
30613+ " movntq %%mm2, 16(%2)\n"
30614+ " movq 24(%1), %%mm3\n"
30615+ " movntq %%mm3, 24(%2)\n"
30616+ " movq 32(%1), %%mm4\n"
30617+ " movntq %%mm4, 32(%2)\n"
30618+ " movq 40(%1), %%mm5\n"
30619+ " movntq %%mm5, 40(%2)\n"
30620+ " movq 48(%1), %%mm6\n"
30621+ " movntq %%mm6, 48(%2)\n"
30622+ " movq 56(%1), %%mm7\n"
30623+ " movntq %%mm7, 56(%2)\n"
30624 ".section .fixup, \"ax\"\n"
30625- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30626+ "3:\n"
30627+
30628+#ifdef CONFIG_PAX_KERNEXEC
30629+ " movl %%cr0, %0\n"
30630+ " movl %0, %%eax\n"
30631+ " andl $0xFFFEFFFF, %%eax\n"
30632+ " movl %%eax, %%cr0\n"
30633+#endif
30634+
30635+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30636+
30637+#ifdef CONFIG_PAX_KERNEXEC
30638+ " movl %0, %%cr0\n"
30639+#endif
30640+
30641 " jmp 2b\n"
30642 ".previous\n"
30643- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30644+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30645
30646 from += 64;
30647 to += 64;
30648@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30649 static void fast_copy_page(void *to, void *from)
30650 {
30651 int i;
30652+ unsigned long cr0;
30653
30654 kernel_fpu_begin();
30655
30656 __asm__ __volatile__ (
30657- "1: prefetch (%0)\n"
30658- " prefetch 64(%0)\n"
30659- " prefetch 128(%0)\n"
30660- " prefetch 192(%0)\n"
30661- " prefetch 256(%0)\n"
30662+ "1: prefetch (%1)\n"
30663+ " prefetch 64(%1)\n"
30664+ " prefetch 128(%1)\n"
30665+ " prefetch 192(%1)\n"
30666+ " prefetch 256(%1)\n"
30667 "2: \n"
30668 ".section .fixup, \"ax\"\n"
30669- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30670+ "3: \n"
30671+
30672+#ifdef CONFIG_PAX_KERNEXEC
30673+ " movl %%cr0, %0\n"
30674+ " movl %0, %%eax\n"
30675+ " andl $0xFFFEFFFF, %%eax\n"
30676+ " movl %%eax, %%cr0\n"
30677+#endif
30678+
30679+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30680+
30681+#ifdef CONFIG_PAX_KERNEXEC
30682+ " movl %0, %%cr0\n"
30683+#endif
30684+
30685 " jmp 2b\n"
30686 ".previous\n"
30687- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30688+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30689
30690 for (i = 0; i < 4096/64; i++) {
30691 __asm__ __volatile__ (
30692- "1: prefetch 320(%0)\n"
30693- "2: movq (%0), %%mm0\n"
30694- " movq 8(%0), %%mm1\n"
30695- " movq 16(%0), %%mm2\n"
30696- " movq 24(%0), %%mm3\n"
30697- " movq %%mm0, (%1)\n"
30698- " movq %%mm1, 8(%1)\n"
30699- " movq %%mm2, 16(%1)\n"
30700- " movq %%mm3, 24(%1)\n"
30701- " movq 32(%0), %%mm0\n"
30702- " movq 40(%0), %%mm1\n"
30703- " movq 48(%0), %%mm2\n"
30704- " movq 56(%0), %%mm3\n"
30705- " movq %%mm0, 32(%1)\n"
30706- " movq %%mm1, 40(%1)\n"
30707- " movq %%mm2, 48(%1)\n"
30708- " movq %%mm3, 56(%1)\n"
30709+ "1: prefetch 320(%1)\n"
30710+ "2: movq (%1), %%mm0\n"
30711+ " movq 8(%1), %%mm1\n"
30712+ " movq 16(%1), %%mm2\n"
30713+ " movq 24(%1), %%mm3\n"
30714+ " movq %%mm0, (%2)\n"
30715+ " movq %%mm1, 8(%2)\n"
30716+ " movq %%mm2, 16(%2)\n"
30717+ " movq %%mm3, 24(%2)\n"
30718+ " movq 32(%1), %%mm0\n"
30719+ " movq 40(%1), %%mm1\n"
30720+ " movq 48(%1), %%mm2\n"
30721+ " movq 56(%1), %%mm3\n"
30722+ " movq %%mm0, 32(%2)\n"
30723+ " movq %%mm1, 40(%2)\n"
30724+ " movq %%mm2, 48(%2)\n"
30725+ " movq %%mm3, 56(%2)\n"
30726 ".section .fixup, \"ax\"\n"
30727- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30728+ "3:\n"
30729+
30730+#ifdef CONFIG_PAX_KERNEXEC
30731+ " movl %%cr0, %0\n"
30732+ " movl %0, %%eax\n"
30733+ " andl $0xFFFEFFFF, %%eax\n"
30734+ " movl %%eax, %%cr0\n"
30735+#endif
30736+
30737+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30738+
30739+#ifdef CONFIG_PAX_KERNEXEC
30740+ " movl %0, %%cr0\n"
30741+#endif
30742+
30743 " jmp 2b\n"
30744 ".previous\n"
30745 _ASM_EXTABLE(1b, 3b)
30746- : : "r" (from), "r" (to) : "memory");
30747+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30748
30749 from += 64;
30750 to += 64;
30751diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30752index f6d13ee..d789440 100644
30753--- a/arch/x86/lib/msr-reg.S
30754+++ b/arch/x86/lib/msr-reg.S
30755@@ -3,6 +3,7 @@
30756 #include <asm/dwarf2.h>
30757 #include <asm/asm.h>
30758 #include <asm/msr.h>
30759+#include <asm/alternative-asm.h>
30760
30761 #ifdef CONFIG_X86_64
30762 /*
30763@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30764 movl %edi, 28(%r10)
30765 popq_cfi %rbp
30766 popq_cfi %rbx
30767+ pax_force_retaddr
30768 ret
30769 3:
30770 CFI_RESTORE_STATE
30771diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30772index fc6ba17..d4d989d 100644
30773--- a/arch/x86/lib/putuser.S
30774+++ b/arch/x86/lib/putuser.S
30775@@ -16,7 +16,9 @@
30776 #include <asm/errno.h>
30777 #include <asm/asm.h>
30778 #include <asm/smap.h>
30779-
30780+#include <asm/segment.h>
30781+#include <asm/pgtable.h>
30782+#include <asm/alternative-asm.h>
30783
30784 /*
30785 * __put_user_X
30786@@ -30,57 +32,125 @@
30787 * as they get called from within inline assembly.
30788 */
30789
30790-#define ENTER CFI_STARTPROC ; \
30791- GET_THREAD_INFO(%_ASM_BX)
30792-#define EXIT ASM_CLAC ; \
30793- ret ; \
30794+#define ENTER CFI_STARTPROC
30795+#define EXIT ASM_CLAC ; \
30796+ pax_force_retaddr ; \
30797+ ret ; \
30798 CFI_ENDPROC
30799
30800+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30801+#define _DEST %_ASM_CX,%_ASM_BX
30802+#else
30803+#define _DEST %_ASM_CX
30804+#endif
30805+
30806+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30807+#define __copyuser_seg gs;
30808+#else
30809+#define __copyuser_seg
30810+#endif
30811+
30812 .text
30813 ENTRY(__put_user_1)
30814 ENTER
30815+
30816+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30817+ GET_THREAD_INFO(%_ASM_BX)
30818 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30819 jae bad_put_user
30820 ASM_STAC
30821-1: movb %al,(%_ASM_CX)
30822+
30823+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30824+ mov pax_user_shadow_base,%_ASM_BX
30825+ cmp %_ASM_BX,%_ASM_CX
30826+ jb 1234f
30827+ xor %ebx,%ebx
30828+1234:
30829+#endif
30830+
30831+#endif
30832+
30833+1: __copyuser_seg movb %al,(_DEST)
30834 xor %eax,%eax
30835 EXIT
30836 ENDPROC(__put_user_1)
30837
30838 ENTRY(__put_user_2)
30839 ENTER
30840+
30841+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30842+ GET_THREAD_INFO(%_ASM_BX)
30843 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30844 sub $1,%_ASM_BX
30845 cmp %_ASM_BX,%_ASM_CX
30846 jae bad_put_user
30847 ASM_STAC
30848-2: movw %ax,(%_ASM_CX)
30849+
30850+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30851+ mov pax_user_shadow_base,%_ASM_BX
30852+ cmp %_ASM_BX,%_ASM_CX
30853+ jb 1234f
30854+ xor %ebx,%ebx
30855+1234:
30856+#endif
30857+
30858+#endif
30859+
30860+2: __copyuser_seg movw %ax,(_DEST)
30861 xor %eax,%eax
30862 EXIT
30863 ENDPROC(__put_user_2)
30864
30865 ENTRY(__put_user_4)
30866 ENTER
30867+
30868+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30869+ GET_THREAD_INFO(%_ASM_BX)
30870 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30871 sub $3,%_ASM_BX
30872 cmp %_ASM_BX,%_ASM_CX
30873 jae bad_put_user
30874 ASM_STAC
30875-3: movl %eax,(%_ASM_CX)
30876+
30877+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30878+ mov pax_user_shadow_base,%_ASM_BX
30879+ cmp %_ASM_BX,%_ASM_CX
30880+ jb 1234f
30881+ xor %ebx,%ebx
30882+1234:
30883+#endif
30884+
30885+#endif
30886+
30887+3: __copyuser_seg movl %eax,(_DEST)
30888 xor %eax,%eax
30889 EXIT
30890 ENDPROC(__put_user_4)
30891
30892 ENTRY(__put_user_8)
30893 ENTER
30894+
30895+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30896+ GET_THREAD_INFO(%_ASM_BX)
30897 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30898 sub $7,%_ASM_BX
30899 cmp %_ASM_BX,%_ASM_CX
30900 jae bad_put_user
30901 ASM_STAC
30902-4: mov %_ASM_AX,(%_ASM_CX)
30903+
30904+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30905+ mov pax_user_shadow_base,%_ASM_BX
30906+ cmp %_ASM_BX,%_ASM_CX
30907+ jb 1234f
30908+ xor %ebx,%ebx
30909+1234:
30910+#endif
30911+
30912+#endif
30913+
30914+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30915 #ifdef CONFIG_X86_32
30916-5: movl %edx,4(%_ASM_CX)
30917+5: __copyuser_seg movl %edx,4(_DEST)
30918 #endif
30919 xor %eax,%eax
30920 EXIT
30921diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30922index 5dff5f0..cadebf4 100644
30923--- a/arch/x86/lib/rwsem.S
30924+++ b/arch/x86/lib/rwsem.S
30925@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30926 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30927 CFI_RESTORE __ASM_REG(dx)
30928 restore_common_regs
30929+ pax_force_retaddr
30930 ret
30931 CFI_ENDPROC
30932 ENDPROC(call_rwsem_down_read_failed)
30933@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30934 movq %rax,%rdi
30935 call rwsem_down_write_failed
30936 restore_common_regs
30937+ pax_force_retaddr
30938 ret
30939 CFI_ENDPROC
30940 ENDPROC(call_rwsem_down_write_failed)
30941@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
30942 movq %rax,%rdi
30943 call rwsem_wake
30944 restore_common_regs
30945-1: ret
30946+1: pax_force_retaddr
30947+ ret
30948 CFI_ENDPROC
30949 ENDPROC(call_rwsem_wake)
30950
30951@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
30952 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30953 CFI_RESTORE __ASM_REG(dx)
30954 restore_common_regs
30955+ pax_force_retaddr
30956 ret
30957 CFI_ENDPROC
30958 ENDPROC(call_rwsem_downgrade_wake)
30959diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30960index b30b5eb..2b57052 100644
30961--- a/arch/x86/lib/thunk_64.S
30962+++ b/arch/x86/lib/thunk_64.S
30963@@ -9,6 +9,7 @@
30964 #include <asm/dwarf2.h>
30965 #include <asm/calling.h>
30966 #include <asm/asm.h>
30967+#include <asm/alternative-asm.h>
30968
30969 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30970 .macro THUNK name, func, put_ret_addr_in_rdi=0
30971@@ -16,11 +17,11 @@
30972 \name:
30973 CFI_STARTPROC
30974
30975- /* this one pushes 9 elems, the next one would be %rIP */
30976- SAVE_ARGS
30977+ /* this one pushes 15+1 elems, the next one would be %rIP */
30978+ SAVE_ARGS 8
30979
30980 .if \put_ret_addr_in_rdi
30981- movq_cfi_restore 9*8, rdi
30982+ movq_cfi_restore RIP, rdi
30983 .endif
30984
30985 call \func
30986@@ -47,9 +48,10 @@
30987
30988 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
30989 CFI_STARTPROC
30990- SAVE_ARGS
30991+ SAVE_ARGS 8
30992 restore:
30993- RESTORE_ARGS
30994+ RESTORE_ARGS 1,8
30995+ pax_force_retaddr
30996 ret
30997 CFI_ENDPROC
30998 _ASM_NOKPROBE(restore)
30999diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31000index e2f5e21..4b22130 100644
31001--- a/arch/x86/lib/usercopy_32.c
31002+++ b/arch/x86/lib/usercopy_32.c
31003@@ -42,11 +42,13 @@ do { \
31004 int __d0; \
31005 might_fault(); \
31006 __asm__ __volatile__( \
31007+ __COPYUSER_SET_ES \
31008 ASM_STAC "\n" \
31009 "0: rep; stosl\n" \
31010 " movl %2,%0\n" \
31011 "1: rep; stosb\n" \
31012 "2: " ASM_CLAC "\n" \
31013+ __COPYUSER_RESTORE_ES \
31014 ".section .fixup,\"ax\"\n" \
31015 "3: lea 0(%2,%0,4),%0\n" \
31016 " jmp 2b\n" \
31017@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31018
31019 #ifdef CONFIG_X86_INTEL_USERCOPY
31020 static unsigned long
31021-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31022+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31023 {
31024 int d0, d1;
31025 __asm__ __volatile__(
31026@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31027 " .align 2,0x90\n"
31028 "3: movl 0(%4), %%eax\n"
31029 "4: movl 4(%4), %%edx\n"
31030- "5: movl %%eax, 0(%3)\n"
31031- "6: movl %%edx, 4(%3)\n"
31032+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31033+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31034 "7: movl 8(%4), %%eax\n"
31035 "8: movl 12(%4),%%edx\n"
31036- "9: movl %%eax, 8(%3)\n"
31037- "10: movl %%edx, 12(%3)\n"
31038+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31039+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31040 "11: movl 16(%4), %%eax\n"
31041 "12: movl 20(%4), %%edx\n"
31042- "13: movl %%eax, 16(%3)\n"
31043- "14: movl %%edx, 20(%3)\n"
31044+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31045+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31046 "15: movl 24(%4), %%eax\n"
31047 "16: movl 28(%4), %%edx\n"
31048- "17: movl %%eax, 24(%3)\n"
31049- "18: movl %%edx, 28(%3)\n"
31050+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31051+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31052 "19: movl 32(%4), %%eax\n"
31053 "20: movl 36(%4), %%edx\n"
31054- "21: movl %%eax, 32(%3)\n"
31055- "22: movl %%edx, 36(%3)\n"
31056+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31057+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31058 "23: movl 40(%4), %%eax\n"
31059 "24: movl 44(%4), %%edx\n"
31060- "25: movl %%eax, 40(%3)\n"
31061- "26: movl %%edx, 44(%3)\n"
31062+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31063+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31064 "27: movl 48(%4), %%eax\n"
31065 "28: movl 52(%4), %%edx\n"
31066- "29: movl %%eax, 48(%3)\n"
31067- "30: movl %%edx, 52(%3)\n"
31068+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31069+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31070 "31: movl 56(%4), %%eax\n"
31071 "32: movl 60(%4), %%edx\n"
31072- "33: movl %%eax, 56(%3)\n"
31073- "34: movl %%edx, 60(%3)\n"
31074+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31075+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31076 " addl $-64, %0\n"
31077 " addl $64, %4\n"
31078 " addl $64, %3\n"
31079@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31080 " shrl $2, %0\n"
31081 " andl $3, %%eax\n"
31082 " cld\n"
31083+ __COPYUSER_SET_ES
31084 "99: rep; movsl\n"
31085 "36: movl %%eax, %0\n"
31086 "37: rep; movsb\n"
31087 "100:\n"
31088+ __COPYUSER_RESTORE_ES
31089+ ".section .fixup,\"ax\"\n"
31090+ "101: lea 0(%%eax,%0,4),%0\n"
31091+ " jmp 100b\n"
31092+ ".previous\n"
31093+ _ASM_EXTABLE(1b,100b)
31094+ _ASM_EXTABLE(2b,100b)
31095+ _ASM_EXTABLE(3b,100b)
31096+ _ASM_EXTABLE(4b,100b)
31097+ _ASM_EXTABLE(5b,100b)
31098+ _ASM_EXTABLE(6b,100b)
31099+ _ASM_EXTABLE(7b,100b)
31100+ _ASM_EXTABLE(8b,100b)
31101+ _ASM_EXTABLE(9b,100b)
31102+ _ASM_EXTABLE(10b,100b)
31103+ _ASM_EXTABLE(11b,100b)
31104+ _ASM_EXTABLE(12b,100b)
31105+ _ASM_EXTABLE(13b,100b)
31106+ _ASM_EXTABLE(14b,100b)
31107+ _ASM_EXTABLE(15b,100b)
31108+ _ASM_EXTABLE(16b,100b)
31109+ _ASM_EXTABLE(17b,100b)
31110+ _ASM_EXTABLE(18b,100b)
31111+ _ASM_EXTABLE(19b,100b)
31112+ _ASM_EXTABLE(20b,100b)
31113+ _ASM_EXTABLE(21b,100b)
31114+ _ASM_EXTABLE(22b,100b)
31115+ _ASM_EXTABLE(23b,100b)
31116+ _ASM_EXTABLE(24b,100b)
31117+ _ASM_EXTABLE(25b,100b)
31118+ _ASM_EXTABLE(26b,100b)
31119+ _ASM_EXTABLE(27b,100b)
31120+ _ASM_EXTABLE(28b,100b)
31121+ _ASM_EXTABLE(29b,100b)
31122+ _ASM_EXTABLE(30b,100b)
31123+ _ASM_EXTABLE(31b,100b)
31124+ _ASM_EXTABLE(32b,100b)
31125+ _ASM_EXTABLE(33b,100b)
31126+ _ASM_EXTABLE(34b,100b)
31127+ _ASM_EXTABLE(35b,100b)
31128+ _ASM_EXTABLE(36b,100b)
31129+ _ASM_EXTABLE(37b,100b)
31130+ _ASM_EXTABLE(99b,101b)
31131+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31132+ : "1"(to), "2"(from), "0"(size)
31133+ : "eax", "edx", "memory");
31134+ return size;
31135+}
31136+
31137+static unsigned long
31138+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31139+{
31140+ int d0, d1;
31141+ __asm__ __volatile__(
31142+ " .align 2,0x90\n"
31143+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31144+ " cmpl $67, %0\n"
31145+ " jbe 3f\n"
31146+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31147+ " .align 2,0x90\n"
31148+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31149+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31150+ "5: movl %%eax, 0(%3)\n"
31151+ "6: movl %%edx, 4(%3)\n"
31152+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31153+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31154+ "9: movl %%eax, 8(%3)\n"
31155+ "10: movl %%edx, 12(%3)\n"
31156+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31157+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31158+ "13: movl %%eax, 16(%3)\n"
31159+ "14: movl %%edx, 20(%3)\n"
31160+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31161+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31162+ "17: movl %%eax, 24(%3)\n"
31163+ "18: movl %%edx, 28(%3)\n"
31164+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31165+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31166+ "21: movl %%eax, 32(%3)\n"
31167+ "22: movl %%edx, 36(%3)\n"
31168+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31169+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31170+ "25: movl %%eax, 40(%3)\n"
31171+ "26: movl %%edx, 44(%3)\n"
31172+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31173+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31174+ "29: movl %%eax, 48(%3)\n"
31175+ "30: movl %%edx, 52(%3)\n"
31176+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31177+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31178+ "33: movl %%eax, 56(%3)\n"
31179+ "34: movl %%edx, 60(%3)\n"
31180+ " addl $-64, %0\n"
31181+ " addl $64, %4\n"
31182+ " addl $64, %3\n"
31183+ " cmpl $63, %0\n"
31184+ " ja 1b\n"
31185+ "35: movl %0, %%eax\n"
31186+ " shrl $2, %0\n"
31187+ " andl $3, %%eax\n"
31188+ " cld\n"
31189+ "99: rep; "__copyuser_seg" movsl\n"
31190+ "36: movl %%eax, %0\n"
31191+ "37: rep; "__copyuser_seg" movsb\n"
31192+ "100:\n"
31193 ".section .fixup,\"ax\"\n"
31194 "101: lea 0(%%eax,%0,4),%0\n"
31195 " jmp 100b\n"
31196@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31197 int d0, d1;
31198 __asm__ __volatile__(
31199 " .align 2,0x90\n"
31200- "0: movl 32(%4), %%eax\n"
31201+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31202 " cmpl $67, %0\n"
31203 " jbe 2f\n"
31204- "1: movl 64(%4), %%eax\n"
31205+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31206 " .align 2,0x90\n"
31207- "2: movl 0(%4), %%eax\n"
31208- "21: movl 4(%4), %%edx\n"
31209+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31210+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31211 " movl %%eax, 0(%3)\n"
31212 " movl %%edx, 4(%3)\n"
31213- "3: movl 8(%4), %%eax\n"
31214- "31: movl 12(%4),%%edx\n"
31215+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31216+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31217 " movl %%eax, 8(%3)\n"
31218 " movl %%edx, 12(%3)\n"
31219- "4: movl 16(%4), %%eax\n"
31220- "41: movl 20(%4), %%edx\n"
31221+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31222+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31223 " movl %%eax, 16(%3)\n"
31224 " movl %%edx, 20(%3)\n"
31225- "10: movl 24(%4), %%eax\n"
31226- "51: movl 28(%4), %%edx\n"
31227+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31228+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31229 " movl %%eax, 24(%3)\n"
31230 " movl %%edx, 28(%3)\n"
31231- "11: movl 32(%4), %%eax\n"
31232- "61: movl 36(%4), %%edx\n"
31233+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31234+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31235 " movl %%eax, 32(%3)\n"
31236 " movl %%edx, 36(%3)\n"
31237- "12: movl 40(%4), %%eax\n"
31238- "71: movl 44(%4), %%edx\n"
31239+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31240+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31241 " movl %%eax, 40(%3)\n"
31242 " movl %%edx, 44(%3)\n"
31243- "13: movl 48(%4), %%eax\n"
31244- "81: movl 52(%4), %%edx\n"
31245+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31246+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31247 " movl %%eax, 48(%3)\n"
31248 " movl %%edx, 52(%3)\n"
31249- "14: movl 56(%4), %%eax\n"
31250- "91: movl 60(%4), %%edx\n"
31251+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31252+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31253 " movl %%eax, 56(%3)\n"
31254 " movl %%edx, 60(%3)\n"
31255 " addl $-64, %0\n"
31256@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31257 " shrl $2, %0\n"
31258 " andl $3, %%eax\n"
31259 " cld\n"
31260- "6: rep; movsl\n"
31261+ "6: rep; "__copyuser_seg" movsl\n"
31262 " movl %%eax,%0\n"
31263- "7: rep; movsb\n"
31264+ "7: rep; "__copyuser_seg" movsb\n"
31265 "8:\n"
31266 ".section .fixup,\"ax\"\n"
31267 "9: lea 0(%%eax,%0,4),%0\n"
31268@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31269
31270 __asm__ __volatile__(
31271 " .align 2,0x90\n"
31272- "0: movl 32(%4), %%eax\n"
31273+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31274 " cmpl $67, %0\n"
31275 " jbe 2f\n"
31276- "1: movl 64(%4), %%eax\n"
31277+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31278 " .align 2,0x90\n"
31279- "2: movl 0(%4), %%eax\n"
31280- "21: movl 4(%4), %%edx\n"
31281+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31282+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31283 " movnti %%eax, 0(%3)\n"
31284 " movnti %%edx, 4(%3)\n"
31285- "3: movl 8(%4), %%eax\n"
31286- "31: movl 12(%4),%%edx\n"
31287+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31288+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31289 " movnti %%eax, 8(%3)\n"
31290 " movnti %%edx, 12(%3)\n"
31291- "4: movl 16(%4), %%eax\n"
31292- "41: movl 20(%4), %%edx\n"
31293+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31294+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31295 " movnti %%eax, 16(%3)\n"
31296 " movnti %%edx, 20(%3)\n"
31297- "10: movl 24(%4), %%eax\n"
31298- "51: movl 28(%4), %%edx\n"
31299+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31300+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31301 " movnti %%eax, 24(%3)\n"
31302 " movnti %%edx, 28(%3)\n"
31303- "11: movl 32(%4), %%eax\n"
31304- "61: movl 36(%4), %%edx\n"
31305+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31306+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31307 " movnti %%eax, 32(%3)\n"
31308 " movnti %%edx, 36(%3)\n"
31309- "12: movl 40(%4), %%eax\n"
31310- "71: movl 44(%4), %%edx\n"
31311+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31312+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31313 " movnti %%eax, 40(%3)\n"
31314 " movnti %%edx, 44(%3)\n"
31315- "13: movl 48(%4), %%eax\n"
31316- "81: movl 52(%4), %%edx\n"
31317+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31318+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31319 " movnti %%eax, 48(%3)\n"
31320 " movnti %%edx, 52(%3)\n"
31321- "14: movl 56(%4), %%eax\n"
31322- "91: movl 60(%4), %%edx\n"
31323+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31324+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31325 " movnti %%eax, 56(%3)\n"
31326 " movnti %%edx, 60(%3)\n"
31327 " addl $-64, %0\n"
31328@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31329 " shrl $2, %0\n"
31330 " andl $3, %%eax\n"
31331 " cld\n"
31332- "6: rep; movsl\n"
31333+ "6: rep; "__copyuser_seg" movsl\n"
31334 " movl %%eax,%0\n"
31335- "7: rep; movsb\n"
31336+ "7: rep; "__copyuser_seg" movsb\n"
31337 "8:\n"
31338 ".section .fixup,\"ax\"\n"
31339 "9: lea 0(%%eax,%0,4),%0\n"
31340@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31341
31342 __asm__ __volatile__(
31343 " .align 2,0x90\n"
31344- "0: movl 32(%4), %%eax\n"
31345+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31346 " cmpl $67, %0\n"
31347 " jbe 2f\n"
31348- "1: movl 64(%4), %%eax\n"
31349+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31350 " .align 2,0x90\n"
31351- "2: movl 0(%4), %%eax\n"
31352- "21: movl 4(%4), %%edx\n"
31353+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31354+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31355 " movnti %%eax, 0(%3)\n"
31356 " movnti %%edx, 4(%3)\n"
31357- "3: movl 8(%4), %%eax\n"
31358- "31: movl 12(%4),%%edx\n"
31359+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31360+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31361 " movnti %%eax, 8(%3)\n"
31362 " movnti %%edx, 12(%3)\n"
31363- "4: movl 16(%4), %%eax\n"
31364- "41: movl 20(%4), %%edx\n"
31365+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31366+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31367 " movnti %%eax, 16(%3)\n"
31368 " movnti %%edx, 20(%3)\n"
31369- "10: movl 24(%4), %%eax\n"
31370- "51: movl 28(%4), %%edx\n"
31371+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31372+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31373 " movnti %%eax, 24(%3)\n"
31374 " movnti %%edx, 28(%3)\n"
31375- "11: movl 32(%4), %%eax\n"
31376- "61: movl 36(%4), %%edx\n"
31377+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31378+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31379 " movnti %%eax, 32(%3)\n"
31380 " movnti %%edx, 36(%3)\n"
31381- "12: movl 40(%4), %%eax\n"
31382- "71: movl 44(%4), %%edx\n"
31383+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31384+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31385 " movnti %%eax, 40(%3)\n"
31386 " movnti %%edx, 44(%3)\n"
31387- "13: movl 48(%4), %%eax\n"
31388- "81: movl 52(%4), %%edx\n"
31389+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31390+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31391 " movnti %%eax, 48(%3)\n"
31392 " movnti %%edx, 52(%3)\n"
31393- "14: movl 56(%4), %%eax\n"
31394- "91: movl 60(%4), %%edx\n"
31395+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31396+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31397 " movnti %%eax, 56(%3)\n"
31398 " movnti %%edx, 60(%3)\n"
31399 " addl $-64, %0\n"
31400@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31401 " shrl $2, %0\n"
31402 " andl $3, %%eax\n"
31403 " cld\n"
31404- "6: rep; movsl\n"
31405+ "6: rep; "__copyuser_seg" movsl\n"
31406 " movl %%eax,%0\n"
31407- "7: rep; movsb\n"
31408+ "7: rep; "__copyuser_seg" movsb\n"
31409 "8:\n"
31410 ".section .fixup,\"ax\"\n"
31411 "9: lea 0(%%eax,%0,4),%0\n"
31412@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31413 */
31414 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31415 unsigned long size);
31416-unsigned long __copy_user_intel(void __user *to, const void *from,
31417+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31418+ unsigned long size);
31419+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31420 unsigned long size);
31421 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31422 const void __user *from, unsigned long size);
31423 #endif /* CONFIG_X86_INTEL_USERCOPY */
31424
31425 /* Generic arbitrary sized copy. */
31426-#define __copy_user(to, from, size) \
31427+#define __copy_user(to, from, size, prefix, set, restore) \
31428 do { \
31429 int __d0, __d1, __d2; \
31430 __asm__ __volatile__( \
31431+ set \
31432 " cmp $7,%0\n" \
31433 " jbe 1f\n" \
31434 " movl %1,%0\n" \
31435 " negl %0\n" \
31436 " andl $7,%0\n" \
31437 " subl %0,%3\n" \
31438- "4: rep; movsb\n" \
31439+ "4: rep; "prefix"movsb\n" \
31440 " movl %3,%0\n" \
31441 " shrl $2,%0\n" \
31442 " andl $3,%3\n" \
31443 " .align 2,0x90\n" \
31444- "0: rep; movsl\n" \
31445+ "0: rep; "prefix"movsl\n" \
31446 " movl %3,%0\n" \
31447- "1: rep; movsb\n" \
31448+ "1: rep; "prefix"movsb\n" \
31449 "2:\n" \
31450+ restore \
31451 ".section .fixup,\"ax\"\n" \
31452 "5: addl %3,%0\n" \
31453 " jmp 2b\n" \
31454@@ -538,14 +650,14 @@ do { \
31455 " negl %0\n" \
31456 " andl $7,%0\n" \
31457 " subl %0,%3\n" \
31458- "4: rep; movsb\n" \
31459+ "4: rep; "__copyuser_seg"movsb\n" \
31460 " movl %3,%0\n" \
31461 " shrl $2,%0\n" \
31462 " andl $3,%3\n" \
31463 " .align 2,0x90\n" \
31464- "0: rep; movsl\n" \
31465+ "0: rep; "__copyuser_seg"movsl\n" \
31466 " movl %3,%0\n" \
31467- "1: rep; movsb\n" \
31468+ "1: rep; "__copyuser_seg"movsb\n" \
31469 "2:\n" \
31470 ".section .fixup,\"ax\"\n" \
31471 "5: addl %3,%0\n" \
31472@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31473 {
31474 stac();
31475 if (movsl_is_ok(to, from, n))
31476- __copy_user(to, from, n);
31477+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31478 else
31479- n = __copy_user_intel(to, from, n);
31480+ n = __generic_copy_to_user_intel(to, from, n);
31481 clac();
31482 return n;
31483 }
31484@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31485 {
31486 stac();
31487 if (movsl_is_ok(to, from, n))
31488- __copy_user(to, from, n);
31489+ __copy_user(to, from, n, __copyuser_seg, "", "");
31490 else
31491- n = __copy_user_intel((void __user *)to,
31492- (const void *)from, n);
31493+ n = __generic_copy_from_user_intel(to, from, n);
31494 clac();
31495 return n;
31496 }
31497@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31498 if (n > 64 && cpu_has_xmm2)
31499 n = __copy_user_intel_nocache(to, from, n);
31500 else
31501- __copy_user(to, from, n);
31502+ __copy_user(to, from, n, __copyuser_seg, "", "");
31503 #else
31504- __copy_user(to, from, n);
31505+ __copy_user(to, from, n, __copyuser_seg, "", "");
31506 #endif
31507 clac();
31508 return n;
31509 }
31510 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31511
31512-/**
31513- * copy_to_user: - Copy a block of data into user space.
31514- * @to: Destination address, in user space.
31515- * @from: Source address, in kernel space.
31516- * @n: Number of bytes to copy.
31517- *
31518- * Context: User context only. This function may sleep.
31519- *
31520- * Copy data from kernel space to user space.
31521- *
31522- * Returns number of bytes that could not be copied.
31523- * On success, this will be zero.
31524- */
31525-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31526+#ifdef CONFIG_PAX_MEMORY_UDEREF
31527+void __set_fs(mm_segment_t x)
31528 {
31529- if (access_ok(VERIFY_WRITE, to, n))
31530- n = __copy_to_user(to, from, n);
31531- return n;
31532+ switch (x.seg) {
31533+ case 0:
31534+ loadsegment(gs, 0);
31535+ break;
31536+ case TASK_SIZE_MAX:
31537+ loadsegment(gs, __USER_DS);
31538+ break;
31539+ case -1UL:
31540+ loadsegment(gs, __KERNEL_DS);
31541+ break;
31542+ default:
31543+ BUG();
31544+ }
31545 }
31546-EXPORT_SYMBOL(_copy_to_user);
31547+EXPORT_SYMBOL(__set_fs);
31548
31549-/**
31550- * copy_from_user: - Copy a block of data from user space.
31551- * @to: Destination address, in kernel space.
31552- * @from: Source address, in user space.
31553- * @n: Number of bytes to copy.
31554- *
31555- * Context: User context only. This function may sleep.
31556- *
31557- * Copy data from user space to kernel space.
31558- *
31559- * Returns number of bytes that could not be copied.
31560- * On success, this will be zero.
31561- *
31562- * If some data could not be copied, this function will pad the copied
31563- * data to the requested size using zero bytes.
31564- */
31565-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31566+void set_fs(mm_segment_t x)
31567 {
31568- if (access_ok(VERIFY_READ, from, n))
31569- n = __copy_from_user(to, from, n);
31570- else
31571- memset(to, 0, n);
31572- return n;
31573+ current_thread_info()->addr_limit = x;
31574+ __set_fs(x);
31575 }
31576-EXPORT_SYMBOL(_copy_from_user);
31577+EXPORT_SYMBOL(set_fs);
31578+#endif
31579diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31580index c905e89..01ab928 100644
31581--- a/arch/x86/lib/usercopy_64.c
31582+++ b/arch/x86/lib/usercopy_64.c
31583@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31584 might_fault();
31585 /* no memory constraint because it doesn't change any memory gcc knows
31586 about */
31587+ pax_open_userland();
31588 stac();
31589 asm volatile(
31590 " testq %[size8],%[size8]\n"
31591@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31592 _ASM_EXTABLE(0b,3b)
31593 _ASM_EXTABLE(1b,2b)
31594 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31595- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31596+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31597 [zero] "r" (0UL), [eight] "r" (8UL));
31598 clac();
31599+ pax_close_userland();
31600 return size;
31601 }
31602 EXPORT_SYMBOL(__clear_user);
31603@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31604 }
31605 EXPORT_SYMBOL(clear_user);
31606
31607-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31608+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31609 {
31610- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31611- return copy_user_generic((__force void *)to, (__force void *)from, len);
31612- }
31613- return len;
31614+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31615+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31616+ return len;
31617 }
31618 EXPORT_SYMBOL(copy_in_user);
31619
31620@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31621 * it is not necessary to optimize tail handling.
31622 */
31623 __visible unsigned long
31624-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31625+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31626 {
31627 char c;
31628 unsigned zero_len;
31629
31630+ clac();
31631+ pax_close_userland();
31632 for (; len; --len, to++) {
31633 if (__get_user_nocheck(c, from++, sizeof(char)))
31634 break;
31635@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31636 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31637 if (__put_user_nocheck(c, to++, sizeof(char)))
31638 break;
31639- clac();
31640 return len;
31641 }
31642diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31643index 6a19ad9..1c48f9a 100644
31644--- a/arch/x86/mm/Makefile
31645+++ b/arch/x86/mm/Makefile
31646@@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31647 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31648
31649 obj-$(CONFIG_MEMTEST) += memtest.o
31650+
31651+quote:="
31652+obj-$(CONFIG_X86_64) += uderef_64.o
31653+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31654diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31655index 903ec1e..c4166b2 100644
31656--- a/arch/x86/mm/extable.c
31657+++ b/arch/x86/mm/extable.c
31658@@ -6,12 +6,24 @@
31659 static inline unsigned long
31660 ex_insn_addr(const struct exception_table_entry *x)
31661 {
31662- return (unsigned long)&x->insn + x->insn;
31663+ unsigned long reloc = 0;
31664+
31665+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31666+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31667+#endif
31668+
31669+ return (unsigned long)&x->insn + x->insn + reloc;
31670 }
31671 static inline unsigned long
31672 ex_fixup_addr(const struct exception_table_entry *x)
31673 {
31674- return (unsigned long)&x->fixup + x->fixup;
31675+ unsigned long reloc = 0;
31676+
31677+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31678+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31679+#endif
31680+
31681+ return (unsigned long)&x->fixup + x->fixup + reloc;
31682 }
31683
31684 int fixup_exception(struct pt_regs *regs)
31685@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31686 unsigned long new_ip;
31687
31688 #ifdef CONFIG_PNPBIOS
31689- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31690+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31691 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31692 extern u32 pnp_bios_is_utter_crap;
31693 pnp_bios_is_utter_crap = 1;
31694@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31695 i += 4;
31696 p->fixup -= i;
31697 i += 4;
31698+
31699+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31700+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31701+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31702+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31703+#endif
31704+
31705 }
31706 }
31707
31708diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31709index d973e61..fb868e9 100644
31710--- a/arch/x86/mm/fault.c
31711+++ b/arch/x86/mm/fault.c
31712@@ -13,12 +13,19 @@
31713 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31714 #include <linux/prefetch.h> /* prefetchw */
31715 #include <linux/context_tracking.h> /* exception_enter(), ... */
31716+#include <linux/unistd.h>
31717+#include <linux/compiler.h>
31718
31719 #include <asm/traps.h> /* dotraplinkage, ... */
31720 #include <asm/pgalloc.h> /* pgd_*(), ... */
31721 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31722 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31723 #include <asm/vsyscall.h> /* emulate_vsyscall */
31724+#include <asm/tlbflush.h>
31725+
31726+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31727+#include <asm/stacktrace.h>
31728+#endif
31729
31730 #define CREATE_TRACE_POINTS
31731 #include <asm/trace/exceptions.h>
31732@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31733 int ret = 0;
31734
31735 /* kprobe_running() needs smp_processor_id() */
31736- if (kprobes_built_in() && !user_mode_vm(regs)) {
31737+ if (kprobes_built_in() && !user_mode(regs)) {
31738 preempt_disable();
31739 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31740 ret = 1;
31741@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31742 return !instr_lo || (instr_lo>>1) == 1;
31743 case 0x00:
31744 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31745- if (probe_kernel_address(instr, opcode))
31746+ if (user_mode(regs)) {
31747+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31748+ return 0;
31749+ } else if (probe_kernel_address(instr, opcode))
31750 return 0;
31751
31752 *prefetch = (instr_lo == 0xF) &&
31753@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31754 while (instr < max_instr) {
31755 unsigned char opcode;
31756
31757- if (probe_kernel_address(instr, opcode))
31758+ if (user_mode(regs)) {
31759+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31760+ break;
31761+ } else if (probe_kernel_address(instr, opcode))
31762 break;
31763
31764 instr++;
31765@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31766 force_sig_info(si_signo, &info, tsk);
31767 }
31768
31769+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31770+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31771+#endif
31772+
31773+#ifdef CONFIG_PAX_EMUTRAMP
31774+static int pax_handle_fetch_fault(struct pt_regs *regs);
31775+#endif
31776+
31777+#ifdef CONFIG_PAX_PAGEEXEC
31778+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31779+{
31780+ pgd_t *pgd;
31781+ pud_t *pud;
31782+ pmd_t *pmd;
31783+
31784+ pgd = pgd_offset(mm, address);
31785+ if (!pgd_present(*pgd))
31786+ return NULL;
31787+ pud = pud_offset(pgd, address);
31788+ if (!pud_present(*pud))
31789+ return NULL;
31790+ pmd = pmd_offset(pud, address);
31791+ if (!pmd_present(*pmd))
31792+ return NULL;
31793+ return pmd;
31794+}
31795+#endif
31796+
31797 DEFINE_SPINLOCK(pgd_lock);
31798 LIST_HEAD(pgd_list);
31799
31800@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31801 for (address = VMALLOC_START & PMD_MASK;
31802 address >= TASK_SIZE && address < FIXADDR_TOP;
31803 address += PMD_SIZE) {
31804+
31805+#ifdef CONFIG_PAX_PER_CPU_PGD
31806+ unsigned long cpu;
31807+#else
31808 struct page *page;
31809+#endif
31810
31811 spin_lock(&pgd_lock);
31812+
31813+#ifdef CONFIG_PAX_PER_CPU_PGD
31814+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31815+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31816+ pmd_t *ret;
31817+
31818+ ret = vmalloc_sync_one(pgd, address);
31819+ if (!ret)
31820+ break;
31821+ pgd = get_cpu_pgd(cpu, kernel);
31822+#else
31823 list_for_each_entry(page, &pgd_list, lru) {
31824+ pgd_t *pgd;
31825 spinlock_t *pgt_lock;
31826 pmd_t *ret;
31827
31828@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31829 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31830
31831 spin_lock(pgt_lock);
31832- ret = vmalloc_sync_one(page_address(page), address);
31833+ pgd = page_address(page);
31834+#endif
31835+
31836+ ret = vmalloc_sync_one(pgd, address);
31837+
31838+#ifndef CONFIG_PAX_PER_CPU_PGD
31839 spin_unlock(pgt_lock);
31840+#endif
31841
31842 if (!ret)
31843 break;
31844@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31845 * an interrupt in the middle of a task switch..
31846 */
31847 pgd_paddr = read_cr3();
31848+
31849+#ifdef CONFIG_PAX_PER_CPU_PGD
31850+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31851+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31852+#endif
31853+
31854 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31855 if (!pmd_k)
31856 return -1;
31857@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31858 * happen within a race in page table update. In the later
31859 * case just flush:
31860 */
31861- pgd = pgd_offset(current->active_mm, address);
31862+
31863 pgd_ref = pgd_offset_k(address);
31864 if (pgd_none(*pgd_ref))
31865 return -1;
31866
31867+#ifdef CONFIG_PAX_PER_CPU_PGD
31868+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31869+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31870+ if (pgd_none(*pgd)) {
31871+ set_pgd(pgd, *pgd_ref);
31872+ arch_flush_lazy_mmu_mode();
31873+ } else {
31874+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31875+ }
31876+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31877+#else
31878+ pgd = pgd_offset(current->active_mm, address);
31879+#endif
31880+
31881 if (pgd_none(*pgd)) {
31882 set_pgd(pgd, *pgd_ref);
31883 arch_flush_lazy_mmu_mode();
31884@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31885 static int is_errata100(struct pt_regs *regs, unsigned long address)
31886 {
31887 #ifdef CONFIG_X86_64
31888- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31889+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31890 return 1;
31891 #endif
31892 return 0;
31893@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31894 }
31895
31896 static const char nx_warning[] = KERN_CRIT
31897-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31898+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31899 static const char smep_warning[] = KERN_CRIT
31900-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31901+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31902
31903 static void
31904 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31905@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31906 if (!oops_may_print())
31907 return;
31908
31909- if (error_code & PF_INSTR) {
31910+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31911 unsigned int level;
31912 pgd_t *pgd;
31913 pte_t *pte;
31914@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31915 pte = lookup_address_in_pgd(pgd, address, &level);
31916
31917 if (pte && pte_present(*pte) && !pte_exec(*pte))
31918- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31919+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31920 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31921 (pgd_flags(*pgd) & _PAGE_USER) &&
31922 (read_cr4() & X86_CR4_SMEP))
31923- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31924+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31925 }
31926
31927+#ifdef CONFIG_PAX_KERNEXEC
31928+ if (init_mm.start_code <= address && address < init_mm.end_code) {
31929+ if (current->signal->curr_ip)
31930+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31931+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
31932+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31933+ else
31934+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31935+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31936+ }
31937+#endif
31938+
31939 printk(KERN_ALERT "BUG: unable to handle kernel ");
31940 if (address < PAGE_SIZE)
31941 printk(KERN_CONT "NULL pointer dereference");
31942@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31943 return;
31944 }
31945 #endif
31946+
31947+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31948+ if (pax_is_fetch_fault(regs, error_code, address)) {
31949+
31950+#ifdef CONFIG_PAX_EMUTRAMP
31951+ switch (pax_handle_fetch_fault(regs)) {
31952+ case 2:
31953+ return;
31954+ }
31955+#endif
31956+
31957+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31958+ do_group_exit(SIGKILL);
31959+ }
31960+#endif
31961+
31962 /* Kernel addresses are always protection faults: */
31963 if (address >= TASK_SIZE)
31964 error_code |= PF_PROT;
31965@@ -867,7 +979,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31966 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31967 printk(KERN_ERR
31968 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31969- tsk->comm, tsk->pid, address);
31970+ tsk->comm, task_pid_nr(tsk), address);
31971 code = BUS_MCEERR_AR;
31972 }
31973 #endif
31974@@ -921,6 +1033,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31975 return 1;
31976 }
31977
31978+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31979+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31980+{
31981+ pte_t *pte;
31982+ pmd_t *pmd;
31983+ spinlock_t *ptl;
31984+ unsigned char pte_mask;
31985+
31986+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31987+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
31988+ return 0;
31989+
31990+ /* PaX: it's our fault, let's handle it if we can */
31991+
31992+ /* PaX: take a look at read faults before acquiring any locks */
31993+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31994+ /* instruction fetch attempt from a protected page in user mode */
31995+ up_read(&mm->mmap_sem);
31996+
31997+#ifdef CONFIG_PAX_EMUTRAMP
31998+ switch (pax_handle_fetch_fault(regs)) {
31999+ case 2:
32000+ return 1;
32001+ }
32002+#endif
32003+
32004+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32005+ do_group_exit(SIGKILL);
32006+ }
32007+
32008+ pmd = pax_get_pmd(mm, address);
32009+ if (unlikely(!pmd))
32010+ return 0;
32011+
32012+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32013+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32014+ pte_unmap_unlock(pte, ptl);
32015+ return 0;
32016+ }
32017+
32018+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32019+ /* write attempt to a protected page in user mode */
32020+ pte_unmap_unlock(pte, ptl);
32021+ return 0;
32022+ }
32023+
32024+#ifdef CONFIG_SMP
32025+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32026+#else
32027+ if (likely(address > get_limit(regs->cs)))
32028+#endif
32029+ {
32030+ set_pte(pte, pte_mkread(*pte));
32031+ __flush_tlb_one(address);
32032+ pte_unmap_unlock(pte, ptl);
32033+ up_read(&mm->mmap_sem);
32034+ return 1;
32035+ }
32036+
32037+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32038+
32039+ /*
32040+ * PaX: fill DTLB with user rights and retry
32041+ */
32042+ __asm__ __volatile__ (
32043+ "orb %2,(%1)\n"
32044+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32045+/*
32046+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32047+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32048+ * page fault when examined during a TLB load attempt. this is true not only
32049+ * for PTEs holding a non-present entry but also present entries that will
32050+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32051+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32052+ * for our target pages since their PTEs are simply not in the TLBs at all.
32053+
32054+ * the best thing in omitting it is that we gain around 15-20% speed in the
32055+ * fast path of the page fault handler and can get rid of tracing since we
32056+ * can no longer flush unintended entries.
32057+ */
32058+ "invlpg (%0)\n"
32059+#endif
32060+ __copyuser_seg"testb $0,(%0)\n"
32061+ "xorb %3,(%1)\n"
32062+ :
32063+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32064+ : "memory", "cc");
32065+ pte_unmap_unlock(pte, ptl);
32066+ up_read(&mm->mmap_sem);
32067+ return 1;
32068+}
32069+#endif
32070+
32071 /*
32072 * Handle a spurious fault caused by a stale TLB entry.
32073 *
32074@@ -1006,6 +1211,9 @@ int show_unhandled_signals = 1;
32075 static inline int
32076 access_error(unsigned long error_code, struct vm_area_struct *vma)
32077 {
32078+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32079+ return 1;
32080+
32081 if (error_code & PF_WRITE) {
32082 /* write, present and write, not present: */
32083 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32084@@ -1040,7 +1248,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32085 if (error_code & PF_USER)
32086 return false;
32087
32088- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32089+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32090 return false;
32091
32092 return true;
32093@@ -1068,6 +1276,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32094 tsk = current;
32095 mm = tsk->mm;
32096
32097+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32098+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32099+ if (!search_exception_tables(regs->ip)) {
32100+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32101+ bad_area_nosemaphore(regs, error_code, address);
32102+ return;
32103+ }
32104+ if (address < pax_user_shadow_base) {
32105+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32106+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32107+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32108+ } else
32109+ address -= pax_user_shadow_base;
32110+ }
32111+#endif
32112+
32113 /*
32114 * Detect and handle instructions that would cause a page fault for
32115 * both a tracked kernel page and a userspace page.
32116@@ -1145,7 +1369,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32117 * User-mode registers count as a user access even for any
32118 * potential system fault or CPU buglet:
32119 */
32120- if (user_mode_vm(regs)) {
32121+ if (user_mode(regs)) {
32122 local_irq_enable();
32123 error_code |= PF_USER;
32124 flags |= FAULT_FLAG_USER;
32125@@ -1192,6 +1416,11 @@ retry:
32126 might_sleep();
32127 }
32128
32129+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32130+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32131+ return;
32132+#endif
32133+
32134 vma = find_vma(mm, address);
32135 if (unlikely(!vma)) {
32136 bad_area(regs, error_code, address);
32137@@ -1203,18 +1432,24 @@ retry:
32138 bad_area(regs, error_code, address);
32139 return;
32140 }
32141- if (error_code & PF_USER) {
32142- /*
32143- * Accessing the stack below %sp is always a bug.
32144- * The large cushion allows instructions like enter
32145- * and pusha to work. ("enter $65535, $31" pushes
32146- * 32 pointers and then decrements %sp by 65535.)
32147- */
32148- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32149- bad_area(regs, error_code, address);
32150- return;
32151- }
32152+ /*
32153+ * Accessing the stack below %sp is always a bug.
32154+ * The large cushion allows instructions like enter
32155+ * and pusha to work. ("enter $65535, $31" pushes
32156+ * 32 pointers and then decrements %sp by 65535.)
32157+ */
32158+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32159+ bad_area(regs, error_code, address);
32160+ return;
32161 }
32162+
32163+#ifdef CONFIG_PAX_SEGMEXEC
32164+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32165+ bad_area(regs, error_code, address);
32166+ return;
32167+ }
32168+#endif
32169+
32170 if (unlikely(expand_stack(vma, address))) {
32171 bad_area(regs, error_code, address);
32172 return;
32173@@ -1331,3 +1566,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32174 }
32175 NOKPROBE_SYMBOL(trace_do_page_fault);
32176 #endif /* CONFIG_TRACING */
32177+
32178+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32179+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32180+{
32181+ struct mm_struct *mm = current->mm;
32182+ unsigned long ip = regs->ip;
32183+
32184+ if (v8086_mode(regs))
32185+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32186+
32187+#ifdef CONFIG_PAX_PAGEEXEC
32188+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32189+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32190+ return true;
32191+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32192+ return true;
32193+ return false;
32194+ }
32195+#endif
32196+
32197+#ifdef CONFIG_PAX_SEGMEXEC
32198+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32199+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32200+ return true;
32201+ return false;
32202+ }
32203+#endif
32204+
32205+ return false;
32206+}
32207+#endif
32208+
32209+#ifdef CONFIG_PAX_EMUTRAMP
32210+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32211+{
32212+ int err;
32213+
32214+ do { /* PaX: libffi trampoline emulation */
32215+ unsigned char mov, jmp;
32216+ unsigned int addr1, addr2;
32217+
32218+#ifdef CONFIG_X86_64
32219+ if ((regs->ip + 9) >> 32)
32220+ break;
32221+#endif
32222+
32223+ err = get_user(mov, (unsigned char __user *)regs->ip);
32224+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32225+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32226+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32227+
32228+ if (err)
32229+ break;
32230+
32231+ if (mov == 0xB8 && jmp == 0xE9) {
32232+ regs->ax = addr1;
32233+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32234+ return 2;
32235+ }
32236+ } while (0);
32237+
32238+ do { /* PaX: gcc trampoline emulation #1 */
32239+ unsigned char mov1, mov2;
32240+ unsigned short jmp;
32241+ unsigned int addr1, addr2;
32242+
32243+#ifdef CONFIG_X86_64
32244+ if ((regs->ip + 11) >> 32)
32245+ break;
32246+#endif
32247+
32248+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32249+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32250+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32251+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32252+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32253+
32254+ if (err)
32255+ break;
32256+
32257+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32258+ regs->cx = addr1;
32259+ regs->ax = addr2;
32260+ regs->ip = addr2;
32261+ return 2;
32262+ }
32263+ } while (0);
32264+
32265+ do { /* PaX: gcc trampoline emulation #2 */
32266+ unsigned char mov, jmp;
32267+ unsigned int addr1, addr2;
32268+
32269+#ifdef CONFIG_X86_64
32270+ if ((regs->ip + 9) >> 32)
32271+ break;
32272+#endif
32273+
32274+ err = get_user(mov, (unsigned char __user *)regs->ip);
32275+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32276+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32277+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32278+
32279+ if (err)
32280+ break;
32281+
32282+ if (mov == 0xB9 && jmp == 0xE9) {
32283+ regs->cx = addr1;
32284+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32285+ return 2;
32286+ }
32287+ } while (0);
32288+
32289+ return 1; /* PaX in action */
32290+}
32291+
32292+#ifdef CONFIG_X86_64
32293+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32294+{
32295+ int err;
32296+
32297+ do { /* PaX: libffi trampoline emulation */
32298+ unsigned short mov1, mov2, jmp1;
32299+ unsigned char stcclc, jmp2;
32300+ unsigned long addr1, addr2;
32301+
32302+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32303+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32304+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32305+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32306+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32307+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32308+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32309+
32310+ if (err)
32311+ break;
32312+
32313+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32314+ regs->r11 = addr1;
32315+ regs->r10 = addr2;
32316+ if (stcclc == 0xF8)
32317+ regs->flags &= ~X86_EFLAGS_CF;
32318+ else
32319+ regs->flags |= X86_EFLAGS_CF;
32320+ regs->ip = addr1;
32321+ return 2;
32322+ }
32323+ } while (0);
32324+
32325+ do { /* PaX: gcc trampoline emulation #1 */
32326+ unsigned short mov1, mov2, jmp1;
32327+ unsigned char jmp2;
32328+ unsigned int addr1;
32329+ unsigned long addr2;
32330+
32331+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32332+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32333+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32334+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32335+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32336+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32337+
32338+ if (err)
32339+ break;
32340+
32341+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32342+ regs->r11 = addr1;
32343+ regs->r10 = addr2;
32344+ regs->ip = addr1;
32345+ return 2;
32346+ }
32347+ } while (0);
32348+
32349+ do { /* PaX: gcc trampoline emulation #2 */
32350+ unsigned short mov1, mov2, jmp1;
32351+ unsigned char jmp2;
32352+ unsigned long addr1, addr2;
32353+
32354+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32355+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32356+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32357+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32358+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32359+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32360+
32361+ if (err)
32362+ break;
32363+
32364+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32365+ regs->r11 = addr1;
32366+ regs->r10 = addr2;
32367+ regs->ip = addr1;
32368+ return 2;
32369+ }
32370+ } while (0);
32371+
32372+ return 1; /* PaX in action */
32373+}
32374+#endif
32375+
32376+/*
32377+ * PaX: decide what to do with offenders (regs->ip = fault address)
32378+ *
32379+ * returns 1 when task should be killed
32380+ * 2 when gcc trampoline was detected
32381+ */
32382+static int pax_handle_fetch_fault(struct pt_regs *regs)
32383+{
32384+ if (v8086_mode(regs))
32385+ return 1;
32386+
32387+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32388+ return 1;
32389+
32390+#ifdef CONFIG_X86_32
32391+ return pax_handle_fetch_fault_32(regs);
32392+#else
32393+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32394+ return pax_handle_fetch_fault_32(regs);
32395+ else
32396+ return pax_handle_fetch_fault_64(regs);
32397+#endif
32398+}
32399+#endif
32400+
32401+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32402+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32403+{
32404+ long i;
32405+
32406+ printk(KERN_ERR "PAX: bytes at PC: ");
32407+ for (i = 0; i < 20; i++) {
32408+ unsigned char c;
32409+ if (get_user(c, (unsigned char __force_user *)pc+i))
32410+ printk(KERN_CONT "?? ");
32411+ else
32412+ printk(KERN_CONT "%02x ", c);
32413+ }
32414+ printk("\n");
32415+
32416+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32417+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32418+ unsigned long c;
32419+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32420+#ifdef CONFIG_X86_32
32421+ printk(KERN_CONT "???????? ");
32422+#else
32423+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32424+ printk(KERN_CONT "???????? ???????? ");
32425+ else
32426+ printk(KERN_CONT "???????????????? ");
32427+#endif
32428+ } else {
32429+#ifdef CONFIG_X86_64
32430+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32431+ printk(KERN_CONT "%08x ", (unsigned int)c);
32432+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32433+ } else
32434+#endif
32435+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32436+ }
32437+ }
32438+ printk("\n");
32439+}
32440+#endif
32441+
32442+/**
32443+ * probe_kernel_write(): safely attempt to write to a location
32444+ * @dst: address to write to
32445+ * @src: pointer to the data that shall be written
32446+ * @size: size of the data chunk
32447+ *
32448+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32449+ * happens, handle that and return -EFAULT.
32450+ */
32451+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32452+{
32453+ long ret;
32454+ mm_segment_t old_fs = get_fs();
32455+
32456+ set_fs(KERNEL_DS);
32457+ pagefault_disable();
32458+ pax_open_kernel();
32459+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32460+ pax_close_kernel();
32461+ pagefault_enable();
32462+ set_fs(old_fs);
32463+
32464+ return ret ? -EFAULT : 0;
32465+}
32466diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32467index 207d9aef..69030980 100644
32468--- a/arch/x86/mm/gup.c
32469+++ b/arch/x86/mm/gup.c
32470@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32471 addr = start;
32472 len = (unsigned long) nr_pages << PAGE_SHIFT;
32473 end = start + len;
32474- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32475+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32476 (void __user *)start, len)))
32477 return 0;
32478
32479@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32480 goto slow_irqon;
32481 #endif
32482
32483+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32484+ (void __user *)start, len)))
32485+ return 0;
32486+
32487 /*
32488 * XXX: batch / limit 'nr', to avoid large irq off latency
32489 * needs some instrumenting to determine the common sizes used by
32490diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32491index 4500142..53a363c 100644
32492--- a/arch/x86/mm/highmem_32.c
32493+++ b/arch/x86/mm/highmem_32.c
32494@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32495 idx = type + KM_TYPE_NR*smp_processor_id();
32496 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32497 BUG_ON(!pte_none(*(kmap_pte-idx)));
32498+
32499+ pax_open_kernel();
32500 set_pte(kmap_pte-idx, mk_pte(page, prot));
32501+ pax_close_kernel();
32502+
32503 arch_flush_lazy_mmu_mode();
32504
32505 return (void *)vaddr;
32506diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32507index 8b977eb..4732c33 100644
32508--- a/arch/x86/mm/hugetlbpage.c
32509+++ b/arch/x86/mm/hugetlbpage.c
32510@@ -80,23 +80,24 @@ int pud_huge(pud_t pud)
32511 #ifdef CONFIG_HUGETLB_PAGE
32512 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32513 unsigned long addr, unsigned long len,
32514- unsigned long pgoff, unsigned long flags)
32515+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32516 {
32517 struct hstate *h = hstate_file(file);
32518 struct vm_unmapped_area_info info;
32519-
32520+
32521 info.flags = 0;
32522 info.length = len;
32523 info.low_limit = current->mm->mmap_legacy_base;
32524 info.high_limit = TASK_SIZE;
32525 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32526 info.align_offset = 0;
32527+ info.threadstack_offset = offset;
32528 return vm_unmapped_area(&info);
32529 }
32530
32531 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32532 unsigned long addr0, unsigned long len,
32533- unsigned long pgoff, unsigned long flags)
32534+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32535 {
32536 struct hstate *h = hstate_file(file);
32537 struct vm_unmapped_area_info info;
32538@@ -108,6 +109,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32539 info.high_limit = current->mm->mmap_base;
32540 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32541 info.align_offset = 0;
32542+ info.threadstack_offset = offset;
32543 addr = vm_unmapped_area(&info);
32544
32545 /*
32546@@ -120,6 +122,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32547 VM_BUG_ON(addr != -ENOMEM);
32548 info.flags = 0;
32549 info.low_limit = TASK_UNMAPPED_BASE;
32550+
32551+#ifdef CONFIG_PAX_RANDMMAP
32552+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32553+ info.low_limit += current->mm->delta_mmap;
32554+#endif
32555+
32556 info.high_limit = TASK_SIZE;
32557 addr = vm_unmapped_area(&info);
32558 }
32559@@ -134,10 +142,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32560 struct hstate *h = hstate_file(file);
32561 struct mm_struct *mm = current->mm;
32562 struct vm_area_struct *vma;
32563+ unsigned long pax_task_size = TASK_SIZE;
32564+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32565
32566 if (len & ~huge_page_mask(h))
32567 return -EINVAL;
32568- if (len > TASK_SIZE)
32569+
32570+#ifdef CONFIG_PAX_SEGMEXEC
32571+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32572+ pax_task_size = SEGMEXEC_TASK_SIZE;
32573+#endif
32574+
32575+ pax_task_size -= PAGE_SIZE;
32576+
32577+ if (len > pax_task_size)
32578 return -ENOMEM;
32579
32580 if (flags & MAP_FIXED) {
32581@@ -146,19 +164,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32582 return addr;
32583 }
32584
32585+#ifdef CONFIG_PAX_RANDMMAP
32586+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32587+#endif
32588+
32589 if (addr) {
32590 addr = ALIGN(addr, huge_page_size(h));
32591 vma = find_vma(mm, addr);
32592- if (TASK_SIZE - len >= addr &&
32593- (!vma || addr + len <= vma->vm_start))
32594+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32595 return addr;
32596 }
32597 if (mm->get_unmapped_area == arch_get_unmapped_area)
32598 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32599- pgoff, flags);
32600+ pgoff, flags, offset);
32601 else
32602 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32603- pgoff, flags);
32604+ pgoff, flags, offset);
32605 }
32606 #endif /* CONFIG_HUGETLB_PAGE */
32607
32608diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32609index 66dba36..f8082ec 100644
32610--- a/arch/x86/mm/init.c
32611+++ b/arch/x86/mm/init.c
32612@@ -4,6 +4,7 @@
32613 #include <linux/swap.h>
32614 #include <linux/memblock.h>
32615 #include <linux/bootmem.h> /* for max_low_pfn */
32616+#include <linux/tboot.h>
32617
32618 #include <asm/cacheflush.h>
32619 #include <asm/e820.h>
32620@@ -17,6 +18,8 @@
32621 #include <asm/proto.h>
32622 #include <asm/dma.h> /* for MAX_DMA_PFN */
32623 #include <asm/microcode.h>
32624+#include <asm/desc.h>
32625+#include <asm/bios_ebda.h>
32626
32627 /*
32628 * We need to define the tracepoints somewhere, and tlb.c
32629@@ -570,7 +573,18 @@ void __init init_mem_mapping(void)
32630 early_ioremap_page_table_range_init();
32631 #endif
32632
32633+#ifdef CONFIG_PAX_PER_CPU_PGD
32634+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32635+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32636+ KERNEL_PGD_PTRS);
32637+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32638+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32639+ KERNEL_PGD_PTRS);
32640+ load_cr3(get_cpu_pgd(0, kernel));
32641+#else
32642 load_cr3(swapper_pg_dir);
32643+#endif
32644+
32645 __flush_tlb_all();
32646
32647 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32648@@ -586,10 +600,40 @@ void __init init_mem_mapping(void)
32649 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32650 * mmio resources as well as potential bios/acpi data regions.
32651 */
32652+
32653+#ifdef CONFIG_GRKERNSEC_KMEM
32654+static unsigned int ebda_start __read_only;
32655+static unsigned int ebda_end __read_only;
32656+#endif
32657+
32658 int devmem_is_allowed(unsigned long pagenr)
32659 {
32660- if (pagenr < 256)
32661+#ifdef CONFIG_GRKERNSEC_KMEM
32662+ /* allow BDA */
32663+ if (!pagenr)
32664 return 1;
32665+ /* allow EBDA */
32666+ if (pagenr >= ebda_start && pagenr < ebda_end)
32667+ return 1;
32668+ /* if tboot is in use, allow access to its hardcoded serial log range */
32669+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32670+ return 1;
32671+#else
32672+ if (!pagenr)
32673+ return 1;
32674+#ifdef CONFIG_VM86
32675+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32676+ return 1;
32677+#endif
32678+#endif
32679+
32680+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32681+ return 1;
32682+#ifdef CONFIG_GRKERNSEC_KMEM
32683+ /* throw out everything else below 1MB */
32684+ if (pagenr <= 256)
32685+ return 0;
32686+#endif
32687 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32688 return 0;
32689 if (!page_is_ram(pagenr))
32690@@ -635,8 +679,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32691 #endif
32692 }
32693
32694+#ifdef CONFIG_GRKERNSEC_KMEM
32695+static inline void gr_init_ebda(void)
32696+{
32697+ unsigned int ebda_addr;
32698+ unsigned int ebda_size = 0;
32699+
32700+ ebda_addr = get_bios_ebda();
32701+ if (ebda_addr) {
32702+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32703+ ebda_size <<= 10;
32704+ }
32705+ if (ebda_addr && ebda_size) {
32706+ ebda_start = ebda_addr >> PAGE_SHIFT;
32707+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32708+ } else {
32709+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32710+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32711+ }
32712+}
32713+#else
32714+static inline void gr_init_ebda(void) { }
32715+#endif
32716+
32717 void free_initmem(void)
32718 {
32719+#ifdef CONFIG_PAX_KERNEXEC
32720+#ifdef CONFIG_X86_32
32721+ /* PaX: limit KERNEL_CS to actual size */
32722+ unsigned long addr, limit;
32723+ struct desc_struct d;
32724+ int cpu;
32725+#else
32726+ pgd_t *pgd;
32727+ pud_t *pud;
32728+ pmd_t *pmd;
32729+ unsigned long addr, end;
32730+#endif
32731+#endif
32732+
32733+ gr_init_ebda();
32734+
32735+#ifdef CONFIG_PAX_KERNEXEC
32736+#ifdef CONFIG_X86_32
32737+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32738+ limit = (limit - 1UL) >> PAGE_SHIFT;
32739+
32740+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32741+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32742+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32743+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32744+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32745+ }
32746+
32747+ /* PaX: make KERNEL_CS read-only */
32748+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32749+ if (!paravirt_enabled())
32750+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32751+/*
32752+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32753+ pgd = pgd_offset_k(addr);
32754+ pud = pud_offset(pgd, addr);
32755+ pmd = pmd_offset(pud, addr);
32756+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32757+ }
32758+*/
32759+#ifdef CONFIG_X86_PAE
32760+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32761+/*
32762+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32763+ pgd = pgd_offset_k(addr);
32764+ pud = pud_offset(pgd, addr);
32765+ pmd = pmd_offset(pud, addr);
32766+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32767+ }
32768+*/
32769+#endif
32770+
32771+#ifdef CONFIG_MODULES
32772+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32773+#endif
32774+
32775+#else
32776+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32777+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32778+ pgd = pgd_offset_k(addr);
32779+ pud = pud_offset(pgd, addr);
32780+ pmd = pmd_offset(pud, addr);
32781+ if (!pmd_present(*pmd))
32782+ continue;
32783+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32784+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32785+ else
32786+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32787+ }
32788+
32789+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32790+ end = addr + KERNEL_IMAGE_SIZE;
32791+ for (; addr < end; addr += PMD_SIZE) {
32792+ pgd = pgd_offset_k(addr);
32793+ pud = pud_offset(pgd, addr);
32794+ pmd = pmd_offset(pud, addr);
32795+ if (!pmd_present(*pmd))
32796+ continue;
32797+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32798+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32799+ }
32800+#endif
32801+
32802+ flush_tlb_all();
32803+#endif
32804+
32805 free_init_pages("unused kernel",
32806 (unsigned long)(&__init_begin),
32807 (unsigned long)(&__init_end));
32808diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32809index c8140e1..59257fc 100644
32810--- a/arch/x86/mm/init_32.c
32811+++ b/arch/x86/mm/init_32.c
32812@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32813 bool __read_mostly __vmalloc_start_set = false;
32814
32815 /*
32816- * Creates a middle page table and puts a pointer to it in the
32817- * given global directory entry. This only returns the gd entry
32818- * in non-PAE compilation mode, since the middle layer is folded.
32819- */
32820-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32821-{
32822- pud_t *pud;
32823- pmd_t *pmd_table;
32824-
32825-#ifdef CONFIG_X86_PAE
32826- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32827- pmd_table = (pmd_t *)alloc_low_page();
32828- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32829- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32830- pud = pud_offset(pgd, 0);
32831- BUG_ON(pmd_table != pmd_offset(pud, 0));
32832-
32833- return pmd_table;
32834- }
32835-#endif
32836- pud = pud_offset(pgd, 0);
32837- pmd_table = pmd_offset(pud, 0);
32838-
32839- return pmd_table;
32840-}
32841-
32842-/*
32843 * Create a page table and place a pointer to it in a middle page
32844 * directory entry:
32845 */
32846@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32847 pte_t *page_table = (pte_t *)alloc_low_page();
32848
32849 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32850+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32851+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32852+#else
32853 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32854+#endif
32855 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32856 }
32857
32858 return pte_offset_kernel(pmd, 0);
32859 }
32860
32861+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32862+{
32863+ pud_t *pud;
32864+ pmd_t *pmd_table;
32865+
32866+ pud = pud_offset(pgd, 0);
32867+ pmd_table = pmd_offset(pud, 0);
32868+
32869+ return pmd_table;
32870+}
32871+
32872 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32873 {
32874 int pgd_idx = pgd_index(vaddr);
32875@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32876 int pgd_idx, pmd_idx;
32877 unsigned long vaddr;
32878 pgd_t *pgd;
32879+ pud_t *pud;
32880 pmd_t *pmd;
32881 pte_t *pte = NULL;
32882 unsigned long count = page_table_range_init_count(start, end);
32883@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32884 pgd = pgd_base + pgd_idx;
32885
32886 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32887- pmd = one_md_table_init(pgd);
32888- pmd = pmd + pmd_index(vaddr);
32889+ pud = pud_offset(pgd, vaddr);
32890+ pmd = pmd_offset(pud, vaddr);
32891+
32892+#ifdef CONFIG_X86_PAE
32893+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32894+#endif
32895+
32896 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32897 pmd++, pmd_idx++) {
32898 pte = page_table_kmap_check(one_page_table_init(pmd),
32899@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32900 }
32901 }
32902
32903-static inline int is_kernel_text(unsigned long addr)
32904+static inline int is_kernel_text(unsigned long start, unsigned long end)
32905 {
32906- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32907- return 1;
32908- return 0;
32909+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32910+ end <= ktla_ktva((unsigned long)_stext)) &&
32911+ (start >= ktla_ktva((unsigned long)_einittext) ||
32912+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32913+
32914+#ifdef CONFIG_ACPI_SLEEP
32915+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32916+#endif
32917+
32918+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32919+ return 0;
32920+ return 1;
32921 }
32922
32923 /*
32924@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32925 unsigned long last_map_addr = end;
32926 unsigned long start_pfn, end_pfn;
32927 pgd_t *pgd_base = swapper_pg_dir;
32928- int pgd_idx, pmd_idx, pte_ofs;
32929+ unsigned int pgd_idx, pmd_idx, pte_ofs;
32930 unsigned long pfn;
32931 pgd_t *pgd;
32932+ pud_t *pud;
32933 pmd_t *pmd;
32934 pte_t *pte;
32935 unsigned pages_2m, pages_4k;
32936@@ -291,8 +295,13 @@ repeat:
32937 pfn = start_pfn;
32938 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32939 pgd = pgd_base + pgd_idx;
32940- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32941- pmd = one_md_table_init(pgd);
32942+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32943+ pud = pud_offset(pgd, 0);
32944+ pmd = pmd_offset(pud, 0);
32945+
32946+#ifdef CONFIG_X86_PAE
32947+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32948+#endif
32949
32950 if (pfn >= end_pfn)
32951 continue;
32952@@ -304,14 +313,13 @@ repeat:
32953 #endif
32954 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32955 pmd++, pmd_idx++) {
32956- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32957+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32958
32959 /*
32960 * Map with big pages if possible, otherwise
32961 * create normal page tables:
32962 */
32963 if (use_pse) {
32964- unsigned int addr2;
32965 pgprot_t prot = PAGE_KERNEL_LARGE;
32966 /*
32967 * first pass will use the same initial
32968@@ -322,11 +330,7 @@ repeat:
32969 _PAGE_PSE);
32970
32971 pfn &= PMD_MASK >> PAGE_SHIFT;
32972- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32973- PAGE_OFFSET + PAGE_SIZE-1;
32974-
32975- if (is_kernel_text(addr) ||
32976- is_kernel_text(addr2))
32977+ if (is_kernel_text(address, address + PMD_SIZE))
32978 prot = PAGE_KERNEL_LARGE_EXEC;
32979
32980 pages_2m++;
32981@@ -343,7 +347,7 @@ repeat:
32982 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32983 pte += pte_ofs;
32984 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32985- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32986+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32987 pgprot_t prot = PAGE_KERNEL;
32988 /*
32989 * first pass will use the same initial
32990@@ -351,7 +355,7 @@ repeat:
32991 */
32992 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32993
32994- if (is_kernel_text(addr))
32995+ if (is_kernel_text(address, address + PAGE_SIZE))
32996 prot = PAGE_KERNEL_EXEC;
32997
32998 pages_4k++;
32999@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33000
33001 pud = pud_offset(pgd, va);
33002 pmd = pmd_offset(pud, va);
33003- if (!pmd_present(*pmd))
33004+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33005 break;
33006
33007 /* should not be large page here */
33008@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33009
33010 static void __init pagetable_init(void)
33011 {
33012- pgd_t *pgd_base = swapper_pg_dir;
33013-
33014- permanent_kmaps_init(pgd_base);
33015+ permanent_kmaps_init(swapper_pg_dir);
33016 }
33017
33018-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33019+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33020 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33021
33022 /* user-defined highmem size */
33023@@ -787,10 +789,10 @@ void __init mem_init(void)
33024 ((unsigned long)&__init_end -
33025 (unsigned long)&__init_begin) >> 10,
33026
33027- (unsigned long)&_etext, (unsigned long)&_edata,
33028- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33029+ (unsigned long)&_sdata, (unsigned long)&_edata,
33030+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33031
33032- (unsigned long)&_text, (unsigned long)&_etext,
33033+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33034 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33035
33036 /*
33037@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33038 if (!kernel_set_to_readonly)
33039 return;
33040
33041+ start = ktla_ktva(start);
33042 pr_debug("Set kernel text: %lx - %lx for read write\n",
33043 start, start+size);
33044
33045@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33046 if (!kernel_set_to_readonly)
33047 return;
33048
33049+ start = ktla_ktva(start);
33050 pr_debug("Set kernel text: %lx - %lx for read only\n",
33051 start, start+size);
33052
33053@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33054 unsigned long start = PFN_ALIGN(_text);
33055 unsigned long size = PFN_ALIGN(_etext) - start;
33056
33057+ start = ktla_ktva(start);
33058 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33059 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33060 size >> 10);
33061diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33062index 4e5dfec..6fd6dc5 100644
33063--- a/arch/x86/mm/init_64.c
33064+++ b/arch/x86/mm/init_64.c
33065@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33066 * around without checking the pgd every time.
33067 */
33068
33069-pteval_t __supported_pte_mask __read_mostly = ~0;
33070+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33071 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33072
33073 int force_personality32;
33074@@ -184,7 +184,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33075
33076 for (address = start; address <= end; address += PGDIR_SIZE) {
33077 const pgd_t *pgd_ref = pgd_offset_k(address);
33078+
33079+#ifdef CONFIG_PAX_PER_CPU_PGD
33080+ unsigned long cpu;
33081+#else
33082 struct page *page;
33083+#endif
33084
33085 /*
33086 * When it is called after memory hot remove, pgd_none()
33087@@ -195,6 +200,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33088 continue;
33089
33090 spin_lock(&pgd_lock);
33091+
33092+#ifdef CONFIG_PAX_PER_CPU_PGD
33093+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33094+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33095+
33096+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33097+ BUG_ON(pgd_page_vaddr(*pgd)
33098+ != pgd_page_vaddr(*pgd_ref));
33099+
33100+ if (removed) {
33101+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33102+ pgd_clear(pgd);
33103+ } else {
33104+ if (pgd_none(*pgd))
33105+ set_pgd(pgd, *pgd_ref);
33106+ }
33107+
33108+ pgd = pgd_offset_cpu(cpu, kernel, address);
33109+#else
33110 list_for_each_entry(page, &pgd_list, lru) {
33111 pgd_t *pgd;
33112 spinlock_t *pgt_lock;
33113@@ -203,6 +227,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33114 /* the pgt_lock only for Xen */
33115 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33116 spin_lock(pgt_lock);
33117+#endif
33118
33119 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33120 BUG_ON(pgd_page_vaddr(*pgd)
33121@@ -216,7 +241,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33122 set_pgd(pgd, *pgd_ref);
33123 }
33124
33125+#ifndef CONFIG_PAX_PER_CPU_PGD
33126 spin_unlock(pgt_lock);
33127+#endif
33128+
33129 }
33130 spin_unlock(&pgd_lock);
33131 }
33132@@ -249,7 +277,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33133 {
33134 if (pgd_none(*pgd)) {
33135 pud_t *pud = (pud_t *)spp_getpage();
33136- pgd_populate(&init_mm, pgd, pud);
33137+ pgd_populate_kernel(&init_mm, pgd, pud);
33138 if (pud != pud_offset(pgd, 0))
33139 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33140 pud, pud_offset(pgd, 0));
33141@@ -261,7 +289,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33142 {
33143 if (pud_none(*pud)) {
33144 pmd_t *pmd = (pmd_t *) spp_getpage();
33145- pud_populate(&init_mm, pud, pmd);
33146+ pud_populate_kernel(&init_mm, pud, pmd);
33147 if (pmd != pmd_offset(pud, 0))
33148 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33149 pmd, pmd_offset(pud, 0));
33150@@ -290,7 +318,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33151 pmd = fill_pmd(pud, vaddr);
33152 pte = fill_pte(pmd, vaddr);
33153
33154+ pax_open_kernel();
33155 set_pte(pte, new_pte);
33156+ pax_close_kernel();
33157
33158 /*
33159 * It's enough to flush this one mapping.
33160@@ -349,14 +379,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33161 pgd = pgd_offset_k((unsigned long)__va(phys));
33162 if (pgd_none(*pgd)) {
33163 pud = (pud_t *) spp_getpage();
33164- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33165- _PAGE_USER));
33166+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33167 }
33168 pud = pud_offset(pgd, (unsigned long)__va(phys));
33169 if (pud_none(*pud)) {
33170 pmd = (pmd_t *) spp_getpage();
33171- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33172- _PAGE_USER));
33173+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33174 }
33175 pmd = pmd_offset(pud, phys);
33176 BUG_ON(!pmd_none(*pmd));
33177@@ -597,7 +625,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33178 prot);
33179
33180 spin_lock(&init_mm.page_table_lock);
33181- pud_populate(&init_mm, pud, pmd);
33182+ pud_populate_kernel(&init_mm, pud, pmd);
33183 spin_unlock(&init_mm.page_table_lock);
33184 }
33185 __flush_tlb_all();
33186@@ -638,7 +666,7 @@ kernel_physical_mapping_init(unsigned long start,
33187 page_size_mask);
33188
33189 spin_lock(&init_mm.page_table_lock);
33190- pgd_populate(&init_mm, pgd, pud);
33191+ pgd_populate_kernel(&init_mm, pgd, pud);
33192 spin_unlock(&init_mm.page_table_lock);
33193 pgd_changed = true;
33194 }
33195@@ -1217,8 +1245,8 @@ static struct vm_operations_struct gate_vma_ops = {
33196 static struct vm_area_struct gate_vma = {
33197 .vm_start = VSYSCALL_ADDR,
33198 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
33199- .vm_page_prot = PAGE_READONLY_EXEC,
33200- .vm_flags = VM_READ | VM_EXEC,
33201+ .vm_page_prot = PAGE_READONLY,
33202+ .vm_flags = VM_READ,
33203 .vm_ops = &gate_vma_ops,
33204 };
33205
33206diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33207index 7b179b49..6bd17777 100644
33208--- a/arch/x86/mm/iomap_32.c
33209+++ b/arch/x86/mm/iomap_32.c
33210@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33211 type = kmap_atomic_idx_push();
33212 idx = type + KM_TYPE_NR * smp_processor_id();
33213 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33214+
33215+ pax_open_kernel();
33216 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33217+ pax_close_kernel();
33218+
33219 arch_flush_lazy_mmu_mode();
33220
33221 return (void *)vaddr;
33222diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33223index af78e50..0790b03 100644
33224--- a/arch/x86/mm/ioremap.c
33225+++ b/arch/x86/mm/ioremap.c
33226@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33227 unsigned long i;
33228
33229 for (i = 0; i < nr_pages; ++i)
33230- if (pfn_valid(start_pfn + i) &&
33231- !PageReserved(pfn_to_page(start_pfn + i)))
33232+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33233+ !PageReserved(pfn_to_page(start_pfn + i))))
33234 return 1;
33235
33236 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33237@@ -280,7 +280,7 @@ EXPORT_SYMBOL(ioremap_prot);
33238 *
33239 * Caller must ensure there is only one unmapping for the same pointer.
33240 */
33241-void iounmap(volatile void __iomem *addr)
33242+void iounmap(const volatile void __iomem *addr)
33243 {
33244 struct vm_struct *p, *o;
33245
33246@@ -334,6 +334,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33247
33248 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33249 if (page_is_ram(start >> PAGE_SHIFT))
33250+#ifdef CONFIG_HIGHMEM
33251+ if ((start >> PAGE_SHIFT) < max_low_pfn)
33252+#endif
33253 return __va(phys);
33254
33255 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33256@@ -346,13 +349,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33257 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
33258 {
33259 if (page_is_ram(phys >> PAGE_SHIFT))
33260+#ifdef CONFIG_HIGHMEM
33261+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33262+#endif
33263 return;
33264
33265 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33266 return;
33267 }
33268
33269-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33270+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33271
33272 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33273 {
33274@@ -388,8 +394,7 @@ void __init early_ioremap_init(void)
33275 early_ioremap_setup();
33276
33277 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33278- memset(bm_pte, 0, sizeof(bm_pte));
33279- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33280+ pmd_populate_user(&init_mm, pmd, bm_pte);
33281
33282 /*
33283 * The boot-ioremap range spans multiple pmds, for which
33284diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33285index b4f2e7e..96c9c3e 100644
33286--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33287+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33288@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33289 * memory (e.g. tracked pages)? For now, we need this to avoid
33290 * invoking kmemcheck for PnP BIOS calls.
33291 */
33292- if (regs->flags & X86_VM_MASK)
33293+ if (v8086_mode(regs))
33294 return false;
33295- if (regs->cs != __KERNEL_CS)
33296+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33297 return false;
33298
33299 pte = kmemcheck_pte_lookup(address);
33300diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33301index 919b912..9267313 100644
33302--- a/arch/x86/mm/mmap.c
33303+++ b/arch/x86/mm/mmap.c
33304@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
33305 * Leave an at least ~128 MB hole with possible stack randomization.
33306 */
33307 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33308-#define MAX_GAP (TASK_SIZE/6*5)
33309+#define MAX_GAP (pax_task_size/6*5)
33310
33311 static int mmap_is_legacy(void)
33312 {
33313@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33314 return rnd << PAGE_SHIFT;
33315 }
33316
33317-static unsigned long mmap_base(void)
33318+static unsigned long mmap_base(struct mm_struct *mm)
33319 {
33320 unsigned long gap = rlimit(RLIMIT_STACK);
33321+ unsigned long pax_task_size = TASK_SIZE;
33322+
33323+#ifdef CONFIG_PAX_SEGMEXEC
33324+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33325+ pax_task_size = SEGMEXEC_TASK_SIZE;
33326+#endif
33327
33328 if (gap < MIN_GAP)
33329 gap = MIN_GAP;
33330 else if (gap > MAX_GAP)
33331 gap = MAX_GAP;
33332
33333- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33334+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33335 }
33336
33337 /*
33338 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33339 * does, but not when emulating X86_32
33340 */
33341-static unsigned long mmap_legacy_base(void)
33342+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33343 {
33344- if (mmap_is_ia32())
33345+ if (mmap_is_ia32()) {
33346+
33347+#ifdef CONFIG_PAX_SEGMEXEC
33348+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33349+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33350+ else
33351+#endif
33352+
33353 return TASK_UNMAPPED_BASE;
33354- else
33355+ } else
33356 return TASK_UNMAPPED_BASE + mmap_rnd();
33357 }
33358
33359@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33360 */
33361 void arch_pick_mmap_layout(struct mm_struct *mm)
33362 {
33363- mm->mmap_legacy_base = mmap_legacy_base();
33364- mm->mmap_base = mmap_base();
33365+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33366+ mm->mmap_base = mmap_base(mm);
33367+
33368+#ifdef CONFIG_PAX_RANDMMAP
33369+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33370+ mm->mmap_legacy_base += mm->delta_mmap;
33371+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33372+ }
33373+#endif
33374
33375 if (mmap_is_legacy()) {
33376 mm->mmap_base = mm->mmap_legacy_base;
33377diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33378index 0057a7a..95c7edd 100644
33379--- a/arch/x86/mm/mmio-mod.c
33380+++ b/arch/x86/mm/mmio-mod.c
33381@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33382 break;
33383 default:
33384 {
33385- unsigned char *ip = (unsigned char *)instptr;
33386+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33387 my_trace->opcode = MMIO_UNKNOWN_OP;
33388 my_trace->width = 0;
33389 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33390@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33391 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33392 void __iomem *addr)
33393 {
33394- static atomic_t next_id;
33395+ static atomic_unchecked_t next_id;
33396 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33397 /* These are page-unaligned. */
33398 struct mmiotrace_map map = {
33399@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33400 .private = trace
33401 },
33402 .phys = offset,
33403- .id = atomic_inc_return(&next_id)
33404+ .id = atomic_inc_return_unchecked(&next_id)
33405 };
33406 map.map_id = trace->id;
33407
33408@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33409 ioremap_trace_core(offset, size, addr);
33410 }
33411
33412-static void iounmap_trace_core(volatile void __iomem *addr)
33413+static void iounmap_trace_core(const volatile void __iomem *addr)
33414 {
33415 struct mmiotrace_map map = {
33416 .phys = 0,
33417@@ -328,7 +328,7 @@ not_enabled:
33418 }
33419 }
33420
33421-void mmiotrace_iounmap(volatile void __iomem *addr)
33422+void mmiotrace_iounmap(const volatile void __iomem *addr)
33423 {
33424 might_sleep();
33425 if (is_enabled()) /* recheck and proper locking in *_core() */
33426diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33427index 1a88370..3f598b5 100644
33428--- a/arch/x86/mm/numa.c
33429+++ b/arch/x86/mm/numa.c
33430@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33431 }
33432 }
33433
33434-static int __init numa_register_memblks(struct numa_meminfo *mi)
33435+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33436 {
33437 unsigned long uninitialized_var(pfn_align);
33438 int i, nid;
33439diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33440index 36de293..b820ddc 100644
33441--- a/arch/x86/mm/pageattr.c
33442+++ b/arch/x86/mm/pageattr.c
33443@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33444 */
33445 #ifdef CONFIG_PCI_BIOS
33446 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33447- pgprot_val(forbidden) |= _PAGE_NX;
33448+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33449 #endif
33450
33451 /*
33452@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33453 * Does not cover __inittext since that is gone later on. On
33454 * 64bit we do not enforce !NX on the low mapping
33455 */
33456- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33457- pgprot_val(forbidden) |= _PAGE_NX;
33458+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33459+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33460
33461+#ifdef CONFIG_DEBUG_RODATA
33462 /*
33463 * The .rodata section needs to be read-only. Using the pfn
33464 * catches all aliases.
33465@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33466 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33467 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33468 pgprot_val(forbidden) |= _PAGE_RW;
33469+#endif
33470
33471 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33472 /*
33473@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33474 }
33475 #endif
33476
33477+#ifdef CONFIG_PAX_KERNEXEC
33478+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33479+ pgprot_val(forbidden) |= _PAGE_RW;
33480+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33481+ }
33482+#endif
33483+
33484 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33485
33486 return prot;
33487@@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33488 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33489 {
33490 /* change init_mm */
33491+ pax_open_kernel();
33492 set_pte_atomic(kpte, pte);
33493+
33494 #ifdef CONFIG_X86_32
33495 if (!SHARED_KERNEL_PMD) {
33496+
33497+#ifdef CONFIG_PAX_PER_CPU_PGD
33498+ unsigned long cpu;
33499+#else
33500 struct page *page;
33501+#endif
33502
33503+#ifdef CONFIG_PAX_PER_CPU_PGD
33504+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33505+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33506+#else
33507 list_for_each_entry(page, &pgd_list, lru) {
33508- pgd_t *pgd;
33509+ pgd_t *pgd = (pgd_t *)page_address(page);
33510+#endif
33511+
33512 pud_t *pud;
33513 pmd_t *pmd;
33514
33515- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33516+ pgd += pgd_index(address);
33517 pud = pud_offset(pgd, address);
33518 pmd = pmd_offset(pud, address);
33519 set_pte_atomic((pte_t *)pmd, pte);
33520 }
33521 }
33522 #endif
33523+ pax_close_kernel();
33524 }
33525
33526 static int
33527diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33528index 6574388..87e9bef 100644
33529--- a/arch/x86/mm/pat.c
33530+++ b/arch/x86/mm/pat.c
33531@@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33532
33533 if (!entry) {
33534 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33535- current->comm, current->pid, start, end - 1);
33536+ current->comm, task_pid_nr(current), start, end - 1);
33537 return -EINVAL;
33538 }
33539
33540@@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33541
33542 while (cursor < to) {
33543 if (!devmem_is_allowed(pfn)) {
33544- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33545- current->comm, from, to - 1);
33546+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33547+ current->comm, from, to - 1, cursor);
33548 return 0;
33549 }
33550 cursor += PAGE_SIZE;
33551@@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33552 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33553 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33554 "for [mem %#010Lx-%#010Lx]\n",
33555- current->comm, current->pid,
33556+ current->comm, task_pid_nr(current),
33557 cattr_name(flags),
33558 base, (unsigned long long)(base + size-1));
33559 return -EINVAL;
33560@@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33561 flags = lookup_memtype(paddr);
33562 if (want_flags != flags) {
33563 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33564- current->comm, current->pid,
33565+ current->comm, task_pid_nr(current),
33566 cattr_name(want_flags),
33567 (unsigned long long)paddr,
33568 (unsigned long long)(paddr + size - 1),
33569@@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33570 free_memtype(paddr, paddr + size);
33571 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33572 " for [mem %#010Lx-%#010Lx], got %s\n",
33573- current->comm, current->pid,
33574+ current->comm, task_pid_nr(current),
33575 cattr_name(want_flags),
33576 (unsigned long long)paddr,
33577 (unsigned long long)(paddr + size - 1),
33578diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33579index 415f6c4..d319983 100644
33580--- a/arch/x86/mm/pat_rbtree.c
33581+++ b/arch/x86/mm/pat_rbtree.c
33582@@ -160,7 +160,7 @@ success:
33583
33584 failure:
33585 printk(KERN_INFO "%s:%d conflicting memory types "
33586- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33587+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33588 end, cattr_name(found_type), cattr_name(match->type));
33589 return -EBUSY;
33590 }
33591diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33592index 9f0614d..92ae64a 100644
33593--- a/arch/x86/mm/pf_in.c
33594+++ b/arch/x86/mm/pf_in.c
33595@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33596 int i;
33597 enum reason_type rv = OTHERS;
33598
33599- p = (unsigned char *)ins_addr;
33600+ p = (unsigned char *)ktla_ktva(ins_addr);
33601 p += skip_prefix(p, &prf);
33602 p += get_opcode(p, &opcode);
33603
33604@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33605 struct prefix_bits prf;
33606 int i;
33607
33608- p = (unsigned char *)ins_addr;
33609+ p = (unsigned char *)ktla_ktva(ins_addr);
33610 p += skip_prefix(p, &prf);
33611 p += get_opcode(p, &opcode);
33612
33613@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33614 struct prefix_bits prf;
33615 int i;
33616
33617- p = (unsigned char *)ins_addr;
33618+ p = (unsigned char *)ktla_ktva(ins_addr);
33619 p += skip_prefix(p, &prf);
33620 p += get_opcode(p, &opcode);
33621
33622@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33623 struct prefix_bits prf;
33624 int i;
33625
33626- p = (unsigned char *)ins_addr;
33627+ p = (unsigned char *)ktla_ktva(ins_addr);
33628 p += skip_prefix(p, &prf);
33629 p += get_opcode(p, &opcode);
33630 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33631@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33632 struct prefix_bits prf;
33633 int i;
33634
33635- p = (unsigned char *)ins_addr;
33636+ p = (unsigned char *)ktla_ktva(ins_addr);
33637 p += skip_prefix(p, &prf);
33638 p += get_opcode(p, &opcode);
33639 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33640diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33641index 6fb6927..4fc13c0 100644
33642--- a/arch/x86/mm/pgtable.c
33643+++ b/arch/x86/mm/pgtable.c
33644@@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33645 list_del(&page->lru);
33646 }
33647
33648-#define UNSHARED_PTRS_PER_PGD \
33649- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33650+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33651+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33652
33653+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33654+{
33655+ unsigned int count = USER_PGD_PTRS;
33656
33657+ if (!pax_user_shadow_base)
33658+ return;
33659+
33660+ while (count--)
33661+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33662+}
33663+#endif
33664+
33665+#ifdef CONFIG_PAX_PER_CPU_PGD
33666+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33667+{
33668+ unsigned int count = USER_PGD_PTRS;
33669+
33670+ while (count--) {
33671+ pgd_t pgd;
33672+
33673+#ifdef CONFIG_X86_64
33674+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33675+#else
33676+ pgd = *src++;
33677+#endif
33678+
33679+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33680+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33681+#endif
33682+
33683+ *dst++ = pgd;
33684+ }
33685+
33686+}
33687+#endif
33688+
33689+#ifdef CONFIG_X86_64
33690+#define pxd_t pud_t
33691+#define pyd_t pgd_t
33692+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33693+#define pgtable_pxd_page_ctor(page) true
33694+#define pgtable_pxd_page_dtor(page)
33695+#define pxd_free(mm, pud) pud_free((mm), (pud))
33696+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33697+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33698+#define PYD_SIZE PGDIR_SIZE
33699+#else
33700+#define pxd_t pmd_t
33701+#define pyd_t pud_t
33702+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33703+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33704+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33705+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33706+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33707+#define pyd_offset(mm, address) pud_offset((mm), (address))
33708+#define PYD_SIZE PUD_SIZE
33709+#endif
33710+
33711+#ifdef CONFIG_PAX_PER_CPU_PGD
33712+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33713+static inline void pgd_dtor(pgd_t *pgd) {}
33714+#else
33715 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33716 {
33717 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33718@@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33719 pgd_list_del(pgd);
33720 spin_unlock(&pgd_lock);
33721 }
33722+#endif
33723
33724 /*
33725 * List of all pgd's needed for non-PAE so it can invalidate entries
33726@@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33727 * -- nyc
33728 */
33729
33730-#ifdef CONFIG_X86_PAE
33731+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33732 /*
33733 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33734 * updating the top-level pagetable entries to guarantee the
33735@@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33736 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33737 * and initialize the kernel pmds here.
33738 */
33739-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33740+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33741
33742 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33743 {
33744@@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33745 */
33746 flush_tlb_mm(mm);
33747 }
33748+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33749+#define PREALLOCATED_PXDS USER_PGD_PTRS
33750 #else /* !CONFIG_X86_PAE */
33751
33752 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33753-#define PREALLOCATED_PMDS 0
33754+#define PREALLOCATED_PXDS 0
33755
33756 #endif /* CONFIG_X86_PAE */
33757
33758-static void free_pmds(pmd_t *pmds[])
33759+static void free_pxds(pxd_t *pxds[])
33760 {
33761 int i;
33762
33763- for(i = 0; i < PREALLOCATED_PMDS; i++)
33764- if (pmds[i]) {
33765- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33766- free_page((unsigned long)pmds[i]);
33767+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33768+ if (pxds[i]) {
33769+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33770+ free_page((unsigned long)pxds[i]);
33771 }
33772 }
33773
33774-static int preallocate_pmds(pmd_t *pmds[])
33775+static int preallocate_pxds(pxd_t *pxds[])
33776 {
33777 int i;
33778 bool failed = false;
33779
33780- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33781- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33782- if (!pmd)
33783+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33784+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33785+ if (!pxd)
33786 failed = true;
33787- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33788- free_page((unsigned long)pmd);
33789- pmd = NULL;
33790+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33791+ free_page((unsigned long)pxd);
33792+ pxd = NULL;
33793 failed = true;
33794 }
33795- pmds[i] = pmd;
33796+ pxds[i] = pxd;
33797 }
33798
33799 if (failed) {
33800- free_pmds(pmds);
33801+ free_pxds(pxds);
33802 return -ENOMEM;
33803 }
33804
33805@@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33806 * preallocate which never got a corresponding vma will need to be
33807 * freed manually.
33808 */
33809-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33810+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33811 {
33812 int i;
33813
33814- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33815+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33816 pgd_t pgd = pgdp[i];
33817
33818 if (pgd_val(pgd) != 0) {
33819- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33820+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33821
33822- pgdp[i] = native_make_pgd(0);
33823+ set_pgd(pgdp + i, native_make_pgd(0));
33824
33825- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33826- pmd_free(mm, pmd);
33827+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33828+ pxd_free(mm, pxd);
33829 }
33830 }
33831 }
33832
33833-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33834+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33835 {
33836- pud_t *pud;
33837+ pyd_t *pyd;
33838 int i;
33839
33840- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33841+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33842 return;
33843
33844- pud = pud_offset(pgd, 0);
33845-
33846- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33847- pmd_t *pmd = pmds[i];
33848+#ifdef CONFIG_X86_64
33849+ pyd = pyd_offset(mm, 0L);
33850+#else
33851+ pyd = pyd_offset(pgd, 0L);
33852+#endif
33853
33854+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33855+ pxd_t *pxd = pxds[i];
33856 if (i >= KERNEL_PGD_BOUNDARY)
33857- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33858- sizeof(pmd_t) * PTRS_PER_PMD);
33859+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33860+ sizeof(pxd_t) * PTRS_PER_PMD);
33861
33862- pud_populate(mm, pud, pmd);
33863+ pyd_populate(mm, pyd, pxd);
33864 }
33865 }
33866
33867 pgd_t *pgd_alloc(struct mm_struct *mm)
33868 {
33869 pgd_t *pgd;
33870- pmd_t *pmds[PREALLOCATED_PMDS];
33871+ pxd_t *pxds[PREALLOCATED_PXDS];
33872
33873 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33874
33875@@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33876
33877 mm->pgd = pgd;
33878
33879- if (preallocate_pmds(pmds) != 0)
33880+ if (preallocate_pxds(pxds) != 0)
33881 goto out_free_pgd;
33882
33883 if (paravirt_pgd_alloc(mm) != 0)
33884- goto out_free_pmds;
33885+ goto out_free_pxds;
33886
33887 /*
33888 * Make sure that pre-populating the pmds is atomic with
33889@@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33890 spin_lock(&pgd_lock);
33891
33892 pgd_ctor(mm, pgd);
33893- pgd_prepopulate_pmd(mm, pgd, pmds);
33894+ pgd_prepopulate_pxd(mm, pgd, pxds);
33895
33896 spin_unlock(&pgd_lock);
33897
33898 return pgd;
33899
33900-out_free_pmds:
33901- free_pmds(pmds);
33902+out_free_pxds:
33903+ free_pxds(pxds);
33904 out_free_pgd:
33905 free_page((unsigned long)pgd);
33906 out:
33907@@ -313,7 +380,7 @@ out:
33908
33909 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33910 {
33911- pgd_mop_up_pmds(mm, pgd);
33912+ pgd_mop_up_pxds(mm, pgd);
33913 pgd_dtor(pgd);
33914 paravirt_pgd_free(mm, pgd);
33915 free_page((unsigned long)pgd);
33916diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33917index 75cc097..79a097f 100644
33918--- a/arch/x86/mm/pgtable_32.c
33919+++ b/arch/x86/mm/pgtable_32.c
33920@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33921 return;
33922 }
33923 pte = pte_offset_kernel(pmd, vaddr);
33924+
33925+ pax_open_kernel();
33926 if (pte_val(pteval))
33927 set_pte_at(&init_mm, vaddr, pte, pteval);
33928 else
33929 pte_clear(&init_mm, vaddr, pte);
33930+ pax_close_kernel();
33931
33932 /*
33933 * It's enough to flush this one mapping.
33934diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33935index e666cbb..61788c45 100644
33936--- a/arch/x86/mm/physaddr.c
33937+++ b/arch/x86/mm/physaddr.c
33938@@ -10,7 +10,7 @@
33939 #ifdef CONFIG_X86_64
33940
33941 #ifdef CONFIG_DEBUG_VIRTUAL
33942-unsigned long __phys_addr(unsigned long x)
33943+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33944 {
33945 unsigned long y = x - __START_KERNEL_map;
33946
33947@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33948 #else
33949
33950 #ifdef CONFIG_DEBUG_VIRTUAL
33951-unsigned long __phys_addr(unsigned long x)
33952+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33953 {
33954 unsigned long phys_addr = x - PAGE_OFFSET;
33955 /* VMALLOC_* aren't constants */
33956diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33957index 90555bf..f5f1828 100644
33958--- a/arch/x86/mm/setup_nx.c
33959+++ b/arch/x86/mm/setup_nx.c
33960@@ -5,8 +5,10 @@
33961 #include <asm/pgtable.h>
33962 #include <asm/proto.h>
33963
33964+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33965 static int disable_nx;
33966
33967+#ifndef CONFIG_PAX_PAGEEXEC
33968 /*
33969 * noexec = on|off
33970 *
33971@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
33972 return 0;
33973 }
33974 early_param("noexec", noexec_setup);
33975+#endif
33976+
33977+#endif
33978
33979 void x86_configure_nx(void)
33980 {
33981+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33982 if (cpu_has_nx && !disable_nx)
33983 __supported_pte_mask |= _PAGE_NX;
33984 else
33985+#endif
33986 __supported_pte_mask &= ~_PAGE_NX;
33987 }
33988
33989diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
33990index ee61c36..e6fedeb 100644
33991--- a/arch/x86/mm/tlb.c
33992+++ b/arch/x86/mm/tlb.c
33993@@ -48,7 +48,11 @@ void leave_mm(int cpu)
33994 BUG();
33995 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
33996 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
33997+
33998+#ifndef CONFIG_PAX_PER_CPU_PGD
33999 load_cr3(swapper_pg_dir);
34000+#endif
34001+
34002 /*
34003 * This gets called in the idle path where RCU
34004 * functions differently. Tracing normally
34005diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34006new file mode 100644
34007index 0000000..dace51c
34008--- /dev/null
34009+++ b/arch/x86/mm/uderef_64.c
34010@@ -0,0 +1,37 @@
34011+#include <linux/mm.h>
34012+#include <asm/pgtable.h>
34013+#include <asm/uaccess.h>
34014+
34015+#ifdef CONFIG_PAX_MEMORY_UDEREF
34016+/* PaX: due to the special call convention these functions must
34017+ * - remain leaf functions under all configurations,
34018+ * - never be called directly, only dereferenced from the wrappers.
34019+ */
34020+void __pax_open_userland(void)
34021+{
34022+ unsigned int cpu;
34023+
34024+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34025+ return;
34026+
34027+ cpu = raw_get_cpu();
34028+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34029+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34030+ raw_put_cpu_no_resched();
34031+}
34032+EXPORT_SYMBOL(__pax_open_userland);
34033+
34034+void __pax_close_userland(void)
34035+{
34036+ unsigned int cpu;
34037+
34038+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34039+ return;
34040+
34041+ cpu = raw_get_cpu();
34042+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34043+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34044+ raw_put_cpu_no_resched();
34045+}
34046+EXPORT_SYMBOL(__pax_close_userland);
34047+#endif
34048diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34049index 6440221..f84b5c7 100644
34050--- a/arch/x86/net/bpf_jit.S
34051+++ b/arch/x86/net/bpf_jit.S
34052@@ -9,6 +9,7 @@
34053 */
34054 #include <linux/linkage.h>
34055 #include <asm/dwarf2.h>
34056+#include <asm/alternative-asm.h>
34057
34058 /*
34059 * Calling convention :
34060@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34061 jle bpf_slow_path_word
34062 mov (SKBDATA,%rsi),%eax
34063 bswap %eax /* ntohl() */
34064+ pax_force_retaddr
34065 ret
34066
34067 sk_load_half:
34068@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34069 jle bpf_slow_path_half
34070 movzwl (SKBDATA,%rsi),%eax
34071 rol $8,%ax # ntohs()
34072+ pax_force_retaddr
34073 ret
34074
34075 sk_load_byte:
34076@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34077 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34078 jle bpf_slow_path_byte
34079 movzbl (SKBDATA,%rsi),%eax
34080+ pax_force_retaddr
34081 ret
34082
34083 /* rsi contains offset and can be scratched */
34084@@ -90,6 +94,7 @@ bpf_slow_path_word:
34085 js bpf_error
34086 mov - MAX_BPF_STACK + 32(%rbp),%eax
34087 bswap %eax
34088+ pax_force_retaddr
34089 ret
34090
34091 bpf_slow_path_half:
34092@@ -98,12 +103,14 @@ bpf_slow_path_half:
34093 mov - MAX_BPF_STACK + 32(%rbp),%ax
34094 rol $8,%ax
34095 movzwl %ax,%eax
34096+ pax_force_retaddr
34097 ret
34098
34099 bpf_slow_path_byte:
34100 bpf_slow_path_common(1)
34101 js bpf_error
34102 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34103+ pax_force_retaddr
34104 ret
34105
34106 #define sk_negative_common(SIZE) \
34107@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34108 sk_negative_common(4)
34109 mov (%rax), %eax
34110 bswap %eax
34111+ pax_force_retaddr
34112 ret
34113
34114 bpf_slow_path_half_neg:
34115@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34116 mov (%rax),%ax
34117 rol $8,%ax
34118 movzwl %ax,%eax
34119+ pax_force_retaddr
34120 ret
34121
34122 bpf_slow_path_byte_neg:
34123@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34124 .globl sk_load_byte_negative_offset
34125 sk_negative_common(1)
34126 movzbl (%rax), %eax
34127+ pax_force_retaddr
34128 ret
34129
34130 bpf_error:
34131@@ -156,4 +166,5 @@ bpf_error:
34132 mov - MAX_BPF_STACK + 16(%rbp),%r14
34133 mov - MAX_BPF_STACK + 24(%rbp),%r15
34134 leaveq
34135+ pax_force_retaddr
34136 ret
34137diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34138index 3f62734..a57894f 100644
34139--- a/arch/x86/net/bpf_jit_comp.c
34140+++ b/arch/x86/net/bpf_jit_comp.c
34141@@ -13,7 +13,11 @@
34142 #include <linux/if_vlan.h>
34143 #include <asm/cacheflush.h>
34144
34145+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34146+int bpf_jit_enable __read_only;
34147+#else
34148 int bpf_jit_enable __read_mostly;
34149+#endif
34150
34151 /*
34152 * assembly code in arch/x86/net/bpf_jit.S
34153@@ -174,7 +178,9 @@ static inline u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34154 static void jit_fill_hole(void *area, unsigned int size)
34155 {
34156 /* fill whole space with int3 instructions */
34157+ pax_open_kernel();
34158 memset(area, 0xcc, size);
34159+ pax_close_kernel();
34160 }
34161
34162 struct jit_context {
34163@@ -894,7 +900,9 @@ common_load:
34164 pr_err("bpf_jit_compile fatal error\n");
34165 return -EFAULT;
34166 }
34167+ pax_open_kernel();
34168 memcpy(image + proglen, temp, ilen);
34169+ pax_close_kernel();
34170 }
34171 proglen += ilen;
34172 addrs[i] = proglen;
34173@@ -966,7 +974,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34174
34175 if (image) {
34176 bpf_flush_icache(header, image + proglen);
34177- set_memory_ro((unsigned long)header, header->pages);
34178 prog->bpf_func = (void *)image;
34179 prog->jited = true;
34180 }
34181@@ -979,12 +986,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34182 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34183 struct bpf_binary_header *header = (void *)addr;
34184
34185- if (!fp->jited)
34186- goto free_filter;
34187+ if (fp->jited)
34188+ bpf_jit_binary_free(header);
34189
34190- set_memory_rw(addr, header->pages);
34191- bpf_jit_binary_free(header);
34192-
34193-free_filter:
34194 bpf_prog_unlock_free(fp);
34195 }
34196diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34197index 5d04be5..2beeaa2 100644
34198--- a/arch/x86/oprofile/backtrace.c
34199+++ b/arch/x86/oprofile/backtrace.c
34200@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34201 struct stack_frame_ia32 *fp;
34202 unsigned long bytes;
34203
34204- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34205+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34206 if (bytes != 0)
34207 return NULL;
34208
34209- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34210+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34211
34212 oprofile_add_trace(bufhead[0].return_address);
34213
34214@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34215 struct stack_frame bufhead[2];
34216 unsigned long bytes;
34217
34218- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34219+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34220 if (bytes != 0)
34221 return NULL;
34222
34223@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34224 {
34225 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34226
34227- if (!user_mode_vm(regs)) {
34228+ if (!user_mode(regs)) {
34229 unsigned long stack = kernel_stack_pointer(regs);
34230 if (depth)
34231 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34232diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34233index 1d2e639..f6ef82a 100644
34234--- a/arch/x86/oprofile/nmi_int.c
34235+++ b/arch/x86/oprofile/nmi_int.c
34236@@ -23,6 +23,7 @@
34237 #include <asm/nmi.h>
34238 #include <asm/msr.h>
34239 #include <asm/apic.h>
34240+#include <asm/pgtable.h>
34241
34242 #include "op_counter.h"
34243 #include "op_x86_model.h"
34244@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34245 if (ret)
34246 return ret;
34247
34248- if (!model->num_virt_counters)
34249- model->num_virt_counters = model->num_counters;
34250+ if (!model->num_virt_counters) {
34251+ pax_open_kernel();
34252+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34253+ pax_close_kernel();
34254+ }
34255
34256 mux_init(ops);
34257
34258diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34259index 50d86c0..7985318 100644
34260--- a/arch/x86/oprofile/op_model_amd.c
34261+++ b/arch/x86/oprofile/op_model_amd.c
34262@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34263 num_counters = AMD64_NUM_COUNTERS;
34264 }
34265
34266- op_amd_spec.num_counters = num_counters;
34267- op_amd_spec.num_controls = num_counters;
34268- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34269+ pax_open_kernel();
34270+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34271+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34272+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34273+ pax_close_kernel();
34274
34275 return 0;
34276 }
34277diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34278index d90528e..0127e2b 100644
34279--- a/arch/x86/oprofile/op_model_ppro.c
34280+++ b/arch/x86/oprofile/op_model_ppro.c
34281@@ -19,6 +19,7 @@
34282 #include <asm/msr.h>
34283 #include <asm/apic.h>
34284 #include <asm/nmi.h>
34285+#include <asm/pgtable.h>
34286
34287 #include "op_x86_model.h"
34288 #include "op_counter.h"
34289@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34290
34291 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34292
34293- op_arch_perfmon_spec.num_counters = num_counters;
34294- op_arch_perfmon_spec.num_controls = num_counters;
34295+ pax_open_kernel();
34296+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34297+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34298+ pax_close_kernel();
34299 }
34300
34301 static int arch_perfmon_init(struct oprofile_operations *ignore)
34302diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34303index 71e8a67..6a313bb 100644
34304--- a/arch/x86/oprofile/op_x86_model.h
34305+++ b/arch/x86/oprofile/op_x86_model.h
34306@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34307 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34308 struct op_msrs const * const msrs);
34309 #endif
34310-};
34311+} __do_const;
34312
34313 struct op_counter_config;
34314
34315diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34316index b9958c3..24229ab 100644
34317--- a/arch/x86/pci/intel_mid_pci.c
34318+++ b/arch/x86/pci/intel_mid_pci.c
34319@@ -250,7 +250,7 @@ int __init intel_mid_pci_init(void)
34320 pci_mmcfg_late_init();
34321 pcibios_enable_irq = intel_mid_pci_irq_enable;
34322 pcibios_disable_irq = intel_mid_pci_irq_disable;
34323- pci_root_ops = intel_mid_pci_ops;
34324+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34325 pci_soc_mode = 1;
34326 /* Continue with standard init */
34327 return 1;
34328diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34329index eb500c2..eab9e70 100644
34330--- a/arch/x86/pci/irq.c
34331+++ b/arch/x86/pci/irq.c
34332@@ -51,7 +51,7 @@ struct irq_router {
34333 struct irq_router_handler {
34334 u16 vendor;
34335 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34336-};
34337+} __do_const;
34338
34339 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34340 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34341@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34342 return 0;
34343 }
34344
34345-static __initdata struct irq_router_handler pirq_routers[] = {
34346+static __initconst const struct irq_router_handler pirq_routers[] = {
34347 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34348 { PCI_VENDOR_ID_AL, ali_router_probe },
34349 { PCI_VENDOR_ID_ITE, ite_router_probe },
34350@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34351 static void __init pirq_find_router(struct irq_router *r)
34352 {
34353 struct irq_routing_table *rt = pirq_table;
34354- struct irq_router_handler *h;
34355+ const struct irq_router_handler *h;
34356
34357 #ifdef CONFIG_PCI_BIOS
34358 if (!rt->signature) {
34359@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34360 return 0;
34361 }
34362
34363-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34364+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34365 {
34366 .callback = fix_broken_hp_bios_irq9,
34367 .ident = "HP Pavilion N5400 Series Laptop",
34368diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34369index 9b83b90..4112152 100644
34370--- a/arch/x86/pci/pcbios.c
34371+++ b/arch/x86/pci/pcbios.c
34372@@ -79,7 +79,7 @@ union bios32 {
34373 static struct {
34374 unsigned long address;
34375 unsigned short segment;
34376-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34377+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34378
34379 /*
34380 * Returns the entry point for the given service, NULL on error
34381@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34382 unsigned long length; /* %ecx */
34383 unsigned long entry; /* %edx */
34384 unsigned long flags;
34385+ struct desc_struct d, *gdt;
34386
34387 local_irq_save(flags);
34388- __asm__("lcall *(%%edi); cld"
34389+
34390+ gdt = get_cpu_gdt_table(smp_processor_id());
34391+
34392+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34393+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34394+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34395+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34396+
34397+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34398 : "=a" (return_code),
34399 "=b" (address),
34400 "=c" (length),
34401 "=d" (entry)
34402 : "0" (service),
34403 "1" (0),
34404- "D" (&bios32_indirect));
34405+ "D" (&bios32_indirect),
34406+ "r"(__PCIBIOS_DS)
34407+ : "memory");
34408+
34409+ pax_open_kernel();
34410+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34411+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34412+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34413+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34414+ pax_close_kernel();
34415+
34416 local_irq_restore(flags);
34417
34418 switch (return_code) {
34419- case 0:
34420- return address + entry;
34421- case 0x80: /* Not present */
34422- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34423- return 0;
34424- default: /* Shouldn't happen */
34425- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34426- service, return_code);
34427+ case 0: {
34428+ int cpu;
34429+ unsigned char flags;
34430+
34431+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34432+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34433+ printk(KERN_WARNING "bios32_service: not valid\n");
34434 return 0;
34435+ }
34436+ address = address + PAGE_OFFSET;
34437+ length += 16UL; /* some BIOSs underreport this... */
34438+ flags = 4;
34439+ if (length >= 64*1024*1024) {
34440+ length >>= PAGE_SHIFT;
34441+ flags |= 8;
34442+ }
34443+
34444+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34445+ gdt = get_cpu_gdt_table(cpu);
34446+ pack_descriptor(&d, address, length, 0x9b, flags);
34447+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34448+ pack_descriptor(&d, address, length, 0x93, flags);
34449+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34450+ }
34451+ return entry;
34452+ }
34453+ case 0x80: /* Not present */
34454+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34455+ return 0;
34456+ default: /* Shouldn't happen */
34457+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34458+ service, return_code);
34459+ return 0;
34460 }
34461 }
34462
34463 static struct {
34464 unsigned long address;
34465 unsigned short segment;
34466-} pci_indirect = { 0, __KERNEL_CS };
34467+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34468
34469-static int pci_bios_present;
34470+static int pci_bios_present __read_only;
34471
34472 static int __init check_pcibios(void)
34473 {
34474@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34475 unsigned long flags, pcibios_entry;
34476
34477 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34478- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34479+ pci_indirect.address = pcibios_entry;
34480
34481 local_irq_save(flags);
34482- __asm__(
34483- "lcall *(%%edi); cld\n\t"
34484+ __asm__("movw %w6, %%ds\n\t"
34485+ "lcall *%%ss:(%%edi); cld\n\t"
34486+ "push %%ss\n\t"
34487+ "pop %%ds\n\t"
34488 "jc 1f\n\t"
34489 "xor %%ah, %%ah\n"
34490 "1:"
34491@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34492 "=b" (ebx),
34493 "=c" (ecx)
34494 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34495- "D" (&pci_indirect)
34496+ "D" (&pci_indirect),
34497+ "r" (__PCIBIOS_DS)
34498 : "memory");
34499 local_irq_restore(flags);
34500
34501@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34502
34503 switch (len) {
34504 case 1:
34505- __asm__("lcall *(%%esi); cld\n\t"
34506+ __asm__("movw %w6, %%ds\n\t"
34507+ "lcall *%%ss:(%%esi); cld\n\t"
34508+ "push %%ss\n\t"
34509+ "pop %%ds\n\t"
34510 "jc 1f\n\t"
34511 "xor %%ah, %%ah\n"
34512 "1:"
34513@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34514 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34515 "b" (bx),
34516 "D" ((long)reg),
34517- "S" (&pci_indirect));
34518+ "S" (&pci_indirect),
34519+ "r" (__PCIBIOS_DS));
34520 /*
34521 * Zero-extend the result beyond 8 bits, do not trust the
34522 * BIOS having done it:
34523@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34524 *value &= 0xff;
34525 break;
34526 case 2:
34527- __asm__("lcall *(%%esi); cld\n\t"
34528+ __asm__("movw %w6, %%ds\n\t"
34529+ "lcall *%%ss:(%%esi); cld\n\t"
34530+ "push %%ss\n\t"
34531+ "pop %%ds\n\t"
34532 "jc 1f\n\t"
34533 "xor %%ah, %%ah\n"
34534 "1:"
34535@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34536 : "1" (PCIBIOS_READ_CONFIG_WORD),
34537 "b" (bx),
34538 "D" ((long)reg),
34539- "S" (&pci_indirect));
34540+ "S" (&pci_indirect),
34541+ "r" (__PCIBIOS_DS));
34542 /*
34543 * Zero-extend the result beyond 16 bits, do not trust the
34544 * BIOS having done it:
34545@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34546 *value &= 0xffff;
34547 break;
34548 case 4:
34549- __asm__("lcall *(%%esi); cld\n\t"
34550+ __asm__("movw %w6, %%ds\n\t"
34551+ "lcall *%%ss:(%%esi); cld\n\t"
34552+ "push %%ss\n\t"
34553+ "pop %%ds\n\t"
34554 "jc 1f\n\t"
34555 "xor %%ah, %%ah\n"
34556 "1:"
34557@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34558 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34559 "b" (bx),
34560 "D" ((long)reg),
34561- "S" (&pci_indirect));
34562+ "S" (&pci_indirect),
34563+ "r" (__PCIBIOS_DS));
34564 break;
34565 }
34566
34567@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34568
34569 switch (len) {
34570 case 1:
34571- __asm__("lcall *(%%esi); cld\n\t"
34572+ __asm__("movw %w6, %%ds\n\t"
34573+ "lcall *%%ss:(%%esi); cld\n\t"
34574+ "push %%ss\n\t"
34575+ "pop %%ds\n\t"
34576 "jc 1f\n\t"
34577 "xor %%ah, %%ah\n"
34578 "1:"
34579@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34580 "c" (value),
34581 "b" (bx),
34582 "D" ((long)reg),
34583- "S" (&pci_indirect));
34584+ "S" (&pci_indirect),
34585+ "r" (__PCIBIOS_DS));
34586 break;
34587 case 2:
34588- __asm__("lcall *(%%esi); cld\n\t"
34589+ __asm__("movw %w6, %%ds\n\t"
34590+ "lcall *%%ss:(%%esi); cld\n\t"
34591+ "push %%ss\n\t"
34592+ "pop %%ds\n\t"
34593 "jc 1f\n\t"
34594 "xor %%ah, %%ah\n"
34595 "1:"
34596@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34597 "c" (value),
34598 "b" (bx),
34599 "D" ((long)reg),
34600- "S" (&pci_indirect));
34601+ "S" (&pci_indirect),
34602+ "r" (__PCIBIOS_DS));
34603 break;
34604 case 4:
34605- __asm__("lcall *(%%esi); cld\n\t"
34606+ __asm__("movw %w6, %%ds\n\t"
34607+ "lcall *%%ss:(%%esi); cld\n\t"
34608+ "push %%ss\n\t"
34609+ "pop %%ds\n\t"
34610 "jc 1f\n\t"
34611 "xor %%ah, %%ah\n"
34612 "1:"
34613@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34614 "c" (value),
34615 "b" (bx),
34616 "D" ((long)reg),
34617- "S" (&pci_indirect));
34618+ "S" (&pci_indirect),
34619+ "r" (__PCIBIOS_DS));
34620 break;
34621 }
34622
34623@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34624
34625 DBG("PCI: Fetching IRQ routing table... ");
34626 __asm__("push %%es\n\t"
34627+ "movw %w8, %%ds\n\t"
34628 "push %%ds\n\t"
34629 "pop %%es\n\t"
34630- "lcall *(%%esi); cld\n\t"
34631+ "lcall *%%ss:(%%esi); cld\n\t"
34632 "pop %%es\n\t"
34633+ "push %%ss\n\t"
34634+ "pop %%ds\n"
34635 "jc 1f\n\t"
34636 "xor %%ah, %%ah\n"
34637 "1:"
34638@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34639 "1" (0),
34640 "D" ((long) &opt),
34641 "S" (&pci_indirect),
34642- "m" (opt)
34643+ "m" (opt),
34644+ "r" (__PCIBIOS_DS)
34645 : "memory");
34646 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34647 if (ret & 0xff00)
34648@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34649 {
34650 int ret;
34651
34652- __asm__("lcall *(%%esi); cld\n\t"
34653+ __asm__("movw %w5, %%ds\n\t"
34654+ "lcall *%%ss:(%%esi); cld\n\t"
34655+ "push %%ss\n\t"
34656+ "pop %%ds\n"
34657 "jc 1f\n\t"
34658 "xor %%ah, %%ah\n"
34659 "1:"
34660@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34661 : "0" (PCIBIOS_SET_PCI_HW_INT),
34662 "b" ((dev->bus->number << 8) | dev->devfn),
34663 "c" ((irq << 8) | (pin + 10)),
34664- "S" (&pci_indirect));
34665+ "S" (&pci_indirect),
34666+ "r" (__PCIBIOS_DS));
34667 return !(ret & 0xff00);
34668 }
34669 EXPORT_SYMBOL(pcibios_set_irq_routing);
34670diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34671index 40e7cda..c7e6672 100644
34672--- a/arch/x86/platform/efi/efi_32.c
34673+++ b/arch/x86/platform/efi/efi_32.c
34674@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34675 {
34676 struct desc_ptr gdt_descr;
34677
34678+#ifdef CONFIG_PAX_KERNEXEC
34679+ struct desc_struct d;
34680+#endif
34681+
34682 local_irq_save(efi_rt_eflags);
34683
34684 load_cr3(initial_page_table);
34685 __flush_tlb_all();
34686
34687+#ifdef CONFIG_PAX_KERNEXEC
34688+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34689+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34690+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34691+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34692+#endif
34693+
34694 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34695 gdt_descr.size = GDT_SIZE - 1;
34696 load_gdt(&gdt_descr);
34697@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34698 {
34699 struct desc_ptr gdt_descr;
34700
34701+#ifdef CONFIG_PAX_KERNEXEC
34702+ struct desc_struct d;
34703+
34704+ memset(&d, 0, sizeof d);
34705+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34706+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34707+#endif
34708+
34709 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34710 gdt_descr.size = GDT_SIZE - 1;
34711 load_gdt(&gdt_descr);
34712
34713+#ifdef CONFIG_PAX_PER_CPU_PGD
34714+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34715+#else
34716 load_cr3(swapper_pg_dir);
34717+#endif
34718+
34719 __flush_tlb_all();
34720
34721 local_irq_restore(efi_rt_eflags);
34722diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34723index 35aecb6..46177db 100644
34724--- a/arch/x86/platform/efi/efi_64.c
34725+++ b/arch/x86/platform/efi/efi_64.c
34726@@ -99,6 +99,11 @@ void __init efi_call_phys_prolog(void)
34727 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34728 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34729 }
34730+
34731+#ifdef CONFIG_PAX_PER_CPU_PGD
34732+ load_cr3(swapper_pg_dir);
34733+#endif
34734+
34735 __flush_tlb_all();
34736 }
34737
34738@@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
34739 for (pgd = 0; pgd < n_pgds; pgd++)
34740 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34741 kfree(save_pgd);
34742+
34743+#ifdef CONFIG_PAX_PER_CPU_PGD
34744+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34745+#endif
34746+
34747 __flush_tlb_all();
34748 local_irq_restore(efi_flags);
34749 early_code_mapping_set_exec(0);
34750@@ -146,8 +156,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34751 unsigned npages;
34752 pgd_t *pgd;
34753
34754- if (efi_enabled(EFI_OLD_MEMMAP))
34755+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34756+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34757+ * able to execute the EFI services.
34758+ */
34759+ if (__supported_pte_mask & _PAGE_NX) {
34760+ unsigned long addr = (unsigned long) __va(0);
34761+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34762+
34763+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34764+#ifdef CONFIG_PAX_PER_CPU_PGD
34765+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34766+#endif
34767+ set_pgd(pgd_offset_k(addr), pe);
34768+ }
34769+
34770 return 0;
34771+ }
34772
34773 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34774 pgd = __va(efi_scratch.efi_pgt);
34775diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34776index 040192b..7d3300f 100644
34777--- a/arch/x86/platform/efi/efi_stub_32.S
34778+++ b/arch/x86/platform/efi/efi_stub_32.S
34779@@ -6,7 +6,9 @@
34780 */
34781
34782 #include <linux/linkage.h>
34783+#include <linux/init.h>
34784 #include <asm/page_types.h>
34785+#include <asm/segment.h>
34786
34787 /*
34788 * efi_call_phys(void *, ...) is a function with variable parameters.
34789@@ -20,7 +22,7 @@
34790 * service functions will comply with gcc calling convention, too.
34791 */
34792
34793-.text
34794+__INIT
34795 ENTRY(efi_call_phys)
34796 /*
34797 * 0. The function can only be called in Linux kernel. So CS has been
34798@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34799 * The mapping of lower virtual memory has been created in prolog and
34800 * epilog.
34801 */
34802- movl $1f, %edx
34803- subl $__PAGE_OFFSET, %edx
34804- jmp *%edx
34805+#ifdef CONFIG_PAX_KERNEXEC
34806+ movl $(__KERNEXEC_EFI_DS), %edx
34807+ mov %edx, %ds
34808+ mov %edx, %es
34809+ mov %edx, %ss
34810+ addl $2f,(1f)
34811+ ljmp *(1f)
34812+
34813+__INITDATA
34814+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34815+.previous
34816+
34817+2:
34818+ subl $2b,(1b)
34819+#else
34820+ jmp 1f-__PAGE_OFFSET
34821 1:
34822+#endif
34823
34824 /*
34825 * 2. Now on the top of stack is the return
34826@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34827 * parameter 2, ..., param n. To make things easy, we save the return
34828 * address of efi_call_phys in a global variable.
34829 */
34830- popl %edx
34831- movl %edx, saved_return_addr
34832- /* get the function pointer into ECX*/
34833- popl %ecx
34834- movl %ecx, efi_rt_function_ptr
34835- movl $2f, %edx
34836- subl $__PAGE_OFFSET, %edx
34837- pushl %edx
34838+ popl (saved_return_addr)
34839+ popl (efi_rt_function_ptr)
34840
34841 /*
34842 * 3. Clear PG bit in %CR0.
34843@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34844 /*
34845 * 5. Call the physical function.
34846 */
34847- jmp *%ecx
34848+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
34849
34850-2:
34851 /*
34852 * 6. After EFI runtime service returns, control will return to
34853 * following instruction. We'd better readjust stack pointer first.
34854@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34855 movl %cr0, %edx
34856 orl $0x80000000, %edx
34857 movl %edx, %cr0
34858- jmp 1f
34859-1:
34860+
34861 /*
34862 * 8. Now restore the virtual mode from flat mode by
34863 * adding EIP with PAGE_OFFSET.
34864 */
34865- movl $1f, %edx
34866- jmp *%edx
34867+#ifdef CONFIG_PAX_KERNEXEC
34868+ movl $(__KERNEL_DS), %edx
34869+ mov %edx, %ds
34870+ mov %edx, %es
34871+ mov %edx, %ss
34872+ ljmp $(__KERNEL_CS),$1f
34873+#else
34874+ jmp 1f+__PAGE_OFFSET
34875+#endif
34876 1:
34877
34878 /*
34879 * 9. Balance the stack. And because EAX contain the return value,
34880 * we'd better not clobber it.
34881 */
34882- leal efi_rt_function_ptr, %edx
34883- movl (%edx), %ecx
34884- pushl %ecx
34885+ pushl (efi_rt_function_ptr)
34886
34887 /*
34888- * 10. Push the saved return address onto the stack and return.
34889+ * 10. Return to the saved return address.
34890 */
34891- leal saved_return_addr, %edx
34892- movl (%edx), %ecx
34893- pushl %ecx
34894- ret
34895+ jmpl *(saved_return_addr)
34896 ENDPROC(efi_call_phys)
34897 .previous
34898
34899-.data
34900+__INITDATA
34901 saved_return_addr:
34902 .long 0
34903 efi_rt_function_ptr:
34904diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34905index 5fcda72..cd4dc41 100644
34906--- a/arch/x86/platform/efi/efi_stub_64.S
34907+++ b/arch/x86/platform/efi/efi_stub_64.S
34908@@ -11,6 +11,7 @@
34909 #include <asm/msr.h>
34910 #include <asm/processor-flags.h>
34911 #include <asm/page_types.h>
34912+#include <asm/alternative-asm.h>
34913
34914 #define SAVE_XMM \
34915 mov %rsp, %rax; \
34916@@ -88,6 +89,7 @@ ENTRY(efi_call)
34917 RESTORE_PGT
34918 addq $48, %rsp
34919 RESTORE_XMM
34920+ pax_force_retaddr 0, 1
34921 ret
34922 ENDPROC(efi_call)
34923
34924@@ -245,8 +247,8 @@ efi_gdt64:
34925 .long 0 /* Filled out by user */
34926 .word 0
34927 .quad 0x0000000000000000 /* NULL descriptor */
34928- .quad 0x00af9a000000ffff /* __KERNEL_CS */
34929- .quad 0x00cf92000000ffff /* __KERNEL_DS */
34930+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
34931+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
34932 .quad 0x0080890000000000 /* TS descriptor */
34933 .quad 0x0000000000000000 /* TS continued */
34934 efi_gdt64_end:
34935diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34936index 1bbedc4..eb795b5 100644
34937--- a/arch/x86/platform/intel-mid/intel-mid.c
34938+++ b/arch/x86/platform/intel-mid/intel-mid.c
34939@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34940 {
34941 };
34942
34943-static void intel_mid_reboot(void)
34944+static void __noreturn intel_mid_reboot(void)
34945 {
34946 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34947+ BUG();
34948 }
34949
34950 static unsigned long __init intel_mid_calibrate_tsc(void)
34951diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34952index 3c1c386..59a68ed 100644
34953--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34954+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34955@@ -13,6 +13,6 @@
34956 /* For every CPU addition a new get_<cpuname>_ops interface needs
34957 * to be added.
34958 */
34959-extern void *get_penwell_ops(void);
34960-extern void *get_cloverview_ops(void);
34961-extern void *get_tangier_ops(void);
34962+extern const void *get_penwell_ops(void);
34963+extern const void *get_cloverview_ops(void);
34964+extern const void *get_tangier_ops(void);
34965diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
34966index 23381d2..8ddc10e 100644
34967--- a/arch/x86/platform/intel-mid/mfld.c
34968+++ b/arch/x86/platform/intel-mid/mfld.c
34969@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
34970 pm_power_off = mfld_power_off;
34971 }
34972
34973-void *get_penwell_ops(void)
34974+const void *get_penwell_ops(void)
34975 {
34976 return &penwell_ops;
34977 }
34978
34979-void *get_cloverview_ops(void)
34980+const void *get_cloverview_ops(void)
34981 {
34982 return &penwell_ops;
34983 }
34984diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
34985index aaca917..66eadbc 100644
34986--- a/arch/x86/platform/intel-mid/mrfl.c
34987+++ b/arch/x86/platform/intel-mid/mrfl.c
34988@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
34989 .arch_setup = tangier_arch_setup,
34990 };
34991
34992-void *get_tangier_ops(void)
34993+const void *get_tangier_ops(void)
34994 {
34995 return &tangier_ops;
34996 }
34997diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
34998index d6ee929..3637cb5 100644
34999--- a/arch/x86/platform/olpc/olpc_dt.c
35000+++ b/arch/x86/platform/olpc/olpc_dt.c
35001@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35002 return res;
35003 }
35004
35005-static struct of_pdt_ops prom_olpc_ops __initdata = {
35006+static struct of_pdt_ops prom_olpc_ops __initconst = {
35007 .nextprop = olpc_dt_nextprop,
35008 .getproplen = olpc_dt_getproplen,
35009 .getproperty = olpc_dt_getproperty,
35010diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35011index 6ec7910..ecdbb11 100644
35012--- a/arch/x86/power/cpu.c
35013+++ b/arch/x86/power/cpu.c
35014@@ -137,11 +137,8 @@ static void do_fpu_end(void)
35015 static void fix_processor_context(void)
35016 {
35017 int cpu = smp_processor_id();
35018- struct tss_struct *t = &per_cpu(init_tss, cpu);
35019-#ifdef CONFIG_X86_64
35020- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35021- tss_desc tss;
35022-#endif
35023+ struct tss_struct *t = init_tss + cpu;
35024+
35025 set_tss_desc(cpu, t); /*
35026 * This just modifies memory; should not be
35027 * necessary. But... This is necessary, because
35028@@ -150,10 +147,6 @@ static void fix_processor_context(void)
35029 */
35030
35031 #ifdef CONFIG_X86_64
35032- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35033- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35034- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35035-
35036 syscall_init(); /* This sets MSR_*STAR and related */
35037 #endif
35038 load_TR_desc(); /* This does ltr */
35039diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35040index bad628a..a102610 100644
35041--- a/arch/x86/realmode/init.c
35042+++ b/arch/x86/realmode/init.c
35043@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35044 __va(real_mode_header->trampoline_header);
35045
35046 #ifdef CONFIG_X86_32
35047- trampoline_header->start = __pa_symbol(startup_32_smp);
35048+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35049+
35050+#ifdef CONFIG_PAX_KERNEXEC
35051+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35052+#endif
35053+
35054+ trampoline_header->boot_cs = __BOOT_CS;
35055 trampoline_header->gdt_limit = __BOOT_DS + 7;
35056 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35057 #else
35058@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35059 *trampoline_cr4_features = read_cr4();
35060
35061 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35062- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35063+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35064 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35065 #endif
35066 }
35067diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35068index 7c0d7be..d24dc88 100644
35069--- a/arch/x86/realmode/rm/Makefile
35070+++ b/arch/x86/realmode/rm/Makefile
35071@@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35072
35073 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35074 -I$(srctree)/arch/x86/boot
35075+ifdef CONSTIFY_PLUGIN
35076+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35077+endif
35078 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35079 GCOV_PROFILE := n
35080diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35081index a28221d..93c40f1 100644
35082--- a/arch/x86/realmode/rm/header.S
35083+++ b/arch/x86/realmode/rm/header.S
35084@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35085 #endif
35086 /* APM/BIOS reboot */
35087 .long pa_machine_real_restart_asm
35088-#ifdef CONFIG_X86_64
35089+#ifdef CONFIG_X86_32
35090+ .long __KERNEL_CS
35091+#else
35092 .long __KERNEL32_CS
35093 #endif
35094 END(real_mode_header)
35095diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35096index 48ddd76..c26749f 100644
35097--- a/arch/x86/realmode/rm/trampoline_32.S
35098+++ b/arch/x86/realmode/rm/trampoline_32.S
35099@@ -24,6 +24,12 @@
35100 #include <asm/page_types.h>
35101 #include "realmode.h"
35102
35103+#ifdef CONFIG_PAX_KERNEXEC
35104+#define ta(X) (X)
35105+#else
35106+#define ta(X) (pa_ ## X)
35107+#endif
35108+
35109 .text
35110 .code16
35111
35112@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35113
35114 cli # We should be safe anyway
35115
35116- movl tr_start, %eax # where we need to go
35117-
35118 movl $0xA5A5A5A5, trampoline_status
35119 # write marker for master knows we're running
35120
35121@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35122 movw $1, %dx # protected mode (PE) bit
35123 lmsw %dx # into protected mode
35124
35125- ljmpl $__BOOT_CS, $pa_startup_32
35126+ ljmpl *(trampoline_header)
35127
35128 .section ".text32","ax"
35129 .code32
35130@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35131 .balign 8
35132 GLOBAL(trampoline_header)
35133 tr_start: .space 4
35134- tr_gdt_pad: .space 2
35135+ tr_boot_cs: .space 2
35136 tr_gdt: .space 6
35137 END(trampoline_header)
35138
35139diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35140index dac7b20..72dbaca 100644
35141--- a/arch/x86/realmode/rm/trampoline_64.S
35142+++ b/arch/x86/realmode/rm/trampoline_64.S
35143@@ -93,6 +93,7 @@ ENTRY(startup_32)
35144 movl %edx, %gs
35145
35146 movl pa_tr_cr4, %eax
35147+ andl $~X86_CR4_PCIDE, %eax
35148 movl %eax, %cr4 # Enable PAE mode
35149
35150 # Setup trampoline 4 level pagetables
35151@@ -106,7 +107,7 @@ ENTRY(startup_32)
35152 wrmsr
35153
35154 # Enable paging and in turn activate Long Mode
35155- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35156+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35157 movl %eax, %cr0
35158
35159 /*
35160diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35161index 9e7e147..25a4158 100644
35162--- a/arch/x86/realmode/rm/wakeup_asm.S
35163+++ b/arch/x86/realmode/rm/wakeup_asm.S
35164@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35165 lgdtl pmode_gdt
35166
35167 /* This really couldn't... */
35168- movl pmode_entry, %eax
35169 movl pmode_cr0, %ecx
35170 movl %ecx, %cr0
35171- ljmpl $__KERNEL_CS, $pa_startup_32
35172- /* -> jmp *%eax in trampoline_32.S */
35173+
35174+ ljmpl *pmode_entry
35175 #else
35176 jmp trampoline_start
35177 #endif
35178diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35179index 604a37e..e49702a 100644
35180--- a/arch/x86/tools/Makefile
35181+++ b/arch/x86/tools/Makefile
35182@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35183
35184 $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c
35185
35186-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35187+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35188 hostprogs-y += relocs
35189 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35190 PHONY += relocs
35191diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35192index a5efb21..97490e9 100644
35193--- a/arch/x86/tools/relocs.c
35194+++ b/arch/x86/tools/relocs.c
35195@@ -1,5 +1,7 @@
35196 /* This is included from relocs_32/64.c */
35197
35198+#include "../../../include/generated/autoconf.h"
35199+
35200 #define ElfW(type) _ElfW(ELF_BITS, type)
35201 #define _ElfW(bits, type) __ElfW(bits, type)
35202 #define __ElfW(bits, type) Elf##bits##_##type
35203@@ -11,6 +13,7 @@
35204 #define Elf_Sym ElfW(Sym)
35205
35206 static Elf_Ehdr ehdr;
35207+static Elf_Phdr *phdr;
35208
35209 struct relocs {
35210 uint32_t *offset;
35211@@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
35212 }
35213 }
35214
35215+static void read_phdrs(FILE *fp)
35216+{
35217+ unsigned int i;
35218+
35219+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35220+ if (!phdr) {
35221+ die("Unable to allocate %d program headers\n",
35222+ ehdr.e_phnum);
35223+ }
35224+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35225+ die("Seek to %d failed: %s\n",
35226+ ehdr.e_phoff, strerror(errno));
35227+ }
35228+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35229+ die("Cannot read ELF program headers: %s\n",
35230+ strerror(errno));
35231+ }
35232+ for(i = 0; i < ehdr.e_phnum; i++) {
35233+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35234+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35235+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35236+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35237+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35238+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35239+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35240+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35241+ }
35242+
35243+}
35244+
35245 static void read_shdrs(FILE *fp)
35246 {
35247- int i;
35248+ unsigned int i;
35249 Elf_Shdr shdr;
35250
35251 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35252@@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
35253
35254 static void read_strtabs(FILE *fp)
35255 {
35256- int i;
35257+ unsigned int i;
35258 for (i = 0; i < ehdr.e_shnum; i++) {
35259 struct section *sec = &secs[i];
35260 if (sec->shdr.sh_type != SHT_STRTAB) {
35261@@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
35262
35263 static void read_symtabs(FILE *fp)
35264 {
35265- int i,j;
35266+ unsigned int i,j;
35267 for (i = 0; i < ehdr.e_shnum; i++) {
35268 struct section *sec = &secs[i];
35269 if (sec->shdr.sh_type != SHT_SYMTAB) {
35270@@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
35271 }
35272
35273
35274-static void read_relocs(FILE *fp)
35275+static void read_relocs(FILE *fp, int use_real_mode)
35276 {
35277- int i,j;
35278+ unsigned int i,j;
35279+ uint32_t base;
35280+
35281 for (i = 0; i < ehdr.e_shnum; i++) {
35282 struct section *sec = &secs[i];
35283 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35284@@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
35285 die("Cannot read symbol table: %s\n",
35286 strerror(errno));
35287 }
35288+ base = 0;
35289+
35290+#ifdef CONFIG_X86_32
35291+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35292+ if (phdr[j].p_type != PT_LOAD )
35293+ continue;
35294+ if (secs[sec->shdr.sh_info].shdr.sh_offset < phdr[j].p_offset || secs[sec->shdr.sh_info].shdr.sh_offset >= phdr[j].p_offset + phdr[j].p_filesz)
35295+ continue;
35296+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35297+ break;
35298+ }
35299+#endif
35300+
35301 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35302 Elf_Rel *rel = &sec->reltab[j];
35303- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35304+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35305 rel->r_info = elf_xword_to_cpu(rel->r_info);
35306 #if (SHT_REL_TYPE == SHT_RELA)
35307 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35308@@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35309
35310 static void print_absolute_symbols(void)
35311 {
35312- int i;
35313+ unsigned int i;
35314 const char *format;
35315
35316 if (ELF_BITS == 64)
35317@@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35318 for (i = 0; i < ehdr.e_shnum; i++) {
35319 struct section *sec = &secs[i];
35320 char *sym_strtab;
35321- int j;
35322+ unsigned int j;
35323
35324 if (sec->shdr.sh_type != SHT_SYMTAB) {
35325 continue;
35326@@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35327
35328 static void print_absolute_relocs(void)
35329 {
35330- int i, printed = 0;
35331+ unsigned int i, printed = 0;
35332 const char *format;
35333
35334 if (ELF_BITS == 64)
35335@@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35336 struct section *sec_applies, *sec_symtab;
35337 char *sym_strtab;
35338 Elf_Sym *sh_symtab;
35339- int j;
35340+ unsigned int j;
35341 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35342 continue;
35343 }
35344@@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35345 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35346 Elf_Sym *sym, const char *symname))
35347 {
35348- int i;
35349+ unsigned int i;
35350 /* Walk through the relocations */
35351 for (i = 0; i < ehdr.e_shnum; i++) {
35352 char *sym_strtab;
35353 Elf_Sym *sh_symtab;
35354 struct section *sec_applies, *sec_symtab;
35355- int j;
35356+ unsigned int j;
35357 struct section *sec = &secs[i];
35358
35359 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35360@@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35361 {
35362 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35363 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35364+ char *sym_strtab = sec->link->link->strtab;
35365+
35366+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35367+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35368+ return 0;
35369+
35370+#ifdef CONFIG_PAX_KERNEXEC
35371+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35372+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35373+ return 0;
35374+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35375+ return 0;
35376+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35377+ return 0;
35378+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35379+ return 0;
35380+#endif
35381
35382 switch (r_type) {
35383 case R_386_NONE:
35384@@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35385
35386 static void emit_relocs(int as_text, int use_real_mode)
35387 {
35388- int i;
35389+ unsigned int i;
35390 int (*write_reloc)(uint32_t, FILE *) = write32;
35391 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35392 const char *symname);
35393@@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35394 {
35395 regex_init(use_real_mode);
35396 read_ehdr(fp);
35397+ read_phdrs(fp);
35398 read_shdrs(fp);
35399 read_strtabs(fp);
35400 read_symtabs(fp);
35401- read_relocs(fp);
35402+ read_relocs(fp, use_real_mode);
35403 if (ELF_BITS == 64)
35404 percpu_init();
35405 if (show_absolute_syms) {
35406diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35407index f40281e..92728c9 100644
35408--- a/arch/x86/um/mem_32.c
35409+++ b/arch/x86/um/mem_32.c
35410@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35411 gate_vma.vm_start = FIXADDR_USER_START;
35412 gate_vma.vm_end = FIXADDR_USER_END;
35413 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35414- gate_vma.vm_page_prot = __P101;
35415+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35416
35417 return 0;
35418 }
35419diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35420index 80ffa5b..a33bd15 100644
35421--- a/arch/x86/um/tls_32.c
35422+++ b/arch/x86/um/tls_32.c
35423@@ -260,7 +260,7 @@ out:
35424 if (unlikely(task == current &&
35425 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35426 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35427- "without flushed TLS.", current->pid);
35428+ "without flushed TLS.", task_pid_nr(current));
35429 }
35430
35431 return 0;
35432diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35433index 5a4affe..9e2d522 100644
35434--- a/arch/x86/vdso/Makefile
35435+++ b/arch/x86/vdso/Makefile
35436@@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO $@
35437 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35438 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35439
35440-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35441+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35442 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35443 GCOV_PROFILE := n
35444
35445diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35446index 0224987..c7d65a5 100644
35447--- a/arch/x86/vdso/vdso2c.h
35448+++ b/arch/x86/vdso/vdso2c.h
35449@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35450 unsigned long load_size = -1; /* Work around bogus warning */
35451 unsigned long mapping_size;
35452 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35453- int i;
35454+ unsigned int i;
35455 unsigned long j;
35456 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35457 *alt_sec = NULL;
35458diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35459index e904c27..b9eaa03 100644
35460--- a/arch/x86/vdso/vdso32-setup.c
35461+++ b/arch/x86/vdso/vdso32-setup.c
35462@@ -14,6 +14,7 @@
35463 #include <asm/cpufeature.h>
35464 #include <asm/processor.h>
35465 #include <asm/vdso.h>
35466+#include <asm/mman.h>
35467
35468 #ifdef CONFIG_COMPAT_VDSO
35469 #define VDSO_DEFAULT 0
35470diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35471index 208c220..54f1447 100644
35472--- a/arch/x86/vdso/vma.c
35473+++ b/arch/x86/vdso/vma.c
35474@@ -16,10 +16,9 @@
35475 #include <asm/vdso.h>
35476 #include <asm/page.h>
35477 #include <asm/hpet.h>
35478+#include <asm/mman.h>
35479
35480 #if defined(CONFIG_X86_64)
35481-unsigned int __read_mostly vdso64_enabled = 1;
35482-
35483 extern unsigned short vdso_sync_cpuid;
35484 #endif
35485
35486@@ -114,6 +113,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35487 .pages = no_pages,
35488 };
35489
35490+#ifdef CONFIG_PAX_RANDMMAP
35491+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35492+ calculate_addr = false;
35493+#endif
35494+
35495 if (calculate_addr) {
35496 addr = vdso_addr(current->mm->start_stack,
35497 image->size - image->sym_vvar_start);
35498@@ -124,14 +128,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35499 down_write(&mm->mmap_sem);
35500
35501 addr = get_unmapped_area(NULL, addr,
35502- image->size - image->sym_vvar_start, 0, 0);
35503+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35504 if (IS_ERR_VALUE(addr)) {
35505 ret = addr;
35506 goto up_fail;
35507 }
35508
35509 text_start = addr - image->sym_vvar_start;
35510- current->mm->context.vdso = (void __user *)text_start;
35511+ mm->context.vdso = text_start;
35512
35513 /*
35514 * MAYWRITE to allow gdb to COW and set breakpoints
35515@@ -176,15 +180,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35516 hpet_address >> PAGE_SHIFT,
35517 PAGE_SIZE,
35518 pgprot_noncached(PAGE_READONLY));
35519-
35520- if (ret)
35521- goto up_fail;
35522 }
35523 #endif
35524
35525 up_fail:
35526 if (ret)
35527- current->mm->context.vdso = NULL;
35528+ current->mm->context.vdso = 0;
35529
35530 up_write(&mm->mmap_sem);
35531 return ret;
35532@@ -204,8 +205,8 @@ static int load_vdso32(void)
35533
35534 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35535 current_thread_info()->sysenter_return =
35536- current->mm->context.vdso +
35537- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35538+ (void __force_user *)(current->mm->context.vdso +
35539+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35540
35541 return 0;
35542 }
35543@@ -214,9 +215,6 @@ static int load_vdso32(void)
35544 #ifdef CONFIG_X86_64
35545 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35546 {
35547- if (!vdso64_enabled)
35548- return 0;
35549-
35550 return map_vdso(&vdso_image_64, true);
35551 }
35552
35553@@ -225,12 +223,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35554 int uses_interp)
35555 {
35556 #ifdef CONFIG_X86_X32_ABI
35557- if (test_thread_flag(TIF_X32)) {
35558- if (!vdso64_enabled)
35559- return 0;
35560-
35561+ if (test_thread_flag(TIF_X32))
35562 return map_vdso(&vdso_image_x32, true);
35563- }
35564 #endif
35565
35566 return load_vdso32();
35567@@ -242,12 +236,3 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35568 return load_vdso32();
35569 }
35570 #endif
35571-
35572-#ifdef CONFIG_X86_64
35573-static __init int vdso_setup(char *s)
35574-{
35575- vdso64_enabled = simple_strtoul(s, NULL, 0);
35576- return 0;
35577-}
35578-__setup("vdso=", vdso_setup);
35579-#endif
35580diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35581index e88fda8..76ce7ce 100644
35582--- a/arch/x86/xen/Kconfig
35583+++ b/arch/x86/xen/Kconfig
35584@@ -9,6 +9,7 @@ config XEN
35585 select XEN_HAVE_PVMMU
35586 depends on X86_64 || (X86_32 && X86_PAE)
35587 depends on X86_TSC
35588+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35589 help
35590 This is the Linux Xen port. Enabling this will allow the
35591 kernel to boot in a paravirtualized environment under the
35592diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35593index fac5e4f..89c3525 100644
35594--- a/arch/x86/xen/enlighten.c
35595+++ b/arch/x86/xen/enlighten.c
35596@@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35597
35598 struct shared_info xen_dummy_shared_info;
35599
35600-void *xen_initial_gdt;
35601-
35602 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35603 __read_mostly int xen_have_vector_callback;
35604 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35605@@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35606 {
35607 unsigned long va = dtr->address;
35608 unsigned int size = dtr->size + 1;
35609- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35610- unsigned long frames[pages];
35611+ unsigned long frames[65536 / PAGE_SIZE];
35612 int f;
35613
35614 /*
35615@@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35616 {
35617 unsigned long va = dtr->address;
35618 unsigned int size = dtr->size + 1;
35619- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35620- unsigned long frames[pages];
35621+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35622 int f;
35623
35624 /*
35625@@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35626 * 8-byte entries, or 16 4k pages..
35627 */
35628
35629- BUG_ON(size > 65536);
35630+ BUG_ON(size > GDT_SIZE);
35631 BUG_ON(va & ~PAGE_MASK);
35632
35633 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35634@@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35635 return 0;
35636 }
35637
35638-static void set_xen_basic_apic_ops(void)
35639+static void __init set_xen_basic_apic_ops(void)
35640 {
35641 apic->read = xen_apic_read;
35642 apic->write = xen_apic_write;
35643@@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35644 #endif
35645 };
35646
35647-static void xen_reboot(int reason)
35648+static __noreturn void xen_reboot(int reason)
35649 {
35650 struct sched_shutdown r = { .reason = reason };
35651
35652- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35653- BUG();
35654+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35655+ BUG();
35656 }
35657
35658-static void xen_restart(char *msg)
35659+static __noreturn void xen_restart(char *msg)
35660 {
35661 xen_reboot(SHUTDOWN_reboot);
35662 }
35663
35664-static void xen_emergency_restart(void)
35665+static __noreturn void xen_emergency_restart(void)
35666 {
35667 xen_reboot(SHUTDOWN_reboot);
35668 }
35669
35670-static void xen_machine_halt(void)
35671+static __noreturn void xen_machine_halt(void)
35672 {
35673 xen_reboot(SHUTDOWN_poweroff);
35674 }
35675
35676-static void xen_machine_power_off(void)
35677+static __noreturn void xen_machine_power_off(void)
35678 {
35679 if (pm_power_off)
35680 pm_power_off();
35681@@ -1456,8 +1452,11 @@ static void __ref xen_setup_gdt(int cpu)
35682 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35683 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35684
35685- setup_stack_canary_segment(0);
35686- switch_to_new_gdt(0);
35687+ setup_stack_canary_segment(cpu);
35688+#ifdef CONFIG_X86_64
35689+ load_percpu_segment(cpu);
35690+#endif
35691+ switch_to_new_gdt(cpu);
35692
35693 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35694 pv_cpu_ops.load_gdt = xen_load_gdt;
35695@@ -1573,7 +1572,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 +1610,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 0a536dc..b8f7aca 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 650afac1..f3307de 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 c305d41..a96de79 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 6341e66..ebcf59c 100644
36357--- a/drivers/acpi/device_pm.c
36358+++ b/drivers/acpi/device_pm.c
36359@@ -1029,6 +1029,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@@ -1047,6 +1049,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@@ -1116,7 +1119,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 485f7ea..9a8df4a 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@@ -4800,7 +4800,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@@ -4816,7 +4816,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@@ -5920,6 +5920,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@@ -5933,8 +5934,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@@ -6130,7 +6132,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 876bae5..8978785 100644
37526--- a/drivers/base/bus.c
37527+++ b/drivers/base/bus.c
37528@@ -1126,7 +1126,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@@ -1151,7 +1151,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..e1797b3 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))
37609@@ -2215,7 +2215,9 @@ int genpd_dev_pm_attach(struct device *dev)
37610 return ret;
37611 }
37612
37613- dev->pm_domain->detach = genpd_dev_pm_detach;
37614+ pax_open_kernel();
37615+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37616+ pax_close_kernel();
37617
37618 return 0;
37619 }
37620diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37621index a9d26ed..74b8405 100644
37622--- a/drivers/base/power/sysfs.c
37623+++ b/drivers/base/power/sysfs.c
37624@@ -182,7 +182,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37625 return -EIO;
37626 }
37627 }
37628- return sprintf(buf, p);
37629+ return sprintf(buf, "%s", p);
37630 }
37631
37632 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37633diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37634index c2744b3..08fac19 100644
37635--- a/drivers/base/power/wakeup.c
37636+++ b/drivers/base/power/wakeup.c
37637@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37638 * They need to be modified together atomically, so it's better to use one
37639 * atomic variable to hold them both.
37640 */
37641-static atomic_t combined_event_count = ATOMIC_INIT(0);
37642+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37643
37644 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37645 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37646
37647 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37648 {
37649- unsigned int comb = atomic_read(&combined_event_count);
37650+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37651
37652 *cnt = (comb >> IN_PROGRESS_BITS);
37653 *inpr = comb & MAX_IN_PROGRESS;
37654@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37655 ws->start_prevent_time = ws->last_time;
37656
37657 /* Increment the counter of events in progress. */
37658- cec = atomic_inc_return(&combined_event_count);
37659+ cec = atomic_inc_return_unchecked(&combined_event_count);
37660
37661 trace_wakeup_source_activate(ws->name, cec);
37662 }
37663@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37664 * Increment the counter of registered wakeup events and decrement the
37665 * couter of wakeup events in progress simultaneously.
37666 */
37667- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37668+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37669 trace_wakeup_source_deactivate(ws->name, cec);
37670
37671 split_counters(&cnt, &inpr);
37672diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37673index 8d98a32..61d3165 100644
37674--- a/drivers/base/syscore.c
37675+++ b/drivers/base/syscore.c
37676@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37677 void register_syscore_ops(struct syscore_ops *ops)
37678 {
37679 mutex_lock(&syscore_ops_lock);
37680- list_add_tail(&ops->node, &syscore_ops_list);
37681+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37682 mutex_unlock(&syscore_ops_lock);
37683 }
37684 EXPORT_SYMBOL_GPL(register_syscore_ops);
37685@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37686 void unregister_syscore_ops(struct syscore_ops *ops)
37687 {
37688 mutex_lock(&syscore_ops_lock);
37689- list_del(&ops->node);
37690+ pax_list_del((struct list_head *)&ops->node);
37691 mutex_unlock(&syscore_ops_lock);
37692 }
37693 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37694diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37695index ff20f19..018f1da 100644
37696--- a/drivers/block/cciss.c
37697+++ b/drivers/block/cciss.c
37698@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37699 while (!list_empty(&h->reqQ)) {
37700 c = list_entry(h->reqQ.next, CommandList_struct, list);
37701 /* can't do anything if fifo is full */
37702- if ((h->access.fifo_full(h))) {
37703+ if ((h->access->fifo_full(h))) {
37704 dev_warn(&h->pdev->dev, "fifo full\n");
37705 break;
37706 }
37707@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37708 h->Qdepth--;
37709
37710 /* Tell the controller execute command */
37711- h->access.submit_command(h, c);
37712+ h->access->submit_command(h, c);
37713
37714 /* Put job onto the completed Q */
37715 addQ(&h->cmpQ, c);
37716@@ -3444,17 +3444,17 @@ startio:
37717
37718 static inline unsigned long get_next_completion(ctlr_info_t *h)
37719 {
37720- return h->access.command_completed(h);
37721+ return h->access->command_completed(h);
37722 }
37723
37724 static inline int interrupt_pending(ctlr_info_t *h)
37725 {
37726- return h->access.intr_pending(h);
37727+ return h->access->intr_pending(h);
37728 }
37729
37730 static inline long interrupt_not_for_us(ctlr_info_t *h)
37731 {
37732- return ((h->access.intr_pending(h) == 0) ||
37733+ return ((h->access->intr_pending(h) == 0) ||
37734 (h->interrupts_enabled == 0));
37735 }
37736
37737@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37738 u32 a;
37739
37740 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37741- return h->access.command_completed(h);
37742+ return h->access->command_completed(h);
37743
37744 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37745 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37746@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37747 trans_support & CFGTBL_Trans_use_short_tags);
37748
37749 /* Change the access methods to the performant access methods */
37750- h->access = SA5_performant_access;
37751+ h->access = &SA5_performant_access;
37752 h->transMethod = CFGTBL_Trans_Performant;
37753
37754 return;
37755@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37756 if (prod_index < 0)
37757 return -ENODEV;
37758 h->product_name = products[prod_index].product_name;
37759- h->access = *(products[prod_index].access);
37760+ h->access = products[prod_index].access;
37761
37762 if (cciss_board_disabled(h)) {
37763 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37764@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37765 }
37766
37767 /* make sure the board interrupts are off */
37768- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37769+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37770 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37771 if (rc)
37772 goto clean2;
37773@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37774 * fake ones to scoop up any residual completions.
37775 */
37776 spin_lock_irqsave(&h->lock, flags);
37777- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37778+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37779 spin_unlock_irqrestore(&h->lock, flags);
37780 free_irq(h->intr[h->intr_mode], h);
37781 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37782@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
37783 dev_info(&h->pdev->dev, "Board READY.\n");
37784 dev_info(&h->pdev->dev,
37785 "Waiting for stale completions to drain.\n");
37786- h->access.set_intr_mask(h, CCISS_INTR_ON);
37787+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37788 msleep(10000);
37789- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37790+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37791
37792 rc = controller_reset_failed(h->cfgtable);
37793 if (rc)
37794@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
37795 cciss_scsi_setup(h);
37796
37797 /* Turn the interrupts on so we can service requests */
37798- h->access.set_intr_mask(h, CCISS_INTR_ON);
37799+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37800
37801 /* Get the firmware version */
37802 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37803@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37804 kfree(flush_buf);
37805 if (return_code != IO_OK)
37806 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37807- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37808+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37809 free_irq(h->intr[h->intr_mode], h);
37810 }
37811
37812diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37813index 7fda30e..2f27946 100644
37814--- a/drivers/block/cciss.h
37815+++ b/drivers/block/cciss.h
37816@@ -101,7 +101,7 @@ struct ctlr_info
37817 /* information about each logical volume */
37818 drive_info_struct *drv[CISS_MAX_LUN];
37819
37820- struct access_method access;
37821+ struct access_method *access;
37822
37823 /* queue and queue Info */
37824 struct list_head reqQ;
37825@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37826 }
37827
37828 static struct access_method SA5_access = {
37829- SA5_submit_command,
37830- SA5_intr_mask,
37831- SA5_fifo_full,
37832- SA5_intr_pending,
37833- SA5_completed,
37834+ .submit_command = SA5_submit_command,
37835+ .set_intr_mask = SA5_intr_mask,
37836+ .fifo_full = SA5_fifo_full,
37837+ .intr_pending = SA5_intr_pending,
37838+ .command_completed = SA5_completed,
37839 };
37840
37841 static struct access_method SA5B_access = {
37842- SA5_submit_command,
37843- SA5B_intr_mask,
37844- SA5_fifo_full,
37845- SA5B_intr_pending,
37846- SA5_completed,
37847+ .submit_command = SA5_submit_command,
37848+ .set_intr_mask = SA5B_intr_mask,
37849+ .fifo_full = SA5_fifo_full,
37850+ .intr_pending = SA5B_intr_pending,
37851+ .command_completed = SA5_completed,
37852 };
37853
37854 static struct access_method SA5_performant_access = {
37855- SA5_submit_command,
37856- SA5_performant_intr_mask,
37857- SA5_fifo_full,
37858- SA5_performant_intr_pending,
37859- SA5_performant_completed,
37860+ .submit_command = SA5_submit_command,
37861+ .set_intr_mask = SA5_performant_intr_mask,
37862+ .fifo_full = SA5_fifo_full,
37863+ .intr_pending = SA5_performant_intr_pending,
37864+ .command_completed = SA5_performant_completed,
37865 };
37866
37867 struct board_type {
37868diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37869index 2b94403..fd6ad1f 100644
37870--- a/drivers/block/cpqarray.c
37871+++ b/drivers/block/cpqarray.c
37872@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37873 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37874 goto Enomem4;
37875 }
37876- hba[i]->access.set_intr_mask(hba[i], 0);
37877+ hba[i]->access->set_intr_mask(hba[i], 0);
37878 if (request_irq(hba[i]->intr, do_ida_intr,
37879 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37880 {
37881@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37882 add_timer(&hba[i]->timer);
37883
37884 /* Enable IRQ now that spinlock and rate limit timer are set up */
37885- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37886+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37887
37888 for(j=0; j<NWD; j++) {
37889 struct gendisk *disk = ida_gendisk[i][j];
37890@@ -694,7 +694,7 @@ DBGINFO(
37891 for(i=0; i<NR_PRODUCTS; i++) {
37892 if (board_id == products[i].board_id) {
37893 c->product_name = products[i].product_name;
37894- c->access = *(products[i].access);
37895+ c->access = products[i].access;
37896 break;
37897 }
37898 }
37899@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37900 hba[ctlr]->intr = intr;
37901 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37902 hba[ctlr]->product_name = products[j].product_name;
37903- hba[ctlr]->access = *(products[j].access);
37904+ hba[ctlr]->access = products[j].access;
37905 hba[ctlr]->ctlr = ctlr;
37906 hba[ctlr]->board_id = board_id;
37907 hba[ctlr]->pci_dev = NULL; /* not PCI */
37908@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37909
37910 while((c = h->reqQ) != NULL) {
37911 /* Can't do anything if we're busy */
37912- if (h->access.fifo_full(h) == 0)
37913+ if (h->access->fifo_full(h) == 0)
37914 return;
37915
37916 /* Get the first entry from the request Q */
37917@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37918 h->Qdepth--;
37919
37920 /* Tell the controller to do our bidding */
37921- h->access.submit_command(h, c);
37922+ h->access->submit_command(h, c);
37923
37924 /* Get onto the completion Q */
37925 addQ(&h->cmpQ, c);
37926@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37927 unsigned long flags;
37928 __u32 a,a1;
37929
37930- istat = h->access.intr_pending(h);
37931+ istat = h->access->intr_pending(h);
37932 /* Is this interrupt for us? */
37933 if (istat == 0)
37934 return IRQ_NONE;
37935@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37936 */
37937 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37938 if (istat & FIFO_NOT_EMPTY) {
37939- while((a = h->access.command_completed(h))) {
37940+ while((a = h->access->command_completed(h))) {
37941 a1 = a; a &= ~3;
37942 if ((c = h->cmpQ) == NULL)
37943 {
37944@@ -1448,11 +1448,11 @@ static int sendcmd(
37945 /*
37946 * Disable interrupt
37947 */
37948- info_p->access.set_intr_mask(info_p, 0);
37949+ info_p->access->set_intr_mask(info_p, 0);
37950 /* Make sure there is room in the command FIFO */
37951 /* Actually it should be completely empty at this time. */
37952 for (i = 200000; i > 0; i--) {
37953- temp = info_p->access.fifo_full(info_p);
37954+ temp = info_p->access->fifo_full(info_p);
37955 if (temp != 0) {
37956 break;
37957 }
37958@@ -1465,7 +1465,7 @@ DBG(
37959 /*
37960 * Send the cmd
37961 */
37962- info_p->access.submit_command(info_p, c);
37963+ info_p->access->submit_command(info_p, c);
37964 complete = pollcomplete(ctlr);
37965
37966 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
37967@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
37968 * we check the new geometry. Then turn interrupts back on when
37969 * we're done.
37970 */
37971- host->access.set_intr_mask(host, 0);
37972+ host->access->set_intr_mask(host, 0);
37973 getgeometry(ctlr);
37974- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
37975+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
37976
37977 for(i=0; i<NWD; i++) {
37978 struct gendisk *disk = ida_gendisk[ctlr][i];
37979@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
37980 /* Wait (up to 2 seconds) for a command to complete */
37981
37982 for (i = 200000; i > 0; i--) {
37983- done = hba[ctlr]->access.command_completed(hba[ctlr]);
37984+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
37985 if (done == 0) {
37986 udelay(10); /* a short fixed delay */
37987 } else
37988diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
37989index be73e9d..7fbf140 100644
37990--- a/drivers/block/cpqarray.h
37991+++ b/drivers/block/cpqarray.h
37992@@ -99,7 +99,7 @@ struct ctlr_info {
37993 drv_info_t drv[NWD];
37994 struct proc_dir_entry *proc;
37995
37996- struct access_method access;
37997+ struct access_method *access;
37998
37999 cmdlist_t *reqQ;
38000 cmdlist_t *cmpQ;
38001diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38002index 434c77d..6d3219a 100644
38003--- a/drivers/block/drbd/drbd_bitmap.c
38004+++ b/drivers/block/drbd/drbd_bitmap.c
38005@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38006 submit_bio(rw, bio);
38007 /* this should not count as user activity and cause the
38008 * resync to throttle -- see drbd_rs_should_slow_down(). */
38009- atomic_add(len >> 9, &device->rs_sect_ev);
38010+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38011 }
38012 }
38013
38014diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38015index 9b22f8f..f2932af 100644
38016--- a/drivers/block/drbd/drbd_int.h
38017+++ b/drivers/block/drbd/drbd_int.h
38018@@ -385,7 +385,7 @@ struct drbd_epoch {
38019 struct drbd_connection *connection;
38020 struct list_head list;
38021 unsigned int barrier_nr;
38022- atomic_t epoch_size; /* increased on every request added. */
38023+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38024 atomic_t active; /* increased on every req. added, and dec on every finished. */
38025 unsigned long flags;
38026 };
38027@@ -946,7 +946,7 @@ struct drbd_device {
38028 unsigned int al_tr_number;
38029 int al_tr_cycle;
38030 wait_queue_head_t seq_wait;
38031- atomic_t packet_seq;
38032+ atomic_unchecked_t packet_seq;
38033 unsigned int peer_seq;
38034 spinlock_t peer_seq_lock;
38035 unsigned long comm_bm_set; /* communicated number of set bits. */
38036@@ -955,8 +955,8 @@ struct drbd_device {
38037 struct mutex own_state_mutex;
38038 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38039 char congestion_reason; /* Why we where congested... */
38040- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38041- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38042+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38043+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38044 int rs_last_sect_ev; /* counter to compare with */
38045 int rs_last_events; /* counter of read or write "events" (unit sectors)
38046 * on the lower level device when we last looked. */
38047@@ -1567,7 +1567,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
38048 char __user *uoptval;
38049 int err;
38050
38051- uoptval = (char __user __force *)optval;
38052+ uoptval = (char __force_user *)optval;
38053
38054 set_fs(KERNEL_DS);
38055 if (level == SOL_SOCKET)
38056diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38057index 973c185..05d8b1a 100644
38058--- a/drivers/block/drbd/drbd_main.c
38059+++ b/drivers/block/drbd/drbd_main.c
38060@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38061 p->sector = sector;
38062 p->block_id = block_id;
38063 p->blksize = blksize;
38064- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38065+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38066 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38067 }
38068
38069@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38070 return -EIO;
38071 p->sector = cpu_to_be64(req->i.sector);
38072 p->block_id = (unsigned long)req;
38073- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38074+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38075 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38076 if (device->state.conn >= C_SYNC_SOURCE &&
38077 device->state.conn <= C_PAUSED_SYNC_T)
38078@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38079 atomic_set(&device->unacked_cnt, 0);
38080 atomic_set(&device->local_cnt, 0);
38081 atomic_set(&device->pp_in_use_by_net, 0);
38082- atomic_set(&device->rs_sect_in, 0);
38083- atomic_set(&device->rs_sect_ev, 0);
38084+ atomic_set_unchecked(&device->rs_sect_in, 0);
38085+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38086 atomic_set(&device->ap_in_flight, 0);
38087 atomic_set(&device->md_io.in_use, 0);
38088
38089@@ -2688,8 +2688,8 @@ void drbd_destroy_connection(struct kref *kref)
38090 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38091 struct drbd_resource *resource = connection->resource;
38092
38093- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38094- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38095+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38096+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38097 kfree(connection->current_epoch);
38098
38099 idr_destroy(&connection->peer_devices);
38100diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38101index 1cd47df..57c53c0 100644
38102--- a/drivers/block/drbd/drbd_nl.c
38103+++ b/drivers/block/drbd/drbd_nl.c
38104@@ -3645,13 +3645,13 @@ finish:
38105
38106 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38107 {
38108- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38109+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38110 struct sk_buff *msg;
38111 struct drbd_genlmsghdr *d_out;
38112 unsigned seq;
38113 int err = -ENOMEM;
38114
38115- seq = atomic_inc_return(&drbd_genl_seq);
38116+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38117 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38118 if (!msg)
38119 goto failed;
38120diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38121index 6960fb0..215d76b 100644
38122--- a/drivers/block/drbd/drbd_receiver.c
38123+++ b/drivers/block/drbd/drbd_receiver.c
38124@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38125 struct drbd_device *device = peer_device->device;
38126 int err;
38127
38128- atomic_set(&device->packet_seq, 0);
38129+ atomic_set_unchecked(&device->packet_seq, 0);
38130 device->peer_seq = 0;
38131
38132 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38133@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38134 do {
38135 next_epoch = NULL;
38136
38137- epoch_size = atomic_read(&epoch->epoch_size);
38138+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38139
38140 switch (ev & ~EV_CLEANUP) {
38141 case EV_PUT:
38142@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38143 rv = FE_DESTROYED;
38144 } else {
38145 epoch->flags = 0;
38146- atomic_set(&epoch->epoch_size, 0);
38147+ atomic_set_unchecked(&epoch->epoch_size, 0);
38148 /* atomic_set(&epoch->active, 0); is already zero */
38149 if (rv == FE_STILL_LIVE)
38150 rv = FE_RECYCLED;
38151@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38152 conn_wait_active_ee_empty(connection);
38153 drbd_flush(connection);
38154
38155- if (atomic_read(&connection->current_epoch->epoch_size)) {
38156+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38157 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38158 if (epoch)
38159 break;
38160@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38161 }
38162
38163 epoch->flags = 0;
38164- atomic_set(&epoch->epoch_size, 0);
38165+ atomic_set_unchecked(&epoch->epoch_size, 0);
38166 atomic_set(&epoch->active, 0);
38167
38168 spin_lock(&connection->epoch_lock);
38169- if (atomic_read(&connection->current_epoch->epoch_size)) {
38170+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38171 list_add(&epoch->list, &connection->current_epoch->list);
38172 connection->current_epoch = epoch;
38173 connection->epochs++;
38174@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38175 list_add_tail(&peer_req->w.list, &device->sync_ee);
38176 spin_unlock_irq(&device->resource->req_lock);
38177
38178- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38179+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38180 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38181 return 0;
38182
38183@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38184 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38185 }
38186
38187- atomic_add(pi->size >> 9, &device->rs_sect_in);
38188+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38189
38190 return err;
38191 }
38192@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38193
38194 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38195 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38196- atomic_inc(&connection->current_epoch->epoch_size);
38197+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38198 err2 = drbd_drain_block(peer_device, pi->size);
38199 if (!err)
38200 err = err2;
38201@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38202
38203 spin_lock(&connection->epoch_lock);
38204 peer_req->epoch = connection->current_epoch;
38205- atomic_inc(&peer_req->epoch->epoch_size);
38206+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38207 atomic_inc(&peer_req->epoch->active);
38208 spin_unlock(&connection->epoch_lock);
38209
38210@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38211
38212 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38213 (int)part_stat_read(&disk->part0, sectors[1]) -
38214- atomic_read(&device->rs_sect_ev);
38215+ atomic_read_unchecked(&device->rs_sect_ev);
38216
38217 if (atomic_read(&device->ap_actlog_cnt)
38218 || !device->rs_last_events || curr_events - device->rs_last_events > 64) {
38219@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38220 device->use_csums = true;
38221 } else if (pi->cmd == P_OV_REPLY) {
38222 /* track progress, we may need to throttle */
38223- atomic_add(size >> 9, &device->rs_sect_in);
38224+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38225 peer_req->w.cb = w_e_end_ov_reply;
38226 dec_rs_pending(device);
38227 /* drbd_rs_begin_io done when we sent this request,
38228@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38229 goto out_free_e;
38230
38231 submit_for_resync:
38232- atomic_add(size >> 9, &device->rs_sect_ev);
38233+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38234
38235 submit:
38236 update_receiver_timing_details(connection, drbd_submit_peer_request);
38237@@ -4564,7 +4564,7 @@ struct data_cmd {
38238 int expect_payload;
38239 size_t pkt_size;
38240 int (*fn)(struct drbd_connection *, struct packet_info *);
38241-};
38242+} __do_const;
38243
38244 static struct data_cmd drbd_cmd_handler[] = {
38245 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38246@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38247 if (!list_empty(&connection->current_epoch->list))
38248 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38249 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38250- atomic_set(&connection->current_epoch->epoch_size, 0);
38251+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38252 connection->send.seen_any_write_yet = false;
38253
38254 drbd_info(connection, "Connection closed\n");
38255@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38256 put_ldev(device);
38257 }
38258 dec_rs_pending(device);
38259- atomic_add(blksize >> 9, &device->rs_sect_in);
38260+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38261
38262 return 0;
38263 }
38264@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38265 struct asender_cmd {
38266 size_t pkt_size;
38267 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38268-};
38269+} __do_const;
38270
38271 static struct asender_cmd asender_tbl[] = {
38272 [P_PING] = { 0, got_Ping },
38273diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38274index d2d1f97..6a1188f 100644
38275--- a/drivers/block/drbd/drbd_worker.c
38276+++ b/drivers/block/drbd/drbd_worker.c
38277@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38278 list_add_tail(&peer_req->w.list, &device->read_ee);
38279 spin_unlock_irq(&device->resource->req_lock);
38280
38281- atomic_add(size >> 9, &device->rs_sect_ev);
38282+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38283 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38284 return 0;
38285
38286@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38287 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38288 int number, mxb;
38289
38290- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38291+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38292 device->rs_in_flight -= sect_in;
38293
38294 rcu_read_lock();
38295@@ -1594,8 +1594,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38296 {
38297 struct fifo_buffer *plan;
38298
38299- atomic_set(&device->rs_sect_in, 0);
38300- atomic_set(&device->rs_sect_ev, 0);
38301+ atomic_set_unchecked(&device->rs_sect_in, 0);
38302+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38303 device->rs_in_flight = 0;
38304
38305 /* Updating the RCU protected object in place is necessary since
38306diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38307index 6cb1beb..bf490f7 100644
38308--- a/drivers/block/loop.c
38309+++ b/drivers/block/loop.c
38310@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38311
38312 file_start_write(file);
38313 set_fs(get_ds());
38314- bw = file->f_op->write(file, buf, len, &pos);
38315+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38316 set_fs(old_fs);
38317 file_end_write(file);
38318 if (likely(bw == len))
38319diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
38320index e2bb8af..44b8aef 100644
38321--- a/drivers/block/nvme-core.c
38322+++ b/drivers/block/nvme-core.c
38323@@ -73,7 +73,6 @@ static LIST_HEAD(dev_list);
38324 static struct task_struct *nvme_thread;
38325 static struct workqueue_struct *nvme_workq;
38326 static wait_queue_head_t nvme_kthread_wait;
38327-static struct notifier_block nvme_nb;
38328
38329 static void nvme_reset_failed_dev(struct work_struct *ws);
38330
38331@@ -2926,6 +2925,10 @@ static struct pci_driver nvme_driver = {
38332 .err_handler = &nvme_err_handler,
38333 };
38334
38335+static struct notifier_block nvme_nb = {
38336+ .notifier_call = &nvme_cpu_notify,
38337+};
38338+
38339 static int __init nvme_init(void)
38340 {
38341 int result;
38342@@ -2942,7 +2945,6 @@ static int __init nvme_init(void)
38343 else if (result > 0)
38344 nvme_major = result;
38345
38346- nvme_nb.notifier_call = &nvme_cpu_notify;
38347 result = register_hotcpu_notifier(&nvme_nb);
38348 if (result)
38349 goto unregister_blkdev;
38350diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38351index 09e628da..7607aaa 100644
38352--- a/drivers/block/pktcdvd.c
38353+++ b/drivers/block/pktcdvd.c
38354@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38355
38356 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38357 {
38358- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38359+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38360 }
38361
38362 /*
38363@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38364 return -EROFS;
38365 }
38366 pd->settings.fp = ti.fp;
38367- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38368+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38369
38370 if (ti.nwa_v) {
38371 pd->nwa = be32_to_cpu(ti.next_writable);
38372diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38373index e5565fb..71be10b4 100644
38374--- a/drivers/block/smart1,2.h
38375+++ b/drivers/block/smart1,2.h
38376@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38377 }
38378
38379 static struct access_method smart4_access = {
38380- smart4_submit_command,
38381- smart4_intr_mask,
38382- smart4_fifo_full,
38383- smart4_intr_pending,
38384- smart4_completed,
38385+ .submit_command = smart4_submit_command,
38386+ .set_intr_mask = smart4_intr_mask,
38387+ .fifo_full = smart4_fifo_full,
38388+ .intr_pending = smart4_intr_pending,
38389+ .command_completed = smart4_completed,
38390 };
38391
38392 /*
38393@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38394 }
38395
38396 static struct access_method smart2_access = {
38397- smart2_submit_command,
38398- smart2_intr_mask,
38399- smart2_fifo_full,
38400- smart2_intr_pending,
38401- smart2_completed,
38402+ .submit_command = smart2_submit_command,
38403+ .set_intr_mask = smart2_intr_mask,
38404+ .fifo_full = smart2_fifo_full,
38405+ .intr_pending = smart2_intr_pending,
38406+ .command_completed = smart2_completed,
38407 };
38408
38409 /*
38410@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38411 }
38412
38413 static struct access_method smart2e_access = {
38414- smart2e_submit_command,
38415- smart2e_intr_mask,
38416- smart2e_fifo_full,
38417- smart2e_intr_pending,
38418- smart2e_completed,
38419+ .submit_command = smart2e_submit_command,
38420+ .set_intr_mask = smart2e_intr_mask,
38421+ .fifo_full = smart2e_fifo_full,
38422+ .intr_pending = smart2e_intr_pending,
38423+ .command_completed = smart2e_completed,
38424 };
38425
38426 /*
38427@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38428 }
38429
38430 static struct access_method smart1_access = {
38431- smart1_submit_command,
38432- smart1_intr_mask,
38433- smart1_fifo_full,
38434- smart1_intr_pending,
38435- smart1_completed,
38436+ .submit_command = smart1_submit_command,
38437+ .set_intr_mask = smart1_intr_mask,
38438+ .fifo_full = smart1_fifo_full,
38439+ .intr_pending = smart1_intr_pending,
38440+ .command_completed = smart1_completed,
38441 };
38442diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38443index f038dba..bb74c08 100644
38444--- a/drivers/bluetooth/btwilink.c
38445+++ b/drivers/bluetooth/btwilink.c
38446@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38447
38448 static int bt_ti_probe(struct platform_device *pdev)
38449 {
38450- static struct ti_st *hst;
38451+ struct ti_st *hst;
38452 struct hci_dev *hdev;
38453 int err;
38454
38455diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38456index 5d28a45..a538f90 100644
38457--- a/drivers/cdrom/cdrom.c
38458+++ b/drivers/cdrom/cdrom.c
38459@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38460 ENSURE(reset, CDC_RESET);
38461 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38462 cdi->mc_flags = 0;
38463- cdo->n_minors = 0;
38464 cdi->options = CDO_USE_FFLAGS;
38465
38466 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38467@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38468 else
38469 cdi->cdda_method = CDDA_OLD;
38470
38471- if (!cdo->generic_packet)
38472- cdo->generic_packet = cdrom_dummy_generic_packet;
38473+ if (!cdo->generic_packet) {
38474+ pax_open_kernel();
38475+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38476+ pax_close_kernel();
38477+ }
38478
38479 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38480 mutex_lock(&cdrom_mutex);
38481@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38482 if (cdi->exit)
38483 cdi->exit(cdi);
38484
38485- cdi->ops->n_minors--;
38486 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38487 }
38488
38489@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38490 */
38491 nr = nframes;
38492 do {
38493- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38494+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38495 if (cgc.buffer)
38496 break;
38497
38498@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38499 struct cdrom_device_info *cdi;
38500 int ret;
38501
38502- ret = scnprintf(info + *pos, max_size - *pos, header);
38503+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38504 if (!ret)
38505 return 1;
38506
38507diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38508index 584bc31..e64a12c 100644
38509--- a/drivers/cdrom/gdrom.c
38510+++ b/drivers/cdrom/gdrom.c
38511@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38512 .audio_ioctl = gdrom_audio_ioctl,
38513 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38514 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38515- .n_minors = 1,
38516 };
38517
38518 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38519diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38520index efefd12..4f1d494 100644
38521--- a/drivers/char/Kconfig
38522+++ b/drivers/char/Kconfig
38523@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38524
38525 config DEVKMEM
38526 bool "/dev/kmem virtual device support"
38527- default y
38528+ default n
38529+ depends on !GRKERNSEC_KMEM
38530 help
38531 Say Y here if you want to support the /dev/kmem device. The
38532 /dev/kmem device is rarely used, but can be used for certain
38533@@ -577,6 +578,7 @@ config DEVPORT
38534 bool
38535 depends on !M68K
38536 depends on ISA || PCI
38537+ depends on !GRKERNSEC_KMEM
38538 default y
38539
38540 source "drivers/s390/char/Kconfig"
38541diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38542index a48e05b..6bac831 100644
38543--- a/drivers/char/agp/compat_ioctl.c
38544+++ b/drivers/char/agp/compat_ioctl.c
38545@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38546 return -ENOMEM;
38547 }
38548
38549- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38550+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38551 sizeof(*usegment) * ureserve.seg_count)) {
38552 kfree(usegment);
38553 kfree(ksegment);
38554diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38555index 09f17eb..8531d2f 100644
38556--- a/drivers/char/agp/frontend.c
38557+++ b/drivers/char/agp/frontend.c
38558@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38559 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38560 return -EFAULT;
38561
38562- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38563+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38564 return -EFAULT;
38565
38566 client = agp_find_client_by_pid(reserve.pid);
38567@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38568 if (segment == NULL)
38569 return -ENOMEM;
38570
38571- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38572+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38573 sizeof(struct agp_segment) * reserve.seg_count)) {
38574 kfree(segment);
38575 return -EFAULT;
38576diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38577index 4f94375..413694e 100644
38578--- a/drivers/char/genrtc.c
38579+++ b/drivers/char/genrtc.c
38580@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38581 switch (cmd) {
38582
38583 case RTC_PLL_GET:
38584+ memset(&pll, 0, sizeof(pll));
38585 if (get_rtc_pll(&pll))
38586 return -EINVAL;
38587 else
38588diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38589index d5d4cd8..22d561d 100644
38590--- a/drivers/char/hpet.c
38591+++ b/drivers/char/hpet.c
38592@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38593 }
38594
38595 static int
38596-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38597+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38598 struct hpet_info *info)
38599 {
38600 struct hpet_timer __iomem *timer;
38601diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38602index f816211..89eadea 100644
38603--- a/drivers/char/ipmi/ipmi_msghandler.c
38604+++ b/drivers/char/ipmi/ipmi_msghandler.c
38605@@ -438,7 +438,7 @@ struct ipmi_smi {
38606 struct proc_dir_entry *proc_dir;
38607 char proc_dir_name[10];
38608
38609- atomic_t stats[IPMI_NUM_STATS];
38610+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38611
38612 /*
38613 * run_to_completion duplicate of smb_info, smi_info
38614@@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
38615 static DEFINE_MUTEX(smi_watchers_mutex);
38616
38617 #define ipmi_inc_stat(intf, stat) \
38618- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38619+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38620 #define ipmi_get_stat(intf, stat) \
38621- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38622+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38623
38624 static int is_lan_addr(struct ipmi_addr *addr)
38625 {
38626@@ -2925,7 +2925,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38627 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38628 init_waitqueue_head(&intf->waitq);
38629 for (i = 0; i < IPMI_NUM_STATS; i++)
38630- atomic_set(&intf->stats[i], 0);
38631+ atomic_set_unchecked(&intf->stats[i], 0);
38632
38633 intf->proc_dir = NULL;
38634
38635diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38636index 5c4e1f6..0ea58f9 100644
38637--- a/drivers/char/ipmi/ipmi_si_intf.c
38638+++ b/drivers/char/ipmi/ipmi_si_intf.c
38639@@ -285,7 +285,7 @@ struct smi_info {
38640 unsigned char slave_addr;
38641
38642 /* Counters and things for the proc filesystem. */
38643- atomic_t stats[SI_NUM_STATS];
38644+ atomic_unchecked_t stats[SI_NUM_STATS];
38645
38646 struct task_struct *thread;
38647
38648@@ -294,9 +294,9 @@ struct smi_info {
38649 };
38650
38651 #define smi_inc_stat(smi, stat) \
38652- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38653+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38654 #define smi_get_stat(smi, stat) \
38655- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38656+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38657
38658 #define SI_MAX_PARMS 4
38659
38660@@ -3377,7 +3377,7 @@ static int try_smi_init(struct smi_info *new_smi)
38661 atomic_set(&new_smi->req_events, 0);
38662 new_smi->run_to_completion = false;
38663 for (i = 0; i < SI_NUM_STATS; i++)
38664- atomic_set(&new_smi->stats[i], 0);
38665+ atomic_set_unchecked(&new_smi->stats[i], 0);
38666
38667 new_smi->interrupt_disabled = true;
38668 atomic_set(&new_smi->stop_operation, 0);
38669diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38670index 524b707..29d07c1 100644
38671--- a/drivers/char/mem.c
38672+++ b/drivers/char/mem.c
38673@@ -18,6 +18,7 @@
38674 #include <linux/raw.h>
38675 #include <linux/tty.h>
38676 #include <linux/capability.h>
38677+#include <linux/security.h>
38678 #include <linux/ptrace.h>
38679 #include <linux/device.h>
38680 #include <linux/highmem.h>
38681@@ -36,6 +37,10 @@
38682
38683 #define DEVPORT_MINOR 4
38684
38685+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38686+extern const struct file_operations grsec_fops;
38687+#endif
38688+
38689 static inline unsigned long size_inside_page(unsigned long start,
38690 unsigned long size)
38691 {
38692@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38693
38694 while (cursor < to) {
38695 if (!devmem_is_allowed(pfn)) {
38696+#ifdef CONFIG_GRKERNSEC_KMEM
38697+ gr_handle_mem_readwrite(from, to);
38698+#else
38699 printk(KERN_INFO
38700 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38701 current->comm, from, to);
38702+#endif
38703 return 0;
38704 }
38705 cursor += PAGE_SIZE;
38706@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38707 }
38708 return 1;
38709 }
38710+#elif defined(CONFIG_GRKERNSEC_KMEM)
38711+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38712+{
38713+ return 0;
38714+}
38715 #else
38716 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38717 {
38718@@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38719
38720 while (count > 0) {
38721 unsigned long remaining;
38722+ char *temp;
38723
38724 sz = size_inside_page(p, count);
38725
38726@@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38727 if (!ptr)
38728 return -EFAULT;
38729
38730- remaining = copy_to_user(buf, ptr, sz);
38731+#ifdef CONFIG_PAX_USERCOPY
38732+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38733+ if (!temp) {
38734+ unxlate_dev_mem_ptr(p, ptr);
38735+ return -ENOMEM;
38736+ }
38737+ memcpy(temp, ptr, sz);
38738+#else
38739+ temp = ptr;
38740+#endif
38741+
38742+ remaining = copy_to_user(buf, temp, sz);
38743+
38744+#ifdef CONFIG_PAX_USERCOPY
38745+ kfree(temp);
38746+#endif
38747+
38748 unxlate_dev_mem_ptr(p, ptr);
38749 if (remaining)
38750 return -EFAULT;
38751@@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38752 size_t count, loff_t *ppos)
38753 {
38754 unsigned long p = *ppos;
38755- ssize_t low_count, read, sz;
38756+ ssize_t low_count, read, sz, err = 0;
38757 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38758- int err = 0;
38759
38760 read = 0;
38761 if (p < (unsigned long) high_memory) {
38762@@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38763 }
38764 #endif
38765 while (low_count > 0) {
38766+ char *temp;
38767+
38768 sz = size_inside_page(p, low_count);
38769
38770 /*
38771@@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38772 */
38773 kbuf = xlate_dev_kmem_ptr((char *)p);
38774
38775- if (copy_to_user(buf, kbuf, sz))
38776+#ifdef CONFIG_PAX_USERCOPY
38777+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38778+ if (!temp)
38779+ return -ENOMEM;
38780+ memcpy(temp, kbuf, sz);
38781+#else
38782+ temp = kbuf;
38783+#endif
38784+
38785+ err = copy_to_user(buf, temp, sz);
38786+
38787+#ifdef CONFIG_PAX_USERCOPY
38788+ kfree(temp);
38789+#endif
38790+
38791+ if (err)
38792 return -EFAULT;
38793 buf += sz;
38794 p += sz;
38795@@ -797,6 +844,9 @@ static const struct memdev {
38796 #ifdef CONFIG_PRINTK
38797 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38798 #endif
38799+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38800+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38801+#endif
38802 };
38803
38804 static int memory_open(struct inode *inode, struct file *filp)
38805@@ -868,7 +918,7 @@ static int __init chr_dev_init(void)
38806 continue;
38807
38808 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38809- NULL, devlist[minor].name);
38810+ NULL, "%s", devlist[minor].name);
38811 }
38812
38813 return tty_init();
38814diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38815index 9df78e2..01ba9ae 100644
38816--- a/drivers/char/nvram.c
38817+++ b/drivers/char/nvram.c
38818@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38819
38820 spin_unlock_irq(&rtc_lock);
38821
38822- if (copy_to_user(buf, contents, tmp - contents))
38823+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38824 return -EFAULT;
38825
38826 *ppos = i;
38827diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38828index 0ea9986..e7b07e4 100644
38829--- a/drivers/char/pcmcia/synclink_cs.c
38830+++ b/drivers/char/pcmcia/synclink_cs.c
38831@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38832
38833 if (debug_level >= DEBUG_LEVEL_INFO)
38834 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38835- __FILE__, __LINE__, info->device_name, port->count);
38836+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38837
38838 if (tty_port_close_start(port, tty, filp) == 0)
38839 goto cleanup;
38840@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38841 cleanup:
38842 if (debug_level >= DEBUG_LEVEL_INFO)
38843 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38844- tty->driver->name, port->count);
38845+ tty->driver->name, atomic_read(&port->count));
38846 }
38847
38848 /* Wait until the transmitter is empty.
38849@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38850
38851 if (debug_level >= DEBUG_LEVEL_INFO)
38852 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38853- __FILE__, __LINE__, tty->driver->name, port->count);
38854+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38855
38856 /* If port is closing, signal caller to try again */
38857 if (port->flags & ASYNC_CLOSING){
38858@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38859 goto cleanup;
38860 }
38861 spin_lock(&port->lock);
38862- port->count++;
38863+ atomic_inc(&port->count);
38864 spin_unlock(&port->lock);
38865 spin_unlock_irqrestore(&info->netlock, flags);
38866
38867- if (port->count == 1) {
38868+ if (atomic_read(&port->count) == 1) {
38869 /* 1st open on this device, init hardware */
38870 retval = startup(info, tty);
38871 if (retval < 0)
38872@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38873 unsigned short new_crctype;
38874
38875 /* return error if TTY interface open */
38876- if (info->port.count)
38877+ if (atomic_read(&info->port.count))
38878 return -EBUSY;
38879
38880 switch (encoding)
38881@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
38882
38883 /* arbitrate between network and tty opens */
38884 spin_lock_irqsave(&info->netlock, flags);
38885- if (info->port.count != 0 || info->netcount != 0) {
38886+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38887 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38888 spin_unlock_irqrestore(&info->netlock, flags);
38889 return -EBUSY;
38890@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38891 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38892
38893 /* return error if TTY interface open */
38894- if (info->port.count)
38895+ if (atomic_read(&info->port.count))
38896 return -EBUSY;
38897
38898 if (cmd != SIOCWANDEV)
38899diff --git a/drivers/char/random.c b/drivers/char/random.c
38900index 04645c0..560e350 100644
38901--- a/drivers/char/random.c
38902+++ b/drivers/char/random.c
38903@@ -289,9 +289,6 @@
38904 /*
38905 * To allow fractional bits to be tracked, the entropy_count field is
38906 * denominated in units of 1/8th bits.
38907- *
38908- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38909- * credit_entropy_bits() needs to be 64 bits wide.
38910 */
38911 #define ENTROPY_SHIFT 3
38912 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38913@@ -439,9 +436,9 @@ struct entropy_store {
38914 };
38915
38916 static void push_to_pool(struct work_struct *work);
38917-static __u32 input_pool_data[INPUT_POOL_WORDS];
38918-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38919-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38920+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38921+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38922+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38923
38924 static struct entropy_store input_pool = {
38925 .poolinfo = &poolinfo_table[0],
38926@@ -635,7 +632,7 @@ retry:
38927 /* The +2 corresponds to the /4 in the denominator */
38928
38929 do {
38930- unsigned int anfrac = min(pnfrac, pool_size/2);
38931+ u64 anfrac = min(pnfrac, pool_size/2);
38932 unsigned int add =
38933 ((pool_size - entropy_count)*anfrac*3) >> s;
38934
38935@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38936
38937 extract_buf(r, tmp);
38938 i = min_t(int, nbytes, EXTRACT_SIZE);
38939- if (copy_to_user(buf, tmp, i)) {
38940+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38941 ret = -EFAULT;
38942 break;
38943 }
38944@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
38945 static int proc_do_uuid(struct ctl_table *table, int write,
38946 void __user *buffer, size_t *lenp, loff_t *ppos)
38947 {
38948- struct ctl_table fake_table;
38949+ ctl_table_no_const fake_table;
38950 unsigned char buf[64], tmp_uuid[16], *uuid;
38951
38952 uuid = table->data;
38953@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38954 static int proc_do_entropy(struct ctl_table *table, int write,
38955 void __user *buffer, size_t *lenp, loff_t *ppos)
38956 {
38957- struct ctl_table fake_table;
38958+ ctl_table_no_const fake_table;
38959 int entropy_count;
38960
38961 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
38962diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
38963index 7cc1fe22..b602d6b 100644
38964--- a/drivers/char/sonypi.c
38965+++ b/drivers/char/sonypi.c
38966@@ -54,6 +54,7 @@
38967
38968 #include <asm/uaccess.h>
38969 #include <asm/io.h>
38970+#include <asm/local.h>
38971
38972 #include <linux/sonypi.h>
38973
38974@@ -490,7 +491,7 @@ static struct sonypi_device {
38975 spinlock_t fifo_lock;
38976 wait_queue_head_t fifo_proc_list;
38977 struct fasync_struct *fifo_async;
38978- int open_count;
38979+ local_t open_count;
38980 int model;
38981 struct input_dev *input_jog_dev;
38982 struct input_dev *input_key_dev;
38983@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
38984 static int sonypi_misc_release(struct inode *inode, struct file *file)
38985 {
38986 mutex_lock(&sonypi_device.lock);
38987- sonypi_device.open_count--;
38988+ local_dec(&sonypi_device.open_count);
38989 mutex_unlock(&sonypi_device.lock);
38990 return 0;
38991 }
38992@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
38993 {
38994 mutex_lock(&sonypi_device.lock);
38995 /* Flush input queue on first open */
38996- if (!sonypi_device.open_count)
38997+ if (!local_read(&sonypi_device.open_count))
38998 kfifo_reset(&sonypi_device.fifo);
38999- sonypi_device.open_count++;
39000+ local_inc(&sonypi_device.open_count);
39001 mutex_unlock(&sonypi_device.lock);
39002
39003 return 0;
39004diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39005index 565a947..dcdc06e 100644
39006--- a/drivers/char/tpm/tpm_acpi.c
39007+++ b/drivers/char/tpm/tpm_acpi.c
39008@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39009 virt = acpi_os_map_iomem(start, len);
39010 if (!virt) {
39011 kfree(log->bios_event_log);
39012+ log->bios_event_log = NULL;
39013 printk("%s: ERROR - Unable to map memory\n", __func__);
39014 return -EIO;
39015 }
39016
39017- memcpy_fromio(log->bios_event_log, virt, len);
39018+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39019
39020 acpi_os_unmap_iomem(virt, len);
39021 return 0;
39022diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39023index 3a56a13..f8cbd25 100644
39024--- a/drivers/char/tpm/tpm_eventlog.c
39025+++ b/drivers/char/tpm/tpm_eventlog.c
39026@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39027 event = addr;
39028
39029 if ((event->event_type == 0 && event->event_size == 0) ||
39030- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39031+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39032 return NULL;
39033
39034 return addr;
39035@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39036 return NULL;
39037
39038 if ((event->event_type == 0 && event->event_size == 0) ||
39039- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39040+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39041 return NULL;
39042
39043 (*pos)++;
39044@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39045 int i;
39046
39047 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39048- seq_putc(m, data[i]);
39049+ if (!seq_putc(m, data[i]))
39050+ return -EFAULT;
39051
39052 return 0;
39053 }
39054diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39055index cf7a561..c319ce0 100644
39056--- a/drivers/char/virtio_console.c
39057+++ b/drivers/char/virtio_console.c
39058@@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
39059 if (to_user) {
39060 ssize_t ret;
39061
39062- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39063+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39064 if (ret)
39065 return -EFAULT;
39066 } else {
39067@@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39068 if (!port_has_data(port) && !port->host_connected)
39069 return 0;
39070
39071- return fill_readbuf(port, ubuf, count, true);
39072+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39073 }
39074
39075 static int wait_port_writable(struct port *port, bool nonblock)
39076diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39077index b9355da..9611f4e 100644
39078--- a/drivers/clk/clk-composite.c
39079+++ b/drivers/clk/clk-composite.c
39080@@ -191,7 +191,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39081 struct clk *clk;
39082 struct clk_init_data init;
39083 struct clk_composite *composite;
39084- struct clk_ops *clk_composite_ops;
39085+ clk_ops_no_const *clk_composite_ops;
39086
39087 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39088 if (!composite) {
39089diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39090index dd3a78c..386d49c 100644
39091--- a/drivers/clk/socfpga/clk-gate.c
39092+++ b/drivers/clk/socfpga/clk-gate.c
39093@@ -22,6 +22,7 @@
39094 #include <linux/mfd/syscon.h>
39095 #include <linux/of.h>
39096 #include <linux/regmap.h>
39097+#include <asm/pgtable.h>
39098
39099 #include "clk.h"
39100
39101@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39102 return 0;
39103 }
39104
39105-static struct clk_ops gateclk_ops = {
39106+static clk_ops_no_const gateclk_ops __read_only = {
39107 .prepare = socfpga_clk_prepare,
39108 .recalc_rate = socfpga_clk_recalc_rate,
39109 .get_parent = socfpga_clk_get_parent,
39110@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39111 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39112 socfpga_clk->hw.bit_idx = clk_gate[1];
39113
39114- gateclk_ops.enable = clk_gate_ops.enable;
39115- gateclk_ops.disable = clk_gate_ops.disable;
39116+ pax_open_kernel();
39117+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39118+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39119+ pax_close_kernel();
39120 }
39121
39122 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39123diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39124index de6da95..c98278b 100644
39125--- a/drivers/clk/socfpga/clk-pll.c
39126+++ b/drivers/clk/socfpga/clk-pll.c
39127@@ -21,6 +21,7 @@
39128 #include <linux/io.h>
39129 #include <linux/of.h>
39130 #include <linux/of_address.h>
39131+#include <asm/pgtable.h>
39132
39133 #include "clk.h"
39134
39135@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39136 CLK_MGR_PLL_CLK_SRC_MASK;
39137 }
39138
39139-static struct clk_ops clk_pll_ops = {
39140+static clk_ops_no_const clk_pll_ops __read_only = {
39141 .recalc_rate = clk_pll_recalc_rate,
39142 .get_parent = clk_pll_get_parent,
39143 };
39144@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39145 pll_clk->hw.hw.init = &init;
39146
39147 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39148- clk_pll_ops.enable = clk_gate_ops.enable;
39149- clk_pll_ops.disable = clk_gate_ops.disable;
39150+ pax_open_kernel();
39151+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39152+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39153+ pax_close_kernel();
39154
39155 clk = clk_register(NULL, &pll_clk->hw.hw);
39156 if (WARN_ON(IS_ERR(clk))) {
39157diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39158index b0c18ed..1713a80 100644
39159--- a/drivers/cpufreq/acpi-cpufreq.c
39160+++ b/drivers/cpufreq/acpi-cpufreq.c
39161@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39162 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39163 per_cpu(acfreq_data, cpu) = data;
39164
39165- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39166- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39167+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39168+ pax_open_kernel();
39169+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39170+ pax_close_kernel();
39171+ }
39172
39173 result = acpi_processor_register_performance(data->acpi_data, cpu);
39174 if (result)
39175@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39176 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39177 break;
39178 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39179- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39180+ pax_open_kernel();
39181+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39182+ pax_close_kernel();
39183 break;
39184 default:
39185 break;
39186@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39187 if (!msrs)
39188 return;
39189
39190- acpi_cpufreq_driver.boost_supported = true;
39191- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39192+ pax_open_kernel();
39193+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39194+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39195+ pax_close_kernel();
39196
39197 cpu_notifier_register_begin();
39198
39199diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39200index f657c57..31d97ae 100644
39201--- a/drivers/cpufreq/cpufreq-dt.c
39202+++ b/drivers/cpufreq/cpufreq-dt.c
39203@@ -362,7 +362,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39204 if (!IS_ERR(cpu_reg))
39205 regulator_put(cpu_reg);
39206
39207- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39208+ pax_open_kernel();
39209+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39210+ pax_close_kernel();
39211
39212 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39213 if (ret)
39214diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39215index 4473eba..a4c9dc2 100644
39216--- a/drivers/cpufreq/cpufreq.c
39217+++ b/drivers/cpufreq/cpufreq.c
39218@@ -2122,7 +2122,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39219 }
39220
39221 mutex_lock(&cpufreq_governor_mutex);
39222- list_del(&governor->governor_list);
39223+ pax_list_del(&governor->governor_list);
39224 mutex_unlock(&cpufreq_governor_mutex);
39225 return;
39226 }
39227@@ -2338,7 +2338,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39228 return NOTIFY_OK;
39229 }
39230
39231-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39232+static struct notifier_block cpufreq_cpu_notifier = {
39233 .notifier_call = cpufreq_cpu_callback,
39234 };
39235
39236@@ -2378,13 +2378,17 @@ int cpufreq_boost_trigger_state(int state)
39237 return 0;
39238
39239 write_lock_irqsave(&cpufreq_driver_lock, flags);
39240- cpufreq_driver->boost_enabled = state;
39241+ pax_open_kernel();
39242+ *(bool *)&cpufreq_driver->boost_enabled = state;
39243+ pax_close_kernel();
39244 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39245
39246 ret = cpufreq_driver->set_boost(state);
39247 if (ret) {
39248 write_lock_irqsave(&cpufreq_driver_lock, flags);
39249- cpufreq_driver->boost_enabled = !state;
39250+ pax_open_kernel();
39251+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39252+ pax_close_kernel();
39253 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39254
39255 pr_err("%s: Cannot %s BOOST\n",
39256@@ -2441,8 +2445,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39257
39258 pr_debug("trying to register driver %s\n", driver_data->name);
39259
39260- if (driver_data->setpolicy)
39261- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39262+ if (driver_data->setpolicy) {
39263+ pax_open_kernel();
39264+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39265+ pax_close_kernel();
39266+ }
39267
39268 write_lock_irqsave(&cpufreq_driver_lock, flags);
39269 if (cpufreq_driver) {
39270@@ -2457,8 +2464,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39271 * Check if driver provides function to enable boost -
39272 * if not, use cpufreq_boost_set_sw as default
39273 */
39274- if (!cpufreq_driver->set_boost)
39275- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39276+ if (!cpufreq_driver->set_boost) {
39277+ pax_open_kernel();
39278+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39279+ pax_close_kernel();
39280+ }
39281
39282 ret = cpufreq_sysfs_create_file(&boost.attr);
39283 if (ret) {
39284diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39285index 1b44496..b80ff5e 100644
39286--- a/drivers/cpufreq/cpufreq_governor.c
39287+++ b/drivers/cpufreq/cpufreq_governor.c
39288@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39289 struct dbs_data *dbs_data;
39290 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39291 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39292- struct od_ops *od_ops = NULL;
39293+ const struct od_ops *od_ops = NULL;
39294 struct od_dbs_tuners *od_tuners = NULL;
39295 struct cs_dbs_tuners *cs_tuners = NULL;
39296 struct cpu_dbs_common_info *cpu_cdbs;
39297@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39298
39299 if ((cdata->governor == GOV_CONSERVATIVE) &&
39300 (!policy->governor->initialized)) {
39301- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39302+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39303
39304 cpufreq_register_notifier(cs_ops->notifier_block,
39305 CPUFREQ_TRANSITION_NOTIFIER);
39306@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39307
39308 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39309 (policy->governor->initialized == 1)) {
39310- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39311+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39312
39313 cpufreq_unregister_notifier(cs_ops->notifier_block,
39314 CPUFREQ_TRANSITION_NOTIFIER);
39315diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39316index cc401d1..8197340 100644
39317--- a/drivers/cpufreq/cpufreq_governor.h
39318+++ b/drivers/cpufreq/cpufreq_governor.h
39319@@ -212,7 +212,7 @@ struct common_dbs_data {
39320 void (*exit)(struct dbs_data *dbs_data);
39321
39322 /* Governor specific ops, see below */
39323- void *gov_ops;
39324+ const void *gov_ops;
39325 };
39326
39327 /* Governor Per policy data */
39328@@ -232,7 +232,7 @@ struct od_ops {
39329 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39330 unsigned int freq_next, unsigned int relation);
39331 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39332-};
39333+} __no_const;
39334
39335 struct cs_ops {
39336 struct notifier_block *notifier_block;
39337diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39338index ad3f38f..8f086cd 100644
39339--- a/drivers/cpufreq/cpufreq_ondemand.c
39340+++ b/drivers/cpufreq/cpufreq_ondemand.c
39341@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39342
39343 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39344
39345-static struct od_ops od_ops = {
39346+static struct od_ops od_ops __read_only = {
39347 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39348 .powersave_bias_target = generic_powersave_bias_target,
39349 .freq_increase = dbs_freq_increase,
39350@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39351 (struct cpufreq_policy *, unsigned int, unsigned int),
39352 unsigned int powersave_bias)
39353 {
39354- od_ops.powersave_bias_target = f;
39355+ pax_open_kernel();
39356+ *(void **)&od_ops.powersave_bias_target = f;
39357+ pax_close_kernel();
39358 od_set_powersave_bias(powersave_bias);
39359 }
39360 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39361
39362 void od_unregister_powersave_bias_handler(void)
39363 {
39364- od_ops.powersave_bias_target = generic_powersave_bias_target;
39365+ pax_open_kernel();
39366+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39367+ pax_close_kernel();
39368 od_set_powersave_bias(0);
39369 }
39370 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39371diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39372index 27bb6d3..4cf595c 100644
39373--- a/drivers/cpufreq/intel_pstate.c
39374+++ b/drivers/cpufreq/intel_pstate.c
39375@@ -133,10 +133,10 @@ struct pstate_funcs {
39376 struct cpu_defaults {
39377 struct pstate_adjust_policy pid_policy;
39378 struct pstate_funcs funcs;
39379-};
39380+} __do_const;
39381
39382 static struct pstate_adjust_policy pid_params;
39383-static struct pstate_funcs pstate_funcs;
39384+static struct pstate_funcs *pstate_funcs;
39385
39386 struct perf_limits {
39387 int no_turbo;
39388@@ -594,18 +594,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39389
39390 cpu->pstate.current_pstate = pstate;
39391
39392- pstate_funcs.set(cpu, pstate);
39393+ pstate_funcs->set(cpu, pstate);
39394 }
39395
39396 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39397 {
39398- cpu->pstate.min_pstate = pstate_funcs.get_min();
39399- cpu->pstate.max_pstate = pstate_funcs.get_max();
39400- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39401- cpu->pstate.scaling = pstate_funcs.get_scaling();
39402+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39403+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39404+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39405+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39406
39407- if (pstate_funcs.get_vid)
39408- pstate_funcs.get_vid(cpu);
39409+ if (pstate_funcs->get_vid)
39410+ pstate_funcs->get_vid(cpu);
39411 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39412 }
39413
39414@@ -875,9 +875,9 @@ static int intel_pstate_msrs_not_valid(void)
39415 rdmsrl(MSR_IA32_APERF, aperf);
39416 rdmsrl(MSR_IA32_MPERF, mperf);
39417
39418- if (!pstate_funcs.get_max() ||
39419- !pstate_funcs.get_min() ||
39420- !pstate_funcs.get_turbo())
39421+ if (!pstate_funcs->get_max() ||
39422+ !pstate_funcs->get_min() ||
39423+ !pstate_funcs->get_turbo())
39424 return -ENODEV;
39425
39426 rdmsrl(MSR_IA32_APERF, tmp);
39427@@ -891,7 +891,7 @@ static int intel_pstate_msrs_not_valid(void)
39428 return 0;
39429 }
39430
39431-static void copy_pid_params(struct pstate_adjust_policy *policy)
39432+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39433 {
39434 pid_params.sample_rate_ms = policy->sample_rate_ms;
39435 pid_params.p_gain_pct = policy->p_gain_pct;
39436@@ -903,12 +903,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39437
39438 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39439 {
39440- pstate_funcs.get_max = funcs->get_max;
39441- pstate_funcs.get_min = funcs->get_min;
39442- pstate_funcs.get_turbo = funcs->get_turbo;
39443- pstate_funcs.get_scaling = funcs->get_scaling;
39444- pstate_funcs.set = funcs->set;
39445- pstate_funcs.get_vid = funcs->get_vid;
39446+ pstate_funcs = funcs;
39447 }
39448
39449 #if IS_ENABLED(CONFIG_ACPI)
39450diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39451index 529cfd9..0e28fff 100644
39452--- a/drivers/cpufreq/p4-clockmod.c
39453+++ b/drivers/cpufreq/p4-clockmod.c
39454@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39455 case 0x0F: /* Core Duo */
39456 case 0x16: /* Celeron Core */
39457 case 0x1C: /* Atom */
39458- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39459+ pax_open_kernel();
39460+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39461+ pax_close_kernel();
39462 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39463 case 0x0D: /* Pentium M (Dothan) */
39464- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39465+ pax_open_kernel();
39466+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39467+ pax_close_kernel();
39468 /* fall through */
39469 case 0x09: /* Pentium M (Banias) */
39470 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39471@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39472
39473 /* on P-4s, the TSC runs with constant frequency independent whether
39474 * throttling is active or not. */
39475- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39476+ pax_open_kernel();
39477+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39478+ pax_close_kernel();
39479
39480 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39481 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39482diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39483index 9bb42ba..b01b4a2 100644
39484--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39485+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39486@@ -18,14 +18,12 @@
39487 #include <asm/head.h>
39488 #include <asm/timer.h>
39489
39490-static struct cpufreq_driver *cpufreq_us3_driver;
39491-
39492 struct us3_freq_percpu_info {
39493 struct cpufreq_frequency_table table[4];
39494 };
39495
39496 /* Indexed by cpu number. */
39497-static struct us3_freq_percpu_info *us3_freq_table;
39498+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39499
39500 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39501 * in the Safari config register.
39502@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39503
39504 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39505 {
39506- if (cpufreq_us3_driver)
39507- us3_freq_target(policy, 0);
39508+ us3_freq_target(policy, 0);
39509
39510 return 0;
39511 }
39512
39513+static int __init us3_freq_init(void);
39514+static void __exit us3_freq_exit(void);
39515+
39516+static struct cpufreq_driver cpufreq_us3_driver = {
39517+ .init = us3_freq_cpu_init,
39518+ .verify = cpufreq_generic_frequency_table_verify,
39519+ .target_index = us3_freq_target,
39520+ .get = us3_freq_get,
39521+ .exit = us3_freq_cpu_exit,
39522+ .name = "UltraSPARC-III",
39523+
39524+};
39525+
39526 static int __init us3_freq_init(void)
39527 {
39528 unsigned long manuf, impl, ver;
39529- int ret;
39530
39531 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39532 return -ENODEV;
39533@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39534 (impl == CHEETAH_IMPL ||
39535 impl == CHEETAH_PLUS_IMPL ||
39536 impl == JAGUAR_IMPL ||
39537- impl == PANTHER_IMPL)) {
39538- struct cpufreq_driver *driver;
39539-
39540- ret = -ENOMEM;
39541- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39542- if (!driver)
39543- goto err_out;
39544-
39545- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39546- GFP_KERNEL);
39547- if (!us3_freq_table)
39548- goto err_out;
39549-
39550- driver->init = us3_freq_cpu_init;
39551- driver->verify = cpufreq_generic_frequency_table_verify;
39552- driver->target_index = us3_freq_target;
39553- driver->get = us3_freq_get;
39554- driver->exit = us3_freq_cpu_exit;
39555- strcpy(driver->name, "UltraSPARC-III");
39556-
39557- cpufreq_us3_driver = driver;
39558- ret = cpufreq_register_driver(driver);
39559- if (ret)
39560- goto err_out;
39561-
39562- return 0;
39563-
39564-err_out:
39565- if (driver) {
39566- kfree(driver);
39567- cpufreq_us3_driver = NULL;
39568- }
39569- kfree(us3_freq_table);
39570- us3_freq_table = NULL;
39571- return ret;
39572- }
39573+ impl == PANTHER_IMPL))
39574+ return cpufreq_register_driver(&cpufreq_us3_driver);
39575
39576 return -ENODEV;
39577 }
39578
39579 static void __exit us3_freq_exit(void)
39580 {
39581- if (cpufreq_us3_driver) {
39582- cpufreq_unregister_driver(cpufreq_us3_driver);
39583- kfree(cpufreq_us3_driver);
39584- cpufreq_us3_driver = NULL;
39585- kfree(us3_freq_table);
39586- us3_freq_table = NULL;
39587- }
39588+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39589 }
39590
39591 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39592diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39593index 7d4a315..21bb886 100644
39594--- a/drivers/cpufreq/speedstep-centrino.c
39595+++ b/drivers/cpufreq/speedstep-centrino.c
39596@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39597 !cpu_has(cpu, X86_FEATURE_EST))
39598 return -ENODEV;
39599
39600- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39601- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39602+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39603+ pax_open_kernel();
39604+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39605+ pax_close_kernel();
39606+ }
39607
39608 if (policy->cpu != 0)
39609 return -ENODEV;
39610diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39611index e431d11..d0b997e 100644
39612--- a/drivers/cpuidle/driver.c
39613+++ b/drivers/cpuidle/driver.c
39614@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
39615
39616 static void poll_idle_init(struct cpuidle_driver *drv)
39617 {
39618- struct cpuidle_state *state = &drv->states[0];
39619+ cpuidle_state_no_const *state = &drv->states[0];
39620
39621 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39622 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39623diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39624index fb9f511..213e6cc 100644
39625--- a/drivers/cpuidle/governor.c
39626+++ b/drivers/cpuidle/governor.c
39627@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39628 mutex_lock(&cpuidle_lock);
39629 if (__cpuidle_find_governor(gov->name) == NULL) {
39630 ret = 0;
39631- list_add_tail(&gov->governor_list, &cpuidle_governors);
39632+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39633 if (!cpuidle_curr_governor ||
39634 cpuidle_curr_governor->rating < gov->rating)
39635 cpuidle_switch_governor(gov);
39636diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39637index 97c5903..023ad23 100644
39638--- a/drivers/cpuidle/sysfs.c
39639+++ b/drivers/cpuidle/sysfs.c
39640@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39641 NULL
39642 };
39643
39644-static struct attribute_group cpuidle_attr_group = {
39645+static attribute_group_no_const cpuidle_attr_group = {
39646 .attrs = cpuidle_default_attrs,
39647 .name = "cpuidle",
39648 };
39649diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39650index 8d2a772..33826c9 100644
39651--- a/drivers/crypto/hifn_795x.c
39652+++ b/drivers/crypto/hifn_795x.c
39653@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39654 MODULE_PARM_DESC(hifn_pll_ref,
39655 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39656
39657-static atomic_t hifn_dev_number;
39658+static atomic_unchecked_t hifn_dev_number;
39659
39660 #define ACRYPTO_OP_DECRYPT 0
39661 #define ACRYPTO_OP_ENCRYPT 1
39662@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39663 goto err_out_disable_pci_device;
39664
39665 snprintf(name, sizeof(name), "hifn%d",
39666- atomic_inc_return(&hifn_dev_number)-1);
39667+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
39668
39669 err = pci_request_regions(pdev, name);
39670 if (err)
39671diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39672index 30b538d8..1610d75 100644
39673--- a/drivers/devfreq/devfreq.c
39674+++ b/drivers/devfreq/devfreq.c
39675@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39676 goto err_out;
39677 }
39678
39679- list_add(&governor->node, &devfreq_governor_list);
39680+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39681
39682 list_for_each_entry(devfreq, &devfreq_list, node) {
39683 int ret = 0;
39684@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39685 }
39686 }
39687
39688- list_del(&governor->node);
39689+ pax_list_del((struct list_head *)&governor->node);
39690 err_out:
39691 mutex_unlock(&devfreq_list_lock);
39692
39693diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39694index 42d4974..2714f36 100644
39695--- a/drivers/dma/sh/shdma-base.c
39696+++ b/drivers/dma/sh/shdma-base.c
39697@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39698 schan->slave_id = -EINVAL;
39699 }
39700
39701- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39702- sdev->desc_size, GFP_KERNEL);
39703+ schan->desc = kcalloc(sdev->desc_size,
39704+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39705 if (!schan->desc) {
39706 ret = -ENOMEM;
39707 goto edescalloc;
39708diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39709index 58eb857..d7e42c8 100644
39710--- a/drivers/dma/sh/shdmac.c
39711+++ b/drivers/dma/sh/shdmac.c
39712@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39713 return ret;
39714 }
39715
39716-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39717+static struct notifier_block sh_dmae_nmi_notifier = {
39718 .notifier_call = sh_dmae_nmi_handler,
39719
39720 /* Run before NMI debug handler and KGDB */
39721diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39722index 592af5f..bb1d583 100644
39723--- a/drivers/edac/edac_device.c
39724+++ b/drivers/edac/edac_device.c
39725@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39726 */
39727 int edac_device_alloc_index(void)
39728 {
39729- static atomic_t device_indexes = ATOMIC_INIT(0);
39730+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39731
39732- return atomic_inc_return(&device_indexes) - 1;
39733+ return atomic_inc_return_unchecked(&device_indexes) - 1;
39734 }
39735 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39736
39737diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39738index a6cd361..7bdbf53 100644
39739--- a/drivers/edac/edac_mc_sysfs.c
39740+++ b/drivers/edac/edac_mc_sysfs.c
39741@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39742 struct dev_ch_attribute {
39743 struct device_attribute attr;
39744 int channel;
39745-};
39746+} __do_const;
39747
39748 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39749 struct dev_ch_attribute dev_attr_legacy_##_name = \
39750@@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39751 }
39752
39753 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39754+ pax_open_kernel();
39755 if (mci->get_sdram_scrub_rate) {
39756- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39757- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39758+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39759+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39760 }
39761 if (mci->set_sdram_scrub_rate) {
39762- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39763- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39764+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39765+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39766 }
39767+ pax_close_kernel();
39768 err = device_create_file(&mci->dev,
39769 &dev_attr_sdram_scrub_rate);
39770 if (err) {
39771diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39772index 2cf44b4d..6dd2dc7 100644
39773--- a/drivers/edac/edac_pci.c
39774+++ b/drivers/edac/edac_pci.c
39775@@ -29,7 +29,7 @@
39776
39777 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39778 static LIST_HEAD(edac_pci_list);
39779-static atomic_t pci_indexes = ATOMIC_INIT(0);
39780+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39781
39782 /*
39783 * edac_pci_alloc_ctl_info
39784@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39785 */
39786 int edac_pci_alloc_index(void)
39787 {
39788- return atomic_inc_return(&pci_indexes) - 1;
39789+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
39790 }
39791 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39792
39793diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39794index e8658e4..22746d6 100644
39795--- a/drivers/edac/edac_pci_sysfs.c
39796+++ b/drivers/edac/edac_pci_sysfs.c
39797@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39798 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39799 static int edac_pci_poll_msec = 1000; /* one second workq period */
39800
39801-static atomic_t pci_parity_count = ATOMIC_INIT(0);
39802-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39803+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39804+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39805
39806 static struct kobject *edac_pci_top_main_kobj;
39807 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39808@@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39809 void *value;
39810 ssize_t(*show) (void *, char *);
39811 ssize_t(*store) (void *, const char *, size_t);
39812-};
39813+} __do_const;
39814
39815 /* Set of show/store abstract level functions for PCI Parity object */
39816 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39817@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39818 edac_printk(KERN_CRIT, EDAC_PCI,
39819 "Signaled System Error on %s\n",
39820 pci_name(dev));
39821- atomic_inc(&pci_nonparity_count);
39822+ atomic_inc_unchecked(&pci_nonparity_count);
39823 }
39824
39825 if (status & (PCI_STATUS_PARITY)) {
39826@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39827 "Master Data Parity Error on %s\n",
39828 pci_name(dev));
39829
39830- atomic_inc(&pci_parity_count);
39831+ atomic_inc_unchecked(&pci_parity_count);
39832 }
39833
39834 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39835@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39836 "Detected Parity Error on %s\n",
39837 pci_name(dev));
39838
39839- atomic_inc(&pci_parity_count);
39840+ atomic_inc_unchecked(&pci_parity_count);
39841 }
39842 }
39843
39844@@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39845 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39846 "Signaled System Error on %s\n",
39847 pci_name(dev));
39848- atomic_inc(&pci_nonparity_count);
39849+ atomic_inc_unchecked(&pci_nonparity_count);
39850 }
39851
39852 if (status & (PCI_STATUS_PARITY)) {
39853@@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39854 "Master Data Parity Error on "
39855 "%s\n", pci_name(dev));
39856
39857- atomic_inc(&pci_parity_count);
39858+ atomic_inc_unchecked(&pci_parity_count);
39859 }
39860
39861 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39862@@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39863 "Detected Parity Error on %s\n",
39864 pci_name(dev));
39865
39866- atomic_inc(&pci_parity_count);
39867+ atomic_inc_unchecked(&pci_parity_count);
39868 }
39869 }
39870 }
39871@@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39872 if (!check_pci_errors)
39873 return;
39874
39875- before_count = atomic_read(&pci_parity_count);
39876+ before_count = atomic_read_unchecked(&pci_parity_count);
39877
39878 /* scan all PCI devices looking for a Parity Error on devices and
39879 * bridges.
39880@@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39881 /* Only if operator has selected panic on PCI Error */
39882 if (edac_pci_get_panic_on_pe()) {
39883 /* If the count is different 'after' from 'before' */
39884- if (before_count != atomic_read(&pci_parity_count))
39885+ if (before_count != atomic_read_unchecked(&pci_parity_count))
39886 panic("EDAC: PCI Parity Error");
39887 }
39888 }
39889diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39890index 51b7e3a..aa8a3e8 100644
39891--- a/drivers/edac/mce_amd.h
39892+++ b/drivers/edac/mce_amd.h
39893@@ -77,7 +77,7 @@ struct amd_decoder_ops {
39894 bool (*mc0_mce)(u16, u8);
39895 bool (*mc1_mce)(u16, u8);
39896 bool (*mc2_mce)(u16, u8);
39897-};
39898+} __no_const;
39899
39900 void amd_report_gart_errors(bool);
39901 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39902diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39903index 57ea7f4..af06b76 100644
39904--- a/drivers/firewire/core-card.c
39905+++ b/drivers/firewire/core-card.c
39906@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39907 const struct fw_card_driver *driver,
39908 struct device *device)
39909 {
39910- static atomic_t index = ATOMIC_INIT(-1);
39911+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
39912
39913- card->index = atomic_inc_return(&index);
39914+ card->index = atomic_inc_return_unchecked(&index);
39915 card->driver = driver;
39916 card->device = device;
39917 card->current_tlabel = 0;
39918@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39919
39920 void fw_core_remove_card(struct fw_card *card)
39921 {
39922- struct fw_card_driver dummy_driver = dummy_driver_template;
39923+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
39924
39925 card->driver->update_phy_reg(card, 4,
39926 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39927diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39928index 2c6d5e1..a2cca6b 100644
39929--- a/drivers/firewire/core-device.c
39930+++ b/drivers/firewire/core-device.c
39931@@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39932 struct config_rom_attribute {
39933 struct device_attribute attr;
39934 u32 key;
39935-};
39936+} __do_const;
39937
39938 static ssize_t show_immediate(struct device *dev,
39939 struct device_attribute *dattr, char *buf)
39940diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39941index eb6935c..3cc2bfa 100644
39942--- a/drivers/firewire/core-transaction.c
39943+++ b/drivers/firewire/core-transaction.c
39944@@ -38,6 +38,7 @@
39945 #include <linux/timer.h>
39946 #include <linux/types.h>
39947 #include <linux/workqueue.h>
39948+#include <linux/sched.h>
39949
39950 #include <asm/byteorder.h>
39951
39952diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39953index e1480ff6..1a429bd 100644
39954--- a/drivers/firewire/core.h
39955+++ b/drivers/firewire/core.h
39956@@ -111,6 +111,7 @@ struct fw_card_driver {
39957
39958 int (*stop_iso)(struct fw_iso_context *ctx);
39959 };
39960+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
39961
39962 void fw_card_initialize(struct fw_card *card,
39963 const struct fw_card_driver *driver, struct device *device);
39964diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
39965index a66a321..f6caf20 100644
39966--- a/drivers/firewire/ohci.c
39967+++ b/drivers/firewire/ohci.c
39968@@ -2056,10 +2056,12 @@ static void bus_reset_work(struct work_struct *work)
39969 be32_to_cpu(ohci->next_header));
39970 }
39971
39972+#ifndef CONFIG_GRKERNSEC
39973 if (param_remote_dma) {
39974 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
39975 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
39976 }
39977+#endif
39978
39979 spin_unlock_irq(&ohci->lock);
39980
39981@@ -2591,8 +2593,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
39982 unsigned long flags;
39983 int n, ret = 0;
39984
39985+#ifndef CONFIG_GRKERNSEC
39986 if (param_remote_dma)
39987 return 0;
39988+#endif
39989
39990 /*
39991 * FIXME: Make sure this bitmask is cleared when we clear the busReset
39992diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
39993index 94a58a0..f5eba42 100644
39994--- a/drivers/firmware/dmi-id.c
39995+++ b/drivers/firmware/dmi-id.c
39996@@ -16,7 +16,7 @@
39997 struct dmi_device_attribute{
39998 struct device_attribute dev_attr;
39999 int field;
40000-};
40001+} __do_const;
40002 #define to_dmi_dev_attr(_dev_attr) \
40003 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40004
40005diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
40006index 17afc51..0ef90cd 100644
40007--- a/drivers/firmware/dmi_scan.c
40008+++ b/drivers/firmware/dmi_scan.c
40009@@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
40010 if (buf == NULL)
40011 return -1;
40012
40013- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
40014+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
40015
40016 dmi_unmap(buf);
40017 return 0;
40018diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40019index 5b53d61..72cee96 100644
40020--- a/drivers/firmware/efi/cper.c
40021+++ b/drivers/firmware/efi/cper.c
40022@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40023 */
40024 u64 cper_next_record_id(void)
40025 {
40026- static atomic64_t seq;
40027+ static atomic64_unchecked_t seq;
40028
40029- if (!atomic64_read(&seq))
40030- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40031+ if (!atomic64_read_unchecked(&seq))
40032+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40033
40034- return atomic64_inc_return(&seq);
40035+ return atomic64_inc_return_unchecked(&seq);
40036 }
40037 EXPORT_SYMBOL_GPL(cper_next_record_id);
40038
40039diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40040index 8590099..d83627a 100644
40041--- a/drivers/firmware/efi/efi.c
40042+++ b/drivers/firmware/efi/efi.c
40043@@ -148,14 +148,16 @@ static struct attribute_group efi_subsys_attr_group = {
40044 };
40045
40046 static struct efivars generic_efivars;
40047-static struct efivar_operations generic_ops;
40048+static efivar_operations_no_const generic_ops __read_only;
40049
40050 static int generic_ops_register(void)
40051 {
40052- generic_ops.get_variable = efi.get_variable;
40053- generic_ops.set_variable = efi.set_variable;
40054- generic_ops.get_next_variable = efi.get_next_variable;
40055- generic_ops.query_variable_store = efi_query_variable_store;
40056+ pax_open_kernel();
40057+ *(void **)&generic_ops.get_variable = efi.get_variable;
40058+ *(void **)&generic_ops.set_variable = efi.set_variable;
40059+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40060+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40061+ pax_close_kernel();
40062
40063 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40064 }
40065diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40066index f256ecd..387dcb1 100644
40067--- a/drivers/firmware/efi/efivars.c
40068+++ b/drivers/firmware/efi/efivars.c
40069@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40070 static int
40071 create_efivars_bin_attributes(void)
40072 {
40073- struct bin_attribute *attr;
40074+ bin_attribute_no_const *attr;
40075 int error;
40076
40077 /* new_var */
40078diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40079index 2f569aa..c95f4fb 100644
40080--- a/drivers/firmware/google/memconsole.c
40081+++ b/drivers/firmware/google/memconsole.c
40082@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40083 if (!found_memconsole())
40084 return -ENODEV;
40085
40086- memconsole_bin_attr.size = memconsole_length;
40087+ pax_open_kernel();
40088+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40089+ pax_close_kernel();
40090+
40091 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40092 }
40093
40094diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40095index fe49ec3..1ade794 100644
40096--- a/drivers/gpio/gpio-em.c
40097+++ b/drivers/gpio/gpio-em.c
40098@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40099 struct em_gio_priv *p;
40100 struct resource *io[2], *irq[2];
40101 struct gpio_chip *gpio_chip;
40102- struct irq_chip *irq_chip;
40103+ irq_chip_no_const *irq_chip;
40104 const char *name = dev_name(&pdev->dev);
40105 int ret;
40106
40107diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40108index 3784e81..73637b5 100644
40109--- a/drivers/gpio/gpio-ich.c
40110+++ b/drivers/gpio/gpio-ich.c
40111@@ -94,7 +94,7 @@ struct ichx_desc {
40112 * this option allows driver caching written output values
40113 */
40114 bool use_outlvl_cache;
40115-};
40116+} __do_const;
40117
40118 static struct {
40119 spinlock_t lock;
40120diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40121index 415682f..08438b8 100644
40122--- a/drivers/gpio/gpio-omap.c
40123+++ b/drivers/gpio/gpio-omap.c
40124@@ -1162,7 +1162,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40125 const struct omap_gpio_platform_data *pdata;
40126 struct resource *res;
40127 struct gpio_bank *bank;
40128- struct irq_chip *irqc;
40129+ irq_chip_no_const *irqc;
40130 int ret;
40131
40132 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40133diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40134index bf6c094..6573caf 100644
40135--- a/drivers/gpio/gpio-rcar.c
40136+++ b/drivers/gpio/gpio-rcar.c
40137@@ -357,7 +357,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40138 struct gpio_rcar_priv *p;
40139 struct resource *io, *irq;
40140 struct gpio_chip *gpio_chip;
40141- struct irq_chip *irq_chip;
40142+ irq_chip_no_const *irq_chip;
40143 struct device *dev = &pdev->dev;
40144 const char *name = dev_name(dev);
40145 int ret;
40146diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40147index dbf28fa..04dad4e 100644
40148--- a/drivers/gpio/gpio-vr41xx.c
40149+++ b/drivers/gpio/gpio-vr41xx.c
40150@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40151 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40152 maskl, pendl, maskh, pendh);
40153
40154- atomic_inc(&irq_err_count);
40155+ atomic_inc_unchecked(&irq_err_count);
40156
40157 return -EINVAL;
40158 }
40159diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40160index c81bda0..a8ccd9f 100644
40161--- a/drivers/gpio/gpiolib.c
40162+++ b/drivers/gpio/gpiolib.c
40163@@ -539,8 +539,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40164 }
40165
40166 if (gpiochip->irqchip) {
40167- gpiochip->irqchip->irq_request_resources = NULL;
40168- gpiochip->irqchip->irq_release_resources = NULL;
40169+ pax_open_kernel();
40170+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40171+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40172+ pax_close_kernel();
40173 gpiochip->irqchip = NULL;
40174 }
40175 }
40176@@ -606,8 +608,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40177 gpiochip->irqchip = NULL;
40178 return -EINVAL;
40179 }
40180- irqchip->irq_request_resources = gpiochip_irq_reqres;
40181- irqchip->irq_release_resources = gpiochip_irq_relres;
40182+
40183+ pax_open_kernel();
40184+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40185+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40186+ pax_close_kernel();
40187
40188 /*
40189 * Prepare the mapping since the irqchip shall be orthogonal to
40190diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40191index e79c8d3..a9370bc 100644
40192--- a/drivers/gpu/drm/drm_crtc.c
40193+++ b/drivers/gpu/drm/drm_crtc.c
40194@@ -3900,7 +3900,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40195 goto done;
40196 }
40197
40198- if (copy_to_user(&enum_ptr[copied].name,
40199+ if (copy_to_user(enum_ptr[copied].name,
40200 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40201 ret = -EFAULT;
40202 goto done;
40203diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40204index bc3da32..7289357 100644
40205--- a/drivers/gpu/drm/drm_drv.c
40206+++ b/drivers/gpu/drm/drm_drv.c
40207@@ -443,7 +443,7 @@ void drm_unplug_dev(struct drm_device *dev)
40208
40209 drm_device_set_unplugged(dev);
40210
40211- if (dev->open_count == 0) {
40212+ if (local_read(&dev->open_count) == 0) {
40213 drm_put_dev(dev);
40214 }
40215 mutex_unlock(&drm_global_mutex);
40216diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
40217index ef757f7..98f720c 100644
40218--- a/drivers/gpu/drm/drm_fb_helper.c
40219+++ b/drivers/gpu/drm/drm_fb_helper.c
40220@@ -741,7 +741,9 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
40221 int i, j, rc = 0;
40222 int start;
40223
40224- drm_modeset_lock_all(dev);
40225+ if (__drm_modeset_lock_all(dev, !!oops_in_progress)) {
40226+ return -EBUSY;
40227+ }
40228 if (!drm_fb_helper_is_bound(fb_helper)) {
40229 drm_modeset_unlock_all(dev);
40230 return -EBUSY;
40231@@ -915,7 +917,9 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
40232 int ret = 0;
40233 int i;
40234
40235- drm_modeset_lock_all(dev);
40236+ if (__drm_modeset_lock_all(dev, !!oops_in_progress)) {
40237+ return -EBUSY;
40238+ }
40239 if (!drm_fb_helper_is_bound(fb_helper)) {
40240 drm_modeset_unlock_all(dev);
40241 return -EBUSY;
40242diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40243index ed7bc68..0d536af 100644
40244--- a/drivers/gpu/drm/drm_fops.c
40245+++ b/drivers/gpu/drm/drm_fops.c
40246@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40247 return PTR_ERR(minor);
40248
40249 dev = minor->dev;
40250- if (!dev->open_count++)
40251+ if (local_inc_return(&dev->open_count) == 1)
40252 need_setup = 1;
40253
40254 /* share address_space across all char-devs of a single device */
40255@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40256 return 0;
40257
40258 err_undo:
40259- dev->open_count--;
40260+ local_dec(&dev->open_count);
40261 drm_minor_release(minor);
40262 return retcode;
40263 }
40264@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40265
40266 mutex_lock(&drm_global_mutex);
40267
40268- DRM_DEBUG("open_count = %d\n", dev->open_count);
40269+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40270
40271 mutex_lock(&dev->struct_mutex);
40272 list_del(&file_priv->lhead);
40273@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40274 * Begin inline drm_release
40275 */
40276
40277- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40278+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40279 task_pid_nr(current),
40280 (long)old_encode_dev(file_priv->minor->kdev->devt),
40281- dev->open_count);
40282+ local_read(&dev->open_count));
40283
40284 /* Release any auth tokens that might point to this file_priv,
40285 (do that under the drm_global_mutex) */
40286@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40287 * End inline drm_release
40288 */
40289
40290- if (!--dev->open_count) {
40291+ if (local_dec_and_test(&dev->open_count)) {
40292 retcode = drm_lastclose(dev);
40293 if (drm_device_is_unplugged(dev))
40294 drm_put_dev(dev);
40295diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40296index 3d2e91c..d31c4c9 100644
40297--- a/drivers/gpu/drm/drm_global.c
40298+++ b/drivers/gpu/drm/drm_global.c
40299@@ -36,7 +36,7 @@
40300 struct drm_global_item {
40301 struct mutex mutex;
40302 void *object;
40303- int refcount;
40304+ atomic_t refcount;
40305 };
40306
40307 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40308@@ -49,7 +49,7 @@ void drm_global_init(void)
40309 struct drm_global_item *item = &glob[i];
40310 mutex_init(&item->mutex);
40311 item->object = NULL;
40312- item->refcount = 0;
40313+ atomic_set(&item->refcount, 0);
40314 }
40315 }
40316
40317@@ -59,7 +59,7 @@ void drm_global_release(void)
40318 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40319 struct drm_global_item *item = &glob[i];
40320 BUG_ON(item->object != NULL);
40321- BUG_ON(item->refcount != 0);
40322+ BUG_ON(atomic_read(&item->refcount) != 0);
40323 }
40324 }
40325
40326@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40327 struct drm_global_item *item = &glob[ref->global_type];
40328
40329 mutex_lock(&item->mutex);
40330- if (item->refcount == 0) {
40331+ if (atomic_read(&item->refcount) == 0) {
40332 item->object = kzalloc(ref->size, GFP_KERNEL);
40333 if (unlikely(item->object == NULL)) {
40334 ret = -ENOMEM;
40335@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40336 goto out_err;
40337
40338 }
40339- ++item->refcount;
40340+ atomic_inc(&item->refcount);
40341 ref->object = item->object;
40342 mutex_unlock(&item->mutex);
40343 return 0;
40344@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40345 struct drm_global_item *item = &glob[ref->global_type];
40346
40347 mutex_lock(&item->mutex);
40348- BUG_ON(item->refcount == 0);
40349+ BUG_ON(atomic_read(&item->refcount) == 0);
40350 BUG_ON(ref->object != item->object);
40351- if (--item->refcount == 0) {
40352+ if (atomic_dec_and_test(&item->refcount)) {
40353 ref->release(ref);
40354 item->object = NULL;
40355 }
40356diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40357index 51efebd..2b70935 100644
40358--- a/drivers/gpu/drm/drm_info.c
40359+++ b/drivers/gpu/drm/drm_info.c
40360@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40361 struct drm_local_map *map;
40362 struct drm_map_list *r_list;
40363
40364- /* Hardcoded from _DRM_FRAME_BUFFER,
40365- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40366- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40367- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40368+ static const char * const types[] = {
40369+ [_DRM_FRAME_BUFFER] = "FB",
40370+ [_DRM_REGISTERS] = "REG",
40371+ [_DRM_SHM] = "SHM",
40372+ [_DRM_AGP] = "AGP",
40373+ [_DRM_SCATTER_GATHER] = "SG",
40374+ [_DRM_CONSISTENT] = "PCI"};
40375 const char *type;
40376 int i;
40377
40378@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40379 map = r_list->map;
40380 if (!map)
40381 continue;
40382- if (map->type < 0 || map->type > 5)
40383+ if (map->type >= ARRAY_SIZE(types))
40384 type = "??";
40385 else
40386 type = types[map->type];
40387diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40388index 2f4c4343..dd12cd2 100644
40389--- a/drivers/gpu/drm/drm_ioc32.c
40390+++ b/drivers/gpu/drm/drm_ioc32.c
40391@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40392 request = compat_alloc_user_space(nbytes);
40393 if (!access_ok(VERIFY_WRITE, request, nbytes))
40394 return -EFAULT;
40395- list = (struct drm_buf_desc *) (request + 1);
40396+ list = (struct drm_buf_desc __user *) (request + 1);
40397
40398 if (__put_user(count, &request->count)
40399 || __put_user(list, &request->list))
40400@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40401 request = compat_alloc_user_space(nbytes);
40402 if (!access_ok(VERIFY_WRITE, request, nbytes))
40403 return -EFAULT;
40404- list = (struct drm_buf_pub *) (request + 1);
40405+ list = (struct drm_buf_pub __user *) (request + 1);
40406
40407 if (__put_user(count, &request->count)
40408 || __put_user(list, &request->list))
40409@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40410 return 0;
40411 }
40412
40413-drm_ioctl_compat_t *drm_compat_ioctls[] = {
40414+drm_ioctl_compat_t drm_compat_ioctls[] = {
40415 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40416 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40417 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40418@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40419 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40420 {
40421 unsigned int nr = DRM_IOCTL_NR(cmd);
40422- drm_ioctl_compat_t *fn;
40423 int ret;
40424
40425 /* Assume that ioctls without an explicit compat routine will just
40426@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40427 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40428 return drm_ioctl(filp, cmd, arg);
40429
40430- fn = drm_compat_ioctls[nr];
40431-
40432- if (fn != NULL)
40433- ret = (*fn) (filp, cmd, arg);
40434+ if (drm_compat_ioctls[nr] != NULL)
40435+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40436 else
40437 ret = drm_ioctl(filp, cmd, arg);
40438
40439diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40440index 00587a1..57a65ca 100644
40441--- a/drivers/gpu/drm/drm_ioctl.c
40442+++ b/drivers/gpu/drm/drm_ioctl.c
40443@@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
40444 struct drm_file *file_priv = filp->private_data;
40445 struct drm_device *dev;
40446 const struct drm_ioctl_desc *ioctl = NULL;
40447- drm_ioctl_t *func;
40448+ drm_ioctl_no_const_t func;
40449 unsigned int nr = DRM_IOCTL_NR(cmd);
40450 int retcode = -EINVAL;
40451 char stack_kdata[128];
40452diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40453index 93ec5dc..82acbaf 100644
40454--- a/drivers/gpu/drm/i810/i810_drv.h
40455+++ b/drivers/gpu/drm/i810/i810_drv.h
40456@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40457 int page_flipping;
40458
40459 wait_queue_head_t irq_queue;
40460- atomic_t irq_received;
40461- atomic_t irq_emitted;
40462+ atomic_unchecked_t irq_received;
40463+ atomic_unchecked_t irq_emitted;
40464
40465 int front_offset;
40466 } drm_i810_private_t;
40467diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40468index 318ade9..1f5de55 100644
40469--- a/drivers/gpu/drm/i915/i915_dma.c
40470+++ b/drivers/gpu/drm/i915/i915_dma.c
40471@@ -1294,7 +1294,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40472 * locking inversion with the driver load path. And the access here is
40473 * completely racy anyway. So don't bother with locking for now.
40474 */
40475- return dev->open_count == 0;
40476+ return local_read(&dev->open_count) == 0;
40477 }
40478
40479 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40480diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40481index 1a0611b..dd1fbfc 100644
40482--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40483+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40484@@ -866,12 +866,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40485 static int
40486 validate_exec_list(struct drm_device *dev,
40487 struct drm_i915_gem_exec_object2 *exec,
40488- int count)
40489+ unsigned int count)
40490 {
40491 unsigned relocs_total = 0;
40492 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40493 unsigned invalid_flags;
40494- int i;
40495+ unsigned int i;
40496
40497 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40498 if (USES_FULL_PPGTT(dev))
40499diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40500index 2e0613e..a8b94d9 100644
40501--- a/drivers/gpu/drm/i915/i915_ioc32.c
40502+++ b/drivers/gpu/drm/i915/i915_ioc32.c
40503@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40504 (unsigned long)request);
40505 }
40506
40507-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40508+static drm_ioctl_compat_t i915_compat_ioctls[] = {
40509 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40510 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40511 [DRM_I915_GETPARAM] = compat_i915_getparam,
40512@@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40513 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40514 {
40515 unsigned int nr = DRM_IOCTL_NR(cmd);
40516- drm_ioctl_compat_t *fn = NULL;
40517 int ret;
40518
40519 if (nr < DRM_COMMAND_BASE)
40520 return drm_compat_ioctl(filp, cmd, arg);
40521
40522- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40523- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40524-
40525- if (fn != NULL)
40526+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
40527+ drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40528 ret = (*fn) (filp, cmd, arg);
40529- else
40530+ } else
40531 ret = drm_ioctl(filp, cmd, arg);
40532
40533 return ret;
40534diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40535index 31b9664..5d478d3 100644
40536--- a/drivers/gpu/drm/i915/intel_display.c
40537+++ b/drivers/gpu/drm/i915/intel_display.c
40538@@ -12811,13 +12811,13 @@ struct intel_quirk {
40539 int subsystem_vendor;
40540 int subsystem_device;
40541 void (*hook)(struct drm_device *dev);
40542-};
40543+} __do_const;
40544
40545 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40546 struct intel_dmi_quirk {
40547 void (*hook)(struct drm_device *dev);
40548 const struct dmi_system_id (*dmi_id_list)[];
40549-};
40550+} __do_const;
40551
40552 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40553 {
40554@@ -12825,18 +12825,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40555 return 1;
40556 }
40557
40558-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40559+static const struct dmi_system_id intel_dmi_quirks_table[] = {
40560 {
40561- .dmi_id_list = &(const struct dmi_system_id[]) {
40562- {
40563- .callback = intel_dmi_reverse_brightness,
40564- .ident = "NCR Corporation",
40565- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40566- DMI_MATCH(DMI_PRODUCT_NAME, ""),
40567- },
40568- },
40569- { } /* terminating entry */
40570+ .callback = intel_dmi_reverse_brightness,
40571+ .ident = "NCR Corporation",
40572+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40573+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
40574 },
40575+ },
40576+ { } /* terminating entry */
40577+};
40578+
40579+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40580+ {
40581+ .dmi_id_list = &intel_dmi_quirks_table,
40582 .hook = quirk_invert_brightness,
40583 },
40584 };
40585diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40586index b4a2014..219ab78 100644
40587--- a/drivers/gpu/drm/mga/mga_drv.h
40588+++ b/drivers/gpu/drm/mga/mga_drv.h
40589@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
40590 u32 clear_cmd;
40591 u32 maccess;
40592
40593- atomic_t vbl_received; /**< Number of vblanks received. */
40594+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40595 wait_queue_head_t fence_queue;
40596- atomic_t last_fence_retired;
40597+ atomic_unchecked_t last_fence_retired;
40598 u32 next_fence_to_post;
40599
40600 unsigned int fb_cpp;
40601diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40602index 729bfd5..ead8823 100644
40603--- a/drivers/gpu/drm/mga/mga_ioc32.c
40604+++ b/drivers/gpu/drm/mga/mga_ioc32.c
40605@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40606 return 0;
40607 }
40608
40609-drm_ioctl_compat_t *mga_compat_ioctls[] = {
40610+drm_ioctl_compat_t mga_compat_ioctls[] = {
40611 [DRM_MGA_INIT] = compat_mga_init,
40612 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40613 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40614@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40615 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40616 {
40617 unsigned int nr = DRM_IOCTL_NR(cmd);
40618- drm_ioctl_compat_t *fn = NULL;
40619 int ret;
40620
40621 if (nr < DRM_COMMAND_BASE)
40622 return drm_compat_ioctl(filp, cmd, arg);
40623
40624- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
40625- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40626-
40627- if (fn != NULL)
40628+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
40629+ drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40630 ret = (*fn) (filp, cmd, arg);
40631- else
40632+ } else
40633 ret = drm_ioctl(filp, cmd, arg);
40634
40635 return ret;
40636diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40637index 1b071b8..de8601a 100644
40638--- a/drivers/gpu/drm/mga/mga_irq.c
40639+++ b/drivers/gpu/drm/mga/mga_irq.c
40640@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40641 if (crtc != 0)
40642 return 0;
40643
40644- return atomic_read(&dev_priv->vbl_received);
40645+ return atomic_read_unchecked(&dev_priv->vbl_received);
40646 }
40647
40648
40649@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40650 /* VBLANK interrupt */
40651 if (status & MGA_VLINEPEN) {
40652 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40653- atomic_inc(&dev_priv->vbl_received);
40654+ atomic_inc_unchecked(&dev_priv->vbl_received);
40655 drm_handle_vblank(dev, 0);
40656 handled = 1;
40657 }
40658@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40659 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40660 MGA_WRITE(MGA_PRIMEND, prim_end);
40661
40662- atomic_inc(&dev_priv->last_fence_retired);
40663+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
40664 wake_up(&dev_priv->fence_queue);
40665 handled = 1;
40666 }
40667@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40668 * using fences.
40669 */
40670 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40671- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40672+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40673 - *sequence) <= (1 << 23)));
40674
40675 *sequence = cur_fence;
40676diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40677index dae2c96..324dbe4 100644
40678--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40679+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40680@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40681 struct bit_table {
40682 const char id;
40683 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40684-};
40685+} __no_const;
40686
40687 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40688
40689diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40690index 8ae36f2..1147a30 100644
40691--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40692+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40693@@ -121,7 +121,6 @@ struct nouveau_drm {
40694 struct drm_global_reference mem_global_ref;
40695 struct ttm_bo_global_ref bo_global_ref;
40696 struct ttm_bo_device bdev;
40697- atomic_t validate_sequence;
40698 int (*move)(struct nouveau_channel *,
40699 struct ttm_buffer_object *,
40700 struct ttm_mem_reg *, struct ttm_mem_reg *);
40701diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40702index 462679a..88e32a7 100644
40703--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40704+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40705@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40706 unsigned long arg)
40707 {
40708 unsigned int nr = DRM_IOCTL_NR(cmd);
40709- drm_ioctl_compat_t *fn = NULL;
40710+ drm_ioctl_compat_t fn = NULL;
40711 int ret;
40712
40713 if (nr < DRM_COMMAND_BASE)
40714diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40715index 3d1cfcb..0542700 100644
40716--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40717+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40718@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40719 }
40720
40721 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40722- nouveau_vram_manager_init,
40723- nouveau_vram_manager_fini,
40724- nouveau_vram_manager_new,
40725- nouveau_vram_manager_del,
40726- nouveau_vram_manager_debug
40727+ .init = nouveau_vram_manager_init,
40728+ .takedown = nouveau_vram_manager_fini,
40729+ .get_node = nouveau_vram_manager_new,
40730+ .put_node = nouveau_vram_manager_del,
40731+ .debug = nouveau_vram_manager_debug
40732 };
40733
40734 static int
40735@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40736 }
40737
40738 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40739- nouveau_gart_manager_init,
40740- nouveau_gart_manager_fini,
40741- nouveau_gart_manager_new,
40742- nouveau_gart_manager_del,
40743- nouveau_gart_manager_debug
40744+ .init = nouveau_gart_manager_init,
40745+ .takedown = nouveau_gart_manager_fini,
40746+ .get_node = nouveau_gart_manager_new,
40747+ .put_node = nouveau_gart_manager_del,
40748+ .debug = nouveau_gart_manager_debug
40749 };
40750
40751 /*XXX*/
40752@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40753 }
40754
40755 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40756- nv04_gart_manager_init,
40757- nv04_gart_manager_fini,
40758- nv04_gart_manager_new,
40759- nv04_gart_manager_del,
40760- nv04_gart_manager_debug
40761+ .init = nv04_gart_manager_init,
40762+ .takedown = nv04_gart_manager_fini,
40763+ .get_node = nv04_gart_manager_new,
40764+ .put_node = nv04_gart_manager_del,
40765+ .debug = nv04_gart_manager_debug
40766 };
40767
40768 int
40769diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40770index c7592ec..dd45ebc 100644
40771--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40772+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40773@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40774 * locking inversion with the driver load path. And the access here is
40775 * completely racy anyway. So don't bother with locking for now.
40776 */
40777- return dev->open_count == 0;
40778+ return local_read(&dev->open_count) == 0;
40779 }
40780
40781 static const struct vga_switcheroo_client_ops
40782diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40783index 9782364..89bd954 100644
40784--- a/drivers/gpu/drm/qxl/qxl_cmd.c
40785+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40786@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40787 int ret;
40788
40789 mutex_lock(&qdev->async_io_mutex);
40790- irq_num = atomic_read(&qdev->irq_received_io_cmd);
40791+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40792 if (qdev->last_sent_io_cmd > irq_num) {
40793 if (intr)
40794 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40795- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40796+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40797 else
40798 ret = wait_event_timeout(qdev->io_cmd_event,
40799- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40800+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40801 /* 0 is timeout, just bail the "hw" has gone away */
40802 if (ret <= 0)
40803 goto out;
40804- irq_num = atomic_read(&qdev->irq_received_io_cmd);
40805+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40806 }
40807 outb(val, addr);
40808 qdev->last_sent_io_cmd = irq_num + 1;
40809 if (intr)
40810 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40811- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40812+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40813 else
40814 ret = wait_event_timeout(qdev->io_cmd_event,
40815- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40816+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40817 out:
40818 if (ret > 0)
40819 ret = 0;
40820diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40821index 6911b8c..89d6867 100644
40822--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40823+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40824@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40825 struct drm_info_node *node = (struct drm_info_node *) m->private;
40826 struct qxl_device *qdev = node->minor->dev->dev_private;
40827
40828- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40829- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40830- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40831- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40832+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40833+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40834+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40835+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40836 seq_printf(m, "%d\n", qdev->irq_received_error);
40837 return 0;
40838 }
40839diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40840index 7c6cafe..460f542 100644
40841--- a/drivers/gpu/drm/qxl/qxl_drv.h
40842+++ b/drivers/gpu/drm/qxl/qxl_drv.h
40843@@ -290,10 +290,10 @@ struct qxl_device {
40844 unsigned int last_sent_io_cmd;
40845
40846 /* interrupt handling */
40847- atomic_t irq_received;
40848- atomic_t irq_received_display;
40849- atomic_t irq_received_cursor;
40850- atomic_t irq_received_io_cmd;
40851+ atomic_unchecked_t irq_received;
40852+ atomic_unchecked_t irq_received_display;
40853+ atomic_unchecked_t irq_received_cursor;
40854+ atomic_unchecked_t irq_received_io_cmd;
40855 unsigned irq_received_error;
40856 wait_queue_head_t display_event;
40857 wait_queue_head_t cursor_event;
40858diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40859index b110883..dd06418 100644
40860--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40861+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40862@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40863
40864 /* TODO copy slow path code from i915 */
40865 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40866- 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);
40867+ 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);
40868
40869 {
40870 struct qxl_drawable *draw = fb_cmd;
40871@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40872 struct drm_qxl_reloc reloc;
40873
40874 if (copy_from_user(&reloc,
40875- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40876+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40877 sizeof(reloc))) {
40878 ret = -EFAULT;
40879 goto out_free_bos;
40880@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40881
40882 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40883
40884- struct drm_qxl_command *commands =
40885- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40886+ struct drm_qxl_command __user *commands =
40887+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40888
40889- if (copy_from_user(&user_cmd, &commands[cmd_num],
40890+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40891 sizeof(user_cmd)))
40892 return -EFAULT;
40893
40894diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40895index 0bf1e20..42a7310 100644
40896--- a/drivers/gpu/drm/qxl/qxl_irq.c
40897+++ b/drivers/gpu/drm/qxl/qxl_irq.c
40898@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40899 if (!pending)
40900 return IRQ_NONE;
40901
40902- atomic_inc(&qdev->irq_received);
40903+ atomic_inc_unchecked(&qdev->irq_received);
40904
40905 if (pending & QXL_INTERRUPT_DISPLAY) {
40906- atomic_inc(&qdev->irq_received_display);
40907+ atomic_inc_unchecked(&qdev->irq_received_display);
40908 wake_up_all(&qdev->display_event);
40909 qxl_queue_garbage_collect(qdev, false);
40910 }
40911 if (pending & QXL_INTERRUPT_CURSOR) {
40912- atomic_inc(&qdev->irq_received_cursor);
40913+ atomic_inc_unchecked(&qdev->irq_received_cursor);
40914 wake_up_all(&qdev->cursor_event);
40915 }
40916 if (pending & QXL_INTERRUPT_IO_CMD) {
40917- atomic_inc(&qdev->irq_received_io_cmd);
40918+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40919 wake_up_all(&qdev->io_cmd_event);
40920 }
40921 if (pending & QXL_INTERRUPT_ERROR) {
40922@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40923 init_waitqueue_head(&qdev->io_cmd_event);
40924 INIT_WORK(&qdev->client_monitors_config_work,
40925 qxl_client_monitors_config_work_func);
40926- atomic_set(&qdev->irq_received, 0);
40927- atomic_set(&qdev->irq_received_display, 0);
40928- atomic_set(&qdev->irq_received_cursor, 0);
40929- atomic_set(&qdev->irq_received_io_cmd, 0);
40930+ atomic_set_unchecked(&qdev->irq_received, 0);
40931+ atomic_set_unchecked(&qdev->irq_received_display, 0);
40932+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40933+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40934 qdev->irq_received_error = 0;
40935 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
40936 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40937diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40938index 0cbc4c9..0e46686 100644
40939--- a/drivers/gpu/drm/qxl/qxl_ttm.c
40940+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40941@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40942 }
40943 }
40944
40945-static struct vm_operations_struct qxl_ttm_vm_ops;
40946+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40947 static const struct vm_operations_struct *ttm_vm_ops;
40948
40949 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40950@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40951 return r;
40952 if (unlikely(ttm_vm_ops == NULL)) {
40953 ttm_vm_ops = vma->vm_ops;
40954+ pax_open_kernel();
40955 qxl_ttm_vm_ops = *ttm_vm_ops;
40956 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40957+ pax_close_kernel();
40958 }
40959 vma->vm_ops = &qxl_ttm_vm_ops;
40960 return 0;
40961@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40962 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40963 {
40964 #if defined(CONFIG_DEBUG_FS)
40965- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40966- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40967- unsigned i;
40968+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40969+ {
40970+ .name = "qxl_mem_mm",
40971+ .show = &qxl_mm_dump_table,
40972+ },
40973+ {
40974+ .name = "qxl_surf_mm",
40975+ .show = &qxl_mm_dump_table,
40976+ }
40977+ };
40978
40979- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40980- if (i == 0)
40981- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40982- else
40983- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40984- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40985- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40986- qxl_mem_types_list[i].driver_features = 0;
40987- if (i == 0)
40988- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40989- else
40990- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40991+ pax_open_kernel();
40992+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40993+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40994+ pax_close_kernel();
40995
40996- }
40997- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
40998+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
40999 #else
41000 return 0;
41001 #endif
41002diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41003index 2c45ac9..5d740f8 100644
41004--- a/drivers/gpu/drm/r128/r128_cce.c
41005+++ b/drivers/gpu/drm/r128/r128_cce.c
41006@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41007
41008 /* GH: Simple idle check.
41009 */
41010- atomic_set(&dev_priv->idle_count, 0);
41011+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41012
41013 /* We don't support anything other than bus-mastering ring mode,
41014 * but the ring can be in either AGP or PCI space for the ring
41015diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41016index 723e5d6..102dbaf 100644
41017--- a/drivers/gpu/drm/r128/r128_drv.h
41018+++ b/drivers/gpu/drm/r128/r128_drv.h
41019@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41020 int is_pci;
41021 unsigned long cce_buffers_offset;
41022
41023- atomic_t idle_count;
41024+ atomic_unchecked_t idle_count;
41025
41026 int page_flipping;
41027 int current_page;
41028 u32 crtc_offset;
41029 u32 crtc_offset_cntl;
41030
41031- atomic_t vbl_received;
41032+ atomic_unchecked_t vbl_received;
41033
41034 u32 color_fmt;
41035 unsigned int front_offset;
41036diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41037index 663f38c..c689495 100644
41038--- a/drivers/gpu/drm/r128/r128_ioc32.c
41039+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41040@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41041 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41042 }
41043
41044-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41045+drm_ioctl_compat_t r128_compat_ioctls[] = {
41046 [DRM_R128_INIT] = compat_r128_init,
41047 [DRM_R128_DEPTH] = compat_r128_depth,
41048 [DRM_R128_STIPPLE] = compat_r128_stipple,
41049@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41050 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41051 {
41052 unsigned int nr = DRM_IOCTL_NR(cmd);
41053- drm_ioctl_compat_t *fn = NULL;
41054 int ret;
41055
41056 if (nr < DRM_COMMAND_BASE)
41057 return drm_compat_ioctl(filp, cmd, arg);
41058
41059- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41060- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41061-
41062- if (fn != NULL)
41063+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
41064+ drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41065 ret = (*fn) (filp, cmd, arg);
41066- else
41067+ } else
41068 ret = drm_ioctl(filp, cmd, arg);
41069
41070 return ret;
41071diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41072index c2ae496..30b5993 100644
41073--- a/drivers/gpu/drm/r128/r128_irq.c
41074+++ b/drivers/gpu/drm/r128/r128_irq.c
41075@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41076 if (crtc != 0)
41077 return 0;
41078
41079- return atomic_read(&dev_priv->vbl_received);
41080+ return atomic_read_unchecked(&dev_priv->vbl_received);
41081 }
41082
41083 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41084@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41085 /* VBLANK interrupt */
41086 if (status & R128_CRTC_VBLANK_INT) {
41087 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41088- atomic_inc(&dev_priv->vbl_received);
41089+ atomic_inc_unchecked(&dev_priv->vbl_received);
41090 drm_handle_vblank(dev, 0);
41091 return IRQ_HANDLED;
41092 }
41093diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41094index 575e986..66e62ca 100644
41095--- a/drivers/gpu/drm/r128/r128_state.c
41096+++ b/drivers/gpu/drm/r128/r128_state.c
41097@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41098
41099 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41100 {
41101- if (atomic_read(&dev_priv->idle_count) == 0)
41102+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41103 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41104 else
41105- atomic_set(&dev_priv->idle_count, 0);
41106+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41107 }
41108
41109 #endif
41110diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41111index 4a85bb6..aaea819 100644
41112--- a/drivers/gpu/drm/radeon/mkregtable.c
41113+++ b/drivers/gpu/drm/radeon/mkregtable.c
41114@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41115 regex_t mask_rex;
41116 regmatch_t match[4];
41117 char buf[1024];
41118- size_t end;
41119+ long end;
41120 int len;
41121 int done = 0;
41122 int r;
41123 unsigned o;
41124 struct offset *offset;
41125 char last_reg_s[10];
41126- int last_reg;
41127+ unsigned long last_reg;
41128
41129 if (regcomp
41130 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41131diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41132index 995a8b1..b7cb898 100644
41133--- a/drivers/gpu/drm/radeon/radeon_device.c
41134+++ b/drivers/gpu/drm/radeon/radeon_device.c
41135@@ -1214,7 +1214,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41136 * locking inversion with the driver load path. And the access here is
41137 * completely racy anyway. So don't bother with locking for now.
41138 */
41139- return dev->open_count == 0;
41140+ return local_read(&dev->open_count) == 0;
41141 }
41142
41143 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41144diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41145index 46bd393..6ae4719 100644
41146--- a/drivers/gpu/drm/radeon/radeon_drv.h
41147+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41148@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41149
41150 /* SW interrupt */
41151 wait_queue_head_t swi_queue;
41152- atomic_t swi_emitted;
41153+ atomic_unchecked_t swi_emitted;
41154 int vblank_crtc;
41155 uint32_t irq_enable_reg;
41156 uint32_t r500_disp_irq_reg;
41157diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41158index 0b98ea1..0881827 100644
41159--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41160+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41161@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41162 request = compat_alloc_user_space(sizeof(*request));
41163 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41164 || __put_user(req32.param, &request->param)
41165- || __put_user((void __user *)(unsigned long)req32.value,
41166+ || __put_user((unsigned long)req32.value,
41167 &request->value))
41168 return -EFAULT;
41169
41170@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41171 #define compat_radeon_cp_setparam NULL
41172 #endif /* X86_64 || IA64 */
41173
41174-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41175+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41176 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41177 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41178 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41179@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41180 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41181 {
41182 unsigned int nr = DRM_IOCTL_NR(cmd);
41183- drm_ioctl_compat_t *fn = NULL;
41184 int ret;
41185
41186 if (nr < DRM_COMMAND_BASE)
41187 return drm_compat_ioctl(filp, cmd, arg);
41188
41189- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41190- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41191-
41192- if (fn != NULL)
41193+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
41194+ drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41195 ret = (*fn) (filp, cmd, arg);
41196- else
41197+ } else
41198 ret = drm_ioctl(filp, cmd, arg);
41199
41200 return ret;
41201diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41202index 244b19b..c19226d 100644
41203--- a/drivers/gpu/drm/radeon/radeon_irq.c
41204+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41205@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41206 unsigned int ret;
41207 RING_LOCALS;
41208
41209- atomic_inc(&dev_priv->swi_emitted);
41210- ret = atomic_read(&dev_priv->swi_emitted);
41211+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41212+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41213
41214 BEGIN_RING(4);
41215 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41216@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41217 drm_radeon_private_t *dev_priv =
41218 (drm_radeon_private_t *) dev->dev_private;
41219
41220- atomic_set(&dev_priv->swi_emitted, 0);
41221+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41222 init_waitqueue_head(&dev_priv->swi_queue);
41223
41224 dev->max_vblank_count = 0x001fffff;
41225diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41226index 535403e..5dd655b 100644
41227--- a/drivers/gpu/drm/radeon/radeon_state.c
41228+++ b/drivers/gpu/drm/radeon/radeon_state.c
41229@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41230 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41231 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41232
41233- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41234+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41235 sarea_priv->nbox * sizeof(depth_boxes[0])))
41236 return -EFAULT;
41237
41238@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41239 {
41240 drm_radeon_private_t *dev_priv = dev->dev_private;
41241 drm_radeon_getparam_t *param = data;
41242- int value;
41243+ int value = 0;
41244
41245 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41246
41247diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41248index d2510cf..63bd4ed 100644
41249--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41250+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41251@@ -936,7 +936,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41252 man->size = size >> PAGE_SHIFT;
41253 }
41254
41255-static struct vm_operations_struct radeon_ttm_vm_ops;
41256+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41257 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41258
41259 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41260@@ -977,8 +977,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41261 }
41262 if (unlikely(ttm_vm_ops == NULL)) {
41263 ttm_vm_ops = vma->vm_ops;
41264+ pax_open_kernel();
41265 radeon_ttm_vm_ops = *ttm_vm_ops;
41266 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41267+ pax_close_kernel();
41268 }
41269 vma->vm_ops = &radeon_ttm_vm_ops;
41270 return 0;
41271diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41272index 054a79f..30d9ac4 100644
41273--- a/drivers/gpu/drm/tegra/dc.c
41274+++ b/drivers/gpu/drm/tegra/dc.c
41275@@ -1242,7 +1242,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41276 }
41277
41278 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41279- dc->debugfs_files[i].data = dc;
41280+ *(void **)&dc->debugfs_files[i].data = dc;
41281
41282 err = drm_debugfs_create_files(dc->debugfs_files,
41283 ARRAY_SIZE(debugfs_files),
41284diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41285index f787445..2df2c65 100644
41286--- a/drivers/gpu/drm/tegra/dsi.c
41287+++ b/drivers/gpu/drm/tegra/dsi.c
41288@@ -41,7 +41,7 @@ struct tegra_dsi {
41289 struct clk *clk_lp;
41290 struct clk *clk;
41291
41292- struct drm_info_list *debugfs_files;
41293+ drm_info_list_no_const *debugfs_files;
41294 struct drm_minor *minor;
41295 struct dentry *debugfs;
41296
41297diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41298index ffe2654..03c7b1c 100644
41299--- a/drivers/gpu/drm/tegra/hdmi.c
41300+++ b/drivers/gpu/drm/tegra/hdmi.c
41301@@ -60,7 +60,7 @@ struct tegra_hdmi {
41302 bool stereo;
41303 bool dvi;
41304
41305- struct drm_info_list *debugfs_files;
41306+ drm_info_list_no_const *debugfs_files;
41307 struct drm_minor *minor;
41308 struct dentry *debugfs;
41309 };
41310diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41311index 964387f..4eafc00 100644
41312--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41313+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41314@@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41315 }
41316
41317 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41318- ttm_bo_man_init,
41319- ttm_bo_man_takedown,
41320- ttm_bo_man_get_node,
41321- ttm_bo_man_put_node,
41322- ttm_bo_man_debug
41323+ .init = ttm_bo_man_init,
41324+ .takedown = ttm_bo_man_takedown,
41325+ .get_node = ttm_bo_man_get_node,
41326+ .put_node = ttm_bo_man_put_node,
41327+ .debug = ttm_bo_man_debug
41328 };
41329 EXPORT_SYMBOL(ttm_bo_manager_func);
41330diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41331index a1803fb..c53f6b0 100644
41332--- a/drivers/gpu/drm/ttm/ttm_memory.c
41333+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41334@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41335 zone->glob = glob;
41336 glob->zone_kernel = zone;
41337 ret = kobject_init_and_add(
41338- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41339+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41340 if (unlikely(ret != 0)) {
41341 kobject_put(&zone->kobj);
41342 return ret;
41343@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41344 zone->glob = glob;
41345 glob->zone_dma32 = zone;
41346 ret = kobject_init_and_add(
41347- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41348+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41349 if (unlikely(ret != 0)) {
41350 kobject_put(&zone->kobj);
41351 return ret;
41352diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41353index 025c429..314062f 100644
41354--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41355+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41356@@ -54,7 +54,7 @@
41357
41358 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41359 #define SMALL_ALLOCATION 16
41360-#define FREE_ALL_PAGES (~0U)
41361+#define FREE_ALL_PAGES (~0UL)
41362 /* times are in msecs */
41363 #define PAGE_FREE_INTERVAL 1000
41364
41365@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41366 * @free_all: If set to true will free all pages in pool
41367 * @use_static: Safe to use static buffer
41368 **/
41369-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41370+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41371 bool use_static)
41372 {
41373 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41374 unsigned long irq_flags;
41375 struct page *p;
41376 struct page **pages_to_free;
41377- unsigned freed_pages = 0,
41378- npages_to_free = nr_free;
41379+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41380
41381 if (NUM_PAGES_TO_ALLOC < nr_free)
41382 npages_to_free = NUM_PAGES_TO_ALLOC;
41383@@ -371,7 +370,8 @@ restart:
41384 __list_del(&p->lru, &pool->list);
41385
41386 ttm_pool_update_free_locked(pool, freed_pages);
41387- nr_free -= freed_pages;
41388+ if (likely(nr_free != FREE_ALL_PAGES))
41389+ nr_free -= freed_pages;
41390 }
41391
41392 spin_unlock_irqrestore(&pool->lock, irq_flags);
41393@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41394 unsigned i;
41395 unsigned pool_offset;
41396 struct ttm_page_pool *pool;
41397- int shrink_pages = sc->nr_to_scan;
41398+ unsigned long shrink_pages = sc->nr_to_scan;
41399 unsigned long freed = 0;
41400
41401 if (!mutex_trylock(&lock))
41402@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41403 pool_offset = ++start_pool % NUM_POOLS;
41404 /* select start pool in round robin fashion */
41405 for (i = 0; i < NUM_POOLS; ++i) {
41406- unsigned nr_free = shrink_pages;
41407+ unsigned long nr_free = shrink_pages;
41408 if (shrink_pages == 0)
41409 break;
41410 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41411@@ -673,7 +673,7 @@ out:
41412 }
41413
41414 /* Put all pages in pages list to correct pool to wait for reuse */
41415-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41416+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41417 enum ttm_caching_state cstate)
41418 {
41419 unsigned long irq_flags;
41420@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41421 struct list_head plist;
41422 struct page *p = NULL;
41423 gfp_t gfp_flags = GFP_USER;
41424- unsigned count;
41425+ unsigned long count;
41426 int r;
41427
41428 /* set zero flag for page allocation if required */
41429diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41430index 01e1d27..aaa018a 100644
41431--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41432+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41433@@ -56,7 +56,7 @@
41434
41435 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41436 #define SMALL_ALLOCATION 4
41437-#define FREE_ALL_PAGES (~0U)
41438+#define FREE_ALL_PAGES (~0UL)
41439 /* times are in msecs */
41440 #define IS_UNDEFINED (0)
41441 #define IS_WC (1<<1)
41442@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41443 * @nr_free: If set to true will free all pages in pool
41444 * @use_static: Safe to use static buffer
41445 **/
41446-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41447+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41448 bool use_static)
41449 {
41450 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41451@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41452 struct dma_page *dma_p, *tmp;
41453 struct page **pages_to_free;
41454 struct list_head d_pages;
41455- unsigned freed_pages = 0,
41456- npages_to_free = nr_free;
41457+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41458
41459 if (NUM_PAGES_TO_ALLOC < nr_free)
41460 npages_to_free = NUM_PAGES_TO_ALLOC;
41461@@ -499,7 +498,8 @@ restart:
41462 /* remove range of pages from the pool */
41463 if (freed_pages) {
41464 ttm_pool_update_free_locked(pool, freed_pages);
41465- nr_free -= freed_pages;
41466+ if (likely(nr_free != FREE_ALL_PAGES))
41467+ nr_free -= freed_pages;
41468 }
41469
41470 spin_unlock_irqrestore(&pool->lock, irq_flags);
41471@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41472 struct dma_page *d_page, *next;
41473 enum pool_type type;
41474 bool is_cached = false;
41475- unsigned count = 0, i, npages = 0;
41476+ unsigned long count = 0, i, npages = 0;
41477 unsigned long irq_flags;
41478
41479 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41480@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41481 static unsigned start_pool;
41482 unsigned idx = 0;
41483 unsigned pool_offset;
41484- unsigned shrink_pages = sc->nr_to_scan;
41485+ unsigned long shrink_pages = sc->nr_to_scan;
41486 struct device_pools *p;
41487 unsigned long freed = 0;
41488
41489@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41490 goto out;
41491 pool_offset = ++start_pool % _manager->npools;
41492 list_for_each_entry(p, &_manager->pools, pools) {
41493- unsigned nr_free;
41494+ unsigned long nr_free;
41495
41496 if (!p->dev)
41497 continue;
41498@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41499 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
41500 freed += nr_free - shrink_pages;
41501
41502- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41503+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41504 p->pool->dev_name, p->pool->name, current->pid,
41505 nr_free, shrink_pages);
41506 }
41507diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41508index 8cbcb45..a4d9cf7 100644
41509--- a/drivers/gpu/drm/udl/udl_fb.c
41510+++ b/drivers/gpu/drm/udl/udl_fb.c
41511@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41512 fb_deferred_io_cleanup(info);
41513 kfree(info->fbdefio);
41514 info->fbdefio = NULL;
41515- info->fbops->fb_mmap = udl_fb_mmap;
41516 }
41517
41518 pr_warn("released /dev/fb%d user=%d count=%d\n",
41519diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41520index ef8c500..01030c8 100644
41521--- a/drivers/gpu/drm/via/via_drv.h
41522+++ b/drivers/gpu/drm/via/via_drv.h
41523@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
41524 typedef uint32_t maskarray_t[5];
41525
41526 typedef struct drm_via_irq {
41527- atomic_t irq_received;
41528+ atomic_unchecked_t irq_received;
41529 uint32_t pending_mask;
41530 uint32_t enable_mask;
41531 wait_queue_head_t irq_queue;
41532@@ -77,7 +77,7 @@ typedef struct drm_via_private {
41533 struct timeval last_vblank;
41534 int last_vblank_valid;
41535 unsigned usec_per_vblank;
41536- atomic_t vbl_received;
41537+ atomic_unchecked_t vbl_received;
41538 drm_via_state_t hc_state;
41539 char pci_buf[VIA_PCI_BUF_SIZE];
41540 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41541diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41542index 1319433..a993b0c 100644
41543--- a/drivers/gpu/drm/via/via_irq.c
41544+++ b/drivers/gpu/drm/via/via_irq.c
41545@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41546 if (crtc != 0)
41547 return 0;
41548
41549- return atomic_read(&dev_priv->vbl_received);
41550+ return atomic_read_unchecked(&dev_priv->vbl_received);
41551 }
41552
41553 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41554@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41555
41556 status = VIA_READ(VIA_REG_INTERRUPT);
41557 if (status & VIA_IRQ_VBLANK_PENDING) {
41558- atomic_inc(&dev_priv->vbl_received);
41559- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41560+ atomic_inc_unchecked(&dev_priv->vbl_received);
41561+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41562 do_gettimeofday(&cur_vblank);
41563 if (dev_priv->last_vblank_valid) {
41564 dev_priv->usec_per_vblank =
41565@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41566 dev_priv->last_vblank = cur_vblank;
41567 dev_priv->last_vblank_valid = 1;
41568 }
41569- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41570+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41571 DRM_DEBUG("US per vblank is: %u\n",
41572 dev_priv->usec_per_vblank);
41573 }
41574@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41575
41576 for (i = 0; i < dev_priv->num_irqs; ++i) {
41577 if (status & cur_irq->pending_mask) {
41578- atomic_inc(&cur_irq->irq_received);
41579+ atomic_inc_unchecked(&cur_irq->irq_received);
41580 wake_up(&cur_irq->irq_queue);
41581 handled = 1;
41582 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41583@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41584 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41585 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41586 masks[irq][4]));
41587- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41588+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41589 } else {
41590 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41591 (((cur_irq_sequence =
41592- atomic_read(&cur_irq->irq_received)) -
41593+ atomic_read_unchecked(&cur_irq->irq_received)) -
41594 *sequence) <= (1 << 23)));
41595 }
41596 *sequence = cur_irq_sequence;
41597@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41598 }
41599
41600 for (i = 0; i < dev_priv->num_irqs; ++i) {
41601- atomic_set(&cur_irq->irq_received, 0);
41602+ atomic_set_unchecked(&cur_irq->irq_received, 0);
41603 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41604 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41605 init_waitqueue_head(&cur_irq->irq_queue);
41606@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41607 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41608 case VIA_IRQ_RELATIVE:
41609 irqwait->request.sequence +=
41610- atomic_read(&cur_irq->irq_received);
41611+ atomic_read_unchecked(&cur_irq->irq_received);
41612 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41613 case VIA_IRQ_ABSOLUTE:
41614 break;
41615diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41616index 4ee799b..69fc0d1 100644
41617--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41618+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41619@@ -446,7 +446,7 @@ struct vmw_private {
41620 * Fencing and IRQs.
41621 */
41622
41623- atomic_t marker_seq;
41624+ atomic_unchecked_t marker_seq;
41625 wait_queue_head_t fence_queue;
41626 wait_queue_head_t fifo_queue;
41627 int fence_queue_waiters; /* Protected by hw_mutex */
41628diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41629index 09e10ae..cb76c60 100644
41630--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41631+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41632@@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41633 (unsigned int) min,
41634 (unsigned int) fifo->capabilities);
41635
41636- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41637+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41638 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41639 vmw_marker_queue_init(&fifo->marker_queue);
41640 return vmw_fifo_send_fence(dev_priv, &dummy);
41641@@ -378,7 +378,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41642 if (reserveable)
41643 iowrite32(bytes, fifo_mem +
41644 SVGA_FIFO_RESERVED);
41645- return fifo_mem + (next_cmd >> 2);
41646+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41647 } else {
41648 need_bounce = true;
41649 }
41650@@ -498,7 +498,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41651
41652 fm = vmw_fifo_reserve(dev_priv, bytes);
41653 if (unlikely(fm == NULL)) {
41654- *seqno = atomic_read(&dev_priv->marker_seq);
41655+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41656 ret = -ENOMEM;
41657 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41658 false, 3*HZ);
41659@@ -506,7 +506,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41660 }
41661
41662 do {
41663- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41664+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41665 } while (*seqno == 0);
41666
41667 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41668diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41669index 170b61b..fec7348 100644
41670--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41671+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41672@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41673 }
41674
41675 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41676- vmw_gmrid_man_init,
41677- vmw_gmrid_man_takedown,
41678- vmw_gmrid_man_get_node,
41679- vmw_gmrid_man_put_node,
41680- vmw_gmrid_man_debug
41681+ .init = vmw_gmrid_man_init,
41682+ .takedown = vmw_gmrid_man_takedown,
41683+ .get_node = vmw_gmrid_man_get_node,
41684+ .put_node = vmw_gmrid_man_put_node,
41685+ .debug = vmw_gmrid_man_debug
41686 };
41687diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41688index 37881ec..319065d 100644
41689--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41690+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41691@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41692 int ret;
41693
41694 num_clips = arg->num_clips;
41695- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41696+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41697
41698 if (unlikely(num_clips == 0))
41699 return 0;
41700@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41701 int ret;
41702
41703 num_clips = arg->num_clips;
41704- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41705+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41706
41707 if (unlikely(num_clips == 0))
41708 return 0;
41709diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41710index 0c42376..6febe77 100644
41711--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41712+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41713@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41714 * emitted. Then the fence is stale and signaled.
41715 */
41716
41717- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41718+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41719 > VMW_FENCE_WRAP);
41720
41721 return ret;
41722@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41723
41724 if (fifo_idle)
41725 down_read(&fifo_state->rwsem);
41726- signal_seq = atomic_read(&dev_priv->marker_seq);
41727+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41728 ret = 0;
41729
41730 for (;;) {
41731diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41732index efd1ffd..0ae13ca 100644
41733--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41734+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41735@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41736 while (!vmw_lag_lt(queue, us)) {
41737 spin_lock(&queue->lock);
41738 if (list_empty(&queue->head))
41739- seqno = atomic_read(&dev_priv->marker_seq);
41740+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41741 else {
41742 marker = list_first_entry(&queue->head,
41743 struct vmw_marker, head);
41744diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41745index 37ac7b5..d52a5c9 100644
41746--- a/drivers/gpu/vga/vga_switcheroo.c
41747+++ b/drivers/gpu/vga/vga_switcheroo.c
41748@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41749
41750 /* this version is for the case where the power switch is separate
41751 to the device being powered down. */
41752-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41753+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41754 {
41755 /* copy over all the bus versions */
41756 if (dev->bus && dev->bus->pm) {
41757@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41758 return ret;
41759 }
41760
41761-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41762+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41763 {
41764 /* copy over all the bus versions */
41765 if (dev->bus && dev->bus->pm) {
41766diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41767index dfaccfc..bfea740 100644
41768--- a/drivers/hid/hid-core.c
41769+++ b/drivers/hid/hid-core.c
41770@@ -2507,7 +2507,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41771
41772 int hid_add_device(struct hid_device *hdev)
41773 {
41774- static atomic_t id = ATOMIC_INIT(0);
41775+ static atomic_unchecked_t id = ATOMIC_INIT(0);
41776 int ret;
41777
41778 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41779@@ -2549,7 +2549,7 @@ int hid_add_device(struct hid_device *hdev)
41780 /* XXX hack, any other cleaner solution after the driver core
41781 * is converted to allow more than 20 bytes as the device name? */
41782 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41783- hdev->vendor, hdev->product, atomic_inc_return(&id));
41784+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41785
41786 hid_debug_register(hdev, dev_name(&hdev->dev));
41787 ret = device_add(&hdev->dev);
41788diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
41789index 71f5692..147d3da 100644
41790--- a/drivers/hid/hid-logitech-dj.c
41791+++ b/drivers/hid/hid-logitech-dj.c
41792@@ -658,6 +658,12 @@ static int logi_dj_raw_event(struct hid_device *hdev,
41793 * device (via hid_input_report() ) and return 1 so hid-core does not do
41794 * anything else with it.
41795 */
41796+ if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
41797+ (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
41798+ dev_err(&hdev->dev, "%s: invalid device index:%d\n",
41799+ __func__, dj_report->device_index);
41800+ return false;
41801+ }
41802
41803 /* case 1) */
41804 if (data[0] != REPORT_ID_DJ_SHORT)
41805diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
41806index bc4269e..b6e6102 100644
41807--- a/drivers/hid/hid-sony.c
41808+++ b/drivers/hid/hid-sony.c
41809@@ -798,6 +798,12 @@ union sixaxis_output_report_01 {
41810 __u8 buf[36];
41811 };
41812
41813+#define DS4_REPORT_0x02_SIZE 37
41814+#define DS4_REPORT_0x05_SIZE 32
41815+#define DS4_REPORT_0x11_SIZE 78
41816+#define DS4_REPORT_0x81_SIZE 7
41817+#define SIXAXIS_REPORT_0xF2_SIZE 18
41818+
41819 static spinlock_t sony_dev_list_lock;
41820 static LIST_HEAD(sony_device_list);
41821 static DEFINE_IDA(sony_device_id_allocator);
41822@@ -811,6 +817,7 @@ struct sony_sc {
41823 struct work_struct state_worker;
41824 struct power_supply battery;
41825 int device_id;
41826+ __u8 *output_report_dmabuf;
41827
41828 #ifdef CONFIG_SONY_FF
41829 __u8 left;
41830@@ -1142,9 +1149,20 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
41831
41832 static int sixaxis_set_operational_bt(struct hid_device *hdev)
41833 {
41834- unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41835- return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
41836+ static const __u8 report[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41837+ __u8 *buf;
41838+ int ret;
41839+
41840+ buf = kmemdup(report, sizeof(report), GFP_KERNEL);
41841+ if (!buf)
41842+ return -ENOMEM;
41843+
41844+ ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(report),
41845 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
41846+
41847+ kfree(buf);
41848+
41849+ return ret;
41850 }
41851
41852 /*
41853@@ -1153,10 +1171,19 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
41854 */
41855 static int dualshock4_set_operational_bt(struct hid_device *hdev)
41856 {
41857- __u8 buf[37] = { 0 };
41858+ __u8 *buf;
41859+ int ret;
41860
41861- return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
41862+ buf = kmalloc(DS4_REPORT_0x02_SIZE, GFP_KERNEL);
41863+ if (!buf)
41864+ return -ENOMEM;
41865+
41866+ ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_REPORT_0x02_SIZE,
41867 HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41868+
41869+ kfree(buf);
41870+
41871+ return ret;
41872 }
41873
41874 static void sixaxis_set_leds_from_id(int id, __u8 values[MAX_LEDS])
41875@@ -1471,9 +1498,7 @@ error_leds:
41876
41877 static void sixaxis_state_worker(struct work_struct *work)
41878 {
41879- struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41880- int n;
41881- union sixaxis_output_report_01 report = {
41882+ static const union sixaxis_output_report_01 default_report = {
41883 .buf = {
41884 0x01,
41885 0x00, 0xff, 0x00, 0xff, 0x00,
41886@@ -1485,20 +1510,27 @@ static void sixaxis_state_worker(struct work_struct *work)
41887 0x00, 0x00, 0x00, 0x00, 0x00
41888 }
41889 };
41890+ struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41891+ struct sixaxis_output_report *report =
41892+ (struct sixaxis_output_report *)sc->output_report_dmabuf;
41893+ int n;
41894+
41895+ /* Initialize the report with default values */
41896+ memcpy(report, &default_report, sizeof(struct sixaxis_output_report));
41897
41898 #ifdef CONFIG_SONY_FF
41899- report.data.rumble.right_motor_on = sc->right ? 1 : 0;
41900- report.data.rumble.left_motor_force = sc->left;
41901+ report->rumble.right_motor_on = sc->right ? 1 : 0;
41902+ report->rumble.left_motor_force = sc->left;
41903 #endif
41904
41905- report.data.leds_bitmap |= sc->led_state[0] << 1;
41906- report.data.leds_bitmap |= sc->led_state[1] << 2;
41907- report.data.leds_bitmap |= sc->led_state[2] << 3;
41908- report.data.leds_bitmap |= sc->led_state[3] << 4;
41909+ report->leds_bitmap |= sc->led_state[0] << 1;
41910+ report->leds_bitmap |= sc->led_state[1] << 2;
41911+ report->leds_bitmap |= sc->led_state[2] << 3;
41912+ report->leds_bitmap |= sc->led_state[3] << 4;
41913
41914 /* Set flag for all leds off, required for 3rd party INTEC controller */
41915- if ((report.data.leds_bitmap & 0x1E) == 0)
41916- report.data.leds_bitmap |= 0x20;
41917+ if ((report->leds_bitmap & 0x1E) == 0)
41918+ report->leds_bitmap |= 0x20;
41919
41920 /*
41921 * The LEDs in the report are indexed in reverse order to their
41922@@ -1511,28 +1543,30 @@ static void sixaxis_state_worker(struct work_struct *work)
41923 */
41924 for (n = 0; n < 4; n++) {
41925 if (sc->led_delay_on[n] || sc->led_delay_off[n]) {
41926- report.data.led[3 - n].duty_off = sc->led_delay_off[n];
41927- report.data.led[3 - n].duty_on = sc->led_delay_on[n];
41928+ report->led[3 - n].duty_off = sc->led_delay_off[n];
41929+ report->led[3 - n].duty_on = sc->led_delay_on[n];
41930 }
41931 }
41932
41933- hid_hw_raw_request(sc->hdev, report.data.report_id, report.buf,
41934- sizeof(report), HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41935+ hid_hw_raw_request(sc->hdev, report->report_id, (__u8 *)report,
41936+ sizeof(struct sixaxis_output_report),
41937+ HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41938 }
41939
41940 static void dualshock4_state_worker(struct work_struct *work)
41941 {
41942 struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41943 struct hid_device *hdev = sc->hdev;
41944+ __u8 *buf = sc->output_report_dmabuf;
41945 int offset;
41946
41947- __u8 buf[78] = { 0 };
41948-
41949 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41950+ memset(buf, 0, DS4_REPORT_0x05_SIZE);
41951 buf[0] = 0x05;
41952 buf[1] = 0xFF;
41953 offset = 4;
41954 } else {
41955+ memset(buf, 0, DS4_REPORT_0x11_SIZE);
41956 buf[0] = 0x11;
41957 buf[1] = 0xB0;
41958 buf[3] = 0x0F;
41959@@ -1560,12 +1594,33 @@ static void dualshock4_state_worker(struct work_struct *work)
41960 buf[offset++] = sc->led_delay_off[3];
41961
41962 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41963- hid_hw_output_report(hdev, buf, 32);
41964+ hid_hw_output_report(hdev, buf, DS4_REPORT_0x05_SIZE);
41965 else
41966- hid_hw_raw_request(hdev, 0x11, buf, 78,
41967+ hid_hw_raw_request(hdev, 0x11, buf, DS4_REPORT_0x11_SIZE,
41968 HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41969 }
41970
41971+static int sony_allocate_output_report(struct sony_sc *sc)
41972+{
41973+ if (sc->quirks & SIXAXIS_CONTROLLER)
41974+ sc->output_report_dmabuf =
41975+ kmalloc(sizeof(union sixaxis_output_report_01),
41976+ GFP_KERNEL);
41977+ else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
41978+ sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x11_SIZE,
41979+ GFP_KERNEL);
41980+ else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41981+ sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x05_SIZE,
41982+ GFP_KERNEL);
41983+ else
41984+ return 0;
41985+
41986+ if (!sc->output_report_dmabuf)
41987+ return -ENOMEM;
41988+
41989+ return 0;
41990+}
41991+
41992 #ifdef CONFIG_SONY_FF
41993 static int sony_play_effect(struct input_dev *dev, void *data,
41994 struct ff_effect *effect)
41995@@ -1754,6 +1809,7 @@ static int sony_get_bt_devaddr(struct sony_sc *sc)
41996
41997 static int sony_check_add(struct sony_sc *sc)
41998 {
41999+ __u8 *buf = NULL;
42000 int n, ret;
42001
42002 if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) ||
42003@@ -1769,36 +1825,44 @@ static int sony_check_add(struct sony_sc *sc)
42004 return 0;
42005 }
42006 } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
42007- __u8 buf[7];
42008+ buf = kmalloc(DS4_REPORT_0x81_SIZE, GFP_KERNEL);
42009+ if (!buf)
42010+ return -ENOMEM;
42011
42012 /*
42013 * The MAC address of a DS4 controller connected via USB can be
42014 * retrieved with feature report 0x81. The address begins at
42015 * offset 1.
42016 */
42017- ret = hid_hw_raw_request(sc->hdev, 0x81, buf, sizeof(buf),
42018- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
42019+ ret = hid_hw_raw_request(sc->hdev, 0x81, buf,
42020+ DS4_REPORT_0x81_SIZE, HID_FEATURE_REPORT,
42021+ HID_REQ_GET_REPORT);
42022
42023- if (ret != 7) {
42024+ if (ret != DS4_REPORT_0x81_SIZE) {
42025 hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n");
42026- return ret < 0 ? ret : -EINVAL;
42027+ ret = ret < 0 ? ret : -EINVAL;
42028+ goto out_free;
42029 }
42030
42031 memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
42032 } else if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
42033- __u8 buf[18];
42034+ buf = kmalloc(SIXAXIS_REPORT_0xF2_SIZE, GFP_KERNEL);
42035+ if (!buf)
42036+ return -ENOMEM;
42037
42038 /*
42039 * The MAC address of a Sixaxis controller connected via USB can
42040 * be retrieved with feature report 0xf2. The address begins at
42041 * offset 4.
42042 */
42043- ret = hid_hw_raw_request(sc->hdev, 0xf2, buf, sizeof(buf),
42044- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
42045+ ret = hid_hw_raw_request(sc->hdev, 0xf2, buf,
42046+ SIXAXIS_REPORT_0xF2_SIZE, HID_FEATURE_REPORT,
42047+ HID_REQ_GET_REPORT);
42048
42049- if (ret != 18) {
42050+ if (ret != SIXAXIS_REPORT_0xF2_SIZE) {
42051 hid_err(sc->hdev, "failed to retrieve feature report 0xf2 with the Sixaxis MAC address\n");
42052- return ret < 0 ? ret : -EINVAL;
42053+ ret = ret < 0 ? ret : -EINVAL;
42054+ goto out_free;
42055 }
42056
42057 /*
42058@@ -1811,7 +1875,13 @@ static int sony_check_add(struct sony_sc *sc)
42059 return 0;
42060 }
42061
42062- return sony_check_add_dev_list(sc);
42063+ ret = sony_check_add_dev_list(sc);
42064+
42065+out_free:
42066+
42067+ kfree(buf);
42068+
42069+ return ret;
42070 }
42071
42072 static int sony_set_device_id(struct sony_sc *sc)
42073@@ -1895,6 +1965,12 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
42074 return ret;
42075 }
42076
42077+ ret = sony_allocate_output_report(sc);
42078+ if (ret < 0) {
42079+ hid_err(hdev, "failed to allocate the output report buffer\n");
42080+ goto err_stop;
42081+ }
42082+
42083 ret = sony_set_device_id(sc);
42084 if (ret < 0) {
42085 hid_err(hdev, "failed to allocate the device id\n");
42086@@ -1984,6 +2060,7 @@ err_stop:
42087 if (sc->quirks & SONY_BATTERY_SUPPORT)
42088 sony_battery_remove(sc);
42089 sony_cancel_work_sync(sc);
42090+ kfree(sc->output_report_dmabuf);
42091 sony_remove_dev_list(sc);
42092 sony_release_device_id(sc);
42093 hid_hw_stop(hdev);
42094@@ -2004,6 +2081,8 @@ static void sony_remove(struct hid_device *hdev)
42095
42096 sony_cancel_work_sync(sc);
42097
42098+ kfree(sc->output_report_dmabuf);
42099+
42100 sony_remove_dev_list(sc);
42101
42102 sony_release_device_id(sc);
42103diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42104index c13fb5b..55a3802 100644
42105--- a/drivers/hid/hid-wiimote-debug.c
42106+++ b/drivers/hid/hid-wiimote-debug.c
42107@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42108 else if (size == 0)
42109 return -EIO;
42110
42111- if (copy_to_user(u, buf, size))
42112+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42113 return -EFAULT;
42114
42115 *off += size;
42116diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42117index 433f72a..2926005 100644
42118--- a/drivers/hv/channel.c
42119+++ b/drivers/hv/channel.c
42120@@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42121 unsigned long flags;
42122 int ret = 0;
42123
42124- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
42125- atomic_inc(&vmbus_connection.next_gpadl_handle);
42126+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
42127+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
42128
42129 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42130 if (ret)
42131diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42132index 3e4235c..877d0e5 100644
42133--- a/drivers/hv/hv.c
42134+++ b/drivers/hv/hv.c
42135@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42136 u64 output_address = (output) ? virt_to_phys(output) : 0;
42137 u32 output_address_hi = output_address >> 32;
42138 u32 output_address_lo = output_address & 0xFFFFFFFF;
42139- void *hypercall_page = hv_context.hypercall_page;
42140+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42141
42142 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42143 "=a"(hv_status_lo) : "d" (control_hi),
42144@@ -156,7 +156,7 @@ int hv_init(void)
42145 /* See if the hypercall page is already set */
42146 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42147
42148- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42149+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42150
42151 if (!virtaddr)
42152 goto cleanup;
42153diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42154index 5e90c5d..d8fcefb 100644
42155--- a/drivers/hv/hv_balloon.c
42156+++ b/drivers/hv/hv_balloon.c
42157@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42158
42159 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42160 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42161-static atomic_t trans_id = ATOMIC_INIT(0);
42162+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42163
42164 static int dm_ring_size = (5 * PAGE_SIZE);
42165
42166@@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
42167 pr_info("Memory hot add failed\n");
42168
42169 dm->state = DM_INITIALIZED;
42170- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42171+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42172 vmbus_sendpacket(dm->dev->channel, &resp,
42173 sizeof(struct dm_hot_add_response),
42174 (unsigned long)NULL,
42175@@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
42176 memset(&status, 0, sizeof(struct dm_status));
42177 status.hdr.type = DM_STATUS_REPORT;
42178 status.hdr.size = sizeof(struct dm_status);
42179- status.hdr.trans_id = atomic_inc_return(&trans_id);
42180+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42181
42182 /*
42183 * The host expects the guest to report free memory.
42184@@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
42185 * send the status. This can happen if we were interrupted
42186 * after we picked our transaction ID.
42187 */
42188- if (status.hdr.trans_id != atomic_read(&trans_id))
42189+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42190 return;
42191
42192 /*
42193@@ -1129,7 +1129,7 @@ static void balloon_up(struct work_struct *dummy)
42194 */
42195
42196 do {
42197- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42198+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42199 ret = vmbus_sendpacket(dm_device.dev->channel,
42200 bl_resp,
42201 bl_resp->hdr.size,
42202@@ -1175,7 +1175,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42203
42204 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42205 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42206- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42207+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42208 resp.hdr.size = sizeof(struct dm_unballoon_response);
42209
42210 vmbus_sendpacket(dm_device.dev->channel, &resp,
42211@@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42212 memset(&version_req, 0, sizeof(struct dm_version_request));
42213 version_req.hdr.type = DM_VERSION_REQUEST;
42214 version_req.hdr.size = sizeof(struct dm_version_request);
42215- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42216+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42217 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42218 version_req.is_last_attempt = 1;
42219
42220@@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
42221 memset(&version_req, 0, sizeof(struct dm_version_request));
42222 version_req.hdr.type = DM_VERSION_REQUEST;
42223 version_req.hdr.size = sizeof(struct dm_version_request);
42224- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42225+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42226 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42227 version_req.is_last_attempt = 0;
42228
42229@@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
42230 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42231 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42232 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42233- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42234+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42235
42236 cap_msg.caps.cap_bits.balloon = 1;
42237 cap_msg.caps.cap_bits.hot_add = 1;
42238diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42239index c386d8d..d6004c4 100644
42240--- a/drivers/hv/hyperv_vmbus.h
42241+++ b/drivers/hv/hyperv_vmbus.h
42242@@ -611,7 +611,7 @@ enum vmbus_connect_state {
42243 struct vmbus_connection {
42244 enum vmbus_connect_state conn_state;
42245
42246- atomic_t next_gpadl_handle;
42247+ atomic_unchecked_t next_gpadl_handle;
42248
42249 /*
42250 * Represents channel interrupts. Each bit position represents a
42251diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42252index 4d6b269..2e23b86 100644
42253--- a/drivers/hv/vmbus_drv.c
42254+++ b/drivers/hv/vmbus_drv.c
42255@@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42256 {
42257 int ret = 0;
42258
42259- static atomic_t device_num = ATOMIC_INIT(0);
42260+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42261
42262 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42263- atomic_inc_return(&device_num));
42264+ atomic_inc_return_unchecked(&device_num));
42265
42266 child_device_obj->device.bus = &hv_bus;
42267 child_device_obj->device.parent = &hv_acpi_dev->dev;
42268diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42269index 579bdf9..75118b5 100644
42270--- a/drivers/hwmon/acpi_power_meter.c
42271+++ b/drivers/hwmon/acpi_power_meter.c
42272@@ -116,7 +116,7 @@ struct sensor_template {
42273 struct device_attribute *devattr,
42274 const char *buf, size_t count);
42275 int index;
42276-};
42277+} __do_const;
42278
42279 /* Averaging interval */
42280 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42281@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42282 struct sensor_template *attrs)
42283 {
42284 struct device *dev = &resource->acpi_dev->dev;
42285- struct sensor_device_attribute *sensors =
42286+ sensor_device_attribute_no_const *sensors =
42287 &resource->sensors[resource->num_sensors];
42288 int res = 0;
42289
42290diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42291index 3288f13..71cfb4e 100644
42292--- a/drivers/hwmon/applesmc.c
42293+++ b/drivers/hwmon/applesmc.c
42294@@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42295 {
42296 struct applesmc_node_group *grp;
42297 struct applesmc_dev_attr *node;
42298- struct attribute *attr;
42299+ attribute_no_const *attr;
42300 int ret, i;
42301
42302 for (grp = groups; grp->format; grp++) {
42303diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42304index cccef87..06ce8ec 100644
42305--- a/drivers/hwmon/asus_atk0110.c
42306+++ b/drivers/hwmon/asus_atk0110.c
42307@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42308 struct atk_sensor_data {
42309 struct list_head list;
42310 struct atk_data *data;
42311- struct device_attribute label_attr;
42312- struct device_attribute input_attr;
42313- struct device_attribute limit1_attr;
42314- struct device_attribute limit2_attr;
42315+ device_attribute_no_const label_attr;
42316+ device_attribute_no_const input_attr;
42317+ device_attribute_no_const limit1_attr;
42318+ device_attribute_no_const limit2_attr;
42319 char label_attr_name[ATTR_NAME_SIZE];
42320 char input_attr_name[ATTR_NAME_SIZE];
42321 char limit1_attr_name[ATTR_NAME_SIZE];
42322@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42323 static struct device_attribute atk_name_attr =
42324 __ATTR(name, 0444, atk_name_show, NULL);
42325
42326-static void atk_init_attribute(struct device_attribute *attr, char *name,
42327+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42328 sysfs_show_func show)
42329 {
42330 sysfs_attr_init(&attr->attr);
42331diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42332index d76f0b7..55ae976 100644
42333--- a/drivers/hwmon/coretemp.c
42334+++ b/drivers/hwmon/coretemp.c
42335@@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42336 return NOTIFY_OK;
42337 }
42338
42339-static struct notifier_block coretemp_cpu_notifier __refdata = {
42340+static struct notifier_block coretemp_cpu_notifier = {
42341 .notifier_call = coretemp_cpu_callback,
42342 };
42343
42344diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42345index 7a8a6fb..015c1fd 100644
42346--- a/drivers/hwmon/ibmaem.c
42347+++ b/drivers/hwmon/ibmaem.c
42348@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42349 struct aem_rw_sensor_template *rw)
42350 {
42351 struct device *dev = &data->pdev->dev;
42352- struct sensor_device_attribute *sensors = data->sensors;
42353+ sensor_device_attribute_no_const *sensors = data->sensors;
42354 int err;
42355
42356 /* Set up read-only sensors */
42357diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42358index 14c82da..09b25d7 100644
42359--- a/drivers/hwmon/iio_hwmon.c
42360+++ b/drivers/hwmon/iio_hwmon.c
42361@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42362 {
42363 struct device *dev = &pdev->dev;
42364 struct iio_hwmon_state *st;
42365- struct sensor_device_attribute *a;
42366+ sensor_device_attribute_no_const *a;
42367 int ret, i;
42368 int in_i = 1, temp_i = 1, curr_i = 1;
42369 enum iio_chan_type type;
42370diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42371index 7710f46..427a28d 100644
42372--- a/drivers/hwmon/nct6683.c
42373+++ b/drivers/hwmon/nct6683.c
42374@@ -397,11 +397,11 @@ static struct attribute_group *
42375 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42376 int repeat)
42377 {
42378- struct sensor_device_attribute_2 *a2;
42379- struct sensor_device_attribute *a;
42380+ sensor_device_attribute_2_no_const *a2;
42381+ sensor_device_attribute_no_const *a;
42382 struct sensor_device_template **t;
42383 struct sensor_device_attr_u *su;
42384- struct attribute_group *group;
42385+ attribute_group_no_const *group;
42386 struct attribute **attrs;
42387 int i, j, count;
42388
42389diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42390index 504cbdd..35d6f25 100644
42391--- a/drivers/hwmon/nct6775.c
42392+++ b/drivers/hwmon/nct6775.c
42393@@ -943,10 +943,10 @@ static struct attribute_group *
42394 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42395 int repeat)
42396 {
42397- struct attribute_group *group;
42398+ attribute_group_no_const *group;
42399 struct sensor_device_attr_u *su;
42400- struct sensor_device_attribute *a;
42401- struct sensor_device_attribute_2 *a2;
42402+ sensor_device_attribute_no_const *a;
42403+ sensor_device_attribute_2_no_const *a2;
42404 struct attribute **attrs;
42405 struct sensor_device_template **t;
42406 int i, count;
42407diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42408index 291d11f..3f0dbbd 100644
42409--- a/drivers/hwmon/pmbus/pmbus_core.c
42410+++ b/drivers/hwmon/pmbus/pmbus_core.c
42411@@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42412 return 0;
42413 }
42414
42415-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42416+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42417 const char *name,
42418 umode_t mode,
42419 ssize_t (*show)(struct device *dev,
42420@@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42421 dev_attr->store = store;
42422 }
42423
42424-static void pmbus_attr_init(struct sensor_device_attribute *a,
42425+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42426 const char *name,
42427 umode_t mode,
42428 ssize_t (*show)(struct device *dev,
42429@@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42430 u16 reg, u8 mask)
42431 {
42432 struct pmbus_boolean *boolean;
42433- struct sensor_device_attribute *a;
42434+ sensor_device_attribute_no_const *a;
42435
42436 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42437 if (!boolean)
42438@@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42439 bool update, bool readonly)
42440 {
42441 struct pmbus_sensor *sensor;
42442- struct device_attribute *a;
42443+ device_attribute_no_const *a;
42444
42445 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42446 if (!sensor)
42447@@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42448 const char *lstring, int index)
42449 {
42450 struct pmbus_label *label;
42451- struct device_attribute *a;
42452+ device_attribute_no_const *a;
42453
42454 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42455 if (!label)
42456diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42457index 97cd45a..ac54d8b 100644
42458--- a/drivers/hwmon/sht15.c
42459+++ b/drivers/hwmon/sht15.c
42460@@ -169,7 +169,7 @@ struct sht15_data {
42461 int supply_uv;
42462 bool supply_uv_valid;
42463 struct work_struct update_supply_work;
42464- atomic_t interrupt_handled;
42465+ atomic_unchecked_t interrupt_handled;
42466 };
42467
42468 /**
42469@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42470 ret = gpio_direction_input(data->pdata->gpio_data);
42471 if (ret)
42472 return ret;
42473- atomic_set(&data->interrupt_handled, 0);
42474+ atomic_set_unchecked(&data->interrupt_handled, 0);
42475
42476 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42477 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42478 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42479 /* Only relevant if the interrupt hasn't occurred. */
42480- if (!atomic_read(&data->interrupt_handled))
42481+ if (!atomic_read_unchecked(&data->interrupt_handled))
42482 schedule_work(&data->read_work);
42483 }
42484 ret = wait_event_timeout(data->wait_queue,
42485@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42486
42487 /* First disable the interrupt */
42488 disable_irq_nosync(irq);
42489- atomic_inc(&data->interrupt_handled);
42490+ atomic_inc_unchecked(&data->interrupt_handled);
42491 /* Then schedule a reading work struct */
42492 if (data->state != SHT15_READING_NOTHING)
42493 schedule_work(&data->read_work);
42494@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42495 * If not, then start the interrupt again - care here as could
42496 * have gone low in meantime so verify it hasn't!
42497 */
42498- atomic_set(&data->interrupt_handled, 0);
42499+ atomic_set_unchecked(&data->interrupt_handled, 0);
42500 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42501 /* If still not occurred or another handler was scheduled */
42502 if (gpio_get_value(data->pdata->gpio_data)
42503- || atomic_read(&data->interrupt_handled))
42504+ || atomic_read_unchecked(&data->interrupt_handled))
42505 return;
42506 }
42507
42508diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42509index 8df43c5..b07b91d 100644
42510--- a/drivers/hwmon/via-cputemp.c
42511+++ b/drivers/hwmon/via-cputemp.c
42512@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42513 return NOTIFY_OK;
42514 }
42515
42516-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42517+static struct notifier_block via_cputemp_cpu_notifier = {
42518 .notifier_call = via_cputemp_cpu_callback,
42519 };
42520
42521diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42522index 65e3240..e6c511d 100644
42523--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42524+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42525@@ -39,7 +39,7 @@
42526 extern struct i2c_adapter amd756_smbus;
42527
42528 static struct i2c_adapter *s4882_adapter;
42529-static struct i2c_algorithm *s4882_algo;
42530+static i2c_algorithm_no_const *s4882_algo;
42531
42532 /* Wrapper access functions for multiplexed SMBus */
42533 static DEFINE_MUTEX(amd756_lock);
42534diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42535index b19a310..d6eece0 100644
42536--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42537+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42538@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42539 /* usb layer */
42540
42541 /* Send command to device, and get response. */
42542-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42543+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42544 {
42545 int ret = 0;
42546 int actual;
42547diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42548index 88eda09..cf40434 100644
42549--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42550+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42551@@ -37,7 +37,7 @@
42552 extern struct i2c_adapter *nforce2_smbus;
42553
42554 static struct i2c_adapter *s4985_adapter;
42555-static struct i2c_algorithm *s4985_algo;
42556+static i2c_algorithm_no_const *s4985_algo;
42557
42558 /* Wrapper access functions for multiplexed SMBus */
42559 static DEFINE_MUTEX(nforce2_lock);
42560diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42561index 71c7a39..71dd3e0 100644
42562--- a/drivers/i2c/i2c-dev.c
42563+++ b/drivers/i2c/i2c-dev.c
42564@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42565 break;
42566 }
42567
42568- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42569+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42570 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42571 if (IS_ERR(rdwr_pa[i].buf)) {
42572 res = PTR_ERR(rdwr_pa[i].buf);
42573diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42574index 0b510ba..4fbb5085 100644
42575--- a/drivers/ide/ide-cd.c
42576+++ b/drivers/ide/ide-cd.c
42577@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42578 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42579 if ((unsigned long)buf & alignment
42580 || blk_rq_bytes(rq) & q->dma_pad_mask
42581- || object_is_on_stack(buf))
42582+ || object_starts_on_stack(buf))
42583 drive->dma = 0;
42584 }
42585 }
42586diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42587index af3e76d..96dfe5e 100644
42588--- a/drivers/iio/industrialio-core.c
42589+++ b/drivers/iio/industrialio-core.c
42590@@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42591 }
42592
42593 static
42594-int __iio_device_attr_init(struct device_attribute *dev_attr,
42595+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42596 const char *postfix,
42597 struct iio_chan_spec const *chan,
42598 ssize_t (*readfunc)(struct device *dev,
42599diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42600index e28a494..f7c2671 100644
42601--- a/drivers/infiniband/core/cm.c
42602+++ b/drivers/infiniband/core/cm.c
42603@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42604
42605 struct cm_counter_group {
42606 struct kobject obj;
42607- atomic_long_t counter[CM_ATTR_COUNT];
42608+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42609 };
42610
42611 struct cm_counter_attribute {
42612@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42613 struct ib_mad_send_buf *msg = NULL;
42614 int ret;
42615
42616- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42617+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42618 counter[CM_REQ_COUNTER]);
42619
42620 /* Quick state check to discard duplicate REQs. */
42621@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42622 if (!cm_id_priv)
42623 return;
42624
42625- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42626+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42627 counter[CM_REP_COUNTER]);
42628 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42629 if (ret)
42630@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42631 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42632 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42633 spin_unlock_irq(&cm_id_priv->lock);
42634- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42635+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42636 counter[CM_RTU_COUNTER]);
42637 goto out;
42638 }
42639@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42640 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42641 dreq_msg->local_comm_id);
42642 if (!cm_id_priv) {
42643- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42644+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42645 counter[CM_DREQ_COUNTER]);
42646 cm_issue_drep(work->port, work->mad_recv_wc);
42647 return -EINVAL;
42648@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42649 case IB_CM_MRA_REP_RCVD:
42650 break;
42651 case IB_CM_TIMEWAIT:
42652- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42653+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42654 counter[CM_DREQ_COUNTER]);
42655 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42656 goto unlock;
42657@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42658 cm_free_msg(msg);
42659 goto deref;
42660 case IB_CM_DREQ_RCVD:
42661- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42662+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42663 counter[CM_DREQ_COUNTER]);
42664 goto unlock;
42665 default:
42666@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42667 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42668 cm_id_priv->msg, timeout)) {
42669 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42670- atomic_long_inc(&work->port->
42671+ atomic_long_inc_unchecked(&work->port->
42672 counter_group[CM_RECV_DUPLICATES].
42673 counter[CM_MRA_COUNTER]);
42674 goto out;
42675@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42676 break;
42677 case IB_CM_MRA_REQ_RCVD:
42678 case IB_CM_MRA_REP_RCVD:
42679- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42680+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42681 counter[CM_MRA_COUNTER]);
42682 /* fall through */
42683 default:
42684@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42685 case IB_CM_LAP_IDLE:
42686 break;
42687 case IB_CM_MRA_LAP_SENT:
42688- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42689+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42690 counter[CM_LAP_COUNTER]);
42691 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42692 goto unlock;
42693@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42694 cm_free_msg(msg);
42695 goto deref;
42696 case IB_CM_LAP_RCVD:
42697- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42698+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42699 counter[CM_LAP_COUNTER]);
42700 goto unlock;
42701 default:
42702@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42703 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42704 if (cur_cm_id_priv) {
42705 spin_unlock_irq(&cm.lock);
42706- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42707+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42708 counter[CM_SIDR_REQ_COUNTER]);
42709 goto out; /* Duplicate message. */
42710 }
42711@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42712 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42713 msg->retries = 1;
42714
42715- atomic_long_add(1 + msg->retries,
42716+ atomic_long_add_unchecked(1 + msg->retries,
42717 &port->counter_group[CM_XMIT].counter[attr_index]);
42718 if (msg->retries)
42719- atomic_long_add(msg->retries,
42720+ atomic_long_add_unchecked(msg->retries,
42721 &port->counter_group[CM_XMIT_RETRIES].
42722 counter[attr_index]);
42723
42724@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42725 }
42726
42727 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42728- atomic_long_inc(&port->counter_group[CM_RECV].
42729+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42730 counter[attr_id - CM_ATTR_ID_OFFSET]);
42731
42732 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42733@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42734 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42735
42736 return sprintf(buf, "%ld\n",
42737- atomic_long_read(&group->counter[cm_attr->index]));
42738+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42739 }
42740
42741 static const struct sysfs_ops cm_counter_ops = {
42742diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42743index 9f5ad7c..588cd84 100644
42744--- a/drivers/infiniband/core/fmr_pool.c
42745+++ b/drivers/infiniband/core/fmr_pool.c
42746@@ -98,8 +98,8 @@ struct ib_fmr_pool {
42747
42748 struct task_struct *thread;
42749
42750- atomic_t req_ser;
42751- atomic_t flush_ser;
42752+ atomic_unchecked_t req_ser;
42753+ atomic_unchecked_t flush_ser;
42754
42755 wait_queue_head_t force_wait;
42756 };
42757@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42758 struct ib_fmr_pool *pool = pool_ptr;
42759
42760 do {
42761- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42762+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42763 ib_fmr_batch_release(pool);
42764
42765- atomic_inc(&pool->flush_ser);
42766+ atomic_inc_unchecked(&pool->flush_ser);
42767 wake_up_interruptible(&pool->force_wait);
42768
42769 if (pool->flush_function)
42770@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42771 }
42772
42773 set_current_state(TASK_INTERRUPTIBLE);
42774- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42775+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42776 !kthread_should_stop())
42777 schedule();
42778 __set_current_state(TASK_RUNNING);
42779@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42780 pool->dirty_watermark = params->dirty_watermark;
42781 pool->dirty_len = 0;
42782 spin_lock_init(&pool->pool_lock);
42783- atomic_set(&pool->req_ser, 0);
42784- atomic_set(&pool->flush_ser, 0);
42785+ atomic_set_unchecked(&pool->req_ser, 0);
42786+ atomic_set_unchecked(&pool->flush_ser, 0);
42787 init_waitqueue_head(&pool->force_wait);
42788
42789 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42790@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42791 }
42792 spin_unlock_irq(&pool->pool_lock);
42793
42794- serial = atomic_inc_return(&pool->req_ser);
42795+ serial = atomic_inc_return_unchecked(&pool->req_ser);
42796 wake_up_process(pool->thread);
42797
42798 if (wait_event_interruptible(pool->force_wait,
42799- atomic_read(&pool->flush_ser) - serial >= 0))
42800+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42801 return -EINTR;
42802
42803 return 0;
42804@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42805 } else {
42806 list_add_tail(&fmr->list, &pool->dirty_list);
42807 if (++pool->dirty_len >= pool->dirty_watermark) {
42808- atomic_inc(&pool->req_ser);
42809+ atomic_inc_unchecked(&pool->req_ser);
42810 wake_up_process(pool->thread);
42811 }
42812 }
42813diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42814index ec7a298..8742e59 100644
42815--- a/drivers/infiniband/hw/cxgb4/mem.c
42816+++ b/drivers/infiniband/hw/cxgb4/mem.c
42817@@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42818 int err;
42819 struct fw_ri_tpte tpt;
42820 u32 stag_idx;
42821- static atomic_t key;
42822+ static atomic_unchecked_t key;
42823
42824 if (c4iw_fatal_error(rdev))
42825 return -EIO;
42826@@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42827 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42828 rdev->stats.stag.max = rdev->stats.stag.cur;
42829 mutex_unlock(&rdev->stats.lock);
42830- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42831+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42832 }
42833 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42834 __func__, stag_state, type, pdid, stag_idx);
42835diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42836index 79b3dbc..96e5fcc 100644
42837--- a/drivers/infiniband/hw/ipath/ipath_rc.c
42838+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42839@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42840 struct ib_atomic_eth *ateth;
42841 struct ipath_ack_entry *e;
42842 u64 vaddr;
42843- atomic64_t *maddr;
42844+ atomic64_unchecked_t *maddr;
42845 u64 sdata;
42846 u32 rkey;
42847 u8 next;
42848@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42849 IB_ACCESS_REMOTE_ATOMIC)))
42850 goto nack_acc_unlck;
42851 /* Perform atomic OP and save result. */
42852- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42853+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42854 sdata = be64_to_cpu(ateth->swap_data);
42855 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42856 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42857- (u64) atomic64_add_return(sdata, maddr) - sdata :
42858+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42859 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42860 be64_to_cpu(ateth->compare_data),
42861 sdata);
42862diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42863index 1f95bba..9530f87 100644
42864--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42865+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42866@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42867 unsigned long flags;
42868 struct ib_wc wc;
42869 u64 sdata;
42870- atomic64_t *maddr;
42871+ atomic64_unchecked_t *maddr;
42872 enum ib_wc_status send_status;
42873
42874 /*
42875@@ -382,11 +382,11 @@ again:
42876 IB_ACCESS_REMOTE_ATOMIC)))
42877 goto acc_err;
42878 /* Perform atomic OP and save result. */
42879- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42880+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42881 sdata = wqe->wr.wr.atomic.compare_add;
42882 *(u64 *) sqp->s_sge.sge.vaddr =
42883 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42884- (u64) atomic64_add_return(sdata, maddr) - sdata :
42885+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42886 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42887 sdata, wqe->wr.wr.atomic.swap);
42888 goto send_comp;
42889diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42890index 82a7dd8..8fb6ba6 100644
42891--- a/drivers/infiniband/hw/mlx4/mad.c
42892+++ b/drivers/infiniband/hw/mlx4/mad.c
42893@@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42894
42895 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42896 {
42897- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42898+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42899 cpu_to_be64(0xff00000000000000LL);
42900 }
42901
42902diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42903index ed327e6..ca1739e0 100644
42904--- a/drivers/infiniband/hw/mlx4/mcg.c
42905+++ b/drivers/infiniband/hw/mlx4/mcg.c
42906@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42907 {
42908 char name[20];
42909
42910- atomic_set(&ctx->tid, 0);
42911+ atomic_set_unchecked(&ctx->tid, 0);
42912 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42913 ctx->mcg_wq = create_singlethread_workqueue(name);
42914 if (!ctx->mcg_wq)
42915diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42916index 6eb743f..a7b0f6d 100644
42917--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42918+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42919@@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
42920 struct list_head mcg_mgid0_list;
42921 struct workqueue_struct *mcg_wq;
42922 struct mlx4_ib_demux_pv_ctx **tun;
42923- atomic_t tid;
42924+ atomic_unchecked_t tid;
42925 int flushing; /* flushing the work queue */
42926 };
42927
42928diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42929index 9d3e5c1..6f166df 100644
42930--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42931+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42932@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42933 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42934 }
42935
42936-int mthca_QUERY_FW(struct mthca_dev *dev)
42937+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42938 {
42939 struct mthca_mailbox *mailbox;
42940 u32 *outbox;
42941@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42942 CMD_TIME_CLASS_B);
42943 }
42944
42945-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42946+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42947 int num_mtt)
42948 {
42949 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42950@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42951 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42952 }
42953
42954-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42955+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42956 int eq_num)
42957 {
42958 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42959@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42960 CMD_TIME_CLASS_B);
42961 }
42962
42963-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42964+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42965 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42966 void *in_mad, void *response_mad)
42967 {
42968diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42969index ded76c1..0cf0a08 100644
42970--- a/drivers/infiniband/hw/mthca/mthca_main.c
42971+++ b/drivers/infiniband/hw/mthca/mthca_main.c
42972@@ -692,7 +692,7 @@ err_close:
42973 return err;
42974 }
42975
42976-static int mthca_setup_hca(struct mthca_dev *dev)
42977+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42978 {
42979 int err;
42980
42981diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42982index ed9a989..6aa5dc2 100644
42983--- a/drivers/infiniband/hw/mthca/mthca_mr.c
42984+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42985@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42986 * through the bitmaps)
42987 */
42988
42989-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42990+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42991 {
42992 int o;
42993 int m;
42994@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42995 return key;
42996 }
42997
42998-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42999+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43000 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43001 {
43002 struct mthca_mailbox *mailbox;
43003@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43004 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43005 }
43006
43007-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43008+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43009 u64 *buffer_list, int buffer_size_shift,
43010 int list_len, u64 iova, u64 total_size,
43011 u32 access, struct mthca_mr *mr)
43012diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43013index 415f8e1..e34214e 100644
43014--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43015+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43016@@ -764,7 +764,7 @@ unlock:
43017 return 0;
43018 }
43019
43020-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43021+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43022 {
43023 struct mthca_dev *dev = to_mdev(ibcq->device);
43024 struct mthca_cq *cq = to_mcq(ibcq);
43025diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43026index 3b2a6dc..bce26ff 100644
43027--- a/drivers/infiniband/hw/nes/nes.c
43028+++ b/drivers/infiniband/hw/nes/nes.c
43029@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43030 LIST_HEAD(nes_adapter_list);
43031 static LIST_HEAD(nes_dev_list);
43032
43033-atomic_t qps_destroyed;
43034+atomic_unchecked_t qps_destroyed;
43035
43036 static unsigned int ee_flsh_adapter;
43037 static unsigned int sysfs_nonidx_addr;
43038@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43039 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43040 struct nes_adapter *nesadapter = nesdev->nesadapter;
43041
43042- atomic_inc(&qps_destroyed);
43043+ atomic_inc_unchecked(&qps_destroyed);
43044
43045 /* Free the control structures */
43046
43047diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43048index bd9d132..70d84f4 100644
43049--- a/drivers/infiniband/hw/nes/nes.h
43050+++ b/drivers/infiniband/hw/nes/nes.h
43051@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43052 extern unsigned int wqm_quanta;
43053 extern struct list_head nes_adapter_list;
43054
43055-extern atomic_t cm_connects;
43056-extern atomic_t cm_accepts;
43057-extern atomic_t cm_disconnects;
43058-extern atomic_t cm_closes;
43059-extern atomic_t cm_connecteds;
43060-extern atomic_t cm_connect_reqs;
43061-extern atomic_t cm_rejects;
43062-extern atomic_t mod_qp_timouts;
43063-extern atomic_t qps_created;
43064-extern atomic_t qps_destroyed;
43065-extern atomic_t sw_qps_destroyed;
43066+extern atomic_unchecked_t cm_connects;
43067+extern atomic_unchecked_t cm_accepts;
43068+extern atomic_unchecked_t cm_disconnects;
43069+extern atomic_unchecked_t cm_closes;
43070+extern atomic_unchecked_t cm_connecteds;
43071+extern atomic_unchecked_t cm_connect_reqs;
43072+extern atomic_unchecked_t cm_rejects;
43073+extern atomic_unchecked_t mod_qp_timouts;
43074+extern atomic_unchecked_t qps_created;
43075+extern atomic_unchecked_t qps_destroyed;
43076+extern atomic_unchecked_t sw_qps_destroyed;
43077 extern u32 mh_detected;
43078 extern u32 mh_pauses_sent;
43079 extern u32 cm_packets_sent;
43080@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43081 extern u32 cm_packets_received;
43082 extern u32 cm_packets_dropped;
43083 extern u32 cm_packets_retrans;
43084-extern atomic_t cm_listens_created;
43085-extern atomic_t cm_listens_destroyed;
43086+extern atomic_unchecked_t cm_listens_created;
43087+extern atomic_unchecked_t cm_listens_destroyed;
43088 extern u32 cm_backlog_drops;
43089-extern atomic_t cm_loopbacks;
43090-extern atomic_t cm_nodes_created;
43091-extern atomic_t cm_nodes_destroyed;
43092-extern atomic_t cm_accel_dropped_pkts;
43093-extern atomic_t cm_resets_recvd;
43094-extern atomic_t pau_qps_created;
43095-extern atomic_t pau_qps_destroyed;
43096+extern atomic_unchecked_t cm_loopbacks;
43097+extern atomic_unchecked_t cm_nodes_created;
43098+extern atomic_unchecked_t cm_nodes_destroyed;
43099+extern atomic_unchecked_t cm_accel_dropped_pkts;
43100+extern atomic_unchecked_t cm_resets_recvd;
43101+extern atomic_unchecked_t pau_qps_created;
43102+extern atomic_unchecked_t pau_qps_destroyed;
43103
43104 extern u32 int_mod_timer_init;
43105 extern u32 int_mod_cq_depth_256;
43106diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43107index 6f09a72..cf4399d 100644
43108--- a/drivers/infiniband/hw/nes/nes_cm.c
43109+++ b/drivers/infiniband/hw/nes/nes_cm.c
43110@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43111 u32 cm_packets_retrans;
43112 u32 cm_packets_created;
43113 u32 cm_packets_received;
43114-atomic_t cm_listens_created;
43115-atomic_t cm_listens_destroyed;
43116+atomic_unchecked_t cm_listens_created;
43117+atomic_unchecked_t cm_listens_destroyed;
43118 u32 cm_backlog_drops;
43119-atomic_t cm_loopbacks;
43120-atomic_t cm_nodes_created;
43121-atomic_t cm_nodes_destroyed;
43122-atomic_t cm_accel_dropped_pkts;
43123-atomic_t cm_resets_recvd;
43124+atomic_unchecked_t cm_loopbacks;
43125+atomic_unchecked_t cm_nodes_created;
43126+atomic_unchecked_t cm_nodes_destroyed;
43127+atomic_unchecked_t cm_accel_dropped_pkts;
43128+atomic_unchecked_t cm_resets_recvd;
43129
43130 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43131 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43132@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43133 /* instance of function pointers for client API */
43134 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43135 static struct nes_cm_ops nes_cm_api = {
43136- mini_cm_accelerated,
43137- mini_cm_listen,
43138- mini_cm_del_listen,
43139- mini_cm_connect,
43140- mini_cm_close,
43141- mini_cm_accept,
43142- mini_cm_reject,
43143- mini_cm_recv_pkt,
43144- mini_cm_dealloc_core,
43145- mini_cm_get,
43146- mini_cm_set
43147+ .accelerated = mini_cm_accelerated,
43148+ .listen = mini_cm_listen,
43149+ .stop_listener = mini_cm_del_listen,
43150+ .connect = mini_cm_connect,
43151+ .close = mini_cm_close,
43152+ .accept = mini_cm_accept,
43153+ .reject = mini_cm_reject,
43154+ .recv_pkt = mini_cm_recv_pkt,
43155+ .destroy_cm_core = mini_cm_dealloc_core,
43156+ .get = mini_cm_get,
43157+ .set = mini_cm_set
43158 };
43159
43160 static struct nes_cm_core *g_cm_core;
43161
43162-atomic_t cm_connects;
43163-atomic_t cm_accepts;
43164-atomic_t cm_disconnects;
43165-atomic_t cm_closes;
43166-atomic_t cm_connecteds;
43167-atomic_t cm_connect_reqs;
43168-atomic_t cm_rejects;
43169+atomic_unchecked_t cm_connects;
43170+atomic_unchecked_t cm_accepts;
43171+atomic_unchecked_t cm_disconnects;
43172+atomic_unchecked_t cm_closes;
43173+atomic_unchecked_t cm_connecteds;
43174+atomic_unchecked_t cm_connect_reqs;
43175+atomic_unchecked_t cm_rejects;
43176
43177 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43178 {
43179@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43180 kfree(listener);
43181 listener = NULL;
43182 ret = 0;
43183- atomic_inc(&cm_listens_destroyed);
43184+ atomic_inc_unchecked(&cm_listens_destroyed);
43185 } else {
43186 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43187 }
43188@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43189 cm_node->rem_mac);
43190
43191 add_hte_node(cm_core, cm_node);
43192- atomic_inc(&cm_nodes_created);
43193+ atomic_inc_unchecked(&cm_nodes_created);
43194
43195 return cm_node;
43196 }
43197@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43198 }
43199
43200 atomic_dec(&cm_core->node_cnt);
43201- atomic_inc(&cm_nodes_destroyed);
43202+ atomic_inc_unchecked(&cm_nodes_destroyed);
43203 nesqp = cm_node->nesqp;
43204 if (nesqp) {
43205 nesqp->cm_node = NULL;
43206@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43207
43208 static void drop_packet(struct sk_buff *skb)
43209 {
43210- atomic_inc(&cm_accel_dropped_pkts);
43211+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43212 dev_kfree_skb_any(skb);
43213 }
43214
43215@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43216 {
43217
43218 int reset = 0; /* whether to send reset in case of err.. */
43219- atomic_inc(&cm_resets_recvd);
43220+ atomic_inc_unchecked(&cm_resets_recvd);
43221 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43222 " refcnt=%d\n", cm_node, cm_node->state,
43223 atomic_read(&cm_node->ref_count));
43224@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43225 rem_ref_cm_node(cm_node->cm_core, cm_node);
43226 return NULL;
43227 }
43228- atomic_inc(&cm_loopbacks);
43229+ atomic_inc_unchecked(&cm_loopbacks);
43230 loopbackremotenode->loopbackpartner = cm_node;
43231 loopbackremotenode->tcp_cntxt.rcv_wscale =
43232 NES_CM_DEFAULT_RCV_WND_SCALE;
43233@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43234 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43235 else {
43236 rem_ref_cm_node(cm_core, cm_node);
43237- atomic_inc(&cm_accel_dropped_pkts);
43238+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43239 dev_kfree_skb_any(skb);
43240 }
43241 break;
43242@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43243
43244 if ((cm_id) && (cm_id->event_handler)) {
43245 if (issue_disconn) {
43246- atomic_inc(&cm_disconnects);
43247+ atomic_inc_unchecked(&cm_disconnects);
43248 cm_event.event = IW_CM_EVENT_DISCONNECT;
43249 cm_event.status = disconn_status;
43250 cm_event.local_addr = cm_id->local_addr;
43251@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43252 }
43253
43254 if (issue_close) {
43255- atomic_inc(&cm_closes);
43256+ atomic_inc_unchecked(&cm_closes);
43257 nes_disconnect(nesqp, 1);
43258
43259 cm_id->provider_data = nesqp;
43260@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43261
43262 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43263 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43264- atomic_inc(&cm_accepts);
43265+ atomic_inc_unchecked(&cm_accepts);
43266
43267 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43268 netdev_refcnt_read(nesvnic->netdev));
43269@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43270 struct nes_cm_core *cm_core;
43271 u8 *start_buff;
43272
43273- atomic_inc(&cm_rejects);
43274+ atomic_inc_unchecked(&cm_rejects);
43275 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43276 loopback = cm_node->loopbackpartner;
43277 cm_core = cm_node->cm_core;
43278@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43279 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43280 ntohs(laddr->sin_port));
43281
43282- atomic_inc(&cm_connects);
43283+ atomic_inc_unchecked(&cm_connects);
43284 nesqp->active_conn = 1;
43285
43286 /* cache the cm_id in the qp */
43287@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43288 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43289 return err;
43290 }
43291- atomic_inc(&cm_listens_created);
43292+ atomic_inc_unchecked(&cm_listens_created);
43293 }
43294
43295 cm_id->add_ref(cm_id);
43296@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43297
43298 if (nesqp->destroyed)
43299 return;
43300- atomic_inc(&cm_connecteds);
43301+ atomic_inc_unchecked(&cm_connecteds);
43302 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43303 " local port 0x%04X. jiffies = %lu.\n",
43304 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43305@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43306
43307 cm_id->add_ref(cm_id);
43308 ret = cm_id->event_handler(cm_id, &cm_event);
43309- atomic_inc(&cm_closes);
43310+ atomic_inc_unchecked(&cm_closes);
43311 cm_event.event = IW_CM_EVENT_CLOSE;
43312 cm_event.status = 0;
43313 cm_event.provider_data = cm_id->provider_data;
43314@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43315 return;
43316 cm_id = cm_node->cm_id;
43317
43318- atomic_inc(&cm_connect_reqs);
43319+ atomic_inc_unchecked(&cm_connect_reqs);
43320 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43321 cm_node, cm_id, jiffies);
43322
43323@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43324 return;
43325 cm_id = cm_node->cm_id;
43326
43327- atomic_inc(&cm_connect_reqs);
43328+ atomic_inc_unchecked(&cm_connect_reqs);
43329 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43330 cm_node, cm_id, jiffies);
43331
43332diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43333index 4166452..fc952c3 100644
43334--- a/drivers/infiniband/hw/nes/nes_mgt.c
43335+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43336@@ -40,8 +40,8 @@
43337 #include "nes.h"
43338 #include "nes_mgt.h"
43339
43340-atomic_t pau_qps_created;
43341-atomic_t pau_qps_destroyed;
43342+atomic_unchecked_t pau_qps_created;
43343+atomic_unchecked_t pau_qps_destroyed;
43344
43345 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43346 {
43347@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43348 {
43349 struct sk_buff *skb;
43350 unsigned long flags;
43351- atomic_inc(&pau_qps_destroyed);
43352+ atomic_inc_unchecked(&pau_qps_destroyed);
43353
43354 /* Free packets that have not yet been forwarded */
43355 /* Lock is acquired by skb_dequeue when removing the skb */
43356@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43357 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43358 skb_queue_head_init(&nesqp->pau_list);
43359 spin_lock_init(&nesqp->pau_lock);
43360- atomic_inc(&pau_qps_created);
43361+ atomic_inc_unchecked(&pau_qps_created);
43362 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43363 }
43364
43365diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43366index 49eb511..a774366 100644
43367--- a/drivers/infiniband/hw/nes/nes_nic.c
43368+++ b/drivers/infiniband/hw/nes/nes_nic.c
43369@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43370 target_stat_values[++index] = mh_detected;
43371 target_stat_values[++index] = mh_pauses_sent;
43372 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43373- target_stat_values[++index] = atomic_read(&cm_connects);
43374- target_stat_values[++index] = atomic_read(&cm_accepts);
43375- target_stat_values[++index] = atomic_read(&cm_disconnects);
43376- target_stat_values[++index] = atomic_read(&cm_connecteds);
43377- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43378- target_stat_values[++index] = atomic_read(&cm_rejects);
43379- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43380- target_stat_values[++index] = atomic_read(&qps_created);
43381- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43382- target_stat_values[++index] = atomic_read(&qps_destroyed);
43383- target_stat_values[++index] = atomic_read(&cm_closes);
43384+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43385+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43386+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43387+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43388+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43389+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43390+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43391+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43392+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43393+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43394+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43395 target_stat_values[++index] = cm_packets_sent;
43396 target_stat_values[++index] = cm_packets_bounced;
43397 target_stat_values[++index] = cm_packets_created;
43398 target_stat_values[++index] = cm_packets_received;
43399 target_stat_values[++index] = cm_packets_dropped;
43400 target_stat_values[++index] = cm_packets_retrans;
43401- target_stat_values[++index] = atomic_read(&cm_listens_created);
43402- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43403+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43404+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43405 target_stat_values[++index] = cm_backlog_drops;
43406- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43407- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43408- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43409- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43410- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43411+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43412+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43413+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43414+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43415+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43416 target_stat_values[++index] = nesadapter->free_4kpbl;
43417 target_stat_values[++index] = nesadapter->free_256pbl;
43418 target_stat_values[++index] = int_mod_timer_init;
43419 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43420 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43421 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43422- target_stat_values[++index] = atomic_read(&pau_qps_created);
43423- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43424+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43425+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43426 }
43427
43428 /**
43429diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43430index fef067c..6a25ccd 100644
43431--- a/drivers/infiniband/hw/nes/nes_verbs.c
43432+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43433@@ -46,9 +46,9 @@
43434
43435 #include <rdma/ib_umem.h>
43436
43437-atomic_t mod_qp_timouts;
43438-atomic_t qps_created;
43439-atomic_t sw_qps_destroyed;
43440+atomic_unchecked_t mod_qp_timouts;
43441+atomic_unchecked_t qps_created;
43442+atomic_unchecked_t sw_qps_destroyed;
43443
43444 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43445
43446@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43447 if (init_attr->create_flags)
43448 return ERR_PTR(-EINVAL);
43449
43450- atomic_inc(&qps_created);
43451+ atomic_inc_unchecked(&qps_created);
43452 switch (init_attr->qp_type) {
43453 case IB_QPT_RC:
43454 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43455@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43456 struct iw_cm_event cm_event;
43457 int ret = 0;
43458
43459- atomic_inc(&sw_qps_destroyed);
43460+ atomic_inc_unchecked(&sw_qps_destroyed);
43461 nesqp->destroyed = 1;
43462
43463 /* Blow away the connection if it exists. */
43464diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43465index c00ae09..04e91be 100644
43466--- a/drivers/infiniband/hw/qib/qib.h
43467+++ b/drivers/infiniband/hw/qib/qib.h
43468@@ -52,6 +52,7 @@
43469 #include <linux/kref.h>
43470 #include <linux/sched.h>
43471 #include <linux/kthread.h>
43472+#include <linux/slab.h>
43473
43474 #include "qib_common.h"
43475 #include "qib_verbs.h"
43476diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43477index cdc7df4..a2fdfdb 100644
43478--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43479+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43480@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43481 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43482 }
43483
43484-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43485+static struct rtnl_link_ops ipoib_link_ops = {
43486 .kind = "ipoib",
43487 .maxtype = IFLA_IPOIB_MAX,
43488 .policy = ipoib_policy,
43489diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43490index e29c04e..adbf68c 100644
43491--- a/drivers/input/gameport/gameport.c
43492+++ b/drivers/input/gameport/gameport.c
43493@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43494 */
43495 static void gameport_init_port(struct gameport *gameport)
43496 {
43497- static atomic_t gameport_no = ATOMIC_INIT(0);
43498+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
43499
43500 __module_get(THIS_MODULE);
43501
43502 mutex_init(&gameport->drv_mutex);
43503 device_initialize(&gameport->dev);
43504 dev_set_name(&gameport->dev, "gameport%lu",
43505- (unsigned long)atomic_inc_return(&gameport_no) - 1);
43506+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
43507 gameport->dev.bus = &gameport_bus;
43508 gameport->dev.release = gameport_release_port;
43509 if (gameport->parent)
43510diff --git a/drivers/input/input.c b/drivers/input/input.c
43511index 0f175f5..4c481c0 100644
43512--- a/drivers/input/input.c
43513+++ b/drivers/input/input.c
43514@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
43515 */
43516 struct input_dev *input_allocate_device(void)
43517 {
43518- static atomic_t input_no = ATOMIC_INIT(0);
43519+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
43520 struct input_dev *dev;
43521
43522 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43523@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
43524 INIT_LIST_HEAD(&dev->node);
43525
43526 dev_set_name(&dev->dev, "input%lu",
43527- (unsigned long) atomic_inc_return(&input_no) - 1);
43528+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
43529
43530 __module_get(THIS_MODULE);
43531 }
43532diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43533index 4a95b22..874c182 100644
43534--- a/drivers/input/joystick/sidewinder.c
43535+++ b/drivers/input/joystick/sidewinder.c
43536@@ -30,6 +30,7 @@
43537 #include <linux/kernel.h>
43538 #include <linux/module.h>
43539 #include <linux/slab.h>
43540+#include <linux/sched.h>
43541 #include <linux/input.h>
43542 #include <linux/gameport.h>
43543 #include <linux/jiffies.h>
43544diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43545index fc55f0d..11e2aa6 100644
43546--- a/drivers/input/joystick/xpad.c
43547+++ b/drivers/input/joystick/xpad.c
43548@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43549
43550 static int xpad_led_probe(struct usb_xpad *xpad)
43551 {
43552- static atomic_t led_seq = ATOMIC_INIT(0);
43553+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
43554 long led_no;
43555 struct xpad_led *led;
43556 struct led_classdev *led_cdev;
43557@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43558 if (!led)
43559 return -ENOMEM;
43560
43561- led_no = (long)atomic_inc_return(&led_seq) - 1;
43562+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
43563
43564 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
43565 led->xpad = xpad;
43566diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43567index afed8e2..3aa8a18 100644
43568--- a/drivers/input/misc/ims-pcu.c
43569+++ b/drivers/input/misc/ims-pcu.c
43570@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43571
43572 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43573 {
43574- static atomic_t device_no = ATOMIC_INIT(0);
43575+ static atomic_unchecked_t device_no = ATOMIC_INIT(0);
43576
43577 const struct ims_pcu_device_info *info;
43578 int error;
43579@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43580 }
43581
43582 /* Device appears to be operable, complete initialization */
43583- pcu->device_no = atomic_inc_return(&device_no) - 1;
43584+ pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
43585
43586 /*
43587 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43588diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43589index f4cf664..3204fda 100644
43590--- a/drivers/input/mouse/psmouse.h
43591+++ b/drivers/input/mouse/psmouse.h
43592@@ -117,7 +117,7 @@ struct psmouse_attribute {
43593 ssize_t (*set)(struct psmouse *psmouse, void *data,
43594 const char *buf, size_t count);
43595 bool protect;
43596-};
43597+} __do_const;
43598 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43599
43600 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43601diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43602index b604564..3f14ae4 100644
43603--- a/drivers/input/mousedev.c
43604+++ b/drivers/input/mousedev.c
43605@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43606
43607 spin_unlock_irq(&client->packet_lock);
43608
43609- if (copy_to_user(buffer, data, count))
43610+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43611 return -EFAULT;
43612
43613 return count;
43614diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43615index d399b8b..4913ede 100644
43616--- a/drivers/input/serio/serio.c
43617+++ b/drivers/input/serio/serio.c
43618@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43619 */
43620 static void serio_init_port(struct serio *serio)
43621 {
43622- static atomic_t serio_no = ATOMIC_INIT(0);
43623+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
43624
43625 __module_get(THIS_MODULE);
43626
43627@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43628 mutex_init(&serio->drv_mutex);
43629 device_initialize(&serio->dev);
43630 dev_set_name(&serio->dev, "serio%lu",
43631- (unsigned long)atomic_inc_return(&serio_no) - 1);
43632+ (unsigned long)atomic_inc_return_unchecked(&serio_no) - 1);
43633 serio->dev.bus = &serio_bus;
43634 serio->dev.release = serio_release_port;
43635 serio->dev.groups = serio_device_attr_groups;
43636diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43637index c9a02fe..0debc75 100644
43638--- a/drivers/input/serio/serio_raw.c
43639+++ b/drivers/input/serio/serio_raw.c
43640@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43641
43642 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43643 {
43644- static atomic_t serio_raw_no = ATOMIC_INIT(0);
43645+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
43646 struct serio_raw *serio_raw;
43647 int err;
43648
43649@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43650 }
43651
43652 snprintf(serio_raw->name, sizeof(serio_raw->name),
43653- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
43654+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
43655 kref_init(&serio_raw->kref);
43656 INIT_LIST_HEAD(&serio_raw->client_list);
43657 init_waitqueue_head(&serio_raw->wait);
43658diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43659index 505a9ad..356734c 100644
43660--- a/drivers/iommu/amd_iommu.c
43661+++ b/drivers/iommu/amd_iommu.c
43662@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43663
43664 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43665 {
43666+ phys_addr_t physaddr;
43667 WARN_ON(address & 0x7ULL);
43668
43669 memset(cmd, 0, sizeof(*cmd));
43670- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43671- cmd->data[1] = upper_32_bits(__pa(address));
43672+
43673+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43674+ if (object_starts_on_stack((void *)address)) {
43675+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43676+ physaddr = __pa((u64)adjbuf);
43677+ } else
43678+#endif
43679+ physaddr = __pa(address);
43680+
43681+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43682+ cmd->data[1] = upper_32_bits(physaddr);
43683 cmd->data[2] = 1;
43684 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43685 }
43686diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43687index 60558f7..5a02369 100644
43688--- a/drivers/iommu/arm-smmu.c
43689+++ b/drivers/iommu/arm-smmu.c
43690@@ -934,7 +934,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43691 cfg->irptndx = cfg->cbndx;
43692 }
43693
43694- ACCESS_ONCE(smmu_domain->smmu) = smmu;
43695+ ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
43696 arm_smmu_init_context_bank(smmu_domain);
43697 spin_unlock_irqrestore(&smmu_domain->lock, flags);
43698
43699diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43700index ed8b048..7fbcc01 100644
43701--- a/drivers/iommu/iommu.c
43702+++ b/drivers/iommu/iommu.c
43703@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
43704 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
43705 {
43706 int err;
43707- struct notifier_block *nb;
43708+ notifier_block_no_const *nb;
43709 struct iommu_callback_data cb = {
43710 .ops = ops,
43711 };
43712diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43713index 74a1767..5a359e8 100644
43714--- a/drivers/iommu/irq_remapping.c
43715+++ b/drivers/iommu/irq_remapping.c
43716@@ -361,7 +361,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43717 void panic_if_irq_remap(const char *msg)
43718 {
43719 if (irq_remapping_enabled)
43720- panic(msg);
43721+ panic("%s", msg);
43722 }
43723
43724 static void ir_ack_apic_edge(struct irq_data *data)
43725@@ -382,10 +382,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43726
43727 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43728 {
43729- chip->irq_print_chip = ir_print_prefix;
43730- chip->irq_ack = ir_ack_apic_edge;
43731- chip->irq_eoi = ir_ack_apic_level;
43732- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43733+ pax_open_kernel();
43734+ *(void **)&chip->irq_print_chip = ir_print_prefix;
43735+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
43736+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
43737+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43738+ pax_close_kernel();
43739 }
43740
43741 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43742diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43743index 38493ff..001538b 100644
43744--- a/drivers/irqchip/irq-gic.c
43745+++ b/drivers/irqchip/irq-gic.c
43746@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43747 * Supported arch specific GIC irq extension.
43748 * Default make them NULL.
43749 */
43750-struct irq_chip gic_arch_extn = {
43751+irq_chip_no_const gic_arch_extn = {
43752 .irq_eoi = NULL,
43753 .irq_mask = NULL,
43754 .irq_unmask = NULL,
43755@@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43756 chained_irq_exit(chip, desc);
43757 }
43758
43759-static struct irq_chip gic_chip = {
43760+static irq_chip_no_const gic_chip __read_only = {
43761 .name = "GIC",
43762 .irq_mask = gic_mask_irq,
43763 .irq_unmask = gic_unmask_irq,
43764diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
43765index 542e850..1bb094c 100644
43766--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
43767+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
43768@@ -353,7 +353,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
43769 struct intc_irqpin_iomem *i;
43770 struct resource *io[INTC_IRQPIN_REG_NR];
43771 struct resource *irq;
43772- struct irq_chip *irq_chip;
43773+ irq_chip_no_const *irq_chip;
43774 void (*enable_fn)(struct irq_data *d);
43775 void (*disable_fn)(struct irq_data *d);
43776 const char *name = dev_name(dev);
43777diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43778index 8777065..a4a9967 100644
43779--- a/drivers/irqchip/irq-renesas-irqc.c
43780+++ b/drivers/irqchip/irq-renesas-irqc.c
43781@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43782 struct irqc_priv *p;
43783 struct resource *io;
43784 struct resource *irq;
43785- struct irq_chip *irq_chip;
43786+ irq_chip_no_const *irq_chip;
43787 const char *name = dev_name(&pdev->dev);
43788 int ret;
43789 int k;
43790diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43791index 6a2df32..dc962f1 100644
43792--- a/drivers/isdn/capi/capi.c
43793+++ b/drivers/isdn/capi/capi.c
43794@@ -81,8 +81,8 @@ struct capiminor {
43795
43796 struct capi20_appl *ap;
43797 u32 ncci;
43798- atomic_t datahandle;
43799- atomic_t msgid;
43800+ atomic_unchecked_t datahandle;
43801+ atomic_unchecked_t msgid;
43802
43803 struct tty_port port;
43804 int ttyinstop;
43805@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43806 capimsg_setu16(s, 2, mp->ap->applid);
43807 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43808 capimsg_setu8 (s, 5, CAPI_RESP);
43809- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43810+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43811 capimsg_setu32(s, 8, mp->ncci);
43812 capimsg_setu16(s, 12, datahandle);
43813 }
43814@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43815 mp->outbytes -= len;
43816 spin_unlock_bh(&mp->outlock);
43817
43818- datahandle = atomic_inc_return(&mp->datahandle);
43819+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43820 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43821 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43822 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43823 capimsg_setu16(skb->data, 2, mp->ap->applid);
43824 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43825 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43826- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43827+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43828 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43829 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43830 capimsg_setu16(skb->data, 16, len); /* Data length */
43831diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43832index aecec6d..11e13c5 100644
43833--- a/drivers/isdn/gigaset/bas-gigaset.c
43834+++ b/drivers/isdn/gigaset/bas-gigaset.c
43835@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43836
43837
43838 static const struct gigaset_ops gigops = {
43839- gigaset_write_cmd,
43840- gigaset_write_room,
43841- gigaset_chars_in_buffer,
43842- gigaset_brkchars,
43843- gigaset_init_bchannel,
43844- gigaset_close_bchannel,
43845- gigaset_initbcshw,
43846- gigaset_freebcshw,
43847- gigaset_reinitbcshw,
43848- gigaset_initcshw,
43849- gigaset_freecshw,
43850- gigaset_set_modem_ctrl,
43851- gigaset_baud_rate,
43852- gigaset_set_line_ctrl,
43853- gigaset_isoc_send_skb,
43854- gigaset_isoc_input,
43855+ .write_cmd = gigaset_write_cmd,
43856+ .write_room = gigaset_write_room,
43857+ .chars_in_buffer = gigaset_chars_in_buffer,
43858+ .brkchars = gigaset_brkchars,
43859+ .init_bchannel = gigaset_init_bchannel,
43860+ .close_bchannel = gigaset_close_bchannel,
43861+ .initbcshw = gigaset_initbcshw,
43862+ .freebcshw = gigaset_freebcshw,
43863+ .reinitbcshw = gigaset_reinitbcshw,
43864+ .initcshw = gigaset_initcshw,
43865+ .freecshw = gigaset_freecshw,
43866+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43867+ .baud_rate = gigaset_baud_rate,
43868+ .set_line_ctrl = gigaset_set_line_ctrl,
43869+ .send_skb = gigaset_isoc_send_skb,
43870+ .handle_input = gigaset_isoc_input,
43871 };
43872
43873 /* bas_gigaset_init
43874diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43875index 600c79b..3752bab 100644
43876--- a/drivers/isdn/gigaset/interface.c
43877+++ b/drivers/isdn/gigaset/interface.c
43878@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43879 }
43880 tty->driver_data = cs;
43881
43882- ++cs->port.count;
43883+ atomic_inc(&cs->port.count);
43884
43885- if (cs->port.count == 1) {
43886+ if (atomic_read(&cs->port.count) == 1) {
43887 tty_port_tty_set(&cs->port, tty);
43888 cs->port.low_latency = 1;
43889 }
43890@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43891
43892 if (!cs->connected)
43893 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43894- else if (!cs->port.count)
43895+ else if (!atomic_read(&cs->port.count))
43896 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43897- else if (!--cs->port.count)
43898+ else if (!atomic_dec_return(&cs->port.count))
43899 tty_port_tty_set(&cs->port, NULL);
43900
43901 mutex_unlock(&cs->mutex);
43902diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43903index 8c91fd5..14f13ce 100644
43904--- a/drivers/isdn/gigaset/ser-gigaset.c
43905+++ b/drivers/isdn/gigaset/ser-gigaset.c
43906@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43907 }
43908
43909 static const struct gigaset_ops ops = {
43910- gigaset_write_cmd,
43911- gigaset_write_room,
43912- gigaset_chars_in_buffer,
43913- gigaset_brkchars,
43914- gigaset_init_bchannel,
43915- gigaset_close_bchannel,
43916- gigaset_initbcshw,
43917- gigaset_freebcshw,
43918- gigaset_reinitbcshw,
43919- gigaset_initcshw,
43920- gigaset_freecshw,
43921- gigaset_set_modem_ctrl,
43922- gigaset_baud_rate,
43923- gigaset_set_line_ctrl,
43924- gigaset_m10x_send_skb, /* asyncdata.c */
43925- gigaset_m10x_input, /* asyncdata.c */
43926+ .write_cmd = gigaset_write_cmd,
43927+ .write_room = gigaset_write_room,
43928+ .chars_in_buffer = gigaset_chars_in_buffer,
43929+ .brkchars = gigaset_brkchars,
43930+ .init_bchannel = gigaset_init_bchannel,
43931+ .close_bchannel = gigaset_close_bchannel,
43932+ .initbcshw = gigaset_initbcshw,
43933+ .freebcshw = gigaset_freebcshw,
43934+ .reinitbcshw = gigaset_reinitbcshw,
43935+ .initcshw = gigaset_initcshw,
43936+ .freecshw = gigaset_freecshw,
43937+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43938+ .baud_rate = gigaset_baud_rate,
43939+ .set_line_ctrl = gigaset_set_line_ctrl,
43940+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43941+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
43942 };
43943
43944
43945diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43946index a8e652d..edadaa4 100644
43947--- a/drivers/isdn/gigaset/usb-gigaset.c
43948+++ b/drivers/isdn/gigaset/usb-gigaset.c
43949@@ -548,7 +548,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43950 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43951 memcpy(cs->hw.usb->bchars, buf, 6);
43952 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43953- 0, 0, &buf, 6, 2000);
43954+ 0, 0, buf, 6, 2000);
43955 }
43956
43957 static void gigaset_freebcshw(struct bc_state *bcs)
43958@@ -867,22 +867,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43959 }
43960
43961 static const struct gigaset_ops ops = {
43962- gigaset_write_cmd,
43963- gigaset_write_room,
43964- gigaset_chars_in_buffer,
43965- gigaset_brkchars,
43966- gigaset_init_bchannel,
43967- gigaset_close_bchannel,
43968- gigaset_initbcshw,
43969- gigaset_freebcshw,
43970- gigaset_reinitbcshw,
43971- gigaset_initcshw,
43972- gigaset_freecshw,
43973- gigaset_set_modem_ctrl,
43974- gigaset_baud_rate,
43975- gigaset_set_line_ctrl,
43976- gigaset_m10x_send_skb,
43977- gigaset_m10x_input,
43978+ .write_cmd = gigaset_write_cmd,
43979+ .write_room = gigaset_write_room,
43980+ .chars_in_buffer = gigaset_chars_in_buffer,
43981+ .brkchars = gigaset_brkchars,
43982+ .init_bchannel = gigaset_init_bchannel,
43983+ .close_bchannel = gigaset_close_bchannel,
43984+ .initbcshw = gigaset_initbcshw,
43985+ .freebcshw = gigaset_freebcshw,
43986+ .reinitbcshw = gigaset_reinitbcshw,
43987+ .initcshw = gigaset_initcshw,
43988+ .freecshw = gigaset_freecshw,
43989+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43990+ .baud_rate = gigaset_baud_rate,
43991+ .set_line_ctrl = gigaset_set_line_ctrl,
43992+ .send_skb = gigaset_m10x_send_skb,
43993+ .handle_input = gigaset_m10x_input,
43994 };
43995
43996 /*
43997diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43998index 4d9b195..455075c 100644
43999--- a/drivers/isdn/hardware/avm/b1.c
44000+++ b/drivers/isdn/hardware/avm/b1.c
44001@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
44002 }
44003 if (left) {
44004 if (t4file->user) {
44005- if (copy_from_user(buf, dp, left))
44006+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44007 return -EFAULT;
44008 } else {
44009 memcpy(buf, dp, left);
44010@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44011 }
44012 if (left) {
44013 if (config->user) {
44014- if (copy_from_user(buf, dp, left))
44015+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44016 return -EFAULT;
44017 } else {
44018 memcpy(buf, dp, left);
44019diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44020index 9b856e1..fa03c92 100644
44021--- a/drivers/isdn/i4l/isdn_common.c
44022+++ b/drivers/isdn/i4l/isdn_common.c
44023@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44024 } else
44025 return -EINVAL;
44026 case IIOCDBGVAR:
44027+ if (!capable(CAP_SYS_RAWIO))
44028+ return -EPERM;
44029 if (arg) {
44030 if (copy_to_user(argp, &dev, sizeof(ulong)))
44031 return -EFAULT;
44032diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44033index 91d5730..336523e 100644
44034--- a/drivers/isdn/i4l/isdn_concap.c
44035+++ b/drivers/isdn/i4l/isdn_concap.c
44036@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44037 }
44038
44039 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44040- &isdn_concap_dl_data_req,
44041- &isdn_concap_dl_connect_req,
44042- &isdn_concap_dl_disconn_req
44043+ .data_req = &isdn_concap_dl_data_req,
44044+ .connect_req = &isdn_concap_dl_connect_req,
44045+ .disconn_req = &isdn_concap_dl_disconn_req
44046 };
44047
44048 /* The following should better go into a dedicated source file such that
44049diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44050index bc91261..2ef7e36 100644
44051--- a/drivers/isdn/i4l/isdn_tty.c
44052+++ b/drivers/isdn/i4l/isdn_tty.c
44053@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44054
44055 #ifdef ISDN_DEBUG_MODEM_OPEN
44056 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44057- port->count);
44058+ atomic_read(&port->count));
44059 #endif
44060- port->count++;
44061+ atomic_inc(&port->count);
44062 port->tty = tty;
44063 /*
44064 * Start up serial port
44065@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44066 #endif
44067 return;
44068 }
44069- if ((tty->count == 1) && (port->count != 1)) {
44070+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44071 /*
44072 * Uh, oh. tty->count is 1, which means that the tty
44073 * structure will be freed. Info->count should always
44074@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44075 * serial port won't be shutdown.
44076 */
44077 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44078- "info->count is %d\n", port->count);
44079- port->count = 1;
44080+ "info->count is %d\n", atomic_read(&port->count));
44081+ atomic_set(&port->count, 1);
44082 }
44083- if (--port->count < 0) {
44084+ if (atomic_dec_return(&port->count) < 0) {
44085 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44086- info->line, port->count);
44087- port->count = 0;
44088+ info->line, atomic_read(&port->count));
44089+ atomic_set(&port->count, 0);
44090 }
44091- if (port->count) {
44092+ if (atomic_read(&port->count)) {
44093 #ifdef ISDN_DEBUG_MODEM_OPEN
44094 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44095 #endif
44096@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44097 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44098 return;
44099 isdn_tty_shutdown(info);
44100- port->count = 0;
44101+ atomic_set(&port->count, 0);
44102 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44103 port->tty = NULL;
44104 wake_up_interruptible(&port->open_wait);
44105@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44106 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44107 modem_info *info = &dev->mdm.info[i];
44108
44109- if (info->port.count == 0)
44110+ if (atomic_read(&info->port.count) == 0)
44111 continue;
44112 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44113 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44114diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44115index e2d4e58..40cd045 100644
44116--- a/drivers/isdn/i4l/isdn_x25iface.c
44117+++ b/drivers/isdn/i4l/isdn_x25iface.c
44118@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44119
44120
44121 static struct concap_proto_ops ix25_pops = {
44122- &isdn_x25iface_proto_new,
44123- &isdn_x25iface_proto_del,
44124- &isdn_x25iface_proto_restart,
44125- &isdn_x25iface_proto_close,
44126- &isdn_x25iface_xmit,
44127- &isdn_x25iface_receive,
44128- &isdn_x25iface_connect_ind,
44129- &isdn_x25iface_disconn_ind
44130+ .proto_new = &isdn_x25iface_proto_new,
44131+ .proto_del = &isdn_x25iface_proto_del,
44132+ .restart = &isdn_x25iface_proto_restart,
44133+ .close = &isdn_x25iface_proto_close,
44134+ .encap_and_xmit = &isdn_x25iface_xmit,
44135+ .data_ind = &isdn_x25iface_receive,
44136+ .connect_ind = &isdn_x25iface_connect_ind,
44137+ .disconn_ind = &isdn_x25iface_disconn_ind
44138 };
44139
44140 /* error message helper function */
44141diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44142index 6a7447c..cae33fe 100644
44143--- a/drivers/isdn/icn/icn.c
44144+++ b/drivers/isdn/icn/icn.c
44145@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44146 if (count > len)
44147 count = len;
44148 if (user) {
44149- if (copy_from_user(msg, buf, count))
44150+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44151 return -EFAULT;
44152 } else
44153 memcpy(msg, buf, count);
44154diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44155index 87f7dff..7300125 100644
44156--- a/drivers/isdn/mISDN/dsp_cmx.c
44157+++ b/drivers/isdn/mISDN/dsp_cmx.c
44158@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44159 static u16 dsp_count; /* last sample count */
44160 static int dsp_count_valid; /* if we have last sample count */
44161
44162-void
44163+void __intentional_overflow(-1)
44164 dsp_cmx_send(void *arg)
44165 {
44166 struct dsp_conf *conf;
44167diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44168index f58a354..fbae176 100644
44169--- a/drivers/leds/leds-clevo-mail.c
44170+++ b/drivers/leds/leds-clevo-mail.c
44171@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44172 * detected as working, but in reality it is not) as low as
44173 * possible.
44174 */
44175-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44176+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44177 {
44178 .callback = clevo_mail_led_dmi_callback,
44179 .ident = "Clevo D410J",
44180diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44181index 046cb70..6b20d39 100644
44182--- a/drivers/leds/leds-ss4200.c
44183+++ b/drivers/leds/leds-ss4200.c
44184@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44185 * detected as working, but in reality it is not) as low as
44186 * possible.
44187 */
44188-static struct dmi_system_id nas_led_whitelist[] __initdata = {
44189+static struct dmi_system_id nas_led_whitelist[] __initconst = {
44190 {
44191 .callback = ss4200_led_dmi_callback,
44192 .ident = "Intel SS4200-E",
44193diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44194index 6590558..a74c5dd 100644
44195--- a/drivers/lguest/core.c
44196+++ b/drivers/lguest/core.c
44197@@ -96,9 +96,17 @@ static __init int map_switcher(void)
44198 * The end address needs +1 because __get_vm_area allocates an
44199 * extra guard page, so we need space for that.
44200 */
44201+
44202+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44203+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44204+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44205+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44206+#else
44207 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44208 VM_ALLOC, switcher_addr, switcher_addr
44209 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44210+#endif
44211+
44212 if (!switcher_vma) {
44213 err = -ENOMEM;
44214 printk("lguest: could not map switcher pages high\n");
44215@@ -121,7 +129,7 @@ static __init int map_switcher(void)
44216 * Now the Switcher is mapped at the right address, we can't fail!
44217 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44218 */
44219- memcpy(switcher_vma->addr, start_switcher_text,
44220+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44221 end_switcher_text - start_switcher_text);
44222
44223 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44224diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44225index e8b55c3..3514c37 100644
44226--- a/drivers/lguest/page_tables.c
44227+++ b/drivers/lguest/page_tables.c
44228@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44229 /*:*/
44230
44231 #ifdef CONFIG_X86_PAE
44232-static void release_pmd(pmd_t *spmd)
44233+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44234 {
44235 /* If the entry's not present, there's nothing to release. */
44236 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44237diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44238index 922a1ac..9dd0c2a 100644
44239--- a/drivers/lguest/x86/core.c
44240+++ b/drivers/lguest/x86/core.c
44241@@ -59,7 +59,7 @@ static struct {
44242 /* Offset from where switcher.S was compiled to where we've copied it */
44243 static unsigned long switcher_offset(void)
44244 {
44245- return switcher_addr - (unsigned long)start_switcher_text;
44246+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44247 }
44248
44249 /* This cpu's struct lguest_pages (after the Switcher text page) */
44250@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44251 * These copies are pretty cheap, so we do them unconditionally: */
44252 /* Save the current Host top-level page directory.
44253 */
44254+
44255+#ifdef CONFIG_PAX_PER_CPU_PGD
44256+ pages->state.host_cr3 = read_cr3();
44257+#else
44258 pages->state.host_cr3 = __pa(current->mm->pgd);
44259+#endif
44260+
44261 /*
44262 * Set up the Guest's page tables to see this CPU's pages (and no
44263 * other CPU's pages).
44264@@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
44265 * compiled-in switcher code and the high-mapped copy we just made.
44266 */
44267 for (i = 0; i < IDT_ENTRIES; i++)
44268- default_idt_entries[i] += switcher_offset();
44269+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44270
44271 /*
44272 * Set up the Switcher's per-cpu areas.
44273@@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
44274 * it will be undisturbed when we switch. To change %cs and jump we
44275 * need this structure to feed to Intel's "lcall" instruction.
44276 */
44277- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44278+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44279 lguest_entry.segment = LGUEST_CS;
44280
44281 /*
44282diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44283index 40634b0..4f5855e 100644
44284--- a/drivers/lguest/x86/switcher_32.S
44285+++ b/drivers/lguest/x86/switcher_32.S
44286@@ -87,6 +87,7 @@
44287 #include <asm/page.h>
44288 #include <asm/segment.h>
44289 #include <asm/lguest.h>
44290+#include <asm/processor-flags.h>
44291
44292 // We mark the start of the code to copy
44293 // It's placed in .text tho it's never run here
44294@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44295 // Changes type when we load it: damn Intel!
44296 // For after we switch over our page tables
44297 // That entry will be read-only: we'd crash.
44298+
44299+#ifdef CONFIG_PAX_KERNEXEC
44300+ mov %cr0, %edx
44301+ xor $X86_CR0_WP, %edx
44302+ mov %edx, %cr0
44303+#endif
44304+
44305 movl $(GDT_ENTRY_TSS*8), %edx
44306 ltr %dx
44307
44308@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44309 // Let's clear it again for our return.
44310 // The GDT descriptor of the Host
44311 // Points to the table after two "size" bytes
44312- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44313+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44314 // Clear "used" from type field (byte 5, bit 2)
44315- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44316+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44317+
44318+#ifdef CONFIG_PAX_KERNEXEC
44319+ mov %cr0, %eax
44320+ xor $X86_CR0_WP, %eax
44321+ mov %eax, %cr0
44322+#endif
44323
44324 // Once our page table's switched, the Guest is live!
44325 // The Host fades as we run this final step.
44326@@ -295,13 +309,12 @@ deliver_to_host:
44327 // I consulted gcc, and it gave
44328 // These instructions, which I gladly credit:
44329 leal (%edx,%ebx,8), %eax
44330- movzwl (%eax),%edx
44331- movl 4(%eax), %eax
44332- xorw %ax, %ax
44333- orl %eax, %edx
44334+ movl 4(%eax), %edx
44335+ movw (%eax), %dx
44336 // Now the address of the handler's in %edx
44337 // We call it now: its "iret" drops us home.
44338- jmp *%edx
44339+ ljmp $__KERNEL_CS, $1f
44340+1: jmp *%edx
44341
44342 // Every interrupt can come to us here
44343 // But we must truly tell each apart.
44344diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44345index a08e3ee..df8ade2 100644
44346--- a/drivers/md/bcache/closure.h
44347+++ b/drivers/md/bcache/closure.h
44348@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44349 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44350 struct workqueue_struct *wq)
44351 {
44352- BUG_ON(object_is_on_stack(cl));
44353+ BUG_ON(object_starts_on_stack(cl));
44354 closure_set_ip(cl);
44355 cl->fn = fn;
44356 cl->wq = wq;
44357diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44358index da3604e..7789cb4c 100644
44359--- a/drivers/md/bitmap.c
44360+++ b/drivers/md/bitmap.c
44361@@ -1771,7 +1771,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44362 chunk_kb ? "KB" : "B");
44363 if (bitmap->storage.file) {
44364 seq_printf(seq, ", file: ");
44365- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44366+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44367 }
44368
44369 seq_printf(seq, "\n");
44370diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44371index 0be9381..114262b 100644
44372--- a/drivers/md/dm-ioctl.c
44373+++ b/drivers/md/dm-ioctl.c
44374@@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44375 cmd == DM_LIST_VERSIONS_CMD)
44376 return 0;
44377
44378- if ((cmd == DM_DEV_CREATE_CMD)) {
44379+ if (cmd == DM_DEV_CREATE_CMD) {
44380 if (!*param->name) {
44381 DMWARN("name not supplied when creating device");
44382 return -EINVAL;
44383diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44384index 7dfdb5c..4caada6 100644
44385--- a/drivers/md/dm-raid1.c
44386+++ b/drivers/md/dm-raid1.c
44387@@ -40,7 +40,7 @@ enum dm_raid1_error {
44388
44389 struct mirror {
44390 struct mirror_set *ms;
44391- atomic_t error_count;
44392+ atomic_unchecked_t error_count;
44393 unsigned long error_type;
44394 struct dm_dev *dev;
44395 sector_t offset;
44396@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44397 struct mirror *m;
44398
44399 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44400- if (!atomic_read(&m->error_count))
44401+ if (!atomic_read_unchecked(&m->error_count))
44402 return m;
44403
44404 return NULL;
44405@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44406 * simple way to tell if a device has encountered
44407 * errors.
44408 */
44409- atomic_inc(&m->error_count);
44410+ atomic_inc_unchecked(&m->error_count);
44411
44412 if (test_and_set_bit(error_type, &m->error_type))
44413 return;
44414@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44415 struct mirror *m = get_default_mirror(ms);
44416
44417 do {
44418- if (likely(!atomic_read(&m->error_count)))
44419+ if (likely(!atomic_read_unchecked(&m->error_count)))
44420 return m;
44421
44422 if (m-- == ms->mirror)
44423@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44424 {
44425 struct mirror *default_mirror = get_default_mirror(m->ms);
44426
44427- return !atomic_read(&default_mirror->error_count);
44428+ return !atomic_read_unchecked(&default_mirror->error_count);
44429 }
44430
44431 static int mirror_available(struct mirror_set *ms, struct bio *bio)
44432@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
44433 */
44434 if (likely(region_in_sync(ms, region, 1)))
44435 m = choose_mirror(ms, bio->bi_iter.bi_sector);
44436- else if (m && atomic_read(&m->error_count))
44437+ else if (m && atomic_read_unchecked(&m->error_count))
44438 m = NULL;
44439
44440 if (likely(m))
44441@@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
44442 }
44443
44444 ms->mirror[mirror].ms = ms;
44445- atomic_set(&(ms->mirror[mirror].error_count), 0);
44446+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
44447 ms->mirror[mirror].error_type = 0;
44448 ms->mirror[mirror].offset = offset;
44449
44450@@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
44451 */
44452 static char device_status_char(struct mirror *m)
44453 {
44454- if (!atomic_read(&(m->error_count)))
44455+ if (!atomic_read_unchecked(&(m->error_count)))
44456 return 'A';
44457
44458 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
44459diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
44460index 87f86c7..a1a4100 100644
44461--- a/drivers/md/dm-stats.c
44462+++ b/drivers/md/dm-stats.c
44463@@ -382,7 +382,7 @@ do_sync_free:
44464 synchronize_rcu_expedited();
44465 dm_stat_free(&s->rcu_head);
44466 } else {
44467- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
44468+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
44469 call_rcu(&s->rcu_head, dm_stat_free);
44470 }
44471 return 0;
44472@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
44473 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
44474 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
44475 ));
44476- ACCESS_ONCE(last->last_sector) = end_sector;
44477- ACCESS_ONCE(last->last_rw) = bi_rw;
44478+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
44479+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
44480 }
44481
44482 rcu_read_lock();
44483diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
44484index f8b37d4..5c5cafd 100644
44485--- a/drivers/md/dm-stripe.c
44486+++ b/drivers/md/dm-stripe.c
44487@@ -21,7 +21,7 @@ struct stripe {
44488 struct dm_dev *dev;
44489 sector_t physical_start;
44490
44491- atomic_t error_count;
44492+ atomic_unchecked_t error_count;
44493 };
44494
44495 struct stripe_c {
44496@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
44497 kfree(sc);
44498 return r;
44499 }
44500- atomic_set(&(sc->stripe[i].error_count), 0);
44501+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
44502 }
44503
44504 ti->private = sc;
44505@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
44506 DMEMIT("%d ", sc->stripes);
44507 for (i = 0; i < sc->stripes; i++) {
44508 DMEMIT("%s ", sc->stripe[i].dev->name);
44509- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
44510+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
44511 'D' : 'A';
44512 }
44513 buffer[i] = '\0';
44514@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
44515 */
44516 for (i = 0; i < sc->stripes; i++)
44517 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
44518- atomic_inc(&(sc->stripe[i].error_count));
44519- if (atomic_read(&(sc->stripe[i].error_count)) <
44520+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
44521+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
44522 DM_IO_ERROR_THRESHOLD)
44523 schedule_work(&sc->trigger_event);
44524 }
44525diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
44526index b2bd1eb..38f7a44 100644
44527--- a/drivers/md/dm-table.c
44528+++ b/drivers/md/dm-table.c
44529@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
44530 if (!dev_size)
44531 return 0;
44532
44533- if ((start >= dev_size) || (start + len > dev_size)) {
44534+ if ((start >= dev_size) || (len > dev_size - start)) {
44535 DMWARN("%s: %s too small for target: "
44536 "start=%llu, len=%llu, dev_size=%llu",
44537 dm_device_name(ti->table->md), bdevname(bdev, b),
44538diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
44539index e9d33ad..dae9880d 100644
44540--- a/drivers/md/dm-thin-metadata.c
44541+++ b/drivers/md/dm-thin-metadata.c
44542@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44543 {
44544 pmd->info.tm = pmd->tm;
44545 pmd->info.levels = 2;
44546- pmd->info.value_type.context = pmd->data_sm;
44547+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44548 pmd->info.value_type.size = sizeof(__le64);
44549 pmd->info.value_type.inc = data_block_inc;
44550 pmd->info.value_type.dec = data_block_dec;
44551@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44552
44553 pmd->bl_info.tm = pmd->tm;
44554 pmd->bl_info.levels = 1;
44555- pmd->bl_info.value_type.context = pmd->data_sm;
44556+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44557 pmd->bl_info.value_type.size = sizeof(__le64);
44558 pmd->bl_info.value_type.inc = data_block_inc;
44559 pmd->bl_info.value_type.dec = data_block_dec;
44560diff --git a/drivers/md/dm.c b/drivers/md/dm.c
44561index 62c5136..aede7f1 100644
44562--- a/drivers/md/dm.c
44563+++ b/drivers/md/dm.c
44564@@ -183,9 +183,9 @@ struct mapped_device {
44565 /*
44566 * Event handling.
44567 */
44568- atomic_t event_nr;
44569+ atomic_unchecked_t event_nr;
44570 wait_queue_head_t eventq;
44571- atomic_t uevent_seq;
44572+ atomic_unchecked_t uevent_seq;
44573 struct list_head uevent_list;
44574 spinlock_t uevent_lock; /* Protect access to uevent_list */
44575
44576@@ -2071,8 +2071,8 @@ static struct mapped_device *alloc_dev(int minor)
44577 spin_lock_init(&md->deferred_lock);
44578 atomic_set(&md->holders, 1);
44579 atomic_set(&md->open_count, 0);
44580- atomic_set(&md->event_nr, 0);
44581- atomic_set(&md->uevent_seq, 0);
44582+ atomic_set_unchecked(&md->event_nr, 0);
44583+ atomic_set_unchecked(&md->uevent_seq, 0);
44584 INIT_LIST_HEAD(&md->uevent_list);
44585 INIT_LIST_HEAD(&md->table_devices);
44586 spin_lock_init(&md->uevent_lock);
44587@@ -2228,7 +2228,7 @@ static void event_callback(void *context)
44588
44589 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
44590
44591- atomic_inc(&md->event_nr);
44592+ atomic_inc_unchecked(&md->event_nr);
44593 wake_up(&md->eventq);
44594 }
44595
44596@@ -2921,18 +2921,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
44597
44598 uint32_t dm_next_uevent_seq(struct mapped_device *md)
44599 {
44600- return atomic_add_return(1, &md->uevent_seq);
44601+ return atomic_add_return_unchecked(1, &md->uevent_seq);
44602 }
44603
44604 uint32_t dm_get_event_nr(struct mapped_device *md)
44605 {
44606- return atomic_read(&md->event_nr);
44607+ return atomic_read_unchecked(&md->event_nr);
44608 }
44609
44610 int dm_wait_event(struct mapped_device *md, int event_nr)
44611 {
44612 return wait_event_interruptible(md->eventq,
44613- (event_nr != atomic_read(&md->event_nr)));
44614+ (event_nr != atomic_read_unchecked(&md->event_nr)));
44615 }
44616
44617 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
44618diff --git a/drivers/md/md.c b/drivers/md/md.c
44619index 9233c71..ed5243a 100644
44620--- a/drivers/md/md.c
44621+++ b/drivers/md/md.c
44622@@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
44623 * start build, activate spare
44624 */
44625 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
44626-static atomic_t md_event_count;
44627+static atomic_unchecked_t md_event_count;
44628 void md_new_event(struct mddev *mddev)
44629 {
44630- atomic_inc(&md_event_count);
44631+ atomic_inc_unchecked(&md_event_count);
44632 wake_up(&md_event_waiters);
44633 }
44634 EXPORT_SYMBOL_GPL(md_new_event);
44635@@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
44636 */
44637 static void md_new_event_inintr(struct mddev *mddev)
44638 {
44639- atomic_inc(&md_event_count);
44640+ atomic_inc_unchecked(&md_event_count);
44641 wake_up(&md_event_waiters);
44642 }
44643
44644@@ -1426,7 +1426,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
44645 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
44646 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
44647 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
44648- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44649+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44650
44651 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
44652 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
44653@@ -1677,7 +1677,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
44654 else
44655 sb->resync_offset = cpu_to_le64(0);
44656
44657- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
44658+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
44659
44660 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
44661 sb->size = cpu_to_le64(mddev->dev_sectors);
44662@@ -2547,7 +2547,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
44663 static ssize_t
44664 errors_show(struct md_rdev *rdev, char *page)
44665 {
44666- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
44667+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
44668 }
44669
44670 static ssize_t
44671@@ -2556,7 +2556,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
44672 char *e;
44673 unsigned long n = simple_strtoul(buf, &e, 10);
44674 if (*buf && (*e == 0 || *e == '\n')) {
44675- atomic_set(&rdev->corrected_errors, n);
44676+ atomic_set_unchecked(&rdev->corrected_errors, n);
44677 return len;
44678 }
44679 return -EINVAL;
44680@@ -3000,8 +3000,8 @@ int md_rdev_init(struct md_rdev *rdev)
44681 rdev->sb_loaded = 0;
44682 rdev->bb_page = NULL;
44683 atomic_set(&rdev->nr_pending, 0);
44684- atomic_set(&rdev->read_errors, 0);
44685- atomic_set(&rdev->corrected_errors, 0);
44686+ atomic_set_unchecked(&rdev->read_errors, 0);
44687+ atomic_set_unchecked(&rdev->corrected_errors, 0);
44688
44689 INIT_LIST_HEAD(&rdev->same_set);
44690 init_waitqueue_head(&rdev->blocked_wait);
44691@@ -6855,7 +6855,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44692
44693 spin_unlock(&pers_lock);
44694 seq_printf(seq, "\n");
44695- seq->poll_event = atomic_read(&md_event_count);
44696+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44697 return 0;
44698 }
44699 if (v == (void*)2) {
44700@@ -6958,7 +6958,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44701 return error;
44702
44703 seq = file->private_data;
44704- seq->poll_event = atomic_read(&md_event_count);
44705+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44706 return error;
44707 }
44708
44709@@ -6975,7 +6975,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44710 /* always allow read */
44711 mask = POLLIN | POLLRDNORM;
44712
44713- if (seq->poll_event != atomic_read(&md_event_count))
44714+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44715 mask |= POLLERR | POLLPRI;
44716 return mask;
44717 }
44718@@ -7022,7 +7022,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44719 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44720 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44721 (int)part_stat_read(&disk->part0, sectors[1]) -
44722- atomic_read(&disk->sync_io);
44723+ atomic_read_unchecked(&disk->sync_io);
44724 /* sync IO will cause sync_io to increase before the disk_stats
44725 * as sync_io is counted when a request starts, and
44726 * disk_stats is counted when it completes.
44727diff --git a/drivers/md/md.h b/drivers/md/md.h
44728index 03cec5b..0a658c1 100644
44729--- a/drivers/md/md.h
44730+++ b/drivers/md/md.h
44731@@ -94,13 +94,13 @@ struct md_rdev {
44732 * only maintained for arrays that
44733 * support hot removal
44734 */
44735- atomic_t read_errors; /* number of consecutive read errors that
44736+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
44737 * we have tried to ignore.
44738 */
44739 struct timespec last_read_error; /* monotonic time since our
44740 * last read error
44741 */
44742- atomic_t corrected_errors; /* number of corrected read errors,
44743+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44744 * for reporting to userspace and storing
44745 * in superblock.
44746 */
44747@@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44748
44749 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44750 {
44751- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44752+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44753 }
44754
44755 struct md_personality
44756diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44757index f4e22bc..8f83114 100644
44758--- a/drivers/md/persistent-data/dm-space-map-metadata.c
44759+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44760@@ -681,7 +681,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44761 * Flick into a mode where all blocks get allocated in the new area.
44762 */
44763 smm->begin = old_len;
44764- memcpy(sm, &bootstrap_ops, sizeof(*sm));
44765+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44766
44767 /*
44768 * Extend.
44769@@ -712,7 +712,7 @@ out:
44770 /*
44771 * Switch back to normal behaviour.
44772 */
44773- memcpy(sm, &ops, sizeof(*sm));
44774+ memcpy((void *)sm, &ops, sizeof(*sm));
44775 return r;
44776 }
44777
44778diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44779index 3e6d115..ffecdeb 100644
44780--- a/drivers/md/persistent-data/dm-space-map.h
44781+++ b/drivers/md/persistent-data/dm-space-map.h
44782@@ -71,6 +71,7 @@ struct dm_space_map {
44783 dm_sm_threshold_fn fn,
44784 void *context);
44785 };
44786+typedef struct dm_space_map __no_const dm_space_map_no_const;
44787
44788 /*----------------------------------------------------------------*/
44789
44790diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44791index 40b35be..a327e11 100644
44792--- a/drivers/md/raid1.c
44793+++ b/drivers/md/raid1.c
44794@@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44795 if (r1_sync_page_io(rdev, sect, s,
44796 bio->bi_io_vec[idx].bv_page,
44797 READ) != 0)
44798- atomic_add(s, &rdev->corrected_errors);
44799+ atomic_add_unchecked(s, &rdev->corrected_errors);
44800 }
44801 sectors -= s;
44802 sect += s;
44803@@ -2164,7 +2164,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44804 !test_bit(Faulty, &rdev->flags)) {
44805 if (r1_sync_page_io(rdev, sect, s,
44806 conf->tmppage, READ)) {
44807- atomic_add(s, &rdev->corrected_errors);
44808+ atomic_add_unchecked(s, &rdev->corrected_errors);
44809 printk(KERN_INFO
44810 "md/raid1:%s: read error corrected "
44811 "(%d sectors at %llu on %s)\n",
44812diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44813index 32e282f..5cec803 100644
44814--- a/drivers/md/raid10.c
44815+++ b/drivers/md/raid10.c
44816@@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
44817 /* The write handler will notice the lack of
44818 * R10BIO_Uptodate and record any errors etc
44819 */
44820- atomic_add(r10_bio->sectors,
44821+ atomic_add_unchecked(r10_bio->sectors,
44822 &conf->mirrors[d].rdev->corrected_errors);
44823
44824 /* for reconstruct, we always reschedule after a read.
44825@@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44826 {
44827 struct timespec cur_time_mon;
44828 unsigned long hours_since_last;
44829- unsigned int read_errors = atomic_read(&rdev->read_errors);
44830+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44831
44832 ktime_get_ts(&cur_time_mon);
44833
44834@@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44835 * overflowing the shift of read_errors by hours_since_last.
44836 */
44837 if (hours_since_last >= 8 * sizeof(read_errors))
44838- atomic_set(&rdev->read_errors, 0);
44839+ atomic_set_unchecked(&rdev->read_errors, 0);
44840 else
44841- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44842+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44843 }
44844
44845 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44846@@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44847 return;
44848
44849 check_decay_read_errors(mddev, rdev);
44850- atomic_inc(&rdev->read_errors);
44851- if (atomic_read(&rdev->read_errors) > max_read_errors) {
44852+ atomic_inc_unchecked(&rdev->read_errors);
44853+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44854 char b[BDEVNAME_SIZE];
44855 bdevname(rdev->bdev, b);
44856
44857@@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44858 "md/raid10:%s: %s: Raid device exceeded "
44859 "read_error threshold [cur %d:max %d]\n",
44860 mdname(mddev), b,
44861- atomic_read(&rdev->read_errors), max_read_errors);
44862+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44863 printk(KERN_NOTICE
44864 "md/raid10:%s: %s: Failing raid device\n",
44865 mdname(mddev), b);
44866@@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44867 sect +
44868 choose_data_offset(r10_bio, rdev)),
44869 bdevname(rdev->bdev, b));
44870- atomic_add(s, &rdev->corrected_errors);
44871+ atomic_add_unchecked(s, &rdev->corrected_errors);
44872 }
44873
44874 rdev_dec_pending(rdev, mddev);
44875diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44876index c1b0d52..07a0a5d 100644
44877--- a/drivers/md/raid5.c
44878+++ b/drivers/md/raid5.c
44879@@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
44880 return 1;
44881 }
44882
44883+#ifdef CONFIG_GRKERNSEC_HIDESYM
44884+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
44885+#endif
44886+
44887 static int grow_stripes(struct r5conf *conf, int num)
44888 {
44889 struct kmem_cache *sc;
44890@@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
44891 "raid%d-%s", conf->level, mdname(conf->mddev));
44892 else
44893 sprintf(conf->cache_name[0],
44894+#ifdef CONFIG_GRKERNSEC_HIDESYM
44895+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
44896+#else
44897 "raid%d-%p", conf->level, conf->mddev);
44898+#endif
44899 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
44900
44901 conf->active_name = 0;
44902@@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44903 mdname(conf->mddev), STRIPE_SECTORS,
44904 (unsigned long long)s,
44905 bdevname(rdev->bdev, b));
44906- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44907+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44908 clear_bit(R5_ReadError, &sh->dev[i].flags);
44909 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44910 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44911 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44912
44913- if (atomic_read(&rdev->read_errors))
44914- atomic_set(&rdev->read_errors, 0);
44915+ if (atomic_read_unchecked(&rdev->read_errors))
44916+ atomic_set_unchecked(&rdev->read_errors, 0);
44917 } else {
44918 const char *bdn = bdevname(rdev->bdev, b);
44919 int retry = 0;
44920 int set_bad = 0;
44921
44922 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44923- atomic_inc(&rdev->read_errors);
44924+ atomic_inc_unchecked(&rdev->read_errors);
44925 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44926 printk_ratelimited(
44927 KERN_WARNING
44928@@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44929 mdname(conf->mddev),
44930 (unsigned long long)s,
44931 bdn);
44932- } else if (atomic_read(&rdev->read_errors)
44933+ } else if (atomic_read_unchecked(&rdev->read_errors)
44934 > conf->max_nr_stripes)
44935 printk(KERN_WARNING
44936 "md/raid:%s: Too many read errors, failing device %s.\n",
44937diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44938index 983db75..ef9248c 100644
44939--- a/drivers/media/dvb-core/dvbdev.c
44940+++ b/drivers/media/dvb-core/dvbdev.c
44941@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44942 const struct dvb_device *template, void *priv, int type)
44943 {
44944 struct dvb_device *dvbdev;
44945- struct file_operations *dvbdevfops;
44946+ file_operations_no_const *dvbdevfops;
44947 struct device *clsdev;
44948 int minor;
44949 int id;
44950diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
44951index 6ad22b6..6e90e2a 100644
44952--- a/drivers/media/dvb-frontends/af9033.h
44953+++ b/drivers/media/dvb-frontends/af9033.h
44954@@ -96,6 +96,6 @@ struct af9033_ops {
44955 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
44956 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
44957 int onoff);
44958-};
44959+} __no_const;
44960
44961 #endif /* AF9033_H */
44962diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44963index 9b6c3bb..baeb5c7 100644
44964--- a/drivers/media/dvb-frontends/dib3000.h
44965+++ b/drivers/media/dvb-frontends/dib3000.h
44966@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44967 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44968 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44969 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44970-};
44971+} __no_const;
44972
44973 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44974 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44975diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
44976index 1fea0e9..321ce8f 100644
44977--- a/drivers/media/dvb-frontends/dib7000p.h
44978+++ b/drivers/media/dvb-frontends/dib7000p.h
44979@@ -64,7 +64,7 @@ struct dib7000p_ops {
44980 int (*get_adc_power)(struct dvb_frontend *fe);
44981 int (*slave_reset)(struct dvb_frontend *fe);
44982 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
44983-};
44984+} __no_const;
44985
44986 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
44987 void *dib7000p_attach(struct dib7000p_ops *ops);
44988diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
44989index 84cc103..5780c54 100644
44990--- a/drivers/media/dvb-frontends/dib8000.h
44991+++ b/drivers/media/dvb-frontends/dib8000.h
44992@@ -61,7 +61,7 @@ struct dib8000_ops {
44993 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
44994 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
44995 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
44996-};
44997+} __no_const;
44998
44999 #if IS_ENABLED(CONFIG_DVB_DIB8000)
45000 void *dib8000_attach(struct dib8000_ops *ops);
45001diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
45002index ce27e6d..b70435a 100644
45003--- a/drivers/media/pci/cx88/cx88-video.c
45004+++ b/drivers/media/pci/cx88/cx88-video.c
45005@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
45006
45007 /* ------------------------------------------------------------------ */
45008
45009-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45010-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45011-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45012+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45013+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45014+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45015
45016 module_param_array(video_nr, int, NULL, 0444);
45017 module_param_array(vbi_nr, int, NULL, 0444);
45018diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45019index 802642d..5534900 100644
45020--- a/drivers/media/pci/ivtv/ivtv-driver.c
45021+++ b/drivers/media/pci/ivtv/ivtv-driver.c
45022@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45023 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45024
45025 /* ivtv instance counter */
45026-static atomic_t ivtv_instance = ATOMIC_INIT(0);
45027+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45028
45029 /* Parameter declarations */
45030 static int cardtype[IVTV_MAX_CARDS];
45031diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45032index 8cbe6b4..ea3601c 100644
45033--- a/drivers/media/pci/solo6x10/solo6x10-core.c
45034+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45035@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45036
45037 static int solo_sysfs_init(struct solo_dev *solo_dev)
45038 {
45039- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45040+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45041 struct device *dev = &solo_dev->dev;
45042 const char *driver;
45043 int i;
45044diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45045index c7141f2..5301fec 100644
45046--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45047+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45048@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45049
45050 int solo_g723_init(struct solo_dev *solo_dev)
45051 {
45052- static struct snd_device_ops ops = { NULL };
45053+ static struct snd_device_ops ops = { };
45054 struct snd_card *card;
45055 struct snd_kcontrol_new kctl;
45056 char name[32];
45057diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45058index 8c84846..27b4f83 100644
45059--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45060+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45061@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45062
45063 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45064 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45065- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45066+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45067 if (p2m_id < 0)
45068 p2m_id = -p2m_id;
45069 }
45070diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45071index 72017b7..dd37ae6 100644
45072--- a/drivers/media/pci/solo6x10/solo6x10.h
45073+++ b/drivers/media/pci/solo6x10/solo6x10.h
45074@@ -219,7 +219,7 @@ struct solo_dev {
45075
45076 /* P2M DMA Engine */
45077 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45078- atomic_t p2m_count;
45079+ atomic_unchecked_t p2m_count;
45080 int p2m_jiffies;
45081 unsigned int p2m_timeouts;
45082
45083diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45084index 63f0b64..a017c1c 100644
45085--- a/drivers/media/pci/tw68/tw68-core.c
45086+++ b/drivers/media/pci/tw68/tw68-core.c
45087@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45088 module_param_array(card, int, NULL, 0444);
45089 MODULE_PARM_DESC(card, "card type");
45090
45091-static atomic_t tw68_instance = ATOMIC_INIT(0);
45092+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45093
45094 /* ------------------------------------------------------------------ */
45095
45096diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45097index 64ab6fb..ef4a8b9 100644
45098--- a/drivers/media/platform/omap/omap_vout.c
45099+++ b/drivers/media/platform/omap/omap_vout.c
45100@@ -63,7 +63,6 @@ enum omap_vout_channels {
45101 OMAP_VIDEO2,
45102 };
45103
45104-static struct videobuf_queue_ops video_vbq_ops;
45105 /* Variables configurable through module params*/
45106 static u32 video1_numbuffers = 3;
45107 static u32 video2_numbuffers = 3;
45108@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45109 {
45110 struct videobuf_queue *q;
45111 struct omap_vout_device *vout = NULL;
45112+ static struct videobuf_queue_ops video_vbq_ops = {
45113+ .buf_setup = omap_vout_buffer_setup,
45114+ .buf_prepare = omap_vout_buffer_prepare,
45115+ .buf_release = omap_vout_buffer_release,
45116+ .buf_queue = omap_vout_buffer_queue,
45117+ };
45118
45119 vout = video_drvdata(file);
45120 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45121@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45122 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45123
45124 q = &vout->vbq;
45125- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45126- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45127- video_vbq_ops.buf_release = omap_vout_buffer_release;
45128- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45129 spin_lock_init(&vout->vbq_lock);
45130
45131 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45132diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45133index fb2acc5..a2fcbdc4 100644
45134--- a/drivers/media/platform/s5p-tv/mixer.h
45135+++ b/drivers/media/platform/s5p-tv/mixer.h
45136@@ -156,7 +156,7 @@ struct mxr_layer {
45137 /** layer index (unique identifier) */
45138 int idx;
45139 /** callbacks for layer methods */
45140- struct mxr_layer_ops ops;
45141+ struct mxr_layer_ops *ops;
45142 /** format array */
45143 const struct mxr_format **fmt_array;
45144 /** size of format array */
45145diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45146index 74344c7..a39e70e 100644
45147--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45148+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45149@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45150 {
45151 struct mxr_layer *layer;
45152 int ret;
45153- struct mxr_layer_ops ops = {
45154+ static struct mxr_layer_ops ops = {
45155 .release = mxr_graph_layer_release,
45156 .buffer_set = mxr_graph_buffer_set,
45157 .stream_set = mxr_graph_stream_set,
45158diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45159index b713403..53cb5ad 100644
45160--- a/drivers/media/platform/s5p-tv/mixer_reg.c
45161+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45162@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45163 layer->update_buf = next;
45164 }
45165
45166- layer->ops.buffer_set(layer, layer->update_buf);
45167+ layer->ops->buffer_set(layer, layer->update_buf);
45168
45169 if (done && done != layer->shadow_buf)
45170 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45171diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45172index b4d2696..91df48e 100644
45173--- a/drivers/media/platform/s5p-tv/mixer_video.c
45174+++ b/drivers/media/platform/s5p-tv/mixer_video.c
45175@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45176 layer->geo.src.height = layer->geo.src.full_height;
45177
45178 mxr_geometry_dump(mdev, &layer->geo);
45179- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45180+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45181 mxr_geometry_dump(mdev, &layer->geo);
45182 }
45183
45184@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45185 layer->geo.dst.full_width = mbus_fmt.width;
45186 layer->geo.dst.full_height = mbus_fmt.height;
45187 layer->geo.dst.field = mbus_fmt.field;
45188- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45189+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45190
45191 mxr_geometry_dump(mdev, &layer->geo);
45192 }
45193@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45194 /* set source size to highest accepted value */
45195 geo->src.full_width = max(geo->dst.full_width, pix->width);
45196 geo->src.full_height = max(geo->dst.full_height, pix->height);
45197- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45198+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45199 mxr_geometry_dump(mdev, &layer->geo);
45200 /* set cropping to total visible screen */
45201 geo->src.width = pix->width;
45202@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45203 geo->src.x_offset = 0;
45204 geo->src.y_offset = 0;
45205 /* assure consistency of geometry */
45206- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45207+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45208 mxr_geometry_dump(mdev, &layer->geo);
45209 /* set full size to lowest possible value */
45210 geo->src.full_width = 0;
45211 geo->src.full_height = 0;
45212- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45213+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45214 mxr_geometry_dump(mdev, &layer->geo);
45215
45216 /* returning results */
45217@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45218 target->width = s->r.width;
45219 target->height = s->r.height;
45220
45221- layer->ops.fix_geometry(layer, stage, s->flags);
45222+ layer->ops->fix_geometry(layer, stage, s->flags);
45223
45224 /* retrieve update selection rectangle */
45225 res.left = target->x_offset;
45226@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45227 mxr_output_get(mdev);
45228
45229 mxr_layer_update_output(layer);
45230- layer->ops.format_set(layer);
45231+ layer->ops->format_set(layer);
45232 /* enabling layer in hardware */
45233 spin_lock_irqsave(&layer->enq_slock, flags);
45234 layer->state = MXR_LAYER_STREAMING;
45235 spin_unlock_irqrestore(&layer->enq_slock, flags);
45236
45237- layer->ops.stream_set(layer, MXR_ENABLE);
45238+ layer->ops->stream_set(layer, MXR_ENABLE);
45239 mxr_streamer_get(mdev);
45240
45241 return 0;
45242@@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
45243 spin_unlock_irqrestore(&layer->enq_slock, flags);
45244
45245 /* disabling layer in hardware */
45246- layer->ops.stream_set(layer, MXR_DISABLE);
45247+ layer->ops->stream_set(layer, MXR_DISABLE);
45248 /* remove one streamer */
45249 mxr_streamer_put(mdev);
45250 /* allow changes in output configuration */
45251@@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45252
45253 void mxr_layer_release(struct mxr_layer *layer)
45254 {
45255- if (layer->ops.release)
45256- layer->ops.release(layer);
45257+ if (layer->ops->release)
45258+ layer->ops->release(layer);
45259 }
45260
45261 void mxr_base_layer_release(struct mxr_layer *layer)
45262@@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45263
45264 layer->mdev = mdev;
45265 layer->idx = idx;
45266- layer->ops = *ops;
45267+ layer->ops = ops;
45268
45269 spin_lock_init(&layer->enq_slock);
45270 INIT_LIST_HEAD(&layer->enq_list);
45271diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45272index c9388c4..ce71ece 100644
45273--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45274+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45275@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45276 {
45277 struct mxr_layer *layer;
45278 int ret;
45279- struct mxr_layer_ops ops = {
45280+ static struct mxr_layer_ops ops = {
45281 .release = mxr_vp_layer_release,
45282 .buffer_set = mxr_vp_buffer_set,
45283 .stream_set = mxr_vp_stream_set,
45284diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45285index 82affae..42833ec 100644
45286--- a/drivers/media/radio/radio-cadet.c
45287+++ b/drivers/media/radio/radio-cadet.c
45288@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45289 unsigned char readbuf[RDS_BUFFER];
45290 int i = 0;
45291
45292+ if (count > RDS_BUFFER)
45293+ return -EFAULT;
45294 mutex_lock(&dev->lock);
45295 if (dev->rdsstat == 0)
45296 cadet_start_rds(dev);
45297@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45298 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45299 mutex_unlock(&dev->lock);
45300
45301- if (i && copy_to_user(data, readbuf, i))
45302- return -EFAULT;
45303+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45304+ i = -EFAULT;
45305+
45306 return i;
45307 }
45308
45309diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45310index 5236035..c622c74 100644
45311--- a/drivers/media/radio/radio-maxiradio.c
45312+++ b/drivers/media/radio/radio-maxiradio.c
45313@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45314 /* TEA5757 pin mappings */
45315 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45316
45317-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45318+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45319
45320 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45321 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45322diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45323index 050b3bb..79f62b9 100644
45324--- a/drivers/media/radio/radio-shark.c
45325+++ b/drivers/media/radio/radio-shark.c
45326@@ -79,7 +79,7 @@ struct shark_device {
45327 u32 last_val;
45328 };
45329
45330-static atomic_t shark_instance = ATOMIC_INIT(0);
45331+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45332
45333 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45334 {
45335diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45336index 8654e0d..0608a64 100644
45337--- a/drivers/media/radio/radio-shark2.c
45338+++ b/drivers/media/radio/radio-shark2.c
45339@@ -74,7 +74,7 @@ struct shark_device {
45340 u8 *transfer_buffer;
45341 };
45342
45343-static atomic_t shark_instance = ATOMIC_INIT(0);
45344+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45345
45346 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45347 {
45348diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45349index 633022b..7f10754 100644
45350--- a/drivers/media/radio/radio-si476x.c
45351+++ b/drivers/media/radio/radio-si476x.c
45352@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45353 struct si476x_radio *radio;
45354 struct v4l2_ctrl *ctrl;
45355
45356- static atomic_t instance = ATOMIC_INIT(0);
45357+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
45358
45359 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45360 if (!radio)
45361diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45362index 9fd1527..8927230 100644
45363--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45364+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45365@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45366
45367 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45368 {
45369- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45370- char result[64];
45371- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45372- sizeof(result), 0);
45373+ char *buf;
45374+ char *result;
45375+ int retval;
45376+
45377+ buf = kmalloc(2, GFP_KERNEL);
45378+ if (buf == NULL)
45379+ return -ENOMEM;
45380+ result = kmalloc(64, GFP_KERNEL);
45381+ if (result == NULL) {
45382+ kfree(buf);
45383+ return -ENOMEM;
45384+ }
45385+
45386+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45387+ buf[1] = enable ? 1 : 0;
45388+
45389+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
45390+
45391+ kfree(buf);
45392+ kfree(result);
45393+ return retval;
45394 }
45395
45396 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
45397 {
45398- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
45399- char state[3];
45400- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
45401+ char *buf;
45402+ char *state;
45403+ int retval;
45404+
45405+ buf = kmalloc(2, GFP_KERNEL);
45406+ if (buf == NULL)
45407+ return -ENOMEM;
45408+ state = kmalloc(3, GFP_KERNEL);
45409+ if (state == NULL) {
45410+ kfree(buf);
45411+ return -ENOMEM;
45412+ }
45413+
45414+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
45415+ buf[1] = enable ? 1 : 0;
45416+
45417+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
45418+
45419+ kfree(buf);
45420+ kfree(state);
45421+ return retval;
45422 }
45423
45424 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45425 {
45426- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
45427- char state[3];
45428+ char *query;
45429+ char *state;
45430 int ret;
45431+ query = kmalloc(1, GFP_KERNEL);
45432+ if (query == NULL)
45433+ return -ENOMEM;
45434+ state = kmalloc(3, GFP_KERNEL);
45435+ if (state == NULL) {
45436+ kfree(query);
45437+ return -ENOMEM;
45438+ }
45439+
45440+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
45441
45442 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
45443
45444- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
45445- sizeof(state), 0);
45446+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
45447 if (ret < 0) {
45448 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
45449 "state info\n");
45450@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45451
45452 /* Copy this pointer as we are gonna need it in the release phase */
45453 cinergyt2_usb_device = adap->dev;
45454-
45455+ kfree(query);
45456+ kfree(state);
45457 return 0;
45458 }
45459
45460@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
45461 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45462 {
45463 struct cinergyt2_state *st = d->priv;
45464- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
45465+ u8 *key, *cmd;
45466 int i;
45467
45468+ cmd = kmalloc(1, GFP_KERNEL);
45469+ if (cmd == NULL)
45470+ return -EINVAL;
45471+ key = kzalloc(5, GFP_KERNEL);
45472+ if (key == NULL) {
45473+ kfree(cmd);
45474+ return -EINVAL;
45475+ }
45476+
45477+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
45478+
45479 *state = REMOTE_NO_KEY_PRESSED;
45480
45481- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
45482+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
45483 if (key[4] == 0xff) {
45484 /* key repeat */
45485 st->rc_counter++;
45486@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45487 *event = d->last_event;
45488 deb_rc("repeat key, event %x\n",
45489 *event);
45490- return 0;
45491+ goto out;
45492 }
45493 }
45494 deb_rc("repeated key (non repeatable)\n");
45495 }
45496- return 0;
45497+ goto out;
45498 }
45499
45500 /* hack to pass checksum on the custom field */
45501@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45502
45503 deb_rc("key: %*ph\n", 5, key);
45504 }
45505+out:
45506+ kfree(cmd);
45507+ kfree(key);
45508 return 0;
45509 }
45510
45511diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45512index c890fe4..f9b2ae6 100644
45513--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45514+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45515@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
45516 fe_status_t *status)
45517 {
45518 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45519- struct dvbt_get_status_msg result;
45520- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45521+ struct dvbt_get_status_msg *result;
45522+ u8 *cmd;
45523 int ret;
45524
45525- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
45526- sizeof(result), 0);
45527+ cmd = kmalloc(1, GFP_KERNEL);
45528+ if (cmd == NULL)
45529+ return -ENOMEM;
45530+ result = kmalloc(sizeof(*result), GFP_KERNEL);
45531+ if (result == NULL) {
45532+ kfree(cmd);
45533+ return -ENOMEM;
45534+ }
45535+
45536+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45537+
45538+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
45539+ sizeof(*result), 0);
45540 if (ret < 0)
45541- return ret;
45542+ goto out;
45543
45544 *status = 0;
45545
45546- if (0xffff - le16_to_cpu(result.gain) > 30)
45547+ if (0xffff - le16_to_cpu(result->gain) > 30)
45548 *status |= FE_HAS_SIGNAL;
45549- if (result.lock_bits & (1 << 6))
45550+ if (result->lock_bits & (1 << 6))
45551 *status |= FE_HAS_LOCK;
45552- if (result.lock_bits & (1 << 5))
45553+ if (result->lock_bits & (1 << 5))
45554 *status |= FE_HAS_SYNC;
45555- if (result.lock_bits & (1 << 4))
45556+ if (result->lock_bits & (1 << 4))
45557 *status |= FE_HAS_CARRIER;
45558- if (result.lock_bits & (1 << 1))
45559+ if (result->lock_bits & (1 << 1))
45560 *status |= FE_HAS_VITERBI;
45561
45562 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
45563 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
45564 *status &= ~FE_HAS_LOCK;
45565
45566- return 0;
45567+out:
45568+ kfree(cmd);
45569+ kfree(result);
45570+ return ret;
45571 }
45572
45573 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
45574 {
45575 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45576- struct dvbt_get_status_msg status;
45577- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45578+ struct dvbt_get_status_msg *status;
45579+ char *cmd;
45580 int ret;
45581
45582- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45583- sizeof(status), 0);
45584+ cmd = kmalloc(1, GFP_KERNEL);
45585+ if (cmd == NULL)
45586+ return -ENOMEM;
45587+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45588+ if (status == NULL) {
45589+ kfree(cmd);
45590+ return -ENOMEM;
45591+ }
45592+
45593+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45594+
45595+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45596+ sizeof(*status), 0);
45597 if (ret < 0)
45598- return ret;
45599+ goto out;
45600
45601- *ber = le32_to_cpu(status.viterbi_error_rate);
45602+ *ber = le32_to_cpu(status->viterbi_error_rate);
45603+out:
45604+ kfree(cmd);
45605+ kfree(status);
45606 return 0;
45607 }
45608
45609 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
45610 {
45611 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45612- struct dvbt_get_status_msg status;
45613- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45614+ struct dvbt_get_status_msg *status;
45615+ u8 *cmd;
45616 int ret;
45617
45618- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
45619- sizeof(status), 0);
45620+ cmd = kmalloc(1, GFP_KERNEL);
45621+ if (cmd == NULL)
45622+ return -ENOMEM;
45623+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45624+ if (status == NULL) {
45625+ kfree(cmd);
45626+ return -ENOMEM;
45627+ }
45628+
45629+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45630+
45631+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
45632+ sizeof(*status), 0);
45633 if (ret < 0) {
45634 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
45635 ret);
45636- return ret;
45637+ goto out;
45638 }
45639- *unc = le32_to_cpu(status.uncorrected_block_count);
45640- return 0;
45641+ *unc = le32_to_cpu(status->uncorrected_block_count);
45642+
45643+out:
45644+ kfree(cmd);
45645+ kfree(status);
45646+ return ret;
45647 }
45648
45649 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
45650 u16 *strength)
45651 {
45652 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45653- struct dvbt_get_status_msg status;
45654- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45655+ struct dvbt_get_status_msg *status;
45656+ char *cmd;
45657 int ret;
45658
45659- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45660- sizeof(status), 0);
45661+ cmd = kmalloc(1, GFP_KERNEL);
45662+ if (cmd == NULL)
45663+ return -ENOMEM;
45664+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45665+ if (status == NULL) {
45666+ kfree(cmd);
45667+ return -ENOMEM;
45668+ }
45669+
45670+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45671+
45672+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45673+ sizeof(*status), 0);
45674 if (ret < 0) {
45675 err("cinergyt2_fe_read_signal_strength() Failed!"
45676 " (Error=%d)\n", ret);
45677- return ret;
45678+ goto out;
45679 }
45680- *strength = (0xffff - le16_to_cpu(status.gain));
45681+ *strength = (0xffff - le16_to_cpu(status->gain));
45682+
45683+out:
45684+ kfree(cmd);
45685+ kfree(status);
45686 return 0;
45687 }
45688
45689 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
45690 {
45691 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45692- struct dvbt_get_status_msg status;
45693- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45694+ struct dvbt_get_status_msg *status;
45695+ char *cmd;
45696 int ret;
45697
45698- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45699- sizeof(status), 0);
45700+ cmd = kmalloc(1, GFP_KERNEL);
45701+ if (cmd == NULL)
45702+ return -ENOMEM;
45703+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45704+ if (status == NULL) {
45705+ kfree(cmd);
45706+ return -ENOMEM;
45707+ }
45708+
45709+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45710+
45711+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45712+ sizeof(*status), 0);
45713 if (ret < 0) {
45714 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
45715- return ret;
45716+ goto out;
45717 }
45718- *snr = (status.snr << 8) | status.snr;
45719- return 0;
45720+ *snr = (status->snr << 8) | status->snr;
45721+
45722+out:
45723+ kfree(cmd);
45724+ kfree(status);
45725+ return ret;
45726 }
45727
45728 static int cinergyt2_fe_init(struct dvb_frontend *fe)
45729@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
45730 {
45731 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
45732 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45733- struct dvbt_set_parameters_msg param;
45734- char result[2];
45735+ struct dvbt_set_parameters_msg *param;
45736+ char *result;
45737 int err;
45738
45739- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45740- param.tps = cpu_to_le16(compute_tps(fep));
45741- param.freq = cpu_to_le32(fep->frequency / 1000);
45742- param.flags = 0;
45743+ result = kmalloc(2, GFP_KERNEL);
45744+ if (result == NULL)
45745+ return -ENOMEM;
45746+ param = kmalloc(sizeof(*param), GFP_KERNEL);
45747+ if (param == NULL) {
45748+ kfree(result);
45749+ return -ENOMEM;
45750+ }
45751+
45752+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45753+ param->tps = cpu_to_le16(compute_tps(fep));
45754+ param->freq = cpu_to_le32(fep->frequency / 1000);
45755+ param->flags = 0;
45756
45757 switch (fep->bandwidth_hz) {
45758 default:
45759 case 8000000:
45760- param.bandwidth = 8;
45761+ param->bandwidth = 8;
45762 break;
45763 case 7000000:
45764- param.bandwidth = 7;
45765+ param->bandwidth = 7;
45766 break;
45767 case 6000000:
45768- param.bandwidth = 6;
45769+ param->bandwidth = 6;
45770 break;
45771 }
45772
45773 err = dvb_usb_generic_rw(state->d,
45774- (char *)&param, sizeof(param),
45775- result, sizeof(result), 0);
45776+ (char *)param, sizeof(*param),
45777+ result, 2, 0);
45778 if (err < 0)
45779 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
45780
45781- return (err < 0) ? err : 0;
45782+ kfree(result);
45783+ kfree(param);
45784+ return err;
45785 }
45786
45787 static void cinergyt2_fe_release(struct dvb_frontend *fe)
45788diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45789index 733a7ff..f8b52e3 100644
45790--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45791+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45792@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
45793
45794 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
45795 {
45796- struct hexline hx;
45797- u8 reset;
45798+ struct hexline *hx;
45799+ u8 *reset;
45800 int ret,pos=0;
45801
45802+ reset = kmalloc(1, GFP_KERNEL);
45803+ if (reset == NULL)
45804+ return -ENOMEM;
45805+
45806+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
45807+ if (hx == NULL) {
45808+ kfree(reset);
45809+ return -ENOMEM;
45810+ }
45811+
45812 /* stop the CPU */
45813- reset = 1;
45814- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
45815+ reset[0] = 1;
45816+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
45817 err("could not stop the USB controller CPU.");
45818
45819- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
45820- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
45821- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
45822+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
45823+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
45824+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
45825
45826- if (ret != hx.len) {
45827+ if (ret != hx->len) {
45828 err("error while transferring firmware "
45829 "(transferred size: %d, block size: %d)",
45830- ret,hx.len);
45831+ ret,hx->len);
45832 ret = -EINVAL;
45833 break;
45834 }
45835 }
45836 if (ret < 0) {
45837 err("firmware download failed at %d with %d",pos,ret);
45838+ kfree(reset);
45839+ kfree(hx);
45840 return ret;
45841 }
45842
45843 if (ret == 0) {
45844 /* restart the CPU */
45845- reset = 0;
45846- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
45847+ reset[0] = 0;
45848+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
45849 err("could not restart the USB controller CPU.");
45850 ret = -EINVAL;
45851 }
45852 } else
45853 ret = -EIO;
45854
45855+ kfree(reset);
45856+ kfree(hx);
45857+
45858 return ret;
45859 }
45860 EXPORT_SYMBOL(usb_cypress_load_firmware);
45861diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
45862index 1a3df10..57997a5 100644
45863--- a/drivers/media/usb/dvb-usb/dw2102.c
45864+++ b/drivers/media/usb/dvb-usb/dw2102.c
45865@@ -118,7 +118,7 @@ struct su3000_state {
45866
45867 struct s6x0_state {
45868 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
45869-};
45870+} __no_const;
45871
45872 /* debug */
45873 static int dvb_usb_dw2102_debug;
45874diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
45875index 6b0b8b6b..4038398 100644
45876--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
45877+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
45878@@ -87,8 +87,11 @@ struct technisat_usb2_state {
45879 static int technisat_usb2_i2c_access(struct usb_device *udev,
45880 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
45881 {
45882- u8 b[64];
45883- int ret, actual_length;
45884+ u8 *b = kmalloc(64, GFP_KERNEL);
45885+ int ret, actual_length, error = 0;
45886+
45887+ if (b == NULL)
45888+ return -ENOMEM;
45889
45890 deb_i2c("i2c-access: %02x, tx: ", device_addr);
45891 debug_dump(tx, txlen, deb_i2c);
45892@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45893
45894 if (ret < 0) {
45895 err("i2c-error: out failed %02x = %d", device_addr, ret);
45896- return -ENODEV;
45897+ error = -ENODEV;
45898+ goto out;
45899 }
45900
45901 ret = usb_bulk_msg(udev,
45902@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45903 b, 64, &actual_length, 1000);
45904 if (ret < 0) {
45905 err("i2c-error: in failed %02x = %d", device_addr, ret);
45906- return -ENODEV;
45907+ error = -ENODEV;
45908+ goto out;
45909 }
45910
45911 if (b[0] != I2C_STATUS_OK) {
45912@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45913 /* handle tuner-i2c-nak */
45914 if (!(b[0] == I2C_STATUS_NAK &&
45915 device_addr == 0x60
45916- /* && device_is_technisat_usb2 */))
45917- return -ENODEV;
45918+ /* && device_is_technisat_usb2 */)) {
45919+ error = -ENODEV;
45920+ goto out;
45921+ }
45922 }
45923
45924 deb_i2c("status: %d, ", b[0]);
45925@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45926
45927 deb_i2c("\n");
45928
45929- return 0;
45930+out:
45931+ kfree(b);
45932+ return error;
45933 }
45934
45935 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
45936@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45937 {
45938 int ret;
45939
45940- u8 led[8] = {
45941- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45942- 0
45943- };
45944+ u8 *led = kzalloc(8, GFP_KERNEL);
45945+
45946+ if (led == NULL)
45947+ return -ENOMEM;
45948
45949 if (disable_led_control && state != TECH_LED_OFF)
45950 return 0;
45951
45952+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
45953+
45954 switch (state) {
45955 case TECH_LED_ON:
45956 led[1] = 0x82;
45957@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45958 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45959 USB_TYPE_VENDOR | USB_DIR_OUT,
45960 0, 0,
45961- led, sizeof(led), 500);
45962+ led, 8, 500);
45963
45964 mutex_unlock(&d->i2c_mutex);
45965+
45966+ kfree(led);
45967+
45968 return ret;
45969 }
45970
45971 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
45972 {
45973 int ret;
45974- u8 b = 0;
45975+ u8 *b = kzalloc(1, GFP_KERNEL);
45976+
45977+ if (b == NULL)
45978+ return -ENOMEM;
45979
45980 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
45981 return -EAGAIN;
45982@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
45983 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
45984 USB_TYPE_VENDOR | USB_DIR_OUT,
45985 (red << 8) | green, 0,
45986- &b, 1, 500);
45987+ b, 1, 500);
45988
45989 mutex_unlock(&d->i2c_mutex);
45990
45991+ kfree(b);
45992+
45993 return ret;
45994 }
45995
45996@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45997 struct dvb_usb_device_description **desc, int *cold)
45998 {
45999 int ret;
46000- u8 version[3];
46001+ u8 *version = kmalloc(3, GFP_KERNEL);
46002
46003 /* first select the interface */
46004 if (usb_set_interface(udev, 0, 1) != 0)
46005@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46006
46007 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
46008
46009+ if (version == NULL)
46010+ return 0;
46011+
46012 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46013 GET_VERSION_INFO_VENDOR_REQUEST,
46014 USB_TYPE_VENDOR | USB_DIR_IN,
46015 0, 0,
46016- version, sizeof(version), 500);
46017+ version, 3, 500);
46018
46019 if (ret < 0)
46020 *cold = 1;
46021@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46022 *cold = 0;
46023 }
46024
46025+ kfree(version);
46026+
46027 return 0;
46028 }
46029
46030@@ -591,10 +615,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46031
46032 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46033 {
46034- u8 buf[62], *b;
46035+ u8 *buf, *b;
46036 int ret;
46037 struct ir_raw_event ev;
46038
46039+ buf = kmalloc(62, GFP_KERNEL);
46040+
46041+ if (buf == NULL)
46042+ return -ENOMEM;
46043+
46044 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46045 buf[1] = 0x08;
46046 buf[2] = 0x8f;
46047@@ -617,16 +646,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46048 GET_IR_DATA_VENDOR_REQUEST,
46049 USB_TYPE_VENDOR | USB_DIR_IN,
46050 0x8080, 0,
46051- buf, sizeof(buf), 500);
46052+ buf, 62, 500);
46053
46054 unlock:
46055 mutex_unlock(&d->i2c_mutex);
46056
46057- if (ret < 0)
46058+ if (ret < 0) {
46059+ kfree(buf);
46060 return ret;
46061+ }
46062
46063- if (ret == 1)
46064+ if (ret == 1) {
46065+ kfree(buf);
46066 return 0; /* no key pressed */
46067+ }
46068
46069 /* decoding */
46070 b = buf+1;
46071@@ -653,6 +686,8 @@ unlock:
46072
46073 ir_raw_event_handle(d->rc_dev);
46074
46075+ kfree(buf);
46076+
46077 return 1;
46078 }
46079
46080diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46081index e502a5f..2a27f40 100644
46082--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46083+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46084@@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46085 * by passing a very big num_planes value */
46086 uplane = compat_alloc_user_space(num_planes *
46087 sizeof(struct v4l2_plane));
46088- kp->m.planes = (__force struct v4l2_plane *)uplane;
46089+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46090
46091 while (--num_planes >= 0) {
46092 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46093@@ -498,7 +498,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46094 if (num_planes == 0)
46095 return 0;
46096
46097- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46098+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46099 if (get_user(p, &up->m.planes))
46100 return -EFAULT;
46101 uplane32 = compat_ptr(p);
46102@@ -562,7 +562,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46103 get_user(kp->flags, &up->flags) ||
46104 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46105 return -EFAULT;
46106- kp->base = (__force void *)compat_ptr(tmp);
46107+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46108 return 0;
46109 }
46110
46111@@ -667,7 +667,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46112 n * sizeof(struct v4l2_ext_control32)))
46113 return -EFAULT;
46114 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46115- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46116+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46117 while (--n >= 0) {
46118 u32 id;
46119
46120@@ -694,7 +694,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46121 {
46122 struct v4l2_ext_control32 __user *ucontrols;
46123 struct v4l2_ext_control __user *kcontrols =
46124- (__force struct v4l2_ext_control __user *)kp->controls;
46125+ (struct v4l2_ext_control __force_user *)kp->controls;
46126 int n = kp->count;
46127 compat_caddr_t p;
46128
46129@@ -778,7 +778,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46130 get_user(tmp, &up->edid) ||
46131 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46132 return -EFAULT;
46133- kp->edid = (__force u8 *)compat_ptr(tmp);
46134+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46135 return 0;
46136 }
46137
46138diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46139index 015f92a..59e311e 100644
46140--- a/drivers/media/v4l2-core/v4l2-device.c
46141+++ b/drivers/media/v4l2-core/v4l2-device.c
46142@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46143 EXPORT_SYMBOL_GPL(v4l2_device_put);
46144
46145 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46146- atomic_t *instance)
46147+ atomic_unchecked_t *instance)
46148 {
46149- int num = atomic_inc_return(instance) - 1;
46150+ int num = atomic_inc_return_unchecked(instance) - 1;
46151 int len = strlen(basename);
46152
46153 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46154diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46155index 9ccb19a..d131468 100644
46156--- a/drivers/media/v4l2-core/v4l2-ioctl.c
46157+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46158@@ -2142,7 +2142,8 @@ struct v4l2_ioctl_info {
46159 struct file *file, void *fh, void *p);
46160 } u;
46161 void (*debug)(const void *arg, bool write_only);
46162-};
46163+} __do_const;
46164+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46165
46166 /* This control needs a priority check */
46167 #define INFO_FL_PRIO (1 << 0)
46168@@ -2326,7 +2327,7 @@ static long __video_do_ioctl(struct file *file,
46169 struct video_device *vfd = video_devdata(file);
46170 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46171 bool write_only = false;
46172- struct v4l2_ioctl_info default_info;
46173+ v4l2_ioctl_info_no_const default_info;
46174 const struct v4l2_ioctl_info *info;
46175 void *fh = file->private_data;
46176 struct v4l2_fh *vfh = NULL;
46177@@ -2413,7 +2414,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46178 ret = -EINVAL;
46179 break;
46180 }
46181- *user_ptr = (void __user *)buf->m.planes;
46182+ *user_ptr = (void __force_user *)buf->m.planes;
46183 *kernel_ptr = (void **)&buf->m.planes;
46184 *array_size = sizeof(struct v4l2_plane) * buf->length;
46185 ret = 1;
46186@@ -2430,7 +2431,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46187 ret = -EINVAL;
46188 break;
46189 }
46190- *user_ptr = (void __user *)edid->edid;
46191+ *user_ptr = (void __force_user *)edid->edid;
46192 *kernel_ptr = (void **)&edid->edid;
46193 *array_size = edid->blocks * 128;
46194 ret = 1;
46195@@ -2448,7 +2449,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46196 ret = -EINVAL;
46197 break;
46198 }
46199- *user_ptr = (void __user *)ctrls->controls;
46200+ *user_ptr = (void __force_user *)ctrls->controls;
46201 *kernel_ptr = (void **)&ctrls->controls;
46202 *array_size = sizeof(struct v4l2_ext_control)
46203 * ctrls->count;
46204@@ -2549,7 +2550,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46205 }
46206
46207 if (has_array_args) {
46208- *kernel_ptr = (void __force *)user_ptr;
46209+ *kernel_ptr = (void __force_kernel *)user_ptr;
46210 if (copy_to_user(user_ptr, mbuf, array_size))
46211 err = -EFAULT;
46212 goto out_array_args;
46213diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46214index 187f836..679544b 100644
46215--- a/drivers/message/fusion/mptbase.c
46216+++ b/drivers/message/fusion/mptbase.c
46217@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46218 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46219 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46220
46221+#ifdef CONFIG_GRKERNSEC_HIDESYM
46222+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46223+#else
46224 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46225 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46226+#endif
46227+
46228 /*
46229 * Rounding UP to nearest 4-kB boundary here...
46230 */
46231@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46232 ioc->facts.GlobalCredits);
46233
46234 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46235+#ifdef CONFIG_GRKERNSEC_HIDESYM
46236+ NULL, NULL);
46237+#else
46238 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46239+#endif
46240 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46241 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46242 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46243diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46244index 0707fa2..70ca794 100644
46245--- a/drivers/message/fusion/mptsas.c
46246+++ b/drivers/message/fusion/mptsas.c
46247@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46248 return 0;
46249 }
46250
46251+static inline void
46252+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46253+{
46254+ if (phy_info->port_details) {
46255+ phy_info->port_details->rphy = rphy;
46256+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46257+ ioc->name, rphy));
46258+ }
46259+
46260+ if (rphy) {
46261+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46262+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46263+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46264+ ioc->name, rphy, rphy->dev.release));
46265+ }
46266+}
46267+
46268 /* no mutex */
46269 static void
46270 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46271@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46272 return NULL;
46273 }
46274
46275-static inline void
46276-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46277-{
46278- if (phy_info->port_details) {
46279- phy_info->port_details->rphy = rphy;
46280- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46281- ioc->name, rphy));
46282- }
46283-
46284- if (rphy) {
46285- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46286- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46287- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46288- ioc->name, rphy, rphy->dev.release));
46289- }
46290-}
46291-
46292 static inline struct sas_port *
46293 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46294 {
46295diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
46296index b7d87cd..3fb36da 100644
46297--- a/drivers/message/i2o/i2o_proc.c
46298+++ b/drivers/message/i2o/i2o_proc.c
46299@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
46300 "Array Controller Device"
46301 };
46302
46303-static char *chtostr(char *tmp, u8 *chars, int n)
46304-{
46305- tmp[0] = 0;
46306- return strncat(tmp, (char *)chars, n);
46307-}
46308-
46309 static int i2o_report_query_status(struct seq_file *seq, int block_status,
46310 char *group)
46311 {
46312@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
46313 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
46314 {
46315 struct i2o_controller *c = (struct i2o_controller *)seq->private;
46316- static u32 work32[5];
46317- static u8 *work8 = (u8 *) work32;
46318- static u16 *work16 = (u16 *) work32;
46319+ u32 work32[5];
46320+ u8 *work8 = (u8 *) work32;
46321+ u16 *work16 = (u16 *) work32;
46322 int token;
46323 u32 hwcap;
46324
46325@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46326 } *result;
46327
46328 i2o_exec_execute_ddm_table ddm_table;
46329- char tmp[28 + 1];
46330
46331 result = kmalloc(sizeof(*result), GFP_KERNEL);
46332 if (!result)
46333@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46334
46335 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
46336 seq_printf(seq, "%-#8x", ddm_table.module_id);
46337- seq_printf(seq, "%-29s",
46338- chtostr(tmp, ddm_table.module_name_version, 28));
46339+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
46340 seq_printf(seq, "%9d ", ddm_table.data_size);
46341 seq_printf(seq, "%8d", ddm_table.code_size);
46342
46343@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46344
46345 i2o_driver_result_table *result;
46346 i2o_driver_store_table *dst;
46347- char tmp[28 + 1];
46348
46349 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
46350 if (result == NULL)
46351@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46352
46353 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
46354 seq_printf(seq, "%-#8x", dst->module_id);
46355- seq_printf(seq, "%-29s",
46356- chtostr(tmp, dst->module_name_version, 28));
46357- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
46358+ seq_printf(seq, "%-.28s", dst->module_name_version);
46359+ seq_printf(seq, "%-.8s", dst->date);
46360 seq_printf(seq, "%8d ", dst->module_size);
46361 seq_printf(seq, "%8d ", dst->mpb_size);
46362 seq_printf(seq, "0x%04x", dst->module_flags);
46363@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
46364 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46365 {
46366 struct i2o_device *d = (struct i2o_device *)seq->private;
46367- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46368+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46369 // == (allow) 512d bytes (max)
46370- static u16 *work16 = (u16 *) work32;
46371+ u16 *work16 = (u16 *) work32;
46372 int token;
46373- char tmp[16 + 1];
46374
46375 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
46376
46377@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46378 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
46379 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
46380 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
46381- seq_printf(seq, "Vendor info : %s\n",
46382- chtostr(tmp, (u8 *) (work32 + 2), 16));
46383- seq_printf(seq, "Product info : %s\n",
46384- chtostr(tmp, (u8 *) (work32 + 6), 16));
46385- seq_printf(seq, "Description : %s\n",
46386- chtostr(tmp, (u8 *) (work32 + 10), 16));
46387- seq_printf(seq, "Product rev. : %s\n",
46388- chtostr(tmp, (u8 *) (work32 + 14), 8));
46389+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
46390+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
46391+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
46392+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
46393
46394 seq_printf(seq, "Serial number : ");
46395 print_serial_number(seq, (u8 *) (work32 + 16),
46396@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46397 u8 pad[256]; // allow up to 256 byte (max) serial number
46398 } result;
46399
46400- char tmp[24 + 1];
46401-
46402 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
46403
46404 if (token < 0) {
46405@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46406 }
46407
46408 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
46409- seq_printf(seq, "Module name : %s\n",
46410- chtostr(tmp, result.module_name, 24));
46411- seq_printf(seq, "Module revision : %s\n",
46412- chtostr(tmp, result.module_rev, 8));
46413+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
46414+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
46415
46416 seq_printf(seq, "Serial number : ");
46417 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
46418@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46419 u8 instance_number[4];
46420 } result;
46421
46422- char tmp[64 + 1];
46423-
46424 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
46425
46426 if (token < 0) {
46427@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46428 return 0;
46429 }
46430
46431- seq_printf(seq, "Device name : %s\n",
46432- chtostr(tmp, result.device_name, 64));
46433- seq_printf(seq, "Service name : %s\n",
46434- chtostr(tmp, result.service_name, 64));
46435- seq_printf(seq, "Physical name : %s\n",
46436- chtostr(tmp, result.physical_location, 64));
46437- seq_printf(seq, "Instance number : %s\n",
46438- chtostr(tmp, result.instance_number, 4));
46439+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
46440+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
46441+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
46442+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
46443
46444 return 0;
46445 }
46446@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46447 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
46448 {
46449 struct i2o_device *d = (struct i2o_device *)seq->private;
46450- static u32 work32[12];
46451- static u16 *work16 = (u16 *) work32;
46452- static u8 *work8 = (u8 *) work32;
46453+ u32 work32[12];
46454+ u16 *work16 = (u16 *) work32;
46455+ u8 *work8 = (u8 *) work32;
46456 int token;
46457
46458 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
46459diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
46460index 92752fb..a7494f6 100644
46461--- a/drivers/message/i2o/iop.c
46462+++ b/drivers/message/i2o/iop.c
46463@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
46464
46465 spin_lock_irqsave(&c->context_list_lock, flags);
46466
46467- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
46468- atomic_inc(&c->context_list_counter);
46469+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
46470+ atomic_inc_unchecked(&c->context_list_counter);
46471
46472- entry->context = atomic_read(&c->context_list_counter);
46473+ entry->context = atomic_read_unchecked(&c->context_list_counter);
46474
46475 list_add(&entry->list, &c->context_list);
46476
46477@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
46478
46479 #if BITS_PER_LONG == 64
46480 spin_lock_init(&c->context_list_lock);
46481- atomic_set(&c->context_list_counter, 0);
46482+ atomic_set_unchecked(&c->context_list_counter, 0);
46483 INIT_LIST_HEAD(&c->context_list);
46484 #endif
46485
46486diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46487index b2c7e3b..85aa4764 100644
46488--- a/drivers/mfd/ab8500-debugfs.c
46489+++ b/drivers/mfd/ab8500-debugfs.c
46490@@ -100,7 +100,7 @@ static int irq_last;
46491 static u32 *irq_count;
46492 static int num_irqs;
46493
46494-static struct device_attribute **dev_attr;
46495+static device_attribute_no_const **dev_attr;
46496 static char **event_name;
46497
46498 static u8 avg_sample = SAMPLE_16;
46499diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46500index c880c89..45a7c68 100644
46501--- a/drivers/mfd/max8925-i2c.c
46502+++ b/drivers/mfd/max8925-i2c.c
46503@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46504 const struct i2c_device_id *id)
46505 {
46506 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46507- static struct max8925_chip *chip;
46508+ struct max8925_chip *chip;
46509 struct device_node *node = client->dev.of_node;
46510
46511 if (node && !pdata) {
46512diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46513index 7612d89..70549c2 100644
46514--- a/drivers/mfd/tps65910.c
46515+++ b/drivers/mfd/tps65910.c
46516@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46517 struct tps65910_platform_data *pdata)
46518 {
46519 int ret = 0;
46520- static struct regmap_irq_chip *tps6591x_irqs_chip;
46521+ struct regmap_irq_chip *tps6591x_irqs_chip;
46522
46523 if (!irq) {
46524 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
46525diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
46526index 1b772ef..01e77d33 100644
46527--- a/drivers/mfd/twl4030-irq.c
46528+++ b/drivers/mfd/twl4030-irq.c
46529@@ -34,6 +34,7 @@
46530 #include <linux/of.h>
46531 #include <linux/irqdomain.h>
46532 #include <linux/i2c/twl.h>
46533+#include <asm/pgtable.h>
46534
46535 #include "twl-core.h"
46536
46537@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
46538 * Install an irq handler for each of the SIH modules;
46539 * clone dummy irq_chip since PIH can't *do* anything
46540 */
46541- twl4030_irq_chip = dummy_irq_chip;
46542- twl4030_irq_chip.name = "twl4030";
46543+ pax_open_kernel();
46544+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
46545+ *(const char **)&twl4030_irq_chip.name = "twl4030";
46546
46547- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46548+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46549+ pax_close_kernel();
46550
46551 for (i = irq_base; i < irq_end; i++) {
46552 irq_set_chip_and_handler(i, &twl4030_irq_chip,
46553diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
46554index 464419b..64bae8d 100644
46555--- a/drivers/misc/c2port/core.c
46556+++ b/drivers/misc/c2port/core.c
46557@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
46558 goto error_idr_alloc;
46559 c2dev->id = ret;
46560
46561- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46562+ pax_open_kernel();
46563+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46564+ pax_close_kernel();
46565
46566 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
46567 "c2port%d", c2dev->id);
46568diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
46569index 3f2b625..945e179 100644
46570--- a/drivers/misc/eeprom/sunxi_sid.c
46571+++ b/drivers/misc/eeprom/sunxi_sid.c
46572@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
46573
46574 platform_set_drvdata(pdev, sid_data);
46575
46576- sid_bin_attr.size = sid_data->keysize;
46577+ pax_open_kernel();
46578+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
46579+ pax_close_kernel();
46580 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
46581 return -ENODEV;
46582
46583diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
46584index 36f5d52..32311c3 100644
46585--- a/drivers/misc/kgdbts.c
46586+++ b/drivers/misc/kgdbts.c
46587@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
46588 char before[BREAK_INSTR_SIZE];
46589 char after[BREAK_INSTR_SIZE];
46590
46591- probe_kernel_read(before, (char *)kgdbts_break_test,
46592+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
46593 BREAK_INSTR_SIZE);
46594 init_simple_test();
46595 ts.tst = plant_and_detach_test;
46596@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
46597 /* Activate test with initial breakpoint */
46598 if (!is_early)
46599 kgdb_breakpoint();
46600- probe_kernel_read(after, (char *)kgdbts_break_test,
46601+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
46602 BREAK_INSTR_SIZE);
46603 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
46604 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
46605diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
46606index 3ef4627..8d00486 100644
46607--- a/drivers/misc/lis3lv02d/lis3lv02d.c
46608+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
46609@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
46610 * the lid is closed. This leads to interrupts as soon as a little move
46611 * is done.
46612 */
46613- atomic_inc(&lis3->count);
46614+ atomic_inc_unchecked(&lis3->count);
46615
46616 wake_up_interruptible(&lis3->misc_wait);
46617 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
46618@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
46619 if (lis3->pm_dev)
46620 pm_runtime_get_sync(lis3->pm_dev);
46621
46622- atomic_set(&lis3->count, 0);
46623+ atomic_set_unchecked(&lis3->count, 0);
46624 return 0;
46625 }
46626
46627@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
46628 add_wait_queue(&lis3->misc_wait, &wait);
46629 while (true) {
46630 set_current_state(TASK_INTERRUPTIBLE);
46631- data = atomic_xchg(&lis3->count, 0);
46632+ data = atomic_xchg_unchecked(&lis3->count, 0);
46633 if (data)
46634 break;
46635
46636@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
46637 struct lis3lv02d, miscdev);
46638
46639 poll_wait(file, &lis3->misc_wait, wait);
46640- if (atomic_read(&lis3->count))
46641+ if (atomic_read_unchecked(&lis3->count))
46642 return POLLIN | POLLRDNORM;
46643 return 0;
46644 }
46645diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
46646index c439c82..1f20f57 100644
46647--- a/drivers/misc/lis3lv02d/lis3lv02d.h
46648+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
46649@@ -297,7 +297,7 @@ struct lis3lv02d {
46650 struct input_polled_dev *idev; /* input device */
46651 struct platform_device *pdev; /* platform device */
46652 struct regulator_bulk_data regulators[2];
46653- atomic_t count; /* interrupt count after last read */
46654+ atomic_unchecked_t count; /* interrupt count after last read */
46655 union axis_conversion ac; /* hw -> logical axis */
46656 int mapped_btns[3];
46657
46658diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
46659index 2f30bad..c4c13d0 100644
46660--- a/drivers/misc/sgi-gru/gruhandles.c
46661+++ b/drivers/misc/sgi-gru/gruhandles.c
46662@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
46663 unsigned long nsec;
46664
46665 nsec = CLKS2NSEC(clks);
46666- atomic_long_inc(&mcs_op_statistics[op].count);
46667- atomic_long_add(nsec, &mcs_op_statistics[op].total);
46668+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
46669+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
46670 if (mcs_op_statistics[op].max < nsec)
46671 mcs_op_statistics[op].max = nsec;
46672 }
46673diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
46674index 4f76359..cdfcb2e 100644
46675--- a/drivers/misc/sgi-gru/gruprocfs.c
46676+++ b/drivers/misc/sgi-gru/gruprocfs.c
46677@@ -32,9 +32,9 @@
46678
46679 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
46680
46681-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
46682+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
46683 {
46684- unsigned long val = atomic_long_read(v);
46685+ unsigned long val = atomic_long_read_unchecked(v);
46686
46687 seq_printf(s, "%16lu %s\n", val, id);
46688 }
46689@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
46690
46691 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
46692 for (op = 0; op < mcsop_last; op++) {
46693- count = atomic_long_read(&mcs_op_statistics[op].count);
46694- total = atomic_long_read(&mcs_op_statistics[op].total);
46695+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
46696+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
46697 max = mcs_op_statistics[op].max;
46698 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
46699 count ? total / count : 0, max);
46700diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
46701index 5c3ce24..4915ccb 100644
46702--- a/drivers/misc/sgi-gru/grutables.h
46703+++ b/drivers/misc/sgi-gru/grutables.h
46704@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
46705 * GRU statistics.
46706 */
46707 struct gru_stats_s {
46708- atomic_long_t vdata_alloc;
46709- atomic_long_t vdata_free;
46710- atomic_long_t gts_alloc;
46711- atomic_long_t gts_free;
46712- atomic_long_t gms_alloc;
46713- atomic_long_t gms_free;
46714- atomic_long_t gts_double_allocate;
46715- atomic_long_t assign_context;
46716- atomic_long_t assign_context_failed;
46717- atomic_long_t free_context;
46718- atomic_long_t load_user_context;
46719- atomic_long_t load_kernel_context;
46720- atomic_long_t lock_kernel_context;
46721- atomic_long_t unlock_kernel_context;
46722- atomic_long_t steal_user_context;
46723- atomic_long_t steal_kernel_context;
46724- atomic_long_t steal_context_failed;
46725- atomic_long_t nopfn;
46726- atomic_long_t asid_new;
46727- atomic_long_t asid_next;
46728- atomic_long_t asid_wrap;
46729- atomic_long_t asid_reuse;
46730- atomic_long_t intr;
46731- atomic_long_t intr_cbr;
46732- atomic_long_t intr_tfh;
46733- atomic_long_t intr_spurious;
46734- atomic_long_t intr_mm_lock_failed;
46735- atomic_long_t call_os;
46736- atomic_long_t call_os_wait_queue;
46737- atomic_long_t user_flush_tlb;
46738- atomic_long_t user_unload_context;
46739- atomic_long_t user_exception;
46740- atomic_long_t set_context_option;
46741- atomic_long_t check_context_retarget_intr;
46742- atomic_long_t check_context_unload;
46743- atomic_long_t tlb_dropin;
46744- atomic_long_t tlb_preload_page;
46745- atomic_long_t tlb_dropin_fail_no_asid;
46746- atomic_long_t tlb_dropin_fail_upm;
46747- atomic_long_t tlb_dropin_fail_invalid;
46748- atomic_long_t tlb_dropin_fail_range_active;
46749- atomic_long_t tlb_dropin_fail_idle;
46750- atomic_long_t tlb_dropin_fail_fmm;
46751- atomic_long_t tlb_dropin_fail_no_exception;
46752- atomic_long_t tfh_stale_on_fault;
46753- atomic_long_t mmu_invalidate_range;
46754- atomic_long_t mmu_invalidate_page;
46755- atomic_long_t flush_tlb;
46756- atomic_long_t flush_tlb_gru;
46757- atomic_long_t flush_tlb_gru_tgh;
46758- atomic_long_t flush_tlb_gru_zero_asid;
46759+ atomic_long_unchecked_t vdata_alloc;
46760+ atomic_long_unchecked_t vdata_free;
46761+ atomic_long_unchecked_t gts_alloc;
46762+ atomic_long_unchecked_t gts_free;
46763+ atomic_long_unchecked_t gms_alloc;
46764+ atomic_long_unchecked_t gms_free;
46765+ atomic_long_unchecked_t gts_double_allocate;
46766+ atomic_long_unchecked_t assign_context;
46767+ atomic_long_unchecked_t assign_context_failed;
46768+ atomic_long_unchecked_t free_context;
46769+ atomic_long_unchecked_t load_user_context;
46770+ atomic_long_unchecked_t load_kernel_context;
46771+ atomic_long_unchecked_t lock_kernel_context;
46772+ atomic_long_unchecked_t unlock_kernel_context;
46773+ atomic_long_unchecked_t steal_user_context;
46774+ atomic_long_unchecked_t steal_kernel_context;
46775+ atomic_long_unchecked_t steal_context_failed;
46776+ atomic_long_unchecked_t nopfn;
46777+ atomic_long_unchecked_t asid_new;
46778+ atomic_long_unchecked_t asid_next;
46779+ atomic_long_unchecked_t asid_wrap;
46780+ atomic_long_unchecked_t asid_reuse;
46781+ atomic_long_unchecked_t intr;
46782+ atomic_long_unchecked_t intr_cbr;
46783+ atomic_long_unchecked_t intr_tfh;
46784+ atomic_long_unchecked_t intr_spurious;
46785+ atomic_long_unchecked_t intr_mm_lock_failed;
46786+ atomic_long_unchecked_t call_os;
46787+ atomic_long_unchecked_t call_os_wait_queue;
46788+ atomic_long_unchecked_t user_flush_tlb;
46789+ atomic_long_unchecked_t user_unload_context;
46790+ atomic_long_unchecked_t user_exception;
46791+ atomic_long_unchecked_t set_context_option;
46792+ atomic_long_unchecked_t check_context_retarget_intr;
46793+ atomic_long_unchecked_t check_context_unload;
46794+ atomic_long_unchecked_t tlb_dropin;
46795+ atomic_long_unchecked_t tlb_preload_page;
46796+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
46797+ atomic_long_unchecked_t tlb_dropin_fail_upm;
46798+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
46799+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
46800+ atomic_long_unchecked_t tlb_dropin_fail_idle;
46801+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
46802+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
46803+ atomic_long_unchecked_t tfh_stale_on_fault;
46804+ atomic_long_unchecked_t mmu_invalidate_range;
46805+ atomic_long_unchecked_t mmu_invalidate_page;
46806+ atomic_long_unchecked_t flush_tlb;
46807+ atomic_long_unchecked_t flush_tlb_gru;
46808+ atomic_long_unchecked_t flush_tlb_gru_tgh;
46809+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
46810
46811- atomic_long_t copy_gpa;
46812- atomic_long_t read_gpa;
46813+ atomic_long_unchecked_t copy_gpa;
46814+ atomic_long_unchecked_t read_gpa;
46815
46816- atomic_long_t mesq_receive;
46817- atomic_long_t mesq_receive_none;
46818- atomic_long_t mesq_send;
46819- atomic_long_t mesq_send_failed;
46820- atomic_long_t mesq_noop;
46821- atomic_long_t mesq_send_unexpected_error;
46822- atomic_long_t mesq_send_lb_overflow;
46823- atomic_long_t mesq_send_qlimit_reached;
46824- atomic_long_t mesq_send_amo_nacked;
46825- atomic_long_t mesq_send_put_nacked;
46826- atomic_long_t mesq_page_overflow;
46827- atomic_long_t mesq_qf_locked;
46828- atomic_long_t mesq_qf_noop_not_full;
46829- atomic_long_t mesq_qf_switch_head_failed;
46830- atomic_long_t mesq_qf_unexpected_error;
46831- atomic_long_t mesq_noop_unexpected_error;
46832- atomic_long_t mesq_noop_lb_overflow;
46833- atomic_long_t mesq_noop_qlimit_reached;
46834- atomic_long_t mesq_noop_amo_nacked;
46835- atomic_long_t mesq_noop_put_nacked;
46836- atomic_long_t mesq_noop_page_overflow;
46837+ atomic_long_unchecked_t mesq_receive;
46838+ atomic_long_unchecked_t mesq_receive_none;
46839+ atomic_long_unchecked_t mesq_send;
46840+ atomic_long_unchecked_t mesq_send_failed;
46841+ atomic_long_unchecked_t mesq_noop;
46842+ atomic_long_unchecked_t mesq_send_unexpected_error;
46843+ atomic_long_unchecked_t mesq_send_lb_overflow;
46844+ atomic_long_unchecked_t mesq_send_qlimit_reached;
46845+ atomic_long_unchecked_t mesq_send_amo_nacked;
46846+ atomic_long_unchecked_t mesq_send_put_nacked;
46847+ atomic_long_unchecked_t mesq_page_overflow;
46848+ atomic_long_unchecked_t mesq_qf_locked;
46849+ atomic_long_unchecked_t mesq_qf_noop_not_full;
46850+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
46851+ atomic_long_unchecked_t mesq_qf_unexpected_error;
46852+ atomic_long_unchecked_t mesq_noop_unexpected_error;
46853+ atomic_long_unchecked_t mesq_noop_lb_overflow;
46854+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
46855+ atomic_long_unchecked_t mesq_noop_amo_nacked;
46856+ atomic_long_unchecked_t mesq_noop_put_nacked;
46857+ atomic_long_unchecked_t mesq_noop_page_overflow;
46858
46859 };
46860
46861@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
46862 tghop_invalidate, mcsop_last};
46863
46864 struct mcs_op_statistic {
46865- atomic_long_t count;
46866- atomic_long_t total;
46867+ atomic_long_unchecked_t count;
46868+ atomic_long_unchecked_t total;
46869 unsigned long max;
46870 };
46871
46872@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
46873
46874 #define STAT(id) do { \
46875 if (gru_options & OPT_STATS) \
46876- atomic_long_inc(&gru_stats.id); \
46877+ atomic_long_inc_unchecked(&gru_stats.id); \
46878 } while (0)
46879
46880 #ifdef CONFIG_SGI_GRU_DEBUG
46881diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
46882index c862cd4..0d176fe 100644
46883--- a/drivers/misc/sgi-xp/xp.h
46884+++ b/drivers/misc/sgi-xp/xp.h
46885@@ -288,7 +288,7 @@ struct xpc_interface {
46886 xpc_notify_func, void *);
46887 void (*received) (short, int, void *);
46888 enum xp_retval (*partid_to_nasids) (short, void *);
46889-};
46890+} __no_const;
46891
46892 extern struct xpc_interface xpc_interface;
46893
46894diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
46895index 01be66d..e3a0c7e 100644
46896--- a/drivers/misc/sgi-xp/xp_main.c
46897+++ b/drivers/misc/sgi-xp/xp_main.c
46898@@ -78,13 +78,13 @@ xpc_notloaded(void)
46899 }
46900
46901 struct xpc_interface xpc_interface = {
46902- (void (*)(int))xpc_notloaded,
46903- (void (*)(int))xpc_notloaded,
46904- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46905- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46906+ .connect = (void (*)(int))xpc_notloaded,
46907+ .disconnect = (void (*)(int))xpc_notloaded,
46908+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46909+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46910 void *))xpc_notloaded,
46911- (void (*)(short, int, void *))xpc_notloaded,
46912- (enum xp_retval(*)(short, void *))xpc_notloaded
46913+ .received = (void (*)(short, int, void *))xpc_notloaded,
46914+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
46915 };
46916 EXPORT_SYMBOL_GPL(xpc_interface);
46917
46918diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
46919index b94d5f7..7f494c5 100644
46920--- a/drivers/misc/sgi-xp/xpc.h
46921+++ b/drivers/misc/sgi-xp/xpc.h
46922@@ -835,6 +835,7 @@ struct xpc_arch_operations {
46923 void (*received_payload) (struct xpc_channel *, void *);
46924 void (*notify_senders_of_disconnect) (struct xpc_channel *);
46925 };
46926+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
46927
46928 /* struct xpc_partition act_state values (for XPC HB) */
46929
46930@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
46931 /* found in xpc_main.c */
46932 extern struct device *xpc_part;
46933 extern struct device *xpc_chan;
46934-extern struct xpc_arch_operations xpc_arch_ops;
46935+extern xpc_arch_operations_no_const xpc_arch_ops;
46936 extern int xpc_disengage_timelimit;
46937 extern int xpc_disengage_timedout;
46938 extern int xpc_activate_IRQ_rcvd;
46939diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
46940index 82dc574..8539ab2 100644
46941--- a/drivers/misc/sgi-xp/xpc_main.c
46942+++ b/drivers/misc/sgi-xp/xpc_main.c
46943@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
46944 .notifier_call = xpc_system_die,
46945 };
46946
46947-struct xpc_arch_operations xpc_arch_ops;
46948+xpc_arch_operations_no_const xpc_arch_ops;
46949
46950 /*
46951 * Timer function to enforce the timelimit on the partition disengage.
46952@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
46953
46954 if (((die_args->trapnr == X86_TRAP_MF) ||
46955 (die_args->trapnr == X86_TRAP_XF)) &&
46956- !user_mode_vm(die_args->regs))
46957+ !user_mode(die_args->regs))
46958 xpc_die_deactivate();
46959
46960 break;
46961diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
46962index a11451f..9e1bbad 100644
46963--- a/drivers/mmc/card/block.c
46964+++ b/drivers/mmc/card/block.c
46965@@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
46966 if (idata->ic.postsleep_min_us)
46967 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
46968
46969- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
46970+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
46971 err = -EFAULT;
46972 goto cmd_rel_host;
46973 }
46974diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
46975index 7911e05..d0f9dda 100644
46976--- a/drivers/mmc/core/mmc_ops.c
46977+++ b/drivers/mmc/core/mmc_ops.c
46978@@ -267,7 +267,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
46979 void *data_buf;
46980 int is_on_stack;
46981
46982- is_on_stack = object_is_on_stack(buf);
46983+ is_on_stack = object_starts_on_stack(buf);
46984 if (is_on_stack) {
46985 /*
46986 * dma onto stack is unsafe/nonportable, but callers to this
46987diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
46988index 01b99e8..5c325e3 100644
46989--- a/drivers/mmc/host/dw_mmc.h
46990+++ b/drivers/mmc/host/dw_mmc.h
46991@@ -265,5 +265,5 @@ struct dw_mci_drv_data {
46992 int (*parse_dt)(struct dw_mci *host);
46993 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
46994 struct dw_mci_tuning_data *tuning_data);
46995-};
46996+} __do_const;
46997 #endif /* _DW_MMC_H_ */
46998diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
46999index 43af791..86f4c48 100644
47000--- a/drivers/mmc/host/mmci.c
47001+++ b/drivers/mmc/host/mmci.c
47002@@ -1628,7 +1628,9 @@ static int mmci_probe(struct amba_device *dev,
47003 mmc->caps |= MMC_CAP_CMD23;
47004
47005 if (variant->busy_detect) {
47006- mmci_ops.card_busy = mmci_card_busy;
47007+ pax_open_kernel();
47008+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47009+ pax_close_kernel();
47010 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47011 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47012 mmc->max_busy_timeout = 0;
47013diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47014index 9c2b9cb..cebb09a 100644
47015--- a/drivers/mmc/host/omap_hsmmc.c
47016+++ b/drivers/mmc/host/omap_hsmmc.c
47017@@ -2113,7 +2113,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47018
47019 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47020 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47021- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47022+ pax_open_kernel();
47023+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47024+ pax_close_kernel();
47025 }
47026
47027 pm_runtime_enable(host->dev);
47028diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47029index 587ee0e..b3bbcab 100644
47030--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47031+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47032@@ -1054,9 +1054,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47033 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47034 }
47035
47036- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47037- sdhci_esdhc_ops.platform_execute_tuning =
47038+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47039+ pax_open_kernel();
47040+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47041 esdhc_executing_tuning;
47042+ pax_close_kernel();
47043+ }
47044
47045 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47046 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47047diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47048index 0ce6eb1..8dcce1b 100644
47049--- a/drivers/mmc/host/sdhci-s3c.c
47050+++ b/drivers/mmc/host/sdhci-s3c.c
47051@@ -584,9 +584,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47052 * we can use overriding functions instead of default.
47053 */
47054 if (sc->no_divider) {
47055- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47056- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47057- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47058+ pax_open_kernel();
47059+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47060+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47061+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47062+ pax_close_kernel();
47063 }
47064
47065 /* It supports additional host capabilities if needed */
47066diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47067index 423666b..81ff5eb 100644
47068--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47069+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47070@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47071 size_t totlen = 0, thislen;
47072 int ret = 0;
47073 size_t buflen = 0;
47074- static char *buffer;
47075+ char *buffer;
47076
47077 if (!ECCBUF_SIZE) {
47078 /* We should fall back to a general writev implementation.
47079diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47080index b3b7ca1..5dd4634 100644
47081--- a/drivers/mtd/nand/denali.c
47082+++ b/drivers/mtd/nand/denali.c
47083@@ -24,6 +24,7 @@
47084 #include <linux/slab.h>
47085 #include <linux/mtd/mtd.h>
47086 #include <linux/module.h>
47087+#include <linux/slab.h>
47088
47089 #include "denali.h"
47090
47091diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47092index 959cb9b..8520fe5 100644
47093--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47094+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47095@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47096
47097 /* first try to map the upper buffer directly */
47098 if (virt_addr_valid(this->upper_buf) &&
47099- !object_is_on_stack(this->upper_buf)) {
47100+ !object_starts_on_stack(this->upper_buf)) {
47101 sg_init_one(sgl, this->upper_buf, this->upper_len);
47102 ret = dma_map_sg(this->dev, sgl, 1, dr);
47103 if (ret == 0)
47104diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47105index 51b9d6a..52af9a7 100644
47106--- a/drivers/mtd/nftlmount.c
47107+++ b/drivers/mtd/nftlmount.c
47108@@ -24,6 +24,7 @@
47109 #include <asm/errno.h>
47110 #include <linux/delay.h>
47111 #include <linux/slab.h>
47112+#include <linux/sched.h>
47113 #include <linux/mtd/mtd.h>
47114 #include <linux/mtd/nand.h>
47115 #include <linux/mtd/nftl.h>
47116diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47117index c23184a..4115c41 100644
47118--- a/drivers/mtd/sm_ftl.c
47119+++ b/drivers/mtd/sm_ftl.c
47120@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47121 #define SM_CIS_VENDOR_OFFSET 0x59
47122 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47123 {
47124- struct attribute_group *attr_group;
47125+ attribute_group_no_const *attr_group;
47126 struct attribute **attributes;
47127 struct sm_sysfs_attribute *vendor_attribute;
47128 char *vendor;
47129diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
47130index a5115fb..81b03f6 100644
47131--- a/drivers/net/bonding/bond_main.c
47132+++ b/drivers/net/bonding/bond_main.c
47133@@ -3749,7 +3749,7 @@ int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev)
47134 bond_dev_queue_xmit(bond, skb, slave->dev);
47135 } else {
47136 dev_kfree_skb_any(skb);
47137- atomic_long_inc(&dev->tx_dropped);
47138+ atomic_long_inc_unchecked(&dev->tx_dropped);
47139 }
47140
47141 return NETDEV_TX_OK;
47142diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47143index 45f09a6..f154f8d 100644
47144--- a/drivers/net/bonding/bond_netlink.c
47145+++ b/drivers/net/bonding/bond_netlink.c
47146@@ -585,7 +585,7 @@ nla_put_failure:
47147 return -EMSGSIZE;
47148 }
47149
47150-struct rtnl_link_ops bond_link_ops __read_mostly = {
47151+struct rtnl_link_ops bond_link_ops = {
47152 .kind = "bond",
47153 .priv_size = sizeof(struct bonding),
47154 .setup = bond_setup,
47155diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47156index 5e40a8b..126bfda 100644
47157--- a/drivers/net/caif/caif_hsi.c
47158+++ b/drivers/net/caif/caif_hsi.c
47159@@ -1445,7 +1445,7 @@ err:
47160 return -ENODEV;
47161 }
47162
47163-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47164+static struct rtnl_link_ops caif_hsi_link_ops = {
47165 .kind = "cfhsi",
47166 .priv_size = sizeof(struct cfhsi),
47167 .setup = cfhsi_setup,
47168diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47169index 98d73aa..63ef9da 100644
47170--- a/drivers/net/can/Kconfig
47171+++ b/drivers/net/can/Kconfig
47172@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47173
47174 config CAN_FLEXCAN
47175 tristate "Support for Freescale FLEXCAN based chips"
47176- depends on ARM || PPC
47177+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47178 ---help---
47179 Say Y here if you want to support for Freescale FlexCAN.
47180
47181diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47182index 4b008c9..2b1151f 100644
47183--- a/drivers/net/can/dev.c
47184+++ b/drivers/net/can/dev.c
47185@@ -872,7 +872,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47186 return -EOPNOTSUPP;
47187 }
47188
47189-static struct rtnl_link_ops can_link_ops __read_mostly = {
47190+static struct rtnl_link_ops can_link_ops = {
47191 .kind = "can",
47192 .maxtype = IFLA_CAN_MAX,
47193 .policy = can_policy,
47194diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47195index 4e94057..32032ff 100644
47196--- a/drivers/net/can/vcan.c
47197+++ b/drivers/net/can/vcan.c
47198@@ -166,7 +166,7 @@ static void vcan_setup(struct net_device *dev)
47199 dev->destructor = free_netdev;
47200 }
47201
47202-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47203+static struct rtnl_link_ops vcan_link_ops = {
47204 .kind = "vcan",
47205 .setup = vcan_setup,
47206 };
47207diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47208index ff435fb..d408b1f 100644
47209--- a/drivers/net/dummy.c
47210+++ b/drivers/net/dummy.c
47211@@ -149,7 +149,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47212 return 0;
47213 }
47214
47215-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47216+static struct rtnl_link_ops dummy_link_ops = {
47217 .kind = "dummy",
47218 .setup = dummy_setup,
47219 .validate = dummy_validate,
47220diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47221index 1d162cc..b546a75 100644
47222--- a/drivers/net/ethernet/8390/ax88796.c
47223+++ b/drivers/net/ethernet/8390/ax88796.c
47224@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47225 if (ax->plat->reg_offsets)
47226 ei_local->reg_offset = ax->plat->reg_offsets;
47227 else {
47228+ resource_size_t _mem_size = mem_size;
47229+ do_div(_mem_size, 0x18);
47230 ei_local->reg_offset = ax->reg_offsets;
47231 for (ret = 0; ret < 0x18; ret++)
47232- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47233+ ax->reg_offsets[ret] = _mem_size * ret;
47234 }
47235
47236 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47237diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47238index 4efc435..4ab9e14 100644
47239--- a/drivers/net/ethernet/altera/altera_tse_main.c
47240+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47241@@ -1224,7 +1224,7 @@ static int tse_shutdown(struct net_device *dev)
47242 return 0;
47243 }
47244
47245-static struct net_device_ops altera_tse_netdev_ops = {
47246+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47247 .ndo_open = tse_open,
47248 .ndo_stop = tse_shutdown,
47249 .ndo_start_xmit = tse_start_xmit,
47250@@ -1461,11 +1461,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47251 ndev->netdev_ops = &altera_tse_netdev_ops;
47252 altera_tse_set_ethtool_ops(ndev);
47253
47254+ pax_open_kernel();
47255 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47256
47257 if (priv->hash_filter)
47258 altera_tse_netdev_ops.ndo_set_rx_mode =
47259 tse_set_rx_mode_hashfilter;
47260+ pax_close_kernel();
47261
47262 /* Scatter/gather IO is not supported,
47263 * so it is turned off
47264diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47265index caade30..3e257d9 100644
47266--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47267+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47268@@ -1072,14 +1072,14 @@ do { \
47269 * operations, everything works on mask values.
47270 */
47271 #define XMDIO_READ(_pdata, _mmd, _reg) \
47272- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47273+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47274 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47275
47276 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47277 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47278
47279 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47280- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47281+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47282 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47283
47284 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47285diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47286index 8a50b01..39c1ad0 100644
47287--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47288+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47289@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47290
47291 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47292
47293- pdata->hw_if.config_dcb_tc(pdata);
47294+ pdata->hw_if->config_dcb_tc(pdata);
47295
47296 return 0;
47297 }
47298@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47299
47300 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47301
47302- pdata->hw_if.config_dcb_pfc(pdata);
47303+ pdata->hw_if->config_dcb_pfc(pdata);
47304
47305 return 0;
47306 }
47307diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47308index 6fc5da0..61ac2cb 100644
47309--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47310+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47311@@ -235,7 +235,7 @@ err_ring:
47312
47313 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47314 {
47315- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47316+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47317 struct xgbe_channel *channel;
47318 struct xgbe_ring *ring;
47319 struct xgbe_ring_data *rdata;
47320@@ -276,7 +276,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47321
47322 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47323 {
47324- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47325+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47326 struct xgbe_channel *channel;
47327 struct xgbe_ring *ring;
47328 struct xgbe_ring_desc *rdesc;
47329@@ -505,7 +505,7 @@ err_out:
47330 static void xgbe_realloc_skb(struct xgbe_channel *channel)
47331 {
47332 struct xgbe_prv_data *pdata = channel->pdata;
47333- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47334+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47335 struct xgbe_ring *ring = channel->rx_ring;
47336 struct xgbe_ring_data *rdata;
47337 struct sk_buff *skb = NULL;
47338@@ -546,17 +546,12 @@ static void xgbe_realloc_skb(struct xgbe_channel *channel)
47339 DBGPR("<--xgbe_realloc_skb\n");
47340 }
47341
47342-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47343-{
47344- DBGPR("-->xgbe_init_function_ptrs_desc\n");
47345-
47346- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47347- desc_if->free_ring_resources = xgbe_free_ring_resources;
47348- desc_if->map_tx_skb = xgbe_map_tx_skb;
47349- desc_if->realloc_skb = xgbe_realloc_skb;
47350- desc_if->unmap_skb = xgbe_unmap_skb;
47351- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47352- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47353-
47354- DBGPR("<--xgbe_init_function_ptrs_desc\n");
47355-}
47356+const struct xgbe_desc_if default_xgbe_desc_if = {
47357+ .alloc_ring_resources = xgbe_alloc_ring_resources,
47358+ .free_ring_resources = xgbe_free_ring_resources,
47359+ .map_tx_skb = xgbe_map_tx_skb,
47360+ .realloc_skb = xgbe_realloc_skb,
47361+ .unmap_skb = xgbe_unmap_skb,
47362+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47363+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47364+};
47365diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47366index 9da3a03..022f15c 100644
47367--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47368+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47369@@ -2462,7 +2462,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47370
47371 static int xgbe_init(struct xgbe_prv_data *pdata)
47372 {
47373- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47374+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47375 int ret;
47376
47377 DBGPR("-->xgbe_init\n");
47378@@ -2524,101 +2524,96 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47379 return 0;
47380 }
47381
47382-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47383-{
47384- DBGPR("-->xgbe_init_function_ptrs\n");
47385-
47386- hw_if->tx_complete = xgbe_tx_complete;
47387-
47388- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47389- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47390- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47391- hw_if->set_mac_address = xgbe_set_mac_address;
47392-
47393- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47394- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47395-
47396- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47397- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47398- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47399- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47400- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47401-
47402- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47403- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47404-
47405- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47406- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47407- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47408-
47409- hw_if->enable_tx = xgbe_enable_tx;
47410- hw_if->disable_tx = xgbe_disable_tx;
47411- hw_if->enable_rx = xgbe_enable_rx;
47412- hw_if->disable_rx = xgbe_disable_rx;
47413-
47414- hw_if->powerup_tx = xgbe_powerup_tx;
47415- hw_if->powerdown_tx = xgbe_powerdown_tx;
47416- hw_if->powerup_rx = xgbe_powerup_rx;
47417- hw_if->powerdown_rx = xgbe_powerdown_rx;
47418-
47419- hw_if->pre_xmit = xgbe_pre_xmit;
47420- hw_if->dev_read = xgbe_dev_read;
47421- hw_if->enable_int = xgbe_enable_int;
47422- hw_if->disable_int = xgbe_disable_int;
47423- hw_if->init = xgbe_init;
47424- hw_if->exit = xgbe_exit;
47425+const struct xgbe_hw_if default_xgbe_hw_if = {
47426+ .tx_complete = xgbe_tx_complete,
47427+
47428+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47429+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47430+ .add_mac_addresses = xgbe_add_mac_addresses,
47431+ .set_mac_address = xgbe_set_mac_address,
47432+
47433+ .enable_rx_csum = xgbe_enable_rx_csum,
47434+ .disable_rx_csum = xgbe_disable_rx_csum,
47435+
47436+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47437+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47438+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47439+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47440+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47441+
47442+ .read_mmd_regs = xgbe_read_mmd_regs,
47443+ .write_mmd_regs = xgbe_write_mmd_regs,
47444+
47445+ .set_gmii_speed = xgbe_set_gmii_speed,
47446+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47447+ .set_xgmii_speed = xgbe_set_xgmii_speed,
47448+
47449+ .enable_tx = xgbe_enable_tx,
47450+ .disable_tx = xgbe_disable_tx,
47451+ .enable_rx = xgbe_enable_rx,
47452+ .disable_rx = xgbe_disable_rx,
47453+
47454+ .powerup_tx = xgbe_powerup_tx,
47455+ .powerdown_tx = xgbe_powerdown_tx,
47456+ .powerup_rx = xgbe_powerup_rx,
47457+ .powerdown_rx = xgbe_powerdown_rx,
47458+
47459+ .pre_xmit = xgbe_pre_xmit,
47460+ .dev_read = xgbe_dev_read,
47461+ .enable_int = xgbe_enable_int,
47462+ .disable_int = xgbe_disable_int,
47463+ .init = xgbe_init,
47464+ .exit = xgbe_exit,
47465
47466 /* Descriptor related Sequences have to be initialized here */
47467- hw_if->tx_desc_init = xgbe_tx_desc_init;
47468- hw_if->rx_desc_init = xgbe_rx_desc_init;
47469- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47470- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47471- hw_if->is_last_desc = xgbe_is_last_desc;
47472- hw_if->is_context_desc = xgbe_is_context_desc;
47473+ .tx_desc_init = xgbe_tx_desc_init,
47474+ .rx_desc_init = xgbe_rx_desc_init,
47475+ .tx_desc_reset = xgbe_tx_desc_reset,
47476+ .rx_desc_reset = xgbe_rx_desc_reset,
47477+ .is_last_desc = xgbe_is_last_desc,
47478+ .is_context_desc = xgbe_is_context_desc,
47479
47480 /* For FLOW ctrl */
47481- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47482- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47483+ .config_tx_flow_control = xgbe_config_tx_flow_control,
47484+ .config_rx_flow_control = xgbe_config_rx_flow_control,
47485
47486 /* For RX coalescing */
47487- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47488- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47489- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47490- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47491+ .config_rx_coalesce = xgbe_config_rx_coalesce,
47492+ .config_tx_coalesce = xgbe_config_tx_coalesce,
47493+ .usec_to_riwt = xgbe_usec_to_riwt,
47494+ .riwt_to_usec = xgbe_riwt_to_usec,
47495
47496 /* For RX and TX threshold config */
47497- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47498- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47499+ .config_rx_threshold = xgbe_config_rx_threshold,
47500+ .config_tx_threshold = xgbe_config_tx_threshold,
47501
47502 /* For RX and TX Store and Forward Mode config */
47503- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47504- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47505+ .config_rsf_mode = xgbe_config_rsf_mode,
47506+ .config_tsf_mode = xgbe_config_tsf_mode,
47507
47508 /* For TX DMA Operating on Second Frame config */
47509- hw_if->config_osp_mode = xgbe_config_osp_mode;
47510+ .config_osp_mode = xgbe_config_osp_mode,
47511
47512 /* For RX and TX PBL config */
47513- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47514- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47515- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47516- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47517- hw_if->config_pblx8 = xgbe_config_pblx8;
47518+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47519+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47520+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47521+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47522+ .config_pblx8 = xgbe_config_pblx8,
47523
47524 /* For MMC statistics support */
47525- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47526- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47527- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47528+ .tx_mmc_int = xgbe_tx_mmc_int,
47529+ .rx_mmc_int = xgbe_rx_mmc_int,
47530+ .read_mmc_stats = xgbe_read_mmc_stats,
47531
47532 /* For PTP config */
47533- hw_if->config_tstamp = xgbe_config_tstamp;
47534- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47535- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47536- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47537- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47538+ .config_tstamp = xgbe_config_tstamp,
47539+ .update_tstamp_addend = xgbe_update_tstamp_addend,
47540+ .set_tstamp_time = xgbe_set_tstamp_time,
47541+ .get_tstamp_time = xgbe_get_tstamp_time,
47542+ .get_tx_tstamp = xgbe_get_tx_tstamp,
47543
47544 /* For Data Center Bridging config */
47545- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47546- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47547-
47548- DBGPR("<--xgbe_init_function_ptrs\n");
47549-}
47550+ .config_dcb_tc = xgbe_config_dcb_tc,
47551+ .config_dcb_pfc = xgbe_config_dcb_pfc,
47552+};
47553diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47554index 2349ea9..a83a677 100644
47555--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47556+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47557@@ -154,7 +154,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
47558
47559 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47560 {
47561- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47562+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47563 struct xgbe_channel *channel;
47564 enum xgbe_int int_id;
47565 unsigned int i;
47566@@ -176,7 +176,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47567
47568 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47569 {
47570- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47571+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47572 struct xgbe_channel *channel;
47573 enum xgbe_int int_id;
47574 unsigned int i;
47575@@ -199,7 +199,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47576 static irqreturn_t xgbe_isr(int irq, void *data)
47577 {
47578 struct xgbe_prv_data *pdata = data;
47579- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47580+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47581 struct xgbe_channel *channel;
47582 unsigned int dma_isr, dma_ch_isr;
47583 unsigned int mac_isr, mac_tssr;
47584@@ -446,7 +446,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
47585
47586 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47587 {
47588- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47589+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47590
47591 DBGPR("-->xgbe_init_tx_coalesce\n");
47592
47593@@ -460,7 +460,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47594
47595 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47596 {
47597- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47598+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47599
47600 DBGPR("-->xgbe_init_rx_coalesce\n");
47601
47602@@ -474,7 +474,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47603
47604 static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47605 {
47606- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47607+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47608 struct xgbe_channel *channel;
47609 struct xgbe_ring *ring;
47610 struct xgbe_ring_data *rdata;
47611@@ -499,7 +499,7 @@ static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47612
47613 static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47614 {
47615- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47616+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47617 struct xgbe_channel *channel;
47618 struct xgbe_ring *ring;
47619 struct xgbe_ring_data *rdata;
47620@@ -525,7 +525,7 @@ static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47621 static void xgbe_adjust_link(struct net_device *netdev)
47622 {
47623 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47624- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47625+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47626 struct phy_device *phydev = pdata->phydev;
47627 int new_state = 0;
47628
47629@@ -633,7 +633,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
47630 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47631 {
47632 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47633- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47634+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47635 unsigned long flags;
47636
47637 DBGPR("-->xgbe_powerdown\n");
47638@@ -671,7 +671,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47639 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47640 {
47641 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47642- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47643+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47644 unsigned long flags;
47645
47646 DBGPR("-->xgbe_powerup\n");
47647@@ -708,7 +708,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47648
47649 static int xgbe_start(struct xgbe_prv_data *pdata)
47650 {
47651- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47652+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47653 struct net_device *netdev = pdata->netdev;
47654
47655 DBGPR("-->xgbe_start\n");
47656@@ -734,7 +734,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
47657
47658 static void xgbe_stop(struct xgbe_prv_data *pdata)
47659 {
47660- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47661+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47662 struct net_device *netdev = pdata->netdev;
47663
47664 DBGPR("-->xgbe_stop\n");
47665@@ -754,7 +754,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
47666
47667 static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
47668 {
47669- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47670+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47671
47672 DBGPR("-->xgbe_restart_dev\n");
47673
47674@@ -951,7 +951,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
47675 return -ERANGE;
47676 }
47677
47678- pdata->hw_if.config_tstamp(pdata, mac_tscr);
47679+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
47680
47681 memcpy(&pdata->tstamp_config, &config, sizeof(config));
47682
47683@@ -1089,8 +1089,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
47684 static int xgbe_open(struct net_device *netdev)
47685 {
47686 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47687- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47688- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47689+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47690+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47691 int ret;
47692
47693 DBGPR("-->xgbe_open\n");
47694@@ -1170,8 +1170,8 @@ err_phy_init:
47695 static int xgbe_close(struct net_device *netdev)
47696 {
47697 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47698- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47699- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47700+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47701+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47702
47703 DBGPR("-->xgbe_close\n");
47704
47705@@ -1205,8 +1205,8 @@ static int xgbe_close(struct net_device *netdev)
47706 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
47707 {
47708 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47709- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47710- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47711+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47712+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47713 struct xgbe_channel *channel;
47714 struct xgbe_ring *ring;
47715 struct xgbe_packet_data *packet;
47716@@ -1275,7 +1275,7 @@ tx_netdev_return:
47717 static void xgbe_set_rx_mode(struct net_device *netdev)
47718 {
47719 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47720- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47721+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47722 unsigned int pr_mode, am_mode;
47723
47724 DBGPR("-->xgbe_set_rx_mode\n");
47725@@ -1294,7 +1294,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
47726 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
47727 {
47728 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47729- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47730+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47731 struct sockaddr *saddr = addr;
47732
47733 DBGPR("-->xgbe_set_mac_address\n");
47734@@ -1361,7 +1361,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
47735
47736 DBGPR("-->%s\n", __func__);
47737
47738- pdata->hw_if.read_mmc_stats(pdata);
47739+ pdata->hw_if->read_mmc_stats(pdata);
47740
47741 s->rx_packets = pstats->rxframecount_gb;
47742 s->rx_bytes = pstats->rxoctetcount_gb;
47743@@ -1388,7 +1388,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
47744 u16 vid)
47745 {
47746 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47747- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47748+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47749
47750 DBGPR("-->%s\n", __func__);
47751
47752@@ -1404,7 +1404,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
47753 u16 vid)
47754 {
47755 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47756- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47757+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47758
47759 DBGPR("-->%s\n", __func__);
47760
47761@@ -1464,7 +1464,7 @@ static int xgbe_set_features(struct net_device *netdev,
47762 netdev_features_t features)
47763 {
47764 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47765- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47766+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47767 netdev_features_t rxcsum, rxvlan, rxvlan_filter;
47768
47769 rxcsum = pdata->netdev_features & NETIF_F_RXCSUM;
47770@@ -1520,7 +1520,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
47771 static void xgbe_rx_refresh(struct xgbe_channel *channel)
47772 {
47773 struct xgbe_prv_data *pdata = channel->pdata;
47774- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47775+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47776 struct xgbe_ring *ring = channel->rx_ring;
47777 struct xgbe_ring_data *rdata;
47778
47779@@ -1536,8 +1536,8 @@ static void xgbe_rx_refresh(struct xgbe_channel *channel)
47780 static int xgbe_tx_poll(struct xgbe_channel *channel)
47781 {
47782 struct xgbe_prv_data *pdata = channel->pdata;
47783- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47784- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47785+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47786+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47787 struct xgbe_ring *ring = channel->tx_ring;
47788 struct xgbe_ring_data *rdata;
47789 struct xgbe_ring_desc *rdesc;
47790@@ -1589,7 +1589,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
47791 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
47792 {
47793 struct xgbe_prv_data *pdata = channel->pdata;
47794- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47795+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47796 struct xgbe_ring *ring = channel->rx_ring;
47797 struct xgbe_ring_data *rdata;
47798 struct xgbe_packet_data *packet;
47799diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47800index 49508ec..2617cca 100644
47801--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47802+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47803@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
47804
47805 DBGPR("-->%s\n", __func__);
47806
47807- pdata->hw_if.read_mmc_stats(pdata);
47808+ pdata->hw_if->read_mmc_stats(pdata);
47809 for (i = 0; i < XGBE_STATS_COUNT; i++) {
47810 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
47811 *data++ = *(u64 *)stat;
47812@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
47813 struct ethtool_coalesce *ec)
47814 {
47815 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47816- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47817+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47818 unsigned int riwt;
47819
47820 DBGPR("-->xgbe_get_coalesce\n");
47821@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
47822 struct ethtool_coalesce *ec)
47823 {
47824 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47825- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47826+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47827 unsigned int rx_frames, rx_riwt, rx_usecs;
47828 unsigned int tx_frames, tx_usecs;
47829
47830diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47831index f5a8fa0..0bb58ff 100644
47832--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47833+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47834@@ -209,12 +209,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
47835 DBGPR("<--xgbe_default_config\n");
47836 }
47837
47838-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
47839-{
47840- xgbe_init_function_ptrs_dev(&pdata->hw_if);
47841- xgbe_init_function_ptrs_desc(&pdata->desc_if);
47842-}
47843-
47844 static int xgbe_probe(struct platform_device *pdev)
47845 {
47846 struct xgbe_prv_data *pdata;
47847@@ -327,9 +321,8 @@ static int xgbe_probe(struct platform_device *pdev)
47848 netdev->base_addr = (unsigned long)pdata->xgmac_regs;
47849
47850 /* Set all the function pointers */
47851- xgbe_init_all_fptrs(pdata);
47852- hw_if = &pdata->hw_if;
47853- desc_if = &pdata->desc_if;
47854+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
47855+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
47856
47857 /* Issue software reset to device */
47858 hw_if->exit(pdata);
47859diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47860index 363b210..b241389 100644
47861--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47862+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47863@@ -126,7 +126,7 @@
47864 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
47865 {
47866 struct xgbe_prv_data *pdata = mii->priv;
47867- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47868+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47869 int mmd_data;
47870
47871 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
47872@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
47873 u16 mmd_val)
47874 {
47875 struct xgbe_prv_data *pdata = mii->priv;
47876- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47877+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47878 int mmd_data = mmd_val;
47879
47880 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
47881diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47882index a1bf9d1c..84adcab 100644
47883--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47884+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47885@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
47886 tstamp_cc);
47887 u64 nsec;
47888
47889- nsec = pdata->hw_if.get_tstamp_time(pdata);
47890+ nsec = pdata->hw_if->get_tstamp_time(pdata);
47891
47892 return nsec;
47893 }
47894@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
47895
47896 spin_lock_irqsave(&pdata->tstamp_lock, flags);
47897
47898- pdata->hw_if.update_tstamp_addend(pdata, addend);
47899+ pdata->hw_if->update_tstamp_addend(pdata, addend);
47900
47901 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
47902
47903diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
47904index 789957d..d7d0245 100644
47905--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
47906+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
47907@@ -583,8 +583,8 @@ struct xgbe_prv_data {
47908
47909 int irq_number;
47910
47911- struct xgbe_hw_if hw_if;
47912- struct xgbe_desc_if desc_if;
47913+ const struct xgbe_hw_if *hw_if;
47914+ const struct xgbe_desc_if *desc_if;
47915
47916 /* AXI DMA settings */
47917 unsigned int axdomain;
47918@@ -697,6 +697,9 @@ struct xgbe_prv_data {
47919 #endif
47920 };
47921
47922+extern const struct xgbe_hw_if default_xgbe_hw_if;
47923+extern const struct xgbe_desc_if default_xgbe_desc_if;
47924+
47925 /* Function prototypes*/
47926
47927 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
47928diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47929index adcacda..fa6e0ae 100644
47930--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47931+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47932@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
47933 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
47934 {
47935 /* RX_MODE controlling object */
47936- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
47937+ bnx2x_init_rx_mode_obj(bp);
47938
47939 /* multicast configuration controlling object */
47940 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
47941diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47942index 7bc2924..2112002 100644
47943--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47944+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47945@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
47946 return rc;
47947 }
47948
47949-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47950- struct bnx2x_rx_mode_obj *o)
47951+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
47952 {
47953 if (CHIP_IS_E1x(bp)) {
47954- o->wait_comp = bnx2x_empty_rx_mode_wait;
47955- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
47956+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
47957+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
47958 } else {
47959- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
47960- o->config_rx_mode = bnx2x_set_rx_mode_e2;
47961+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
47962+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
47963 }
47964 }
47965
47966diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47967index e97275f..52e28bc 100644
47968--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47969+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47970@@ -1409,8 +1409,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
47971
47972 /********************* RX MODE ****************/
47973
47974-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47975- struct bnx2x_rx_mode_obj *o);
47976+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
47977
47978 /**
47979 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
47980diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
47981index 31c9f82..e65e986 100644
47982--- a/drivers/net/ethernet/broadcom/tg3.h
47983+++ b/drivers/net/ethernet/broadcom/tg3.h
47984@@ -150,6 +150,7 @@
47985 #define CHIPREV_ID_5750_A0 0x4000
47986 #define CHIPREV_ID_5750_A1 0x4001
47987 #define CHIPREV_ID_5750_A3 0x4003
47988+#define CHIPREV_ID_5750_C1 0x4201
47989 #define CHIPREV_ID_5750_C2 0x4202
47990 #define CHIPREV_ID_5752_A0_HW 0x5000
47991 #define CHIPREV_ID_5752_A0 0x6000
47992diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
47993index 903466e..b285864 100644
47994--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
47995+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
47996@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
47997 }
47998
47999 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48000- bna_cb_ioceth_enable,
48001- bna_cb_ioceth_disable,
48002- bna_cb_ioceth_hbfail,
48003- bna_cb_ioceth_reset
48004+ .enable_cbfn = bna_cb_ioceth_enable,
48005+ .disable_cbfn = bna_cb_ioceth_disable,
48006+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48007+ .reset_cbfn = bna_cb_ioceth_reset
48008 };
48009
48010 static void bna_attr_init(struct bna_ioceth *ioceth)
48011diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48012index 8cffcdf..aadf043 100644
48013--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48014+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48015@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48016 */
48017 struct l2t_skb_cb {
48018 arp_failure_handler_func arp_failure_handler;
48019-};
48020+} __no_const;
48021
48022 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48023
48024diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48025index 279873c..11e1921 100644
48026--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48027+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48028@@ -2365,7 +2365,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48029
48030 int i;
48031 struct adapter *ap = netdev2adap(dev);
48032- static const unsigned int *reg_ranges;
48033+ const unsigned int *reg_ranges;
48034 int arr_size = 0, buf_size = 0;
48035
48036 if (is_t4(ap->params.chip)) {
48037diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48038index cf8b6ff..274271e 100644
48039--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48040+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48041@@ -5387,7 +5387,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48042 for (i=0; i<ETH_ALEN; i++) {
48043 tmp.addr[i] = dev->dev_addr[i];
48044 }
48045- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48046+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48047 break;
48048
48049 case DE4X5_SET_HWADDR: /* Set the hardware address */
48050@@ -5427,7 +5427,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48051 spin_lock_irqsave(&lp->lock, flags);
48052 memcpy(&statbuf, &lp->pktStats, ioc->len);
48053 spin_unlock_irqrestore(&lp->lock, flags);
48054- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48055+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48056 return -EFAULT;
48057 break;
48058 }
48059diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48060index d2975fa..8aaec07 100644
48061--- a/drivers/net/ethernet/emulex/benet/be_main.c
48062+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48063@@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48064
48065 if (wrapped)
48066 newacc += 65536;
48067- ACCESS_ONCE(*acc) = newacc;
48068+ ACCESS_ONCE_RW(*acc) = newacc;
48069 }
48070
48071 static void populate_erx_stats(struct be_adapter *adapter,
48072diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48073index c77fa4a..7fd42fc 100644
48074--- a/drivers/net/ethernet/faraday/ftgmac100.c
48075+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48076@@ -30,6 +30,8 @@
48077 #include <linux/netdevice.h>
48078 #include <linux/phy.h>
48079 #include <linux/platform_device.h>
48080+#include <linux/interrupt.h>
48081+#include <linux/irqreturn.h>
48082 #include <net/ip.h>
48083
48084 #include "ftgmac100.h"
48085diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48086index 4ff1adc..0ea6bf4 100644
48087--- a/drivers/net/ethernet/faraday/ftmac100.c
48088+++ b/drivers/net/ethernet/faraday/ftmac100.c
48089@@ -31,6 +31,8 @@
48090 #include <linux/module.h>
48091 #include <linux/netdevice.h>
48092 #include <linux/platform_device.h>
48093+#include <linux/interrupt.h>
48094+#include <linux/irqreturn.h>
48095
48096 #include "ftmac100.h"
48097
48098diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48099index 537b621..07f87ce 100644
48100--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48101+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48102@@ -401,7 +401,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48103 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48104
48105 /* Update the base adjustement value. */
48106- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48107+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48108 smp_mb(); /* Force the above update. */
48109 }
48110
48111diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48112index 5fd4b52..87aa34b 100644
48113--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48114+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48115@@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48116 }
48117
48118 /* update the base incval used to calculate frequency adjustment */
48119- ACCESS_ONCE(adapter->base_incval) = incval;
48120+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48121 smp_mb();
48122
48123 /* need lock to prevent incorrect read while modifying cyclecounter */
48124diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48125index 11ff28b..375d659 100644
48126--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48127+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48128@@ -458,8 +458,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48129 wmb();
48130
48131 /* we want to dirty this cache line once */
48132- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48133- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48134+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48135+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48136
48137 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48138
48139diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
48140index f5e4b82..db0c7a9 100644
48141--- a/drivers/net/ethernet/neterion/s2io.c
48142+++ b/drivers/net/ethernet/neterion/s2io.c
48143@@ -6987,7 +6987,9 @@ static int s2io_add_isr(struct s2io_nic *sp)
48144 if (sp->s2io_entries[i].in_use == MSIX_FLG) {
48145 if (sp->s2io_entries[i].type ==
48146 MSIX_RING_TYPE) {
48147- sprintf(sp->desc[i], "%s:MSI-X-%d-RX",
48148+ snprintf(sp->desc[i],
48149+ sizeof(sp->desc[i]),
48150+ "%s:MSI-X-%d-RX",
48151 dev->name, i);
48152 err = request_irq(sp->entries[i].vector,
48153 s2io_msix_ring_handle,
48154@@ -6996,7 +6998,9 @@ static int s2io_add_isr(struct s2io_nic *sp)
48155 sp->s2io_entries[i].arg);
48156 } else if (sp->s2io_entries[i].type ==
48157 MSIX_ALARM_TYPE) {
48158- sprintf(sp->desc[i], "%s:MSI-X-%d-TX",
48159+ snprintf(sp->desc[i],
48160+ sizeof(sp->desc[i]),
48161+ "%s:MSI-X-%d-TX",
48162 dev->name, i);
48163 err = request_irq(sp->entries[i].vector,
48164 s2io_msix_fifo_handle,
48165@@ -8154,7 +8158,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
48166 "%s: UDP Fragmentation Offload(UFO) enabled\n",
48167 dev->name);
48168 /* Initialize device name */
48169- sprintf(sp->name, "%s Neterion %s", dev->name, sp->product_name);
48170+ snprintf(sp->name, sizeof(sp->name), "%s Neterion %s", dev->name,
48171+ sp->product_name);
48172
48173 if (vlan_tag_strip)
48174 sp->vlan_strip_flag = 1;
48175diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48176index 2bbd01f..e8baa64 100644
48177--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48178+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48179@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48180 struct __vxge_hw_fifo *fifo;
48181 struct vxge_hw_fifo_config *config;
48182 u32 txdl_size, txdl_per_memblock;
48183- struct vxge_hw_mempool_cbs fifo_mp_callback;
48184+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48185+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48186+ };
48187+
48188 struct __vxge_hw_virtualpath *vpath;
48189
48190 if ((vp == NULL) || (attr == NULL)) {
48191@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48192 goto exit;
48193 }
48194
48195- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48196-
48197 fifo->mempool =
48198 __vxge_hw_mempool_create(vpath->hldev,
48199 fifo->config->memblock_size,
48200diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48201index 2bb48d5..d1a865d 100644
48202--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48203+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48204@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48205 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48206 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48207 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48208- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48209+ pax_open_kernel();
48210+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48211+ pax_close_kernel();
48212 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48213 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48214 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48215diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48216index be7d7a6..a8983f8 100644
48217--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48218+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48219@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48220 case QLCNIC_NON_PRIV_FUNC:
48221 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48222 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48223- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48224+ pax_open_kernel();
48225+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48226+ pax_close_kernel();
48227 break;
48228 case QLCNIC_PRIV_FUNC:
48229 ahw->op_mode = QLCNIC_PRIV_FUNC;
48230 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48231- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48232+ pax_open_kernel();
48233+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48234+ pax_close_kernel();
48235 break;
48236 case QLCNIC_MGMT_FUNC:
48237 ahw->op_mode = QLCNIC_MGMT_FUNC;
48238 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48239- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48240+ pax_open_kernel();
48241+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48242+ pax_close_kernel();
48243 break;
48244 default:
48245 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48246diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48247index c9f57fb..208bdc1 100644
48248--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48249+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48250@@ -1285,7 +1285,7 @@ flash_temp:
48251 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48252 {
48253 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48254- static const struct qlcnic_dump_operations *fw_dump_ops;
48255+ const struct qlcnic_dump_operations *fw_dump_ops;
48256 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48257 u32 entry_offset, dump, no_entries, buf_offset = 0;
48258 int i, k, ops_cnt, ops_index, dump_size = 0;
48259diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48260index cf154f7..c948d1b 100644
48261--- a/drivers/net/ethernet/realtek/r8169.c
48262+++ b/drivers/net/ethernet/realtek/r8169.c
48263@@ -788,22 +788,22 @@ struct rtl8169_private {
48264 struct mdio_ops {
48265 void (*write)(struct rtl8169_private *, int, int);
48266 int (*read)(struct rtl8169_private *, int);
48267- } mdio_ops;
48268+ } __no_const mdio_ops;
48269
48270 struct pll_power_ops {
48271 void (*down)(struct rtl8169_private *);
48272 void (*up)(struct rtl8169_private *);
48273- } pll_power_ops;
48274+ } __no_const pll_power_ops;
48275
48276 struct jumbo_ops {
48277 void (*enable)(struct rtl8169_private *);
48278 void (*disable)(struct rtl8169_private *);
48279- } jumbo_ops;
48280+ } __no_const jumbo_ops;
48281
48282 struct csi_ops {
48283 void (*write)(struct rtl8169_private *, int, int);
48284 u32 (*read)(struct rtl8169_private *, int);
48285- } csi_ops;
48286+ } __no_const csi_ops;
48287
48288 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48289 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48290diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48291index 6b861e3..204ac86 100644
48292--- a/drivers/net/ethernet/sfc/ptp.c
48293+++ b/drivers/net/ethernet/sfc/ptp.c
48294@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48295 ptp->start.dma_addr);
48296
48297 /* Clear flag that signals MC ready */
48298- ACCESS_ONCE(*start) = 0;
48299+ ACCESS_ONCE_RW(*start) = 0;
48300 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48301 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48302 EFX_BUG_ON_PARANOID(rc);
48303diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48304index 08c483b..2c4a553 100644
48305--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48306+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48307@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48308
48309 writel(value, ioaddr + MMC_CNTRL);
48310
48311- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48312- MMC_CNTRL, value);
48313+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48314+// MMC_CNTRL, value);
48315 }
48316
48317 /* To mask all all interrupts.*/
48318diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48319index 2f48f79..8ae1a1a 100644
48320--- a/drivers/net/hyperv/hyperv_net.h
48321+++ b/drivers/net/hyperv/hyperv_net.h
48322@@ -171,7 +171,7 @@ struct rndis_device {
48323 enum rndis_device_state state;
48324 bool link_state;
48325 bool link_change;
48326- atomic_t new_req_id;
48327+ atomic_unchecked_t new_req_id;
48328
48329 spinlock_t request_lock;
48330 struct list_head req_list;
48331diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
48332index 7d76c95..63d7a64 100644
48333--- a/drivers/net/hyperv/netvsc.c
48334+++ b/drivers/net/hyperv/netvsc.c
48335@@ -716,7 +716,7 @@ int netvsc_send(struct hv_device *device,
48336 u64 req_id;
48337 unsigned int section_index = NETVSC_INVALID_INDEX;
48338 u32 msg_size = 0;
48339- struct sk_buff *skb;
48340+ struct sk_buff *skb = NULL;
48341 u16 q_idx = packet->q_idx;
48342
48343
48344@@ -743,8 +743,6 @@ int netvsc_send(struct hv_device *device,
48345 packet);
48346 skb = (struct sk_buff *)
48347 (unsigned long)packet->send_completion_tid;
48348- if (skb)
48349- dev_kfree_skb_any(skb);
48350 packet->page_buf_cnt = 0;
48351 }
48352 }
48353@@ -807,6 +805,13 @@ int netvsc_send(struct hv_device *device,
48354 packet, ret);
48355 }
48356
48357+ if (ret != 0) {
48358+ if (section_index != NETVSC_INVALID_INDEX)
48359+ netvsc_free_send_slot(net_device, section_index);
48360+ } else if (skb) {
48361+ dev_kfree_skb_any(skb);
48362+ }
48363+
48364 return ret;
48365 }
48366
48367diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48368index 2b86f0b..ecc996f 100644
48369--- a/drivers/net/hyperv/rndis_filter.c
48370+++ b/drivers/net/hyperv/rndis_filter.c
48371@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48372 * template
48373 */
48374 set = &rndis_msg->msg.set_req;
48375- set->req_id = atomic_inc_return(&dev->new_req_id);
48376+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48377
48378 /* Add to the request list */
48379 spin_lock_irqsave(&dev->request_lock, flags);
48380@@ -911,7 +911,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48381
48382 /* Setup the rndis set */
48383 halt = &request->request_msg.msg.halt_req;
48384- halt->req_id = atomic_inc_return(&dev->new_req_id);
48385+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48386
48387 /* Ignore return since this msg is optional. */
48388 rndis_filter_send_request(dev, request);
48389diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
48390index 6cbc56a..5f7e6c8 100644
48391--- a/drivers/net/ieee802154/fakehard.c
48392+++ b/drivers/net/ieee802154/fakehard.c
48393@@ -365,7 +365,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
48394 phy->transmit_power = 0xbf;
48395
48396 dev->netdev_ops = &fake_ops;
48397- dev->ml_priv = &fake_mlme;
48398+ dev->ml_priv = (void *)&fake_mlme;
48399
48400 priv = netdev_priv(dev);
48401 priv->phy = phy;
48402diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48403index 34f846b..4a0d5b1 100644
48404--- a/drivers/net/ifb.c
48405+++ b/drivers/net/ifb.c
48406@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48407 return 0;
48408 }
48409
48410-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48411+static struct rtnl_link_ops ifb_link_ops = {
48412 .kind = "ifb",
48413 .priv_size = sizeof(struct ifb_private),
48414 .setup = ifb_setup,
48415diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48416index bfb0b6e..5c396ce 100644
48417--- a/drivers/net/macvlan.c
48418+++ b/drivers/net/macvlan.c
48419@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48420 free_nskb:
48421 kfree_skb(nskb);
48422 err:
48423- atomic_long_inc(&skb->dev->rx_dropped);
48424+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48425 }
48426
48427 static void macvlan_flush_sources(struct macvlan_port *port,
48428@@ -1454,13 +1454,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48429 int macvlan_link_register(struct rtnl_link_ops *ops)
48430 {
48431 /* common fields */
48432- ops->priv_size = sizeof(struct macvlan_dev);
48433- ops->validate = macvlan_validate;
48434- ops->maxtype = IFLA_MACVLAN_MAX;
48435- ops->policy = macvlan_policy;
48436- ops->changelink = macvlan_changelink;
48437- ops->get_size = macvlan_get_size;
48438- ops->fill_info = macvlan_fill_info;
48439+ pax_open_kernel();
48440+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48441+ *(void **)&ops->validate = macvlan_validate;
48442+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48443+ *(const void **)&ops->policy = macvlan_policy;
48444+ *(void **)&ops->changelink = macvlan_changelink;
48445+ *(void **)&ops->get_size = macvlan_get_size;
48446+ *(void **)&ops->fill_info = macvlan_fill_info;
48447+ pax_close_kernel();
48448
48449 return rtnl_link_register(ops);
48450 };
48451@@ -1540,7 +1542,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48452 return NOTIFY_DONE;
48453 }
48454
48455-static struct notifier_block macvlan_notifier_block __read_mostly = {
48456+static struct notifier_block macvlan_notifier_block = {
48457 .notifier_call = macvlan_device_event,
48458 };
48459
48460diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48461index 880cc09..6a68ba6 100644
48462--- a/drivers/net/macvtap.c
48463+++ b/drivers/net/macvtap.c
48464@@ -422,7 +422,7 @@ static void macvtap_setup(struct net_device *dev)
48465 dev->tx_queue_len = TUN_READQ_SIZE;
48466 }
48467
48468-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48469+static struct rtnl_link_ops macvtap_link_ops = {
48470 .kind = "macvtap",
48471 .setup = macvtap_setup,
48472 .newlink = macvtap_newlink,
48473@@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48474 }
48475
48476 ret = 0;
48477- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48478+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48479 put_user(q->flags, &ifr->ifr_flags))
48480 ret = -EFAULT;
48481 macvtap_put_vlan(vlan);
48482@@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48483 return NOTIFY_DONE;
48484 }
48485
48486-static struct notifier_block macvtap_notifier_block __read_mostly = {
48487+static struct notifier_block macvtap_notifier_block = {
48488 .notifier_call = macvtap_device_event,
48489 };
48490
48491diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48492index 34924df..a747360 100644
48493--- a/drivers/net/nlmon.c
48494+++ b/drivers/net/nlmon.c
48495@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48496 return 0;
48497 }
48498
48499-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48500+static struct rtnl_link_ops nlmon_link_ops = {
48501 .kind = "nlmon",
48502 .priv_size = sizeof(struct nlmon),
48503 .setup = nlmon_setup,
48504diff --git a/drivers/net/ppp/ppp_deflate.c b/drivers/net/ppp/ppp_deflate.c
48505index 602c625..b5edc7f 100644
48506--- a/drivers/net/ppp/ppp_deflate.c
48507+++ b/drivers/net/ppp/ppp_deflate.c
48508@@ -246,7 +246,7 @@ static int z_compress(void *arg, unsigned char *rptr, unsigned char *obuf,
48509 /*
48510 * See if we managed to reduce the size of the packet.
48511 */
48512- if (olen < isize) {
48513+ if (olen < isize && olen <= osize) {
48514 state->stats.comp_bytes += olen;
48515 state->stats.comp_packets++;
48516 } else {
48517diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48518index 794a473..9fd437b 100644
48519--- a/drivers/net/ppp/ppp_generic.c
48520+++ b/drivers/net/ppp/ppp_generic.c
48521@@ -1020,7 +1020,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48522 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48523 struct ppp_stats stats;
48524 struct ppp_comp_stats cstats;
48525- char *vers;
48526
48527 switch (cmd) {
48528 case SIOCGPPPSTATS:
48529@@ -1042,8 +1041,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48530 break;
48531
48532 case SIOCGPPPVER:
48533- vers = PPP_VERSION;
48534- if (copy_to_user(addr, vers, strlen(vers) + 1))
48535+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48536 break;
48537 err = 0;
48538 break;
48539diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48540index 079f7ad..b2a2bfa7 100644
48541--- a/drivers/net/slip/slhc.c
48542+++ b/drivers/net/slip/slhc.c
48543@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48544 register struct tcphdr *thp;
48545 register struct iphdr *ip;
48546 register struct cstate *cs;
48547- int len, hdrlen;
48548+ long len, hdrlen;
48549 unsigned char *cp = icp;
48550
48551 /* We've got a compressed packet; read the change byte */
48552diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48553index 9c505c4..5d0c879 100644
48554--- a/drivers/net/team/team.c
48555+++ b/drivers/net/team/team.c
48556@@ -2102,7 +2102,7 @@ static unsigned int team_get_num_rx_queues(void)
48557 return TEAM_DEFAULT_NUM_RX_QUEUES;
48558 }
48559
48560-static struct rtnl_link_ops team_link_ops __read_mostly = {
48561+static struct rtnl_link_ops team_link_ops = {
48562 .kind = DRV_NAME,
48563 .priv_size = sizeof(struct team),
48564 .setup = team_setup,
48565@@ -2892,7 +2892,7 @@ static int team_device_event(struct notifier_block *unused,
48566 return NOTIFY_DONE;
48567 }
48568
48569-static struct notifier_block team_notifier_block __read_mostly = {
48570+static struct notifier_block team_notifier_block = {
48571 .notifier_call = team_device_event,
48572 };
48573
48574diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48575index 9dd3746..74f191e 100644
48576--- a/drivers/net/tun.c
48577+++ b/drivers/net/tun.c
48578@@ -1426,7 +1426,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
48579 return -EINVAL;
48580 }
48581
48582-static struct rtnl_link_ops tun_link_ops __read_mostly = {
48583+static struct rtnl_link_ops tun_link_ops = {
48584 .kind = DRV_NAME,
48585 .priv_size = sizeof(struct tun_struct),
48586 .setup = tun_setup,
48587@@ -1868,7 +1868,7 @@ unlock:
48588 }
48589
48590 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48591- unsigned long arg, int ifreq_len)
48592+ unsigned long arg, size_t ifreq_len)
48593 {
48594 struct tun_file *tfile = file->private_data;
48595 struct tun_struct *tun;
48596@@ -1881,6 +1881,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48597 unsigned int ifindex;
48598 int ret;
48599
48600+ if (ifreq_len > sizeof ifr)
48601+ return -EFAULT;
48602+
48603 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
48604 if (copy_from_user(&ifr, argp, ifreq_len))
48605 return -EFAULT;
48606diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
48607index babda7d..e40c90a 100644
48608--- a/drivers/net/usb/hso.c
48609+++ b/drivers/net/usb/hso.c
48610@@ -71,7 +71,7 @@
48611 #include <asm/byteorder.h>
48612 #include <linux/serial_core.h>
48613 #include <linux/serial.h>
48614-
48615+#include <asm/local.h>
48616
48617 #define MOD_AUTHOR "Option Wireless"
48618 #define MOD_DESCRIPTION "USB High Speed Option driver"
48619@@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
48620 struct urb *urb;
48621
48622 urb = serial->rx_urb[0];
48623- if (serial->port.count > 0) {
48624+ if (atomic_read(&serial->port.count) > 0) {
48625 count = put_rxbuf_data(urb, serial);
48626 if (count == -1)
48627 return;
48628@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
48629 DUMP1(urb->transfer_buffer, urb->actual_length);
48630
48631 /* Anyone listening? */
48632- if (serial->port.count == 0)
48633+ if (atomic_read(&serial->port.count) == 0)
48634 return;
48635
48636 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
48637@@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48638 tty_port_tty_set(&serial->port, tty);
48639
48640 /* check for port already opened, if not set the termios */
48641- serial->port.count++;
48642- if (serial->port.count == 1) {
48643+ if (atomic_inc_return(&serial->port.count) == 1) {
48644 serial->rx_state = RX_IDLE;
48645 /* Force default termio settings */
48646 _hso_serial_set_termios(tty, NULL);
48647@@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48648 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
48649 if (result) {
48650 hso_stop_serial_device(serial->parent);
48651- serial->port.count--;
48652+ atomic_dec(&serial->port.count);
48653 kref_put(&serial->parent->ref, hso_serial_ref_free);
48654 }
48655 } else {
48656@@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
48657
48658 /* reset the rts and dtr */
48659 /* do the actual close */
48660- serial->port.count--;
48661+ atomic_dec(&serial->port.count);
48662
48663- if (serial->port.count <= 0) {
48664- serial->port.count = 0;
48665+ if (atomic_read(&serial->port.count) <= 0) {
48666+ atomic_set(&serial->port.count, 0);
48667 tty_port_tty_set(&serial->port, NULL);
48668 if (!usb_gone)
48669 hso_stop_serial_device(serial->parent);
48670@@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
48671
48672 /* the actual setup */
48673 spin_lock_irqsave(&serial->serial_lock, flags);
48674- if (serial->port.count)
48675+ if (atomic_read(&serial->port.count))
48676 _hso_serial_set_termios(tty, old);
48677 else
48678 tty->termios = *old;
48679@@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
48680 D1("Pending read interrupt on port %d\n", i);
48681 spin_lock(&serial->serial_lock);
48682 if (serial->rx_state == RX_IDLE &&
48683- serial->port.count > 0) {
48684+ atomic_read(&serial->port.count) > 0) {
48685 /* Setup and send a ctrl req read on
48686 * port i */
48687 if (!serial->rx_urb_filled[0]) {
48688@@ -3047,7 +3046,7 @@ static int hso_resume(struct usb_interface *iface)
48689 /* Start all serial ports */
48690 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
48691 if (serial_table[i] && (serial_table[i]->interface == iface)) {
48692- if (dev2ser(serial_table[i])->port.count) {
48693+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
48694 result =
48695 hso_start_serial_device(serial_table[i], GFP_NOIO);
48696 hso_kick_transmit(dev2ser(serial_table[i]));
48697diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
48698index c6554c7..7e2ebd7 100644
48699--- a/drivers/net/usb/r8152.c
48700+++ b/drivers/net/usb/r8152.c
48701@@ -577,7 +577,7 @@ struct r8152 {
48702 void (*unload)(struct r8152 *);
48703 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
48704 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
48705- } rtl_ops;
48706+ } __no_const rtl_ops;
48707
48708 int intr_interval;
48709 u32 saved_wolopts;
48710diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
48711index a2515887..6d13233 100644
48712--- a/drivers/net/usb/sierra_net.c
48713+++ b/drivers/net/usb/sierra_net.c
48714@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
48715 /* atomic counter partially included in MAC address to make sure 2 devices
48716 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
48717 */
48718-static atomic_t iface_counter = ATOMIC_INIT(0);
48719+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
48720
48721 /*
48722 * SYNC Timer Delay definition used to set the expiry time
48723@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
48724 dev->net->netdev_ops = &sierra_net_device_ops;
48725
48726 /* change MAC addr to include, ifacenum, and to be unique */
48727- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
48728+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
48729 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
48730
48731 /* we will have to manufacture ethernet headers, prepare template */
48732diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
48733index b0bc8ea..3af931b5 100644
48734--- a/drivers/net/virtio_net.c
48735+++ b/drivers/net/virtio_net.c
48736@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
48737 #define RECEIVE_AVG_WEIGHT 64
48738
48739 /* Minimum alignment for mergeable packet buffers. */
48740-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
48741+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
48742
48743 #define VIRTNET_DRIVER_VERSION "1.0.0"
48744
48745diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
48746index 42b2d6a5..2a2cb41 100644
48747--- a/drivers/net/vxlan.c
48748+++ b/drivers/net/vxlan.c
48749@@ -2695,7 +2695,7 @@ nla_put_failure:
48750 return -EMSGSIZE;
48751 }
48752
48753-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
48754+static struct rtnl_link_ops vxlan_link_ops = {
48755 .kind = "vxlan",
48756 .maxtype = IFLA_VXLAN_MAX,
48757 .policy = vxlan_policy,
48758@@ -2742,7 +2742,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
48759 return NOTIFY_DONE;
48760 }
48761
48762-static struct notifier_block vxlan_notifier_block __read_mostly = {
48763+static struct notifier_block vxlan_notifier_block = {
48764 .notifier_call = vxlan_lowerdev_event,
48765 };
48766
48767diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
48768index 5920c99..ff2e4a5 100644
48769--- a/drivers/net/wan/lmc/lmc_media.c
48770+++ b/drivers/net/wan/lmc/lmc_media.c
48771@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
48772 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
48773
48774 lmc_media_t lmc_ds3_media = {
48775- lmc_ds3_init, /* special media init stuff */
48776- lmc_ds3_default, /* reset to default state */
48777- lmc_ds3_set_status, /* reset status to state provided */
48778- lmc_dummy_set_1, /* set clock source */
48779- lmc_dummy_set2_1, /* set line speed */
48780- lmc_ds3_set_100ft, /* set cable length */
48781- lmc_ds3_set_scram, /* set scrambler */
48782- lmc_ds3_get_link_status, /* get link status */
48783- lmc_dummy_set_1, /* set link status */
48784- lmc_ds3_set_crc_length, /* set CRC length */
48785- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48786- lmc_ds3_watchdog
48787+ .init = lmc_ds3_init, /* special media init stuff */
48788+ .defaults = lmc_ds3_default, /* reset to default state */
48789+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
48790+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
48791+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48792+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
48793+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
48794+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
48795+ .set_link_status = lmc_dummy_set_1, /* set link status */
48796+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
48797+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48798+ .watchdog = lmc_ds3_watchdog
48799 };
48800
48801 lmc_media_t lmc_hssi_media = {
48802- lmc_hssi_init, /* special media init stuff */
48803- lmc_hssi_default, /* reset to default state */
48804- lmc_hssi_set_status, /* reset status to state provided */
48805- lmc_hssi_set_clock, /* set clock source */
48806- lmc_dummy_set2_1, /* set line speed */
48807- lmc_dummy_set_1, /* set cable length */
48808- lmc_dummy_set_1, /* set scrambler */
48809- lmc_hssi_get_link_status, /* get link status */
48810- lmc_hssi_set_link_status, /* set link status */
48811- lmc_hssi_set_crc_length, /* set CRC length */
48812- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48813- lmc_hssi_watchdog
48814+ .init = lmc_hssi_init, /* special media init stuff */
48815+ .defaults = lmc_hssi_default, /* reset to default state */
48816+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
48817+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
48818+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48819+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48820+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48821+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
48822+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
48823+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
48824+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48825+ .watchdog = lmc_hssi_watchdog
48826 };
48827
48828-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
48829- lmc_ssi_default, /* reset to default state */
48830- lmc_ssi_set_status, /* reset status to state provided */
48831- lmc_ssi_set_clock, /* set clock source */
48832- lmc_ssi_set_speed, /* set line speed */
48833- lmc_dummy_set_1, /* set cable length */
48834- lmc_dummy_set_1, /* set scrambler */
48835- lmc_ssi_get_link_status, /* get link status */
48836- lmc_ssi_set_link_status, /* set link status */
48837- lmc_ssi_set_crc_length, /* set CRC length */
48838- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48839- lmc_ssi_watchdog
48840+lmc_media_t lmc_ssi_media = {
48841+ .init = lmc_ssi_init, /* special media init stuff */
48842+ .defaults = lmc_ssi_default, /* reset to default state */
48843+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
48844+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
48845+ .set_speed = lmc_ssi_set_speed, /* set line speed */
48846+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48847+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48848+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
48849+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
48850+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
48851+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48852+ .watchdog = lmc_ssi_watchdog
48853 };
48854
48855 lmc_media_t lmc_t1_media = {
48856- lmc_t1_init, /* special media init stuff */
48857- lmc_t1_default, /* reset to default state */
48858- lmc_t1_set_status, /* reset status to state provided */
48859- lmc_t1_set_clock, /* set clock source */
48860- lmc_dummy_set2_1, /* set line speed */
48861- lmc_dummy_set_1, /* set cable length */
48862- lmc_dummy_set_1, /* set scrambler */
48863- lmc_t1_get_link_status, /* get link status */
48864- lmc_dummy_set_1, /* set link status */
48865- lmc_t1_set_crc_length, /* set CRC length */
48866- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48867- lmc_t1_watchdog
48868+ .init = lmc_t1_init, /* special media init stuff */
48869+ .defaults = lmc_t1_default, /* reset to default state */
48870+ .set_status = lmc_t1_set_status, /* reset status to state provided */
48871+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
48872+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48873+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48874+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48875+ .get_link_status = lmc_t1_get_link_status, /* get link status */
48876+ .set_link_status = lmc_dummy_set_1, /* set link status */
48877+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
48878+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48879+ .watchdog = lmc_t1_watchdog
48880 };
48881
48882 static void
48883diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
48884index feacc3b..5bac0de 100644
48885--- a/drivers/net/wan/z85230.c
48886+++ b/drivers/net/wan/z85230.c
48887@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
48888
48889 struct z8530_irqhandler z8530_sync =
48890 {
48891- z8530_rx,
48892- z8530_tx,
48893- z8530_status
48894+ .rx = z8530_rx,
48895+ .tx = z8530_tx,
48896+ .status = z8530_status
48897 };
48898
48899 EXPORT_SYMBOL(z8530_sync);
48900@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
48901 }
48902
48903 static struct z8530_irqhandler z8530_dma_sync = {
48904- z8530_dma_rx,
48905- z8530_dma_tx,
48906- z8530_dma_status
48907+ .rx = z8530_dma_rx,
48908+ .tx = z8530_dma_tx,
48909+ .status = z8530_dma_status
48910 };
48911
48912 static struct z8530_irqhandler z8530_txdma_sync = {
48913- z8530_rx,
48914- z8530_dma_tx,
48915- z8530_dma_status
48916+ .rx = z8530_rx,
48917+ .tx = z8530_dma_tx,
48918+ .status = z8530_dma_status
48919 };
48920
48921 /**
48922@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
48923
48924 struct z8530_irqhandler z8530_nop=
48925 {
48926- z8530_rx_clear,
48927- z8530_tx_clear,
48928- z8530_status_clear
48929+ .rx = z8530_rx_clear,
48930+ .tx = z8530_tx_clear,
48931+ .status = z8530_status_clear
48932 };
48933
48934
48935diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
48936index 0b60295..b8bfa5b 100644
48937--- a/drivers/net/wimax/i2400m/rx.c
48938+++ b/drivers/net/wimax/i2400m/rx.c
48939@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
48940 if (i2400m->rx_roq == NULL)
48941 goto error_roq_alloc;
48942
48943- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
48944+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
48945 GFP_KERNEL);
48946 if (rd == NULL) {
48947 result = -ENOMEM;
48948diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
48949index e71a2ce..2268d61 100644
48950--- a/drivers/net/wireless/airo.c
48951+++ b/drivers/net/wireless/airo.c
48952@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
48953 struct airo_info *ai = dev->ml_priv;
48954 int ridcode;
48955 int enabled;
48956- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48957+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48958 unsigned char *iobuf;
48959
48960 /* Only super-user can write RIDs */
48961diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
48962index da92bfa..5a9001a 100644
48963--- a/drivers/net/wireless/at76c50x-usb.c
48964+++ b/drivers/net/wireless/at76c50x-usb.c
48965@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
48966 }
48967
48968 /* Convert timeout from the DFU status to jiffies */
48969-static inline unsigned long at76_get_timeout(struct dfu_status *s)
48970+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
48971 {
48972 return msecs_to_jiffies((s->poll_timeout[2] << 16)
48973 | (s->poll_timeout[1] << 8)
48974diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
48975index 676bd4e..0b807a3 100644
48976--- a/drivers/net/wireless/ath/ath10k/htc.c
48977+++ b/drivers/net/wireless/ath/ath10k/htc.c
48978@@ -848,7 +848,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
48979 /* registered target arrival callback from the HIF layer */
48980 int ath10k_htc_init(struct ath10k *ar)
48981 {
48982- struct ath10k_hif_cb htc_callbacks;
48983+ static struct ath10k_hif_cb htc_callbacks = {
48984+ .rx_completion = ath10k_htc_rx_completion_handler,
48985+ .tx_completion = ath10k_htc_tx_completion_handler,
48986+ };
48987 struct ath10k_htc_ep *ep = NULL;
48988 struct ath10k_htc *htc = &ar->htc;
48989
48990@@ -857,8 +860,6 @@ int ath10k_htc_init(struct ath10k *ar)
48991 ath10k_htc_reset_endpoint_states(htc);
48992
48993 /* setup HIF layer callbacks */
48994- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
48995- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
48996 htc->ar = ar;
48997
48998 /* Get HIF default pipe for HTC message exchange */
48999diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49000index 527179c..a890150 100644
49001--- a/drivers/net/wireless/ath/ath10k/htc.h
49002+++ b/drivers/net/wireless/ath/ath10k/htc.h
49003@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49004
49005 struct ath10k_htc_ops {
49006 void (*target_send_suspend_complete)(struct ath10k *ar);
49007-};
49008+} __no_const;
49009
49010 struct ath10k_htc_ep_ops {
49011 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49012 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49013 void (*ep_tx_credits)(struct ath10k *);
49014-};
49015+} __no_const;
49016
49017 /* service connection information */
49018 struct ath10k_htc_svc_conn_req {
49019diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49020index 2a93519..7052786 100644
49021--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49022+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49023@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49024 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49025 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49026
49027- ACCESS_ONCE(ads->ds_link) = i->link;
49028- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49029+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49030+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49031
49032 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49033 ctl6 = SM(i->keytype, AR_EncrType);
49034@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49035
49036 if ((i->is_first || i->is_last) &&
49037 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49038- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49039+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49040 | set11nTries(i->rates, 1)
49041 | set11nTries(i->rates, 2)
49042 | set11nTries(i->rates, 3)
49043 | (i->dur_update ? AR_DurUpdateEna : 0)
49044 | SM(0, AR_BurstDur);
49045
49046- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49047+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49048 | set11nRate(i->rates, 1)
49049 | set11nRate(i->rates, 2)
49050 | set11nRate(i->rates, 3);
49051 } else {
49052- ACCESS_ONCE(ads->ds_ctl2) = 0;
49053- ACCESS_ONCE(ads->ds_ctl3) = 0;
49054+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49055+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49056 }
49057
49058 if (!i->is_first) {
49059- ACCESS_ONCE(ads->ds_ctl0) = 0;
49060- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49061- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49062+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49063+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49064+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49065 return;
49066 }
49067
49068@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49069 break;
49070 }
49071
49072- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49073+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49074 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49075 | SM(i->txpower, AR_XmitPower0)
49076 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49077@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49078 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
49079 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
49080
49081- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49082- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49083+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49084+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49085
49086 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
49087 return;
49088
49089- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49090+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49091 | set11nPktDurRTSCTS(i->rates, 1);
49092
49093- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49094+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49095 | set11nPktDurRTSCTS(i->rates, 3);
49096
49097- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49098+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49099 | set11nRateFlags(i->rates, 1)
49100 | set11nRateFlags(i->rates, 2)
49101 | set11nRateFlags(i->rates, 3)
49102 | SM(i->rtscts_rate, AR_RTSCTSRate);
49103
49104- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
49105- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
49106- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
49107+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
49108+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
49109+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
49110 }
49111
49112 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49113diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49114index 057b165..98ae88f 100644
49115--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49116+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49117@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49118 (i->qcu << AR_TxQcuNum_S) | desc_len;
49119
49120 checksum += val;
49121- ACCESS_ONCE(ads->info) = val;
49122+ ACCESS_ONCE_RW(ads->info) = val;
49123
49124 checksum += i->link;
49125- ACCESS_ONCE(ads->link) = i->link;
49126+ ACCESS_ONCE_RW(ads->link) = i->link;
49127
49128 checksum += i->buf_addr[0];
49129- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49130+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49131 checksum += i->buf_addr[1];
49132- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49133+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49134 checksum += i->buf_addr[2];
49135- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49136+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49137 checksum += i->buf_addr[3];
49138- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49139+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49140
49141 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49142- ACCESS_ONCE(ads->ctl3) = val;
49143+ ACCESS_ONCE_RW(ads->ctl3) = val;
49144 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49145- ACCESS_ONCE(ads->ctl5) = val;
49146+ ACCESS_ONCE_RW(ads->ctl5) = val;
49147 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49148- ACCESS_ONCE(ads->ctl7) = val;
49149+ ACCESS_ONCE_RW(ads->ctl7) = val;
49150 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49151- ACCESS_ONCE(ads->ctl9) = val;
49152+ ACCESS_ONCE_RW(ads->ctl9) = val;
49153
49154 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49155- ACCESS_ONCE(ads->ctl10) = checksum;
49156+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
49157
49158 if (i->is_first || i->is_last) {
49159- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49160+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49161 | set11nTries(i->rates, 1)
49162 | set11nTries(i->rates, 2)
49163 | set11nTries(i->rates, 3)
49164 | (i->dur_update ? AR_DurUpdateEna : 0)
49165 | SM(0, AR_BurstDur);
49166
49167- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49168+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49169 | set11nRate(i->rates, 1)
49170 | set11nRate(i->rates, 2)
49171 | set11nRate(i->rates, 3);
49172 } else {
49173- ACCESS_ONCE(ads->ctl13) = 0;
49174- ACCESS_ONCE(ads->ctl14) = 0;
49175+ ACCESS_ONCE_RW(ads->ctl13) = 0;
49176+ ACCESS_ONCE_RW(ads->ctl14) = 0;
49177 }
49178
49179 ads->ctl20 = 0;
49180@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49181
49182 ctl17 = SM(i->keytype, AR_EncrType);
49183 if (!i->is_first) {
49184- ACCESS_ONCE(ads->ctl11) = 0;
49185- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49186- ACCESS_ONCE(ads->ctl15) = 0;
49187- ACCESS_ONCE(ads->ctl16) = 0;
49188- ACCESS_ONCE(ads->ctl17) = ctl17;
49189- ACCESS_ONCE(ads->ctl18) = 0;
49190- ACCESS_ONCE(ads->ctl19) = 0;
49191+ ACCESS_ONCE_RW(ads->ctl11) = 0;
49192+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49193+ ACCESS_ONCE_RW(ads->ctl15) = 0;
49194+ ACCESS_ONCE_RW(ads->ctl16) = 0;
49195+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49196+ ACCESS_ONCE_RW(ads->ctl18) = 0;
49197+ ACCESS_ONCE_RW(ads->ctl19) = 0;
49198 return;
49199 }
49200
49201- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49202+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49203 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49204 | SM(i->txpower, AR_XmitPower0)
49205 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49206@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49207 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49208 ctl12 |= SM(val, AR_PAPRDChainMask);
49209
49210- ACCESS_ONCE(ads->ctl12) = ctl12;
49211- ACCESS_ONCE(ads->ctl17) = ctl17;
49212+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49213+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49214
49215- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49216+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49217 | set11nPktDurRTSCTS(i->rates, 1);
49218
49219- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49220+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49221 | set11nPktDurRTSCTS(i->rates, 3);
49222
49223- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49224+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49225 | set11nRateFlags(i->rates, 1)
49226 | set11nRateFlags(i->rates, 2)
49227 | set11nRateFlags(i->rates, 3)
49228 | SM(i->rtscts_rate, AR_RTSCTSRate);
49229
49230- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49231+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49232
49233- ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49234- ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49235- ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49236+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49237+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49238+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49239 }
49240
49241 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49242diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49243index e8e8dd2..030f80e 100644
49244--- a/drivers/net/wireless/ath/ath9k/hw.h
49245+++ b/drivers/net/wireless/ath/ath9k/hw.h
49246@@ -630,7 +630,7 @@ struct ath_hw_private_ops {
49247
49248 /* ANI */
49249 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49250-};
49251+} __no_const;
49252
49253 /**
49254 * struct ath_spec_scan - parameters for Atheros spectral scan
49255@@ -708,7 +708,7 @@ struct ath_hw_ops {
49256 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49257 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49258 #endif
49259-};
49260+} __no_const;
49261
49262 struct ath_nf_limits {
49263 s16 max;
49264diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49265index 4f18a6b..b07d92f 100644
49266--- a/drivers/net/wireless/ath/ath9k/main.c
49267+++ b/drivers/net/wireless/ath/ath9k/main.c
49268@@ -2454,16 +2454,18 @@ void ath9k_fill_chanctx_ops(void)
49269 if (!ath9k_is_chanctx_enabled())
49270 return;
49271
49272- ath9k_ops.hw_scan = ath9k_hw_scan;
49273- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49274- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49275- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49276- ath9k_ops.add_chanctx = ath9k_add_chanctx;
49277- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49278- ath9k_ops.change_chanctx = ath9k_change_chanctx;
49279- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49280- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49281- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49282+ pax_open_kernel();
49283+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49284+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49285+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49286+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49287+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49288+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49289+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49290+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49291+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49292+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49293+ pax_close_kernel();
49294 }
49295
49296 #endif
49297diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49298index 058a9f2..d5cb1ba 100644
49299--- a/drivers/net/wireless/b43/phy_lp.c
49300+++ b/drivers/net/wireless/b43/phy_lp.c
49301@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49302 {
49303 struct ssb_bus *bus = dev->dev->sdev->bus;
49304
49305- static const struct b206x_channel *chandata = NULL;
49306+ const struct b206x_channel *chandata = NULL;
49307 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49308 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49309 u16 old_comm15, scale;
49310diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49311index dc1d20c..f7a4f06 100644
49312--- a/drivers/net/wireless/iwlegacy/3945-mac.c
49313+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49314@@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49315 */
49316 if (il3945_mod_params.disable_hw_scan) {
49317 D_INFO("Disabling hw_scan\n");
49318- il3945_mac_ops.hw_scan = NULL;
49319+ pax_open_kernel();
49320+ *(void **)&il3945_mac_ops.hw_scan = NULL;
49321+ pax_close_kernel();
49322 }
49323
49324 D_INFO("*** LOAD DRIVER ***\n");
49325diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49326index 0ffb6ff..c0b7f0e 100644
49327--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49328+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49329@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49330 {
49331 struct iwl_priv *priv = file->private_data;
49332 char buf[64];
49333- int buf_size;
49334+ size_t buf_size;
49335 u32 offset, len;
49336
49337 memset(buf, 0, sizeof(buf));
49338@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49339 struct iwl_priv *priv = file->private_data;
49340
49341 char buf[8];
49342- int buf_size;
49343+ size_t buf_size;
49344 u32 reset_flag;
49345
49346 memset(buf, 0, sizeof(buf));
49347@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49348 {
49349 struct iwl_priv *priv = file->private_data;
49350 char buf[8];
49351- int buf_size;
49352+ size_t buf_size;
49353 int ht40;
49354
49355 memset(buf, 0, sizeof(buf));
49356@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49357 {
49358 struct iwl_priv *priv = file->private_data;
49359 char buf[8];
49360- int buf_size;
49361+ size_t buf_size;
49362 int value;
49363
49364 memset(buf, 0, sizeof(buf));
49365@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49366 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49367 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49368
49369-static const char *fmt_value = " %-30s %10u\n";
49370-static const char *fmt_hex = " %-30s 0x%02X\n";
49371-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49372-static const char *fmt_header =
49373+static const char fmt_value[] = " %-30s %10u\n";
49374+static const char fmt_hex[] = " %-30s 0x%02X\n";
49375+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49376+static const char fmt_header[] =
49377 "%-32s current cumulative delta max\n";
49378
49379 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49380@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49381 {
49382 struct iwl_priv *priv = file->private_data;
49383 char buf[8];
49384- int buf_size;
49385+ size_t buf_size;
49386 int clear;
49387
49388 memset(buf, 0, sizeof(buf));
49389@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49390 {
49391 struct iwl_priv *priv = file->private_data;
49392 char buf[8];
49393- int buf_size;
49394+ size_t buf_size;
49395 int trace;
49396
49397 memset(buf, 0, sizeof(buf));
49398@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49399 {
49400 struct iwl_priv *priv = file->private_data;
49401 char buf[8];
49402- int buf_size;
49403+ size_t buf_size;
49404 int missed;
49405
49406 memset(buf, 0, sizeof(buf));
49407@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49408
49409 struct iwl_priv *priv = file->private_data;
49410 char buf[8];
49411- int buf_size;
49412+ size_t buf_size;
49413 int plcp;
49414
49415 memset(buf, 0, sizeof(buf));
49416@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49417
49418 struct iwl_priv *priv = file->private_data;
49419 char buf[8];
49420- int buf_size;
49421+ size_t buf_size;
49422 int flush;
49423
49424 memset(buf, 0, sizeof(buf));
49425@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49426
49427 struct iwl_priv *priv = file->private_data;
49428 char buf[8];
49429- int buf_size;
49430+ size_t buf_size;
49431 int rts;
49432
49433 if (!priv->cfg->ht_params)
49434@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49435 {
49436 struct iwl_priv *priv = file->private_data;
49437 char buf[8];
49438- int buf_size;
49439+ size_t buf_size;
49440
49441 memset(buf, 0, sizeof(buf));
49442 buf_size = min(count, sizeof(buf) - 1);
49443@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49444 struct iwl_priv *priv = file->private_data;
49445 u32 event_log_flag;
49446 char buf[8];
49447- int buf_size;
49448+ size_t buf_size;
49449
49450 /* check that the interface is up */
49451 if (!iwl_is_ready(priv))
49452@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49453 struct iwl_priv *priv = file->private_data;
49454 char buf[8];
49455 u32 calib_disabled;
49456- int buf_size;
49457+ size_t buf_size;
49458
49459 memset(buf, 0, sizeof(buf));
49460 buf_size = min(count, sizeof(buf) - 1);
49461diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49462index dd2f3f8..fb1ae88 100644
49463--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49464+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49465@@ -1689,7 +1689,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49466 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49467
49468 char buf[8];
49469- int buf_size;
49470+ size_t buf_size;
49471 u32 reset_flag;
49472
49473 memset(buf, 0, sizeof(buf));
49474@@ -1710,7 +1710,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49475 {
49476 struct iwl_trans *trans = file->private_data;
49477 char buf[8];
49478- int buf_size;
49479+ size_t buf_size;
49480 int csr;
49481
49482 memset(buf, 0, sizeof(buf));
49483diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49484index c9ad4cf..49a2fa0 100644
49485--- a/drivers/net/wireless/mac80211_hwsim.c
49486+++ b/drivers/net/wireless/mac80211_hwsim.c
49487@@ -2577,20 +2577,20 @@ static int __init init_mac80211_hwsim(void)
49488 if (channels < 1)
49489 return -EINVAL;
49490
49491- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49492- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49493- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49494- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49495- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49496- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49497- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49498- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49499- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49500- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49501- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49502- mac80211_hwsim_assign_vif_chanctx;
49503- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49504- mac80211_hwsim_unassign_vif_chanctx;
49505+ pax_open_kernel();
49506+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49507+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49508+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49509+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49510+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49511+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49512+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49513+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49514+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49515+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49516+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49517+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49518+ pax_close_kernel();
49519
49520 spin_lock_init(&hwsim_radio_lock);
49521 INIT_LIST_HEAD(&hwsim_radios);
49522diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49523index 1a4facd..a2ecbbd 100644
49524--- a/drivers/net/wireless/rndis_wlan.c
49525+++ b/drivers/net/wireless/rndis_wlan.c
49526@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49527
49528 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49529
49530- if (rts_threshold < 0 || rts_threshold > 2347)
49531+ if (rts_threshold > 2347)
49532 rts_threshold = 2347;
49533
49534 tmp = cpu_to_le32(rts_threshold);
49535diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49536index d13f25c..2573994 100644
49537--- a/drivers/net/wireless/rt2x00/rt2x00.h
49538+++ b/drivers/net/wireless/rt2x00/rt2x00.h
49539@@ -375,7 +375,7 @@ struct rt2x00_intf {
49540 * for hardware which doesn't support hardware
49541 * sequence counting.
49542 */
49543- atomic_t seqno;
49544+ atomic_unchecked_t seqno;
49545 };
49546
49547 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49548diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49549index 66ff364..3ce34f7 100644
49550--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49551+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49552@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49553 * sequence counter given by mac80211.
49554 */
49555 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49556- seqno = atomic_add_return(0x10, &intf->seqno);
49557+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49558 else
49559- seqno = atomic_read(&intf->seqno);
49560+ seqno = atomic_read_unchecked(&intf->seqno);
49561
49562 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49563 hdr->seq_ctrl |= cpu_to_le16(seqno);
49564diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49565index b661f896..ddf7d2b 100644
49566--- a/drivers/net/wireless/ti/wl1251/sdio.c
49567+++ b/drivers/net/wireless/ti/wl1251/sdio.c
49568@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49569
49570 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49571
49572- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49573- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49574+ pax_open_kernel();
49575+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49576+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49577+ pax_close_kernel();
49578
49579 wl1251_info("using dedicated interrupt line");
49580 } else {
49581- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49582- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49583+ pax_open_kernel();
49584+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49585+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49586+ pax_close_kernel();
49587
49588 wl1251_info("using SDIO interrupt");
49589 }
49590diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
49591index 0bccf12..3d95068 100644
49592--- a/drivers/net/wireless/ti/wl12xx/main.c
49593+++ b/drivers/net/wireless/ti/wl12xx/main.c
49594@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49595 sizeof(wl->conf.mem));
49596
49597 /* read data preparation is only needed by wl127x */
49598- wl->ops->prepare_read = wl127x_prepare_read;
49599+ pax_open_kernel();
49600+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49601+ pax_close_kernel();
49602
49603 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49604 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49605@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49606 sizeof(wl->conf.mem));
49607
49608 /* read data preparation is only needed by wl127x */
49609- wl->ops->prepare_read = wl127x_prepare_read;
49610+ pax_open_kernel();
49611+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49612+ pax_close_kernel();
49613
49614 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49615 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49616diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
49617index 7af1936..128bb35 100644
49618--- a/drivers/net/wireless/ti/wl18xx/main.c
49619+++ b/drivers/net/wireless/ti/wl18xx/main.c
49620@@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
49621 }
49622
49623 if (!checksum_param) {
49624- wl18xx_ops.set_rx_csum = NULL;
49625- wl18xx_ops.init_vif = NULL;
49626+ pax_open_kernel();
49627+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
49628+ *(void **)&wl18xx_ops.init_vif = NULL;
49629+ pax_close_kernel();
49630 }
49631
49632 /* Enable 11a Band only if we have 5G antennas */
49633diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
49634index a912dc0..a8225ba 100644
49635--- a/drivers/net/wireless/zd1211rw/zd_usb.c
49636+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
49637@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
49638 {
49639 struct zd_usb *usb = urb->context;
49640 struct zd_usb_interrupt *intr = &usb->intr;
49641- int len;
49642+ unsigned int len;
49643 u16 int_num;
49644
49645 ZD_ASSERT(in_interrupt());
49646diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
49647index 683671a..4519fc2 100644
49648--- a/drivers/nfc/nfcwilink.c
49649+++ b/drivers/nfc/nfcwilink.c
49650@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
49651
49652 static int nfcwilink_probe(struct platform_device *pdev)
49653 {
49654- static struct nfcwilink *drv;
49655+ struct nfcwilink *drv;
49656 int rc;
49657 __u32 protocols;
49658
49659diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
49660index d93b2b6..ae50401 100644
49661--- a/drivers/oprofile/buffer_sync.c
49662+++ b/drivers/oprofile/buffer_sync.c
49663@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
49664 if (cookie == NO_COOKIE)
49665 offset = pc;
49666 if (cookie == INVALID_COOKIE) {
49667- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49668+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49669 offset = pc;
49670 }
49671 if (cookie != last_cookie) {
49672@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
49673 /* add userspace sample */
49674
49675 if (!mm) {
49676- atomic_inc(&oprofile_stats.sample_lost_no_mm);
49677+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
49678 return 0;
49679 }
49680
49681 cookie = lookup_dcookie(mm, s->eip, &offset);
49682
49683 if (cookie == INVALID_COOKIE) {
49684- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49685+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49686 return 0;
49687 }
49688
49689@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
49690 /* ignore backtraces if failed to add a sample */
49691 if (state == sb_bt_start) {
49692 state = sb_bt_ignore;
49693- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
49694+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
49695 }
49696 }
49697 release_mm(mm);
49698diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
49699index c0cc4e7..44d4e54 100644
49700--- a/drivers/oprofile/event_buffer.c
49701+++ b/drivers/oprofile/event_buffer.c
49702@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
49703 }
49704
49705 if (buffer_pos == buffer_size) {
49706- atomic_inc(&oprofile_stats.event_lost_overflow);
49707+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
49708 return;
49709 }
49710
49711diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
49712index ed2c3ec..deda85a 100644
49713--- a/drivers/oprofile/oprof.c
49714+++ b/drivers/oprofile/oprof.c
49715@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
49716 if (oprofile_ops.switch_events())
49717 return;
49718
49719- atomic_inc(&oprofile_stats.multiplex_counter);
49720+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
49721 start_switch_worker();
49722 }
49723
49724diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
49725index ee2cfce..7f8f699 100644
49726--- a/drivers/oprofile/oprofile_files.c
49727+++ b/drivers/oprofile/oprofile_files.c
49728@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
49729
49730 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
49731
49732-static ssize_t timeout_read(struct file *file, char __user *buf,
49733+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
49734 size_t count, loff_t *offset)
49735 {
49736 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
49737diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
49738index 59659ce..6c860a0 100644
49739--- a/drivers/oprofile/oprofile_stats.c
49740+++ b/drivers/oprofile/oprofile_stats.c
49741@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
49742 cpu_buf->sample_invalid_eip = 0;
49743 }
49744
49745- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
49746- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
49747- atomic_set(&oprofile_stats.event_lost_overflow, 0);
49748- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
49749- atomic_set(&oprofile_stats.multiplex_counter, 0);
49750+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
49751+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
49752+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
49753+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
49754+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
49755 }
49756
49757
49758diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
49759index 1fc622b..8c48fc3 100644
49760--- a/drivers/oprofile/oprofile_stats.h
49761+++ b/drivers/oprofile/oprofile_stats.h
49762@@ -13,11 +13,11 @@
49763 #include <linux/atomic.h>
49764
49765 struct oprofile_stat_struct {
49766- atomic_t sample_lost_no_mm;
49767- atomic_t sample_lost_no_mapping;
49768- atomic_t bt_lost_no_mapping;
49769- atomic_t event_lost_overflow;
49770- atomic_t multiplex_counter;
49771+ atomic_unchecked_t sample_lost_no_mm;
49772+ atomic_unchecked_t sample_lost_no_mapping;
49773+ atomic_unchecked_t bt_lost_no_mapping;
49774+ atomic_unchecked_t event_lost_overflow;
49775+ atomic_unchecked_t multiplex_counter;
49776 };
49777
49778 extern struct oprofile_stat_struct oprofile_stats;
49779diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
49780index 3f49345..c750d0b 100644
49781--- a/drivers/oprofile/oprofilefs.c
49782+++ b/drivers/oprofile/oprofilefs.c
49783@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
49784
49785 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
49786 {
49787- atomic_t *val = file->private_data;
49788- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
49789+ atomic_unchecked_t *val = file->private_data;
49790+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
49791 }
49792
49793
49794@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
49795
49796
49797 int oprofilefs_create_ro_atomic(struct dentry *root,
49798- char const *name, atomic_t *val)
49799+ char const *name, atomic_unchecked_t *val)
49800 {
49801 return __oprofilefs_create_file(root, name,
49802 &atomic_ro_fops, 0444, val);
49803diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
49804index bdef916..88c7dee 100644
49805--- a/drivers/oprofile/timer_int.c
49806+++ b/drivers/oprofile/timer_int.c
49807@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
49808 return NOTIFY_OK;
49809 }
49810
49811-static struct notifier_block __refdata oprofile_cpu_notifier = {
49812+static struct notifier_block oprofile_cpu_notifier = {
49813 .notifier_call = oprofile_cpu_notify,
49814 };
49815
49816diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
49817index 3b47080..6cd05dd 100644
49818--- a/drivers/parport/procfs.c
49819+++ b/drivers/parport/procfs.c
49820@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
49821
49822 *ppos += len;
49823
49824- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
49825+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
49826 }
49827
49828 #ifdef CONFIG_PARPORT_1284
49829@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
49830
49831 *ppos += len;
49832
49833- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
49834+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
49835 }
49836 #endif /* IEEE1284.3 support. */
49837
49838diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
49839index 6ca2399..68d866b 100644
49840--- a/drivers/pci/hotplug/acpiphp_ibm.c
49841+++ b/drivers/pci/hotplug/acpiphp_ibm.c
49842@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
49843 goto init_cleanup;
49844 }
49845
49846- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49847+ pax_open_kernel();
49848+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49849+ pax_close_kernel();
49850 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
49851
49852 return retval;
49853diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
49854index 66b7bbe..26bee78 100644
49855--- a/drivers/pci/hotplug/cpcihp_generic.c
49856+++ b/drivers/pci/hotplug/cpcihp_generic.c
49857@@ -73,7 +73,6 @@ static u16 port;
49858 static unsigned int enum_bit;
49859 static u8 enum_mask;
49860
49861-static struct cpci_hp_controller_ops generic_hpc_ops;
49862 static struct cpci_hp_controller generic_hpc;
49863
49864 static int __init validate_parameters(void)
49865@@ -139,6 +138,10 @@ static int query_enum(void)
49866 return ((value & enum_mask) == enum_mask);
49867 }
49868
49869+static struct cpci_hp_controller_ops generic_hpc_ops = {
49870+ .query_enum = query_enum,
49871+};
49872+
49873 static int __init cpcihp_generic_init(void)
49874 {
49875 int status;
49876@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
49877 pci_dev_put(dev);
49878
49879 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
49880- generic_hpc_ops.query_enum = query_enum;
49881 generic_hpc.ops = &generic_hpc_ops;
49882
49883 status = cpci_hp_register_controller(&generic_hpc);
49884diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
49885index 7ecf34e..effed62 100644
49886--- a/drivers/pci/hotplug/cpcihp_zt5550.c
49887+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
49888@@ -59,7 +59,6 @@
49889 /* local variables */
49890 static bool debug;
49891 static bool poll;
49892-static struct cpci_hp_controller_ops zt5550_hpc_ops;
49893 static struct cpci_hp_controller zt5550_hpc;
49894
49895 /* Primary cPCI bus bridge device */
49896@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
49897 return 0;
49898 }
49899
49900+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
49901+ .query_enum = zt5550_hc_query_enum,
49902+};
49903+
49904 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
49905 {
49906 int status;
49907@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
49908 dbg("returned from zt5550_hc_config");
49909
49910 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
49911- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
49912 zt5550_hpc.ops = &zt5550_hpc_ops;
49913 if (!poll) {
49914 zt5550_hpc.irq = hc_dev->irq;
49915 zt5550_hpc.irq_flags = IRQF_SHARED;
49916 zt5550_hpc.dev_id = hc_dev;
49917
49918- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49919- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49920- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49921+ pax_open_kernel();
49922+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49923+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49924+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49925+ pax_open_kernel();
49926 } else {
49927 info("using ENUM# polling mode");
49928 }
49929diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
49930index 1e08ff8c..3cd145f 100644
49931--- a/drivers/pci/hotplug/cpqphp_nvram.c
49932+++ b/drivers/pci/hotplug/cpqphp_nvram.c
49933@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
49934
49935 void compaq_nvram_init (void __iomem *rom_start)
49936 {
49937+#ifndef CONFIG_PAX_KERNEXEC
49938 if (rom_start)
49939 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
49940+#endif
49941
49942 dbg("int15 entry = %p\n", compaq_int15_entry_point);
49943
49944diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
49945index 56d8486..f26113f 100644
49946--- a/drivers/pci/hotplug/pci_hotplug_core.c
49947+++ b/drivers/pci/hotplug/pci_hotplug_core.c
49948@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
49949 return -EINVAL;
49950 }
49951
49952- slot->ops->owner = owner;
49953- slot->ops->mod_name = mod_name;
49954+ pax_open_kernel();
49955+ *(struct module **)&slot->ops->owner = owner;
49956+ *(const char **)&slot->ops->mod_name = mod_name;
49957+ pax_close_kernel();
49958
49959 mutex_lock(&pci_hp_mutex);
49960 /*
49961diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
49962index 07aa722..84514b4 100644
49963--- a/drivers/pci/hotplug/pciehp_core.c
49964+++ b/drivers/pci/hotplug/pciehp_core.c
49965@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
49966 struct slot *slot = ctrl->slot;
49967 struct hotplug_slot *hotplug = NULL;
49968 struct hotplug_slot_info *info = NULL;
49969- struct hotplug_slot_ops *ops = NULL;
49970+ hotplug_slot_ops_no_const *ops = NULL;
49971 char name[SLOT_NAME_SIZE];
49972 int retval = -ENOMEM;
49973
49974diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
49975index 084587d..4a8f9df 100644
49976--- a/drivers/pci/msi.c
49977+++ b/drivers/pci/msi.c
49978@@ -488,8 +488,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
49979 {
49980 struct attribute **msi_attrs;
49981 struct attribute *msi_attr;
49982- struct device_attribute *msi_dev_attr;
49983- struct attribute_group *msi_irq_group;
49984+ device_attribute_no_const *msi_dev_attr;
49985+ attribute_group_no_const *msi_irq_group;
49986 const struct attribute_group **msi_irq_groups;
49987 struct msi_desc *entry;
49988 int ret = -ENOMEM;
49989@@ -549,7 +549,7 @@ error_attrs:
49990 count = 0;
49991 msi_attr = msi_attrs[count];
49992 while (msi_attr) {
49993- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
49994+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
49995 kfree(msi_attr->name);
49996 kfree(msi_dev_attr);
49997 ++count;
49998diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
49999index 2c6643f..3a6d8e0 100644
50000--- a/drivers/pci/pci-sysfs.c
50001+++ b/drivers/pci/pci-sysfs.c
50002@@ -1133,7 +1133,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
50003 {
50004 /* allocate attribute structure, piggyback attribute name */
50005 int name_len = write_combine ? 13 : 10;
50006- struct bin_attribute *res_attr;
50007+ bin_attribute_no_const *res_attr;
50008 int retval;
50009
50010 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
50011@@ -1310,7 +1310,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
50012 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
50013 {
50014 int retval;
50015- struct bin_attribute *attr;
50016+ bin_attribute_no_const *attr;
50017
50018 /* If the device has VPD, try to expose it in sysfs. */
50019 if (dev->vpd) {
50020@@ -1357,7 +1357,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
50021 {
50022 int retval;
50023 int rom_size = 0;
50024- struct bin_attribute *attr;
50025+ bin_attribute_no_const *attr;
50026
50027 if (!sysfs_initialized)
50028 return -EACCES;
50029diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
50030index b5defca..e3664cc 100644
50031--- a/drivers/pci/pci.h
50032+++ b/drivers/pci/pci.h
50033@@ -93,7 +93,7 @@ struct pci_vpd_ops {
50034 struct pci_vpd {
50035 unsigned int len;
50036 const struct pci_vpd_ops *ops;
50037- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
50038+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
50039 };
50040
50041 int pci_vpd_pci22_init(struct pci_dev *dev);
50042diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
50043index e1e7026..d28dd33 100644
50044--- a/drivers/pci/pcie/aspm.c
50045+++ b/drivers/pci/pcie/aspm.c
50046@@ -27,9 +27,9 @@
50047 #define MODULE_PARAM_PREFIX "pcie_aspm."
50048
50049 /* Note: those are not register definitions */
50050-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
50051-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
50052-#define ASPM_STATE_L1 (4) /* L1 state */
50053+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
50054+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
50055+#define ASPM_STATE_L1 (4U) /* L1 state */
50056 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
50057 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
50058
50059diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
50060index 3010ffc..5e2e133 100644
50061--- a/drivers/pci/probe.c
50062+++ b/drivers/pci/probe.c
50063@@ -177,7 +177,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
50064 struct pci_bus_region region, inverted_region;
50065 bool bar_too_big = false, bar_too_high = false, bar_invalid = false;
50066
50067- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
50068+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
50069
50070 /* No printks while decoding is disabled! */
50071 if (!dev->mmio_always_on) {
50072diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
50073index 3f155e7..0f4b1f0 100644
50074--- a/drivers/pci/proc.c
50075+++ b/drivers/pci/proc.c
50076@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
50077 static int __init pci_proc_init(void)
50078 {
50079 struct pci_dev *dev = NULL;
50080+
50081+#ifdef CONFIG_GRKERNSEC_PROC_ADD
50082+#ifdef CONFIG_GRKERNSEC_PROC_USER
50083+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
50084+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
50085+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
50086+#endif
50087+#else
50088 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
50089+#endif
50090 proc_create("devices", 0, proc_bus_pci_dir,
50091 &proc_bus_pci_dev_operations);
50092 proc_initialized = 1;
50093diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
50094index d866db8..c827d1f 100644
50095--- a/drivers/platform/chrome/chromeos_laptop.c
50096+++ b/drivers/platform/chrome/chromeos_laptop.c
50097@@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
50098 .callback = chromeos_laptop_dmi_matched, \
50099 .driver_data = (void *)&board_
50100
50101-static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
50102+static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
50103 {
50104 .ident = "Samsung Series 5 550",
50105 .matches = {
50106diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
50107index c5af23b..3d62d5e 100644
50108--- a/drivers/platform/x86/alienware-wmi.c
50109+++ b/drivers/platform/x86/alienware-wmi.c
50110@@ -150,7 +150,7 @@ struct wmax_led_args {
50111 } __packed;
50112
50113 static struct platform_device *platform_device;
50114-static struct device_attribute *zone_dev_attrs;
50115+static device_attribute_no_const *zone_dev_attrs;
50116 static struct attribute **zone_attrs;
50117 static struct platform_zone *zone_data;
50118
50119@@ -161,7 +161,7 @@ static struct platform_driver platform_driver = {
50120 }
50121 };
50122
50123-static struct attribute_group zone_attribute_group = {
50124+static attribute_group_no_const zone_attribute_group = {
50125 .name = "rgb_zones",
50126 };
50127
50128diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
50129index 21fc932..ee9394a 100644
50130--- a/drivers/platform/x86/asus-wmi.c
50131+++ b/drivers/platform/x86/asus-wmi.c
50132@@ -1590,6 +1590,10 @@ static int show_dsts(struct seq_file *m, void *data)
50133 int err;
50134 u32 retval = -1;
50135
50136+#ifdef CONFIG_GRKERNSEC_KMEM
50137+ return -EPERM;
50138+#endif
50139+
50140 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
50141
50142 if (err < 0)
50143@@ -1606,6 +1610,10 @@ static int show_devs(struct seq_file *m, void *data)
50144 int err;
50145 u32 retval = -1;
50146
50147+#ifdef CONFIG_GRKERNSEC_KMEM
50148+ return -EPERM;
50149+#endif
50150+
50151 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
50152 &retval);
50153
50154@@ -1630,6 +1638,10 @@ static int show_call(struct seq_file *m, void *data)
50155 union acpi_object *obj;
50156 acpi_status status;
50157
50158+#ifdef CONFIG_GRKERNSEC_KMEM
50159+ return -EPERM;
50160+#endif
50161+
50162 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
50163 1, asus->debug.method_id,
50164 &input, &output);
50165diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50166index 62f8030..c7f2a45 100644
50167--- a/drivers/platform/x86/msi-laptop.c
50168+++ b/drivers/platform/x86/msi-laptop.c
50169@@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50170
50171 if (!quirks->ec_read_only) {
50172 /* allow userland write sysfs file */
50173- dev_attr_bluetooth.store = store_bluetooth;
50174- dev_attr_wlan.store = store_wlan;
50175- dev_attr_threeg.store = store_threeg;
50176- dev_attr_bluetooth.attr.mode |= S_IWUSR;
50177- dev_attr_wlan.attr.mode |= S_IWUSR;
50178- dev_attr_threeg.attr.mode |= S_IWUSR;
50179+ pax_open_kernel();
50180+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50181+ *(void **)&dev_attr_wlan.store = store_wlan;
50182+ *(void **)&dev_attr_threeg.store = store_threeg;
50183+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50184+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50185+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50186+ pax_close_kernel();
50187 }
50188
50189 /* disable hardware control by fn key */
50190diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50191index 70222f2..8c8ce66 100644
50192--- a/drivers/platform/x86/msi-wmi.c
50193+++ b/drivers/platform/x86/msi-wmi.c
50194@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50195 static void msi_wmi_notify(u32 value, void *context)
50196 {
50197 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50198- static struct key_entry *key;
50199+ struct key_entry *key;
50200 union acpi_object *obj;
50201 acpi_status status;
50202
50203diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50204index 26ad9ff..7c52909 100644
50205--- a/drivers/platform/x86/sony-laptop.c
50206+++ b/drivers/platform/x86/sony-laptop.c
50207@@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50208 }
50209
50210 /* High speed charging function */
50211-static struct device_attribute *hsc_handle;
50212+static device_attribute_no_const *hsc_handle;
50213
50214 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50215 struct device_attribute *attr,
50216@@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50217 }
50218
50219 /* low battery function */
50220-static struct device_attribute *lowbatt_handle;
50221+static device_attribute_no_const *lowbatt_handle;
50222
50223 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50224 struct device_attribute *attr,
50225@@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50226 }
50227
50228 /* fan speed function */
50229-static struct device_attribute *fan_handle, *hsf_handle;
50230+static device_attribute_no_const *fan_handle, *hsf_handle;
50231
50232 static ssize_t sony_nc_hsfan_store(struct device *dev,
50233 struct device_attribute *attr,
50234@@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50235 }
50236
50237 /* USB charge function */
50238-static struct device_attribute *uc_handle;
50239+static device_attribute_no_const *uc_handle;
50240
50241 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50242 struct device_attribute *attr,
50243@@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50244 }
50245
50246 /* Panel ID function */
50247-static struct device_attribute *panel_handle;
50248+static device_attribute_no_const *panel_handle;
50249
50250 static ssize_t sony_nc_panelid_show(struct device *dev,
50251 struct device_attribute *attr, char *buffer)
50252@@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50253 }
50254
50255 /* smart connect function */
50256-static struct device_attribute *sc_handle;
50257+static device_attribute_no_const *sc_handle;
50258
50259 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50260 struct device_attribute *attr,
50261diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50262index cf0f893..5955997 100644
50263--- a/drivers/platform/x86/thinkpad_acpi.c
50264+++ b/drivers/platform/x86/thinkpad_acpi.c
50265@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
50266 return 0;
50267 }
50268
50269-void static hotkey_mask_warn_incomplete_mask(void)
50270+static void hotkey_mask_warn_incomplete_mask(void)
50271 {
50272 /* log only what the user can fix... */
50273 const u32 wantedmask = hotkey_driver_mask &
50274@@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50275 && !tp_features.bright_unkfw)
50276 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50277 }
50278+}
50279
50280 #undef TPACPI_COMPARE_KEY
50281 #undef TPACPI_MAY_SEND_KEY
50282-}
50283
50284 /*
50285 * Polling driver
50286diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50287index 438d4c7..ca8a2fb 100644
50288--- a/drivers/pnp/pnpbios/bioscalls.c
50289+++ b/drivers/pnp/pnpbios/bioscalls.c
50290@@ -59,7 +59,7 @@ do { \
50291 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50292 } while(0)
50293
50294-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50295+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50296 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50297
50298 /*
50299@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50300
50301 cpu = get_cpu();
50302 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50303+
50304+ pax_open_kernel();
50305 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50306+ pax_close_kernel();
50307
50308 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50309 spin_lock_irqsave(&pnp_bios_lock, flags);
50310@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50311 :"memory");
50312 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50313
50314+ pax_open_kernel();
50315 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50316+ pax_close_kernel();
50317+
50318 put_cpu();
50319
50320 /* If we get here and this is set then the PnP BIOS faulted on us. */
50321@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50322 return status;
50323 }
50324
50325-void pnpbios_calls_init(union pnp_bios_install_struct *header)
50326+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50327 {
50328 int i;
50329
50330@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50331 pnp_bios_callpoint.offset = header->fields.pm16offset;
50332 pnp_bios_callpoint.segment = PNP_CS16;
50333
50334+ pax_open_kernel();
50335+
50336 for_each_possible_cpu(i) {
50337 struct desc_struct *gdt = get_cpu_gdt_table(i);
50338 if (!gdt)
50339@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50340 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50341 (unsigned long)__va(header->fields.pm16dseg));
50342 }
50343+
50344+ pax_close_kernel();
50345 }
50346diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50347index 0c52e2a..3421ab7 100644
50348--- a/drivers/power/pda_power.c
50349+++ b/drivers/power/pda_power.c
50350@@ -37,7 +37,11 @@ static int polling;
50351
50352 #if IS_ENABLED(CONFIG_USB_PHY)
50353 static struct usb_phy *transceiver;
50354-static struct notifier_block otg_nb;
50355+static int otg_handle_notification(struct notifier_block *nb,
50356+ unsigned long event, void *unused);
50357+static struct notifier_block otg_nb = {
50358+ .notifier_call = otg_handle_notification
50359+};
50360 #endif
50361
50362 static struct regulator *ac_draw;
50363@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
50364
50365 #if IS_ENABLED(CONFIG_USB_PHY)
50366 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
50367- otg_nb.notifier_call = otg_handle_notification;
50368 ret = usb_register_notifier(transceiver, &otg_nb);
50369 if (ret) {
50370 dev_err(dev, "failure to register otg notifier\n");
50371diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
50372index cc439fd..8fa30df 100644
50373--- a/drivers/power/power_supply.h
50374+++ b/drivers/power/power_supply.h
50375@@ -16,12 +16,12 @@ struct power_supply;
50376
50377 #ifdef CONFIG_SYSFS
50378
50379-extern void power_supply_init_attrs(struct device_type *dev_type);
50380+extern void power_supply_init_attrs(void);
50381 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
50382
50383 #else
50384
50385-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
50386+static inline void power_supply_init_attrs(void) {}
50387 #define power_supply_uevent NULL
50388
50389 #endif /* CONFIG_SYSFS */
50390diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
50391index 694e8cd..9f03483 100644
50392--- a/drivers/power/power_supply_core.c
50393+++ b/drivers/power/power_supply_core.c
50394@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
50395 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
50396 EXPORT_SYMBOL_GPL(power_supply_notifier);
50397
50398-static struct device_type power_supply_dev_type;
50399+extern const struct attribute_group *power_supply_attr_groups[];
50400+static struct device_type power_supply_dev_type = {
50401+ .groups = power_supply_attr_groups,
50402+};
50403
50404 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
50405 struct power_supply *supply)
50406@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
50407 return PTR_ERR(power_supply_class);
50408
50409 power_supply_class->dev_uevent = power_supply_uevent;
50410- power_supply_init_attrs(&power_supply_dev_type);
50411+ power_supply_init_attrs();
50412
50413 return 0;
50414 }
50415diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
50416index 62653f5..d0bb485 100644
50417--- a/drivers/power/power_supply_sysfs.c
50418+++ b/drivers/power/power_supply_sysfs.c
50419@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
50420 .is_visible = power_supply_attr_is_visible,
50421 };
50422
50423-static const struct attribute_group *power_supply_attr_groups[] = {
50424+const struct attribute_group *power_supply_attr_groups[] = {
50425 &power_supply_attr_group,
50426 NULL,
50427 };
50428
50429-void power_supply_init_attrs(struct device_type *dev_type)
50430+void power_supply_init_attrs(void)
50431 {
50432 int i;
50433
50434- dev_type->groups = power_supply_attr_groups;
50435-
50436 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
50437 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
50438 }
50439diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
50440index 84419af..268ede8 100644
50441--- a/drivers/powercap/powercap_sys.c
50442+++ b/drivers/powercap/powercap_sys.c
50443@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
50444 struct device_attribute name_attr;
50445 };
50446
50447+static ssize_t show_constraint_name(struct device *dev,
50448+ struct device_attribute *dev_attr,
50449+ char *buf);
50450+
50451 static struct powercap_constraint_attr
50452- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
50453+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
50454+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
50455+ .power_limit_attr = {
50456+ .attr = {
50457+ .name = NULL,
50458+ .mode = S_IWUSR | S_IRUGO
50459+ },
50460+ .show = show_constraint_power_limit_uw,
50461+ .store = store_constraint_power_limit_uw
50462+ },
50463+
50464+ .time_window_attr = {
50465+ .attr = {
50466+ .name = NULL,
50467+ .mode = S_IWUSR | S_IRUGO
50468+ },
50469+ .show = show_constraint_time_window_us,
50470+ .store = store_constraint_time_window_us
50471+ },
50472+
50473+ .max_power_attr = {
50474+ .attr = {
50475+ .name = NULL,
50476+ .mode = S_IRUGO
50477+ },
50478+ .show = show_constraint_max_power_uw,
50479+ .store = NULL
50480+ },
50481+
50482+ .min_power_attr = {
50483+ .attr = {
50484+ .name = NULL,
50485+ .mode = S_IRUGO
50486+ },
50487+ .show = show_constraint_min_power_uw,
50488+ .store = NULL
50489+ },
50490+
50491+ .max_time_window_attr = {
50492+ .attr = {
50493+ .name = NULL,
50494+ .mode = S_IRUGO
50495+ },
50496+ .show = show_constraint_max_time_window_us,
50497+ .store = NULL
50498+ },
50499+
50500+ .min_time_window_attr = {
50501+ .attr = {
50502+ .name = NULL,
50503+ .mode = S_IRUGO
50504+ },
50505+ .show = show_constraint_min_time_window_us,
50506+ .store = NULL
50507+ },
50508+
50509+ .name_attr = {
50510+ .attr = {
50511+ .name = NULL,
50512+ .mode = S_IRUGO
50513+ },
50514+ .show = show_constraint_name,
50515+ .store = NULL
50516+ }
50517+ }
50518+};
50519
50520 /* A list of powercap control_types */
50521 static LIST_HEAD(powercap_cntrl_list);
50522@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
50523 }
50524
50525 static int create_constraint_attribute(int id, const char *name,
50526- int mode,
50527- struct device_attribute *dev_attr,
50528- ssize_t (*show)(struct device *,
50529- struct device_attribute *, char *),
50530- ssize_t (*store)(struct device *,
50531- struct device_attribute *,
50532- const char *, size_t)
50533- )
50534+ struct device_attribute *dev_attr)
50535 {
50536+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
50537
50538- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
50539- id, name);
50540- if (!dev_attr->attr.name)
50541+ if (!name)
50542 return -ENOMEM;
50543- dev_attr->attr.mode = mode;
50544- dev_attr->show = show;
50545- dev_attr->store = store;
50546+
50547+ pax_open_kernel();
50548+ *(const char **)&dev_attr->attr.name = name;
50549+ pax_close_kernel();
50550
50551 return 0;
50552 }
50553@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
50554
50555 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
50556 ret = create_constraint_attribute(i, "power_limit_uw",
50557- S_IWUSR | S_IRUGO,
50558- &constraint_attrs[i].power_limit_attr,
50559- show_constraint_power_limit_uw,
50560- store_constraint_power_limit_uw);
50561+ &constraint_attrs[i].power_limit_attr);
50562 if (ret)
50563 goto err_alloc;
50564 ret = create_constraint_attribute(i, "time_window_us",
50565- S_IWUSR | S_IRUGO,
50566- &constraint_attrs[i].time_window_attr,
50567- show_constraint_time_window_us,
50568- store_constraint_time_window_us);
50569+ &constraint_attrs[i].time_window_attr);
50570 if (ret)
50571 goto err_alloc;
50572- ret = create_constraint_attribute(i, "name", S_IRUGO,
50573- &constraint_attrs[i].name_attr,
50574- show_constraint_name,
50575- NULL);
50576+ ret = create_constraint_attribute(i, "name",
50577+ &constraint_attrs[i].name_attr);
50578 if (ret)
50579 goto err_alloc;
50580- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
50581- &constraint_attrs[i].max_power_attr,
50582- show_constraint_max_power_uw,
50583- NULL);
50584+ ret = create_constraint_attribute(i, "max_power_uw",
50585+ &constraint_attrs[i].max_power_attr);
50586 if (ret)
50587 goto err_alloc;
50588- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
50589- &constraint_attrs[i].min_power_attr,
50590- show_constraint_min_power_uw,
50591- NULL);
50592+ ret = create_constraint_attribute(i, "min_power_uw",
50593+ &constraint_attrs[i].min_power_attr);
50594 if (ret)
50595 goto err_alloc;
50596 ret = create_constraint_attribute(i, "max_time_window_us",
50597- S_IRUGO,
50598- &constraint_attrs[i].max_time_window_attr,
50599- show_constraint_max_time_window_us,
50600- NULL);
50601+ &constraint_attrs[i].max_time_window_attr);
50602 if (ret)
50603 goto err_alloc;
50604 ret = create_constraint_attribute(i, "min_time_window_us",
50605- S_IRUGO,
50606- &constraint_attrs[i].min_time_window_attr,
50607- show_constraint_min_time_window_us,
50608- NULL);
50609+ &constraint_attrs[i].min_time_window_attr);
50610 if (ret)
50611 goto err_alloc;
50612
50613@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
50614 power_zone->zone_dev_attrs[count++] =
50615 &dev_attr_max_energy_range_uj.attr;
50616 if (power_zone->ops->get_energy_uj) {
50617+ pax_open_kernel();
50618 if (power_zone->ops->reset_energy_uj)
50619- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50620+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50621 else
50622- dev_attr_energy_uj.attr.mode = S_IRUGO;
50623+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
50624+ pax_close_kernel();
50625 power_zone->zone_dev_attrs[count++] =
50626 &dev_attr_energy_uj.attr;
50627 }
50628diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
50629index 9c5d414..c7900ce 100644
50630--- a/drivers/ptp/ptp_private.h
50631+++ b/drivers/ptp/ptp_private.h
50632@@ -51,7 +51,7 @@ struct ptp_clock {
50633 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
50634 wait_queue_head_t tsev_wq;
50635 int defunct; /* tells readers to go away when clock is being removed */
50636- struct device_attribute *pin_dev_attr;
50637+ device_attribute_no_const *pin_dev_attr;
50638 struct attribute **pin_attr;
50639 struct attribute_group pin_attr_group;
50640 };
50641diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
50642index 302e626..12579af 100644
50643--- a/drivers/ptp/ptp_sysfs.c
50644+++ b/drivers/ptp/ptp_sysfs.c
50645@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
50646 goto no_pin_attr;
50647
50648 for (i = 0; i < n_pins; i++) {
50649- struct device_attribute *da = &ptp->pin_dev_attr[i];
50650+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
50651 sysfs_attr_init(&da->attr);
50652 da->attr.name = info->pin_config[i].name;
50653 da->attr.mode = 0644;
50654diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
50655index cd87c0c..715ecbe 100644
50656--- a/drivers/regulator/core.c
50657+++ b/drivers/regulator/core.c
50658@@ -3567,7 +3567,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50659 {
50660 const struct regulation_constraints *constraints = NULL;
50661 const struct regulator_init_data *init_data;
50662- static atomic_t regulator_no = ATOMIC_INIT(0);
50663+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
50664 struct regulator_dev *rdev;
50665 struct device *dev;
50666 int ret, i;
50667@@ -3641,7 +3641,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50668 rdev->dev.class = &regulator_class;
50669 rdev->dev.parent = dev;
50670 dev_set_name(&rdev->dev, "regulator.%d",
50671- atomic_inc_return(&regulator_no) - 1);
50672+ atomic_inc_return_unchecked(&regulator_no) - 1);
50673 ret = device_register(&rdev->dev);
50674 if (ret != 0) {
50675 put_device(&rdev->dev);
50676diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
50677index 7eee2ca..4024513 100644
50678--- a/drivers/regulator/max8660.c
50679+++ b/drivers/regulator/max8660.c
50680@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
50681 max8660->shadow_regs[MAX8660_OVER1] = 5;
50682 } else {
50683 /* Otherwise devices can be toggled via software */
50684- max8660_dcdc_ops.enable = max8660_dcdc_enable;
50685- max8660_dcdc_ops.disable = max8660_dcdc_disable;
50686+ pax_open_kernel();
50687+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
50688+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
50689+ pax_close_kernel();
50690 }
50691
50692 /*
50693diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
50694index dbedf17..18ff6b7 100644
50695--- a/drivers/regulator/max8973-regulator.c
50696+++ b/drivers/regulator/max8973-regulator.c
50697@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
50698 if (!pdata || !pdata->enable_ext_control) {
50699 max->desc.enable_reg = MAX8973_VOUT;
50700 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
50701- max->ops.enable = regulator_enable_regmap;
50702- max->ops.disable = regulator_disable_regmap;
50703- max->ops.is_enabled = regulator_is_enabled_regmap;
50704+ pax_open_kernel();
50705+ *(void **)&max->ops.enable = regulator_enable_regmap;
50706+ *(void **)&max->ops.disable = regulator_disable_regmap;
50707+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
50708+ pax_close_kernel();
50709 }
50710
50711 if (pdata) {
50712diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
50713index 793b662..85f74cd 100644
50714--- a/drivers/regulator/mc13892-regulator.c
50715+++ b/drivers/regulator/mc13892-regulator.c
50716@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
50717 mc13xxx_unlock(mc13892);
50718
50719 /* update mc13892_vcam ops */
50720+ pax_open_kernel();
50721 memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
50722 sizeof(struct regulator_ops));
50723- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50724- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50725+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50726+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50727+ pax_close_kernel();
50728 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
50729
50730 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
50731diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
50732index 5b2e761..c8c8a4a 100644
50733--- a/drivers/rtc/rtc-cmos.c
50734+++ b/drivers/rtc/rtc-cmos.c
50735@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
50736 hpet_rtc_timer_init();
50737
50738 /* export at least the first block of NVRAM */
50739- nvram.size = address_space - NVRAM_OFFSET;
50740+ pax_open_kernel();
50741+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
50742+ pax_close_kernel();
50743 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
50744 if (retval < 0) {
50745 dev_dbg(dev, "can't create nvram file? %d\n", retval);
50746diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
50747index d049393..bb20be0 100644
50748--- a/drivers/rtc/rtc-dev.c
50749+++ b/drivers/rtc/rtc-dev.c
50750@@ -16,6 +16,7 @@
50751 #include <linux/module.h>
50752 #include <linux/rtc.h>
50753 #include <linux/sched.h>
50754+#include <linux/grsecurity.h>
50755 #include "rtc-core.h"
50756
50757 static dev_t rtc_devt;
50758@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
50759 if (copy_from_user(&tm, uarg, sizeof(tm)))
50760 return -EFAULT;
50761
50762+ gr_log_timechange();
50763+
50764 return rtc_set_time(rtc, &tm);
50765
50766 case RTC_PIE_ON:
50767diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
50768index bb43cf7..ee4d274 100644
50769--- a/drivers/rtc/rtc-ds1307.c
50770+++ b/drivers/rtc/rtc-ds1307.c
50771@@ -107,7 +107,7 @@ struct ds1307 {
50772 u8 offset; /* register's offset */
50773 u8 regs[11];
50774 u16 nvram_offset;
50775- struct bin_attribute *nvram;
50776+ bin_attribute_no_const *nvram;
50777 enum ds_type type;
50778 unsigned long flags;
50779 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
50780diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
50781index 11880c1..b823aa4 100644
50782--- a/drivers/rtc/rtc-m48t59.c
50783+++ b/drivers/rtc/rtc-m48t59.c
50784@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
50785 if (IS_ERR(m48t59->rtc))
50786 return PTR_ERR(m48t59->rtc);
50787
50788- m48t59_nvram_attr.size = pdata->offset;
50789+ pax_open_kernel();
50790+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
50791+ pax_close_kernel();
50792
50793 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
50794 if (ret)
50795diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
50796index e693af6..2e525b6 100644
50797--- a/drivers/scsi/bfa/bfa_fcpim.h
50798+++ b/drivers/scsi/bfa/bfa_fcpim.h
50799@@ -36,7 +36,7 @@ struct bfa_iotag_s {
50800
50801 struct bfa_itn_s {
50802 bfa_isr_func_t isr;
50803-};
50804+} __no_const;
50805
50806 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
50807 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
50808diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
50809index 0f19455..ef7adb5 100644
50810--- a/drivers/scsi/bfa/bfa_fcs.c
50811+++ b/drivers/scsi/bfa/bfa_fcs.c
50812@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
50813 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
50814
50815 static struct bfa_fcs_mod_s fcs_modules[] = {
50816- { bfa_fcs_port_attach, NULL, NULL },
50817- { bfa_fcs_uf_attach, NULL, NULL },
50818- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
50819- bfa_fcs_fabric_modexit },
50820+ {
50821+ .attach = bfa_fcs_port_attach,
50822+ .modinit = NULL,
50823+ .modexit = NULL
50824+ },
50825+ {
50826+ .attach = bfa_fcs_uf_attach,
50827+ .modinit = NULL,
50828+ .modexit = NULL
50829+ },
50830+ {
50831+ .attach = bfa_fcs_fabric_attach,
50832+ .modinit = bfa_fcs_fabric_modinit,
50833+ .modexit = bfa_fcs_fabric_modexit
50834+ },
50835 };
50836
50837 /*
50838diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
50839index ff75ef8..2dfe00a 100644
50840--- a/drivers/scsi/bfa/bfa_fcs_lport.c
50841+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
50842@@ -89,15 +89,26 @@ static struct {
50843 void (*offline) (struct bfa_fcs_lport_s *port);
50844 } __port_action[] = {
50845 {
50846- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
50847- bfa_fcs_lport_unknown_offline}, {
50848- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
50849- bfa_fcs_lport_fab_offline}, {
50850- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
50851- bfa_fcs_lport_n2n_offline}, {
50852- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
50853- bfa_fcs_lport_loop_offline},
50854- };
50855+ .init = bfa_fcs_lport_unknown_init,
50856+ .online = bfa_fcs_lport_unknown_online,
50857+ .offline = bfa_fcs_lport_unknown_offline
50858+ },
50859+ {
50860+ .init = bfa_fcs_lport_fab_init,
50861+ .online = bfa_fcs_lport_fab_online,
50862+ .offline = bfa_fcs_lport_fab_offline
50863+ },
50864+ {
50865+ .init = bfa_fcs_lport_n2n_init,
50866+ .online = bfa_fcs_lport_n2n_online,
50867+ .offline = bfa_fcs_lport_n2n_offline
50868+ },
50869+ {
50870+ .init = bfa_fcs_lport_loop_init,
50871+ .online = bfa_fcs_lport_loop_online,
50872+ .offline = bfa_fcs_lport_loop_offline
50873+ },
50874+};
50875
50876 /*
50877 * fcs_port_sm FCS logical port state machine
50878diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
50879index a38aafa0..fe8f03b 100644
50880--- a/drivers/scsi/bfa/bfa_ioc.h
50881+++ b/drivers/scsi/bfa/bfa_ioc.h
50882@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
50883 bfa_ioc_disable_cbfn_t disable_cbfn;
50884 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
50885 bfa_ioc_reset_cbfn_t reset_cbfn;
50886-};
50887+} __no_const;
50888
50889 /*
50890 * IOC event notification mechanism.
50891@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
50892 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
50893 enum bfi_ioc_state fwstate);
50894 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
50895-};
50896+} __no_const;
50897
50898 /*
50899 * Queue element to wait for room in request queue. FIFO order is
50900diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
50901index a14c784..6de6790 100644
50902--- a/drivers/scsi/bfa/bfa_modules.h
50903+++ b/drivers/scsi/bfa/bfa_modules.h
50904@@ -78,12 +78,12 @@ enum {
50905 \
50906 extern struct bfa_module_s hal_mod_ ## __mod; \
50907 struct bfa_module_s hal_mod_ ## __mod = { \
50908- bfa_ ## __mod ## _meminfo, \
50909- bfa_ ## __mod ## _attach, \
50910- bfa_ ## __mod ## _detach, \
50911- bfa_ ## __mod ## _start, \
50912- bfa_ ## __mod ## _stop, \
50913- bfa_ ## __mod ## _iocdisable, \
50914+ .meminfo = bfa_ ## __mod ## _meminfo, \
50915+ .attach = bfa_ ## __mod ## _attach, \
50916+ .detach = bfa_ ## __mod ## _detach, \
50917+ .start = bfa_ ## __mod ## _start, \
50918+ .stop = bfa_ ## __mod ## _stop, \
50919+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
50920 }
50921
50922 #define BFA_CACHELINE_SZ (256)
50923diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
50924index 045c4e1..13de803 100644
50925--- a/drivers/scsi/fcoe/fcoe_sysfs.c
50926+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
50927@@ -33,8 +33,8 @@
50928 */
50929 #include "libfcoe.h"
50930
50931-static atomic_t ctlr_num;
50932-static atomic_t fcf_num;
50933+static atomic_unchecked_t ctlr_num;
50934+static atomic_unchecked_t fcf_num;
50935
50936 /*
50937 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
50938@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
50939 if (!ctlr)
50940 goto out;
50941
50942- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
50943+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
50944 ctlr->f = f;
50945 ctlr->mode = FIP_CONN_TYPE_FABRIC;
50946 INIT_LIST_HEAD(&ctlr->fcfs);
50947@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
50948 fcf->dev.parent = &ctlr->dev;
50949 fcf->dev.bus = &fcoe_bus_type;
50950 fcf->dev.type = &fcoe_fcf_device_type;
50951- fcf->id = atomic_inc_return(&fcf_num) - 1;
50952+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
50953 fcf->state = FCOE_FCF_STATE_UNKNOWN;
50954
50955 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
50956@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
50957 {
50958 int error;
50959
50960- atomic_set(&ctlr_num, 0);
50961- atomic_set(&fcf_num, 0);
50962+ atomic_set_unchecked(&ctlr_num, 0);
50963+ atomic_set_unchecked(&fcf_num, 0);
50964
50965 error = bus_register(&fcoe_bus_type);
50966 if (error)
50967diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
50968index 6de80e3..a11e0ac 100644
50969--- a/drivers/scsi/hosts.c
50970+++ b/drivers/scsi/hosts.c
50971@@ -42,7 +42,7 @@
50972 #include "scsi_logging.h"
50973
50974
50975-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50976+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50977
50978
50979 static void scsi_host_cls_release(struct device *dev)
50980@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
50981 * subtract one because we increment first then return, but we need to
50982 * know what the next host number was before increment
50983 */
50984- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
50985+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
50986 shost->dma_channel = 0xff;
50987
50988 /* These three are default values which can be overridden */
50989diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
50990index cef5d49..01e280e 100644
50991--- a/drivers/scsi/hpsa.c
50992+++ b/drivers/scsi/hpsa.c
50993@@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
50994 unsigned long flags;
50995
50996 if (h->transMethod & CFGTBL_Trans_io_accel1)
50997- return h->access.command_completed(h, q);
50998+ return h->access->command_completed(h, q);
50999
51000 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
51001- return h->access.command_completed(h, q);
51002+ return h->access->command_completed(h, q);
51003
51004 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
51005 a = rq->head[rq->current_entry];
51006@@ -5454,7 +5454,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
51007 while (!list_empty(&h->reqQ)) {
51008 c = list_entry(h->reqQ.next, struct CommandList, list);
51009 /* can't do anything if fifo is full */
51010- if ((h->access.fifo_full(h))) {
51011+ if ((h->access->fifo_full(h))) {
51012 h->fifo_recently_full = 1;
51013 dev_warn(&h->pdev->dev, "fifo full\n");
51014 break;
51015@@ -5476,7 +5476,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
51016
51017 /* Tell the controller execute command */
51018 spin_unlock_irqrestore(&h->lock, *flags);
51019- h->access.submit_command(h, c);
51020+ h->access->submit_command(h, c);
51021 spin_lock_irqsave(&h->lock, *flags);
51022 }
51023 }
51024@@ -5492,17 +5492,17 @@ static void lock_and_start_io(struct ctlr_info *h)
51025
51026 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
51027 {
51028- return h->access.command_completed(h, q);
51029+ return h->access->command_completed(h, q);
51030 }
51031
51032 static inline bool interrupt_pending(struct ctlr_info *h)
51033 {
51034- return h->access.intr_pending(h);
51035+ return h->access->intr_pending(h);
51036 }
51037
51038 static inline long interrupt_not_for_us(struct ctlr_info *h)
51039 {
51040- return (h->access.intr_pending(h) == 0) ||
51041+ return (h->access->intr_pending(h) == 0) ||
51042 (h->interrupts_enabled == 0);
51043 }
51044
51045@@ -6445,7 +6445,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
51046 if (prod_index < 0)
51047 return -ENODEV;
51048 h->product_name = products[prod_index].product_name;
51049- h->access = *(products[prod_index].access);
51050+ h->access = products[prod_index].access;
51051
51052 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
51053 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
51054@@ -6790,7 +6790,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
51055 unsigned long flags;
51056 u32 lockup_detected;
51057
51058- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51059+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51060 spin_lock_irqsave(&h->lock, flags);
51061 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
51062 if (!lockup_detected) {
51063@@ -7037,7 +7037,7 @@ reinit_after_soft_reset:
51064 }
51065
51066 /* make sure the board interrupts are off */
51067- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51068+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51069
51070 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
51071 goto clean2;
51072@@ -7072,7 +7072,7 @@ reinit_after_soft_reset:
51073 * fake ones to scoop up any residual completions.
51074 */
51075 spin_lock_irqsave(&h->lock, flags);
51076- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51077+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51078 spin_unlock_irqrestore(&h->lock, flags);
51079 free_irqs(h);
51080 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
51081@@ -7091,9 +7091,9 @@ reinit_after_soft_reset:
51082 dev_info(&h->pdev->dev, "Board READY.\n");
51083 dev_info(&h->pdev->dev,
51084 "Waiting for stale completions to drain.\n");
51085- h->access.set_intr_mask(h, HPSA_INTR_ON);
51086+ h->access->set_intr_mask(h, HPSA_INTR_ON);
51087 msleep(10000);
51088- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51089+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51090
51091 rc = controller_reset_failed(h->cfgtable);
51092 if (rc)
51093@@ -7119,7 +7119,7 @@ reinit_after_soft_reset:
51094 h->drv_req_rescan = 0;
51095
51096 /* Turn the interrupts on so we can service requests */
51097- h->access.set_intr_mask(h, HPSA_INTR_ON);
51098+ h->access->set_intr_mask(h, HPSA_INTR_ON);
51099
51100 hpsa_hba_inquiry(h);
51101 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
51102@@ -7184,7 +7184,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
51103 * To write all data in the battery backed cache to disks
51104 */
51105 hpsa_flush_cache(h);
51106- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51107+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51108 hpsa_free_irqs_and_disable_msix(h);
51109 }
51110
51111@@ -7302,7 +7302,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51112 CFGTBL_Trans_enable_directed_msix |
51113 (trans_support & (CFGTBL_Trans_io_accel1 |
51114 CFGTBL_Trans_io_accel2));
51115- struct access_method access = SA5_performant_access;
51116+ struct access_method *access = &SA5_performant_access;
51117
51118 /* This is a bit complicated. There are 8 registers on
51119 * the controller which we write to to tell it 8 different
51120@@ -7344,7 +7344,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51121 * perform the superfluous readl() after each command submission.
51122 */
51123 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
51124- access = SA5_performant_access_no_read;
51125+ access = &SA5_performant_access_no_read;
51126
51127 /* Controller spec: zero out this buffer. */
51128 for (i = 0; i < h->nreply_queues; i++)
51129@@ -7374,12 +7374,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51130 * enable outbound interrupt coalescing in accelerator mode;
51131 */
51132 if (trans_support & CFGTBL_Trans_io_accel1) {
51133- access = SA5_ioaccel_mode1_access;
51134+ access = &SA5_ioaccel_mode1_access;
51135 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51136 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51137 } else {
51138 if (trans_support & CFGTBL_Trans_io_accel2) {
51139- access = SA5_ioaccel_mode2_access;
51140+ access = &SA5_ioaccel_mode2_access;
51141 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51142 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51143 }
51144diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
51145index 24472ce..8782caf 100644
51146--- a/drivers/scsi/hpsa.h
51147+++ b/drivers/scsi/hpsa.h
51148@@ -127,7 +127,7 @@ struct ctlr_info {
51149 unsigned int msix_vector;
51150 unsigned int msi_vector;
51151 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
51152- struct access_method access;
51153+ struct access_method *access;
51154 char hba_mode_enabled;
51155
51156 /* queue and queue Info */
51157@@ -536,43 +536,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
51158 }
51159
51160 static struct access_method SA5_access = {
51161- SA5_submit_command,
51162- SA5_intr_mask,
51163- SA5_fifo_full,
51164- SA5_intr_pending,
51165- SA5_completed,
51166+ .submit_command = SA5_submit_command,
51167+ .set_intr_mask = SA5_intr_mask,
51168+ .fifo_full = SA5_fifo_full,
51169+ .intr_pending = SA5_intr_pending,
51170+ .command_completed = SA5_completed,
51171 };
51172
51173 static struct access_method SA5_ioaccel_mode1_access = {
51174- SA5_submit_command,
51175- SA5_performant_intr_mask,
51176- SA5_fifo_full,
51177- SA5_ioaccel_mode1_intr_pending,
51178- SA5_ioaccel_mode1_completed,
51179+ .submit_command = SA5_submit_command,
51180+ .set_intr_mask = SA5_performant_intr_mask,
51181+ .fifo_full = SA5_fifo_full,
51182+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
51183+ .command_completed = SA5_ioaccel_mode1_completed,
51184 };
51185
51186 static struct access_method SA5_ioaccel_mode2_access = {
51187- SA5_submit_command_ioaccel2,
51188- SA5_performant_intr_mask,
51189- SA5_fifo_full,
51190- SA5_performant_intr_pending,
51191- SA5_performant_completed,
51192+ .submit_command = SA5_submit_command_ioaccel2,
51193+ .set_intr_mask = SA5_performant_intr_mask,
51194+ .fifo_full = SA5_fifo_full,
51195+ .intr_pending = SA5_performant_intr_pending,
51196+ .command_completed = SA5_performant_completed,
51197 };
51198
51199 static struct access_method SA5_performant_access = {
51200- SA5_submit_command,
51201- SA5_performant_intr_mask,
51202- SA5_fifo_full,
51203- SA5_performant_intr_pending,
51204- SA5_performant_completed,
51205+ .submit_command = SA5_submit_command,
51206+ .set_intr_mask = SA5_performant_intr_mask,
51207+ .fifo_full = SA5_fifo_full,
51208+ .intr_pending = SA5_performant_intr_pending,
51209+ .command_completed = SA5_performant_completed,
51210 };
51211
51212 static struct access_method SA5_performant_access_no_read = {
51213- SA5_submit_command_no_read,
51214- SA5_performant_intr_mask,
51215- SA5_fifo_full,
51216- SA5_performant_intr_pending,
51217- SA5_performant_completed,
51218+ .submit_command = SA5_submit_command_no_read,
51219+ .set_intr_mask = SA5_performant_intr_mask,
51220+ .fifo_full = SA5_fifo_full,
51221+ .intr_pending = SA5_performant_intr_pending,
51222+ .command_completed = SA5_performant_completed,
51223 };
51224
51225 struct board_type {
51226diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51227index 1b3a094..068e683 100644
51228--- a/drivers/scsi/libfc/fc_exch.c
51229+++ b/drivers/scsi/libfc/fc_exch.c
51230@@ -101,12 +101,12 @@ struct fc_exch_mgr {
51231 u16 pool_max_index;
51232
51233 struct {
51234- atomic_t no_free_exch;
51235- atomic_t no_free_exch_xid;
51236- atomic_t xid_not_found;
51237- atomic_t xid_busy;
51238- atomic_t seq_not_found;
51239- atomic_t non_bls_resp;
51240+ atomic_unchecked_t no_free_exch;
51241+ atomic_unchecked_t no_free_exch_xid;
51242+ atomic_unchecked_t xid_not_found;
51243+ atomic_unchecked_t xid_busy;
51244+ atomic_unchecked_t seq_not_found;
51245+ atomic_unchecked_t non_bls_resp;
51246 } stats;
51247 };
51248
51249@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51250 /* allocate memory for exchange */
51251 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51252 if (!ep) {
51253- atomic_inc(&mp->stats.no_free_exch);
51254+ atomic_inc_unchecked(&mp->stats.no_free_exch);
51255 goto out;
51256 }
51257 memset(ep, 0, sizeof(*ep));
51258@@ -874,7 +874,7 @@ out:
51259 return ep;
51260 err:
51261 spin_unlock_bh(&pool->lock);
51262- atomic_inc(&mp->stats.no_free_exch_xid);
51263+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51264 mempool_free(ep, mp->ep_pool);
51265 return NULL;
51266 }
51267@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51268 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51269 ep = fc_exch_find(mp, xid);
51270 if (!ep) {
51271- atomic_inc(&mp->stats.xid_not_found);
51272+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51273 reject = FC_RJT_OX_ID;
51274 goto out;
51275 }
51276@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51277 ep = fc_exch_find(mp, xid);
51278 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51279 if (ep) {
51280- atomic_inc(&mp->stats.xid_busy);
51281+ atomic_inc_unchecked(&mp->stats.xid_busy);
51282 reject = FC_RJT_RX_ID;
51283 goto rel;
51284 }
51285@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51286 }
51287 xid = ep->xid; /* get our XID */
51288 } else if (!ep) {
51289- atomic_inc(&mp->stats.xid_not_found);
51290+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51291 reject = FC_RJT_RX_ID; /* XID not found */
51292 goto out;
51293 }
51294@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51295 } else {
51296 sp = &ep->seq;
51297 if (sp->id != fh->fh_seq_id) {
51298- atomic_inc(&mp->stats.seq_not_found);
51299+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51300 if (f_ctl & FC_FC_END_SEQ) {
51301 /*
51302 * Update sequence_id based on incoming last
51303@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51304
51305 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51306 if (!ep) {
51307- atomic_inc(&mp->stats.xid_not_found);
51308+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51309 goto out;
51310 }
51311 if (ep->esb_stat & ESB_ST_COMPLETE) {
51312- atomic_inc(&mp->stats.xid_not_found);
51313+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51314 goto rel;
51315 }
51316 if (ep->rxid == FC_XID_UNKNOWN)
51317 ep->rxid = ntohs(fh->fh_rx_id);
51318 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51319- atomic_inc(&mp->stats.xid_not_found);
51320+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51321 goto rel;
51322 }
51323 if (ep->did != ntoh24(fh->fh_s_id) &&
51324 ep->did != FC_FID_FLOGI) {
51325- atomic_inc(&mp->stats.xid_not_found);
51326+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51327 goto rel;
51328 }
51329 sof = fr_sof(fp);
51330@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51331 sp->ssb_stat |= SSB_ST_RESP;
51332 sp->id = fh->fh_seq_id;
51333 } else if (sp->id != fh->fh_seq_id) {
51334- atomic_inc(&mp->stats.seq_not_found);
51335+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51336 goto rel;
51337 }
51338
51339@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51340 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51341
51342 if (!sp)
51343- atomic_inc(&mp->stats.xid_not_found);
51344+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51345 else
51346- atomic_inc(&mp->stats.non_bls_resp);
51347+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
51348
51349 fc_frame_free(fp);
51350 }
51351@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51352
51353 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51354 mp = ema->mp;
51355- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51356+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51357 st->fc_no_free_exch_xid +=
51358- atomic_read(&mp->stats.no_free_exch_xid);
51359- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51360- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51361- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51362- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51363+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51364+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51365+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
51366+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
51367+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
51368 }
51369 }
51370 EXPORT_SYMBOL(fc_exch_update_stats);
51371diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
51372index 766098a..1c6c971 100644
51373--- a/drivers/scsi/libsas/sas_ata.c
51374+++ b/drivers/scsi/libsas/sas_ata.c
51375@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
51376 .postreset = ata_std_postreset,
51377 .error_handler = ata_std_error_handler,
51378 .post_internal_cmd = sas_ata_post_internal,
51379- .qc_defer = ata_std_qc_defer,
51380+ .qc_defer = ata_std_qc_defer,
51381 .qc_prep = ata_noop_qc_prep,
51382 .qc_issue = sas_ata_qc_issue,
51383 .qc_fill_rtf = sas_ata_qc_fill_rtf,
51384diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
51385index 434e903..5a4a79b 100644
51386--- a/drivers/scsi/lpfc/lpfc.h
51387+++ b/drivers/scsi/lpfc/lpfc.h
51388@@ -430,7 +430,7 @@ struct lpfc_vport {
51389 struct dentry *debug_nodelist;
51390 struct dentry *vport_debugfs_root;
51391 struct lpfc_debugfs_trc *disc_trc;
51392- atomic_t disc_trc_cnt;
51393+ atomic_unchecked_t disc_trc_cnt;
51394 #endif
51395 uint8_t stat_data_enabled;
51396 uint8_t stat_data_blocked;
51397@@ -880,8 +880,8 @@ struct lpfc_hba {
51398 struct timer_list fabric_block_timer;
51399 unsigned long bit_flags;
51400 #define FABRIC_COMANDS_BLOCKED 0
51401- atomic_t num_rsrc_err;
51402- atomic_t num_cmd_success;
51403+ atomic_unchecked_t num_rsrc_err;
51404+ atomic_unchecked_t num_cmd_success;
51405 unsigned long last_rsrc_error_time;
51406 unsigned long last_ramp_down_time;
51407 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51408@@ -916,7 +916,7 @@ struct lpfc_hba {
51409
51410 struct dentry *debug_slow_ring_trc;
51411 struct lpfc_debugfs_trc *slow_ring_trc;
51412- atomic_t slow_ring_trc_cnt;
51413+ atomic_unchecked_t slow_ring_trc_cnt;
51414 /* iDiag debugfs sub-directory */
51415 struct dentry *idiag_root;
51416 struct dentry *idiag_pci_cfg;
51417diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
51418index 786a2af..562c6a2 100644
51419--- a/drivers/scsi/lpfc/lpfc_debugfs.c
51420+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
51421@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
51422
51423 #include <linux/debugfs.h>
51424
51425-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51426+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51427 static unsigned long lpfc_debugfs_start_time = 0L;
51428
51429 /* iDiag */
51430@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
51431 lpfc_debugfs_enable = 0;
51432
51433 len = 0;
51434- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
51435+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
51436 (lpfc_debugfs_max_disc_trc - 1);
51437 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
51438 dtp = vport->disc_trc + i;
51439@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
51440 lpfc_debugfs_enable = 0;
51441
51442 len = 0;
51443- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
51444+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
51445 (lpfc_debugfs_max_slow_ring_trc - 1);
51446 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
51447 dtp = phba->slow_ring_trc + i;
51448@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
51449 !vport || !vport->disc_trc)
51450 return;
51451
51452- index = atomic_inc_return(&vport->disc_trc_cnt) &
51453+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
51454 (lpfc_debugfs_max_disc_trc - 1);
51455 dtp = vport->disc_trc + index;
51456 dtp->fmt = fmt;
51457 dtp->data1 = data1;
51458 dtp->data2 = data2;
51459 dtp->data3 = data3;
51460- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51461+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51462 dtp->jif = jiffies;
51463 #endif
51464 return;
51465@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
51466 !phba || !phba->slow_ring_trc)
51467 return;
51468
51469- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
51470+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
51471 (lpfc_debugfs_max_slow_ring_trc - 1);
51472 dtp = phba->slow_ring_trc + index;
51473 dtp->fmt = fmt;
51474 dtp->data1 = data1;
51475 dtp->data2 = data2;
51476 dtp->data3 = data3;
51477- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51478+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51479 dtp->jif = jiffies;
51480 #endif
51481 return;
51482@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51483 "slow_ring buffer\n");
51484 goto debug_failed;
51485 }
51486- atomic_set(&phba->slow_ring_trc_cnt, 0);
51487+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
51488 memset(phba->slow_ring_trc, 0,
51489 (sizeof(struct lpfc_debugfs_trc) *
51490 lpfc_debugfs_max_slow_ring_trc));
51491@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51492 "buffer\n");
51493 goto debug_failed;
51494 }
51495- atomic_set(&vport->disc_trc_cnt, 0);
51496+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
51497
51498 snprintf(name, sizeof(name), "discovery_trace");
51499 vport->debug_disc_trc =
51500diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
51501index 0b2c53a..aec2b45 100644
51502--- a/drivers/scsi/lpfc/lpfc_init.c
51503+++ b/drivers/scsi/lpfc/lpfc_init.c
51504@@ -11290,8 +11290,10 @@ lpfc_init(void)
51505 "misc_register returned with status %d", error);
51506
51507 if (lpfc_enable_npiv) {
51508- lpfc_transport_functions.vport_create = lpfc_vport_create;
51509- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51510+ pax_open_kernel();
51511+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
51512+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51513+ pax_close_kernel();
51514 }
51515 lpfc_transport_template =
51516 fc_attach_transport(&lpfc_transport_functions);
51517diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
51518index b99399f..d29dc75 100644
51519--- a/drivers/scsi/lpfc/lpfc_scsi.c
51520+++ b/drivers/scsi/lpfc/lpfc_scsi.c
51521@@ -383,7 +383,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
51522 unsigned long expires;
51523
51524 spin_lock_irqsave(&phba->hbalock, flags);
51525- atomic_inc(&phba->num_rsrc_err);
51526+ atomic_inc_unchecked(&phba->num_rsrc_err);
51527 phba->last_rsrc_error_time = jiffies;
51528
51529 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
51530@@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51531 unsigned long num_rsrc_err, num_cmd_success;
51532 int i;
51533
51534- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
51535- num_cmd_success = atomic_read(&phba->num_cmd_success);
51536+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
51537+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
51538
51539 /*
51540 * The error and success command counters are global per
51541@@ -454,8 +454,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51542 }
51543 }
51544 lpfc_destroy_vport_work_array(phba, vports);
51545- atomic_set(&phba->num_rsrc_err, 0);
51546- atomic_set(&phba->num_cmd_success, 0);
51547+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
51548+ atomic_set_unchecked(&phba->num_cmd_success, 0);
51549 }
51550
51551 /**
51552diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51553index c80ed04..e674f01 100644
51554--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51555+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51556@@ -1561,7 +1561,7 @@ _scsih_get_resync(struct device *dev)
51557 {
51558 struct scsi_device *sdev = to_scsi_device(dev);
51559 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51560- static struct _raid_device *raid_device;
51561+ struct _raid_device *raid_device;
51562 unsigned long flags;
51563 Mpi2RaidVolPage0_t vol_pg0;
51564 Mpi2ConfigReply_t mpi_reply;
51565@@ -1613,7 +1613,7 @@ _scsih_get_state(struct device *dev)
51566 {
51567 struct scsi_device *sdev = to_scsi_device(dev);
51568 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51569- static struct _raid_device *raid_device;
51570+ struct _raid_device *raid_device;
51571 unsigned long flags;
51572 Mpi2RaidVolPage0_t vol_pg0;
51573 Mpi2ConfigReply_t mpi_reply;
51574@@ -6663,7 +6663,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
51575 Mpi2EventDataIrOperationStatus_t *event_data =
51576 (Mpi2EventDataIrOperationStatus_t *)
51577 fw_event->event_data;
51578- static struct _raid_device *raid_device;
51579+ struct _raid_device *raid_device;
51580 unsigned long flags;
51581 u16 handle;
51582
51583@@ -7134,7 +7134,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
51584 u64 sas_address;
51585 struct _sas_device *sas_device;
51586 struct _sas_node *expander_device;
51587- static struct _raid_device *raid_device;
51588+ struct _raid_device *raid_device;
51589 u8 retry_count;
51590 unsigned long flags;
51591
51592diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
51593index bcb64eb..f08cf71 100644
51594--- a/drivers/scsi/pmcraid.c
51595+++ b/drivers/scsi/pmcraid.c
51596@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
51597 res->scsi_dev = scsi_dev;
51598 scsi_dev->hostdata = res;
51599 res->change_detected = 0;
51600- atomic_set(&res->read_failures, 0);
51601- atomic_set(&res->write_failures, 0);
51602+ atomic_set_unchecked(&res->read_failures, 0);
51603+ atomic_set_unchecked(&res->write_failures, 0);
51604 rc = 0;
51605 }
51606 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
51607@@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
51608
51609 /* If this was a SCSI read/write command keep count of errors */
51610 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
51611- atomic_inc(&res->read_failures);
51612+ atomic_inc_unchecked(&res->read_failures);
51613 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
51614- atomic_inc(&res->write_failures);
51615+ atomic_inc_unchecked(&res->write_failures);
51616
51617 if (!RES_IS_GSCSI(res->cfg_entry) &&
51618 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
51619@@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
51620 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51621 * hrrq_id assigned here in queuecommand
51622 */
51623- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51624+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51625 pinstance->num_hrrq;
51626 cmd->cmd_done = pmcraid_io_done;
51627
51628@@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
51629 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51630 * hrrq_id assigned here in queuecommand
51631 */
51632- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51633+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51634 pinstance->num_hrrq;
51635
51636 if (request_size) {
51637@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
51638
51639 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
51640 /* add resources only after host is added into system */
51641- if (!atomic_read(&pinstance->expose_resources))
51642+ if (!atomic_read_unchecked(&pinstance->expose_resources))
51643 return;
51644
51645 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
51646@@ -5312,8 +5312,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
51647 init_waitqueue_head(&pinstance->reset_wait_q);
51648
51649 atomic_set(&pinstance->outstanding_cmds, 0);
51650- atomic_set(&pinstance->last_message_id, 0);
51651- atomic_set(&pinstance->expose_resources, 0);
51652+ atomic_set_unchecked(&pinstance->last_message_id, 0);
51653+ atomic_set_unchecked(&pinstance->expose_resources, 0);
51654
51655 INIT_LIST_HEAD(&pinstance->free_res_q);
51656 INIT_LIST_HEAD(&pinstance->used_res_q);
51657@@ -6026,7 +6026,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
51658 /* Schedule worker thread to handle CCN and take care of adding and
51659 * removing devices to OS
51660 */
51661- atomic_set(&pinstance->expose_resources, 1);
51662+ atomic_set_unchecked(&pinstance->expose_resources, 1);
51663 schedule_work(&pinstance->worker_q);
51664 return rc;
51665
51666diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
51667index e1d150f..6c6df44 100644
51668--- a/drivers/scsi/pmcraid.h
51669+++ b/drivers/scsi/pmcraid.h
51670@@ -748,7 +748,7 @@ struct pmcraid_instance {
51671 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
51672
51673 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
51674- atomic_t last_message_id;
51675+ atomic_unchecked_t last_message_id;
51676
51677 /* configuration table */
51678 struct pmcraid_config_table *cfg_table;
51679@@ -777,7 +777,7 @@ struct pmcraid_instance {
51680 atomic_t outstanding_cmds;
51681
51682 /* should add/delete resources to mid-layer now ?*/
51683- atomic_t expose_resources;
51684+ atomic_unchecked_t expose_resources;
51685
51686
51687
51688@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
51689 struct pmcraid_config_table_entry_ext cfg_entry_ext;
51690 };
51691 struct scsi_device *scsi_dev; /* Link scsi_device structure */
51692- atomic_t read_failures; /* count of failed READ commands */
51693- atomic_t write_failures; /* count of failed WRITE commands */
51694+ atomic_unchecked_t read_failures; /* count of failed READ commands */
51695+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
51696
51697 /* To indicate add/delete/modify during CCN */
51698 u8 change_detected;
51699diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
51700index 82b92c4..3178171 100644
51701--- a/drivers/scsi/qla2xxx/qla_attr.c
51702+++ b/drivers/scsi/qla2xxx/qla_attr.c
51703@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
51704 return 0;
51705 }
51706
51707-struct fc_function_template qla2xxx_transport_functions = {
51708+fc_function_template_no_const qla2xxx_transport_functions = {
51709
51710 .show_host_node_name = 1,
51711 .show_host_port_name = 1,
51712@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
51713 .bsg_timeout = qla24xx_bsg_timeout,
51714 };
51715
51716-struct fc_function_template qla2xxx_transport_vport_functions = {
51717+fc_function_template_no_const qla2xxx_transport_vport_functions = {
51718
51719 .show_host_node_name = 1,
51720 .show_host_port_name = 1,
51721diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
51722index b1865a7..a7723d3 100644
51723--- a/drivers/scsi/qla2xxx/qla_gbl.h
51724+++ b/drivers/scsi/qla2xxx/qla_gbl.h
51725@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
51726 struct device_attribute;
51727 extern struct device_attribute *qla2x00_host_attrs[];
51728 struct fc_function_template;
51729-extern struct fc_function_template qla2xxx_transport_functions;
51730-extern struct fc_function_template qla2xxx_transport_vport_functions;
51731+extern fc_function_template_no_const qla2xxx_transport_functions;
51732+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
51733 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
51734 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
51735 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
51736diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
51737index db3dbd9..2492392 100644
51738--- a/drivers/scsi/qla2xxx/qla_os.c
51739+++ b/drivers/scsi/qla2xxx/qla_os.c
51740@@ -1507,8 +1507,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
51741 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
51742 /* Ok, a 64bit DMA mask is applicable. */
51743 ha->flags.enable_64bit_addressing = 1;
51744- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51745- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51746+ pax_open_kernel();
51747+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51748+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51749+ pax_close_kernel();
51750 return;
51751 }
51752 }
51753diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
51754index 8f6d0fb..1b21097 100644
51755--- a/drivers/scsi/qla4xxx/ql4_def.h
51756+++ b/drivers/scsi/qla4xxx/ql4_def.h
51757@@ -305,7 +305,7 @@ struct ddb_entry {
51758 * (4000 only) */
51759 atomic_t relogin_timer; /* Max Time to wait for
51760 * relogin to complete */
51761- atomic_t relogin_retry_count; /* Num of times relogin has been
51762+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
51763 * retried */
51764 uint32_t default_time2wait; /* Default Min time between
51765 * relogins (+aens) */
51766diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
51767index 199fcf7..3c3a918 100644
51768--- a/drivers/scsi/qla4xxx/ql4_os.c
51769+++ b/drivers/scsi/qla4xxx/ql4_os.c
51770@@ -4496,12 +4496,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
51771 */
51772 if (!iscsi_is_session_online(cls_sess)) {
51773 /* Reset retry relogin timer */
51774- atomic_inc(&ddb_entry->relogin_retry_count);
51775+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
51776 DEBUG2(ql4_printk(KERN_INFO, ha,
51777 "%s: index[%d] relogin timed out-retrying"
51778 " relogin (%d), retry (%d)\n", __func__,
51779 ddb_entry->fw_ddb_index,
51780- atomic_read(&ddb_entry->relogin_retry_count),
51781+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
51782 ddb_entry->default_time2wait + 4));
51783 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
51784 atomic_set(&ddb_entry->retry_relogin_timer,
51785@@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
51786
51787 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
51788 atomic_set(&ddb_entry->relogin_timer, 0);
51789- atomic_set(&ddb_entry->relogin_retry_count, 0);
51790+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
51791 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
51792 ddb_entry->default_relogin_timeout =
51793 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
51794diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
51795index 79c77b4..ef6ec0b 100644
51796--- a/drivers/scsi/scsi.c
51797+++ b/drivers/scsi/scsi.c
51798@@ -645,7 +645,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
51799 struct Scsi_Host *host = cmd->device->host;
51800 int rtn = 0;
51801
51802- atomic_inc(&cmd->device->iorequest_cnt);
51803+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51804
51805 /* check if the device is still usable */
51806 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
51807diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
51808index 17fb051..937fbbd 100644
51809--- a/drivers/scsi/scsi_lib.c
51810+++ b/drivers/scsi/scsi_lib.c
51811@@ -1583,7 +1583,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
51812 shost = sdev->host;
51813 scsi_init_cmd_errh(cmd);
51814 cmd->result = DID_NO_CONNECT << 16;
51815- atomic_inc(&cmd->device->iorequest_cnt);
51816+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51817
51818 /*
51819 * SCSI request completion path will do scsi_device_unbusy(),
51820@@ -1606,9 +1606,9 @@ static void scsi_softirq_done(struct request *rq)
51821
51822 INIT_LIST_HEAD(&cmd->eh_entry);
51823
51824- atomic_inc(&cmd->device->iodone_cnt);
51825+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
51826 if (cmd->result)
51827- atomic_inc(&cmd->device->ioerr_cnt);
51828+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
51829
51830 disposition = scsi_decide_disposition(cmd);
51831 if (disposition != SUCCESS &&
51832diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
51833index f4cb7b3..dfa79c4 100644
51834--- a/drivers/scsi/scsi_sysfs.c
51835+++ b/drivers/scsi/scsi_sysfs.c
51836@@ -805,7 +805,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
51837 char *buf) \
51838 { \
51839 struct scsi_device *sdev = to_scsi_device(dev); \
51840- unsigned long long count = atomic_read(&sdev->field); \
51841+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
51842 return snprintf(buf, 20, "0x%llx\n", count); \
51843 } \
51844 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
51845diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
51846index 5d6f348..18778a6b 100644
51847--- a/drivers/scsi/scsi_transport_fc.c
51848+++ b/drivers/scsi/scsi_transport_fc.c
51849@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
51850 * Netlink Infrastructure
51851 */
51852
51853-static atomic_t fc_event_seq;
51854+static atomic_unchecked_t fc_event_seq;
51855
51856 /**
51857 * fc_get_event_number - Obtain the next sequential FC event number
51858@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
51859 u32
51860 fc_get_event_number(void)
51861 {
51862- return atomic_add_return(1, &fc_event_seq);
51863+ return atomic_add_return_unchecked(1, &fc_event_seq);
51864 }
51865 EXPORT_SYMBOL(fc_get_event_number);
51866
51867@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
51868 {
51869 int error;
51870
51871- atomic_set(&fc_event_seq, 0);
51872+ atomic_set_unchecked(&fc_event_seq, 0);
51873
51874 error = transport_class_register(&fc_host_class);
51875 if (error)
51876@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
51877 char *cp;
51878
51879 *val = simple_strtoul(buf, &cp, 0);
51880- if ((*cp && (*cp != '\n')) || (*val < 0))
51881+ if (*cp && (*cp != '\n'))
51882 return -EINVAL;
51883 /*
51884 * Check for overflow; dev_loss_tmo is u32
51885diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
51886index 67d43e3..8cee73c 100644
51887--- a/drivers/scsi/scsi_transport_iscsi.c
51888+++ b/drivers/scsi/scsi_transport_iscsi.c
51889@@ -79,7 +79,7 @@ struct iscsi_internal {
51890 struct transport_container session_cont;
51891 };
51892
51893-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
51894+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
51895 static struct workqueue_struct *iscsi_eh_timer_workq;
51896
51897 static DEFINE_IDA(iscsi_sess_ida);
51898@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
51899 int err;
51900
51901 ihost = shost->shost_data;
51902- session->sid = atomic_add_return(1, &iscsi_session_nr);
51903+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
51904
51905 if (target_id == ISCSI_MAX_TARGET) {
51906 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
51907@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
51908 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
51909 ISCSI_TRANSPORT_VERSION);
51910
51911- atomic_set(&iscsi_session_nr, 0);
51912+ atomic_set_unchecked(&iscsi_session_nr, 0);
51913
51914 err = class_register(&iscsi_transport_class);
51915 if (err)
51916diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
51917index ae45bd9..c32a586 100644
51918--- a/drivers/scsi/scsi_transport_srp.c
51919+++ b/drivers/scsi/scsi_transport_srp.c
51920@@ -35,7 +35,7 @@
51921 #include "scsi_priv.h"
51922
51923 struct srp_host_attrs {
51924- atomic_t next_port_id;
51925+ atomic_unchecked_t next_port_id;
51926 };
51927 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
51928
51929@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
51930 struct Scsi_Host *shost = dev_to_shost(dev);
51931 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
51932
51933- atomic_set(&srp_host->next_port_id, 0);
51934+ atomic_set_unchecked(&srp_host->next_port_id, 0);
51935 return 0;
51936 }
51937
51938@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
51939 rport_fast_io_fail_timedout);
51940 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
51941
51942- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
51943+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
51944 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
51945
51946 transport_setup_device(&rport->dev);
51947diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
51948index cfba74c..415f09b 100644
51949--- a/drivers/scsi/sd.c
51950+++ b/drivers/scsi/sd.c
51951@@ -3022,7 +3022,7 @@ static int sd_probe(struct device *dev)
51952 sdkp->disk = gd;
51953 sdkp->index = index;
51954 atomic_set(&sdkp->openers, 0);
51955- atomic_set(&sdkp->device->ioerr_cnt, 0);
51956+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
51957
51958 if (!sdp->request_queue->rq_timeout) {
51959 if (sdp->type != TYPE_MOD)
51960diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
51961index 6035444..c82edd4 100644
51962--- a/drivers/scsi/sg.c
51963+++ b/drivers/scsi/sg.c
51964@@ -1138,7 +1138,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
51965 sdp->disk->disk_name,
51966 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
51967 NULL,
51968- (char *)arg);
51969+ (char __user *)arg);
51970 case BLKTRACESTART:
51971 return blk_trace_startstop(sdp->device->request_queue, 1);
51972 case BLKTRACESTOP:
51973diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
51974index 11a5043..e36f04c 100644
51975--- a/drivers/soc/tegra/fuse/fuse-tegra.c
51976+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
51977@@ -70,7 +70,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
51978 return i;
51979 }
51980
51981-static struct bin_attribute fuse_bin_attr = {
51982+static bin_attribute_no_const fuse_bin_attr = {
51983 .attr = { .name = "fuse", .mode = S_IRUGO, },
51984 .read = fuse_read,
51985 };
51986diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
51987index 50f20f2..6bd81e0 100644
51988--- a/drivers/spi/spi.c
51989+++ b/drivers/spi/spi.c
51990@@ -2224,7 +2224,7 @@ int spi_bus_unlock(struct spi_master *master)
51991 EXPORT_SYMBOL_GPL(spi_bus_unlock);
51992
51993 /* portable code must never pass more than 32 bytes */
51994-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
51995+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
51996
51997 static u8 *buf;
51998
51999diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
52000index b41429f..2de5373 100644
52001--- a/drivers/staging/android/timed_output.c
52002+++ b/drivers/staging/android/timed_output.c
52003@@ -25,7 +25,7 @@
52004 #include "timed_output.h"
52005
52006 static struct class *timed_output_class;
52007-static atomic_t device_count;
52008+static atomic_unchecked_t device_count;
52009
52010 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
52011 char *buf)
52012@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
52013 timed_output_class = class_create(THIS_MODULE, "timed_output");
52014 if (IS_ERR(timed_output_class))
52015 return PTR_ERR(timed_output_class);
52016- atomic_set(&device_count, 0);
52017+ atomic_set_unchecked(&device_count, 0);
52018 timed_output_class->dev_groups = timed_output_groups;
52019 }
52020
52021@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
52022 if (ret < 0)
52023 return ret;
52024
52025- tdev->index = atomic_inc_return(&device_count);
52026+ tdev->index = atomic_inc_return_unchecked(&device_count);
52027 tdev->dev = device_create(timed_output_class, NULL,
52028 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
52029 if (IS_ERR(tdev->dev))
52030diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
52031index 001348c..cfaac8a 100644
52032--- a/drivers/staging/gdm724x/gdm_tty.c
52033+++ b/drivers/staging/gdm724x/gdm_tty.c
52034@@ -44,7 +44,7 @@
52035 #define gdm_tty_send_control(n, r, v, d, l) (\
52036 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
52037
52038-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
52039+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
52040
52041 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
52042 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
52043diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
52044index 9cb222e..8766f26 100644
52045--- a/drivers/staging/imx-drm/imx-drm-core.c
52046+++ b/drivers/staging/imx-drm/imx-drm-core.c
52047@@ -357,7 +357,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
52048 if (imxdrm->pipes >= MAX_CRTC)
52049 return -EINVAL;
52050
52051- if (imxdrm->drm->open_count)
52052+ if (local_read(&imxdrm->drm->open_count))
52053 return -EBUSY;
52054
52055 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
52056diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
52057index 503b2d7..c904931 100644
52058--- a/drivers/staging/line6/driver.c
52059+++ b/drivers/staging/line6/driver.c
52060@@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
52061 {
52062 struct usb_device *usbdev = line6->usbdev;
52063 int ret;
52064- unsigned char len;
52065+ unsigned char *plen;
52066
52067 /* query the serial number: */
52068 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
52069@@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
52070 return ret;
52071 }
52072
52073+ plen = kmalloc(1, GFP_KERNEL);
52074+ if (plen == NULL)
52075+ return -ENOMEM;
52076+
52077 /* Wait for data length. We'll get 0xff until length arrives. */
52078 do {
52079 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52080 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52081 USB_DIR_IN,
52082- 0x0012, 0x0000, &len, 1,
52083+ 0x0012, 0x0000, plen, 1,
52084 LINE6_TIMEOUT * HZ);
52085 if (ret < 0) {
52086 dev_err(line6->ifcdev,
52087 "receive length failed (error %d)\n", ret);
52088+ kfree(plen);
52089 return ret;
52090 }
52091- } while (len == 0xff);
52092+ } while (*plen == 0xff);
52093
52094- if (len != datalen) {
52095+ if (*plen != datalen) {
52096 /* should be equal or something went wrong */
52097 dev_err(line6->ifcdev,
52098 "length mismatch (expected %d, got %d)\n",
52099- (int)datalen, (int)len);
52100+ (int)datalen, (int)*plen);
52101+ kfree(plen);
52102 return -EINVAL;
52103 }
52104+ kfree(plen);
52105
52106 /* receive the result: */
52107 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52108@@ -520,7 +527,7 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
52109 {
52110 struct usb_device *usbdev = line6->usbdev;
52111 int ret;
52112- unsigned char status;
52113+ unsigned char *status;
52114
52115 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
52116 USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
52117@@ -533,26 +540,34 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
52118 return ret;
52119 }
52120
52121+ status = kmalloc(1, GFP_KERNEL);
52122+ if (status == NULL)
52123+ return -ENOMEM;
52124+
52125 do {
52126 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
52127 0x67,
52128 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52129 USB_DIR_IN,
52130 0x0012, 0x0000,
52131- &status, 1, LINE6_TIMEOUT * HZ);
52132+ status, 1, LINE6_TIMEOUT * HZ);
52133
52134 if (ret < 0) {
52135 dev_err(line6->ifcdev,
52136 "receiving status failed (error %d)\n", ret);
52137+ kfree(status);
52138 return ret;
52139 }
52140- } while (status == 0xff);
52141+ } while (*status == 0xff);
52142
52143- if (status != 0) {
52144+ if (*status != 0) {
52145 dev_err(line6->ifcdev, "write failed (error %d)\n", ret);
52146+ kfree(status);
52147 return -EINVAL;
52148 }
52149
52150+ kfree(status);
52151+
52152 return 0;
52153 }
52154
52155diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
52156index 6943715..0a93632 100644
52157--- a/drivers/staging/line6/toneport.c
52158+++ b/drivers/staging/line6/toneport.c
52159@@ -11,6 +11,7 @@
52160 */
52161
52162 #include <linux/wait.h>
52163+#include <linux/slab.h>
52164 #include <sound/control.h>
52165
52166 #include "audio.h"
52167@@ -307,14 +308,20 @@ static void toneport_destruct(struct usb_interface *interface)
52168 */
52169 static void toneport_setup(struct usb_line6_toneport *toneport)
52170 {
52171- int ticks;
52172+ int *ticks;
52173 struct usb_line6 *line6 = &toneport->line6;
52174 struct usb_device *usbdev = line6->usbdev;
52175 u16 idProduct = le16_to_cpu(usbdev->descriptor.idProduct);
52176
52177+ ticks = kmalloc(sizeof(int), GFP_KERNEL);
52178+ if (ticks == NULL)
52179+ return;
52180+
52181 /* sync time on device with host: */
52182- ticks = (int)get_seconds();
52183- line6_write_data(line6, 0x80c6, &ticks, 4);
52184+ *ticks = (int)get_seconds();
52185+ line6_write_data(line6, 0x80c6, ticks, sizeof(int));
52186+
52187+ kfree(ticks);
52188
52189 /* enable device: */
52190 toneport_send_cmd(usbdev, 0x0301, 0x0000);
52191diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
52192index a94f336..6a1924d 100644
52193--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
52194+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
52195@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
52196 return 0;
52197 }
52198
52199-sfw_test_client_ops_t brw_test_client;
52200-void brw_init_test_client(void)
52201-{
52202- brw_test_client.tso_init = brw_client_init;
52203- brw_test_client.tso_fini = brw_client_fini;
52204- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
52205- brw_test_client.tso_done_rpc = brw_client_done_rpc;
52206+sfw_test_client_ops_t brw_test_client = {
52207+ .tso_init = brw_client_init,
52208+ .tso_fini = brw_client_fini,
52209+ .tso_prep_rpc = brw_client_prep_rpc,
52210+ .tso_done_rpc = brw_client_done_rpc,
52211 };
52212
52213 srpc_service_t brw_test_service;
52214diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
52215index df04ab7..1deb1ac 100644
52216--- a/drivers/staging/lustre/lnet/selftest/framework.c
52217+++ b/drivers/staging/lustre/lnet/selftest/framework.c
52218@@ -1632,12 +1632,10 @@ static srpc_service_t sfw_services[] = {
52219
52220 extern sfw_test_client_ops_t ping_test_client;
52221 extern srpc_service_t ping_test_service;
52222-extern void ping_init_test_client(void);
52223 extern void ping_init_test_service(void);
52224
52225 extern sfw_test_client_ops_t brw_test_client;
52226 extern srpc_service_t brw_test_service;
52227-extern void brw_init_test_client(void);
52228 extern void brw_init_test_service(void);
52229
52230
52231@@ -1681,12 +1679,10 @@ sfw_startup (void)
52232 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
52233 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
52234
52235- brw_init_test_client();
52236 brw_init_test_service();
52237 rc = sfw_register_test(&brw_test_service, &brw_test_client);
52238 LASSERT (rc == 0);
52239
52240- ping_init_test_client();
52241 ping_init_test_service();
52242 rc = sfw_register_test(&ping_test_service, &ping_test_client);
52243 LASSERT (rc == 0);
52244diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
52245index 750cac4..e4d751f 100644
52246--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
52247+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
52248@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52249 return 0;
52250 }
52251
52252-sfw_test_client_ops_t ping_test_client;
52253-void ping_init_test_client(void)
52254-{
52255- ping_test_client.tso_init = ping_client_init;
52256- ping_test_client.tso_fini = ping_client_fini;
52257- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
52258- ping_test_client.tso_done_rpc = ping_client_done_rpc;
52259-}
52260+sfw_test_client_ops_t ping_test_client = {
52261+ .tso_init = ping_client_init,
52262+ .tso_fini = ping_client_fini,
52263+ .tso_prep_rpc = ping_client_prep_rpc,
52264+ .tso_done_rpc = ping_client_done_rpc,
52265+};
52266
52267 srpc_service_t ping_test_service;
52268 void ping_init_test_service(void)
52269diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52270index 14ac46f..eca2c16 100644
52271--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
52272+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52273@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
52274 ldlm_completion_callback lcs_completion;
52275 ldlm_blocking_callback lcs_blocking;
52276 ldlm_glimpse_callback lcs_glimpse;
52277-};
52278+} __no_const;
52279
52280 /* ldlm_lockd.c */
52281 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
52282diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
52283index 2a88b80..62e7e5f 100644
52284--- a/drivers/staging/lustre/lustre/include/obd.h
52285+++ b/drivers/staging/lustre/lustre/include/obd.h
52286@@ -1362,7 +1362,7 @@ struct md_ops {
52287 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
52288 * wrapper function in include/linux/obd_class.h.
52289 */
52290-};
52291+} __no_const;
52292
52293 struct lsm_operations {
52294 void (*lsm_free)(struct lov_stripe_md *);
52295diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52296index b798daa..b28ca8f 100644
52297--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52298+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52299@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
52300 int added = (mode == LCK_NL);
52301 int overlaps = 0;
52302 int splitted = 0;
52303- const struct ldlm_callback_suite null_cbs = { NULL };
52304+ const struct ldlm_callback_suite null_cbs = { };
52305
52306 CDEBUG(D_DLMTRACE, "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
52307 *flags, new->l_policy_data.l_flock.owner,
52308diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52309index bbe2c68..c6b4275 100644
52310--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52311+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52312@@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
52313 void __user *buffer, size_t *lenp, loff_t *ppos)
52314 {
52315 int rc, max_delay_cs;
52316- struct ctl_table dummy = *table;
52317+ ctl_table_no_const dummy = *table;
52318 long d;
52319
52320 dummy.data = &max_delay_cs;
52321@@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
52322 void __user *buffer, size_t *lenp, loff_t *ppos)
52323 {
52324 int rc, min_delay_cs;
52325- struct ctl_table dummy = *table;
52326+ ctl_table_no_const dummy = *table;
52327 long d;
52328
52329 dummy.data = &min_delay_cs;
52330@@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
52331 void __user *buffer, size_t *lenp, loff_t *ppos)
52332 {
52333 int rc, backoff;
52334- struct ctl_table dummy = *table;
52335+ ctl_table_no_const dummy = *table;
52336
52337 dummy.data = &backoff;
52338 dummy.proc_handler = &proc_dointvec;
52339diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
52340index 2c4fc74..b04ca79 100644
52341--- a/drivers/staging/lustre/lustre/libcfs/module.c
52342+++ b/drivers/staging/lustre/lustre/libcfs/module.c
52343@@ -315,11 +315,11 @@ out:
52344
52345
52346 struct cfs_psdev_ops libcfs_psdev_ops = {
52347- libcfs_psdev_open,
52348- libcfs_psdev_release,
52349- NULL,
52350- NULL,
52351- libcfs_ioctl
52352+ .p_open = libcfs_psdev_open,
52353+ .p_close = libcfs_psdev_release,
52354+ .p_read = NULL,
52355+ .p_write = NULL,
52356+ .p_ioctl = libcfs_ioctl
52357 };
52358
52359 extern int insert_proc(void);
52360diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
52361index b0bb709..0117c96 100644
52362--- a/drivers/staging/lustre/lustre/llite/dir.c
52363+++ b/drivers/staging/lustre/lustre/llite/dir.c
52364@@ -661,7 +661,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
52365 int mode;
52366 int err;
52367
52368- mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
52369+ mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
52370 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
52371 strlen(filename), mode, LUSTRE_OPC_MKDIR,
52372 lump);
52373diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
52374index b2b6c3c..302e4e4 100644
52375--- a/drivers/staging/octeon/ethernet-rx.c
52376+++ b/drivers/staging/octeon/ethernet-rx.c
52377@@ -416,11 +416,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52378 /* Increment RX stats for virtual ports */
52379 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
52380 #ifdef CONFIG_64BIT
52381- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
52382- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
52383+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
52384+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
52385 #else
52386- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
52387- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
52388+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
52389+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
52390 #endif
52391 }
52392 netif_receive_skb(skb);
52393@@ -431,9 +431,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52394 dev->name);
52395 */
52396 #ifdef CONFIG_64BIT
52397- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
52398+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52399 #else
52400- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
52401+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
52402 #endif
52403 dev_kfree_skb_irq(skb);
52404 }
52405diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
52406index 8f9e3fb..d283fb9 100644
52407--- a/drivers/staging/octeon/ethernet.c
52408+++ b/drivers/staging/octeon/ethernet.c
52409@@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
52410 * since the RX tasklet also increments it.
52411 */
52412 #ifdef CONFIG_64BIT
52413- atomic64_add(rx_status.dropped_packets,
52414- (atomic64_t *)&priv->stats.rx_dropped);
52415+ atomic64_add_unchecked(rx_status.dropped_packets,
52416+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52417 #else
52418- atomic_add(rx_status.dropped_packets,
52419- (atomic_t *)&priv->stats.rx_dropped);
52420+ atomic_add_unchecked(rx_status.dropped_packets,
52421+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
52422 #endif
52423 }
52424
52425diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
52426index 9191993..30e9817 100644
52427--- a/drivers/staging/rtl8188eu/include/hal_intf.h
52428+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
52429@@ -225,7 +225,7 @@ struct hal_ops {
52430
52431 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
52432 void (*hal_reset_security_engine)(struct adapter *adapter);
52433-};
52434+} __no_const;
52435
52436 enum rt_eeprom_type {
52437 EEPROM_93C46,
52438diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
52439index 070cc03..6806e37 100644
52440--- a/drivers/staging/rtl8712/rtl871x_io.h
52441+++ b/drivers/staging/rtl8712/rtl871x_io.h
52442@@ -108,7 +108,7 @@ struct _io_ops {
52443 u8 *pmem);
52444 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
52445 u8 *pmem);
52446-};
52447+} __no_const;
52448
52449 struct io_req {
52450 struct list_head list;
52451diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
52452index 2bf2e2f..84421c9 100644
52453--- a/drivers/staging/unisys/visorchipset/visorchipset.h
52454+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
52455@@ -228,7 +228,7 @@ typedef struct {
52456 void (*device_resume)(ulong busNo, ulong devNo);
52457 int (*get_channel_info)(uuid_le typeGuid, ulong *minSize,
52458 ulong *maxSize);
52459-} VISORCHIPSET_BUSDEV_NOTIFIERS;
52460+} __no_const VISORCHIPSET_BUSDEV_NOTIFIERS;
52461
52462 /* These functions live inside visorchipset, and will be called to indicate
52463 * responses to specific events (by code outside of visorchipset).
52464@@ -243,7 +243,7 @@ typedef struct {
52465 void (*device_destroy)(ulong busNo, ulong devNo, int response);
52466 void (*device_pause)(ulong busNo, ulong devNo, int response);
52467 void (*device_resume)(ulong busNo, ulong devNo, int response);
52468-} VISORCHIPSET_BUSDEV_RESPONDERS;
52469+} __no_const VISORCHIPSET_BUSDEV_RESPONDERS;
52470
52471 /** Register functions (in the bus driver) to get called by visorchipset
52472 * whenever a bus or device appears for which this service partition is
52473diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
52474index ae0dade..803d53a 100644
52475--- a/drivers/staging/vt6655/hostap.c
52476+++ b/drivers/staging/vt6655/hostap.c
52477@@ -65,14 +65,13 @@
52478 *
52479 */
52480
52481+static net_device_ops_no_const apdev_netdev_ops;
52482+
52483 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52484 {
52485 struct vnt_private *apdev_priv;
52486 struct net_device *dev = pDevice->dev;
52487 int ret;
52488- const struct net_device_ops apdev_netdev_ops = {
52489- .ndo_start_xmit = pDevice->tx_80211,
52490- };
52491
52492 pr_debug("%s: Enabling hostapd mode\n", dev->name);
52493
52494@@ -84,6 +83,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52495 *apdev_priv = *pDevice;
52496 eth_hw_addr_inherit(pDevice->apdev, dev);
52497
52498+ /* only half broken now */
52499+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
52500 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
52501
52502 pDevice->apdev->type = ARPHRD_IEEE80211;
52503diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
52504index e7e9372..161f530 100644
52505--- a/drivers/target/sbp/sbp_target.c
52506+++ b/drivers/target/sbp/sbp_target.c
52507@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
52508
52509 #define SESSION_MAINTENANCE_INTERVAL HZ
52510
52511-static atomic_t login_id = ATOMIC_INIT(0);
52512+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
52513
52514 static void session_maintenance_work(struct work_struct *);
52515 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
52516@@ -444,7 +444,7 @@ static void sbp_management_request_login(
52517 login->lun = se_lun;
52518 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
52519 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
52520- login->login_id = atomic_inc_return(&login_id);
52521+ login->login_id = atomic_inc_return_unchecked(&login_id);
52522
52523 login->tgt_agt = sbp_target_agent_register(login);
52524 if (IS_ERR(login->tgt_agt)) {
52525diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
52526index 24fa5d1..fae56f1 100644
52527--- a/drivers/target/target_core_device.c
52528+++ b/drivers/target/target_core_device.c
52529@@ -1532,7 +1532,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
52530 spin_lock_init(&dev->se_tmr_lock);
52531 spin_lock_init(&dev->qf_cmd_lock);
52532 sema_init(&dev->caw_sem, 1);
52533- atomic_set(&dev->dev_ordered_id, 0);
52534+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
52535 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
52536 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
52537 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
52538diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
52539index be877bf..7be9cd4 100644
52540--- a/drivers/target/target_core_transport.c
52541+++ b/drivers/target/target_core_transport.c
52542@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
52543 * Used to determine when ORDERED commands should go from
52544 * Dormant to Active status.
52545 */
52546- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
52547+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
52548 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
52549 cmd->se_ordered_id, cmd->sam_task_attr,
52550 dev->transport->name);
52551diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
52552index edc1cce..769e4cb 100644
52553--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
52554+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
52555@@ -209,8 +209,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
52556 platform_set_drvdata(pdev, priv);
52557
52558 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
52559- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52560- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52561+ pax_open_kernel();
52562+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52563+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52564+ pax_close_kernel();
52565 }
52566 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
52567 priv, &int3400_thermal_ops,
52568diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
52569index 62143ba..ae21165 100644
52570--- a/drivers/thermal/of-thermal.c
52571+++ b/drivers/thermal/of-thermal.c
52572@@ -30,6 +30,7 @@
52573 #include <linux/err.h>
52574 #include <linux/export.h>
52575 #include <linux/string.h>
52576+#include <linux/mm.h>
52577
52578 #include "thermal_core.h"
52579
52580@@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
52581 tz->get_trend = get_trend;
52582 tz->sensor_data = data;
52583
52584- tzd->ops->get_temp = of_thermal_get_temp;
52585- tzd->ops->get_trend = of_thermal_get_trend;
52586+ pax_open_kernel();
52587+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
52588+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
52589+ pax_close_kernel();
52590 mutex_unlock(&tzd->lock);
52591
52592 return tzd;
52593@@ -473,8 +476,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
52594 return;
52595
52596 mutex_lock(&tzd->lock);
52597- tzd->ops->get_temp = NULL;
52598- tzd->ops->get_trend = NULL;
52599+ pax_open_kernel();
52600+ *(void **)&tzd->ops->get_temp = NULL;
52601+ *(void **)&tzd->ops->get_trend = NULL;
52602+ pax_close_kernel();
52603
52604 tz->get_temp = NULL;
52605 tz->get_trend = NULL;
52606diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
52607index fd66f57..48e6376 100644
52608--- a/drivers/tty/cyclades.c
52609+++ b/drivers/tty/cyclades.c
52610@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
52611 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
52612 info->port.count);
52613 #endif
52614- info->port.count++;
52615+ atomic_inc(&info->port.count);
52616 #ifdef CY_DEBUG_COUNT
52617 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
52618- current->pid, info->port.count);
52619+ current->pid, atomic_read(&info->port.count));
52620 #endif
52621
52622 /*
52623@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
52624 for (j = 0; j < cy_card[i].nports; j++) {
52625 info = &cy_card[i].ports[j];
52626
52627- if (info->port.count) {
52628+ if (atomic_read(&info->port.count)) {
52629 /* XXX is the ldisc num worth this? */
52630 struct tty_struct *tty;
52631 struct tty_ldisc *ld;
52632diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
52633index 4fcec1d..5a036f7 100644
52634--- a/drivers/tty/hvc/hvc_console.c
52635+++ b/drivers/tty/hvc/hvc_console.c
52636@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
52637
52638 spin_lock_irqsave(&hp->port.lock, flags);
52639 /* Check and then increment for fast path open. */
52640- if (hp->port.count++ > 0) {
52641+ if (atomic_inc_return(&hp->port.count) > 1) {
52642 spin_unlock_irqrestore(&hp->port.lock, flags);
52643 hvc_kick();
52644 return 0;
52645@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52646
52647 spin_lock_irqsave(&hp->port.lock, flags);
52648
52649- if (--hp->port.count == 0) {
52650+ if (atomic_dec_return(&hp->port.count) == 0) {
52651 spin_unlock_irqrestore(&hp->port.lock, flags);
52652 /* We are done with the tty pointer now. */
52653 tty_port_tty_set(&hp->port, NULL);
52654@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52655 */
52656 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
52657 } else {
52658- if (hp->port.count < 0)
52659+ if (atomic_read(&hp->port.count) < 0)
52660 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
52661- hp->vtermno, hp->port.count);
52662+ hp->vtermno, atomic_read(&hp->port.count));
52663 spin_unlock_irqrestore(&hp->port.lock, flags);
52664 }
52665 }
52666@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
52667 * open->hangup case this can be called after the final close so prevent
52668 * that from happening for now.
52669 */
52670- if (hp->port.count <= 0) {
52671+ if (atomic_read(&hp->port.count) <= 0) {
52672 spin_unlock_irqrestore(&hp->port.lock, flags);
52673 return;
52674 }
52675
52676- hp->port.count = 0;
52677+ atomic_set(&hp->port.count, 0);
52678 spin_unlock_irqrestore(&hp->port.lock, flags);
52679 tty_port_tty_set(&hp->port, NULL);
52680
52681@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
52682 return -EPIPE;
52683
52684 /* FIXME what's this (unprotected) check for? */
52685- if (hp->port.count <= 0)
52686+ if (atomic_read(&hp->port.count) <= 0)
52687 return -EIO;
52688
52689 spin_lock_irqsave(&hp->lock, flags);
52690diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
52691index 81e939e..95ead10 100644
52692--- a/drivers/tty/hvc/hvcs.c
52693+++ b/drivers/tty/hvc/hvcs.c
52694@@ -83,6 +83,7 @@
52695 #include <asm/hvcserver.h>
52696 #include <asm/uaccess.h>
52697 #include <asm/vio.h>
52698+#include <asm/local.h>
52699
52700 /*
52701 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
52702@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
52703
52704 spin_lock_irqsave(&hvcsd->lock, flags);
52705
52706- if (hvcsd->port.count > 0) {
52707+ if (atomic_read(&hvcsd->port.count) > 0) {
52708 spin_unlock_irqrestore(&hvcsd->lock, flags);
52709 printk(KERN_INFO "HVCS: vterm state unchanged. "
52710 "The hvcs device node is still in use.\n");
52711@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
52712 }
52713 }
52714
52715- hvcsd->port.count = 0;
52716+ atomic_set(&hvcsd->port.count, 0);
52717 hvcsd->port.tty = tty;
52718 tty->driver_data = hvcsd;
52719
52720@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
52721 unsigned long flags;
52722
52723 spin_lock_irqsave(&hvcsd->lock, flags);
52724- hvcsd->port.count++;
52725+ atomic_inc(&hvcsd->port.count);
52726 hvcsd->todo_mask |= HVCS_SCHED_READ;
52727 spin_unlock_irqrestore(&hvcsd->lock, flags);
52728
52729@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52730 hvcsd = tty->driver_data;
52731
52732 spin_lock_irqsave(&hvcsd->lock, flags);
52733- if (--hvcsd->port.count == 0) {
52734+ if (atomic_dec_and_test(&hvcsd->port.count)) {
52735
52736 vio_disable_interrupts(hvcsd->vdev);
52737
52738@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52739
52740 free_irq(irq, hvcsd);
52741 return;
52742- } else if (hvcsd->port.count < 0) {
52743+ } else if (atomic_read(&hvcsd->port.count) < 0) {
52744 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
52745 " is missmanaged.\n",
52746- hvcsd->vdev->unit_address, hvcsd->port.count);
52747+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
52748 }
52749
52750 spin_unlock_irqrestore(&hvcsd->lock, flags);
52751@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52752
52753 spin_lock_irqsave(&hvcsd->lock, flags);
52754 /* Preserve this so that we know how many kref refs to put */
52755- temp_open_count = hvcsd->port.count;
52756+ temp_open_count = atomic_read(&hvcsd->port.count);
52757
52758 /*
52759 * Don't kref put inside the spinlock because the destruction
52760@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52761 tty->driver_data = NULL;
52762 hvcsd->port.tty = NULL;
52763
52764- hvcsd->port.count = 0;
52765+ atomic_set(&hvcsd->port.count, 0);
52766
52767 /* This will drop any buffered data on the floor which is OK in a hangup
52768 * scenario. */
52769@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
52770 * the middle of a write operation? This is a crummy place to do this
52771 * but we want to keep it all in the spinlock.
52772 */
52773- if (hvcsd->port.count <= 0) {
52774+ if (atomic_read(&hvcsd->port.count) <= 0) {
52775 spin_unlock_irqrestore(&hvcsd->lock, flags);
52776 return -ENODEV;
52777 }
52778@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
52779 {
52780 struct hvcs_struct *hvcsd = tty->driver_data;
52781
52782- if (!hvcsd || hvcsd->port.count <= 0)
52783+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
52784 return 0;
52785
52786 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
52787diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
52788index 4190199..06d5bfa 100644
52789--- a/drivers/tty/hvc/hvsi.c
52790+++ b/drivers/tty/hvc/hvsi.c
52791@@ -85,7 +85,7 @@ struct hvsi_struct {
52792 int n_outbuf;
52793 uint32_t vtermno;
52794 uint32_t virq;
52795- atomic_t seqno; /* HVSI packet sequence number */
52796+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
52797 uint16_t mctrl;
52798 uint8_t state; /* HVSI protocol state */
52799 uint8_t flags;
52800@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
52801
52802 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
52803 packet.hdr.len = sizeof(struct hvsi_query_response);
52804- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52805+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52806 packet.verb = VSV_SEND_VERSION_NUMBER;
52807 packet.u.version = HVSI_VERSION;
52808 packet.query_seqno = query_seqno+1;
52809@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
52810
52811 packet.hdr.type = VS_QUERY_PACKET_HEADER;
52812 packet.hdr.len = sizeof(struct hvsi_query);
52813- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52814+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52815 packet.verb = verb;
52816
52817 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
52818@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
52819 int wrote;
52820
52821 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
52822- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52823+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52824 packet.hdr.len = sizeof(struct hvsi_control);
52825 packet.verb = VSV_SET_MODEM_CTL;
52826 packet.mask = HVSI_TSDTR;
52827@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
52828 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
52829
52830 packet.hdr.type = VS_DATA_PACKET_HEADER;
52831- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52832+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52833 packet.hdr.len = count + sizeof(struct hvsi_header);
52834 memcpy(&packet.data, buf, count);
52835
52836@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
52837 struct hvsi_control packet __ALIGNED__;
52838
52839 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
52840- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52841+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52842 packet.hdr.len = 6;
52843 packet.verb = VSV_CLOSE_PROTOCOL;
52844
52845@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
52846
52847 tty_port_tty_set(&hp->port, tty);
52848 spin_lock_irqsave(&hp->lock, flags);
52849- hp->port.count++;
52850+ atomic_inc(&hp->port.count);
52851 atomic_set(&hp->seqno, 0);
52852 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
52853 spin_unlock_irqrestore(&hp->lock, flags);
52854@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52855
52856 spin_lock_irqsave(&hp->lock, flags);
52857
52858- if (--hp->port.count == 0) {
52859+ if (atomic_dec_return(&hp->port.count) == 0) {
52860 tty_port_tty_set(&hp->port, NULL);
52861 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
52862
52863@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52864
52865 spin_lock_irqsave(&hp->lock, flags);
52866 }
52867- } else if (hp->port.count < 0)
52868+ } else if (atomic_read(&hp->port.count) < 0)
52869 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
52870- hp - hvsi_ports, hp->port.count);
52871+ hp - hvsi_ports, atomic_read(&hp->port.count));
52872
52873 spin_unlock_irqrestore(&hp->lock, flags);
52874 }
52875@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
52876 tty_port_tty_set(&hp->port, NULL);
52877
52878 spin_lock_irqsave(&hp->lock, flags);
52879- hp->port.count = 0;
52880+ atomic_set(&hp->port.count, 0);
52881 hp->n_outbuf = 0;
52882 spin_unlock_irqrestore(&hp->lock, flags);
52883 }
52884diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
52885index 7ae6c29..05c6dba 100644
52886--- a/drivers/tty/hvc/hvsi_lib.c
52887+++ b/drivers/tty/hvc/hvsi_lib.c
52888@@ -8,7 +8,7 @@
52889
52890 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
52891 {
52892- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
52893+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
52894
52895 /* Assumes that always succeeds, works in practice */
52896 return pv->put_chars(pv->termno, (char *)packet, packet->len);
52897@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
52898
52899 /* Reset state */
52900 pv->established = 0;
52901- atomic_set(&pv->seqno, 0);
52902+ atomic_set_unchecked(&pv->seqno, 0);
52903
52904 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
52905
52906diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
52907index 345cebb..d5a1e9e 100644
52908--- a/drivers/tty/ipwireless/tty.c
52909+++ b/drivers/tty/ipwireless/tty.c
52910@@ -28,6 +28,7 @@
52911 #include <linux/tty_driver.h>
52912 #include <linux/tty_flip.h>
52913 #include <linux/uaccess.h>
52914+#include <asm/local.h>
52915
52916 #include "tty.h"
52917 #include "network.h"
52918@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52919 return -ENODEV;
52920
52921 mutex_lock(&tty->ipw_tty_mutex);
52922- if (tty->port.count == 0)
52923+ if (atomic_read(&tty->port.count) == 0)
52924 tty->tx_bytes_queued = 0;
52925
52926- tty->port.count++;
52927+ atomic_inc(&tty->port.count);
52928
52929 tty->port.tty = linux_tty;
52930 linux_tty->driver_data = tty;
52931@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52932
52933 static void do_ipw_close(struct ipw_tty *tty)
52934 {
52935- tty->port.count--;
52936-
52937- if (tty->port.count == 0) {
52938+ if (atomic_dec_return(&tty->port.count) == 0) {
52939 struct tty_struct *linux_tty = tty->port.tty;
52940
52941 if (linux_tty != NULL) {
52942@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
52943 return;
52944
52945 mutex_lock(&tty->ipw_tty_mutex);
52946- if (tty->port.count == 0) {
52947+ if (atomic_read(&tty->port.count) == 0) {
52948 mutex_unlock(&tty->ipw_tty_mutex);
52949 return;
52950 }
52951@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
52952
52953 mutex_lock(&tty->ipw_tty_mutex);
52954
52955- if (!tty->port.count) {
52956+ if (!atomic_read(&tty->port.count)) {
52957 mutex_unlock(&tty->ipw_tty_mutex);
52958 return;
52959 }
52960@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
52961 return -ENODEV;
52962
52963 mutex_lock(&tty->ipw_tty_mutex);
52964- if (!tty->port.count) {
52965+ if (!atomic_read(&tty->port.count)) {
52966 mutex_unlock(&tty->ipw_tty_mutex);
52967 return -EINVAL;
52968 }
52969@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
52970 if (!tty)
52971 return -ENODEV;
52972
52973- if (!tty->port.count)
52974+ if (!atomic_read(&tty->port.count))
52975 return -EINVAL;
52976
52977 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
52978@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
52979 if (!tty)
52980 return 0;
52981
52982- if (!tty->port.count)
52983+ if (!atomic_read(&tty->port.count))
52984 return 0;
52985
52986 return tty->tx_bytes_queued;
52987@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
52988 if (!tty)
52989 return -ENODEV;
52990
52991- if (!tty->port.count)
52992+ if (!atomic_read(&tty->port.count))
52993 return -EINVAL;
52994
52995 return get_control_lines(tty);
52996@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
52997 if (!tty)
52998 return -ENODEV;
52999
53000- if (!tty->port.count)
53001+ if (!atomic_read(&tty->port.count))
53002 return -EINVAL;
53003
53004 return set_control_lines(tty, set, clear);
53005@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
53006 if (!tty)
53007 return -ENODEV;
53008
53009- if (!tty->port.count)
53010+ if (!atomic_read(&tty->port.count))
53011 return -EINVAL;
53012
53013 /* FIXME: Exactly how is the tty object locked here .. */
53014@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
53015 * are gone */
53016 mutex_lock(&ttyj->ipw_tty_mutex);
53017 }
53018- while (ttyj->port.count)
53019+ while (atomic_read(&ttyj->port.count))
53020 do_ipw_close(ttyj);
53021 ipwireless_disassociate_network_ttys(network,
53022 ttyj->channel_idx);
53023diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
53024index 14c54e0..1efd4f2 100644
53025--- a/drivers/tty/moxa.c
53026+++ b/drivers/tty/moxa.c
53027@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
53028 }
53029
53030 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
53031- ch->port.count++;
53032+ atomic_inc(&ch->port.count);
53033 tty->driver_data = ch;
53034 tty_port_tty_set(&ch->port, tty);
53035 mutex_lock(&ch->port.mutex);
53036diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
53037index c434376..114ce13 100644
53038--- a/drivers/tty/n_gsm.c
53039+++ b/drivers/tty/n_gsm.c
53040@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
53041 spin_lock_init(&dlci->lock);
53042 mutex_init(&dlci->mutex);
53043 dlci->fifo = &dlci->_fifo;
53044- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
53045+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
53046 kfree(dlci);
53047 return NULL;
53048 }
53049@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
53050 struct gsm_dlci *dlci = tty->driver_data;
53051 struct tty_port *port = &dlci->port;
53052
53053- port->count++;
53054+ atomic_inc(&port->count);
53055 tty_port_tty_set(port, tty);
53056
53057 dlci->modem_rx = 0;
53058diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
53059index 47ca0f3..3c0b803 100644
53060--- a/drivers/tty/n_tty.c
53061+++ b/drivers/tty/n_tty.c
53062@@ -115,7 +115,7 @@ struct n_tty_data {
53063 int minimum_to_wake;
53064
53065 /* consumer-published */
53066- size_t read_tail;
53067+ size_t read_tail __intentional_overflow(-1);
53068 size_t line_start;
53069
53070 /* protected by output lock */
53071@@ -2523,6 +2523,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
53072 {
53073 *ops = tty_ldisc_N_TTY;
53074 ops->owner = NULL;
53075- ops->refcount = ops->flags = 0;
53076+ atomic_set(&ops->refcount, 0);
53077+ ops->flags = 0;
53078 }
53079 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
53080diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
53081index 7c4447a..70fbc1e 100644
53082--- a/drivers/tty/pty.c
53083+++ b/drivers/tty/pty.c
53084@@ -830,8 +830,10 @@ static void __init unix98_pty_init(void)
53085 panic("Couldn't register Unix98 pts driver");
53086
53087 /* Now create the /dev/ptmx special device */
53088+ pax_open_kernel();
53089 tty_default_fops(&ptmx_fops);
53090- ptmx_fops.open = ptmx_open;
53091+ *(void **)&ptmx_fops.open = ptmx_open;
53092+ pax_close_kernel();
53093
53094 cdev_init(&ptmx_cdev, &ptmx_fops);
53095 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
53096diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
53097index 383c4c7..d408e21 100644
53098--- a/drivers/tty/rocket.c
53099+++ b/drivers/tty/rocket.c
53100@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53101 tty->driver_data = info;
53102 tty_port_tty_set(port, tty);
53103
53104- if (port->count++ == 0) {
53105+ if (atomic_inc_return(&port->count) == 1) {
53106 atomic_inc(&rp_num_ports_open);
53107
53108 #ifdef ROCKET_DEBUG_OPEN
53109@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53110 #endif
53111 }
53112 #ifdef ROCKET_DEBUG_OPEN
53113- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
53114+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
53115 #endif
53116
53117 /*
53118@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
53119 spin_unlock_irqrestore(&info->port.lock, flags);
53120 return;
53121 }
53122- if (info->port.count)
53123+ if (atomic_read(&info->port.count))
53124 atomic_dec(&rp_num_ports_open);
53125 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
53126 spin_unlock_irqrestore(&info->port.lock, flags);
53127diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
53128index aa28209..e08fb85 100644
53129--- a/drivers/tty/serial/ioc4_serial.c
53130+++ b/drivers/tty/serial/ioc4_serial.c
53131@@ -437,7 +437,7 @@ struct ioc4_soft {
53132 } is_intr_info[MAX_IOC4_INTR_ENTS];
53133
53134 /* Number of entries active in the above array */
53135- atomic_t is_num_intrs;
53136+ atomic_unchecked_t is_num_intrs;
53137 } is_intr_type[IOC4_NUM_INTR_TYPES];
53138
53139 /* is_ir_lock must be held while
53140@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
53141 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
53142 || (type == IOC4_OTHER_INTR_TYPE)));
53143
53144- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
53145+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
53146 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
53147
53148 /* Save off the lower level interrupt handler */
53149@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
53150
53151 soft = arg;
53152 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
53153- num_intrs = (int)atomic_read(
53154+ num_intrs = (int)atomic_read_unchecked(
53155 &soft->is_intr_type[intr_type].is_num_intrs);
53156
53157 this_mir = this_ir = pending_intrs(soft, intr_type);
53158diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
53159index 129dc5b..1da5bb8 100644
53160--- a/drivers/tty/serial/kgdb_nmi.c
53161+++ b/drivers/tty/serial/kgdb_nmi.c
53162@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
53163 * I/O utilities that messages sent to the console will automatically
53164 * be displayed on the dbg_io.
53165 */
53166- dbg_io_ops->is_console = true;
53167+ pax_open_kernel();
53168+ *(int *)&dbg_io_ops->is_console = true;
53169+ pax_close_kernel();
53170
53171 return 0;
53172 }
53173diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
53174index a260cde..6b2b5ce 100644
53175--- a/drivers/tty/serial/kgdboc.c
53176+++ b/drivers/tty/serial/kgdboc.c
53177@@ -24,8 +24,9 @@
53178 #define MAX_CONFIG_LEN 40
53179
53180 static struct kgdb_io kgdboc_io_ops;
53181+static struct kgdb_io kgdboc_io_ops_console;
53182
53183-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
53184+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
53185 static int configured = -1;
53186
53187 static char config[MAX_CONFIG_LEN];
53188@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
53189 kgdboc_unregister_kbd();
53190 if (configured == 1)
53191 kgdb_unregister_io_module(&kgdboc_io_ops);
53192+ else if (configured == 2)
53193+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
53194 }
53195
53196 static int configure_kgdboc(void)
53197@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
53198 int err;
53199 char *cptr = config;
53200 struct console *cons;
53201+ int is_console = 0;
53202
53203 err = kgdboc_option_setup(config);
53204 if (err || !strlen(config) || isspace(config[0]))
53205 goto noconfig;
53206
53207 err = -ENODEV;
53208- kgdboc_io_ops.is_console = 0;
53209 kgdb_tty_driver = NULL;
53210
53211 kgdboc_use_kms = 0;
53212@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
53213 int idx;
53214 if (cons->device && cons->device(cons, &idx) == p &&
53215 idx == tty_line) {
53216- kgdboc_io_ops.is_console = 1;
53217+ is_console = 1;
53218 break;
53219 }
53220 cons = cons->next;
53221@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
53222 kgdb_tty_line = tty_line;
53223
53224 do_register:
53225- err = kgdb_register_io_module(&kgdboc_io_ops);
53226+ if (is_console) {
53227+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
53228+ configured = 2;
53229+ } else {
53230+ err = kgdb_register_io_module(&kgdboc_io_ops);
53231+ configured = 1;
53232+ }
53233 if (err)
53234 goto noconfig;
53235
53236@@ -205,8 +214,6 @@ do_register:
53237 if (err)
53238 goto nmi_con_failed;
53239
53240- configured = 1;
53241-
53242 return 0;
53243
53244 nmi_con_failed:
53245@@ -223,7 +230,7 @@ noconfig:
53246 static int __init init_kgdboc(void)
53247 {
53248 /* Already configured? */
53249- if (configured == 1)
53250+ if (configured >= 1)
53251 return 0;
53252
53253 return configure_kgdboc();
53254@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53255 if (config[len - 1] == '\n')
53256 config[len - 1] = '\0';
53257
53258- if (configured == 1)
53259+ if (configured >= 1)
53260 cleanup_kgdboc();
53261
53262 /* Go and configure with the new params. */
53263@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53264 .post_exception = kgdboc_post_exp_handler,
53265 };
53266
53267+static struct kgdb_io kgdboc_io_ops_console = {
53268+ .name = "kgdboc",
53269+ .read_char = kgdboc_get_char,
53270+ .write_char = kgdboc_put_char,
53271+ .pre_exception = kgdboc_pre_exp_handler,
53272+ .post_exception = kgdboc_post_exp_handler,
53273+ .is_console = 1
53274+};
53275+
53276 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
53277 /* This is only available if kgdboc is a built in for early debugging */
53278 static int __init kgdboc_early_init(char *opt)
53279diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
53280index 4b6c783..9a19db3 100644
53281--- a/drivers/tty/serial/msm_serial.c
53282+++ b/drivers/tty/serial/msm_serial.c
53283@@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
53284 .cons = MSM_CONSOLE,
53285 };
53286
53287-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
53288+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
53289
53290 static const struct of_device_id msm_uartdm_table[] = {
53291 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
53292@@ -1047,7 +1047,7 @@ static int msm_serial_probe(struct platform_device *pdev)
53293 int irq;
53294
53295 if (pdev->id == -1)
53296- pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
53297+ pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
53298
53299 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
53300 return -ENXIO;
53301diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
53302index 587d63b..48423a6 100644
53303--- a/drivers/tty/serial/samsung.c
53304+++ b/drivers/tty/serial/samsung.c
53305@@ -478,11 +478,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
53306 }
53307 }
53308
53309+static int s3c64xx_serial_startup(struct uart_port *port);
53310 static int s3c24xx_serial_startup(struct uart_port *port)
53311 {
53312 struct s3c24xx_uart_port *ourport = to_ourport(port);
53313 int ret;
53314
53315+ /* Startup sequence is different for s3c64xx and higher SoC's */
53316+ if (s3c24xx_serial_has_interrupt_mask(port))
53317+ return s3c64xx_serial_startup(port);
53318+
53319 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
53320 port, (unsigned long long)port->mapbase, port->membase);
53321
53322@@ -1159,10 +1164,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
53323 /* setup info for port */
53324 port->dev = &platdev->dev;
53325
53326- /* Startup sequence is different for s3c64xx and higher SoC's */
53327- if (s3c24xx_serial_has_interrupt_mask(port))
53328- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
53329-
53330 port->uartclk = 1;
53331
53332 if (cfg->uart_flags & UPF_CONS_FLOW) {
53333diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
53334index a28dee9..168ba47 100644
53335--- a/drivers/tty/serial/serial_core.c
53336+++ b/drivers/tty/serial/serial_core.c
53337@@ -1339,7 +1339,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53338
53339 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
53340
53341- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
53342+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
53343 return;
53344
53345 /*
53346@@ -1466,7 +1466,7 @@ static void uart_hangup(struct tty_struct *tty)
53347 uart_flush_buffer(tty);
53348 uart_shutdown(tty, state);
53349 spin_lock_irqsave(&port->lock, flags);
53350- port->count = 0;
53351+ atomic_set(&port->count, 0);
53352 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
53353 spin_unlock_irqrestore(&port->lock, flags);
53354 tty_port_tty_set(port, NULL);
53355@@ -1564,7 +1564,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53356 goto end;
53357 }
53358
53359- port->count++;
53360+ atomic_inc(&port->count);
53361 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
53362 retval = -ENXIO;
53363 goto err_dec_count;
53364@@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53365 end:
53366 return retval;
53367 err_dec_count:
53368- port->count--;
53369+ atomic_dec(&port->count);
53370 mutex_unlock(&port->mutex);
53371 goto end;
53372 }
53373diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
53374index b799170..87dafd5 100644
53375--- a/drivers/tty/synclink.c
53376+++ b/drivers/tty/synclink.c
53377@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53378
53379 if (debug_level >= DEBUG_LEVEL_INFO)
53380 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
53381- __FILE__,__LINE__, info->device_name, info->port.count);
53382+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53383
53384 if (tty_port_close_start(&info->port, tty, filp) == 0)
53385 goto cleanup;
53386@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53387 cleanup:
53388 if (debug_level >= DEBUG_LEVEL_INFO)
53389 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
53390- tty->driver->name, info->port.count);
53391+ tty->driver->name, atomic_read(&info->port.count));
53392
53393 } /* end of mgsl_close() */
53394
53395@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
53396
53397 mgsl_flush_buffer(tty);
53398 shutdown(info);
53399-
53400- info->port.count = 0;
53401+
53402+ atomic_set(&info->port.count, 0);
53403 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53404 info->port.tty = NULL;
53405
53406@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53407
53408 if (debug_level >= DEBUG_LEVEL_INFO)
53409 printk("%s(%d):block_til_ready before block on %s count=%d\n",
53410- __FILE__,__LINE__, tty->driver->name, port->count );
53411+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53412
53413 spin_lock_irqsave(&info->irq_spinlock, flags);
53414- port->count--;
53415+ atomic_dec(&port->count);
53416 spin_unlock_irqrestore(&info->irq_spinlock, flags);
53417 port->blocked_open++;
53418
53419@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53420
53421 if (debug_level >= DEBUG_LEVEL_INFO)
53422 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
53423- __FILE__,__LINE__, tty->driver->name, port->count );
53424+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53425
53426 tty_unlock(tty);
53427 schedule();
53428@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53429
53430 /* FIXME: Racy on hangup during close wait */
53431 if (!tty_hung_up_p(filp))
53432- port->count++;
53433+ atomic_inc(&port->count);
53434 port->blocked_open--;
53435
53436 if (debug_level >= DEBUG_LEVEL_INFO)
53437 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
53438- __FILE__,__LINE__, tty->driver->name, port->count );
53439+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53440
53441 if (!retval)
53442 port->flags |= ASYNC_NORMAL_ACTIVE;
53443@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53444
53445 if (debug_level >= DEBUG_LEVEL_INFO)
53446 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
53447- __FILE__,__LINE__,tty->driver->name, info->port.count);
53448+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53449
53450 /* If port is closing, signal caller to try again */
53451 if (info->port.flags & ASYNC_CLOSING){
53452@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53453 spin_unlock_irqrestore(&info->netlock, flags);
53454 goto cleanup;
53455 }
53456- info->port.count++;
53457+ atomic_inc(&info->port.count);
53458 spin_unlock_irqrestore(&info->netlock, flags);
53459
53460- if (info->port.count == 1) {
53461+ if (atomic_read(&info->port.count) == 1) {
53462 /* 1st open on this device, init hardware */
53463 retval = startup(info);
53464 if (retval < 0)
53465@@ -3442,8 +3442,8 @@ cleanup:
53466 if (retval) {
53467 if (tty->count == 1)
53468 info->port.tty = NULL; /* tty layer will release tty struct */
53469- if(info->port.count)
53470- info->port.count--;
53471+ if (atomic_read(&info->port.count))
53472+ atomic_dec(&info->port.count);
53473 }
53474
53475 return retval;
53476@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53477 unsigned short new_crctype;
53478
53479 /* return error if TTY interface open */
53480- if (info->port.count)
53481+ if (atomic_read(&info->port.count))
53482 return -EBUSY;
53483
53484 switch (encoding)
53485@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
53486
53487 /* arbitrate between network and tty opens */
53488 spin_lock_irqsave(&info->netlock, flags);
53489- if (info->port.count != 0 || info->netcount != 0) {
53490+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53491 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53492 spin_unlock_irqrestore(&info->netlock, flags);
53493 return -EBUSY;
53494@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53495 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53496
53497 /* return error if TTY interface open */
53498- if (info->port.count)
53499+ if (atomic_read(&info->port.count))
53500 return -EBUSY;
53501
53502 if (cmd != SIOCWANDEV)
53503diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
53504index 0e8c39b..e0cb171 100644
53505--- a/drivers/tty/synclink_gt.c
53506+++ b/drivers/tty/synclink_gt.c
53507@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53508 tty->driver_data = info;
53509 info->port.tty = tty;
53510
53511- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
53512+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
53513
53514 /* If port is closing, signal caller to try again */
53515 if (info->port.flags & ASYNC_CLOSING){
53516@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53517 mutex_unlock(&info->port.mutex);
53518 goto cleanup;
53519 }
53520- info->port.count++;
53521+ atomic_inc(&info->port.count);
53522 spin_unlock_irqrestore(&info->netlock, flags);
53523
53524- if (info->port.count == 1) {
53525+ if (atomic_read(&info->port.count) == 1) {
53526 /* 1st open on this device, init hardware */
53527 retval = startup(info);
53528 if (retval < 0) {
53529@@ -715,8 +715,8 @@ cleanup:
53530 if (retval) {
53531 if (tty->count == 1)
53532 info->port.tty = NULL; /* tty layer will release tty struct */
53533- if(info->port.count)
53534- info->port.count--;
53535+ if(atomic_read(&info->port.count))
53536+ atomic_dec(&info->port.count);
53537 }
53538
53539 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
53540@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53541
53542 if (sanity_check(info, tty->name, "close"))
53543 return;
53544- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
53545+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
53546
53547 if (tty_port_close_start(&info->port, tty, filp) == 0)
53548 goto cleanup;
53549@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53550 tty_port_close_end(&info->port, tty);
53551 info->port.tty = NULL;
53552 cleanup:
53553- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
53554+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
53555 }
53556
53557 static void hangup(struct tty_struct *tty)
53558@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
53559 shutdown(info);
53560
53561 spin_lock_irqsave(&info->port.lock, flags);
53562- info->port.count = 0;
53563+ atomic_set(&info->port.count, 0);
53564 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53565 info->port.tty = NULL;
53566 spin_unlock_irqrestore(&info->port.lock, flags);
53567@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53568 unsigned short new_crctype;
53569
53570 /* return error if TTY interface open */
53571- if (info->port.count)
53572+ if (atomic_read(&info->port.count))
53573 return -EBUSY;
53574
53575 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
53576@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
53577
53578 /* arbitrate between network and tty opens */
53579 spin_lock_irqsave(&info->netlock, flags);
53580- if (info->port.count != 0 || info->netcount != 0) {
53581+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53582 DBGINFO(("%s hdlc_open busy\n", dev->name));
53583 spin_unlock_irqrestore(&info->netlock, flags);
53584 return -EBUSY;
53585@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53586 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
53587
53588 /* return error if TTY interface open */
53589- if (info->port.count)
53590+ if (atomic_read(&info->port.count))
53591 return -EBUSY;
53592
53593 if (cmd != SIOCWANDEV)
53594@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
53595 if (port == NULL)
53596 continue;
53597 spin_lock(&port->lock);
53598- if ((port->port.count || port->netcount) &&
53599+ if ((atomic_read(&port->port.count) || port->netcount) &&
53600 port->pending_bh && !port->bh_running &&
53601 !port->bh_requested) {
53602 DBGISR(("%s bh queued\n", port->device_name));
53603@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53604 add_wait_queue(&port->open_wait, &wait);
53605
53606 spin_lock_irqsave(&info->lock, flags);
53607- port->count--;
53608+ atomic_dec(&port->count);
53609 spin_unlock_irqrestore(&info->lock, flags);
53610 port->blocked_open++;
53611
53612@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53613 remove_wait_queue(&port->open_wait, &wait);
53614
53615 if (!tty_hung_up_p(filp))
53616- port->count++;
53617+ atomic_inc(&port->count);
53618 port->blocked_open--;
53619
53620 if (!retval)
53621diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
53622index c3f9091..abe4601 100644
53623--- a/drivers/tty/synclinkmp.c
53624+++ b/drivers/tty/synclinkmp.c
53625@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53626
53627 if (debug_level >= DEBUG_LEVEL_INFO)
53628 printk("%s(%d):%s open(), old ref count = %d\n",
53629- __FILE__,__LINE__,tty->driver->name, info->port.count);
53630+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53631
53632 /* If port is closing, signal caller to try again */
53633 if (info->port.flags & ASYNC_CLOSING){
53634@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53635 spin_unlock_irqrestore(&info->netlock, flags);
53636 goto cleanup;
53637 }
53638- info->port.count++;
53639+ atomic_inc(&info->port.count);
53640 spin_unlock_irqrestore(&info->netlock, flags);
53641
53642- if (info->port.count == 1) {
53643+ if (atomic_read(&info->port.count) == 1) {
53644 /* 1st open on this device, init hardware */
53645 retval = startup(info);
53646 if (retval < 0)
53647@@ -796,8 +796,8 @@ cleanup:
53648 if (retval) {
53649 if (tty->count == 1)
53650 info->port.tty = NULL; /* tty layer will release tty struct */
53651- if(info->port.count)
53652- info->port.count--;
53653+ if(atomic_read(&info->port.count))
53654+ atomic_dec(&info->port.count);
53655 }
53656
53657 return retval;
53658@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53659
53660 if (debug_level >= DEBUG_LEVEL_INFO)
53661 printk("%s(%d):%s close() entry, count=%d\n",
53662- __FILE__,__LINE__, info->device_name, info->port.count);
53663+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53664
53665 if (tty_port_close_start(&info->port, tty, filp) == 0)
53666 goto cleanup;
53667@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53668 cleanup:
53669 if (debug_level >= DEBUG_LEVEL_INFO)
53670 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
53671- tty->driver->name, info->port.count);
53672+ tty->driver->name, atomic_read(&info->port.count));
53673 }
53674
53675 /* Called by tty_hangup() when a hangup is signaled.
53676@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
53677 shutdown(info);
53678
53679 spin_lock_irqsave(&info->port.lock, flags);
53680- info->port.count = 0;
53681+ atomic_set(&info->port.count, 0);
53682 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53683 info->port.tty = NULL;
53684 spin_unlock_irqrestore(&info->port.lock, flags);
53685@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53686 unsigned short new_crctype;
53687
53688 /* return error if TTY interface open */
53689- if (info->port.count)
53690+ if (atomic_read(&info->port.count))
53691 return -EBUSY;
53692
53693 switch (encoding)
53694@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
53695
53696 /* arbitrate between network and tty opens */
53697 spin_lock_irqsave(&info->netlock, flags);
53698- if (info->port.count != 0 || info->netcount != 0) {
53699+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53700 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53701 spin_unlock_irqrestore(&info->netlock, flags);
53702 return -EBUSY;
53703@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53704 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53705
53706 /* return error if TTY interface open */
53707- if (info->port.count)
53708+ if (atomic_read(&info->port.count))
53709 return -EBUSY;
53710
53711 if (cmd != SIOCWANDEV)
53712@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
53713 * do not request bottom half processing if the
53714 * device is not open in a normal mode.
53715 */
53716- if ( port && (port->port.count || port->netcount) &&
53717+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
53718 port->pending_bh && !port->bh_running &&
53719 !port->bh_requested ) {
53720 if ( debug_level >= DEBUG_LEVEL_ISR )
53721@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53722
53723 if (debug_level >= DEBUG_LEVEL_INFO)
53724 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
53725- __FILE__,__LINE__, tty->driver->name, port->count );
53726+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53727
53728 spin_lock_irqsave(&info->lock, flags);
53729- port->count--;
53730+ atomic_dec(&port->count);
53731 spin_unlock_irqrestore(&info->lock, flags);
53732 port->blocked_open++;
53733
53734@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53735
53736 if (debug_level >= DEBUG_LEVEL_INFO)
53737 printk("%s(%d):%s block_til_ready() count=%d\n",
53738- __FILE__,__LINE__, tty->driver->name, port->count );
53739+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53740
53741 tty_unlock(tty);
53742 schedule();
53743@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53744 set_current_state(TASK_RUNNING);
53745 remove_wait_queue(&port->open_wait, &wait);
53746 if (!tty_hung_up_p(filp))
53747- port->count++;
53748+ atomic_inc(&port->count);
53749 port->blocked_open--;
53750
53751 if (debug_level >= DEBUG_LEVEL_INFO)
53752 printk("%s(%d):%s block_til_ready() after, count=%d\n",
53753- __FILE__,__LINE__, tty->driver->name, port->count );
53754+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53755
53756 if (!retval)
53757 port->flags |= ASYNC_NORMAL_ACTIVE;
53758diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
53759index 42bad18..447d7a2 100644
53760--- a/drivers/tty/sysrq.c
53761+++ b/drivers/tty/sysrq.c
53762@@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
53763 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
53764 size_t count, loff_t *ppos)
53765 {
53766- if (count) {
53767+ if (count && capable(CAP_SYS_ADMIN)) {
53768 char c;
53769
53770 if (get_user(c, buf))
53771diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
53772index 0508a1d..b610592 100644
53773--- a/drivers/tty/tty_io.c
53774+++ b/drivers/tty/tty_io.c
53775@@ -3498,7 +3498,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
53776
53777 void tty_default_fops(struct file_operations *fops)
53778 {
53779- *fops = tty_fops;
53780+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
53781 }
53782
53783 /*
53784diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
53785index 2d822aa..a566234 100644
53786--- a/drivers/tty/tty_ldisc.c
53787+++ b/drivers/tty/tty_ldisc.c
53788@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
53789 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53790 tty_ldiscs[disc] = new_ldisc;
53791 new_ldisc->num = disc;
53792- new_ldisc->refcount = 0;
53793+ atomic_set(&new_ldisc->refcount, 0);
53794 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53795
53796 return ret;
53797@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
53798 return -EINVAL;
53799
53800 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53801- if (tty_ldiscs[disc]->refcount)
53802+ if (atomic_read(&tty_ldiscs[disc]->refcount))
53803 ret = -EBUSY;
53804 else
53805 tty_ldiscs[disc] = NULL;
53806@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
53807 if (ldops) {
53808 ret = ERR_PTR(-EAGAIN);
53809 if (try_module_get(ldops->owner)) {
53810- ldops->refcount++;
53811+ atomic_inc(&ldops->refcount);
53812 ret = ldops;
53813 }
53814 }
53815@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
53816 unsigned long flags;
53817
53818 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53819- ldops->refcount--;
53820+ atomic_dec(&ldops->refcount);
53821 module_put(ldops->owner);
53822 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53823 }
53824diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
53825index 1b93357..ea9f82c 100644
53826--- a/drivers/tty/tty_port.c
53827+++ b/drivers/tty/tty_port.c
53828@@ -237,7 +237,7 @@ void tty_port_hangup(struct tty_port *port)
53829 unsigned long flags;
53830
53831 spin_lock_irqsave(&port->lock, flags);
53832- port->count = 0;
53833+ atomic_set(&port->count, 0);
53834 port->flags &= ~ASYNC_NORMAL_ACTIVE;
53835 tty = port->tty;
53836 if (tty)
53837@@ -399,7 +399,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53838
53839 /* The port lock protects the port counts */
53840 spin_lock_irqsave(&port->lock, flags);
53841- port->count--;
53842+ atomic_dec(&port->count);
53843 port->blocked_open++;
53844 spin_unlock_irqrestore(&port->lock, flags);
53845
53846@@ -441,7 +441,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53847 we must not mess that up further */
53848 spin_lock_irqsave(&port->lock, flags);
53849 if (!tty_hung_up_p(filp))
53850- port->count++;
53851+ atomic_inc(&port->count);
53852 port->blocked_open--;
53853 if (retval == 0)
53854 port->flags |= ASYNC_NORMAL_ACTIVE;
53855@@ -479,19 +479,19 @@ int tty_port_close_start(struct tty_port *port,
53856 return 0;
53857 }
53858
53859- if (tty->count == 1 && port->count != 1) {
53860+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
53861 printk(KERN_WARNING
53862 "tty_port_close_start: tty->count = 1 port count = %d.\n",
53863- port->count);
53864- port->count = 1;
53865+ atomic_read(&port->count));
53866+ atomic_set(&port->count, 1);
53867 }
53868- if (--port->count < 0) {
53869+ if (atomic_dec_return(&port->count) < 0) {
53870 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
53871- port->count);
53872- port->count = 0;
53873+ atomic_read(&port->count));
53874+ atomic_set(&port->count, 0);
53875 }
53876
53877- if (port->count) {
53878+ if (atomic_read(&port->count)) {
53879 spin_unlock_irqrestore(&port->lock, flags);
53880 return 0;
53881 }
53882@@ -592,7 +592,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
53883 struct file *filp)
53884 {
53885 spin_lock_irq(&port->lock);
53886- ++port->count;
53887+ atomic_inc(&port->count);
53888 spin_unlock_irq(&port->lock);
53889 tty_port_tty_set(port, tty);
53890
53891diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
53892index c039cfe..0b463b0 100644
53893--- a/drivers/tty/vt/keyboard.c
53894+++ b/drivers/tty/vt/keyboard.c
53895@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
53896 kbd->kbdmode == VC_OFF) &&
53897 value != KVAL(K_SAK))
53898 return; /* SAK is allowed even in raw mode */
53899+
53900+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53901+ {
53902+ void *func = fn_handler[value];
53903+ if (func == fn_show_state || func == fn_show_ptregs ||
53904+ func == fn_show_mem)
53905+ return;
53906+ }
53907+#endif
53908+
53909 fn_handler[value](vc);
53910 }
53911
53912@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53913 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
53914 return -EFAULT;
53915
53916- if (!capable(CAP_SYS_TTY_CONFIG))
53917- perm = 0;
53918-
53919 switch (cmd) {
53920 case KDGKBENT:
53921 /* Ensure another thread doesn't free it under us */
53922@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53923 spin_unlock_irqrestore(&kbd_event_lock, flags);
53924 return put_user(val, &user_kbe->kb_value);
53925 case KDSKBENT:
53926+ if (!capable(CAP_SYS_TTY_CONFIG))
53927+ perm = 0;
53928+
53929 if (!perm)
53930 return -EPERM;
53931 if (!i && v == K_NOSUCHMAP) {
53932@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53933 int i, j, k;
53934 int ret;
53935
53936- if (!capable(CAP_SYS_TTY_CONFIG))
53937- perm = 0;
53938-
53939 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
53940 if (!kbs) {
53941 ret = -ENOMEM;
53942@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53943 kfree(kbs);
53944 return ((p && *p) ? -EOVERFLOW : 0);
53945 case KDSKBSENT:
53946+ if (!capable(CAP_SYS_TTY_CONFIG))
53947+ perm = 0;
53948+
53949 if (!perm) {
53950 ret = -EPERM;
53951 goto reterr;
53952diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
53953index 60fa627..7214965 100644
53954--- a/drivers/uio/uio.c
53955+++ b/drivers/uio/uio.c
53956@@ -25,6 +25,7 @@
53957 #include <linux/kobject.h>
53958 #include <linux/cdev.h>
53959 #include <linux/uio_driver.h>
53960+#include <asm/local.h>
53961
53962 #define UIO_MAX_DEVICES (1U << MINORBITS)
53963
53964@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
53965 struct device_attribute *attr, char *buf)
53966 {
53967 struct uio_device *idev = dev_get_drvdata(dev);
53968- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
53969+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
53970 }
53971 static DEVICE_ATTR_RO(event);
53972
53973@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
53974 {
53975 struct uio_device *idev = info->uio_dev;
53976
53977- atomic_inc(&idev->event);
53978+ atomic_inc_unchecked(&idev->event);
53979 wake_up_interruptible(&idev->wait);
53980 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
53981 }
53982@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
53983 }
53984
53985 listener->dev = idev;
53986- listener->event_count = atomic_read(&idev->event);
53987+ listener->event_count = atomic_read_unchecked(&idev->event);
53988 filep->private_data = listener;
53989
53990 if (idev->info->open) {
53991@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
53992 return -EIO;
53993
53994 poll_wait(filep, &idev->wait, wait);
53995- if (listener->event_count != atomic_read(&idev->event))
53996+ if (listener->event_count != atomic_read_unchecked(&idev->event))
53997 return POLLIN | POLLRDNORM;
53998 return 0;
53999 }
54000@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
54001 do {
54002 set_current_state(TASK_INTERRUPTIBLE);
54003
54004- event_count = atomic_read(&idev->event);
54005+ event_count = atomic_read_unchecked(&idev->event);
54006 if (event_count != listener->event_count) {
54007 if (copy_to_user(buf, &event_count, count))
54008 retval = -EFAULT;
54009@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
54010 static int uio_find_mem_index(struct vm_area_struct *vma)
54011 {
54012 struct uio_device *idev = vma->vm_private_data;
54013+ unsigned long size;
54014
54015 if (vma->vm_pgoff < MAX_UIO_MAPS) {
54016- if (idev->info->mem[vma->vm_pgoff].size == 0)
54017+ size = idev->info->mem[vma->vm_pgoff].size;
54018+ if (size == 0)
54019+ return -1;
54020+ if (vma->vm_end - vma->vm_start > size)
54021 return -1;
54022 return (int)vma->vm_pgoff;
54023 }
54024@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
54025 idev->owner = owner;
54026 idev->info = info;
54027 init_waitqueue_head(&idev->wait);
54028- atomic_set(&idev->event, 0);
54029+ atomic_set_unchecked(&idev->event, 0);
54030
54031 ret = uio_get_minor(idev);
54032 if (ret)
54033diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
54034index 813d4d3..a71934f 100644
54035--- a/drivers/usb/atm/cxacru.c
54036+++ b/drivers/usb/atm/cxacru.c
54037@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
54038 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
54039 if (ret < 2)
54040 return -EINVAL;
54041- if (index < 0 || index > 0x7f)
54042+ if (index > 0x7f)
54043 return -EINVAL;
54044 pos += tmp;
54045
54046diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
54047index dada014..1d0d517 100644
54048--- a/drivers/usb/atm/usbatm.c
54049+++ b/drivers/usb/atm/usbatm.c
54050@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54051 if (printk_ratelimit())
54052 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
54053 __func__, vpi, vci);
54054- atomic_inc(&vcc->stats->rx_err);
54055+ atomic_inc_unchecked(&vcc->stats->rx_err);
54056 return;
54057 }
54058
54059@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54060 if (length > ATM_MAX_AAL5_PDU) {
54061 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
54062 __func__, length, vcc);
54063- atomic_inc(&vcc->stats->rx_err);
54064+ atomic_inc_unchecked(&vcc->stats->rx_err);
54065 goto out;
54066 }
54067
54068@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54069 if (sarb->len < pdu_length) {
54070 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
54071 __func__, pdu_length, sarb->len, vcc);
54072- atomic_inc(&vcc->stats->rx_err);
54073+ atomic_inc_unchecked(&vcc->stats->rx_err);
54074 goto out;
54075 }
54076
54077 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
54078 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
54079 __func__, vcc);
54080- atomic_inc(&vcc->stats->rx_err);
54081+ atomic_inc_unchecked(&vcc->stats->rx_err);
54082 goto out;
54083 }
54084
54085@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54086 if (printk_ratelimit())
54087 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
54088 __func__, length);
54089- atomic_inc(&vcc->stats->rx_drop);
54090+ atomic_inc_unchecked(&vcc->stats->rx_drop);
54091 goto out;
54092 }
54093
54094@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54095
54096 vcc->push(vcc, skb);
54097
54098- atomic_inc(&vcc->stats->rx);
54099+ atomic_inc_unchecked(&vcc->stats->rx);
54100 out:
54101 skb_trim(sarb, 0);
54102 }
54103@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
54104 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
54105
54106 usbatm_pop(vcc, skb);
54107- atomic_inc(&vcc->stats->tx);
54108+ atomic_inc_unchecked(&vcc->stats->tx);
54109
54110 skb = skb_dequeue(&instance->sndqueue);
54111 }
54112@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
54113 if (!left--)
54114 return sprintf(page,
54115 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
54116- atomic_read(&atm_dev->stats.aal5.tx),
54117- atomic_read(&atm_dev->stats.aal5.tx_err),
54118- atomic_read(&atm_dev->stats.aal5.rx),
54119- atomic_read(&atm_dev->stats.aal5.rx_err),
54120- atomic_read(&atm_dev->stats.aal5.rx_drop));
54121+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
54122+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
54123+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
54124+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
54125+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
54126
54127 if (!left--) {
54128 if (instance->disconnected)
54129diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
54130index 2a3bbdf..91d72cf 100644
54131--- a/drivers/usb/core/devices.c
54132+++ b/drivers/usb/core/devices.c
54133@@ -126,7 +126,7 @@ static const char format_endpt[] =
54134 * time it gets called.
54135 */
54136 static struct device_connect_event {
54137- atomic_t count;
54138+ atomic_unchecked_t count;
54139 wait_queue_head_t wait;
54140 } device_event = {
54141 .count = ATOMIC_INIT(1),
54142@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
54143
54144 void usbfs_conn_disc_event(void)
54145 {
54146- atomic_add(2, &device_event.count);
54147+ atomic_add_unchecked(2, &device_event.count);
54148 wake_up(&device_event.wait);
54149 }
54150
54151@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
54152
54153 poll_wait(file, &device_event.wait, wait);
54154
54155- event_count = atomic_read(&device_event.count);
54156+ event_count = atomic_read_unchecked(&device_event.count);
54157 if (file->f_version != event_count) {
54158 file->f_version = event_count;
54159 return POLLIN | POLLRDNORM;
54160diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
54161index 0b59731..46ee7d1 100644
54162--- a/drivers/usb/core/devio.c
54163+++ b/drivers/usb/core/devio.c
54164@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54165 struct usb_dev_state *ps = file->private_data;
54166 struct usb_device *dev = ps->dev;
54167 ssize_t ret = 0;
54168- unsigned len;
54169+ size_t len;
54170 loff_t pos;
54171 int i;
54172
54173@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54174 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
54175 struct usb_config_descriptor *config =
54176 (struct usb_config_descriptor *)dev->rawdescriptors[i];
54177- unsigned int length = le16_to_cpu(config->wTotalLength);
54178+ size_t length = le16_to_cpu(config->wTotalLength);
54179
54180 if (*ppos < pos + length) {
54181
54182 /* The descriptor may claim to be longer than it
54183 * really is. Here is the actual allocated length. */
54184- unsigned alloclen =
54185+ size_t alloclen =
54186 le16_to_cpu(dev->config[i].desc.wTotalLength);
54187
54188- len = length - (*ppos - pos);
54189+ len = length + pos - *ppos;
54190 if (len > nbytes)
54191 len = nbytes;
54192
54193 /* Simply don't write (skip over) unallocated parts */
54194 if (alloclen > (*ppos - pos)) {
54195- alloclen -= (*ppos - pos);
54196+ alloclen = alloclen + pos - *ppos;
54197 if (copy_to_user(buf,
54198 dev->rawdescriptors[i] + (*ppos - pos),
54199 min(len, alloclen))) {
54200diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
54201index a6efb41..6f72549b 100644
54202--- a/drivers/usb/core/hcd.c
54203+++ b/drivers/usb/core/hcd.c
54204@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54205 */
54206 usb_get_urb(urb);
54207 atomic_inc(&urb->use_count);
54208- atomic_inc(&urb->dev->urbnum);
54209+ atomic_inc_unchecked(&urb->dev->urbnum);
54210 usbmon_urb_submit(&hcd->self, urb);
54211
54212 /* NOTE requirements on root-hub callers (usbfs and the hub
54213@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54214 urb->hcpriv = NULL;
54215 INIT_LIST_HEAD(&urb->urb_list);
54216 atomic_dec(&urb->use_count);
54217- atomic_dec(&urb->dev->urbnum);
54218+ atomic_dec_unchecked(&urb->dev->urbnum);
54219 if (atomic_read(&urb->reject))
54220 wake_up(&usb_kill_urb_queue);
54221 usb_put_urb(urb);
54222diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
54223index b649fef..c7107a0 100644
54224--- a/drivers/usb/core/hub.c
54225+++ b/drivers/usb/core/hub.c
54226@@ -26,6 +26,7 @@
54227 #include <linux/mutex.h>
54228 #include <linux/random.h>
54229 #include <linux/pm_qos.h>
54230+#include <linux/grsecurity.h>
54231
54232 #include <asm/uaccess.h>
54233 #include <asm/byteorder.h>
54234@@ -4666,6 +4667,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
54235 goto done;
54236 return;
54237 }
54238+
54239+ if (gr_handle_new_usb())
54240+ goto done;
54241+
54242 if (hub_is_superspeed(hub->hdev))
54243 unit_load = 150;
54244 else
54245diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
54246index f7b7713..23d07ec 100644
54247--- a/drivers/usb/core/message.c
54248+++ b/drivers/usb/core/message.c
54249@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54250 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54251 * error number.
54252 */
54253-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54254+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54255 __u8 requesttype, __u16 value, __u16 index, void *data,
54256 __u16 size, int timeout)
54257 {
54258@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54259 * If successful, 0. Otherwise a negative error number. The number of actual
54260 * bytes transferred will be stored in the @actual_length parameter.
54261 */
54262-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54263+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54264 void *data, int len, int *actual_length, int timeout)
54265 {
54266 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54267@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54268 * bytes transferred will be stored in the @actual_length parameter.
54269 *
54270 */
54271-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54272+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54273 void *data, int len, int *actual_length, int timeout)
54274 {
54275 struct urb *urb;
54276diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
54277index 1236c60..d47a51c 100644
54278--- a/drivers/usb/core/sysfs.c
54279+++ b/drivers/usb/core/sysfs.c
54280@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
54281 struct usb_device *udev;
54282
54283 udev = to_usb_device(dev);
54284- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
54285+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
54286 }
54287 static DEVICE_ATTR_RO(urbnum);
54288
54289diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
54290index 2dd2362..1135437 100644
54291--- a/drivers/usb/core/usb.c
54292+++ b/drivers/usb/core/usb.c
54293@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
54294 set_dev_node(&dev->dev, dev_to_node(bus->controller));
54295 dev->state = USB_STATE_ATTACHED;
54296 dev->lpm_disable_count = 1;
54297- atomic_set(&dev->urbnum, 0);
54298+ atomic_set_unchecked(&dev->urbnum, 0);
54299
54300 INIT_LIST_HEAD(&dev->ep0.urb_list);
54301 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
54302diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
54303index 8cfc319..4868255 100644
54304--- a/drivers/usb/early/ehci-dbgp.c
54305+++ b/drivers/usb/early/ehci-dbgp.c
54306@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
54307
54308 #ifdef CONFIG_KGDB
54309 static struct kgdb_io kgdbdbgp_io_ops;
54310-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
54311+static struct kgdb_io kgdbdbgp_io_ops_console;
54312+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
54313 #else
54314 #define dbgp_kgdb_mode (0)
54315 #endif
54316@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
54317 .write_char = kgdbdbgp_write_char,
54318 };
54319
54320+static struct kgdb_io kgdbdbgp_io_ops_console = {
54321+ .name = "kgdbdbgp",
54322+ .read_char = kgdbdbgp_read_char,
54323+ .write_char = kgdbdbgp_write_char,
54324+ .is_console = 1
54325+};
54326+
54327 static int kgdbdbgp_wait_time;
54328
54329 static int __init kgdbdbgp_parse_config(char *str)
54330@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
54331 ptr++;
54332 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
54333 }
54334- kgdb_register_io_module(&kgdbdbgp_io_ops);
54335- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
54336+ if (early_dbgp_console.index != -1)
54337+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
54338+ else
54339+ kgdb_register_io_module(&kgdbdbgp_io_ops);
54340
54341 return 0;
54342 }
54343diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
54344index f7b2032..fbb340c 100644
54345--- a/drivers/usb/gadget/function/f_uac1.c
54346+++ b/drivers/usb/gadget/function/f_uac1.c
54347@@ -14,6 +14,7 @@
54348 #include <linux/module.h>
54349 #include <linux/device.h>
54350 #include <linux/atomic.h>
54351+#include <linux/module.h>
54352
54353 #include "u_uac1.h"
54354
54355diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
54356index 491082a..dfd7d17 100644
54357--- a/drivers/usb/gadget/function/u_serial.c
54358+++ b/drivers/usb/gadget/function/u_serial.c
54359@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54360 spin_lock_irq(&port->port_lock);
54361
54362 /* already open? Great. */
54363- if (port->port.count) {
54364+ if (atomic_read(&port->port.count)) {
54365 status = 0;
54366- port->port.count++;
54367+ atomic_inc(&port->port.count);
54368
54369 /* currently opening/closing? wait ... */
54370 } else if (port->openclose) {
54371@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54372 tty->driver_data = port;
54373 port->port.tty = tty;
54374
54375- port->port.count = 1;
54376+ atomic_set(&port->port.count, 1);
54377 port->openclose = false;
54378
54379 /* if connected, start the I/O stream */
54380@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54381
54382 spin_lock_irq(&port->port_lock);
54383
54384- if (port->port.count != 1) {
54385- if (port->port.count == 0)
54386+ if (atomic_read(&port->port.count) != 1) {
54387+ if (atomic_read(&port->port.count) == 0)
54388 WARN_ON(1);
54389 else
54390- --port->port.count;
54391+ atomic_dec(&port->port.count);
54392 goto exit;
54393 }
54394
54395@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54396 * and sleep if necessary
54397 */
54398 port->openclose = true;
54399- port->port.count = 0;
54400+ atomic_set(&port->port.count, 0);
54401
54402 gser = port->port_usb;
54403 if (gser && gser->disconnect)
54404@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
54405 int cond;
54406
54407 spin_lock_irq(&port->port_lock);
54408- cond = (port->port.count == 0) && !port->openclose;
54409+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
54410 spin_unlock_irq(&port->port_lock);
54411 return cond;
54412 }
54413@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
54414 /* if it's already open, start I/O ... and notify the serial
54415 * protocol about open/close status (connect/disconnect).
54416 */
54417- if (port->port.count) {
54418+ if (atomic_read(&port->port.count)) {
54419 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
54420 gs_start_io(port);
54421 if (gser->connect)
54422@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
54423
54424 port->port_usb = NULL;
54425 gser->ioport = NULL;
54426- if (port->port.count > 0 || port->openclose) {
54427+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
54428 wake_up_interruptible(&port->drain_wait);
54429 if (port->port.tty)
54430 tty_hangup(port->port.tty);
54431@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
54432
54433 /* finally, free any unused/unusable I/O buffers */
54434 spin_lock_irqsave(&port->port_lock, flags);
54435- if (port->port.count == 0 && !port->openclose)
54436+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
54437 gs_buf_free(&port->port_write_buf);
54438 gs_free_requests(gser->out, &port->read_pool, NULL);
54439 gs_free_requests(gser->out, &port->read_queue, NULL);
54440diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
54441index a44a07f..ecea924 100644
54442--- a/drivers/usb/gadget/function/u_uac1.c
54443+++ b/drivers/usb/gadget/function/u_uac1.c
54444@@ -17,6 +17,7 @@
54445 #include <linux/ctype.h>
54446 #include <linux/random.h>
54447 #include <linux/syscalls.h>
54448+#include <linux/module.h>
54449
54450 #include "u_uac1.h"
54451
54452diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
54453index 5728829..fefc6bf 100644
54454--- a/drivers/usb/host/ehci-hub.c
54455+++ b/drivers/usb/host/ehci-hub.c
54456@@ -771,7 +771,7 @@ static struct urb *request_single_step_set_feature_urb(
54457 urb->transfer_flags = URB_DIR_IN;
54458 usb_get_urb(urb);
54459 atomic_inc(&urb->use_count);
54460- atomic_inc(&urb->dev->urbnum);
54461+ atomic_inc_unchecked(&urb->dev->urbnum);
54462 urb->setup_dma = dma_map_single(
54463 hcd->self.controller,
54464 urb->setup_packet,
54465@@ -838,7 +838,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
54466 urb->status = -EINPROGRESS;
54467 usb_get_urb(urb);
54468 atomic_inc(&urb->use_count);
54469- atomic_inc(&urb->dev->urbnum);
54470+ atomic_inc_unchecked(&urb->dev->urbnum);
54471 retval = submit_single_step_set_feature(hcd, urb, 0);
54472 if (!retval && !wait_for_completion_timeout(&done,
54473 msecs_to_jiffies(2000))) {
54474diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
54475index 1db0626..4948782 100644
54476--- a/drivers/usb/host/hwa-hc.c
54477+++ b/drivers/usb/host/hwa-hc.c
54478@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54479 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
54480 struct wahc *wa = &hwahc->wa;
54481 struct device *dev = &wa->usb_iface->dev;
54482- u8 mas_le[UWB_NUM_MAS/8];
54483+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
54484+
54485+ if (mas_le == NULL)
54486+ return -ENOMEM;
54487
54488 /* Set the stream index */
54489 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
54490@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54491 WUSB_REQ_SET_WUSB_MAS,
54492 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
54493 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
54494- mas_le, 32, USB_CTRL_SET_TIMEOUT);
54495+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
54496 if (result < 0)
54497 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
54498 out:
54499+ kfree(mas_le);
54500+
54501 return result;
54502 }
54503
54504diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
54505index b3d245e..99549ed 100644
54506--- a/drivers/usb/misc/appledisplay.c
54507+++ b/drivers/usb/misc/appledisplay.c
54508@@ -84,7 +84,7 @@ struct appledisplay {
54509 struct mutex sysfslock; /* concurrent read and write */
54510 };
54511
54512-static atomic_t count_displays = ATOMIC_INIT(0);
54513+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
54514 static struct workqueue_struct *wq;
54515
54516 static void appledisplay_complete(struct urb *urb)
54517@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
54518
54519 /* Register backlight device */
54520 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
54521- atomic_inc_return(&count_displays) - 1);
54522+ atomic_inc_return_unchecked(&count_displays) - 1);
54523 memset(&props, 0, sizeof(struct backlight_properties));
54524 props.type = BACKLIGHT_RAW;
54525 props.max_brightness = 0xff;
54526diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
54527index 29fa1c3..a57b08e 100644
54528--- a/drivers/usb/serial/console.c
54529+++ b/drivers/usb/serial/console.c
54530@@ -125,7 +125,7 @@ static int usb_console_setup(struct console *co, char *options)
54531
54532 info->port = port;
54533
54534- ++port->port.count;
54535+ atomic_inc(&port->port.count);
54536 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
54537 if (serial->type->set_termios) {
54538 /*
54539@@ -173,7 +173,7 @@ static int usb_console_setup(struct console *co, char *options)
54540 }
54541 /* Now that any required fake tty operations are completed restore
54542 * the tty port count */
54543- --port->port.count;
54544+ atomic_dec(&port->port.count);
54545 /* The console is special in terms of closing the device so
54546 * indicate this port is now acting as a system console. */
54547 port->port.console = 1;
54548@@ -186,7 +186,7 @@ static int usb_console_setup(struct console *co, char *options)
54549 put_tty:
54550 tty_kref_put(tty);
54551 reset_open_count:
54552- port->port.count = 0;
54553+ atomic_set(&port->port.count, 0);
54554 usb_autopm_put_interface(serial->interface);
54555 error_get_interface:
54556 usb_serial_put(serial);
54557@@ -197,7 +197,7 @@ static int usb_console_setup(struct console *co, char *options)
54558 static void usb_console_write(struct console *co,
54559 const char *buf, unsigned count)
54560 {
54561- static struct usbcons_info *info = &usbcons_info;
54562+ struct usbcons_info *info = &usbcons_info;
54563 struct usb_serial_port *port = info->port;
54564 struct usb_serial *serial;
54565 int retval = -ENODEV;
54566diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
54567index 307e339..6aa97cb 100644
54568--- a/drivers/usb/storage/usb.h
54569+++ b/drivers/usb/storage/usb.h
54570@@ -63,7 +63,7 @@ struct us_unusual_dev {
54571 __u8 useProtocol;
54572 __u8 useTransport;
54573 int (*initFunction)(struct us_data *);
54574-};
54575+} __do_const;
54576
54577
54578 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
54579diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
54580index a863a98..d272795 100644
54581--- a/drivers/usb/usbip/vhci.h
54582+++ b/drivers/usb/usbip/vhci.h
54583@@ -83,7 +83,7 @@ struct vhci_hcd {
54584 unsigned resuming:1;
54585 unsigned long re_timeout;
54586
54587- atomic_t seqnum;
54588+ atomic_unchecked_t seqnum;
54589
54590 /*
54591 * NOTE:
54592diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
54593index c02374b..32d47a9 100644
54594--- a/drivers/usb/usbip/vhci_hcd.c
54595+++ b/drivers/usb/usbip/vhci_hcd.c
54596@@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
54597
54598 spin_lock(&vdev->priv_lock);
54599
54600- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
54601+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54602 if (priv->seqnum == 0xffff)
54603 dev_info(&urb->dev->dev, "seqnum max\n");
54604
54605@@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
54606 return -ENOMEM;
54607 }
54608
54609- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
54610+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54611 if (unlink->seqnum == 0xffff)
54612 pr_info("seqnum max\n");
54613
54614@@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
54615 vdev->rhport = rhport;
54616 }
54617
54618- atomic_set(&vhci->seqnum, 0);
54619+ atomic_set_unchecked(&vhci->seqnum, 0);
54620 spin_lock_init(&vhci->lock);
54621
54622 hcd->power_budget = 0; /* no limit */
54623diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
54624index 00e4a54..d676f85 100644
54625--- a/drivers/usb/usbip/vhci_rx.c
54626+++ b/drivers/usb/usbip/vhci_rx.c
54627@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
54628 if (!urb) {
54629 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
54630 pr_info("max seqnum %d\n",
54631- atomic_read(&the_controller->seqnum));
54632+ atomic_read_unchecked(&the_controller->seqnum));
54633 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
54634 return;
54635 }
54636diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
54637index edc7267..9f65ce2 100644
54638--- a/drivers/usb/wusbcore/wa-hc.h
54639+++ b/drivers/usb/wusbcore/wa-hc.h
54640@@ -240,7 +240,7 @@ struct wahc {
54641 spinlock_t xfer_list_lock;
54642 struct work_struct xfer_enqueue_work;
54643 struct work_struct xfer_error_work;
54644- atomic_t xfer_id_count;
54645+ atomic_unchecked_t xfer_id_count;
54646
54647 kernel_ulong_t quirks;
54648 };
54649@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
54650 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
54651 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
54652 wa->dto_in_use = 0;
54653- atomic_set(&wa->xfer_id_count, 1);
54654+ atomic_set_unchecked(&wa->xfer_id_count, 1);
54655 /* init the buf in URBs */
54656 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
54657 usb_init_urb(&(wa->buf_in_urbs[index]));
54658diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
54659index 69af4fd..da390d7 100644
54660--- a/drivers/usb/wusbcore/wa-xfer.c
54661+++ b/drivers/usb/wusbcore/wa-xfer.c
54662@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
54663 */
54664 static void wa_xfer_id_init(struct wa_xfer *xfer)
54665 {
54666- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
54667+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
54668 }
54669
54670 /* Return the xfer's ID. */
54671diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
54672index f018d8d..ccab63f 100644
54673--- a/drivers/vfio/vfio.c
54674+++ b/drivers/vfio/vfio.c
54675@@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
54676 return 0;
54677
54678 /* TODO Prevent device auto probing */
54679- WARN("Device %s added to live group %d!\n", dev_name(dev),
54680+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
54681 iommu_group_id(group->iommu_group));
54682
54683 return 0;
54684diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
54685index 5174eba..451e6bc 100644
54686--- a/drivers/vhost/vringh.c
54687+++ b/drivers/vhost/vringh.c
54688@@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
54689 /* Userspace access helpers: in this case, addresses are really userspace. */
54690 static inline int getu16_user(u16 *val, const u16 *p)
54691 {
54692- return get_user(*val, (__force u16 __user *)p);
54693+ return get_user(*val, (u16 __force_user *)p);
54694 }
54695
54696 static inline int putu16_user(u16 *p, u16 val)
54697 {
54698- return put_user(val, (__force u16 __user *)p);
54699+ return put_user(val, (u16 __force_user *)p);
54700 }
54701
54702 static inline int copydesc_user(void *dst, const void *src, size_t len)
54703 {
54704- return copy_from_user(dst, (__force void __user *)src, len) ?
54705+ return copy_from_user(dst, (void __force_user *)src, len) ?
54706 -EFAULT : 0;
54707 }
54708
54709@@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
54710 const struct vring_used_elem *src,
54711 unsigned int num)
54712 {
54713- return copy_to_user((__force void __user *)dst, src,
54714+ return copy_to_user((void __force_user *)dst, src,
54715 sizeof(*dst) * num) ? -EFAULT : 0;
54716 }
54717
54718 static inline int xfer_from_user(void *src, void *dst, size_t len)
54719 {
54720- return copy_from_user(dst, (__force void __user *)src, len) ?
54721+ return copy_from_user(dst, (void __force_user *)src, len) ?
54722 -EFAULT : 0;
54723 }
54724
54725 static inline int xfer_to_user(void *dst, void *src, size_t len)
54726 {
54727- return copy_to_user((__force void __user *)dst, src, len) ?
54728+ return copy_to_user((void __force_user *)dst, src, len) ?
54729 -EFAULT : 0;
54730 }
54731
54732@@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
54733 vrh->last_used_idx = 0;
54734 vrh->vring.num = num;
54735 /* vring expects kernel addresses, but only used via accessors. */
54736- vrh->vring.desc = (__force struct vring_desc *)desc;
54737- vrh->vring.avail = (__force struct vring_avail *)avail;
54738- vrh->vring.used = (__force struct vring_used *)used;
54739+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
54740+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
54741+ vrh->vring.used = (__force_kernel struct vring_used *)used;
54742 return 0;
54743 }
54744 EXPORT_SYMBOL(vringh_init_user);
54745@@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
54746
54747 static inline int putu16_kern(u16 *p, u16 val)
54748 {
54749- ACCESS_ONCE(*p) = val;
54750+ ACCESS_ONCE_RW(*p) = val;
54751 return 0;
54752 }
54753
54754diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
54755index 84a110a..96312c3 100644
54756--- a/drivers/video/backlight/kb3886_bl.c
54757+++ b/drivers/video/backlight/kb3886_bl.c
54758@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
54759 static unsigned long kb3886bl_flags;
54760 #define KB3886BL_SUSPENDED 0x01
54761
54762-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
54763+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
54764 {
54765 .ident = "Sahara Touch-iT",
54766 .matches = {
54767diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
54768index 1b0b233..6f34c2c 100644
54769--- a/drivers/video/fbdev/arcfb.c
54770+++ b/drivers/video/fbdev/arcfb.c
54771@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
54772 return -ENOSPC;
54773
54774 err = 0;
54775- if ((count + p) > fbmemlength) {
54776+ if (count > (fbmemlength - p)) {
54777 count = fbmemlength - p;
54778 err = -ENOSPC;
54779 }
54780diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
54781index aedf2fb..47c9aca 100644
54782--- a/drivers/video/fbdev/aty/aty128fb.c
54783+++ b/drivers/video/fbdev/aty/aty128fb.c
54784@@ -149,7 +149,7 @@ enum {
54785 };
54786
54787 /* Must match above enum */
54788-static char * const r128_family[] = {
54789+static const char * const r128_family[] = {
54790 "AGP",
54791 "PCI",
54792 "PRO AGP",
54793diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
54794index 37ec09b..98f8862 100644
54795--- a/drivers/video/fbdev/aty/atyfb_base.c
54796+++ b/drivers/video/fbdev/aty/atyfb_base.c
54797@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
54798 par->accel_flags = var->accel_flags; /* hack */
54799
54800 if (var->accel_flags) {
54801- info->fbops->fb_sync = atyfb_sync;
54802+ pax_open_kernel();
54803+ *(void **)&info->fbops->fb_sync = atyfb_sync;
54804+ pax_close_kernel();
54805 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54806 } else {
54807- info->fbops->fb_sync = NULL;
54808+ pax_open_kernel();
54809+ *(void **)&info->fbops->fb_sync = NULL;
54810+ pax_close_kernel();
54811 info->flags |= FBINFO_HWACCEL_DISABLED;
54812 }
54813
54814diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
54815index 2fa0317..4983f2a 100644
54816--- a/drivers/video/fbdev/aty/mach64_cursor.c
54817+++ b/drivers/video/fbdev/aty/mach64_cursor.c
54818@@ -8,6 +8,7 @@
54819 #include "../core/fb_draw.h"
54820
54821 #include <asm/io.h>
54822+#include <asm/pgtable.h>
54823
54824 #ifdef __sparc__
54825 #include <asm/fbio.h>
54826@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
54827 info->sprite.buf_align = 16; /* and 64 lines tall. */
54828 info->sprite.flags = FB_PIXMAP_IO;
54829
54830- info->fbops->fb_cursor = atyfb_cursor;
54831+ pax_open_kernel();
54832+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
54833+ pax_close_kernel();
54834
54835 return 0;
54836 }
54837diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
54838index d6cab1f..112f680 100644
54839--- a/drivers/video/fbdev/core/fb_defio.c
54840+++ b/drivers/video/fbdev/core/fb_defio.c
54841@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
54842
54843 BUG_ON(!fbdefio);
54844 mutex_init(&fbdefio->lock);
54845- info->fbops->fb_mmap = fb_deferred_io_mmap;
54846+ pax_open_kernel();
54847+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
54848+ pax_close_kernel();
54849 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
54850 INIT_LIST_HEAD(&fbdefio->pagelist);
54851 if (fbdefio->delay == 0) /* set a default of 1 s */
54852@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
54853 page->mapping = NULL;
54854 }
54855
54856- info->fbops->fb_mmap = NULL;
54857+ *(void **)&info->fbops->fb_mmap = NULL;
54858 mutex_destroy(&fbdefio->lock);
54859 }
54860 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
54861diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
54862index 0705d88..d9429bf 100644
54863--- a/drivers/video/fbdev/core/fbmem.c
54864+++ b/drivers/video/fbdev/core/fbmem.c
54865@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
54866 __u32 data;
54867 int err;
54868
54869- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
54870+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
54871
54872 data = (__u32) (unsigned long) fix->smem_start;
54873 err |= put_user(data, &fix32->smem_start);
54874diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
54875index 4254336..282567e 100644
54876--- a/drivers/video/fbdev/hyperv_fb.c
54877+++ b/drivers/video/fbdev/hyperv_fb.c
54878@@ -240,7 +240,7 @@ static uint screen_fb_size;
54879 static inline int synthvid_send(struct hv_device *hdev,
54880 struct synthvid_msg *msg)
54881 {
54882- static atomic64_t request_id = ATOMIC64_INIT(0);
54883+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
54884 int ret;
54885
54886 msg->pipe_hdr.type = PIPE_MSG_DATA;
54887@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
54888
54889 ret = vmbus_sendpacket(hdev->channel, msg,
54890 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
54891- atomic64_inc_return(&request_id),
54892+ atomic64_inc_return_unchecked(&request_id),
54893 VM_PKT_DATA_INBAND, 0);
54894
54895 if (ret)
54896diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
54897index 7672d2e..b56437f 100644
54898--- a/drivers/video/fbdev/i810/i810_accel.c
54899+++ b/drivers/video/fbdev/i810/i810_accel.c
54900@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
54901 }
54902 }
54903 printk("ringbuffer lockup!!!\n");
54904+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
54905 i810_report_error(mmio);
54906 par->dev_flags |= LOCKUP;
54907 info->pixmap.scan_align = 1;
54908diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54909index a01147f..5d896f8 100644
54910--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54911+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54912@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
54913
54914 #ifdef CONFIG_FB_MATROX_MYSTIQUE
54915 struct matrox_switch matrox_mystique = {
54916- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
54917+ .preinit = MGA1064_preinit,
54918+ .reset = MGA1064_reset,
54919+ .init = MGA1064_init,
54920+ .restore = MGA1064_restore,
54921 };
54922 EXPORT_SYMBOL(matrox_mystique);
54923 #endif
54924
54925 #ifdef CONFIG_FB_MATROX_G
54926 struct matrox_switch matrox_G100 = {
54927- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
54928+ .preinit = MGAG100_preinit,
54929+ .reset = MGAG100_reset,
54930+ .init = MGAG100_init,
54931+ .restore = MGAG100_restore,
54932 };
54933 EXPORT_SYMBOL(matrox_G100);
54934 #endif
54935diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54936index 195ad7c..09743fc 100644
54937--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54938+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54939@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
54940 }
54941
54942 struct matrox_switch matrox_millennium = {
54943- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
54944+ .preinit = Ti3026_preinit,
54945+ .reset = Ti3026_reset,
54946+ .init = Ti3026_init,
54947+ .restore = Ti3026_restore
54948 };
54949 EXPORT_SYMBOL(matrox_millennium);
54950 #endif
54951diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54952index fe92eed..106e085 100644
54953--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54954+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54955@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
54956 struct mb862xxfb_par *par = info->par;
54957
54958 if (info->var.bits_per_pixel == 32) {
54959- info->fbops->fb_fillrect = cfb_fillrect;
54960- info->fbops->fb_copyarea = cfb_copyarea;
54961- info->fbops->fb_imageblit = cfb_imageblit;
54962+ pax_open_kernel();
54963+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54964+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54965+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54966+ pax_close_kernel();
54967 } else {
54968 outreg(disp, GC_L0EM, 3);
54969- info->fbops->fb_fillrect = mb86290fb_fillrect;
54970- info->fbops->fb_copyarea = mb86290fb_copyarea;
54971- info->fbops->fb_imageblit = mb86290fb_imageblit;
54972+ pax_open_kernel();
54973+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
54974+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
54975+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
54976+ pax_close_kernel();
54977 }
54978 outreg(draw, GDC_REG_DRAW_BASE, 0);
54979 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
54980diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
54981index def0412..fed6529 100644
54982--- a/drivers/video/fbdev/nvidia/nvidia.c
54983+++ b/drivers/video/fbdev/nvidia/nvidia.c
54984@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
54985 info->fix.line_length = (info->var.xres_virtual *
54986 info->var.bits_per_pixel) >> 3;
54987 if (info->var.accel_flags) {
54988- info->fbops->fb_imageblit = nvidiafb_imageblit;
54989- info->fbops->fb_fillrect = nvidiafb_fillrect;
54990- info->fbops->fb_copyarea = nvidiafb_copyarea;
54991- info->fbops->fb_sync = nvidiafb_sync;
54992+ pax_open_kernel();
54993+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
54994+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
54995+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
54996+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
54997+ pax_close_kernel();
54998 info->pixmap.scan_align = 4;
54999 info->flags &= ~FBINFO_HWACCEL_DISABLED;
55000 info->flags |= FBINFO_READS_FAST;
55001 NVResetGraphics(info);
55002 } else {
55003- info->fbops->fb_imageblit = cfb_imageblit;
55004- info->fbops->fb_fillrect = cfb_fillrect;
55005- info->fbops->fb_copyarea = cfb_copyarea;
55006- info->fbops->fb_sync = NULL;
55007+ pax_open_kernel();
55008+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55009+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55010+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55011+ *(void **)&info->fbops->fb_sync = NULL;
55012+ pax_close_kernel();
55013 info->pixmap.scan_align = 1;
55014 info->flags |= FBINFO_HWACCEL_DISABLED;
55015 info->flags &= ~FBINFO_READS_FAST;
55016@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
55017 info->pixmap.size = 8 * 1024;
55018 info->pixmap.flags = FB_PIXMAP_SYSTEM;
55019
55020- if (!hwcur)
55021- info->fbops->fb_cursor = NULL;
55022+ if (!hwcur) {
55023+ pax_open_kernel();
55024+ *(void **)&info->fbops->fb_cursor = NULL;
55025+ pax_close_kernel();
55026+ }
55027
55028 info->var.accel_flags = (!noaccel);
55029
55030diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
55031index 2412a0d..294215b 100644
55032--- a/drivers/video/fbdev/omap2/dss/display.c
55033+++ b/drivers/video/fbdev/omap2/dss/display.c
55034@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
55035 if (dssdev->name == NULL)
55036 dssdev->name = dssdev->alias;
55037
55038+ pax_open_kernel();
55039 if (drv && drv->get_resolution == NULL)
55040- drv->get_resolution = omapdss_default_get_resolution;
55041+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
55042 if (drv && drv->get_recommended_bpp == NULL)
55043- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55044+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55045 if (drv && drv->get_timings == NULL)
55046- drv->get_timings = omapdss_default_get_timings;
55047+ *(void **)&drv->get_timings = omapdss_default_get_timings;
55048+ pax_close_kernel();
55049
55050 mutex_lock(&panel_list_mutex);
55051 list_add_tail(&dssdev->panel_list, &panel_list);
55052diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
55053index 83433cb..71e9b98 100644
55054--- a/drivers/video/fbdev/s1d13xxxfb.c
55055+++ b/drivers/video/fbdev/s1d13xxxfb.c
55056@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
55057
55058 switch(prod_id) {
55059 case S1D13506_PROD_ID: /* activate acceleration */
55060- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55061- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55062+ pax_open_kernel();
55063+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55064+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55065+ pax_close_kernel();
55066 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
55067 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
55068 break;
55069diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55070index 2bcc84a..29dd1ea 100644
55071--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
55072+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55073@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
55074 }
55075
55076 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
55077- lcdc_sys_write_index,
55078- lcdc_sys_write_data,
55079- lcdc_sys_read_data,
55080+ .write_index = lcdc_sys_write_index,
55081+ .write_data = lcdc_sys_write_data,
55082+ .read_data = lcdc_sys_read_data,
55083 };
55084
55085 static int sh_mobile_lcdc_sginit(struct fb_info *info,
55086diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
55087index d513ed6..90b0de9 100644
55088--- a/drivers/video/fbdev/smscufx.c
55089+++ b/drivers/video/fbdev/smscufx.c
55090@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
55091 fb_deferred_io_cleanup(info);
55092 kfree(info->fbdefio);
55093 info->fbdefio = NULL;
55094- info->fbops->fb_mmap = ufx_ops_mmap;
55095+ pax_open_kernel();
55096+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
55097+ pax_close_kernel();
55098 }
55099
55100 pr_debug("released /dev/fb%d user=%d count=%d",
55101diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
55102index 046d51d..be564da 100644
55103--- a/drivers/video/fbdev/udlfb.c
55104+++ b/drivers/video/fbdev/udlfb.c
55105@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
55106 dlfb_urb_completion(urb);
55107
55108 error:
55109- atomic_add(bytes_sent, &dev->bytes_sent);
55110- atomic_add(bytes_identical, &dev->bytes_identical);
55111- atomic_add(width*height*2, &dev->bytes_rendered);
55112+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55113+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55114+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
55115 end_cycles = get_cycles();
55116- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55117+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55118 >> 10)), /* Kcycles */
55119 &dev->cpu_kcycles_used);
55120
55121@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
55122 dlfb_urb_completion(urb);
55123
55124 error:
55125- atomic_add(bytes_sent, &dev->bytes_sent);
55126- atomic_add(bytes_identical, &dev->bytes_identical);
55127- atomic_add(bytes_rendered, &dev->bytes_rendered);
55128+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55129+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55130+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
55131 end_cycles = get_cycles();
55132- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55133+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55134 >> 10)), /* Kcycles */
55135 &dev->cpu_kcycles_used);
55136 }
55137@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
55138 fb_deferred_io_cleanup(info);
55139 kfree(info->fbdefio);
55140 info->fbdefio = NULL;
55141- info->fbops->fb_mmap = dlfb_ops_mmap;
55142+ pax_open_kernel();
55143+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
55144+ pax_close_kernel();
55145 }
55146
55147 pr_warn("released /dev/fb%d user=%d count=%d\n",
55148@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
55149 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55150 struct dlfb_data *dev = fb_info->par;
55151 return snprintf(buf, PAGE_SIZE, "%u\n",
55152- atomic_read(&dev->bytes_rendered));
55153+ atomic_read_unchecked(&dev->bytes_rendered));
55154 }
55155
55156 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55157@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55158 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55159 struct dlfb_data *dev = fb_info->par;
55160 return snprintf(buf, PAGE_SIZE, "%u\n",
55161- atomic_read(&dev->bytes_identical));
55162+ atomic_read_unchecked(&dev->bytes_identical));
55163 }
55164
55165 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55166@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55167 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55168 struct dlfb_data *dev = fb_info->par;
55169 return snprintf(buf, PAGE_SIZE, "%u\n",
55170- atomic_read(&dev->bytes_sent));
55171+ atomic_read_unchecked(&dev->bytes_sent));
55172 }
55173
55174 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55175@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55176 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55177 struct dlfb_data *dev = fb_info->par;
55178 return snprintf(buf, PAGE_SIZE, "%u\n",
55179- atomic_read(&dev->cpu_kcycles_used));
55180+ atomic_read_unchecked(&dev->cpu_kcycles_used));
55181 }
55182
55183 static ssize_t edid_show(
55184@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
55185 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55186 struct dlfb_data *dev = fb_info->par;
55187
55188- atomic_set(&dev->bytes_rendered, 0);
55189- atomic_set(&dev->bytes_identical, 0);
55190- atomic_set(&dev->bytes_sent, 0);
55191- atomic_set(&dev->cpu_kcycles_used, 0);
55192+ atomic_set_unchecked(&dev->bytes_rendered, 0);
55193+ atomic_set_unchecked(&dev->bytes_identical, 0);
55194+ atomic_set_unchecked(&dev->bytes_sent, 0);
55195+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
55196
55197 return count;
55198 }
55199diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
55200index 509d452..7c9d2de 100644
55201--- a/drivers/video/fbdev/uvesafb.c
55202+++ b/drivers/video/fbdev/uvesafb.c
55203@@ -19,6 +19,7 @@
55204 #include <linux/io.h>
55205 #include <linux/mutex.h>
55206 #include <linux/slab.h>
55207+#include <linux/moduleloader.h>
55208 #include <video/edid.h>
55209 #include <video/uvesafb.h>
55210 #ifdef CONFIG_X86
55211@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
55212 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
55213 par->pmi_setpal = par->ypan = 0;
55214 } else {
55215+
55216+#ifdef CONFIG_PAX_KERNEXEC
55217+#ifdef CONFIG_MODULES
55218+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
55219+#endif
55220+ if (!par->pmi_code) {
55221+ par->pmi_setpal = par->ypan = 0;
55222+ return 0;
55223+ }
55224+#endif
55225+
55226 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55227 + task->t.regs.edi);
55228+
55229+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55230+ pax_open_kernel();
55231+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55232+ pax_close_kernel();
55233+
55234+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55235+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55236+#else
55237 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55238 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55239+#endif
55240+
55241 printk(KERN_INFO "uvesafb: protected mode interface info at "
55242 "%04x:%04x\n",
55243 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55244@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55245 par->ypan = ypan;
55246
55247 if (par->pmi_setpal || par->ypan) {
55248+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55249 if (__supported_pte_mask & _PAGE_NX) {
55250 par->pmi_setpal = par->ypan = 0;
55251 printk(KERN_WARNING "uvesafb: NX protection is active, "
55252 "better not use the PMI.\n");
55253- } else {
55254+ } else
55255+#endif
55256 uvesafb_vbe_getpmi(task, par);
55257- }
55258 }
55259 #else
55260 /* The protected mode interface is not available on non-x86. */
55261@@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55262 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55263
55264 /* Disable blanking if the user requested so. */
55265- if (!blank)
55266- info->fbops->fb_blank = NULL;
55267+ if (!blank) {
55268+ pax_open_kernel();
55269+ *(void **)&info->fbops->fb_blank = NULL;
55270+ pax_close_kernel();
55271+ }
55272
55273 /*
55274 * Find out how much IO memory is required for the mode with
55275@@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55276 info->flags = FBINFO_FLAG_DEFAULT |
55277 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55278
55279- if (!par->ypan)
55280- info->fbops->fb_pan_display = NULL;
55281+ if (!par->ypan) {
55282+ pax_open_kernel();
55283+ *(void **)&info->fbops->fb_pan_display = NULL;
55284+ pax_close_kernel();
55285+ }
55286 }
55287
55288 static void uvesafb_init_mtrr(struct fb_info *info)
55289@@ -1787,6 +1817,11 @@ out_mode:
55290 out:
55291 kfree(par->vbe_modes);
55292
55293+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55294+ if (par->pmi_code)
55295+ module_free_exec(NULL, par->pmi_code);
55296+#endif
55297+
55298 framebuffer_release(info);
55299 return err;
55300 }
55301@@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
55302 kfree(par->vbe_state_orig);
55303 kfree(par->vbe_state_saved);
55304
55305+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55306+ if (par->pmi_code)
55307+ module_free_exec(NULL, par->pmi_code);
55308+#endif
55309+
55310 framebuffer_release(info);
55311 }
55312 return 0;
55313diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
55314index 6170e7f..dd63031 100644
55315--- a/drivers/video/fbdev/vesafb.c
55316+++ b/drivers/video/fbdev/vesafb.c
55317@@ -9,6 +9,7 @@
55318 */
55319
55320 #include <linux/module.h>
55321+#include <linux/moduleloader.h>
55322 #include <linux/kernel.h>
55323 #include <linux/errno.h>
55324 #include <linux/string.h>
55325@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55326 static int vram_total; /* Set total amount of memory */
55327 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55328 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55329-static void (*pmi_start)(void) __read_mostly;
55330-static void (*pmi_pal) (void) __read_mostly;
55331+static void (*pmi_start)(void) __read_only;
55332+static void (*pmi_pal) (void) __read_only;
55333 static int depth __read_mostly;
55334 static int vga_compat __read_mostly;
55335 /* --------------------------------------------------------------------- */
55336@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
55337 unsigned int size_remap;
55338 unsigned int size_total;
55339 char *option = NULL;
55340+ void *pmi_code = NULL;
55341
55342 /* ignore error return of fb_get_options */
55343 fb_get_options("vesafb", &option);
55344@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
55345 size_remap = size_total;
55346 vesafb_fix.smem_len = size_remap;
55347
55348-#ifndef __i386__
55349- screen_info.vesapm_seg = 0;
55350-#endif
55351-
55352 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55353 printk(KERN_WARNING
55354 "vesafb: cannot reserve video memory at 0x%lx\n",
55355@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55356 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55357 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55358
55359+#ifdef __i386__
55360+
55361+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55362+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
55363+ if (!pmi_code)
55364+#elif !defined(CONFIG_PAX_KERNEXEC)
55365+ if (0)
55366+#endif
55367+
55368+#endif
55369+ screen_info.vesapm_seg = 0;
55370+
55371 if (screen_info.vesapm_seg) {
55372- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55373- screen_info.vesapm_seg,screen_info.vesapm_off);
55374+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55375+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55376 }
55377
55378 if (screen_info.vesapm_seg < 0xc000)
55379@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55380
55381 if (ypan || pmi_setpal) {
55382 unsigned short *pmi_base;
55383+
55384 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55385- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55386- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55387+
55388+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55389+ pax_open_kernel();
55390+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55391+#else
55392+ pmi_code = pmi_base;
55393+#endif
55394+
55395+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55396+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55397+
55398+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55399+ pmi_start = ktva_ktla(pmi_start);
55400+ pmi_pal = ktva_ktla(pmi_pal);
55401+ pax_close_kernel();
55402+#endif
55403+
55404 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55405 if (pmi_base[3]) {
55406 printk(KERN_INFO "vesafb: pmi: ports = ");
55407@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55408 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55409 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55410
55411- if (!ypan)
55412- info->fbops->fb_pan_display = NULL;
55413+ if (!ypan) {
55414+ pax_open_kernel();
55415+ *(void **)&info->fbops->fb_pan_display = NULL;
55416+ pax_close_kernel();
55417+ }
55418
55419 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55420 err = -ENOMEM;
55421@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55422 fb_info(info, "%s frame buffer device\n", info->fix.id);
55423 return 0;
55424 err:
55425+
55426+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55427+ module_free_exec(NULL, pmi_code);
55428+#endif
55429+
55430 if (info->screen_base)
55431 iounmap(info->screen_base);
55432 framebuffer_release(info);
55433diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
55434index 88714ae..16c2e11 100644
55435--- a/drivers/video/fbdev/via/via_clock.h
55436+++ b/drivers/video/fbdev/via/via_clock.h
55437@@ -56,7 +56,7 @@ struct via_clock {
55438
55439 void (*set_engine_pll_state)(u8 state);
55440 void (*set_engine_pll)(struct via_pll_config config);
55441-};
55442+} __no_const;
55443
55444
55445 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55446diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
55447index 3c14e43..2630570 100644
55448--- a/drivers/video/logo/logo_linux_clut224.ppm
55449+++ b/drivers/video/logo/logo_linux_clut224.ppm
55450@@ -2,1603 +2,1123 @@ P3
55451 # Standard 224-color Linux logo
55452 80 80
55453 255
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 0 0 0
55457- 0 0 0 0 0 0 0 0 0 0 0 0
55458- 0 0 0 0 0 0 0 0 0 0 0 0
55459- 0 0 0 0 0 0 0 0 0 0 0 0
55460- 0 0 0 0 0 0 0 0 0 0 0 0
55461- 0 0 0 0 0 0 0 0 0 0 0 0
55462- 0 0 0 0 0 0 0 0 0 0 0 0
55463- 6 6 6 6 6 6 10 10 10 10 10 10
55464- 10 10 10 6 6 6 6 6 6 6 6 6
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 0 0 0 0 0 0 0
55472- 0 0 0 0 0 0 0 0 0 0 0 0
55473- 0 0 0 0 0 0 0 0 0 0 0 0
55474- 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 0 0 0
55477- 0 0 0 0 0 0 0 0 0 0 0 0
55478- 0 0 0 0 0 0 0 0 0 0 0 0
55479- 0 0 0 0 0 0 0 0 0 0 0 0
55480- 0 0 0 0 0 0 0 0 0 0 0 0
55481- 0 0 0 0 0 0 0 0 0 0 0 0
55482- 0 0 0 6 6 6 10 10 10 14 14 14
55483- 22 22 22 26 26 26 30 30 30 34 34 34
55484- 30 30 30 30 30 30 26 26 26 18 18 18
55485- 14 14 14 10 10 10 6 6 6 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 0 0 0 0 0 0 0 0 0 0
55492- 0 0 0 0 0 0 0 0 0 0 0 0
55493- 0 0 0 0 0 0 0 0 0 0 0 0
55494- 0 0 0 0 0 0 0 0 0 0 0 0
55495- 0 0 0 0 0 1 0 0 1 0 0 0
55496- 0 0 0 0 0 0 0 0 0 0 0 0
55497- 0 0 0 0 0 0 0 0 0 0 0 0
55498- 0 0 0 0 0 0 0 0 0 0 0 0
55499- 0 0 0 0 0 0 0 0 0 0 0 0
55500- 0 0 0 0 0 0 0 0 0 0 0 0
55501- 0 0 0 0 0 0 0 0 0 0 0 0
55502- 6 6 6 14 14 14 26 26 26 42 42 42
55503- 54 54 54 66 66 66 78 78 78 78 78 78
55504- 78 78 78 74 74 74 66 66 66 54 54 54
55505- 42 42 42 26 26 26 18 18 18 10 10 10
55506- 6 6 6 0 0 0 0 0 0 0 0 0
55507- 0 0 0 0 0 0 0 0 0 0 0 0
55508- 0 0 0 0 0 0 0 0 0 0 0 0
55509- 0 0 0 0 0 0 0 0 0 0 0 0
55510- 0 0 0 0 0 0 0 0 0 0 0 0
55511- 0 0 0 0 0 0 0 0 0 0 0 0
55512- 0 0 0 0 0 0 0 0 0 0 0 0
55513- 0 0 0 0 0 0 0 0 0 0 0 0
55514- 0 0 0 0 0 0 0 0 0 0 0 0
55515- 0 0 1 0 0 0 0 0 0 0 0 0
55516- 0 0 0 0 0 0 0 0 0 0 0 0
55517- 0 0 0 0 0 0 0 0 0 0 0 0
55518- 0 0 0 0 0 0 0 0 0 0 0 0
55519- 0 0 0 0 0 0 0 0 0 0 0 0
55520- 0 0 0 0 0 0 0 0 0 0 0 0
55521- 0 0 0 0 0 0 0 0 0 10 10 10
55522- 22 22 22 42 42 42 66 66 66 86 86 86
55523- 66 66 66 38 38 38 38 38 38 22 22 22
55524- 26 26 26 34 34 34 54 54 54 66 66 66
55525- 86 86 86 70 70 70 46 46 46 26 26 26
55526- 14 14 14 6 6 6 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 1 0 0 1 0 0 1 0 0 0
55536- 0 0 0 0 0 0 0 0 0 0 0 0
55537- 0 0 0 0 0 0 0 0 0 0 0 0
55538- 0 0 0 0 0 0 0 0 0 0 0 0
55539- 0 0 0 0 0 0 0 0 0 0 0 0
55540- 0 0 0 0 0 0 0 0 0 0 0 0
55541- 0 0 0 0 0 0 10 10 10 26 26 26
55542- 50 50 50 82 82 82 58 58 58 6 6 6
55543- 2 2 6 2 2 6 2 2 6 2 2 6
55544- 2 2 6 2 2 6 2 2 6 2 2 6
55545- 6 6 6 54 54 54 86 86 86 66 66 66
55546- 38 38 38 18 18 18 6 6 6 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 0 0 0 0
55551- 0 0 0 0 0 0 0 0 0 0 0 0
55552- 0 0 0 0 0 0 0 0 0 0 0 0
55553- 0 0 0 0 0 0 0 0 0 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 0 0 0
55557- 0 0 0 0 0 0 0 0 0 0 0 0
55558- 0 0 0 0 0 0 0 0 0 0 0 0
55559- 0 0 0 0 0 0 0 0 0 0 0 0
55560- 0 0 0 0 0 0 0 0 0 0 0 0
55561- 0 0 0 6 6 6 22 22 22 50 50 50
55562- 78 78 78 34 34 34 2 2 6 2 2 6
55563- 2 2 6 2 2 6 2 2 6 2 2 6
55564- 2 2 6 2 2 6 2 2 6 2 2 6
55565- 2 2 6 2 2 6 6 6 6 70 70 70
55566- 78 78 78 46 46 46 22 22 22 6 6 6
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 1 0 0 1 0 0 1 0 0 0
55576- 0 0 0 0 0 0 0 0 0 0 0 0
55577- 0 0 0 0 0 0 0 0 0 0 0 0
55578- 0 0 0 0 0 0 0 0 0 0 0 0
55579- 0 0 0 0 0 0 0 0 0 0 0 0
55580- 0 0 0 0 0 0 0 0 0 0 0 0
55581- 6 6 6 18 18 18 42 42 42 82 82 82
55582- 26 26 26 2 2 6 2 2 6 2 2 6
55583- 2 2 6 2 2 6 2 2 6 2 2 6
55584- 2 2 6 2 2 6 2 2 6 14 14 14
55585- 46 46 46 34 34 34 6 6 6 2 2 6
55586- 42 42 42 78 78 78 42 42 42 18 18 18
55587- 6 6 6 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 0 0 0 0
55591- 0 0 0 0 0 0 0 0 0 0 0 0
55592- 0 0 0 0 0 0 0 0 0 0 0 0
55593- 0 0 0 0 0 0 0 0 0 0 0 0
55594- 0 0 0 0 0 0 0 0 0 0 0 0
55595- 0 0 1 0 0 0 0 0 1 0 0 0
55596- 0 0 0 0 0 0 0 0 0 0 0 0
55597- 0 0 0 0 0 0 0 0 0 0 0 0
55598- 0 0 0 0 0 0 0 0 0 0 0 0
55599- 0 0 0 0 0 0 0 0 0 0 0 0
55600- 0 0 0 0 0 0 0 0 0 0 0 0
55601- 10 10 10 30 30 30 66 66 66 58 58 58
55602- 2 2 6 2 2 6 2 2 6 2 2 6
55603- 2 2 6 2 2 6 2 2 6 2 2 6
55604- 2 2 6 2 2 6 2 2 6 26 26 26
55605- 86 86 86 101 101 101 46 46 46 10 10 10
55606- 2 2 6 58 58 58 70 70 70 34 34 34
55607- 10 10 10 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 0 0 0 0
55611- 0 0 0 0 0 0 0 0 0 0 0 0
55612- 0 0 0 0 0 0 0 0 0 0 0 0
55613- 0 0 0 0 0 0 0 0 0 0 0 0
55614- 0 0 0 0 0 0 0 0 0 0 0 0
55615- 0 0 1 0 0 1 0 0 1 0 0 0
55616- 0 0 0 0 0 0 0 0 0 0 0 0
55617- 0 0 0 0 0 0 0 0 0 0 0 0
55618- 0 0 0 0 0 0 0 0 0 0 0 0
55619- 0 0 0 0 0 0 0 0 0 0 0 0
55620- 0 0 0 0 0 0 0 0 0 0 0 0
55621- 14 14 14 42 42 42 86 86 86 10 10 10
55622- 2 2 6 2 2 6 2 2 6 2 2 6
55623- 2 2 6 2 2 6 2 2 6 2 2 6
55624- 2 2 6 2 2 6 2 2 6 30 30 30
55625- 94 94 94 94 94 94 58 58 58 26 26 26
55626- 2 2 6 6 6 6 78 78 78 54 54 54
55627- 22 22 22 6 6 6 0 0 0 0 0 0
55628- 0 0 0 0 0 0 0 0 0 0 0 0
55629- 0 0 0 0 0 0 0 0 0 0 0 0
55630- 0 0 0 0 0 0 0 0 0 0 0 0
55631- 0 0 0 0 0 0 0 0 0 0 0 0
55632- 0 0 0 0 0 0 0 0 0 0 0 0
55633- 0 0 0 0 0 0 0 0 0 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 0 0 0
55637- 0 0 0 0 0 0 0 0 0 0 0 0
55638- 0 0 0 0 0 0 0 0 0 0 0 0
55639- 0 0 0 0 0 0 0 0 0 0 0 0
55640- 0 0 0 0 0 0 0 0 0 6 6 6
55641- 22 22 22 62 62 62 62 62 62 2 2 6
55642- 2 2 6 2 2 6 2 2 6 2 2 6
55643- 2 2 6 2 2 6 2 2 6 2 2 6
55644- 2 2 6 2 2 6 2 2 6 26 26 26
55645- 54 54 54 38 38 38 18 18 18 10 10 10
55646- 2 2 6 2 2 6 34 34 34 82 82 82
55647- 38 38 38 14 14 14 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 1 0 0 1 0 0 0
55656- 0 0 0 0 0 0 0 0 0 0 0 0
55657- 0 0 0 0 0 0 0 0 0 0 0 0
55658- 0 0 0 0 0 0 0 0 0 0 0 0
55659- 0 0 0 0 0 0 0 0 0 0 0 0
55660- 0 0 0 0 0 0 0 0 0 6 6 6
55661- 30 30 30 78 78 78 30 30 30 2 2 6
55662- 2 2 6 2 2 6 2 2 6 2 2 6
55663- 2 2 6 2 2 6 2 2 6 2 2 6
55664- 2 2 6 2 2 6 2 2 6 10 10 10
55665- 10 10 10 2 2 6 2 2 6 2 2 6
55666- 2 2 6 2 2 6 2 2 6 78 78 78
55667- 50 50 50 18 18 18 6 6 6 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 1 0 0 0 0 0 0 0 0 0
55676- 0 0 0 0 0 0 0 0 0 0 0 0
55677- 0 0 0 0 0 0 0 0 0 0 0 0
55678- 0 0 0 0 0 0 0 0 0 0 0 0
55679- 0 0 0 0 0 0 0 0 0 0 0 0
55680- 0 0 0 0 0 0 0 0 0 10 10 10
55681- 38 38 38 86 86 86 14 14 14 2 2 6
55682- 2 2 6 2 2 6 2 2 6 2 2 6
55683- 2 2 6 2 2 6 2 2 6 2 2 6
55684- 2 2 6 2 2 6 2 2 6 2 2 6
55685- 2 2 6 2 2 6 2 2 6 2 2 6
55686- 2 2 6 2 2 6 2 2 6 54 54 54
55687- 66 66 66 26 26 26 6 6 6 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 1 0 0 1 0 0 0
55696- 0 0 0 0 0 0 0 0 0 0 0 0
55697- 0 0 0 0 0 0 0 0 0 0 0 0
55698- 0 0 0 0 0 0 0 0 0 0 0 0
55699- 0 0 0 0 0 0 0 0 0 0 0 0
55700- 0 0 0 0 0 0 0 0 0 14 14 14
55701- 42 42 42 82 82 82 2 2 6 2 2 6
55702- 2 2 6 6 6 6 10 10 10 2 2 6
55703- 2 2 6 2 2 6 2 2 6 2 2 6
55704- 2 2 6 2 2 6 2 2 6 6 6 6
55705- 14 14 14 10 10 10 2 2 6 2 2 6
55706- 2 2 6 2 2 6 2 2 6 18 18 18
55707- 82 82 82 34 34 34 10 10 10 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 1 0 0 0 0 0 0 0 0 0
55716- 0 0 0 0 0 0 0 0 0 0 0 0
55717- 0 0 0 0 0 0 0 0 0 0 0 0
55718- 0 0 0 0 0 0 0 0 0 0 0 0
55719- 0 0 0 0 0 0 0 0 0 0 0 0
55720- 0 0 0 0 0 0 0 0 0 14 14 14
55721- 46 46 46 86 86 86 2 2 6 2 2 6
55722- 6 6 6 6 6 6 22 22 22 34 34 34
55723- 6 6 6 2 2 6 2 2 6 2 2 6
55724- 2 2 6 2 2 6 18 18 18 34 34 34
55725- 10 10 10 50 50 50 22 22 22 2 2 6
55726- 2 2 6 2 2 6 2 2 6 10 10 10
55727- 86 86 86 42 42 42 14 14 14 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 1 0 0 1 0 0 1 0 0 0
55736- 0 0 0 0 0 0 0 0 0 0 0 0
55737- 0 0 0 0 0 0 0 0 0 0 0 0
55738- 0 0 0 0 0 0 0 0 0 0 0 0
55739- 0 0 0 0 0 0 0 0 0 0 0 0
55740- 0 0 0 0 0 0 0 0 0 14 14 14
55741- 46 46 46 86 86 86 2 2 6 2 2 6
55742- 38 38 38 116 116 116 94 94 94 22 22 22
55743- 22 22 22 2 2 6 2 2 6 2 2 6
55744- 14 14 14 86 86 86 138 138 138 162 162 162
55745-154 154 154 38 38 38 26 26 26 6 6 6
55746- 2 2 6 2 2 6 2 2 6 2 2 6
55747- 86 86 86 46 46 46 14 14 14 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 0 0 0
55757- 0 0 0 0 0 0 0 0 0 0 0 0
55758- 0 0 0 0 0 0 0 0 0 0 0 0
55759- 0 0 0 0 0 0 0 0 0 0 0 0
55760- 0 0 0 0 0 0 0 0 0 14 14 14
55761- 46 46 46 86 86 86 2 2 6 14 14 14
55762-134 134 134 198 198 198 195 195 195 116 116 116
55763- 10 10 10 2 2 6 2 2 6 6 6 6
55764-101 98 89 187 187 187 210 210 210 218 218 218
55765-214 214 214 134 134 134 14 14 14 6 6 6
55766- 2 2 6 2 2 6 2 2 6 2 2 6
55767- 86 86 86 50 50 50 18 18 18 6 6 6
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 1 0 0 0
55775- 0 0 1 0 0 1 0 0 1 0 0 0
55776- 0 0 0 0 0 0 0 0 0 0 0 0
55777- 0 0 0 0 0 0 0 0 0 0 0 0
55778- 0 0 0 0 0 0 0 0 0 0 0 0
55779- 0 0 0 0 0 0 0 0 0 0 0 0
55780- 0 0 0 0 0 0 0 0 0 14 14 14
55781- 46 46 46 86 86 86 2 2 6 54 54 54
55782-218 218 218 195 195 195 226 226 226 246 246 246
55783- 58 58 58 2 2 6 2 2 6 30 30 30
55784-210 210 210 253 253 253 174 174 174 123 123 123
55785-221 221 221 234 234 234 74 74 74 2 2 6
55786- 2 2 6 2 2 6 2 2 6 2 2 6
55787- 70 70 70 58 58 58 22 22 22 6 6 6
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 0 0 0 0 0 0
55797- 0 0 0 0 0 0 0 0 0 0 0 0
55798- 0 0 0 0 0 0 0 0 0 0 0 0
55799- 0 0 0 0 0 0 0 0 0 0 0 0
55800- 0 0 0 0 0 0 0 0 0 14 14 14
55801- 46 46 46 82 82 82 2 2 6 106 106 106
55802-170 170 170 26 26 26 86 86 86 226 226 226
55803-123 123 123 10 10 10 14 14 14 46 46 46
55804-231 231 231 190 190 190 6 6 6 70 70 70
55805- 90 90 90 238 238 238 158 158 158 2 2 6
55806- 2 2 6 2 2 6 2 2 6 2 2 6
55807- 70 70 70 58 58 58 22 22 22 6 6 6
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 1 0 0 0
55815- 0 0 1 0 0 1 0 0 1 0 0 0
55816- 0 0 0 0 0 0 0 0 0 0 0 0
55817- 0 0 0 0 0 0 0 0 0 0 0 0
55818- 0 0 0 0 0 0 0 0 0 0 0 0
55819- 0 0 0 0 0 0 0 0 0 0 0 0
55820- 0 0 0 0 0 0 0 0 0 14 14 14
55821- 42 42 42 86 86 86 6 6 6 116 116 116
55822-106 106 106 6 6 6 70 70 70 149 149 149
55823-128 128 128 18 18 18 38 38 38 54 54 54
55824-221 221 221 106 106 106 2 2 6 14 14 14
55825- 46 46 46 190 190 190 198 198 198 2 2 6
55826- 2 2 6 2 2 6 2 2 6 2 2 6
55827- 74 74 74 62 62 62 22 22 22 6 6 6
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 1 0 0 0
55835- 0 0 1 0 0 0 0 0 1 0 0 0
55836- 0 0 0 0 0 0 0 0 0 0 0 0
55837- 0 0 0 0 0 0 0 0 0 0 0 0
55838- 0 0 0 0 0 0 0 0 0 0 0 0
55839- 0 0 0 0 0 0 0 0 0 0 0 0
55840- 0 0 0 0 0 0 0 0 0 14 14 14
55841- 42 42 42 94 94 94 14 14 14 101 101 101
55842-128 128 128 2 2 6 18 18 18 116 116 116
55843-118 98 46 121 92 8 121 92 8 98 78 10
55844-162 162 162 106 106 106 2 2 6 2 2 6
55845- 2 2 6 195 195 195 195 195 195 6 6 6
55846- 2 2 6 2 2 6 2 2 6 2 2 6
55847- 74 74 74 62 62 62 22 22 22 6 6 6
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 1 0 0 1
55855- 0 0 1 0 0 0 0 0 1 0 0 0
55856- 0 0 0 0 0 0 0 0 0 0 0 0
55857- 0 0 0 0 0 0 0 0 0 0 0 0
55858- 0 0 0 0 0 0 0 0 0 0 0 0
55859- 0 0 0 0 0 0 0 0 0 0 0 0
55860- 0 0 0 0 0 0 0 0 0 10 10 10
55861- 38 38 38 90 90 90 14 14 14 58 58 58
55862-210 210 210 26 26 26 54 38 6 154 114 10
55863-226 170 11 236 186 11 225 175 15 184 144 12
55864-215 174 15 175 146 61 37 26 9 2 2 6
55865- 70 70 70 246 246 246 138 138 138 2 2 6
55866- 2 2 6 2 2 6 2 2 6 2 2 6
55867- 70 70 70 66 66 66 26 26 26 6 6 6
55868- 0 0 0 0 0 0 0 0 0 0 0 0
55869- 0 0 0 0 0 0 0 0 0 0 0 0
55870- 0 0 0 0 0 0 0 0 0 0 0 0
55871- 0 0 0 0 0 0 0 0 0 0 0 0
55872- 0 0 0 0 0 0 0 0 0 0 0 0
55873- 0 0 0 0 0 0 0 0 0 0 0 0
55874- 0 0 0 0 0 0 0 0 0 0 0 0
55875- 0 0 0 0 0 0 0 0 0 0 0 0
55876- 0 0 0 0 0 0 0 0 0 0 0 0
55877- 0 0 0 0 0 0 0 0 0 0 0 0
55878- 0 0 0 0 0 0 0 0 0 0 0 0
55879- 0 0 0 0 0 0 0 0 0 0 0 0
55880- 0 0 0 0 0 0 0 0 0 10 10 10
55881- 38 38 38 86 86 86 14 14 14 10 10 10
55882-195 195 195 188 164 115 192 133 9 225 175 15
55883-239 182 13 234 190 10 232 195 16 232 200 30
55884-245 207 45 241 208 19 232 195 16 184 144 12
55885-218 194 134 211 206 186 42 42 42 2 2 6
55886- 2 2 6 2 2 6 2 2 6 2 2 6
55887- 50 50 50 74 74 74 30 30 30 6 6 6
55888- 0 0 0 0 0 0 0 0 0 0 0 0
55889- 0 0 0 0 0 0 0 0 0 0 0 0
55890- 0 0 0 0 0 0 0 0 0 0 0 0
55891- 0 0 0 0 0 0 0 0 0 0 0 0
55892- 0 0 0 0 0 0 0 0 0 0 0 0
55893- 0 0 0 0 0 0 0 0 0 0 0 0
55894- 0 0 0 0 0 0 0 0 0 0 0 0
55895- 0 0 0 0 0 0 0 0 0 0 0 0
55896- 0 0 0 0 0 0 0 0 0 0 0 0
55897- 0 0 0 0 0 0 0 0 0 0 0 0
55898- 0 0 0 0 0 0 0 0 0 0 0 0
55899- 0 0 0 0 0 0 0 0 0 0 0 0
55900- 0 0 0 0 0 0 0 0 0 10 10 10
55901- 34 34 34 86 86 86 14 14 14 2 2 6
55902-121 87 25 192 133 9 219 162 10 239 182 13
55903-236 186 11 232 195 16 241 208 19 244 214 54
55904-246 218 60 246 218 38 246 215 20 241 208 19
55905-241 208 19 226 184 13 121 87 25 2 2 6
55906- 2 2 6 2 2 6 2 2 6 2 2 6
55907- 50 50 50 82 82 82 34 34 34 10 10 10
55908- 0 0 0 0 0 0 0 0 0 0 0 0
55909- 0 0 0 0 0 0 0 0 0 0 0 0
55910- 0 0 0 0 0 0 0 0 0 0 0 0
55911- 0 0 0 0 0 0 0 0 0 0 0 0
55912- 0 0 0 0 0 0 0 0 0 0 0 0
55913- 0 0 0 0 0 0 0 0 0 0 0 0
55914- 0 0 0 0 0 0 0 0 0 0 0 0
55915- 0 0 0 0 0 0 0 0 0 0 0 0
55916- 0 0 0 0 0 0 0 0 0 0 0 0
55917- 0 0 0 0 0 0 0 0 0 0 0 0
55918- 0 0 0 0 0 0 0 0 0 0 0 0
55919- 0 0 0 0 0 0 0 0 0 0 0 0
55920- 0 0 0 0 0 0 0 0 0 10 10 10
55921- 34 34 34 82 82 82 30 30 30 61 42 6
55922-180 123 7 206 145 10 230 174 11 239 182 13
55923-234 190 10 238 202 15 241 208 19 246 218 74
55924-246 218 38 246 215 20 246 215 20 246 215 20
55925-226 184 13 215 174 15 184 144 12 6 6 6
55926- 2 2 6 2 2 6 2 2 6 2 2 6
55927- 26 26 26 94 94 94 42 42 42 14 14 14
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 0 0 0 0 0 0 0 0 0
55936- 0 0 0 0 0 0 0 0 0 0 0 0
55937- 0 0 0 0 0 0 0 0 0 0 0 0
55938- 0 0 0 0 0 0 0 0 0 0 0 0
55939- 0 0 0 0 0 0 0 0 0 0 0 0
55940- 0 0 0 0 0 0 0 0 0 10 10 10
55941- 30 30 30 78 78 78 50 50 50 104 69 6
55942-192 133 9 216 158 10 236 178 12 236 186 11
55943-232 195 16 241 208 19 244 214 54 245 215 43
55944-246 215 20 246 215 20 241 208 19 198 155 10
55945-200 144 11 216 158 10 156 118 10 2 2 6
55946- 2 2 6 2 2 6 2 2 6 2 2 6
55947- 6 6 6 90 90 90 54 54 54 18 18 18
55948- 6 6 6 0 0 0 0 0 0 0 0 0
55949- 0 0 0 0 0 0 0 0 0 0 0 0
55950- 0 0 0 0 0 0 0 0 0 0 0 0
55951- 0 0 0 0 0 0 0 0 0 0 0 0
55952- 0 0 0 0 0 0 0 0 0 0 0 0
55953- 0 0 0 0 0 0 0 0 0 0 0 0
55954- 0 0 0 0 0 0 0 0 0 0 0 0
55955- 0 0 0 0 0 0 0 0 0 0 0 0
55956- 0 0 0 0 0 0 0 0 0 0 0 0
55957- 0 0 0 0 0 0 0 0 0 0 0 0
55958- 0 0 0 0 0 0 0 0 0 0 0 0
55959- 0 0 0 0 0 0 0 0 0 0 0 0
55960- 0 0 0 0 0 0 0 0 0 10 10 10
55961- 30 30 30 78 78 78 46 46 46 22 22 22
55962-137 92 6 210 162 10 239 182 13 238 190 10
55963-238 202 15 241 208 19 246 215 20 246 215 20
55964-241 208 19 203 166 17 185 133 11 210 150 10
55965-216 158 10 210 150 10 102 78 10 2 2 6
55966- 6 6 6 54 54 54 14 14 14 2 2 6
55967- 2 2 6 62 62 62 74 74 74 30 30 30
55968- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
55976- 0 0 0 0 0 0 0 0 0 0 0 0
55977- 0 0 0 0 0 0 0 0 0 0 0 0
55978- 0 0 0 0 0 0 0 0 0 0 0 0
55979- 0 0 0 0 0 0 0 0 0 0 0 0
55980- 0 0 0 0 0 0 0 0 0 10 10 10
55981- 34 34 34 78 78 78 50 50 50 6 6 6
55982- 94 70 30 139 102 15 190 146 13 226 184 13
55983-232 200 30 232 195 16 215 174 15 190 146 13
55984-168 122 10 192 133 9 210 150 10 213 154 11
55985-202 150 34 182 157 106 101 98 89 2 2 6
55986- 2 2 6 78 78 78 116 116 116 58 58 58
55987- 2 2 6 22 22 22 90 90 90 46 46 46
55988- 18 18 18 6 6 6 0 0 0 0 0 0
55989- 0 0 0 0 0 0 0 0 0 0 0 0
55990- 0 0 0 0 0 0 0 0 0 0 0 0
55991- 0 0 0 0 0 0 0 0 0 0 0 0
55992- 0 0 0 0 0 0 0 0 0 0 0 0
55993- 0 0 0 0 0 0 0 0 0 0 0 0
55994- 0 0 0 0 0 0 0 0 0 0 0 0
55995- 0 0 0 0 0 0 0 0 0 0 0 0
55996- 0 0 0 0 0 0 0 0 0 0 0 0
55997- 0 0 0 0 0 0 0 0 0 0 0 0
55998- 0 0 0 0 0 0 0 0 0 0 0 0
55999- 0 0 0 0 0 0 0 0 0 0 0 0
56000- 0 0 0 0 0 0 0 0 0 10 10 10
56001- 38 38 38 86 86 86 50 50 50 6 6 6
56002-128 128 128 174 154 114 156 107 11 168 122 10
56003-198 155 10 184 144 12 197 138 11 200 144 11
56004-206 145 10 206 145 10 197 138 11 188 164 115
56005-195 195 195 198 198 198 174 174 174 14 14 14
56006- 2 2 6 22 22 22 116 116 116 116 116 116
56007- 22 22 22 2 2 6 74 74 74 70 70 70
56008- 30 30 30 10 10 10 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 0 0 0
56015- 0 0 0 0 0 0 0 0 0 0 0 0
56016- 0 0 0 0 0 0 0 0 0 0 0 0
56017- 0 0 0 0 0 0 0 0 0 0 0 0
56018- 0 0 0 0 0 0 0 0 0 0 0 0
56019- 0 0 0 0 0 0 0 0 0 0 0 0
56020- 0 0 0 0 0 0 6 6 6 18 18 18
56021- 50 50 50 101 101 101 26 26 26 10 10 10
56022-138 138 138 190 190 190 174 154 114 156 107 11
56023-197 138 11 200 144 11 197 138 11 192 133 9
56024-180 123 7 190 142 34 190 178 144 187 187 187
56025-202 202 202 221 221 221 214 214 214 66 66 66
56026- 2 2 6 2 2 6 50 50 50 62 62 62
56027- 6 6 6 2 2 6 10 10 10 90 90 90
56028- 50 50 50 18 18 18 6 6 6 0 0 0
56029- 0 0 0 0 0 0 0 0 0 0 0 0
56030- 0 0 0 0 0 0 0 0 0 0 0 0
56031- 0 0 0 0 0 0 0 0 0 0 0 0
56032- 0 0 0 0 0 0 0 0 0 0 0 0
56033- 0 0 0 0 0 0 0 0 0 0 0 0
56034- 0 0 0 0 0 0 0 0 0 0 0 0
56035- 0 0 0 0 0 0 0 0 0 0 0 0
56036- 0 0 0 0 0 0 0 0 0 0 0 0
56037- 0 0 0 0 0 0 0 0 0 0 0 0
56038- 0 0 0 0 0 0 0 0 0 0 0 0
56039- 0 0 0 0 0 0 0 0 0 0 0 0
56040- 0 0 0 0 0 0 10 10 10 34 34 34
56041- 74 74 74 74 74 74 2 2 6 6 6 6
56042-144 144 144 198 198 198 190 190 190 178 166 146
56043-154 121 60 156 107 11 156 107 11 168 124 44
56044-174 154 114 187 187 187 190 190 190 210 210 210
56045-246 246 246 253 253 253 253 253 253 182 182 182
56046- 6 6 6 2 2 6 2 2 6 2 2 6
56047- 2 2 6 2 2 6 2 2 6 62 62 62
56048- 74 74 74 34 34 34 14 14 14 0 0 0
56049- 0 0 0 0 0 0 0 0 0 0 0 0
56050- 0 0 0 0 0 0 0 0 0 0 0 0
56051- 0 0 0 0 0 0 0 0 0 0 0 0
56052- 0 0 0 0 0 0 0 0 0 0 0 0
56053- 0 0 0 0 0 0 0 0 0 0 0 0
56054- 0 0 0 0 0 0 0 0 0 0 0 0
56055- 0 0 0 0 0 0 0 0 0 0 0 0
56056- 0 0 0 0 0 0 0 0 0 0 0 0
56057- 0 0 0 0 0 0 0 0 0 0 0 0
56058- 0 0 0 0 0 0 0 0 0 0 0 0
56059- 0 0 0 0 0 0 0 0 0 0 0 0
56060- 0 0 0 10 10 10 22 22 22 54 54 54
56061- 94 94 94 18 18 18 2 2 6 46 46 46
56062-234 234 234 221 221 221 190 190 190 190 190 190
56063-190 190 190 187 187 187 187 187 187 190 190 190
56064-190 190 190 195 195 195 214 214 214 242 242 242
56065-253 253 253 253 253 253 253 253 253 253 253 253
56066- 82 82 82 2 2 6 2 2 6 2 2 6
56067- 2 2 6 2 2 6 2 2 6 14 14 14
56068- 86 86 86 54 54 54 22 22 22 6 6 6
56069- 0 0 0 0 0 0 0 0 0 0 0 0
56070- 0 0 0 0 0 0 0 0 0 0 0 0
56071- 0 0 0 0 0 0 0 0 0 0 0 0
56072- 0 0 0 0 0 0 0 0 0 0 0 0
56073- 0 0 0 0 0 0 0 0 0 0 0 0
56074- 0 0 0 0 0 0 0 0 0 0 0 0
56075- 0 0 0 0 0 0 0 0 0 0 0 0
56076- 0 0 0 0 0 0 0 0 0 0 0 0
56077- 0 0 0 0 0 0 0 0 0 0 0 0
56078- 0 0 0 0 0 0 0 0 0 0 0 0
56079- 0 0 0 0 0 0 0 0 0 0 0 0
56080- 6 6 6 18 18 18 46 46 46 90 90 90
56081- 46 46 46 18 18 18 6 6 6 182 182 182
56082-253 253 253 246 246 246 206 206 206 190 190 190
56083-190 190 190 190 190 190 190 190 190 190 190 190
56084-206 206 206 231 231 231 250 250 250 253 253 253
56085-253 253 253 253 253 253 253 253 253 253 253 253
56086-202 202 202 14 14 14 2 2 6 2 2 6
56087- 2 2 6 2 2 6 2 2 6 2 2 6
56088- 42 42 42 86 86 86 42 42 42 18 18 18
56089- 6 6 6 0 0 0 0 0 0 0 0 0
56090- 0 0 0 0 0 0 0 0 0 0 0 0
56091- 0 0 0 0 0 0 0 0 0 0 0 0
56092- 0 0 0 0 0 0 0 0 0 0 0 0
56093- 0 0 0 0 0 0 0 0 0 0 0 0
56094- 0 0 0 0 0 0 0 0 0 0 0 0
56095- 0 0 0 0 0 0 0 0 0 0 0 0
56096- 0 0 0 0 0 0 0 0 0 0 0 0
56097- 0 0 0 0 0 0 0 0 0 0 0 0
56098- 0 0 0 0 0 0 0 0 0 0 0 0
56099- 0 0 0 0 0 0 0 0 0 6 6 6
56100- 14 14 14 38 38 38 74 74 74 66 66 66
56101- 2 2 6 6 6 6 90 90 90 250 250 250
56102-253 253 253 253 253 253 238 238 238 198 198 198
56103-190 190 190 190 190 190 195 195 195 221 221 221
56104-246 246 246 253 253 253 253 253 253 253 253 253
56105-253 253 253 253 253 253 253 253 253 253 253 253
56106-253 253 253 82 82 82 2 2 6 2 2 6
56107- 2 2 6 2 2 6 2 2 6 2 2 6
56108- 2 2 6 78 78 78 70 70 70 34 34 34
56109- 14 14 14 6 6 6 0 0 0 0 0 0
56110- 0 0 0 0 0 0 0 0 0 0 0 0
56111- 0 0 0 0 0 0 0 0 0 0 0 0
56112- 0 0 0 0 0 0 0 0 0 0 0 0
56113- 0 0 0 0 0 0 0 0 0 0 0 0
56114- 0 0 0 0 0 0 0 0 0 0 0 0
56115- 0 0 0 0 0 0 0 0 0 0 0 0
56116- 0 0 0 0 0 0 0 0 0 0 0 0
56117- 0 0 0 0 0 0 0 0 0 0 0 0
56118- 0 0 0 0 0 0 0 0 0 0 0 0
56119- 0 0 0 0 0 0 0 0 0 14 14 14
56120- 34 34 34 66 66 66 78 78 78 6 6 6
56121- 2 2 6 18 18 18 218 218 218 253 253 253
56122-253 253 253 253 253 253 253 253 253 246 246 246
56123-226 226 226 231 231 231 246 246 246 253 253 253
56124-253 253 253 253 253 253 253 253 253 253 253 253
56125-253 253 253 253 253 253 253 253 253 253 253 253
56126-253 253 253 178 178 178 2 2 6 2 2 6
56127- 2 2 6 2 2 6 2 2 6 2 2 6
56128- 2 2 6 18 18 18 90 90 90 62 62 62
56129- 30 30 30 10 10 10 0 0 0 0 0 0
56130- 0 0 0 0 0 0 0 0 0 0 0 0
56131- 0 0 0 0 0 0 0 0 0 0 0 0
56132- 0 0 0 0 0 0 0 0 0 0 0 0
56133- 0 0 0 0 0 0 0 0 0 0 0 0
56134- 0 0 0 0 0 0 0 0 0 0 0 0
56135- 0 0 0 0 0 0 0 0 0 0 0 0
56136- 0 0 0 0 0 0 0 0 0 0 0 0
56137- 0 0 0 0 0 0 0 0 0 0 0 0
56138- 0 0 0 0 0 0 0 0 0 0 0 0
56139- 0 0 0 0 0 0 10 10 10 26 26 26
56140- 58 58 58 90 90 90 18 18 18 2 2 6
56141- 2 2 6 110 110 110 253 253 253 253 253 253
56142-253 253 253 253 253 253 253 253 253 253 253 253
56143-250 250 250 253 253 253 253 253 253 253 253 253
56144-253 253 253 253 253 253 253 253 253 253 253 253
56145-253 253 253 253 253 253 253 253 253 253 253 253
56146-253 253 253 231 231 231 18 18 18 2 2 6
56147- 2 2 6 2 2 6 2 2 6 2 2 6
56148- 2 2 6 2 2 6 18 18 18 94 94 94
56149- 54 54 54 26 26 26 10 10 10 0 0 0
56150- 0 0 0 0 0 0 0 0 0 0 0 0
56151- 0 0 0 0 0 0 0 0 0 0 0 0
56152- 0 0 0 0 0 0 0 0 0 0 0 0
56153- 0 0 0 0 0 0 0 0 0 0 0 0
56154- 0 0 0 0 0 0 0 0 0 0 0 0
56155- 0 0 0 0 0 0 0 0 0 0 0 0
56156- 0 0 0 0 0 0 0 0 0 0 0 0
56157- 0 0 0 0 0 0 0 0 0 0 0 0
56158- 0 0 0 0 0 0 0 0 0 0 0 0
56159- 0 0 0 6 6 6 22 22 22 50 50 50
56160- 90 90 90 26 26 26 2 2 6 2 2 6
56161- 14 14 14 195 195 195 250 250 250 253 253 253
56162-253 253 253 253 253 253 253 253 253 253 253 253
56163-253 253 253 253 253 253 253 253 253 253 253 253
56164-253 253 253 253 253 253 253 253 253 253 253 253
56165-253 253 253 253 253 253 253 253 253 253 253 253
56166-250 250 250 242 242 242 54 54 54 2 2 6
56167- 2 2 6 2 2 6 2 2 6 2 2 6
56168- 2 2 6 2 2 6 2 2 6 38 38 38
56169- 86 86 86 50 50 50 22 22 22 6 6 6
56170- 0 0 0 0 0 0 0 0 0 0 0 0
56171- 0 0 0 0 0 0 0 0 0 0 0 0
56172- 0 0 0 0 0 0 0 0 0 0 0 0
56173- 0 0 0 0 0 0 0 0 0 0 0 0
56174- 0 0 0 0 0 0 0 0 0 0 0 0
56175- 0 0 0 0 0 0 0 0 0 0 0 0
56176- 0 0 0 0 0 0 0 0 0 0 0 0
56177- 0 0 0 0 0 0 0 0 0 0 0 0
56178- 0 0 0 0 0 0 0 0 0 0 0 0
56179- 6 6 6 14 14 14 38 38 38 82 82 82
56180- 34 34 34 2 2 6 2 2 6 2 2 6
56181- 42 42 42 195 195 195 246 246 246 253 253 253
56182-253 253 253 253 253 253 253 253 253 250 250 250
56183-242 242 242 242 242 242 250 250 250 253 253 253
56184-253 253 253 253 253 253 253 253 253 253 253 253
56185-253 253 253 250 250 250 246 246 246 238 238 238
56186-226 226 226 231 231 231 101 101 101 6 6 6
56187- 2 2 6 2 2 6 2 2 6 2 2 6
56188- 2 2 6 2 2 6 2 2 6 2 2 6
56189- 38 38 38 82 82 82 42 42 42 14 14 14
56190- 6 6 6 0 0 0 0 0 0 0 0 0
56191- 0 0 0 0 0 0 0 0 0 0 0 0
56192- 0 0 0 0 0 0 0 0 0 0 0 0
56193- 0 0 0 0 0 0 0 0 0 0 0 0
56194- 0 0 0 0 0 0 0 0 0 0 0 0
56195- 0 0 0 0 0 0 0 0 0 0 0 0
56196- 0 0 0 0 0 0 0 0 0 0 0 0
56197- 0 0 0 0 0 0 0 0 0 0 0 0
56198- 0 0 0 0 0 0 0 0 0 0 0 0
56199- 10 10 10 26 26 26 62 62 62 66 66 66
56200- 2 2 6 2 2 6 2 2 6 6 6 6
56201- 70 70 70 170 170 170 206 206 206 234 234 234
56202-246 246 246 250 250 250 250 250 250 238 238 238
56203-226 226 226 231 231 231 238 238 238 250 250 250
56204-250 250 250 250 250 250 246 246 246 231 231 231
56205-214 214 214 206 206 206 202 202 202 202 202 202
56206-198 198 198 202 202 202 182 182 182 18 18 18
56207- 2 2 6 2 2 6 2 2 6 2 2 6
56208- 2 2 6 2 2 6 2 2 6 2 2 6
56209- 2 2 6 62 62 62 66 66 66 30 30 30
56210- 10 10 10 0 0 0 0 0 0 0 0 0
56211- 0 0 0 0 0 0 0 0 0 0 0 0
56212- 0 0 0 0 0 0 0 0 0 0 0 0
56213- 0 0 0 0 0 0 0 0 0 0 0 0
56214- 0 0 0 0 0 0 0 0 0 0 0 0
56215- 0 0 0 0 0 0 0 0 0 0 0 0
56216- 0 0 0 0 0 0 0 0 0 0 0 0
56217- 0 0 0 0 0 0 0 0 0 0 0 0
56218- 0 0 0 0 0 0 0 0 0 0 0 0
56219- 14 14 14 42 42 42 82 82 82 18 18 18
56220- 2 2 6 2 2 6 2 2 6 10 10 10
56221- 94 94 94 182 182 182 218 218 218 242 242 242
56222-250 250 250 253 253 253 253 253 253 250 250 250
56223-234 234 234 253 253 253 253 253 253 253 253 253
56224-253 253 253 253 253 253 253 253 253 246 246 246
56225-238 238 238 226 226 226 210 210 210 202 202 202
56226-195 195 195 195 195 195 210 210 210 158 158 158
56227- 6 6 6 14 14 14 50 50 50 14 14 14
56228- 2 2 6 2 2 6 2 2 6 2 2 6
56229- 2 2 6 6 6 6 86 86 86 46 46 46
56230- 18 18 18 6 6 6 0 0 0 0 0 0
56231- 0 0 0 0 0 0 0 0 0 0 0 0
56232- 0 0 0 0 0 0 0 0 0 0 0 0
56233- 0 0 0 0 0 0 0 0 0 0 0 0
56234- 0 0 0 0 0 0 0 0 0 0 0 0
56235- 0 0 0 0 0 0 0 0 0 0 0 0
56236- 0 0 0 0 0 0 0 0 0 0 0 0
56237- 0 0 0 0 0 0 0 0 0 0 0 0
56238- 0 0 0 0 0 0 0 0 0 6 6 6
56239- 22 22 22 54 54 54 70 70 70 2 2 6
56240- 2 2 6 10 10 10 2 2 6 22 22 22
56241-166 166 166 231 231 231 250 250 250 253 253 253
56242-253 253 253 253 253 253 253 253 253 250 250 250
56243-242 242 242 253 253 253 253 253 253 253 253 253
56244-253 253 253 253 253 253 253 253 253 253 253 253
56245-253 253 253 253 253 253 253 253 253 246 246 246
56246-231 231 231 206 206 206 198 198 198 226 226 226
56247- 94 94 94 2 2 6 6 6 6 38 38 38
56248- 30 30 30 2 2 6 2 2 6 2 2 6
56249- 2 2 6 2 2 6 62 62 62 66 66 66
56250- 26 26 26 10 10 10 0 0 0 0 0 0
56251- 0 0 0 0 0 0 0 0 0 0 0 0
56252- 0 0 0 0 0 0 0 0 0 0 0 0
56253- 0 0 0 0 0 0 0 0 0 0 0 0
56254- 0 0 0 0 0 0 0 0 0 0 0 0
56255- 0 0 0 0 0 0 0 0 0 0 0 0
56256- 0 0 0 0 0 0 0 0 0 0 0 0
56257- 0 0 0 0 0 0 0 0 0 0 0 0
56258- 0 0 0 0 0 0 0 0 0 10 10 10
56259- 30 30 30 74 74 74 50 50 50 2 2 6
56260- 26 26 26 26 26 26 2 2 6 106 106 106
56261-238 238 238 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 253 253 253 253 253 253
56264-253 253 253 253 253 253 253 253 253 253 253 253
56265-253 253 253 253 253 253 253 253 253 253 253 253
56266-253 253 253 246 246 246 218 218 218 202 202 202
56267-210 210 210 14 14 14 2 2 6 2 2 6
56268- 30 30 30 22 22 22 2 2 6 2 2 6
56269- 2 2 6 2 2 6 18 18 18 86 86 86
56270- 42 42 42 14 14 14 0 0 0 0 0 0
56271- 0 0 0 0 0 0 0 0 0 0 0 0
56272- 0 0 0 0 0 0 0 0 0 0 0 0
56273- 0 0 0 0 0 0 0 0 0 0 0 0
56274- 0 0 0 0 0 0 0 0 0 0 0 0
56275- 0 0 0 0 0 0 0 0 0 0 0 0
56276- 0 0 0 0 0 0 0 0 0 0 0 0
56277- 0 0 0 0 0 0 0 0 0 0 0 0
56278- 0 0 0 0 0 0 0 0 0 14 14 14
56279- 42 42 42 90 90 90 22 22 22 2 2 6
56280- 42 42 42 2 2 6 18 18 18 218 218 218
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 253 253 253 253 253 253
56284-253 253 253 253 253 253 253 253 253 253 253 253
56285-253 253 253 253 253 253 253 253 253 253 253 253
56286-253 253 253 253 253 253 250 250 250 221 221 221
56287-218 218 218 101 101 101 2 2 6 14 14 14
56288- 18 18 18 38 38 38 10 10 10 2 2 6
56289- 2 2 6 2 2 6 2 2 6 78 78 78
56290- 58 58 58 22 22 22 6 6 6 0 0 0
56291- 0 0 0 0 0 0 0 0 0 0 0 0
56292- 0 0 0 0 0 0 0 0 0 0 0 0
56293- 0 0 0 0 0 0 0 0 0 0 0 0
56294- 0 0 0 0 0 0 0 0 0 0 0 0
56295- 0 0 0 0 0 0 0 0 0 0 0 0
56296- 0 0 0 0 0 0 0 0 0 0 0 0
56297- 0 0 0 0 0 0 0 0 0 0 0 0
56298- 0 0 0 0 0 0 6 6 6 18 18 18
56299- 54 54 54 82 82 82 2 2 6 26 26 26
56300- 22 22 22 2 2 6 123 123 123 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 253 253 253 253 253 253
56304-253 253 253 253 253 253 253 253 253 253 253 253
56305-253 253 253 253 253 253 253 253 253 253 253 253
56306-253 253 253 253 253 253 253 253 253 250 250 250
56307-238 238 238 198 198 198 6 6 6 38 38 38
56308- 58 58 58 26 26 26 38 38 38 2 2 6
56309- 2 2 6 2 2 6 2 2 6 46 46 46
56310- 78 78 78 30 30 30 10 10 10 0 0 0
56311- 0 0 0 0 0 0 0 0 0 0 0 0
56312- 0 0 0 0 0 0 0 0 0 0 0 0
56313- 0 0 0 0 0 0 0 0 0 0 0 0
56314- 0 0 0 0 0 0 0 0 0 0 0 0
56315- 0 0 0 0 0 0 0 0 0 0 0 0
56316- 0 0 0 0 0 0 0 0 0 0 0 0
56317- 0 0 0 0 0 0 0 0 0 0 0 0
56318- 0 0 0 0 0 0 10 10 10 30 30 30
56319- 74 74 74 58 58 58 2 2 6 42 42 42
56320- 2 2 6 22 22 22 231 231 231 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 250 250 250
56323-253 253 253 253 253 253 253 253 253 253 253 253
56324-253 253 253 253 253 253 253 253 253 253 253 253
56325-253 253 253 253 253 253 253 253 253 253 253 253
56326-253 253 253 253 253 253 253 253 253 253 253 253
56327-253 253 253 246 246 246 46 46 46 38 38 38
56328- 42 42 42 14 14 14 38 38 38 14 14 14
56329- 2 2 6 2 2 6 2 2 6 6 6 6
56330- 86 86 86 46 46 46 14 14 14 0 0 0
56331- 0 0 0 0 0 0 0 0 0 0 0 0
56332- 0 0 0 0 0 0 0 0 0 0 0 0
56333- 0 0 0 0 0 0 0 0 0 0 0 0
56334- 0 0 0 0 0 0 0 0 0 0 0 0
56335- 0 0 0 0 0 0 0 0 0 0 0 0
56336- 0 0 0 0 0 0 0 0 0 0 0 0
56337- 0 0 0 0 0 0 0 0 0 0 0 0
56338- 0 0 0 6 6 6 14 14 14 42 42 42
56339- 90 90 90 18 18 18 18 18 18 26 26 26
56340- 2 2 6 116 116 116 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 250 250 250 238 238 238
56343-253 253 253 253 253 253 253 253 253 253 253 253
56344-253 253 253 253 253 253 253 253 253 253 253 253
56345-253 253 253 253 253 253 253 253 253 253 253 253
56346-253 253 253 253 253 253 253 253 253 253 253 253
56347-253 253 253 253 253 253 94 94 94 6 6 6
56348- 2 2 6 2 2 6 10 10 10 34 34 34
56349- 2 2 6 2 2 6 2 2 6 2 2 6
56350- 74 74 74 58 58 58 22 22 22 6 6 6
56351- 0 0 0 0 0 0 0 0 0 0 0 0
56352- 0 0 0 0 0 0 0 0 0 0 0 0
56353- 0 0 0 0 0 0 0 0 0 0 0 0
56354- 0 0 0 0 0 0 0 0 0 0 0 0
56355- 0 0 0 0 0 0 0 0 0 0 0 0
56356- 0 0 0 0 0 0 0 0 0 0 0 0
56357- 0 0 0 0 0 0 0 0 0 0 0 0
56358- 0 0 0 10 10 10 26 26 26 66 66 66
56359- 82 82 82 2 2 6 38 38 38 6 6 6
56360- 14 14 14 210 210 210 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 246 246 246 242 242 242
56363-253 253 253 253 253 253 253 253 253 253 253 253
56364-253 253 253 253 253 253 253 253 253 253 253 253
56365-253 253 253 253 253 253 253 253 253 253 253 253
56366-253 253 253 253 253 253 253 253 253 253 253 253
56367-253 253 253 253 253 253 144 144 144 2 2 6
56368- 2 2 6 2 2 6 2 2 6 46 46 46
56369- 2 2 6 2 2 6 2 2 6 2 2 6
56370- 42 42 42 74 74 74 30 30 30 10 10 10
56371- 0 0 0 0 0 0 0 0 0 0 0 0
56372- 0 0 0 0 0 0 0 0 0 0 0 0
56373- 0 0 0 0 0 0 0 0 0 0 0 0
56374- 0 0 0 0 0 0 0 0 0 0 0 0
56375- 0 0 0 0 0 0 0 0 0 0 0 0
56376- 0 0 0 0 0 0 0 0 0 0 0 0
56377- 0 0 0 0 0 0 0 0 0 0 0 0
56378- 6 6 6 14 14 14 42 42 42 90 90 90
56379- 26 26 26 6 6 6 42 42 42 2 2 6
56380- 74 74 74 250 250 250 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 242 242 242 242 242 242
56383-253 253 253 253 253 253 253 253 253 253 253 253
56384-253 253 253 253 253 253 253 253 253 253 253 253
56385-253 253 253 253 253 253 253 253 253 253 253 253
56386-253 253 253 253 253 253 253 253 253 253 253 253
56387-253 253 253 253 253 253 182 182 182 2 2 6
56388- 2 2 6 2 2 6 2 2 6 46 46 46
56389- 2 2 6 2 2 6 2 2 6 2 2 6
56390- 10 10 10 86 86 86 38 38 38 10 10 10
56391- 0 0 0 0 0 0 0 0 0 0 0 0
56392- 0 0 0 0 0 0 0 0 0 0 0 0
56393- 0 0 0 0 0 0 0 0 0 0 0 0
56394- 0 0 0 0 0 0 0 0 0 0 0 0
56395- 0 0 0 0 0 0 0 0 0 0 0 0
56396- 0 0 0 0 0 0 0 0 0 0 0 0
56397- 0 0 0 0 0 0 0 0 0 0 0 0
56398- 10 10 10 26 26 26 66 66 66 82 82 82
56399- 2 2 6 22 22 22 18 18 18 2 2 6
56400-149 149 149 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 253 253 253 234 234 234 242 242 242
56403-253 253 253 253 253 253 253 253 253 253 253 253
56404-253 253 253 253 253 253 253 253 253 253 253 253
56405-253 253 253 253 253 253 253 253 253 253 253 253
56406-253 253 253 253 253 253 253 253 253 253 253 253
56407-253 253 253 253 253 253 206 206 206 2 2 6
56408- 2 2 6 2 2 6 2 2 6 38 38 38
56409- 2 2 6 2 2 6 2 2 6 2 2 6
56410- 6 6 6 86 86 86 46 46 46 14 14 14
56411- 0 0 0 0 0 0 0 0 0 0 0 0
56412- 0 0 0 0 0 0 0 0 0 0 0 0
56413- 0 0 0 0 0 0 0 0 0 0 0 0
56414- 0 0 0 0 0 0 0 0 0 0 0 0
56415- 0 0 0 0 0 0 0 0 0 0 0 0
56416- 0 0 0 0 0 0 0 0 0 0 0 0
56417- 0 0 0 0 0 0 0 0 0 6 6 6
56418- 18 18 18 46 46 46 86 86 86 18 18 18
56419- 2 2 6 34 34 34 10 10 10 6 6 6
56420-210 210 210 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 253 253 253 234 234 234 242 242 242
56423-253 253 253 253 253 253 253 253 253 253 253 253
56424-253 253 253 253 253 253 253 253 253 253 253 253
56425-253 253 253 253 253 253 253 253 253 253 253 253
56426-253 253 253 253 253 253 253 253 253 253 253 253
56427-253 253 253 253 253 253 221 221 221 6 6 6
56428- 2 2 6 2 2 6 6 6 6 30 30 30
56429- 2 2 6 2 2 6 2 2 6 2 2 6
56430- 2 2 6 82 82 82 54 54 54 18 18 18
56431- 6 6 6 0 0 0 0 0 0 0 0 0
56432- 0 0 0 0 0 0 0 0 0 0 0 0
56433- 0 0 0 0 0 0 0 0 0 0 0 0
56434- 0 0 0 0 0 0 0 0 0 0 0 0
56435- 0 0 0 0 0 0 0 0 0 0 0 0
56436- 0 0 0 0 0 0 0 0 0 0 0 0
56437- 0 0 0 0 0 0 0 0 0 10 10 10
56438- 26 26 26 66 66 66 62 62 62 2 2 6
56439- 2 2 6 38 38 38 10 10 10 26 26 26
56440-238 238 238 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 253 253 253 231 231 231 238 238 238
56443-253 253 253 253 253 253 253 253 253 253 253 253
56444-253 253 253 253 253 253 253 253 253 253 253 253
56445-253 253 253 253 253 253 253 253 253 253 253 253
56446-253 253 253 253 253 253 253 253 253 253 253 253
56447-253 253 253 253 253 253 231 231 231 6 6 6
56448- 2 2 6 2 2 6 10 10 10 30 30 30
56449- 2 2 6 2 2 6 2 2 6 2 2 6
56450- 2 2 6 66 66 66 58 58 58 22 22 22
56451- 6 6 6 0 0 0 0 0 0 0 0 0
56452- 0 0 0 0 0 0 0 0 0 0 0 0
56453- 0 0 0 0 0 0 0 0 0 0 0 0
56454- 0 0 0 0 0 0 0 0 0 0 0 0
56455- 0 0 0 0 0 0 0 0 0 0 0 0
56456- 0 0 0 0 0 0 0 0 0 0 0 0
56457- 0 0 0 0 0 0 0 0 0 10 10 10
56458- 38 38 38 78 78 78 6 6 6 2 2 6
56459- 2 2 6 46 46 46 14 14 14 42 42 42
56460-246 246 246 253 253 253 253 253 253 253 253 253
56461-253 253 253 253 253 253 253 253 253 253 253 253
56462-253 253 253 253 253 253 231 231 231 242 242 242
56463-253 253 253 253 253 253 253 253 253 253 253 253
56464-253 253 253 253 253 253 253 253 253 253 253 253
56465-253 253 253 253 253 253 253 253 253 253 253 253
56466-253 253 253 253 253 253 253 253 253 253 253 253
56467-253 253 253 253 253 253 234 234 234 10 10 10
56468- 2 2 6 2 2 6 22 22 22 14 14 14
56469- 2 2 6 2 2 6 2 2 6 2 2 6
56470- 2 2 6 66 66 66 62 62 62 22 22 22
56471- 6 6 6 0 0 0 0 0 0 0 0 0
56472- 0 0 0 0 0 0 0 0 0 0 0 0
56473- 0 0 0 0 0 0 0 0 0 0 0 0
56474- 0 0 0 0 0 0 0 0 0 0 0 0
56475- 0 0 0 0 0 0 0 0 0 0 0 0
56476- 0 0 0 0 0 0 0 0 0 0 0 0
56477- 0 0 0 0 0 0 6 6 6 18 18 18
56478- 50 50 50 74 74 74 2 2 6 2 2 6
56479- 14 14 14 70 70 70 34 34 34 62 62 62
56480-250 250 250 253 253 253 253 253 253 253 253 253
56481-253 253 253 253 253 253 253 253 253 253 253 253
56482-253 253 253 253 253 253 231 231 231 246 246 246
56483-253 253 253 253 253 253 253 253 253 253 253 253
56484-253 253 253 253 253 253 253 253 253 253 253 253
56485-253 253 253 253 253 253 253 253 253 253 253 253
56486-253 253 253 253 253 253 253 253 253 253 253 253
56487-253 253 253 253 253 253 234 234 234 14 14 14
56488- 2 2 6 2 2 6 30 30 30 2 2 6
56489- 2 2 6 2 2 6 2 2 6 2 2 6
56490- 2 2 6 66 66 66 62 62 62 22 22 22
56491- 6 6 6 0 0 0 0 0 0 0 0 0
56492- 0 0 0 0 0 0 0 0 0 0 0 0
56493- 0 0 0 0 0 0 0 0 0 0 0 0
56494- 0 0 0 0 0 0 0 0 0 0 0 0
56495- 0 0 0 0 0 0 0 0 0 0 0 0
56496- 0 0 0 0 0 0 0 0 0 0 0 0
56497- 0 0 0 0 0 0 6 6 6 18 18 18
56498- 54 54 54 62 62 62 2 2 6 2 2 6
56499- 2 2 6 30 30 30 46 46 46 70 70 70
56500-250 250 250 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 253 253 253 231 231 231 246 246 246
56503-253 253 253 253 253 253 253 253 253 253 253 253
56504-253 253 253 253 253 253 253 253 253 253 253 253
56505-253 253 253 253 253 253 253 253 253 253 253 253
56506-253 253 253 253 253 253 253 253 253 253 253 253
56507-253 253 253 253 253 253 226 226 226 10 10 10
56508- 2 2 6 6 6 6 30 30 30 2 2 6
56509- 2 2 6 2 2 6 2 2 6 2 2 6
56510- 2 2 6 66 66 66 58 58 58 22 22 22
56511- 6 6 6 0 0 0 0 0 0 0 0 0
56512- 0 0 0 0 0 0 0 0 0 0 0 0
56513- 0 0 0 0 0 0 0 0 0 0 0 0
56514- 0 0 0 0 0 0 0 0 0 0 0 0
56515- 0 0 0 0 0 0 0 0 0 0 0 0
56516- 0 0 0 0 0 0 0 0 0 0 0 0
56517- 0 0 0 0 0 0 6 6 6 22 22 22
56518- 58 58 58 62 62 62 2 2 6 2 2 6
56519- 2 2 6 2 2 6 30 30 30 78 78 78
56520-250 250 250 253 253 253 253 253 253 253 253 253
56521-253 253 253 253 253 253 253 253 253 253 253 253
56522-253 253 253 253 253 253 231 231 231 246 246 246
56523-253 253 253 253 253 253 253 253 253 253 253 253
56524-253 253 253 253 253 253 253 253 253 253 253 253
56525-253 253 253 253 253 253 253 253 253 253 253 253
56526-253 253 253 253 253 253 253 253 253 253 253 253
56527-253 253 253 253 253 253 206 206 206 2 2 6
56528- 22 22 22 34 34 34 18 14 6 22 22 22
56529- 26 26 26 18 18 18 6 6 6 2 2 6
56530- 2 2 6 82 82 82 54 54 54 18 18 18
56531- 6 6 6 0 0 0 0 0 0 0 0 0
56532- 0 0 0 0 0 0 0 0 0 0 0 0
56533- 0 0 0 0 0 0 0 0 0 0 0 0
56534- 0 0 0 0 0 0 0 0 0 0 0 0
56535- 0 0 0 0 0 0 0 0 0 0 0 0
56536- 0 0 0 0 0 0 0 0 0 0 0 0
56537- 0 0 0 0 0 0 6 6 6 26 26 26
56538- 62 62 62 106 106 106 74 54 14 185 133 11
56539-210 162 10 121 92 8 6 6 6 62 62 62
56540-238 238 238 253 253 253 253 253 253 253 253 253
56541-253 253 253 253 253 253 253 253 253 253 253 253
56542-253 253 253 253 253 253 231 231 231 246 246 246
56543-253 253 253 253 253 253 253 253 253 253 253 253
56544-253 253 253 253 253 253 253 253 253 253 253 253
56545-253 253 253 253 253 253 253 253 253 253 253 253
56546-253 253 253 253 253 253 253 253 253 253 253 253
56547-253 253 253 253 253 253 158 158 158 18 18 18
56548- 14 14 14 2 2 6 2 2 6 2 2 6
56549- 6 6 6 18 18 18 66 66 66 38 38 38
56550- 6 6 6 94 94 94 50 50 50 18 18 18
56551- 6 6 6 0 0 0 0 0 0 0 0 0
56552- 0 0 0 0 0 0 0 0 0 0 0 0
56553- 0 0 0 0 0 0 0 0 0 0 0 0
56554- 0 0 0 0 0 0 0 0 0 0 0 0
56555- 0 0 0 0 0 0 0 0 0 0 0 0
56556- 0 0 0 0 0 0 0 0 0 6 6 6
56557- 10 10 10 10 10 10 18 18 18 38 38 38
56558- 78 78 78 142 134 106 216 158 10 242 186 14
56559-246 190 14 246 190 14 156 118 10 10 10 10
56560- 90 90 90 238 238 238 253 253 253 253 253 253
56561-253 253 253 253 253 253 253 253 253 253 253 253
56562-253 253 253 253 253 253 231 231 231 250 250 250
56563-253 253 253 253 253 253 253 253 253 253 253 253
56564-253 253 253 253 253 253 253 253 253 253 253 253
56565-253 253 253 253 253 253 253 253 253 253 253 253
56566-253 253 253 253 253 253 253 253 253 246 230 190
56567-238 204 91 238 204 91 181 142 44 37 26 9
56568- 2 2 6 2 2 6 2 2 6 2 2 6
56569- 2 2 6 2 2 6 38 38 38 46 46 46
56570- 26 26 26 106 106 106 54 54 54 18 18 18
56571- 6 6 6 0 0 0 0 0 0 0 0 0
56572- 0 0 0 0 0 0 0 0 0 0 0 0
56573- 0 0 0 0 0 0 0 0 0 0 0 0
56574- 0 0 0 0 0 0 0 0 0 0 0 0
56575- 0 0 0 0 0 0 0 0 0 0 0 0
56576- 0 0 0 6 6 6 14 14 14 22 22 22
56577- 30 30 30 38 38 38 50 50 50 70 70 70
56578-106 106 106 190 142 34 226 170 11 242 186 14
56579-246 190 14 246 190 14 246 190 14 154 114 10
56580- 6 6 6 74 74 74 226 226 226 253 253 253
56581-253 253 253 253 253 253 253 253 253 253 253 253
56582-253 253 253 253 253 253 231 231 231 250 250 250
56583-253 253 253 253 253 253 253 253 253 253 253 253
56584-253 253 253 253 253 253 253 253 253 253 253 253
56585-253 253 253 253 253 253 253 253 253 253 253 253
56586-253 253 253 253 253 253 253 253 253 228 184 62
56587-241 196 14 241 208 19 232 195 16 38 30 10
56588- 2 2 6 2 2 6 2 2 6 2 2 6
56589- 2 2 6 6 6 6 30 30 30 26 26 26
56590-203 166 17 154 142 90 66 66 66 26 26 26
56591- 6 6 6 0 0 0 0 0 0 0 0 0
56592- 0 0 0 0 0 0 0 0 0 0 0 0
56593- 0 0 0 0 0 0 0 0 0 0 0 0
56594- 0 0 0 0 0 0 0 0 0 0 0 0
56595- 0 0 0 0 0 0 0 0 0 0 0 0
56596- 6 6 6 18 18 18 38 38 38 58 58 58
56597- 78 78 78 86 86 86 101 101 101 123 123 123
56598-175 146 61 210 150 10 234 174 13 246 186 14
56599-246 190 14 246 190 14 246 190 14 238 190 10
56600-102 78 10 2 2 6 46 46 46 198 198 198
56601-253 253 253 253 253 253 253 253 253 253 253 253
56602-253 253 253 253 253 253 234 234 234 242 242 242
56603-253 253 253 253 253 253 253 253 253 253 253 253
56604-253 253 253 253 253 253 253 253 253 253 253 253
56605-253 253 253 253 253 253 253 253 253 253 253 253
56606-253 253 253 253 253 253 253 253 253 224 178 62
56607-242 186 14 241 196 14 210 166 10 22 18 6
56608- 2 2 6 2 2 6 2 2 6 2 2 6
56609- 2 2 6 2 2 6 6 6 6 121 92 8
56610-238 202 15 232 195 16 82 82 82 34 34 34
56611- 10 10 10 0 0 0 0 0 0 0 0 0
56612- 0 0 0 0 0 0 0 0 0 0 0 0
56613- 0 0 0 0 0 0 0 0 0 0 0 0
56614- 0 0 0 0 0 0 0 0 0 0 0 0
56615- 0 0 0 0 0 0 0 0 0 0 0 0
56616- 14 14 14 38 38 38 70 70 70 154 122 46
56617-190 142 34 200 144 11 197 138 11 197 138 11
56618-213 154 11 226 170 11 242 186 14 246 190 14
56619-246 190 14 246 190 14 246 190 14 246 190 14
56620-225 175 15 46 32 6 2 2 6 22 22 22
56621-158 158 158 250 250 250 253 253 253 253 253 253
56622-253 253 253 253 253 253 253 253 253 253 253 253
56623-253 253 253 253 253 253 253 253 253 253 253 253
56624-253 253 253 253 253 253 253 253 253 253 253 253
56625-253 253 253 253 253 253 253 253 253 253 253 253
56626-253 253 253 250 250 250 242 242 242 224 178 62
56627-239 182 13 236 186 11 213 154 11 46 32 6
56628- 2 2 6 2 2 6 2 2 6 2 2 6
56629- 2 2 6 2 2 6 61 42 6 225 175 15
56630-238 190 10 236 186 11 112 100 78 42 42 42
56631- 14 14 14 0 0 0 0 0 0 0 0 0
56632- 0 0 0 0 0 0 0 0 0 0 0 0
56633- 0 0 0 0 0 0 0 0 0 0 0 0
56634- 0 0 0 0 0 0 0 0 0 0 0 0
56635- 0 0 0 0 0 0 0 0 0 6 6 6
56636- 22 22 22 54 54 54 154 122 46 213 154 11
56637-226 170 11 230 174 11 226 170 11 226 170 11
56638-236 178 12 242 186 14 246 190 14 246 190 14
56639-246 190 14 246 190 14 246 190 14 246 190 14
56640-241 196 14 184 144 12 10 10 10 2 2 6
56641- 6 6 6 116 116 116 242 242 242 253 253 253
56642-253 253 253 253 253 253 253 253 253 253 253 253
56643-253 253 253 253 253 253 253 253 253 253 253 253
56644-253 253 253 253 253 253 253 253 253 253 253 253
56645-253 253 253 253 253 253 253 253 253 253 253 253
56646-253 253 253 231 231 231 198 198 198 214 170 54
56647-236 178 12 236 178 12 210 150 10 137 92 6
56648- 18 14 6 2 2 6 2 2 6 2 2 6
56649- 6 6 6 70 47 6 200 144 11 236 178 12
56650-239 182 13 239 182 13 124 112 88 58 58 58
56651- 22 22 22 6 6 6 0 0 0 0 0 0
56652- 0 0 0 0 0 0 0 0 0 0 0 0
56653- 0 0 0 0 0 0 0 0 0 0 0 0
56654- 0 0 0 0 0 0 0 0 0 0 0 0
56655- 0 0 0 0 0 0 0 0 0 10 10 10
56656- 30 30 30 70 70 70 180 133 36 226 170 11
56657-239 182 13 242 186 14 242 186 14 246 186 14
56658-246 190 14 246 190 14 246 190 14 246 190 14
56659-246 190 14 246 190 14 246 190 14 246 190 14
56660-246 190 14 232 195 16 98 70 6 2 2 6
56661- 2 2 6 2 2 6 66 66 66 221 221 221
56662-253 253 253 253 253 253 253 253 253 253 253 253
56663-253 253 253 253 253 253 253 253 253 253 253 253
56664-253 253 253 253 253 253 253 253 253 253 253 253
56665-253 253 253 253 253 253 253 253 253 253 253 253
56666-253 253 253 206 206 206 198 198 198 214 166 58
56667-230 174 11 230 174 11 216 158 10 192 133 9
56668-163 110 8 116 81 8 102 78 10 116 81 8
56669-167 114 7 197 138 11 226 170 11 239 182 13
56670-242 186 14 242 186 14 162 146 94 78 78 78
56671- 34 34 34 14 14 14 6 6 6 0 0 0
56672- 0 0 0 0 0 0 0 0 0 0 0 0
56673- 0 0 0 0 0 0 0 0 0 0 0 0
56674- 0 0 0 0 0 0 0 0 0 0 0 0
56675- 0 0 0 0 0 0 0 0 0 6 6 6
56676- 30 30 30 78 78 78 190 142 34 226 170 11
56677-239 182 13 246 190 14 246 190 14 246 190 14
56678-246 190 14 246 190 14 246 190 14 246 190 14
56679-246 190 14 246 190 14 246 190 14 246 190 14
56680-246 190 14 241 196 14 203 166 17 22 18 6
56681- 2 2 6 2 2 6 2 2 6 38 38 38
56682-218 218 218 253 253 253 253 253 253 253 253 253
56683-253 253 253 253 253 253 253 253 253 253 253 253
56684-253 253 253 253 253 253 253 253 253 253 253 253
56685-253 253 253 253 253 253 253 253 253 253 253 253
56686-250 250 250 206 206 206 198 198 198 202 162 69
56687-226 170 11 236 178 12 224 166 10 210 150 10
56688-200 144 11 197 138 11 192 133 9 197 138 11
56689-210 150 10 226 170 11 242 186 14 246 190 14
56690-246 190 14 246 186 14 225 175 15 124 112 88
56691- 62 62 62 30 30 30 14 14 14 6 6 6
56692- 0 0 0 0 0 0 0 0 0 0 0 0
56693- 0 0 0 0 0 0 0 0 0 0 0 0
56694- 0 0 0 0 0 0 0 0 0 0 0 0
56695- 0 0 0 0 0 0 0 0 0 10 10 10
56696- 30 30 30 78 78 78 174 135 50 224 166 10
56697-239 182 13 246 190 14 246 190 14 246 190 14
56698-246 190 14 246 190 14 246 190 14 246 190 14
56699-246 190 14 246 190 14 246 190 14 246 190 14
56700-246 190 14 246 190 14 241 196 14 139 102 15
56701- 2 2 6 2 2 6 2 2 6 2 2 6
56702- 78 78 78 250 250 250 253 253 253 253 253 253
56703-253 253 253 253 253 253 253 253 253 253 253 253
56704-253 253 253 253 253 253 253 253 253 253 253 253
56705-253 253 253 253 253 253 253 253 253 253 253 253
56706-250 250 250 214 214 214 198 198 198 190 150 46
56707-219 162 10 236 178 12 234 174 13 224 166 10
56708-216 158 10 213 154 11 213 154 11 216 158 10
56709-226 170 11 239 182 13 246 190 14 246 190 14
56710-246 190 14 246 190 14 242 186 14 206 162 42
56711-101 101 101 58 58 58 30 30 30 14 14 14
56712- 6 6 6 0 0 0 0 0 0 0 0 0
56713- 0 0 0 0 0 0 0 0 0 0 0 0
56714- 0 0 0 0 0 0 0 0 0 0 0 0
56715- 0 0 0 0 0 0 0 0 0 10 10 10
56716- 30 30 30 74 74 74 174 135 50 216 158 10
56717-236 178 12 246 190 14 246 190 14 246 190 14
56718-246 190 14 246 190 14 246 190 14 246 190 14
56719-246 190 14 246 190 14 246 190 14 246 190 14
56720-246 190 14 246 190 14 241 196 14 226 184 13
56721- 61 42 6 2 2 6 2 2 6 2 2 6
56722- 22 22 22 238 238 238 253 253 253 253 253 253
56723-253 253 253 253 253 253 253 253 253 253 253 253
56724-253 253 253 253 253 253 253 253 253 253 253 253
56725-253 253 253 253 253 253 253 253 253 253 253 253
56726-253 253 253 226 226 226 187 187 187 180 133 36
56727-216 158 10 236 178 12 239 182 13 236 178 12
56728-230 174 11 226 170 11 226 170 11 230 174 11
56729-236 178 12 242 186 14 246 190 14 246 190 14
56730-246 190 14 246 190 14 246 186 14 239 182 13
56731-206 162 42 106 106 106 66 66 66 34 34 34
56732- 14 14 14 6 6 6 0 0 0 0 0 0
56733- 0 0 0 0 0 0 0 0 0 0 0 0
56734- 0 0 0 0 0 0 0 0 0 0 0 0
56735- 0 0 0 0 0 0 0 0 0 6 6 6
56736- 26 26 26 70 70 70 163 133 67 213 154 11
56737-236 178 12 246 190 14 246 190 14 246 190 14
56738-246 190 14 246 190 14 246 190 14 246 190 14
56739-246 190 14 246 190 14 246 190 14 246 190 14
56740-246 190 14 246 190 14 246 190 14 241 196 14
56741-190 146 13 18 14 6 2 2 6 2 2 6
56742- 46 46 46 246 246 246 253 253 253 253 253 253
56743-253 253 253 253 253 253 253 253 253 253 253 253
56744-253 253 253 253 253 253 253 253 253 253 253 253
56745-253 253 253 253 253 253 253 253 253 253 253 253
56746-253 253 253 221 221 221 86 86 86 156 107 11
56747-216 158 10 236 178 12 242 186 14 246 186 14
56748-242 186 14 239 182 13 239 182 13 242 186 14
56749-242 186 14 246 186 14 246 190 14 246 190 14
56750-246 190 14 246 190 14 246 190 14 246 190 14
56751-242 186 14 225 175 15 142 122 72 66 66 66
56752- 30 30 30 10 10 10 0 0 0 0 0 0
56753- 0 0 0 0 0 0 0 0 0 0 0 0
56754- 0 0 0 0 0 0 0 0 0 0 0 0
56755- 0 0 0 0 0 0 0 0 0 6 6 6
56756- 26 26 26 70 70 70 163 133 67 210 150 10
56757-236 178 12 246 190 14 246 190 14 246 190 14
56758-246 190 14 246 190 14 246 190 14 246 190 14
56759-246 190 14 246 190 14 246 190 14 246 190 14
56760-246 190 14 246 190 14 246 190 14 246 190 14
56761-232 195 16 121 92 8 34 34 34 106 106 106
56762-221 221 221 253 253 253 253 253 253 253 253 253
56763-253 253 253 253 253 253 253 253 253 253 253 253
56764-253 253 253 253 253 253 253 253 253 253 253 253
56765-253 253 253 253 253 253 253 253 253 253 253 253
56766-242 242 242 82 82 82 18 14 6 163 110 8
56767-216 158 10 236 178 12 242 186 14 246 190 14
56768-246 190 14 246 190 14 246 190 14 246 190 14
56769-246 190 14 246 190 14 246 190 14 246 190 14
56770-246 190 14 246 190 14 246 190 14 246 190 14
56771-246 190 14 246 190 14 242 186 14 163 133 67
56772- 46 46 46 18 18 18 6 6 6 0 0 0
56773- 0 0 0 0 0 0 0 0 0 0 0 0
56774- 0 0 0 0 0 0 0 0 0 0 0 0
56775- 0 0 0 0 0 0 0 0 0 10 10 10
56776- 30 30 30 78 78 78 163 133 67 210 150 10
56777-236 178 12 246 186 14 246 190 14 246 190 14
56778-246 190 14 246 190 14 246 190 14 246 190 14
56779-246 190 14 246 190 14 246 190 14 246 190 14
56780-246 190 14 246 190 14 246 190 14 246 190 14
56781-241 196 14 215 174 15 190 178 144 253 253 253
56782-253 253 253 253 253 253 253 253 253 253 253 253
56783-253 253 253 253 253 253 253 253 253 253 253 253
56784-253 253 253 253 253 253 253 253 253 253 253 253
56785-253 253 253 253 253 253 253 253 253 218 218 218
56786- 58 58 58 2 2 6 22 18 6 167 114 7
56787-216 158 10 236 178 12 246 186 14 246 190 14
56788-246 190 14 246 190 14 246 190 14 246 190 14
56789-246 190 14 246 190 14 246 190 14 246 190 14
56790-246 190 14 246 190 14 246 190 14 246 190 14
56791-246 190 14 246 186 14 242 186 14 190 150 46
56792- 54 54 54 22 22 22 6 6 6 0 0 0
56793- 0 0 0 0 0 0 0 0 0 0 0 0
56794- 0 0 0 0 0 0 0 0 0 0 0 0
56795- 0 0 0 0 0 0 0 0 0 14 14 14
56796- 38 38 38 86 86 86 180 133 36 213 154 11
56797-236 178 12 246 186 14 246 190 14 246 190 14
56798-246 190 14 246 190 14 246 190 14 246 190 14
56799-246 190 14 246 190 14 246 190 14 246 190 14
56800-246 190 14 246 190 14 246 190 14 246 190 14
56801-246 190 14 232 195 16 190 146 13 214 214 214
56802-253 253 253 253 253 253 253 253 253 253 253 253
56803-253 253 253 253 253 253 253 253 253 253 253 253
56804-253 253 253 253 253 253 253 253 253 253 253 253
56805-253 253 253 250 250 250 170 170 170 26 26 26
56806- 2 2 6 2 2 6 37 26 9 163 110 8
56807-219 162 10 239 182 13 246 186 14 246 190 14
56808-246 190 14 246 190 14 246 190 14 246 190 14
56809-246 190 14 246 190 14 246 190 14 246 190 14
56810-246 190 14 246 190 14 246 190 14 246 190 14
56811-246 186 14 236 178 12 224 166 10 142 122 72
56812- 46 46 46 18 18 18 6 6 6 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 6 6 6 18 18 18
56816- 50 50 50 109 106 95 192 133 9 224 166 10
56817-242 186 14 246 190 14 246 190 14 246 190 14
56818-246 190 14 246 190 14 246 190 14 246 190 14
56819-246 190 14 246 190 14 246 190 14 246 190 14
56820-246 190 14 246 190 14 246 190 14 246 190 14
56821-242 186 14 226 184 13 210 162 10 142 110 46
56822-226 226 226 253 253 253 253 253 253 253 253 253
56823-253 253 253 253 253 253 253 253 253 253 253 253
56824-253 253 253 253 253 253 253 253 253 253 253 253
56825-198 198 198 66 66 66 2 2 6 2 2 6
56826- 2 2 6 2 2 6 50 34 6 156 107 11
56827-219 162 10 239 182 13 246 186 14 246 190 14
56828-246 190 14 246 190 14 246 190 14 246 190 14
56829-246 190 14 246 190 14 246 190 14 246 190 14
56830-246 190 14 246 190 14 246 190 14 242 186 14
56831-234 174 13 213 154 11 154 122 46 66 66 66
56832- 30 30 30 10 10 10 0 0 0 0 0 0
56833- 0 0 0 0 0 0 0 0 0 0 0 0
56834- 0 0 0 0 0 0 0 0 0 0 0 0
56835- 0 0 0 0 0 0 6 6 6 22 22 22
56836- 58 58 58 154 121 60 206 145 10 234 174 13
56837-242 186 14 246 186 14 246 190 14 246 190 14
56838-246 190 14 246 190 14 246 190 14 246 190 14
56839-246 190 14 246 190 14 246 190 14 246 190 14
56840-246 190 14 246 190 14 246 190 14 246 190 14
56841-246 186 14 236 178 12 210 162 10 163 110 8
56842- 61 42 6 138 138 138 218 218 218 250 250 250
56843-253 253 253 253 253 253 253 253 253 250 250 250
56844-242 242 242 210 210 210 144 144 144 66 66 66
56845- 6 6 6 2 2 6 2 2 6 2 2 6
56846- 2 2 6 2 2 6 61 42 6 163 110 8
56847-216 158 10 236 178 12 246 190 14 246 190 14
56848-246 190 14 246 190 14 246 190 14 246 190 14
56849-246 190 14 246 190 14 246 190 14 246 190 14
56850-246 190 14 239 182 13 230 174 11 216 158 10
56851-190 142 34 124 112 88 70 70 70 38 38 38
56852- 18 18 18 6 6 6 0 0 0 0 0 0
56853- 0 0 0 0 0 0 0 0 0 0 0 0
56854- 0 0 0 0 0 0 0 0 0 0 0 0
56855- 0 0 0 0 0 0 6 6 6 22 22 22
56856- 62 62 62 168 124 44 206 145 10 224 166 10
56857-236 178 12 239 182 13 242 186 14 242 186 14
56858-246 186 14 246 190 14 246 190 14 246 190 14
56859-246 190 14 246 190 14 246 190 14 246 190 14
56860-246 190 14 246 190 14 246 190 14 246 190 14
56861-246 190 14 236 178 12 216 158 10 175 118 6
56862- 80 54 7 2 2 6 6 6 6 30 30 30
56863- 54 54 54 62 62 62 50 50 50 38 38 38
56864- 14 14 14 2 2 6 2 2 6 2 2 6
56865- 2 2 6 2 2 6 2 2 6 2 2 6
56866- 2 2 6 6 6 6 80 54 7 167 114 7
56867-213 154 11 236 178 12 246 190 14 246 190 14
56868-246 190 14 246 190 14 246 190 14 246 190 14
56869-246 190 14 242 186 14 239 182 13 239 182 13
56870-230 174 11 210 150 10 174 135 50 124 112 88
56871- 82 82 82 54 54 54 34 34 34 18 18 18
56872- 6 6 6 0 0 0 0 0 0 0 0 0
56873- 0 0 0 0 0 0 0 0 0 0 0 0
56874- 0 0 0 0 0 0 0 0 0 0 0 0
56875- 0 0 0 0 0 0 6 6 6 18 18 18
56876- 50 50 50 158 118 36 192 133 9 200 144 11
56877-216 158 10 219 162 10 224 166 10 226 170 11
56878-230 174 11 236 178 12 239 182 13 239 182 13
56879-242 186 14 246 186 14 246 190 14 246 190 14
56880-246 190 14 246 190 14 246 190 14 246 190 14
56881-246 186 14 230 174 11 210 150 10 163 110 8
56882-104 69 6 10 10 10 2 2 6 2 2 6
56883- 2 2 6 2 2 6 2 2 6 2 2 6
56884- 2 2 6 2 2 6 2 2 6 2 2 6
56885- 2 2 6 2 2 6 2 2 6 2 2 6
56886- 2 2 6 6 6 6 91 60 6 167 114 7
56887-206 145 10 230 174 11 242 186 14 246 190 14
56888-246 190 14 246 190 14 246 186 14 242 186 14
56889-239 182 13 230 174 11 224 166 10 213 154 11
56890-180 133 36 124 112 88 86 86 86 58 58 58
56891- 38 38 38 22 22 22 10 10 10 6 6 6
56892- 0 0 0 0 0 0 0 0 0 0 0 0
56893- 0 0 0 0 0 0 0 0 0 0 0 0
56894- 0 0 0 0 0 0 0 0 0 0 0 0
56895- 0 0 0 0 0 0 0 0 0 14 14 14
56896- 34 34 34 70 70 70 138 110 50 158 118 36
56897-167 114 7 180 123 7 192 133 9 197 138 11
56898-200 144 11 206 145 10 213 154 11 219 162 10
56899-224 166 10 230 174 11 239 182 13 242 186 14
56900-246 186 14 246 186 14 246 186 14 246 186 14
56901-239 182 13 216 158 10 185 133 11 152 99 6
56902-104 69 6 18 14 6 2 2 6 2 2 6
56903- 2 2 6 2 2 6 2 2 6 2 2 6
56904- 2 2 6 2 2 6 2 2 6 2 2 6
56905- 2 2 6 2 2 6 2 2 6 2 2 6
56906- 2 2 6 6 6 6 80 54 7 152 99 6
56907-192 133 9 219 162 10 236 178 12 239 182 13
56908-246 186 14 242 186 14 239 182 13 236 178 12
56909-224 166 10 206 145 10 192 133 9 154 121 60
56910- 94 94 94 62 62 62 42 42 42 22 22 22
56911- 14 14 14 6 6 6 0 0 0 0 0 0
56912- 0 0 0 0 0 0 0 0 0 0 0 0
56913- 0 0 0 0 0 0 0 0 0 0 0 0
56914- 0 0 0 0 0 0 0 0 0 0 0 0
56915- 0 0 0 0 0 0 0 0 0 6 6 6
56916- 18 18 18 34 34 34 58 58 58 78 78 78
56917-101 98 89 124 112 88 142 110 46 156 107 11
56918-163 110 8 167 114 7 175 118 6 180 123 7
56919-185 133 11 197 138 11 210 150 10 219 162 10
56920-226 170 11 236 178 12 236 178 12 234 174 13
56921-219 162 10 197 138 11 163 110 8 130 83 6
56922- 91 60 6 10 10 10 2 2 6 2 2 6
56923- 18 18 18 38 38 38 38 38 38 38 38 38
56924- 38 38 38 38 38 38 38 38 38 38 38 38
56925- 38 38 38 38 38 38 26 26 26 2 2 6
56926- 2 2 6 6 6 6 70 47 6 137 92 6
56927-175 118 6 200 144 11 219 162 10 230 174 11
56928-234 174 13 230 174 11 219 162 10 210 150 10
56929-192 133 9 163 110 8 124 112 88 82 82 82
56930- 50 50 50 30 30 30 14 14 14 6 6 6
56931- 0 0 0 0 0 0 0 0 0 0 0 0
56932- 0 0 0 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 0 0 0 0 0 0 0 0 0 0 0 0
56935- 0 0 0 0 0 0 0 0 0 0 0 0
56936- 6 6 6 14 14 14 22 22 22 34 34 34
56937- 42 42 42 58 58 58 74 74 74 86 86 86
56938-101 98 89 122 102 70 130 98 46 121 87 25
56939-137 92 6 152 99 6 163 110 8 180 123 7
56940-185 133 11 197 138 11 206 145 10 200 144 11
56941-180 123 7 156 107 11 130 83 6 104 69 6
56942- 50 34 6 54 54 54 110 110 110 101 98 89
56943- 86 86 86 82 82 82 78 78 78 78 78 78
56944- 78 78 78 78 78 78 78 78 78 78 78 78
56945- 78 78 78 82 82 82 86 86 86 94 94 94
56946-106 106 106 101 101 101 86 66 34 124 80 6
56947-156 107 11 180 123 7 192 133 9 200 144 11
56948-206 145 10 200 144 11 192 133 9 175 118 6
56949-139 102 15 109 106 95 70 70 70 42 42 42
56950- 22 22 22 10 10 10 0 0 0 0 0 0
56951- 0 0 0 0 0 0 0 0 0 0 0 0
56952- 0 0 0 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 0 0 0
56954- 0 0 0 0 0 0 0 0 0 0 0 0
56955- 0 0 0 0 0 0 0 0 0 0 0 0
56956- 0 0 0 0 0 0 6 6 6 10 10 10
56957- 14 14 14 22 22 22 30 30 30 38 38 38
56958- 50 50 50 62 62 62 74 74 74 90 90 90
56959-101 98 89 112 100 78 121 87 25 124 80 6
56960-137 92 6 152 99 6 152 99 6 152 99 6
56961-138 86 6 124 80 6 98 70 6 86 66 30
56962-101 98 89 82 82 82 58 58 58 46 46 46
56963- 38 38 38 34 34 34 34 34 34 34 34 34
56964- 34 34 34 34 34 34 34 34 34 34 34 34
56965- 34 34 34 34 34 34 38 38 38 42 42 42
56966- 54 54 54 82 82 82 94 86 76 91 60 6
56967-134 86 6 156 107 11 167 114 7 175 118 6
56968-175 118 6 167 114 7 152 99 6 121 87 25
56969-101 98 89 62 62 62 34 34 34 18 18 18
56970- 6 6 6 0 0 0 0 0 0 0 0 0
56971- 0 0 0 0 0 0 0 0 0 0 0 0
56972- 0 0 0 0 0 0 0 0 0 0 0 0
56973- 0 0 0 0 0 0 0 0 0 0 0 0
56974- 0 0 0 0 0 0 0 0 0 0 0 0
56975- 0 0 0 0 0 0 0 0 0 0 0 0
56976- 0 0 0 0 0 0 0 0 0 0 0 0
56977- 0 0 0 6 6 6 6 6 6 10 10 10
56978- 18 18 18 22 22 22 30 30 30 42 42 42
56979- 50 50 50 66 66 66 86 86 86 101 98 89
56980-106 86 58 98 70 6 104 69 6 104 69 6
56981-104 69 6 91 60 6 82 62 34 90 90 90
56982- 62 62 62 38 38 38 22 22 22 14 14 14
56983- 10 10 10 10 10 10 10 10 10 10 10 10
56984- 10 10 10 10 10 10 6 6 6 10 10 10
56985- 10 10 10 10 10 10 10 10 10 14 14 14
56986- 22 22 22 42 42 42 70 70 70 89 81 66
56987- 80 54 7 104 69 6 124 80 6 137 92 6
56988-134 86 6 116 81 8 100 82 52 86 86 86
56989- 58 58 58 30 30 30 14 14 14 6 6 6
56990- 0 0 0 0 0 0 0 0 0 0 0 0
56991- 0 0 0 0 0 0 0 0 0 0 0 0
56992- 0 0 0 0 0 0 0 0 0 0 0 0
56993- 0 0 0 0 0 0 0 0 0 0 0 0
56994- 0 0 0 0 0 0 0 0 0 0 0 0
56995- 0 0 0 0 0 0 0 0 0 0 0 0
56996- 0 0 0 0 0 0 0 0 0 0 0 0
56997- 0 0 0 0 0 0 0 0 0 0 0 0
56998- 0 0 0 6 6 6 10 10 10 14 14 14
56999- 18 18 18 26 26 26 38 38 38 54 54 54
57000- 70 70 70 86 86 86 94 86 76 89 81 66
57001- 89 81 66 86 86 86 74 74 74 50 50 50
57002- 30 30 30 14 14 14 6 6 6 0 0 0
57003- 0 0 0 0 0 0 0 0 0 0 0 0
57004- 0 0 0 0 0 0 0 0 0 0 0 0
57005- 0 0 0 0 0 0 0 0 0 0 0 0
57006- 6 6 6 18 18 18 34 34 34 58 58 58
57007- 82 82 82 89 81 66 89 81 66 89 81 66
57008- 94 86 66 94 86 76 74 74 74 50 50 50
57009- 26 26 26 14 14 14 6 6 6 0 0 0
57010- 0 0 0 0 0 0 0 0 0 0 0 0
57011- 0 0 0 0 0 0 0 0 0 0 0 0
57012- 0 0 0 0 0 0 0 0 0 0 0 0
57013- 0 0 0 0 0 0 0 0 0 0 0 0
57014- 0 0 0 0 0 0 0 0 0 0 0 0
57015- 0 0 0 0 0 0 0 0 0 0 0 0
57016- 0 0 0 0 0 0 0 0 0 0 0 0
57017- 0 0 0 0 0 0 0 0 0 0 0 0
57018- 0 0 0 0 0 0 0 0 0 0 0 0
57019- 6 6 6 6 6 6 14 14 14 18 18 18
57020- 30 30 30 38 38 38 46 46 46 54 54 54
57021- 50 50 50 42 42 42 30 30 30 18 18 18
57022- 10 10 10 0 0 0 0 0 0 0 0 0
57023- 0 0 0 0 0 0 0 0 0 0 0 0
57024- 0 0 0 0 0 0 0 0 0 0 0 0
57025- 0 0 0 0 0 0 0 0 0 0 0 0
57026- 0 0 0 6 6 6 14 14 14 26 26 26
57027- 38 38 38 50 50 50 58 58 58 58 58 58
57028- 54 54 54 42 42 42 30 30 30 18 18 18
57029- 10 10 10 0 0 0 0 0 0 0 0 0
57030- 0 0 0 0 0 0 0 0 0 0 0 0
57031- 0 0 0 0 0 0 0 0 0 0 0 0
57032- 0 0 0 0 0 0 0 0 0 0 0 0
57033- 0 0 0 0 0 0 0 0 0 0 0 0
57034- 0 0 0 0 0 0 0 0 0 0 0 0
57035- 0 0 0 0 0 0 0 0 0 0 0 0
57036- 0 0 0 0 0 0 0 0 0 0 0 0
57037- 0 0 0 0 0 0 0 0 0 0 0 0
57038- 0 0 0 0 0 0 0 0 0 0 0 0
57039- 0 0 0 0 0 0 0 0 0 6 6 6
57040- 6 6 6 10 10 10 14 14 14 18 18 18
57041- 18 18 18 14 14 14 10 10 10 6 6 6
57042- 0 0 0 0 0 0 0 0 0 0 0 0
57043- 0 0 0 0 0 0 0 0 0 0 0 0
57044- 0 0 0 0 0 0 0 0 0 0 0 0
57045- 0 0 0 0 0 0 0 0 0 0 0 0
57046- 0 0 0 0 0 0 0 0 0 6 6 6
57047- 14 14 14 18 18 18 22 22 22 22 22 22
57048- 18 18 18 14 14 14 10 10 10 6 6 6
57049- 0 0 0 0 0 0 0 0 0 0 0 0
57050- 0 0 0 0 0 0 0 0 0 0 0 0
57051- 0 0 0 0 0 0 0 0 0 0 0 0
57052- 0 0 0 0 0 0 0 0 0 0 0 0
57053- 0 0 0 0 0 0 0 0 0 0 0 0
57054+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57055+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57056+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57057+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57058+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57059+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57060+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57061+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57062+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57063+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57065+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57066+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57070+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57071+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57072+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57073+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57074+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57075+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57076+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57077+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57078+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57079+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57080+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57081+4 4 4 4 4 4
57082+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57083+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57086+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57087+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57088+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57089+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57090+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57091+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57092+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57093+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57094+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57095+4 4 4 4 4 4
57096+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57097+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57100+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57101+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57102+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57103+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57104+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57105+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57106+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57107+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57108+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57109+4 4 4 4 4 4
57110+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57111+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57113+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57114+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57115+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57116+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57117+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57118+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57119+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57120+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57121+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57122+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57123+4 4 4 4 4 4
57124+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57125+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57126+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57127+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57128+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57129+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57130+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57131+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57132+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57133+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57134+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57135+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57136+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57137+4 4 4 4 4 4
57138+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57139+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57140+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57141+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57142+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
57143+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
57144+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57145+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57146+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57147+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
57148+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57149+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
57150+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57151+4 4 4 4 4 4
57152+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57153+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57154+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57155+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57156+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
57157+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
57158+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57159+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57160+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57161+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
57162+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
57163+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
57164+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57165+4 4 4 4 4 4
57166+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57167+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57168+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57169+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57170+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
57171+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
57172+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57173+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57174+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57175+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
57176+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
57177+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
57178+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
57179+4 4 4 4 4 4
57180+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57181+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57182+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57183+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
57184+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
57185+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
57186+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
57187+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57188+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57189+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
57190+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
57191+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
57192+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
57193+4 4 4 4 4 4
57194+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57195+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57196+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57197+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
57198+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
57199+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
57200+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
57201+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57202+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
57203+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
57204+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
57205+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
57206+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
57207+4 4 4 4 4 4
57208+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57209+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57210+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57211+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
57212+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
57213+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
57214+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
57215+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57216+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
57217+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
57218+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
57219+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
57220+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
57221+4 4 4 4 4 4
57222+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57223+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57224+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
57225+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
57226+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
57227+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
57228+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
57229+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
57230+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
57231+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
57232+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
57233+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
57234+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
57235+4 4 4 4 4 4
57236+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57237+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57238+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
57239+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
57240+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
57241+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
57242+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
57243+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
57244+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
57245+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
57246+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
57247+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
57248+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
57249+4 4 4 4 4 4
57250+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57251+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57252+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57253+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57254+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57255+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57256+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57257+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57258+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57259+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57260+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57261+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57262+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57263+4 4 4 4 4 4
57264+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57265+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57266+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57267+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57268+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57269+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57270+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57271+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57272+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57273+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
57274+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
57275+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
57276+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
57277+4 4 4 4 4 4
57278+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57279+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
57280+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
57281+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
57282+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
57283+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
57284+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
57285+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
57286+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
57287+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
57288+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
57289+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
57290+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
57291+4 4 4 4 4 4
57292+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57293+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
57294+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
57295+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
57296+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57297+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
57298+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
57299+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
57300+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
57301+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
57302+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
57303+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
57304+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
57305+0 0 0 4 4 4
57306+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57307+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
57308+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
57309+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
57310+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
57311+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
57312+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
57313+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
57314+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
57315+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
57316+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
57317+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
57318+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
57319+2 0 0 0 0 0
57320+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
57321+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
57322+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
57323+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
57324+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
57325+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
57326+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
57327+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
57328+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
57329+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
57330+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
57331+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
57332+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
57333+37 38 37 0 0 0
57334+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57335+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
57336+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
57337+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
57338+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
57339+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
57340+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
57341+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
57342+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
57343+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
57344+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
57345+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
57346+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
57347+85 115 134 4 0 0
57348+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
57349+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
57350+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
57351+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
57352+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
57353+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
57354+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
57355+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
57356+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
57357+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
57358+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
57359+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
57360+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
57361+60 73 81 4 0 0
57362+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
57363+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
57364+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
57365+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
57366+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
57367+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
57368+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
57369+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
57370+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
57371+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
57372+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
57373+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
57374+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
57375+16 19 21 4 0 0
57376+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
57377+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
57378+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
57379+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
57380+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
57381+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
57382+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
57383+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
57384+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
57385+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
57386+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
57387+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
57388+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
57389+4 0 0 4 3 3
57390+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
57391+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
57392+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
57393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
57394+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
57395+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
57396+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
57397+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
57398+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
57399+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
57400+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
57401+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
57402+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
57403+3 2 2 4 4 4
57404+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
57405+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
57406+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
57407+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57408+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
57409+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
57410+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
57411+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
57412+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
57413+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
57414+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
57415+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
57416+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
57417+4 4 4 4 4 4
57418+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
57419+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
57420+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
57421+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
57422+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
57423+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
57424+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
57425+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
57426+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
57427+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
57428+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
57429+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
57430+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
57431+4 4 4 4 4 4
57432+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
57433+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
57434+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
57435+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
57436+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
57437+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57438+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
57439+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
57440+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
57441+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
57442+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
57443+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
57444+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
57445+5 5 5 5 5 5
57446+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
57447+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
57448+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
57449+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
57450+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
57451+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57452+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
57453+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
57454+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
57455+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
57456+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
57457+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
57458+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57459+5 5 5 4 4 4
57460+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
57461+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
57462+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
57463+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
57464+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57465+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
57466+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
57467+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
57468+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
57469+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
57470+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
57471+4 0 0 4 0 0 5 5 5 5 5 5 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+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
57475+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
57476+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
57477+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
57478+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
57479+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57480+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57481+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
57482+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
57483+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
57484+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
57485+3 3 3 5 5 5 6 6 6 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 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
57489+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
57490+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
57491+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
57492+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57493+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
57494+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
57495+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
57496+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
57497+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
57498+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 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+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
57503+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
57504+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
57505+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
57506+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57507+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57508+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57509+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
57510+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
57511+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
57512+6 6 6 4 0 0 4 0 0 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 41 54 63 156 155 156 158 157 158 153 152 153
57517+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
57518+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
57519+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
57520+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57521+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
57522+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57523+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
57524+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
57525+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
57526+4 0 0 4 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+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
57531+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
57532+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
57533+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
57534+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57535+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
57536+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
57537+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
57538+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
57539+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
57540+6 6 6 4 0 0 6 6 6 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 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
57545+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
57546+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
57547+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
57548+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57549+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
57550+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
57551+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
57552+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
57553+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
57554+4 0 0 3 2 2 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+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
57559+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
57560+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
57561+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57562+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
57563+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
57564+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
57565+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
57566+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
57567+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
57568+4 0 0 4 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 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
57573+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
57574+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
57575+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57576+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57577+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
57578+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
57579+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
57580+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
57581+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
57582+4 0 0 4 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+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
57587+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
57588+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57589+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57590+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57591+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
57592+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
57593+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
57594+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
57595+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
57596+4 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+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
57601+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
57602+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57603+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57604+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57605+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
57606+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
57607+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
57608+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57609+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57610+0 0 0 3 3 3 5 5 5 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+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57615+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
57616+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57617+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
57618+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
57619+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
57620+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
57621+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
57622+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57623+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57624+0 0 0 3 3 3 5 5 5 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 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57629+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
57630+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57631+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
57632+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57633+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
57634+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
57635+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
57636+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57637+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57638+0 0 0 3 3 3 5 5 5 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+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
57643+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
57644+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57645+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
57646+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
57647+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
57648+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
57649+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
57650+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57651+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57652+0 0 0 3 3 3 5 5 5 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 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
57657+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
57658+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57659+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
57660+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
57661+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
57662+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
57663+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
57664+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57665+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57666+0 0 0 3 3 3 5 5 5 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+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57671+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
57672+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57673+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
57674+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
57675+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
57676+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
57677+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
57678+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57679+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57680+0 0 0 3 3 3 5 5 5 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+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
57685+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
57686+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57687+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
57688+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
57689+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
57690+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
57691+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
57692+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
57693+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57694+0 0 0 3 3 3 5 5 5 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 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57699+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
57700+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
57701+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
57702+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
57703+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
57704+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
57705+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
57706+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57707+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57708+0 0 0 3 3 3 5 5 5 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+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57713+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
57714+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57715+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
57716+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
57717+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
57718+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
57719+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
57720+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57721+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57722+0 0 0 3 3 3 5 5 5 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 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57727+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
57728+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
57729+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
57730+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
57731+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
57732+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57733+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
57734+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57735+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57736+0 0 0 3 3 3 5 5 5 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 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57741+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
57742+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
57743+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57744+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
57745+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
57746+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57747+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
57748+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57749+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57750+0 0 0 3 3 3 5 5 5 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 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57755+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
57756+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
57757+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
57758+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
57759+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
57760+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
57761+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
57762+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
57763+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57764+0 0 0 3 3 3 5 5 5 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 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57769+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
57770+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
57771+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
57772+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
57773+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
57774+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
57775+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
57776+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
57777+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57778+0 0 0 3 3 3 5 5 5 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 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
57783+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
57784+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
57785+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
57786+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57787+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
57788+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
57789+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
57790+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
57791+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57792+0 0 0 3 3 3 5 5 5 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 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57797+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
57798+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
57799+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
57800+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
57801+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
57802+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
57803+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
57804+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
57805+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57806+0 0 0 3 3 3 5 5 5 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 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
57811+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
57812+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
57813+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
57814+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
57815+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
57816+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
57817+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
57818+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
57819+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
57820+0 0 0 3 3 3 5 5 5 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 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
57825+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57826+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
57827+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
57828+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
57829+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
57830+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
57831+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
57832+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
57833+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
57834+0 0 0 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+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
57839+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57840+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
57841+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
57842+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
57843+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
57844+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57845+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
57846+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
57847+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
57848+4 3 3 5 5 5 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 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
57853+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
57854+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
57855+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
57856+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
57857+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
57858+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
57859+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
57860+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
57861+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
57862+5 5 5 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+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
57867+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
57868+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57869+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
57870+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
57871+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
57872+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
57873+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
57874+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
57875+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
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 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57881+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
57882+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
57883+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
57884+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
57885+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
57886+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
57887+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
57888+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
57889+13 16 17 4 0 0 4 0 0 4 3 3 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+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
57895+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
57896+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
57897+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
57898+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
57899+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
57900+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
57901+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
57902+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
57903+4 0 0 4 0 0 5 5 5 5 5 5 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+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
57909+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
57910+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
57911+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
57912+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
57913+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
57914+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
57915+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
57916+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57917+4 3 3 5 5 5 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 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
57923+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57924+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
57925+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57926+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
57927+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
57928+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
57929+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
57930+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
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+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
57937+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
57938+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
57939+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
57940+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
57941+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
57942+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
57943+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
57944+4 0 0 4 0 0 4 0 0 6 6 6 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
57950+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57951+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
57952+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
57953+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
57954+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
57955+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
57956+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
57957+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
57958+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57959+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57960+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57961+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57962+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57963+4 4 4 4 4 4
57964+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
57965+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
57966+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57967+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
57968+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
57969+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
57970+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
57971+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
57972+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57973+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57974+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57975+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57976+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57977+4 4 4 4 4 4
57978+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57979+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
57980+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
57981+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
57982+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
57983+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
57984+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
57985+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57986+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57987+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57988+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57989+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57990+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57991+4 4 4 4 4 4
57992+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57993+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
57994+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57995+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
57996+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
57997+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
57998+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
57999+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
58000+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58001+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58002+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58003+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58004+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58005+4 4 4 4 4 4
58006+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58007+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
58008+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
58009+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
58010+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
58011+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
58012+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
58013+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
58014+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58015+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58016+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58017+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58018+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58019+4 4 4 4 4 4
58020+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58021+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58022+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
58023+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58024+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
58025+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
58026+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
58027+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58028+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58029+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58030+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58031+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58032+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58033+4 4 4 4 4 4
58034+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58035+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58036+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58037+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
58038+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
58039+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
58040+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
58041+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58043+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58044+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58045+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58046+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58047+4 4 4 4 4 4
58048+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58049+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58050+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58051+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58052+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
58053+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
58054+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
58055+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58056+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58057+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58058+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58059+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58060+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58061+4 4 4 4 4 4
58062+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58063+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58065+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58066+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
58067+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
58068+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
58069+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58070+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58071+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58072+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58073+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58074+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58075+4 4 4 4 4 4
58076+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58077+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58078+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58079+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
58080+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58081+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58082+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
58083+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58086+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58087+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58088+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58089+4 4 4 4 4 4
58090+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58091+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58092+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58093+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
58094+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
58095+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
58096+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
58097+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58100+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58101+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58102+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58103+4 4 4 4 4 4
58104+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58105+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58106+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58107+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58108+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
58109+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58110+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58111+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58113+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58114+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58115+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58116+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58117+4 4 4 4 4 4
58118+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58119+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58120+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58121+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58122+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
58123+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
58124+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58125+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58126+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58127+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58128+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58129+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58130+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58131+4 4 4 4 4 4
58132+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58133+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58134+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58135+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58136+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
58137+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
58138+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58139+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58140+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58141+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58142+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58143+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58144+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58145+4 4 4 4 4 4
58146+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58147+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58148+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58149+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58150+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
58151+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
58152+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58153+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58154+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58155+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58156+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58157+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58158+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58159+4 4 4 4 4 4
58160+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58161+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58162+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58163+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58164+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
58165+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
58166+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58167+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58168+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58169+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58170+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58171+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58172+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58173+4 4 4 4 4 4
58174diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
58175index fef20db..d28b1ab 100644
58176--- a/drivers/xen/xenfs/xenstored.c
58177+++ b/drivers/xen/xenfs/xenstored.c
58178@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
58179 static int xsd_kva_open(struct inode *inode, struct file *file)
58180 {
58181 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
58182+#ifdef CONFIG_GRKERNSEC_HIDESYM
58183+ NULL);
58184+#else
58185 xen_store_interface);
58186+#endif
58187+
58188 if (!file->private_data)
58189 return -ENOMEM;
58190 return 0;
58191diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
58192index eb14e05..5156de7 100644
58193--- a/fs/9p/vfs_addr.c
58194+++ b/fs/9p/vfs_addr.c
58195@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
58196
58197 retval = v9fs_file_write_internal(inode,
58198 v9inode->writeback_fid,
58199- (__force const char __user *)buffer,
58200+ (const char __force_user *)buffer,
58201 len, &offset, 0);
58202 if (retval > 0)
58203 retval = 0;
58204diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
58205index 296482f..183ddc3 100644
58206--- a/fs/9p/vfs_inode.c
58207+++ b/fs/9p/vfs_inode.c
58208@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58209 void
58210 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58211 {
58212- char *s = nd_get_link(nd);
58213+ const char *s = nd_get_link(nd);
58214
58215 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
58216 dentry, IS_ERR(s) ? "<error>" : s);
58217diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
58218index 370b24c..ff0be7b 100644
58219--- a/fs/Kconfig.binfmt
58220+++ b/fs/Kconfig.binfmt
58221@@ -103,7 +103,7 @@ config HAVE_AOUT
58222
58223 config BINFMT_AOUT
58224 tristate "Kernel support for a.out and ECOFF binaries"
58225- depends on HAVE_AOUT
58226+ depends on HAVE_AOUT && BROKEN
58227 ---help---
58228 A.out (Assembler.OUTput) is a set of formats for libraries and
58229 executables used in the earliest versions of UNIX. Linux used
58230diff --git a/fs/afs/inode.c b/fs/afs/inode.c
58231index 2946712..f737435 100644
58232--- a/fs/afs/inode.c
58233+++ b/fs/afs/inode.c
58234@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58235 struct afs_vnode *vnode;
58236 struct super_block *sb;
58237 struct inode *inode;
58238- static atomic_t afs_autocell_ino;
58239+ static atomic_unchecked_t afs_autocell_ino;
58240
58241 _enter("{%x:%u},%*.*s,",
58242 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
58243@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58244 data.fid.unique = 0;
58245 data.fid.vnode = 0;
58246
58247- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
58248+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
58249 afs_iget5_autocell_test, afs_iget5_set,
58250 &data);
58251 if (!inode) {
58252diff --git a/fs/aio.c b/fs/aio.c
58253index 14b9315..365980f 100644
58254--- a/fs/aio.c
58255+++ b/fs/aio.c
58256@@ -388,7 +388,7 @@ static int aio_setup_ring(struct kioctx *ctx)
58257 size += sizeof(struct io_event) * nr_events;
58258
58259 nr_pages = PFN_UP(size);
58260- if (nr_pages < 0)
58261+ if (nr_pages <= 0)
58262 return -EINVAL;
58263
58264 file = aio_private_file(ctx, nr_pages);
58265diff --git a/fs/attr.c b/fs/attr.c
58266index 6530ced..4a827e2 100644
58267--- a/fs/attr.c
58268+++ b/fs/attr.c
58269@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
58270 unsigned long limit;
58271
58272 limit = rlimit(RLIMIT_FSIZE);
58273+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
58274 if (limit != RLIM_INFINITY && offset > limit)
58275 goto out_sig;
58276 if (offset > inode->i_sb->s_maxbytes)
58277diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
58278index 116fd38..c04182da 100644
58279--- a/fs/autofs4/waitq.c
58280+++ b/fs/autofs4/waitq.c
58281@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
58282 {
58283 unsigned long sigpipe, flags;
58284 mm_segment_t fs;
58285- const char *data = (const char *)addr;
58286+ const char __user *data = (const char __force_user *)addr;
58287 ssize_t wr = 0;
58288
58289 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
58290@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
58291 return 1;
58292 }
58293
58294+#ifdef CONFIG_GRKERNSEC_HIDESYM
58295+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
58296+#endif
58297+
58298 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58299 enum autofs_notify notify)
58300 {
58301@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58302
58303 /* If this is a direct mount request create a dummy name */
58304 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
58305+#ifdef CONFIG_GRKERNSEC_HIDESYM
58306+ /* this name does get written to userland via autofs4_write() */
58307+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
58308+#else
58309 qstr.len = sprintf(name, "%p", dentry);
58310+#endif
58311 else {
58312 qstr.len = autofs4_getpath(sbi, dentry, &name);
58313 if (!qstr.len) {
58314diff --git a/fs/befs/endian.h b/fs/befs/endian.h
58315index 2722387..56059b5 100644
58316--- a/fs/befs/endian.h
58317+++ b/fs/befs/endian.h
58318@@ -11,7 +11,7 @@
58319
58320 #include <asm/byteorder.h>
58321
58322-static inline u64
58323+static inline u64 __intentional_overflow(-1)
58324 fs64_to_cpu(const struct super_block *sb, fs64 n)
58325 {
58326 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58327@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
58328 return (__force fs64)cpu_to_be64(n);
58329 }
58330
58331-static inline u32
58332+static inline u32 __intentional_overflow(-1)
58333 fs32_to_cpu(const struct super_block *sb, fs32 n)
58334 {
58335 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58336@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
58337 return (__force fs32)cpu_to_be32(n);
58338 }
58339
58340-static inline u16
58341+static inline u16 __intentional_overflow(-1)
58342 fs16_to_cpu(const struct super_block *sb, fs16 n)
58343 {
58344 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58345diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
58346index 929dec0..84bd914 100644
58347--- a/fs/binfmt_aout.c
58348+++ b/fs/binfmt_aout.c
58349@@ -16,6 +16,7 @@
58350 #include <linux/string.h>
58351 #include <linux/fs.h>
58352 #include <linux/file.h>
58353+#include <linux/security.h>
58354 #include <linux/stat.h>
58355 #include <linux/fcntl.h>
58356 #include <linux/ptrace.h>
58357@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
58358 #endif
58359 # define START_STACK(u) ((void __user *)u.start_stack)
58360
58361+ memset(&dump, 0, sizeof(dump));
58362+
58363 fs = get_fs();
58364 set_fs(KERNEL_DS);
58365 has_dumped = 1;
58366@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
58367
58368 /* If the size of the dump file exceeds the rlimit, then see what would happen
58369 if we wrote the stack, but not the data area. */
58370+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
58371 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
58372 dump.u_dsize = 0;
58373
58374 /* Make sure we have enough room to write the stack and data areas. */
58375+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
58376 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
58377 dump.u_ssize = 0;
58378
58379@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
58380 rlim = rlimit(RLIMIT_DATA);
58381 if (rlim >= RLIM_INFINITY)
58382 rlim = ~0;
58383+
58384+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
58385 if (ex.a_data + ex.a_bss > rlim)
58386 return -ENOMEM;
58387
58388@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
58389
58390 install_exec_creds(bprm);
58391
58392+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58393+ current->mm->pax_flags = 0UL;
58394+#endif
58395+
58396+#ifdef CONFIG_PAX_PAGEEXEC
58397+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
58398+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
58399+
58400+#ifdef CONFIG_PAX_EMUTRAMP
58401+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
58402+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
58403+#endif
58404+
58405+#ifdef CONFIG_PAX_MPROTECT
58406+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
58407+ current->mm->pax_flags |= MF_PAX_MPROTECT;
58408+#endif
58409+
58410+ }
58411+#endif
58412+
58413 if (N_MAGIC(ex) == OMAGIC) {
58414 unsigned long text_addr, map_size;
58415 loff_t pos;
58416@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
58417 return error;
58418
58419 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
58420- PROT_READ | PROT_WRITE | PROT_EXEC,
58421+ PROT_READ | PROT_WRITE,
58422 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
58423 fd_offset + ex.a_text);
58424 if (error != N_DATADDR(ex))
58425diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
58426index d8fc060..cbd44d5 100644
58427--- a/fs/binfmt_elf.c
58428+++ b/fs/binfmt_elf.c
58429@@ -34,6 +34,7 @@
58430 #include <linux/utsname.h>
58431 #include <linux/coredump.h>
58432 #include <linux/sched.h>
58433+#include <linux/xattr.h>
58434 #include <asm/uaccess.h>
58435 #include <asm/param.h>
58436 #include <asm/page.h>
58437@@ -47,7 +48,7 @@
58438
58439 static int load_elf_binary(struct linux_binprm *bprm);
58440 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
58441- int, int, unsigned long);
58442+ int, int, unsigned long) __intentional_overflow(-1);
58443
58444 #ifdef CONFIG_USELIB
58445 static int load_elf_library(struct file *);
58446@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
58447 #define elf_core_dump NULL
58448 #endif
58449
58450+#ifdef CONFIG_PAX_MPROTECT
58451+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
58452+#endif
58453+
58454+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58455+static void elf_handle_mmap(struct file *file);
58456+#endif
58457+
58458 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
58459 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
58460 #else
58461@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
58462 .load_binary = load_elf_binary,
58463 .load_shlib = load_elf_library,
58464 .core_dump = elf_core_dump,
58465+
58466+#ifdef CONFIG_PAX_MPROTECT
58467+ .handle_mprotect= elf_handle_mprotect,
58468+#endif
58469+
58470+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58471+ .handle_mmap = elf_handle_mmap,
58472+#endif
58473+
58474 .min_coredump = ELF_EXEC_PAGESIZE,
58475 };
58476
58477@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
58478
58479 static int set_brk(unsigned long start, unsigned long end)
58480 {
58481+ unsigned long e = end;
58482+
58483 start = ELF_PAGEALIGN(start);
58484 end = ELF_PAGEALIGN(end);
58485 if (end > start) {
58486@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
58487 if (BAD_ADDR(addr))
58488 return addr;
58489 }
58490- current->mm->start_brk = current->mm->brk = end;
58491+ current->mm->start_brk = current->mm->brk = e;
58492 return 0;
58493 }
58494
58495@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58496 elf_addr_t __user *u_rand_bytes;
58497 const char *k_platform = ELF_PLATFORM;
58498 const char *k_base_platform = ELF_BASE_PLATFORM;
58499- unsigned char k_rand_bytes[16];
58500+ u32 k_rand_bytes[4];
58501 int items;
58502 elf_addr_t *elf_info;
58503 int ei_index = 0;
58504 const struct cred *cred = current_cred();
58505 struct vm_area_struct *vma;
58506+ unsigned long saved_auxv[AT_VECTOR_SIZE];
58507
58508 /*
58509 * In some cases (e.g. Hyper-Threading), we want to avoid L1
58510@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58511 * Generate 16 random bytes for userspace PRNG seeding.
58512 */
58513 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
58514- u_rand_bytes = (elf_addr_t __user *)
58515- STACK_ALLOC(p, sizeof(k_rand_bytes));
58516+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
58517+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
58518+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
58519+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
58520+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
58521+ u_rand_bytes = (elf_addr_t __user *) p;
58522 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
58523 return -EFAULT;
58524
58525@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58526 return -EFAULT;
58527 current->mm->env_end = p;
58528
58529+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
58530+
58531 /* Put the elf_info on the stack in the right place. */
58532 sp = (elf_addr_t __user *)envp + 1;
58533- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
58534+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
58535 return -EFAULT;
58536 return 0;
58537 }
58538@@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
58539 an ELF header */
58540
58541 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58542- struct file *interpreter, unsigned long *interp_map_addr,
58543- unsigned long no_base)
58544+ struct file *interpreter, unsigned long no_base)
58545 {
58546 struct elf_phdr *elf_phdata;
58547 struct elf_phdr *eppnt;
58548- unsigned long load_addr = 0;
58549+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
58550 int load_addr_set = 0;
58551 unsigned long last_bss = 0, elf_bss = 0;
58552- unsigned long error = ~0UL;
58553+ unsigned long error = -EINVAL;
58554 unsigned long total_size;
58555 int retval, i, size;
58556
58557@@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58558 goto out_close;
58559 }
58560
58561+#ifdef CONFIG_PAX_SEGMEXEC
58562+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
58563+ pax_task_size = SEGMEXEC_TASK_SIZE;
58564+#endif
58565+
58566 eppnt = elf_phdata;
58567 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
58568 if (eppnt->p_type == PT_LOAD) {
58569@@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58570 map_addr = elf_map(interpreter, load_addr + vaddr,
58571 eppnt, elf_prot, elf_type, total_size);
58572 total_size = 0;
58573- if (!*interp_map_addr)
58574- *interp_map_addr = map_addr;
58575 error = map_addr;
58576 if (BAD_ADDR(map_addr))
58577 goto out_close;
58578@@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58579 k = load_addr + eppnt->p_vaddr;
58580 if (BAD_ADDR(k) ||
58581 eppnt->p_filesz > eppnt->p_memsz ||
58582- eppnt->p_memsz > TASK_SIZE ||
58583- TASK_SIZE - eppnt->p_memsz < k) {
58584+ eppnt->p_memsz > pax_task_size ||
58585+ pax_task_size - eppnt->p_memsz < k) {
58586 error = -ENOMEM;
58587 goto out_close;
58588 }
58589@@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58590 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
58591
58592 /* Map the last of the bss segment */
58593- error = vm_brk(elf_bss, last_bss - elf_bss);
58594- if (BAD_ADDR(error))
58595- goto out_close;
58596+ if (last_bss > elf_bss) {
58597+ error = vm_brk(elf_bss, last_bss - elf_bss);
58598+ if (BAD_ADDR(error))
58599+ goto out_close;
58600+ }
58601 }
58602
58603 error = load_addr;
58604@@ -543,6 +574,336 @@ out:
58605 return error;
58606 }
58607
58608+#ifdef CONFIG_PAX_PT_PAX_FLAGS
58609+#ifdef CONFIG_PAX_SOFTMODE
58610+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
58611+{
58612+ unsigned long pax_flags = 0UL;
58613+
58614+#ifdef CONFIG_PAX_PAGEEXEC
58615+ if (elf_phdata->p_flags & PF_PAGEEXEC)
58616+ pax_flags |= MF_PAX_PAGEEXEC;
58617+#endif
58618+
58619+#ifdef CONFIG_PAX_SEGMEXEC
58620+ if (elf_phdata->p_flags & PF_SEGMEXEC)
58621+ pax_flags |= MF_PAX_SEGMEXEC;
58622+#endif
58623+
58624+#ifdef CONFIG_PAX_EMUTRAMP
58625+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58626+ pax_flags |= MF_PAX_EMUTRAMP;
58627+#endif
58628+
58629+#ifdef CONFIG_PAX_MPROTECT
58630+ if (elf_phdata->p_flags & PF_MPROTECT)
58631+ pax_flags |= MF_PAX_MPROTECT;
58632+#endif
58633+
58634+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58635+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
58636+ pax_flags |= MF_PAX_RANDMMAP;
58637+#endif
58638+
58639+ return pax_flags;
58640+}
58641+#endif
58642+
58643+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
58644+{
58645+ unsigned long pax_flags = 0UL;
58646+
58647+#ifdef CONFIG_PAX_PAGEEXEC
58648+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
58649+ pax_flags |= MF_PAX_PAGEEXEC;
58650+#endif
58651+
58652+#ifdef CONFIG_PAX_SEGMEXEC
58653+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
58654+ pax_flags |= MF_PAX_SEGMEXEC;
58655+#endif
58656+
58657+#ifdef CONFIG_PAX_EMUTRAMP
58658+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
58659+ pax_flags |= MF_PAX_EMUTRAMP;
58660+#endif
58661+
58662+#ifdef CONFIG_PAX_MPROTECT
58663+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
58664+ pax_flags |= MF_PAX_MPROTECT;
58665+#endif
58666+
58667+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58668+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
58669+ pax_flags |= MF_PAX_RANDMMAP;
58670+#endif
58671+
58672+ return pax_flags;
58673+}
58674+#endif
58675+
58676+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58677+#ifdef CONFIG_PAX_SOFTMODE
58678+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
58679+{
58680+ unsigned long pax_flags = 0UL;
58681+
58682+#ifdef CONFIG_PAX_PAGEEXEC
58683+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
58684+ pax_flags |= MF_PAX_PAGEEXEC;
58685+#endif
58686+
58687+#ifdef CONFIG_PAX_SEGMEXEC
58688+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
58689+ pax_flags |= MF_PAX_SEGMEXEC;
58690+#endif
58691+
58692+#ifdef CONFIG_PAX_EMUTRAMP
58693+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58694+ pax_flags |= MF_PAX_EMUTRAMP;
58695+#endif
58696+
58697+#ifdef CONFIG_PAX_MPROTECT
58698+ if (pax_flags_softmode & MF_PAX_MPROTECT)
58699+ pax_flags |= MF_PAX_MPROTECT;
58700+#endif
58701+
58702+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58703+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
58704+ pax_flags |= MF_PAX_RANDMMAP;
58705+#endif
58706+
58707+ return pax_flags;
58708+}
58709+#endif
58710+
58711+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
58712+{
58713+ unsigned long pax_flags = 0UL;
58714+
58715+#ifdef CONFIG_PAX_PAGEEXEC
58716+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
58717+ pax_flags |= MF_PAX_PAGEEXEC;
58718+#endif
58719+
58720+#ifdef CONFIG_PAX_SEGMEXEC
58721+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
58722+ pax_flags |= MF_PAX_SEGMEXEC;
58723+#endif
58724+
58725+#ifdef CONFIG_PAX_EMUTRAMP
58726+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
58727+ pax_flags |= MF_PAX_EMUTRAMP;
58728+#endif
58729+
58730+#ifdef CONFIG_PAX_MPROTECT
58731+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
58732+ pax_flags |= MF_PAX_MPROTECT;
58733+#endif
58734+
58735+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58736+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
58737+ pax_flags |= MF_PAX_RANDMMAP;
58738+#endif
58739+
58740+ return pax_flags;
58741+}
58742+#endif
58743+
58744+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58745+static unsigned long pax_parse_defaults(void)
58746+{
58747+ unsigned long pax_flags = 0UL;
58748+
58749+#ifdef CONFIG_PAX_SOFTMODE
58750+ if (pax_softmode)
58751+ return pax_flags;
58752+#endif
58753+
58754+#ifdef CONFIG_PAX_PAGEEXEC
58755+ pax_flags |= MF_PAX_PAGEEXEC;
58756+#endif
58757+
58758+#ifdef CONFIG_PAX_SEGMEXEC
58759+ pax_flags |= MF_PAX_SEGMEXEC;
58760+#endif
58761+
58762+#ifdef CONFIG_PAX_MPROTECT
58763+ pax_flags |= MF_PAX_MPROTECT;
58764+#endif
58765+
58766+#ifdef CONFIG_PAX_RANDMMAP
58767+ if (randomize_va_space)
58768+ pax_flags |= MF_PAX_RANDMMAP;
58769+#endif
58770+
58771+ return pax_flags;
58772+}
58773+
58774+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
58775+{
58776+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
58777+
58778+#ifdef CONFIG_PAX_EI_PAX
58779+
58780+#ifdef CONFIG_PAX_SOFTMODE
58781+ if (pax_softmode)
58782+ return pax_flags;
58783+#endif
58784+
58785+ pax_flags = 0UL;
58786+
58787+#ifdef CONFIG_PAX_PAGEEXEC
58788+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
58789+ pax_flags |= MF_PAX_PAGEEXEC;
58790+#endif
58791+
58792+#ifdef CONFIG_PAX_SEGMEXEC
58793+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
58794+ pax_flags |= MF_PAX_SEGMEXEC;
58795+#endif
58796+
58797+#ifdef CONFIG_PAX_EMUTRAMP
58798+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
58799+ pax_flags |= MF_PAX_EMUTRAMP;
58800+#endif
58801+
58802+#ifdef CONFIG_PAX_MPROTECT
58803+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
58804+ pax_flags |= MF_PAX_MPROTECT;
58805+#endif
58806+
58807+#ifdef CONFIG_PAX_ASLR
58808+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
58809+ pax_flags |= MF_PAX_RANDMMAP;
58810+#endif
58811+
58812+#endif
58813+
58814+ return pax_flags;
58815+
58816+}
58817+
58818+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
58819+{
58820+
58821+#ifdef CONFIG_PAX_PT_PAX_FLAGS
58822+ unsigned long i;
58823+
58824+ for (i = 0UL; i < elf_ex->e_phnum; i++)
58825+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
58826+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
58827+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
58828+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
58829+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
58830+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
58831+ return PAX_PARSE_FLAGS_FALLBACK;
58832+
58833+#ifdef CONFIG_PAX_SOFTMODE
58834+ if (pax_softmode)
58835+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
58836+ else
58837+#endif
58838+
58839+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
58840+ break;
58841+ }
58842+#endif
58843+
58844+ return PAX_PARSE_FLAGS_FALLBACK;
58845+}
58846+
58847+static unsigned long pax_parse_xattr_pax(struct file * const file)
58848+{
58849+
58850+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58851+ ssize_t xattr_size, i;
58852+ unsigned char xattr_value[sizeof("pemrs") - 1];
58853+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
58854+
58855+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
58856+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
58857+ return PAX_PARSE_FLAGS_FALLBACK;
58858+
58859+ for (i = 0; i < xattr_size; i++)
58860+ switch (xattr_value[i]) {
58861+ default:
58862+ return PAX_PARSE_FLAGS_FALLBACK;
58863+
58864+#define parse_flag(option1, option2, flag) \
58865+ case option1: \
58866+ if (pax_flags_hardmode & MF_PAX_##flag) \
58867+ return PAX_PARSE_FLAGS_FALLBACK;\
58868+ pax_flags_hardmode |= MF_PAX_##flag; \
58869+ break; \
58870+ case option2: \
58871+ if (pax_flags_softmode & MF_PAX_##flag) \
58872+ return PAX_PARSE_FLAGS_FALLBACK;\
58873+ pax_flags_softmode |= MF_PAX_##flag; \
58874+ break;
58875+
58876+ parse_flag('p', 'P', PAGEEXEC);
58877+ parse_flag('e', 'E', EMUTRAMP);
58878+ parse_flag('m', 'M', MPROTECT);
58879+ parse_flag('r', 'R', RANDMMAP);
58880+ parse_flag('s', 'S', SEGMEXEC);
58881+
58882+#undef parse_flag
58883+ }
58884+
58885+ if (pax_flags_hardmode & pax_flags_softmode)
58886+ return PAX_PARSE_FLAGS_FALLBACK;
58887+
58888+#ifdef CONFIG_PAX_SOFTMODE
58889+ if (pax_softmode)
58890+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
58891+ else
58892+#endif
58893+
58894+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
58895+#else
58896+ return PAX_PARSE_FLAGS_FALLBACK;
58897+#endif
58898+
58899+}
58900+
58901+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
58902+{
58903+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
58904+
58905+ pax_flags = pax_parse_defaults();
58906+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
58907+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
58908+ xattr_pax_flags = pax_parse_xattr_pax(file);
58909+
58910+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58911+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58912+ pt_pax_flags != xattr_pax_flags)
58913+ return -EINVAL;
58914+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58915+ pax_flags = xattr_pax_flags;
58916+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58917+ pax_flags = pt_pax_flags;
58918+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58919+ pax_flags = ei_pax_flags;
58920+
58921+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
58922+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58923+ if ((__supported_pte_mask & _PAGE_NX))
58924+ pax_flags &= ~MF_PAX_SEGMEXEC;
58925+ else
58926+ pax_flags &= ~MF_PAX_PAGEEXEC;
58927+ }
58928+#endif
58929+
58930+ if (0 > pax_check_flags(&pax_flags))
58931+ return -EINVAL;
58932+
58933+ current->mm->pax_flags = pax_flags;
58934+ return 0;
58935+}
58936+#endif
58937+
58938 /*
58939 * These are the functions used to load ELF style executables and shared
58940 * libraries. There is no binary dependent code anywhere else.
58941@@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
58942 {
58943 unsigned int random_variable = 0;
58944
58945+#ifdef CONFIG_PAX_RANDUSTACK
58946+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
58947+ return stack_top - current->mm->delta_stack;
58948+#endif
58949+
58950 if ((current->flags & PF_RANDOMIZE) &&
58951 !(current->personality & ADDR_NO_RANDOMIZE)) {
58952 random_variable = get_random_int() & STACK_RND_MASK;
58953@@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58954 unsigned long load_addr = 0, load_bias = 0;
58955 int load_addr_set = 0;
58956 char * elf_interpreter = NULL;
58957- unsigned long error;
58958+ unsigned long error = 0;
58959 struct elf_phdr *elf_ppnt, *elf_phdata;
58960 unsigned long elf_bss, elf_brk;
58961 int retval, i;
58962@@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58963 struct elfhdr elf_ex;
58964 struct elfhdr interp_elf_ex;
58965 } *loc;
58966+ unsigned long pax_task_size;
58967
58968 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
58969 if (!loc) {
58970@@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
58971 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
58972 may depend on the personality. */
58973 SET_PERSONALITY(loc->elf_ex);
58974+
58975+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58976+ current->mm->pax_flags = 0UL;
58977+#endif
58978+
58979+#ifdef CONFIG_PAX_DLRESOLVE
58980+ current->mm->call_dl_resolve = 0UL;
58981+#endif
58982+
58983+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
58984+ current->mm->call_syscall = 0UL;
58985+#endif
58986+
58987+#ifdef CONFIG_PAX_ASLR
58988+ current->mm->delta_mmap = 0UL;
58989+ current->mm->delta_stack = 0UL;
58990+#endif
58991+
58992+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58993+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
58994+ send_sig(SIGKILL, current, 0);
58995+ goto out_free_dentry;
58996+ }
58997+#endif
58998+
58999+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
59000+ pax_set_initial_flags(bprm);
59001+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
59002+ if (pax_set_initial_flags_func)
59003+ (pax_set_initial_flags_func)(bprm);
59004+#endif
59005+
59006+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
59007+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
59008+ current->mm->context.user_cs_limit = PAGE_SIZE;
59009+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
59010+ }
59011+#endif
59012+
59013+#ifdef CONFIG_PAX_SEGMEXEC
59014+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
59015+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
59016+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
59017+ pax_task_size = SEGMEXEC_TASK_SIZE;
59018+ current->mm->def_flags |= VM_NOHUGEPAGE;
59019+ } else
59020+#endif
59021+
59022+ pax_task_size = TASK_SIZE;
59023+
59024+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
59025+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59026+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
59027+ put_cpu();
59028+ }
59029+#endif
59030+
59031+#ifdef CONFIG_PAX_ASLR
59032+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59033+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
59034+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
59035+ }
59036+#endif
59037+
59038+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
59039+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59040+ executable_stack = EXSTACK_DISABLE_X;
59041+ current->personality &= ~READ_IMPLIES_EXEC;
59042+ } else
59043+#endif
59044+
59045 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
59046 current->personality |= READ_IMPLIES_EXEC;
59047
59048@@ -811,6 +1249,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
59049 #else
59050 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
59051 #endif
59052+
59053+#ifdef CONFIG_PAX_RANDMMAP
59054+ /* PaX: randomize base address at the default exe base if requested */
59055+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
59056+#ifdef CONFIG_SPARC64
59057+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
59058+#else
59059+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
59060+#endif
59061+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
59062+ elf_flags |= MAP_FIXED;
59063+ }
59064+#endif
59065+
59066 }
59067
59068 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
59069@@ -842,9 +1294,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
59070 * allowed task size. Note that p_filesz must always be
59071 * <= p_memsz so it is only necessary to check p_memsz.
59072 */
59073- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59074- elf_ppnt->p_memsz > TASK_SIZE ||
59075- TASK_SIZE - elf_ppnt->p_memsz < k) {
59076+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59077+ elf_ppnt->p_memsz > pax_task_size ||
59078+ pax_task_size - elf_ppnt->p_memsz < k) {
59079 /* set_brk can never work. Avoid overflows. */
59080 retval = -EINVAL;
59081 goto out_free_dentry;
59082@@ -880,16 +1332,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
59083 if (retval)
59084 goto out_free_dentry;
59085 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
59086- retval = -EFAULT; /* Nobody gets to see this, but.. */
59087- goto out_free_dentry;
59088+ /*
59089+ * This bss-zeroing can fail if the ELF
59090+ * file specifies odd protections. So
59091+ * we don't check the return value
59092+ */
59093 }
59094
59095+#ifdef CONFIG_PAX_RANDMMAP
59096+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59097+ unsigned long start, size, flags;
59098+ vm_flags_t vm_flags;
59099+
59100+ start = ELF_PAGEALIGN(elf_brk);
59101+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
59102+ flags = MAP_FIXED | MAP_PRIVATE;
59103+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
59104+
59105+ down_write(&current->mm->mmap_sem);
59106+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
59107+ retval = -ENOMEM;
59108+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
59109+// if (current->personality & ADDR_NO_RANDOMIZE)
59110+// vm_flags |= VM_READ | VM_MAYREAD;
59111+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
59112+ retval = IS_ERR_VALUE(start) ? start : 0;
59113+ }
59114+ up_write(&current->mm->mmap_sem);
59115+ if (retval == 0)
59116+ retval = set_brk(start + size, start + size + PAGE_SIZE);
59117+ if (retval < 0)
59118+ goto out_free_dentry;
59119+ }
59120+#endif
59121+
59122 if (elf_interpreter) {
59123- unsigned long interp_map_addr = 0;
59124-
59125 elf_entry = load_elf_interp(&loc->interp_elf_ex,
59126 interpreter,
59127- &interp_map_addr,
59128 load_bias);
59129 if (!IS_ERR((void *)elf_entry)) {
59130 /*
59131@@ -1115,7 +1594,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
59132 * Decide what to dump of a segment, part, all or none.
59133 */
59134 static unsigned long vma_dump_size(struct vm_area_struct *vma,
59135- unsigned long mm_flags)
59136+ unsigned long mm_flags, long signr)
59137 {
59138 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
59139
59140@@ -1153,7 +1632,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
59141 if (vma->vm_file == NULL)
59142 return 0;
59143
59144- if (FILTER(MAPPED_PRIVATE))
59145+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
59146 goto whole;
59147
59148 /*
59149@@ -1360,9 +1839,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
59150 {
59151 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
59152 int i = 0;
59153- do
59154+ do {
59155 i += 2;
59156- while (auxv[i - 2] != AT_NULL);
59157+ } while (auxv[i - 2] != AT_NULL);
59158 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
59159 }
59160
59161@@ -1371,7 +1850,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
59162 {
59163 mm_segment_t old_fs = get_fs();
59164 set_fs(KERNEL_DS);
59165- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
59166+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
59167 set_fs(old_fs);
59168 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
59169 }
59170@@ -1995,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
59171 }
59172
59173 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
59174- unsigned long mm_flags)
59175+ struct coredump_params *cprm)
59176 {
59177 struct vm_area_struct *vma;
59178 size_t size = 0;
59179
59180 for (vma = first_vma(current, gate_vma); vma != NULL;
59181 vma = next_vma(vma, gate_vma))
59182- size += vma_dump_size(vma, mm_flags);
59183+ size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59184 return size;
59185 }
59186
59187@@ -2093,7 +2572,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59188
59189 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
59190
59191- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
59192+ offset += elf_core_vma_data_size(gate_vma, cprm);
59193 offset += elf_core_extra_data_size();
59194 e_shoff = offset;
59195
59196@@ -2121,7 +2600,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59197 phdr.p_offset = offset;
59198 phdr.p_vaddr = vma->vm_start;
59199 phdr.p_paddr = 0;
59200- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
59201+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59202 phdr.p_memsz = vma->vm_end - vma->vm_start;
59203 offset += phdr.p_filesz;
59204 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
59205@@ -2154,7 +2633,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59206 unsigned long addr;
59207 unsigned long end;
59208
59209- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
59210+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59211
59212 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
59213 struct page *page;
59214@@ -2195,6 +2674,167 @@ out:
59215
59216 #endif /* CONFIG_ELF_CORE */
59217
59218+#ifdef CONFIG_PAX_MPROTECT
59219+/* PaX: non-PIC ELF libraries need relocations on their executable segments
59220+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
59221+ * we'll remove VM_MAYWRITE for good on RELRO segments.
59222+ *
59223+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
59224+ * basis because we want to allow the common case and not the special ones.
59225+ */
59226+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
59227+{
59228+ struct elfhdr elf_h;
59229+ struct elf_phdr elf_p;
59230+ unsigned long i;
59231+ unsigned long oldflags;
59232+ bool is_textrel_rw, is_textrel_rx, is_relro;
59233+
59234+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
59235+ return;
59236+
59237+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
59238+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
59239+
59240+#ifdef CONFIG_PAX_ELFRELOCS
59241+ /* possible TEXTREL */
59242+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
59243+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
59244+#else
59245+ is_textrel_rw = false;
59246+ is_textrel_rx = false;
59247+#endif
59248+
59249+ /* possible RELRO */
59250+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59251+
59252+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59253+ return;
59254+
59255+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59256+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59257+
59258+#ifdef CONFIG_PAX_ETEXECRELOCS
59259+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59260+#else
59261+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59262+#endif
59263+
59264+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59265+ !elf_check_arch(&elf_h) ||
59266+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59267+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59268+ return;
59269+
59270+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59271+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59272+ return;
59273+ switch (elf_p.p_type) {
59274+ case PT_DYNAMIC:
59275+ if (!is_textrel_rw && !is_textrel_rx)
59276+ continue;
59277+ i = 0UL;
59278+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
59279+ elf_dyn dyn;
59280+
59281+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
59282+ break;
59283+ if (dyn.d_tag == DT_NULL)
59284+ break;
59285+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
59286+ gr_log_textrel(vma);
59287+ if (is_textrel_rw)
59288+ vma->vm_flags |= VM_MAYWRITE;
59289+ else
59290+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
59291+ vma->vm_flags &= ~VM_MAYWRITE;
59292+ break;
59293+ }
59294+ i++;
59295+ }
59296+ is_textrel_rw = false;
59297+ is_textrel_rx = false;
59298+ continue;
59299+
59300+ case PT_GNU_RELRO:
59301+ if (!is_relro)
59302+ continue;
59303+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
59304+ vma->vm_flags &= ~VM_MAYWRITE;
59305+ is_relro = false;
59306+ continue;
59307+
59308+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59309+ case PT_PAX_FLAGS: {
59310+ const char *msg_mprotect = "", *msg_emutramp = "";
59311+ char *buffer_lib, *buffer_exe;
59312+
59313+ if (elf_p.p_flags & PF_NOMPROTECT)
59314+ msg_mprotect = "MPROTECT disabled";
59315+
59316+#ifdef CONFIG_PAX_EMUTRAMP
59317+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
59318+ msg_emutramp = "EMUTRAMP enabled";
59319+#endif
59320+
59321+ if (!msg_mprotect[0] && !msg_emutramp[0])
59322+ continue;
59323+
59324+ if (!printk_ratelimit())
59325+ continue;
59326+
59327+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
59328+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
59329+ if (buffer_lib && buffer_exe) {
59330+ char *path_lib, *path_exe;
59331+
59332+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
59333+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
59334+
59335+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
59336+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
59337+
59338+ }
59339+ free_page((unsigned long)buffer_exe);
59340+ free_page((unsigned long)buffer_lib);
59341+ continue;
59342+ }
59343+#endif
59344+
59345+ }
59346+ }
59347+}
59348+#endif
59349+
59350+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59351+
59352+extern int grsec_enable_log_rwxmaps;
59353+
59354+static void elf_handle_mmap(struct file *file)
59355+{
59356+ struct elfhdr elf_h;
59357+ struct elf_phdr elf_p;
59358+ unsigned long i;
59359+
59360+ if (!grsec_enable_log_rwxmaps)
59361+ return;
59362+
59363+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59364+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59365+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
59366+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59367+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59368+ return;
59369+
59370+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59371+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59372+ return;
59373+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
59374+ gr_log_ptgnustack(file);
59375+ }
59376+}
59377+#endif
59378+
59379 static int __init init_elf_binfmt(void)
59380 {
59381 register_binfmt(&elf_format);
59382diff --git a/fs/block_dev.c b/fs/block_dev.c
59383index 1d9c9f3..2905786 100644
59384--- a/fs/block_dev.c
59385+++ b/fs/block_dev.c
59386@@ -697,7 +697,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
59387 else if (bdev->bd_contains == bdev)
59388 return true; /* is a whole device which isn't held */
59389
59390- else if (whole->bd_holder == bd_may_claim)
59391+ else if (whole->bd_holder == (void *)bd_may_claim)
59392 return true; /* is a partition of a device that is being partitioned */
59393 else if (whole->bd_holder != NULL)
59394 return false; /* is a partition of a held device */
59395diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
59396index 150822e..75bb326 100644
59397--- a/fs/btrfs/ctree.c
59398+++ b/fs/btrfs/ctree.c
59399@@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
59400 free_extent_buffer(buf);
59401 add_root_to_dirty_list(root);
59402 } else {
59403- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
59404- parent_start = parent->start;
59405- else
59406+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
59407+ if (parent)
59408+ parent_start = parent->start;
59409+ else
59410+ parent_start = 0;
59411+ } else
59412 parent_start = 0;
59413
59414 WARN_ON(trans->transid != btrfs_header_generation(parent));
59415diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
59416index de4e70f..b41dc45 100644
59417--- a/fs/btrfs/delayed-inode.c
59418+++ b/fs/btrfs/delayed-inode.c
59419@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
59420
59421 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
59422 {
59423- int seq = atomic_inc_return(&delayed_root->items_seq);
59424+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
59425 if ((atomic_dec_return(&delayed_root->items) <
59426 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
59427 waitqueue_active(&delayed_root->wait))
59428@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
59429
59430 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
59431 {
59432- int val = atomic_read(&delayed_root->items_seq);
59433+ int val = atomic_read_unchecked(&delayed_root->items_seq);
59434
59435 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
59436 return 1;
59437@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
59438 int seq;
59439 int ret;
59440
59441- seq = atomic_read(&delayed_root->items_seq);
59442+ seq = atomic_read_unchecked(&delayed_root->items_seq);
59443
59444 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
59445 if (ret)
59446diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
59447index f70119f..ab5894d 100644
59448--- a/fs/btrfs/delayed-inode.h
59449+++ b/fs/btrfs/delayed-inode.h
59450@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
59451 */
59452 struct list_head prepare_list;
59453 atomic_t items; /* for delayed items */
59454- atomic_t items_seq; /* for delayed items */
59455+ atomic_unchecked_t items_seq; /* for delayed items */
59456 int nodes; /* for delayed nodes */
59457 wait_queue_head_t wait;
59458 };
59459@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
59460 struct btrfs_delayed_root *delayed_root)
59461 {
59462 atomic_set(&delayed_root->items, 0);
59463- atomic_set(&delayed_root->items_seq, 0);
59464+ atomic_set_unchecked(&delayed_root->items_seq, 0);
59465 delayed_root->nodes = 0;
59466 spin_lock_init(&delayed_root->lock);
59467 init_waitqueue_head(&delayed_root->wait);
59468diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
59469index 4399f0c..a34d8b4 100644
59470--- a/fs/btrfs/ioctl.c
59471+++ b/fs/btrfs/ioctl.c
59472@@ -3953,9 +3953,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59473 for (i = 0; i < num_types; i++) {
59474 struct btrfs_space_info *tmp;
59475
59476+ /* Don't copy in more than we allocated */
59477 if (!slot_count)
59478 break;
59479
59480+ slot_count--;
59481+
59482 info = NULL;
59483 rcu_read_lock();
59484 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
59485@@ -3977,10 +3980,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59486 memcpy(dest, &space, sizeof(space));
59487 dest++;
59488 space_args.total_spaces++;
59489- slot_count--;
59490 }
59491- if (!slot_count)
59492- break;
59493 }
59494 up_read(&info->groups_sem);
59495 }
59496diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
59497index cde9c03..ad4d4db 100644
59498--- a/fs/btrfs/super.c
59499+++ b/fs/btrfs/super.c
59500@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
59501 function, line, errstr);
59502 return;
59503 }
59504- ACCESS_ONCE(trans->transaction->aborted) = errno;
59505+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
59506 /* Wake up anybody who may be waiting on this transaction */
59507 wake_up(&root->fs_info->transaction_wait);
59508 wake_up(&root->fs_info->transaction_blocked_wait);
59509diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
59510index b2e7bb4..3719201 100644
59511--- a/fs/btrfs/sysfs.c
59512+++ b/fs/btrfs/sysfs.c
59513@@ -480,7 +480,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
59514 for (set = 0; set < FEAT_MAX; set++) {
59515 int i;
59516 struct attribute *attrs[2];
59517- struct attribute_group agroup = {
59518+ attribute_group_no_const agroup = {
59519 .name = "features",
59520 .attrs = attrs,
59521 };
59522diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
59523index 2299bfd..4098e72 100644
59524--- a/fs/btrfs/tests/free-space-tests.c
59525+++ b/fs/btrfs/tests/free-space-tests.c
59526@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59527 * extent entry.
59528 */
59529 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
59530- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59531+ pax_open_kernel();
59532+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59533+ pax_close_kernel();
59534
59535 /*
59536 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
59537@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59538 if (ret)
59539 return ret;
59540
59541- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59542+ pax_open_kernel();
59543+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59544+ pax_close_kernel();
59545 __btrfs_remove_free_space_cache(cache->free_space_ctl);
59546
59547 return 0;
59548diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
59549index 154990c..d0cf699 100644
59550--- a/fs/btrfs/tree-log.h
59551+++ b/fs/btrfs/tree-log.h
59552@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
59553 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
59554 struct btrfs_trans_handle *trans)
59555 {
59556- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
59557+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
59558 }
59559
59560 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
59561diff --git a/fs/buffer.c b/fs/buffer.c
59562index 20805db..2e8fc69 100644
59563--- a/fs/buffer.c
59564+++ b/fs/buffer.c
59565@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
59566 bh_cachep = kmem_cache_create("buffer_head",
59567 sizeof(struct buffer_head), 0,
59568 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
59569- SLAB_MEM_SPREAD),
59570+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
59571 NULL);
59572
59573 /*
59574diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
59575index fbb08e9..0fda764 100644
59576--- a/fs/cachefiles/bind.c
59577+++ b/fs/cachefiles/bind.c
59578@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
59579 args);
59580
59581 /* start by checking things over */
59582- ASSERT(cache->fstop_percent >= 0 &&
59583- cache->fstop_percent < cache->fcull_percent &&
59584+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
59585 cache->fcull_percent < cache->frun_percent &&
59586 cache->frun_percent < 100);
59587
59588- ASSERT(cache->bstop_percent >= 0 &&
59589- cache->bstop_percent < cache->bcull_percent &&
59590+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
59591 cache->bcull_percent < cache->brun_percent &&
59592 cache->brun_percent < 100);
59593
59594diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
59595index ce1b115..4a6852c 100644
59596--- a/fs/cachefiles/daemon.c
59597+++ b/fs/cachefiles/daemon.c
59598@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
59599 if (n > buflen)
59600 return -EMSGSIZE;
59601
59602- if (copy_to_user(_buffer, buffer, n) != 0)
59603+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
59604 return -EFAULT;
59605
59606 return n;
59607@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
59608 if (test_bit(CACHEFILES_DEAD, &cache->flags))
59609 return -EIO;
59610
59611- if (datalen < 0 || datalen > PAGE_SIZE - 1)
59612+ if (datalen > PAGE_SIZE - 1)
59613 return -EOPNOTSUPP;
59614
59615 /* drag the command string into the kernel so we can parse it */
59616@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
59617 if (args[0] != '%' || args[1] != '\0')
59618 return -EINVAL;
59619
59620- if (fstop < 0 || fstop >= cache->fcull_percent)
59621+ if (fstop >= cache->fcull_percent)
59622 return cachefiles_daemon_range_error(cache, args);
59623
59624 cache->fstop_percent = fstop;
59625@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
59626 if (args[0] != '%' || args[1] != '\0')
59627 return -EINVAL;
59628
59629- if (bstop < 0 || bstop >= cache->bcull_percent)
59630+ if (bstop >= cache->bcull_percent)
59631 return cachefiles_daemon_range_error(cache, args);
59632
59633 cache->bstop_percent = bstop;
59634diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
59635index 8c52472..c4e3a69 100644
59636--- a/fs/cachefiles/internal.h
59637+++ b/fs/cachefiles/internal.h
59638@@ -66,7 +66,7 @@ struct cachefiles_cache {
59639 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
59640 struct rb_root active_nodes; /* active nodes (can't be culled) */
59641 rwlock_t active_lock; /* lock for active_nodes */
59642- atomic_t gravecounter; /* graveyard uniquifier */
59643+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
59644 unsigned frun_percent; /* when to stop culling (% files) */
59645 unsigned fcull_percent; /* when to start culling (% files) */
59646 unsigned fstop_percent; /* when to stop allocating (% files) */
59647@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
59648 * proc.c
59649 */
59650 #ifdef CONFIG_CACHEFILES_HISTOGRAM
59651-extern atomic_t cachefiles_lookup_histogram[HZ];
59652-extern atomic_t cachefiles_mkdir_histogram[HZ];
59653-extern atomic_t cachefiles_create_histogram[HZ];
59654+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59655+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59656+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
59657
59658 extern int __init cachefiles_proc_init(void);
59659 extern void cachefiles_proc_cleanup(void);
59660 static inline
59661-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
59662+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
59663 {
59664 unsigned long jif = jiffies - start_jif;
59665 if (jif >= HZ)
59666 jif = HZ - 1;
59667- atomic_inc(&histogram[jif]);
59668+ atomic_inc_unchecked(&histogram[jif]);
59669 }
59670
59671 #else
59672diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
59673index e12f189..ed17244 100644
59674--- a/fs/cachefiles/namei.c
59675+++ b/fs/cachefiles/namei.c
59676@@ -312,7 +312,7 @@ try_again:
59677 /* first step is to make up a grave dentry in the graveyard */
59678 sprintf(nbuffer, "%08x%08x",
59679 (uint32_t) get_seconds(),
59680- (uint32_t) atomic_inc_return(&cache->gravecounter));
59681+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
59682
59683 /* do the multiway lock magic */
59684 trap = lock_rename(cache->graveyard, dir);
59685diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
59686index eccd339..4c1d995 100644
59687--- a/fs/cachefiles/proc.c
59688+++ b/fs/cachefiles/proc.c
59689@@ -14,9 +14,9 @@
59690 #include <linux/seq_file.h>
59691 #include "internal.h"
59692
59693-atomic_t cachefiles_lookup_histogram[HZ];
59694-atomic_t cachefiles_mkdir_histogram[HZ];
59695-atomic_t cachefiles_create_histogram[HZ];
59696+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59697+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59698+atomic_unchecked_t cachefiles_create_histogram[HZ];
59699
59700 /*
59701 * display the latency histogram
59702@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
59703 return 0;
59704 default:
59705 index = (unsigned long) v - 3;
59706- x = atomic_read(&cachefiles_lookup_histogram[index]);
59707- y = atomic_read(&cachefiles_mkdir_histogram[index]);
59708- z = atomic_read(&cachefiles_create_histogram[index]);
59709+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
59710+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
59711+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
59712 if (x == 0 && y == 0 && z == 0)
59713 return 0;
59714
59715diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
59716index 695e788..f4a9d4d 100644
59717--- a/fs/ceph/dir.c
59718+++ b/fs/ceph/dir.c
59719@@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
59720 struct dentry *dentry, *last;
59721 struct ceph_dentry_info *di;
59722 int err = 0;
59723+ char d_name[DNAME_INLINE_LEN];
59724+ const unsigned char *name;
59725
59726 /* claim ref on last dentry we returned */
59727 last = fi->dentry;
59728@@ -192,7 +194,12 @@ more:
59729
59730 dout(" %llu (%llu) dentry %p %.*s %p\n", di->offset, ctx->pos,
59731 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
59732- if (!dir_emit(ctx, dentry->d_name.name,
59733+ name = dentry->d_name.name;
59734+ if (name == dentry->d_iname) {
59735+ memcpy(d_name, name, dentry->d_name.len);
59736+ name = d_name;
59737+ }
59738+ if (!dir_emit(ctx, name,
59739 dentry->d_name.len,
59740 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
59741 dentry->d_inode->i_mode >> 12)) {
59742@@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
59743 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
59744 struct ceph_mds_client *mdsc = fsc->mdsc;
59745 unsigned frag = fpos_frag(ctx->pos);
59746- int off = fpos_off(ctx->pos);
59747+ unsigned int off = fpos_off(ctx->pos);
59748 int err;
59749 u32 ftype;
59750 struct ceph_mds_reply_info_parsed *rinfo;
59751diff --git a/fs/ceph/super.c b/fs/ceph/super.c
59752index f6e1237..796ffd1 100644
59753--- a/fs/ceph/super.c
59754+++ b/fs/ceph/super.c
59755@@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
59756 /*
59757 * construct our own bdi so we can control readahead, etc.
59758 */
59759-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
59760+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
59761
59762 static int ceph_register_bdi(struct super_block *sb,
59763 struct ceph_fs_client *fsc)
59764@@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
59765 default_backing_dev_info.ra_pages;
59766
59767 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
59768- atomic_long_inc_return(&bdi_seq));
59769+ atomic_long_inc_return_unchecked(&bdi_seq));
59770 if (!err)
59771 sb->s_bdi = &fsc->backing_dev_info;
59772 return err;
59773diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
59774index 44ec726..bcb06a3 100644
59775--- a/fs/cifs/cifs_debug.c
59776+++ b/fs/cifs/cifs_debug.c
59777@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59778
59779 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
59780 #ifdef CONFIG_CIFS_STATS2
59781- atomic_set(&totBufAllocCount, 0);
59782- atomic_set(&totSmBufAllocCount, 0);
59783+ atomic_set_unchecked(&totBufAllocCount, 0);
59784+ atomic_set_unchecked(&totSmBufAllocCount, 0);
59785 #endif /* CONFIG_CIFS_STATS2 */
59786 spin_lock(&cifs_tcp_ses_lock);
59787 list_for_each(tmp1, &cifs_tcp_ses_list) {
59788@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59789 tcon = list_entry(tmp3,
59790 struct cifs_tcon,
59791 tcon_list);
59792- atomic_set(&tcon->num_smbs_sent, 0);
59793+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
59794 if (server->ops->clear_stats)
59795 server->ops->clear_stats(tcon);
59796 }
59797@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59798 smBufAllocCount.counter, cifs_min_small);
59799 #ifdef CONFIG_CIFS_STATS2
59800 seq_printf(m, "Total Large %d Small %d Allocations\n",
59801- atomic_read(&totBufAllocCount),
59802- atomic_read(&totSmBufAllocCount));
59803+ atomic_read_unchecked(&totBufAllocCount),
59804+ atomic_read_unchecked(&totSmBufAllocCount));
59805 #endif /* CONFIG_CIFS_STATS2 */
59806
59807 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
59808@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59809 if (tcon->need_reconnect)
59810 seq_puts(m, "\tDISCONNECTED ");
59811 seq_printf(m, "\nSMBs: %d",
59812- atomic_read(&tcon->num_smbs_sent));
59813+ atomic_read_unchecked(&tcon->num_smbs_sent));
59814 if (server->ops->print_stats)
59815 server->ops->print_stats(m, tcon);
59816 }
59817diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
59818index 9d7996e..35ad5cf4 100644
59819--- a/fs/cifs/cifsfs.c
59820+++ b/fs/cifs/cifsfs.c
59821@@ -1093,7 +1093,7 @@ cifs_init_request_bufs(void)
59822 */
59823 cifs_req_cachep = kmem_cache_create("cifs_request",
59824 CIFSMaxBufSize + max_hdr_size, 0,
59825- SLAB_HWCACHE_ALIGN, NULL);
59826+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
59827 if (cifs_req_cachep == NULL)
59828 return -ENOMEM;
59829
59830@@ -1120,7 +1120,7 @@ cifs_init_request_bufs(void)
59831 efficient to alloc 1 per page off the slab compared to 17K (5page)
59832 alloc of large cifs buffers even when page debugging is on */
59833 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
59834- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
59835+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
59836 NULL);
59837 if (cifs_sm_req_cachep == NULL) {
59838 mempool_destroy(cifs_req_poolp);
59839@@ -1205,8 +1205,8 @@ init_cifs(void)
59840 atomic_set(&bufAllocCount, 0);
59841 atomic_set(&smBufAllocCount, 0);
59842 #ifdef CONFIG_CIFS_STATS2
59843- atomic_set(&totBufAllocCount, 0);
59844- atomic_set(&totSmBufAllocCount, 0);
59845+ atomic_set_unchecked(&totBufAllocCount, 0);
59846+ atomic_set_unchecked(&totSmBufAllocCount, 0);
59847 #endif /* CONFIG_CIFS_STATS2 */
59848
59849 atomic_set(&midCount, 0);
59850diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
59851index 02a33e5..3a28b5a 100644
59852--- a/fs/cifs/cifsglob.h
59853+++ b/fs/cifs/cifsglob.h
59854@@ -823,35 +823,35 @@ struct cifs_tcon {
59855 __u16 Flags; /* optional support bits */
59856 enum statusEnum tidStatus;
59857 #ifdef CONFIG_CIFS_STATS
59858- atomic_t num_smbs_sent;
59859+ atomic_unchecked_t num_smbs_sent;
59860 union {
59861 struct {
59862- atomic_t num_writes;
59863- atomic_t num_reads;
59864- atomic_t num_flushes;
59865- atomic_t num_oplock_brks;
59866- atomic_t num_opens;
59867- atomic_t num_closes;
59868- atomic_t num_deletes;
59869- atomic_t num_mkdirs;
59870- atomic_t num_posixopens;
59871- atomic_t num_posixmkdirs;
59872- atomic_t num_rmdirs;
59873- atomic_t num_renames;
59874- atomic_t num_t2renames;
59875- atomic_t num_ffirst;
59876- atomic_t num_fnext;
59877- atomic_t num_fclose;
59878- atomic_t num_hardlinks;
59879- atomic_t num_symlinks;
59880- atomic_t num_locks;
59881- atomic_t num_acl_get;
59882- atomic_t num_acl_set;
59883+ atomic_unchecked_t num_writes;
59884+ atomic_unchecked_t num_reads;
59885+ atomic_unchecked_t num_flushes;
59886+ atomic_unchecked_t num_oplock_brks;
59887+ atomic_unchecked_t num_opens;
59888+ atomic_unchecked_t num_closes;
59889+ atomic_unchecked_t num_deletes;
59890+ atomic_unchecked_t num_mkdirs;
59891+ atomic_unchecked_t num_posixopens;
59892+ atomic_unchecked_t num_posixmkdirs;
59893+ atomic_unchecked_t num_rmdirs;
59894+ atomic_unchecked_t num_renames;
59895+ atomic_unchecked_t num_t2renames;
59896+ atomic_unchecked_t num_ffirst;
59897+ atomic_unchecked_t num_fnext;
59898+ atomic_unchecked_t num_fclose;
59899+ atomic_unchecked_t num_hardlinks;
59900+ atomic_unchecked_t num_symlinks;
59901+ atomic_unchecked_t num_locks;
59902+ atomic_unchecked_t num_acl_get;
59903+ atomic_unchecked_t num_acl_set;
59904 } cifs_stats;
59905 #ifdef CONFIG_CIFS_SMB2
59906 struct {
59907- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59908- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59909+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59910+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59911 } smb2_stats;
59912 #endif /* CONFIG_CIFS_SMB2 */
59913 } stats;
59914@@ -1192,7 +1192,7 @@ convert_delimiter(char *path, char delim)
59915 }
59916
59917 #ifdef CONFIG_CIFS_STATS
59918-#define cifs_stats_inc atomic_inc
59919+#define cifs_stats_inc atomic_inc_unchecked
59920
59921 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
59922 unsigned int bytes)
59923@@ -1559,8 +1559,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
59924 /* Various Debug counters */
59925 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
59926 #ifdef CONFIG_CIFS_STATS2
59927-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
59928-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
59929+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
59930+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
59931 #endif
59932 GLOBAL_EXTERN atomic_t smBufAllocCount;
59933 GLOBAL_EXTERN atomic_t midCount;
59934diff --git a/fs/cifs/file.c b/fs/cifs/file.c
59935index 3e4d00a..38a122d 100644
59936--- a/fs/cifs/file.c
59937+++ b/fs/cifs/file.c
59938@@ -2056,10 +2056,14 @@ static int cifs_writepages(struct address_space *mapping,
59939 index = mapping->writeback_index; /* Start from prev offset */
59940 end = -1;
59941 } else {
59942- index = wbc->range_start >> PAGE_CACHE_SHIFT;
59943- end = wbc->range_end >> PAGE_CACHE_SHIFT;
59944- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
59945+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
59946 range_whole = true;
59947+ index = 0;
59948+ end = ULONG_MAX;
59949+ } else {
59950+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
59951+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
59952+ }
59953 scanned = true;
59954 }
59955 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
59956diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
59957index b7415d5..3984ec0 100644
59958--- a/fs/cifs/misc.c
59959+++ b/fs/cifs/misc.c
59960@@ -170,7 +170,7 @@ cifs_buf_get(void)
59961 memset(ret_buf, 0, buf_size + 3);
59962 atomic_inc(&bufAllocCount);
59963 #ifdef CONFIG_CIFS_STATS2
59964- atomic_inc(&totBufAllocCount);
59965+ atomic_inc_unchecked(&totBufAllocCount);
59966 #endif /* CONFIG_CIFS_STATS2 */
59967 }
59968
59969@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
59970 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
59971 atomic_inc(&smBufAllocCount);
59972 #ifdef CONFIG_CIFS_STATS2
59973- atomic_inc(&totSmBufAllocCount);
59974+ atomic_inc_unchecked(&totSmBufAllocCount);
59975 #endif /* CONFIG_CIFS_STATS2 */
59976
59977 }
59978diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
59979index d297903..1cb7516 100644
59980--- a/fs/cifs/smb1ops.c
59981+++ b/fs/cifs/smb1ops.c
59982@@ -622,27 +622,27 @@ static void
59983 cifs_clear_stats(struct cifs_tcon *tcon)
59984 {
59985 #ifdef CONFIG_CIFS_STATS
59986- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
59987- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
59988- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
59989- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59990- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
59991- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
59992- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59993- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
59994- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
59995- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
59996- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
59997- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
59998- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
59999- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
60000- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
60001- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
60002- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
60003- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
60004- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
60005- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
60006- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
60007+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
60008+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
60009+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
60010+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
60011+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
60012+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
60013+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
60014+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
60015+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
60016+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
60017+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
60018+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
60019+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
60020+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
60021+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
60022+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
60023+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
60024+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
60025+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
60026+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
60027+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
60028 #endif
60029 }
60030
60031@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60032 {
60033 #ifdef CONFIG_CIFS_STATS
60034 seq_printf(m, " Oplocks breaks: %d",
60035- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
60036+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
60037 seq_printf(m, "\nReads: %d Bytes: %llu",
60038- atomic_read(&tcon->stats.cifs_stats.num_reads),
60039+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
60040 (long long)(tcon->bytes_read));
60041 seq_printf(m, "\nWrites: %d Bytes: %llu",
60042- atomic_read(&tcon->stats.cifs_stats.num_writes),
60043+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
60044 (long long)(tcon->bytes_written));
60045 seq_printf(m, "\nFlushes: %d",
60046- atomic_read(&tcon->stats.cifs_stats.num_flushes));
60047+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
60048 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
60049- atomic_read(&tcon->stats.cifs_stats.num_locks),
60050- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
60051- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
60052+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
60053+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
60054+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
60055 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
60056- atomic_read(&tcon->stats.cifs_stats.num_opens),
60057- atomic_read(&tcon->stats.cifs_stats.num_closes),
60058- atomic_read(&tcon->stats.cifs_stats.num_deletes));
60059+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
60060+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
60061+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
60062 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
60063- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
60064- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
60065+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
60066+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
60067 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
60068- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
60069- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
60070+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
60071+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
60072 seq_printf(m, "\nRenames: %d T2 Renames %d",
60073- atomic_read(&tcon->stats.cifs_stats.num_renames),
60074- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
60075+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
60076+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
60077 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
60078- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
60079- atomic_read(&tcon->stats.cifs_stats.num_fnext),
60080- atomic_read(&tcon->stats.cifs_stats.num_fclose));
60081+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
60082+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
60083+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
60084 #endif
60085 }
60086
60087diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
60088index c5f521b..1a40865 100644
60089--- a/fs/cifs/smb2ops.c
60090+++ b/fs/cifs/smb2ops.c
60091@@ -417,8 +417,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
60092 #ifdef CONFIG_CIFS_STATS
60093 int i;
60094 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
60095- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60096- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60097+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60098+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60099 }
60100 #endif
60101 }
60102@@ -458,65 +458,65 @@ static void
60103 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60104 {
60105 #ifdef CONFIG_CIFS_STATS
60106- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60107- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60108+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60109+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60110 seq_printf(m, "\nNegotiates: %d sent %d failed",
60111- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
60112- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
60113+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
60114+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
60115 seq_printf(m, "\nSessionSetups: %d sent %d failed",
60116- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
60117- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
60118+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
60119+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
60120 seq_printf(m, "\nLogoffs: %d sent %d failed",
60121- atomic_read(&sent[SMB2_LOGOFF_HE]),
60122- atomic_read(&failed[SMB2_LOGOFF_HE]));
60123+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
60124+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
60125 seq_printf(m, "\nTreeConnects: %d sent %d failed",
60126- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
60127- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
60128+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
60129+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
60130 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
60131- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
60132- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
60133+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
60134+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
60135 seq_printf(m, "\nCreates: %d sent %d failed",
60136- atomic_read(&sent[SMB2_CREATE_HE]),
60137- atomic_read(&failed[SMB2_CREATE_HE]));
60138+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
60139+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
60140 seq_printf(m, "\nCloses: %d sent %d failed",
60141- atomic_read(&sent[SMB2_CLOSE_HE]),
60142- atomic_read(&failed[SMB2_CLOSE_HE]));
60143+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
60144+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
60145 seq_printf(m, "\nFlushes: %d sent %d failed",
60146- atomic_read(&sent[SMB2_FLUSH_HE]),
60147- atomic_read(&failed[SMB2_FLUSH_HE]));
60148+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
60149+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
60150 seq_printf(m, "\nReads: %d sent %d failed",
60151- atomic_read(&sent[SMB2_READ_HE]),
60152- atomic_read(&failed[SMB2_READ_HE]));
60153+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
60154+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
60155 seq_printf(m, "\nWrites: %d sent %d failed",
60156- atomic_read(&sent[SMB2_WRITE_HE]),
60157- atomic_read(&failed[SMB2_WRITE_HE]));
60158+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
60159+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
60160 seq_printf(m, "\nLocks: %d sent %d failed",
60161- atomic_read(&sent[SMB2_LOCK_HE]),
60162- atomic_read(&failed[SMB2_LOCK_HE]));
60163+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
60164+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
60165 seq_printf(m, "\nIOCTLs: %d sent %d failed",
60166- atomic_read(&sent[SMB2_IOCTL_HE]),
60167- atomic_read(&failed[SMB2_IOCTL_HE]));
60168+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
60169+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
60170 seq_printf(m, "\nCancels: %d sent %d failed",
60171- atomic_read(&sent[SMB2_CANCEL_HE]),
60172- atomic_read(&failed[SMB2_CANCEL_HE]));
60173+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
60174+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
60175 seq_printf(m, "\nEchos: %d sent %d failed",
60176- atomic_read(&sent[SMB2_ECHO_HE]),
60177- atomic_read(&failed[SMB2_ECHO_HE]));
60178+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
60179+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
60180 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
60181- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
60182- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
60183+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
60184+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
60185 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
60186- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
60187- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
60188+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
60189+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
60190 seq_printf(m, "\nQueryInfos: %d sent %d failed",
60191- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
60192- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
60193+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
60194+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
60195 seq_printf(m, "\nSetInfos: %d sent %d failed",
60196- atomic_read(&sent[SMB2_SET_INFO_HE]),
60197- atomic_read(&failed[SMB2_SET_INFO_HE]));
60198+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
60199+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
60200 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
60201- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
60202- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
60203+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
60204+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
60205 #endif
60206 }
60207
60208diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
60209index 8f1672b..af339c07 100644
60210--- a/fs/cifs/smb2pdu.c
60211+++ b/fs/cifs/smb2pdu.c
60212@@ -2145,8 +2145,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
60213 default:
60214 cifs_dbg(VFS, "info level %u isn't supported\n",
60215 srch_inf->info_level);
60216- rc = -EINVAL;
60217- goto qdir_exit;
60218+ return -EINVAL;
60219 }
60220
60221 req->FileIndex = cpu_to_le32(index);
60222diff --git a/fs/coda/cache.c b/fs/coda/cache.c
60223index 46ee6f2..89a9e7f 100644
60224--- a/fs/coda/cache.c
60225+++ b/fs/coda/cache.c
60226@@ -24,7 +24,7 @@
60227 #include "coda_linux.h"
60228 #include "coda_cache.h"
60229
60230-static atomic_t permission_epoch = ATOMIC_INIT(0);
60231+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
60232
60233 /* replace or extend an acl cache hit */
60234 void coda_cache_enter(struct inode *inode, int mask)
60235@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
60236 struct coda_inode_info *cii = ITOC(inode);
60237
60238 spin_lock(&cii->c_lock);
60239- cii->c_cached_epoch = atomic_read(&permission_epoch);
60240+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
60241 if (!uid_eq(cii->c_uid, current_fsuid())) {
60242 cii->c_uid = current_fsuid();
60243 cii->c_cached_perm = mask;
60244@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
60245 {
60246 struct coda_inode_info *cii = ITOC(inode);
60247 spin_lock(&cii->c_lock);
60248- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60249+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60250 spin_unlock(&cii->c_lock);
60251 }
60252
60253 /* remove all acl caches */
60254 void coda_cache_clear_all(struct super_block *sb)
60255 {
60256- atomic_inc(&permission_epoch);
60257+ atomic_inc_unchecked(&permission_epoch);
60258 }
60259
60260
60261@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60262 spin_lock(&cii->c_lock);
60263 hit = (mask & cii->c_cached_perm) == mask &&
60264 uid_eq(cii->c_uid, current_fsuid()) &&
60265- cii->c_cached_epoch == atomic_read(&permission_epoch);
60266+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60267 spin_unlock(&cii->c_lock);
60268
60269 return hit;
60270diff --git a/fs/compat.c b/fs/compat.c
60271index b13df99..6f6f4a3 100644
60272--- a/fs/compat.c
60273+++ b/fs/compat.c
60274@@ -54,7 +54,7 @@
60275 #include <asm/ioctls.h>
60276 #include "internal.h"
60277
60278-int compat_log = 1;
60279+int compat_log = 0;
60280
60281 int compat_printk(const char *fmt, ...)
60282 {
60283@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60284
60285 set_fs(KERNEL_DS);
60286 /* The __user pointer cast is valid because of the set_fs() */
60287- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60288+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60289 set_fs(oldfs);
60290 /* truncating is ok because it's a user address */
60291 if (!ret)
60292@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60293 goto out;
60294
60295 ret = -EINVAL;
60296- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60297+ if (nr_segs > UIO_MAXIOV)
60298 goto out;
60299 if (nr_segs > fast_segs) {
60300 ret = -ENOMEM;
60301@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
60302 struct compat_readdir_callback {
60303 struct dir_context ctx;
60304 struct compat_old_linux_dirent __user *dirent;
60305+ struct file * file;
60306 int result;
60307 };
60308
60309@@ -861,6 +862,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
60310 buf->result = -EOVERFLOW;
60311 return -EOVERFLOW;
60312 }
60313+
60314+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60315+ return 0;
60316+
60317 buf->result++;
60318 dirent = buf->dirent;
60319 if (!access_ok(VERIFY_WRITE, dirent,
60320@@ -892,6 +897,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
60321 if (!f.file)
60322 return -EBADF;
60323
60324+ buf.file = f.file;
60325 error = iterate_dir(f.file, &buf.ctx);
60326 if (buf.result)
60327 error = buf.result;
60328@@ -911,6 +917,7 @@ struct compat_getdents_callback {
60329 struct dir_context ctx;
60330 struct compat_linux_dirent __user *current_dir;
60331 struct compat_linux_dirent __user *previous;
60332+ struct file * file;
60333 int count;
60334 int error;
60335 };
60336@@ -932,6 +939,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
60337 buf->error = -EOVERFLOW;
60338 return -EOVERFLOW;
60339 }
60340+
60341+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60342+ return 0;
60343+
60344 dirent = buf->previous;
60345 if (dirent) {
60346 if (__put_user(offset, &dirent->d_off))
60347@@ -977,6 +988,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
60348 if (!f.file)
60349 return -EBADF;
60350
60351+ buf.file = f.file;
60352 error = iterate_dir(f.file, &buf.ctx);
60353 if (error >= 0)
60354 error = buf.error;
60355@@ -997,6 +1009,7 @@ struct compat_getdents_callback64 {
60356 struct dir_context ctx;
60357 struct linux_dirent64 __user *current_dir;
60358 struct linux_dirent64 __user *previous;
60359+ struct file * file;
60360 int count;
60361 int error;
60362 };
60363@@ -1013,6 +1026,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
60364 buf->error = -EINVAL; /* only used if we fail.. */
60365 if (reclen > buf->count)
60366 return -EINVAL;
60367+
60368+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60369+ return 0;
60370+
60371 dirent = buf->previous;
60372
60373 if (dirent) {
60374@@ -1062,6 +1079,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
60375 if (!f.file)
60376 return -EBADF;
60377
60378+ buf.file = f.file;
60379 error = iterate_dir(f.file, &buf.ctx);
60380 if (error >= 0)
60381 error = buf.error;
60382diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
60383index 4d24d17..4f8c09e 100644
60384--- a/fs/compat_binfmt_elf.c
60385+++ b/fs/compat_binfmt_elf.c
60386@@ -30,11 +30,13 @@
60387 #undef elf_phdr
60388 #undef elf_shdr
60389 #undef elf_note
60390+#undef elf_dyn
60391 #undef elf_addr_t
60392 #define elfhdr elf32_hdr
60393 #define elf_phdr elf32_phdr
60394 #define elf_shdr elf32_shdr
60395 #define elf_note elf32_note
60396+#define elf_dyn Elf32_Dyn
60397 #define elf_addr_t Elf32_Addr
60398
60399 /*
60400diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
60401index afec645..9c65620 100644
60402--- a/fs/compat_ioctl.c
60403+++ b/fs/compat_ioctl.c
60404@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
60405 return -EFAULT;
60406 if (__get_user(udata, &ss32->iomem_base))
60407 return -EFAULT;
60408- ss.iomem_base = compat_ptr(udata);
60409+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
60410 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
60411 __get_user(ss.port_high, &ss32->port_high))
60412 return -EFAULT;
60413@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
60414 for (i = 0; i < nmsgs; i++) {
60415 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
60416 return -EFAULT;
60417- if (get_user(datap, &umsgs[i].buf) ||
60418- put_user(compat_ptr(datap), &tmsgs[i].buf))
60419+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
60420+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
60421 return -EFAULT;
60422 }
60423 return sys_ioctl(fd, cmd, (unsigned long)tdata);
60424@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
60425 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
60426 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
60427 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
60428- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
60429+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
60430 return -EFAULT;
60431
60432 return ioctl_preallocate(file, p);
60433@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
60434 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
60435 {
60436 unsigned int a, b;
60437- a = *(unsigned int *)p;
60438- b = *(unsigned int *)q;
60439+ a = *(const unsigned int *)p;
60440+ b = *(const unsigned int *)q;
60441 if (a > b)
60442 return 1;
60443 if (a < b)
60444diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
60445index 668dcab..daebcd6 100644
60446--- a/fs/configfs/dir.c
60447+++ b/fs/configfs/dir.c
60448@@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60449 }
60450 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
60451 struct configfs_dirent *next;
60452- const char *name;
60453+ const unsigned char * name;
60454+ char d_name[sizeof(next->s_dentry->d_iname)];
60455 int len;
60456 struct inode *inode = NULL;
60457
60458@@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60459 continue;
60460
60461 name = configfs_get_name(next);
60462- len = strlen(name);
60463+ if (next->s_dentry && name == next->s_dentry->d_iname) {
60464+ len = next->s_dentry->d_name.len;
60465+ memcpy(d_name, name, len);
60466+ name = d_name;
60467+ } else
60468+ len = strlen(name);
60469
60470 /*
60471 * We'll have a dentry and an inode for
60472diff --git a/fs/coredump.c b/fs/coredump.c
60473index b5c86ff..0dac262 100644
60474--- a/fs/coredump.c
60475+++ b/fs/coredump.c
60476@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
60477 struct pipe_inode_info *pipe = file->private_data;
60478
60479 pipe_lock(pipe);
60480- pipe->readers++;
60481- pipe->writers--;
60482+ atomic_inc(&pipe->readers);
60483+ atomic_dec(&pipe->writers);
60484 wake_up_interruptible_sync(&pipe->wait);
60485 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60486 pipe_unlock(pipe);
60487@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
60488 * We actually want wait_event_freezable() but then we need
60489 * to clear TIF_SIGPENDING and improve dump_interrupted().
60490 */
60491- wait_event_interruptible(pipe->wait, pipe->readers == 1);
60492+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
60493
60494 pipe_lock(pipe);
60495- pipe->readers--;
60496- pipe->writers++;
60497+ atomic_dec(&pipe->readers);
60498+ atomic_inc(&pipe->writers);
60499 pipe_unlock(pipe);
60500 }
60501
60502@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
60503 struct files_struct *displaced;
60504 bool need_nonrelative = false;
60505 bool core_dumped = false;
60506- static atomic_t core_dump_count = ATOMIC_INIT(0);
60507+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
60508+ long signr = siginfo->si_signo;
60509+ int dumpable;
60510 struct coredump_params cprm = {
60511 .siginfo = siginfo,
60512 .regs = signal_pt_regs(),
60513@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
60514 .mm_flags = mm->flags,
60515 };
60516
60517- audit_core_dumps(siginfo->si_signo);
60518+ audit_core_dumps(signr);
60519+
60520+ dumpable = __get_dumpable(cprm.mm_flags);
60521+
60522+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
60523+ gr_handle_brute_attach(dumpable);
60524
60525 binfmt = mm->binfmt;
60526 if (!binfmt || !binfmt->core_dump)
60527 goto fail;
60528- if (!__get_dumpable(cprm.mm_flags))
60529+ if (!dumpable)
60530 goto fail;
60531
60532 cred = prepare_creds();
60533@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
60534 need_nonrelative = true;
60535 }
60536
60537- retval = coredump_wait(siginfo->si_signo, &core_state);
60538+ retval = coredump_wait(signr, &core_state);
60539 if (retval < 0)
60540 goto fail_creds;
60541
60542@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
60543 }
60544 cprm.limit = RLIM_INFINITY;
60545
60546- dump_count = atomic_inc_return(&core_dump_count);
60547+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
60548 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
60549 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
60550 task_tgid_vnr(current), current->comm);
60551@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
60552 } else {
60553 struct inode *inode;
60554
60555+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
60556+
60557 if (cprm.limit < binfmt->min_coredump)
60558 goto fail_unlock;
60559
60560@@ -681,7 +690,7 @@ close_fail:
60561 filp_close(cprm.file, NULL);
60562 fail_dropcount:
60563 if (ispipe)
60564- atomic_dec(&core_dump_count);
60565+ atomic_dec_unchecked(&core_dump_count);
60566 fail_unlock:
60567 kfree(cn.corename);
60568 coredump_finish(mm, core_dumped);
60569@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
60570 struct file *file = cprm->file;
60571 loff_t pos = file->f_pos;
60572 ssize_t n;
60573+
60574+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
60575 if (cprm->written + nr > cprm->limit)
60576 return 0;
60577 while (nr) {
60578diff --git a/fs/dcache.c b/fs/dcache.c
60579index 03dca3c..15f326d 100644
60580--- a/fs/dcache.c
60581+++ b/fs/dcache.c
60582@@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
60583 * dentry_iput drops the locks, at which point nobody (except
60584 * transient RCU lookups) can reach this dentry.
60585 */
60586- BUG_ON((int)dentry->d_lockref.count > 0);
60587+ BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
60588 this_cpu_dec(nr_dentry);
60589 if (dentry->d_op && dentry->d_op->d_release)
60590 dentry->d_op->d_release(dentry);
60591@@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
60592 struct dentry *parent = dentry->d_parent;
60593 if (IS_ROOT(dentry))
60594 return NULL;
60595- if (unlikely((int)dentry->d_lockref.count < 0))
60596+ if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
60597 return NULL;
60598 if (likely(spin_trylock(&parent->d_lock)))
60599 return parent;
60600@@ -638,7 +638,7 @@ repeat:
60601 dentry->d_flags |= DCACHE_REFERENCED;
60602 dentry_lru_add(dentry);
60603
60604- dentry->d_lockref.count--;
60605+ __lockref_dec(&dentry->d_lockref);
60606 spin_unlock(&dentry->d_lock);
60607 return;
60608
60609@@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
60610 /* This must be called with d_lock held */
60611 static inline void __dget_dlock(struct dentry *dentry)
60612 {
60613- dentry->d_lockref.count++;
60614+ __lockref_inc(&dentry->d_lockref);
60615 }
60616
60617 static inline void __dget(struct dentry *dentry)
60618@@ -694,8 +694,8 @@ repeat:
60619 goto repeat;
60620 }
60621 rcu_read_unlock();
60622- BUG_ON(!ret->d_lockref.count);
60623- ret->d_lockref.count++;
60624+ BUG_ON(!__lockref_read(&ret->d_lockref));
60625+ __lockref_inc(&ret->d_lockref);
60626 spin_unlock(&ret->d_lock);
60627 return ret;
60628 }
60629@@ -773,9 +773,9 @@ restart:
60630 spin_lock(&inode->i_lock);
60631 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
60632 spin_lock(&dentry->d_lock);
60633- if (!dentry->d_lockref.count) {
60634+ if (!__lockref_read(&dentry->d_lockref)) {
60635 struct dentry *parent = lock_parent(dentry);
60636- if (likely(!dentry->d_lockref.count)) {
60637+ if (likely(!__lockref_read(&dentry->d_lockref))) {
60638 __dentry_kill(dentry);
60639 dput(parent);
60640 goto restart;
60641@@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
60642 * We found an inuse dentry which was not removed from
60643 * the LRU because of laziness during lookup. Do not free it.
60644 */
60645- if ((int)dentry->d_lockref.count > 0) {
60646+ if ((int)__lockref_read(&dentry->d_lockref) > 0) {
60647 spin_unlock(&dentry->d_lock);
60648 if (parent)
60649 spin_unlock(&parent->d_lock);
60650@@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
60651 dentry = parent;
60652 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
60653 parent = lock_parent(dentry);
60654- if (dentry->d_lockref.count != 1) {
60655- dentry->d_lockref.count--;
60656+ if (__lockref_read(&dentry->d_lockref) != 1) {
60657+ __lockref_inc(&dentry->d_lockref);
60658 spin_unlock(&dentry->d_lock);
60659 if (parent)
60660 spin_unlock(&parent->d_lock);
60661@@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
60662 * counts, just remove them from the LRU. Otherwise give them
60663 * another pass through the LRU.
60664 */
60665- if (dentry->d_lockref.count) {
60666+ if (__lockref_read(&dentry->d_lockref) > 0) {
60667 d_lru_isolate(dentry);
60668 spin_unlock(&dentry->d_lock);
60669 return LRU_REMOVED;
60670@@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
60671 } else {
60672 if (dentry->d_flags & DCACHE_LRU_LIST)
60673 d_lru_del(dentry);
60674- if (!dentry->d_lockref.count) {
60675+ if (!__lockref_read(&dentry->d_lockref)) {
60676 d_shrink_add(dentry, &data->dispose);
60677 data->found++;
60678 }
60679@@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60680 return D_WALK_CONTINUE;
60681
60682 /* root with refcount 1 is fine */
60683- if (dentry == _data && dentry->d_lockref.count == 1)
60684+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
60685 return D_WALK_CONTINUE;
60686
60687 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
60688@@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60689 dentry->d_inode ?
60690 dentry->d_inode->i_ino : 0UL,
60691 dentry,
60692- dentry->d_lockref.count,
60693+ __lockref_read(&dentry->d_lockref),
60694 dentry->d_sb->s_type->name,
60695 dentry->d_sb->s_id);
60696 WARN_ON(1);
60697@@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60698 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
60699 if (name->len > DNAME_INLINE_LEN-1) {
60700 size_t size = offsetof(struct external_name, name[1]);
60701- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
60702+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
60703 if (!p) {
60704 kmem_cache_free(dentry_cache, dentry);
60705 return NULL;
60706@@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60707 smp_wmb();
60708 dentry->d_name.name = dname;
60709
60710- dentry->d_lockref.count = 1;
60711+ __lockref_set(&dentry->d_lockref, 1);
60712 dentry->d_flags = 0;
60713 spin_lock_init(&dentry->d_lock);
60714 seqcount_init(&dentry->d_seq);
60715@@ -1452,6 +1452,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60716 dentry->d_sb = sb;
60717 dentry->d_op = NULL;
60718 dentry->d_fsdata = NULL;
60719+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
60720+ atomic_set(&dentry->chroot_refcnt, 0);
60721+#endif
60722 INIT_HLIST_BL_NODE(&dentry->d_hash);
60723 INIT_LIST_HEAD(&dentry->d_lru);
60724 INIT_LIST_HEAD(&dentry->d_subdirs);
60725@@ -2183,7 +2186,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
60726 goto next;
60727 }
60728
60729- dentry->d_lockref.count++;
60730+ __lockref_inc(&dentry->d_lockref);
60731 found = dentry;
60732 spin_unlock(&dentry->d_lock);
60733 break;
60734@@ -2282,7 +2285,7 @@ again:
60735 spin_lock(&dentry->d_lock);
60736 inode = dentry->d_inode;
60737 isdir = S_ISDIR(inode->i_mode);
60738- if (dentry->d_lockref.count == 1) {
60739+ if (__lockref_read(&dentry->d_lockref) == 1) {
60740 if (!spin_trylock(&inode->i_lock)) {
60741 spin_unlock(&dentry->d_lock);
60742 cpu_relax();
60743@@ -3308,7 +3311,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
60744
60745 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
60746 dentry->d_flags |= DCACHE_GENOCIDE;
60747- dentry->d_lockref.count--;
60748+ __lockref_dec(&dentry->d_lockref);
60749 }
60750 }
60751 return D_WALK_CONTINUE;
60752@@ -3424,7 +3427,8 @@ void __init vfs_caches_init(unsigned long mempages)
60753 mempages -= reserve;
60754
60755 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
60756- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
60757+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
60758+ SLAB_NO_SANITIZE, NULL);
60759
60760 dcache_init();
60761 inode_init();
60762diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
60763index 05f2960..b012481 100644
60764--- a/fs/debugfs/inode.c
60765+++ b/fs/debugfs/inode.c
60766@@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
60767 */
60768 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
60769 {
60770+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
60771+ return __create_file(name, S_IFDIR | S_IRWXU,
60772+#else
60773 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
60774+#endif
60775 parent, NULL, NULL);
60776 }
60777 EXPORT_SYMBOL_GPL(debugfs_create_dir);
60778diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
60779index 1686dc2..9611c50 100644
60780--- a/fs/ecryptfs/inode.c
60781+++ b/fs/ecryptfs/inode.c
60782@@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
60783 old_fs = get_fs();
60784 set_fs(get_ds());
60785 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
60786- (char __user *)lower_buf,
60787+ (char __force_user *)lower_buf,
60788 PATH_MAX);
60789 set_fs(old_fs);
60790 if (rc < 0)
60791diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
60792index e4141f2..d8263e8 100644
60793--- a/fs/ecryptfs/miscdev.c
60794+++ b/fs/ecryptfs/miscdev.c
60795@@ -304,7 +304,7 @@ check_list:
60796 goto out_unlock_msg_ctx;
60797 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
60798 if (msg_ctx->msg) {
60799- if (copy_to_user(&buf[i], packet_length, packet_length_size))
60800+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
60801 goto out_unlock_msg_ctx;
60802 i += packet_length_size;
60803 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
60804diff --git a/fs/exec.c b/fs/exec.c
60805index 7302b75..b917171 100644
60806--- a/fs/exec.c
60807+++ b/fs/exec.c
60808@@ -56,8 +56,20 @@
60809 #include <linux/pipe_fs_i.h>
60810 #include <linux/oom.h>
60811 #include <linux/compat.h>
60812+#include <linux/random.h>
60813+#include <linux/seq_file.h>
60814+#include <linux/coredump.h>
60815+#include <linux/mman.h>
60816+
60817+#ifdef CONFIG_PAX_REFCOUNT
60818+#include <linux/kallsyms.h>
60819+#include <linux/kdebug.h>
60820+#endif
60821+
60822+#include <trace/events/fs.h>
60823
60824 #include <asm/uaccess.h>
60825+#include <asm/sections.h>
60826 #include <asm/mmu_context.h>
60827 #include <asm/tlb.h>
60828
60829@@ -66,19 +78,34 @@
60830
60831 #include <trace/events/sched.h>
60832
60833+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
60834+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
60835+{
60836+ 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");
60837+}
60838+#endif
60839+
60840+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
60841+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
60842+EXPORT_SYMBOL(pax_set_initial_flags_func);
60843+#endif
60844+
60845 int suid_dumpable = 0;
60846
60847 static LIST_HEAD(formats);
60848 static DEFINE_RWLOCK(binfmt_lock);
60849
60850+extern int gr_process_kernel_exec_ban(void);
60851+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
60852+
60853 void __register_binfmt(struct linux_binfmt * fmt, int insert)
60854 {
60855 BUG_ON(!fmt);
60856 if (WARN_ON(!fmt->load_binary))
60857 return;
60858 write_lock(&binfmt_lock);
60859- insert ? list_add(&fmt->lh, &formats) :
60860- list_add_tail(&fmt->lh, &formats);
60861+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
60862+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
60863 write_unlock(&binfmt_lock);
60864 }
60865
60866@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
60867 void unregister_binfmt(struct linux_binfmt * fmt)
60868 {
60869 write_lock(&binfmt_lock);
60870- list_del(&fmt->lh);
60871+ pax_list_del((struct list_head *)&fmt->lh);
60872 write_unlock(&binfmt_lock);
60873 }
60874
60875@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60876 int write)
60877 {
60878 struct page *page;
60879- int ret;
60880
60881-#ifdef CONFIG_STACK_GROWSUP
60882- if (write) {
60883- ret = expand_downwards(bprm->vma, pos);
60884- if (ret < 0)
60885- return NULL;
60886- }
60887-#endif
60888- ret = get_user_pages(current, bprm->mm, pos,
60889- 1, write, 1, &page, NULL);
60890- if (ret <= 0)
60891+ if (0 > expand_downwards(bprm->vma, pos))
60892+ return NULL;
60893+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
60894 return NULL;
60895
60896 if (write) {
60897@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60898 if (size <= ARG_MAX)
60899 return page;
60900
60901+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60902+ // only allow 512KB for argv+env on suid/sgid binaries
60903+ // to prevent easy ASLR exhaustion
60904+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
60905+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
60906+ (size > (512 * 1024))) {
60907+ put_page(page);
60908+ return NULL;
60909+ }
60910+#endif
60911+
60912 /*
60913 * Limit to 1/4-th the stack size for the argv+env strings.
60914 * This ensures that:
60915@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60916 vma->vm_end = STACK_TOP_MAX;
60917 vma->vm_start = vma->vm_end - PAGE_SIZE;
60918 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
60919+
60920+#ifdef CONFIG_PAX_SEGMEXEC
60921+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
60922+#endif
60923+
60924 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
60925 INIT_LIST_HEAD(&vma->anon_vma_chain);
60926
60927@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60928 mm->stack_vm = mm->total_vm = 1;
60929 up_write(&mm->mmap_sem);
60930 bprm->p = vma->vm_end - sizeof(void *);
60931+
60932+#ifdef CONFIG_PAX_RANDUSTACK
60933+ if (randomize_va_space)
60934+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
60935+#endif
60936+
60937 return 0;
60938 err:
60939 up_write(&mm->mmap_sem);
60940@@ -395,7 +436,7 @@ struct user_arg_ptr {
60941 } ptr;
60942 };
60943
60944-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60945+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60946 {
60947 const char __user *native;
60948
60949@@ -404,14 +445,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60950 compat_uptr_t compat;
60951
60952 if (get_user(compat, argv.ptr.compat + nr))
60953- return ERR_PTR(-EFAULT);
60954+ return (const char __force_user *)ERR_PTR(-EFAULT);
60955
60956 return compat_ptr(compat);
60957 }
60958 #endif
60959
60960 if (get_user(native, argv.ptr.native + nr))
60961- return ERR_PTR(-EFAULT);
60962+ return (const char __force_user *)ERR_PTR(-EFAULT);
60963
60964 return native;
60965 }
60966@@ -430,7 +471,7 @@ static int count(struct user_arg_ptr argv, int max)
60967 if (!p)
60968 break;
60969
60970- if (IS_ERR(p))
60971+ if (IS_ERR((const char __force_kernel *)p))
60972 return -EFAULT;
60973
60974 if (i >= max)
60975@@ -465,7 +506,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
60976
60977 ret = -EFAULT;
60978 str = get_user_arg_ptr(argv, argc);
60979- if (IS_ERR(str))
60980+ if (IS_ERR((const char __force_kernel *)str))
60981 goto out;
60982
60983 len = strnlen_user(str, MAX_ARG_STRLEN);
60984@@ -547,7 +588,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
60985 int r;
60986 mm_segment_t oldfs = get_fs();
60987 struct user_arg_ptr argv = {
60988- .ptr.native = (const char __user *const __user *)__argv,
60989+ .ptr.native = (const char __user * const __force_user *)__argv,
60990 };
60991
60992 set_fs(KERNEL_DS);
60993@@ -582,7 +623,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60994 unsigned long new_end = old_end - shift;
60995 struct mmu_gather tlb;
60996
60997- BUG_ON(new_start > new_end);
60998+ if (new_start >= new_end || new_start < mmap_min_addr)
60999+ return -ENOMEM;
61000
61001 /*
61002 * ensure there are no vmas between where we want to go
61003@@ -591,6 +633,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
61004 if (vma != find_vma(mm, new_start))
61005 return -EFAULT;
61006
61007+#ifdef CONFIG_PAX_SEGMEXEC
61008+ BUG_ON(pax_find_mirror_vma(vma));
61009+#endif
61010+
61011 /*
61012 * cover the whole range: [new_start, old_end)
61013 */
61014@@ -671,10 +717,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
61015 stack_top = arch_align_stack(stack_top);
61016 stack_top = PAGE_ALIGN(stack_top);
61017
61018- if (unlikely(stack_top < mmap_min_addr) ||
61019- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
61020- return -ENOMEM;
61021-
61022 stack_shift = vma->vm_end - stack_top;
61023
61024 bprm->p -= stack_shift;
61025@@ -686,8 +728,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
61026 bprm->exec -= stack_shift;
61027
61028 down_write(&mm->mmap_sem);
61029+
61030+ /* Move stack pages down in memory. */
61031+ if (stack_shift) {
61032+ ret = shift_arg_pages(vma, stack_shift);
61033+ if (ret)
61034+ goto out_unlock;
61035+ }
61036+
61037 vm_flags = VM_STACK_FLAGS;
61038
61039+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61040+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
61041+ vm_flags &= ~VM_EXEC;
61042+
61043+#ifdef CONFIG_PAX_MPROTECT
61044+ if (mm->pax_flags & MF_PAX_MPROTECT)
61045+ vm_flags &= ~VM_MAYEXEC;
61046+#endif
61047+
61048+ }
61049+#endif
61050+
61051 /*
61052 * Adjust stack execute permissions; explicitly enable for
61053 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
61054@@ -706,13 +768,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
61055 goto out_unlock;
61056 BUG_ON(prev != vma);
61057
61058- /* Move stack pages down in memory. */
61059- if (stack_shift) {
61060- ret = shift_arg_pages(vma, stack_shift);
61061- if (ret)
61062- goto out_unlock;
61063- }
61064-
61065 /* mprotect_fixup is overkill to remove the temporary stack flags */
61066 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
61067
61068@@ -736,6 +791,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
61069 #endif
61070 current->mm->start_stack = bprm->p;
61071 ret = expand_stack(vma, stack_base);
61072+
61073+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
61074+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
61075+ unsigned long size;
61076+ vm_flags_t vm_flags;
61077+
61078+ size = STACK_TOP - vma->vm_end;
61079+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
61080+
61081+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
61082+
61083+#ifdef CONFIG_X86
61084+ if (!ret) {
61085+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
61086+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
61087+ }
61088+#endif
61089+
61090+ }
61091+#endif
61092+
61093 if (ret)
61094 ret = -EFAULT;
61095
61096@@ -771,6 +847,8 @@ static struct file *do_open_exec(struct filename *name)
61097
61098 fsnotify_open(file);
61099
61100+ trace_open_exec(name->name);
61101+
61102 err = deny_write_access(file);
61103 if (err)
61104 goto exit;
61105@@ -800,7 +878,7 @@ int kernel_read(struct file *file, loff_t offset,
61106 old_fs = get_fs();
61107 set_fs(get_ds());
61108 /* The cast to a user pointer is valid due to the set_fs() */
61109- result = vfs_read(file, (void __user *)addr, count, &pos);
61110+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
61111 set_fs(old_fs);
61112 return result;
61113 }
61114@@ -845,6 +923,7 @@ static int exec_mmap(struct mm_struct *mm)
61115 tsk->mm = mm;
61116 tsk->active_mm = mm;
61117 activate_mm(active_mm, mm);
61118+ populate_stack();
61119 tsk->mm->vmacache_seqnum = 0;
61120 vmacache_flush(tsk);
61121 task_unlock(tsk);
61122@@ -1243,7 +1322,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
61123 }
61124 rcu_read_unlock();
61125
61126- if (p->fs->users > n_fs)
61127+ if (atomic_read(&p->fs->users) > n_fs)
61128 bprm->unsafe |= LSM_UNSAFE_SHARE;
61129 else
61130 p->fs->in_exec = 1;
61131@@ -1424,6 +1503,31 @@ static int exec_binprm(struct linux_binprm *bprm)
61132 return ret;
61133 }
61134
61135+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61136+static DEFINE_PER_CPU(u64, exec_counter);
61137+static int __init init_exec_counters(void)
61138+{
61139+ unsigned int cpu;
61140+
61141+ for_each_possible_cpu(cpu) {
61142+ per_cpu(exec_counter, cpu) = (u64)cpu;
61143+ }
61144+
61145+ return 0;
61146+}
61147+early_initcall(init_exec_counters);
61148+static inline void increment_exec_counter(void)
61149+{
61150+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
61151+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
61152+}
61153+#else
61154+static inline void increment_exec_counter(void) {}
61155+#endif
61156+
61157+extern void gr_handle_exec_args(struct linux_binprm *bprm,
61158+ struct user_arg_ptr argv);
61159+
61160 /*
61161 * sys_execve() executes a new program.
61162 */
61163@@ -1431,6 +1535,11 @@ static int do_execve_common(struct filename *filename,
61164 struct user_arg_ptr argv,
61165 struct user_arg_ptr envp)
61166 {
61167+#ifdef CONFIG_GRKERNSEC
61168+ struct file *old_exec_file;
61169+ struct acl_subject_label *old_acl;
61170+ struct rlimit old_rlim[RLIM_NLIMITS];
61171+#endif
61172 struct linux_binprm *bprm;
61173 struct file *file;
61174 struct files_struct *displaced;
61175@@ -1439,6 +1548,8 @@ static int do_execve_common(struct filename *filename,
61176 if (IS_ERR(filename))
61177 return PTR_ERR(filename);
61178
61179+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
61180+
61181 /*
61182 * We move the actual failure in case of RLIMIT_NPROC excess from
61183 * set*uid() to execve() because too many poorly written programs
61184@@ -1476,11 +1587,21 @@ static int do_execve_common(struct filename *filename,
61185 if (IS_ERR(file))
61186 goto out_unmark;
61187
61188+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
61189+ retval = -EPERM;
61190+ goto out_unmark;
61191+ }
61192+
61193 sched_exec();
61194
61195 bprm->file = file;
61196 bprm->filename = bprm->interp = filename->name;
61197
61198+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
61199+ retval = -EACCES;
61200+ goto out_unmark;
61201+ }
61202+
61203 retval = bprm_mm_init(bprm);
61204 if (retval)
61205 goto out_unmark;
61206@@ -1497,24 +1618,70 @@ static int do_execve_common(struct filename *filename,
61207 if (retval < 0)
61208 goto out;
61209
61210+#ifdef CONFIG_GRKERNSEC
61211+ old_acl = current->acl;
61212+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
61213+ old_exec_file = current->exec_file;
61214+ get_file(file);
61215+ current->exec_file = file;
61216+#endif
61217+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61218+ /* limit suid stack to 8MB
61219+ * we saved the old limits above and will restore them if this exec fails
61220+ */
61221+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
61222+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
61223+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
61224+#endif
61225+
61226+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
61227+ retval = -EPERM;
61228+ goto out_fail;
61229+ }
61230+
61231+ if (!gr_tpe_allow(file)) {
61232+ retval = -EACCES;
61233+ goto out_fail;
61234+ }
61235+
61236+ if (gr_check_crash_exec(file)) {
61237+ retval = -EACCES;
61238+ goto out_fail;
61239+ }
61240+
61241+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
61242+ bprm->unsafe);
61243+ if (retval < 0)
61244+ goto out_fail;
61245+
61246 retval = copy_strings_kernel(1, &bprm->filename, bprm);
61247 if (retval < 0)
61248- goto out;
61249+ goto out_fail;
61250
61251 bprm->exec = bprm->p;
61252 retval = copy_strings(bprm->envc, envp, bprm);
61253 if (retval < 0)
61254- goto out;
61255+ goto out_fail;
61256
61257 retval = copy_strings(bprm->argc, argv, bprm);
61258 if (retval < 0)
61259- goto out;
61260+ goto out_fail;
61261+
61262+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
61263+
61264+ gr_handle_exec_args(bprm, argv);
61265
61266 retval = exec_binprm(bprm);
61267 if (retval < 0)
61268- goto out;
61269+ goto out_fail;
61270+#ifdef CONFIG_GRKERNSEC
61271+ if (old_exec_file)
61272+ fput(old_exec_file);
61273+#endif
61274
61275 /* execve succeeded */
61276+
61277+ increment_exec_counter();
61278 current->fs->in_exec = 0;
61279 current->in_execve = 0;
61280 acct_update_integrals(current);
61281@@ -1525,6 +1692,14 @@ static int do_execve_common(struct filename *filename,
61282 put_files_struct(displaced);
61283 return retval;
61284
61285+out_fail:
61286+#ifdef CONFIG_GRKERNSEC
61287+ current->acl = old_acl;
61288+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
61289+ fput(current->exec_file);
61290+ current->exec_file = old_exec_file;
61291+#endif
61292+
61293 out:
61294 if (bprm->mm) {
61295 acct_arg_size(bprm, 0);
61296@@ -1616,3 +1791,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
61297 return compat_do_execve(getname(filename), argv, envp);
61298 }
61299 #endif
61300+
61301+int pax_check_flags(unsigned long *flags)
61302+{
61303+ int retval = 0;
61304+
61305+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
61306+ if (*flags & MF_PAX_SEGMEXEC)
61307+ {
61308+ *flags &= ~MF_PAX_SEGMEXEC;
61309+ retval = -EINVAL;
61310+ }
61311+#endif
61312+
61313+ if ((*flags & MF_PAX_PAGEEXEC)
61314+
61315+#ifdef CONFIG_PAX_PAGEEXEC
61316+ && (*flags & MF_PAX_SEGMEXEC)
61317+#endif
61318+
61319+ )
61320+ {
61321+ *flags &= ~MF_PAX_PAGEEXEC;
61322+ retval = -EINVAL;
61323+ }
61324+
61325+ if ((*flags & MF_PAX_MPROTECT)
61326+
61327+#ifdef CONFIG_PAX_MPROTECT
61328+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61329+#endif
61330+
61331+ )
61332+ {
61333+ *flags &= ~MF_PAX_MPROTECT;
61334+ retval = -EINVAL;
61335+ }
61336+
61337+ if ((*flags & MF_PAX_EMUTRAMP)
61338+
61339+#ifdef CONFIG_PAX_EMUTRAMP
61340+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61341+#endif
61342+
61343+ )
61344+ {
61345+ *flags &= ~MF_PAX_EMUTRAMP;
61346+ retval = -EINVAL;
61347+ }
61348+
61349+ return retval;
61350+}
61351+
61352+EXPORT_SYMBOL(pax_check_flags);
61353+
61354+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61355+char *pax_get_path(const struct path *path, char *buf, int buflen)
61356+{
61357+ char *pathname = d_path(path, buf, buflen);
61358+
61359+ if (IS_ERR(pathname))
61360+ goto toolong;
61361+
61362+ pathname = mangle_path(buf, pathname, "\t\n\\");
61363+ if (!pathname)
61364+ goto toolong;
61365+
61366+ *pathname = 0;
61367+ return buf;
61368+
61369+toolong:
61370+ return "<path too long>";
61371+}
61372+EXPORT_SYMBOL(pax_get_path);
61373+
61374+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
61375+{
61376+ struct task_struct *tsk = current;
61377+ struct mm_struct *mm = current->mm;
61378+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
61379+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
61380+ char *path_exec = NULL;
61381+ char *path_fault = NULL;
61382+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
61383+ siginfo_t info = { };
61384+
61385+ if (buffer_exec && buffer_fault) {
61386+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
61387+
61388+ down_read(&mm->mmap_sem);
61389+ vma = mm->mmap;
61390+ while (vma && (!vma_exec || !vma_fault)) {
61391+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
61392+ vma_exec = vma;
61393+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
61394+ vma_fault = vma;
61395+ vma = vma->vm_next;
61396+ }
61397+ if (vma_exec)
61398+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
61399+ if (vma_fault) {
61400+ start = vma_fault->vm_start;
61401+ end = vma_fault->vm_end;
61402+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
61403+ if (vma_fault->vm_file)
61404+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
61405+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
61406+ path_fault = "<heap>";
61407+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
61408+ path_fault = "<stack>";
61409+ else
61410+ path_fault = "<anonymous mapping>";
61411+ }
61412+ up_read(&mm->mmap_sem);
61413+ }
61414+ if (tsk->signal->curr_ip)
61415+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
61416+ else
61417+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
61418+ 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),
61419+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
61420+ free_page((unsigned long)buffer_exec);
61421+ free_page((unsigned long)buffer_fault);
61422+ pax_report_insns(regs, pc, sp);
61423+ info.si_signo = SIGKILL;
61424+ info.si_errno = 0;
61425+ info.si_code = SI_KERNEL;
61426+ info.si_pid = 0;
61427+ info.si_uid = 0;
61428+ do_coredump(&info);
61429+}
61430+#endif
61431+
61432+#ifdef CONFIG_PAX_REFCOUNT
61433+void pax_report_refcount_overflow(struct pt_regs *regs)
61434+{
61435+ if (current->signal->curr_ip)
61436+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
61437+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
61438+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61439+ else
61440+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
61441+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61442+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
61443+ preempt_disable();
61444+ show_regs(regs);
61445+ preempt_enable();
61446+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
61447+}
61448+#endif
61449+
61450+#ifdef CONFIG_PAX_USERCOPY
61451+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
61452+static noinline int check_stack_object(const void *obj, unsigned long len)
61453+{
61454+ const void * const stack = task_stack_page(current);
61455+ const void * const stackend = stack + THREAD_SIZE;
61456+
61457+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61458+ const void *frame = NULL;
61459+ const void *oldframe;
61460+#endif
61461+
61462+ if (obj + len < obj)
61463+ return -1;
61464+
61465+ if (obj + len <= stack || stackend <= obj)
61466+ return 0;
61467+
61468+ if (obj < stack || stackend < obj + len)
61469+ return -1;
61470+
61471+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61472+ oldframe = __builtin_frame_address(1);
61473+ if (oldframe)
61474+ frame = __builtin_frame_address(2);
61475+ /*
61476+ low ----------------------------------------------> high
61477+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
61478+ ^----------------^
61479+ allow copies only within here
61480+ */
61481+ while (stack <= frame && frame < stackend) {
61482+ /* if obj + len extends past the last frame, this
61483+ check won't pass and the next frame will be 0,
61484+ causing us to bail out and correctly report
61485+ the copy as invalid
61486+ */
61487+ if (obj + len <= frame)
61488+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
61489+ oldframe = frame;
61490+ frame = *(const void * const *)frame;
61491+ }
61492+ return -1;
61493+#else
61494+ return 1;
61495+#endif
61496+}
61497+
61498+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
61499+{
61500+ if (current->signal->curr_ip)
61501+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61502+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61503+ else
61504+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61505+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61506+ dump_stack();
61507+ gr_handle_kernel_exploit();
61508+ do_group_exit(SIGKILL);
61509+}
61510+#endif
61511+
61512+#ifdef CONFIG_PAX_USERCOPY
61513+
61514+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
61515+{
61516+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
61517+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
61518+#ifdef CONFIG_MODULES
61519+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
61520+#else
61521+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
61522+#endif
61523+
61524+#else
61525+ unsigned long textlow = (unsigned long)_stext;
61526+ unsigned long texthigh = (unsigned long)_etext;
61527+
61528+#ifdef CONFIG_X86_64
61529+ /* check against linear mapping as well */
61530+ if (high > (unsigned long)__va(__pa(textlow)) &&
61531+ low < (unsigned long)__va(__pa(texthigh)))
61532+ return true;
61533+#endif
61534+
61535+#endif
61536+
61537+ if (high <= textlow || low >= texthigh)
61538+ return false;
61539+ else
61540+ return true;
61541+}
61542+#endif
61543+
61544+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
61545+{
61546+#ifdef CONFIG_PAX_USERCOPY
61547+ const char *type;
61548+#endif
61549+
61550+#ifndef CONFIG_STACK_GROWSUP
61551+ unsigned long stackstart = (unsigned long)task_stack_page(current);
61552+ unsigned long currentsp = (unsigned long)&stackstart;
61553+ if (unlikely((currentsp < stackstart + 512 ||
61554+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
61555+ BUG();
61556+#endif
61557+
61558+#ifndef CONFIG_PAX_USERCOPY_DEBUG
61559+ if (const_size)
61560+ return;
61561+#endif
61562+
61563+#ifdef CONFIG_PAX_USERCOPY
61564+ if (!n)
61565+ return;
61566+
61567+ type = check_heap_object(ptr, n);
61568+ if (!type) {
61569+ int ret = check_stack_object(ptr, n);
61570+ if (ret == 1 || ret == 2)
61571+ return;
61572+ if (ret == 0) {
61573+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
61574+ type = "<kernel text>";
61575+ else
61576+ return;
61577+ } else
61578+ type = "<process stack>";
61579+ }
61580+
61581+ pax_report_usercopy(ptr, n, to_user, type);
61582+#endif
61583+
61584+}
61585+EXPORT_SYMBOL(__check_object_size);
61586+
61587+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
61588+void pax_track_stack(void)
61589+{
61590+ unsigned long sp = (unsigned long)&sp;
61591+ if (sp < current_thread_info()->lowest_stack &&
61592+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
61593+ current_thread_info()->lowest_stack = sp;
61594+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
61595+ BUG();
61596+}
61597+EXPORT_SYMBOL(pax_track_stack);
61598+#endif
61599+
61600+#ifdef CONFIG_PAX_SIZE_OVERFLOW
61601+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
61602+{
61603+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
61604+ dump_stack();
61605+ do_group_exit(SIGKILL);
61606+}
61607+EXPORT_SYMBOL(report_size_overflow);
61608+#endif
61609diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
61610index 9f9992b..8b59411 100644
61611--- a/fs/ext2/balloc.c
61612+++ b/fs/ext2/balloc.c
61613@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
61614
61615 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61616 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61617- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61618+ if (free_blocks < root_blocks + 1 &&
61619 !uid_eq(sbi->s_resuid, current_fsuid()) &&
61620 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61621- !in_group_p (sbi->s_resgid))) {
61622+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61623 return 0;
61624 }
61625 return 1;
61626diff --git a/fs/ext2/super.c b/fs/ext2/super.c
61627index 170dc41..62f6b18 100644
61628--- a/fs/ext2/super.c
61629+++ b/fs/ext2/super.c
61630@@ -264,10 +264,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
61631 #ifdef CONFIG_EXT2_FS_XATTR
61632 if (test_opt(sb, XATTR_USER))
61633 seq_puts(seq, ",user_xattr");
61634- if (!test_opt(sb, XATTR_USER) &&
61635- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
61636+ if (!test_opt(sb, XATTR_USER))
61637 seq_puts(seq, ",nouser_xattr");
61638- }
61639 #endif
61640
61641 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61642@@ -841,8 +839,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
61643 if (def_mount_opts & EXT2_DEFM_UID16)
61644 set_opt(sbi->s_mount_opt, NO_UID32);
61645 #ifdef CONFIG_EXT2_FS_XATTR
61646- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
61647- set_opt(sbi->s_mount_opt, XATTR_USER);
61648+ /* always enable user xattrs */
61649+ set_opt(sbi->s_mount_opt, XATTR_USER);
61650 #endif
61651 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61652 if (def_mount_opts & EXT2_DEFM_ACL)
61653diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
61654index 9142614..97484fa 100644
61655--- a/fs/ext2/xattr.c
61656+++ b/fs/ext2/xattr.c
61657@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
61658 struct buffer_head *bh = NULL;
61659 struct ext2_xattr_entry *entry;
61660 char *end;
61661- size_t rest = buffer_size;
61662+ size_t rest = buffer_size, total_size = 0;
61663 int error;
61664
61665 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
61666@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
61667 buffer += size;
61668 }
61669 rest -= size;
61670+ total_size += size;
61671 }
61672 }
61673- error = buffer_size - rest; /* total size */
61674+ error = total_size;
61675
61676 cleanup:
61677 brelse(bh);
61678diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
61679index 158b5d4..2432610 100644
61680--- a/fs/ext3/balloc.c
61681+++ b/fs/ext3/balloc.c
61682@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
61683
61684 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61685 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61686- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61687+ if (free_blocks < root_blocks + 1 &&
61688 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
61689 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61690- !in_group_p (sbi->s_resgid))) {
61691+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61692 return 0;
61693 }
61694 return 1;
61695diff --git a/fs/ext3/super.c b/fs/ext3/super.c
61696index eb742d0..c19f705 100644
61697--- a/fs/ext3/super.c
61698+++ b/fs/ext3/super.c
61699@@ -649,10 +649,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
61700 #ifdef CONFIG_EXT3_FS_XATTR
61701 if (test_opt(sb, XATTR_USER))
61702 seq_puts(seq, ",user_xattr");
61703- if (!test_opt(sb, XATTR_USER) &&
61704- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
61705+ if (!test_opt(sb, XATTR_USER))
61706 seq_puts(seq, ",nouser_xattr");
61707- }
61708 #endif
61709 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61710 if (test_opt(sb, POSIX_ACL))
61711@@ -1749,8 +1747,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
61712 if (def_mount_opts & EXT3_DEFM_UID16)
61713 set_opt(sbi->s_mount_opt, NO_UID32);
61714 #ifdef CONFIG_EXT3_FS_XATTR
61715- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
61716- set_opt(sbi->s_mount_opt, XATTR_USER);
61717+ /* always enable user xattrs */
61718+ set_opt(sbi->s_mount_opt, XATTR_USER);
61719 #endif
61720 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61721 if (def_mount_opts & EXT3_DEFM_ACL)
61722diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
61723index c6874be..f8a6ae8 100644
61724--- a/fs/ext3/xattr.c
61725+++ b/fs/ext3/xattr.c
61726@@ -330,7 +330,7 @@ static int
61727 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61728 char *buffer, size_t buffer_size)
61729 {
61730- size_t rest = buffer_size;
61731+ size_t rest = buffer_size, total_size = 0;
61732
61733 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
61734 const struct xattr_handler *handler =
61735@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61736 buffer += size;
61737 }
61738 rest -= size;
61739+ total_size += size;
61740 }
61741 }
61742- return buffer_size - rest;
61743+ return total_size;
61744 }
61745
61746 static int
61747diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
61748index 83a6f49..d4e4d03 100644
61749--- a/fs/ext4/balloc.c
61750+++ b/fs/ext4/balloc.c
61751@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
61752 /* Hm, nope. Are (enough) root reserved clusters available? */
61753 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
61754 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
61755- capable(CAP_SYS_RESOURCE) ||
61756- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
61757+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
61758+ capable_nolog(CAP_SYS_RESOURCE)) {
61759
61760 if (free_clusters >= (nclusters + dirty_clusters +
61761 resv_clusters))
61762diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
61763index c55a1fa..9904ebb 100644
61764--- a/fs/ext4/ext4.h
61765+++ b/fs/ext4/ext4.h
61766@@ -1279,19 +1279,19 @@ struct ext4_sb_info {
61767 unsigned long s_mb_last_start;
61768
61769 /* stats for buddy allocator */
61770- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
61771- atomic_t s_bal_success; /* we found long enough chunks */
61772- atomic_t s_bal_allocated; /* in blocks */
61773- atomic_t s_bal_ex_scanned; /* total extents scanned */
61774- atomic_t s_bal_goals; /* goal hits */
61775- atomic_t s_bal_breaks; /* too long searches */
61776- atomic_t s_bal_2orders; /* 2^order hits */
61777+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
61778+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
61779+ atomic_unchecked_t s_bal_allocated; /* in blocks */
61780+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
61781+ atomic_unchecked_t s_bal_goals; /* goal hits */
61782+ atomic_unchecked_t s_bal_breaks; /* too long searches */
61783+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
61784 spinlock_t s_bal_lock;
61785 unsigned long s_mb_buddies_generated;
61786 unsigned long long s_mb_generation_time;
61787- atomic_t s_mb_lost_chunks;
61788- atomic_t s_mb_preallocated;
61789- atomic_t s_mb_discarded;
61790+ atomic_unchecked_t s_mb_lost_chunks;
61791+ atomic_unchecked_t s_mb_preallocated;
61792+ atomic_unchecked_t s_mb_discarded;
61793 atomic_t s_lock_busy;
61794
61795 /* locality groups */
61796diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
61797index dbfe15c..9a6ee8d 100644
61798--- a/fs/ext4/mballoc.c
61799+++ b/fs/ext4/mballoc.c
61800@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
61801 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
61802
61803 if (EXT4_SB(sb)->s_mb_stats)
61804- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
61805+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
61806
61807 break;
61808 }
61809@@ -2211,7 +2211,7 @@ repeat:
61810 ac->ac_status = AC_STATUS_CONTINUE;
61811 ac->ac_flags |= EXT4_MB_HINT_FIRST;
61812 cr = 3;
61813- atomic_inc(&sbi->s_mb_lost_chunks);
61814+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
61815 goto repeat;
61816 }
61817 }
61818@@ -2717,25 +2717,25 @@ int ext4_mb_release(struct super_block *sb)
61819 if (sbi->s_mb_stats) {
61820 ext4_msg(sb, KERN_INFO,
61821 "mballoc: %u blocks %u reqs (%u success)",
61822- atomic_read(&sbi->s_bal_allocated),
61823- atomic_read(&sbi->s_bal_reqs),
61824- atomic_read(&sbi->s_bal_success));
61825+ atomic_read_unchecked(&sbi->s_bal_allocated),
61826+ atomic_read_unchecked(&sbi->s_bal_reqs),
61827+ atomic_read_unchecked(&sbi->s_bal_success));
61828 ext4_msg(sb, KERN_INFO,
61829 "mballoc: %u extents scanned, %u goal hits, "
61830 "%u 2^N hits, %u breaks, %u lost",
61831- atomic_read(&sbi->s_bal_ex_scanned),
61832- atomic_read(&sbi->s_bal_goals),
61833- atomic_read(&sbi->s_bal_2orders),
61834- atomic_read(&sbi->s_bal_breaks),
61835- atomic_read(&sbi->s_mb_lost_chunks));
61836+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
61837+ atomic_read_unchecked(&sbi->s_bal_goals),
61838+ atomic_read_unchecked(&sbi->s_bal_2orders),
61839+ atomic_read_unchecked(&sbi->s_bal_breaks),
61840+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
61841 ext4_msg(sb, KERN_INFO,
61842 "mballoc: %lu generated and it took %Lu",
61843 sbi->s_mb_buddies_generated,
61844 sbi->s_mb_generation_time);
61845 ext4_msg(sb, KERN_INFO,
61846 "mballoc: %u preallocated, %u discarded",
61847- atomic_read(&sbi->s_mb_preallocated),
61848- atomic_read(&sbi->s_mb_discarded));
61849+ atomic_read_unchecked(&sbi->s_mb_preallocated),
61850+ atomic_read_unchecked(&sbi->s_mb_discarded));
61851 }
61852
61853 free_percpu(sbi->s_locality_groups);
61854@@ -3191,16 +3191,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
61855 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
61856
61857 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
61858- atomic_inc(&sbi->s_bal_reqs);
61859- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61860+ atomic_inc_unchecked(&sbi->s_bal_reqs);
61861+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61862 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
61863- atomic_inc(&sbi->s_bal_success);
61864- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
61865+ atomic_inc_unchecked(&sbi->s_bal_success);
61866+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
61867 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
61868 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
61869- atomic_inc(&sbi->s_bal_goals);
61870+ atomic_inc_unchecked(&sbi->s_bal_goals);
61871 if (ac->ac_found > sbi->s_mb_max_to_scan)
61872- atomic_inc(&sbi->s_bal_breaks);
61873+ atomic_inc_unchecked(&sbi->s_bal_breaks);
61874 }
61875
61876 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
61877@@ -3627,7 +3627,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
61878 trace_ext4_mb_new_inode_pa(ac, pa);
61879
61880 ext4_mb_use_inode_pa(ac, pa);
61881- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
61882+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
61883
61884 ei = EXT4_I(ac->ac_inode);
61885 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61886@@ -3687,7 +3687,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
61887 trace_ext4_mb_new_group_pa(ac, pa);
61888
61889 ext4_mb_use_group_pa(ac, pa);
61890- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61891+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61892
61893 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61894 lg = ac->ac_lg;
61895@@ -3776,7 +3776,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
61896 * from the bitmap and continue.
61897 */
61898 }
61899- atomic_add(free, &sbi->s_mb_discarded);
61900+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
61901
61902 return err;
61903 }
61904@@ -3794,7 +3794,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
61905 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
61906 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
61907 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
61908- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61909+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61910 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
61911
61912 return 0;
61913diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
61914index 8313ca3..8a37d08 100644
61915--- a/fs/ext4/mmp.c
61916+++ b/fs/ext4/mmp.c
61917@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
61918 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
61919 const char *function, unsigned int line, const char *msg)
61920 {
61921- __ext4_warning(sb, function, line, msg);
61922+ __ext4_warning(sb, function, line, "%s", msg);
61923 __ext4_warning(sb, function, line,
61924 "MMP failure info: last update time: %llu, last update "
61925 "node: %s, last update device: %s\n",
61926diff --git a/fs/ext4/super.c b/fs/ext4/super.c
61927index 2c9e686..6a40edc 100644
61928--- a/fs/ext4/super.c
61929+++ b/fs/ext4/super.c
61930@@ -1254,7 +1254,7 @@ static ext4_fsblk_t get_sb_block(void **data)
61931 }
61932
61933 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
61934-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61935+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61936 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
61937
61938 #ifdef CONFIG_QUOTA
61939@@ -2434,7 +2434,7 @@ struct ext4_attr {
61940 int offset;
61941 int deprecated_val;
61942 } u;
61943-};
61944+} __do_const;
61945
61946 static int parse_strtoull(const char *buf,
61947 unsigned long long max, unsigned long long *value)
61948diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
61949index 1e09fc7..0400dd4 100644
61950--- a/fs/ext4/xattr.c
61951+++ b/fs/ext4/xattr.c
61952@@ -399,7 +399,7 @@ static int
61953 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61954 char *buffer, size_t buffer_size)
61955 {
61956- size_t rest = buffer_size;
61957+ size_t rest = buffer_size, total_size = 0;
61958
61959 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
61960 const struct xattr_handler *handler =
61961@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61962 buffer += size;
61963 }
61964 rest -= size;
61965+ total_size += size;
61966 }
61967 }
61968- return buffer_size - rest;
61969+ return total_size;
61970 }
61971
61972 static int
61973diff --git a/fs/fcntl.c b/fs/fcntl.c
61974index 99d440a..eb979d1 100644
61975--- a/fs/fcntl.c
61976+++ b/fs/fcntl.c
61977@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
61978 int force)
61979 {
61980 security_file_set_fowner(filp);
61981+ if (gr_handle_chroot_fowner(pid, type))
61982+ return;
61983+ if (gr_check_protected_task_fowner(pid, type))
61984+ return;
61985 f_modown(filp, pid, type, force);
61986 }
61987 EXPORT_SYMBOL(__f_setown);
61988diff --git a/fs/fhandle.c b/fs/fhandle.c
61989index 999ff5c..2281df9 100644
61990--- a/fs/fhandle.c
61991+++ b/fs/fhandle.c
61992@@ -8,6 +8,7 @@
61993 #include <linux/fs_struct.h>
61994 #include <linux/fsnotify.h>
61995 #include <linux/personality.h>
61996+#include <linux/grsecurity.h>
61997 #include <asm/uaccess.h>
61998 #include "internal.h"
61999 #include "mount.h"
62000@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
62001 } else
62002 retval = 0;
62003 /* copy the mount id */
62004- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
62005- sizeof(*mnt_id)) ||
62006+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
62007 copy_to_user(ufh, handle,
62008 sizeof(struct file_handle) + handle_bytes))
62009 retval = -EFAULT;
62010@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
62011 * the directory. Ideally we would like CAP_DAC_SEARCH.
62012 * But we don't have that
62013 */
62014- if (!capable(CAP_DAC_READ_SEARCH)) {
62015+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
62016 retval = -EPERM;
62017 goto out_err;
62018 }
62019@@ -195,8 +195,9 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
62020 goto out_err;
62021 }
62022 /* copy the full handle */
62023- if (copy_from_user(handle, ufh,
62024- sizeof(struct file_handle) +
62025+ *handle = f_handle;
62026+ if (copy_from_user(&handle->f_handle,
62027+ &ufh->f_handle,
62028 f_handle.handle_bytes)) {
62029 retval = -EFAULT;
62030 goto out_handle;
62031diff --git a/fs/file.c b/fs/file.c
62032index ab3eb6a..8de2392 100644
62033--- a/fs/file.c
62034+++ b/fs/file.c
62035@@ -16,6 +16,7 @@
62036 #include <linux/slab.h>
62037 #include <linux/vmalloc.h>
62038 #include <linux/file.h>
62039+#include <linux/security.h>
62040 #include <linux/fdtable.h>
62041 #include <linux/bitops.h>
62042 #include <linux/interrupt.h>
62043@@ -139,7 +140,7 @@ out:
62044 * Return <0 error code on error; 1 on successful completion.
62045 * The files->file_lock should be held on entry, and will be held on exit.
62046 */
62047-static int expand_fdtable(struct files_struct *files, int nr)
62048+static int expand_fdtable(struct files_struct *files, unsigned int nr)
62049 __releases(files->file_lock)
62050 __acquires(files->file_lock)
62051 {
62052@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
62053 * expanded and execution may have blocked.
62054 * The files->file_lock should be held on entry, and will be held on exit.
62055 */
62056-static int expand_files(struct files_struct *files, int nr)
62057+static int expand_files(struct files_struct *files, unsigned int nr)
62058 {
62059 struct fdtable *fdt;
62060
62061@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
62062 if (!file)
62063 return __close_fd(files, fd);
62064
62065+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
62066 if (fd >= rlimit(RLIMIT_NOFILE))
62067 return -EBADF;
62068
62069@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
62070 if (unlikely(oldfd == newfd))
62071 return -EINVAL;
62072
62073+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
62074 if (newfd >= rlimit(RLIMIT_NOFILE))
62075 return -EBADF;
62076
62077@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
62078 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
62079 {
62080 int err;
62081+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
62082 if (from >= rlimit(RLIMIT_NOFILE))
62083 return -EINVAL;
62084 err = alloc_fd(from, flags);
62085diff --git a/fs/filesystems.c b/fs/filesystems.c
62086index 5797d45..7d7d79a 100644
62087--- a/fs/filesystems.c
62088+++ b/fs/filesystems.c
62089@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
62090 int len = dot ? dot - name : strlen(name);
62091
62092 fs = __get_fs_type(name, len);
62093+#ifdef CONFIG_GRKERNSEC_MODHARDEN
62094+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
62095+#else
62096 if (!fs && (request_module("fs-%.*s", len, name) == 0))
62097+#endif
62098 fs = __get_fs_type(name, len);
62099
62100 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
62101diff --git a/fs/fs_struct.c b/fs/fs_struct.c
62102index 7dca743..f5e007d 100644
62103--- a/fs/fs_struct.c
62104+++ b/fs/fs_struct.c
62105@@ -4,6 +4,7 @@
62106 #include <linux/path.h>
62107 #include <linux/slab.h>
62108 #include <linux/fs_struct.h>
62109+#include <linux/grsecurity.h>
62110 #include "internal.h"
62111
62112 /*
62113@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
62114 struct path old_root;
62115
62116 path_get(path);
62117+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
62118 spin_lock(&fs->lock);
62119 write_seqcount_begin(&fs->seq);
62120 old_root = fs->root;
62121 fs->root = *path;
62122+ gr_set_chroot_entries(current, path);
62123 write_seqcount_end(&fs->seq);
62124 spin_unlock(&fs->lock);
62125- if (old_root.dentry)
62126+ if (old_root.dentry) {
62127+ gr_inc_chroot_refcnts(old_root.dentry, old_root.mnt);
62128 path_put(&old_root);
62129+ }
62130 }
62131
62132 /*
62133@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62134 int hits = 0;
62135 spin_lock(&fs->lock);
62136 write_seqcount_begin(&fs->seq);
62137+ /* this root replacement is only done by pivot_root,
62138+ leave grsec's chroot tagging alone for this task
62139+ so that a pivoted root isn't treated as a chroot
62140+ */
62141 hits += replace_path(&fs->root, old_root, new_root);
62142 hits += replace_path(&fs->pwd, old_root, new_root);
62143 write_seqcount_end(&fs->seq);
62144@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62145
62146 void free_fs_struct(struct fs_struct *fs)
62147 {
62148+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
62149 path_put(&fs->root);
62150 path_put(&fs->pwd);
62151 kmem_cache_free(fs_cachep, fs);
62152@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
62153 task_lock(tsk);
62154 spin_lock(&fs->lock);
62155 tsk->fs = NULL;
62156- kill = !--fs->users;
62157+ gr_clear_chroot_entries(tsk);
62158+ kill = !atomic_dec_return(&fs->users);
62159 spin_unlock(&fs->lock);
62160 task_unlock(tsk);
62161 if (kill)
62162@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62163 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
62164 /* We don't need to lock fs - think why ;-) */
62165 if (fs) {
62166- fs->users = 1;
62167+ atomic_set(&fs->users, 1);
62168 fs->in_exec = 0;
62169 spin_lock_init(&fs->lock);
62170 seqcount_init(&fs->seq);
62171@@ -121,6 +132,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62172 spin_lock(&old->lock);
62173 fs->root = old->root;
62174 path_get(&fs->root);
62175+ /* instead of calling gr_set_chroot_entries here,
62176+ we call it from every caller of this function
62177+ */
62178 fs->pwd = old->pwd;
62179 path_get(&fs->pwd);
62180 spin_unlock(&old->lock);
62181@@ -139,8 +153,9 @@ int unshare_fs_struct(void)
62182
62183 task_lock(current);
62184 spin_lock(&fs->lock);
62185- kill = !--fs->users;
62186+ kill = !atomic_dec_return(&fs->users);
62187 current->fs = new_fs;
62188+ gr_set_chroot_entries(current, &new_fs->root);
62189 spin_unlock(&fs->lock);
62190 task_unlock(current);
62191
62192@@ -153,13 +168,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
62193
62194 int current_umask(void)
62195 {
62196- return current->fs->umask;
62197+ return current->fs->umask | gr_acl_umask();
62198 }
62199 EXPORT_SYMBOL(current_umask);
62200
62201 /* to be mentioned only in INIT_TASK */
62202 struct fs_struct init_fs = {
62203- .users = 1,
62204+ .users = ATOMIC_INIT(1),
62205 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
62206 .seq = SEQCNT_ZERO(init_fs.seq),
62207 .umask = 0022,
62208diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
62209index 89acec7..a575262 100644
62210--- a/fs/fscache/cookie.c
62211+++ b/fs/fscache/cookie.c
62212@@ -19,7 +19,7 @@
62213
62214 struct kmem_cache *fscache_cookie_jar;
62215
62216-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
62217+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
62218
62219 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
62220 static int fscache_alloc_object(struct fscache_cache *cache,
62221@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
62222 parent ? (char *) parent->def->name : "<no-parent>",
62223 def->name, netfs_data, enable);
62224
62225- fscache_stat(&fscache_n_acquires);
62226+ fscache_stat_unchecked(&fscache_n_acquires);
62227
62228 /* if there's no parent cookie, then we don't create one here either */
62229 if (!parent) {
62230- fscache_stat(&fscache_n_acquires_null);
62231+ fscache_stat_unchecked(&fscache_n_acquires_null);
62232 _leave(" [no parent]");
62233 return NULL;
62234 }
62235@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62236 /* allocate and initialise a cookie */
62237 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
62238 if (!cookie) {
62239- fscache_stat(&fscache_n_acquires_oom);
62240+ fscache_stat_unchecked(&fscache_n_acquires_oom);
62241 _leave(" [ENOMEM]");
62242 return NULL;
62243 }
62244@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
62245
62246 switch (cookie->def->type) {
62247 case FSCACHE_COOKIE_TYPE_INDEX:
62248- fscache_stat(&fscache_n_cookie_index);
62249+ fscache_stat_unchecked(&fscache_n_cookie_index);
62250 break;
62251 case FSCACHE_COOKIE_TYPE_DATAFILE:
62252- fscache_stat(&fscache_n_cookie_data);
62253+ fscache_stat_unchecked(&fscache_n_cookie_data);
62254 break;
62255 default:
62256- fscache_stat(&fscache_n_cookie_special);
62257+ fscache_stat_unchecked(&fscache_n_cookie_special);
62258 break;
62259 }
62260
62261@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62262 } else {
62263 atomic_dec(&parent->n_children);
62264 __fscache_cookie_put(cookie);
62265- fscache_stat(&fscache_n_acquires_nobufs);
62266+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
62267 _leave(" = NULL");
62268 return NULL;
62269 }
62270@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62271 }
62272 }
62273
62274- fscache_stat(&fscache_n_acquires_ok);
62275+ fscache_stat_unchecked(&fscache_n_acquires_ok);
62276 _leave(" = %p", cookie);
62277 return cookie;
62278 }
62279@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
62280 cache = fscache_select_cache_for_object(cookie->parent);
62281 if (!cache) {
62282 up_read(&fscache_addremove_sem);
62283- fscache_stat(&fscache_n_acquires_no_cache);
62284+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
62285 _leave(" = -ENOMEDIUM [no cache]");
62286 return -ENOMEDIUM;
62287 }
62288@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
62289 object = cache->ops->alloc_object(cache, cookie);
62290 fscache_stat_d(&fscache_n_cop_alloc_object);
62291 if (IS_ERR(object)) {
62292- fscache_stat(&fscache_n_object_no_alloc);
62293+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
62294 ret = PTR_ERR(object);
62295 goto error;
62296 }
62297
62298- fscache_stat(&fscache_n_object_alloc);
62299+ fscache_stat_unchecked(&fscache_n_object_alloc);
62300
62301- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
62302+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
62303
62304 _debug("ALLOC OBJ%x: %s {%lx}",
62305 object->debug_id, cookie->def->name, object->events);
62306@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
62307
62308 _enter("{%s}", cookie->def->name);
62309
62310- fscache_stat(&fscache_n_invalidates);
62311+ fscache_stat_unchecked(&fscache_n_invalidates);
62312
62313 /* Only permit invalidation of data files. Invalidating an index will
62314 * require the caller to release all its attachments to the tree rooted
62315@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
62316 {
62317 struct fscache_object *object;
62318
62319- fscache_stat(&fscache_n_updates);
62320+ fscache_stat_unchecked(&fscache_n_updates);
62321
62322 if (!cookie) {
62323- fscache_stat(&fscache_n_updates_null);
62324+ fscache_stat_unchecked(&fscache_n_updates_null);
62325 _leave(" [no cookie]");
62326 return;
62327 }
62328@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
62329 */
62330 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
62331 {
62332- fscache_stat(&fscache_n_relinquishes);
62333+ fscache_stat_unchecked(&fscache_n_relinquishes);
62334 if (retire)
62335- fscache_stat(&fscache_n_relinquishes_retire);
62336+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
62337
62338 if (!cookie) {
62339- fscache_stat(&fscache_n_relinquishes_null);
62340+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
62341 _leave(" [no cookie]");
62342 return;
62343 }
62344@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
62345 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
62346 goto inconsistent;
62347
62348- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62349+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62350
62351 __fscache_use_cookie(cookie);
62352 if (fscache_submit_op(object, op) < 0)
62353diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
62354index 7872a62..d91b19f 100644
62355--- a/fs/fscache/internal.h
62356+++ b/fs/fscache/internal.h
62357@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
62358 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
62359 extern int fscache_wait_for_operation_activation(struct fscache_object *,
62360 struct fscache_operation *,
62361- atomic_t *,
62362- atomic_t *,
62363+ atomic_unchecked_t *,
62364+ atomic_unchecked_t *,
62365 void (*)(struct fscache_operation *));
62366 extern void fscache_invalidate_writes(struct fscache_cookie *);
62367
62368@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
62369 * stats.c
62370 */
62371 #ifdef CONFIG_FSCACHE_STATS
62372-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62373-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62374+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62375+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62376
62377-extern atomic_t fscache_n_op_pend;
62378-extern atomic_t fscache_n_op_run;
62379-extern atomic_t fscache_n_op_enqueue;
62380-extern atomic_t fscache_n_op_deferred_release;
62381-extern atomic_t fscache_n_op_release;
62382-extern atomic_t fscache_n_op_gc;
62383-extern atomic_t fscache_n_op_cancelled;
62384-extern atomic_t fscache_n_op_rejected;
62385+extern atomic_unchecked_t fscache_n_op_pend;
62386+extern atomic_unchecked_t fscache_n_op_run;
62387+extern atomic_unchecked_t fscache_n_op_enqueue;
62388+extern atomic_unchecked_t fscache_n_op_deferred_release;
62389+extern atomic_unchecked_t fscache_n_op_release;
62390+extern atomic_unchecked_t fscache_n_op_gc;
62391+extern atomic_unchecked_t fscache_n_op_cancelled;
62392+extern atomic_unchecked_t fscache_n_op_rejected;
62393
62394-extern atomic_t fscache_n_attr_changed;
62395-extern atomic_t fscache_n_attr_changed_ok;
62396-extern atomic_t fscache_n_attr_changed_nobufs;
62397-extern atomic_t fscache_n_attr_changed_nomem;
62398-extern atomic_t fscache_n_attr_changed_calls;
62399+extern atomic_unchecked_t fscache_n_attr_changed;
62400+extern atomic_unchecked_t fscache_n_attr_changed_ok;
62401+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
62402+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
62403+extern atomic_unchecked_t fscache_n_attr_changed_calls;
62404
62405-extern atomic_t fscache_n_allocs;
62406-extern atomic_t fscache_n_allocs_ok;
62407-extern atomic_t fscache_n_allocs_wait;
62408-extern atomic_t fscache_n_allocs_nobufs;
62409-extern atomic_t fscache_n_allocs_intr;
62410-extern atomic_t fscache_n_allocs_object_dead;
62411-extern atomic_t fscache_n_alloc_ops;
62412-extern atomic_t fscache_n_alloc_op_waits;
62413+extern atomic_unchecked_t fscache_n_allocs;
62414+extern atomic_unchecked_t fscache_n_allocs_ok;
62415+extern atomic_unchecked_t fscache_n_allocs_wait;
62416+extern atomic_unchecked_t fscache_n_allocs_nobufs;
62417+extern atomic_unchecked_t fscache_n_allocs_intr;
62418+extern atomic_unchecked_t fscache_n_allocs_object_dead;
62419+extern atomic_unchecked_t fscache_n_alloc_ops;
62420+extern atomic_unchecked_t fscache_n_alloc_op_waits;
62421
62422-extern atomic_t fscache_n_retrievals;
62423-extern atomic_t fscache_n_retrievals_ok;
62424-extern atomic_t fscache_n_retrievals_wait;
62425-extern atomic_t fscache_n_retrievals_nodata;
62426-extern atomic_t fscache_n_retrievals_nobufs;
62427-extern atomic_t fscache_n_retrievals_intr;
62428-extern atomic_t fscache_n_retrievals_nomem;
62429-extern atomic_t fscache_n_retrievals_object_dead;
62430-extern atomic_t fscache_n_retrieval_ops;
62431-extern atomic_t fscache_n_retrieval_op_waits;
62432+extern atomic_unchecked_t fscache_n_retrievals;
62433+extern atomic_unchecked_t fscache_n_retrievals_ok;
62434+extern atomic_unchecked_t fscache_n_retrievals_wait;
62435+extern atomic_unchecked_t fscache_n_retrievals_nodata;
62436+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
62437+extern atomic_unchecked_t fscache_n_retrievals_intr;
62438+extern atomic_unchecked_t fscache_n_retrievals_nomem;
62439+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
62440+extern atomic_unchecked_t fscache_n_retrieval_ops;
62441+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
62442
62443-extern atomic_t fscache_n_stores;
62444-extern atomic_t fscache_n_stores_ok;
62445-extern atomic_t fscache_n_stores_again;
62446-extern atomic_t fscache_n_stores_nobufs;
62447-extern atomic_t fscache_n_stores_oom;
62448-extern atomic_t fscache_n_store_ops;
62449-extern atomic_t fscache_n_store_calls;
62450-extern atomic_t fscache_n_store_pages;
62451-extern atomic_t fscache_n_store_radix_deletes;
62452-extern atomic_t fscache_n_store_pages_over_limit;
62453+extern atomic_unchecked_t fscache_n_stores;
62454+extern atomic_unchecked_t fscache_n_stores_ok;
62455+extern atomic_unchecked_t fscache_n_stores_again;
62456+extern atomic_unchecked_t fscache_n_stores_nobufs;
62457+extern atomic_unchecked_t fscache_n_stores_oom;
62458+extern atomic_unchecked_t fscache_n_store_ops;
62459+extern atomic_unchecked_t fscache_n_store_calls;
62460+extern atomic_unchecked_t fscache_n_store_pages;
62461+extern atomic_unchecked_t fscache_n_store_radix_deletes;
62462+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
62463
62464-extern atomic_t fscache_n_store_vmscan_not_storing;
62465-extern atomic_t fscache_n_store_vmscan_gone;
62466-extern atomic_t fscache_n_store_vmscan_busy;
62467-extern atomic_t fscache_n_store_vmscan_cancelled;
62468-extern atomic_t fscache_n_store_vmscan_wait;
62469+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
62470+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
62471+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
62472+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
62473+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
62474
62475-extern atomic_t fscache_n_marks;
62476-extern atomic_t fscache_n_uncaches;
62477+extern atomic_unchecked_t fscache_n_marks;
62478+extern atomic_unchecked_t fscache_n_uncaches;
62479
62480-extern atomic_t fscache_n_acquires;
62481-extern atomic_t fscache_n_acquires_null;
62482-extern atomic_t fscache_n_acquires_no_cache;
62483-extern atomic_t fscache_n_acquires_ok;
62484-extern atomic_t fscache_n_acquires_nobufs;
62485-extern atomic_t fscache_n_acquires_oom;
62486+extern atomic_unchecked_t fscache_n_acquires;
62487+extern atomic_unchecked_t fscache_n_acquires_null;
62488+extern atomic_unchecked_t fscache_n_acquires_no_cache;
62489+extern atomic_unchecked_t fscache_n_acquires_ok;
62490+extern atomic_unchecked_t fscache_n_acquires_nobufs;
62491+extern atomic_unchecked_t fscache_n_acquires_oom;
62492
62493-extern atomic_t fscache_n_invalidates;
62494-extern atomic_t fscache_n_invalidates_run;
62495+extern atomic_unchecked_t fscache_n_invalidates;
62496+extern atomic_unchecked_t fscache_n_invalidates_run;
62497
62498-extern atomic_t fscache_n_updates;
62499-extern atomic_t fscache_n_updates_null;
62500-extern atomic_t fscache_n_updates_run;
62501+extern atomic_unchecked_t fscache_n_updates;
62502+extern atomic_unchecked_t fscache_n_updates_null;
62503+extern atomic_unchecked_t fscache_n_updates_run;
62504
62505-extern atomic_t fscache_n_relinquishes;
62506-extern atomic_t fscache_n_relinquishes_null;
62507-extern atomic_t fscache_n_relinquishes_waitcrt;
62508-extern atomic_t fscache_n_relinquishes_retire;
62509+extern atomic_unchecked_t fscache_n_relinquishes;
62510+extern atomic_unchecked_t fscache_n_relinquishes_null;
62511+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
62512+extern atomic_unchecked_t fscache_n_relinquishes_retire;
62513
62514-extern atomic_t fscache_n_cookie_index;
62515-extern atomic_t fscache_n_cookie_data;
62516-extern atomic_t fscache_n_cookie_special;
62517+extern atomic_unchecked_t fscache_n_cookie_index;
62518+extern atomic_unchecked_t fscache_n_cookie_data;
62519+extern atomic_unchecked_t fscache_n_cookie_special;
62520
62521-extern atomic_t fscache_n_object_alloc;
62522-extern atomic_t fscache_n_object_no_alloc;
62523-extern atomic_t fscache_n_object_lookups;
62524-extern atomic_t fscache_n_object_lookups_negative;
62525-extern atomic_t fscache_n_object_lookups_positive;
62526-extern atomic_t fscache_n_object_lookups_timed_out;
62527-extern atomic_t fscache_n_object_created;
62528-extern atomic_t fscache_n_object_avail;
62529-extern atomic_t fscache_n_object_dead;
62530+extern atomic_unchecked_t fscache_n_object_alloc;
62531+extern atomic_unchecked_t fscache_n_object_no_alloc;
62532+extern atomic_unchecked_t fscache_n_object_lookups;
62533+extern atomic_unchecked_t fscache_n_object_lookups_negative;
62534+extern atomic_unchecked_t fscache_n_object_lookups_positive;
62535+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
62536+extern atomic_unchecked_t fscache_n_object_created;
62537+extern atomic_unchecked_t fscache_n_object_avail;
62538+extern atomic_unchecked_t fscache_n_object_dead;
62539
62540-extern atomic_t fscache_n_checkaux_none;
62541-extern atomic_t fscache_n_checkaux_okay;
62542-extern atomic_t fscache_n_checkaux_update;
62543-extern atomic_t fscache_n_checkaux_obsolete;
62544+extern atomic_unchecked_t fscache_n_checkaux_none;
62545+extern atomic_unchecked_t fscache_n_checkaux_okay;
62546+extern atomic_unchecked_t fscache_n_checkaux_update;
62547+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
62548
62549 extern atomic_t fscache_n_cop_alloc_object;
62550 extern atomic_t fscache_n_cop_lookup_object;
62551@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
62552 atomic_inc(stat);
62553 }
62554
62555+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
62556+{
62557+ atomic_inc_unchecked(stat);
62558+}
62559+
62560 static inline void fscache_stat_d(atomic_t *stat)
62561 {
62562 atomic_dec(stat);
62563@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
62564
62565 #define __fscache_stat(stat) (NULL)
62566 #define fscache_stat(stat) do {} while (0)
62567+#define fscache_stat_unchecked(stat) do {} while (0)
62568 #define fscache_stat_d(stat) do {} while (0)
62569 #endif
62570
62571diff --git a/fs/fscache/object.c b/fs/fscache/object.c
62572index da032da..0076ce7 100644
62573--- a/fs/fscache/object.c
62574+++ b/fs/fscache/object.c
62575@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62576 _debug("LOOKUP \"%s\" in \"%s\"",
62577 cookie->def->name, object->cache->tag->name);
62578
62579- fscache_stat(&fscache_n_object_lookups);
62580+ fscache_stat_unchecked(&fscache_n_object_lookups);
62581 fscache_stat(&fscache_n_cop_lookup_object);
62582 ret = object->cache->ops->lookup_object(object);
62583 fscache_stat_d(&fscache_n_cop_lookup_object);
62584@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62585 if (ret == -ETIMEDOUT) {
62586 /* probably stuck behind another object, so move this one to
62587 * the back of the queue */
62588- fscache_stat(&fscache_n_object_lookups_timed_out);
62589+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
62590 _leave(" [timeout]");
62591 return NO_TRANSIT;
62592 }
62593@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
62594 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
62595
62596 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62597- fscache_stat(&fscache_n_object_lookups_negative);
62598+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
62599
62600 /* Allow write requests to begin stacking up and read requests to begin
62601 * returning ENODATA.
62602@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
62603 /* if we were still looking up, then we must have a positive lookup
62604 * result, in which case there may be data available */
62605 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62606- fscache_stat(&fscache_n_object_lookups_positive);
62607+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
62608
62609 /* We do (presumably) have data */
62610 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
62611@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
62612 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
62613 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
62614 } else {
62615- fscache_stat(&fscache_n_object_created);
62616+ fscache_stat_unchecked(&fscache_n_object_created);
62617 }
62618
62619 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
62620@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
62621 fscache_stat_d(&fscache_n_cop_lookup_complete);
62622
62623 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
62624- fscache_stat(&fscache_n_object_avail);
62625+ fscache_stat_unchecked(&fscache_n_object_avail);
62626
62627 _leave("");
62628 return transit_to(JUMPSTART_DEPS);
62629@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
62630
62631 /* this just shifts the object release to the work processor */
62632 fscache_put_object(object);
62633- fscache_stat(&fscache_n_object_dead);
62634+ fscache_stat_unchecked(&fscache_n_object_dead);
62635
62636 _leave("");
62637 return transit_to(OBJECT_DEAD);
62638@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62639 enum fscache_checkaux result;
62640
62641 if (!object->cookie->def->check_aux) {
62642- fscache_stat(&fscache_n_checkaux_none);
62643+ fscache_stat_unchecked(&fscache_n_checkaux_none);
62644 return FSCACHE_CHECKAUX_OKAY;
62645 }
62646
62647@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62648 switch (result) {
62649 /* entry okay as is */
62650 case FSCACHE_CHECKAUX_OKAY:
62651- fscache_stat(&fscache_n_checkaux_okay);
62652+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
62653 break;
62654
62655 /* entry requires update */
62656 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
62657- fscache_stat(&fscache_n_checkaux_update);
62658+ fscache_stat_unchecked(&fscache_n_checkaux_update);
62659 break;
62660
62661 /* entry requires deletion */
62662 case FSCACHE_CHECKAUX_OBSOLETE:
62663- fscache_stat(&fscache_n_checkaux_obsolete);
62664+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
62665 break;
62666
62667 default:
62668@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
62669 {
62670 const struct fscache_state *s;
62671
62672- fscache_stat(&fscache_n_invalidates_run);
62673+ fscache_stat_unchecked(&fscache_n_invalidates_run);
62674 fscache_stat(&fscache_n_cop_invalidate_object);
62675 s = _fscache_invalidate_object(object, event);
62676 fscache_stat_d(&fscache_n_cop_invalidate_object);
62677@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
62678 {
62679 _enter("{OBJ%x},%d", object->debug_id, event);
62680
62681- fscache_stat(&fscache_n_updates_run);
62682+ fscache_stat_unchecked(&fscache_n_updates_run);
62683 fscache_stat(&fscache_n_cop_update_object);
62684 object->cache->ops->update_object(object);
62685 fscache_stat_d(&fscache_n_cop_update_object);
62686diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
62687index e7b87a0..a85d47a 100644
62688--- a/fs/fscache/operation.c
62689+++ b/fs/fscache/operation.c
62690@@ -17,7 +17,7 @@
62691 #include <linux/slab.h>
62692 #include "internal.h"
62693
62694-atomic_t fscache_op_debug_id;
62695+atomic_unchecked_t fscache_op_debug_id;
62696 EXPORT_SYMBOL(fscache_op_debug_id);
62697
62698 /**
62699@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
62700 ASSERTCMP(atomic_read(&op->usage), >, 0);
62701 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
62702
62703- fscache_stat(&fscache_n_op_enqueue);
62704+ fscache_stat_unchecked(&fscache_n_op_enqueue);
62705 switch (op->flags & FSCACHE_OP_TYPE) {
62706 case FSCACHE_OP_ASYNC:
62707 _debug("queue async");
62708@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
62709 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
62710 if (op->processor)
62711 fscache_enqueue_operation(op);
62712- fscache_stat(&fscache_n_op_run);
62713+ fscache_stat_unchecked(&fscache_n_op_run);
62714 }
62715
62716 /*
62717@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62718 if (object->n_in_progress > 0) {
62719 atomic_inc(&op->usage);
62720 list_add_tail(&op->pend_link, &object->pending_ops);
62721- fscache_stat(&fscache_n_op_pend);
62722+ fscache_stat_unchecked(&fscache_n_op_pend);
62723 } else if (!list_empty(&object->pending_ops)) {
62724 atomic_inc(&op->usage);
62725 list_add_tail(&op->pend_link, &object->pending_ops);
62726- fscache_stat(&fscache_n_op_pend);
62727+ fscache_stat_unchecked(&fscache_n_op_pend);
62728 fscache_start_operations(object);
62729 } else {
62730 ASSERTCMP(object->n_in_progress, ==, 0);
62731@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62732 object->n_exclusive++; /* reads and writes must wait */
62733 atomic_inc(&op->usage);
62734 list_add_tail(&op->pend_link, &object->pending_ops);
62735- fscache_stat(&fscache_n_op_pend);
62736+ fscache_stat_unchecked(&fscache_n_op_pend);
62737 ret = 0;
62738 } else {
62739 /* If we're in any other state, there must have been an I/O
62740@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
62741 if (object->n_exclusive > 0) {
62742 atomic_inc(&op->usage);
62743 list_add_tail(&op->pend_link, &object->pending_ops);
62744- fscache_stat(&fscache_n_op_pend);
62745+ fscache_stat_unchecked(&fscache_n_op_pend);
62746 } else if (!list_empty(&object->pending_ops)) {
62747 atomic_inc(&op->usage);
62748 list_add_tail(&op->pend_link, &object->pending_ops);
62749- fscache_stat(&fscache_n_op_pend);
62750+ fscache_stat_unchecked(&fscache_n_op_pend);
62751 fscache_start_operations(object);
62752 } else {
62753 ASSERTCMP(object->n_exclusive, ==, 0);
62754@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
62755 object->n_ops++;
62756 atomic_inc(&op->usage);
62757 list_add_tail(&op->pend_link, &object->pending_ops);
62758- fscache_stat(&fscache_n_op_pend);
62759+ fscache_stat_unchecked(&fscache_n_op_pend);
62760 ret = 0;
62761 } else if (fscache_object_is_dying(object)) {
62762- fscache_stat(&fscache_n_op_rejected);
62763+ fscache_stat_unchecked(&fscache_n_op_rejected);
62764 op->state = FSCACHE_OP_ST_CANCELLED;
62765 ret = -ENOBUFS;
62766 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
62767@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
62768 ret = -EBUSY;
62769 if (op->state == FSCACHE_OP_ST_PENDING) {
62770 ASSERT(!list_empty(&op->pend_link));
62771- fscache_stat(&fscache_n_op_cancelled);
62772+ fscache_stat_unchecked(&fscache_n_op_cancelled);
62773 list_del_init(&op->pend_link);
62774 if (do_cancel)
62775 do_cancel(op);
62776@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
62777 while (!list_empty(&object->pending_ops)) {
62778 op = list_entry(object->pending_ops.next,
62779 struct fscache_operation, pend_link);
62780- fscache_stat(&fscache_n_op_cancelled);
62781+ fscache_stat_unchecked(&fscache_n_op_cancelled);
62782 list_del_init(&op->pend_link);
62783
62784 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
62785@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
62786 op->state, ==, FSCACHE_OP_ST_CANCELLED);
62787 op->state = FSCACHE_OP_ST_DEAD;
62788
62789- fscache_stat(&fscache_n_op_release);
62790+ fscache_stat_unchecked(&fscache_n_op_release);
62791
62792 if (op->release) {
62793 op->release(op);
62794@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
62795 * lock, and defer it otherwise */
62796 if (!spin_trylock(&object->lock)) {
62797 _debug("defer put");
62798- fscache_stat(&fscache_n_op_deferred_release);
62799+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
62800
62801 cache = object->cache;
62802 spin_lock(&cache->op_gc_list_lock);
62803@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
62804
62805 _debug("GC DEFERRED REL OBJ%x OP%x",
62806 object->debug_id, op->debug_id);
62807- fscache_stat(&fscache_n_op_gc);
62808+ fscache_stat_unchecked(&fscache_n_op_gc);
62809
62810 ASSERTCMP(atomic_read(&op->usage), ==, 0);
62811 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
62812diff --git a/fs/fscache/page.c b/fs/fscache/page.c
62813index de33b3f..8be4d29 100644
62814--- a/fs/fscache/page.c
62815+++ b/fs/fscache/page.c
62816@@ -74,7 +74,7 @@ try_again:
62817 val = radix_tree_lookup(&cookie->stores, page->index);
62818 if (!val) {
62819 rcu_read_unlock();
62820- fscache_stat(&fscache_n_store_vmscan_not_storing);
62821+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
62822 __fscache_uncache_page(cookie, page);
62823 return true;
62824 }
62825@@ -104,11 +104,11 @@ try_again:
62826 spin_unlock(&cookie->stores_lock);
62827
62828 if (xpage) {
62829- fscache_stat(&fscache_n_store_vmscan_cancelled);
62830- fscache_stat(&fscache_n_store_radix_deletes);
62831+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
62832+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62833 ASSERTCMP(xpage, ==, page);
62834 } else {
62835- fscache_stat(&fscache_n_store_vmscan_gone);
62836+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
62837 }
62838
62839 wake_up_bit(&cookie->flags, 0);
62840@@ -123,11 +123,11 @@ page_busy:
62841 * sleeping on memory allocation, so we may need to impose a timeout
62842 * too. */
62843 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
62844- fscache_stat(&fscache_n_store_vmscan_busy);
62845+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
62846 return false;
62847 }
62848
62849- fscache_stat(&fscache_n_store_vmscan_wait);
62850+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
62851 if (!release_page_wait_timeout(cookie, page))
62852 _debug("fscache writeout timeout page: %p{%lx}",
62853 page, page->index);
62854@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
62855 FSCACHE_COOKIE_STORING_TAG);
62856 if (!radix_tree_tag_get(&cookie->stores, page->index,
62857 FSCACHE_COOKIE_PENDING_TAG)) {
62858- fscache_stat(&fscache_n_store_radix_deletes);
62859+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62860 xpage = radix_tree_delete(&cookie->stores, page->index);
62861 }
62862 spin_unlock(&cookie->stores_lock);
62863@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
62864
62865 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
62866
62867- fscache_stat(&fscache_n_attr_changed_calls);
62868+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
62869
62870 if (fscache_object_is_active(object)) {
62871 fscache_stat(&fscache_n_cop_attr_changed);
62872@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62873
62874 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62875
62876- fscache_stat(&fscache_n_attr_changed);
62877+ fscache_stat_unchecked(&fscache_n_attr_changed);
62878
62879 op = kzalloc(sizeof(*op), GFP_KERNEL);
62880 if (!op) {
62881- fscache_stat(&fscache_n_attr_changed_nomem);
62882+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
62883 _leave(" = -ENOMEM");
62884 return -ENOMEM;
62885 }
62886@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62887 if (fscache_submit_exclusive_op(object, op) < 0)
62888 goto nobufs_dec;
62889 spin_unlock(&cookie->lock);
62890- fscache_stat(&fscache_n_attr_changed_ok);
62891+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
62892 fscache_put_operation(op);
62893 _leave(" = 0");
62894 return 0;
62895@@ -242,7 +242,7 @@ nobufs:
62896 kfree(op);
62897 if (wake_cookie)
62898 __fscache_wake_unused_cookie(cookie);
62899- fscache_stat(&fscache_n_attr_changed_nobufs);
62900+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
62901 _leave(" = %d", -ENOBUFS);
62902 return -ENOBUFS;
62903 }
62904@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
62905 /* allocate a retrieval operation and attempt to submit it */
62906 op = kzalloc(sizeof(*op), GFP_NOIO);
62907 if (!op) {
62908- fscache_stat(&fscache_n_retrievals_nomem);
62909+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62910 return NULL;
62911 }
62912
62913@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
62914 return 0;
62915 }
62916
62917- fscache_stat(&fscache_n_retrievals_wait);
62918+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
62919
62920 jif = jiffies;
62921 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
62922 TASK_INTERRUPTIBLE) != 0) {
62923- fscache_stat(&fscache_n_retrievals_intr);
62924+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
62925 _leave(" = -ERESTARTSYS");
62926 return -ERESTARTSYS;
62927 }
62928@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
62929 */
62930 int fscache_wait_for_operation_activation(struct fscache_object *object,
62931 struct fscache_operation *op,
62932- atomic_t *stat_op_waits,
62933- atomic_t *stat_object_dead,
62934+ atomic_unchecked_t *stat_op_waits,
62935+ atomic_unchecked_t *stat_object_dead,
62936 void (*do_cancel)(struct fscache_operation *))
62937 {
62938 int ret;
62939@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62940
62941 _debug(">>> WT");
62942 if (stat_op_waits)
62943- fscache_stat(stat_op_waits);
62944+ fscache_stat_unchecked(stat_op_waits);
62945 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
62946 TASK_INTERRUPTIBLE) != 0) {
62947 ret = fscache_cancel_op(op, do_cancel);
62948@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62949 check_if_dead:
62950 if (op->state == FSCACHE_OP_ST_CANCELLED) {
62951 if (stat_object_dead)
62952- fscache_stat(stat_object_dead);
62953+ fscache_stat_unchecked(stat_object_dead);
62954 _leave(" = -ENOBUFS [cancelled]");
62955 return -ENOBUFS;
62956 }
62957@@ -381,7 +381,7 @@ check_if_dead:
62958 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
62959 fscache_cancel_op(op, do_cancel);
62960 if (stat_object_dead)
62961- fscache_stat(stat_object_dead);
62962+ fscache_stat_unchecked(stat_object_dead);
62963 return -ENOBUFS;
62964 }
62965 return 0;
62966@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62967
62968 _enter("%p,%p,,,", cookie, page);
62969
62970- fscache_stat(&fscache_n_retrievals);
62971+ fscache_stat_unchecked(&fscache_n_retrievals);
62972
62973 if (hlist_empty(&cookie->backing_objects))
62974 goto nobufs;
62975@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62976 goto nobufs_unlock_dec;
62977 spin_unlock(&cookie->lock);
62978
62979- fscache_stat(&fscache_n_retrieval_ops);
62980+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
62981
62982 /* pin the netfs read context in case we need to do the actual netfs
62983 * read because we've encountered a cache read failure */
62984@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62985
62986 error:
62987 if (ret == -ENOMEM)
62988- fscache_stat(&fscache_n_retrievals_nomem);
62989+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62990 else if (ret == -ERESTARTSYS)
62991- fscache_stat(&fscache_n_retrievals_intr);
62992+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
62993 else if (ret == -ENODATA)
62994- fscache_stat(&fscache_n_retrievals_nodata);
62995+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62996 else if (ret < 0)
62997- fscache_stat(&fscache_n_retrievals_nobufs);
62998+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62999 else
63000- fscache_stat(&fscache_n_retrievals_ok);
63001+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
63002
63003 fscache_put_retrieval(op);
63004 _leave(" = %d", ret);
63005@@ -505,7 +505,7 @@ nobufs_unlock:
63006 __fscache_wake_unused_cookie(cookie);
63007 kfree(op);
63008 nobufs:
63009- fscache_stat(&fscache_n_retrievals_nobufs);
63010+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63011 _leave(" = -ENOBUFS");
63012 return -ENOBUFS;
63013 }
63014@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63015
63016 _enter("%p,,%d,,,", cookie, *nr_pages);
63017
63018- fscache_stat(&fscache_n_retrievals);
63019+ fscache_stat_unchecked(&fscache_n_retrievals);
63020
63021 if (hlist_empty(&cookie->backing_objects))
63022 goto nobufs;
63023@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63024 goto nobufs_unlock_dec;
63025 spin_unlock(&cookie->lock);
63026
63027- fscache_stat(&fscache_n_retrieval_ops);
63028+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
63029
63030 /* pin the netfs read context in case we need to do the actual netfs
63031 * read because we've encountered a cache read failure */
63032@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63033
63034 error:
63035 if (ret == -ENOMEM)
63036- fscache_stat(&fscache_n_retrievals_nomem);
63037+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63038 else if (ret == -ERESTARTSYS)
63039- fscache_stat(&fscache_n_retrievals_intr);
63040+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63041 else if (ret == -ENODATA)
63042- fscache_stat(&fscache_n_retrievals_nodata);
63043+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
63044 else if (ret < 0)
63045- fscache_stat(&fscache_n_retrievals_nobufs);
63046+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63047 else
63048- fscache_stat(&fscache_n_retrievals_ok);
63049+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
63050
63051 fscache_put_retrieval(op);
63052 _leave(" = %d", ret);
63053@@ -636,7 +636,7 @@ nobufs_unlock:
63054 if (wake_cookie)
63055 __fscache_wake_unused_cookie(cookie);
63056 nobufs:
63057- fscache_stat(&fscache_n_retrievals_nobufs);
63058+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63059 _leave(" = -ENOBUFS");
63060 return -ENOBUFS;
63061 }
63062@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63063
63064 _enter("%p,%p,,,", cookie, page);
63065
63066- fscache_stat(&fscache_n_allocs);
63067+ fscache_stat_unchecked(&fscache_n_allocs);
63068
63069 if (hlist_empty(&cookie->backing_objects))
63070 goto nobufs;
63071@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63072 goto nobufs_unlock_dec;
63073 spin_unlock(&cookie->lock);
63074
63075- fscache_stat(&fscache_n_alloc_ops);
63076+ fscache_stat_unchecked(&fscache_n_alloc_ops);
63077
63078 ret = fscache_wait_for_operation_activation(
63079 object, &op->op,
63080@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63081
63082 error:
63083 if (ret == -ERESTARTSYS)
63084- fscache_stat(&fscache_n_allocs_intr);
63085+ fscache_stat_unchecked(&fscache_n_allocs_intr);
63086 else if (ret < 0)
63087- fscache_stat(&fscache_n_allocs_nobufs);
63088+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63089 else
63090- fscache_stat(&fscache_n_allocs_ok);
63091+ fscache_stat_unchecked(&fscache_n_allocs_ok);
63092
63093 fscache_put_retrieval(op);
63094 _leave(" = %d", ret);
63095@@ -730,7 +730,7 @@ nobufs_unlock:
63096 if (wake_cookie)
63097 __fscache_wake_unused_cookie(cookie);
63098 nobufs:
63099- fscache_stat(&fscache_n_allocs_nobufs);
63100+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63101 _leave(" = -ENOBUFS");
63102 return -ENOBUFS;
63103 }
63104@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63105
63106 spin_lock(&cookie->stores_lock);
63107
63108- fscache_stat(&fscache_n_store_calls);
63109+ fscache_stat_unchecked(&fscache_n_store_calls);
63110
63111 /* find a page to store */
63112 page = NULL;
63113@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63114 page = results[0];
63115 _debug("gang %d [%lx]", n, page->index);
63116 if (page->index > op->store_limit) {
63117- fscache_stat(&fscache_n_store_pages_over_limit);
63118+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
63119 goto superseded;
63120 }
63121
63122@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63123 spin_unlock(&cookie->stores_lock);
63124 spin_unlock(&object->lock);
63125
63126- fscache_stat(&fscache_n_store_pages);
63127+ fscache_stat_unchecked(&fscache_n_store_pages);
63128 fscache_stat(&fscache_n_cop_write_page);
63129 ret = object->cache->ops->write_page(op, page);
63130 fscache_stat_d(&fscache_n_cop_write_page);
63131@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63132 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63133 ASSERT(PageFsCache(page));
63134
63135- fscache_stat(&fscache_n_stores);
63136+ fscache_stat_unchecked(&fscache_n_stores);
63137
63138 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
63139 _leave(" = -ENOBUFS [invalidating]");
63140@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63141 spin_unlock(&cookie->stores_lock);
63142 spin_unlock(&object->lock);
63143
63144- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
63145+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
63146 op->store_limit = object->store_limit;
63147
63148 __fscache_use_cookie(cookie);
63149@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63150
63151 spin_unlock(&cookie->lock);
63152 radix_tree_preload_end();
63153- fscache_stat(&fscache_n_store_ops);
63154- fscache_stat(&fscache_n_stores_ok);
63155+ fscache_stat_unchecked(&fscache_n_store_ops);
63156+ fscache_stat_unchecked(&fscache_n_stores_ok);
63157
63158 /* the work queue now carries its own ref on the object */
63159 fscache_put_operation(&op->op);
63160@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63161 return 0;
63162
63163 already_queued:
63164- fscache_stat(&fscache_n_stores_again);
63165+ fscache_stat_unchecked(&fscache_n_stores_again);
63166 already_pending:
63167 spin_unlock(&cookie->stores_lock);
63168 spin_unlock(&object->lock);
63169 spin_unlock(&cookie->lock);
63170 radix_tree_preload_end();
63171 kfree(op);
63172- fscache_stat(&fscache_n_stores_ok);
63173+ fscache_stat_unchecked(&fscache_n_stores_ok);
63174 _leave(" = 0");
63175 return 0;
63176
63177@@ -1039,14 +1039,14 @@ nobufs:
63178 kfree(op);
63179 if (wake_cookie)
63180 __fscache_wake_unused_cookie(cookie);
63181- fscache_stat(&fscache_n_stores_nobufs);
63182+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
63183 _leave(" = -ENOBUFS");
63184 return -ENOBUFS;
63185
63186 nomem_free:
63187 kfree(op);
63188 nomem:
63189- fscache_stat(&fscache_n_stores_oom);
63190+ fscache_stat_unchecked(&fscache_n_stores_oom);
63191 _leave(" = -ENOMEM");
63192 return -ENOMEM;
63193 }
63194@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
63195 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63196 ASSERTCMP(page, !=, NULL);
63197
63198- fscache_stat(&fscache_n_uncaches);
63199+ fscache_stat_unchecked(&fscache_n_uncaches);
63200
63201 /* cache withdrawal may beat us to it */
63202 if (!PageFsCache(page))
63203@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
63204 struct fscache_cookie *cookie = op->op.object->cookie;
63205
63206 #ifdef CONFIG_FSCACHE_STATS
63207- atomic_inc(&fscache_n_marks);
63208+ atomic_inc_unchecked(&fscache_n_marks);
63209 #endif
63210
63211 _debug("- mark %p{%lx}", page, page->index);
63212diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
63213index 40d13c7..ddf52b9 100644
63214--- a/fs/fscache/stats.c
63215+++ b/fs/fscache/stats.c
63216@@ -18,99 +18,99 @@
63217 /*
63218 * operation counters
63219 */
63220-atomic_t fscache_n_op_pend;
63221-atomic_t fscache_n_op_run;
63222-atomic_t fscache_n_op_enqueue;
63223-atomic_t fscache_n_op_requeue;
63224-atomic_t fscache_n_op_deferred_release;
63225-atomic_t fscache_n_op_release;
63226-atomic_t fscache_n_op_gc;
63227-atomic_t fscache_n_op_cancelled;
63228-atomic_t fscache_n_op_rejected;
63229+atomic_unchecked_t fscache_n_op_pend;
63230+atomic_unchecked_t fscache_n_op_run;
63231+atomic_unchecked_t fscache_n_op_enqueue;
63232+atomic_unchecked_t fscache_n_op_requeue;
63233+atomic_unchecked_t fscache_n_op_deferred_release;
63234+atomic_unchecked_t fscache_n_op_release;
63235+atomic_unchecked_t fscache_n_op_gc;
63236+atomic_unchecked_t fscache_n_op_cancelled;
63237+atomic_unchecked_t fscache_n_op_rejected;
63238
63239-atomic_t fscache_n_attr_changed;
63240-atomic_t fscache_n_attr_changed_ok;
63241-atomic_t fscache_n_attr_changed_nobufs;
63242-atomic_t fscache_n_attr_changed_nomem;
63243-atomic_t fscache_n_attr_changed_calls;
63244+atomic_unchecked_t fscache_n_attr_changed;
63245+atomic_unchecked_t fscache_n_attr_changed_ok;
63246+atomic_unchecked_t fscache_n_attr_changed_nobufs;
63247+atomic_unchecked_t fscache_n_attr_changed_nomem;
63248+atomic_unchecked_t fscache_n_attr_changed_calls;
63249
63250-atomic_t fscache_n_allocs;
63251-atomic_t fscache_n_allocs_ok;
63252-atomic_t fscache_n_allocs_wait;
63253-atomic_t fscache_n_allocs_nobufs;
63254-atomic_t fscache_n_allocs_intr;
63255-atomic_t fscache_n_allocs_object_dead;
63256-atomic_t fscache_n_alloc_ops;
63257-atomic_t fscache_n_alloc_op_waits;
63258+atomic_unchecked_t fscache_n_allocs;
63259+atomic_unchecked_t fscache_n_allocs_ok;
63260+atomic_unchecked_t fscache_n_allocs_wait;
63261+atomic_unchecked_t fscache_n_allocs_nobufs;
63262+atomic_unchecked_t fscache_n_allocs_intr;
63263+atomic_unchecked_t fscache_n_allocs_object_dead;
63264+atomic_unchecked_t fscache_n_alloc_ops;
63265+atomic_unchecked_t fscache_n_alloc_op_waits;
63266
63267-atomic_t fscache_n_retrievals;
63268-atomic_t fscache_n_retrievals_ok;
63269-atomic_t fscache_n_retrievals_wait;
63270-atomic_t fscache_n_retrievals_nodata;
63271-atomic_t fscache_n_retrievals_nobufs;
63272-atomic_t fscache_n_retrievals_intr;
63273-atomic_t fscache_n_retrievals_nomem;
63274-atomic_t fscache_n_retrievals_object_dead;
63275-atomic_t fscache_n_retrieval_ops;
63276-atomic_t fscache_n_retrieval_op_waits;
63277+atomic_unchecked_t fscache_n_retrievals;
63278+atomic_unchecked_t fscache_n_retrievals_ok;
63279+atomic_unchecked_t fscache_n_retrievals_wait;
63280+atomic_unchecked_t fscache_n_retrievals_nodata;
63281+atomic_unchecked_t fscache_n_retrievals_nobufs;
63282+atomic_unchecked_t fscache_n_retrievals_intr;
63283+atomic_unchecked_t fscache_n_retrievals_nomem;
63284+atomic_unchecked_t fscache_n_retrievals_object_dead;
63285+atomic_unchecked_t fscache_n_retrieval_ops;
63286+atomic_unchecked_t fscache_n_retrieval_op_waits;
63287
63288-atomic_t fscache_n_stores;
63289-atomic_t fscache_n_stores_ok;
63290-atomic_t fscache_n_stores_again;
63291-atomic_t fscache_n_stores_nobufs;
63292-atomic_t fscache_n_stores_oom;
63293-atomic_t fscache_n_store_ops;
63294-atomic_t fscache_n_store_calls;
63295-atomic_t fscache_n_store_pages;
63296-atomic_t fscache_n_store_radix_deletes;
63297-atomic_t fscache_n_store_pages_over_limit;
63298+atomic_unchecked_t fscache_n_stores;
63299+atomic_unchecked_t fscache_n_stores_ok;
63300+atomic_unchecked_t fscache_n_stores_again;
63301+atomic_unchecked_t fscache_n_stores_nobufs;
63302+atomic_unchecked_t fscache_n_stores_oom;
63303+atomic_unchecked_t fscache_n_store_ops;
63304+atomic_unchecked_t fscache_n_store_calls;
63305+atomic_unchecked_t fscache_n_store_pages;
63306+atomic_unchecked_t fscache_n_store_radix_deletes;
63307+atomic_unchecked_t fscache_n_store_pages_over_limit;
63308
63309-atomic_t fscache_n_store_vmscan_not_storing;
63310-atomic_t fscache_n_store_vmscan_gone;
63311-atomic_t fscache_n_store_vmscan_busy;
63312-atomic_t fscache_n_store_vmscan_cancelled;
63313-atomic_t fscache_n_store_vmscan_wait;
63314+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63315+atomic_unchecked_t fscache_n_store_vmscan_gone;
63316+atomic_unchecked_t fscache_n_store_vmscan_busy;
63317+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63318+atomic_unchecked_t fscache_n_store_vmscan_wait;
63319
63320-atomic_t fscache_n_marks;
63321-atomic_t fscache_n_uncaches;
63322+atomic_unchecked_t fscache_n_marks;
63323+atomic_unchecked_t fscache_n_uncaches;
63324
63325-atomic_t fscache_n_acquires;
63326-atomic_t fscache_n_acquires_null;
63327-atomic_t fscache_n_acquires_no_cache;
63328-atomic_t fscache_n_acquires_ok;
63329-atomic_t fscache_n_acquires_nobufs;
63330-atomic_t fscache_n_acquires_oom;
63331+atomic_unchecked_t fscache_n_acquires;
63332+atomic_unchecked_t fscache_n_acquires_null;
63333+atomic_unchecked_t fscache_n_acquires_no_cache;
63334+atomic_unchecked_t fscache_n_acquires_ok;
63335+atomic_unchecked_t fscache_n_acquires_nobufs;
63336+atomic_unchecked_t fscache_n_acquires_oom;
63337
63338-atomic_t fscache_n_invalidates;
63339-atomic_t fscache_n_invalidates_run;
63340+atomic_unchecked_t fscache_n_invalidates;
63341+atomic_unchecked_t fscache_n_invalidates_run;
63342
63343-atomic_t fscache_n_updates;
63344-atomic_t fscache_n_updates_null;
63345-atomic_t fscache_n_updates_run;
63346+atomic_unchecked_t fscache_n_updates;
63347+atomic_unchecked_t fscache_n_updates_null;
63348+atomic_unchecked_t fscache_n_updates_run;
63349
63350-atomic_t fscache_n_relinquishes;
63351-atomic_t fscache_n_relinquishes_null;
63352-atomic_t fscache_n_relinquishes_waitcrt;
63353-atomic_t fscache_n_relinquishes_retire;
63354+atomic_unchecked_t fscache_n_relinquishes;
63355+atomic_unchecked_t fscache_n_relinquishes_null;
63356+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63357+atomic_unchecked_t fscache_n_relinquishes_retire;
63358
63359-atomic_t fscache_n_cookie_index;
63360-atomic_t fscache_n_cookie_data;
63361-atomic_t fscache_n_cookie_special;
63362+atomic_unchecked_t fscache_n_cookie_index;
63363+atomic_unchecked_t fscache_n_cookie_data;
63364+atomic_unchecked_t fscache_n_cookie_special;
63365
63366-atomic_t fscache_n_object_alloc;
63367-atomic_t fscache_n_object_no_alloc;
63368-atomic_t fscache_n_object_lookups;
63369-atomic_t fscache_n_object_lookups_negative;
63370-atomic_t fscache_n_object_lookups_positive;
63371-atomic_t fscache_n_object_lookups_timed_out;
63372-atomic_t fscache_n_object_created;
63373-atomic_t fscache_n_object_avail;
63374-atomic_t fscache_n_object_dead;
63375+atomic_unchecked_t fscache_n_object_alloc;
63376+atomic_unchecked_t fscache_n_object_no_alloc;
63377+atomic_unchecked_t fscache_n_object_lookups;
63378+atomic_unchecked_t fscache_n_object_lookups_negative;
63379+atomic_unchecked_t fscache_n_object_lookups_positive;
63380+atomic_unchecked_t fscache_n_object_lookups_timed_out;
63381+atomic_unchecked_t fscache_n_object_created;
63382+atomic_unchecked_t fscache_n_object_avail;
63383+atomic_unchecked_t fscache_n_object_dead;
63384
63385-atomic_t fscache_n_checkaux_none;
63386-atomic_t fscache_n_checkaux_okay;
63387-atomic_t fscache_n_checkaux_update;
63388-atomic_t fscache_n_checkaux_obsolete;
63389+atomic_unchecked_t fscache_n_checkaux_none;
63390+atomic_unchecked_t fscache_n_checkaux_okay;
63391+atomic_unchecked_t fscache_n_checkaux_update;
63392+atomic_unchecked_t fscache_n_checkaux_obsolete;
63393
63394 atomic_t fscache_n_cop_alloc_object;
63395 atomic_t fscache_n_cop_lookup_object;
63396@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
63397 seq_puts(m, "FS-Cache statistics\n");
63398
63399 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
63400- atomic_read(&fscache_n_cookie_index),
63401- atomic_read(&fscache_n_cookie_data),
63402- atomic_read(&fscache_n_cookie_special));
63403+ atomic_read_unchecked(&fscache_n_cookie_index),
63404+ atomic_read_unchecked(&fscache_n_cookie_data),
63405+ atomic_read_unchecked(&fscache_n_cookie_special));
63406
63407 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
63408- atomic_read(&fscache_n_object_alloc),
63409- atomic_read(&fscache_n_object_no_alloc),
63410- atomic_read(&fscache_n_object_avail),
63411- atomic_read(&fscache_n_object_dead));
63412+ atomic_read_unchecked(&fscache_n_object_alloc),
63413+ atomic_read_unchecked(&fscache_n_object_no_alloc),
63414+ atomic_read_unchecked(&fscache_n_object_avail),
63415+ atomic_read_unchecked(&fscache_n_object_dead));
63416 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
63417- atomic_read(&fscache_n_checkaux_none),
63418- atomic_read(&fscache_n_checkaux_okay),
63419- atomic_read(&fscache_n_checkaux_update),
63420- atomic_read(&fscache_n_checkaux_obsolete));
63421+ atomic_read_unchecked(&fscache_n_checkaux_none),
63422+ atomic_read_unchecked(&fscache_n_checkaux_okay),
63423+ atomic_read_unchecked(&fscache_n_checkaux_update),
63424+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
63425
63426 seq_printf(m, "Pages : mrk=%u unc=%u\n",
63427- atomic_read(&fscache_n_marks),
63428- atomic_read(&fscache_n_uncaches));
63429+ atomic_read_unchecked(&fscache_n_marks),
63430+ atomic_read_unchecked(&fscache_n_uncaches));
63431
63432 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
63433 " oom=%u\n",
63434- atomic_read(&fscache_n_acquires),
63435- atomic_read(&fscache_n_acquires_null),
63436- atomic_read(&fscache_n_acquires_no_cache),
63437- atomic_read(&fscache_n_acquires_ok),
63438- atomic_read(&fscache_n_acquires_nobufs),
63439- atomic_read(&fscache_n_acquires_oom));
63440+ atomic_read_unchecked(&fscache_n_acquires),
63441+ atomic_read_unchecked(&fscache_n_acquires_null),
63442+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
63443+ atomic_read_unchecked(&fscache_n_acquires_ok),
63444+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
63445+ atomic_read_unchecked(&fscache_n_acquires_oom));
63446
63447 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
63448- atomic_read(&fscache_n_object_lookups),
63449- atomic_read(&fscache_n_object_lookups_negative),
63450- atomic_read(&fscache_n_object_lookups_positive),
63451- atomic_read(&fscache_n_object_created),
63452- atomic_read(&fscache_n_object_lookups_timed_out));
63453+ atomic_read_unchecked(&fscache_n_object_lookups),
63454+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
63455+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
63456+ atomic_read_unchecked(&fscache_n_object_created),
63457+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
63458
63459 seq_printf(m, "Invals : n=%u run=%u\n",
63460- atomic_read(&fscache_n_invalidates),
63461- atomic_read(&fscache_n_invalidates_run));
63462+ atomic_read_unchecked(&fscache_n_invalidates),
63463+ atomic_read_unchecked(&fscache_n_invalidates_run));
63464
63465 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
63466- atomic_read(&fscache_n_updates),
63467- atomic_read(&fscache_n_updates_null),
63468- atomic_read(&fscache_n_updates_run));
63469+ atomic_read_unchecked(&fscache_n_updates),
63470+ atomic_read_unchecked(&fscache_n_updates_null),
63471+ atomic_read_unchecked(&fscache_n_updates_run));
63472
63473 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
63474- atomic_read(&fscache_n_relinquishes),
63475- atomic_read(&fscache_n_relinquishes_null),
63476- atomic_read(&fscache_n_relinquishes_waitcrt),
63477- atomic_read(&fscache_n_relinquishes_retire));
63478+ atomic_read_unchecked(&fscache_n_relinquishes),
63479+ atomic_read_unchecked(&fscache_n_relinquishes_null),
63480+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
63481+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
63482
63483 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
63484- atomic_read(&fscache_n_attr_changed),
63485- atomic_read(&fscache_n_attr_changed_ok),
63486- atomic_read(&fscache_n_attr_changed_nobufs),
63487- atomic_read(&fscache_n_attr_changed_nomem),
63488- atomic_read(&fscache_n_attr_changed_calls));
63489+ atomic_read_unchecked(&fscache_n_attr_changed),
63490+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
63491+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
63492+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
63493+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
63494
63495 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
63496- atomic_read(&fscache_n_allocs),
63497- atomic_read(&fscache_n_allocs_ok),
63498- atomic_read(&fscache_n_allocs_wait),
63499- atomic_read(&fscache_n_allocs_nobufs),
63500- atomic_read(&fscache_n_allocs_intr));
63501+ atomic_read_unchecked(&fscache_n_allocs),
63502+ atomic_read_unchecked(&fscache_n_allocs_ok),
63503+ atomic_read_unchecked(&fscache_n_allocs_wait),
63504+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
63505+ atomic_read_unchecked(&fscache_n_allocs_intr));
63506 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
63507- atomic_read(&fscache_n_alloc_ops),
63508- atomic_read(&fscache_n_alloc_op_waits),
63509- atomic_read(&fscache_n_allocs_object_dead));
63510+ atomic_read_unchecked(&fscache_n_alloc_ops),
63511+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
63512+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
63513
63514 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
63515 " int=%u oom=%u\n",
63516- atomic_read(&fscache_n_retrievals),
63517- atomic_read(&fscache_n_retrievals_ok),
63518- atomic_read(&fscache_n_retrievals_wait),
63519- atomic_read(&fscache_n_retrievals_nodata),
63520- atomic_read(&fscache_n_retrievals_nobufs),
63521- atomic_read(&fscache_n_retrievals_intr),
63522- atomic_read(&fscache_n_retrievals_nomem));
63523+ atomic_read_unchecked(&fscache_n_retrievals),
63524+ atomic_read_unchecked(&fscache_n_retrievals_ok),
63525+ atomic_read_unchecked(&fscache_n_retrievals_wait),
63526+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
63527+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
63528+ atomic_read_unchecked(&fscache_n_retrievals_intr),
63529+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
63530 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
63531- atomic_read(&fscache_n_retrieval_ops),
63532- atomic_read(&fscache_n_retrieval_op_waits),
63533- atomic_read(&fscache_n_retrievals_object_dead));
63534+ atomic_read_unchecked(&fscache_n_retrieval_ops),
63535+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
63536+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
63537
63538 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
63539- atomic_read(&fscache_n_stores),
63540- atomic_read(&fscache_n_stores_ok),
63541- atomic_read(&fscache_n_stores_again),
63542- atomic_read(&fscache_n_stores_nobufs),
63543- atomic_read(&fscache_n_stores_oom));
63544+ atomic_read_unchecked(&fscache_n_stores),
63545+ atomic_read_unchecked(&fscache_n_stores_ok),
63546+ atomic_read_unchecked(&fscache_n_stores_again),
63547+ atomic_read_unchecked(&fscache_n_stores_nobufs),
63548+ atomic_read_unchecked(&fscache_n_stores_oom));
63549 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
63550- atomic_read(&fscache_n_store_ops),
63551- atomic_read(&fscache_n_store_calls),
63552- atomic_read(&fscache_n_store_pages),
63553- atomic_read(&fscache_n_store_radix_deletes),
63554- atomic_read(&fscache_n_store_pages_over_limit));
63555+ atomic_read_unchecked(&fscache_n_store_ops),
63556+ atomic_read_unchecked(&fscache_n_store_calls),
63557+ atomic_read_unchecked(&fscache_n_store_pages),
63558+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
63559+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
63560
63561 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
63562- atomic_read(&fscache_n_store_vmscan_not_storing),
63563- atomic_read(&fscache_n_store_vmscan_gone),
63564- atomic_read(&fscache_n_store_vmscan_busy),
63565- atomic_read(&fscache_n_store_vmscan_cancelled),
63566- atomic_read(&fscache_n_store_vmscan_wait));
63567+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
63568+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
63569+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
63570+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
63571+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
63572
63573 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
63574- atomic_read(&fscache_n_op_pend),
63575- atomic_read(&fscache_n_op_run),
63576- atomic_read(&fscache_n_op_enqueue),
63577- atomic_read(&fscache_n_op_cancelled),
63578- atomic_read(&fscache_n_op_rejected));
63579+ atomic_read_unchecked(&fscache_n_op_pend),
63580+ atomic_read_unchecked(&fscache_n_op_run),
63581+ atomic_read_unchecked(&fscache_n_op_enqueue),
63582+ atomic_read_unchecked(&fscache_n_op_cancelled),
63583+ atomic_read_unchecked(&fscache_n_op_rejected));
63584 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
63585- atomic_read(&fscache_n_op_deferred_release),
63586- atomic_read(&fscache_n_op_release),
63587- atomic_read(&fscache_n_op_gc));
63588+ atomic_read_unchecked(&fscache_n_op_deferred_release),
63589+ atomic_read_unchecked(&fscache_n_op_release),
63590+ atomic_read_unchecked(&fscache_n_op_gc));
63591
63592 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
63593 atomic_read(&fscache_n_cop_alloc_object),
63594diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
63595index 966ace8..030a03a 100644
63596--- a/fs/fuse/cuse.c
63597+++ b/fs/fuse/cuse.c
63598@@ -611,10 +611,12 @@ static int __init cuse_init(void)
63599 INIT_LIST_HEAD(&cuse_conntbl[i]);
63600
63601 /* inherit and extend fuse_dev_operations */
63602- cuse_channel_fops = fuse_dev_operations;
63603- cuse_channel_fops.owner = THIS_MODULE;
63604- cuse_channel_fops.open = cuse_channel_open;
63605- cuse_channel_fops.release = cuse_channel_release;
63606+ pax_open_kernel();
63607+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
63608+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
63609+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
63610+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
63611+ pax_close_kernel();
63612
63613 cuse_class = class_create(THIS_MODULE, "cuse");
63614 if (IS_ERR(cuse_class))
63615diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
63616index ca88731..8e9c55d 100644
63617--- a/fs/fuse/dev.c
63618+++ b/fs/fuse/dev.c
63619@@ -1318,7 +1318,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63620 ret = 0;
63621 pipe_lock(pipe);
63622
63623- if (!pipe->readers) {
63624+ if (!atomic_read(&pipe->readers)) {
63625 send_sig(SIGPIPE, current, 0);
63626 if (!ret)
63627 ret = -EPIPE;
63628@@ -1347,7 +1347,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63629 page_nr++;
63630 ret += buf->len;
63631
63632- if (pipe->files)
63633+ if (atomic_read(&pipe->files))
63634 do_wakeup = 1;
63635 }
63636
63637diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
63638index dbab798..fefa22b 100644
63639--- a/fs/fuse/dir.c
63640+++ b/fs/fuse/dir.c
63641@@ -1474,7 +1474,7 @@ static char *read_link(struct dentry *dentry)
63642 return link;
63643 }
63644
63645-static void free_link(char *link)
63646+static void free_link(const char *link)
63647 {
63648 if (!IS_ERR(link))
63649 free_page((unsigned long) link);
63650diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
63651index fd62cae..3494dfa 100644
63652--- a/fs/hostfs/hostfs_kern.c
63653+++ b/fs/hostfs/hostfs_kern.c
63654@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
63655
63656 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
63657 {
63658- char *s = nd_get_link(nd);
63659+ const char *s = nd_get_link(nd);
63660 if (!IS_ERR(s))
63661 __putname(s);
63662 }
63663diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
63664index 1e2872b..7aea000 100644
63665--- a/fs/hugetlbfs/inode.c
63666+++ b/fs/hugetlbfs/inode.c
63667@@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63668 struct mm_struct *mm = current->mm;
63669 struct vm_area_struct *vma;
63670 struct hstate *h = hstate_file(file);
63671+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
63672 struct vm_unmapped_area_info info;
63673
63674 if (len & ~huge_page_mask(h))
63675@@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63676 return addr;
63677 }
63678
63679+#ifdef CONFIG_PAX_RANDMMAP
63680+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
63681+#endif
63682+
63683 if (addr) {
63684 addr = ALIGN(addr, huge_page_size(h));
63685 vma = find_vma(mm, addr);
63686- if (TASK_SIZE - len >= addr &&
63687- (!vma || addr + len <= vma->vm_start))
63688+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
63689 return addr;
63690 }
63691
63692 info.flags = 0;
63693 info.length = len;
63694 info.low_limit = TASK_UNMAPPED_BASE;
63695+
63696+#ifdef CONFIG_PAX_RANDMMAP
63697+ if (mm->pax_flags & MF_PAX_RANDMMAP)
63698+ info.low_limit += mm->delta_mmap;
63699+#endif
63700+
63701 info.high_limit = TASK_SIZE;
63702 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
63703 info.align_offset = 0;
63704@@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
63705 };
63706 MODULE_ALIAS_FS("hugetlbfs");
63707
63708-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63709+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63710
63711 static int can_do_hugetlb_shm(void)
63712 {
63713diff --git a/fs/inode.c b/fs/inode.c
63714index 26753ba..d19eb34 100644
63715--- a/fs/inode.c
63716+++ b/fs/inode.c
63717@@ -840,16 +840,20 @@ unsigned int get_next_ino(void)
63718 unsigned int *p = &get_cpu_var(last_ino);
63719 unsigned int res = *p;
63720
63721+start:
63722+
63723 #ifdef CONFIG_SMP
63724 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
63725- static atomic_t shared_last_ino;
63726- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
63727+ static atomic_unchecked_t shared_last_ino;
63728+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
63729
63730 res = next - LAST_INO_BATCH;
63731 }
63732 #endif
63733
63734- *p = ++res;
63735+ if (unlikely(!++res))
63736+ goto start; /* never zero */
63737+ *p = res;
63738 put_cpu_var(last_ino);
63739 return res;
63740 }
63741diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
63742index 4a6cf28..d3a29d3 100644
63743--- a/fs/jffs2/erase.c
63744+++ b/fs/jffs2/erase.c
63745@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
63746 struct jffs2_unknown_node marker = {
63747 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
63748 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63749- .totlen = cpu_to_je32(c->cleanmarker_size)
63750+ .totlen = cpu_to_je32(c->cleanmarker_size),
63751+ .hdr_crc = cpu_to_je32(0)
63752 };
63753
63754 jffs2_prealloc_raw_node_refs(c, jeb, 1);
63755diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
63756index 09ed551..45684f8 100644
63757--- a/fs/jffs2/wbuf.c
63758+++ b/fs/jffs2/wbuf.c
63759@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
63760 {
63761 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
63762 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63763- .totlen = constant_cpu_to_je32(8)
63764+ .totlen = constant_cpu_to_je32(8),
63765+ .hdr_crc = constant_cpu_to_je32(0)
63766 };
63767
63768 /*
63769diff --git a/fs/jfs/super.c b/fs/jfs/super.c
63770index 93e897e..a863de4 100644
63771--- a/fs/jfs/super.c
63772+++ b/fs/jfs/super.c
63773@@ -893,7 +893,7 @@ static int __init init_jfs_fs(void)
63774
63775 jfs_inode_cachep =
63776 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
63777- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
63778+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
63779 init_once);
63780 if (jfs_inode_cachep == NULL)
63781 return -ENOMEM;
63782diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
63783index 1c77193..ba73e66 100644
63784--- a/fs/kernfs/dir.c
63785+++ b/fs/kernfs/dir.c
63786@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
63787 *
63788 * Returns 31 bit hash of ns + name (so it fits in an off_t )
63789 */
63790-static unsigned int kernfs_name_hash(const char *name, const void *ns)
63791+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
63792 {
63793 unsigned long hash = init_name_hash();
63794 unsigned int len = strlen(name);
63795@@ -829,6 +829,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
63796 ret = scops->mkdir(parent, dentry->d_name.name, mode);
63797
63798 kernfs_put_active(parent);
63799+
63800+ if (!ret) {
63801+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
63802+ ret = PTR_ERR_OR_ZERO(dentry_ret);
63803+ }
63804+
63805 return ret;
63806 }
63807
63808diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
63809index 4429d6d..9831f52 100644
63810--- a/fs/kernfs/file.c
63811+++ b/fs/kernfs/file.c
63812@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
63813
63814 struct kernfs_open_node {
63815 atomic_t refcnt;
63816- atomic_t event;
63817+ atomic_unchecked_t event;
63818 wait_queue_head_t poll;
63819 struct list_head files; /* goes through kernfs_open_file.list */
63820 };
63821@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
63822 {
63823 struct kernfs_open_file *of = sf->private;
63824
63825- of->event = atomic_read(&of->kn->attr.open->event);
63826+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
63827
63828 return of->kn->attr.ops->seq_show(sf, v);
63829 }
63830@@ -375,12 +375,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
63831 return ret;
63832 }
63833
63834-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63835- void *buf, int len, int write)
63836+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63837+ void *buf, size_t len, int write)
63838 {
63839 struct file *file = vma->vm_file;
63840 struct kernfs_open_file *of = kernfs_of(file);
63841- int ret;
63842+ ssize_t ret;
63843
63844 if (!of->vm_ops)
63845 return -EINVAL;
63846@@ -581,7 +581,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
63847 return -ENOMEM;
63848
63849 atomic_set(&new_on->refcnt, 0);
63850- atomic_set(&new_on->event, 1);
63851+ atomic_set_unchecked(&new_on->event, 1);
63852 init_waitqueue_head(&new_on->poll);
63853 INIT_LIST_HEAD(&new_on->files);
63854 goto retry;
63855@@ -787,7 +787,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
63856
63857 kernfs_put_active(kn);
63858
63859- if (of->event != atomic_read(&on->event))
63860+ if (of->event != atomic_read_unchecked(&on->event))
63861 goto trigger;
63862
63863 return DEFAULT_POLLMASK;
63864@@ -818,7 +818,7 @@ repeat:
63865
63866 on = kn->attr.open;
63867 if (on) {
63868- atomic_inc(&on->event);
63869+ atomic_inc_unchecked(&on->event);
63870 wake_up_interruptible(&on->poll);
63871 }
63872
63873diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
63874index 8a19889..4c3069a 100644
63875--- a/fs/kernfs/symlink.c
63876+++ b/fs/kernfs/symlink.c
63877@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
63878 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
63879 void *cookie)
63880 {
63881- char *page = nd_get_link(nd);
63882+ const char *page = nd_get_link(nd);
63883 if (!IS_ERR(page))
63884 free_page((unsigned long)page);
63885 }
63886diff --git a/fs/libfs.c b/fs/libfs.c
63887index 005843c..06c4191 100644
63888--- a/fs/libfs.c
63889+++ b/fs/libfs.c
63890@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63891
63892 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
63893 struct dentry *next = list_entry(p, struct dentry, d_child);
63894+ char d_name[sizeof(next->d_iname)];
63895+ const unsigned char *name;
63896+
63897 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
63898 if (!simple_positive(next)) {
63899 spin_unlock(&next->d_lock);
63900@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63901
63902 spin_unlock(&next->d_lock);
63903 spin_unlock(&dentry->d_lock);
63904- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
63905+ name = next->d_name.name;
63906+ if (name == next->d_iname) {
63907+ memcpy(d_name, name, next->d_name.len);
63908+ name = d_name;
63909+ }
63910+ if (!dir_emit(ctx, name, next->d_name.len,
63911 next->d_inode->i_ino, dt_type(next->d_inode)))
63912 return 0;
63913 spin_lock(&dentry->d_lock);
63914@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
63915 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
63916 void *cookie)
63917 {
63918- char *s = nd_get_link(nd);
63919+ const char *s = nd_get_link(nd);
63920 if (!IS_ERR(s))
63921 kfree(s);
63922 }
63923diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
63924index acd3947..1f896e2 100644
63925--- a/fs/lockd/clntproc.c
63926+++ b/fs/lockd/clntproc.c
63927@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
63928 /*
63929 * Cookie counter for NLM requests
63930 */
63931-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
63932+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
63933
63934 void nlmclnt_next_cookie(struct nlm_cookie *c)
63935 {
63936- u32 cookie = atomic_inc_return(&nlm_cookie);
63937+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
63938
63939 memcpy(c->data, &cookie, 4);
63940 c->len=4;
63941diff --git a/fs/locks.c b/fs/locks.c
63942index 59e2f90..bd69071 100644
63943--- a/fs/locks.c
63944+++ b/fs/locks.c
63945@@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
63946 locks_remove_posix(filp, filp);
63947
63948 if (filp->f_op->flock) {
63949- struct file_lock fl = {
63950+ struct file_lock flock = {
63951 .fl_owner = filp,
63952 .fl_pid = current->tgid,
63953 .fl_file = filp,
63954@@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
63955 .fl_type = F_UNLCK,
63956 .fl_end = OFFSET_MAX,
63957 };
63958- filp->f_op->flock(filp, F_SETLKW, &fl);
63959- if (fl.fl_ops && fl.fl_ops->fl_release_private)
63960- fl.fl_ops->fl_release_private(&fl);
63961+ filp->f_op->flock(filp, F_SETLKW, &flock);
63962+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
63963+ flock.fl_ops->fl_release_private(&flock);
63964 }
63965
63966 spin_lock(&inode->i_lock);
63967diff --git a/fs/mount.h b/fs/mount.h
63968index f82c628..9492b99 100644
63969--- a/fs/mount.h
63970+++ b/fs/mount.h
63971@@ -11,7 +11,7 @@ struct mnt_namespace {
63972 u64 seq; /* Sequence number to prevent loops */
63973 wait_queue_head_t poll;
63974 u64 event;
63975-};
63976+} __randomize_layout;
63977
63978 struct mnt_pcp {
63979 int mnt_count;
63980@@ -62,7 +62,7 @@ struct mount {
63981 int mnt_expiry_mark; /* true if marked for expiry */
63982 struct hlist_head mnt_pins;
63983 struct path mnt_ex_mountpoint;
63984-};
63985+} __randomize_layout;
63986
63987 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
63988
63989diff --git a/fs/namei.c b/fs/namei.c
63990index db5fe86..ac769e4 100644
63991--- a/fs/namei.c
63992+++ b/fs/namei.c
63993@@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
63994 if (ret != -EACCES)
63995 return ret;
63996
63997+#ifdef CONFIG_GRKERNSEC
63998+ /* we'll block if we have to log due to a denied capability use */
63999+ if (mask & MAY_NOT_BLOCK)
64000+ return -ECHILD;
64001+#endif
64002+
64003 if (S_ISDIR(inode->i_mode)) {
64004 /* DACs are overridable for directories */
64005- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64006- return 0;
64007 if (!(mask & MAY_WRITE))
64008- if (capable_wrt_inode_uidgid(inode,
64009- CAP_DAC_READ_SEARCH))
64010+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
64011+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64012 return 0;
64013+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64014+ return 0;
64015 return -EACCES;
64016 }
64017 /*
64018+ * Searching includes executable on directories, else just read.
64019+ */
64020+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
64021+ if (mask == MAY_READ)
64022+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
64023+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64024+ return 0;
64025+
64026+ /*
64027 * Read/write DACs are always overridable.
64028 * Executable DACs are overridable when there is
64029 * at least one exec bit set.
64030@@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
64031 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64032 return 0;
64033
64034- /*
64035- * Searching includes executable on directories, else just read.
64036- */
64037- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
64038- if (mask == MAY_READ)
64039- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64040- return 0;
64041-
64042 return -EACCES;
64043 }
64044 EXPORT_SYMBOL(generic_permission);
64045@@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
64046 {
64047 struct dentry *dentry = link->dentry;
64048 int error;
64049- char *s;
64050+ const char *s;
64051
64052 BUG_ON(nd->flags & LOOKUP_RCU);
64053
64054@@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
64055 if (error)
64056 goto out_put_nd_path;
64057
64058+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
64059+ dentry->d_inode, dentry, nd->path.mnt)) {
64060+ error = -EACCES;
64061+ goto out_put_nd_path;
64062+ }
64063+
64064 nd->last_type = LAST_BIND;
64065 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
64066 error = PTR_ERR(*p);
64067@@ -1608,6 +1621,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
64068 if (res)
64069 break;
64070 res = walk_component(nd, path, LOOKUP_FOLLOW);
64071+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
64072+ res = -EACCES;
64073 put_link(nd, &link, cookie);
64074 } while (res > 0);
64075
64076@@ -1680,7 +1695,7 @@ EXPORT_SYMBOL(full_name_hash);
64077 static inline u64 hash_name(const char *name)
64078 {
64079 unsigned long a, b, adata, bdata, mask, hash, len;
64080- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
64081+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
64082
64083 hash = a = 0;
64084 len = -sizeof(unsigned long);
64085@@ -1969,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
64086 if (err)
64087 break;
64088 err = lookup_last(nd, &path);
64089+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
64090+ err = -EACCES;
64091 put_link(nd, &link, cookie);
64092 }
64093 }
64094@@ -1976,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
64095 if (!err)
64096 err = complete_walk(nd);
64097
64098+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
64099+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64100+ path_put(&nd->path);
64101+ err = -ENOENT;
64102+ }
64103+ }
64104+
64105 if (!err && nd->flags & LOOKUP_DIRECTORY) {
64106 if (!d_can_lookup(nd->path.dentry)) {
64107 path_put(&nd->path);
64108@@ -2004,8 +2028,15 @@ static int filename_lookup(int dfd, struct filename *name,
64109 retval = path_lookupat(dfd, name->name,
64110 flags | LOOKUP_REVAL, nd);
64111
64112- if (likely(!retval))
64113+ if (likely(!retval)) {
64114 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
64115+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
64116+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
64117+ path_put(&nd->path);
64118+ return -ENOENT;
64119+ }
64120+ }
64121+ }
64122 return retval;
64123 }
64124
64125@@ -2582,6 +2613,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
64126 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
64127 return -EPERM;
64128
64129+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
64130+ return -EPERM;
64131+ if (gr_handle_rawio(inode))
64132+ return -EPERM;
64133+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
64134+ return -EACCES;
64135+
64136 return 0;
64137 }
64138
64139@@ -2813,7 +2851,7 @@ looked_up:
64140 * cleared otherwise prior to returning.
64141 */
64142 static int lookup_open(struct nameidata *nd, struct path *path,
64143- struct file *file,
64144+ struct path *link, struct file *file,
64145 const struct open_flags *op,
64146 bool got_write, int *opened)
64147 {
64148@@ -2848,6 +2886,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
64149 /* Negative dentry, just create the file */
64150 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
64151 umode_t mode = op->mode;
64152+
64153+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
64154+ error = -EACCES;
64155+ goto out_dput;
64156+ }
64157+
64158+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
64159+ error = -EACCES;
64160+ goto out_dput;
64161+ }
64162+
64163 if (!IS_POSIXACL(dir->d_inode))
64164 mode &= ~current_umask();
64165 /*
64166@@ -2869,6 +2918,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
64167 nd->flags & LOOKUP_EXCL);
64168 if (error)
64169 goto out_dput;
64170+ else
64171+ gr_handle_create(dentry, nd->path.mnt);
64172 }
64173 out_no_open:
64174 path->dentry = dentry;
64175@@ -2883,7 +2934,7 @@ out_dput:
64176 /*
64177 * Handle the last step of open()
64178 */
64179-static int do_last(struct nameidata *nd, struct path *path,
64180+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
64181 struct file *file, const struct open_flags *op,
64182 int *opened, struct filename *name)
64183 {
64184@@ -2933,6 +2984,15 @@ static int do_last(struct nameidata *nd, struct path *path,
64185 if (error)
64186 return error;
64187
64188+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
64189+ error = -ENOENT;
64190+ goto out;
64191+ }
64192+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64193+ error = -EACCES;
64194+ goto out;
64195+ }
64196+
64197 audit_inode(name, dir, LOOKUP_PARENT);
64198 error = -EISDIR;
64199 /* trailing slashes? */
64200@@ -2952,7 +3012,7 @@ retry_lookup:
64201 */
64202 }
64203 mutex_lock(&dir->d_inode->i_mutex);
64204- error = lookup_open(nd, path, file, op, got_write, opened);
64205+ error = lookup_open(nd, path, link, file, op, got_write, opened);
64206 mutex_unlock(&dir->d_inode->i_mutex);
64207
64208 if (error <= 0) {
64209@@ -2976,11 +3036,28 @@ retry_lookup:
64210 goto finish_open_created;
64211 }
64212
64213+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
64214+ error = -ENOENT;
64215+ goto exit_dput;
64216+ }
64217+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
64218+ error = -EACCES;
64219+ goto exit_dput;
64220+ }
64221+
64222 /*
64223 * create/update audit record if it already exists.
64224 */
64225- if (d_is_positive(path->dentry))
64226+ if (d_is_positive(path->dentry)) {
64227+ /* only check if O_CREAT is specified, all other checks need to go
64228+ into may_open */
64229+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
64230+ error = -EACCES;
64231+ goto exit_dput;
64232+ }
64233+
64234 audit_inode(name, path->dentry, 0);
64235+ }
64236
64237 /*
64238 * If atomic_open() acquired write access it is dropped now due to
64239@@ -3021,6 +3098,11 @@ finish_lookup:
64240 }
64241 }
64242 BUG_ON(inode != path->dentry->d_inode);
64243+ /* if we're resolving a symlink to another symlink */
64244+ if (link && gr_handle_symlink_owner(link, inode)) {
64245+ error = -EACCES;
64246+ goto out;
64247+ }
64248 return 1;
64249 }
64250
64251@@ -3040,7 +3122,18 @@ finish_open:
64252 path_put(&save_parent);
64253 return error;
64254 }
64255+
64256+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64257+ error = -ENOENT;
64258+ goto out;
64259+ }
64260+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64261+ error = -EACCES;
64262+ goto out;
64263+ }
64264+
64265 audit_inode(name, nd->path.dentry, 0);
64266+
64267 error = -EISDIR;
64268 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
64269 goto out;
64270@@ -3207,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64271 if (unlikely(error))
64272 goto out;
64273
64274- error = do_last(nd, &path, file, op, &opened, pathname);
64275+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
64276 while (unlikely(error > 0)) { /* trailing symlink */
64277 struct path link = path;
64278 void *cookie;
64279@@ -3225,7 +3318,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64280 error = follow_link(&link, nd, &cookie);
64281 if (unlikely(error))
64282 break;
64283- error = do_last(nd, &path, file, op, &opened, pathname);
64284+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
64285 put_link(nd, &link, cookie);
64286 }
64287 out:
64288@@ -3325,9 +3418,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
64289 goto unlock;
64290
64291 error = -EEXIST;
64292- if (d_is_positive(dentry))
64293+ if (d_is_positive(dentry)) {
64294+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
64295+ error = -ENOENT;
64296 goto fail;
64297-
64298+ }
64299 /*
64300 * Special case - lookup gave negative, but... we had foo/bar/
64301 * From the vfs_mknod() POV we just have a negative dentry -
64302@@ -3379,6 +3474,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
64303 }
64304 EXPORT_SYMBOL(user_path_create);
64305
64306+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
64307+{
64308+ struct filename *tmp = getname(pathname);
64309+ struct dentry *res;
64310+ if (IS_ERR(tmp))
64311+ return ERR_CAST(tmp);
64312+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
64313+ if (IS_ERR(res))
64314+ putname(tmp);
64315+ else
64316+ *to = tmp;
64317+ return res;
64318+}
64319+
64320 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
64321 {
64322 int error = may_create(dir, dentry);
64323@@ -3442,6 +3551,17 @@ retry:
64324
64325 if (!IS_POSIXACL(path.dentry->d_inode))
64326 mode &= ~current_umask();
64327+
64328+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
64329+ error = -EPERM;
64330+ goto out;
64331+ }
64332+
64333+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
64334+ error = -EACCES;
64335+ goto out;
64336+ }
64337+
64338 error = security_path_mknod(&path, dentry, mode, dev);
64339 if (error)
64340 goto out;
64341@@ -3457,6 +3577,8 @@ retry:
64342 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
64343 break;
64344 }
64345+ if (!error)
64346+ gr_handle_create(dentry, path.mnt);
64347 out:
64348 done_path_create(&path, dentry);
64349 if (retry_estale(error, lookup_flags)) {
64350@@ -3511,9 +3633,16 @@ retry:
64351
64352 if (!IS_POSIXACL(path.dentry->d_inode))
64353 mode &= ~current_umask();
64354+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
64355+ error = -EACCES;
64356+ goto out;
64357+ }
64358 error = security_path_mkdir(&path, dentry, mode);
64359 if (!error)
64360 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
64361+ if (!error)
64362+ gr_handle_create(dentry, path.mnt);
64363+out:
64364 done_path_create(&path, dentry);
64365 if (retry_estale(error, lookup_flags)) {
64366 lookup_flags |= LOOKUP_REVAL;
64367@@ -3597,6 +3726,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
64368 struct filename *name;
64369 struct dentry *dentry;
64370 struct nameidata nd;
64371+ ino_t saved_ino = 0;
64372+ dev_t saved_dev = 0;
64373 unsigned int lookup_flags = 0;
64374 retry:
64375 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64376@@ -3629,10 +3760,21 @@ retry:
64377 error = -ENOENT;
64378 goto exit3;
64379 }
64380+
64381+ saved_ino = dentry->d_inode->i_ino;
64382+ saved_dev = gr_get_dev_from_dentry(dentry);
64383+
64384+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
64385+ error = -EACCES;
64386+ goto exit3;
64387+ }
64388+
64389 error = security_path_rmdir(&nd.path, dentry);
64390 if (error)
64391 goto exit3;
64392 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
64393+ if (!error && (saved_dev || saved_ino))
64394+ gr_handle_delete(saved_ino, saved_dev);
64395 exit3:
64396 dput(dentry);
64397 exit2:
64398@@ -3725,6 +3867,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
64399 struct nameidata nd;
64400 struct inode *inode = NULL;
64401 struct inode *delegated_inode = NULL;
64402+ ino_t saved_ino = 0;
64403+ dev_t saved_dev = 0;
64404 unsigned int lookup_flags = 0;
64405 retry:
64406 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64407@@ -3751,10 +3895,22 @@ retry_deleg:
64408 if (d_is_negative(dentry))
64409 goto slashes;
64410 ihold(inode);
64411+
64412+ if (inode->i_nlink <= 1) {
64413+ saved_ino = inode->i_ino;
64414+ saved_dev = gr_get_dev_from_dentry(dentry);
64415+ }
64416+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
64417+ error = -EACCES;
64418+ goto exit2;
64419+ }
64420+
64421 error = security_path_unlink(&nd.path, dentry);
64422 if (error)
64423 goto exit2;
64424 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
64425+ if (!error && (saved_ino || saved_dev))
64426+ gr_handle_delete(saved_ino, saved_dev);
64427 exit2:
64428 dput(dentry);
64429 }
64430@@ -3843,9 +3999,17 @@ retry:
64431 if (IS_ERR(dentry))
64432 goto out_putname;
64433
64434+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
64435+ error = -EACCES;
64436+ goto out;
64437+ }
64438+
64439 error = security_path_symlink(&path, dentry, from->name);
64440 if (!error)
64441 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
64442+ if (!error)
64443+ gr_handle_create(dentry, path.mnt);
64444+out:
64445 done_path_create(&path, dentry);
64446 if (retry_estale(error, lookup_flags)) {
64447 lookup_flags |= LOOKUP_REVAL;
64448@@ -3949,6 +4113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
64449 struct dentry *new_dentry;
64450 struct path old_path, new_path;
64451 struct inode *delegated_inode = NULL;
64452+ struct filename *to = NULL;
64453 int how = 0;
64454 int error;
64455
64456@@ -3972,7 +4137,7 @@ retry:
64457 if (error)
64458 return error;
64459
64460- new_dentry = user_path_create(newdfd, newname, &new_path,
64461+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
64462 (how & LOOKUP_REVAL));
64463 error = PTR_ERR(new_dentry);
64464 if (IS_ERR(new_dentry))
64465@@ -3984,11 +4149,28 @@ retry:
64466 error = may_linkat(&old_path);
64467 if (unlikely(error))
64468 goto out_dput;
64469+
64470+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
64471+ old_path.dentry->d_inode,
64472+ old_path.dentry->d_inode->i_mode, to)) {
64473+ error = -EACCES;
64474+ goto out_dput;
64475+ }
64476+
64477+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
64478+ old_path.dentry, old_path.mnt, to)) {
64479+ error = -EACCES;
64480+ goto out_dput;
64481+ }
64482+
64483 error = security_path_link(old_path.dentry, &new_path, new_dentry);
64484 if (error)
64485 goto out_dput;
64486 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
64487+ if (!error)
64488+ gr_handle_create(new_dentry, new_path.mnt);
64489 out_dput:
64490+ putname(to);
64491 done_path_create(&new_path, new_dentry);
64492 if (delegated_inode) {
64493 error = break_deleg_wait(&delegated_inode);
64494@@ -4304,6 +4486,20 @@ retry_deleg:
64495 if (new_dentry == trap)
64496 goto exit5;
64497
64498+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
64499+ /* use EXDEV error to cause 'mv' to switch to an alternative
64500+ * method for usability
64501+ */
64502+ error = -EXDEV;
64503+ goto exit5;
64504+ }
64505+
64506+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
64507+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
64508+ to, flags);
64509+ if (error)
64510+ goto exit5;
64511+
64512 error = security_path_rename(&oldnd.path, old_dentry,
64513 &newnd.path, new_dentry, flags);
64514 if (error)
64515@@ -4311,6 +4507,9 @@ retry_deleg:
64516 error = vfs_rename(old_dir->d_inode, old_dentry,
64517 new_dir->d_inode, new_dentry,
64518 &delegated_inode, flags);
64519+ if (!error)
64520+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
64521+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
64522 exit5:
64523 dput(new_dentry);
64524 exit4:
64525@@ -4367,14 +4566,24 @@ EXPORT_SYMBOL(vfs_whiteout);
64526
64527 int readlink_copy(char __user *buffer, int buflen, const char *link)
64528 {
64529+ char tmpbuf[64];
64530+ const char *newlink;
64531 int len = PTR_ERR(link);
64532+
64533 if (IS_ERR(link))
64534 goto out;
64535
64536 len = strlen(link);
64537 if (len > (unsigned) buflen)
64538 len = buflen;
64539- if (copy_to_user(buffer, link, len))
64540+
64541+ if (len < sizeof(tmpbuf)) {
64542+ memcpy(tmpbuf, link, len);
64543+ newlink = tmpbuf;
64544+ } else
64545+ newlink = link;
64546+
64547+ if (copy_to_user(buffer, newlink, len))
64548 len = -EFAULT;
64549 out:
64550 return len;
64551diff --git a/fs/namespace.c b/fs/namespace.c
64552index bbde147..f4deeba 100644
64553--- a/fs/namespace.c
64554+++ b/fs/namespace.c
64555@@ -1447,6 +1447,9 @@ static int do_umount(struct mount *mnt, int flags)
64556 if (!(sb->s_flags & MS_RDONLY))
64557 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
64558 up_write(&sb->s_umount);
64559+
64560+ gr_log_remount(mnt->mnt_devname, retval);
64561+
64562 return retval;
64563 }
64564
64565@@ -1469,6 +1472,9 @@ static int do_umount(struct mount *mnt, int flags)
64566 }
64567 unlock_mount_hash();
64568 namespace_unlock();
64569+
64570+ gr_log_unmount(mnt->mnt_devname, retval);
64571+
64572 return retval;
64573 }
64574
64575@@ -1519,7 +1525,7 @@ static inline bool may_mount(void)
64576 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
64577 */
64578
64579-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
64580+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
64581 {
64582 struct path path;
64583 struct mount *mnt;
64584@@ -1564,7 +1570,7 @@ out:
64585 /*
64586 * The 2.0 compatible umount. No flags.
64587 */
64588-SYSCALL_DEFINE1(oldumount, char __user *, name)
64589+SYSCALL_DEFINE1(oldumount, const char __user *, name)
64590 {
64591 return sys_umount(name, 0);
64592 }
64593@@ -2632,6 +2638,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64594 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
64595 MS_STRICTATIME);
64596
64597+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
64598+ retval = -EPERM;
64599+ goto dput_out;
64600+ }
64601+
64602+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
64603+ retval = -EPERM;
64604+ goto dput_out;
64605+ }
64606+
64607 if (flags & MS_REMOUNT)
64608 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
64609 data_page);
64610@@ -2645,7 +2661,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64611 retval = do_new_mount(&path, type_page, flags, mnt_flags,
64612 dev_name, data_page);
64613 dput_out:
64614+ gr_log_mount(dev_name, &path, retval);
64615+
64616 path_put(&path);
64617+
64618 return retval;
64619 }
64620
64621@@ -2663,7 +2682,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
64622 * number incrementing at 10Ghz will take 12,427 years to wrap which
64623 * is effectively never, so we can ignore the possibility.
64624 */
64625-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
64626+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
64627
64628 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64629 {
64630@@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64631 kfree(new_ns);
64632 return ERR_PTR(ret);
64633 }
64634- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
64635+ new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
64636 atomic_set(&new_ns->count, 1);
64637 new_ns->root = NULL;
64638 INIT_LIST_HEAD(&new_ns->list);
64639@@ -2688,7 +2707,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64640 return new_ns;
64641 }
64642
64643-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64644+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64645 struct user_namespace *user_ns, struct fs_struct *new_fs)
64646 {
64647 struct mnt_namespace *new_ns;
64648@@ -2809,8 +2828,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
64649 }
64650 EXPORT_SYMBOL(mount_subtree);
64651
64652-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
64653- char __user *, type, unsigned long, flags, void __user *, data)
64654+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
64655+ const char __user *, type, unsigned long, flags, void __user *, data)
64656 {
64657 int ret;
64658 char *kernel_type;
64659@@ -2916,6 +2935,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
64660 if (error)
64661 goto out2;
64662
64663+ if (gr_handle_chroot_pivot()) {
64664+ error = -EPERM;
64665+ goto out2;
64666+ }
64667+
64668 get_fs_root(current->fs, &root);
64669 old_mp = lock_mount(&old);
64670 error = PTR_ERR(old_mp);
64671@@ -3187,7 +3211,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
64672 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
64673 return -EPERM;
64674
64675- if (fs->users != 1)
64676+ if (atomic_read(&fs->users) != 1)
64677 return -EINVAL;
64678
64679 get_mnt_ns(mnt_ns);
64680diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
64681index f4ccfe6..a5cf064 100644
64682--- a/fs/nfs/callback_xdr.c
64683+++ b/fs/nfs/callback_xdr.c
64684@@ -51,7 +51,7 @@ struct callback_op {
64685 callback_decode_arg_t decode_args;
64686 callback_encode_res_t encode_res;
64687 long res_maxsize;
64688-};
64689+} __do_const;
64690
64691 static struct callback_op callback_ops[];
64692
64693diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
64694index 00689a8..b162632 100644
64695--- a/fs/nfs/inode.c
64696+++ b/fs/nfs/inode.c
64697@@ -1232,16 +1232,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
64698 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
64699 }
64700
64701-static atomic_long_t nfs_attr_generation_counter;
64702+static atomic_long_unchecked_t nfs_attr_generation_counter;
64703
64704 static unsigned long nfs_read_attr_generation_counter(void)
64705 {
64706- return atomic_long_read(&nfs_attr_generation_counter);
64707+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
64708 }
64709
64710 unsigned long nfs_inc_attr_generation_counter(void)
64711 {
64712- return atomic_long_inc_return(&nfs_attr_generation_counter);
64713+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
64714 }
64715
64716 void nfs_fattr_init(struct nfs_fattr *fattr)
64717diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
64718index 0beb023..3f685ec 100644
64719--- a/fs/nfsd/nfs4proc.c
64720+++ b/fs/nfsd/nfs4proc.c
64721@@ -1198,7 +1198,7 @@ struct nfsd4_operation {
64722 nfsd4op_rsize op_rsize_bop;
64723 stateid_getter op_get_currentstateid;
64724 stateid_setter op_set_currentstateid;
64725-};
64726+} __do_const;
64727
64728 static struct nfsd4_operation nfsd4_ops[];
64729
64730diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
64731index 2a77603..68e0e37 100644
64732--- a/fs/nfsd/nfs4xdr.c
64733+++ b/fs/nfsd/nfs4xdr.c
64734@@ -1543,7 +1543,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
64735
64736 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
64737
64738-static nfsd4_dec nfsd4_dec_ops[] = {
64739+static const nfsd4_dec nfsd4_dec_ops[] = {
64740 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
64741 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
64742 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
64743diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
64744index 122f691..a00e2e0 100644
64745--- a/fs/nfsd/nfscache.c
64746+++ b/fs/nfsd/nfscache.c
64747@@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64748 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
64749 u32 hash;
64750 struct nfsd_drc_bucket *b;
64751- int len;
64752+ long len;
64753 size_t bufsize = 0;
64754
64755 if (!rp)
64756@@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64757 hash = nfsd_cache_hash(rp->c_xid);
64758 b = &drc_hashtbl[hash];
64759
64760- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
64761- len >>= 2;
64762+ if (statp) {
64763+ len = (char*)statp - (char*)resv->iov_base;
64764+ len = resv->iov_len - len;
64765+ len >>= 2;
64766+ }
64767
64768 /* Don't cache excessive amounts of data and XDR failures */
64769- if (!statp || len > (256 >> 2)) {
64770+ if (!statp || len > (256 >> 2) || len < 0) {
64771 nfsd_reply_cache_free(b, rp);
64772 return;
64773 }
64774@@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64775 switch (cachetype) {
64776 case RC_REPLSTAT:
64777 if (len != 1)
64778- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
64779+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
64780 rp->c_replstat = *statp;
64781 break;
64782 case RC_REPLBUFF:
64783diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
64784index 989129e..42e019e 100644
64785--- a/fs/nfsd/vfs.c
64786+++ b/fs/nfsd/vfs.c
64787@@ -872,7 +872,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
64788
64789 oldfs = get_fs();
64790 set_fs(KERNEL_DS);
64791- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
64792+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
64793 set_fs(oldfs);
64794 return nfsd_finish_read(file, count, host_err);
64795 }
64796@@ -960,7 +960,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
64797
64798 /* Write the data. */
64799 oldfs = get_fs(); set_fs(KERNEL_DS);
64800- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
64801+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
64802 set_fs(oldfs);
64803 if (host_err < 0)
64804 goto out_nfserr;
64805@@ -1502,7 +1502,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
64806 */
64807
64808 oldfs = get_fs(); set_fs(KERNEL_DS);
64809- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
64810+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
64811 set_fs(oldfs);
64812
64813 if (host_err < 0)
64814diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
64815index 52ccd34..7a6b202 100644
64816--- a/fs/nls/nls_base.c
64817+++ b/fs/nls/nls_base.c
64818@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
64819
64820 int __register_nls(struct nls_table *nls, struct module *owner)
64821 {
64822- struct nls_table ** tmp = &tables;
64823+ struct nls_table *tmp = tables;
64824
64825 if (nls->next)
64826 return -EBUSY;
64827
64828- nls->owner = owner;
64829+ pax_open_kernel();
64830+ *(void **)&nls->owner = owner;
64831+ pax_close_kernel();
64832 spin_lock(&nls_lock);
64833- while (*tmp) {
64834- if (nls == *tmp) {
64835+ while (tmp) {
64836+ if (nls == tmp) {
64837 spin_unlock(&nls_lock);
64838 return -EBUSY;
64839 }
64840- tmp = &(*tmp)->next;
64841+ tmp = tmp->next;
64842 }
64843- nls->next = tables;
64844+ pax_open_kernel();
64845+ *(struct nls_table **)&nls->next = tables;
64846+ pax_close_kernel();
64847 tables = nls;
64848 spin_unlock(&nls_lock);
64849 return 0;
64850@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
64851
64852 int unregister_nls(struct nls_table * nls)
64853 {
64854- struct nls_table ** tmp = &tables;
64855+ struct nls_table * const * tmp = &tables;
64856
64857 spin_lock(&nls_lock);
64858 while (*tmp) {
64859 if (nls == *tmp) {
64860- *tmp = nls->next;
64861+ pax_open_kernel();
64862+ *(struct nls_table **)tmp = nls->next;
64863+ pax_close_kernel();
64864 spin_unlock(&nls_lock);
64865 return 0;
64866 }
64867@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
64868 return -EINVAL;
64869 }
64870
64871-static struct nls_table *find_nls(char *charset)
64872+static struct nls_table *find_nls(const char *charset)
64873 {
64874 struct nls_table *nls;
64875 spin_lock(&nls_lock);
64876@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
64877 return nls;
64878 }
64879
64880-struct nls_table *load_nls(char *charset)
64881+struct nls_table *load_nls(const char *charset)
64882 {
64883 return try_then_request_module(find_nls(charset), "nls_%s", charset);
64884 }
64885diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
64886index 162b3f1..6076a7c 100644
64887--- a/fs/nls/nls_euc-jp.c
64888+++ b/fs/nls/nls_euc-jp.c
64889@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
64890 p_nls = load_nls("cp932");
64891
64892 if (p_nls) {
64893- table.charset2upper = p_nls->charset2upper;
64894- table.charset2lower = p_nls->charset2lower;
64895+ pax_open_kernel();
64896+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64897+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64898+ pax_close_kernel();
64899 return register_nls(&table);
64900 }
64901
64902diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
64903index a80a741..7b96e1b 100644
64904--- a/fs/nls/nls_koi8-ru.c
64905+++ b/fs/nls/nls_koi8-ru.c
64906@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
64907 p_nls = load_nls("koi8-u");
64908
64909 if (p_nls) {
64910- table.charset2upper = p_nls->charset2upper;
64911- table.charset2lower = p_nls->charset2lower;
64912+ pax_open_kernel();
64913+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64914+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64915+ pax_close_kernel();
64916 return register_nls(&table);
64917 }
64918
64919diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
64920index c991616..5ae51af 100644
64921--- a/fs/notify/fanotify/fanotify_user.c
64922+++ b/fs/notify/fanotify/fanotify_user.c
64923@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
64924
64925 fd = fanotify_event_metadata.fd;
64926 ret = -EFAULT;
64927- if (copy_to_user(buf, &fanotify_event_metadata,
64928- fanotify_event_metadata.event_len))
64929+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
64930+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
64931 goto out_close_fd;
64932
64933 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
64934diff --git a/fs/notify/notification.c b/fs/notify/notification.c
64935index a95d8e0..a91a5fd 100644
64936--- a/fs/notify/notification.c
64937+++ b/fs/notify/notification.c
64938@@ -48,7 +48,7 @@
64939 #include <linux/fsnotify_backend.h>
64940 #include "fsnotify.h"
64941
64942-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64943+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64944
64945 /**
64946 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
64947@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64948 */
64949 u32 fsnotify_get_cookie(void)
64950 {
64951- return atomic_inc_return(&fsnotify_sync_cookie);
64952+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
64953 }
64954 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
64955
64956diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
64957index 9e38daf..5727cae 100644
64958--- a/fs/ntfs/dir.c
64959+++ b/fs/ntfs/dir.c
64960@@ -1310,7 +1310,7 @@ find_next_index_buffer:
64961 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
64962 ~(s64)(ndir->itype.index.block_size - 1)));
64963 /* Bounds checks. */
64964- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64965+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64966 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
64967 "inode 0x%lx or driver bug.", vdir->i_ino);
64968 goto err_out;
64969diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
64970index 643faa4..ef9027e 100644
64971--- a/fs/ntfs/file.c
64972+++ b/fs/ntfs/file.c
64973@@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
64974 char *addr;
64975 size_t total = 0;
64976 unsigned len;
64977- int left;
64978+ unsigned left;
64979
64980 do {
64981 len = PAGE_CACHE_SIZE - ofs;
64982diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
64983index 9e1e112..241a52a 100644
64984--- a/fs/ntfs/super.c
64985+++ b/fs/ntfs/super.c
64986@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64987 if (!silent)
64988 ntfs_error(sb, "Primary boot sector is invalid.");
64989 } else if (!silent)
64990- ntfs_error(sb, read_err_str, "primary");
64991+ ntfs_error(sb, read_err_str, "%s", "primary");
64992 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
64993 if (bh_primary)
64994 brelse(bh_primary);
64995@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64996 goto hotfix_primary_boot_sector;
64997 brelse(bh_backup);
64998 } else if (!silent)
64999- ntfs_error(sb, read_err_str, "backup");
65000+ ntfs_error(sb, read_err_str, "%s", "backup");
65001 /* Try to read NT3.51- backup boot sector. */
65002 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
65003 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
65004@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65005 "sector.");
65006 brelse(bh_backup);
65007 } else if (!silent)
65008- ntfs_error(sb, read_err_str, "backup");
65009+ ntfs_error(sb, read_err_str, "%s", "backup");
65010 /* We failed. Cleanup and return. */
65011 if (bh_primary)
65012 brelse(bh_primary);
65013diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
65014index 0440134..d52c93a 100644
65015--- a/fs/ocfs2/localalloc.c
65016+++ b/fs/ocfs2/localalloc.c
65017@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
65018 goto bail;
65019 }
65020
65021- atomic_inc(&osb->alloc_stats.moves);
65022+ atomic_inc_unchecked(&osb->alloc_stats.moves);
65023
65024 bail:
65025 if (handle)
65026diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
65027index bbec539..7b266d5 100644
65028--- a/fs/ocfs2/ocfs2.h
65029+++ b/fs/ocfs2/ocfs2.h
65030@@ -236,11 +236,11 @@ enum ocfs2_vol_state
65031
65032 struct ocfs2_alloc_stats
65033 {
65034- atomic_t moves;
65035- atomic_t local_data;
65036- atomic_t bitmap_data;
65037- atomic_t bg_allocs;
65038- atomic_t bg_extends;
65039+ atomic_unchecked_t moves;
65040+ atomic_unchecked_t local_data;
65041+ atomic_unchecked_t bitmap_data;
65042+ atomic_unchecked_t bg_allocs;
65043+ atomic_unchecked_t bg_extends;
65044 };
65045
65046 enum ocfs2_local_alloc_state
65047diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
65048index 0cb889a..6a26b24 100644
65049--- a/fs/ocfs2/suballoc.c
65050+++ b/fs/ocfs2/suballoc.c
65051@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
65052 mlog_errno(status);
65053 goto bail;
65054 }
65055- atomic_inc(&osb->alloc_stats.bg_extends);
65056+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
65057
65058 /* You should never ask for this much metadata */
65059 BUG_ON(bits_wanted >
65060@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
65061 mlog_errno(status);
65062 goto bail;
65063 }
65064- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65065+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65066
65067 *suballoc_loc = res.sr_bg_blkno;
65068 *suballoc_bit_start = res.sr_bit_offset;
65069@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
65070 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
65071 res->sr_bits);
65072
65073- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65074+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65075
65076 BUG_ON(res->sr_bits != 1);
65077
65078@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
65079 mlog_errno(status);
65080 goto bail;
65081 }
65082- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65083+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
65084
65085 BUG_ON(res.sr_bits != 1);
65086
65087@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
65088 cluster_start,
65089 num_clusters);
65090 if (!status)
65091- atomic_inc(&osb->alloc_stats.local_data);
65092+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
65093 } else {
65094 if (min_clusters > (osb->bitmap_cpg - 1)) {
65095 /* The only paths asking for contiguousness
65096@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
65097 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
65098 res.sr_bg_blkno,
65099 res.sr_bit_offset);
65100- atomic_inc(&osb->alloc_stats.bitmap_data);
65101+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
65102 *num_clusters = res.sr_bits;
65103 }
65104 }
65105diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
65106index 93c85bc..02f68a4 100644
65107--- a/fs/ocfs2/super.c
65108+++ b/fs/ocfs2/super.c
65109@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
65110 "%10s => GlobalAllocs: %d LocalAllocs: %d "
65111 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
65112 "Stats",
65113- atomic_read(&osb->alloc_stats.bitmap_data),
65114- atomic_read(&osb->alloc_stats.local_data),
65115- atomic_read(&osb->alloc_stats.bg_allocs),
65116- atomic_read(&osb->alloc_stats.moves),
65117- atomic_read(&osb->alloc_stats.bg_extends));
65118+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
65119+ atomic_read_unchecked(&osb->alloc_stats.local_data),
65120+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
65121+ atomic_read_unchecked(&osb->alloc_stats.moves),
65122+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
65123
65124 out += snprintf(buf + out, len - out,
65125 "%10s => State: %u Descriptor: %llu Size: %u bits "
65126@@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
65127
65128 mutex_init(&osb->system_file_mutex);
65129
65130- atomic_set(&osb->alloc_stats.moves, 0);
65131- atomic_set(&osb->alloc_stats.local_data, 0);
65132- atomic_set(&osb->alloc_stats.bitmap_data, 0);
65133- atomic_set(&osb->alloc_stats.bg_allocs, 0);
65134- atomic_set(&osb->alloc_stats.bg_extends, 0);
65135+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
65136+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
65137+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
65138+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
65139+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
65140
65141 /* Copy the blockcheck stats from the superblock probe */
65142 osb->osb_ecc_stats = *stats;
65143diff --git a/fs/open.c b/fs/open.c
65144index de92c13..52d2a6c 100644
65145--- a/fs/open.c
65146+++ b/fs/open.c
65147@@ -32,6 +32,8 @@
65148 #include <linux/dnotify.h>
65149 #include <linux/compat.h>
65150
65151+#define CREATE_TRACE_POINTS
65152+#include <trace/events/fs.h>
65153 #include "internal.h"
65154
65155 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
65156@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
65157 error = locks_verify_truncate(inode, NULL, length);
65158 if (!error)
65159 error = security_path_truncate(path);
65160+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
65161+ error = -EACCES;
65162 if (!error)
65163 error = do_truncate(path->dentry, length, 0, NULL);
65164
65165@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
65166 error = locks_verify_truncate(inode, f.file, length);
65167 if (!error)
65168 error = security_path_truncate(&f.file->f_path);
65169+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
65170+ error = -EACCES;
65171 if (!error)
65172 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
65173 sb_end_write(inode->i_sb);
65174@@ -380,6 +386,9 @@ retry:
65175 if (__mnt_is_readonly(path.mnt))
65176 res = -EROFS;
65177
65178+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
65179+ res = -EACCES;
65180+
65181 out_path_release:
65182 path_put(&path);
65183 if (retry_estale(res, lookup_flags)) {
65184@@ -411,6 +420,8 @@ retry:
65185 if (error)
65186 goto dput_and_out;
65187
65188+ gr_log_chdir(path.dentry, path.mnt);
65189+
65190 set_fs_pwd(current->fs, &path);
65191
65192 dput_and_out:
65193@@ -440,6 +451,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
65194 goto out_putf;
65195
65196 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
65197+
65198+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
65199+ error = -EPERM;
65200+
65201+ if (!error)
65202+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
65203+
65204 if (!error)
65205 set_fs_pwd(current->fs, &f.file->f_path);
65206 out_putf:
65207@@ -469,7 +487,13 @@ retry:
65208 if (error)
65209 goto dput_and_out;
65210
65211+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
65212+ goto dput_and_out;
65213+
65214 set_fs_root(current->fs, &path);
65215+
65216+ gr_handle_chroot_chdir(&path);
65217+
65218 error = 0;
65219 dput_and_out:
65220 path_put(&path);
65221@@ -493,6 +517,16 @@ static int chmod_common(struct path *path, umode_t mode)
65222 return error;
65223 retry_deleg:
65224 mutex_lock(&inode->i_mutex);
65225+
65226+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
65227+ error = -EACCES;
65228+ goto out_unlock;
65229+ }
65230+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
65231+ error = -EACCES;
65232+ goto out_unlock;
65233+ }
65234+
65235 error = security_path_chmod(path, mode);
65236 if (error)
65237 goto out_unlock;
65238@@ -558,6 +592,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
65239 uid = make_kuid(current_user_ns(), user);
65240 gid = make_kgid(current_user_ns(), group);
65241
65242+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
65243+ return -EACCES;
65244+
65245 newattrs.ia_valid = ATTR_CTIME;
65246 if (user != (uid_t) -1) {
65247 if (!uid_valid(uid))
65248@@ -1002,6 +1039,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
65249 } else {
65250 fsnotify_open(f);
65251 fd_install(fd, f);
65252+ trace_do_sys_open(tmp->name, flags, mode);
65253 }
65254 }
65255 putname(tmp);
65256diff --git a/fs/pipe.c b/fs/pipe.c
65257index 21981e5..3d5f55c 100644
65258--- a/fs/pipe.c
65259+++ b/fs/pipe.c
65260@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
65261
65262 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
65263 {
65264- if (pipe->files)
65265+ if (atomic_read(&pipe->files))
65266 mutex_lock_nested(&pipe->mutex, subclass);
65267 }
65268
65269@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
65270
65271 void pipe_unlock(struct pipe_inode_info *pipe)
65272 {
65273- if (pipe->files)
65274+ if (atomic_read(&pipe->files))
65275 mutex_unlock(&pipe->mutex);
65276 }
65277 EXPORT_SYMBOL(pipe_unlock);
65278@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
65279 }
65280 if (bufs) /* More to do? */
65281 continue;
65282- if (!pipe->writers)
65283+ if (!atomic_read(&pipe->writers))
65284 break;
65285- if (!pipe->waiting_writers) {
65286+ if (!atomic_read(&pipe->waiting_writers)) {
65287 /* syscall merging: Usually we must not sleep
65288 * if O_NONBLOCK is set, or if we got some data.
65289 * But if a writer sleeps in kernel space, then
65290@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65291
65292 __pipe_lock(pipe);
65293
65294- if (!pipe->readers) {
65295+ if (!atomic_read(&pipe->readers)) {
65296 send_sig(SIGPIPE, current, 0);
65297 ret = -EPIPE;
65298 goto out;
65299@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65300 for (;;) {
65301 int bufs;
65302
65303- if (!pipe->readers) {
65304+ if (!atomic_read(&pipe->readers)) {
65305 send_sig(SIGPIPE, current, 0);
65306 if (!ret)
65307 ret = -EPIPE;
65308@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65309 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65310 do_wakeup = 0;
65311 }
65312- pipe->waiting_writers++;
65313+ atomic_inc(&pipe->waiting_writers);
65314 pipe_wait(pipe);
65315- pipe->waiting_writers--;
65316+ atomic_dec(&pipe->waiting_writers);
65317 }
65318 out:
65319 __pipe_unlock(pipe);
65320@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65321 mask = 0;
65322 if (filp->f_mode & FMODE_READ) {
65323 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
65324- if (!pipe->writers && filp->f_version != pipe->w_counter)
65325+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
65326 mask |= POLLHUP;
65327 }
65328
65329@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65330 * Most Unices do not set POLLERR for FIFOs but on Linux they
65331 * behave exactly like pipes for poll().
65332 */
65333- if (!pipe->readers)
65334+ if (!atomic_read(&pipe->readers))
65335 mask |= POLLERR;
65336 }
65337
65338@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
65339 int kill = 0;
65340
65341 spin_lock(&inode->i_lock);
65342- if (!--pipe->files) {
65343+ if (atomic_dec_and_test(&pipe->files)) {
65344 inode->i_pipe = NULL;
65345 kill = 1;
65346 }
65347@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
65348
65349 __pipe_lock(pipe);
65350 if (file->f_mode & FMODE_READ)
65351- pipe->readers--;
65352+ atomic_dec(&pipe->readers);
65353 if (file->f_mode & FMODE_WRITE)
65354- pipe->writers--;
65355+ atomic_dec(&pipe->writers);
65356
65357- if (pipe->readers || pipe->writers) {
65358+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
65359 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
65360 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65361 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
65362@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
65363 kfree(pipe);
65364 }
65365
65366-static struct vfsmount *pipe_mnt __read_mostly;
65367+struct vfsmount *pipe_mnt __read_mostly;
65368
65369 /*
65370 * pipefs_dname() is called from d_path().
65371@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
65372 goto fail_iput;
65373
65374 inode->i_pipe = pipe;
65375- pipe->files = 2;
65376- pipe->readers = pipe->writers = 1;
65377+ atomic_set(&pipe->files, 2);
65378+ atomic_set(&pipe->readers, 1);
65379+ atomic_set(&pipe->writers, 1);
65380 inode->i_fop = &pipefifo_fops;
65381
65382 /*
65383@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
65384 spin_lock(&inode->i_lock);
65385 if (inode->i_pipe) {
65386 pipe = inode->i_pipe;
65387- pipe->files++;
65388+ atomic_inc(&pipe->files);
65389 spin_unlock(&inode->i_lock);
65390 } else {
65391 spin_unlock(&inode->i_lock);
65392 pipe = alloc_pipe_info();
65393 if (!pipe)
65394 return -ENOMEM;
65395- pipe->files = 1;
65396+ atomic_set(&pipe->files, 1);
65397 spin_lock(&inode->i_lock);
65398 if (unlikely(inode->i_pipe)) {
65399- inode->i_pipe->files++;
65400+ atomic_inc(&inode->i_pipe->files);
65401 spin_unlock(&inode->i_lock);
65402 free_pipe_info(pipe);
65403 pipe = inode->i_pipe;
65404@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
65405 * opened, even when there is no process writing the FIFO.
65406 */
65407 pipe->r_counter++;
65408- if (pipe->readers++ == 0)
65409+ if (atomic_inc_return(&pipe->readers) == 1)
65410 wake_up_partner(pipe);
65411
65412- if (!is_pipe && !pipe->writers) {
65413+ if (!is_pipe && !atomic_read(&pipe->writers)) {
65414 if ((filp->f_flags & O_NONBLOCK)) {
65415 /* suppress POLLHUP until we have
65416 * seen a writer */
65417@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
65418 * errno=ENXIO when there is no process reading the FIFO.
65419 */
65420 ret = -ENXIO;
65421- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
65422+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
65423 goto err;
65424
65425 pipe->w_counter++;
65426- if (!pipe->writers++)
65427+ if (atomic_inc_return(&pipe->writers) == 1)
65428 wake_up_partner(pipe);
65429
65430- if (!is_pipe && !pipe->readers) {
65431+ if (!is_pipe && !atomic_read(&pipe->readers)) {
65432 if (wait_for_partner(pipe, &pipe->r_counter))
65433 goto err_wr;
65434 }
65435@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
65436 * the process can at least talk to itself.
65437 */
65438
65439- pipe->readers++;
65440- pipe->writers++;
65441+ atomic_inc(&pipe->readers);
65442+ atomic_inc(&pipe->writers);
65443 pipe->r_counter++;
65444 pipe->w_counter++;
65445- if (pipe->readers == 1 || pipe->writers == 1)
65446+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
65447 wake_up_partner(pipe);
65448 break;
65449
65450@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
65451 return 0;
65452
65453 err_rd:
65454- if (!--pipe->readers)
65455+ if (atomic_dec_and_test(&pipe->readers))
65456 wake_up_interruptible(&pipe->wait);
65457 ret = -ERESTARTSYS;
65458 goto err;
65459
65460 err_wr:
65461- if (!--pipe->writers)
65462+ if (atomic_dec_and_test(&pipe->writers))
65463 wake_up_interruptible(&pipe->wait);
65464 ret = -ERESTARTSYS;
65465 goto err;
65466diff --git a/fs/posix_acl.c b/fs/posix_acl.c
65467index 0855f77..6787d50 100644
65468--- a/fs/posix_acl.c
65469+++ b/fs/posix_acl.c
65470@@ -20,6 +20,7 @@
65471 #include <linux/xattr.h>
65472 #include <linux/export.h>
65473 #include <linux/user_namespace.h>
65474+#include <linux/grsecurity.h>
65475
65476 struct posix_acl **acl_by_type(struct inode *inode, int type)
65477 {
65478@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
65479 }
65480 }
65481 if (mode_p)
65482- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65483+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65484 return not_equiv;
65485 }
65486 EXPORT_SYMBOL(posix_acl_equiv_mode);
65487@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
65488 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
65489 }
65490
65491- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65492+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65493 return not_equiv;
65494 }
65495
65496@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
65497 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
65498 int err = -ENOMEM;
65499 if (clone) {
65500+ *mode_p &= ~gr_acl_umask();
65501+
65502 err = posix_acl_create_masq(clone, mode_p);
65503 if (err < 0) {
65504 posix_acl_release(clone);
65505@@ -659,11 +662,12 @@ struct posix_acl *
65506 posix_acl_from_xattr(struct user_namespace *user_ns,
65507 const void *value, size_t size)
65508 {
65509- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
65510- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
65511+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
65512+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
65513 int count;
65514 struct posix_acl *acl;
65515 struct posix_acl_entry *acl_e;
65516+ umode_t umask = gr_acl_umask();
65517
65518 if (!value)
65519 return NULL;
65520@@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65521
65522 switch(acl_e->e_tag) {
65523 case ACL_USER_OBJ:
65524+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65525+ break;
65526 case ACL_GROUP_OBJ:
65527 case ACL_MASK:
65528+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65529+ break;
65530 case ACL_OTHER:
65531+ acl_e->e_perm &= ~(umask & S_IRWXO);
65532 break;
65533
65534 case ACL_USER:
65535+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65536 acl_e->e_uid =
65537 make_kuid(user_ns,
65538 le32_to_cpu(entry->e_id));
65539@@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65540 goto fail;
65541 break;
65542 case ACL_GROUP:
65543+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65544 acl_e->e_gid =
65545 make_kgid(user_ns,
65546 le32_to_cpu(entry->e_id));
65547diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
65548index 2183fcf..3c32a98 100644
65549--- a/fs/proc/Kconfig
65550+++ b/fs/proc/Kconfig
65551@@ -30,7 +30,7 @@ config PROC_FS
65552
65553 config PROC_KCORE
65554 bool "/proc/kcore support" if !ARM
65555- depends on PROC_FS && MMU
65556+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
65557 help
65558 Provides a virtual ELF core file of the live kernel. This can
65559 be read with gdb and other ELF tools. No modifications can be
65560@@ -38,8 +38,8 @@ config PROC_KCORE
65561
65562 config PROC_VMCORE
65563 bool "/proc/vmcore support"
65564- depends on PROC_FS && CRASH_DUMP
65565- default y
65566+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
65567+ default n
65568 help
65569 Exports the dump image of crashed kernel in ELF format.
65570
65571@@ -63,8 +63,8 @@ config PROC_SYSCTL
65572 limited in memory.
65573
65574 config PROC_PAGE_MONITOR
65575- default y
65576- depends on PROC_FS && MMU
65577+ default n
65578+ depends on PROC_FS && MMU && !GRKERNSEC
65579 bool "Enable /proc page monitoring" if EXPERT
65580 help
65581 Various /proc files exist to monitor process memory utilization:
65582diff --git a/fs/proc/array.c b/fs/proc/array.c
65583index cd3653e..9b9b79a 100644
65584--- a/fs/proc/array.c
65585+++ b/fs/proc/array.c
65586@@ -60,6 +60,7 @@
65587 #include <linux/tty.h>
65588 #include <linux/string.h>
65589 #include <linux/mman.h>
65590+#include <linux/grsecurity.h>
65591 #include <linux/proc_fs.h>
65592 #include <linux/ioport.h>
65593 #include <linux/uaccess.h>
65594@@ -347,6 +348,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
65595 seq_putc(m, '\n');
65596 }
65597
65598+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65599+static inline void task_pax(struct seq_file *m, struct task_struct *p)
65600+{
65601+ if (p->mm)
65602+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
65603+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
65604+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
65605+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
65606+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
65607+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
65608+ else
65609+ seq_printf(m, "PaX:\t-----\n");
65610+}
65611+#endif
65612+
65613 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65614 struct pid *pid, struct task_struct *task)
65615 {
65616@@ -365,9 +381,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65617 task_cpus_allowed(m, task);
65618 cpuset_task_status_allowed(m, task);
65619 task_context_switch_counts(m, task);
65620+
65621+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65622+ task_pax(m, task);
65623+#endif
65624+
65625+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
65626+ task_grsec_rbac(m, task);
65627+#endif
65628+
65629 return 0;
65630 }
65631
65632+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65633+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65634+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
65635+ _mm->pax_flags & MF_PAX_SEGMEXEC))
65636+#endif
65637+
65638 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65639 struct pid *pid, struct task_struct *task, int whole)
65640 {
65641@@ -389,6 +420,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65642 char tcomm[sizeof(task->comm)];
65643 unsigned long flags;
65644
65645+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65646+ if (current->exec_id != m->exec_id) {
65647+ gr_log_badprocpid("stat");
65648+ return 0;
65649+ }
65650+#endif
65651+
65652 state = *get_task_state(task);
65653 vsize = eip = esp = 0;
65654 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65655@@ -459,6 +497,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65656 gtime = task_gtime(task);
65657 }
65658
65659+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65660+ if (PAX_RAND_FLAGS(mm)) {
65661+ eip = 0;
65662+ esp = 0;
65663+ wchan = 0;
65664+ }
65665+#endif
65666+#ifdef CONFIG_GRKERNSEC_HIDESYM
65667+ wchan = 0;
65668+ eip =0;
65669+ esp =0;
65670+#endif
65671+
65672 /* scale priority and nice values from timeslices to -20..20 */
65673 /* to make it look like a "normal" Unix priority/nice value */
65674 priority = task_prio(task);
65675@@ -490,9 +541,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65676 seq_put_decimal_ull(m, ' ', vsize);
65677 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
65678 seq_put_decimal_ull(m, ' ', rsslim);
65679+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65680+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
65681+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
65682+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
65683+#else
65684 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
65685 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
65686 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
65687+#endif
65688 seq_put_decimal_ull(m, ' ', esp);
65689 seq_put_decimal_ull(m, ' ', eip);
65690 /* The signal information here is obsolete.
65691@@ -514,7 +571,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65692 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
65693 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
65694
65695- if (mm && permitted) {
65696+ if (mm && permitted
65697+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65698+ && !PAX_RAND_FLAGS(mm)
65699+#endif
65700+ ) {
65701 seq_put_decimal_ull(m, ' ', mm->start_data);
65702 seq_put_decimal_ull(m, ' ', mm->end_data);
65703 seq_put_decimal_ull(m, ' ', mm->start_brk);
65704@@ -552,8 +613,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65705 struct pid *pid, struct task_struct *task)
65706 {
65707 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
65708- struct mm_struct *mm = get_task_mm(task);
65709+ struct mm_struct *mm;
65710
65711+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65712+ if (current->exec_id != m->exec_id) {
65713+ gr_log_badprocpid("statm");
65714+ return 0;
65715+ }
65716+#endif
65717+ mm = get_task_mm(task);
65718 if (mm) {
65719 size = task_statm(mm, &shared, &text, &data, &resident);
65720 mmput(mm);
65721@@ -576,6 +644,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65722 return 0;
65723 }
65724
65725+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65726+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
65727+{
65728+ unsigned long flags;
65729+ u32 curr_ip = 0;
65730+
65731+ if (lock_task_sighand(task, &flags)) {
65732+ curr_ip = task->signal->curr_ip;
65733+ unlock_task_sighand(task, &flags);
65734+ }
65735+ return seq_printf(m, "%pI4\n", &curr_ip);
65736+}
65737+#endif
65738+
65739 #ifdef CONFIG_CHECKPOINT_RESTORE
65740 static struct pid *
65741 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
65742diff --git a/fs/proc/base.c b/fs/proc/base.c
65743index 7dc3ea8..a08077e 100644
65744--- a/fs/proc/base.c
65745+++ b/fs/proc/base.c
65746@@ -113,6 +113,14 @@ struct pid_entry {
65747 union proc_op op;
65748 };
65749
65750+struct getdents_callback {
65751+ struct linux_dirent __user * current_dir;
65752+ struct linux_dirent __user * previous;
65753+ struct file * file;
65754+ int count;
65755+ int error;
65756+};
65757+
65758 #define NOD(NAME, MODE, IOP, FOP, OP) { \
65759 .name = (NAME), \
65760 .len = sizeof(NAME) - 1, \
65761@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
65762 return 0;
65763 }
65764
65765+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65766+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65767+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
65768+ _mm->pax_flags & MF_PAX_SEGMEXEC))
65769+#endif
65770+
65771 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65772 struct pid *pid, struct task_struct *task)
65773 {
65774 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
65775 if (mm && !IS_ERR(mm)) {
65776 unsigned int nwords = 0;
65777+
65778+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65779+ /* allow if we're currently ptracing this task */
65780+ if (PAX_RAND_FLAGS(mm) &&
65781+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
65782+ mmput(mm);
65783+ return 0;
65784+ }
65785+#endif
65786+
65787 do {
65788 nwords += 2;
65789 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
65790@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65791 }
65792
65793
65794-#ifdef CONFIG_KALLSYMS
65795+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65796 /*
65797 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
65798 * Returns the resolved symbol. If that fails, simply return the address.
65799@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
65800 mutex_unlock(&task->signal->cred_guard_mutex);
65801 }
65802
65803-#ifdef CONFIG_STACKTRACE
65804+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65805
65806 #define MAX_STACK_TRACE_DEPTH 64
65807
65808@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
65809 return 0;
65810 }
65811
65812-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65813+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65814 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65815 struct pid *pid, struct task_struct *task)
65816 {
65817@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65818 /************************************************************************/
65819
65820 /* permission checks */
65821-static int proc_fd_access_allowed(struct inode *inode)
65822+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
65823 {
65824 struct task_struct *task;
65825 int allowed = 0;
65826@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
65827 */
65828 task = get_proc_task(inode);
65829 if (task) {
65830- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65831+ if (log)
65832+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65833+ else
65834+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65835 put_task_struct(task);
65836 }
65837 return allowed;
65838@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
65839 struct task_struct *task,
65840 int hide_pid_min)
65841 {
65842+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65843+ return false;
65844+
65845+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65846+ rcu_read_lock();
65847+ {
65848+ const struct cred *tmpcred = current_cred();
65849+ const struct cred *cred = __task_cred(task);
65850+
65851+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
65852+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65853+ || in_group_p(grsec_proc_gid)
65854+#endif
65855+ ) {
65856+ rcu_read_unlock();
65857+ return true;
65858+ }
65859+ }
65860+ rcu_read_unlock();
65861+
65862+ if (!pid->hide_pid)
65863+ return false;
65864+#endif
65865+
65866 if (pid->hide_pid < hide_pid_min)
65867 return true;
65868 if (in_group_p(pid->pid_gid))
65869 return true;
65870+
65871 return ptrace_may_access(task, PTRACE_MODE_READ);
65872 }
65873
65874@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
65875 put_task_struct(task);
65876
65877 if (!has_perms) {
65878+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65879+ {
65880+#else
65881 if (pid->hide_pid == 2) {
65882+#endif
65883 /*
65884 * Let's make getdents(), stat(), and open()
65885 * consistent with each other. If a process
65886@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
65887
65888 if (task) {
65889 mm = mm_access(task, mode);
65890+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
65891+ mmput(mm);
65892+ mm = ERR_PTR(-EPERM);
65893+ }
65894 put_task_struct(task);
65895
65896 if (!IS_ERR_OR_NULL(mm)) {
65897@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
65898 return PTR_ERR(mm);
65899
65900 file->private_data = mm;
65901+
65902+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65903+ file->f_version = current->exec_id;
65904+#endif
65905+
65906 return 0;
65907 }
65908
65909@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65910 ssize_t copied;
65911 char *page;
65912
65913+#ifdef CONFIG_GRKERNSEC
65914+ if (write)
65915+ return -EPERM;
65916+#endif
65917+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65918+ if (file->f_version != current->exec_id) {
65919+ gr_log_badprocpid("mem");
65920+ return 0;
65921+ }
65922+#endif
65923+
65924 if (!mm)
65925 return 0;
65926
65927@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65928 goto free;
65929
65930 while (count > 0) {
65931- int this_len = min_t(int, count, PAGE_SIZE);
65932+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
65933
65934 if (write && copy_from_user(page, buf, this_len)) {
65935 copied = -EFAULT;
65936@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65937 if (!mm)
65938 return 0;
65939
65940+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65941+ if (file->f_version != current->exec_id) {
65942+ gr_log_badprocpid("environ");
65943+ return 0;
65944+ }
65945+#endif
65946+
65947 page = (char *)__get_free_page(GFP_TEMPORARY);
65948 if (!page)
65949 return -ENOMEM;
65950@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65951 goto free;
65952 while (count > 0) {
65953 size_t this_len, max_len;
65954- int retval;
65955+ ssize_t retval;
65956
65957 if (src >= (mm->env_end - mm->env_start))
65958 break;
65959@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
65960 int error = -EACCES;
65961
65962 /* Are we allowed to snoop on the tasks file descriptors? */
65963- if (!proc_fd_access_allowed(inode))
65964+ if (!proc_fd_access_allowed(inode, 0))
65965 goto out;
65966
65967 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65968@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
65969 struct path path;
65970
65971 /* Are we allowed to snoop on the tasks file descriptors? */
65972- if (!proc_fd_access_allowed(inode))
65973- goto out;
65974+ /* logging this is needed for learning on chromium to work properly,
65975+ but we don't want to flood the logs from 'ps' which does a readlink
65976+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
65977+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
65978+ */
65979+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
65980+ if (!proc_fd_access_allowed(inode,0))
65981+ goto out;
65982+ } else {
65983+ if (!proc_fd_access_allowed(inode,1))
65984+ goto out;
65985+ }
65986
65987 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65988 if (error)
65989@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
65990 rcu_read_lock();
65991 cred = __task_cred(task);
65992 inode->i_uid = cred->euid;
65993+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65994+ inode->i_gid = grsec_proc_gid;
65995+#else
65996 inode->i_gid = cred->egid;
65997+#endif
65998 rcu_read_unlock();
65999 }
66000 security_task_to_inode(task, inode);
66001@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
66002 return -ENOENT;
66003 }
66004 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
66005+#ifdef CONFIG_GRKERNSEC_PROC_USER
66006+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
66007+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66008+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
66009+#endif
66010 task_dumpable(task)) {
66011 cred = __task_cred(task);
66012 stat->uid = cred->euid;
66013+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66014+ stat->gid = grsec_proc_gid;
66015+#else
66016 stat->gid = cred->egid;
66017+#endif
66018 }
66019 }
66020 rcu_read_unlock();
66021@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
66022
66023 if (task) {
66024 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
66025+#ifdef CONFIG_GRKERNSEC_PROC_USER
66026+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
66027+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66028+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
66029+#endif
66030 task_dumpable(task)) {
66031 rcu_read_lock();
66032 cred = __task_cred(task);
66033 inode->i_uid = cred->euid;
66034+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66035+ inode->i_gid = grsec_proc_gid;
66036+#else
66037 inode->i_gid = cred->egid;
66038+#endif
66039 rcu_read_unlock();
66040 } else {
66041 inode->i_uid = GLOBAL_ROOT_UID;
66042@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
66043 if (!task)
66044 goto out_no_task;
66045
66046+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66047+ goto out;
66048+
66049 /*
66050 * Yes, it does not scale. And it should not. Don't add
66051 * new entries into /proc/<tgid>/ without very good reasons.
66052@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
66053 if (!task)
66054 return -ENOENT;
66055
66056+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66057+ goto out;
66058+
66059 if (!dir_emit_dots(file, ctx))
66060 goto out;
66061
66062@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
66063 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
66064 #endif
66065 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
66066-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66067+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66068 ONE("syscall", S_IRUSR, proc_pid_syscall),
66069 #endif
66070 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
66071@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
66072 #ifdef CONFIG_SECURITY
66073 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
66074 #endif
66075-#ifdef CONFIG_KALLSYMS
66076+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66077 ONE("wchan", S_IRUGO, proc_pid_wchan),
66078 #endif
66079-#ifdef CONFIG_STACKTRACE
66080+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66081 ONE("stack", S_IRUSR, proc_pid_stack),
66082 #endif
66083 #ifdef CONFIG_SCHEDSTATS
66084@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
66085 #ifdef CONFIG_HARDWALL
66086 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
66087 #endif
66088+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66089+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
66090+#endif
66091 #ifdef CONFIG_USER_NS
66092 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
66093 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
66094@@ -2748,7 +2872,14 @@ static int proc_pid_instantiate(struct inode *dir,
66095 if (!inode)
66096 goto out;
66097
66098+#ifdef CONFIG_GRKERNSEC_PROC_USER
66099+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
66100+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66101+ inode->i_gid = grsec_proc_gid;
66102+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
66103+#else
66104 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
66105+#endif
66106 inode->i_op = &proc_tgid_base_inode_operations;
66107 inode->i_fop = &proc_tgid_base_operations;
66108 inode->i_flags|=S_IMMUTABLE;
66109@@ -2786,7 +2917,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
66110 if (!task)
66111 goto out;
66112
66113+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66114+ goto out_put_task;
66115+
66116 result = proc_pid_instantiate(dir, dentry, task, NULL);
66117+out_put_task:
66118 put_task_struct(task);
66119 out:
66120 return ERR_PTR(result);
66121@@ -2900,7 +3035,7 @@ static const struct pid_entry tid_base_stuff[] = {
66122 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
66123 #endif
66124 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
66125-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66126+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66127 ONE("syscall", S_IRUSR, proc_pid_syscall),
66128 #endif
66129 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
66130@@ -2927,10 +3062,10 @@ static const struct pid_entry tid_base_stuff[] = {
66131 #ifdef CONFIG_SECURITY
66132 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
66133 #endif
66134-#ifdef CONFIG_KALLSYMS
66135+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66136 ONE("wchan", S_IRUGO, proc_pid_wchan),
66137 #endif
66138-#ifdef CONFIG_STACKTRACE
66139+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66140 ONE("stack", S_IRUSR, proc_pid_stack),
66141 #endif
66142 #ifdef CONFIG_SCHEDSTATS
66143diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
66144index cbd82df..c0407d2 100644
66145--- a/fs/proc/cmdline.c
66146+++ b/fs/proc/cmdline.c
66147@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
66148
66149 static int __init proc_cmdline_init(void)
66150 {
66151+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66152+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
66153+#else
66154 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
66155+#endif
66156 return 0;
66157 }
66158 fs_initcall(proc_cmdline_init);
66159diff --git a/fs/proc/devices.c b/fs/proc/devices.c
66160index 50493ed..248166b 100644
66161--- a/fs/proc/devices.c
66162+++ b/fs/proc/devices.c
66163@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
66164
66165 static int __init proc_devices_init(void)
66166 {
66167+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66168+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
66169+#else
66170 proc_create("devices", 0, NULL, &proc_devinfo_operations);
66171+#endif
66172 return 0;
66173 }
66174 fs_initcall(proc_devices_init);
66175diff --git a/fs/proc/fd.c b/fs/proc/fd.c
66176index e11d7c5..9128ce06 100644
66177--- a/fs/proc/fd.c
66178+++ b/fs/proc/fd.c
66179@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
66180 if (!task)
66181 return -ENOENT;
66182
66183- files = get_files_struct(task);
66184+ if (!gr_acl_handle_procpidmem(task))
66185+ files = get_files_struct(task);
66186 put_task_struct(task);
66187
66188 if (files) {
66189@@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
66190 */
66191 int proc_fd_permission(struct inode *inode, int mask)
66192 {
66193+ struct task_struct *task;
66194 int rv = generic_permission(inode, mask);
66195- if (rv == 0)
66196- return 0;
66197+
66198 if (task_tgid(current) == proc_pid(inode))
66199 rv = 0;
66200+
66201+ task = get_proc_task(inode);
66202+ if (task == NULL)
66203+ return rv;
66204+
66205+ if (gr_acl_handle_procpidmem(task))
66206+ rv = -EACCES;
66207+
66208+ put_task_struct(task);
66209+
66210 return rv;
66211 }
66212
66213diff --git a/fs/proc/generic.c b/fs/proc/generic.c
66214index 317b726..e329aed 100644
66215--- a/fs/proc/generic.c
66216+++ b/fs/proc/generic.c
66217@@ -23,6 +23,7 @@
66218 #include <linux/bitops.h>
66219 #include <linux/spinlock.h>
66220 #include <linux/completion.h>
66221+#include <linux/grsecurity.h>
66222 #include <asm/uaccess.h>
66223
66224 #include "internal.h"
66225@@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
66226 return proc_lookup_de(PDE(dir), dir, dentry);
66227 }
66228
66229+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
66230+ unsigned int flags)
66231+{
66232+ if (gr_proc_is_restricted())
66233+ return ERR_PTR(-EACCES);
66234+
66235+ return proc_lookup_de(PDE(dir), dir, dentry);
66236+}
66237+
66238 /*
66239 * This returns non-zero if at EOF, so that the /proc
66240 * root directory can use this and check if it should
66241@@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
66242 return proc_readdir_de(PDE(inode), file, ctx);
66243 }
66244
66245+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
66246+{
66247+ struct inode *inode = file_inode(file);
66248+
66249+ if (gr_proc_is_restricted())
66250+ return -EACCES;
66251+
66252+ return proc_readdir_de(PDE(inode), file, ctx);
66253+}
66254+
66255 /*
66256 * These are the generic /proc directory operations. They
66257 * use the in-memory "struct proc_dir_entry" tree to parse
66258@@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
66259 .iterate = proc_readdir,
66260 };
66261
66262+static const struct file_operations proc_dir_restricted_operations = {
66263+ .llseek = generic_file_llseek,
66264+ .read = generic_read_dir,
66265+ .iterate = proc_readdir_restrict,
66266+};
66267+
66268 /*
66269 * proc directories can do almost nothing..
66270 */
66271@@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
66272 .setattr = proc_notify_change,
66273 };
66274
66275+static const struct inode_operations proc_dir_restricted_inode_operations = {
66276+ .lookup = proc_lookup_restrict,
66277+ .getattr = proc_getattr,
66278+ .setattr = proc_notify_change,
66279+};
66280+
66281 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
66282 {
66283 struct proc_dir_entry *tmp;
66284@@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
66285 return ret;
66286
66287 if (S_ISDIR(dp->mode)) {
66288- dp->proc_fops = &proc_dir_operations;
66289- dp->proc_iops = &proc_dir_inode_operations;
66290+ if (dp->restricted) {
66291+ dp->proc_fops = &proc_dir_restricted_operations;
66292+ dp->proc_iops = &proc_dir_restricted_inode_operations;
66293+ } else {
66294+ dp->proc_fops = &proc_dir_operations;
66295+ dp->proc_iops = &proc_dir_inode_operations;
66296+ }
66297 dir->nlink++;
66298 } else if (S_ISLNK(dp->mode)) {
66299 dp->proc_iops = &proc_link_inode_operations;
66300@@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
66301 }
66302 EXPORT_SYMBOL_GPL(proc_mkdir_data);
66303
66304+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
66305+ struct proc_dir_entry *parent, void *data)
66306+{
66307+ struct proc_dir_entry *ent;
66308+
66309+ if (mode == 0)
66310+ mode = S_IRUGO | S_IXUGO;
66311+
66312+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
66313+ if (ent) {
66314+ ent->data = data;
66315+ ent->restricted = 1;
66316+ if (proc_register(parent, ent) < 0) {
66317+ kfree(ent);
66318+ ent = NULL;
66319+ }
66320+ }
66321+ return ent;
66322+}
66323+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
66324+
66325 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
66326 struct proc_dir_entry *parent)
66327 {
66328@@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
66329 }
66330 EXPORT_SYMBOL(proc_mkdir);
66331
66332+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
66333+ struct proc_dir_entry *parent)
66334+{
66335+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
66336+}
66337+EXPORT_SYMBOL(proc_mkdir_restrict);
66338+
66339 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
66340 struct proc_dir_entry *parent,
66341 const struct file_operations *proc_fops,
66342diff --git a/fs/proc/inode.c b/fs/proc/inode.c
66343index 333080d..0a35ec4 100644
66344--- a/fs/proc/inode.c
66345+++ b/fs/proc/inode.c
66346@@ -23,11 +23,17 @@
66347 #include <linux/slab.h>
66348 #include <linux/mount.h>
66349 #include <linux/magic.h>
66350+#include <linux/grsecurity.h>
66351
66352 #include <asm/uaccess.h>
66353
66354 #include "internal.h"
66355
66356+#ifdef CONFIG_PROC_SYSCTL
66357+extern const struct inode_operations proc_sys_inode_operations;
66358+extern const struct inode_operations proc_sys_dir_operations;
66359+#endif
66360+
66361 static void proc_evict_inode(struct inode *inode)
66362 {
66363 struct proc_dir_entry *de;
66364@@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
66365 ns = PROC_I(inode)->ns.ns;
66366 if (ns_ops && ns)
66367 ns_ops->put(ns);
66368+
66369+#ifdef CONFIG_PROC_SYSCTL
66370+ if (inode->i_op == &proc_sys_inode_operations ||
66371+ inode->i_op == &proc_sys_dir_operations)
66372+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
66373+#endif
66374+
66375 }
66376
66377 static struct kmem_cache * proc_inode_cachep;
66378@@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
66379 if (de->mode) {
66380 inode->i_mode = de->mode;
66381 inode->i_uid = de->uid;
66382+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66383+ inode->i_gid = grsec_proc_gid;
66384+#else
66385 inode->i_gid = de->gid;
66386+#endif
66387 }
66388 if (de->size)
66389 inode->i_size = de->size;
66390diff --git a/fs/proc/internal.h b/fs/proc/internal.h
66391index aa7a0ee..f2318df 100644
66392--- a/fs/proc/internal.h
66393+++ b/fs/proc/internal.h
66394@@ -46,9 +46,10 @@ struct proc_dir_entry {
66395 struct completion *pde_unload_completion;
66396 struct list_head pde_openers; /* who did ->open, but not ->release */
66397 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
66398+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
66399 u8 namelen;
66400 char name[];
66401-};
66402+} __randomize_layout;
66403
66404 union proc_op {
66405 int (*proc_get_link)(struct dentry *, struct path *);
66406@@ -66,7 +67,7 @@ struct proc_inode {
66407 struct ctl_table *sysctl_entry;
66408 struct proc_ns ns;
66409 struct inode vfs_inode;
66410-};
66411+} __randomize_layout;
66412
66413 /*
66414 * General functions
66415@@ -154,6 +155,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
66416 struct pid *, struct task_struct *);
66417 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
66418 struct pid *, struct task_struct *);
66419+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66420+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
66421+ struct pid *, struct task_struct *);
66422+#endif
66423
66424 /*
66425 * base.c
66426@@ -178,9 +183,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
66427 * generic.c
66428 */
66429 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
66430+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
66431 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
66432 struct dentry *);
66433 extern int proc_readdir(struct file *, struct dir_context *);
66434+extern int proc_readdir_restrict(struct file *, struct dir_context *);
66435 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
66436
66437 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
66438diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
66439index a352d57..cb94a5c 100644
66440--- a/fs/proc/interrupts.c
66441+++ b/fs/proc/interrupts.c
66442@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
66443
66444 static int __init proc_interrupts_init(void)
66445 {
66446+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66447+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
66448+#else
66449 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
66450+#endif
66451 return 0;
66452 }
66453 fs_initcall(proc_interrupts_init);
66454diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
66455index 91a4e64..cb007c0 100644
66456--- a/fs/proc/kcore.c
66457+++ b/fs/proc/kcore.c
66458@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66459 * the addresses in the elf_phdr on our list.
66460 */
66461 start = kc_offset_to_vaddr(*fpos - elf_buflen);
66462- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
66463+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
66464+ if (tsz > buflen)
66465 tsz = buflen;
66466-
66467+
66468 while (buflen) {
66469 struct kcore_list *m;
66470
66471@@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66472 kfree(elf_buf);
66473 } else {
66474 if (kern_addr_valid(start)) {
66475- unsigned long n;
66476+ char *elf_buf;
66477+ mm_segment_t oldfs;
66478
66479- n = copy_to_user(buffer, (char *)start, tsz);
66480- /*
66481- * We cannot distinguish between fault on source
66482- * and fault on destination. When this happens
66483- * we clear too and hope it will trigger the
66484- * EFAULT again.
66485- */
66486- if (n) {
66487- if (clear_user(buffer + tsz - n,
66488- n))
66489+ elf_buf = kmalloc(tsz, GFP_KERNEL);
66490+ if (!elf_buf)
66491+ return -ENOMEM;
66492+ oldfs = get_fs();
66493+ set_fs(KERNEL_DS);
66494+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
66495+ set_fs(oldfs);
66496+ if (copy_to_user(buffer, elf_buf, tsz)) {
66497+ kfree(elf_buf);
66498 return -EFAULT;
66499+ }
66500 }
66501+ set_fs(oldfs);
66502+ kfree(elf_buf);
66503 } else {
66504 if (clear_user(buffer, tsz))
66505 return -EFAULT;
66506@@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66507
66508 static int open_kcore(struct inode *inode, struct file *filp)
66509 {
66510+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66511+ return -EPERM;
66512+#endif
66513 if (!capable(CAP_SYS_RAWIO))
66514 return -EPERM;
66515 if (kcore_need_update)
66516diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
66517index aa1eee0..03dda72 100644
66518--- a/fs/proc/meminfo.c
66519+++ b/fs/proc/meminfo.c
66520@@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
66521 vmi.used >> 10,
66522 vmi.largest_chunk >> 10
66523 #ifdef CONFIG_MEMORY_FAILURE
66524- ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66525+ ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66526 #endif
66527 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
66528 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
66529diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
66530index d4a3574..b421ce9 100644
66531--- a/fs/proc/nommu.c
66532+++ b/fs/proc/nommu.c
66533@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
66534
66535 if (file) {
66536 seq_pad(m, ' ');
66537- seq_path(m, &file->f_path, "");
66538+ seq_path(m, &file->f_path, "\n\\");
66539 }
66540
66541 seq_putc(m, '\n');
66542diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
66543index a63af3e..b4f262a 100644
66544--- a/fs/proc/proc_net.c
66545+++ b/fs/proc/proc_net.c
66546@@ -23,9 +23,27 @@
66547 #include <linux/nsproxy.h>
66548 #include <net/net_namespace.h>
66549 #include <linux/seq_file.h>
66550+#include <linux/grsecurity.h>
66551
66552 #include "internal.h"
66553
66554+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66555+static struct seq_operations *ipv6_seq_ops_addr;
66556+
66557+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
66558+{
66559+ ipv6_seq_ops_addr = addr;
66560+}
66561+
66562+void unregister_ipv6_seq_ops_addr(void)
66563+{
66564+ ipv6_seq_ops_addr = NULL;
66565+}
66566+
66567+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
66568+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
66569+#endif
66570+
66571 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
66572 {
66573 return pde->parent->data;
66574@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
66575 return maybe_get_net(PDE_NET(PDE(inode)));
66576 }
66577
66578+extern const struct seq_operations dev_seq_ops;
66579+
66580 int seq_open_net(struct inode *ino, struct file *f,
66581 const struct seq_operations *ops, int size)
66582 {
66583@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
66584
66585 BUG_ON(size < sizeof(*p));
66586
66587+ /* only permit access to /proc/net/dev */
66588+ if (
66589+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66590+ ops != ipv6_seq_ops_addr &&
66591+#endif
66592+ ops != &dev_seq_ops && gr_proc_is_restricted())
66593+ return -EACCES;
66594+
66595 net = get_proc_net(ino);
66596 if (net == NULL)
66597 return -ENXIO;
66598@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
66599 int err;
66600 struct net *net;
66601
66602+ if (gr_proc_is_restricted())
66603+ return -EACCES;
66604+
66605 err = -ENXIO;
66606 net = get_proc_net(inode);
66607 if (net == NULL)
66608diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
66609index f92d5dd..26398ac 100644
66610--- a/fs/proc/proc_sysctl.c
66611+++ b/fs/proc/proc_sysctl.c
66612@@ -11,13 +11,21 @@
66613 #include <linux/namei.h>
66614 #include <linux/mm.h>
66615 #include <linux/module.h>
66616+#include <linux/nsproxy.h>
66617+#ifdef CONFIG_GRKERNSEC
66618+#include <net/net_namespace.h>
66619+#endif
66620 #include "internal.h"
66621
66622+extern int gr_handle_chroot_sysctl(const int op);
66623+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
66624+ const int op);
66625+
66626 static const struct dentry_operations proc_sys_dentry_operations;
66627 static const struct file_operations proc_sys_file_operations;
66628-static const struct inode_operations proc_sys_inode_operations;
66629+const struct inode_operations proc_sys_inode_operations;
66630 static const struct file_operations proc_sys_dir_file_operations;
66631-static const struct inode_operations proc_sys_dir_operations;
66632+const struct inode_operations proc_sys_dir_operations;
66633
66634 void proc_sys_poll_notify(struct ctl_table_poll *poll)
66635 {
66636@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
66637
66638 err = NULL;
66639 d_set_d_op(dentry, &proc_sys_dentry_operations);
66640+
66641+ gr_handle_proc_create(dentry, inode);
66642+
66643 d_add(dentry, inode);
66644
66645 out:
66646@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66647 struct inode *inode = file_inode(filp);
66648 struct ctl_table_header *head = grab_header(inode);
66649 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
66650+ int op = write ? MAY_WRITE : MAY_READ;
66651 ssize_t error;
66652 size_t res;
66653
66654@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66655 * and won't be until we finish.
66656 */
66657 error = -EPERM;
66658- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
66659+ if (sysctl_perm(head, table, op))
66660 goto out;
66661
66662 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
66663@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66664 if (!table->proc_handler)
66665 goto out;
66666
66667+#ifdef CONFIG_GRKERNSEC
66668+ error = -EPERM;
66669+ if (gr_handle_chroot_sysctl(op))
66670+ goto out;
66671+ dget(filp->f_path.dentry);
66672+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
66673+ dput(filp->f_path.dentry);
66674+ goto out;
66675+ }
66676+ dput(filp->f_path.dentry);
66677+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
66678+ goto out;
66679+ if (write) {
66680+ if (current->nsproxy->net_ns != table->extra2) {
66681+ if (!capable(CAP_SYS_ADMIN))
66682+ goto out;
66683+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
66684+ goto out;
66685+ }
66686+#endif
66687+
66688 /* careful: calling conventions are nasty here */
66689 res = count;
66690 error = table->proc_handler(table, write, buf, &res, ppos);
66691@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
66692 return false;
66693 } else {
66694 d_set_d_op(child, &proc_sys_dentry_operations);
66695+
66696+ gr_handle_proc_create(child, inode);
66697+
66698 d_add(child, inode);
66699 }
66700 } else {
66701@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
66702 if ((*pos)++ < ctx->pos)
66703 return true;
66704
66705+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
66706+ return 0;
66707+
66708 if (unlikely(S_ISLNK(table->mode)))
66709 res = proc_sys_link_fill_cache(file, ctx, head, table);
66710 else
66711@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
66712 if (IS_ERR(head))
66713 return PTR_ERR(head);
66714
66715+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
66716+ return -ENOENT;
66717+
66718 generic_fillattr(inode, stat);
66719 if (table)
66720 stat->mode = (stat->mode & S_IFMT) | table->mode;
66721@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
66722 .llseek = generic_file_llseek,
66723 };
66724
66725-static const struct inode_operations proc_sys_inode_operations = {
66726+const struct inode_operations proc_sys_inode_operations = {
66727 .permission = proc_sys_permission,
66728 .setattr = proc_sys_setattr,
66729 .getattr = proc_sys_getattr,
66730 };
66731
66732-static const struct inode_operations proc_sys_dir_operations = {
66733+const struct inode_operations proc_sys_dir_operations = {
66734 .lookup = proc_sys_lookup,
66735 .permission = proc_sys_permission,
66736 .setattr = proc_sys_setattr,
66737@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
66738 static struct ctl_dir *new_dir(struct ctl_table_set *set,
66739 const char *name, int namelen)
66740 {
66741- struct ctl_table *table;
66742+ ctl_table_no_const *table;
66743 struct ctl_dir *new;
66744 struct ctl_node *node;
66745 char *new_name;
66746@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
66747 return NULL;
66748
66749 node = (struct ctl_node *)(new + 1);
66750- table = (struct ctl_table *)(node + 1);
66751+ table = (ctl_table_no_const *)(node + 1);
66752 new_name = (char *)(table + 2);
66753 memcpy(new_name, name, namelen);
66754 new_name[namelen] = '\0';
66755@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
66756 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
66757 struct ctl_table_root *link_root)
66758 {
66759- struct ctl_table *link_table, *entry, *link;
66760+ ctl_table_no_const *link_table, *link;
66761+ struct ctl_table *entry;
66762 struct ctl_table_header *links;
66763 struct ctl_node *node;
66764 char *link_name;
66765@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
66766 return NULL;
66767
66768 node = (struct ctl_node *)(links + 1);
66769- link_table = (struct ctl_table *)(node + nr_entries);
66770+ link_table = (ctl_table_no_const *)(node + nr_entries);
66771 link_name = (char *)&link_table[nr_entries + 1];
66772
66773 for (link = link_table, entry = table; entry->procname; link++, entry++) {
66774@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66775 struct ctl_table_header ***subheader, struct ctl_table_set *set,
66776 struct ctl_table *table)
66777 {
66778- struct ctl_table *ctl_table_arg = NULL;
66779- struct ctl_table *entry, *files;
66780+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
66781+ struct ctl_table *entry;
66782 int nr_files = 0;
66783 int nr_dirs = 0;
66784 int err = -ENOMEM;
66785@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66786 nr_files++;
66787 }
66788
66789- files = table;
66790 /* If there are mixed files and directories we need a new table */
66791 if (nr_dirs && nr_files) {
66792- struct ctl_table *new;
66793+ ctl_table_no_const *new;
66794 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
66795 GFP_KERNEL);
66796 if (!files)
66797@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66798 /* Register everything except a directory full of subdirectories */
66799 if (nr_files || !nr_dirs) {
66800 struct ctl_table_header *header;
66801- header = __register_sysctl_table(set, path, files);
66802+ header = __register_sysctl_table(set, path, files ? files : table);
66803 if (!header) {
66804 kfree(ctl_table_arg);
66805 goto out;
66806diff --git a/fs/proc/root.c b/fs/proc/root.c
66807index 094e44d..085a877 100644
66808--- a/fs/proc/root.c
66809+++ b/fs/proc/root.c
66810@@ -188,7 +188,15 @@ void __init proc_root_init(void)
66811 proc_mkdir("openprom", NULL);
66812 #endif
66813 proc_tty_init();
66814+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66815+#ifdef CONFIG_GRKERNSEC_PROC_USER
66816+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
66817+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66818+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
66819+#endif
66820+#else
66821 proc_mkdir("bus", NULL);
66822+#endif
66823 proc_sys_init();
66824 }
66825
66826diff --git a/fs/proc/stat.c b/fs/proc/stat.c
66827index 510413eb..34d9a8c 100644
66828--- a/fs/proc/stat.c
66829+++ b/fs/proc/stat.c
66830@@ -11,6 +11,7 @@
66831 #include <linux/irqnr.h>
66832 #include <linux/cputime.h>
66833 #include <linux/tick.h>
66834+#include <linux/grsecurity.h>
66835
66836 #ifndef arch_irq_stat_cpu
66837 #define arch_irq_stat_cpu(cpu) 0
66838@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
66839 u64 sum_softirq = 0;
66840 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
66841 struct timespec boottime;
66842+ int unrestricted = 1;
66843+
66844+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66845+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66846+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
66847+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66848+ && !in_group_p(grsec_proc_gid)
66849+#endif
66850+ )
66851+ unrestricted = 0;
66852+#endif
66853+#endif
66854
66855 user = nice = system = idle = iowait =
66856 irq = softirq = steal = 0;
66857@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
66858 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66859 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66860 idle += get_idle_time(i);
66861- iowait += get_iowait_time(i);
66862- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66863- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66864- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66865- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66866- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66867- sum += kstat_cpu_irqs_sum(i);
66868- sum += arch_irq_stat_cpu(i);
66869+ if (unrestricted) {
66870+ iowait += get_iowait_time(i);
66871+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66872+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66873+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66874+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66875+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66876+ sum += kstat_cpu_irqs_sum(i);
66877+ sum += arch_irq_stat_cpu(i);
66878+ for (j = 0; j < NR_SOFTIRQS; j++) {
66879+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66880
66881- for (j = 0; j < NR_SOFTIRQS; j++) {
66882- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66883-
66884- per_softirq_sums[j] += softirq_stat;
66885- sum_softirq += softirq_stat;
66886+ per_softirq_sums[j] += softirq_stat;
66887+ sum_softirq += softirq_stat;
66888+ }
66889 }
66890 }
66891- sum += arch_irq_stat();
66892+ if (unrestricted)
66893+ sum += arch_irq_stat();
66894
66895 seq_puts(p, "cpu ");
66896 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66897@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
66898 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66899 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66900 idle = get_idle_time(i);
66901- iowait = get_iowait_time(i);
66902- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66903- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66904- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66905- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66906- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66907+ if (unrestricted) {
66908+ iowait = get_iowait_time(i);
66909+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66910+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66911+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66912+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66913+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66914+ }
66915 seq_printf(p, "cpu%d", i);
66916 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66917 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
66918@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
66919
66920 /* sum again ? it could be updated? */
66921 for_each_irq_nr(j)
66922- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
66923+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
66924
66925 seq_printf(p,
66926 "\nctxt %llu\n"
66927@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
66928 "processes %lu\n"
66929 "procs_running %lu\n"
66930 "procs_blocked %lu\n",
66931- nr_context_switches(),
66932+ unrestricted ? nr_context_switches() : 0ULL,
66933 (unsigned long)jif,
66934- total_forks,
66935- nr_running(),
66936- nr_iowait());
66937+ unrestricted ? total_forks : 0UL,
66938+ unrestricted ? nr_running() : 0UL,
66939+ unrestricted ? nr_iowait() : 0UL);
66940
66941 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
66942
66943diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
66944index 4e0388c..fc6a0e1 100644
66945--- a/fs/proc/task_mmu.c
66946+++ b/fs/proc/task_mmu.c
66947@@ -13,12 +13,19 @@
66948 #include <linux/swap.h>
66949 #include <linux/swapops.h>
66950 #include <linux/mmu_notifier.h>
66951+#include <linux/grsecurity.h>
66952
66953 #include <asm/elf.h>
66954 #include <asm/uaccess.h>
66955 #include <asm/tlbflush.h>
66956 #include "internal.h"
66957
66958+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66959+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66960+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66961+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66962+#endif
66963+
66964 void task_mem(struct seq_file *m, struct mm_struct *mm)
66965 {
66966 unsigned long data, text, lib, swap;
66967@@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66968 "VmExe:\t%8lu kB\n"
66969 "VmLib:\t%8lu kB\n"
66970 "VmPTE:\t%8lu kB\n"
66971- "VmSwap:\t%8lu kB\n",
66972- hiwater_vm << (PAGE_SHIFT-10),
66973+ "VmSwap:\t%8lu kB\n"
66974+
66975+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66976+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
66977+#endif
66978+
66979+ ,hiwater_vm << (PAGE_SHIFT-10),
66980 total_vm << (PAGE_SHIFT-10),
66981 mm->locked_vm << (PAGE_SHIFT-10),
66982 mm->pinned_vm << (PAGE_SHIFT-10),
66983@@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66984 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
66985 (PTRS_PER_PTE * sizeof(pte_t) *
66986 atomic_long_read(&mm->nr_ptes)) >> 10,
66987- swap << (PAGE_SHIFT-10));
66988+ swap << (PAGE_SHIFT-10)
66989+
66990+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66991+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66992+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
66993+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
66994+#else
66995+ , mm->context.user_cs_base
66996+ , mm->context.user_cs_limit
66997+#endif
66998+#endif
66999+
67000+ );
67001 }
67002
67003 unsigned long task_vsize(struct mm_struct *mm)
67004@@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67005 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
67006 }
67007
67008- /* We don't show the stack guard page in /proc/maps */
67009+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67010+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
67011+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
67012+#else
67013 start = vma->vm_start;
67014- if (stack_guard_page_start(vma, start))
67015- start += PAGE_SIZE;
67016 end = vma->vm_end;
67017- if (stack_guard_page_end(vma, end))
67018- end -= PAGE_SIZE;
67019+#endif
67020
67021 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
67022 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
67023@@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67024 flags & VM_WRITE ? 'w' : '-',
67025 flags & VM_EXEC ? 'x' : '-',
67026 flags & VM_MAYSHARE ? 's' : 'p',
67027+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67028+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
67029+#else
67030 pgoff,
67031+#endif
67032 MAJOR(dev), MINOR(dev), ino);
67033
67034 /*
67035@@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67036 */
67037 if (file) {
67038 seq_pad(m, ' ');
67039- seq_path(m, &file->f_path, "\n");
67040+ seq_path(m, &file->f_path, "\n\\");
67041 goto done;
67042 }
67043
67044@@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
67045 * Thread stack in /proc/PID/task/TID/maps or
67046 * the main process stack.
67047 */
67048- if (!is_pid || (vma->vm_start <= mm->start_stack &&
67049- vma->vm_end >= mm->start_stack)) {
67050+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
67051+ (vma->vm_start <= mm->start_stack &&
67052+ vma->vm_end >= mm->start_stack)) {
67053 name = "[stack]";
67054 } else {
67055 /* Thread stack in /proc/PID/maps */
67056@@ -359,6 +388,12 @@ done:
67057
67058 static int show_map(struct seq_file *m, void *v, int is_pid)
67059 {
67060+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67061+ if (current->exec_id != m->exec_id) {
67062+ gr_log_badprocpid("maps");
67063+ return 0;
67064+ }
67065+#endif
67066 show_map_vma(m, v, is_pid);
67067 m_cache_vma(m, v);
67068 return 0;
67069@@ -594,12 +629,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
67070 .private = &mss,
67071 };
67072
67073+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67074+ if (current->exec_id != m->exec_id) {
67075+ gr_log_badprocpid("smaps");
67076+ return 0;
67077+ }
67078+#endif
67079 memset(&mss, 0, sizeof mss);
67080- mss.vma = vma;
67081- /* mmap_sem is held in m_start */
67082- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
67083- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
67084-
67085+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67086+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
67087+#endif
67088+ mss.vma = vma;
67089+ /* mmap_sem is held in m_start */
67090+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
67091+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
67092+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67093+ }
67094+#endif
67095 show_map_vma(m, vma, is_pid);
67096
67097 seq_printf(m,
67098@@ -617,7 +663,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
67099 "KernelPageSize: %8lu kB\n"
67100 "MMUPageSize: %8lu kB\n"
67101 "Locked: %8lu kB\n",
67102+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67103+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
67104+#else
67105 (vma->vm_end - vma->vm_start) >> 10,
67106+#endif
67107 mss.resident >> 10,
67108 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
67109 mss.shared_clean >> 10,
67110@@ -1447,6 +1497,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
67111 char buffer[64];
67112 int nid;
67113
67114+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67115+ if (current->exec_id != m->exec_id) {
67116+ gr_log_badprocpid("numa_maps");
67117+ return 0;
67118+ }
67119+#endif
67120+
67121 if (!mm)
67122 return 0;
67123
67124@@ -1468,11 +1525,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
67125 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
67126 }
67127
67128+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67129+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
67130+#else
67131 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
67132+#endif
67133
67134 if (file) {
67135 seq_puts(m, " file=");
67136- seq_path(m, &file->f_path, "\n\t= ");
67137+ seq_path(m, &file->f_path, "\n\t\\= ");
67138 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
67139 seq_puts(m, " heap");
67140 } else {
67141diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
67142index 599ec2e..f1413ae 100644
67143--- a/fs/proc/task_nommu.c
67144+++ b/fs/proc/task_nommu.c
67145@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
67146 else
67147 bytes += kobjsize(mm);
67148
67149- if (current->fs && current->fs->users > 1)
67150+ if (current->fs && atomic_read(&current->fs->users) > 1)
67151 sbytes += kobjsize(current->fs);
67152 else
67153 bytes += kobjsize(current->fs);
67154@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
67155
67156 if (file) {
67157 seq_pad(m, ' ');
67158- seq_path(m, &file->f_path, "");
67159+ seq_path(m, &file->f_path, "\n\\");
67160 } else if (mm) {
67161 pid_t tid = pid_of_stack(priv, vma, is_pid);
67162
67163diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
67164index a90d6d35..d08047c 100644
67165--- a/fs/proc/vmcore.c
67166+++ b/fs/proc/vmcore.c
67167@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
67168 nr_bytes = count;
67169
67170 /* If pfn is not ram, return zeros for sparse dump files */
67171- if (pfn_is_ram(pfn) == 0)
67172- memset(buf, 0, nr_bytes);
67173- else {
67174+ if (pfn_is_ram(pfn) == 0) {
67175+ if (userbuf) {
67176+ if (clear_user((char __force_user *)buf, nr_bytes))
67177+ return -EFAULT;
67178+ } else
67179+ memset(buf, 0, nr_bytes);
67180+ } else {
67181 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
67182 offset, userbuf);
67183 if (tmp < 0)
67184@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
67185 static int copy_to(void *target, void *src, size_t size, int userbuf)
67186 {
67187 if (userbuf) {
67188- if (copy_to_user((char __user *) target, src, size))
67189+ if (copy_to_user((char __force_user *) target, src, size))
67190 return -EFAULT;
67191 } else {
67192 memcpy(target, src, size);
67193@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67194 if (*fpos < m->offset + m->size) {
67195 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
67196 start = m->paddr + *fpos - m->offset;
67197- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
67198+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
67199 if (tmp < 0)
67200 return tmp;
67201 buflen -= tsz;
67202@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67203 static ssize_t read_vmcore(struct file *file, char __user *buffer,
67204 size_t buflen, loff_t *fpos)
67205 {
67206- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
67207+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
67208 }
67209
67210 /*
67211diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
67212index d3fb2b6..43a8140 100644
67213--- a/fs/qnx6/qnx6.h
67214+++ b/fs/qnx6/qnx6.h
67215@@ -74,7 +74,7 @@ enum {
67216 BYTESEX_BE,
67217 };
67218
67219-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67220+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67221 {
67222 if (sbi->s_bytesex == BYTESEX_LE)
67223 return le64_to_cpu((__force __le64)n);
67224@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
67225 return (__force __fs64)cpu_to_be64(n);
67226 }
67227
67228-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67229+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67230 {
67231 if (sbi->s_bytesex == BYTESEX_LE)
67232 return le32_to_cpu((__force __le32)n);
67233diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
67234index bb2869f..d34ada8 100644
67235--- a/fs/quota/netlink.c
67236+++ b/fs/quota/netlink.c
67237@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
67238 void quota_send_warning(struct kqid qid, dev_t dev,
67239 const char warntype)
67240 {
67241- static atomic_t seq;
67242+ static atomic_unchecked_t seq;
67243 struct sk_buff *skb;
67244 void *msg_head;
67245 int ret;
67246@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
67247 "VFS: Not enough memory to send quota warning.\n");
67248 return;
67249 }
67250- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
67251+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
67252 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
67253 if (!msg_head) {
67254 printk(KERN_ERR
67255diff --git a/fs/read_write.c b/fs/read_write.c
67256index 7d9318c..51b336f 100644
67257--- a/fs/read_write.c
67258+++ b/fs/read_write.c
67259@@ -495,7 +495,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
67260
67261 old_fs = get_fs();
67262 set_fs(get_ds());
67263- p = (__force const char __user *)buf;
67264+ p = (const char __force_user *)buf;
67265 if (count > MAX_RW_COUNT)
67266 count = MAX_RW_COUNT;
67267 if (file->f_op->write)
67268diff --git a/fs/readdir.c b/fs/readdir.c
67269index 33fd922..e0d6094 100644
67270--- a/fs/readdir.c
67271+++ b/fs/readdir.c
67272@@ -18,6 +18,7 @@
67273 #include <linux/security.h>
67274 #include <linux/syscalls.h>
67275 #include <linux/unistd.h>
67276+#include <linux/namei.h>
67277
67278 #include <asm/uaccess.h>
67279
67280@@ -71,6 +72,7 @@ struct old_linux_dirent {
67281 struct readdir_callback {
67282 struct dir_context ctx;
67283 struct old_linux_dirent __user * dirent;
67284+ struct file * file;
67285 int result;
67286 };
67287
67288@@ -88,6 +90,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
67289 buf->result = -EOVERFLOW;
67290 return -EOVERFLOW;
67291 }
67292+
67293+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67294+ return 0;
67295+
67296 buf->result++;
67297 dirent = buf->dirent;
67298 if (!access_ok(VERIFY_WRITE, dirent,
67299@@ -119,6 +125,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
67300 if (!f.file)
67301 return -EBADF;
67302
67303+ buf.file = f.file;
67304 error = iterate_dir(f.file, &buf.ctx);
67305 if (buf.result)
67306 error = buf.result;
67307@@ -144,6 +151,7 @@ struct getdents_callback {
67308 struct dir_context ctx;
67309 struct linux_dirent __user * current_dir;
67310 struct linux_dirent __user * previous;
67311+ struct file * file;
67312 int count;
67313 int error;
67314 };
67315@@ -165,6 +173,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
67316 buf->error = -EOVERFLOW;
67317 return -EOVERFLOW;
67318 }
67319+
67320+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67321+ return 0;
67322+
67323 dirent = buf->previous;
67324 if (dirent) {
67325 if (__put_user(offset, &dirent->d_off))
67326@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
67327 if (!f.file)
67328 return -EBADF;
67329
67330+ buf.file = f.file;
67331 error = iterate_dir(f.file, &buf.ctx);
67332 if (error >= 0)
67333 error = buf.error;
67334@@ -228,6 +241,7 @@ struct getdents_callback64 {
67335 struct dir_context ctx;
67336 struct linux_dirent64 __user * current_dir;
67337 struct linux_dirent64 __user * previous;
67338+ struct file *file;
67339 int count;
67340 int error;
67341 };
67342@@ -243,6 +257,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
67343 buf->error = -EINVAL; /* only used if we fail.. */
67344 if (reclen > buf->count)
67345 return -EINVAL;
67346+
67347+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67348+ return 0;
67349+
67350 dirent = buf->previous;
67351 if (dirent) {
67352 if (__put_user(offset, &dirent->d_off))
67353@@ -290,6 +308,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
67354 if (!f.file)
67355 return -EBADF;
67356
67357+ buf.file = f.file;
67358 error = iterate_dir(f.file, &buf.ctx);
67359 if (error >= 0)
67360 error = buf.error;
67361diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
67362index 9c02d96..6562c10 100644
67363--- a/fs/reiserfs/do_balan.c
67364+++ b/fs/reiserfs/do_balan.c
67365@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
67366 return;
67367 }
67368
67369- atomic_inc(&fs_generation(tb->tb_sb));
67370+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
67371 do_balance_starts(tb);
67372
67373 /*
67374diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
67375index aca73dd..e3c558d 100644
67376--- a/fs/reiserfs/item_ops.c
67377+++ b/fs/reiserfs/item_ops.c
67378@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
67379 }
67380
67381 static struct item_operations errcatch_ops = {
67382- errcatch_bytes_number,
67383- errcatch_decrement_key,
67384- errcatch_is_left_mergeable,
67385- errcatch_print_item,
67386- errcatch_check_item,
67387+ .bytes_number = errcatch_bytes_number,
67388+ .decrement_key = errcatch_decrement_key,
67389+ .is_left_mergeable = errcatch_is_left_mergeable,
67390+ .print_item = errcatch_print_item,
67391+ .check_item = errcatch_check_item,
67392
67393- errcatch_create_vi,
67394- errcatch_check_left,
67395- errcatch_check_right,
67396- errcatch_part_size,
67397- errcatch_unit_num,
67398- errcatch_print_vi
67399+ .create_vi = errcatch_create_vi,
67400+ .check_left = errcatch_check_left,
67401+ .check_right = errcatch_check_right,
67402+ .part_size = errcatch_part_size,
67403+ .unit_num = errcatch_unit_num,
67404+ .print_vi = errcatch_print_vi
67405 };
67406
67407 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
67408diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
67409index 621b9f3..af527fd 100644
67410--- a/fs/reiserfs/procfs.c
67411+++ b/fs/reiserfs/procfs.c
67412@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
67413 "SMALL_TAILS " : "NO_TAILS ",
67414 replay_only(sb) ? "REPLAY_ONLY " : "",
67415 convert_reiserfs(sb) ? "CONV " : "",
67416- atomic_read(&r->s_generation_counter),
67417+ atomic_read_unchecked(&r->s_generation_counter),
67418 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
67419 SF(s_do_balance), SF(s_unneeded_left_neighbor),
67420 SF(s_good_search_by_key_reada), SF(s_bmaps),
67421diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
67422index 1894d96..1dfd1c2 100644
67423--- a/fs/reiserfs/reiserfs.h
67424+++ b/fs/reiserfs/reiserfs.h
67425@@ -576,7 +576,7 @@ struct reiserfs_sb_info {
67426 /* Comment? -Hans */
67427 wait_queue_head_t s_wait;
67428 /* increased by one every time the tree gets re-balanced */
67429- atomic_t s_generation_counter;
67430+ atomic_unchecked_t s_generation_counter;
67431
67432 /* File system properties. Currently holds on-disk FS format */
67433 unsigned long s_properties;
67434@@ -2297,7 +2297,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
67435 #define REISERFS_USER_MEM 1 /* user memory mode */
67436
67437 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
67438-#define get_generation(s) atomic_read (&fs_generation(s))
67439+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
67440 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
67441 #define __fs_changed(gen,s) (gen != get_generation (s))
67442 #define fs_changed(gen,s) \
67443diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
67444index b27ef35..d9c6c18 100644
67445--- a/fs/reiserfs/super.c
67446+++ b/fs/reiserfs/super.c
67447@@ -1857,6 +1857,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
67448 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
67449 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
67450 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
67451+#ifdef CONFIG_REISERFS_FS_XATTR
67452+ /* turn on user xattrs by default */
67453+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
67454+#endif
67455 /* no preallocation minimum, be smart in reiserfs_file_write instead */
67456 sbi->s_alloc_options.preallocmin = 0;
67457 /* Preallocate by 16 blocks (17-1) at once */
67458diff --git a/fs/select.c b/fs/select.c
67459index 467bb1c..cf9d65a 100644
67460--- a/fs/select.c
67461+++ b/fs/select.c
67462@@ -20,6 +20,7 @@
67463 #include <linux/export.h>
67464 #include <linux/slab.h>
67465 #include <linux/poll.h>
67466+#include <linux/security.h>
67467 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
67468 #include <linux/file.h>
67469 #include <linux/fdtable.h>
67470@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
67471 struct poll_list *walk = head;
67472 unsigned long todo = nfds;
67473
67474+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
67475 if (nfds > rlimit(RLIMIT_NOFILE))
67476 return -EINVAL;
67477
67478diff --git a/fs/seq_file.c b/fs/seq_file.c
67479index 3857b72..0b7281e 100644
67480--- a/fs/seq_file.c
67481+++ b/fs/seq_file.c
67482@@ -12,6 +12,8 @@
67483 #include <linux/slab.h>
67484 #include <linux/cred.h>
67485 #include <linux/mm.h>
67486+#include <linux/sched.h>
67487+#include <linux/grsecurity.h>
67488
67489 #include <asm/uaccess.h>
67490 #include <asm/page.h>
67491@@ -34,12 +36,7 @@ static void seq_set_overflow(struct seq_file *m)
67492
67493 static void *seq_buf_alloc(unsigned long size)
67494 {
67495- void *buf;
67496-
67497- buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
67498- if (!buf && size > PAGE_SIZE)
67499- buf = vmalloc(size);
67500- return buf;
67501+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
67502 }
67503
67504 /**
67505@@ -72,6 +69,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
67506 #ifdef CONFIG_USER_NS
67507 p->user_ns = file->f_cred->user_ns;
67508 #endif
67509+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67510+ p->exec_id = current->exec_id;
67511+#endif
67512
67513 /*
67514 * Wrappers around seq_open(e.g. swaps_open) need to be
67515@@ -94,6 +94,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
67516 }
67517 EXPORT_SYMBOL(seq_open);
67518
67519+
67520+int seq_open_restrict(struct file *file, const struct seq_operations *op)
67521+{
67522+ if (gr_proc_is_restricted())
67523+ return -EACCES;
67524+
67525+ return seq_open(file, op);
67526+}
67527+EXPORT_SYMBOL(seq_open_restrict);
67528+
67529 static int traverse(struct seq_file *m, loff_t offset)
67530 {
67531 loff_t pos = 0, index;
67532@@ -165,7 +175,7 @@ Eoverflow:
67533 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
67534 {
67535 struct seq_file *m = file->private_data;
67536- size_t copied = 0;
67537+ ssize_t copied = 0;
67538 loff_t pos;
67539 size_t n;
67540 void *p;
67541@@ -596,7 +606,7 @@ static void single_stop(struct seq_file *p, void *v)
67542 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
67543 void *data)
67544 {
67545- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
67546+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
67547 int res = -ENOMEM;
67548
67549 if (op) {
67550@@ -632,6 +642,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
67551 }
67552 EXPORT_SYMBOL(single_open_size);
67553
67554+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
67555+ void *data)
67556+{
67557+ if (gr_proc_is_restricted())
67558+ return -EACCES;
67559+
67560+ return single_open(file, show, data);
67561+}
67562+EXPORT_SYMBOL(single_open_restrict);
67563+
67564+
67565 int single_release(struct inode *inode, struct file *file)
67566 {
67567 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
67568diff --git a/fs/splice.c b/fs/splice.c
67569index 75c6058..770d40c 100644
67570--- a/fs/splice.c
67571+++ b/fs/splice.c
67572@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67573 pipe_lock(pipe);
67574
67575 for (;;) {
67576- if (!pipe->readers) {
67577+ if (!atomic_read(&pipe->readers)) {
67578 send_sig(SIGPIPE, current, 0);
67579 if (!ret)
67580 ret = -EPIPE;
67581@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67582 page_nr++;
67583 ret += buf->len;
67584
67585- if (pipe->files)
67586+ if (atomic_read(&pipe->files))
67587 do_wakeup = 1;
67588
67589 if (!--spd->nr_pages)
67590@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67591 do_wakeup = 0;
67592 }
67593
67594- pipe->waiting_writers++;
67595+ atomic_inc(&pipe->waiting_writers);
67596 pipe_wait(pipe);
67597- pipe->waiting_writers--;
67598+ atomic_dec(&pipe->waiting_writers);
67599 }
67600
67601 pipe_unlock(pipe);
67602@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
67603 old_fs = get_fs();
67604 set_fs(get_ds());
67605 /* The cast to a user pointer is valid due to the set_fs() */
67606- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
67607+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
67608 set_fs(old_fs);
67609
67610 return res;
67611@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
67612 old_fs = get_fs();
67613 set_fs(get_ds());
67614 /* The cast to a user pointer is valid due to the set_fs() */
67615- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
67616+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
67617 set_fs(old_fs);
67618
67619 return res;
67620@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
67621 goto err;
67622
67623 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
67624- vec[i].iov_base = (void __user *) page_address(page);
67625+ vec[i].iov_base = (void __force_user *) page_address(page);
67626 vec[i].iov_len = this_len;
67627 spd.pages[i] = page;
67628 spd.nr_pages++;
67629@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67630 ops->release(pipe, buf);
67631 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67632 pipe->nrbufs--;
67633- if (pipe->files)
67634+ if (atomic_read(&pipe->files))
67635 sd->need_wakeup = true;
67636 }
67637
67638@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67639 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
67640 {
67641 while (!pipe->nrbufs) {
67642- if (!pipe->writers)
67643+ if (!atomic_read(&pipe->writers))
67644 return 0;
67645
67646- if (!pipe->waiting_writers && sd->num_spliced)
67647+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
67648 return 0;
67649
67650 if (sd->flags & SPLICE_F_NONBLOCK)
67651@@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
67652 ops->release(pipe, buf);
67653 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67654 pipe->nrbufs--;
67655- if (pipe->files)
67656+ if (atomic_read(&pipe->files))
67657 sd.need_wakeup = true;
67658 } else {
67659 buf->offset += ret;
67660@@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
67661 * out of the pipe right after the splice_to_pipe(). So set
67662 * PIPE_READERS appropriately.
67663 */
67664- pipe->readers = 1;
67665+ atomic_set(&pipe->readers, 1);
67666
67667 current->splice_pipe = pipe;
67668 }
67669@@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
67670
67671 partial[buffers].offset = off;
67672 partial[buffers].len = plen;
67673+ partial[buffers].private = 0;
67674
67675 off = 0;
67676 len -= plen;
67677@@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67678 ret = -ERESTARTSYS;
67679 break;
67680 }
67681- if (!pipe->writers)
67682+ if (!atomic_read(&pipe->writers))
67683 break;
67684- if (!pipe->waiting_writers) {
67685+ if (!atomic_read(&pipe->waiting_writers)) {
67686 if (flags & SPLICE_F_NONBLOCK) {
67687 ret = -EAGAIN;
67688 break;
67689@@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67690 pipe_lock(pipe);
67691
67692 while (pipe->nrbufs >= pipe->buffers) {
67693- if (!pipe->readers) {
67694+ if (!atomic_read(&pipe->readers)) {
67695 send_sig(SIGPIPE, current, 0);
67696 ret = -EPIPE;
67697 break;
67698@@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67699 ret = -ERESTARTSYS;
67700 break;
67701 }
67702- pipe->waiting_writers++;
67703+ atomic_inc(&pipe->waiting_writers);
67704 pipe_wait(pipe);
67705- pipe->waiting_writers--;
67706+ atomic_dec(&pipe->waiting_writers);
67707 }
67708
67709 pipe_unlock(pipe);
67710@@ -1818,14 +1819,14 @@ retry:
67711 pipe_double_lock(ipipe, opipe);
67712
67713 do {
67714- if (!opipe->readers) {
67715+ if (!atomic_read(&opipe->readers)) {
67716 send_sig(SIGPIPE, current, 0);
67717 if (!ret)
67718 ret = -EPIPE;
67719 break;
67720 }
67721
67722- if (!ipipe->nrbufs && !ipipe->writers)
67723+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
67724 break;
67725
67726 /*
67727@@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67728 pipe_double_lock(ipipe, opipe);
67729
67730 do {
67731- if (!opipe->readers) {
67732+ if (!atomic_read(&opipe->readers)) {
67733 send_sig(SIGPIPE, current, 0);
67734 if (!ret)
67735 ret = -EPIPE;
67736@@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67737 * return EAGAIN if we have the potential of some data in the
67738 * future, otherwise just return 0
67739 */
67740- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
67741+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
67742 ret = -EAGAIN;
67743
67744 pipe_unlock(ipipe);
67745diff --git a/fs/stat.c b/fs/stat.c
67746index ae0c3ce..9ee641c 100644
67747--- a/fs/stat.c
67748+++ b/fs/stat.c
67749@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
67750 stat->gid = inode->i_gid;
67751 stat->rdev = inode->i_rdev;
67752 stat->size = i_size_read(inode);
67753- stat->atime = inode->i_atime;
67754- stat->mtime = inode->i_mtime;
67755+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67756+ stat->atime = inode->i_ctime;
67757+ stat->mtime = inode->i_ctime;
67758+ } else {
67759+ stat->atime = inode->i_atime;
67760+ stat->mtime = inode->i_mtime;
67761+ }
67762 stat->ctime = inode->i_ctime;
67763 stat->blksize = (1 << inode->i_blkbits);
67764 stat->blocks = inode->i_blocks;
67765@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
67766 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
67767 {
67768 struct inode *inode = path->dentry->d_inode;
67769+ int retval;
67770
67771- if (inode->i_op->getattr)
67772- return inode->i_op->getattr(path->mnt, path->dentry, stat);
67773+ if (inode->i_op->getattr) {
67774+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
67775+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67776+ stat->atime = stat->ctime;
67777+ stat->mtime = stat->ctime;
67778+ }
67779+ return retval;
67780+ }
67781
67782 generic_fillattr(inode, stat);
67783 return 0;
67784diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
67785index 0b45ff4..847de5b 100644
67786--- a/fs/sysfs/dir.c
67787+++ b/fs/sysfs/dir.c
67788@@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
67789 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67790 {
67791 struct kernfs_node *parent, *kn;
67792+ const char *name;
67793+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
67794+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67795+ const char *parent_name;
67796+#endif
67797
67798 BUG_ON(!kobj);
67799
67800+ name = kobject_name(kobj);
67801+
67802 if (kobj->parent)
67803 parent = kobj->parent->sd;
67804 else
67805@@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67806 if (!parent)
67807 return -ENOENT;
67808
67809- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
67810- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
67811+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67812+ parent_name = parent->name;
67813+ mode = S_IRWXU;
67814+
67815+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
67816+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
67817+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
67818+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
67819+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
67820+#endif
67821+
67822+ kn = kernfs_create_dir_ns(parent, name,
67823+ mode, kobj, ns);
67824 if (IS_ERR(kn)) {
67825 if (PTR_ERR(kn) == -EEXIST)
67826- sysfs_warn_dup(parent, kobject_name(kobj));
67827+ sysfs_warn_dup(parent, name);
67828 return PTR_ERR(kn);
67829 }
67830
67831diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
67832index 69d4889..a810bd4 100644
67833--- a/fs/sysv/sysv.h
67834+++ b/fs/sysv/sysv.h
67835@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
67836 #endif
67837 }
67838
67839-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67840+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67841 {
67842 if (sbi->s_bytesex == BYTESEX_PDP)
67843 return PDP_swab((__force __u32)n);
67844diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
67845index fb08b0c..65fcc7e 100644
67846--- a/fs/ubifs/io.c
67847+++ b/fs/ubifs/io.c
67848@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
67849 return err;
67850 }
67851
67852-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67853+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67854 {
67855 int err;
67856
67857diff --git a/fs/udf/misc.c b/fs/udf/misc.c
67858index c175b4d..8f36a16 100644
67859--- a/fs/udf/misc.c
67860+++ b/fs/udf/misc.c
67861@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
67862
67863 u8 udf_tag_checksum(const struct tag *t)
67864 {
67865- u8 *data = (u8 *)t;
67866+ const u8 *data = (const u8 *)t;
67867 u8 checksum = 0;
67868 int i;
67869 for (i = 0; i < sizeof(struct tag); ++i)
67870diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
67871index 8d974c4..b82f6ec 100644
67872--- a/fs/ufs/swab.h
67873+++ b/fs/ufs/swab.h
67874@@ -22,7 +22,7 @@ enum {
67875 BYTESEX_BE
67876 };
67877
67878-static inline u64
67879+static inline u64 __intentional_overflow(-1)
67880 fs64_to_cpu(struct super_block *sbp, __fs64 n)
67881 {
67882 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67883@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
67884 return (__force __fs64)cpu_to_be64(n);
67885 }
67886
67887-static inline u32
67888+static inline u32 __intentional_overflow(-1)
67889 fs32_to_cpu(struct super_block *sbp, __fs32 n)
67890 {
67891 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67892diff --git a/fs/utimes.c b/fs/utimes.c
67893index aa138d6..5f3a811 100644
67894--- a/fs/utimes.c
67895+++ b/fs/utimes.c
67896@@ -1,6 +1,7 @@
67897 #include <linux/compiler.h>
67898 #include <linux/file.h>
67899 #include <linux/fs.h>
67900+#include <linux/security.h>
67901 #include <linux/linkage.h>
67902 #include <linux/mount.h>
67903 #include <linux/namei.h>
67904@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
67905 }
67906 }
67907 retry_deleg:
67908+
67909+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
67910+ error = -EACCES;
67911+ goto mnt_drop_write_and_out;
67912+ }
67913+
67914 mutex_lock(&inode->i_mutex);
67915 error = notify_change(path->dentry, &newattrs, &delegated_inode);
67916 mutex_unlock(&inode->i_mutex);
67917diff --git a/fs/xattr.c b/fs/xattr.c
67918index 64e83ef..b6be154 100644
67919--- a/fs/xattr.c
67920+++ b/fs/xattr.c
67921@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
67922 return rc;
67923 }
67924
67925+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
67926+ssize_t
67927+pax_getxattr(struct dentry *dentry, void *value, size_t size)
67928+{
67929+ struct inode *inode = dentry->d_inode;
67930+ ssize_t error;
67931+
67932+ error = inode_permission(inode, MAY_EXEC);
67933+ if (error)
67934+ return error;
67935+
67936+ if (inode->i_op->getxattr)
67937+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
67938+ else
67939+ error = -EOPNOTSUPP;
67940+
67941+ return error;
67942+}
67943+EXPORT_SYMBOL(pax_getxattr);
67944+#endif
67945+
67946 ssize_t
67947 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
67948 {
67949@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
67950 * Extended attribute SET operations
67951 */
67952 static long
67953-setxattr(struct dentry *d, const char __user *name, const void __user *value,
67954+setxattr(struct path *path, const char __user *name, const void __user *value,
67955 size_t size, int flags)
67956 {
67957 int error;
67958@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
67959 posix_acl_fix_xattr_from_user(kvalue, size);
67960 }
67961
67962- error = vfs_setxattr(d, kname, kvalue, size, flags);
67963+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
67964+ error = -EACCES;
67965+ goto out;
67966+ }
67967+
67968+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
67969 out:
67970 if (vvalue)
67971 vfree(vvalue);
67972@@ -376,7 +402,7 @@ retry:
67973 return error;
67974 error = mnt_want_write(path.mnt);
67975 if (!error) {
67976- error = setxattr(path.dentry, name, value, size, flags);
67977+ error = setxattr(&path, name, value, size, flags);
67978 mnt_drop_write(path.mnt);
67979 }
67980 path_put(&path);
67981@@ -405,16 +431,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
67982 const void __user *,value, size_t, size, int, flags)
67983 {
67984 struct fd f = fdget(fd);
67985- struct dentry *dentry;
67986 int error = -EBADF;
67987
67988 if (!f.file)
67989 return error;
67990- dentry = f.file->f_path.dentry;
67991- audit_inode(NULL, dentry, 0);
67992+ audit_inode(NULL, f.file->f_path.dentry, 0);
67993 error = mnt_want_write_file(f.file);
67994 if (!error) {
67995- error = setxattr(dentry, name, value, size, flags);
67996+ error = setxattr(&f.file->f_path, name, value, size, flags);
67997 mnt_drop_write_file(f.file);
67998 }
67999 fdput(f);
68000@@ -600,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
68001 * Extended attribute REMOVE operations
68002 */
68003 static long
68004-removexattr(struct dentry *d, const char __user *name)
68005+removexattr(struct path *path, const char __user *name)
68006 {
68007 int error;
68008 char kname[XATTR_NAME_MAX + 1];
68009@@ -611,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
68010 if (error < 0)
68011 return error;
68012
68013- return vfs_removexattr(d, kname);
68014+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
68015+ return -EACCES;
68016+
68017+ return vfs_removexattr(path->dentry, kname);
68018 }
68019
68020 static int path_removexattr(const char __user *pathname,
68021@@ -625,7 +652,7 @@ retry:
68022 return error;
68023 error = mnt_want_write(path.mnt);
68024 if (!error) {
68025- error = removexattr(path.dentry, name);
68026+ error = removexattr(&path, name);
68027 mnt_drop_write(path.mnt);
68028 }
68029 path_put(&path);
68030@@ -651,16 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
68031 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
68032 {
68033 struct fd f = fdget(fd);
68034- struct dentry *dentry;
68035+ struct path *path;
68036 int error = -EBADF;
68037
68038 if (!f.file)
68039 return error;
68040- dentry = f.file->f_path.dentry;
68041- audit_inode(NULL, dentry, 0);
68042+ path = &f.file->f_path;
68043+ audit_inode(NULL, path->dentry, 0);
68044 error = mnt_want_write_file(f.file);
68045 if (!error) {
68046- error = removexattr(dentry, name);
68047+ error = removexattr(path, name);
68048 mnt_drop_write_file(f.file);
68049 }
68050 fdput(f);
68051diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
68052index 79c9819..22226b4 100644
68053--- a/fs/xfs/libxfs/xfs_bmap.c
68054+++ b/fs/xfs/libxfs/xfs_bmap.c
68055@@ -583,7 +583,7 @@ xfs_bmap_validate_ret(
68056
68057 #else
68058 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
68059-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
68060+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
68061 #endif /* DEBUG */
68062
68063 /*
68064diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
68065index f1b69ed..3d0222f 100644
68066--- a/fs/xfs/xfs_dir2_readdir.c
68067+++ b/fs/xfs/xfs_dir2_readdir.c
68068@@ -159,7 +159,12 @@ xfs_dir2_sf_getdents(
68069 ino = dp->d_ops->sf_get_ino(sfp, sfep);
68070 filetype = dp->d_ops->sf_get_ftype(sfep);
68071 ctx->pos = off & 0x7fffffff;
68072- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
68073+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
68074+ char name[sfep->namelen];
68075+ memcpy(name, sfep->name, sfep->namelen);
68076+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
68077+ return 0;
68078+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
68079 xfs_dir3_get_dtype(dp->i_mount, filetype)))
68080 return 0;
68081 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
68082diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
68083index 24c926b6..8726af88 100644
68084--- a/fs/xfs/xfs_ioctl.c
68085+++ b/fs/xfs/xfs_ioctl.c
68086@@ -122,7 +122,7 @@ xfs_find_handle(
68087 }
68088
68089 error = -EFAULT;
68090- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
68091+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
68092 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
68093 goto out_put;
68094
68095diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
68096index 6a51619..9592e1b 100644
68097--- a/fs/xfs/xfs_linux.h
68098+++ b/fs/xfs/xfs_linux.h
68099@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
68100 * of the compiler which do not like us using do_div in the middle
68101 * of large functions.
68102 */
68103-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
68104+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
68105 {
68106 __u32 mod;
68107
68108@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
68109 return 0;
68110 }
68111 #else
68112-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
68113+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
68114 {
68115 __u32 mod;
68116
68117diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
68118new file mode 100644
68119index 0000000..31f8fe4
68120--- /dev/null
68121+++ b/grsecurity/Kconfig
68122@@ -0,0 +1,1182 @@
68123+#
68124+# grecurity configuration
68125+#
68126+menu "Memory Protections"
68127+depends on GRKERNSEC
68128+
68129+config GRKERNSEC_KMEM
68130+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
68131+ default y if GRKERNSEC_CONFIG_AUTO
68132+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
68133+ help
68134+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
68135+ be written to or read from to modify or leak the contents of the running
68136+ kernel. /dev/port will also not be allowed to be opened, writing to
68137+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
68138+ If you have module support disabled, enabling this will close up several
68139+ ways that are currently used to insert malicious code into the running
68140+ kernel.
68141+
68142+ Even with this feature enabled, we still highly recommend that
68143+ you use the RBAC system, as it is still possible for an attacker to
68144+ modify the running kernel through other more obscure methods.
68145+
68146+ It is highly recommended that you say Y here if you meet all the
68147+ conditions above.
68148+
68149+config GRKERNSEC_VM86
68150+ bool "Restrict VM86 mode"
68151+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68152+ depends on X86_32
68153+
68154+ help
68155+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
68156+ make use of a special execution mode on 32bit x86 processors called
68157+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
68158+ video cards and will still work with this option enabled. The purpose
68159+ of the option is to prevent exploitation of emulation errors in
68160+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
68161+ Nearly all users should be able to enable this option.
68162+
68163+config GRKERNSEC_IO
68164+ bool "Disable privileged I/O"
68165+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68166+ depends on X86
68167+ select RTC_CLASS
68168+ select RTC_INTF_DEV
68169+ select RTC_DRV_CMOS
68170+
68171+ help
68172+ If you say Y here, all ioperm and iopl calls will return an error.
68173+ Ioperm and iopl can be used to modify the running kernel.
68174+ Unfortunately, some programs need this access to operate properly,
68175+ the most notable of which are XFree86 and hwclock. hwclock can be
68176+ remedied by having RTC support in the kernel, so real-time
68177+ clock support is enabled if this option is enabled, to ensure
68178+ that hwclock operates correctly. If hwclock still does not work,
68179+ either update udev or symlink /dev/rtc to /dev/rtc0.
68180+
68181+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
68182+ you may not be able to boot into a graphical environment with this
68183+ option enabled. In this case, you should use the RBAC system instead.
68184+
68185+config GRKERNSEC_BPF_HARDEN
68186+ bool "Harden BPF interpreter"
68187+ default y if GRKERNSEC_CONFIG_AUTO
68188+ help
68189+ Unlike previous versions of grsecurity that hardened both the BPF
68190+ interpreted code against corruption at rest as well as the JIT code
68191+ against JIT-spray attacks and attacker-controlled immediate values
68192+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
68193+ and will ensure the interpreted code is read-only at rest. This feature
68194+ may be removed at a later time when eBPF stabilizes to entirely revert
68195+ back to the more secure pre-3.16 BPF interpreter/JIT.
68196+
68197+ If you're using KERNEXEC, it's recommended that you enable this option
68198+ to supplement the hardening of the kernel.
68199+
68200+config GRKERNSEC_PERF_HARDEN
68201+ bool "Disable unprivileged PERF_EVENTS usage by default"
68202+ default y if GRKERNSEC_CONFIG_AUTO
68203+ depends on PERF_EVENTS
68204+ help
68205+ If you say Y here, the range of acceptable values for the
68206+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
68207+ default to a new value: 3. When the sysctl is set to this value, no
68208+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
68209+
68210+ Though PERF_EVENTS can be used legitimately for performance monitoring
68211+ and low-level application profiling, it is forced on regardless of
68212+ configuration, has been at fault for several vulnerabilities, and
68213+ creates new opportunities for side channels and other information leaks.
68214+
68215+ This feature puts PERF_EVENTS into a secure default state and permits
68216+ the administrator to change out of it temporarily if unprivileged
68217+ application profiling is needed.
68218+
68219+config GRKERNSEC_RAND_THREADSTACK
68220+ bool "Insert random gaps between thread stacks"
68221+ default y if GRKERNSEC_CONFIG_AUTO
68222+ depends on PAX_RANDMMAP && !PPC
68223+ help
68224+ If you say Y here, a random-sized gap will be enforced between allocated
68225+ thread stacks. Glibc's NPTL and other threading libraries that
68226+ pass MAP_STACK to the kernel for thread stack allocation are supported.
68227+ The implementation currently provides 8 bits of entropy for the gap.
68228+
68229+ Many distributions do not compile threaded remote services with the
68230+ -fstack-check argument to GCC, causing the variable-sized stack-based
68231+ allocator, alloca(), to not probe the stack on allocation. This
68232+ permits an unbounded alloca() to skip over any guard page and potentially
68233+ modify another thread's stack reliably. An enforced random gap
68234+ reduces the reliability of such an attack and increases the chance
68235+ that such a read/write to another thread's stack instead lands in
68236+ an unmapped area, causing a crash and triggering grsecurity's
68237+ anti-bruteforcing logic.
68238+
68239+config GRKERNSEC_PROC_MEMMAP
68240+ bool "Harden ASLR against information leaks and entropy reduction"
68241+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
68242+ depends on PAX_NOEXEC || PAX_ASLR
68243+ help
68244+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
68245+ give no information about the addresses of its mappings if
68246+ PaX features that rely on random addresses are enabled on the task.
68247+ In addition to sanitizing this information and disabling other
68248+ dangerous sources of information, this option causes reads of sensitive
68249+ /proc/<pid> entries where the file descriptor was opened in a different
68250+ task than the one performing the read. Such attempts are logged.
68251+ This option also limits argv/env strings for suid/sgid binaries
68252+ to 512KB to prevent a complete exhaustion of the stack entropy provided
68253+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
68254+ binaries to prevent alternative mmap layouts from being abused.
68255+
68256+ If you use PaX it is essential that you say Y here as it closes up
68257+ several holes that make full ASLR useless locally.
68258+
68259+
68260+config GRKERNSEC_KSTACKOVERFLOW
68261+ bool "Prevent kernel stack overflows"
68262+ default y if GRKERNSEC_CONFIG_AUTO
68263+ depends on !IA64 && 64BIT
68264+ help
68265+ If you say Y here, the kernel's process stacks will be allocated
68266+ with vmalloc instead of the kernel's default allocator. This
68267+ introduces guard pages that in combination with the alloca checking
68268+ of the STACKLEAK feature prevents all forms of kernel process stack
68269+ overflow abuse. Note that this is different from kernel stack
68270+ buffer overflows.
68271+
68272+config GRKERNSEC_BRUTE
68273+ bool "Deter exploit bruteforcing"
68274+ default y if GRKERNSEC_CONFIG_AUTO
68275+ help
68276+ If you say Y here, attempts to bruteforce exploits against forking
68277+ daemons such as apache or sshd, as well as against suid/sgid binaries
68278+ will be deterred. When a child of a forking daemon is killed by PaX
68279+ or crashes due to an illegal instruction or other suspicious signal,
68280+ the parent process will be delayed 30 seconds upon every subsequent
68281+ fork until the administrator is able to assess the situation and
68282+ restart the daemon.
68283+ In the suid/sgid case, the attempt is logged, the user has all their
68284+ existing instances of the suid/sgid binary terminated and will
68285+ be unable to execute any suid/sgid binaries for 15 minutes.
68286+
68287+ It is recommended that you also enable signal logging in the auditing
68288+ section so that logs are generated when a process triggers a suspicious
68289+ signal.
68290+ If the sysctl option is enabled, a sysctl option with name
68291+ "deter_bruteforce" is created.
68292+
68293+config GRKERNSEC_MODHARDEN
68294+ bool "Harden module auto-loading"
68295+ default y if GRKERNSEC_CONFIG_AUTO
68296+ depends on MODULES
68297+ help
68298+ If you say Y here, module auto-loading in response to use of some
68299+ feature implemented by an unloaded module will be restricted to
68300+ root users. Enabling this option helps defend against attacks
68301+ by unprivileged users who abuse the auto-loading behavior to
68302+ cause a vulnerable module to load that is then exploited.
68303+
68304+ If this option prevents a legitimate use of auto-loading for a
68305+ non-root user, the administrator can execute modprobe manually
68306+ with the exact name of the module mentioned in the alert log.
68307+ Alternatively, the administrator can add the module to the list
68308+ of modules loaded at boot by modifying init scripts.
68309+
68310+ Modification of init scripts will most likely be needed on
68311+ Ubuntu servers with encrypted home directory support enabled,
68312+ as the first non-root user logging in will cause the ecb(aes),
68313+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
68314+
68315+config GRKERNSEC_HIDESYM
68316+ bool "Hide kernel symbols"
68317+ default y if GRKERNSEC_CONFIG_AUTO
68318+ select PAX_USERCOPY_SLABS
68319+ help
68320+ If you say Y here, getting information on loaded modules, and
68321+ displaying all kernel symbols through a syscall will be restricted
68322+ to users with CAP_SYS_MODULE. For software compatibility reasons,
68323+ /proc/kallsyms will be restricted to the root user. The RBAC
68324+ system can hide that entry even from root.
68325+
68326+ This option also prevents leaking of kernel addresses through
68327+ several /proc entries.
68328+
68329+ Note that this option is only effective provided the following
68330+ conditions are met:
68331+ 1) The kernel using grsecurity is not precompiled by some distribution
68332+ 2) You have also enabled GRKERNSEC_DMESG
68333+ 3) You are using the RBAC system and hiding other files such as your
68334+ kernel image and System.map. Alternatively, enabling this option
68335+ causes the permissions on /boot, /lib/modules, and the kernel
68336+ source directory to change at compile time to prevent
68337+ reading by non-root users.
68338+ If the above conditions are met, this option will aid in providing a
68339+ useful protection against local kernel exploitation of overflows
68340+ and arbitrary read/write vulnerabilities.
68341+
68342+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
68343+ in addition to this feature.
68344+
68345+config GRKERNSEC_RANDSTRUCT
68346+ bool "Randomize layout of sensitive kernel structures"
68347+ default y if GRKERNSEC_CONFIG_AUTO
68348+ select GRKERNSEC_HIDESYM
68349+ select MODVERSIONS if MODULES
68350+ help
68351+ If you say Y here, the layouts of a number of sensitive kernel
68352+ structures (task, fs, cred, etc) and all structures composed entirely
68353+ of function pointers (aka "ops" structs) will be randomized at compile-time.
68354+ This can introduce the requirement of an additional infoleak
68355+ vulnerability for exploits targeting these structure types.
68356+
68357+ Enabling this feature will introduce some performance impact, slightly
68358+ increase memory usage, and prevent the use of forensic tools like
68359+ Volatility against the system (unless the kernel source tree isn't
68360+ cleaned after kernel installation).
68361+
68362+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
68363+ It remains after a make clean to allow for external modules to be compiled
68364+ with the existing seed and will be removed by a make mrproper or
68365+ make distclean.
68366+
68367+ Note that the implementation requires gcc 4.6.4. or newer. You may need
68368+ to install the supporting headers explicitly in addition to the normal
68369+ gcc package.
68370+
68371+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
68372+ bool "Use cacheline-aware structure randomization"
68373+ depends on GRKERNSEC_RANDSTRUCT
68374+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
68375+ help
68376+ If you say Y here, the RANDSTRUCT randomization will make a best effort
68377+ at restricting randomization to cacheline-sized groups of elements. It
68378+ will further not randomize bitfields in structures. This reduces the
68379+ performance hit of RANDSTRUCT at the cost of weakened randomization.
68380+
68381+config GRKERNSEC_KERN_LOCKOUT
68382+ bool "Active kernel exploit response"
68383+ default y if GRKERNSEC_CONFIG_AUTO
68384+ depends on X86 || ARM || PPC || SPARC
68385+ help
68386+ If you say Y here, when a PaX alert is triggered due to suspicious
68387+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
68388+ or an OOPS occurs due to bad memory accesses, instead of just
68389+ terminating the offending process (and potentially allowing
68390+ a subsequent exploit from the same user), we will take one of two
68391+ actions:
68392+ If the user was root, we will panic the system
68393+ If the user was non-root, we will log the attempt, terminate
68394+ all processes owned by the user, then prevent them from creating
68395+ any new processes until the system is restarted
68396+ This deters repeated kernel exploitation/bruteforcing attempts
68397+ and is useful for later forensics.
68398+
68399+config GRKERNSEC_OLD_ARM_USERLAND
68400+ bool "Old ARM userland compatibility"
68401+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
68402+ help
68403+ If you say Y here, stubs of executable code to perform such operations
68404+ as "compare-exchange" will be placed at fixed locations in the ARM vector
68405+ table. This is unfortunately needed for old ARM userland meant to run
68406+ across a wide range of processors. Without this option enabled,
68407+ the get_tls and data memory barrier stubs will be emulated by the kernel,
68408+ which is enough for Linaro userlands or other userlands designed for v6
68409+ and newer ARM CPUs. It's recommended that you try without this option enabled
68410+ first, and only enable it if your userland does not boot (it will likely fail
68411+ at init time).
68412+
68413+endmenu
68414+menu "Role Based Access Control Options"
68415+depends on GRKERNSEC
68416+
68417+config GRKERNSEC_RBAC_DEBUG
68418+ bool
68419+
68420+config GRKERNSEC_NO_RBAC
68421+ bool "Disable RBAC system"
68422+ help
68423+ If you say Y here, the /dev/grsec device will be removed from the kernel,
68424+ preventing the RBAC system from being enabled. You should only say Y
68425+ here if you have no intention of using the RBAC system, so as to prevent
68426+ an attacker with root access from misusing the RBAC system to hide files
68427+ and processes when loadable module support and /dev/[k]mem have been
68428+ locked down.
68429+
68430+config GRKERNSEC_ACL_HIDEKERN
68431+ bool "Hide kernel processes"
68432+ help
68433+ If you say Y here, all kernel threads will be hidden to all
68434+ processes but those whose subject has the "view hidden processes"
68435+ flag.
68436+
68437+config GRKERNSEC_ACL_MAXTRIES
68438+ int "Maximum tries before password lockout"
68439+ default 3
68440+ help
68441+ This option enforces the maximum number of times a user can attempt
68442+ to authorize themselves with the grsecurity RBAC system before being
68443+ denied the ability to attempt authorization again for a specified time.
68444+ The lower the number, the harder it will be to brute-force a password.
68445+
68446+config GRKERNSEC_ACL_TIMEOUT
68447+ int "Time to wait after max password tries, in seconds"
68448+ default 30
68449+ help
68450+ This option specifies the time the user must wait after attempting to
68451+ authorize to the RBAC system with the maximum number of invalid
68452+ passwords. The higher the number, the harder it will be to brute-force
68453+ a password.
68454+
68455+endmenu
68456+menu "Filesystem Protections"
68457+depends on GRKERNSEC
68458+
68459+config GRKERNSEC_PROC
68460+ bool "Proc restrictions"
68461+ default y if GRKERNSEC_CONFIG_AUTO
68462+ help
68463+ If you say Y here, the permissions of the /proc filesystem
68464+ will be altered to enhance system security and privacy. You MUST
68465+ choose either a user only restriction or a user and group restriction.
68466+ Depending upon the option you choose, you can either restrict users to
68467+ see only the processes they themselves run, or choose a group that can
68468+ view all processes and files normally restricted to root if you choose
68469+ the "restrict to user only" option. NOTE: If you're running identd or
68470+ ntpd as a non-root user, you will have to run it as the group you
68471+ specify here.
68472+
68473+config GRKERNSEC_PROC_USER
68474+ bool "Restrict /proc to user only"
68475+ depends on GRKERNSEC_PROC
68476+ help
68477+ If you say Y here, non-root users will only be able to view their own
68478+ processes, and restricts them from viewing network-related information,
68479+ and viewing kernel symbol and module information.
68480+
68481+config GRKERNSEC_PROC_USERGROUP
68482+ bool "Allow special group"
68483+ default y if GRKERNSEC_CONFIG_AUTO
68484+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
68485+ help
68486+ If you say Y here, you will be able to select a group that will be
68487+ able to view all processes and network-related information. If you've
68488+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
68489+ remain hidden. This option is useful if you want to run identd as
68490+ a non-root user. The group you select may also be chosen at boot time
68491+ via "grsec_proc_gid=" on the kernel commandline.
68492+
68493+config GRKERNSEC_PROC_GID
68494+ int "GID for special group"
68495+ depends on GRKERNSEC_PROC_USERGROUP
68496+ default 1001
68497+
68498+config GRKERNSEC_PROC_ADD
68499+ bool "Additional restrictions"
68500+ default y if GRKERNSEC_CONFIG_AUTO
68501+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
68502+ help
68503+ If you say Y here, additional restrictions will be placed on
68504+ /proc that keep normal users from viewing device information and
68505+ slabinfo information that could be useful for exploits.
68506+
68507+config GRKERNSEC_LINK
68508+ bool "Linking restrictions"
68509+ default y if GRKERNSEC_CONFIG_AUTO
68510+ help
68511+ If you say Y here, /tmp race exploits will be prevented, since users
68512+ will no longer be able to follow symlinks owned by other users in
68513+ world-writable +t directories (e.g. /tmp), unless the owner of the
68514+ symlink is the owner of the directory. users will also not be
68515+ able to hardlink to files they do not own. If the sysctl option is
68516+ enabled, a sysctl option with name "linking_restrictions" is created.
68517+
68518+config GRKERNSEC_SYMLINKOWN
68519+ bool "Kernel-enforced SymlinksIfOwnerMatch"
68520+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68521+ help
68522+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
68523+ that prevents it from being used as a security feature. As Apache
68524+ verifies the symlink by performing a stat() against the target of
68525+ the symlink before it is followed, an attacker can setup a symlink
68526+ to point to a same-owned file, then replace the symlink with one
68527+ that targets another user's file just after Apache "validates" the
68528+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
68529+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
68530+ will be in place for the group you specify. If the sysctl option
68531+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
68532+ created.
68533+
68534+config GRKERNSEC_SYMLINKOWN_GID
68535+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
68536+ depends on GRKERNSEC_SYMLINKOWN
68537+ default 1006
68538+ help
68539+ Setting this GID determines what group kernel-enforced
68540+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
68541+ is enabled, a sysctl option with name "symlinkown_gid" is created.
68542+
68543+config GRKERNSEC_FIFO
68544+ bool "FIFO restrictions"
68545+ default y if GRKERNSEC_CONFIG_AUTO
68546+ help
68547+ If you say Y here, users will not be able to write to FIFOs they don't
68548+ own in world-writable +t directories (e.g. /tmp), unless the owner of
68549+ the FIFO is the same owner of the directory it's held in. If the sysctl
68550+ option is enabled, a sysctl option with name "fifo_restrictions" is
68551+ created.
68552+
68553+config GRKERNSEC_SYSFS_RESTRICT
68554+ bool "Sysfs/debugfs restriction"
68555+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68556+ depends on SYSFS
68557+ help
68558+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
68559+ any filesystem normally mounted under it (e.g. debugfs) will be
68560+ mostly accessible only by root. These filesystems generally provide access
68561+ to hardware and debug information that isn't appropriate for unprivileged
68562+ users of the system. Sysfs and debugfs have also become a large source
68563+ of new vulnerabilities, ranging from infoleaks to local compromise.
68564+ There has been very little oversight with an eye toward security involved
68565+ in adding new exporters of information to these filesystems, so their
68566+ use is discouraged.
68567+ For reasons of compatibility, a few directories have been whitelisted
68568+ for access by non-root users:
68569+ /sys/fs/selinux
68570+ /sys/fs/fuse
68571+ /sys/devices/system/cpu
68572+
68573+config GRKERNSEC_ROFS
68574+ bool "Runtime read-only mount protection"
68575+ depends on SYSCTL
68576+ help
68577+ If you say Y here, a sysctl option with name "romount_protect" will
68578+ be created. By setting this option to 1 at runtime, filesystems
68579+ will be protected in the following ways:
68580+ * No new writable mounts will be allowed
68581+ * Existing read-only mounts won't be able to be remounted read/write
68582+ * Write operations will be denied on all block devices
68583+ This option acts independently of grsec_lock: once it is set to 1,
68584+ it cannot be turned off. Therefore, please be mindful of the resulting
68585+ behavior if this option is enabled in an init script on a read-only
68586+ filesystem.
68587+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
68588+ and GRKERNSEC_IO should be enabled and module loading disabled via
68589+ config or at runtime.
68590+ This feature is mainly intended for secure embedded systems.
68591+
68592+
68593+config GRKERNSEC_DEVICE_SIDECHANNEL
68594+ bool "Eliminate stat/notify-based device sidechannels"
68595+ default y if GRKERNSEC_CONFIG_AUTO
68596+ help
68597+ If you say Y here, timing analyses on block or character
68598+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
68599+ will be thwarted for unprivileged users. If a process without
68600+ CAP_MKNOD stats such a device, the last access and last modify times
68601+ will match the device's create time. No access or modify events
68602+ will be triggered through inotify/dnotify/fanotify for such devices.
68603+ This feature will prevent attacks that may at a minimum
68604+ allow an attacker to determine the administrator's password length.
68605+
68606+config GRKERNSEC_CHROOT
68607+ bool "Chroot jail restrictions"
68608+ default y if GRKERNSEC_CONFIG_AUTO
68609+ help
68610+ If you say Y here, you will be able to choose several options that will
68611+ make breaking out of a chrooted jail much more difficult. If you
68612+ encounter no software incompatibilities with the following options, it
68613+ is recommended that you enable each one.
68614+
68615+ Note that the chroot restrictions are not intended to apply to "chroots"
68616+ to directories that are simple bind mounts of the global root filesystem.
68617+ For several other reasons, a user shouldn't expect any significant
68618+ security by performing such a chroot.
68619+
68620+config GRKERNSEC_CHROOT_MOUNT
68621+ bool "Deny mounts"
68622+ default y if GRKERNSEC_CONFIG_AUTO
68623+ depends on GRKERNSEC_CHROOT
68624+ help
68625+ If you say Y here, processes inside a chroot will not be able to
68626+ mount or remount filesystems. If the sysctl option is enabled, a
68627+ sysctl option with name "chroot_deny_mount" is created.
68628+
68629+config GRKERNSEC_CHROOT_DOUBLE
68630+ bool "Deny double-chroots"
68631+ default y if GRKERNSEC_CONFIG_AUTO
68632+ depends on GRKERNSEC_CHROOT
68633+ help
68634+ If you say Y here, processes inside a chroot will not be able to chroot
68635+ again outside the chroot. This is a widely used method of breaking
68636+ out of a chroot jail and should not be allowed. If the sysctl
68637+ option is enabled, a sysctl option with name
68638+ "chroot_deny_chroot" is created.
68639+
68640+config GRKERNSEC_CHROOT_PIVOT
68641+ bool "Deny pivot_root in chroot"
68642+ default y if GRKERNSEC_CONFIG_AUTO
68643+ depends on GRKERNSEC_CHROOT
68644+ help
68645+ If you say Y here, processes inside a chroot will not be able to use
68646+ a function called pivot_root() that was introduced in Linux 2.3.41. It
68647+ works similar to chroot in that it changes the root filesystem. This
68648+ function could be misused in a chrooted process to attempt to break out
68649+ of the chroot, and therefore should not be allowed. If the sysctl
68650+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
68651+ created.
68652+
68653+config GRKERNSEC_CHROOT_CHDIR
68654+ bool "Enforce chdir(\"/\") on all chroots"
68655+ default y if GRKERNSEC_CONFIG_AUTO
68656+ depends on GRKERNSEC_CHROOT
68657+ help
68658+ If you say Y here, the current working directory of all newly-chrooted
68659+ applications will be set to the the root directory of the chroot.
68660+ The man page on chroot(2) states:
68661+ Note that this call does not change the current working
68662+ directory, so that `.' can be outside the tree rooted at
68663+ `/'. In particular, the super-user can escape from a
68664+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
68665+
68666+ It is recommended that you say Y here, since it's not known to break
68667+ any software. If the sysctl option is enabled, a sysctl option with
68668+ name "chroot_enforce_chdir" is created.
68669+
68670+config GRKERNSEC_CHROOT_CHMOD
68671+ bool "Deny (f)chmod +s"
68672+ default y if GRKERNSEC_CONFIG_AUTO
68673+ depends on GRKERNSEC_CHROOT
68674+ help
68675+ If you say Y here, processes inside a chroot will not be able to chmod
68676+ or fchmod files to make them have suid or sgid bits. This protects
68677+ against another published method of breaking a chroot. If the sysctl
68678+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
68679+ created.
68680+
68681+config GRKERNSEC_CHROOT_FCHDIR
68682+ bool "Deny fchdir and fhandle out of chroot"
68683+ default y if GRKERNSEC_CONFIG_AUTO
68684+ depends on GRKERNSEC_CHROOT
68685+ help
68686+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
68687+ to a file descriptor of the chrooting process that points to a directory
68688+ outside the filesystem will be stopped. Additionally, this option prevents
68689+ use of the recently-created syscall for opening files by a guessable "file
68690+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
68691+ with name "chroot_deny_fchdir" is created.
68692+
68693+config GRKERNSEC_CHROOT_MKNOD
68694+ bool "Deny mknod"
68695+ default y if GRKERNSEC_CONFIG_AUTO
68696+ depends on GRKERNSEC_CHROOT
68697+ help
68698+ If you say Y here, processes inside a chroot will not be allowed to
68699+ mknod. The problem with using mknod inside a chroot is that it
68700+ would allow an attacker to create a device entry that is the same
68701+ as one on the physical root of your system, which could range from
68702+ anything from the console device to a device for your harddrive (which
68703+ they could then use to wipe the drive or steal data). It is recommended
68704+ that you say Y here, unless you run into software incompatibilities.
68705+ If the sysctl option is enabled, a sysctl option with name
68706+ "chroot_deny_mknod" is created.
68707+
68708+config GRKERNSEC_CHROOT_SHMAT
68709+ bool "Deny shmat() out of chroot"
68710+ default y if GRKERNSEC_CONFIG_AUTO
68711+ depends on GRKERNSEC_CHROOT
68712+ help
68713+ If you say Y here, processes inside a chroot will not be able to attach
68714+ to shared memory segments that were created outside of the chroot jail.
68715+ It is recommended that you say Y here. If the sysctl option is enabled,
68716+ a sysctl option with name "chroot_deny_shmat" is created.
68717+
68718+config GRKERNSEC_CHROOT_UNIX
68719+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
68720+ default y if GRKERNSEC_CONFIG_AUTO
68721+ depends on GRKERNSEC_CHROOT
68722+ help
68723+ If you say Y here, processes inside a chroot will not be able to
68724+ connect to abstract (meaning not belonging to a filesystem) Unix
68725+ domain sockets that were bound outside of a chroot. It is recommended
68726+ that you say Y here. If the sysctl option is enabled, a sysctl option
68727+ with name "chroot_deny_unix" is created.
68728+
68729+config GRKERNSEC_CHROOT_FINDTASK
68730+ bool "Protect outside processes"
68731+ default y if GRKERNSEC_CONFIG_AUTO
68732+ depends on GRKERNSEC_CHROOT
68733+ help
68734+ If you say Y here, processes inside a chroot will not be able to
68735+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
68736+ getsid, or view any process outside of the chroot. If the sysctl
68737+ option is enabled, a sysctl option with name "chroot_findtask" is
68738+ created.
68739+
68740+config GRKERNSEC_CHROOT_NICE
68741+ bool "Restrict priority changes"
68742+ default y if GRKERNSEC_CONFIG_AUTO
68743+ depends on GRKERNSEC_CHROOT
68744+ help
68745+ If you say Y here, processes inside a chroot will not be able to raise
68746+ the priority of processes in the chroot, or alter the priority of
68747+ processes outside the chroot. This provides more security than simply
68748+ removing CAP_SYS_NICE from the process' capability set. If the
68749+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
68750+ is created.
68751+
68752+config GRKERNSEC_CHROOT_SYSCTL
68753+ bool "Deny sysctl writes"
68754+ default y if GRKERNSEC_CONFIG_AUTO
68755+ depends on GRKERNSEC_CHROOT
68756+ help
68757+ If you say Y here, an attacker in a chroot will not be able to
68758+ write to sysctl entries, either by sysctl(2) or through a /proc
68759+ interface. It is strongly recommended that you say Y here. If the
68760+ sysctl option is enabled, a sysctl option with name
68761+ "chroot_deny_sysctl" is created.
68762+
68763+config GRKERNSEC_CHROOT_RENAME
68764+ bool "Deny bad renames"
68765+ default y if GRKERNSEC_CONFIG_AUTO
68766+ depends on GRKERNSEC_CHROOT
68767+ help
68768+ If you say Y here, an attacker in a chroot will not be able to
68769+ abuse the ability to create double chroots to break out of the
68770+ chroot by exploiting a race condition between a rename of a directory
68771+ within a chroot against an open of a symlink with relative path
68772+ components. This feature will likewise prevent an accomplice outside
68773+ a chroot from enabling a user inside the chroot to break out and make
68774+ use of their credentials on the global filesystem. Enabling this
68775+ feature is essential to prevent root users from breaking out of a
68776+ chroot. If the sysctl option is enabled, a sysctl option with name
68777+ "chroot_deny_bad_rename" is created.
68778+
68779+config GRKERNSEC_CHROOT_CAPS
68780+ bool "Capability restrictions"
68781+ default y if GRKERNSEC_CONFIG_AUTO
68782+ depends on GRKERNSEC_CHROOT
68783+ help
68784+ If you say Y here, the capabilities on all processes within a
68785+ chroot jail will be lowered to stop module insertion, raw i/o,
68786+ system and net admin tasks, rebooting the system, modifying immutable
68787+ files, modifying IPC owned by another, and changing the system time.
68788+ This is left an option because it can break some apps. Disable this
68789+ if your chrooted apps are having problems performing those kinds of
68790+ tasks. If the sysctl option is enabled, a sysctl option with
68791+ name "chroot_caps" is created.
68792+
68793+config GRKERNSEC_CHROOT_INITRD
68794+ bool "Exempt initrd tasks from restrictions"
68795+ default y if GRKERNSEC_CONFIG_AUTO
68796+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
68797+ help
68798+ If you say Y here, tasks started prior to init will be exempted from
68799+ grsecurity's chroot restrictions. This option is mainly meant to
68800+ resolve Plymouth's performing privileged operations unnecessarily
68801+ in a chroot.
68802+
68803+endmenu
68804+menu "Kernel Auditing"
68805+depends on GRKERNSEC
68806+
68807+config GRKERNSEC_AUDIT_GROUP
68808+ bool "Single group for auditing"
68809+ help
68810+ If you say Y here, the exec and chdir logging features will only operate
68811+ on a group you specify. This option is recommended if you only want to
68812+ watch certain users instead of having a large amount of logs from the
68813+ entire system. If the sysctl option is enabled, a sysctl option with
68814+ name "audit_group" is created.
68815+
68816+config GRKERNSEC_AUDIT_GID
68817+ int "GID for auditing"
68818+ depends on GRKERNSEC_AUDIT_GROUP
68819+ default 1007
68820+
68821+config GRKERNSEC_EXECLOG
68822+ bool "Exec logging"
68823+ help
68824+ If you say Y here, all execve() calls will be logged (since the
68825+ other exec*() calls are frontends to execve(), all execution
68826+ will be logged). Useful for shell-servers that like to keep track
68827+ of their users. If the sysctl option is enabled, a sysctl option with
68828+ name "exec_logging" is created.
68829+ WARNING: This option when enabled will produce a LOT of logs, especially
68830+ on an active system.
68831+
68832+config GRKERNSEC_RESLOG
68833+ bool "Resource logging"
68834+ default y if GRKERNSEC_CONFIG_AUTO
68835+ help
68836+ If you say Y here, all attempts to overstep resource limits will
68837+ be logged with the resource name, the requested size, and the current
68838+ limit. It is highly recommended that you say Y here. If the sysctl
68839+ option is enabled, a sysctl option with name "resource_logging" is
68840+ created. If the RBAC system is enabled, the sysctl value is ignored.
68841+
68842+config GRKERNSEC_CHROOT_EXECLOG
68843+ bool "Log execs within chroot"
68844+ help
68845+ If you say Y here, all executions inside a chroot jail will be logged
68846+ to syslog. This can cause a large amount of logs if certain
68847+ applications (eg. djb's daemontools) are installed on the system, and
68848+ is therefore left as an option. If the sysctl option is enabled, a
68849+ sysctl option with name "chroot_execlog" is created.
68850+
68851+config GRKERNSEC_AUDIT_PTRACE
68852+ bool "Ptrace logging"
68853+ help
68854+ If you say Y here, all attempts to attach to a process via ptrace
68855+ will be logged. If the sysctl option is enabled, a sysctl option
68856+ with name "audit_ptrace" is created.
68857+
68858+config GRKERNSEC_AUDIT_CHDIR
68859+ bool "Chdir logging"
68860+ help
68861+ If you say Y here, all chdir() calls will be logged. If the sysctl
68862+ option is enabled, a sysctl option with name "audit_chdir" is created.
68863+
68864+config GRKERNSEC_AUDIT_MOUNT
68865+ bool "(Un)Mount logging"
68866+ help
68867+ If you say Y here, all mounts and unmounts will be logged. If the
68868+ sysctl option is enabled, a sysctl option with name "audit_mount" is
68869+ created.
68870+
68871+config GRKERNSEC_SIGNAL
68872+ bool "Signal logging"
68873+ default y if GRKERNSEC_CONFIG_AUTO
68874+ help
68875+ If you say Y here, certain important signals will be logged, such as
68876+ SIGSEGV, which will as a result inform you of when a error in a program
68877+ occurred, which in some cases could mean a possible exploit attempt.
68878+ If the sysctl option is enabled, a sysctl option with name
68879+ "signal_logging" is created.
68880+
68881+config GRKERNSEC_FORKFAIL
68882+ bool "Fork failure logging"
68883+ help
68884+ If you say Y here, all failed fork() attempts will be logged.
68885+ This could suggest a fork bomb, or someone attempting to overstep
68886+ their process limit. If the sysctl option is enabled, a sysctl option
68887+ with name "forkfail_logging" is created.
68888+
68889+config GRKERNSEC_TIME
68890+ bool "Time change logging"
68891+ default y if GRKERNSEC_CONFIG_AUTO
68892+ help
68893+ If you say Y here, any changes of the system clock will be logged.
68894+ If the sysctl option is enabled, a sysctl option with name
68895+ "timechange_logging" is created.
68896+
68897+config GRKERNSEC_PROC_IPADDR
68898+ bool "/proc/<pid>/ipaddr support"
68899+ default y if GRKERNSEC_CONFIG_AUTO
68900+ help
68901+ If you say Y here, a new entry will be added to each /proc/<pid>
68902+ directory that contains the IP address of the person using the task.
68903+ The IP is carried across local TCP and AF_UNIX stream sockets.
68904+ This information can be useful for IDS/IPSes to perform remote response
68905+ to a local attack. The entry is readable by only the owner of the
68906+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
68907+ the RBAC system), and thus does not create privacy concerns.
68908+
68909+config GRKERNSEC_RWXMAP_LOG
68910+ bool 'Denied RWX mmap/mprotect logging'
68911+ default y if GRKERNSEC_CONFIG_AUTO
68912+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
68913+ help
68914+ If you say Y here, calls to mmap() and mprotect() with explicit
68915+ usage of PROT_WRITE and PROT_EXEC together will be logged when
68916+ denied by the PAX_MPROTECT feature. This feature will also
68917+ log other problematic scenarios that can occur when PAX_MPROTECT
68918+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
68919+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
68920+ is created.
68921+
68922+endmenu
68923+
68924+menu "Executable Protections"
68925+depends on GRKERNSEC
68926+
68927+config GRKERNSEC_DMESG
68928+ bool "Dmesg(8) restriction"
68929+ default y if GRKERNSEC_CONFIG_AUTO
68930+ help
68931+ If you say Y here, non-root users will not be able to use dmesg(8)
68932+ to view the contents of the kernel's circular log buffer.
68933+ The kernel's log buffer often contains kernel addresses and other
68934+ identifying information useful to an attacker in fingerprinting a
68935+ system for a targeted exploit.
68936+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
68937+ created.
68938+
68939+config GRKERNSEC_HARDEN_PTRACE
68940+ bool "Deter ptrace-based process snooping"
68941+ default y if GRKERNSEC_CONFIG_AUTO
68942+ help
68943+ If you say Y here, TTY sniffers and other malicious monitoring
68944+ programs implemented through ptrace will be defeated. If you
68945+ have been using the RBAC system, this option has already been
68946+ enabled for several years for all users, with the ability to make
68947+ fine-grained exceptions.
68948+
68949+ This option only affects the ability of non-root users to ptrace
68950+ processes that are not a descendent of the ptracing process.
68951+ This means that strace ./binary and gdb ./binary will still work,
68952+ but attaching to arbitrary processes will not. If the sysctl
68953+ option is enabled, a sysctl option with name "harden_ptrace" is
68954+ created.
68955+
68956+config GRKERNSEC_PTRACE_READEXEC
68957+ bool "Require read access to ptrace sensitive binaries"
68958+ default y if GRKERNSEC_CONFIG_AUTO
68959+ help
68960+ If you say Y here, unprivileged users will not be able to ptrace unreadable
68961+ binaries. This option is useful in environments that
68962+ remove the read bits (e.g. file mode 4711) from suid binaries to
68963+ prevent infoleaking of their contents. This option adds
68964+ consistency to the use of that file mode, as the binary could normally
68965+ be read out when run without privileges while ptracing.
68966+
68967+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
68968+ is created.
68969+
68970+config GRKERNSEC_SETXID
68971+ bool "Enforce consistent multithreaded privileges"
68972+ default y if GRKERNSEC_CONFIG_AUTO
68973+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
68974+ help
68975+ If you say Y here, a change from a root uid to a non-root uid
68976+ in a multithreaded application will cause the resulting uids,
68977+ gids, supplementary groups, and capabilities in that thread
68978+ to be propagated to the other threads of the process. In most
68979+ cases this is unnecessary, as glibc will emulate this behavior
68980+ on behalf of the application. Other libcs do not act in the
68981+ same way, allowing the other threads of the process to continue
68982+ running with root privileges. If the sysctl option is enabled,
68983+ a sysctl option with name "consistent_setxid" is created.
68984+
68985+config GRKERNSEC_HARDEN_IPC
68986+ bool "Disallow access to overly-permissive IPC objects"
68987+ default y if GRKERNSEC_CONFIG_AUTO
68988+ depends on SYSVIPC
68989+ help
68990+ If you say Y here, access to overly-permissive IPC objects (shared
68991+ memory, message queues, and semaphores) will be denied for processes
68992+ given the following criteria beyond normal permission checks:
68993+ 1) If the IPC object is world-accessible and the euid doesn't match
68994+ that of the creator or current uid for the IPC object
68995+ 2) If the IPC object is group-accessible and the egid doesn't
68996+ match that of the creator or current gid for the IPC object
68997+ It's a common error to grant too much permission to these objects,
68998+ with impact ranging from denial of service and information leaking to
68999+ privilege escalation. This feature was developed in response to
69000+ research by Tim Brown:
69001+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
69002+ who found hundreds of such insecure usages. Processes with
69003+ CAP_IPC_OWNER are still permitted to access these IPC objects.
69004+ If the sysctl option is enabled, a sysctl option with name
69005+ "harden_ipc" is created.
69006+
69007+config GRKERNSEC_TPE
69008+ bool "Trusted Path Execution (TPE)"
69009+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
69010+ help
69011+ If you say Y here, you will be able to choose a gid to add to the
69012+ supplementary groups of users you want to mark as "untrusted."
69013+ These users will not be able to execute any files that are not in
69014+ root-owned directories writable only by root. If the sysctl option
69015+ is enabled, a sysctl option with name "tpe" is created.
69016+
69017+config GRKERNSEC_TPE_ALL
69018+ bool "Partially restrict all non-root users"
69019+ depends on GRKERNSEC_TPE
69020+ help
69021+ If you say Y here, all non-root users will be covered under
69022+ a weaker TPE restriction. This is separate from, and in addition to,
69023+ the main TPE options that you have selected elsewhere. Thus, if a
69024+ "trusted" GID is chosen, this restriction applies to even that GID.
69025+ Under this restriction, all non-root users will only be allowed to
69026+ execute files in directories they own that are not group or
69027+ world-writable, or in directories owned by root and writable only by
69028+ root. If the sysctl option is enabled, a sysctl option with name
69029+ "tpe_restrict_all" is created.
69030+
69031+config GRKERNSEC_TPE_INVERT
69032+ bool "Invert GID option"
69033+ depends on GRKERNSEC_TPE
69034+ help
69035+ If you say Y here, the group you specify in the TPE configuration will
69036+ decide what group TPE restrictions will be *disabled* for. This
69037+ option is useful if you want TPE restrictions to be applied to most
69038+ users on the system. If the sysctl option is enabled, a sysctl option
69039+ with name "tpe_invert" is created. Unlike other sysctl options, this
69040+ entry will default to on for backward-compatibility.
69041+
69042+config GRKERNSEC_TPE_GID
69043+ int
69044+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
69045+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
69046+
69047+config GRKERNSEC_TPE_UNTRUSTED_GID
69048+ int "GID for TPE-untrusted users"
69049+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
69050+ default 1005
69051+ help
69052+ Setting this GID determines what group TPE restrictions will be
69053+ *enabled* for. If the sysctl option is enabled, a sysctl option
69054+ with name "tpe_gid" is created.
69055+
69056+config GRKERNSEC_TPE_TRUSTED_GID
69057+ int "GID for TPE-trusted users"
69058+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
69059+ default 1005
69060+ help
69061+ Setting this GID determines what group TPE restrictions will be
69062+ *disabled* for. If the sysctl option is enabled, a sysctl option
69063+ with name "tpe_gid" is created.
69064+
69065+endmenu
69066+menu "Network Protections"
69067+depends on GRKERNSEC
69068+
69069+config GRKERNSEC_BLACKHOLE
69070+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
69071+ default y if GRKERNSEC_CONFIG_AUTO
69072+ depends on NET
69073+ help
69074+ If you say Y here, neither TCP resets nor ICMP
69075+ destination-unreachable packets will be sent in response to packets
69076+ sent to ports for which no associated listening process exists.
69077+ It will also prevent the sending of ICMP protocol unreachable packets
69078+ in response to packets with unknown protocols.
69079+ This feature supports both IPV4 and IPV6 and exempts the
69080+ loopback interface from blackholing. Enabling this feature
69081+ makes a host more resilient to DoS attacks and reduces network
69082+ visibility against scanners.
69083+
69084+ The blackhole feature as-implemented is equivalent to the FreeBSD
69085+ blackhole feature, as it prevents RST responses to all packets, not
69086+ just SYNs. Under most application behavior this causes no
69087+ problems, but applications (like haproxy) may not close certain
69088+ connections in a way that cleanly terminates them on the remote
69089+ end, leaving the remote host in LAST_ACK state. Because of this
69090+ side-effect and to prevent intentional LAST_ACK DoSes, this
69091+ feature also adds automatic mitigation against such attacks.
69092+ The mitigation drastically reduces the amount of time a socket
69093+ can spend in LAST_ACK state. If you're using haproxy and not
69094+ all servers it connects to have this option enabled, consider
69095+ disabling this feature on the haproxy host.
69096+
69097+ If the sysctl option is enabled, two sysctl options with names
69098+ "ip_blackhole" and "lastack_retries" will be created.
69099+ While "ip_blackhole" takes the standard zero/non-zero on/off
69100+ toggle, "lastack_retries" uses the same kinds of values as
69101+ "tcp_retries1" and "tcp_retries2". The default value of 4
69102+ prevents a socket from lasting more than 45 seconds in LAST_ACK
69103+ state.
69104+
69105+config GRKERNSEC_NO_SIMULT_CONNECT
69106+ bool "Disable TCP Simultaneous Connect"
69107+ default y if GRKERNSEC_CONFIG_AUTO
69108+ depends on NET
69109+ help
69110+ If you say Y here, a feature by Willy Tarreau will be enabled that
69111+ removes a weakness in Linux's strict implementation of TCP that
69112+ allows two clients to connect to each other without either entering
69113+ a listening state. The weakness allows an attacker to easily prevent
69114+ a client from connecting to a known server provided the source port
69115+ for the connection is guessed correctly.
69116+
69117+ As the weakness could be used to prevent an antivirus or IPS from
69118+ fetching updates, or prevent an SSL gateway from fetching a CRL,
69119+ it should be eliminated by enabling this option. Though Linux is
69120+ one of few operating systems supporting simultaneous connect, it
69121+ has no legitimate use in practice and is rarely supported by firewalls.
69122+
69123+config GRKERNSEC_SOCKET
69124+ bool "Socket restrictions"
69125+ depends on NET
69126+ help
69127+ If you say Y here, you will be able to choose from several options.
69128+ If you assign a GID on your system and add it to the supplementary
69129+ groups of users you want to restrict socket access to, this patch
69130+ will perform up to three things, based on the option(s) you choose.
69131+
69132+config GRKERNSEC_SOCKET_ALL
69133+ bool "Deny any sockets to group"
69134+ depends on GRKERNSEC_SOCKET
69135+ help
69136+ If you say Y here, you will be able to choose a GID of whose users will
69137+ be unable to connect to other hosts from your machine or run server
69138+ applications from your machine. If the sysctl option is enabled, a
69139+ sysctl option with name "socket_all" is created.
69140+
69141+config GRKERNSEC_SOCKET_ALL_GID
69142+ int "GID to deny all sockets for"
69143+ depends on GRKERNSEC_SOCKET_ALL
69144+ default 1004
69145+ help
69146+ Here you can choose the GID to disable socket access for. Remember to
69147+ add the users you want socket access disabled for to the GID
69148+ specified here. If the sysctl option is enabled, a sysctl option
69149+ with name "socket_all_gid" is created.
69150+
69151+config GRKERNSEC_SOCKET_CLIENT
69152+ bool "Deny client sockets to group"
69153+ depends on GRKERNSEC_SOCKET
69154+ help
69155+ If you say Y here, you will be able to choose a GID of whose users will
69156+ be unable to connect to other hosts from your machine, but will be
69157+ able to run servers. If this option is enabled, all users in the group
69158+ you specify will have to use passive mode when initiating ftp transfers
69159+ from the shell on your machine. If the sysctl option is enabled, a
69160+ sysctl option with name "socket_client" is created.
69161+
69162+config GRKERNSEC_SOCKET_CLIENT_GID
69163+ int "GID to deny client sockets for"
69164+ depends on GRKERNSEC_SOCKET_CLIENT
69165+ default 1003
69166+ help
69167+ Here you can choose the GID to disable client socket access for.
69168+ Remember to add the users you want client socket access disabled for to
69169+ the GID specified here. If the sysctl option is enabled, a sysctl
69170+ option with name "socket_client_gid" is created.
69171+
69172+config GRKERNSEC_SOCKET_SERVER
69173+ bool "Deny server sockets to group"
69174+ depends on GRKERNSEC_SOCKET
69175+ help
69176+ If you say Y here, you will be able to choose a GID of whose users will
69177+ be unable to run server applications from your machine. If the sysctl
69178+ option is enabled, a sysctl option with name "socket_server" is created.
69179+
69180+config GRKERNSEC_SOCKET_SERVER_GID
69181+ int "GID to deny server sockets for"
69182+ depends on GRKERNSEC_SOCKET_SERVER
69183+ default 1002
69184+ help
69185+ Here you can choose the GID to disable server socket access for.
69186+ Remember to add the users you want server socket access disabled for to
69187+ the GID specified here. If the sysctl option is enabled, a sysctl
69188+ option with name "socket_server_gid" is created.
69189+
69190+endmenu
69191+
69192+menu "Physical Protections"
69193+depends on GRKERNSEC
69194+
69195+config GRKERNSEC_DENYUSB
69196+ bool "Deny new USB connections after toggle"
69197+ default y if GRKERNSEC_CONFIG_AUTO
69198+ depends on SYSCTL && USB_SUPPORT
69199+ help
69200+ If you say Y here, a new sysctl option with name "deny_new_usb"
69201+ will be created. Setting its value to 1 will prevent any new
69202+ USB devices from being recognized by the OS. Any attempted USB
69203+ device insertion will be logged. This option is intended to be
69204+ used against custom USB devices designed to exploit vulnerabilities
69205+ in various USB device drivers.
69206+
69207+ For greatest effectiveness, this sysctl should be set after any
69208+ relevant init scripts. This option is safe to enable in distros
69209+ as each user can choose whether or not to toggle the sysctl.
69210+
69211+config GRKERNSEC_DENYUSB_FORCE
69212+ bool "Reject all USB devices not connected at boot"
69213+ select USB
69214+ depends on GRKERNSEC_DENYUSB
69215+ help
69216+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
69217+ that doesn't involve a sysctl entry. This option should only be
69218+ enabled if you're sure you want to deny all new USB connections
69219+ at runtime and don't want to modify init scripts. This should not
69220+ be enabled by distros. It forces the core USB code to be built
69221+ into the kernel image so that all devices connected at boot time
69222+ can be recognized and new USB device connections can be prevented
69223+ prior to init running.
69224+
69225+endmenu
69226+
69227+menu "Sysctl Support"
69228+depends on GRKERNSEC && SYSCTL
69229+
69230+config GRKERNSEC_SYSCTL
69231+ bool "Sysctl support"
69232+ default y if GRKERNSEC_CONFIG_AUTO
69233+ help
69234+ If you say Y here, you will be able to change the options that
69235+ grsecurity runs with at bootup, without having to recompile your
69236+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
69237+ to enable (1) or disable (0) various features. All the sysctl entries
69238+ are mutable until the "grsec_lock" entry is set to a non-zero value.
69239+ All features enabled in the kernel configuration are disabled at boot
69240+ if you do not say Y to the "Turn on features by default" option.
69241+ All options should be set at startup, and the grsec_lock entry should
69242+ be set to a non-zero value after all the options are set.
69243+ *THIS IS EXTREMELY IMPORTANT*
69244+
69245+config GRKERNSEC_SYSCTL_DISTRO
69246+ bool "Extra sysctl support for distro makers (READ HELP)"
69247+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
69248+ help
69249+ If you say Y here, additional sysctl options will be created
69250+ for features that affect processes running as root. Therefore,
69251+ it is critical when using this option that the grsec_lock entry be
69252+ enabled after boot. Only distros with prebuilt kernel packages
69253+ with this option enabled that can ensure grsec_lock is enabled
69254+ after boot should use this option.
69255+ *Failure to set grsec_lock after boot makes all grsec features
69256+ this option covers useless*
69257+
69258+ Currently this option creates the following sysctl entries:
69259+ "Disable Privileged I/O": "disable_priv_io"
69260+
69261+config GRKERNSEC_SYSCTL_ON
69262+ bool "Turn on features by default"
69263+ default y if GRKERNSEC_CONFIG_AUTO
69264+ depends on GRKERNSEC_SYSCTL
69265+ help
69266+ If you say Y here, instead of having all features enabled in the
69267+ kernel configuration disabled at boot time, the features will be
69268+ enabled at boot time. It is recommended you say Y here unless
69269+ there is some reason you would want all sysctl-tunable features to
69270+ be disabled by default. As mentioned elsewhere, it is important
69271+ to enable the grsec_lock entry once you have finished modifying
69272+ the sysctl entries.
69273+
69274+endmenu
69275+menu "Logging Options"
69276+depends on GRKERNSEC
69277+
69278+config GRKERNSEC_FLOODTIME
69279+ int "Seconds in between log messages (minimum)"
69280+ default 10
69281+ help
69282+ This option allows you to enforce the number of seconds between
69283+ grsecurity log messages. The default should be suitable for most
69284+ people, however, if you choose to change it, choose a value small enough
69285+ to allow informative logs to be produced, but large enough to
69286+ prevent flooding.
69287+
69288+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
69289+ any rate limiting on grsecurity log messages.
69290+
69291+config GRKERNSEC_FLOODBURST
69292+ int "Number of messages in a burst (maximum)"
69293+ default 6
69294+ help
69295+ This option allows you to choose the maximum number of messages allowed
69296+ within the flood time interval you chose in a separate option. The
69297+ default should be suitable for most people, however if you find that
69298+ many of your logs are being interpreted as flooding, you may want to
69299+ raise this value.
69300+
69301+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
69302+ any rate limiting on grsecurity log messages.
69303+
69304+endmenu
69305diff --git a/grsecurity/Makefile b/grsecurity/Makefile
69306new file mode 100644
69307index 0000000..30ababb
69308--- /dev/null
69309+++ b/grsecurity/Makefile
69310@@ -0,0 +1,54 @@
69311+# grsecurity – access control and security hardening for Linux
69312+# All code in this directory and various hooks located throughout the Linux kernel are
69313+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
69314+# http://www.grsecurity.net spender@grsecurity.net
69315+#
69316+# This program is free software; you can redistribute it and/or
69317+# modify it under the terms of the GNU General Public License version 2
69318+# as published by the Free Software Foundation.
69319+#
69320+# This program is distributed in the hope that it will be useful,
69321+# but WITHOUT ANY WARRANTY; without even the implied warranty of
69322+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69323+# GNU General Public License for more details.
69324+#
69325+# You should have received a copy of the GNU General Public License
69326+# along with this program; if not, write to the Free Software
69327+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
69328+
69329+KBUILD_CFLAGS += -Werror
69330+
69331+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
69332+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
69333+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
69334+ grsec_usb.o grsec_ipc.o grsec_proc.o
69335+
69336+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
69337+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
69338+ gracl_learn.o grsec_log.o gracl_policy.o
69339+ifdef CONFIG_COMPAT
69340+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
69341+endif
69342+
69343+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
69344+
69345+ifdef CONFIG_NET
69346+obj-y += grsec_sock.o
69347+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
69348+endif
69349+
69350+ifndef CONFIG_GRKERNSEC
69351+obj-y += grsec_disabled.o
69352+endif
69353+
69354+ifdef CONFIG_GRKERNSEC_HIDESYM
69355+extra-y := grsec_hidesym.o
69356+$(obj)/grsec_hidesym.o:
69357+ @-chmod -f 500 /boot
69358+ @-chmod -f 500 /lib/modules
69359+ @-chmod -f 500 /lib64/modules
69360+ @-chmod -f 500 /lib32/modules
69361+ @-chmod -f 700 .
69362+ @-chmod -f 700 $(objtree)
69363+ @echo ' grsec: protected kernel image paths'
69364+endif
69365diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
69366new file mode 100644
69367index 0000000..9c2d930
69368--- /dev/null
69369+++ b/grsecurity/gracl.c
69370@@ -0,0 +1,2721 @@
69371+#include <linux/kernel.h>
69372+#include <linux/module.h>
69373+#include <linux/sched.h>
69374+#include <linux/mm.h>
69375+#include <linux/file.h>
69376+#include <linux/fs.h>
69377+#include <linux/namei.h>
69378+#include <linux/mount.h>
69379+#include <linux/tty.h>
69380+#include <linux/proc_fs.h>
69381+#include <linux/lglock.h>
69382+#include <linux/slab.h>
69383+#include <linux/vmalloc.h>
69384+#include <linux/types.h>
69385+#include <linux/sysctl.h>
69386+#include <linux/netdevice.h>
69387+#include <linux/ptrace.h>
69388+#include <linux/gracl.h>
69389+#include <linux/gralloc.h>
69390+#include <linux/security.h>
69391+#include <linux/grinternal.h>
69392+#include <linux/pid_namespace.h>
69393+#include <linux/stop_machine.h>
69394+#include <linux/fdtable.h>
69395+#include <linux/percpu.h>
69396+#include <linux/lglock.h>
69397+#include <linux/hugetlb.h>
69398+#include <linux/posix-timers.h>
69399+#include <linux/prefetch.h>
69400+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69401+#include <linux/magic.h>
69402+#include <linux/pagemap.h>
69403+#include "../fs/btrfs/async-thread.h"
69404+#include "../fs/btrfs/ctree.h"
69405+#include "../fs/btrfs/btrfs_inode.h"
69406+#endif
69407+#include "../fs/mount.h"
69408+
69409+#include <asm/uaccess.h>
69410+#include <asm/errno.h>
69411+#include <asm/mman.h>
69412+
69413+#define FOR_EACH_ROLE_START(role) \
69414+ role = running_polstate.role_list; \
69415+ while (role) {
69416+
69417+#define FOR_EACH_ROLE_END(role) \
69418+ role = role->prev; \
69419+ }
69420+
69421+extern struct path gr_real_root;
69422+
69423+static struct gr_policy_state running_polstate;
69424+struct gr_policy_state *polstate = &running_polstate;
69425+extern struct gr_alloc_state *current_alloc_state;
69426+
69427+extern char *gr_shared_page[4];
69428+DEFINE_RWLOCK(gr_inode_lock);
69429+
69430+static unsigned int gr_status __read_only = GR_STATUS_INIT;
69431+
69432+#ifdef CONFIG_NET
69433+extern struct vfsmount *sock_mnt;
69434+#endif
69435+
69436+extern struct vfsmount *pipe_mnt;
69437+extern struct vfsmount *shm_mnt;
69438+
69439+#ifdef CONFIG_HUGETLBFS
69440+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
69441+#endif
69442+
69443+extern u16 acl_sp_role_value;
69444+extern struct acl_object_label *fakefs_obj_rw;
69445+extern struct acl_object_label *fakefs_obj_rwx;
69446+
69447+int gr_acl_is_enabled(void)
69448+{
69449+ return (gr_status & GR_READY);
69450+}
69451+
69452+void gr_enable_rbac_system(void)
69453+{
69454+ pax_open_kernel();
69455+ gr_status |= GR_READY;
69456+ pax_close_kernel();
69457+}
69458+
69459+int gr_rbac_disable(void *unused)
69460+{
69461+ pax_open_kernel();
69462+ gr_status &= ~GR_READY;
69463+ pax_close_kernel();
69464+
69465+ return 0;
69466+}
69467+
69468+static inline dev_t __get_dev(const struct dentry *dentry)
69469+{
69470+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69471+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69472+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
69473+ else
69474+#endif
69475+ return dentry->d_sb->s_dev;
69476+}
69477+
69478+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
69479+{
69480+ return __get_dev(dentry);
69481+}
69482+
69483+static char gr_task_roletype_to_char(struct task_struct *task)
69484+{
69485+ switch (task->role->roletype &
69486+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
69487+ GR_ROLE_SPECIAL)) {
69488+ case GR_ROLE_DEFAULT:
69489+ return 'D';
69490+ case GR_ROLE_USER:
69491+ return 'U';
69492+ case GR_ROLE_GROUP:
69493+ return 'G';
69494+ case GR_ROLE_SPECIAL:
69495+ return 'S';
69496+ }
69497+
69498+ return 'X';
69499+}
69500+
69501+char gr_roletype_to_char(void)
69502+{
69503+ return gr_task_roletype_to_char(current);
69504+}
69505+
69506+__inline__ int
69507+gr_acl_tpe_check(void)
69508+{
69509+ if (unlikely(!(gr_status & GR_READY)))
69510+ return 0;
69511+ if (current->role->roletype & GR_ROLE_TPE)
69512+ return 1;
69513+ else
69514+ return 0;
69515+}
69516+
69517+int
69518+gr_handle_rawio(const struct inode *inode)
69519+{
69520+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69521+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
69522+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
69523+ !capable(CAP_SYS_RAWIO))
69524+ return 1;
69525+#endif
69526+ return 0;
69527+}
69528+
69529+int
69530+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
69531+{
69532+ if (likely(lena != lenb))
69533+ return 0;
69534+
69535+ return !memcmp(a, b, lena);
69536+}
69537+
69538+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
69539+{
69540+ *buflen -= namelen;
69541+ if (*buflen < 0)
69542+ return -ENAMETOOLONG;
69543+ *buffer -= namelen;
69544+ memcpy(*buffer, str, namelen);
69545+ return 0;
69546+}
69547+
69548+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
69549+{
69550+ return prepend(buffer, buflen, name->name, name->len);
69551+}
69552+
69553+static int prepend_path(const struct path *path, struct path *root,
69554+ char **buffer, int *buflen)
69555+{
69556+ struct dentry *dentry = path->dentry;
69557+ struct vfsmount *vfsmnt = path->mnt;
69558+ struct mount *mnt = real_mount(vfsmnt);
69559+ bool slash = false;
69560+ int error = 0;
69561+
69562+ while (dentry != root->dentry || vfsmnt != root->mnt) {
69563+ struct dentry * parent;
69564+
69565+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
69566+ /* Global root? */
69567+ if (!mnt_has_parent(mnt)) {
69568+ goto out;
69569+ }
69570+ dentry = mnt->mnt_mountpoint;
69571+ mnt = mnt->mnt_parent;
69572+ vfsmnt = &mnt->mnt;
69573+ continue;
69574+ }
69575+ parent = dentry->d_parent;
69576+ prefetch(parent);
69577+ spin_lock(&dentry->d_lock);
69578+ error = prepend_name(buffer, buflen, &dentry->d_name);
69579+ spin_unlock(&dentry->d_lock);
69580+ if (!error)
69581+ error = prepend(buffer, buflen, "/", 1);
69582+ if (error)
69583+ break;
69584+
69585+ slash = true;
69586+ dentry = parent;
69587+ }
69588+
69589+out:
69590+ if (!error && !slash)
69591+ error = prepend(buffer, buflen, "/", 1);
69592+
69593+ return error;
69594+}
69595+
69596+/* this must be called with mount_lock and rename_lock held */
69597+
69598+static char *__our_d_path(const struct path *path, struct path *root,
69599+ char *buf, int buflen)
69600+{
69601+ char *res = buf + buflen;
69602+ int error;
69603+
69604+ prepend(&res, &buflen, "\0", 1);
69605+ error = prepend_path(path, root, &res, &buflen);
69606+ if (error)
69607+ return ERR_PTR(error);
69608+
69609+ return res;
69610+}
69611+
69612+static char *
69613+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
69614+{
69615+ char *retval;
69616+
69617+ retval = __our_d_path(path, root, buf, buflen);
69618+ if (unlikely(IS_ERR(retval)))
69619+ retval = strcpy(buf, "<path too long>");
69620+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
69621+ retval[1] = '\0';
69622+
69623+ return retval;
69624+}
69625+
69626+static char *
69627+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69628+ char *buf, int buflen)
69629+{
69630+ struct path path;
69631+ char *res;
69632+
69633+ path.dentry = (struct dentry *)dentry;
69634+ path.mnt = (struct vfsmount *)vfsmnt;
69635+
69636+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
69637+ by the RBAC system */
69638+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
69639+
69640+ return res;
69641+}
69642+
69643+static char *
69644+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69645+ char *buf, int buflen)
69646+{
69647+ char *res;
69648+ struct path path;
69649+ struct path root;
69650+ struct task_struct *reaper = init_pid_ns.child_reaper;
69651+
69652+ path.dentry = (struct dentry *)dentry;
69653+ path.mnt = (struct vfsmount *)vfsmnt;
69654+
69655+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
69656+ get_fs_root(reaper->fs, &root);
69657+
69658+ read_seqlock_excl(&mount_lock);
69659+ write_seqlock(&rename_lock);
69660+ res = gen_full_path(&path, &root, buf, buflen);
69661+ write_sequnlock(&rename_lock);
69662+ read_sequnlock_excl(&mount_lock);
69663+
69664+ path_put(&root);
69665+ return res;
69666+}
69667+
69668+char *
69669+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69670+{
69671+ char *ret;
69672+ read_seqlock_excl(&mount_lock);
69673+ write_seqlock(&rename_lock);
69674+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69675+ PAGE_SIZE);
69676+ write_sequnlock(&rename_lock);
69677+ read_sequnlock_excl(&mount_lock);
69678+ return ret;
69679+}
69680+
69681+static char *
69682+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69683+{
69684+ char *ret;
69685+ char *buf;
69686+ int buflen;
69687+
69688+ read_seqlock_excl(&mount_lock);
69689+ write_seqlock(&rename_lock);
69690+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
69691+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
69692+ buflen = (int)(ret - buf);
69693+ if (buflen >= 5)
69694+ prepend(&ret, &buflen, "/proc", 5);
69695+ else
69696+ ret = strcpy(buf, "<path too long>");
69697+ write_sequnlock(&rename_lock);
69698+ read_sequnlock_excl(&mount_lock);
69699+ return ret;
69700+}
69701+
69702+char *
69703+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
69704+{
69705+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69706+ PAGE_SIZE);
69707+}
69708+
69709+char *
69710+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
69711+{
69712+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69713+ PAGE_SIZE);
69714+}
69715+
69716+char *
69717+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
69718+{
69719+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
69720+ PAGE_SIZE);
69721+}
69722+
69723+char *
69724+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
69725+{
69726+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
69727+ PAGE_SIZE);
69728+}
69729+
69730+char *
69731+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
69732+{
69733+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
69734+ PAGE_SIZE);
69735+}
69736+
69737+__inline__ __u32
69738+to_gr_audit(const __u32 reqmode)
69739+{
69740+ /* masks off auditable permission flags, then shifts them to create
69741+ auditing flags, and adds the special case of append auditing if
69742+ we're requesting write */
69743+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
69744+}
69745+
69746+struct acl_role_label *
69747+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
69748+ const gid_t gid)
69749+{
69750+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
69751+ struct acl_role_label *match;
69752+ struct role_allowed_ip *ipp;
69753+ unsigned int x;
69754+ u32 curr_ip = task->signal->saved_ip;
69755+
69756+ match = state->acl_role_set.r_hash[index];
69757+
69758+ while (match) {
69759+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
69760+ for (x = 0; x < match->domain_child_num; x++) {
69761+ if (match->domain_children[x] == uid)
69762+ goto found;
69763+ }
69764+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
69765+ break;
69766+ match = match->next;
69767+ }
69768+found:
69769+ if (match == NULL) {
69770+ try_group:
69771+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
69772+ match = state->acl_role_set.r_hash[index];
69773+
69774+ while (match) {
69775+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
69776+ for (x = 0; x < match->domain_child_num; x++) {
69777+ if (match->domain_children[x] == gid)
69778+ goto found2;
69779+ }
69780+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
69781+ break;
69782+ match = match->next;
69783+ }
69784+found2:
69785+ if (match == NULL)
69786+ match = state->default_role;
69787+ if (match->allowed_ips == NULL)
69788+ return match;
69789+ else {
69790+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69791+ if (likely
69792+ ((ntohl(curr_ip) & ipp->netmask) ==
69793+ (ntohl(ipp->addr) & ipp->netmask)))
69794+ return match;
69795+ }
69796+ match = state->default_role;
69797+ }
69798+ } else if (match->allowed_ips == NULL) {
69799+ return match;
69800+ } else {
69801+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69802+ if (likely
69803+ ((ntohl(curr_ip) & ipp->netmask) ==
69804+ (ntohl(ipp->addr) & ipp->netmask)))
69805+ return match;
69806+ }
69807+ goto try_group;
69808+ }
69809+
69810+ return match;
69811+}
69812+
69813+static struct acl_role_label *
69814+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
69815+ const gid_t gid)
69816+{
69817+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
69818+}
69819+
69820+struct acl_subject_label *
69821+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
69822+ const struct acl_role_label *role)
69823+{
69824+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69825+ struct acl_subject_label *match;
69826+
69827+ match = role->subj_hash[index];
69828+
69829+ while (match && (match->inode != ino || match->device != dev ||
69830+ (match->mode & GR_DELETED))) {
69831+ match = match->next;
69832+ }
69833+
69834+ if (match && !(match->mode & GR_DELETED))
69835+ return match;
69836+ else
69837+ return NULL;
69838+}
69839+
69840+struct acl_subject_label *
69841+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
69842+ const struct acl_role_label *role)
69843+{
69844+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69845+ struct acl_subject_label *match;
69846+
69847+ match = role->subj_hash[index];
69848+
69849+ while (match && (match->inode != ino || match->device != dev ||
69850+ !(match->mode & GR_DELETED))) {
69851+ match = match->next;
69852+ }
69853+
69854+ if (match && (match->mode & GR_DELETED))
69855+ return match;
69856+ else
69857+ return NULL;
69858+}
69859+
69860+static struct acl_object_label *
69861+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
69862+ const struct acl_subject_label *subj)
69863+{
69864+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69865+ struct acl_object_label *match;
69866+
69867+ match = subj->obj_hash[index];
69868+
69869+ while (match && (match->inode != ino || match->device != dev ||
69870+ (match->mode & GR_DELETED))) {
69871+ match = match->next;
69872+ }
69873+
69874+ if (match && !(match->mode & GR_DELETED))
69875+ return match;
69876+ else
69877+ return NULL;
69878+}
69879+
69880+static struct acl_object_label *
69881+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
69882+ const struct acl_subject_label *subj)
69883+{
69884+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69885+ struct acl_object_label *match;
69886+
69887+ match = subj->obj_hash[index];
69888+
69889+ while (match && (match->inode != ino || match->device != dev ||
69890+ !(match->mode & GR_DELETED))) {
69891+ match = match->next;
69892+ }
69893+
69894+ if (match && (match->mode & GR_DELETED))
69895+ return match;
69896+
69897+ match = subj->obj_hash[index];
69898+
69899+ while (match && (match->inode != ino || match->device != dev ||
69900+ (match->mode & GR_DELETED))) {
69901+ match = match->next;
69902+ }
69903+
69904+ if (match && !(match->mode & GR_DELETED))
69905+ return match;
69906+ else
69907+ return NULL;
69908+}
69909+
69910+struct name_entry *
69911+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
69912+{
69913+ unsigned int len = strlen(name);
69914+ unsigned int key = full_name_hash(name, len);
69915+ unsigned int index = key % state->name_set.n_size;
69916+ struct name_entry *match;
69917+
69918+ match = state->name_set.n_hash[index];
69919+
69920+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
69921+ match = match->next;
69922+
69923+ return match;
69924+}
69925+
69926+static struct name_entry *
69927+lookup_name_entry(const char *name)
69928+{
69929+ return __lookup_name_entry(&running_polstate, name);
69930+}
69931+
69932+static struct name_entry *
69933+lookup_name_entry_create(const char *name)
69934+{
69935+ unsigned int len = strlen(name);
69936+ unsigned int key = full_name_hash(name, len);
69937+ unsigned int index = key % running_polstate.name_set.n_size;
69938+ struct name_entry *match;
69939+
69940+ match = running_polstate.name_set.n_hash[index];
69941+
69942+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69943+ !match->deleted))
69944+ match = match->next;
69945+
69946+ if (match && match->deleted)
69947+ return match;
69948+
69949+ match = running_polstate.name_set.n_hash[index];
69950+
69951+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69952+ match->deleted))
69953+ match = match->next;
69954+
69955+ if (match && !match->deleted)
69956+ return match;
69957+ else
69958+ return NULL;
69959+}
69960+
69961+static struct inodev_entry *
69962+lookup_inodev_entry(const ino_t ino, const dev_t dev)
69963+{
69964+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
69965+ struct inodev_entry *match;
69966+
69967+ match = running_polstate.inodev_set.i_hash[index];
69968+
69969+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
69970+ match = match->next;
69971+
69972+ return match;
69973+}
69974+
69975+void
69976+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
69977+{
69978+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
69979+ state->inodev_set.i_size);
69980+ struct inodev_entry **curr;
69981+
69982+ entry->prev = NULL;
69983+
69984+ curr = &state->inodev_set.i_hash[index];
69985+ if (*curr != NULL)
69986+ (*curr)->prev = entry;
69987+
69988+ entry->next = *curr;
69989+ *curr = entry;
69990+
69991+ return;
69992+}
69993+
69994+static void
69995+insert_inodev_entry(struct inodev_entry *entry)
69996+{
69997+ __insert_inodev_entry(&running_polstate, entry);
69998+}
69999+
70000+void
70001+insert_acl_obj_label(struct acl_object_label *obj,
70002+ struct acl_subject_label *subj)
70003+{
70004+ unsigned int index =
70005+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
70006+ struct acl_object_label **curr;
70007+
70008+ obj->prev = NULL;
70009+
70010+ curr = &subj->obj_hash[index];
70011+ if (*curr != NULL)
70012+ (*curr)->prev = obj;
70013+
70014+ obj->next = *curr;
70015+ *curr = obj;
70016+
70017+ return;
70018+}
70019+
70020+void
70021+insert_acl_subj_label(struct acl_subject_label *obj,
70022+ struct acl_role_label *role)
70023+{
70024+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
70025+ struct acl_subject_label **curr;
70026+
70027+ obj->prev = NULL;
70028+
70029+ curr = &role->subj_hash[index];
70030+ if (*curr != NULL)
70031+ (*curr)->prev = obj;
70032+
70033+ obj->next = *curr;
70034+ *curr = obj;
70035+
70036+ return;
70037+}
70038+
70039+/* derived from glibc fnmatch() 0: match, 1: no match*/
70040+
70041+static int
70042+glob_match(const char *p, const char *n)
70043+{
70044+ char c;
70045+
70046+ while ((c = *p++) != '\0') {
70047+ switch (c) {
70048+ case '?':
70049+ if (*n == '\0')
70050+ return 1;
70051+ else if (*n == '/')
70052+ return 1;
70053+ break;
70054+ case '\\':
70055+ if (*n != c)
70056+ return 1;
70057+ break;
70058+ case '*':
70059+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
70060+ if (*n == '/')
70061+ return 1;
70062+ else if (c == '?') {
70063+ if (*n == '\0')
70064+ return 1;
70065+ else
70066+ ++n;
70067+ }
70068+ }
70069+ if (c == '\0') {
70070+ return 0;
70071+ } else {
70072+ const char *endp;
70073+
70074+ if ((endp = strchr(n, '/')) == NULL)
70075+ endp = n + strlen(n);
70076+
70077+ if (c == '[') {
70078+ for (--p; n < endp; ++n)
70079+ if (!glob_match(p, n))
70080+ return 0;
70081+ } else if (c == '/') {
70082+ while (*n != '\0' && *n != '/')
70083+ ++n;
70084+ if (*n == '/' && !glob_match(p, n + 1))
70085+ return 0;
70086+ } else {
70087+ for (--p; n < endp; ++n)
70088+ if (*n == c && !glob_match(p, n))
70089+ return 0;
70090+ }
70091+
70092+ return 1;
70093+ }
70094+ case '[':
70095+ {
70096+ int not;
70097+ char cold;
70098+
70099+ if (*n == '\0' || *n == '/')
70100+ return 1;
70101+
70102+ not = (*p == '!' || *p == '^');
70103+ if (not)
70104+ ++p;
70105+
70106+ c = *p++;
70107+ for (;;) {
70108+ unsigned char fn = (unsigned char)*n;
70109+
70110+ if (c == '\0')
70111+ return 1;
70112+ else {
70113+ if (c == fn)
70114+ goto matched;
70115+ cold = c;
70116+ c = *p++;
70117+
70118+ if (c == '-' && *p != ']') {
70119+ unsigned char cend = *p++;
70120+
70121+ if (cend == '\0')
70122+ return 1;
70123+
70124+ if (cold <= fn && fn <= cend)
70125+ goto matched;
70126+
70127+ c = *p++;
70128+ }
70129+ }
70130+
70131+ if (c == ']')
70132+ break;
70133+ }
70134+ if (!not)
70135+ return 1;
70136+ break;
70137+ matched:
70138+ while (c != ']') {
70139+ if (c == '\0')
70140+ return 1;
70141+
70142+ c = *p++;
70143+ }
70144+ if (not)
70145+ return 1;
70146+ }
70147+ break;
70148+ default:
70149+ if (c != *n)
70150+ return 1;
70151+ }
70152+
70153+ ++n;
70154+ }
70155+
70156+ if (*n == '\0')
70157+ return 0;
70158+
70159+ if (*n == '/')
70160+ return 0;
70161+
70162+ return 1;
70163+}
70164+
70165+static struct acl_object_label *
70166+chk_glob_label(struct acl_object_label *globbed,
70167+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
70168+{
70169+ struct acl_object_label *tmp;
70170+
70171+ if (*path == NULL)
70172+ *path = gr_to_filename_nolock(dentry, mnt);
70173+
70174+ tmp = globbed;
70175+
70176+ while (tmp) {
70177+ if (!glob_match(tmp->filename, *path))
70178+ return tmp;
70179+ tmp = tmp->next;
70180+ }
70181+
70182+ return NULL;
70183+}
70184+
70185+static struct acl_object_label *
70186+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70187+ const ino_t curr_ino, const dev_t curr_dev,
70188+ const struct acl_subject_label *subj, char **path, const int checkglob)
70189+{
70190+ struct acl_subject_label *tmpsubj;
70191+ struct acl_object_label *retval;
70192+ struct acl_object_label *retval2;
70193+
70194+ tmpsubj = (struct acl_subject_label *) subj;
70195+ read_lock(&gr_inode_lock);
70196+ do {
70197+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
70198+ if (retval) {
70199+ if (checkglob && retval->globbed) {
70200+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
70201+ if (retval2)
70202+ retval = retval2;
70203+ }
70204+ break;
70205+ }
70206+ } while ((tmpsubj = tmpsubj->parent_subject));
70207+ read_unlock(&gr_inode_lock);
70208+
70209+ return retval;
70210+}
70211+
70212+static __inline__ struct acl_object_label *
70213+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70214+ struct dentry *curr_dentry,
70215+ const struct acl_subject_label *subj, char **path, const int checkglob)
70216+{
70217+ int newglob = checkglob;
70218+ ino_t inode;
70219+ dev_t device;
70220+
70221+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
70222+ as we don't want a / * rule to match instead of the / object
70223+ don't do this for create lookups that call this function though, since they're looking up
70224+ on the parent and thus need globbing checks on all paths
70225+ */
70226+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
70227+ newglob = GR_NO_GLOB;
70228+
70229+ spin_lock(&curr_dentry->d_lock);
70230+ inode = curr_dentry->d_inode->i_ino;
70231+ device = __get_dev(curr_dentry);
70232+ spin_unlock(&curr_dentry->d_lock);
70233+
70234+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
70235+}
70236+
70237+#ifdef CONFIG_HUGETLBFS
70238+static inline bool
70239+is_hugetlbfs_mnt(const struct vfsmount *mnt)
70240+{
70241+ int i;
70242+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
70243+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
70244+ return true;
70245+ }
70246+
70247+ return false;
70248+}
70249+#endif
70250+
70251+static struct acl_object_label *
70252+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70253+ const struct acl_subject_label *subj, char *path, const int checkglob)
70254+{
70255+ struct dentry *dentry = (struct dentry *) l_dentry;
70256+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70257+ struct mount *real_mnt = real_mount(mnt);
70258+ struct acl_object_label *retval;
70259+ struct dentry *parent;
70260+
70261+ read_seqlock_excl(&mount_lock);
70262+ write_seqlock(&rename_lock);
70263+
70264+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
70265+#ifdef CONFIG_NET
70266+ mnt == sock_mnt ||
70267+#endif
70268+#ifdef CONFIG_HUGETLBFS
70269+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
70270+#endif
70271+ /* ignore Eric Biederman */
70272+ IS_PRIVATE(l_dentry->d_inode))) {
70273+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
70274+ goto out;
70275+ }
70276+
70277+ for (;;) {
70278+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70279+ break;
70280+
70281+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70282+ if (!mnt_has_parent(real_mnt))
70283+ break;
70284+
70285+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70286+ if (retval != NULL)
70287+ goto out;
70288+
70289+ dentry = real_mnt->mnt_mountpoint;
70290+ real_mnt = real_mnt->mnt_parent;
70291+ mnt = &real_mnt->mnt;
70292+ continue;
70293+ }
70294+
70295+ parent = dentry->d_parent;
70296+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70297+ if (retval != NULL)
70298+ goto out;
70299+
70300+ dentry = parent;
70301+ }
70302+
70303+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70304+
70305+ /* gr_real_root is pinned so we don't have to hold a reference */
70306+ if (retval == NULL)
70307+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
70308+out:
70309+ write_sequnlock(&rename_lock);
70310+ read_sequnlock_excl(&mount_lock);
70311+
70312+ BUG_ON(retval == NULL);
70313+
70314+ return retval;
70315+}
70316+
70317+static __inline__ struct acl_object_label *
70318+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70319+ const struct acl_subject_label *subj)
70320+{
70321+ char *path = NULL;
70322+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
70323+}
70324+
70325+static __inline__ struct acl_object_label *
70326+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70327+ const struct acl_subject_label *subj)
70328+{
70329+ char *path = NULL;
70330+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
70331+}
70332+
70333+static __inline__ struct acl_object_label *
70334+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70335+ const struct acl_subject_label *subj, char *path)
70336+{
70337+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
70338+}
70339+
70340+struct acl_subject_label *
70341+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70342+ const struct acl_role_label *role)
70343+{
70344+ struct dentry *dentry = (struct dentry *) l_dentry;
70345+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70346+ struct mount *real_mnt = real_mount(mnt);
70347+ struct acl_subject_label *retval;
70348+ struct dentry *parent;
70349+
70350+ read_seqlock_excl(&mount_lock);
70351+ write_seqlock(&rename_lock);
70352+
70353+ for (;;) {
70354+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70355+ break;
70356+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70357+ if (!mnt_has_parent(real_mnt))
70358+ break;
70359+
70360+ spin_lock(&dentry->d_lock);
70361+ read_lock(&gr_inode_lock);
70362+ retval =
70363+ lookup_acl_subj_label(dentry->d_inode->i_ino,
70364+ __get_dev(dentry), role);
70365+ read_unlock(&gr_inode_lock);
70366+ spin_unlock(&dentry->d_lock);
70367+ if (retval != NULL)
70368+ goto out;
70369+
70370+ dentry = real_mnt->mnt_mountpoint;
70371+ real_mnt = real_mnt->mnt_parent;
70372+ mnt = &real_mnt->mnt;
70373+ continue;
70374+ }
70375+
70376+ spin_lock(&dentry->d_lock);
70377+ read_lock(&gr_inode_lock);
70378+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70379+ __get_dev(dentry), role);
70380+ read_unlock(&gr_inode_lock);
70381+ parent = dentry->d_parent;
70382+ spin_unlock(&dentry->d_lock);
70383+
70384+ if (retval != NULL)
70385+ goto out;
70386+
70387+ dentry = parent;
70388+ }
70389+
70390+ spin_lock(&dentry->d_lock);
70391+ read_lock(&gr_inode_lock);
70392+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70393+ __get_dev(dentry), role);
70394+ read_unlock(&gr_inode_lock);
70395+ spin_unlock(&dentry->d_lock);
70396+
70397+ if (unlikely(retval == NULL)) {
70398+ /* gr_real_root is pinned, we don't need to hold a reference */
70399+ read_lock(&gr_inode_lock);
70400+ retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
70401+ __get_dev(gr_real_root.dentry), role);
70402+ read_unlock(&gr_inode_lock);
70403+ }
70404+out:
70405+ write_sequnlock(&rename_lock);
70406+ read_sequnlock_excl(&mount_lock);
70407+
70408+ BUG_ON(retval == NULL);
70409+
70410+ return retval;
70411+}
70412+
70413+void
70414+assign_special_role(const char *rolename)
70415+{
70416+ struct acl_object_label *obj;
70417+ struct acl_role_label *r;
70418+ struct acl_role_label *assigned = NULL;
70419+ struct task_struct *tsk;
70420+ struct file *filp;
70421+
70422+ FOR_EACH_ROLE_START(r)
70423+ if (!strcmp(rolename, r->rolename) &&
70424+ (r->roletype & GR_ROLE_SPECIAL)) {
70425+ assigned = r;
70426+ break;
70427+ }
70428+ FOR_EACH_ROLE_END(r)
70429+
70430+ if (!assigned)
70431+ return;
70432+
70433+ read_lock(&tasklist_lock);
70434+ read_lock(&grsec_exec_file_lock);
70435+
70436+ tsk = current->real_parent;
70437+ if (tsk == NULL)
70438+ goto out_unlock;
70439+
70440+ filp = tsk->exec_file;
70441+ if (filp == NULL)
70442+ goto out_unlock;
70443+
70444+ tsk->is_writable = 0;
70445+ tsk->inherited = 0;
70446+
70447+ tsk->acl_sp_role = 1;
70448+ tsk->acl_role_id = ++acl_sp_role_value;
70449+ tsk->role = assigned;
70450+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
70451+
70452+ /* ignore additional mmap checks for processes that are writable
70453+ by the default ACL */
70454+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70455+ if (unlikely(obj->mode & GR_WRITE))
70456+ tsk->is_writable = 1;
70457+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
70458+ if (unlikely(obj->mode & GR_WRITE))
70459+ tsk->is_writable = 1;
70460+
70461+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70462+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
70463+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
70464+#endif
70465+
70466+out_unlock:
70467+ read_unlock(&grsec_exec_file_lock);
70468+ read_unlock(&tasklist_lock);
70469+ return;
70470+}
70471+
70472+
70473+static void
70474+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
70475+{
70476+ struct task_struct *task = current;
70477+ const struct cred *cred = current_cred();
70478+
70479+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
70480+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70481+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70482+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
70483+
70484+ return;
70485+}
70486+
70487+static void
70488+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
70489+{
70490+ struct task_struct *task = current;
70491+ const struct cred *cred = current_cred();
70492+
70493+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70494+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70495+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70496+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
70497+
70498+ return;
70499+}
70500+
70501+static void
70502+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
70503+{
70504+ struct task_struct *task = current;
70505+ const struct cred *cred = current_cred();
70506+
70507+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70508+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70509+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70510+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
70511+
70512+ return;
70513+}
70514+
70515+static void
70516+gr_set_proc_res(struct task_struct *task)
70517+{
70518+ struct acl_subject_label *proc;
70519+ unsigned short i;
70520+
70521+ proc = task->acl;
70522+
70523+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
70524+ return;
70525+
70526+ for (i = 0; i < RLIM_NLIMITS; i++) {
70527+ if (!(proc->resmask & (1U << i)))
70528+ continue;
70529+
70530+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
70531+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
70532+
70533+ if (i == RLIMIT_CPU)
70534+ update_rlimit_cpu(task, proc->res[i].rlim_cur);
70535+ }
70536+
70537+ return;
70538+}
70539+
70540+/* both of the below must be called with
70541+ rcu_read_lock();
70542+ read_lock(&tasklist_lock);
70543+ read_lock(&grsec_exec_file_lock);
70544+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
70545+*/
70546+
70547+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
70548+{
70549+ char *tmpname;
70550+ struct acl_subject_label *tmpsubj;
70551+ struct file *filp;
70552+ struct name_entry *nmatch;
70553+
70554+ filp = task->exec_file;
70555+ if (filp == NULL)
70556+ return NULL;
70557+
70558+ /* the following is to apply the correct subject
70559+ on binaries running when the RBAC system
70560+ is enabled, when the binaries have been
70561+ replaced or deleted since their execution
70562+ -----
70563+ when the RBAC system starts, the inode/dev
70564+ from exec_file will be one the RBAC system
70565+ is unaware of. It only knows the inode/dev
70566+ of the present file on disk, or the absence
70567+ of it.
70568+ */
70569+
70570+ if (filename)
70571+ nmatch = __lookup_name_entry(state, filename);
70572+ else {
70573+ preempt_disable();
70574+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
70575+
70576+ nmatch = __lookup_name_entry(state, tmpname);
70577+ preempt_enable();
70578+ }
70579+ tmpsubj = NULL;
70580+ if (nmatch) {
70581+ if (nmatch->deleted)
70582+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
70583+ else
70584+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
70585+ }
70586+ /* this also works for the reload case -- if we don't match a potentially inherited subject
70587+ then we fall back to a normal lookup based on the binary's ino/dev
70588+ */
70589+ if (tmpsubj == NULL && fallback)
70590+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
70591+
70592+ return tmpsubj;
70593+}
70594+
70595+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
70596+{
70597+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
70598+}
70599+
70600+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
70601+{
70602+ struct acl_object_label *obj;
70603+ struct file *filp;
70604+
70605+ filp = task->exec_file;
70606+
70607+ task->acl = subj;
70608+ task->is_writable = 0;
70609+ /* ignore additional mmap checks for processes that are writable
70610+ by the default ACL */
70611+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
70612+ if (unlikely(obj->mode & GR_WRITE))
70613+ task->is_writable = 1;
70614+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70615+ if (unlikely(obj->mode & GR_WRITE))
70616+ task->is_writable = 1;
70617+
70618+ gr_set_proc_res(task);
70619+
70620+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70621+ 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);
70622+#endif
70623+}
70624+
70625+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
70626+{
70627+ __gr_apply_subject_to_task(&running_polstate, task, subj);
70628+}
70629+
70630+__u32
70631+gr_search_file(const struct dentry * dentry, const __u32 mode,
70632+ const struct vfsmount * mnt)
70633+{
70634+ __u32 retval = mode;
70635+ struct acl_subject_label *curracl;
70636+ struct acl_object_label *currobj;
70637+
70638+ if (unlikely(!(gr_status & GR_READY)))
70639+ return (mode & ~GR_AUDITS);
70640+
70641+ curracl = current->acl;
70642+
70643+ currobj = chk_obj_label(dentry, mnt, curracl);
70644+ retval = currobj->mode & mode;
70645+
70646+ /* if we're opening a specified transfer file for writing
70647+ (e.g. /dev/initctl), then transfer our role to init
70648+ */
70649+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
70650+ current->role->roletype & GR_ROLE_PERSIST)) {
70651+ struct task_struct *task = init_pid_ns.child_reaper;
70652+
70653+ if (task->role != current->role) {
70654+ struct acl_subject_label *subj;
70655+
70656+ task->acl_sp_role = 0;
70657+ task->acl_role_id = current->acl_role_id;
70658+ task->role = current->role;
70659+ rcu_read_lock();
70660+ read_lock(&grsec_exec_file_lock);
70661+ subj = gr_get_subject_for_task(task, NULL, 1);
70662+ gr_apply_subject_to_task(task, subj);
70663+ read_unlock(&grsec_exec_file_lock);
70664+ rcu_read_unlock();
70665+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
70666+ }
70667+ }
70668+
70669+ if (unlikely
70670+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
70671+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
70672+ __u32 new_mode = mode;
70673+
70674+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70675+
70676+ retval = new_mode;
70677+
70678+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
70679+ new_mode |= GR_INHERIT;
70680+
70681+ if (!(mode & GR_NOLEARN))
70682+ gr_log_learn(dentry, mnt, new_mode);
70683+ }
70684+
70685+ return retval;
70686+}
70687+
70688+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
70689+ const struct dentry *parent,
70690+ const struct vfsmount *mnt)
70691+{
70692+ struct name_entry *match;
70693+ struct acl_object_label *matchpo;
70694+ struct acl_subject_label *curracl;
70695+ char *path;
70696+
70697+ if (unlikely(!(gr_status & GR_READY)))
70698+ return NULL;
70699+
70700+ preempt_disable();
70701+ path = gr_to_filename_rbac(new_dentry, mnt);
70702+ match = lookup_name_entry_create(path);
70703+
70704+ curracl = current->acl;
70705+
70706+ if (match) {
70707+ read_lock(&gr_inode_lock);
70708+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
70709+ read_unlock(&gr_inode_lock);
70710+
70711+ if (matchpo) {
70712+ preempt_enable();
70713+ return matchpo;
70714+ }
70715+ }
70716+
70717+ // lookup parent
70718+
70719+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
70720+
70721+ preempt_enable();
70722+ return matchpo;
70723+}
70724+
70725+__u32
70726+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
70727+ const struct vfsmount * mnt, const __u32 mode)
70728+{
70729+ struct acl_object_label *matchpo;
70730+ __u32 retval;
70731+
70732+ if (unlikely(!(gr_status & GR_READY)))
70733+ return (mode & ~GR_AUDITS);
70734+
70735+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
70736+
70737+ retval = matchpo->mode & mode;
70738+
70739+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
70740+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70741+ __u32 new_mode = mode;
70742+
70743+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70744+
70745+ gr_log_learn(new_dentry, mnt, new_mode);
70746+ return new_mode;
70747+ }
70748+
70749+ return retval;
70750+}
70751+
70752+__u32
70753+gr_check_link(const struct dentry * new_dentry,
70754+ const struct dentry * parent_dentry,
70755+ const struct vfsmount * parent_mnt,
70756+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
70757+{
70758+ struct acl_object_label *obj;
70759+ __u32 oldmode, newmode;
70760+ __u32 needmode;
70761+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
70762+ GR_DELETE | GR_INHERIT;
70763+
70764+ if (unlikely(!(gr_status & GR_READY)))
70765+ return (GR_CREATE | GR_LINK);
70766+
70767+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
70768+ oldmode = obj->mode;
70769+
70770+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
70771+ newmode = obj->mode;
70772+
70773+ needmode = newmode & checkmodes;
70774+
70775+ // old name for hardlink must have at least the permissions of the new name
70776+ if ((oldmode & needmode) != needmode)
70777+ goto bad;
70778+
70779+ // if old name had restrictions/auditing, make sure the new name does as well
70780+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
70781+
70782+ // don't allow hardlinking of suid/sgid/fcapped files without permission
70783+ if (is_privileged_binary(old_dentry))
70784+ needmode |= GR_SETID;
70785+
70786+ if ((newmode & needmode) != needmode)
70787+ goto bad;
70788+
70789+ // enforce minimum permissions
70790+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
70791+ return newmode;
70792+bad:
70793+ needmode = oldmode;
70794+ if (is_privileged_binary(old_dentry))
70795+ needmode |= GR_SETID;
70796+
70797+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
70798+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
70799+ return (GR_CREATE | GR_LINK);
70800+ } else if (newmode & GR_SUPPRESS)
70801+ return GR_SUPPRESS;
70802+ else
70803+ return 0;
70804+}
70805+
70806+int
70807+gr_check_hidden_task(const struct task_struct *task)
70808+{
70809+ if (unlikely(!(gr_status & GR_READY)))
70810+ return 0;
70811+
70812+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
70813+ return 1;
70814+
70815+ return 0;
70816+}
70817+
70818+int
70819+gr_check_protected_task(const struct task_struct *task)
70820+{
70821+ if (unlikely(!(gr_status & GR_READY) || !task))
70822+ return 0;
70823+
70824+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70825+ task->acl != current->acl)
70826+ return 1;
70827+
70828+ return 0;
70829+}
70830+
70831+int
70832+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70833+{
70834+ struct task_struct *p;
70835+ int ret = 0;
70836+
70837+ if (unlikely(!(gr_status & GR_READY) || !pid))
70838+ return ret;
70839+
70840+ read_lock(&tasklist_lock);
70841+ do_each_pid_task(pid, type, p) {
70842+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70843+ p->acl != current->acl) {
70844+ ret = 1;
70845+ goto out;
70846+ }
70847+ } while_each_pid_task(pid, type, p);
70848+out:
70849+ read_unlock(&tasklist_lock);
70850+
70851+ return ret;
70852+}
70853+
70854+void
70855+gr_copy_label(struct task_struct *tsk)
70856+{
70857+ struct task_struct *p = current;
70858+
70859+ tsk->inherited = p->inherited;
70860+ tsk->acl_sp_role = 0;
70861+ tsk->acl_role_id = p->acl_role_id;
70862+ tsk->acl = p->acl;
70863+ tsk->role = p->role;
70864+ tsk->signal->used_accept = 0;
70865+ tsk->signal->curr_ip = p->signal->curr_ip;
70866+ tsk->signal->saved_ip = p->signal->saved_ip;
70867+ if (p->exec_file)
70868+ get_file(p->exec_file);
70869+ tsk->exec_file = p->exec_file;
70870+ tsk->is_writable = p->is_writable;
70871+ if (unlikely(p->signal->used_accept)) {
70872+ p->signal->curr_ip = 0;
70873+ p->signal->saved_ip = 0;
70874+ }
70875+
70876+ return;
70877+}
70878+
70879+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
70880+
70881+int
70882+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70883+{
70884+ unsigned int i;
70885+ __u16 num;
70886+ uid_t *uidlist;
70887+ uid_t curuid;
70888+ int realok = 0;
70889+ int effectiveok = 0;
70890+ int fsok = 0;
70891+ uid_t globalreal, globaleffective, globalfs;
70892+
70893+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
70894+ struct user_struct *user;
70895+
70896+ if (!uid_valid(real))
70897+ goto skipit;
70898+
70899+ /* find user based on global namespace */
70900+
70901+ globalreal = GR_GLOBAL_UID(real);
70902+
70903+ user = find_user(make_kuid(&init_user_ns, globalreal));
70904+ if (user == NULL)
70905+ goto skipit;
70906+
70907+ if (gr_process_kernel_setuid_ban(user)) {
70908+ /* for find_user */
70909+ free_uid(user);
70910+ return 1;
70911+ }
70912+
70913+ /* for find_user */
70914+ free_uid(user);
70915+
70916+skipit:
70917+#endif
70918+
70919+ if (unlikely(!(gr_status & GR_READY)))
70920+ return 0;
70921+
70922+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70923+ gr_log_learn_uid_change(real, effective, fs);
70924+
70925+ num = current->acl->user_trans_num;
70926+ uidlist = current->acl->user_transitions;
70927+
70928+ if (uidlist == NULL)
70929+ return 0;
70930+
70931+ if (!uid_valid(real)) {
70932+ realok = 1;
70933+ globalreal = (uid_t)-1;
70934+ } else {
70935+ globalreal = GR_GLOBAL_UID(real);
70936+ }
70937+ if (!uid_valid(effective)) {
70938+ effectiveok = 1;
70939+ globaleffective = (uid_t)-1;
70940+ } else {
70941+ globaleffective = GR_GLOBAL_UID(effective);
70942+ }
70943+ if (!uid_valid(fs)) {
70944+ fsok = 1;
70945+ globalfs = (uid_t)-1;
70946+ } else {
70947+ globalfs = GR_GLOBAL_UID(fs);
70948+ }
70949+
70950+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
70951+ for (i = 0; i < num; i++) {
70952+ curuid = uidlist[i];
70953+ if (globalreal == curuid)
70954+ realok = 1;
70955+ if (globaleffective == curuid)
70956+ effectiveok = 1;
70957+ if (globalfs == curuid)
70958+ fsok = 1;
70959+ }
70960+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
70961+ for (i = 0; i < num; i++) {
70962+ curuid = uidlist[i];
70963+ if (globalreal == curuid)
70964+ break;
70965+ if (globaleffective == curuid)
70966+ break;
70967+ if (globalfs == curuid)
70968+ break;
70969+ }
70970+ /* not in deny list */
70971+ if (i == num) {
70972+ realok = 1;
70973+ effectiveok = 1;
70974+ fsok = 1;
70975+ }
70976+ }
70977+
70978+ if (realok && effectiveok && fsok)
70979+ return 0;
70980+ else {
70981+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70982+ return 1;
70983+ }
70984+}
70985+
70986+int
70987+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70988+{
70989+ unsigned int i;
70990+ __u16 num;
70991+ gid_t *gidlist;
70992+ gid_t curgid;
70993+ int realok = 0;
70994+ int effectiveok = 0;
70995+ int fsok = 0;
70996+ gid_t globalreal, globaleffective, globalfs;
70997+
70998+ if (unlikely(!(gr_status & GR_READY)))
70999+ return 0;
71000+
71001+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71002+ gr_log_learn_gid_change(real, effective, fs);
71003+
71004+ num = current->acl->group_trans_num;
71005+ gidlist = current->acl->group_transitions;
71006+
71007+ if (gidlist == NULL)
71008+ return 0;
71009+
71010+ if (!gid_valid(real)) {
71011+ realok = 1;
71012+ globalreal = (gid_t)-1;
71013+ } else {
71014+ globalreal = GR_GLOBAL_GID(real);
71015+ }
71016+ if (!gid_valid(effective)) {
71017+ effectiveok = 1;
71018+ globaleffective = (gid_t)-1;
71019+ } else {
71020+ globaleffective = GR_GLOBAL_GID(effective);
71021+ }
71022+ if (!gid_valid(fs)) {
71023+ fsok = 1;
71024+ globalfs = (gid_t)-1;
71025+ } else {
71026+ globalfs = GR_GLOBAL_GID(fs);
71027+ }
71028+
71029+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
71030+ for (i = 0; i < num; i++) {
71031+ curgid = gidlist[i];
71032+ if (globalreal == curgid)
71033+ realok = 1;
71034+ if (globaleffective == curgid)
71035+ effectiveok = 1;
71036+ if (globalfs == curgid)
71037+ fsok = 1;
71038+ }
71039+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
71040+ for (i = 0; i < num; i++) {
71041+ curgid = gidlist[i];
71042+ if (globalreal == curgid)
71043+ break;
71044+ if (globaleffective == curgid)
71045+ break;
71046+ if (globalfs == curgid)
71047+ break;
71048+ }
71049+ /* not in deny list */
71050+ if (i == num) {
71051+ realok = 1;
71052+ effectiveok = 1;
71053+ fsok = 1;
71054+ }
71055+ }
71056+
71057+ if (realok && effectiveok && fsok)
71058+ return 0;
71059+ else {
71060+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
71061+ return 1;
71062+ }
71063+}
71064+
71065+extern int gr_acl_is_capable(const int cap);
71066+
71067+void
71068+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
71069+{
71070+ struct acl_role_label *role = task->role;
71071+ struct acl_role_label *origrole = role;
71072+ struct acl_subject_label *subj = NULL;
71073+ struct acl_object_label *obj;
71074+ struct file *filp;
71075+ uid_t uid;
71076+ gid_t gid;
71077+
71078+ if (unlikely(!(gr_status & GR_READY)))
71079+ return;
71080+
71081+ uid = GR_GLOBAL_UID(kuid);
71082+ gid = GR_GLOBAL_GID(kgid);
71083+
71084+ filp = task->exec_file;
71085+
71086+ /* kernel process, we'll give them the kernel role */
71087+ if (unlikely(!filp)) {
71088+ task->role = running_polstate.kernel_role;
71089+ task->acl = running_polstate.kernel_role->root_label;
71090+ return;
71091+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
71092+ /* save the current ip at time of role lookup so that the proper
71093+ IP will be learned for role_allowed_ip */
71094+ task->signal->saved_ip = task->signal->curr_ip;
71095+ role = lookup_acl_role_label(task, uid, gid);
71096+ }
71097+
71098+ /* don't change the role if we're not a privileged process */
71099+ if (role && task->role != role &&
71100+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
71101+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
71102+ return;
71103+
71104+ task->role = role;
71105+
71106+ if (task->inherited) {
71107+ /* if we reached our subject through inheritance, then first see
71108+ if there's a subject of the same name in the new role that has
71109+ an object that would result in the same inherited subject
71110+ */
71111+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
71112+ if (subj) {
71113+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
71114+ if (!(obj->mode & GR_INHERIT))
71115+ subj = NULL;
71116+ }
71117+
71118+ }
71119+ if (subj == NULL) {
71120+ /* otherwise:
71121+ perform subject lookup in possibly new role
71122+ we can use this result below in the case where role == task->role
71123+ */
71124+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
71125+ }
71126+
71127+ /* if we changed uid/gid, but result in the same role
71128+ and are using inheritance, don't lose the inherited subject
71129+ if current subject is other than what normal lookup
71130+ would result in, we arrived via inheritance, don't
71131+ lose subject
71132+ */
71133+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
71134+ (subj == task->acl)))
71135+ task->acl = subj;
71136+
71137+ /* leave task->inherited unaffected */
71138+
71139+ task->is_writable = 0;
71140+
71141+ /* ignore additional mmap checks for processes that are writable
71142+ by the default ACL */
71143+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71144+ if (unlikely(obj->mode & GR_WRITE))
71145+ task->is_writable = 1;
71146+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
71147+ if (unlikely(obj->mode & GR_WRITE))
71148+ task->is_writable = 1;
71149+
71150+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71151+ 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);
71152+#endif
71153+
71154+ gr_set_proc_res(task);
71155+
71156+ return;
71157+}
71158+
71159+int
71160+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
71161+ const int unsafe_flags)
71162+{
71163+ struct task_struct *task = current;
71164+ struct acl_subject_label *newacl;
71165+ struct acl_object_label *obj;
71166+ __u32 retmode;
71167+
71168+ if (unlikely(!(gr_status & GR_READY)))
71169+ return 0;
71170+
71171+ newacl = chk_subj_label(dentry, mnt, task->role);
71172+
71173+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
71174+ did an exec
71175+ */
71176+ rcu_read_lock();
71177+ read_lock(&tasklist_lock);
71178+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
71179+ (task->parent->acl->mode & GR_POVERRIDE))) {
71180+ read_unlock(&tasklist_lock);
71181+ rcu_read_unlock();
71182+ goto skip_check;
71183+ }
71184+ read_unlock(&tasklist_lock);
71185+ rcu_read_unlock();
71186+
71187+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
71188+ !(task->role->roletype & GR_ROLE_GOD) &&
71189+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
71190+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
71191+ if (unsafe_flags & LSM_UNSAFE_SHARE)
71192+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
71193+ else
71194+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
71195+ return -EACCES;
71196+ }
71197+
71198+skip_check:
71199+
71200+ obj = chk_obj_label(dentry, mnt, task->acl);
71201+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
71202+
71203+ if (!(task->acl->mode & GR_INHERITLEARN) &&
71204+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
71205+ if (obj->nested)
71206+ task->acl = obj->nested;
71207+ else
71208+ task->acl = newacl;
71209+ task->inherited = 0;
71210+ } else {
71211+ task->inherited = 1;
71212+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
71213+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
71214+ }
71215+
71216+ task->is_writable = 0;
71217+
71218+ /* ignore additional mmap checks for processes that are writable
71219+ by the default ACL */
71220+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
71221+ if (unlikely(obj->mode & GR_WRITE))
71222+ task->is_writable = 1;
71223+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
71224+ if (unlikely(obj->mode & GR_WRITE))
71225+ task->is_writable = 1;
71226+
71227+ gr_set_proc_res(task);
71228+
71229+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71230+ 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);
71231+#endif
71232+ return 0;
71233+}
71234+
71235+/* always called with valid inodev ptr */
71236+static void
71237+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
71238+{
71239+ struct acl_object_label *matchpo;
71240+ struct acl_subject_label *matchps;
71241+ struct acl_subject_label *subj;
71242+ struct acl_role_label *role;
71243+ unsigned int x;
71244+
71245+ FOR_EACH_ROLE_START(role)
71246+ FOR_EACH_SUBJECT_START(role, subj, x)
71247+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71248+ matchpo->mode |= GR_DELETED;
71249+ FOR_EACH_SUBJECT_END(subj,x)
71250+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71251+ /* nested subjects aren't in the role's subj_hash table */
71252+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71253+ matchpo->mode |= GR_DELETED;
71254+ FOR_EACH_NESTED_SUBJECT_END(subj)
71255+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
71256+ matchps->mode |= GR_DELETED;
71257+ FOR_EACH_ROLE_END(role)
71258+
71259+ inodev->nentry->deleted = 1;
71260+
71261+ return;
71262+}
71263+
71264+void
71265+gr_handle_delete(const ino_t ino, const dev_t dev)
71266+{
71267+ struct inodev_entry *inodev;
71268+
71269+ if (unlikely(!(gr_status & GR_READY)))
71270+ return;
71271+
71272+ write_lock(&gr_inode_lock);
71273+ inodev = lookup_inodev_entry(ino, dev);
71274+ if (inodev != NULL)
71275+ do_handle_delete(inodev, ino, dev);
71276+ write_unlock(&gr_inode_lock);
71277+
71278+ return;
71279+}
71280+
71281+static void
71282+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
71283+ const ino_t newinode, const dev_t newdevice,
71284+ struct acl_subject_label *subj)
71285+{
71286+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
71287+ struct acl_object_label *match;
71288+
71289+ match = subj->obj_hash[index];
71290+
71291+ while (match && (match->inode != oldinode ||
71292+ match->device != olddevice ||
71293+ !(match->mode & GR_DELETED)))
71294+ match = match->next;
71295+
71296+ if (match && (match->inode == oldinode)
71297+ && (match->device == olddevice)
71298+ && (match->mode & GR_DELETED)) {
71299+ if (match->prev == NULL) {
71300+ subj->obj_hash[index] = match->next;
71301+ if (match->next != NULL)
71302+ match->next->prev = NULL;
71303+ } else {
71304+ match->prev->next = match->next;
71305+ if (match->next != NULL)
71306+ match->next->prev = match->prev;
71307+ }
71308+ match->prev = NULL;
71309+ match->next = NULL;
71310+ match->inode = newinode;
71311+ match->device = newdevice;
71312+ match->mode &= ~GR_DELETED;
71313+
71314+ insert_acl_obj_label(match, subj);
71315+ }
71316+
71317+ return;
71318+}
71319+
71320+static void
71321+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
71322+ const ino_t newinode, const dev_t newdevice,
71323+ struct acl_role_label *role)
71324+{
71325+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
71326+ struct acl_subject_label *match;
71327+
71328+ match = role->subj_hash[index];
71329+
71330+ while (match && (match->inode != oldinode ||
71331+ match->device != olddevice ||
71332+ !(match->mode & GR_DELETED)))
71333+ match = match->next;
71334+
71335+ if (match && (match->inode == oldinode)
71336+ && (match->device == olddevice)
71337+ && (match->mode & GR_DELETED)) {
71338+ if (match->prev == NULL) {
71339+ role->subj_hash[index] = match->next;
71340+ if (match->next != NULL)
71341+ match->next->prev = NULL;
71342+ } else {
71343+ match->prev->next = match->next;
71344+ if (match->next != NULL)
71345+ match->next->prev = match->prev;
71346+ }
71347+ match->prev = NULL;
71348+ match->next = NULL;
71349+ match->inode = newinode;
71350+ match->device = newdevice;
71351+ match->mode &= ~GR_DELETED;
71352+
71353+ insert_acl_subj_label(match, role);
71354+ }
71355+
71356+ return;
71357+}
71358+
71359+static void
71360+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
71361+ const ino_t newinode, const dev_t newdevice)
71362+{
71363+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
71364+ struct inodev_entry *match;
71365+
71366+ match = running_polstate.inodev_set.i_hash[index];
71367+
71368+ while (match && (match->nentry->inode != oldinode ||
71369+ match->nentry->device != olddevice || !match->nentry->deleted))
71370+ match = match->next;
71371+
71372+ if (match && (match->nentry->inode == oldinode)
71373+ && (match->nentry->device == olddevice) &&
71374+ match->nentry->deleted) {
71375+ if (match->prev == NULL) {
71376+ running_polstate.inodev_set.i_hash[index] = match->next;
71377+ if (match->next != NULL)
71378+ match->next->prev = NULL;
71379+ } else {
71380+ match->prev->next = match->next;
71381+ if (match->next != NULL)
71382+ match->next->prev = match->prev;
71383+ }
71384+ match->prev = NULL;
71385+ match->next = NULL;
71386+ match->nentry->inode = newinode;
71387+ match->nentry->device = newdevice;
71388+ match->nentry->deleted = 0;
71389+
71390+ insert_inodev_entry(match);
71391+ }
71392+
71393+ return;
71394+}
71395+
71396+static void
71397+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
71398+{
71399+ struct acl_subject_label *subj;
71400+ struct acl_role_label *role;
71401+ unsigned int x;
71402+
71403+ FOR_EACH_ROLE_START(role)
71404+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
71405+
71406+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71407+ if ((subj->inode == ino) && (subj->device == dev)) {
71408+ subj->inode = ino;
71409+ subj->device = dev;
71410+ }
71411+ /* nested subjects aren't in the role's subj_hash table */
71412+ update_acl_obj_label(matchn->inode, matchn->device,
71413+ ino, dev, subj);
71414+ FOR_EACH_NESTED_SUBJECT_END(subj)
71415+ FOR_EACH_SUBJECT_START(role, subj, x)
71416+ update_acl_obj_label(matchn->inode, matchn->device,
71417+ ino, dev, subj);
71418+ FOR_EACH_SUBJECT_END(subj,x)
71419+ FOR_EACH_ROLE_END(role)
71420+
71421+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
71422+
71423+ return;
71424+}
71425+
71426+static void
71427+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
71428+ const struct vfsmount *mnt)
71429+{
71430+ ino_t ino = dentry->d_inode->i_ino;
71431+ dev_t dev = __get_dev(dentry);
71432+
71433+ __do_handle_create(matchn, ino, dev);
71434+
71435+ return;
71436+}
71437+
71438+void
71439+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
71440+{
71441+ struct name_entry *matchn;
71442+
71443+ if (unlikely(!(gr_status & GR_READY)))
71444+ return;
71445+
71446+ preempt_disable();
71447+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
71448+
71449+ if (unlikely((unsigned long)matchn)) {
71450+ write_lock(&gr_inode_lock);
71451+ do_handle_create(matchn, dentry, mnt);
71452+ write_unlock(&gr_inode_lock);
71453+ }
71454+ preempt_enable();
71455+
71456+ return;
71457+}
71458+
71459+void
71460+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
71461+{
71462+ struct name_entry *matchn;
71463+
71464+ if (unlikely(!(gr_status & GR_READY)))
71465+ return;
71466+
71467+ preempt_disable();
71468+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
71469+
71470+ if (unlikely((unsigned long)matchn)) {
71471+ write_lock(&gr_inode_lock);
71472+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
71473+ write_unlock(&gr_inode_lock);
71474+ }
71475+ preempt_enable();
71476+
71477+ return;
71478+}
71479+
71480+void
71481+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
71482+ struct dentry *old_dentry,
71483+ struct dentry *new_dentry,
71484+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
71485+{
71486+ struct name_entry *matchn;
71487+ struct name_entry *matchn2 = NULL;
71488+ struct inodev_entry *inodev;
71489+ struct inode *inode = new_dentry->d_inode;
71490+ ino_t old_ino = old_dentry->d_inode->i_ino;
71491+ dev_t old_dev = __get_dev(old_dentry);
71492+ unsigned int exchange = flags & RENAME_EXCHANGE;
71493+
71494+ /* vfs_rename swaps the name and parent link for old_dentry and
71495+ new_dentry
71496+ at this point, old_dentry has the new name, parent link, and inode
71497+ for the renamed file
71498+ if a file is being replaced by a rename, new_dentry has the inode
71499+ and name for the replaced file
71500+ */
71501+
71502+ if (unlikely(!(gr_status & GR_READY)))
71503+ return;
71504+
71505+ preempt_disable();
71506+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
71507+
71508+ /* exchange cases:
71509+ a filename exists for the source, but not dest
71510+ do a recreate on source
71511+ a filename exists for the dest, but not source
71512+ do a recreate on dest
71513+ a filename exists for both source and dest
71514+ delete source and dest, then create source and dest
71515+ a filename exists for neither source nor dest
71516+ no updates needed
71517+
71518+ the name entry lookups get us the old inode/dev associated with
71519+ each name, so do the deletes first (if possible) so that when
71520+ we do the create, we pick up on the right entries
71521+ */
71522+
71523+ if (exchange)
71524+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
71525+
71526+ /* we wouldn't have to check d_inode if it weren't for
71527+ NFS silly-renaming
71528+ */
71529+
71530+ write_lock(&gr_inode_lock);
71531+ if (unlikely((replace || exchange) && inode)) {
71532+ ino_t new_ino = inode->i_ino;
71533+ dev_t new_dev = __get_dev(new_dentry);
71534+
71535+ inodev = lookup_inodev_entry(new_ino, new_dev);
71536+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
71537+ do_handle_delete(inodev, new_ino, new_dev);
71538+ }
71539+
71540+ inodev = lookup_inodev_entry(old_ino, old_dev);
71541+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
71542+ do_handle_delete(inodev, old_ino, old_dev);
71543+
71544+ if (unlikely(matchn != NULL))
71545+ do_handle_create(matchn, old_dentry, mnt);
71546+
71547+ if (unlikely(matchn2 != NULL))
71548+ do_handle_create(matchn2, new_dentry, mnt);
71549+
71550+ write_unlock(&gr_inode_lock);
71551+ preempt_enable();
71552+
71553+ return;
71554+}
71555+
71556+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
71557+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
71558+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
71559+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
71560+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
71561+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
71562+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
71563+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
71564+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
71565+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
71566+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
71567+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
71568+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
71569+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
71570+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
71571+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
71572+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
71573+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
71574+};
71575+
71576+void
71577+gr_learn_resource(const struct task_struct *task,
71578+ const int res, const unsigned long wanted, const int gt)
71579+{
71580+ struct acl_subject_label *acl;
71581+ const struct cred *cred;
71582+
71583+ if (unlikely((gr_status & GR_READY) &&
71584+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
71585+ goto skip_reslog;
71586+
71587+ gr_log_resource(task, res, wanted, gt);
71588+skip_reslog:
71589+
71590+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
71591+ return;
71592+
71593+ acl = task->acl;
71594+
71595+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
71596+ !(acl->resmask & (1U << (unsigned short) res))))
71597+ return;
71598+
71599+ if (wanted >= acl->res[res].rlim_cur) {
71600+ unsigned long res_add;
71601+
71602+ res_add = wanted + res_learn_bumps[res];
71603+
71604+ acl->res[res].rlim_cur = res_add;
71605+
71606+ if (wanted > acl->res[res].rlim_max)
71607+ acl->res[res].rlim_max = res_add;
71608+
71609+ /* only log the subject filename, since resource logging is supported for
71610+ single-subject learning only */
71611+ rcu_read_lock();
71612+ cred = __task_cred(task);
71613+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
71614+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
71615+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
71616+ "", (unsigned long) res, &task->signal->saved_ip);
71617+ rcu_read_unlock();
71618+ }
71619+
71620+ return;
71621+}
71622+EXPORT_SYMBOL_GPL(gr_learn_resource);
71623+#endif
71624+
71625+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
71626+void
71627+pax_set_initial_flags(struct linux_binprm *bprm)
71628+{
71629+ struct task_struct *task = current;
71630+ struct acl_subject_label *proc;
71631+ unsigned long flags;
71632+
71633+ if (unlikely(!(gr_status & GR_READY)))
71634+ return;
71635+
71636+ flags = pax_get_flags(task);
71637+
71638+ proc = task->acl;
71639+
71640+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
71641+ flags &= ~MF_PAX_PAGEEXEC;
71642+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
71643+ flags &= ~MF_PAX_SEGMEXEC;
71644+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
71645+ flags &= ~MF_PAX_RANDMMAP;
71646+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
71647+ flags &= ~MF_PAX_EMUTRAMP;
71648+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
71649+ flags &= ~MF_PAX_MPROTECT;
71650+
71651+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
71652+ flags |= MF_PAX_PAGEEXEC;
71653+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
71654+ flags |= MF_PAX_SEGMEXEC;
71655+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
71656+ flags |= MF_PAX_RANDMMAP;
71657+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
71658+ flags |= MF_PAX_EMUTRAMP;
71659+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
71660+ flags |= MF_PAX_MPROTECT;
71661+
71662+ pax_set_flags(task, flags);
71663+
71664+ return;
71665+}
71666+#endif
71667+
71668+int
71669+gr_handle_proc_ptrace(struct task_struct *task)
71670+{
71671+ struct file *filp;
71672+ struct task_struct *tmp = task;
71673+ struct task_struct *curtemp = current;
71674+ __u32 retmode;
71675+
71676+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71677+ if (unlikely(!(gr_status & GR_READY)))
71678+ return 0;
71679+#endif
71680+
71681+ read_lock(&tasklist_lock);
71682+ read_lock(&grsec_exec_file_lock);
71683+ filp = task->exec_file;
71684+
71685+ while (task_pid_nr(tmp) > 0) {
71686+ if (tmp == curtemp)
71687+ break;
71688+ tmp = tmp->real_parent;
71689+ }
71690+
71691+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71692+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
71693+ read_unlock(&grsec_exec_file_lock);
71694+ read_unlock(&tasklist_lock);
71695+ return 1;
71696+ }
71697+
71698+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71699+ if (!(gr_status & GR_READY)) {
71700+ read_unlock(&grsec_exec_file_lock);
71701+ read_unlock(&tasklist_lock);
71702+ return 0;
71703+ }
71704+#endif
71705+
71706+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
71707+ read_unlock(&grsec_exec_file_lock);
71708+ read_unlock(&tasklist_lock);
71709+
71710+ if (retmode & GR_NOPTRACE)
71711+ return 1;
71712+
71713+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
71714+ && (current->acl != task->acl || (current->acl != current->role->root_label
71715+ && task_pid_nr(current) != task_pid_nr(task))))
71716+ return 1;
71717+
71718+ return 0;
71719+}
71720+
71721+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
71722+{
71723+ if (unlikely(!(gr_status & GR_READY)))
71724+ return;
71725+
71726+ if (!(current->role->roletype & GR_ROLE_GOD))
71727+ return;
71728+
71729+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
71730+ p->role->rolename, gr_task_roletype_to_char(p),
71731+ p->acl->filename);
71732+}
71733+
71734+int
71735+gr_handle_ptrace(struct task_struct *task, const long request)
71736+{
71737+ struct task_struct *tmp = task;
71738+ struct task_struct *curtemp = current;
71739+ __u32 retmode;
71740+
71741+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71742+ if (unlikely(!(gr_status & GR_READY)))
71743+ return 0;
71744+#endif
71745+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
71746+ read_lock(&tasklist_lock);
71747+ while (task_pid_nr(tmp) > 0) {
71748+ if (tmp == curtemp)
71749+ break;
71750+ tmp = tmp->real_parent;
71751+ }
71752+
71753+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71754+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
71755+ read_unlock(&tasklist_lock);
71756+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71757+ return 1;
71758+ }
71759+ read_unlock(&tasklist_lock);
71760+ }
71761+
71762+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71763+ if (!(gr_status & GR_READY))
71764+ return 0;
71765+#endif
71766+
71767+ read_lock(&grsec_exec_file_lock);
71768+ if (unlikely(!task->exec_file)) {
71769+ read_unlock(&grsec_exec_file_lock);
71770+ return 0;
71771+ }
71772+
71773+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
71774+ read_unlock(&grsec_exec_file_lock);
71775+
71776+ if (retmode & GR_NOPTRACE) {
71777+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71778+ return 1;
71779+ }
71780+
71781+ if (retmode & GR_PTRACERD) {
71782+ switch (request) {
71783+ case PTRACE_SEIZE:
71784+ case PTRACE_POKETEXT:
71785+ case PTRACE_POKEDATA:
71786+ case PTRACE_POKEUSR:
71787+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
71788+ case PTRACE_SETREGS:
71789+ case PTRACE_SETFPREGS:
71790+#endif
71791+#ifdef CONFIG_X86
71792+ case PTRACE_SETFPXREGS:
71793+#endif
71794+#ifdef CONFIG_ALTIVEC
71795+ case PTRACE_SETVRREGS:
71796+#endif
71797+ return 1;
71798+ default:
71799+ return 0;
71800+ }
71801+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
71802+ !(current->role->roletype & GR_ROLE_GOD) &&
71803+ (current->acl != task->acl)) {
71804+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71805+ return 1;
71806+ }
71807+
71808+ return 0;
71809+}
71810+
71811+static int is_writable_mmap(const struct file *filp)
71812+{
71813+ struct task_struct *task = current;
71814+ struct acl_object_label *obj, *obj2;
71815+
71816+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
71817+ !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))) {
71818+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71819+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
71820+ task->role->root_label);
71821+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
71822+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
71823+ return 1;
71824+ }
71825+ }
71826+ return 0;
71827+}
71828+
71829+int
71830+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
71831+{
71832+ __u32 mode;
71833+
71834+ if (unlikely(!file || !(prot & PROT_EXEC)))
71835+ return 1;
71836+
71837+ if (is_writable_mmap(file))
71838+ return 0;
71839+
71840+ mode =
71841+ gr_search_file(file->f_path.dentry,
71842+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71843+ file->f_path.mnt);
71844+
71845+ if (!gr_tpe_allow(file))
71846+ return 0;
71847+
71848+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71849+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71850+ return 0;
71851+ } else if (unlikely(!(mode & GR_EXEC))) {
71852+ return 0;
71853+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71854+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71855+ return 1;
71856+ }
71857+
71858+ return 1;
71859+}
71860+
71861+int
71862+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
71863+{
71864+ __u32 mode;
71865+
71866+ if (unlikely(!file || !(prot & PROT_EXEC)))
71867+ return 1;
71868+
71869+ if (is_writable_mmap(file))
71870+ return 0;
71871+
71872+ mode =
71873+ gr_search_file(file->f_path.dentry,
71874+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71875+ file->f_path.mnt);
71876+
71877+ if (!gr_tpe_allow(file))
71878+ return 0;
71879+
71880+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71881+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71882+ return 0;
71883+ } else if (unlikely(!(mode & GR_EXEC))) {
71884+ return 0;
71885+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71886+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71887+ return 1;
71888+ }
71889+
71890+ return 1;
71891+}
71892+
71893+void
71894+gr_acl_handle_psacct(struct task_struct *task, const long code)
71895+{
71896+ unsigned long runtime, cputime;
71897+ cputime_t utime, stime;
71898+ unsigned int wday, cday;
71899+ __u8 whr, chr;
71900+ __u8 wmin, cmin;
71901+ __u8 wsec, csec;
71902+ struct timespec curtime, starttime;
71903+
71904+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
71905+ !(task->acl->mode & GR_PROCACCT)))
71906+ return;
71907+
71908+ curtime = ns_to_timespec(ktime_get_ns());
71909+ starttime = ns_to_timespec(task->start_time);
71910+ runtime = curtime.tv_sec - starttime.tv_sec;
71911+ wday = runtime / (60 * 60 * 24);
71912+ runtime -= wday * (60 * 60 * 24);
71913+ whr = runtime / (60 * 60);
71914+ runtime -= whr * (60 * 60);
71915+ wmin = runtime / 60;
71916+ runtime -= wmin * 60;
71917+ wsec = runtime;
71918+
71919+ task_cputime(task, &utime, &stime);
71920+ cputime = cputime_to_secs(utime + stime);
71921+ cday = cputime / (60 * 60 * 24);
71922+ cputime -= cday * (60 * 60 * 24);
71923+ chr = cputime / (60 * 60);
71924+ cputime -= chr * (60 * 60);
71925+ cmin = cputime / 60;
71926+ cputime -= cmin * 60;
71927+ csec = cputime;
71928+
71929+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
71930+
71931+ return;
71932+}
71933+
71934+#ifdef CONFIG_TASKSTATS
71935+int gr_is_taskstats_denied(int pid)
71936+{
71937+ struct task_struct *task;
71938+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71939+ const struct cred *cred;
71940+#endif
71941+ int ret = 0;
71942+
71943+ /* restrict taskstats viewing to un-chrooted root users
71944+ who have the 'view' subject flag if the RBAC system is enabled
71945+ */
71946+
71947+ rcu_read_lock();
71948+ read_lock(&tasklist_lock);
71949+ task = find_task_by_vpid(pid);
71950+ if (task) {
71951+#ifdef CONFIG_GRKERNSEC_CHROOT
71952+ if (proc_is_chrooted(task))
71953+ ret = -EACCES;
71954+#endif
71955+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71956+ cred = __task_cred(task);
71957+#ifdef CONFIG_GRKERNSEC_PROC_USER
71958+ if (gr_is_global_nonroot(cred->uid))
71959+ ret = -EACCES;
71960+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71961+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
71962+ ret = -EACCES;
71963+#endif
71964+#endif
71965+ if (gr_status & GR_READY) {
71966+ if (!(task->acl->mode & GR_VIEW))
71967+ ret = -EACCES;
71968+ }
71969+ } else
71970+ ret = -ENOENT;
71971+
71972+ read_unlock(&tasklist_lock);
71973+ rcu_read_unlock();
71974+
71975+ return ret;
71976+}
71977+#endif
71978+
71979+/* AUXV entries are filled via a descendant of search_binary_handler
71980+ after we've already applied the subject for the target
71981+*/
71982+int gr_acl_enable_at_secure(void)
71983+{
71984+ if (unlikely(!(gr_status & GR_READY)))
71985+ return 0;
71986+
71987+ if (current->acl->mode & GR_ATSECURE)
71988+ return 1;
71989+
71990+ return 0;
71991+}
71992+
71993+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
71994+{
71995+ struct task_struct *task = current;
71996+ struct dentry *dentry = file->f_path.dentry;
71997+ struct vfsmount *mnt = file->f_path.mnt;
71998+ struct acl_object_label *obj, *tmp;
71999+ struct acl_subject_label *subj;
72000+ unsigned int bufsize;
72001+ int is_not_root;
72002+ char *path;
72003+ dev_t dev = __get_dev(dentry);
72004+
72005+ if (unlikely(!(gr_status & GR_READY)))
72006+ return 1;
72007+
72008+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
72009+ return 1;
72010+
72011+ /* ignore Eric Biederman */
72012+ if (IS_PRIVATE(dentry->d_inode))
72013+ return 1;
72014+
72015+ subj = task->acl;
72016+ read_lock(&gr_inode_lock);
72017+ do {
72018+ obj = lookup_acl_obj_label(ino, dev, subj);
72019+ if (obj != NULL) {
72020+ read_unlock(&gr_inode_lock);
72021+ return (obj->mode & GR_FIND) ? 1 : 0;
72022+ }
72023+ } while ((subj = subj->parent_subject));
72024+ read_unlock(&gr_inode_lock);
72025+
72026+ /* this is purely an optimization since we're looking for an object
72027+ for the directory we're doing a readdir on
72028+ if it's possible for any globbed object to match the entry we're
72029+ filling into the directory, then the object we find here will be
72030+ an anchor point with attached globbed objects
72031+ */
72032+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
72033+ if (obj->globbed == NULL)
72034+ return (obj->mode & GR_FIND) ? 1 : 0;
72035+
72036+ is_not_root = ((obj->filename[0] == '/') &&
72037+ (obj->filename[1] == '\0')) ? 0 : 1;
72038+ bufsize = PAGE_SIZE - namelen - is_not_root;
72039+
72040+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
72041+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
72042+ return 1;
72043+
72044+ preempt_disable();
72045+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
72046+ bufsize);
72047+
72048+ bufsize = strlen(path);
72049+
72050+ /* if base is "/", don't append an additional slash */
72051+ if (is_not_root)
72052+ *(path + bufsize) = '/';
72053+ memcpy(path + bufsize + is_not_root, name, namelen);
72054+ *(path + bufsize + namelen + is_not_root) = '\0';
72055+
72056+ tmp = obj->globbed;
72057+ while (tmp) {
72058+ if (!glob_match(tmp->filename, path)) {
72059+ preempt_enable();
72060+ return (tmp->mode & GR_FIND) ? 1 : 0;
72061+ }
72062+ tmp = tmp->next;
72063+ }
72064+ preempt_enable();
72065+ return (obj->mode & GR_FIND) ? 1 : 0;
72066+}
72067+
72068+void gr_put_exec_file(struct task_struct *task)
72069+{
72070+ struct file *filp;
72071+
72072+ write_lock(&grsec_exec_file_lock);
72073+ filp = task->exec_file;
72074+ task->exec_file = NULL;
72075+ write_unlock(&grsec_exec_file_lock);
72076+
72077+ if (filp)
72078+ fput(filp);
72079+
72080+ return;
72081+}
72082+
72083+
72084+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
72085+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
72086+#endif
72087+#ifdef CONFIG_SECURITY
72088+EXPORT_SYMBOL_GPL(gr_check_user_change);
72089+EXPORT_SYMBOL_GPL(gr_check_group_change);
72090+#endif
72091+
72092diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
72093new file mode 100644
72094index 0000000..18ffbbd
72095--- /dev/null
72096+++ b/grsecurity/gracl_alloc.c
72097@@ -0,0 +1,105 @@
72098+#include <linux/kernel.h>
72099+#include <linux/mm.h>
72100+#include <linux/slab.h>
72101+#include <linux/vmalloc.h>
72102+#include <linux/gracl.h>
72103+#include <linux/grsecurity.h>
72104+
72105+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
72106+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
72107+
72108+static __inline__ int
72109+alloc_pop(void)
72110+{
72111+ if (current_alloc_state->alloc_stack_next == 1)
72112+ return 0;
72113+
72114+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
72115+
72116+ current_alloc_state->alloc_stack_next--;
72117+
72118+ return 1;
72119+}
72120+
72121+static __inline__ int
72122+alloc_push(void *buf)
72123+{
72124+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
72125+ return 1;
72126+
72127+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
72128+
72129+ current_alloc_state->alloc_stack_next++;
72130+
72131+ return 0;
72132+}
72133+
72134+void *
72135+acl_alloc(unsigned long len)
72136+{
72137+ void *ret = NULL;
72138+
72139+ if (!len || len > PAGE_SIZE)
72140+ goto out;
72141+
72142+ ret = kmalloc(len, GFP_KERNEL);
72143+
72144+ if (ret) {
72145+ if (alloc_push(ret)) {
72146+ kfree(ret);
72147+ ret = NULL;
72148+ }
72149+ }
72150+
72151+out:
72152+ return ret;
72153+}
72154+
72155+void *
72156+acl_alloc_num(unsigned long num, unsigned long len)
72157+{
72158+ if (!len || (num > (PAGE_SIZE / len)))
72159+ return NULL;
72160+
72161+ return acl_alloc(num * len);
72162+}
72163+
72164+void
72165+acl_free_all(void)
72166+{
72167+ if (!current_alloc_state->alloc_stack)
72168+ return;
72169+
72170+ while (alloc_pop()) ;
72171+
72172+ if (current_alloc_state->alloc_stack) {
72173+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
72174+ kfree(current_alloc_state->alloc_stack);
72175+ else
72176+ vfree(current_alloc_state->alloc_stack);
72177+ }
72178+
72179+ current_alloc_state->alloc_stack = NULL;
72180+ current_alloc_state->alloc_stack_size = 1;
72181+ current_alloc_state->alloc_stack_next = 1;
72182+
72183+ return;
72184+}
72185+
72186+int
72187+acl_alloc_stack_init(unsigned long size)
72188+{
72189+ if ((size * sizeof (void *)) <= PAGE_SIZE)
72190+ current_alloc_state->alloc_stack =
72191+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
72192+ else
72193+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
72194+
72195+ current_alloc_state->alloc_stack_size = size;
72196+ current_alloc_state->alloc_stack_next = 1;
72197+
72198+ if (!current_alloc_state->alloc_stack)
72199+ return 0;
72200+ else
72201+ return 1;
72202+}
72203diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
72204new file mode 100644
72205index 0000000..1a94c11
72206--- /dev/null
72207+++ b/grsecurity/gracl_cap.c
72208@@ -0,0 +1,127 @@
72209+#include <linux/kernel.h>
72210+#include <linux/module.h>
72211+#include <linux/sched.h>
72212+#include <linux/gracl.h>
72213+#include <linux/grsecurity.h>
72214+#include <linux/grinternal.h>
72215+
72216+extern const char *captab_log[];
72217+extern int captab_log_entries;
72218+
72219+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
72220+{
72221+ struct acl_subject_label *curracl;
72222+
72223+ if (!gr_acl_is_enabled())
72224+ return 1;
72225+
72226+ curracl = task->acl;
72227+
72228+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
72229+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72230+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
72231+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
72232+ gr_to_filename(task->exec_file->f_path.dentry,
72233+ task->exec_file->f_path.mnt) : curracl->filename,
72234+ curracl->filename, 0UL,
72235+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
72236+ return 1;
72237+ }
72238+
72239+ return 0;
72240+}
72241+
72242+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
72243+{
72244+ struct acl_subject_label *curracl;
72245+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72246+ kernel_cap_t cap_audit = __cap_empty_set;
72247+
72248+ if (!gr_acl_is_enabled())
72249+ return 1;
72250+
72251+ curracl = task->acl;
72252+
72253+ cap_drop = curracl->cap_lower;
72254+ cap_mask = curracl->cap_mask;
72255+ cap_audit = curracl->cap_invert_audit;
72256+
72257+ while ((curracl = curracl->parent_subject)) {
72258+ /* if the cap isn't specified in the current computed mask but is specified in the
72259+ current level subject, and is lowered in the current level subject, then add
72260+ it to the set of dropped capabilities
72261+ otherwise, add the current level subject's mask to the current computed mask
72262+ */
72263+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72264+ cap_raise(cap_mask, cap);
72265+ if (cap_raised(curracl->cap_lower, cap))
72266+ cap_raise(cap_drop, cap);
72267+ if (cap_raised(curracl->cap_invert_audit, cap))
72268+ cap_raise(cap_audit, cap);
72269+ }
72270+ }
72271+
72272+ if (!cap_raised(cap_drop, cap)) {
72273+ if (cap_raised(cap_audit, cap))
72274+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
72275+ return 1;
72276+ }
72277+
72278+ /* only learn the capability use if the process has the capability in the
72279+ general case, the two uses in sys.c of gr_learn_cap are an exception
72280+ to this rule to ensure any role transition involves what the full-learned
72281+ policy believes in a privileged process
72282+ */
72283+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
72284+ return 1;
72285+
72286+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
72287+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
72288+
72289+ return 0;
72290+}
72291+
72292+int
72293+gr_acl_is_capable(const int cap)
72294+{
72295+ return gr_task_acl_is_capable(current, current_cred(), cap);
72296+}
72297+
72298+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
72299+{
72300+ struct acl_subject_label *curracl;
72301+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72302+
72303+ if (!gr_acl_is_enabled())
72304+ return 1;
72305+
72306+ curracl = task->acl;
72307+
72308+ cap_drop = curracl->cap_lower;
72309+ cap_mask = curracl->cap_mask;
72310+
72311+ while ((curracl = curracl->parent_subject)) {
72312+ /* if the cap isn't specified in the current computed mask but is specified in the
72313+ current level subject, and is lowered in the current level subject, then add
72314+ it to the set of dropped capabilities
72315+ otherwise, add the current level subject's mask to the current computed mask
72316+ */
72317+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72318+ cap_raise(cap_mask, cap);
72319+ if (cap_raised(curracl->cap_lower, cap))
72320+ cap_raise(cap_drop, cap);
72321+ }
72322+ }
72323+
72324+ if (!cap_raised(cap_drop, cap))
72325+ return 1;
72326+
72327+ return 0;
72328+}
72329+
72330+int
72331+gr_acl_is_capable_nolog(const int cap)
72332+{
72333+ return gr_task_acl_is_capable_nolog(current, cap);
72334+}
72335+
72336diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
72337new file mode 100644
72338index 0000000..ca25605
72339--- /dev/null
72340+++ b/grsecurity/gracl_compat.c
72341@@ -0,0 +1,270 @@
72342+#include <linux/kernel.h>
72343+#include <linux/gracl.h>
72344+#include <linux/compat.h>
72345+#include <linux/gracl_compat.h>
72346+
72347+#include <asm/uaccess.h>
72348+
72349+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
72350+{
72351+ struct gr_arg_wrapper_compat uwrapcompat;
72352+
72353+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
72354+ return -EFAULT;
72355+
72356+ if (((uwrapcompat.version != GRSECURITY_VERSION) &&
72357+ (uwrapcompat.version != 0x2901)) ||
72358+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
72359+ return -EINVAL;
72360+
72361+ uwrap->arg = compat_ptr(uwrapcompat.arg);
72362+ uwrap->version = uwrapcompat.version;
72363+ uwrap->size = sizeof(struct gr_arg);
72364+
72365+ return 0;
72366+}
72367+
72368+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
72369+{
72370+ struct gr_arg_compat argcompat;
72371+
72372+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
72373+ return -EFAULT;
72374+
72375+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
72376+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
72377+ arg->role_db.num_roles = argcompat.role_db.num_roles;
72378+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
72379+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
72380+ arg->role_db.num_objects = argcompat.role_db.num_objects;
72381+
72382+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
72383+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
72384+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
72385+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
72386+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
72387+ arg->segv_device = argcompat.segv_device;
72388+ arg->segv_inode = argcompat.segv_inode;
72389+ arg->segv_uid = argcompat.segv_uid;
72390+ arg->num_sprole_pws = argcompat.num_sprole_pws;
72391+ arg->mode = argcompat.mode;
72392+
72393+ return 0;
72394+}
72395+
72396+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
72397+{
72398+ struct acl_object_label_compat objcompat;
72399+
72400+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
72401+ return -EFAULT;
72402+
72403+ obj->filename = compat_ptr(objcompat.filename);
72404+ obj->inode = objcompat.inode;
72405+ obj->device = objcompat.device;
72406+ obj->mode = objcompat.mode;
72407+
72408+ obj->nested = compat_ptr(objcompat.nested);
72409+ obj->globbed = compat_ptr(objcompat.globbed);
72410+
72411+ obj->prev = compat_ptr(objcompat.prev);
72412+ obj->next = compat_ptr(objcompat.next);
72413+
72414+ return 0;
72415+}
72416+
72417+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
72418+{
72419+ unsigned int i;
72420+ struct acl_subject_label_compat subjcompat;
72421+
72422+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
72423+ return -EFAULT;
72424+
72425+ subj->filename = compat_ptr(subjcompat.filename);
72426+ subj->inode = subjcompat.inode;
72427+ subj->device = subjcompat.device;
72428+ subj->mode = subjcompat.mode;
72429+ subj->cap_mask = subjcompat.cap_mask;
72430+ subj->cap_lower = subjcompat.cap_lower;
72431+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
72432+
72433+ for (i = 0; i < GR_NLIMITS; i++) {
72434+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
72435+ subj->res[i].rlim_cur = RLIM_INFINITY;
72436+ else
72437+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
72438+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
72439+ subj->res[i].rlim_max = RLIM_INFINITY;
72440+ else
72441+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
72442+ }
72443+ subj->resmask = subjcompat.resmask;
72444+
72445+ subj->user_trans_type = subjcompat.user_trans_type;
72446+ subj->group_trans_type = subjcompat.group_trans_type;
72447+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
72448+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
72449+ subj->user_trans_num = subjcompat.user_trans_num;
72450+ subj->group_trans_num = subjcompat.group_trans_num;
72451+
72452+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
72453+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
72454+ subj->ip_type = subjcompat.ip_type;
72455+ subj->ips = compat_ptr(subjcompat.ips);
72456+ subj->ip_num = subjcompat.ip_num;
72457+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
72458+
72459+ subj->crashes = subjcompat.crashes;
72460+ subj->expires = subjcompat.expires;
72461+
72462+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
72463+ subj->hash = compat_ptr(subjcompat.hash);
72464+ subj->prev = compat_ptr(subjcompat.prev);
72465+ subj->next = compat_ptr(subjcompat.next);
72466+
72467+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
72468+ subj->obj_hash_size = subjcompat.obj_hash_size;
72469+ subj->pax_flags = subjcompat.pax_flags;
72470+
72471+ return 0;
72472+}
72473+
72474+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
72475+{
72476+ struct acl_role_label_compat rolecompat;
72477+
72478+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
72479+ return -EFAULT;
72480+
72481+ role->rolename = compat_ptr(rolecompat.rolename);
72482+ role->uidgid = rolecompat.uidgid;
72483+ role->roletype = rolecompat.roletype;
72484+
72485+ role->auth_attempts = rolecompat.auth_attempts;
72486+ role->expires = rolecompat.expires;
72487+
72488+ role->root_label = compat_ptr(rolecompat.root_label);
72489+ role->hash = compat_ptr(rolecompat.hash);
72490+
72491+ role->prev = compat_ptr(rolecompat.prev);
72492+ role->next = compat_ptr(rolecompat.next);
72493+
72494+ role->transitions = compat_ptr(rolecompat.transitions);
72495+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
72496+ role->domain_children = compat_ptr(rolecompat.domain_children);
72497+ role->domain_child_num = rolecompat.domain_child_num;
72498+
72499+ role->umask = rolecompat.umask;
72500+
72501+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
72502+ role->subj_hash_size = rolecompat.subj_hash_size;
72503+
72504+ return 0;
72505+}
72506+
72507+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
72508+{
72509+ struct role_allowed_ip_compat roleip_compat;
72510+
72511+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
72512+ return -EFAULT;
72513+
72514+ roleip->addr = roleip_compat.addr;
72515+ roleip->netmask = roleip_compat.netmask;
72516+
72517+ roleip->prev = compat_ptr(roleip_compat.prev);
72518+ roleip->next = compat_ptr(roleip_compat.next);
72519+
72520+ return 0;
72521+}
72522+
72523+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
72524+{
72525+ struct role_transition_compat trans_compat;
72526+
72527+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
72528+ return -EFAULT;
72529+
72530+ trans->rolename = compat_ptr(trans_compat.rolename);
72531+
72532+ trans->prev = compat_ptr(trans_compat.prev);
72533+ trans->next = compat_ptr(trans_compat.next);
72534+
72535+ return 0;
72536+
72537+}
72538+
72539+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
72540+{
72541+ struct gr_hash_struct_compat hash_compat;
72542+
72543+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
72544+ return -EFAULT;
72545+
72546+ hash->table = compat_ptr(hash_compat.table);
72547+ hash->nametable = compat_ptr(hash_compat.nametable);
72548+ hash->first = compat_ptr(hash_compat.first);
72549+
72550+ hash->table_size = hash_compat.table_size;
72551+ hash->used_size = hash_compat.used_size;
72552+
72553+ hash->type = hash_compat.type;
72554+
72555+ return 0;
72556+}
72557+
72558+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
72559+{
72560+ compat_uptr_t ptrcompat;
72561+
72562+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
72563+ return -EFAULT;
72564+
72565+ *(void **)ptr = compat_ptr(ptrcompat);
72566+
72567+ return 0;
72568+}
72569+
72570+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
72571+{
72572+ struct acl_ip_label_compat ip_compat;
72573+
72574+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
72575+ return -EFAULT;
72576+
72577+ ip->iface = compat_ptr(ip_compat.iface);
72578+ ip->addr = ip_compat.addr;
72579+ ip->netmask = ip_compat.netmask;
72580+ ip->low = ip_compat.low;
72581+ ip->high = ip_compat.high;
72582+ ip->mode = ip_compat.mode;
72583+ ip->type = ip_compat.type;
72584+
72585+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
72586+
72587+ ip->prev = compat_ptr(ip_compat.prev);
72588+ ip->next = compat_ptr(ip_compat.next);
72589+
72590+ return 0;
72591+}
72592+
72593+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
72594+{
72595+ struct sprole_pw_compat pw_compat;
72596+
72597+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
72598+ return -EFAULT;
72599+
72600+ pw->rolename = compat_ptr(pw_compat.rolename);
72601+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
72602+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
72603+
72604+ return 0;
72605+}
72606+
72607+size_t get_gr_arg_wrapper_size_compat(void)
72608+{
72609+ return sizeof(struct gr_arg_wrapper_compat);
72610+}
72611+
72612diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
72613new file mode 100644
72614index 0000000..8ee8e4f
72615--- /dev/null
72616+++ b/grsecurity/gracl_fs.c
72617@@ -0,0 +1,447 @@
72618+#include <linux/kernel.h>
72619+#include <linux/sched.h>
72620+#include <linux/types.h>
72621+#include <linux/fs.h>
72622+#include <linux/file.h>
72623+#include <linux/stat.h>
72624+#include <linux/grsecurity.h>
72625+#include <linux/grinternal.h>
72626+#include <linux/gracl.h>
72627+
72628+umode_t
72629+gr_acl_umask(void)
72630+{
72631+ if (unlikely(!gr_acl_is_enabled()))
72632+ return 0;
72633+
72634+ return current->role->umask;
72635+}
72636+
72637+__u32
72638+gr_acl_handle_hidden_file(const struct dentry * dentry,
72639+ const struct vfsmount * mnt)
72640+{
72641+ __u32 mode;
72642+
72643+ if (unlikely(d_is_negative(dentry)))
72644+ return GR_FIND;
72645+
72646+ mode =
72647+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
72648+
72649+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
72650+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72651+ return mode;
72652+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
72653+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72654+ return 0;
72655+ } else if (unlikely(!(mode & GR_FIND)))
72656+ return 0;
72657+
72658+ return GR_FIND;
72659+}
72660+
72661+__u32
72662+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
72663+ int acc_mode)
72664+{
72665+ __u32 reqmode = GR_FIND;
72666+ __u32 mode;
72667+
72668+ if (unlikely(d_is_negative(dentry)))
72669+ return reqmode;
72670+
72671+ if (acc_mode & MAY_APPEND)
72672+ reqmode |= GR_APPEND;
72673+ else if (acc_mode & MAY_WRITE)
72674+ reqmode |= GR_WRITE;
72675+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
72676+ reqmode |= GR_READ;
72677+
72678+ mode =
72679+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72680+ mnt);
72681+
72682+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72683+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72684+ reqmode & GR_READ ? " reading" : "",
72685+ reqmode & GR_WRITE ? " writing" : reqmode &
72686+ GR_APPEND ? " appending" : "");
72687+ return reqmode;
72688+ } else
72689+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72690+ {
72691+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72692+ reqmode & GR_READ ? " reading" : "",
72693+ reqmode & GR_WRITE ? " writing" : reqmode &
72694+ GR_APPEND ? " appending" : "");
72695+ return 0;
72696+ } else if (unlikely((mode & reqmode) != reqmode))
72697+ return 0;
72698+
72699+ return reqmode;
72700+}
72701+
72702+__u32
72703+gr_acl_handle_creat(const struct dentry * dentry,
72704+ const struct dentry * p_dentry,
72705+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
72706+ const int imode)
72707+{
72708+ __u32 reqmode = GR_WRITE | GR_CREATE;
72709+ __u32 mode;
72710+
72711+ if (acc_mode & MAY_APPEND)
72712+ reqmode |= GR_APPEND;
72713+ // if a directory was required or the directory already exists, then
72714+ // don't count this open as a read
72715+ if ((acc_mode & MAY_READ) &&
72716+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
72717+ reqmode |= GR_READ;
72718+ if ((open_flags & O_CREAT) &&
72719+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72720+ reqmode |= GR_SETID;
72721+
72722+ mode =
72723+ gr_check_create(dentry, p_dentry, p_mnt,
72724+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72725+
72726+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72727+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72728+ reqmode & GR_READ ? " reading" : "",
72729+ reqmode & GR_WRITE ? " writing" : reqmode &
72730+ GR_APPEND ? " appending" : "");
72731+ return reqmode;
72732+ } else
72733+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72734+ {
72735+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72736+ reqmode & GR_READ ? " reading" : "",
72737+ reqmode & GR_WRITE ? " writing" : reqmode &
72738+ GR_APPEND ? " appending" : "");
72739+ return 0;
72740+ } else if (unlikely((mode & reqmode) != reqmode))
72741+ return 0;
72742+
72743+ return reqmode;
72744+}
72745+
72746+__u32
72747+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
72748+ const int fmode)
72749+{
72750+ __u32 mode, reqmode = GR_FIND;
72751+
72752+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
72753+ reqmode |= GR_EXEC;
72754+ if (fmode & S_IWOTH)
72755+ reqmode |= GR_WRITE;
72756+ if (fmode & S_IROTH)
72757+ reqmode |= GR_READ;
72758+
72759+ mode =
72760+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72761+ mnt);
72762+
72763+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72764+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72765+ reqmode & GR_READ ? " reading" : "",
72766+ reqmode & GR_WRITE ? " writing" : "",
72767+ reqmode & GR_EXEC ? " executing" : "");
72768+ return reqmode;
72769+ } else
72770+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72771+ {
72772+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72773+ reqmode & GR_READ ? " reading" : "",
72774+ reqmode & GR_WRITE ? " writing" : "",
72775+ reqmode & GR_EXEC ? " executing" : "");
72776+ return 0;
72777+ } else if (unlikely((mode & reqmode) != reqmode))
72778+ return 0;
72779+
72780+ return reqmode;
72781+}
72782+
72783+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
72784+{
72785+ __u32 mode;
72786+
72787+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
72788+
72789+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72790+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
72791+ return mode;
72792+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72793+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
72794+ return 0;
72795+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
72796+ return 0;
72797+
72798+ return (reqmode);
72799+}
72800+
72801+__u32
72802+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
72803+{
72804+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
72805+}
72806+
72807+__u32
72808+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
72809+{
72810+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
72811+}
72812+
72813+__u32
72814+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
72815+{
72816+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
72817+}
72818+
72819+__u32
72820+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
72821+{
72822+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
72823+}
72824+
72825+__u32
72826+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
72827+ umode_t *modeptr)
72828+{
72829+ umode_t mode;
72830+
72831+ *modeptr &= ~gr_acl_umask();
72832+ mode = *modeptr;
72833+
72834+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
72835+ return 1;
72836+
72837+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
72838+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
72839+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
72840+ GR_CHMOD_ACL_MSG);
72841+ } else {
72842+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
72843+ }
72844+}
72845+
72846+__u32
72847+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
72848+{
72849+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
72850+}
72851+
72852+__u32
72853+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
72854+{
72855+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
72856+}
72857+
72858+__u32
72859+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
72860+{
72861+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
72862+}
72863+
72864+__u32
72865+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
72866+{
72867+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
72868+}
72869+
72870+__u32
72871+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
72872+{
72873+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
72874+ GR_UNIXCONNECT_ACL_MSG);
72875+}
72876+
72877+/* hardlinks require at minimum create and link permission,
72878+ any additional privilege required is based on the
72879+ privilege of the file being linked to
72880+*/
72881+__u32
72882+gr_acl_handle_link(const struct dentry * new_dentry,
72883+ const struct dentry * parent_dentry,
72884+ const struct vfsmount * parent_mnt,
72885+ const struct dentry * old_dentry,
72886+ const struct vfsmount * old_mnt, const struct filename *to)
72887+{
72888+ __u32 mode;
72889+ __u32 needmode = GR_CREATE | GR_LINK;
72890+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
72891+
72892+ mode =
72893+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
72894+ old_mnt);
72895+
72896+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
72897+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72898+ return mode;
72899+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72900+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72901+ return 0;
72902+ } else if (unlikely((mode & needmode) != needmode))
72903+ return 0;
72904+
72905+ return 1;
72906+}
72907+
72908+__u32
72909+gr_acl_handle_symlink(const struct dentry * new_dentry,
72910+ const struct dentry * parent_dentry,
72911+ const struct vfsmount * parent_mnt, const struct filename *from)
72912+{
72913+ __u32 needmode = GR_WRITE | GR_CREATE;
72914+ __u32 mode;
72915+
72916+ mode =
72917+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
72918+ GR_CREATE | GR_AUDIT_CREATE |
72919+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
72920+
72921+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
72922+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72923+ return mode;
72924+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72925+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72926+ return 0;
72927+ } else if (unlikely((mode & needmode) != needmode))
72928+ return 0;
72929+
72930+ return (GR_WRITE | GR_CREATE);
72931+}
72932+
72933+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)
72934+{
72935+ __u32 mode;
72936+
72937+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72938+
72939+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72940+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
72941+ return mode;
72942+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72943+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
72944+ return 0;
72945+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
72946+ return 0;
72947+
72948+ return (reqmode);
72949+}
72950+
72951+__u32
72952+gr_acl_handle_mknod(const struct dentry * new_dentry,
72953+ const struct dentry * parent_dentry,
72954+ const struct vfsmount * parent_mnt,
72955+ const int mode)
72956+{
72957+ __u32 reqmode = GR_WRITE | GR_CREATE;
72958+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72959+ reqmode |= GR_SETID;
72960+
72961+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72962+ reqmode, GR_MKNOD_ACL_MSG);
72963+}
72964+
72965+__u32
72966+gr_acl_handle_mkdir(const struct dentry *new_dentry,
72967+ const struct dentry *parent_dentry,
72968+ const struct vfsmount *parent_mnt)
72969+{
72970+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72971+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
72972+}
72973+
72974+#define RENAME_CHECK_SUCCESS(old, new) \
72975+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
72976+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
72977+
72978+int
72979+gr_acl_handle_rename(struct dentry *new_dentry,
72980+ struct dentry *parent_dentry,
72981+ const struct vfsmount *parent_mnt,
72982+ struct dentry *old_dentry,
72983+ struct inode *old_parent_inode,
72984+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
72985+{
72986+ __u32 comp1, comp2;
72987+ int error = 0;
72988+
72989+ if (unlikely(!gr_acl_is_enabled()))
72990+ return 0;
72991+
72992+ if (flags & RENAME_EXCHANGE) {
72993+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72994+ GR_AUDIT_READ | GR_AUDIT_WRITE |
72995+ GR_SUPPRESS, parent_mnt);
72996+ comp2 =
72997+ gr_search_file(old_dentry,
72998+ GR_READ | GR_WRITE | GR_AUDIT_READ |
72999+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
73000+ } else if (d_is_negative(new_dentry)) {
73001+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
73002+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
73003+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
73004+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
73005+ GR_DELETE | GR_AUDIT_DELETE |
73006+ GR_AUDIT_READ | GR_AUDIT_WRITE |
73007+ GR_SUPPRESS, old_mnt);
73008+ } else {
73009+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
73010+ GR_CREATE | GR_DELETE |
73011+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
73012+ GR_AUDIT_READ | GR_AUDIT_WRITE |
73013+ GR_SUPPRESS, parent_mnt);
73014+ comp2 =
73015+ gr_search_file(old_dentry,
73016+ GR_READ | GR_WRITE | GR_AUDIT_READ |
73017+ GR_DELETE | GR_AUDIT_DELETE |
73018+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
73019+ }
73020+
73021+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
73022+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
73023+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
73024+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
73025+ && !(comp2 & GR_SUPPRESS)) {
73026+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
73027+ error = -EACCES;
73028+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
73029+ error = -EACCES;
73030+
73031+ return error;
73032+}
73033+
73034+void
73035+gr_acl_handle_exit(void)
73036+{
73037+ u16 id;
73038+ char *rolename;
73039+
73040+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
73041+ !(current->role->roletype & GR_ROLE_PERSIST))) {
73042+ id = current->acl_role_id;
73043+ rolename = current->role->rolename;
73044+ gr_set_acls(1);
73045+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
73046+ }
73047+
73048+ gr_put_exec_file(current);
73049+ return;
73050+}
73051+
73052+int
73053+gr_acl_handle_procpidmem(const struct task_struct *task)
73054+{
73055+ if (unlikely(!gr_acl_is_enabled()))
73056+ return 0;
73057+
73058+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
73059+ !(current->acl->mode & GR_POVERRIDE) &&
73060+ !(current->role->roletype & GR_ROLE_GOD))
73061+ return -EACCES;
73062+
73063+ return 0;
73064+}
73065diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
73066new file mode 100644
73067index 0000000..f056b81
73068--- /dev/null
73069+++ b/grsecurity/gracl_ip.c
73070@@ -0,0 +1,386 @@
73071+#include <linux/kernel.h>
73072+#include <asm/uaccess.h>
73073+#include <asm/errno.h>
73074+#include <net/sock.h>
73075+#include <linux/file.h>
73076+#include <linux/fs.h>
73077+#include <linux/net.h>
73078+#include <linux/in.h>
73079+#include <linux/skbuff.h>
73080+#include <linux/ip.h>
73081+#include <linux/udp.h>
73082+#include <linux/types.h>
73083+#include <linux/sched.h>
73084+#include <linux/netdevice.h>
73085+#include <linux/inetdevice.h>
73086+#include <linux/gracl.h>
73087+#include <linux/grsecurity.h>
73088+#include <linux/grinternal.h>
73089+
73090+#define GR_BIND 0x01
73091+#define GR_CONNECT 0x02
73092+#define GR_INVERT 0x04
73093+#define GR_BINDOVERRIDE 0x08
73094+#define GR_CONNECTOVERRIDE 0x10
73095+#define GR_SOCK_FAMILY 0x20
73096+
73097+static const char * gr_protocols[IPPROTO_MAX] = {
73098+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
73099+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
73100+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
73101+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
73102+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
73103+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
73104+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
73105+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
73106+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
73107+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
73108+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
73109+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
73110+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
73111+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
73112+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
73113+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
73114+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
73115+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
73116+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
73117+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
73118+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
73119+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
73120+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
73121+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
73122+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
73123+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
73124+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
73125+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
73126+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
73127+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
73128+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
73129+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
73130+ };
73131+
73132+static const char * gr_socktypes[SOCK_MAX] = {
73133+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
73134+ "unknown:7", "unknown:8", "unknown:9", "packet"
73135+ };
73136+
73137+static const char * gr_sockfamilies[AF_MAX+1] = {
73138+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
73139+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
73140+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
73141+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
73142+ };
73143+
73144+const char *
73145+gr_proto_to_name(unsigned char proto)
73146+{
73147+ return gr_protocols[proto];
73148+}
73149+
73150+const char *
73151+gr_socktype_to_name(unsigned char type)
73152+{
73153+ return gr_socktypes[type];
73154+}
73155+
73156+const char *
73157+gr_sockfamily_to_name(unsigned char family)
73158+{
73159+ return gr_sockfamilies[family];
73160+}
73161+
73162+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
73163+
73164+int
73165+gr_search_socket(const int domain, const int type, const int protocol)
73166+{
73167+ struct acl_subject_label *curr;
73168+ const struct cred *cred = current_cred();
73169+
73170+ if (unlikely(!gr_acl_is_enabled()))
73171+ goto exit;
73172+
73173+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
73174+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
73175+ goto exit; // let the kernel handle it
73176+
73177+ curr = current->acl;
73178+
73179+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
73180+ /* the family is allowed, if this is PF_INET allow it only if
73181+ the extra sock type/protocol checks pass */
73182+ if (domain == PF_INET)
73183+ goto inet_check;
73184+ goto exit;
73185+ } else {
73186+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73187+ __u32 fakeip = 0;
73188+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73189+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73190+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73191+ gr_to_filename(current->exec_file->f_path.dentry,
73192+ current->exec_file->f_path.mnt) :
73193+ curr->filename, curr->filename,
73194+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
73195+ &current->signal->saved_ip);
73196+ goto exit;
73197+ }
73198+ goto exit_fail;
73199+ }
73200+
73201+inet_check:
73202+ /* the rest of this checking is for IPv4 only */
73203+ if (!curr->ips)
73204+ goto exit;
73205+
73206+ if ((curr->ip_type & (1U << type)) &&
73207+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
73208+ goto exit;
73209+
73210+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73211+ /* we don't place acls on raw sockets , and sometimes
73212+ dgram/ip sockets are opened for ioctl and not
73213+ bind/connect, so we'll fake a bind learn log */
73214+ if (type == SOCK_RAW || type == SOCK_PACKET) {
73215+ __u32 fakeip = 0;
73216+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73217+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73218+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73219+ gr_to_filename(current->exec_file->f_path.dentry,
73220+ current->exec_file->f_path.mnt) :
73221+ curr->filename, curr->filename,
73222+ &fakeip, 0, type,
73223+ protocol, GR_CONNECT, &current->signal->saved_ip);
73224+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
73225+ __u32 fakeip = 0;
73226+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73227+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73228+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73229+ gr_to_filename(current->exec_file->f_path.dentry,
73230+ current->exec_file->f_path.mnt) :
73231+ curr->filename, curr->filename,
73232+ &fakeip, 0, type,
73233+ protocol, GR_BIND, &current->signal->saved_ip);
73234+ }
73235+ /* we'll log when they use connect or bind */
73236+ goto exit;
73237+ }
73238+
73239+exit_fail:
73240+ if (domain == PF_INET)
73241+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
73242+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
73243+ else if (rcu_access_pointer(net_families[domain]) != NULL)
73244+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
73245+ gr_socktype_to_name(type), protocol);
73246+
73247+ return 0;
73248+exit:
73249+ return 1;
73250+}
73251+
73252+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)
73253+{
73254+ if ((ip->mode & mode) &&
73255+ (ip_port >= ip->low) &&
73256+ (ip_port <= ip->high) &&
73257+ ((ntohl(ip_addr) & our_netmask) ==
73258+ (ntohl(our_addr) & our_netmask))
73259+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
73260+ && (ip->type & (1U << type))) {
73261+ if (ip->mode & GR_INVERT)
73262+ return 2; // specifically denied
73263+ else
73264+ return 1; // allowed
73265+ }
73266+
73267+ return 0; // not specifically allowed, may continue parsing
73268+}
73269+
73270+static int
73271+gr_search_connectbind(const int full_mode, struct sock *sk,
73272+ struct sockaddr_in *addr, const int type)
73273+{
73274+ char iface[IFNAMSIZ] = {0};
73275+ struct acl_subject_label *curr;
73276+ struct acl_ip_label *ip;
73277+ struct inet_sock *isk;
73278+ struct net_device *dev;
73279+ struct in_device *idev;
73280+ unsigned long i;
73281+ int ret;
73282+ int mode = full_mode & (GR_BIND | GR_CONNECT);
73283+ __u32 ip_addr = 0;
73284+ __u32 our_addr;
73285+ __u32 our_netmask;
73286+ char *p;
73287+ __u16 ip_port = 0;
73288+ const struct cred *cred = current_cred();
73289+
73290+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
73291+ return 0;
73292+
73293+ curr = current->acl;
73294+ isk = inet_sk(sk);
73295+
73296+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
73297+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
73298+ addr->sin_addr.s_addr = curr->inaddr_any_override;
73299+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
73300+ struct sockaddr_in saddr;
73301+ int err;
73302+
73303+ saddr.sin_family = AF_INET;
73304+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
73305+ saddr.sin_port = isk->inet_sport;
73306+
73307+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73308+ if (err)
73309+ return err;
73310+
73311+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73312+ if (err)
73313+ return err;
73314+ }
73315+
73316+ if (!curr->ips)
73317+ return 0;
73318+
73319+ ip_addr = addr->sin_addr.s_addr;
73320+ ip_port = ntohs(addr->sin_port);
73321+
73322+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73323+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73324+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73325+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73326+ gr_to_filename(current->exec_file->f_path.dentry,
73327+ current->exec_file->f_path.mnt) :
73328+ curr->filename, curr->filename,
73329+ &ip_addr, ip_port, type,
73330+ sk->sk_protocol, mode, &current->signal->saved_ip);
73331+ return 0;
73332+ }
73333+
73334+ for (i = 0; i < curr->ip_num; i++) {
73335+ ip = *(curr->ips + i);
73336+ if (ip->iface != NULL) {
73337+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
73338+ p = strchr(iface, ':');
73339+ if (p != NULL)
73340+ *p = '\0';
73341+ dev = dev_get_by_name(sock_net(sk), iface);
73342+ if (dev == NULL)
73343+ continue;
73344+ idev = in_dev_get(dev);
73345+ if (idev == NULL) {
73346+ dev_put(dev);
73347+ continue;
73348+ }
73349+ rcu_read_lock();
73350+ for_ifa(idev) {
73351+ if (!strcmp(ip->iface, ifa->ifa_label)) {
73352+ our_addr = ifa->ifa_address;
73353+ our_netmask = 0xffffffff;
73354+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73355+ if (ret == 1) {
73356+ rcu_read_unlock();
73357+ in_dev_put(idev);
73358+ dev_put(dev);
73359+ return 0;
73360+ } else if (ret == 2) {
73361+ rcu_read_unlock();
73362+ in_dev_put(idev);
73363+ dev_put(dev);
73364+ goto denied;
73365+ }
73366+ }
73367+ } endfor_ifa(idev);
73368+ rcu_read_unlock();
73369+ in_dev_put(idev);
73370+ dev_put(dev);
73371+ } else {
73372+ our_addr = ip->addr;
73373+ our_netmask = ip->netmask;
73374+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73375+ if (ret == 1)
73376+ return 0;
73377+ else if (ret == 2)
73378+ goto denied;
73379+ }
73380+ }
73381+
73382+denied:
73383+ if (mode == GR_BIND)
73384+ 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));
73385+ else if (mode == GR_CONNECT)
73386+ 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));
73387+
73388+ return -EACCES;
73389+}
73390+
73391+int
73392+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
73393+{
73394+ /* always allow disconnection of dgram sockets with connect */
73395+ if (addr->sin_family == AF_UNSPEC)
73396+ return 0;
73397+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
73398+}
73399+
73400+int
73401+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
73402+{
73403+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
73404+}
73405+
73406+int gr_search_listen(struct socket *sock)
73407+{
73408+ struct sock *sk = sock->sk;
73409+ struct sockaddr_in addr;
73410+
73411+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73412+ addr.sin_port = inet_sk(sk)->inet_sport;
73413+
73414+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73415+}
73416+
73417+int gr_search_accept(struct socket *sock)
73418+{
73419+ struct sock *sk = sock->sk;
73420+ struct sockaddr_in addr;
73421+
73422+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73423+ addr.sin_port = inet_sk(sk)->inet_sport;
73424+
73425+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73426+}
73427+
73428+int
73429+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
73430+{
73431+ if (addr)
73432+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
73433+ else {
73434+ struct sockaddr_in sin;
73435+ const struct inet_sock *inet = inet_sk(sk);
73436+
73437+ sin.sin_addr.s_addr = inet->inet_daddr;
73438+ sin.sin_port = inet->inet_dport;
73439+
73440+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73441+ }
73442+}
73443+
73444+int
73445+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
73446+{
73447+ struct sockaddr_in sin;
73448+
73449+ if (unlikely(skb->len < sizeof (struct udphdr)))
73450+ return 0; // skip this packet
73451+
73452+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
73453+ sin.sin_port = udp_hdr(skb)->source;
73454+
73455+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73456+}
73457diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
73458new file mode 100644
73459index 0000000..25f54ef
73460--- /dev/null
73461+++ b/grsecurity/gracl_learn.c
73462@@ -0,0 +1,207 @@
73463+#include <linux/kernel.h>
73464+#include <linux/mm.h>
73465+#include <linux/sched.h>
73466+#include <linux/poll.h>
73467+#include <linux/string.h>
73468+#include <linux/file.h>
73469+#include <linux/types.h>
73470+#include <linux/vmalloc.h>
73471+#include <linux/grinternal.h>
73472+
73473+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
73474+ size_t count, loff_t *ppos);
73475+extern int gr_acl_is_enabled(void);
73476+
73477+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
73478+static int gr_learn_attached;
73479+
73480+/* use a 512k buffer */
73481+#define LEARN_BUFFER_SIZE (512 * 1024)
73482+
73483+static DEFINE_SPINLOCK(gr_learn_lock);
73484+static DEFINE_MUTEX(gr_learn_user_mutex);
73485+
73486+/* we need to maintain two buffers, so that the kernel context of grlearn
73487+ uses a semaphore around the userspace copying, and the other kernel contexts
73488+ use a spinlock when copying into the buffer, since they cannot sleep
73489+*/
73490+static char *learn_buffer;
73491+static char *learn_buffer_user;
73492+static int learn_buffer_len;
73493+static int learn_buffer_user_len;
73494+
73495+static ssize_t
73496+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
73497+{
73498+ DECLARE_WAITQUEUE(wait, current);
73499+ ssize_t retval = 0;
73500+
73501+ add_wait_queue(&learn_wait, &wait);
73502+ set_current_state(TASK_INTERRUPTIBLE);
73503+ do {
73504+ mutex_lock(&gr_learn_user_mutex);
73505+ spin_lock(&gr_learn_lock);
73506+ if (learn_buffer_len)
73507+ break;
73508+ spin_unlock(&gr_learn_lock);
73509+ mutex_unlock(&gr_learn_user_mutex);
73510+ if (file->f_flags & O_NONBLOCK) {
73511+ retval = -EAGAIN;
73512+ goto out;
73513+ }
73514+ if (signal_pending(current)) {
73515+ retval = -ERESTARTSYS;
73516+ goto out;
73517+ }
73518+
73519+ schedule();
73520+ } while (1);
73521+
73522+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
73523+ learn_buffer_user_len = learn_buffer_len;
73524+ retval = learn_buffer_len;
73525+ learn_buffer_len = 0;
73526+
73527+ spin_unlock(&gr_learn_lock);
73528+
73529+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
73530+ retval = -EFAULT;
73531+
73532+ mutex_unlock(&gr_learn_user_mutex);
73533+out:
73534+ set_current_state(TASK_RUNNING);
73535+ remove_wait_queue(&learn_wait, &wait);
73536+ return retval;
73537+}
73538+
73539+static unsigned int
73540+poll_learn(struct file * file, poll_table * wait)
73541+{
73542+ poll_wait(file, &learn_wait, wait);
73543+
73544+ if (learn_buffer_len)
73545+ return (POLLIN | POLLRDNORM);
73546+
73547+ return 0;
73548+}
73549+
73550+void
73551+gr_clear_learn_entries(void)
73552+{
73553+ char *tmp;
73554+
73555+ mutex_lock(&gr_learn_user_mutex);
73556+ spin_lock(&gr_learn_lock);
73557+ tmp = learn_buffer;
73558+ learn_buffer = NULL;
73559+ spin_unlock(&gr_learn_lock);
73560+ if (tmp)
73561+ vfree(tmp);
73562+ if (learn_buffer_user != NULL) {
73563+ vfree(learn_buffer_user);
73564+ learn_buffer_user = NULL;
73565+ }
73566+ learn_buffer_len = 0;
73567+ mutex_unlock(&gr_learn_user_mutex);
73568+
73569+ return;
73570+}
73571+
73572+void
73573+gr_add_learn_entry(const char *fmt, ...)
73574+{
73575+ va_list args;
73576+ unsigned int len;
73577+
73578+ if (!gr_learn_attached)
73579+ return;
73580+
73581+ spin_lock(&gr_learn_lock);
73582+
73583+ /* leave a gap at the end so we know when it's "full" but don't have to
73584+ compute the exact length of the string we're trying to append
73585+ */
73586+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
73587+ spin_unlock(&gr_learn_lock);
73588+ wake_up_interruptible(&learn_wait);
73589+ return;
73590+ }
73591+ if (learn_buffer == NULL) {
73592+ spin_unlock(&gr_learn_lock);
73593+ return;
73594+ }
73595+
73596+ va_start(args, fmt);
73597+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
73598+ va_end(args);
73599+
73600+ learn_buffer_len += len + 1;
73601+
73602+ spin_unlock(&gr_learn_lock);
73603+ wake_up_interruptible(&learn_wait);
73604+
73605+ return;
73606+}
73607+
73608+static int
73609+open_learn(struct inode *inode, struct file *file)
73610+{
73611+ if (file->f_mode & FMODE_READ && gr_learn_attached)
73612+ return -EBUSY;
73613+ if (file->f_mode & FMODE_READ) {
73614+ int retval = 0;
73615+ mutex_lock(&gr_learn_user_mutex);
73616+ if (learn_buffer == NULL)
73617+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
73618+ if (learn_buffer_user == NULL)
73619+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
73620+ if (learn_buffer == NULL) {
73621+ retval = -ENOMEM;
73622+ goto out_error;
73623+ }
73624+ if (learn_buffer_user == NULL) {
73625+ retval = -ENOMEM;
73626+ goto out_error;
73627+ }
73628+ learn_buffer_len = 0;
73629+ learn_buffer_user_len = 0;
73630+ gr_learn_attached = 1;
73631+out_error:
73632+ mutex_unlock(&gr_learn_user_mutex);
73633+ return retval;
73634+ }
73635+ return 0;
73636+}
73637+
73638+static int
73639+close_learn(struct inode *inode, struct file *file)
73640+{
73641+ if (file->f_mode & FMODE_READ) {
73642+ char *tmp = NULL;
73643+ mutex_lock(&gr_learn_user_mutex);
73644+ spin_lock(&gr_learn_lock);
73645+ tmp = learn_buffer;
73646+ learn_buffer = NULL;
73647+ spin_unlock(&gr_learn_lock);
73648+ if (tmp)
73649+ vfree(tmp);
73650+ if (learn_buffer_user != NULL) {
73651+ vfree(learn_buffer_user);
73652+ learn_buffer_user = NULL;
73653+ }
73654+ learn_buffer_len = 0;
73655+ learn_buffer_user_len = 0;
73656+ gr_learn_attached = 0;
73657+ mutex_unlock(&gr_learn_user_mutex);
73658+ }
73659+
73660+ return 0;
73661+}
73662+
73663+const struct file_operations grsec_fops = {
73664+ .read = read_learn,
73665+ .write = write_grsec_handler,
73666+ .open = open_learn,
73667+ .release = close_learn,
73668+ .poll = poll_learn,
73669+};
73670diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
73671new file mode 100644
73672index 0000000..7949dcd
73673--- /dev/null
73674+++ b/grsecurity/gracl_policy.c
73675@@ -0,0 +1,1782 @@
73676+#include <linux/kernel.h>
73677+#include <linux/module.h>
73678+#include <linux/sched.h>
73679+#include <linux/mm.h>
73680+#include <linux/file.h>
73681+#include <linux/fs.h>
73682+#include <linux/namei.h>
73683+#include <linux/mount.h>
73684+#include <linux/tty.h>
73685+#include <linux/proc_fs.h>
73686+#include <linux/lglock.h>
73687+#include <linux/slab.h>
73688+#include <linux/vmalloc.h>
73689+#include <linux/types.h>
73690+#include <linux/sysctl.h>
73691+#include <linux/netdevice.h>
73692+#include <linux/ptrace.h>
73693+#include <linux/gracl.h>
73694+#include <linux/gralloc.h>
73695+#include <linux/security.h>
73696+#include <linux/grinternal.h>
73697+#include <linux/pid_namespace.h>
73698+#include <linux/stop_machine.h>
73699+#include <linux/fdtable.h>
73700+#include <linux/percpu.h>
73701+#include <linux/lglock.h>
73702+#include <linux/hugetlb.h>
73703+#include <linux/posix-timers.h>
73704+#include "../fs/mount.h"
73705+
73706+#include <asm/uaccess.h>
73707+#include <asm/errno.h>
73708+#include <asm/mman.h>
73709+
73710+extern struct gr_policy_state *polstate;
73711+
73712+#define FOR_EACH_ROLE_START(role) \
73713+ role = polstate->role_list; \
73714+ while (role) {
73715+
73716+#define FOR_EACH_ROLE_END(role) \
73717+ role = role->prev; \
73718+ }
73719+
73720+struct path gr_real_root;
73721+
73722+extern struct gr_alloc_state *current_alloc_state;
73723+
73724+u16 acl_sp_role_value;
73725+
73726+static DEFINE_MUTEX(gr_dev_mutex);
73727+
73728+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
73729+extern void gr_clear_learn_entries(void);
73730+
73731+struct gr_arg *gr_usermode __read_only;
73732+unsigned char *gr_system_salt __read_only;
73733+unsigned char *gr_system_sum __read_only;
73734+
73735+static unsigned int gr_auth_attempts = 0;
73736+static unsigned long gr_auth_expires = 0UL;
73737+
73738+struct acl_object_label *fakefs_obj_rw;
73739+struct acl_object_label *fakefs_obj_rwx;
73740+
73741+extern int gr_init_uidset(void);
73742+extern void gr_free_uidset(void);
73743+extern void gr_remove_uid(uid_t uid);
73744+extern int gr_find_uid(uid_t uid);
73745+
73746+extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback);
73747+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
73748+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
73749+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
73750+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);
73751+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
73752+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
73753+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
73754+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
73755+extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73756+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73757+extern void assign_special_role(const char *rolename);
73758+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
73759+extern int gr_rbac_disable(void *unused);
73760+extern void gr_enable_rbac_system(void);
73761+
73762+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
73763+{
73764+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
73765+ return -EFAULT;
73766+
73767+ return 0;
73768+}
73769+
73770+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73771+{
73772+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
73773+ return -EFAULT;
73774+
73775+ return 0;
73776+}
73777+
73778+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
73779+{
73780+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
73781+ return -EFAULT;
73782+
73783+ return 0;
73784+}
73785+
73786+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
73787+{
73788+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
73789+ return -EFAULT;
73790+
73791+ return 0;
73792+}
73793+
73794+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
73795+{
73796+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
73797+ return -EFAULT;
73798+
73799+ return 0;
73800+}
73801+
73802+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73803+{
73804+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
73805+ return -EFAULT;
73806+
73807+ return 0;
73808+}
73809+
73810+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73811+{
73812+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
73813+ return -EFAULT;
73814+
73815+ return 0;
73816+}
73817+
73818+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
73819+{
73820+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
73821+ return -EFAULT;
73822+
73823+ return 0;
73824+}
73825+
73826+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
73827+{
73828+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
73829+ return -EFAULT;
73830+
73831+ return 0;
73832+}
73833+
73834+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
73835+{
73836+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
73837+ return -EFAULT;
73838+
73839+ if (((uwrap->version != GRSECURITY_VERSION) &&
73840+ (uwrap->version != 0x2901)) ||
73841+ (uwrap->size != sizeof(struct gr_arg)))
73842+ return -EINVAL;
73843+
73844+ return 0;
73845+}
73846+
73847+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
73848+{
73849+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
73850+ return -EFAULT;
73851+
73852+ return 0;
73853+}
73854+
73855+static size_t get_gr_arg_wrapper_size_normal(void)
73856+{
73857+ return sizeof(struct gr_arg_wrapper);
73858+}
73859+
73860+#ifdef CONFIG_COMPAT
73861+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
73862+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
73863+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
73864+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
73865+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
73866+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
73867+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
73868+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
73869+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
73870+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
73871+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
73872+extern size_t get_gr_arg_wrapper_size_compat(void);
73873+
73874+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
73875+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
73876+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
73877+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
73878+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
73879+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
73880+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
73881+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
73882+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
73883+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
73884+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
73885+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
73886+
73887+#else
73888+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
73889+#define copy_gr_arg copy_gr_arg_normal
73890+#define copy_gr_hash_struct copy_gr_hash_struct_normal
73891+#define copy_acl_object_label copy_acl_object_label_normal
73892+#define copy_acl_subject_label copy_acl_subject_label_normal
73893+#define copy_acl_role_label copy_acl_role_label_normal
73894+#define copy_acl_ip_label copy_acl_ip_label_normal
73895+#define copy_pointer_from_array copy_pointer_from_array_normal
73896+#define copy_sprole_pw copy_sprole_pw_normal
73897+#define copy_role_transition copy_role_transition_normal
73898+#define copy_role_allowed_ip copy_role_allowed_ip_normal
73899+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
73900+#endif
73901+
73902+static struct acl_subject_label *
73903+lookup_subject_map(const struct acl_subject_label *userp)
73904+{
73905+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
73906+ struct subject_map *match;
73907+
73908+ match = polstate->subj_map_set.s_hash[index];
73909+
73910+ while (match && match->user != userp)
73911+ match = match->next;
73912+
73913+ if (match != NULL)
73914+ return match->kernel;
73915+ else
73916+ return NULL;
73917+}
73918+
73919+static void
73920+insert_subj_map_entry(struct subject_map *subjmap)
73921+{
73922+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
73923+ struct subject_map **curr;
73924+
73925+ subjmap->prev = NULL;
73926+
73927+ curr = &polstate->subj_map_set.s_hash[index];
73928+ if (*curr != NULL)
73929+ (*curr)->prev = subjmap;
73930+
73931+ subjmap->next = *curr;
73932+ *curr = subjmap;
73933+
73934+ return;
73935+}
73936+
73937+static void
73938+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
73939+{
73940+ unsigned int index =
73941+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
73942+ struct acl_role_label **curr;
73943+ struct acl_role_label *tmp, *tmp2;
73944+
73945+ curr = &polstate->acl_role_set.r_hash[index];
73946+
73947+ /* simple case, slot is empty, just set it to our role */
73948+ if (*curr == NULL) {
73949+ *curr = role;
73950+ } else {
73951+ /* example:
73952+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
73953+ 2 -> 3
73954+ */
73955+ /* first check to see if we can already be reached via this slot */
73956+ tmp = *curr;
73957+ while (tmp && tmp != role)
73958+ tmp = tmp->next;
73959+ if (tmp == role) {
73960+ /* we don't need to add ourselves to this slot's chain */
73961+ return;
73962+ }
73963+ /* we need to add ourselves to this chain, two cases */
73964+ if (role->next == NULL) {
73965+ /* simple case, append the current chain to our role */
73966+ role->next = *curr;
73967+ *curr = role;
73968+ } else {
73969+ /* 1 -> 2 -> 3 -> 4
73970+ 2 -> 3 -> 4
73971+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
73972+ */
73973+ /* trickier case: walk our role's chain until we find
73974+ the role for the start of the current slot's chain */
73975+ tmp = role;
73976+ tmp2 = *curr;
73977+ while (tmp->next && tmp->next != tmp2)
73978+ tmp = tmp->next;
73979+ if (tmp->next == tmp2) {
73980+ /* from example above, we found 3, so just
73981+ replace this slot's chain with ours */
73982+ *curr = role;
73983+ } else {
73984+ /* we didn't find a subset of our role's chain
73985+ in the current slot's chain, so append their
73986+ chain to ours, and set us as the first role in
73987+ the slot's chain
73988+
73989+ we could fold this case with the case above,
73990+ but making it explicit for clarity
73991+ */
73992+ tmp->next = tmp2;
73993+ *curr = role;
73994+ }
73995+ }
73996+ }
73997+
73998+ return;
73999+}
74000+
74001+static void
74002+insert_acl_role_label(struct acl_role_label *role)
74003+{
74004+ int i;
74005+
74006+ if (polstate->role_list == NULL) {
74007+ polstate->role_list = role;
74008+ role->prev = NULL;
74009+ } else {
74010+ role->prev = polstate->role_list;
74011+ polstate->role_list = role;
74012+ }
74013+
74014+ /* used for hash chains */
74015+ role->next = NULL;
74016+
74017+ if (role->roletype & GR_ROLE_DOMAIN) {
74018+ for (i = 0; i < role->domain_child_num; i++)
74019+ __insert_acl_role_label(role, role->domain_children[i]);
74020+ } else
74021+ __insert_acl_role_label(role, role->uidgid);
74022+}
74023+
74024+static int
74025+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
74026+{
74027+ struct name_entry **curr, *nentry;
74028+ struct inodev_entry *ientry;
74029+ unsigned int len = strlen(name);
74030+ unsigned int key = full_name_hash(name, len);
74031+ unsigned int index = key % polstate->name_set.n_size;
74032+
74033+ curr = &polstate->name_set.n_hash[index];
74034+
74035+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
74036+ curr = &((*curr)->next);
74037+
74038+ if (*curr != NULL)
74039+ return 1;
74040+
74041+ nentry = acl_alloc(sizeof (struct name_entry));
74042+ if (nentry == NULL)
74043+ return 0;
74044+ ientry = acl_alloc(sizeof (struct inodev_entry));
74045+ if (ientry == NULL)
74046+ return 0;
74047+ ientry->nentry = nentry;
74048+
74049+ nentry->key = key;
74050+ nentry->name = name;
74051+ nentry->inode = inode;
74052+ nentry->device = device;
74053+ nentry->len = len;
74054+ nentry->deleted = deleted;
74055+
74056+ nentry->prev = NULL;
74057+ curr = &polstate->name_set.n_hash[index];
74058+ if (*curr != NULL)
74059+ (*curr)->prev = nentry;
74060+ nentry->next = *curr;
74061+ *curr = nentry;
74062+
74063+ /* insert us into the table searchable by inode/dev */
74064+ __insert_inodev_entry(polstate, ientry);
74065+
74066+ return 1;
74067+}
74068+
74069+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
74070+
74071+static void *
74072+create_table(__u32 * len, int elementsize)
74073+{
74074+ unsigned int table_sizes[] = {
74075+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
74076+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
74077+ 4194301, 8388593, 16777213, 33554393, 67108859
74078+ };
74079+ void *newtable = NULL;
74080+ unsigned int pwr = 0;
74081+
74082+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
74083+ table_sizes[pwr] <= *len)
74084+ pwr++;
74085+
74086+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
74087+ return newtable;
74088+
74089+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
74090+ newtable =
74091+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
74092+ else
74093+ newtable = vmalloc(table_sizes[pwr] * elementsize);
74094+
74095+ *len = table_sizes[pwr];
74096+
74097+ return newtable;
74098+}
74099+
74100+static int
74101+init_variables(const struct gr_arg *arg, bool reload)
74102+{
74103+ struct task_struct *reaper = init_pid_ns.child_reaper;
74104+ unsigned int stacksize;
74105+
74106+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
74107+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
74108+ polstate->name_set.n_size = arg->role_db.num_objects;
74109+ polstate->inodev_set.i_size = arg->role_db.num_objects;
74110+
74111+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
74112+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
74113+ return 1;
74114+
74115+ if (!reload) {
74116+ if (!gr_init_uidset())
74117+ return 1;
74118+ }
74119+
74120+ /* set up the stack that holds allocation info */
74121+
74122+ stacksize = arg->role_db.num_pointers + 5;
74123+
74124+ if (!acl_alloc_stack_init(stacksize))
74125+ return 1;
74126+
74127+ if (!reload) {
74128+ /* grab reference for the real root dentry and vfsmount */
74129+ get_fs_root(reaper->fs, &gr_real_root);
74130+
74131+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74132+ 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);
74133+#endif
74134+
74135+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
74136+ if (fakefs_obj_rw == NULL)
74137+ return 1;
74138+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
74139+
74140+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
74141+ if (fakefs_obj_rwx == NULL)
74142+ return 1;
74143+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
74144+ }
74145+
74146+ polstate->subj_map_set.s_hash =
74147+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
74148+ polstate->acl_role_set.r_hash =
74149+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
74150+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
74151+ polstate->inodev_set.i_hash =
74152+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
74153+
74154+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
74155+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
74156+ return 1;
74157+
74158+ memset(polstate->subj_map_set.s_hash, 0,
74159+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
74160+ memset(polstate->acl_role_set.r_hash, 0,
74161+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
74162+ memset(polstate->name_set.n_hash, 0,
74163+ sizeof (struct name_entry *) * polstate->name_set.n_size);
74164+ memset(polstate->inodev_set.i_hash, 0,
74165+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
74166+
74167+ return 0;
74168+}
74169+
74170+/* free information not needed after startup
74171+ currently contains user->kernel pointer mappings for subjects
74172+*/
74173+
74174+static void
74175+free_init_variables(void)
74176+{
74177+ __u32 i;
74178+
74179+ if (polstate->subj_map_set.s_hash) {
74180+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
74181+ if (polstate->subj_map_set.s_hash[i]) {
74182+ kfree(polstate->subj_map_set.s_hash[i]);
74183+ polstate->subj_map_set.s_hash[i] = NULL;
74184+ }
74185+ }
74186+
74187+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
74188+ PAGE_SIZE)
74189+ kfree(polstate->subj_map_set.s_hash);
74190+ else
74191+ vfree(polstate->subj_map_set.s_hash);
74192+ }
74193+
74194+ return;
74195+}
74196+
74197+static void
74198+free_variables(bool reload)
74199+{
74200+ struct acl_subject_label *s;
74201+ struct acl_role_label *r;
74202+ struct task_struct *task, *task2;
74203+ unsigned int x;
74204+
74205+ if (!reload) {
74206+ gr_clear_learn_entries();
74207+
74208+ read_lock(&tasklist_lock);
74209+ do_each_thread(task2, task) {
74210+ task->acl_sp_role = 0;
74211+ task->acl_role_id = 0;
74212+ task->inherited = 0;
74213+ task->acl = NULL;
74214+ task->role = NULL;
74215+ } while_each_thread(task2, task);
74216+ read_unlock(&tasklist_lock);
74217+
74218+ kfree(fakefs_obj_rw);
74219+ fakefs_obj_rw = NULL;
74220+ kfree(fakefs_obj_rwx);
74221+ fakefs_obj_rwx = NULL;
74222+
74223+ /* release the reference to the real root dentry and vfsmount */
74224+ path_put(&gr_real_root);
74225+ memset(&gr_real_root, 0, sizeof(gr_real_root));
74226+ }
74227+
74228+ /* free all object hash tables */
74229+
74230+ FOR_EACH_ROLE_START(r)
74231+ if (r->subj_hash == NULL)
74232+ goto next_role;
74233+ FOR_EACH_SUBJECT_START(r, s, x)
74234+ if (s->obj_hash == NULL)
74235+ break;
74236+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74237+ kfree(s->obj_hash);
74238+ else
74239+ vfree(s->obj_hash);
74240+ FOR_EACH_SUBJECT_END(s, x)
74241+ FOR_EACH_NESTED_SUBJECT_START(r, s)
74242+ if (s->obj_hash == NULL)
74243+ break;
74244+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74245+ kfree(s->obj_hash);
74246+ else
74247+ vfree(s->obj_hash);
74248+ FOR_EACH_NESTED_SUBJECT_END(s)
74249+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
74250+ kfree(r->subj_hash);
74251+ else
74252+ vfree(r->subj_hash);
74253+ r->subj_hash = NULL;
74254+next_role:
74255+ FOR_EACH_ROLE_END(r)
74256+
74257+ acl_free_all();
74258+
74259+ if (polstate->acl_role_set.r_hash) {
74260+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
74261+ PAGE_SIZE)
74262+ kfree(polstate->acl_role_set.r_hash);
74263+ else
74264+ vfree(polstate->acl_role_set.r_hash);
74265+ }
74266+ if (polstate->name_set.n_hash) {
74267+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
74268+ PAGE_SIZE)
74269+ kfree(polstate->name_set.n_hash);
74270+ else
74271+ vfree(polstate->name_set.n_hash);
74272+ }
74273+
74274+ if (polstate->inodev_set.i_hash) {
74275+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
74276+ PAGE_SIZE)
74277+ kfree(polstate->inodev_set.i_hash);
74278+ else
74279+ vfree(polstate->inodev_set.i_hash);
74280+ }
74281+
74282+ if (!reload)
74283+ gr_free_uidset();
74284+
74285+ memset(&polstate->name_set, 0, sizeof (struct name_db));
74286+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
74287+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
74288+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
74289+
74290+ polstate->default_role = NULL;
74291+ polstate->kernel_role = NULL;
74292+ polstate->role_list = NULL;
74293+
74294+ return;
74295+}
74296+
74297+static struct acl_subject_label *
74298+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
74299+
74300+static int alloc_and_copy_string(char **name, unsigned int maxlen)
74301+{
74302+ unsigned int len = strnlen_user(*name, maxlen);
74303+ char *tmp;
74304+
74305+ if (!len || len >= maxlen)
74306+ return -EINVAL;
74307+
74308+ if ((tmp = (char *) acl_alloc(len)) == NULL)
74309+ return -ENOMEM;
74310+
74311+ if (copy_from_user(tmp, *name, len))
74312+ return -EFAULT;
74313+
74314+ tmp[len-1] = '\0';
74315+ *name = tmp;
74316+
74317+ return 0;
74318+}
74319+
74320+static int
74321+copy_user_glob(struct acl_object_label *obj)
74322+{
74323+ struct acl_object_label *g_tmp, **guser;
74324+ int error;
74325+
74326+ if (obj->globbed == NULL)
74327+ return 0;
74328+
74329+ guser = &obj->globbed;
74330+ while (*guser) {
74331+ g_tmp = (struct acl_object_label *)
74332+ acl_alloc(sizeof (struct acl_object_label));
74333+ if (g_tmp == NULL)
74334+ return -ENOMEM;
74335+
74336+ if (copy_acl_object_label(g_tmp, *guser))
74337+ return -EFAULT;
74338+
74339+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
74340+ if (error)
74341+ return error;
74342+
74343+ *guser = g_tmp;
74344+ guser = &(g_tmp->next);
74345+ }
74346+
74347+ return 0;
74348+}
74349+
74350+static int
74351+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
74352+ struct acl_role_label *role)
74353+{
74354+ struct acl_object_label *o_tmp;
74355+ int ret;
74356+
74357+ while (userp) {
74358+ if ((o_tmp = (struct acl_object_label *)
74359+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
74360+ return -ENOMEM;
74361+
74362+ if (copy_acl_object_label(o_tmp, userp))
74363+ return -EFAULT;
74364+
74365+ userp = o_tmp->prev;
74366+
74367+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
74368+ if (ret)
74369+ return ret;
74370+
74371+ insert_acl_obj_label(o_tmp, subj);
74372+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
74373+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
74374+ return -ENOMEM;
74375+
74376+ ret = copy_user_glob(o_tmp);
74377+ if (ret)
74378+ return ret;
74379+
74380+ if (o_tmp->nested) {
74381+ int already_copied;
74382+
74383+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
74384+ if (IS_ERR(o_tmp->nested))
74385+ return PTR_ERR(o_tmp->nested);
74386+
74387+ /* insert into nested subject list if we haven't copied this one yet
74388+ to prevent duplicate entries */
74389+ if (!already_copied) {
74390+ o_tmp->nested->next = role->hash->first;
74391+ role->hash->first = o_tmp->nested;
74392+ }
74393+ }
74394+ }
74395+
74396+ return 0;
74397+}
74398+
74399+static __u32
74400+count_user_subjs(struct acl_subject_label *userp)
74401+{
74402+ struct acl_subject_label s_tmp;
74403+ __u32 num = 0;
74404+
74405+ while (userp) {
74406+ if (copy_acl_subject_label(&s_tmp, userp))
74407+ break;
74408+
74409+ userp = s_tmp.prev;
74410+ }
74411+
74412+ return num;
74413+}
74414+
74415+static int
74416+copy_user_allowedips(struct acl_role_label *rolep)
74417+{
74418+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
74419+
74420+ ruserip = rolep->allowed_ips;
74421+
74422+ while (ruserip) {
74423+ rlast = rtmp;
74424+
74425+ if ((rtmp = (struct role_allowed_ip *)
74426+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
74427+ return -ENOMEM;
74428+
74429+ if (copy_role_allowed_ip(rtmp, ruserip))
74430+ return -EFAULT;
74431+
74432+ ruserip = rtmp->prev;
74433+
74434+ if (!rlast) {
74435+ rtmp->prev = NULL;
74436+ rolep->allowed_ips = rtmp;
74437+ } else {
74438+ rlast->next = rtmp;
74439+ rtmp->prev = rlast;
74440+ }
74441+
74442+ if (!ruserip)
74443+ rtmp->next = NULL;
74444+ }
74445+
74446+ return 0;
74447+}
74448+
74449+static int
74450+copy_user_transitions(struct acl_role_label *rolep)
74451+{
74452+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
74453+ int error;
74454+
74455+ rusertp = rolep->transitions;
74456+
74457+ while (rusertp) {
74458+ rlast = rtmp;
74459+
74460+ if ((rtmp = (struct role_transition *)
74461+ acl_alloc(sizeof (struct role_transition))) == NULL)
74462+ return -ENOMEM;
74463+
74464+ if (copy_role_transition(rtmp, rusertp))
74465+ return -EFAULT;
74466+
74467+ rusertp = rtmp->prev;
74468+
74469+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
74470+ if (error)
74471+ return error;
74472+
74473+ if (!rlast) {
74474+ rtmp->prev = NULL;
74475+ rolep->transitions = rtmp;
74476+ } else {
74477+ rlast->next = rtmp;
74478+ rtmp->prev = rlast;
74479+ }
74480+
74481+ if (!rusertp)
74482+ rtmp->next = NULL;
74483+ }
74484+
74485+ return 0;
74486+}
74487+
74488+static __u32 count_user_objs(const struct acl_object_label __user *userp)
74489+{
74490+ struct acl_object_label o_tmp;
74491+ __u32 num = 0;
74492+
74493+ while (userp) {
74494+ if (copy_acl_object_label(&o_tmp, userp))
74495+ break;
74496+
74497+ userp = o_tmp.prev;
74498+ num++;
74499+ }
74500+
74501+ return num;
74502+}
74503+
74504+static struct acl_subject_label *
74505+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
74506+{
74507+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
74508+ __u32 num_objs;
74509+ struct acl_ip_label **i_tmp, *i_utmp2;
74510+ struct gr_hash_struct ghash;
74511+ struct subject_map *subjmap;
74512+ unsigned int i_num;
74513+ int err;
74514+
74515+ if (already_copied != NULL)
74516+ *already_copied = 0;
74517+
74518+ s_tmp = lookup_subject_map(userp);
74519+
74520+ /* we've already copied this subject into the kernel, just return
74521+ the reference to it, and don't copy it over again
74522+ */
74523+ if (s_tmp) {
74524+ if (already_copied != NULL)
74525+ *already_copied = 1;
74526+ return(s_tmp);
74527+ }
74528+
74529+ if ((s_tmp = (struct acl_subject_label *)
74530+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
74531+ return ERR_PTR(-ENOMEM);
74532+
74533+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
74534+ if (subjmap == NULL)
74535+ return ERR_PTR(-ENOMEM);
74536+
74537+ subjmap->user = userp;
74538+ subjmap->kernel = s_tmp;
74539+ insert_subj_map_entry(subjmap);
74540+
74541+ if (copy_acl_subject_label(s_tmp, userp))
74542+ return ERR_PTR(-EFAULT);
74543+
74544+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
74545+ if (err)
74546+ return ERR_PTR(err);
74547+
74548+ if (!strcmp(s_tmp->filename, "/"))
74549+ role->root_label = s_tmp;
74550+
74551+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
74552+ return ERR_PTR(-EFAULT);
74553+
74554+ /* copy user and group transition tables */
74555+
74556+ if (s_tmp->user_trans_num) {
74557+ uid_t *uidlist;
74558+
74559+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
74560+ if (uidlist == NULL)
74561+ return ERR_PTR(-ENOMEM);
74562+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
74563+ return ERR_PTR(-EFAULT);
74564+
74565+ s_tmp->user_transitions = uidlist;
74566+ }
74567+
74568+ if (s_tmp->group_trans_num) {
74569+ gid_t *gidlist;
74570+
74571+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
74572+ if (gidlist == NULL)
74573+ return ERR_PTR(-ENOMEM);
74574+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
74575+ return ERR_PTR(-EFAULT);
74576+
74577+ s_tmp->group_transitions = gidlist;
74578+ }
74579+
74580+ /* set up object hash table */
74581+ num_objs = count_user_objs(ghash.first);
74582+
74583+ s_tmp->obj_hash_size = num_objs;
74584+ s_tmp->obj_hash =
74585+ (struct acl_object_label **)
74586+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
74587+
74588+ if (!s_tmp->obj_hash)
74589+ return ERR_PTR(-ENOMEM);
74590+
74591+ memset(s_tmp->obj_hash, 0,
74592+ s_tmp->obj_hash_size *
74593+ sizeof (struct acl_object_label *));
74594+
74595+ /* add in objects */
74596+ err = copy_user_objs(ghash.first, s_tmp, role);
74597+
74598+ if (err)
74599+ return ERR_PTR(err);
74600+
74601+ /* set pointer for parent subject */
74602+ if (s_tmp->parent_subject) {
74603+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
74604+
74605+ if (IS_ERR(s_tmp2))
74606+ return s_tmp2;
74607+
74608+ s_tmp->parent_subject = s_tmp2;
74609+ }
74610+
74611+ /* add in ip acls */
74612+
74613+ if (!s_tmp->ip_num) {
74614+ s_tmp->ips = NULL;
74615+ goto insert;
74616+ }
74617+
74618+ i_tmp =
74619+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
74620+ sizeof (struct acl_ip_label *));
74621+
74622+ if (!i_tmp)
74623+ return ERR_PTR(-ENOMEM);
74624+
74625+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
74626+ *(i_tmp + i_num) =
74627+ (struct acl_ip_label *)
74628+ acl_alloc(sizeof (struct acl_ip_label));
74629+ if (!*(i_tmp + i_num))
74630+ return ERR_PTR(-ENOMEM);
74631+
74632+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
74633+ return ERR_PTR(-EFAULT);
74634+
74635+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
74636+ return ERR_PTR(-EFAULT);
74637+
74638+ if ((*(i_tmp + i_num))->iface == NULL)
74639+ continue;
74640+
74641+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
74642+ if (err)
74643+ return ERR_PTR(err);
74644+ }
74645+
74646+ s_tmp->ips = i_tmp;
74647+
74648+insert:
74649+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
74650+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
74651+ return ERR_PTR(-ENOMEM);
74652+
74653+ return s_tmp;
74654+}
74655+
74656+static int
74657+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
74658+{
74659+ struct acl_subject_label s_pre;
74660+ struct acl_subject_label * ret;
74661+ int err;
74662+
74663+ while (userp) {
74664+ if (copy_acl_subject_label(&s_pre, userp))
74665+ return -EFAULT;
74666+
74667+ ret = do_copy_user_subj(userp, role, NULL);
74668+
74669+ err = PTR_ERR(ret);
74670+ if (IS_ERR(ret))
74671+ return err;
74672+
74673+ insert_acl_subj_label(ret, role);
74674+
74675+ userp = s_pre.prev;
74676+ }
74677+
74678+ return 0;
74679+}
74680+
74681+static int
74682+copy_user_acl(struct gr_arg *arg)
74683+{
74684+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
74685+ struct acl_subject_label *subj_list;
74686+ struct sprole_pw *sptmp;
74687+ struct gr_hash_struct *ghash;
74688+ uid_t *domainlist;
74689+ unsigned int r_num;
74690+ int err = 0;
74691+ __u16 i;
74692+ __u32 num_subjs;
74693+
74694+ /* we need a default and kernel role */
74695+ if (arg->role_db.num_roles < 2)
74696+ return -EINVAL;
74697+
74698+ /* copy special role authentication info from userspace */
74699+
74700+ polstate->num_sprole_pws = arg->num_sprole_pws;
74701+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
74702+
74703+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
74704+ return -ENOMEM;
74705+
74706+ for (i = 0; i < polstate->num_sprole_pws; i++) {
74707+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
74708+ if (!sptmp)
74709+ return -ENOMEM;
74710+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
74711+ return -EFAULT;
74712+
74713+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
74714+ if (err)
74715+ return err;
74716+
74717+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74718+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
74719+#endif
74720+
74721+ polstate->acl_special_roles[i] = sptmp;
74722+ }
74723+
74724+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
74725+
74726+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
74727+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
74728+
74729+ if (!r_tmp)
74730+ return -ENOMEM;
74731+
74732+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
74733+ return -EFAULT;
74734+
74735+ if (copy_acl_role_label(r_tmp, r_utmp2))
74736+ return -EFAULT;
74737+
74738+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
74739+ if (err)
74740+ return err;
74741+
74742+ if (!strcmp(r_tmp->rolename, "default")
74743+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
74744+ polstate->default_role = r_tmp;
74745+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
74746+ polstate->kernel_role = r_tmp;
74747+ }
74748+
74749+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
74750+ return -ENOMEM;
74751+
74752+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
74753+ return -EFAULT;
74754+
74755+ r_tmp->hash = ghash;
74756+
74757+ num_subjs = count_user_subjs(r_tmp->hash->first);
74758+
74759+ r_tmp->subj_hash_size = num_subjs;
74760+ r_tmp->subj_hash =
74761+ (struct acl_subject_label **)
74762+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
74763+
74764+ if (!r_tmp->subj_hash)
74765+ return -ENOMEM;
74766+
74767+ err = copy_user_allowedips(r_tmp);
74768+ if (err)
74769+ return err;
74770+
74771+ /* copy domain info */
74772+ if (r_tmp->domain_children != NULL) {
74773+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
74774+ if (domainlist == NULL)
74775+ return -ENOMEM;
74776+
74777+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
74778+ return -EFAULT;
74779+
74780+ r_tmp->domain_children = domainlist;
74781+ }
74782+
74783+ err = copy_user_transitions(r_tmp);
74784+ if (err)
74785+ return err;
74786+
74787+ memset(r_tmp->subj_hash, 0,
74788+ r_tmp->subj_hash_size *
74789+ sizeof (struct acl_subject_label *));
74790+
74791+ /* acquire the list of subjects, then NULL out
74792+ the list prior to parsing the subjects for this role,
74793+ as during this parsing the list is replaced with a list
74794+ of *nested* subjects for the role
74795+ */
74796+ subj_list = r_tmp->hash->first;
74797+
74798+ /* set nested subject list to null */
74799+ r_tmp->hash->first = NULL;
74800+
74801+ err = copy_user_subjs(subj_list, r_tmp);
74802+
74803+ if (err)
74804+ return err;
74805+
74806+ insert_acl_role_label(r_tmp);
74807+ }
74808+
74809+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
74810+ return -EINVAL;
74811+
74812+ return err;
74813+}
74814+
74815+static int gracl_reload_apply_policies(void *reload)
74816+{
74817+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
74818+ struct task_struct *task, *task2;
74819+ struct acl_role_label *role, *rtmp;
74820+ struct acl_subject_label *subj;
74821+ const struct cred *cred;
74822+ int role_applied;
74823+ int ret = 0;
74824+
74825+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
74826+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
74827+
74828+ /* first make sure we'll be able to apply the new policy cleanly */
74829+ do_each_thread(task2, task) {
74830+ if (task->exec_file == NULL)
74831+ continue;
74832+ role_applied = 0;
74833+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74834+ /* preserve special roles */
74835+ FOR_EACH_ROLE_START(role)
74836+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74837+ rtmp = task->role;
74838+ task->role = role;
74839+ role_applied = 1;
74840+ break;
74841+ }
74842+ FOR_EACH_ROLE_END(role)
74843+ }
74844+ if (!role_applied) {
74845+ cred = __task_cred(task);
74846+ rtmp = task->role;
74847+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74848+ }
74849+ /* this handles non-nested inherited subjects, nested subjects will still
74850+ be dropped currently */
74851+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
74852+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
74853+ /* change the role back so that we've made no modifications to the policy */
74854+ task->role = rtmp;
74855+
74856+ if (subj == NULL || task->tmpacl == NULL) {
74857+ ret = -EINVAL;
74858+ goto out;
74859+ }
74860+ } while_each_thread(task2, task);
74861+
74862+ /* now actually apply the policy */
74863+
74864+ do_each_thread(task2, task) {
74865+ if (task->exec_file) {
74866+ role_applied = 0;
74867+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74868+ /* preserve special roles */
74869+ FOR_EACH_ROLE_START(role)
74870+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74871+ task->role = role;
74872+ role_applied = 1;
74873+ break;
74874+ }
74875+ FOR_EACH_ROLE_END(role)
74876+ }
74877+ if (!role_applied) {
74878+ cred = __task_cred(task);
74879+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74880+ }
74881+ /* this handles non-nested inherited subjects, nested subjects will still
74882+ be dropped currently */
74883+ if (!reload_state->oldmode && task->inherited)
74884+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
74885+ else {
74886+ /* looked up and tagged to the task previously */
74887+ subj = task->tmpacl;
74888+ }
74889+ /* subj will be non-null */
74890+ __gr_apply_subject_to_task(polstate, task, subj);
74891+ if (reload_state->oldmode) {
74892+ task->acl_role_id = 0;
74893+ task->acl_sp_role = 0;
74894+ task->inherited = 0;
74895+ }
74896+ } else {
74897+ // it's a kernel process
74898+ task->role = polstate->kernel_role;
74899+ task->acl = polstate->kernel_role->root_label;
74900+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
74901+ task->acl->mode &= ~GR_PROCFIND;
74902+#endif
74903+ }
74904+ } while_each_thread(task2, task);
74905+
74906+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
74907+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
74908+
74909+out:
74910+
74911+ return ret;
74912+}
74913+
74914+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
74915+{
74916+ struct gr_reload_state new_reload_state = { };
74917+ int err;
74918+
74919+ new_reload_state.oldpolicy_ptr = polstate;
74920+ new_reload_state.oldalloc_ptr = current_alloc_state;
74921+ new_reload_state.oldmode = oldmode;
74922+
74923+ current_alloc_state = &new_reload_state.newalloc;
74924+ polstate = &new_reload_state.newpolicy;
74925+
74926+ /* everything relevant is now saved off, copy in the new policy */
74927+ if (init_variables(args, true)) {
74928+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74929+ err = -ENOMEM;
74930+ goto error;
74931+ }
74932+
74933+ err = copy_user_acl(args);
74934+ free_init_variables();
74935+ if (err)
74936+ goto error;
74937+ /* the new policy is copied in, with the old policy available via saved_state
74938+ first go through applying roles, making sure to preserve special roles
74939+ then apply new subjects, making sure to preserve inherited and nested subjects,
74940+ though currently only inherited subjects will be preserved
74941+ */
74942+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
74943+ if (err)
74944+ goto error;
74945+
74946+ /* we've now applied the new policy, so restore the old policy state to free it */
74947+ polstate = &new_reload_state.oldpolicy;
74948+ current_alloc_state = &new_reload_state.oldalloc;
74949+ free_variables(true);
74950+
74951+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
74952+ to running_polstate/current_alloc_state inside stop_machine
74953+ */
74954+ err = 0;
74955+ goto out;
74956+error:
74957+ /* on error of loading the new policy, we'll just keep the previous
74958+ policy set around
74959+ */
74960+ free_variables(true);
74961+
74962+ /* doesn't affect runtime, but maintains consistent state */
74963+out:
74964+ polstate = new_reload_state.oldpolicy_ptr;
74965+ current_alloc_state = new_reload_state.oldalloc_ptr;
74966+
74967+ return err;
74968+}
74969+
74970+static int
74971+gracl_init(struct gr_arg *args)
74972+{
74973+ int error = 0;
74974+
74975+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
74976+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
74977+
74978+ if (init_variables(args, false)) {
74979+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74980+ error = -ENOMEM;
74981+ goto out;
74982+ }
74983+
74984+ error = copy_user_acl(args);
74985+ free_init_variables();
74986+ if (error)
74987+ goto out;
74988+
74989+ error = gr_set_acls(0);
74990+ if (error)
74991+ goto out;
74992+
74993+ gr_enable_rbac_system();
74994+
74995+ return 0;
74996+
74997+out:
74998+ free_variables(false);
74999+ return error;
75000+}
75001+
75002+static int
75003+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
75004+ unsigned char **sum)
75005+{
75006+ struct acl_role_label *r;
75007+ struct role_allowed_ip *ipp;
75008+ struct role_transition *trans;
75009+ unsigned int i;
75010+ int found = 0;
75011+ u32 curr_ip = current->signal->curr_ip;
75012+
75013+ current->signal->saved_ip = curr_ip;
75014+
75015+ /* check transition table */
75016+
75017+ for (trans = current->role->transitions; trans; trans = trans->next) {
75018+ if (!strcmp(rolename, trans->rolename)) {
75019+ found = 1;
75020+ break;
75021+ }
75022+ }
75023+
75024+ if (!found)
75025+ return 0;
75026+
75027+ /* handle special roles that do not require authentication
75028+ and check ip */
75029+
75030+ FOR_EACH_ROLE_START(r)
75031+ if (!strcmp(rolename, r->rolename) &&
75032+ (r->roletype & GR_ROLE_SPECIAL)) {
75033+ found = 0;
75034+ if (r->allowed_ips != NULL) {
75035+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
75036+ if ((ntohl(curr_ip) & ipp->netmask) ==
75037+ (ntohl(ipp->addr) & ipp->netmask))
75038+ found = 1;
75039+ }
75040+ } else
75041+ found = 2;
75042+ if (!found)
75043+ return 0;
75044+
75045+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
75046+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
75047+ *salt = NULL;
75048+ *sum = NULL;
75049+ return 1;
75050+ }
75051+ }
75052+ FOR_EACH_ROLE_END(r)
75053+
75054+ for (i = 0; i < polstate->num_sprole_pws; i++) {
75055+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
75056+ *salt = polstate->acl_special_roles[i]->salt;
75057+ *sum = polstate->acl_special_roles[i]->sum;
75058+ return 1;
75059+ }
75060+ }
75061+
75062+ return 0;
75063+}
75064+
75065+int gr_check_secure_terminal(struct task_struct *task)
75066+{
75067+ struct task_struct *p, *p2, *p3;
75068+ struct files_struct *files;
75069+ struct fdtable *fdt;
75070+ struct file *our_file = NULL, *file;
75071+ int i;
75072+
75073+ if (task->signal->tty == NULL)
75074+ return 1;
75075+
75076+ files = get_files_struct(task);
75077+ if (files != NULL) {
75078+ rcu_read_lock();
75079+ fdt = files_fdtable(files);
75080+ for (i=0; i < fdt->max_fds; i++) {
75081+ file = fcheck_files(files, i);
75082+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
75083+ get_file(file);
75084+ our_file = file;
75085+ }
75086+ }
75087+ rcu_read_unlock();
75088+ put_files_struct(files);
75089+ }
75090+
75091+ if (our_file == NULL)
75092+ return 1;
75093+
75094+ read_lock(&tasklist_lock);
75095+ do_each_thread(p2, p) {
75096+ files = get_files_struct(p);
75097+ if (files == NULL ||
75098+ (p->signal && p->signal->tty == task->signal->tty)) {
75099+ if (files != NULL)
75100+ put_files_struct(files);
75101+ continue;
75102+ }
75103+ rcu_read_lock();
75104+ fdt = files_fdtable(files);
75105+ for (i=0; i < fdt->max_fds; i++) {
75106+ file = fcheck_files(files, i);
75107+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
75108+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
75109+ p3 = task;
75110+ while (task_pid_nr(p3) > 0) {
75111+ if (p3 == p)
75112+ break;
75113+ p3 = p3->real_parent;
75114+ }
75115+ if (p3 == p)
75116+ break;
75117+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
75118+ gr_handle_alertkill(p);
75119+ rcu_read_unlock();
75120+ put_files_struct(files);
75121+ read_unlock(&tasklist_lock);
75122+ fput(our_file);
75123+ return 0;
75124+ }
75125+ }
75126+ rcu_read_unlock();
75127+ put_files_struct(files);
75128+ } while_each_thread(p2, p);
75129+ read_unlock(&tasklist_lock);
75130+
75131+ fput(our_file);
75132+ return 1;
75133+}
75134+
75135+ssize_t
75136+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
75137+{
75138+ struct gr_arg_wrapper uwrap;
75139+ unsigned char *sprole_salt = NULL;
75140+ unsigned char *sprole_sum = NULL;
75141+ int error = 0;
75142+ int error2 = 0;
75143+ size_t req_count = 0;
75144+ unsigned char oldmode = 0;
75145+
75146+ mutex_lock(&gr_dev_mutex);
75147+
75148+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
75149+ error = -EPERM;
75150+ goto out;
75151+ }
75152+
75153+#ifdef CONFIG_COMPAT
75154+ pax_open_kernel();
75155+ if (is_compat_task()) {
75156+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
75157+ copy_gr_arg = &copy_gr_arg_compat;
75158+ copy_acl_object_label = &copy_acl_object_label_compat;
75159+ copy_acl_subject_label = &copy_acl_subject_label_compat;
75160+ copy_acl_role_label = &copy_acl_role_label_compat;
75161+ copy_acl_ip_label = &copy_acl_ip_label_compat;
75162+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
75163+ copy_role_transition = &copy_role_transition_compat;
75164+ copy_sprole_pw = &copy_sprole_pw_compat;
75165+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
75166+ copy_pointer_from_array = &copy_pointer_from_array_compat;
75167+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
75168+ } else {
75169+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
75170+ copy_gr_arg = &copy_gr_arg_normal;
75171+ copy_acl_object_label = &copy_acl_object_label_normal;
75172+ copy_acl_subject_label = &copy_acl_subject_label_normal;
75173+ copy_acl_role_label = &copy_acl_role_label_normal;
75174+ copy_acl_ip_label = &copy_acl_ip_label_normal;
75175+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
75176+ copy_role_transition = &copy_role_transition_normal;
75177+ copy_sprole_pw = &copy_sprole_pw_normal;
75178+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
75179+ copy_pointer_from_array = &copy_pointer_from_array_normal;
75180+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
75181+ }
75182+ pax_close_kernel();
75183+#endif
75184+
75185+ req_count = get_gr_arg_wrapper_size();
75186+
75187+ if (count != req_count) {
75188+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
75189+ error = -EINVAL;
75190+ goto out;
75191+ }
75192+
75193+
75194+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
75195+ gr_auth_expires = 0;
75196+ gr_auth_attempts = 0;
75197+ }
75198+
75199+ error = copy_gr_arg_wrapper(buf, &uwrap);
75200+ if (error)
75201+ goto out;
75202+
75203+ error = copy_gr_arg(uwrap.arg, gr_usermode);
75204+ if (error)
75205+ goto out;
75206+
75207+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75208+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75209+ time_after(gr_auth_expires, get_seconds())) {
75210+ error = -EBUSY;
75211+ goto out;
75212+ }
75213+
75214+ /* if non-root trying to do anything other than use a special role,
75215+ do not attempt authentication, do not count towards authentication
75216+ locking
75217+ */
75218+
75219+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
75220+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75221+ gr_is_global_nonroot(current_uid())) {
75222+ error = -EPERM;
75223+ goto out;
75224+ }
75225+
75226+ /* ensure pw and special role name are null terminated */
75227+
75228+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
75229+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
75230+
75231+ /* Okay.
75232+ * We have our enough of the argument structure..(we have yet
75233+ * to copy_from_user the tables themselves) . Copy the tables
75234+ * only if we need them, i.e. for loading operations. */
75235+
75236+ switch (gr_usermode->mode) {
75237+ case GR_STATUS:
75238+ if (gr_acl_is_enabled()) {
75239+ error = 1;
75240+ if (!gr_check_secure_terminal(current))
75241+ error = 3;
75242+ } else
75243+ error = 2;
75244+ goto out;
75245+ case GR_SHUTDOWN:
75246+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75247+ stop_machine(gr_rbac_disable, NULL, NULL);
75248+ free_variables(false);
75249+ memset(gr_usermode, 0, sizeof(struct gr_arg));
75250+ memset(gr_system_salt, 0, GR_SALT_LEN);
75251+ memset(gr_system_sum, 0, GR_SHA_LEN);
75252+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
75253+ } else if (gr_acl_is_enabled()) {
75254+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
75255+ error = -EPERM;
75256+ } else {
75257+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
75258+ error = -EAGAIN;
75259+ }
75260+ break;
75261+ case GR_ENABLE:
75262+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
75263+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
75264+ else {
75265+ if (gr_acl_is_enabled())
75266+ error = -EAGAIN;
75267+ else
75268+ error = error2;
75269+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
75270+ }
75271+ break;
75272+ case GR_OLDRELOAD:
75273+ oldmode = 1;
75274+ case GR_RELOAD:
75275+ if (!gr_acl_is_enabled()) {
75276+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
75277+ error = -EAGAIN;
75278+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75279+ error2 = gracl_reload(gr_usermode, oldmode);
75280+ if (!error2)
75281+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
75282+ else {
75283+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75284+ error = error2;
75285+ }
75286+ } else {
75287+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75288+ error = -EPERM;
75289+ }
75290+ break;
75291+ case GR_SEGVMOD:
75292+ if (unlikely(!gr_acl_is_enabled())) {
75293+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
75294+ error = -EAGAIN;
75295+ break;
75296+ }
75297+
75298+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75299+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
75300+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
75301+ struct acl_subject_label *segvacl;
75302+ segvacl =
75303+ lookup_acl_subj_label(gr_usermode->segv_inode,
75304+ gr_usermode->segv_device,
75305+ current->role);
75306+ if (segvacl) {
75307+ segvacl->crashes = 0;
75308+ segvacl->expires = 0;
75309+ }
75310+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
75311+ gr_remove_uid(gr_usermode->segv_uid);
75312+ }
75313+ } else {
75314+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
75315+ error = -EPERM;
75316+ }
75317+ break;
75318+ case GR_SPROLE:
75319+ case GR_SPROLEPAM:
75320+ if (unlikely(!gr_acl_is_enabled())) {
75321+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
75322+ error = -EAGAIN;
75323+ break;
75324+ }
75325+
75326+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
75327+ current->role->expires = 0;
75328+ current->role->auth_attempts = 0;
75329+ }
75330+
75331+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75332+ time_after(current->role->expires, get_seconds())) {
75333+ error = -EBUSY;
75334+ goto out;
75335+ }
75336+
75337+ if (lookup_special_role_auth
75338+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
75339+ && ((!sprole_salt && !sprole_sum)
75340+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
75341+ char *p = "";
75342+ assign_special_role(gr_usermode->sp_role);
75343+ read_lock(&tasklist_lock);
75344+ if (current->real_parent)
75345+ p = current->real_parent->role->rolename;
75346+ read_unlock(&tasklist_lock);
75347+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
75348+ p, acl_sp_role_value);
75349+ } else {
75350+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
75351+ error = -EPERM;
75352+ if(!(current->role->auth_attempts++))
75353+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75354+
75355+ goto out;
75356+ }
75357+ break;
75358+ case GR_UNSPROLE:
75359+ if (unlikely(!gr_acl_is_enabled())) {
75360+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
75361+ error = -EAGAIN;
75362+ break;
75363+ }
75364+
75365+ if (current->role->roletype & GR_ROLE_SPECIAL) {
75366+ char *p = "";
75367+ int i = 0;
75368+
75369+ read_lock(&tasklist_lock);
75370+ if (current->real_parent) {
75371+ p = current->real_parent->role->rolename;
75372+ i = current->real_parent->acl_role_id;
75373+ }
75374+ read_unlock(&tasklist_lock);
75375+
75376+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
75377+ gr_set_acls(1);
75378+ } else {
75379+ error = -EPERM;
75380+ goto out;
75381+ }
75382+ break;
75383+ default:
75384+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
75385+ error = -EINVAL;
75386+ break;
75387+ }
75388+
75389+ if (error != -EPERM)
75390+ goto out;
75391+
75392+ if(!(gr_auth_attempts++))
75393+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75394+
75395+ out:
75396+ mutex_unlock(&gr_dev_mutex);
75397+
75398+ if (!error)
75399+ error = req_count;
75400+
75401+ return error;
75402+}
75403+
75404+int
75405+gr_set_acls(const int type)
75406+{
75407+ struct task_struct *task, *task2;
75408+ struct acl_role_label *role = current->role;
75409+ struct acl_subject_label *subj;
75410+ __u16 acl_role_id = current->acl_role_id;
75411+ const struct cred *cred;
75412+ int ret;
75413+
75414+ rcu_read_lock();
75415+ read_lock(&tasklist_lock);
75416+ read_lock(&grsec_exec_file_lock);
75417+ do_each_thread(task2, task) {
75418+ /* check to see if we're called from the exit handler,
75419+ if so, only replace ACLs that have inherited the admin
75420+ ACL */
75421+
75422+ if (type && (task->role != role ||
75423+ task->acl_role_id != acl_role_id))
75424+ continue;
75425+
75426+ task->acl_role_id = 0;
75427+ task->acl_sp_role = 0;
75428+ task->inherited = 0;
75429+
75430+ if (task->exec_file) {
75431+ cred = __task_cred(task);
75432+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75433+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
75434+ if (subj == NULL) {
75435+ ret = -EINVAL;
75436+ read_unlock(&grsec_exec_file_lock);
75437+ read_unlock(&tasklist_lock);
75438+ rcu_read_unlock();
75439+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
75440+ return ret;
75441+ }
75442+ __gr_apply_subject_to_task(polstate, task, subj);
75443+ } else {
75444+ // it's a kernel process
75445+ task->role = polstate->kernel_role;
75446+ task->acl = polstate->kernel_role->root_label;
75447+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75448+ task->acl->mode &= ~GR_PROCFIND;
75449+#endif
75450+ }
75451+ } while_each_thread(task2, task);
75452+ read_unlock(&grsec_exec_file_lock);
75453+ read_unlock(&tasklist_lock);
75454+ rcu_read_unlock();
75455+
75456+ return 0;
75457+}
75458diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
75459new file mode 100644
75460index 0000000..39645c9
75461--- /dev/null
75462+++ b/grsecurity/gracl_res.c
75463@@ -0,0 +1,68 @@
75464+#include <linux/kernel.h>
75465+#include <linux/sched.h>
75466+#include <linux/gracl.h>
75467+#include <linux/grinternal.h>
75468+
75469+static const char *restab_log[] = {
75470+ [RLIMIT_CPU] = "RLIMIT_CPU",
75471+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
75472+ [RLIMIT_DATA] = "RLIMIT_DATA",
75473+ [RLIMIT_STACK] = "RLIMIT_STACK",
75474+ [RLIMIT_CORE] = "RLIMIT_CORE",
75475+ [RLIMIT_RSS] = "RLIMIT_RSS",
75476+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
75477+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
75478+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
75479+ [RLIMIT_AS] = "RLIMIT_AS",
75480+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
75481+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
75482+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
75483+ [RLIMIT_NICE] = "RLIMIT_NICE",
75484+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
75485+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
75486+ [GR_CRASH_RES] = "RLIMIT_CRASH"
75487+};
75488+
75489+void
75490+gr_log_resource(const struct task_struct *task,
75491+ const int res, const unsigned long wanted, const int gt)
75492+{
75493+ const struct cred *cred;
75494+ unsigned long rlim;
75495+
75496+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
75497+ return;
75498+
75499+ // not yet supported resource
75500+ if (unlikely(!restab_log[res]))
75501+ return;
75502+
75503+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
75504+ rlim = task_rlimit_max(task, res);
75505+ else
75506+ rlim = task_rlimit(task, res);
75507+
75508+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
75509+ return;
75510+
75511+ rcu_read_lock();
75512+ cred = __task_cred(task);
75513+
75514+ if (res == RLIMIT_NPROC &&
75515+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
75516+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
75517+ goto out_rcu_unlock;
75518+ else if (res == RLIMIT_MEMLOCK &&
75519+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
75520+ goto out_rcu_unlock;
75521+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
75522+ goto out_rcu_unlock;
75523+ rcu_read_unlock();
75524+
75525+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
75526+
75527+ return;
75528+out_rcu_unlock:
75529+ rcu_read_unlock();
75530+ return;
75531+}
75532diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
75533new file mode 100644
75534index 0000000..2040e61
75535--- /dev/null
75536+++ b/grsecurity/gracl_segv.c
75537@@ -0,0 +1,313 @@
75538+#include <linux/kernel.h>
75539+#include <linux/mm.h>
75540+#include <asm/uaccess.h>
75541+#include <asm/errno.h>
75542+#include <asm/mman.h>
75543+#include <net/sock.h>
75544+#include <linux/file.h>
75545+#include <linux/fs.h>
75546+#include <linux/net.h>
75547+#include <linux/in.h>
75548+#include <linux/slab.h>
75549+#include <linux/types.h>
75550+#include <linux/sched.h>
75551+#include <linux/timer.h>
75552+#include <linux/gracl.h>
75553+#include <linux/grsecurity.h>
75554+#include <linux/grinternal.h>
75555+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75556+#include <linux/magic.h>
75557+#include <linux/pagemap.h>
75558+#include "../fs/btrfs/async-thread.h"
75559+#include "../fs/btrfs/ctree.h"
75560+#include "../fs/btrfs/btrfs_inode.h"
75561+#endif
75562+
75563+static struct crash_uid *uid_set;
75564+static unsigned short uid_used;
75565+static DEFINE_SPINLOCK(gr_uid_lock);
75566+extern rwlock_t gr_inode_lock;
75567+extern struct acl_subject_label *
75568+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
75569+ struct acl_role_label *role);
75570+
75571+static inline dev_t __get_dev(const struct dentry *dentry)
75572+{
75573+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75574+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
75575+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
75576+ else
75577+#endif
75578+ return dentry->d_sb->s_dev;
75579+}
75580+
75581+int
75582+gr_init_uidset(void)
75583+{
75584+ uid_set =
75585+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
75586+ uid_used = 0;
75587+
75588+ return uid_set ? 1 : 0;
75589+}
75590+
75591+void
75592+gr_free_uidset(void)
75593+{
75594+ if (uid_set) {
75595+ struct crash_uid *tmpset;
75596+ spin_lock(&gr_uid_lock);
75597+ tmpset = uid_set;
75598+ uid_set = NULL;
75599+ uid_used = 0;
75600+ spin_unlock(&gr_uid_lock);
75601+ if (tmpset)
75602+ kfree(tmpset);
75603+ }
75604+
75605+ return;
75606+}
75607+
75608+int
75609+gr_find_uid(const uid_t uid)
75610+{
75611+ struct crash_uid *tmp = uid_set;
75612+ uid_t buid;
75613+ int low = 0, high = uid_used - 1, mid;
75614+
75615+ while (high >= low) {
75616+ mid = (low + high) >> 1;
75617+ buid = tmp[mid].uid;
75618+ if (buid == uid)
75619+ return mid;
75620+ if (buid > uid)
75621+ high = mid - 1;
75622+ if (buid < uid)
75623+ low = mid + 1;
75624+ }
75625+
75626+ return -1;
75627+}
75628+
75629+static __inline__ void
75630+gr_insertsort(void)
75631+{
75632+ unsigned short i, j;
75633+ struct crash_uid index;
75634+
75635+ for (i = 1; i < uid_used; i++) {
75636+ index = uid_set[i];
75637+ j = i;
75638+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
75639+ uid_set[j] = uid_set[j - 1];
75640+ j--;
75641+ }
75642+ uid_set[j] = index;
75643+ }
75644+
75645+ return;
75646+}
75647+
75648+static __inline__ void
75649+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
75650+{
75651+ int loc;
75652+ uid_t uid = GR_GLOBAL_UID(kuid);
75653+
75654+ if (uid_used == GR_UIDTABLE_MAX)
75655+ return;
75656+
75657+ loc = gr_find_uid(uid);
75658+
75659+ if (loc >= 0) {
75660+ uid_set[loc].expires = expires;
75661+ return;
75662+ }
75663+
75664+ uid_set[uid_used].uid = uid;
75665+ uid_set[uid_used].expires = expires;
75666+ uid_used++;
75667+
75668+ gr_insertsort();
75669+
75670+ return;
75671+}
75672+
75673+void
75674+gr_remove_uid(const unsigned short loc)
75675+{
75676+ unsigned short i;
75677+
75678+ for (i = loc + 1; i < uid_used; i++)
75679+ uid_set[i - 1] = uid_set[i];
75680+
75681+ uid_used--;
75682+
75683+ return;
75684+}
75685+
75686+int
75687+gr_check_crash_uid(const kuid_t kuid)
75688+{
75689+ int loc;
75690+ int ret = 0;
75691+ uid_t uid;
75692+
75693+ if (unlikely(!gr_acl_is_enabled()))
75694+ return 0;
75695+
75696+ uid = GR_GLOBAL_UID(kuid);
75697+
75698+ spin_lock(&gr_uid_lock);
75699+ loc = gr_find_uid(uid);
75700+
75701+ if (loc < 0)
75702+ goto out_unlock;
75703+
75704+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
75705+ gr_remove_uid(loc);
75706+ else
75707+ ret = 1;
75708+
75709+out_unlock:
75710+ spin_unlock(&gr_uid_lock);
75711+ return ret;
75712+}
75713+
75714+static __inline__ int
75715+proc_is_setxid(const struct cred *cred)
75716+{
75717+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
75718+ !uid_eq(cred->uid, cred->fsuid))
75719+ return 1;
75720+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
75721+ !gid_eq(cred->gid, cred->fsgid))
75722+ return 1;
75723+
75724+ return 0;
75725+}
75726+
75727+extern int gr_fake_force_sig(int sig, struct task_struct *t);
75728+
75729+void
75730+gr_handle_crash(struct task_struct *task, const int sig)
75731+{
75732+ struct acl_subject_label *curr;
75733+ struct task_struct *tsk, *tsk2;
75734+ const struct cred *cred;
75735+ const struct cred *cred2;
75736+
75737+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
75738+ return;
75739+
75740+ if (unlikely(!gr_acl_is_enabled()))
75741+ return;
75742+
75743+ curr = task->acl;
75744+
75745+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
75746+ return;
75747+
75748+ if (time_before_eq(curr->expires, get_seconds())) {
75749+ curr->expires = 0;
75750+ curr->crashes = 0;
75751+ }
75752+
75753+ curr->crashes++;
75754+
75755+ if (!curr->expires)
75756+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
75757+
75758+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75759+ time_after(curr->expires, get_seconds())) {
75760+ rcu_read_lock();
75761+ cred = __task_cred(task);
75762+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
75763+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75764+ spin_lock(&gr_uid_lock);
75765+ gr_insert_uid(cred->uid, curr->expires);
75766+ spin_unlock(&gr_uid_lock);
75767+ curr->expires = 0;
75768+ curr->crashes = 0;
75769+ read_lock(&tasklist_lock);
75770+ do_each_thread(tsk2, tsk) {
75771+ cred2 = __task_cred(tsk);
75772+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
75773+ gr_fake_force_sig(SIGKILL, tsk);
75774+ } while_each_thread(tsk2, tsk);
75775+ read_unlock(&tasklist_lock);
75776+ } else {
75777+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75778+ read_lock(&tasklist_lock);
75779+ read_lock(&grsec_exec_file_lock);
75780+ do_each_thread(tsk2, tsk) {
75781+ if (likely(tsk != task)) {
75782+ // if this thread has the same subject as the one that triggered
75783+ // RES_CRASH and it's the same binary, kill it
75784+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
75785+ gr_fake_force_sig(SIGKILL, tsk);
75786+ }
75787+ } while_each_thread(tsk2, tsk);
75788+ read_unlock(&grsec_exec_file_lock);
75789+ read_unlock(&tasklist_lock);
75790+ }
75791+ rcu_read_unlock();
75792+ }
75793+
75794+ return;
75795+}
75796+
75797+int
75798+gr_check_crash_exec(const struct file *filp)
75799+{
75800+ struct acl_subject_label *curr;
75801+
75802+ if (unlikely(!gr_acl_is_enabled()))
75803+ return 0;
75804+
75805+ read_lock(&gr_inode_lock);
75806+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
75807+ __get_dev(filp->f_path.dentry),
75808+ current->role);
75809+ read_unlock(&gr_inode_lock);
75810+
75811+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
75812+ (!curr->crashes && !curr->expires))
75813+ return 0;
75814+
75815+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75816+ time_after(curr->expires, get_seconds()))
75817+ return 1;
75818+ else if (time_before_eq(curr->expires, get_seconds())) {
75819+ curr->crashes = 0;
75820+ curr->expires = 0;
75821+ }
75822+
75823+ return 0;
75824+}
75825+
75826+void
75827+gr_handle_alertkill(struct task_struct *task)
75828+{
75829+ struct acl_subject_label *curracl;
75830+ __u32 curr_ip;
75831+ struct task_struct *p, *p2;
75832+
75833+ if (unlikely(!gr_acl_is_enabled()))
75834+ return;
75835+
75836+ curracl = task->acl;
75837+ curr_ip = task->signal->curr_ip;
75838+
75839+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
75840+ read_lock(&tasklist_lock);
75841+ do_each_thread(p2, p) {
75842+ if (p->signal->curr_ip == curr_ip)
75843+ gr_fake_force_sig(SIGKILL, p);
75844+ } while_each_thread(p2, p);
75845+ read_unlock(&tasklist_lock);
75846+ } else if (curracl->mode & GR_KILLPROC)
75847+ gr_fake_force_sig(SIGKILL, task);
75848+
75849+ return;
75850+}
75851diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
75852new file mode 100644
75853index 0000000..6b0c9cc
75854--- /dev/null
75855+++ b/grsecurity/gracl_shm.c
75856@@ -0,0 +1,40 @@
75857+#include <linux/kernel.h>
75858+#include <linux/mm.h>
75859+#include <linux/sched.h>
75860+#include <linux/file.h>
75861+#include <linux/ipc.h>
75862+#include <linux/gracl.h>
75863+#include <linux/grsecurity.h>
75864+#include <linux/grinternal.h>
75865+
75866+int
75867+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75868+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
75869+{
75870+ struct task_struct *task;
75871+
75872+ if (!gr_acl_is_enabled())
75873+ return 1;
75874+
75875+ rcu_read_lock();
75876+ read_lock(&tasklist_lock);
75877+
75878+ task = find_task_by_vpid(shm_cprid);
75879+
75880+ if (unlikely(!task))
75881+ task = find_task_by_vpid(shm_lapid);
75882+
75883+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
75884+ (task_pid_nr(task) == shm_lapid)) &&
75885+ (task->acl->mode & GR_PROTSHM) &&
75886+ (task->acl != current->acl))) {
75887+ read_unlock(&tasklist_lock);
75888+ rcu_read_unlock();
75889+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
75890+ return 0;
75891+ }
75892+ read_unlock(&tasklist_lock);
75893+ rcu_read_unlock();
75894+
75895+ return 1;
75896+}
75897diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
75898new file mode 100644
75899index 0000000..bc0be01
75900--- /dev/null
75901+++ b/grsecurity/grsec_chdir.c
75902@@ -0,0 +1,19 @@
75903+#include <linux/kernel.h>
75904+#include <linux/sched.h>
75905+#include <linux/fs.h>
75906+#include <linux/file.h>
75907+#include <linux/grsecurity.h>
75908+#include <linux/grinternal.h>
75909+
75910+void
75911+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
75912+{
75913+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
75914+ if ((grsec_enable_chdir && grsec_enable_group &&
75915+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
75916+ !grsec_enable_group)) {
75917+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
75918+ }
75919+#endif
75920+ return;
75921+}
75922diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
75923new file mode 100644
75924index 0000000..114ea4f
75925--- /dev/null
75926+++ b/grsecurity/grsec_chroot.c
75927@@ -0,0 +1,467 @@
75928+#include <linux/kernel.h>
75929+#include <linux/module.h>
75930+#include <linux/sched.h>
75931+#include <linux/file.h>
75932+#include <linux/fs.h>
75933+#include <linux/mount.h>
75934+#include <linux/types.h>
75935+#include "../fs/mount.h"
75936+#include <linux/grsecurity.h>
75937+#include <linux/grinternal.h>
75938+
75939+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75940+int gr_init_ran;
75941+#endif
75942+
75943+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
75944+{
75945+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
75946+ struct dentry *tmpd = dentry;
75947+
75948+ read_seqlock_excl(&mount_lock);
75949+ write_seqlock(&rename_lock);
75950+
75951+ while (tmpd != mnt->mnt_root) {
75952+ atomic_inc(&tmpd->chroot_refcnt);
75953+ tmpd = tmpd->d_parent;
75954+ }
75955+ atomic_inc(&tmpd->chroot_refcnt);
75956+
75957+ write_sequnlock(&rename_lock);
75958+ read_sequnlock_excl(&mount_lock);
75959+#endif
75960+}
75961+
75962+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
75963+{
75964+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
75965+ struct dentry *tmpd = dentry;
75966+
75967+ read_seqlock_excl(&mount_lock);
75968+ write_seqlock(&rename_lock);
75969+
75970+ while (tmpd != mnt->mnt_root) {
75971+ atomic_dec(&tmpd->chroot_refcnt);
75972+ tmpd = tmpd->d_parent;
75973+ }
75974+ atomic_dec(&tmpd->chroot_refcnt);
75975+
75976+ write_sequnlock(&rename_lock);
75977+ read_sequnlock_excl(&mount_lock);
75978+#endif
75979+}
75980+
75981+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
75982+static struct dentry *get_closest_chroot(struct dentry *dentry)
75983+{
75984+ write_seqlock(&rename_lock);
75985+ do {
75986+ if (atomic_read(&dentry->chroot_refcnt)) {
75987+ write_sequnlock(&rename_lock);
75988+ return dentry;
75989+ }
75990+ dentry = dentry->d_parent;
75991+ } while (!IS_ROOT(dentry));
75992+ write_sequnlock(&rename_lock);
75993+ return NULL;
75994+}
75995+#endif
75996+
75997+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
75998+ struct dentry *newdentry, struct vfsmount *newmnt)
75999+{
76000+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
76001+ struct dentry *chroot;
76002+
76003+ if (unlikely(!grsec_enable_chroot_rename))
76004+ return 0;
76005+
76006+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
76007+ return 0;
76008+
76009+ chroot = get_closest_chroot(olddentry);
76010+
76011+ if (chroot == NULL)
76012+ return 0;
76013+
76014+ if (is_subdir(newdentry, chroot))
76015+ return 0;
76016+
76017+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
76018+
76019+ return 1;
76020+#else
76021+ return 0;
76022+#endif
76023+}
76024+
76025+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
76026+{
76027+#ifdef CONFIG_GRKERNSEC
76028+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
76029+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
76030+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
76031+ && gr_init_ran
76032+#endif
76033+ )
76034+ task->gr_is_chrooted = 1;
76035+ else {
76036+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
76037+ if (task_pid_nr(task) == 1 && !gr_init_ran)
76038+ gr_init_ran = 1;
76039+#endif
76040+ task->gr_is_chrooted = 0;
76041+ }
76042+
76043+ task->gr_chroot_dentry = path->dentry;
76044+#endif
76045+ return;
76046+}
76047+
76048+void gr_clear_chroot_entries(struct task_struct *task)
76049+{
76050+#ifdef CONFIG_GRKERNSEC
76051+ task->gr_is_chrooted = 0;
76052+ task->gr_chroot_dentry = NULL;
76053+#endif
76054+ return;
76055+}
76056+
76057+int
76058+gr_handle_chroot_unix(const pid_t pid)
76059+{
76060+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
76061+ struct task_struct *p;
76062+
76063+ if (unlikely(!grsec_enable_chroot_unix))
76064+ return 1;
76065+
76066+ if (likely(!proc_is_chrooted(current)))
76067+ return 1;
76068+
76069+ rcu_read_lock();
76070+ read_lock(&tasklist_lock);
76071+ p = find_task_by_vpid_unrestricted(pid);
76072+ if (unlikely(p && !have_same_root(current, p))) {
76073+ read_unlock(&tasklist_lock);
76074+ rcu_read_unlock();
76075+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
76076+ return 0;
76077+ }
76078+ read_unlock(&tasklist_lock);
76079+ rcu_read_unlock();
76080+#endif
76081+ return 1;
76082+}
76083+
76084+int
76085+gr_handle_chroot_nice(void)
76086+{
76087+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76088+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
76089+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
76090+ return -EPERM;
76091+ }
76092+#endif
76093+ return 0;
76094+}
76095+
76096+int
76097+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
76098+{
76099+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76100+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
76101+ && proc_is_chrooted(current)) {
76102+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
76103+ return -EACCES;
76104+ }
76105+#endif
76106+ return 0;
76107+}
76108+
76109+int
76110+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
76111+{
76112+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76113+ struct task_struct *p;
76114+ int ret = 0;
76115+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
76116+ return ret;
76117+
76118+ read_lock(&tasklist_lock);
76119+ do_each_pid_task(pid, type, p) {
76120+ if (!have_same_root(current, p)) {
76121+ ret = 1;
76122+ goto out;
76123+ }
76124+ } while_each_pid_task(pid, type, p);
76125+out:
76126+ read_unlock(&tasklist_lock);
76127+ return ret;
76128+#endif
76129+ return 0;
76130+}
76131+
76132+int
76133+gr_pid_is_chrooted(struct task_struct *p)
76134+{
76135+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76136+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
76137+ return 0;
76138+
76139+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
76140+ !have_same_root(current, p)) {
76141+ return 1;
76142+ }
76143+#endif
76144+ return 0;
76145+}
76146+
76147+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
76148+
76149+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
76150+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
76151+{
76152+ struct path path, currentroot;
76153+ int ret = 0;
76154+
76155+ path.dentry = (struct dentry *)u_dentry;
76156+ path.mnt = (struct vfsmount *)u_mnt;
76157+ get_fs_root(current->fs, &currentroot);
76158+ if (path_is_under(&path, &currentroot))
76159+ ret = 1;
76160+ path_put(&currentroot);
76161+
76162+ return ret;
76163+}
76164+#endif
76165+
76166+int
76167+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
76168+{
76169+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76170+ if (!grsec_enable_chroot_fchdir)
76171+ return 1;
76172+
76173+ if (!proc_is_chrooted(current))
76174+ return 1;
76175+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
76176+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
76177+ return 0;
76178+ }
76179+#endif
76180+ return 1;
76181+}
76182+
76183+int
76184+gr_chroot_fhandle(void)
76185+{
76186+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76187+ if (!grsec_enable_chroot_fchdir)
76188+ return 1;
76189+
76190+ if (!proc_is_chrooted(current))
76191+ return 1;
76192+ else {
76193+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
76194+ return 0;
76195+ }
76196+#endif
76197+ return 1;
76198+}
76199+
76200+int
76201+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76202+ const u64 shm_createtime)
76203+{
76204+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
76205+ struct task_struct *p;
76206+
76207+ if (unlikely(!grsec_enable_chroot_shmat))
76208+ return 1;
76209+
76210+ if (likely(!proc_is_chrooted(current)))
76211+ return 1;
76212+
76213+ rcu_read_lock();
76214+ read_lock(&tasklist_lock);
76215+
76216+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
76217+ if (time_before_eq64(p->start_time, shm_createtime)) {
76218+ if (have_same_root(current, p)) {
76219+ goto allow;
76220+ } else {
76221+ read_unlock(&tasklist_lock);
76222+ rcu_read_unlock();
76223+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
76224+ return 0;
76225+ }
76226+ }
76227+ /* creator exited, pid reuse, fall through to next check */
76228+ }
76229+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
76230+ if (unlikely(!have_same_root(current, p))) {
76231+ read_unlock(&tasklist_lock);
76232+ rcu_read_unlock();
76233+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
76234+ return 0;
76235+ }
76236+ }
76237+
76238+allow:
76239+ read_unlock(&tasklist_lock);
76240+ rcu_read_unlock();
76241+#endif
76242+ return 1;
76243+}
76244+
76245+void
76246+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
76247+{
76248+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
76249+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
76250+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
76251+#endif
76252+ return;
76253+}
76254+
76255+int
76256+gr_handle_chroot_mknod(const struct dentry *dentry,
76257+ const struct vfsmount *mnt, const int mode)
76258+{
76259+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
76260+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
76261+ proc_is_chrooted(current)) {
76262+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
76263+ return -EPERM;
76264+ }
76265+#endif
76266+ return 0;
76267+}
76268+
76269+int
76270+gr_handle_chroot_mount(const struct dentry *dentry,
76271+ const struct vfsmount *mnt, const char *dev_name)
76272+{
76273+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
76274+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
76275+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
76276+ return -EPERM;
76277+ }
76278+#endif
76279+ return 0;
76280+}
76281+
76282+int
76283+gr_handle_chroot_pivot(void)
76284+{
76285+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
76286+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
76287+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
76288+ return -EPERM;
76289+ }
76290+#endif
76291+ return 0;
76292+}
76293+
76294+int
76295+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
76296+{
76297+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76298+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
76299+ !gr_is_outside_chroot(dentry, mnt)) {
76300+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
76301+ return -EPERM;
76302+ }
76303+#endif
76304+ return 0;
76305+}
76306+
76307+extern const char *captab_log[];
76308+extern int captab_log_entries;
76309+
76310+int
76311+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76312+{
76313+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76314+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76315+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76316+ if (cap_raised(chroot_caps, cap)) {
76317+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
76318+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
76319+ }
76320+ return 0;
76321+ }
76322+ }
76323+#endif
76324+ return 1;
76325+}
76326+
76327+int
76328+gr_chroot_is_capable(const int cap)
76329+{
76330+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76331+ return gr_task_chroot_is_capable(current, current_cred(), cap);
76332+#endif
76333+ return 1;
76334+}
76335+
76336+int
76337+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
76338+{
76339+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76340+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76341+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76342+ if (cap_raised(chroot_caps, cap)) {
76343+ return 0;
76344+ }
76345+ }
76346+#endif
76347+ return 1;
76348+}
76349+
76350+int
76351+gr_chroot_is_capable_nolog(const int cap)
76352+{
76353+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76354+ return gr_task_chroot_is_capable_nolog(current, cap);
76355+#endif
76356+ return 1;
76357+}
76358+
76359+int
76360+gr_handle_chroot_sysctl(const int op)
76361+{
76362+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76363+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
76364+ proc_is_chrooted(current))
76365+ return -EACCES;
76366+#endif
76367+ return 0;
76368+}
76369+
76370+void
76371+gr_handle_chroot_chdir(const struct path *path)
76372+{
76373+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76374+ if (grsec_enable_chroot_chdir)
76375+ set_fs_pwd(current->fs, path);
76376+#endif
76377+ return;
76378+}
76379+
76380+int
76381+gr_handle_chroot_chmod(const struct dentry *dentry,
76382+ const struct vfsmount *mnt, const int mode)
76383+{
76384+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76385+ /* allow chmod +s on directories, but not files */
76386+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
76387+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
76388+ proc_is_chrooted(current)) {
76389+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
76390+ return -EPERM;
76391+ }
76392+#endif
76393+ return 0;
76394+}
76395diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
76396new file mode 100644
76397index 0000000..0f9ac91
76398--- /dev/null
76399+++ b/grsecurity/grsec_disabled.c
76400@@ -0,0 +1,440 @@
76401+#include <linux/kernel.h>
76402+#include <linux/module.h>
76403+#include <linux/sched.h>
76404+#include <linux/file.h>
76405+#include <linux/fs.h>
76406+#include <linux/kdev_t.h>
76407+#include <linux/net.h>
76408+#include <linux/in.h>
76409+#include <linux/ip.h>
76410+#include <linux/skbuff.h>
76411+#include <linux/sysctl.h>
76412+
76413+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
76414+void
76415+pax_set_initial_flags(struct linux_binprm *bprm)
76416+{
76417+ return;
76418+}
76419+#endif
76420+
76421+#ifdef CONFIG_SYSCTL
76422+__u32
76423+gr_handle_sysctl(const struct ctl_table * table, const int op)
76424+{
76425+ return 0;
76426+}
76427+#endif
76428+
76429+#ifdef CONFIG_TASKSTATS
76430+int gr_is_taskstats_denied(int pid)
76431+{
76432+ return 0;
76433+}
76434+#endif
76435+
76436+int
76437+gr_acl_is_enabled(void)
76438+{
76439+ return 0;
76440+}
76441+
76442+int
76443+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
76444+{
76445+ return 0;
76446+}
76447+
76448+void
76449+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
76450+{
76451+ return;
76452+}
76453+
76454+int
76455+gr_handle_rawio(const struct inode *inode)
76456+{
76457+ return 0;
76458+}
76459+
76460+void
76461+gr_acl_handle_psacct(struct task_struct *task, const long code)
76462+{
76463+ return;
76464+}
76465+
76466+int
76467+gr_handle_ptrace(struct task_struct *task, const long request)
76468+{
76469+ return 0;
76470+}
76471+
76472+int
76473+gr_handle_proc_ptrace(struct task_struct *task)
76474+{
76475+ return 0;
76476+}
76477+
76478+int
76479+gr_set_acls(const int type)
76480+{
76481+ return 0;
76482+}
76483+
76484+int
76485+gr_check_hidden_task(const struct task_struct *tsk)
76486+{
76487+ return 0;
76488+}
76489+
76490+int
76491+gr_check_protected_task(const struct task_struct *task)
76492+{
76493+ return 0;
76494+}
76495+
76496+int
76497+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
76498+{
76499+ return 0;
76500+}
76501+
76502+void
76503+gr_copy_label(struct task_struct *tsk)
76504+{
76505+ return;
76506+}
76507+
76508+void
76509+gr_set_pax_flags(struct task_struct *task)
76510+{
76511+ return;
76512+}
76513+
76514+int
76515+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
76516+ const int unsafe_share)
76517+{
76518+ return 0;
76519+}
76520+
76521+void
76522+gr_handle_delete(const ino_t ino, const dev_t dev)
76523+{
76524+ return;
76525+}
76526+
76527+void
76528+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
76529+{
76530+ return;
76531+}
76532+
76533+void
76534+gr_handle_crash(struct task_struct *task, const int sig)
76535+{
76536+ return;
76537+}
76538+
76539+int
76540+gr_check_crash_exec(const struct file *filp)
76541+{
76542+ return 0;
76543+}
76544+
76545+int
76546+gr_check_crash_uid(const kuid_t uid)
76547+{
76548+ return 0;
76549+}
76550+
76551+void
76552+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76553+ struct dentry *old_dentry,
76554+ struct dentry *new_dentry,
76555+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
76556+{
76557+ return;
76558+}
76559+
76560+int
76561+gr_search_socket(const int family, const int type, const int protocol)
76562+{
76563+ return 1;
76564+}
76565+
76566+int
76567+gr_search_connectbind(const int mode, const struct socket *sock,
76568+ const struct sockaddr_in *addr)
76569+{
76570+ return 0;
76571+}
76572+
76573+void
76574+gr_handle_alertkill(struct task_struct *task)
76575+{
76576+ return;
76577+}
76578+
76579+__u32
76580+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
76581+{
76582+ return 1;
76583+}
76584+
76585+__u32
76586+gr_acl_handle_hidden_file(const struct dentry * dentry,
76587+ const struct vfsmount * mnt)
76588+{
76589+ return 1;
76590+}
76591+
76592+__u32
76593+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
76594+ int acc_mode)
76595+{
76596+ return 1;
76597+}
76598+
76599+__u32
76600+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
76601+{
76602+ return 1;
76603+}
76604+
76605+__u32
76606+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
76607+{
76608+ return 1;
76609+}
76610+
76611+int
76612+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
76613+ unsigned int *vm_flags)
76614+{
76615+ return 1;
76616+}
76617+
76618+__u32
76619+gr_acl_handle_truncate(const struct dentry * dentry,
76620+ const struct vfsmount * mnt)
76621+{
76622+ return 1;
76623+}
76624+
76625+__u32
76626+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
76627+{
76628+ return 1;
76629+}
76630+
76631+__u32
76632+gr_acl_handle_access(const struct dentry * dentry,
76633+ const struct vfsmount * mnt, const int fmode)
76634+{
76635+ return 1;
76636+}
76637+
76638+__u32
76639+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
76640+ umode_t *mode)
76641+{
76642+ return 1;
76643+}
76644+
76645+__u32
76646+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
76647+{
76648+ return 1;
76649+}
76650+
76651+__u32
76652+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
76653+{
76654+ return 1;
76655+}
76656+
76657+__u32
76658+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
76659+{
76660+ return 1;
76661+}
76662+
76663+void
76664+grsecurity_init(void)
76665+{
76666+ return;
76667+}
76668+
76669+umode_t gr_acl_umask(void)
76670+{
76671+ return 0;
76672+}
76673+
76674+__u32
76675+gr_acl_handle_mknod(const struct dentry * new_dentry,
76676+ const struct dentry * parent_dentry,
76677+ const struct vfsmount * parent_mnt,
76678+ const int mode)
76679+{
76680+ return 1;
76681+}
76682+
76683+__u32
76684+gr_acl_handle_mkdir(const struct dentry * new_dentry,
76685+ const struct dentry * parent_dentry,
76686+ const struct vfsmount * parent_mnt)
76687+{
76688+ return 1;
76689+}
76690+
76691+__u32
76692+gr_acl_handle_symlink(const struct dentry * new_dentry,
76693+ const struct dentry * parent_dentry,
76694+ const struct vfsmount * parent_mnt, const struct filename *from)
76695+{
76696+ return 1;
76697+}
76698+
76699+__u32
76700+gr_acl_handle_link(const struct dentry * new_dentry,
76701+ const struct dentry * parent_dentry,
76702+ const struct vfsmount * parent_mnt,
76703+ const struct dentry * old_dentry,
76704+ const struct vfsmount * old_mnt, const struct filename *to)
76705+{
76706+ return 1;
76707+}
76708+
76709+int
76710+gr_acl_handle_rename(const struct dentry *new_dentry,
76711+ const struct dentry *parent_dentry,
76712+ const struct vfsmount *parent_mnt,
76713+ const struct dentry *old_dentry,
76714+ const struct inode *old_parent_inode,
76715+ const struct vfsmount *old_mnt, const struct filename *newname,
76716+ unsigned int flags)
76717+{
76718+ return 0;
76719+}
76720+
76721+int
76722+gr_acl_handle_filldir(const struct file *file, const char *name,
76723+ const int namelen, const ino_t ino)
76724+{
76725+ return 1;
76726+}
76727+
76728+int
76729+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76730+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
76731+{
76732+ return 1;
76733+}
76734+
76735+int
76736+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
76737+{
76738+ return 0;
76739+}
76740+
76741+int
76742+gr_search_accept(const struct socket *sock)
76743+{
76744+ return 0;
76745+}
76746+
76747+int
76748+gr_search_listen(const struct socket *sock)
76749+{
76750+ return 0;
76751+}
76752+
76753+int
76754+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
76755+{
76756+ return 0;
76757+}
76758+
76759+__u32
76760+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
76761+{
76762+ return 1;
76763+}
76764+
76765+__u32
76766+gr_acl_handle_creat(const struct dentry * dentry,
76767+ const struct dentry * p_dentry,
76768+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
76769+ const int imode)
76770+{
76771+ return 1;
76772+}
76773+
76774+void
76775+gr_acl_handle_exit(void)
76776+{
76777+ return;
76778+}
76779+
76780+int
76781+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
76782+{
76783+ return 1;
76784+}
76785+
76786+void
76787+gr_set_role_label(const kuid_t uid, const kgid_t gid)
76788+{
76789+ return;
76790+}
76791+
76792+int
76793+gr_acl_handle_procpidmem(const struct task_struct *task)
76794+{
76795+ return 0;
76796+}
76797+
76798+int
76799+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
76800+{
76801+ return 0;
76802+}
76803+
76804+int
76805+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
76806+{
76807+ return 0;
76808+}
76809+
76810+int
76811+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
76812+{
76813+ return 0;
76814+}
76815+
76816+int
76817+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
76818+{
76819+ return 0;
76820+}
76821+
76822+int gr_acl_enable_at_secure(void)
76823+{
76824+ return 0;
76825+}
76826+
76827+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
76828+{
76829+ return dentry->d_sb->s_dev;
76830+}
76831+
76832+void gr_put_exec_file(struct task_struct *task)
76833+{
76834+ return;
76835+}
76836+
76837+#ifdef CONFIG_SECURITY
76838+EXPORT_SYMBOL_GPL(gr_check_user_change);
76839+EXPORT_SYMBOL_GPL(gr_check_group_change);
76840+#endif
76841diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
76842new file mode 100644
76843index 0000000..14638ff
76844--- /dev/null
76845+++ b/grsecurity/grsec_exec.c
76846@@ -0,0 +1,188 @@
76847+#include <linux/kernel.h>
76848+#include <linux/sched.h>
76849+#include <linux/file.h>
76850+#include <linux/binfmts.h>
76851+#include <linux/fs.h>
76852+#include <linux/types.h>
76853+#include <linux/grdefs.h>
76854+#include <linux/grsecurity.h>
76855+#include <linux/grinternal.h>
76856+#include <linux/capability.h>
76857+#include <linux/module.h>
76858+#include <linux/compat.h>
76859+
76860+#include <asm/uaccess.h>
76861+
76862+#ifdef CONFIG_GRKERNSEC_EXECLOG
76863+static char gr_exec_arg_buf[132];
76864+static DEFINE_MUTEX(gr_exec_arg_mutex);
76865+#endif
76866+
76867+struct user_arg_ptr {
76868+#ifdef CONFIG_COMPAT
76869+ bool is_compat;
76870+#endif
76871+ union {
76872+ const char __user *const __user *native;
76873+#ifdef CONFIG_COMPAT
76874+ const compat_uptr_t __user *compat;
76875+#endif
76876+ } ptr;
76877+};
76878+
76879+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
76880+
76881+void
76882+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
76883+{
76884+#ifdef CONFIG_GRKERNSEC_EXECLOG
76885+ char *grarg = gr_exec_arg_buf;
76886+ unsigned int i, x, execlen = 0;
76887+ char c;
76888+
76889+ if (!((grsec_enable_execlog && grsec_enable_group &&
76890+ in_group_p(grsec_audit_gid))
76891+ || (grsec_enable_execlog && !grsec_enable_group)))
76892+ return;
76893+
76894+ mutex_lock(&gr_exec_arg_mutex);
76895+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
76896+
76897+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
76898+ const char __user *p;
76899+ unsigned int len;
76900+
76901+ p = get_user_arg_ptr(argv, i);
76902+ if (IS_ERR(p))
76903+ goto log;
76904+
76905+ len = strnlen_user(p, 128 - execlen);
76906+ if (len > 128 - execlen)
76907+ len = 128 - execlen;
76908+ else if (len > 0)
76909+ len--;
76910+ if (copy_from_user(grarg + execlen, p, len))
76911+ goto log;
76912+
76913+ /* rewrite unprintable characters */
76914+ for (x = 0; x < len; x++) {
76915+ c = *(grarg + execlen + x);
76916+ if (c < 32 || c > 126)
76917+ *(grarg + execlen + x) = ' ';
76918+ }
76919+
76920+ execlen += len;
76921+ *(grarg + execlen) = ' ';
76922+ *(grarg + execlen + 1) = '\0';
76923+ execlen++;
76924+ }
76925+
76926+ log:
76927+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
76928+ bprm->file->f_path.mnt, grarg);
76929+ mutex_unlock(&gr_exec_arg_mutex);
76930+#endif
76931+ return;
76932+}
76933+
76934+#ifdef CONFIG_GRKERNSEC
76935+extern int gr_acl_is_capable(const int cap);
76936+extern int gr_acl_is_capable_nolog(const int cap);
76937+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76938+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
76939+extern int gr_chroot_is_capable(const int cap);
76940+extern int gr_chroot_is_capable_nolog(const int cap);
76941+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76942+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
76943+#endif
76944+
76945+const char *captab_log[] = {
76946+ "CAP_CHOWN",
76947+ "CAP_DAC_OVERRIDE",
76948+ "CAP_DAC_READ_SEARCH",
76949+ "CAP_FOWNER",
76950+ "CAP_FSETID",
76951+ "CAP_KILL",
76952+ "CAP_SETGID",
76953+ "CAP_SETUID",
76954+ "CAP_SETPCAP",
76955+ "CAP_LINUX_IMMUTABLE",
76956+ "CAP_NET_BIND_SERVICE",
76957+ "CAP_NET_BROADCAST",
76958+ "CAP_NET_ADMIN",
76959+ "CAP_NET_RAW",
76960+ "CAP_IPC_LOCK",
76961+ "CAP_IPC_OWNER",
76962+ "CAP_SYS_MODULE",
76963+ "CAP_SYS_RAWIO",
76964+ "CAP_SYS_CHROOT",
76965+ "CAP_SYS_PTRACE",
76966+ "CAP_SYS_PACCT",
76967+ "CAP_SYS_ADMIN",
76968+ "CAP_SYS_BOOT",
76969+ "CAP_SYS_NICE",
76970+ "CAP_SYS_RESOURCE",
76971+ "CAP_SYS_TIME",
76972+ "CAP_SYS_TTY_CONFIG",
76973+ "CAP_MKNOD",
76974+ "CAP_LEASE",
76975+ "CAP_AUDIT_WRITE",
76976+ "CAP_AUDIT_CONTROL",
76977+ "CAP_SETFCAP",
76978+ "CAP_MAC_OVERRIDE",
76979+ "CAP_MAC_ADMIN",
76980+ "CAP_SYSLOG",
76981+ "CAP_WAKE_ALARM",
76982+ "CAP_BLOCK_SUSPEND"
76983+};
76984+
76985+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
76986+
76987+int gr_is_capable(const int cap)
76988+{
76989+#ifdef CONFIG_GRKERNSEC
76990+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
76991+ return 1;
76992+ return 0;
76993+#else
76994+ return 1;
76995+#endif
76996+}
76997+
76998+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76999+{
77000+#ifdef CONFIG_GRKERNSEC
77001+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
77002+ return 1;
77003+ return 0;
77004+#else
77005+ return 1;
77006+#endif
77007+}
77008+
77009+int gr_is_capable_nolog(const int cap)
77010+{
77011+#ifdef CONFIG_GRKERNSEC
77012+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
77013+ return 1;
77014+ return 0;
77015+#else
77016+ return 1;
77017+#endif
77018+}
77019+
77020+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
77021+{
77022+#ifdef CONFIG_GRKERNSEC
77023+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
77024+ return 1;
77025+ return 0;
77026+#else
77027+ return 1;
77028+#endif
77029+}
77030+
77031+EXPORT_SYMBOL_GPL(gr_is_capable);
77032+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
77033+EXPORT_SYMBOL_GPL(gr_task_is_capable);
77034+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
77035diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
77036new file mode 100644
77037index 0000000..06cc6ea
77038--- /dev/null
77039+++ b/grsecurity/grsec_fifo.c
77040@@ -0,0 +1,24 @@
77041+#include <linux/kernel.h>
77042+#include <linux/sched.h>
77043+#include <linux/fs.h>
77044+#include <linux/file.h>
77045+#include <linux/grinternal.h>
77046+
77047+int
77048+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
77049+ const struct dentry *dir, const int flag, const int acc_mode)
77050+{
77051+#ifdef CONFIG_GRKERNSEC_FIFO
77052+ const struct cred *cred = current_cred();
77053+
77054+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
77055+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
77056+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
77057+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
77058+ if (!inode_permission(dentry->d_inode, acc_mode))
77059+ 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));
77060+ return -EACCES;
77061+ }
77062+#endif
77063+ return 0;
77064+}
77065diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
77066new file mode 100644
77067index 0000000..8ca18bf
77068--- /dev/null
77069+++ b/grsecurity/grsec_fork.c
77070@@ -0,0 +1,23 @@
77071+#include <linux/kernel.h>
77072+#include <linux/sched.h>
77073+#include <linux/grsecurity.h>
77074+#include <linux/grinternal.h>
77075+#include <linux/errno.h>
77076+
77077+void
77078+gr_log_forkfail(const int retval)
77079+{
77080+#ifdef CONFIG_GRKERNSEC_FORKFAIL
77081+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
77082+ switch (retval) {
77083+ case -EAGAIN:
77084+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
77085+ break;
77086+ case -ENOMEM:
77087+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
77088+ break;
77089+ }
77090+ }
77091+#endif
77092+ return;
77093+}
77094diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
77095new file mode 100644
77096index 0000000..4ed9e7d
77097--- /dev/null
77098+++ b/grsecurity/grsec_init.c
77099@@ -0,0 +1,290 @@
77100+#include <linux/kernel.h>
77101+#include <linux/sched.h>
77102+#include <linux/mm.h>
77103+#include <linux/gracl.h>
77104+#include <linux/slab.h>
77105+#include <linux/vmalloc.h>
77106+#include <linux/percpu.h>
77107+#include <linux/module.h>
77108+
77109+int grsec_enable_ptrace_readexec;
77110+int grsec_enable_setxid;
77111+int grsec_enable_symlinkown;
77112+kgid_t grsec_symlinkown_gid;
77113+int grsec_enable_brute;
77114+int grsec_enable_link;
77115+int grsec_enable_dmesg;
77116+int grsec_enable_harden_ptrace;
77117+int grsec_enable_harden_ipc;
77118+int grsec_enable_fifo;
77119+int grsec_enable_execlog;
77120+int grsec_enable_signal;
77121+int grsec_enable_forkfail;
77122+int grsec_enable_audit_ptrace;
77123+int grsec_enable_time;
77124+int grsec_enable_group;
77125+kgid_t grsec_audit_gid;
77126+int grsec_enable_chdir;
77127+int grsec_enable_mount;
77128+int grsec_enable_rofs;
77129+int grsec_deny_new_usb;
77130+int grsec_enable_chroot_findtask;
77131+int grsec_enable_chroot_mount;
77132+int grsec_enable_chroot_shmat;
77133+int grsec_enable_chroot_fchdir;
77134+int grsec_enable_chroot_double;
77135+int grsec_enable_chroot_pivot;
77136+int grsec_enable_chroot_chdir;
77137+int grsec_enable_chroot_chmod;
77138+int grsec_enable_chroot_mknod;
77139+int grsec_enable_chroot_nice;
77140+int grsec_enable_chroot_execlog;
77141+int grsec_enable_chroot_caps;
77142+int grsec_enable_chroot_rename;
77143+int grsec_enable_chroot_sysctl;
77144+int grsec_enable_chroot_unix;
77145+int grsec_enable_tpe;
77146+kgid_t grsec_tpe_gid;
77147+int grsec_enable_blackhole;
77148+#ifdef CONFIG_IPV6_MODULE
77149+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
77150+#endif
77151+int grsec_lastack_retries;
77152+int grsec_enable_tpe_all;
77153+int grsec_enable_tpe_invert;
77154+int grsec_enable_socket_all;
77155+kgid_t grsec_socket_all_gid;
77156+int grsec_enable_socket_client;
77157+kgid_t grsec_socket_client_gid;
77158+int grsec_enable_socket_server;
77159+kgid_t grsec_socket_server_gid;
77160+int grsec_resource_logging;
77161+int grsec_disable_privio;
77162+int grsec_enable_log_rwxmaps;
77163+int grsec_lock;
77164+
77165+DEFINE_SPINLOCK(grsec_alert_lock);
77166+unsigned long grsec_alert_wtime = 0;
77167+unsigned long grsec_alert_fyet = 0;
77168+
77169+DEFINE_SPINLOCK(grsec_audit_lock);
77170+
77171+DEFINE_RWLOCK(grsec_exec_file_lock);
77172+
77173+char *gr_shared_page[4];
77174+
77175+char *gr_alert_log_fmt;
77176+char *gr_audit_log_fmt;
77177+char *gr_alert_log_buf;
77178+char *gr_audit_log_buf;
77179+
77180+extern struct gr_arg *gr_usermode;
77181+extern unsigned char *gr_system_salt;
77182+extern unsigned char *gr_system_sum;
77183+
77184+void __init
77185+grsecurity_init(void)
77186+{
77187+ int j;
77188+ /* create the per-cpu shared pages */
77189+
77190+#ifdef CONFIG_X86
77191+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
77192+#endif
77193+
77194+ for (j = 0; j < 4; j++) {
77195+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
77196+ if (gr_shared_page[j] == NULL) {
77197+ panic("Unable to allocate grsecurity shared page");
77198+ return;
77199+ }
77200+ }
77201+
77202+ /* allocate log buffers */
77203+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
77204+ if (!gr_alert_log_fmt) {
77205+ panic("Unable to allocate grsecurity alert log format buffer");
77206+ return;
77207+ }
77208+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
77209+ if (!gr_audit_log_fmt) {
77210+ panic("Unable to allocate grsecurity audit log format buffer");
77211+ return;
77212+ }
77213+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
77214+ if (!gr_alert_log_buf) {
77215+ panic("Unable to allocate grsecurity alert log buffer");
77216+ return;
77217+ }
77218+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
77219+ if (!gr_audit_log_buf) {
77220+ panic("Unable to allocate grsecurity audit log buffer");
77221+ return;
77222+ }
77223+
77224+ /* allocate memory for authentication structure */
77225+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
77226+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
77227+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
77228+
77229+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
77230+ panic("Unable to allocate grsecurity authentication structure");
77231+ return;
77232+ }
77233+
77234+#ifdef CONFIG_GRKERNSEC_IO
77235+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
77236+ grsec_disable_privio = 1;
77237+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
77238+ grsec_disable_privio = 1;
77239+#else
77240+ grsec_disable_privio = 0;
77241+#endif
77242+#endif
77243+
77244+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
77245+ /* for backward compatibility, tpe_invert always defaults to on if
77246+ enabled in the kernel
77247+ */
77248+ grsec_enable_tpe_invert = 1;
77249+#endif
77250+
77251+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
77252+#ifndef CONFIG_GRKERNSEC_SYSCTL
77253+ grsec_lock = 1;
77254+#endif
77255+
77256+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77257+ grsec_enable_log_rwxmaps = 1;
77258+#endif
77259+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
77260+ grsec_enable_group = 1;
77261+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
77262+#endif
77263+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77264+ grsec_enable_ptrace_readexec = 1;
77265+#endif
77266+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
77267+ grsec_enable_chdir = 1;
77268+#endif
77269+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
77270+ grsec_enable_harden_ptrace = 1;
77271+#endif
77272+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77273+ grsec_enable_harden_ipc = 1;
77274+#endif
77275+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77276+ grsec_enable_mount = 1;
77277+#endif
77278+#ifdef CONFIG_GRKERNSEC_LINK
77279+ grsec_enable_link = 1;
77280+#endif
77281+#ifdef CONFIG_GRKERNSEC_BRUTE
77282+ grsec_enable_brute = 1;
77283+#endif
77284+#ifdef CONFIG_GRKERNSEC_DMESG
77285+ grsec_enable_dmesg = 1;
77286+#endif
77287+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77288+ grsec_enable_blackhole = 1;
77289+ grsec_lastack_retries = 4;
77290+#endif
77291+#ifdef CONFIG_GRKERNSEC_FIFO
77292+ grsec_enable_fifo = 1;
77293+#endif
77294+#ifdef CONFIG_GRKERNSEC_EXECLOG
77295+ grsec_enable_execlog = 1;
77296+#endif
77297+#ifdef CONFIG_GRKERNSEC_SETXID
77298+ grsec_enable_setxid = 1;
77299+#endif
77300+#ifdef CONFIG_GRKERNSEC_SIGNAL
77301+ grsec_enable_signal = 1;
77302+#endif
77303+#ifdef CONFIG_GRKERNSEC_FORKFAIL
77304+ grsec_enable_forkfail = 1;
77305+#endif
77306+#ifdef CONFIG_GRKERNSEC_TIME
77307+ grsec_enable_time = 1;
77308+#endif
77309+#ifdef CONFIG_GRKERNSEC_RESLOG
77310+ grsec_resource_logging = 1;
77311+#endif
77312+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
77313+ grsec_enable_chroot_findtask = 1;
77314+#endif
77315+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
77316+ grsec_enable_chroot_unix = 1;
77317+#endif
77318+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
77319+ grsec_enable_chroot_mount = 1;
77320+#endif
77321+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
77322+ grsec_enable_chroot_fchdir = 1;
77323+#endif
77324+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
77325+ grsec_enable_chroot_shmat = 1;
77326+#endif
77327+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77328+ grsec_enable_audit_ptrace = 1;
77329+#endif
77330+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
77331+ grsec_enable_chroot_double = 1;
77332+#endif
77333+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
77334+ grsec_enable_chroot_pivot = 1;
77335+#endif
77336+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
77337+ grsec_enable_chroot_chdir = 1;
77338+#endif
77339+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
77340+ grsec_enable_chroot_chmod = 1;
77341+#endif
77342+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
77343+ grsec_enable_chroot_mknod = 1;
77344+#endif
77345+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
77346+ grsec_enable_chroot_nice = 1;
77347+#endif
77348+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
77349+ grsec_enable_chroot_execlog = 1;
77350+#endif
77351+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77352+ grsec_enable_chroot_caps = 1;
77353+#endif
77354+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
77355+ grsec_enable_chroot_rename = 1;
77356+#endif
77357+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
77358+ grsec_enable_chroot_sysctl = 1;
77359+#endif
77360+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77361+ grsec_enable_symlinkown = 1;
77362+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
77363+#endif
77364+#ifdef CONFIG_GRKERNSEC_TPE
77365+ grsec_enable_tpe = 1;
77366+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
77367+#ifdef CONFIG_GRKERNSEC_TPE_ALL
77368+ grsec_enable_tpe_all = 1;
77369+#endif
77370+#endif
77371+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
77372+ grsec_enable_socket_all = 1;
77373+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
77374+#endif
77375+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
77376+ grsec_enable_socket_client = 1;
77377+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
77378+#endif
77379+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
77380+ grsec_enable_socket_server = 1;
77381+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
77382+#endif
77383+#endif
77384+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
77385+ grsec_deny_new_usb = 1;
77386+#endif
77387+
77388+ return;
77389+}
77390diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
77391new file mode 100644
77392index 0000000..1773300
77393--- /dev/null
77394+++ b/grsecurity/grsec_ipc.c
77395@@ -0,0 +1,48 @@
77396+#include <linux/kernel.h>
77397+#include <linux/mm.h>
77398+#include <linux/sched.h>
77399+#include <linux/file.h>
77400+#include <linux/ipc.h>
77401+#include <linux/ipc_namespace.h>
77402+#include <linux/grsecurity.h>
77403+#include <linux/grinternal.h>
77404+
77405+int
77406+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
77407+{
77408+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77409+ int write;
77410+ int orig_granted_mode;
77411+ kuid_t euid;
77412+ kgid_t egid;
77413+
77414+ if (!grsec_enable_harden_ipc)
77415+ return 1;
77416+
77417+ euid = current_euid();
77418+ egid = current_egid();
77419+
77420+ write = requested_mode & 00002;
77421+ orig_granted_mode = ipcp->mode;
77422+
77423+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
77424+ orig_granted_mode >>= 6;
77425+ else {
77426+ /* if likely wrong permissions, lock to user */
77427+ if (orig_granted_mode & 0007)
77428+ orig_granted_mode = 0;
77429+ /* otherwise do a egid-only check */
77430+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
77431+ orig_granted_mode >>= 3;
77432+ /* otherwise, no access */
77433+ else
77434+ orig_granted_mode = 0;
77435+ }
77436+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
77437+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
77438+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
77439+ return 0;
77440+ }
77441+#endif
77442+ return 1;
77443+}
77444diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
77445new file mode 100644
77446index 0000000..5e05e20
77447--- /dev/null
77448+++ b/grsecurity/grsec_link.c
77449@@ -0,0 +1,58 @@
77450+#include <linux/kernel.h>
77451+#include <linux/sched.h>
77452+#include <linux/fs.h>
77453+#include <linux/file.h>
77454+#include <linux/grinternal.h>
77455+
77456+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
77457+{
77458+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77459+ const struct inode *link_inode = link->dentry->d_inode;
77460+
77461+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
77462+ /* ignore root-owned links, e.g. /proc/self */
77463+ gr_is_global_nonroot(link_inode->i_uid) && target &&
77464+ !uid_eq(link_inode->i_uid, target->i_uid)) {
77465+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
77466+ return 1;
77467+ }
77468+#endif
77469+ return 0;
77470+}
77471+
77472+int
77473+gr_handle_follow_link(const struct inode *parent,
77474+ const struct inode *inode,
77475+ const struct dentry *dentry, const struct vfsmount *mnt)
77476+{
77477+#ifdef CONFIG_GRKERNSEC_LINK
77478+ const struct cred *cred = current_cred();
77479+
77480+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
77481+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
77482+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
77483+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
77484+ return -EACCES;
77485+ }
77486+#endif
77487+ return 0;
77488+}
77489+
77490+int
77491+gr_handle_hardlink(const struct dentry *dentry,
77492+ const struct vfsmount *mnt,
77493+ struct inode *inode, const int mode, const struct filename *to)
77494+{
77495+#ifdef CONFIG_GRKERNSEC_LINK
77496+ const struct cred *cred = current_cred();
77497+
77498+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
77499+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
77500+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
77501+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
77502+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
77503+ return -EPERM;
77504+ }
77505+#endif
77506+ return 0;
77507+}
77508diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
77509new file mode 100644
77510index 0000000..dbe0a6b
77511--- /dev/null
77512+++ b/grsecurity/grsec_log.c
77513@@ -0,0 +1,341 @@
77514+#include <linux/kernel.h>
77515+#include <linux/sched.h>
77516+#include <linux/file.h>
77517+#include <linux/tty.h>
77518+#include <linux/fs.h>
77519+#include <linux/mm.h>
77520+#include <linux/grinternal.h>
77521+
77522+#ifdef CONFIG_TREE_PREEMPT_RCU
77523+#define DISABLE_PREEMPT() preempt_disable()
77524+#define ENABLE_PREEMPT() preempt_enable()
77525+#else
77526+#define DISABLE_PREEMPT()
77527+#define ENABLE_PREEMPT()
77528+#endif
77529+
77530+#define BEGIN_LOCKS(x) \
77531+ DISABLE_PREEMPT(); \
77532+ rcu_read_lock(); \
77533+ read_lock(&tasklist_lock); \
77534+ read_lock(&grsec_exec_file_lock); \
77535+ if (x != GR_DO_AUDIT) \
77536+ spin_lock(&grsec_alert_lock); \
77537+ else \
77538+ spin_lock(&grsec_audit_lock)
77539+
77540+#define END_LOCKS(x) \
77541+ if (x != GR_DO_AUDIT) \
77542+ spin_unlock(&grsec_alert_lock); \
77543+ else \
77544+ spin_unlock(&grsec_audit_lock); \
77545+ read_unlock(&grsec_exec_file_lock); \
77546+ read_unlock(&tasklist_lock); \
77547+ rcu_read_unlock(); \
77548+ ENABLE_PREEMPT(); \
77549+ if (x == GR_DONT_AUDIT) \
77550+ gr_handle_alertkill(current)
77551+
77552+enum {
77553+ FLOODING,
77554+ NO_FLOODING
77555+};
77556+
77557+extern char *gr_alert_log_fmt;
77558+extern char *gr_audit_log_fmt;
77559+extern char *gr_alert_log_buf;
77560+extern char *gr_audit_log_buf;
77561+
77562+static int gr_log_start(int audit)
77563+{
77564+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
77565+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
77566+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77567+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
77568+ unsigned long curr_secs = get_seconds();
77569+
77570+ if (audit == GR_DO_AUDIT)
77571+ goto set_fmt;
77572+
77573+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
77574+ grsec_alert_wtime = curr_secs;
77575+ grsec_alert_fyet = 0;
77576+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
77577+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
77578+ grsec_alert_fyet++;
77579+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
77580+ grsec_alert_wtime = curr_secs;
77581+ grsec_alert_fyet++;
77582+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
77583+ return FLOODING;
77584+ }
77585+ else return FLOODING;
77586+
77587+set_fmt:
77588+#endif
77589+ memset(buf, 0, PAGE_SIZE);
77590+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
77591+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
77592+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77593+ } else if (current->signal->curr_ip) {
77594+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
77595+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
77596+ } else if (gr_acl_is_enabled()) {
77597+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
77598+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77599+ } else {
77600+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
77601+ strcpy(buf, fmt);
77602+ }
77603+
77604+ return NO_FLOODING;
77605+}
77606+
77607+static void gr_log_middle(int audit, const char *msg, va_list ap)
77608+ __attribute__ ((format (printf, 2, 0)));
77609+
77610+static void gr_log_middle(int audit, const char *msg, va_list ap)
77611+{
77612+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77613+ unsigned int len = strlen(buf);
77614+
77615+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77616+
77617+ return;
77618+}
77619+
77620+static void gr_log_middle_varargs(int audit, const char *msg, ...)
77621+ __attribute__ ((format (printf, 2, 3)));
77622+
77623+static void gr_log_middle_varargs(int audit, const char *msg, ...)
77624+{
77625+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77626+ unsigned int len = strlen(buf);
77627+ va_list ap;
77628+
77629+ va_start(ap, msg);
77630+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77631+ va_end(ap);
77632+
77633+ return;
77634+}
77635+
77636+static void gr_log_end(int audit, int append_default)
77637+{
77638+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77639+ if (append_default) {
77640+ struct task_struct *task = current;
77641+ struct task_struct *parent = task->real_parent;
77642+ const struct cred *cred = __task_cred(task);
77643+ const struct cred *pcred = __task_cred(parent);
77644+ unsigned int len = strlen(buf);
77645+
77646+ 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));
77647+ }
77648+
77649+ printk("%s\n", buf);
77650+
77651+ return;
77652+}
77653+
77654+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
77655+{
77656+ int logtype;
77657+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
77658+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
77659+ void *voidptr = NULL;
77660+ int num1 = 0, num2 = 0;
77661+ unsigned long ulong1 = 0, ulong2 = 0;
77662+ struct dentry *dentry = NULL;
77663+ struct vfsmount *mnt = NULL;
77664+ struct file *file = NULL;
77665+ struct task_struct *task = NULL;
77666+ struct vm_area_struct *vma = NULL;
77667+ const struct cred *cred, *pcred;
77668+ va_list ap;
77669+
77670+ BEGIN_LOCKS(audit);
77671+ logtype = gr_log_start(audit);
77672+ if (logtype == FLOODING) {
77673+ END_LOCKS(audit);
77674+ return;
77675+ }
77676+ va_start(ap, argtypes);
77677+ switch (argtypes) {
77678+ case GR_TTYSNIFF:
77679+ task = va_arg(ap, struct task_struct *);
77680+ 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));
77681+ break;
77682+ case GR_SYSCTL_HIDDEN:
77683+ str1 = va_arg(ap, char *);
77684+ gr_log_middle_varargs(audit, msg, result, str1);
77685+ break;
77686+ case GR_RBAC:
77687+ dentry = va_arg(ap, struct dentry *);
77688+ mnt = va_arg(ap, struct vfsmount *);
77689+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
77690+ break;
77691+ case GR_RBAC_STR:
77692+ dentry = va_arg(ap, struct dentry *);
77693+ mnt = va_arg(ap, struct vfsmount *);
77694+ str1 = va_arg(ap, char *);
77695+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
77696+ break;
77697+ case GR_STR_RBAC:
77698+ str1 = va_arg(ap, char *);
77699+ dentry = va_arg(ap, struct dentry *);
77700+ mnt = va_arg(ap, struct vfsmount *);
77701+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
77702+ break;
77703+ case GR_RBAC_MODE2:
77704+ dentry = va_arg(ap, struct dentry *);
77705+ mnt = va_arg(ap, struct vfsmount *);
77706+ str1 = va_arg(ap, char *);
77707+ str2 = va_arg(ap, char *);
77708+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
77709+ break;
77710+ case GR_RBAC_MODE3:
77711+ dentry = va_arg(ap, struct dentry *);
77712+ mnt = va_arg(ap, struct vfsmount *);
77713+ str1 = va_arg(ap, char *);
77714+ str2 = va_arg(ap, char *);
77715+ str3 = va_arg(ap, char *);
77716+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
77717+ break;
77718+ case GR_FILENAME:
77719+ dentry = va_arg(ap, struct dentry *);
77720+ mnt = va_arg(ap, struct vfsmount *);
77721+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
77722+ break;
77723+ case GR_STR_FILENAME:
77724+ str1 = va_arg(ap, char *);
77725+ dentry = va_arg(ap, struct dentry *);
77726+ mnt = va_arg(ap, struct vfsmount *);
77727+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
77728+ break;
77729+ case GR_FILENAME_STR:
77730+ dentry = va_arg(ap, struct dentry *);
77731+ mnt = va_arg(ap, struct vfsmount *);
77732+ str1 = va_arg(ap, char *);
77733+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
77734+ break;
77735+ case GR_FILENAME_TWO_INT:
77736+ dentry = va_arg(ap, struct dentry *);
77737+ mnt = va_arg(ap, struct vfsmount *);
77738+ num1 = va_arg(ap, int);
77739+ num2 = va_arg(ap, int);
77740+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
77741+ break;
77742+ case GR_FILENAME_TWO_INT_STR:
77743+ dentry = va_arg(ap, struct dentry *);
77744+ mnt = va_arg(ap, struct vfsmount *);
77745+ num1 = va_arg(ap, int);
77746+ num2 = va_arg(ap, int);
77747+ str1 = va_arg(ap, char *);
77748+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
77749+ break;
77750+ case GR_TEXTREL:
77751+ file = va_arg(ap, struct file *);
77752+ ulong1 = va_arg(ap, unsigned long);
77753+ ulong2 = va_arg(ap, unsigned long);
77754+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
77755+ break;
77756+ case GR_PTRACE:
77757+ task = va_arg(ap, struct task_struct *);
77758+ 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));
77759+ break;
77760+ case GR_RESOURCE:
77761+ task = va_arg(ap, struct task_struct *);
77762+ cred = __task_cred(task);
77763+ pcred = __task_cred(task->real_parent);
77764+ ulong1 = va_arg(ap, unsigned long);
77765+ str1 = va_arg(ap, char *);
77766+ ulong2 = va_arg(ap, unsigned long);
77767+ 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));
77768+ break;
77769+ case GR_CAP:
77770+ task = va_arg(ap, struct task_struct *);
77771+ cred = __task_cred(task);
77772+ pcred = __task_cred(task->real_parent);
77773+ str1 = va_arg(ap, char *);
77774+ 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));
77775+ break;
77776+ case GR_SIG:
77777+ str1 = va_arg(ap, char *);
77778+ voidptr = va_arg(ap, void *);
77779+ gr_log_middle_varargs(audit, msg, str1, voidptr);
77780+ break;
77781+ case GR_SIG2:
77782+ task = va_arg(ap, struct task_struct *);
77783+ cred = __task_cred(task);
77784+ pcred = __task_cred(task->real_parent);
77785+ num1 = va_arg(ap, int);
77786+ 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));
77787+ break;
77788+ case GR_CRASH1:
77789+ task = va_arg(ap, struct task_struct *);
77790+ cred = __task_cred(task);
77791+ pcred = __task_cred(task->real_parent);
77792+ ulong1 = va_arg(ap, unsigned long);
77793+ 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);
77794+ break;
77795+ case GR_CRASH2:
77796+ task = va_arg(ap, struct task_struct *);
77797+ cred = __task_cred(task);
77798+ pcred = __task_cred(task->real_parent);
77799+ ulong1 = va_arg(ap, unsigned long);
77800+ 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);
77801+ break;
77802+ case GR_RWXMAP:
77803+ file = va_arg(ap, struct file *);
77804+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
77805+ break;
77806+ case GR_RWXMAPVMA:
77807+ vma = va_arg(ap, struct vm_area_struct *);
77808+ if (vma->vm_file)
77809+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
77810+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
77811+ str1 = "<stack>";
77812+ else if (vma->vm_start <= current->mm->brk &&
77813+ vma->vm_end >= current->mm->start_brk)
77814+ str1 = "<heap>";
77815+ else
77816+ str1 = "<anonymous mapping>";
77817+ gr_log_middle_varargs(audit, msg, str1);
77818+ break;
77819+ case GR_PSACCT:
77820+ {
77821+ unsigned int wday, cday;
77822+ __u8 whr, chr;
77823+ __u8 wmin, cmin;
77824+ __u8 wsec, csec;
77825+ char cur_tty[64] = { 0 };
77826+ char parent_tty[64] = { 0 };
77827+
77828+ task = va_arg(ap, struct task_struct *);
77829+ wday = va_arg(ap, unsigned int);
77830+ cday = va_arg(ap, unsigned int);
77831+ whr = va_arg(ap, int);
77832+ chr = va_arg(ap, int);
77833+ wmin = va_arg(ap, int);
77834+ cmin = va_arg(ap, int);
77835+ wsec = va_arg(ap, int);
77836+ csec = va_arg(ap, int);
77837+ ulong1 = va_arg(ap, unsigned long);
77838+ cred = __task_cred(task);
77839+ pcred = __task_cred(task->real_parent);
77840+
77841+ 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));
77842+ }
77843+ break;
77844+ default:
77845+ gr_log_middle(audit, msg, ap);
77846+ }
77847+ va_end(ap);
77848+ // these don't need DEFAULTSECARGS printed on the end
77849+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
77850+ gr_log_end(audit, 0);
77851+ else
77852+ gr_log_end(audit, 1);
77853+ END_LOCKS(audit);
77854+}
77855diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
77856new file mode 100644
77857index 0000000..0e39d8c
77858--- /dev/null
77859+++ b/grsecurity/grsec_mem.c
77860@@ -0,0 +1,48 @@
77861+#include <linux/kernel.h>
77862+#include <linux/sched.h>
77863+#include <linux/mm.h>
77864+#include <linux/mman.h>
77865+#include <linux/module.h>
77866+#include <linux/grinternal.h>
77867+
77868+void gr_handle_msr_write(void)
77869+{
77870+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
77871+ return;
77872+}
77873+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
77874+
77875+void
77876+gr_handle_ioperm(void)
77877+{
77878+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
77879+ return;
77880+}
77881+
77882+void
77883+gr_handle_iopl(void)
77884+{
77885+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
77886+ return;
77887+}
77888+
77889+void
77890+gr_handle_mem_readwrite(u64 from, u64 to)
77891+{
77892+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
77893+ return;
77894+}
77895+
77896+void
77897+gr_handle_vm86(void)
77898+{
77899+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
77900+ return;
77901+}
77902+
77903+void
77904+gr_log_badprocpid(const char *entry)
77905+{
77906+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
77907+ return;
77908+}
77909diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
77910new file mode 100644
77911index 0000000..6f9eb73
77912--- /dev/null
77913+++ b/grsecurity/grsec_mount.c
77914@@ -0,0 +1,65 @@
77915+#include <linux/kernel.h>
77916+#include <linux/sched.h>
77917+#include <linux/mount.h>
77918+#include <linux/major.h>
77919+#include <linux/grsecurity.h>
77920+#include <linux/grinternal.h>
77921+
77922+void
77923+gr_log_remount(const char *devname, const int retval)
77924+{
77925+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77926+ if (grsec_enable_mount && (retval >= 0))
77927+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
77928+#endif
77929+ return;
77930+}
77931+
77932+void
77933+gr_log_unmount(const char *devname, const int retval)
77934+{
77935+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77936+ if (grsec_enable_mount && (retval >= 0))
77937+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
77938+#endif
77939+ return;
77940+}
77941+
77942+void
77943+gr_log_mount(const char *from, struct path *to, const int retval)
77944+{
77945+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77946+ if (grsec_enable_mount && (retval >= 0))
77947+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
77948+#endif
77949+ return;
77950+}
77951+
77952+int
77953+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
77954+{
77955+#ifdef CONFIG_GRKERNSEC_ROFS
77956+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
77957+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
77958+ return -EPERM;
77959+ } else
77960+ return 0;
77961+#endif
77962+ return 0;
77963+}
77964+
77965+int
77966+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
77967+{
77968+#ifdef CONFIG_GRKERNSEC_ROFS
77969+ struct inode *inode = dentry->d_inode;
77970+
77971+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
77972+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
77973+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
77974+ return -EPERM;
77975+ } else
77976+ return 0;
77977+#endif
77978+ return 0;
77979+}
77980diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
77981new file mode 100644
77982index 0000000..6ee9d50
77983--- /dev/null
77984+++ b/grsecurity/grsec_pax.c
77985@@ -0,0 +1,45 @@
77986+#include <linux/kernel.h>
77987+#include <linux/sched.h>
77988+#include <linux/mm.h>
77989+#include <linux/file.h>
77990+#include <linux/grinternal.h>
77991+#include <linux/grsecurity.h>
77992+
77993+void
77994+gr_log_textrel(struct vm_area_struct * vma)
77995+{
77996+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77997+ if (grsec_enable_log_rwxmaps)
77998+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
77999+#endif
78000+ return;
78001+}
78002+
78003+void gr_log_ptgnustack(struct file *file)
78004+{
78005+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78006+ if (grsec_enable_log_rwxmaps)
78007+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
78008+#endif
78009+ return;
78010+}
78011+
78012+void
78013+gr_log_rwxmmap(struct file *file)
78014+{
78015+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78016+ if (grsec_enable_log_rwxmaps)
78017+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
78018+#endif
78019+ return;
78020+}
78021+
78022+void
78023+gr_log_rwxmprotect(struct vm_area_struct *vma)
78024+{
78025+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78026+ if (grsec_enable_log_rwxmaps)
78027+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
78028+#endif
78029+ return;
78030+}
78031diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
78032new file mode 100644
78033index 0000000..2005a3a
78034--- /dev/null
78035+++ b/grsecurity/grsec_proc.c
78036@@ -0,0 +1,20 @@
78037+#include <linux/kernel.h>
78038+#include <linux/sched.h>
78039+#include <linux/grsecurity.h>
78040+#include <linux/grinternal.h>
78041+
78042+int gr_proc_is_restricted(void)
78043+{
78044+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78045+ const struct cred *cred = current_cred();
78046+#endif
78047+
78048+#ifdef CONFIG_GRKERNSEC_PROC_USER
78049+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
78050+ return -EACCES;
78051+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78052+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
78053+ return -EACCES;
78054+#endif
78055+ return 0;
78056+}
78057diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
78058new file mode 100644
78059index 0000000..f7f29aa
78060--- /dev/null
78061+++ b/grsecurity/grsec_ptrace.c
78062@@ -0,0 +1,30 @@
78063+#include <linux/kernel.h>
78064+#include <linux/sched.h>
78065+#include <linux/grinternal.h>
78066+#include <linux/security.h>
78067+
78068+void
78069+gr_audit_ptrace(struct task_struct *task)
78070+{
78071+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78072+ if (grsec_enable_audit_ptrace)
78073+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
78074+#endif
78075+ return;
78076+}
78077+
78078+int
78079+gr_ptrace_readexec(struct file *file, int unsafe_flags)
78080+{
78081+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78082+ const struct dentry *dentry = file->f_path.dentry;
78083+ const struct vfsmount *mnt = file->f_path.mnt;
78084+
78085+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
78086+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
78087+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
78088+ return -EACCES;
78089+ }
78090+#endif
78091+ return 0;
78092+}
78093diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
78094new file mode 100644
78095index 0000000..3860c7e
78096--- /dev/null
78097+++ b/grsecurity/grsec_sig.c
78098@@ -0,0 +1,236 @@
78099+#include <linux/kernel.h>
78100+#include <linux/sched.h>
78101+#include <linux/fs.h>
78102+#include <linux/delay.h>
78103+#include <linux/grsecurity.h>
78104+#include <linux/grinternal.h>
78105+#include <linux/hardirq.h>
78106+
78107+char *signames[] = {
78108+ [SIGSEGV] = "Segmentation fault",
78109+ [SIGILL] = "Illegal instruction",
78110+ [SIGABRT] = "Abort",
78111+ [SIGBUS] = "Invalid alignment/Bus error"
78112+};
78113+
78114+void
78115+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
78116+{
78117+#ifdef CONFIG_GRKERNSEC_SIGNAL
78118+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
78119+ (sig == SIGABRT) || (sig == SIGBUS))) {
78120+ if (task_pid_nr(t) == task_pid_nr(current)) {
78121+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
78122+ } else {
78123+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
78124+ }
78125+ }
78126+#endif
78127+ return;
78128+}
78129+
78130+int
78131+gr_handle_signal(const struct task_struct *p, const int sig)
78132+{
78133+#ifdef CONFIG_GRKERNSEC
78134+ /* ignore the 0 signal for protected task checks */
78135+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
78136+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
78137+ return -EPERM;
78138+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
78139+ return -EPERM;
78140+ }
78141+#endif
78142+ return 0;
78143+}
78144+
78145+#ifdef CONFIG_GRKERNSEC
78146+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
78147+
78148+int gr_fake_force_sig(int sig, struct task_struct *t)
78149+{
78150+ unsigned long int flags;
78151+ int ret, blocked, ignored;
78152+ struct k_sigaction *action;
78153+
78154+ spin_lock_irqsave(&t->sighand->siglock, flags);
78155+ action = &t->sighand->action[sig-1];
78156+ ignored = action->sa.sa_handler == SIG_IGN;
78157+ blocked = sigismember(&t->blocked, sig);
78158+ if (blocked || ignored) {
78159+ action->sa.sa_handler = SIG_DFL;
78160+ if (blocked) {
78161+ sigdelset(&t->blocked, sig);
78162+ recalc_sigpending_and_wake(t);
78163+ }
78164+ }
78165+ if (action->sa.sa_handler == SIG_DFL)
78166+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
78167+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
78168+
78169+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
78170+
78171+ return ret;
78172+}
78173+#endif
78174+
78175+#define GR_USER_BAN_TIME (15 * 60)
78176+#define GR_DAEMON_BRUTE_TIME (30 * 60)
78177+
78178+void gr_handle_brute_attach(int dumpable)
78179+{
78180+#ifdef CONFIG_GRKERNSEC_BRUTE
78181+ struct task_struct *p = current;
78182+ kuid_t uid = GLOBAL_ROOT_UID;
78183+ int daemon = 0;
78184+
78185+ if (!grsec_enable_brute)
78186+ return;
78187+
78188+ rcu_read_lock();
78189+ read_lock(&tasklist_lock);
78190+ read_lock(&grsec_exec_file_lock);
78191+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
78192+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
78193+ p->real_parent->brute = 1;
78194+ daemon = 1;
78195+ } else {
78196+ const struct cred *cred = __task_cred(p), *cred2;
78197+ struct task_struct *tsk, *tsk2;
78198+
78199+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
78200+ struct user_struct *user;
78201+
78202+ uid = cred->uid;
78203+
78204+ /* this is put upon execution past expiration */
78205+ user = find_user(uid);
78206+ if (user == NULL)
78207+ goto unlock;
78208+ user->suid_banned = 1;
78209+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
78210+ if (user->suid_ban_expires == ~0UL)
78211+ user->suid_ban_expires--;
78212+
78213+ /* only kill other threads of the same binary, from the same user */
78214+ do_each_thread(tsk2, tsk) {
78215+ cred2 = __task_cred(tsk);
78216+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
78217+ gr_fake_force_sig(SIGKILL, tsk);
78218+ } while_each_thread(tsk2, tsk);
78219+ }
78220+ }
78221+unlock:
78222+ read_unlock(&grsec_exec_file_lock);
78223+ read_unlock(&tasklist_lock);
78224+ rcu_read_unlock();
78225+
78226+ if (gr_is_global_nonroot(uid))
78227+ 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);
78228+ else if (daemon)
78229+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
78230+
78231+#endif
78232+ return;
78233+}
78234+
78235+void gr_handle_brute_check(void)
78236+{
78237+#ifdef CONFIG_GRKERNSEC_BRUTE
78238+ struct task_struct *p = current;
78239+
78240+ if (unlikely(p->brute)) {
78241+ if (!grsec_enable_brute)
78242+ p->brute = 0;
78243+ else if (time_before(get_seconds(), p->brute_expires))
78244+ msleep(30 * 1000);
78245+ }
78246+#endif
78247+ return;
78248+}
78249+
78250+void gr_handle_kernel_exploit(void)
78251+{
78252+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78253+ const struct cred *cred;
78254+ struct task_struct *tsk, *tsk2;
78255+ struct user_struct *user;
78256+ kuid_t uid;
78257+
78258+ if (in_irq() || in_serving_softirq() || in_nmi())
78259+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
78260+
78261+ uid = current_uid();
78262+
78263+ if (gr_is_global_root(uid))
78264+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
78265+ else {
78266+ /* kill all the processes of this user, hold a reference
78267+ to their creds struct, and prevent them from creating
78268+ another process until system reset
78269+ */
78270+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
78271+ GR_GLOBAL_UID(uid));
78272+ /* we intentionally leak this ref */
78273+ user = get_uid(current->cred->user);
78274+ if (user)
78275+ user->kernel_banned = 1;
78276+
78277+ /* kill all processes of this user */
78278+ read_lock(&tasklist_lock);
78279+ do_each_thread(tsk2, tsk) {
78280+ cred = __task_cred(tsk);
78281+ if (uid_eq(cred->uid, uid))
78282+ gr_fake_force_sig(SIGKILL, tsk);
78283+ } while_each_thread(tsk2, tsk);
78284+ read_unlock(&tasklist_lock);
78285+ }
78286+#endif
78287+}
78288+
78289+#ifdef CONFIG_GRKERNSEC_BRUTE
78290+static bool suid_ban_expired(struct user_struct *user)
78291+{
78292+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
78293+ user->suid_banned = 0;
78294+ user->suid_ban_expires = 0;
78295+ free_uid(user);
78296+ return true;
78297+ }
78298+
78299+ return false;
78300+}
78301+#endif
78302+
78303+int gr_process_kernel_exec_ban(void)
78304+{
78305+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78306+ if (unlikely(current->cred->user->kernel_banned))
78307+ return -EPERM;
78308+#endif
78309+ return 0;
78310+}
78311+
78312+int gr_process_kernel_setuid_ban(struct user_struct *user)
78313+{
78314+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78315+ if (unlikely(user->kernel_banned))
78316+ gr_fake_force_sig(SIGKILL, current);
78317+#endif
78318+ return 0;
78319+}
78320+
78321+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
78322+{
78323+#ifdef CONFIG_GRKERNSEC_BRUTE
78324+ struct user_struct *user = current->cred->user;
78325+ if (unlikely(user->suid_banned)) {
78326+ if (suid_ban_expired(user))
78327+ return 0;
78328+ /* disallow execution of suid binaries only */
78329+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
78330+ return -EPERM;
78331+ }
78332+#endif
78333+ return 0;
78334+}
78335diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
78336new file mode 100644
78337index 0000000..e3650b6
78338--- /dev/null
78339+++ b/grsecurity/grsec_sock.c
78340@@ -0,0 +1,244 @@
78341+#include <linux/kernel.h>
78342+#include <linux/module.h>
78343+#include <linux/sched.h>
78344+#include <linux/file.h>
78345+#include <linux/net.h>
78346+#include <linux/in.h>
78347+#include <linux/ip.h>
78348+#include <net/sock.h>
78349+#include <net/inet_sock.h>
78350+#include <linux/grsecurity.h>
78351+#include <linux/grinternal.h>
78352+#include <linux/gracl.h>
78353+
78354+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
78355+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
78356+
78357+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
78358+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
78359+
78360+#ifdef CONFIG_UNIX_MODULE
78361+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
78362+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
78363+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
78364+EXPORT_SYMBOL_GPL(gr_handle_create);
78365+#endif
78366+
78367+#ifdef CONFIG_GRKERNSEC
78368+#define gr_conn_table_size 32749
78369+struct conn_table_entry {
78370+ struct conn_table_entry *next;
78371+ struct signal_struct *sig;
78372+};
78373+
78374+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
78375+DEFINE_SPINLOCK(gr_conn_table_lock);
78376+
78377+extern const char * gr_socktype_to_name(unsigned char type);
78378+extern const char * gr_proto_to_name(unsigned char proto);
78379+extern const char * gr_sockfamily_to_name(unsigned char family);
78380+
78381+static __inline__ int
78382+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
78383+{
78384+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
78385+}
78386+
78387+static __inline__ int
78388+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
78389+ __u16 sport, __u16 dport)
78390+{
78391+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
78392+ sig->gr_sport == sport && sig->gr_dport == dport))
78393+ return 1;
78394+ else
78395+ return 0;
78396+}
78397+
78398+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
78399+{
78400+ struct conn_table_entry **match;
78401+ unsigned int index;
78402+
78403+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78404+ sig->gr_sport, sig->gr_dport,
78405+ gr_conn_table_size);
78406+
78407+ newent->sig = sig;
78408+
78409+ match = &gr_conn_table[index];
78410+ newent->next = *match;
78411+ *match = newent;
78412+
78413+ return;
78414+}
78415+
78416+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
78417+{
78418+ struct conn_table_entry *match, *last = NULL;
78419+ unsigned int index;
78420+
78421+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78422+ sig->gr_sport, sig->gr_dport,
78423+ gr_conn_table_size);
78424+
78425+ match = gr_conn_table[index];
78426+ while (match && !conn_match(match->sig,
78427+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
78428+ sig->gr_dport)) {
78429+ last = match;
78430+ match = match->next;
78431+ }
78432+
78433+ if (match) {
78434+ if (last)
78435+ last->next = match->next;
78436+ else
78437+ gr_conn_table[index] = NULL;
78438+ kfree(match);
78439+ }
78440+
78441+ return;
78442+}
78443+
78444+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
78445+ __u16 sport, __u16 dport)
78446+{
78447+ struct conn_table_entry *match;
78448+ unsigned int index;
78449+
78450+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
78451+
78452+ match = gr_conn_table[index];
78453+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
78454+ match = match->next;
78455+
78456+ if (match)
78457+ return match->sig;
78458+ else
78459+ return NULL;
78460+}
78461+
78462+#endif
78463+
78464+void gr_update_task_in_ip_table(const struct inet_sock *inet)
78465+{
78466+#ifdef CONFIG_GRKERNSEC
78467+ struct signal_struct *sig = current->signal;
78468+ struct conn_table_entry *newent;
78469+
78470+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
78471+ if (newent == NULL)
78472+ return;
78473+ /* no bh lock needed since we are called with bh disabled */
78474+ spin_lock(&gr_conn_table_lock);
78475+ gr_del_task_from_ip_table_nolock(sig);
78476+ sig->gr_saddr = inet->inet_rcv_saddr;
78477+ sig->gr_daddr = inet->inet_daddr;
78478+ sig->gr_sport = inet->inet_sport;
78479+ sig->gr_dport = inet->inet_dport;
78480+ gr_add_to_task_ip_table_nolock(sig, newent);
78481+ spin_unlock(&gr_conn_table_lock);
78482+#endif
78483+ return;
78484+}
78485+
78486+void gr_del_task_from_ip_table(struct task_struct *task)
78487+{
78488+#ifdef CONFIG_GRKERNSEC
78489+ spin_lock_bh(&gr_conn_table_lock);
78490+ gr_del_task_from_ip_table_nolock(task->signal);
78491+ spin_unlock_bh(&gr_conn_table_lock);
78492+#endif
78493+ return;
78494+}
78495+
78496+void
78497+gr_attach_curr_ip(const struct sock *sk)
78498+{
78499+#ifdef CONFIG_GRKERNSEC
78500+ struct signal_struct *p, *set;
78501+ const struct inet_sock *inet = inet_sk(sk);
78502+
78503+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
78504+ return;
78505+
78506+ set = current->signal;
78507+
78508+ spin_lock_bh(&gr_conn_table_lock);
78509+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
78510+ inet->inet_dport, inet->inet_sport);
78511+ if (unlikely(p != NULL)) {
78512+ set->curr_ip = p->curr_ip;
78513+ set->used_accept = 1;
78514+ gr_del_task_from_ip_table_nolock(p);
78515+ spin_unlock_bh(&gr_conn_table_lock);
78516+ return;
78517+ }
78518+ spin_unlock_bh(&gr_conn_table_lock);
78519+
78520+ set->curr_ip = inet->inet_daddr;
78521+ set->used_accept = 1;
78522+#endif
78523+ return;
78524+}
78525+
78526+int
78527+gr_handle_sock_all(const int family, const int type, const int protocol)
78528+{
78529+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78530+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
78531+ (family != AF_UNIX)) {
78532+ if (family == AF_INET)
78533+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
78534+ else
78535+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
78536+ return -EACCES;
78537+ }
78538+#endif
78539+ return 0;
78540+}
78541+
78542+int
78543+gr_handle_sock_server(const struct sockaddr *sck)
78544+{
78545+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78546+ if (grsec_enable_socket_server &&
78547+ in_group_p(grsec_socket_server_gid) &&
78548+ sck && (sck->sa_family != AF_UNIX) &&
78549+ (sck->sa_family != AF_LOCAL)) {
78550+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78551+ return -EACCES;
78552+ }
78553+#endif
78554+ return 0;
78555+}
78556+
78557+int
78558+gr_handle_sock_server_other(const struct sock *sck)
78559+{
78560+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78561+ if (grsec_enable_socket_server &&
78562+ in_group_p(grsec_socket_server_gid) &&
78563+ sck && (sck->sk_family != AF_UNIX) &&
78564+ (sck->sk_family != AF_LOCAL)) {
78565+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78566+ return -EACCES;
78567+ }
78568+#endif
78569+ return 0;
78570+}
78571+
78572+int
78573+gr_handle_sock_client(const struct sockaddr *sck)
78574+{
78575+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78576+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
78577+ sck && (sck->sa_family != AF_UNIX) &&
78578+ (sck->sa_family != AF_LOCAL)) {
78579+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
78580+ return -EACCES;
78581+ }
78582+#endif
78583+ return 0;
78584+}
78585diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
78586new file mode 100644
78587index 0000000..cce889e
78588--- /dev/null
78589+++ b/grsecurity/grsec_sysctl.c
78590@@ -0,0 +1,488 @@
78591+#include <linux/kernel.h>
78592+#include <linux/sched.h>
78593+#include <linux/sysctl.h>
78594+#include <linux/grsecurity.h>
78595+#include <linux/grinternal.h>
78596+
78597+int
78598+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
78599+{
78600+#ifdef CONFIG_GRKERNSEC_SYSCTL
78601+ if (dirname == NULL || name == NULL)
78602+ return 0;
78603+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
78604+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
78605+ return -EACCES;
78606+ }
78607+#endif
78608+ return 0;
78609+}
78610+
78611+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
78612+static int __maybe_unused __read_only one = 1;
78613+#endif
78614+
78615+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
78616+ defined(CONFIG_GRKERNSEC_DENYUSB)
78617+struct ctl_table grsecurity_table[] = {
78618+#ifdef CONFIG_GRKERNSEC_SYSCTL
78619+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
78620+#ifdef CONFIG_GRKERNSEC_IO
78621+ {
78622+ .procname = "disable_priv_io",
78623+ .data = &grsec_disable_privio,
78624+ .maxlen = sizeof(int),
78625+ .mode = 0600,
78626+ .proc_handler = &proc_dointvec,
78627+ },
78628+#endif
78629+#endif
78630+#ifdef CONFIG_GRKERNSEC_LINK
78631+ {
78632+ .procname = "linking_restrictions",
78633+ .data = &grsec_enable_link,
78634+ .maxlen = sizeof(int),
78635+ .mode = 0600,
78636+ .proc_handler = &proc_dointvec,
78637+ },
78638+#endif
78639+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
78640+ {
78641+ .procname = "enforce_symlinksifowner",
78642+ .data = &grsec_enable_symlinkown,
78643+ .maxlen = sizeof(int),
78644+ .mode = 0600,
78645+ .proc_handler = &proc_dointvec,
78646+ },
78647+ {
78648+ .procname = "symlinkown_gid",
78649+ .data = &grsec_symlinkown_gid,
78650+ .maxlen = sizeof(int),
78651+ .mode = 0600,
78652+ .proc_handler = &proc_dointvec,
78653+ },
78654+#endif
78655+#ifdef CONFIG_GRKERNSEC_BRUTE
78656+ {
78657+ .procname = "deter_bruteforce",
78658+ .data = &grsec_enable_brute,
78659+ .maxlen = sizeof(int),
78660+ .mode = 0600,
78661+ .proc_handler = &proc_dointvec,
78662+ },
78663+#endif
78664+#ifdef CONFIG_GRKERNSEC_FIFO
78665+ {
78666+ .procname = "fifo_restrictions",
78667+ .data = &grsec_enable_fifo,
78668+ .maxlen = sizeof(int),
78669+ .mode = 0600,
78670+ .proc_handler = &proc_dointvec,
78671+ },
78672+#endif
78673+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78674+ {
78675+ .procname = "ptrace_readexec",
78676+ .data = &grsec_enable_ptrace_readexec,
78677+ .maxlen = sizeof(int),
78678+ .mode = 0600,
78679+ .proc_handler = &proc_dointvec,
78680+ },
78681+#endif
78682+#ifdef CONFIG_GRKERNSEC_SETXID
78683+ {
78684+ .procname = "consistent_setxid",
78685+ .data = &grsec_enable_setxid,
78686+ .maxlen = sizeof(int),
78687+ .mode = 0600,
78688+ .proc_handler = &proc_dointvec,
78689+ },
78690+#endif
78691+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78692+ {
78693+ .procname = "ip_blackhole",
78694+ .data = &grsec_enable_blackhole,
78695+ .maxlen = sizeof(int),
78696+ .mode = 0600,
78697+ .proc_handler = &proc_dointvec,
78698+ },
78699+ {
78700+ .procname = "lastack_retries",
78701+ .data = &grsec_lastack_retries,
78702+ .maxlen = sizeof(int),
78703+ .mode = 0600,
78704+ .proc_handler = &proc_dointvec,
78705+ },
78706+#endif
78707+#ifdef CONFIG_GRKERNSEC_EXECLOG
78708+ {
78709+ .procname = "exec_logging",
78710+ .data = &grsec_enable_execlog,
78711+ .maxlen = sizeof(int),
78712+ .mode = 0600,
78713+ .proc_handler = &proc_dointvec,
78714+ },
78715+#endif
78716+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78717+ {
78718+ .procname = "rwxmap_logging",
78719+ .data = &grsec_enable_log_rwxmaps,
78720+ .maxlen = sizeof(int),
78721+ .mode = 0600,
78722+ .proc_handler = &proc_dointvec,
78723+ },
78724+#endif
78725+#ifdef CONFIG_GRKERNSEC_SIGNAL
78726+ {
78727+ .procname = "signal_logging",
78728+ .data = &grsec_enable_signal,
78729+ .maxlen = sizeof(int),
78730+ .mode = 0600,
78731+ .proc_handler = &proc_dointvec,
78732+ },
78733+#endif
78734+#ifdef CONFIG_GRKERNSEC_FORKFAIL
78735+ {
78736+ .procname = "forkfail_logging",
78737+ .data = &grsec_enable_forkfail,
78738+ .maxlen = sizeof(int),
78739+ .mode = 0600,
78740+ .proc_handler = &proc_dointvec,
78741+ },
78742+#endif
78743+#ifdef CONFIG_GRKERNSEC_TIME
78744+ {
78745+ .procname = "timechange_logging",
78746+ .data = &grsec_enable_time,
78747+ .maxlen = sizeof(int),
78748+ .mode = 0600,
78749+ .proc_handler = &proc_dointvec,
78750+ },
78751+#endif
78752+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
78753+ {
78754+ .procname = "chroot_deny_shmat",
78755+ .data = &grsec_enable_chroot_shmat,
78756+ .maxlen = sizeof(int),
78757+ .mode = 0600,
78758+ .proc_handler = &proc_dointvec,
78759+ },
78760+#endif
78761+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
78762+ {
78763+ .procname = "chroot_deny_unix",
78764+ .data = &grsec_enable_chroot_unix,
78765+ .maxlen = sizeof(int),
78766+ .mode = 0600,
78767+ .proc_handler = &proc_dointvec,
78768+ },
78769+#endif
78770+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
78771+ {
78772+ .procname = "chroot_deny_mount",
78773+ .data = &grsec_enable_chroot_mount,
78774+ .maxlen = sizeof(int),
78775+ .mode = 0600,
78776+ .proc_handler = &proc_dointvec,
78777+ },
78778+#endif
78779+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
78780+ {
78781+ .procname = "chroot_deny_fchdir",
78782+ .data = &grsec_enable_chroot_fchdir,
78783+ .maxlen = sizeof(int),
78784+ .mode = 0600,
78785+ .proc_handler = &proc_dointvec,
78786+ },
78787+#endif
78788+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
78789+ {
78790+ .procname = "chroot_deny_chroot",
78791+ .data = &grsec_enable_chroot_double,
78792+ .maxlen = sizeof(int),
78793+ .mode = 0600,
78794+ .proc_handler = &proc_dointvec,
78795+ },
78796+#endif
78797+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
78798+ {
78799+ .procname = "chroot_deny_pivot",
78800+ .data = &grsec_enable_chroot_pivot,
78801+ .maxlen = sizeof(int),
78802+ .mode = 0600,
78803+ .proc_handler = &proc_dointvec,
78804+ },
78805+#endif
78806+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
78807+ {
78808+ .procname = "chroot_enforce_chdir",
78809+ .data = &grsec_enable_chroot_chdir,
78810+ .maxlen = sizeof(int),
78811+ .mode = 0600,
78812+ .proc_handler = &proc_dointvec,
78813+ },
78814+#endif
78815+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
78816+ {
78817+ .procname = "chroot_deny_chmod",
78818+ .data = &grsec_enable_chroot_chmod,
78819+ .maxlen = sizeof(int),
78820+ .mode = 0600,
78821+ .proc_handler = &proc_dointvec,
78822+ },
78823+#endif
78824+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
78825+ {
78826+ .procname = "chroot_deny_mknod",
78827+ .data = &grsec_enable_chroot_mknod,
78828+ .maxlen = sizeof(int),
78829+ .mode = 0600,
78830+ .proc_handler = &proc_dointvec,
78831+ },
78832+#endif
78833+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
78834+ {
78835+ .procname = "chroot_restrict_nice",
78836+ .data = &grsec_enable_chroot_nice,
78837+ .maxlen = sizeof(int),
78838+ .mode = 0600,
78839+ .proc_handler = &proc_dointvec,
78840+ },
78841+#endif
78842+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
78843+ {
78844+ .procname = "chroot_execlog",
78845+ .data = &grsec_enable_chroot_execlog,
78846+ .maxlen = sizeof(int),
78847+ .mode = 0600,
78848+ .proc_handler = &proc_dointvec,
78849+ },
78850+#endif
78851+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
78852+ {
78853+ .procname = "chroot_caps",
78854+ .data = &grsec_enable_chroot_caps,
78855+ .maxlen = sizeof(int),
78856+ .mode = 0600,
78857+ .proc_handler = &proc_dointvec,
78858+ },
78859+#endif
78860+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
78861+ {
78862+ .procname = "chroot_deny_bad_rename",
78863+ .data = &grsec_enable_chroot_rename,
78864+ .maxlen = sizeof(int),
78865+ .mode = 0600,
78866+ .proc_handler = &proc_dointvec,
78867+ },
78868+#endif
78869+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
78870+ {
78871+ .procname = "chroot_deny_sysctl",
78872+ .data = &grsec_enable_chroot_sysctl,
78873+ .maxlen = sizeof(int),
78874+ .mode = 0600,
78875+ .proc_handler = &proc_dointvec,
78876+ },
78877+#endif
78878+#ifdef CONFIG_GRKERNSEC_TPE
78879+ {
78880+ .procname = "tpe",
78881+ .data = &grsec_enable_tpe,
78882+ .maxlen = sizeof(int),
78883+ .mode = 0600,
78884+ .proc_handler = &proc_dointvec,
78885+ },
78886+ {
78887+ .procname = "tpe_gid",
78888+ .data = &grsec_tpe_gid,
78889+ .maxlen = sizeof(int),
78890+ .mode = 0600,
78891+ .proc_handler = &proc_dointvec,
78892+ },
78893+#endif
78894+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78895+ {
78896+ .procname = "tpe_invert",
78897+ .data = &grsec_enable_tpe_invert,
78898+ .maxlen = sizeof(int),
78899+ .mode = 0600,
78900+ .proc_handler = &proc_dointvec,
78901+ },
78902+#endif
78903+#ifdef CONFIG_GRKERNSEC_TPE_ALL
78904+ {
78905+ .procname = "tpe_restrict_all",
78906+ .data = &grsec_enable_tpe_all,
78907+ .maxlen = sizeof(int),
78908+ .mode = 0600,
78909+ .proc_handler = &proc_dointvec,
78910+ },
78911+#endif
78912+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78913+ {
78914+ .procname = "socket_all",
78915+ .data = &grsec_enable_socket_all,
78916+ .maxlen = sizeof(int),
78917+ .mode = 0600,
78918+ .proc_handler = &proc_dointvec,
78919+ },
78920+ {
78921+ .procname = "socket_all_gid",
78922+ .data = &grsec_socket_all_gid,
78923+ .maxlen = sizeof(int),
78924+ .mode = 0600,
78925+ .proc_handler = &proc_dointvec,
78926+ },
78927+#endif
78928+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78929+ {
78930+ .procname = "socket_client",
78931+ .data = &grsec_enable_socket_client,
78932+ .maxlen = sizeof(int),
78933+ .mode = 0600,
78934+ .proc_handler = &proc_dointvec,
78935+ },
78936+ {
78937+ .procname = "socket_client_gid",
78938+ .data = &grsec_socket_client_gid,
78939+ .maxlen = sizeof(int),
78940+ .mode = 0600,
78941+ .proc_handler = &proc_dointvec,
78942+ },
78943+#endif
78944+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78945+ {
78946+ .procname = "socket_server",
78947+ .data = &grsec_enable_socket_server,
78948+ .maxlen = sizeof(int),
78949+ .mode = 0600,
78950+ .proc_handler = &proc_dointvec,
78951+ },
78952+ {
78953+ .procname = "socket_server_gid",
78954+ .data = &grsec_socket_server_gid,
78955+ .maxlen = sizeof(int),
78956+ .mode = 0600,
78957+ .proc_handler = &proc_dointvec,
78958+ },
78959+#endif
78960+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
78961+ {
78962+ .procname = "audit_group",
78963+ .data = &grsec_enable_group,
78964+ .maxlen = sizeof(int),
78965+ .mode = 0600,
78966+ .proc_handler = &proc_dointvec,
78967+ },
78968+ {
78969+ .procname = "audit_gid",
78970+ .data = &grsec_audit_gid,
78971+ .maxlen = sizeof(int),
78972+ .mode = 0600,
78973+ .proc_handler = &proc_dointvec,
78974+ },
78975+#endif
78976+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
78977+ {
78978+ .procname = "audit_chdir",
78979+ .data = &grsec_enable_chdir,
78980+ .maxlen = sizeof(int),
78981+ .mode = 0600,
78982+ .proc_handler = &proc_dointvec,
78983+ },
78984+#endif
78985+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78986+ {
78987+ .procname = "audit_mount",
78988+ .data = &grsec_enable_mount,
78989+ .maxlen = sizeof(int),
78990+ .mode = 0600,
78991+ .proc_handler = &proc_dointvec,
78992+ },
78993+#endif
78994+#ifdef CONFIG_GRKERNSEC_DMESG
78995+ {
78996+ .procname = "dmesg",
78997+ .data = &grsec_enable_dmesg,
78998+ .maxlen = sizeof(int),
78999+ .mode = 0600,
79000+ .proc_handler = &proc_dointvec,
79001+ },
79002+#endif
79003+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
79004+ {
79005+ .procname = "chroot_findtask",
79006+ .data = &grsec_enable_chroot_findtask,
79007+ .maxlen = sizeof(int),
79008+ .mode = 0600,
79009+ .proc_handler = &proc_dointvec,
79010+ },
79011+#endif
79012+#ifdef CONFIG_GRKERNSEC_RESLOG
79013+ {
79014+ .procname = "resource_logging",
79015+ .data = &grsec_resource_logging,
79016+ .maxlen = sizeof(int),
79017+ .mode = 0600,
79018+ .proc_handler = &proc_dointvec,
79019+ },
79020+#endif
79021+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
79022+ {
79023+ .procname = "audit_ptrace",
79024+ .data = &grsec_enable_audit_ptrace,
79025+ .maxlen = sizeof(int),
79026+ .mode = 0600,
79027+ .proc_handler = &proc_dointvec,
79028+ },
79029+#endif
79030+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
79031+ {
79032+ .procname = "harden_ptrace",
79033+ .data = &grsec_enable_harden_ptrace,
79034+ .maxlen = sizeof(int),
79035+ .mode = 0600,
79036+ .proc_handler = &proc_dointvec,
79037+ },
79038+#endif
79039+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
79040+ {
79041+ .procname = "harden_ipc",
79042+ .data = &grsec_enable_harden_ipc,
79043+ .maxlen = sizeof(int),
79044+ .mode = 0600,
79045+ .proc_handler = &proc_dointvec,
79046+ },
79047+#endif
79048+ {
79049+ .procname = "grsec_lock",
79050+ .data = &grsec_lock,
79051+ .maxlen = sizeof(int),
79052+ .mode = 0600,
79053+ .proc_handler = &proc_dointvec,
79054+ },
79055+#endif
79056+#ifdef CONFIG_GRKERNSEC_ROFS
79057+ {
79058+ .procname = "romount_protect",
79059+ .data = &grsec_enable_rofs,
79060+ .maxlen = sizeof(int),
79061+ .mode = 0600,
79062+ .proc_handler = &proc_dointvec_minmax,
79063+ .extra1 = &one,
79064+ .extra2 = &one,
79065+ },
79066+#endif
79067+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
79068+ {
79069+ .procname = "deny_new_usb",
79070+ .data = &grsec_deny_new_usb,
79071+ .maxlen = sizeof(int),
79072+ .mode = 0600,
79073+ .proc_handler = &proc_dointvec,
79074+ },
79075+#endif
79076+ { }
79077+};
79078+#endif
79079diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
79080new file mode 100644
79081index 0000000..61b514e
79082--- /dev/null
79083+++ b/grsecurity/grsec_time.c
79084@@ -0,0 +1,16 @@
79085+#include <linux/kernel.h>
79086+#include <linux/sched.h>
79087+#include <linux/grinternal.h>
79088+#include <linux/module.h>
79089+
79090+void
79091+gr_log_timechange(void)
79092+{
79093+#ifdef CONFIG_GRKERNSEC_TIME
79094+ if (grsec_enable_time)
79095+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
79096+#endif
79097+ return;
79098+}
79099+
79100+EXPORT_SYMBOL_GPL(gr_log_timechange);
79101diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
79102new file mode 100644
79103index 0000000..d1953de
79104--- /dev/null
79105+++ b/grsecurity/grsec_tpe.c
79106@@ -0,0 +1,78 @@
79107+#include <linux/kernel.h>
79108+#include <linux/sched.h>
79109+#include <linux/file.h>
79110+#include <linux/fs.h>
79111+#include <linux/grinternal.h>
79112+
79113+extern int gr_acl_tpe_check(void);
79114+
79115+int
79116+gr_tpe_allow(const struct file *file)
79117+{
79118+#ifdef CONFIG_GRKERNSEC
79119+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
79120+ struct inode *file_inode = file->f_path.dentry->d_inode;
79121+ const struct cred *cred = current_cred();
79122+ char *msg = NULL;
79123+ char *msg2 = NULL;
79124+
79125+ // never restrict root
79126+ if (gr_is_global_root(cred->uid))
79127+ return 1;
79128+
79129+ if (grsec_enable_tpe) {
79130+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
79131+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
79132+ msg = "not being in trusted group";
79133+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
79134+ msg = "being in untrusted group";
79135+#else
79136+ if (in_group_p(grsec_tpe_gid))
79137+ msg = "being in untrusted group";
79138+#endif
79139+ }
79140+ if (!msg && gr_acl_tpe_check())
79141+ msg = "being in untrusted role";
79142+
79143+ // not in any affected group/role
79144+ if (!msg)
79145+ goto next_check;
79146+
79147+ if (gr_is_global_nonroot(inode->i_uid))
79148+ msg2 = "file in non-root-owned directory";
79149+ else if (inode->i_mode & S_IWOTH)
79150+ msg2 = "file in world-writable directory";
79151+ else if (inode->i_mode & S_IWGRP)
79152+ msg2 = "file in group-writable directory";
79153+ else if (file_inode->i_mode & S_IWOTH)
79154+ msg2 = "file is world-writable";
79155+
79156+ if (msg && msg2) {
79157+ char fullmsg[70] = {0};
79158+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
79159+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
79160+ return 0;
79161+ }
79162+ msg = NULL;
79163+next_check:
79164+#ifdef CONFIG_GRKERNSEC_TPE_ALL
79165+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
79166+ return 1;
79167+
79168+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
79169+ msg = "directory not owned by user";
79170+ else if (inode->i_mode & S_IWOTH)
79171+ msg = "file in world-writable directory";
79172+ else if (inode->i_mode & S_IWGRP)
79173+ msg = "file in group-writable directory";
79174+ else if (file_inode->i_mode & S_IWOTH)
79175+ msg = "file is world-writable";
79176+
79177+ if (msg) {
79178+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
79179+ return 0;
79180+ }
79181+#endif
79182+#endif
79183+ return 1;
79184+}
79185diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
79186new file mode 100644
79187index 0000000..ae02d8e
79188--- /dev/null
79189+++ b/grsecurity/grsec_usb.c
79190@@ -0,0 +1,15 @@
79191+#include <linux/kernel.h>
79192+#include <linux/grinternal.h>
79193+#include <linux/module.h>
79194+
79195+int gr_handle_new_usb(void)
79196+{
79197+#ifdef CONFIG_GRKERNSEC_DENYUSB
79198+ if (grsec_deny_new_usb) {
79199+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
79200+ return 1;
79201+ }
79202+#endif
79203+ return 0;
79204+}
79205+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
79206diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
79207new file mode 100644
79208index 0000000..158b330
79209--- /dev/null
79210+++ b/grsecurity/grsum.c
79211@@ -0,0 +1,64 @@
79212+#include <linux/err.h>
79213+#include <linux/kernel.h>
79214+#include <linux/sched.h>
79215+#include <linux/mm.h>
79216+#include <linux/scatterlist.h>
79217+#include <linux/crypto.h>
79218+#include <linux/gracl.h>
79219+
79220+
79221+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
79222+#error "crypto and sha256 must be built into the kernel"
79223+#endif
79224+
79225+int
79226+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
79227+{
79228+ struct crypto_hash *tfm;
79229+ struct hash_desc desc;
79230+ struct scatterlist sg[2];
79231+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
79232+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
79233+ unsigned long *sumptr = (unsigned long *)sum;
79234+ int cryptres;
79235+ int retval = 1;
79236+ volatile int mismatched = 0;
79237+ volatile int dummy = 0;
79238+ unsigned int i;
79239+
79240+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
79241+ if (IS_ERR(tfm)) {
79242+ /* should never happen, since sha256 should be built in */
79243+ memset(entry->pw, 0, GR_PW_LEN);
79244+ return 1;
79245+ }
79246+
79247+ sg_init_table(sg, 2);
79248+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
79249+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
79250+
79251+ desc.tfm = tfm;
79252+ desc.flags = 0;
79253+
79254+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
79255+ temp_sum);
79256+
79257+ memset(entry->pw, 0, GR_PW_LEN);
79258+
79259+ if (cryptres)
79260+ goto out;
79261+
79262+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
79263+ if (sumptr[i] != tmpsumptr[i])
79264+ mismatched = 1;
79265+ else
79266+ dummy = 1; // waste a cycle
79267+
79268+ if (!mismatched)
79269+ retval = dummy - 1;
79270+
79271+out:
79272+ crypto_free_hash(tfm);
79273+
79274+ return retval;
79275+}
79276diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
79277index 77ff547..181834f 100644
79278--- a/include/asm-generic/4level-fixup.h
79279+++ b/include/asm-generic/4level-fixup.h
79280@@ -13,8 +13,10 @@
79281 #define pmd_alloc(mm, pud, address) \
79282 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
79283 NULL: pmd_offset(pud, address))
79284+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
79285
79286 #define pud_alloc(mm, pgd, address) (pgd)
79287+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
79288 #define pud_offset(pgd, start) (pgd)
79289 #define pud_none(pud) 0
79290 #define pud_bad(pud) 0
79291diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
79292index b7babf0..1e4b4f1 100644
79293--- a/include/asm-generic/atomic-long.h
79294+++ b/include/asm-generic/atomic-long.h
79295@@ -22,6 +22,12 @@
79296
79297 typedef atomic64_t atomic_long_t;
79298
79299+#ifdef CONFIG_PAX_REFCOUNT
79300+typedef atomic64_unchecked_t atomic_long_unchecked_t;
79301+#else
79302+typedef atomic64_t atomic_long_unchecked_t;
79303+#endif
79304+
79305 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
79306
79307 static inline long atomic_long_read(atomic_long_t *l)
79308@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79309 return (long)atomic64_read(v);
79310 }
79311
79312+#ifdef CONFIG_PAX_REFCOUNT
79313+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79314+{
79315+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79316+
79317+ return (long)atomic64_read_unchecked(v);
79318+}
79319+#endif
79320+
79321 static inline void atomic_long_set(atomic_long_t *l, long i)
79322 {
79323 atomic64_t *v = (atomic64_t *)l;
79324@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79325 atomic64_set(v, i);
79326 }
79327
79328+#ifdef CONFIG_PAX_REFCOUNT
79329+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79330+{
79331+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79332+
79333+ atomic64_set_unchecked(v, i);
79334+}
79335+#endif
79336+
79337 static inline void atomic_long_inc(atomic_long_t *l)
79338 {
79339 atomic64_t *v = (atomic64_t *)l;
79340@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79341 atomic64_inc(v);
79342 }
79343
79344+#ifdef CONFIG_PAX_REFCOUNT
79345+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79346+{
79347+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79348+
79349+ atomic64_inc_unchecked(v);
79350+}
79351+#endif
79352+
79353 static inline void atomic_long_dec(atomic_long_t *l)
79354 {
79355 atomic64_t *v = (atomic64_t *)l;
79356@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79357 atomic64_dec(v);
79358 }
79359
79360+#ifdef CONFIG_PAX_REFCOUNT
79361+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79362+{
79363+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79364+
79365+ atomic64_dec_unchecked(v);
79366+}
79367+#endif
79368+
79369 static inline void atomic_long_add(long i, atomic_long_t *l)
79370 {
79371 atomic64_t *v = (atomic64_t *)l;
79372@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79373 atomic64_add(i, v);
79374 }
79375
79376+#ifdef CONFIG_PAX_REFCOUNT
79377+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79378+{
79379+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79380+
79381+ atomic64_add_unchecked(i, v);
79382+}
79383+#endif
79384+
79385 static inline void atomic_long_sub(long i, atomic_long_t *l)
79386 {
79387 atomic64_t *v = (atomic64_t *)l;
79388@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79389 atomic64_sub(i, v);
79390 }
79391
79392+#ifdef CONFIG_PAX_REFCOUNT
79393+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79394+{
79395+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79396+
79397+ atomic64_sub_unchecked(i, v);
79398+}
79399+#endif
79400+
79401 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79402 {
79403 atomic64_t *v = (atomic64_t *)l;
79404@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79405 return atomic64_add_negative(i, v);
79406 }
79407
79408-static inline long atomic_long_add_return(long i, atomic_long_t *l)
79409+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79410 {
79411 atomic64_t *v = (atomic64_t *)l;
79412
79413 return (long)atomic64_add_return(i, v);
79414 }
79415
79416+#ifdef CONFIG_PAX_REFCOUNT
79417+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79418+{
79419+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79420+
79421+ return (long)atomic64_add_return_unchecked(i, v);
79422+}
79423+#endif
79424+
79425 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79426 {
79427 atomic64_t *v = (atomic64_t *)l;
79428@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79429 return (long)atomic64_inc_return(v);
79430 }
79431
79432+#ifdef CONFIG_PAX_REFCOUNT
79433+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79434+{
79435+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79436+
79437+ return (long)atomic64_inc_return_unchecked(v);
79438+}
79439+#endif
79440+
79441 static inline long atomic_long_dec_return(atomic_long_t *l)
79442 {
79443 atomic64_t *v = (atomic64_t *)l;
79444@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79445
79446 typedef atomic_t atomic_long_t;
79447
79448+#ifdef CONFIG_PAX_REFCOUNT
79449+typedef atomic_unchecked_t atomic_long_unchecked_t;
79450+#else
79451+typedef atomic_t atomic_long_unchecked_t;
79452+#endif
79453+
79454 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
79455 static inline long atomic_long_read(atomic_long_t *l)
79456 {
79457@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79458 return (long)atomic_read(v);
79459 }
79460
79461+#ifdef CONFIG_PAX_REFCOUNT
79462+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79463+{
79464+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79465+
79466+ return (long)atomic_read_unchecked(v);
79467+}
79468+#endif
79469+
79470 static inline void atomic_long_set(atomic_long_t *l, long i)
79471 {
79472 atomic_t *v = (atomic_t *)l;
79473@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79474 atomic_set(v, i);
79475 }
79476
79477+#ifdef CONFIG_PAX_REFCOUNT
79478+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79479+{
79480+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79481+
79482+ atomic_set_unchecked(v, i);
79483+}
79484+#endif
79485+
79486 static inline void atomic_long_inc(atomic_long_t *l)
79487 {
79488 atomic_t *v = (atomic_t *)l;
79489@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79490 atomic_inc(v);
79491 }
79492
79493+#ifdef CONFIG_PAX_REFCOUNT
79494+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79495+{
79496+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79497+
79498+ atomic_inc_unchecked(v);
79499+}
79500+#endif
79501+
79502 static inline void atomic_long_dec(atomic_long_t *l)
79503 {
79504 atomic_t *v = (atomic_t *)l;
79505@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79506 atomic_dec(v);
79507 }
79508
79509+#ifdef CONFIG_PAX_REFCOUNT
79510+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79511+{
79512+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79513+
79514+ atomic_dec_unchecked(v);
79515+}
79516+#endif
79517+
79518 static inline void atomic_long_add(long i, atomic_long_t *l)
79519 {
79520 atomic_t *v = (atomic_t *)l;
79521@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79522 atomic_add(i, v);
79523 }
79524
79525+#ifdef CONFIG_PAX_REFCOUNT
79526+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79527+{
79528+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79529+
79530+ atomic_add_unchecked(i, v);
79531+}
79532+#endif
79533+
79534 static inline void atomic_long_sub(long i, atomic_long_t *l)
79535 {
79536 atomic_t *v = (atomic_t *)l;
79537@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79538 atomic_sub(i, v);
79539 }
79540
79541+#ifdef CONFIG_PAX_REFCOUNT
79542+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79543+{
79544+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79545+
79546+ atomic_sub_unchecked(i, v);
79547+}
79548+#endif
79549+
79550 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79551 {
79552 atomic_t *v = (atomic_t *)l;
79553@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79554 return atomic_add_negative(i, v);
79555 }
79556
79557-static inline long atomic_long_add_return(long i, atomic_long_t *l)
79558+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79559 {
79560 atomic_t *v = (atomic_t *)l;
79561
79562 return (long)atomic_add_return(i, v);
79563 }
79564
79565+#ifdef CONFIG_PAX_REFCOUNT
79566+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79567+{
79568+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79569+
79570+ return (long)atomic_add_return_unchecked(i, v);
79571+}
79572+
79573+#endif
79574+
79575 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79576 {
79577 atomic_t *v = (atomic_t *)l;
79578@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79579 return (long)atomic_inc_return(v);
79580 }
79581
79582+#ifdef CONFIG_PAX_REFCOUNT
79583+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79584+{
79585+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79586+
79587+ return (long)atomic_inc_return_unchecked(v);
79588+}
79589+#endif
79590+
79591 static inline long atomic_long_dec_return(atomic_long_t *l)
79592 {
79593 atomic_t *v = (atomic_t *)l;
79594@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79595
79596 #endif /* BITS_PER_LONG == 64 */
79597
79598+#ifdef CONFIG_PAX_REFCOUNT
79599+static inline void pax_refcount_needs_these_functions(void)
79600+{
79601+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
79602+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
79603+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
79604+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
79605+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
79606+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
79607+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
79608+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
79609+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
79610+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
79611+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
79612+#ifdef CONFIG_X86
79613+ atomic_clear_mask_unchecked(0, NULL);
79614+ atomic_set_mask_unchecked(0, NULL);
79615+#endif
79616+
79617+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
79618+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
79619+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
79620+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
79621+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
79622+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
79623+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
79624+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
79625+}
79626+#else
79627+#define atomic_read_unchecked(v) atomic_read(v)
79628+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
79629+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
79630+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
79631+#define atomic_inc_unchecked(v) atomic_inc(v)
79632+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
79633+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
79634+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
79635+#define atomic_dec_unchecked(v) atomic_dec(v)
79636+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
79637+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
79638+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
79639+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
79640+
79641+#define atomic_long_read_unchecked(v) atomic_long_read(v)
79642+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
79643+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
79644+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
79645+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
79646+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
79647+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
79648+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
79649+#endif
79650+
79651 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
79652diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
79653index 30ad9c8..c70c170 100644
79654--- a/include/asm-generic/atomic64.h
79655+++ b/include/asm-generic/atomic64.h
79656@@ -16,6 +16,8 @@ typedef struct {
79657 long long counter;
79658 } atomic64_t;
79659
79660+typedef atomic64_t atomic64_unchecked_t;
79661+
79662 #define ATOMIC64_INIT(i) { (i) }
79663
79664 extern long long atomic64_read(const atomic64_t *v);
79665@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
79666 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
79667 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
79668
79669+#define atomic64_read_unchecked(v) atomic64_read(v)
79670+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
79671+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
79672+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
79673+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
79674+#define atomic64_inc_unchecked(v) atomic64_inc(v)
79675+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
79676+#define atomic64_dec_unchecked(v) atomic64_dec(v)
79677+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
79678+
79679 #endif /* _ASM_GENERIC_ATOMIC64_H */
79680diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
79681index 1402fa8..025a736 100644
79682--- a/include/asm-generic/barrier.h
79683+++ b/include/asm-generic/barrier.h
79684@@ -74,7 +74,7 @@
79685 do { \
79686 compiletime_assert_atomic_type(*p); \
79687 smp_mb(); \
79688- ACCESS_ONCE(*p) = (v); \
79689+ ACCESS_ONCE_RW(*p) = (v); \
79690 } while (0)
79691
79692 #define smp_load_acquire(p) \
79693diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
79694index a60a7cc..0fe12f2 100644
79695--- a/include/asm-generic/bitops/__fls.h
79696+++ b/include/asm-generic/bitops/__fls.h
79697@@ -9,7 +9,7 @@
79698 *
79699 * Undefined if no set bit exists, so code should check against 0 first.
79700 */
79701-static __always_inline unsigned long __fls(unsigned long word)
79702+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
79703 {
79704 int num = BITS_PER_LONG - 1;
79705
79706diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
79707index 0576d1f..dad6c71 100644
79708--- a/include/asm-generic/bitops/fls.h
79709+++ b/include/asm-generic/bitops/fls.h
79710@@ -9,7 +9,7 @@
79711 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
79712 */
79713
79714-static __always_inline int fls(int x)
79715+static __always_inline int __intentional_overflow(-1) fls(int x)
79716 {
79717 int r = 32;
79718
79719diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
79720index b097cf8..3d40e14 100644
79721--- a/include/asm-generic/bitops/fls64.h
79722+++ b/include/asm-generic/bitops/fls64.h
79723@@ -15,7 +15,7 @@
79724 * at position 64.
79725 */
79726 #if BITS_PER_LONG == 32
79727-static __always_inline int fls64(__u64 x)
79728+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79729 {
79730 __u32 h = x >> 32;
79731 if (h)
79732@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
79733 return fls(x);
79734 }
79735 #elif BITS_PER_LONG == 64
79736-static __always_inline int fls64(__u64 x)
79737+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79738 {
79739 if (x == 0)
79740 return 0;
79741diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
79742index 1bfcfe5..e04c5c9 100644
79743--- a/include/asm-generic/cache.h
79744+++ b/include/asm-generic/cache.h
79745@@ -6,7 +6,7 @@
79746 * cache lines need to provide their own cache.h.
79747 */
79748
79749-#define L1_CACHE_SHIFT 5
79750-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
79751+#define L1_CACHE_SHIFT 5UL
79752+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
79753
79754 #endif /* __ASM_GENERIC_CACHE_H */
79755diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
79756index 0d68a1e..b74a761 100644
79757--- a/include/asm-generic/emergency-restart.h
79758+++ b/include/asm-generic/emergency-restart.h
79759@@ -1,7 +1,7 @@
79760 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
79761 #define _ASM_GENERIC_EMERGENCY_RESTART_H
79762
79763-static inline void machine_emergency_restart(void)
79764+static inline __noreturn void machine_emergency_restart(void)
79765 {
79766 machine_restart(NULL);
79767 }
79768diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
79769index b8fdc57..c6d5a5c 100644
79770--- a/include/asm-generic/io.h
79771+++ b/include/asm-generic/io.h
79772@@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
79773 * These are pretty trivial
79774 */
79775 #ifndef virt_to_phys
79776-static inline unsigned long virt_to_phys(volatile void *address)
79777+static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
79778 {
79779 return __pa((unsigned long)address);
79780 }
79781diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
79782index 90f99c7..00ce236 100644
79783--- a/include/asm-generic/kmap_types.h
79784+++ b/include/asm-generic/kmap_types.h
79785@@ -2,9 +2,9 @@
79786 #define _ASM_GENERIC_KMAP_TYPES_H
79787
79788 #ifdef __WITH_KM_FENCE
79789-# define KM_TYPE_NR 41
79790+# define KM_TYPE_NR 42
79791 #else
79792-# define KM_TYPE_NR 20
79793+# define KM_TYPE_NR 21
79794 #endif
79795
79796 #endif
79797diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
79798index 9ceb03b..62b0b8f 100644
79799--- a/include/asm-generic/local.h
79800+++ b/include/asm-generic/local.h
79801@@ -23,24 +23,37 @@ typedef struct
79802 atomic_long_t a;
79803 } local_t;
79804
79805+typedef struct {
79806+ atomic_long_unchecked_t a;
79807+} local_unchecked_t;
79808+
79809 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
79810
79811 #define local_read(l) atomic_long_read(&(l)->a)
79812+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
79813 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
79814+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
79815 #define local_inc(l) atomic_long_inc(&(l)->a)
79816+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
79817 #define local_dec(l) atomic_long_dec(&(l)->a)
79818+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
79819 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
79820+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
79821 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
79822+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
79823
79824 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
79825 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
79826 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
79827 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
79828 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
79829+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
79830 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
79831 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
79832+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
79833
79834 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79835+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79836 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
79837 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
79838 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
79839diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
79840index 725612b..9cc513a 100644
79841--- a/include/asm-generic/pgtable-nopmd.h
79842+++ b/include/asm-generic/pgtable-nopmd.h
79843@@ -1,14 +1,19 @@
79844 #ifndef _PGTABLE_NOPMD_H
79845 #define _PGTABLE_NOPMD_H
79846
79847-#ifndef __ASSEMBLY__
79848-
79849 #include <asm-generic/pgtable-nopud.h>
79850
79851-struct mm_struct;
79852-
79853 #define __PAGETABLE_PMD_FOLDED
79854
79855+#define PMD_SHIFT PUD_SHIFT
79856+#define PTRS_PER_PMD 1
79857+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
79858+#define PMD_MASK (~(PMD_SIZE-1))
79859+
79860+#ifndef __ASSEMBLY__
79861+
79862+struct mm_struct;
79863+
79864 /*
79865 * Having the pmd type consist of a pud gets the size right, and allows
79866 * us to conceptually access the pud entry that this pmd is folded into
79867@@ -16,11 +21,6 @@ struct mm_struct;
79868 */
79869 typedef struct { pud_t pud; } pmd_t;
79870
79871-#define PMD_SHIFT PUD_SHIFT
79872-#define PTRS_PER_PMD 1
79873-#define PMD_SIZE (1UL << PMD_SHIFT)
79874-#define PMD_MASK (~(PMD_SIZE-1))
79875-
79876 /*
79877 * The "pud_xxx()" functions here are trivial for a folded two-level
79878 * setup: the pmd is never bad, and a pmd always exists (as it's folded
79879diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
79880index 810431d..0ec4804f 100644
79881--- a/include/asm-generic/pgtable-nopud.h
79882+++ b/include/asm-generic/pgtable-nopud.h
79883@@ -1,10 +1,15 @@
79884 #ifndef _PGTABLE_NOPUD_H
79885 #define _PGTABLE_NOPUD_H
79886
79887-#ifndef __ASSEMBLY__
79888-
79889 #define __PAGETABLE_PUD_FOLDED
79890
79891+#define PUD_SHIFT PGDIR_SHIFT
79892+#define PTRS_PER_PUD 1
79893+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
79894+#define PUD_MASK (~(PUD_SIZE-1))
79895+
79896+#ifndef __ASSEMBLY__
79897+
79898 /*
79899 * Having the pud type consist of a pgd gets the size right, and allows
79900 * us to conceptually access the pgd entry that this pud is folded into
79901@@ -12,11 +17,6 @@
79902 */
79903 typedef struct { pgd_t pgd; } pud_t;
79904
79905-#define PUD_SHIFT PGDIR_SHIFT
79906-#define PTRS_PER_PUD 1
79907-#define PUD_SIZE (1UL << PUD_SHIFT)
79908-#define PUD_MASK (~(PUD_SIZE-1))
79909-
79910 /*
79911 * The "pgd_xxx()" functions here are trivial for a folded two-level
79912 * setup: the pud is never bad, and a pud always exists (as it's folded
79913@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
79914 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
79915
79916 #define pgd_populate(mm, pgd, pud) do { } while (0)
79917+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
79918 /*
79919 * (puds are folded into pgds so this doesn't get actually called,
79920 * but the define is needed for a generic inline function.)
79921diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
79922index 752e30d..87f172d 100644
79923--- a/include/asm-generic/pgtable.h
79924+++ b/include/asm-generic/pgtable.h
79925@@ -828,6 +828,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
79926 }
79927 #endif /* CONFIG_NUMA_BALANCING */
79928
79929+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
79930+#ifdef CONFIG_PAX_KERNEXEC
79931+#error KERNEXEC requires pax_open_kernel
79932+#else
79933+static inline unsigned long pax_open_kernel(void) { return 0; }
79934+#endif
79935+#endif
79936+
79937+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
79938+#ifdef CONFIG_PAX_KERNEXEC
79939+#error KERNEXEC requires pax_close_kernel
79940+#else
79941+static inline unsigned long pax_close_kernel(void) { return 0; }
79942+#endif
79943+#endif
79944+
79945 #endif /* CONFIG_MMU */
79946
79947 #endif /* !__ASSEMBLY__ */
79948diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
79949index 72d8803..cb9749c 100644
79950--- a/include/asm-generic/uaccess.h
79951+++ b/include/asm-generic/uaccess.h
79952@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
79953 return __clear_user(to, n);
79954 }
79955
79956+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
79957+#ifdef CONFIG_PAX_MEMORY_UDEREF
79958+#error UDEREF requires pax_open_userland
79959+#else
79960+static inline unsigned long pax_open_userland(void) { return 0; }
79961+#endif
79962+#endif
79963+
79964+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
79965+#ifdef CONFIG_PAX_MEMORY_UDEREF
79966+#error UDEREF requires pax_close_userland
79967+#else
79968+static inline unsigned long pax_close_userland(void) { return 0; }
79969+#endif
79970+#endif
79971+
79972 #endif /* __ASM_GENERIC_UACCESS_H */
79973diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
79974index aa70cbd..fd72c7a 100644
79975--- a/include/asm-generic/vmlinux.lds.h
79976+++ b/include/asm-generic/vmlinux.lds.h
79977@@ -233,6 +233,7 @@
79978 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
79979 VMLINUX_SYMBOL(__start_rodata) = .; \
79980 *(.rodata) *(.rodata.*) \
79981+ *(.data..read_only) \
79982 *(__vermagic) /* Kernel version magic */ \
79983 . = ALIGN(8); \
79984 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
79985@@ -724,17 +725,18 @@
79986 * section in the linker script will go there too. @phdr should have
79987 * a leading colon.
79988 *
79989- * Note that this macros defines __per_cpu_load as an absolute symbol.
79990+ * Note that this macros defines per_cpu_load as an absolute symbol.
79991 * If there is no need to put the percpu section at a predetermined
79992 * address, use PERCPU_SECTION.
79993 */
79994 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
79995- VMLINUX_SYMBOL(__per_cpu_load) = .; \
79996- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
79997+ per_cpu_load = .; \
79998+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
79999 - LOAD_OFFSET) { \
80000+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
80001 PERCPU_INPUT(cacheline) \
80002 } phdr \
80003- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
80004+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
80005
80006 /**
80007 * PERCPU_SECTION - define output section for percpu area, simple version
80008diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
80009index 623a59c..1e79ab9 100644
80010--- a/include/crypto/algapi.h
80011+++ b/include/crypto/algapi.h
80012@@ -34,7 +34,7 @@ struct crypto_type {
80013 unsigned int maskclear;
80014 unsigned int maskset;
80015 unsigned int tfmsize;
80016-};
80017+} __do_const;
80018
80019 struct crypto_instance {
80020 struct crypto_alg alg;
80021diff --git a/include/drm/drmP.h b/include/drm/drmP.h
80022index 53ed876..5bb09be 100644
80023--- a/include/drm/drmP.h
80024+++ b/include/drm/drmP.h
80025@@ -59,6 +59,7 @@
80026
80027 #include <asm/mman.h>
80028 #include <asm/pgalloc.h>
80029+#include <asm/local.h>
80030 #include <asm/uaccess.h>
80031
80032 #include <uapi/drm/drm.h>
80033@@ -223,10 +224,12 @@ void drm_err(const char *func, const char *format, ...);
80034 * \param cmd command.
80035 * \param arg argument.
80036 */
80037-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
80038+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
80039+ struct drm_file *file_priv);
80040+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
80041 struct drm_file *file_priv);
80042
80043-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
80044+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
80045 unsigned long arg);
80046
80047 #define DRM_IOCTL_NR(n) _IOC_NR(n)
80048@@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
80049 struct drm_ioctl_desc {
80050 unsigned int cmd;
80051 int flags;
80052- drm_ioctl_t *func;
80053+ drm_ioctl_t func;
80054 unsigned int cmd_drv;
80055 const char *name;
80056-};
80057+} __do_const;
80058
80059 /**
80060 * Creates a driver or general drm_ioctl_desc array entry for the given
80061@@ -629,7 +632,8 @@ struct drm_info_list {
80062 int (*show)(struct seq_file*, void*); /** show callback */
80063 u32 driver_features; /**< Required driver features for this entry */
80064 void *data;
80065-};
80066+} __do_const;
80067+typedef struct drm_info_list __no_const drm_info_list_no_const;
80068
80069 /**
80070 * debugfs node structure. This structure represents a debugfs file.
80071@@ -713,7 +717,7 @@ struct drm_device {
80072
80073 /** \name Usage Counters */
80074 /*@{ */
80075- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
80076+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
80077 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
80078 int buf_use; /**< Buffers in use -- cannot alloc */
80079 atomic_t buf_alloc; /**< Buffer allocation in progress */
80080diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
80081index a3d75fe..6802f9c 100644
80082--- a/include/drm/drm_crtc_helper.h
80083+++ b/include/drm/drm_crtc_helper.h
80084@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
80085 struct drm_connector *connector);
80086 /* disable encoder when not in use - more explicit than dpms off */
80087 void (*disable)(struct drm_encoder *encoder);
80088-};
80089+} __no_const;
80090
80091 /**
80092 * drm_connector_helper_funcs - helper operations for connectors
80093diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
80094index a70d456..6ea07cd 100644
80095--- a/include/drm/i915_pciids.h
80096+++ b/include/drm/i915_pciids.h
80097@@ -37,7 +37,7 @@
80098 */
80099 #define INTEL_VGA_DEVICE(id, info) { \
80100 0x8086, id, \
80101- ~0, ~0, \
80102+ PCI_ANY_ID, PCI_ANY_ID, \
80103 0x030000, 0xff0000, \
80104 (unsigned long) info }
80105
80106diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
80107index 72dcbe8..8db58d7 100644
80108--- a/include/drm/ttm/ttm_memory.h
80109+++ b/include/drm/ttm/ttm_memory.h
80110@@ -48,7 +48,7 @@
80111
80112 struct ttm_mem_shrink {
80113 int (*do_shrink) (struct ttm_mem_shrink *);
80114-};
80115+} __no_const;
80116
80117 /**
80118 * struct ttm_mem_global - Global memory accounting structure.
80119diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
80120index 49a8284..9643967 100644
80121--- a/include/drm/ttm/ttm_page_alloc.h
80122+++ b/include/drm/ttm/ttm_page_alloc.h
80123@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
80124 */
80125 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
80126
80127+struct device;
80128 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
80129 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
80130
80131diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
80132index 4b840e8..155d235 100644
80133--- a/include/keys/asymmetric-subtype.h
80134+++ b/include/keys/asymmetric-subtype.h
80135@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
80136 /* Verify the signature on a key of this subtype (optional) */
80137 int (*verify_signature)(const struct key *key,
80138 const struct public_key_signature *sig);
80139-};
80140+} __do_const;
80141
80142 /**
80143 * asymmetric_key_subtype - Get the subtype from an asymmetric key
80144diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
80145index c1da539..1dcec55 100644
80146--- a/include/linux/atmdev.h
80147+++ b/include/linux/atmdev.h
80148@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
80149 #endif
80150
80151 struct k_atm_aal_stats {
80152-#define __HANDLE_ITEM(i) atomic_t i
80153+#define __HANDLE_ITEM(i) atomic_unchecked_t i
80154 __AAL_STAT_ITEMS
80155 #undef __HANDLE_ITEM
80156 };
80157@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
80158 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
80159 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
80160 struct module *owner;
80161-};
80162+} __do_const ;
80163
80164 struct atmphy_ops {
80165 int (*start)(struct atm_dev *dev);
80166diff --git a/include/linux/audit.h b/include/linux/audit.h
80167index 10f155b..6c73ffe 100644
80168--- a/include/linux/audit.h
80169+++ b/include/linux/audit.h
80170@@ -219,7 +219,7 @@ static inline void audit_ptrace(struct task_struct *t)
80171 extern unsigned int audit_serial(void);
80172 extern int auditsc_get_stamp(struct audit_context *ctx,
80173 struct timespec *t, unsigned int *serial);
80174-extern int audit_set_loginuid(kuid_t loginuid);
80175+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
80176
80177 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
80178 {
80179diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
80180index 61f29e5..e67c658 100644
80181--- a/include/linux/binfmts.h
80182+++ b/include/linux/binfmts.h
80183@@ -44,7 +44,7 @@ struct linux_binprm {
80184 unsigned interp_flags;
80185 unsigned interp_data;
80186 unsigned long loader, exec;
80187-};
80188+} __randomize_layout;
80189
80190 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
80191 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
80192@@ -73,8 +73,10 @@ struct linux_binfmt {
80193 int (*load_binary)(struct linux_binprm *);
80194 int (*load_shlib)(struct file *);
80195 int (*core_dump)(struct coredump_params *cprm);
80196+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
80197+ void (*handle_mmap)(struct file *);
80198 unsigned long min_coredump; /* minimal dump size */
80199-};
80200+} __do_const __randomize_layout;
80201
80202 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
80203
80204diff --git a/include/linux/bitops.h b/include/linux/bitops.h
80205index 5d858e0..336c1d9 100644
80206--- a/include/linux/bitops.h
80207+++ b/include/linux/bitops.h
80208@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
80209 * @word: value to rotate
80210 * @shift: bits to roll
80211 */
80212-static inline __u32 rol32(__u32 word, unsigned int shift)
80213+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
80214 {
80215 return (word << shift) | (word >> (32 - shift));
80216 }
80217@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
80218 * @word: value to rotate
80219 * @shift: bits to roll
80220 */
80221-static inline __u32 ror32(__u32 word, unsigned int shift)
80222+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
80223 {
80224 return (word >> shift) | (word << (32 - shift));
80225 }
80226@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
80227 return (__s32)(value << shift) >> shift;
80228 }
80229
80230-static inline unsigned fls_long(unsigned long l)
80231+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
80232 {
80233 if (sizeof(l) == 4)
80234 return fls(l);
80235diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
80236index aac0f9e..73c9869 100644
80237--- a/include/linux/blkdev.h
80238+++ b/include/linux/blkdev.h
80239@@ -1615,7 +1615,7 @@ struct block_device_operations {
80240 /* this callback is with swap_lock and sometimes page table lock held */
80241 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
80242 struct module *owner;
80243-};
80244+} __do_const;
80245
80246 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
80247 unsigned long);
80248diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
80249index afc1343..9735539 100644
80250--- a/include/linux/blktrace_api.h
80251+++ b/include/linux/blktrace_api.h
80252@@ -25,7 +25,7 @@ struct blk_trace {
80253 struct dentry *dropped_file;
80254 struct dentry *msg_file;
80255 struct list_head running_list;
80256- atomic_t dropped;
80257+ atomic_unchecked_t dropped;
80258 };
80259
80260 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
80261diff --git a/include/linux/cache.h b/include/linux/cache.h
80262index 17e7e82..1d7da26 100644
80263--- a/include/linux/cache.h
80264+++ b/include/linux/cache.h
80265@@ -16,6 +16,14 @@
80266 #define __read_mostly
80267 #endif
80268
80269+#ifndef __read_only
80270+#ifdef CONFIG_PAX_KERNEXEC
80271+#error KERNEXEC requires __read_only
80272+#else
80273+#define __read_only __read_mostly
80274+#endif
80275+#endif
80276+
80277 #ifndef ____cacheline_aligned
80278 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
80279 #endif
80280diff --git a/include/linux/capability.h b/include/linux/capability.h
80281index aa93e5e..985a1b0 100644
80282--- a/include/linux/capability.h
80283+++ b/include/linux/capability.h
80284@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
80285 extern bool capable(int cap);
80286 extern bool ns_capable(struct user_namespace *ns, int cap);
80287 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
80288+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
80289 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
80290+extern bool capable_nolog(int cap);
80291+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
80292
80293 /* audit system wants to get cap info from files as well */
80294 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
80295
80296+extern int is_privileged_binary(const struct dentry *dentry);
80297+
80298 #endif /* !_LINUX_CAPABILITY_H */
80299diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
80300index 8609d57..86e4d79 100644
80301--- a/include/linux/cdrom.h
80302+++ b/include/linux/cdrom.h
80303@@ -87,7 +87,6 @@ struct cdrom_device_ops {
80304
80305 /* driver specifications */
80306 const int capability; /* capability flags */
80307- int n_minors; /* number of active minor devices */
80308 /* handle uniform packets for scsi type devices (scsi,atapi) */
80309 int (*generic_packet) (struct cdrom_device_info *,
80310 struct packet_command *);
80311diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
80312index 4ce9056..86caac6 100644
80313--- a/include/linux/cleancache.h
80314+++ b/include/linux/cleancache.h
80315@@ -31,7 +31,7 @@ struct cleancache_ops {
80316 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
80317 void (*invalidate_inode)(int, struct cleancache_filekey);
80318 void (*invalidate_fs)(int);
80319-};
80320+} __no_const;
80321
80322 extern struct cleancache_ops *
80323 cleancache_register_ops(struct cleancache_ops *ops);
80324diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
80325index 2839c63..5b06b6b 100644
80326--- a/include/linux/clk-provider.h
80327+++ b/include/linux/clk-provider.h
80328@@ -191,6 +191,7 @@ struct clk_ops {
80329 void (*init)(struct clk_hw *hw);
80330 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
80331 };
80332+typedef struct clk_ops __no_const clk_ops_no_const;
80333
80334 /**
80335 * struct clk_init_data - holds init data that's common to all clocks and is
80336diff --git a/include/linux/compat.h b/include/linux/compat.h
80337index e649426..a74047b 100644
80338--- a/include/linux/compat.h
80339+++ b/include/linux/compat.h
80340@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
80341 compat_size_t __user *len_ptr);
80342
80343 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
80344-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
80345+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
80346 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
80347 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
80348 compat_ssize_t msgsz, int msgflg);
80349@@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
80350 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
80351 compat_ulong_t addr, compat_ulong_t data);
80352 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
80353- compat_long_t addr, compat_long_t data);
80354+ compat_ulong_t addr, compat_ulong_t data);
80355
80356 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
80357 /*
80358diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
80359index d1a5582..4424efa 100644
80360--- a/include/linux/compiler-gcc4.h
80361+++ b/include/linux/compiler-gcc4.h
80362@@ -39,9 +39,34 @@
80363 # define __compiletime_warning(message) __attribute__((warning(message)))
80364 # define __compiletime_error(message) __attribute__((error(message)))
80365 #endif /* __CHECKER__ */
80366+
80367+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
80368+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
80369+#define __bos0(ptr) __bos((ptr), 0)
80370+#define __bos1(ptr) __bos((ptr), 1)
80371 #endif /* GCC_VERSION >= 40300 */
80372
80373 #if GCC_VERSION >= 40500
80374+
80375+#ifdef RANDSTRUCT_PLUGIN
80376+#define __randomize_layout __attribute__((randomize_layout))
80377+#define __no_randomize_layout __attribute__((no_randomize_layout))
80378+#endif
80379+
80380+#ifdef CONSTIFY_PLUGIN
80381+#define __no_const __attribute__((no_const))
80382+#define __do_const __attribute__((do_const))
80383+#endif
80384+
80385+#ifdef SIZE_OVERFLOW_PLUGIN
80386+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80387+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80388+#endif
80389+
80390+#ifdef LATENT_ENTROPY_PLUGIN
80391+#define __latent_entropy __attribute__((latent_entropy))
80392+#endif
80393+
80394 /*
80395 * Mark a position in code as unreachable. This can be used to
80396 * suppress control flow warnings after asm blocks that transfer
80397diff --git a/include/linux/compiler.h b/include/linux/compiler.h
80398index d5ad7b1..3b74638 100644
80399--- a/include/linux/compiler.h
80400+++ b/include/linux/compiler.h
80401@@ -5,11 +5,14 @@
80402
80403 #ifdef __CHECKER__
80404 # define __user __attribute__((noderef, address_space(1)))
80405+# define __force_user __force __user
80406 # define __kernel __attribute__((address_space(0)))
80407+# define __force_kernel __force __kernel
80408 # define __safe __attribute__((safe))
80409 # define __force __attribute__((force))
80410 # define __nocast __attribute__((nocast))
80411 # define __iomem __attribute__((noderef, address_space(2)))
80412+# define __force_iomem __force __iomem
80413 # define __must_hold(x) __attribute__((context(x,1,1)))
80414 # define __acquires(x) __attribute__((context(x,0,1)))
80415 # define __releases(x) __attribute__((context(x,1,0)))
80416@@ -17,20 +20,37 @@
80417 # define __release(x) __context__(x,-1)
80418 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
80419 # define __percpu __attribute__((noderef, address_space(3)))
80420+# define __force_percpu __force __percpu
80421 #ifdef CONFIG_SPARSE_RCU_POINTER
80422 # define __rcu __attribute__((noderef, address_space(4)))
80423+# define __force_rcu __force __rcu
80424 #else
80425 # define __rcu
80426+# define __force_rcu
80427 #endif
80428 extern void __chk_user_ptr(const volatile void __user *);
80429 extern void __chk_io_ptr(const volatile void __iomem *);
80430 #else
80431-# define __user
80432-# define __kernel
80433+# ifdef CHECKER_PLUGIN
80434+//# define __user
80435+//# define __force_user
80436+//# define __kernel
80437+//# define __force_kernel
80438+# else
80439+# ifdef STRUCTLEAK_PLUGIN
80440+# define __user __attribute__((user))
80441+# else
80442+# define __user
80443+# endif
80444+# define __force_user
80445+# define __kernel
80446+# define __force_kernel
80447+# endif
80448 # define __safe
80449 # define __force
80450 # define __nocast
80451 # define __iomem
80452+# define __force_iomem
80453 # define __chk_user_ptr(x) (void)0
80454 # define __chk_io_ptr(x) (void)0
80455 # define __builtin_warning(x, y...) (1)
80456@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
80457 # define __release(x) (void)0
80458 # define __cond_lock(x,c) (c)
80459 # define __percpu
80460+# define __force_percpu
80461 # define __rcu
80462+# define __force_rcu
80463 #endif
80464
80465 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
80466@@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80467 # define __attribute_const__ /* unimplemented */
80468 #endif
80469
80470+#ifndef __randomize_layout
80471+# define __randomize_layout
80472+#endif
80473+
80474+#ifndef __no_randomize_layout
80475+# define __no_randomize_layout
80476+#endif
80477+
80478+#ifndef __no_const
80479+# define __no_const
80480+#endif
80481+
80482+#ifndef __do_const
80483+# define __do_const
80484+#endif
80485+
80486+#ifndef __size_overflow
80487+# define __size_overflow(...)
80488+#endif
80489+
80490+#ifndef __intentional_overflow
80491+# define __intentional_overflow(...)
80492+#endif
80493+
80494+#ifndef __latent_entropy
80495+# define __latent_entropy
80496+#endif
80497+
80498 /*
80499 * Tell gcc if a function is cold. The compiler will assume any path
80500 * directly leading to the call is unlikely.
80501@@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80502 #define __cold
80503 #endif
80504
80505+#ifndef __alloc_size
80506+#define __alloc_size(...)
80507+#endif
80508+
80509+#ifndef __bos
80510+#define __bos(ptr, arg)
80511+#endif
80512+
80513+#ifndef __bos0
80514+#define __bos0(ptr)
80515+#endif
80516+
80517+#ifndef __bos1
80518+#define __bos1(ptr)
80519+#endif
80520+
80521 /* Simple shorthand for a section definition */
80522 #ifndef __section
80523 # define __section(S) __attribute__ ((__section__(#S)))
80524@@ -378,7 +444,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80525 * use is to mediate communication between process-level code and irq/NMI
80526 * handlers, all running on the same CPU.
80527 */
80528-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
80529+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
80530+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
80531
80532 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
80533 #ifdef CONFIG_KPROBES
80534diff --git a/include/linux/completion.h b/include/linux/completion.h
80535index 5d5aaae..0ea9b84 100644
80536--- a/include/linux/completion.h
80537+++ b/include/linux/completion.h
80538@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
80539
80540 extern void wait_for_completion(struct completion *);
80541 extern void wait_for_completion_io(struct completion *);
80542-extern int wait_for_completion_interruptible(struct completion *x);
80543-extern int wait_for_completion_killable(struct completion *x);
80544+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
80545+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
80546 extern unsigned long wait_for_completion_timeout(struct completion *x,
80547- unsigned long timeout);
80548+ unsigned long timeout) __intentional_overflow(-1);
80549 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
80550- unsigned long timeout);
80551+ unsigned long timeout) __intentional_overflow(-1);
80552 extern long wait_for_completion_interruptible_timeout(
80553- struct completion *x, unsigned long timeout);
80554+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80555 extern long wait_for_completion_killable_timeout(
80556- struct completion *x, unsigned long timeout);
80557+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80558 extern bool try_wait_for_completion(struct completion *x);
80559 extern bool completion_done(struct completion *x);
80560
80561diff --git a/include/linux/configfs.h b/include/linux/configfs.h
80562index 34025df..d94bbbc 100644
80563--- a/include/linux/configfs.h
80564+++ b/include/linux/configfs.h
80565@@ -125,7 +125,7 @@ struct configfs_attribute {
80566 const char *ca_name;
80567 struct module *ca_owner;
80568 umode_t ca_mode;
80569-};
80570+} __do_const;
80571
80572 /*
80573 * Users often need to create attribute structures for their configurable
80574diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
80575index 503b085b..1638c9e 100644
80576--- a/include/linux/cpufreq.h
80577+++ b/include/linux/cpufreq.h
80578@@ -206,6 +206,7 @@ struct global_attr {
80579 ssize_t (*store)(struct kobject *a, struct attribute *b,
80580 const char *c, size_t count);
80581 };
80582+typedef struct global_attr __no_const global_attr_no_const;
80583
80584 #define define_one_global_ro(_name) \
80585 static struct global_attr _name = \
80586@@ -273,7 +274,7 @@ struct cpufreq_driver {
80587 bool boost_supported;
80588 bool boost_enabled;
80589 int (*set_boost) (int state);
80590-};
80591+} __do_const;
80592
80593 /* flags */
80594 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
80595diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
80596index 25e0df6..952dffd 100644
80597--- a/include/linux/cpuidle.h
80598+++ b/include/linux/cpuidle.h
80599@@ -50,7 +50,8 @@ struct cpuidle_state {
80600 int index);
80601
80602 int (*enter_dead) (struct cpuidle_device *dev, int index);
80603-};
80604+} __do_const;
80605+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
80606
80607 /* Idle State Flags */
80608 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
80609@@ -209,7 +210,7 @@ struct cpuidle_governor {
80610 void (*reflect) (struct cpuidle_device *dev, int index);
80611
80612 struct module *owner;
80613-};
80614+} __do_const;
80615
80616 #ifdef CONFIG_CPU_IDLE
80617 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
80618diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
80619index 0a9a6da..ea597ca 100644
80620--- a/include/linux/cpumask.h
80621+++ b/include/linux/cpumask.h
80622@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80623 }
80624
80625 /* Valid inputs for n are -1 and 0. */
80626-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80627+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80628 {
80629 return n+1;
80630 }
80631
80632-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80633+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80634 {
80635 return n+1;
80636 }
80637
80638-static inline unsigned int cpumask_next_and(int n,
80639+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
80640 const struct cpumask *srcp,
80641 const struct cpumask *andp)
80642 {
80643@@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80644 *
80645 * Returns >= nr_cpu_ids if no further cpus set.
80646 */
80647-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80648+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80649 {
80650 /* -1 is a legal arg here. */
80651 if (n != -1)
80652@@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80653 *
80654 * Returns >= nr_cpu_ids if no further cpus unset.
80655 */
80656-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80657+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80658 {
80659 /* -1 is a legal arg here. */
80660 if (n != -1)
80661@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80662 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
80663 }
80664
80665-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
80666+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
80667 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
80668 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
80669
80670diff --git a/include/linux/cred.h b/include/linux/cred.h
80671index 2fb2ca2..d6a3340 100644
80672--- a/include/linux/cred.h
80673+++ b/include/linux/cred.h
80674@@ -35,7 +35,7 @@ struct group_info {
80675 int nblocks;
80676 kgid_t small_block[NGROUPS_SMALL];
80677 kgid_t *blocks[0];
80678-};
80679+} __randomize_layout;
80680
80681 /**
80682 * get_group_info - Get a reference to a group info structure
80683@@ -137,7 +137,7 @@ struct cred {
80684 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
80685 struct group_info *group_info; /* supplementary groups for euid/fsgid */
80686 struct rcu_head rcu; /* RCU deletion hook */
80687-};
80688+} __randomize_layout;
80689
80690 extern void __put_cred(struct cred *);
80691 extern void exit_creds(struct task_struct *);
80692@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
80693 static inline void validate_process_creds(void)
80694 {
80695 }
80696+static inline void validate_task_creds(struct task_struct *task)
80697+{
80698+}
80699 #endif
80700
80701 /**
80702@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
80703
80704 #define task_uid(task) (task_cred_xxx((task), uid))
80705 #define task_euid(task) (task_cred_xxx((task), euid))
80706+#define task_securebits(task) (task_cred_xxx((task), securebits))
80707
80708 #define current_cred_xxx(xxx) \
80709 ({ \
80710diff --git a/include/linux/crypto.h b/include/linux/crypto.h
80711index dc34dfc..bdf9b5d 100644
80712--- a/include/linux/crypto.h
80713+++ b/include/linux/crypto.h
80714@@ -386,7 +386,7 @@ struct cipher_tfm {
80715 const u8 *key, unsigned int keylen);
80716 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80717 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80718-};
80719+} __no_const;
80720
80721 struct hash_tfm {
80722 int (*init)(struct hash_desc *desc);
80723@@ -407,13 +407,13 @@ struct compress_tfm {
80724 int (*cot_decompress)(struct crypto_tfm *tfm,
80725 const u8 *src, unsigned int slen,
80726 u8 *dst, unsigned int *dlen);
80727-};
80728+} __no_const;
80729
80730 struct rng_tfm {
80731 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
80732 unsigned int dlen);
80733 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
80734-};
80735+} __no_const;
80736
80737 #define crt_ablkcipher crt_u.ablkcipher
80738 #define crt_aead crt_u.aead
80739diff --git a/include/linux/ctype.h b/include/linux/ctype.h
80740index 653589e..4ef254a 100644
80741--- a/include/linux/ctype.h
80742+++ b/include/linux/ctype.h
80743@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
80744 * Fast implementation of tolower() for internal usage. Do not use in your
80745 * code.
80746 */
80747-static inline char _tolower(const char c)
80748+static inline unsigned char _tolower(const unsigned char c)
80749 {
80750 return c | 0x20;
80751 }
80752diff --git a/include/linux/dcache.h b/include/linux/dcache.h
80753index 1c2f1b8..7b9f50c 100644
80754--- a/include/linux/dcache.h
80755+++ b/include/linux/dcache.h
80756@@ -123,6 +123,9 @@ struct dentry {
80757 unsigned long d_time; /* used by d_revalidate */
80758 void *d_fsdata; /* fs-specific data */
80759
80760+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
80761+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
80762+#endif
80763 struct list_head d_lru; /* LRU list */
80764 struct list_head d_child; /* child of parent list */
80765 struct list_head d_subdirs; /* our children */
80766@@ -133,7 +136,7 @@ struct dentry {
80767 struct hlist_node d_alias; /* inode alias list */
80768 struct rcu_head d_rcu;
80769 } d_u;
80770-};
80771+} __randomize_layout;
80772
80773 /*
80774 * dentry->d_lock spinlock nesting subclasses:
80775diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
80776index 7925bf0..d5143d2 100644
80777--- a/include/linux/decompress/mm.h
80778+++ b/include/linux/decompress/mm.h
80779@@ -77,7 +77,7 @@ static void free(void *where)
80780 * warnings when not needed (indeed large_malloc / large_free are not
80781 * needed by inflate */
80782
80783-#define malloc(a) kmalloc(a, GFP_KERNEL)
80784+#define malloc(a) kmalloc((a), GFP_KERNEL)
80785 #define free(a) kfree(a)
80786
80787 #define large_malloc(a) vmalloc(a)
80788diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
80789index f1863dc..5c26074 100644
80790--- a/include/linux/devfreq.h
80791+++ b/include/linux/devfreq.h
80792@@ -114,7 +114,7 @@ struct devfreq_governor {
80793 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
80794 int (*event_handler)(struct devfreq *devfreq,
80795 unsigned int event, void *data);
80796-};
80797+} __do_const;
80798
80799 /**
80800 * struct devfreq - Device devfreq structure
80801diff --git a/include/linux/device.h b/include/linux/device.h
80802index ce1f2160..189bc33 100644
80803--- a/include/linux/device.h
80804+++ b/include/linux/device.h
80805@@ -311,7 +311,7 @@ struct subsys_interface {
80806 struct list_head node;
80807 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
80808 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
80809-};
80810+} __do_const;
80811
80812 int subsys_interface_register(struct subsys_interface *sif);
80813 void subsys_interface_unregister(struct subsys_interface *sif);
80814@@ -507,7 +507,7 @@ struct device_type {
80815 void (*release)(struct device *dev);
80816
80817 const struct dev_pm_ops *pm;
80818-};
80819+} __do_const;
80820
80821 /* interface for exporting device attributes */
80822 struct device_attribute {
80823@@ -517,11 +517,12 @@ struct device_attribute {
80824 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
80825 const char *buf, size_t count);
80826 };
80827+typedef struct device_attribute __no_const device_attribute_no_const;
80828
80829 struct dev_ext_attribute {
80830 struct device_attribute attr;
80831 void *var;
80832-};
80833+} __do_const;
80834
80835 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
80836 char *buf);
80837diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
80838index d5d3881..7ed54af 100644
80839--- a/include/linux/dma-mapping.h
80840+++ b/include/linux/dma-mapping.h
80841@@ -60,7 +60,7 @@ struct dma_map_ops {
80842 u64 (*get_required_mask)(struct device *dev);
80843 #endif
80844 int is_phys;
80845-};
80846+} __do_const;
80847
80848 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
80849
80850diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
80851index 653a1fd..9133cd1 100644
80852--- a/include/linux/dmaengine.h
80853+++ b/include/linux/dmaengine.h
80854@@ -1136,9 +1136,9 @@ struct dma_pinned_list {
80855 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
80856 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
80857
80858-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80859+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80860 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
80861-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80862+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80863 struct dma_pinned_list *pinned_list, struct page *page,
80864 unsigned int offset, size_t len);
80865
80866diff --git a/include/linux/efi.h b/include/linux/efi.h
80867index 0949f9c..04cb9a5 100644
80868--- a/include/linux/efi.h
80869+++ b/include/linux/efi.h
80870@@ -1050,6 +1050,7 @@ struct efivar_operations {
80871 efi_set_variable_nonblocking_t *set_variable_nonblocking;
80872 efi_query_variable_store_t *query_variable_store;
80873 };
80874+typedef struct efivar_operations __no_const efivar_operations_no_const;
80875
80876 struct efivars {
80877 /*
80878diff --git a/include/linux/elf.h b/include/linux/elf.h
80879index 67a5fa7..b817372 100644
80880--- a/include/linux/elf.h
80881+++ b/include/linux/elf.h
80882@@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
80883 #define elf_note elf32_note
80884 #define elf_addr_t Elf32_Off
80885 #define Elf_Half Elf32_Half
80886+#define elf_dyn Elf32_Dyn
80887
80888 #else
80889
80890@@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
80891 #define elf_note elf64_note
80892 #define elf_addr_t Elf64_Off
80893 #define Elf_Half Elf64_Half
80894+#define elf_dyn Elf64_Dyn
80895
80896 #endif
80897
80898diff --git a/include/linux/err.h b/include/linux/err.h
80899index a729120..6ede2c9 100644
80900--- a/include/linux/err.h
80901+++ b/include/linux/err.h
80902@@ -20,12 +20,12 @@
80903
80904 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
80905
80906-static inline void * __must_check ERR_PTR(long error)
80907+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
80908 {
80909 return (void *) error;
80910 }
80911
80912-static inline long __must_check PTR_ERR(__force const void *ptr)
80913+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
80914 {
80915 return (long) ptr;
80916 }
80917diff --git a/include/linux/extcon.h b/include/linux/extcon.h
80918index 36f49c4..a2a1f4c 100644
80919--- a/include/linux/extcon.h
80920+++ b/include/linux/extcon.h
80921@@ -135,7 +135,7 @@ struct extcon_dev {
80922 /* /sys/class/extcon/.../mutually_exclusive/... */
80923 struct attribute_group attr_g_muex;
80924 struct attribute **attrs_muex;
80925- struct device_attribute *d_attrs_muex;
80926+ device_attribute_no_const *d_attrs_muex;
80927 };
80928
80929 /**
80930diff --git a/include/linux/fb.h b/include/linux/fb.h
80931index 09bb7a1..d98870a 100644
80932--- a/include/linux/fb.h
80933+++ b/include/linux/fb.h
80934@@ -305,7 +305,7 @@ struct fb_ops {
80935 /* called at KDB enter and leave time to prepare the console */
80936 int (*fb_debug_enter)(struct fb_info *info);
80937 int (*fb_debug_leave)(struct fb_info *info);
80938-};
80939+} __do_const;
80940
80941 #ifdef CONFIG_FB_TILEBLITTING
80942 #define FB_TILE_CURSOR_NONE 0
80943diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
80944index 230f87b..1fd0485 100644
80945--- a/include/linux/fdtable.h
80946+++ b/include/linux/fdtable.h
80947@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
80948 void put_files_struct(struct files_struct *fs);
80949 void reset_files_struct(struct files_struct *);
80950 int unshare_files(struct files_struct **);
80951-struct files_struct *dup_fd(struct files_struct *, int *);
80952+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
80953 void do_close_on_exec(struct files_struct *);
80954 int iterate_fd(struct files_struct *, unsigned,
80955 int (*)(const void *, struct file *, unsigned),
80956diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
80957index 8293262..2b3b8bd 100644
80958--- a/include/linux/frontswap.h
80959+++ b/include/linux/frontswap.h
80960@@ -11,7 +11,7 @@ struct frontswap_ops {
80961 int (*load)(unsigned, pgoff_t, struct page *);
80962 void (*invalidate_page)(unsigned, pgoff_t);
80963 void (*invalidate_area)(unsigned);
80964-};
80965+} __no_const;
80966
80967 extern bool frontswap_enabled;
80968 extern struct frontswap_ops *
80969diff --git a/include/linux/fs.h b/include/linux/fs.h
80970index 9ab779e..0c636f2 100644
80971--- a/include/linux/fs.h
80972+++ b/include/linux/fs.h
80973@@ -412,7 +412,7 @@ struct address_space {
80974 spinlock_t private_lock; /* for use by the address_space */
80975 struct list_head private_list; /* ditto */
80976 void *private_data; /* ditto */
80977-} __attribute__((aligned(sizeof(long))));
80978+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
80979 /*
80980 * On most architectures that alignment is already the case; but
80981 * must be enforced here for CRIS, to let the least significant bit
80982@@ -455,7 +455,7 @@ struct block_device {
80983 int bd_fsfreeze_count;
80984 /* Mutex for freeze */
80985 struct mutex bd_fsfreeze_mutex;
80986-};
80987+} __randomize_layout;
80988
80989 /*
80990 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
80991@@ -624,7 +624,7 @@ struct inode {
80992 #endif
80993
80994 void *i_private; /* fs or device private pointer */
80995-};
80996+} __randomize_layout;
80997
80998 static inline int inode_unhashed(struct inode *inode)
80999 {
81000@@ -820,7 +820,7 @@ struct file {
81001 struct list_head f_tfile_llink;
81002 #endif /* #ifdef CONFIG_EPOLL */
81003 struct address_space *f_mapping;
81004-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
81005+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
81006
81007 struct file_handle {
81008 __u32 handle_bytes;
81009@@ -945,7 +945,7 @@ struct file_lock {
81010 int state; /* state of grant or error if -ve */
81011 } afs;
81012 } fl_u;
81013-};
81014+} __randomize_layout;
81015
81016 /* The following constant reflects the upper bound of the file/locking space */
81017 #ifndef OFFSET_MAX
81018@@ -1287,7 +1287,7 @@ struct super_block {
81019 * Indicates how deep in a filesystem stack this SB is
81020 */
81021 int s_stack_depth;
81022-};
81023+} __randomize_layout;
81024
81025 extern struct timespec current_fs_time(struct super_block *sb);
81026
81027@@ -1514,7 +1514,8 @@ struct file_operations {
81028 long (*fallocate)(struct file *file, int mode, loff_t offset,
81029 loff_t len);
81030 int (*show_fdinfo)(struct seq_file *m, struct file *f);
81031-};
81032+} __do_const __randomize_layout;
81033+typedef struct file_operations __no_const file_operations_no_const;
81034
81035 struct inode_operations {
81036 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
81037@@ -2823,4 +2824,14 @@ static inline bool dir_relax(struct inode *inode)
81038 return !IS_DEADDIR(inode);
81039 }
81040
81041+static inline bool is_sidechannel_device(const struct inode *inode)
81042+{
81043+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
81044+ umode_t mode = inode->i_mode;
81045+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
81046+#else
81047+ return false;
81048+#endif
81049+}
81050+
81051 #endif /* _LINUX_FS_H */
81052diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
81053index 0efc3e6..fd23610 100644
81054--- a/include/linux/fs_struct.h
81055+++ b/include/linux/fs_struct.h
81056@@ -6,13 +6,13 @@
81057 #include <linux/seqlock.h>
81058
81059 struct fs_struct {
81060- int users;
81061+ atomic_t users;
81062 spinlock_t lock;
81063 seqcount_t seq;
81064 int umask;
81065 int in_exec;
81066 struct path root, pwd;
81067-};
81068+} __randomize_layout;
81069
81070 extern struct kmem_cache *fs_cachep;
81071
81072diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
81073index 7714849..a4a5c7a 100644
81074--- a/include/linux/fscache-cache.h
81075+++ b/include/linux/fscache-cache.h
81076@@ -113,7 +113,7 @@ struct fscache_operation {
81077 fscache_operation_release_t release;
81078 };
81079
81080-extern atomic_t fscache_op_debug_id;
81081+extern atomic_unchecked_t fscache_op_debug_id;
81082 extern void fscache_op_work_func(struct work_struct *work);
81083
81084 extern void fscache_enqueue_operation(struct fscache_operation *);
81085@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
81086 INIT_WORK(&op->work, fscache_op_work_func);
81087 atomic_set(&op->usage, 1);
81088 op->state = FSCACHE_OP_ST_INITIALISED;
81089- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
81090+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
81091 op->processor = processor;
81092 op->release = release;
81093 INIT_LIST_HEAD(&op->pend_link);
81094diff --git a/include/linux/fscache.h b/include/linux/fscache.h
81095index 115bb81..e7b812b 100644
81096--- a/include/linux/fscache.h
81097+++ b/include/linux/fscache.h
81098@@ -152,7 +152,7 @@ struct fscache_cookie_def {
81099 * - this is mandatory for any object that may have data
81100 */
81101 void (*now_uncached)(void *cookie_netfs_data);
81102-};
81103+} __do_const;
81104
81105 /*
81106 * fscache cached network filesystem type
81107diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
81108index 1c804b0..1432c2b 100644
81109--- a/include/linux/fsnotify.h
81110+++ b/include/linux/fsnotify.h
81111@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
81112 struct inode *inode = file_inode(file);
81113 __u32 mask = FS_ACCESS;
81114
81115+ if (is_sidechannel_device(inode))
81116+ return;
81117+
81118 if (S_ISDIR(inode->i_mode))
81119 mask |= FS_ISDIR;
81120
81121@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
81122 struct inode *inode = file_inode(file);
81123 __u32 mask = FS_MODIFY;
81124
81125+ if (is_sidechannel_device(inode))
81126+ return;
81127+
81128 if (S_ISDIR(inode->i_mode))
81129 mask |= FS_ISDIR;
81130
81131@@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
81132 */
81133 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
81134 {
81135- return kstrdup(name, GFP_KERNEL);
81136+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
81137 }
81138
81139 /*
81140diff --git a/include/linux/genhd.h b/include/linux/genhd.h
81141index ec274e0..e678159 100644
81142--- a/include/linux/genhd.h
81143+++ b/include/linux/genhd.h
81144@@ -194,7 +194,7 @@ struct gendisk {
81145 struct kobject *slave_dir;
81146
81147 struct timer_rand_state *random;
81148- atomic_t sync_io; /* RAID */
81149+ atomic_unchecked_t sync_io; /* RAID */
81150 struct disk_events *ev;
81151 #ifdef CONFIG_BLK_DEV_INTEGRITY
81152 struct blk_integrity *integrity;
81153@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
81154 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
81155
81156 /* drivers/char/random.c */
81157-extern void add_disk_randomness(struct gendisk *disk);
81158+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
81159 extern void rand_initialize_disk(struct gendisk *disk);
81160
81161 static inline sector_t get_start_sect(struct block_device *bdev)
81162diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
81163index 667c311..abac2a7 100644
81164--- a/include/linux/genl_magic_func.h
81165+++ b/include/linux/genl_magic_func.h
81166@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
81167 },
81168
81169 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
81170-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
81171+static struct genl_ops ZZZ_genl_ops[] = {
81172 #include GENL_MAGIC_INCLUDE_FILE
81173 };
81174
81175diff --git a/include/linux/gfp.h b/include/linux/gfp.h
81176index 41b30fd..a3718cf 100644
81177--- a/include/linux/gfp.h
81178+++ b/include/linux/gfp.h
81179@@ -34,6 +34,13 @@ struct vm_area_struct;
81180 #define ___GFP_NO_KSWAPD 0x400000u
81181 #define ___GFP_OTHER_NODE 0x800000u
81182 #define ___GFP_WRITE 0x1000000u
81183+
81184+#ifdef CONFIG_PAX_USERCOPY_SLABS
81185+#define ___GFP_USERCOPY 0x2000000u
81186+#else
81187+#define ___GFP_USERCOPY 0
81188+#endif
81189+
81190 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
81191
81192 /*
81193@@ -90,6 +97,7 @@ struct vm_area_struct;
81194 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
81195 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
81196 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
81197+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
81198
81199 /*
81200 * This may seem redundant, but it's a way of annotating false positives vs.
81201@@ -97,7 +105,7 @@ struct vm_area_struct;
81202 */
81203 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
81204
81205-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
81206+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
81207 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
81208
81209 /* This equals 0, but use constants in case they ever change */
81210@@ -155,6 +163,8 @@ struct vm_area_struct;
81211 /* 4GB DMA on some platforms */
81212 #define GFP_DMA32 __GFP_DMA32
81213
81214+#define GFP_USERCOPY __GFP_USERCOPY
81215+
81216 /* Convert GFP flags to their corresponding migrate type */
81217 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
81218 {
81219diff --git a/include/linux/gracl.h b/include/linux/gracl.h
81220new file mode 100644
81221index 0000000..edb2cb6
81222--- /dev/null
81223+++ b/include/linux/gracl.h
81224@@ -0,0 +1,340 @@
81225+#ifndef GR_ACL_H
81226+#define GR_ACL_H
81227+
81228+#include <linux/grdefs.h>
81229+#include <linux/resource.h>
81230+#include <linux/capability.h>
81231+#include <linux/dcache.h>
81232+#include <asm/resource.h>
81233+
81234+/* Major status information */
81235+
81236+#define GR_VERSION "grsecurity 3.0"
81237+#define GRSECURITY_VERSION 0x3000
81238+
81239+enum {
81240+ GR_SHUTDOWN = 0,
81241+ GR_ENABLE = 1,
81242+ GR_SPROLE = 2,
81243+ GR_OLDRELOAD = 3,
81244+ GR_SEGVMOD = 4,
81245+ GR_STATUS = 5,
81246+ GR_UNSPROLE = 6,
81247+ GR_PASSSET = 7,
81248+ GR_SPROLEPAM = 8,
81249+ GR_RELOAD = 9,
81250+};
81251+
81252+/* Password setup definitions
81253+ * kernel/grhash.c */
81254+enum {
81255+ GR_PW_LEN = 128,
81256+ GR_SALT_LEN = 16,
81257+ GR_SHA_LEN = 32,
81258+};
81259+
81260+enum {
81261+ GR_SPROLE_LEN = 64,
81262+};
81263+
81264+enum {
81265+ GR_NO_GLOB = 0,
81266+ GR_REG_GLOB,
81267+ GR_CREATE_GLOB
81268+};
81269+
81270+#define GR_NLIMITS 32
81271+
81272+/* Begin Data Structures */
81273+
81274+struct sprole_pw {
81275+ unsigned char *rolename;
81276+ unsigned char salt[GR_SALT_LEN];
81277+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
81278+};
81279+
81280+struct name_entry {
81281+ __u32 key;
81282+ ino_t inode;
81283+ dev_t device;
81284+ char *name;
81285+ __u16 len;
81286+ __u8 deleted;
81287+ struct name_entry *prev;
81288+ struct name_entry *next;
81289+};
81290+
81291+struct inodev_entry {
81292+ struct name_entry *nentry;
81293+ struct inodev_entry *prev;
81294+ struct inodev_entry *next;
81295+};
81296+
81297+struct acl_role_db {
81298+ struct acl_role_label **r_hash;
81299+ __u32 r_size;
81300+};
81301+
81302+struct inodev_db {
81303+ struct inodev_entry **i_hash;
81304+ __u32 i_size;
81305+};
81306+
81307+struct name_db {
81308+ struct name_entry **n_hash;
81309+ __u32 n_size;
81310+};
81311+
81312+struct crash_uid {
81313+ uid_t uid;
81314+ unsigned long expires;
81315+};
81316+
81317+struct gr_hash_struct {
81318+ void **table;
81319+ void **nametable;
81320+ void *first;
81321+ __u32 table_size;
81322+ __u32 used_size;
81323+ int type;
81324+};
81325+
81326+/* Userspace Grsecurity ACL data structures */
81327+
81328+struct acl_subject_label {
81329+ char *filename;
81330+ ino_t inode;
81331+ dev_t device;
81332+ __u32 mode;
81333+ kernel_cap_t cap_mask;
81334+ kernel_cap_t cap_lower;
81335+ kernel_cap_t cap_invert_audit;
81336+
81337+ struct rlimit res[GR_NLIMITS];
81338+ __u32 resmask;
81339+
81340+ __u8 user_trans_type;
81341+ __u8 group_trans_type;
81342+ uid_t *user_transitions;
81343+ gid_t *group_transitions;
81344+ __u16 user_trans_num;
81345+ __u16 group_trans_num;
81346+
81347+ __u32 sock_families[2];
81348+ __u32 ip_proto[8];
81349+ __u32 ip_type;
81350+ struct acl_ip_label **ips;
81351+ __u32 ip_num;
81352+ __u32 inaddr_any_override;
81353+
81354+ __u32 crashes;
81355+ unsigned long expires;
81356+
81357+ struct acl_subject_label *parent_subject;
81358+ struct gr_hash_struct *hash;
81359+ struct acl_subject_label *prev;
81360+ struct acl_subject_label *next;
81361+
81362+ struct acl_object_label **obj_hash;
81363+ __u32 obj_hash_size;
81364+ __u16 pax_flags;
81365+};
81366+
81367+struct role_allowed_ip {
81368+ __u32 addr;
81369+ __u32 netmask;
81370+
81371+ struct role_allowed_ip *prev;
81372+ struct role_allowed_ip *next;
81373+};
81374+
81375+struct role_transition {
81376+ char *rolename;
81377+
81378+ struct role_transition *prev;
81379+ struct role_transition *next;
81380+};
81381+
81382+struct acl_role_label {
81383+ char *rolename;
81384+ uid_t uidgid;
81385+ __u16 roletype;
81386+
81387+ __u16 auth_attempts;
81388+ unsigned long expires;
81389+
81390+ struct acl_subject_label *root_label;
81391+ struct gr_hash_struct *hash;
81392+
81393+ struct acl_role_label *prev;
81394+ struct acl_role_label *next;
81395+
81396+ struct role_transition *transitions;
81397+ struct role_allowed_ip *allowed_ips;
81398+ uid_t *domain_children;
81399+ __u16 domain_child_num;
81400+
81401+ umode_t umask;
81402+
81403+ struct acl_subject_label **subj_hash;
81404+ __u32 subj_hash_size;
81405+};
81406+
81407+struct user_acl_role_db {
81408+ struct acl_role_label **r_table;
81409+ __u32 num_pointers; /* Number of allocations to track */
81410+ __u32 num_roles; /* Number of roles */
81411+ __u32 num_domain_children; /* Number of domain children */
81412+ __u32 num_subjects; /* Number of subjects */
81413+ __u32 num_objects; /* Number of objects */
81414+};
81415+
81416+struct acl_object_label {
81417+ char *filename;
81418+ ino_t inode;
81419+ dev_t device;
81420+ __u32 mode;
81421+
81422+ struct acl_subject_label *nested;
81423+ struct acl_object_label *globbed;
81424+
81425+ /* next two structures not used */
81426+
81427+ struct acl_object_label *prev;
81428+ struct acl_object_label *next;
81429+};
81430+
81431+struct acl_ip_label {
81432+ char *iface;
81433+ __u32 addr;
81434+ __u32 netmask;
81435+ __u16 low, high;
81436+ __u8 mode;
81437+ __u32 type;
81438+ __u32 proto[8];
81439+
81440+ /* next two structures not used */
81441+
81442+ struct acl_ip_label *prev;
81443+ struct acl_ip_label *next;
81444+};
81445+
81446+struct gr_arg {
81447+ struct user_acl_role_db role_db;
81448+ unsigned char pw[GR_PW_LEN];
81449+ unsigned char salt[GR_SALT_LEN];
81450+ unsigned char sum[GR_SHA_LEN];
81451+ unsigned char sp_role[GR_SPROLE_LEN];
81452+ struct sprole_pw *sprole_pws;
81453+ dev_t segv_device;
81454+ ino_t segv_inode;
81455+ uid_t segv_uid;
81456+ __u16 num_sprole_pws;
81457+ __u16 mode;
81458+};
81459+
81460+struct gr_arg_wrapper {
81461+ struct gr_arg *arg;
81462+ __u32 version;
81463+ __u32 size;
81464+};
81465+
81466+struct subject_map {
81467+ struct acl_subject_label *user;
81468+ struct acl_subject_label *kernel;
81469+ struct subject_map *prev;
81470+ struct subject_map *next;
81471+};
81472+
81473+struct acl_subj_map_db {
81474+ struct subject_map **s_hash;
81475+ __u32 s_size;
81476+};
81477+
81478+struct gr_policy_state {
81479+ struct sprole_pw **acl_special_roles;
81480+ __u16 num_sprole_pws;
81481+ struct acl_role_label *kernel_role;
81482+ struct acl_role_label *role_list;
81483+ struct acl_role_label *default_role;
81484+ struct acl_role_db acl_role_set;
81485+ struct acl_subj_map_db subj_map_set;
81486+ struct name_db name_set;
81487+ struct inodev_db inodev_set;
81488+};
81489+
81490+struct gr_alloc_state {
81491+ unsigned long alloc_stack_next;
81492+ unsigned long alloc_stack_size;
81493+ void **alloc_stack;
81494+};
81495+
81496+struct gr_reload_state {
81497+ struct gr_policy_state oldpolicy;
81498+ struct gr_alloc_state oldalloc;
81499+ struct gr_policy_state newpolicy;
81500+ struct gr_alloc_state newalloc;
81501+ struct gr_policy_state *oldpolicy_ptr;
81502+ struct gr_alloc_state *oldalloc_ptr;
81503+ unsigned char oldmode;
81504+};
81505+
81506+/* End Data Structures Section */
81507+
81508+/* Hash functions generated by empirical testing by Brad Spengler
81509+ Makes good use of the low bits of the inode. Generally 0-1 times
81510+ in loop for successful match. 0-3 for unsuccessful match.
81511+ Shift/add algorithm with modulus of table size and an XOR*/
81512+
81513+static __inline__ unsigned int
81514+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
81515+{
81516+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
81517+}
81518+
81519+ static __inline__ unsigned int
81520+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
81521+{
81522+ return ((const unsigned long)userp % sz);
81523+}
81524+
81525+static __inline__ unsigned int
81526+gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
81527+{
81528+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
81529+}
81530+
81531+static __inline__ unsigned int
81532+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
81533+{
81534+ return full_name_hash((const unsigned char *)name, len) % sz;
81535+}
81536+
81537+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
81538+ subj = NULL; \
81539+ iter = 0; \
81540+ while (iter < role->subj_hash_size) { \
81541+ if (subj == NULL) \
81542+ subj = role->subj_hash[iter]; \
81543+ if (subj == NULL) { \
81544+ iter++; \
81545+ continue; \
81546+ }
81547+
81548+#define FOR_EACH_SUBJECT_END(subj,iter) \
81549+ subj = subj->next; \
81550+ if (subj == NULL) \
81551+ iter++; \
81552+ }
81553+
81554+
81555+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
81556+ subj = role->hash->first; \
81557+ while (subj != NULL) {
81558+
81559+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
81560+ subj = subj->next; \
81561+ }
81562+
81563+#endif
81564+
81565diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
81566new file mode 100644
81567index 0000000..33ebd1f
81568--- /dev/null
81569+++ b/include/linux/gracl_compat.h
81570@@ -0,0 +1,156 @@
81571+#ifndef GR_ACL_COMPAT_H
81572+#define GR_ACL_COMPAT_H
81573+
81574+#include <linux/resource.h>
81575+#include <asm/resource.h>
81576+
81577+struct sprole_pw_compat {
81578+ compat_uptr_t rolename;
81579+ unsigned char salt[GR_SALT_LEN];
81580+ unsigned char sum[GR_SHA_LEN];
81581+};
81582+
81583+struct gr_hash_struct_compat {
81584+ compat_uptr_t table;
81585+ compat_uptr_t nametable;
81586+ compat_uptr_t first;
81587+ __u32 table_size;
81588+ __u32 used_size;
81589+ int type;
81590+};
81591+
81592+struct acl_subject_label_compat {
81593+ compat_uptr_t filename;
81594+ compat_ino_t inode;
81595+ __u32 device;
81596+ __u32 mode;
81597+ kernel_cap_t cap_mask;
81598+ kernel_cap_t cap_lower;
81599+ kernel_cap_t cap_invert_audit;
81600+
81601+ struct compat_rlimit res[GR_NLIMITS];
81602+ __u32 resmask;
81603+
81604+ __u8 user_trans_type;
81605+ __u8 group_trans_type;
81606+ compat_uptr_t user_transitions;
81607+ compat_uptr_t group_transitions;
81608+ __u16 user_trans_num;
81609+ __u16 group_trans_num;
81610+
81611+ __u32 sock_families[2];
81612+ __u32 ip_proto[8];
81613+ __u32 ip_type;
81614+ compat_uptr_t ips;
81615+ __u32 ip_num;
81616+ __u32 inaddr_any_override;
81617+
81618+ __u32 crashes;
81619+ compat_ulong_t expires;
81620+
81621+ compat_uptr_t parent_subject;
81622+ compat_uptr_t hash;
81623+ compat_uptr_t prev;
81624+ compat_uptr_t next;
81625+
81626+ compat_uptr_t obj_hash;
81627+ __u32 obj_hash_size;
81628+ __u16 pax_flags;
81629+};
81630+
81631+struct role_allowed_ip_compat {
81632+ __u32 addr;
81633+ __u32 netmask;
81634+
81635+ compat_uptr_t prev;
81636+ compat_uptr_t next;
81637+};
81638+
81639+struct role_transition_compat {
81640+ compat_uptr_t rolename;
81641+
81642+ compat_uptr_t prev;
81643+ compat_uptr_t next;
81644+};
81645+
81646+struct acl_role_label_compat {
81647+ compat_uptr_t rolename;
81648+ uid_t uidgid;
81649+ __u16 roletype;
81650+
81651+ __u16 auth_attempts;
81652+ compat_ulong_t expires;
81653+
81654+ compat_uptr_t root_label;
81655+ compat_uptr_t hash;
81656+
81657+ compat_uptr_t prev;
81658+ compat_uptr_t next;
81659+
81660+ compat_uptr_t transitions;
81661+ compat_uptr_t allowed_ips;
81662+ compat_uptr_t domain_children;
81663+ __u16 domain_child_num;
81664+
81665+ umode_t umask;
81666+
81667+ compat_uptr_t subj_hash;
81668+ __u32 subj_hash_size;
81669+};
81670+
81671+struct user_acl_role_db_compat {
81672+ compat_uptr_t r_table;
81673+ __u32 num_pointers;
81674+ __u32 num_roles;
81675+ __u32 num_domain_children;
81676+ __u32 num_subjects;
81677+ __u32 num_objects;
81678+};
81679+
81680+struct acl_object_label_compat {
81681+ compat_uptr_t filename;
81682+ compat_ino_t inode;
81683+ __u32 device;
81684+ __u32 mode;
81685+
81686+ compat_uptr_t nested;
81687+ compat_uptr_t globbed;
81688+
81689+ compat_uptr_t prev;
81690+ compat_uptr_t next;
81691+};
81692+
81693+struct acl_ip_label_compat {
81694+ compat_uptr_t iface;
81695+ __u32 addr;
81696+ __u32 netmask;
81697+ __u16 low, high;
81698+ __u8 mode;
81699+ __u32 type;
81700+ __u32 proto[8];
81701+
81702+ compat_uptr_t prev;
81703+ compat_uptr_t next;
81704+};
81705+
81706+struct gr_arg_compat {
81707+ struct user_acl_role_db_compat role_db;
81708+ unsigned char pw[GR_PW_LEN];
81709+ unsigned char salt[GR_SALT_LEN];
81710+ unsigned char sum[GR_SHA_LEN];
81711+ unsigned char sp_role[GR_SPROLE_LEN];
81712+ compat_uptr_t sprole_pws;
81713+ __u32 segv_device;
81714+ compat_ino_t segv_inode;
81715+ uid_t segv_uid;
81716+ __u16 num_sprole_pws;
81717+ __u16 mode;
81718+};
81719+
81720+struct gr_arg_wrapper_compat {
81721+ compat_uptr_t arg;
81722+ __u32 version;
81723+ __u32 size;
81724+};
81725+
81726+#endif
81727diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
81728new file mode 100644
81729index 0000000..323ecf2
81730--- /dev/null
81731+++ b/include/linux/gralloc.h
81732@@ -0,0 +1,9 @@
81733+#ifndef __GRALLOC_H
81734+#define __GRALLOC_H
81735+
81736+void acl_free_all(void);
81737+int acl_alloc_stack_init(unsigned long size);
81738+void *acl_alloc(unsigned long len);
81739+void *acl_alloc_num(unsigned long num, unsigned long len);
81740+
81741+#endif
81742diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
81743new file mode 100644
81744index 0000000..be66033
81745--- /dev/null
81746+++ b/include/linux/grdefs.h
81747@@ -0,0 +1,140 @@
81748+#ifndef GRDEFS_H
81749+#define GRDEFS_H
81750+
81751+/* Begin grsecurity status declarations */
81752+
81753+enum {
81754+ GR_READY = 0x01,
81755+ GR_STATUS_INIT = 0x00 // disabled state
81756+};
81757+
81758+/* Begin ACL declarations */
81759+
81760+/* Role flags */
81761+
81762+enum {
81763+ GR_ROLE_USER = 0x0001,
81764+ GR_ROLE_GROUP = 0x0002,
81765+ GR_ROLE_DEFAULT = 0x0004,
81766+ GR_ROLE_SPECIAL = 0x0008,
81767+ GR_ROLE_AUTH = 0x0010,
81768+ GR_ROLE_NOPW = 0x0020,
81769+ GR_ROLE_GOD = 0x0040,
81770+ GR_ROLE_LEARN = 0x0080,
81771+ GR_ROLE_TPE = 0x0100,
81772+ GR_ROLE_DOMAIN = 0x0200,
81773+ GR_ROLE_PAM = 0x0400,
81774+ GR_ROLE_PERSIST = 0x0800
81775+};
81776+
81777+/* ACL Subject and Object mode flags */
81778+enum {
81779+ GR_DELETED = 0x80000000
81780+};
81781+
81782+/* ACL Object-only mode flags */
81783+enum {
81784+ GR_READ = 0x00000001,
81785+ GR_APPEND = 0x00000002,
81786+ GR_WRITE = 0x00000004,
81787+ GR_EXEC = 0x00000008,
81788+ GR_FIND = 0x00000010,
81789+ GR_INHERIT = 0x00000020,
81790+ GR_SETID = 0x00000040,
81791+ GR_CREATE = 0x00000080,
81792+ GR_DELETE = 0x00000100,
81793+ GR_LINK = 0x00000200,
81794+ GR_AUDIT_READ = 0x00000400,
81795+ GR_AUDIT_APPEND = 0x00000800,
81796+ GR_AUDIT_WRITE = 0x00001000,
81797+ GR_AUDIT_EXEC = 0x00002000,
81798+ GR_AUDIT_FIND = 0x00004000,
81799+ GR_AUDIT_INHERIT= 0x00008000,
81800+ GR_AUDIT_SETID = 0x00010000,
81801+ GR_AUDIT_CREATE = 0x00020000,
81802+ GR_AUDIT_DELETE = 0x00040000,
81803+ GR_AUDIT_LINK = 0x00080000,
81804+ GR_PTRACERD = 0x00100000,
81805+ GR_NOPTRACE = 0x00200000,
81806+ GR_SUPPRESS = 0x00400000,
81807+ GR_NOLEARN = 0x00800000,
81808+ GR_INIT_TRANSFER= 0x01000000
81809+};
81810+
81811+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
81812+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
81813+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
81814+
81815+/* ACL subject-only mode flags */
81816+enum {
81817+ GR_KILL = 0x00000001,
81818+ GR_VIEW = 0x00000002,
81819+ GR_PROTECTED = 0x00000004,
81820+ GR_LEARN = 0x00000008,
81821+ GR_OVERRIDE = 0x00000010,
81822+ /* just a placeholder, this mode is only used in userspace */
81823+ GR_DUMMY = 0x00000020,
81824+ GR_PROTSHM = 0x00000040,
81825+ GR_KILLPROC = 0x00000080,
81826+ GR_KILLIPPROC = 0x00000100,
81827+ /* just a placeholder, this mode is only used in userspace */
81828+ GR_NOTROJAN = 0x00000200,
81829+ GR_PROTPROCFD = 0x00000400,
81830+ GR_PROCACCT = 0x00000800,
81831+ GR_RELAXPTRACE = 0x00001000,
81832+ //GR_NESTED = 0x00002000,
81833+ GR_INHERITLEARN = 0x00004000,
81834+ GR_PROCFIND = 0x00008000,
81835+ GR_POVERRIDE = 0x00010000,
81836+ GR_KERNELAUTH = 0x00020000,
81837+ GR_ATSECURE = 0x00040000,
81838+ GR_SHMEXEC = 0x00080000
81839+};
81840+
81841+enum {
81842+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
81843+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
81844+ GR_PAX_ENABLE_MPROTECT = 0x0004,
81845+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
81846+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
81847+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
81848+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
81849+ GR_PAX_DISABLE_MPROTECT = 0x0400,
81850+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
81851+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
81852+};
81853+
81854+enum {
81855+ GR_ID_USER = 0x01,
81856+ GR_ID_GROUP = 0x02,
81857+};
81858+
81859+enum {
81860+ GR_ID_ALLOW = 0x01,
81861+ GR_ID_DENY = 0x02,
81862+};
81863+
81864+#define GR_CRASH_RES 31
81865+#define GR_UIDTABLE_MAX 500
81866+
81867+/* begin resource learning section */
81868+enum {
81869+ GR_RLIM_CPU_BUMP = 60,
81870+ GR_RLIM_FSIZE_BUMP = 50000,
81871+ GR_RLIM_DATA_BUMP = 10000,
81872+ GR_RLIM_STACK_BUMP = 1000,
81873+ GR_RLIM_CORE_BUMP = 10000,
81874+ GR_RLIM_RSS_BUMP = 500000,
81875+ GR_RLIM_NPROC_BUMP = 1,
81876+ GR_RLIM_NOFILE_BUMP = 5,
81877+ GR_RLIM_MEMLOCK_BUMP = 50000,
81878+ GR_RLIM_AS_BUMP = 500000,
81879+ GR_RLIM_LOCKS_BUMP = 2,
81880+ GR_RLIM_SIGPENDING_BUMP = 5,
81881+ GR_RLIM_MSGQUEUE_BUMP = 10000,
81882+ GR_RLIM_NICE_BUMP = 1,
81883+ GR_RLIM_RTPRIO_BUMP = 1,
81884+ GR_RLIM_RTTIME_BUMP = 1000000
81885+};
81886+
81887+#endif
81888diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
81889new file mode 100644
81890index 0000000..fb1de5d
81891--- /dev/null
81892+++ b/include/linux/grinternal.h
81893@@ -0,0 +1,230 @@
81894+#ifndef __GRINTERNAL_H
81895+#define __GRINTERNAL_H
81896+
81897+#ifdef CONFIG_GRKERNSEC
81898+
81899+#include <linux/fs.h>
81900+#include <linux/mnt_namespace.h>
81901+#include <linux/nsproxy.h>
81902+#include <linux/gracl.h>
81903+#include <linux/grdefs.h>
81904+#include <linux/grmsg.h>
81905+
81906+void gr_add_learn_entry(const char *fmt, ...)
81907+ __attribute__ ((format (printf, 1, 2)));
81908+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
81909+ const struct vfsmount *mnt);
81910+__u32 gr_check_create(const struct dentry *new_dentry,
81911+ const struct dentry *parent,
81912+ const struct vfsmount *mnt, const __u32 mode);
81913+int gr_check_protected_task(const struct task_struct *task);
81914+__u32 to_gr_audit(const __u32 reqmode);
81915+int gr_set_acls(const int type);
81916+int gr_acl_is_enabled(void);
81917+char gr_roletype_to_char(void);
81918+
81919+void gr_handle_alertkill(struct task_struct *task);
81920+char *gr_to_filename(const struct dentry *dentry,
81921+ const struct vfsmount *mnt);
81922+char *gr_to_filename1(const struct dentry *dentry,
81923+ const struct vfsmount *mnt);
81924+char *gr_to_filename2(const struct dentry *dentry,
81925+ const struct vfsmount *mnt);
81926+char *gr_to_filename3(const struct dentry *dentry,
81927+ const struct vfsmount *mnt);
81928+
81929+extern int grsec_enable_ptrace_readexec;
81930+extern int grsec_enable_harden_ptrace;
81931+extern int grsec_enable_link;
81932+extern int grsec_enable_fifo;
81933+extern int grsec_enable_execve;
81934+extern int grsec_enable_shm;
81935+extern int grsec_enable_execlog;
81936+extern int grsec_enable_signal;
81937+extern int grsec_enable_audit_ptrace;
81938+extern int grsec_enable_forkfail;
81939+extern int grsec_enable_time;
81940+extern int grsec_enable_rofs;
81941+extern int grsec_deny_new_usb;
81942+extern int grsec_enable_chroot_shmat;
81943+extern int grsec_enable_chroot_mount;
81944+extern int grsec_enable_chroot_double;
81945+extern int grsec_enable_chroot_pivot;
81946+extern int grsec_enable_chroot_chdir;
81947+extern int grsec_enable_chroot_chmod;
81948+extern int grsec_enable_chroot_mknod;
81949+extern int grsec_enable_chroot_fchdir;
81950+extern int grsec_enable_chroot_nice;
81951+extern int grsec_enable_chroot_execlog;
81952+extern int grsec_enable_chroot_caps;
81953+extern int grsec_enable_chroot_rename;
81954+extern int grsec_enable_chroot_sysctl;
81955+extern int grsec_enable_chroot_unix;
81956+extern int grsec_enable_symlinkown;
81957+extern kgid_t grsec_symlinkown_gid;
81958+extern int grsec_enable_tpe;
81959+extern kgid_t grsec_tpe_gid;
81960+extern int grsec_enable_tpe_all;
81961+extern int grsec_enable_tpe_invert;
81962+extern int grsec_enable_socket_all;
81963+extern kgid_t grsec_socket_all_gid;
81964+extern int grsec_enable_socket_client;
81965+extern kgid_t grsec_socket_client_gid;
81966+extern int grsec_enable_socket_server;
81967+extern kgid_t grsec_socket_server_gid;
81968+extern kgid_t grsec_audit_gid;
81969+extern int grsec_enable_group;
81970+extern int grsec_enable_log_rwxmaps;
81971+extern int grsec_enable_mount;
81972+extern int grsec_enable_chdir;
81973+extern int grsec_resource_logging;
81974+extern int grsec_enable_blackhole;
81975+extern int grsec_lastack_retries;
81976+extern int grsec_enable_brute;
81977+extern int grsec_enable_harden_ipc;
81978+extern int grsec_lock;
81979+
81980+extern spinlock_t grsec_alert_lock;
81981+extern unsigned long grsec_alert_wtime;
81982+extern unsigned long grsec_alert_fyet;
81983+
81984+extern spinlock_t grsec_audit_lock;
81985+
81986+extern rwlock_t grsec_exec_file_lock;
81987+
81988+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
81989+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
81990+ (tsk)->exec_file->f_path.mnt) : "/")
81991+
81992+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
81993+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
81994+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81995+
81996+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
81997+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
81998+ (tsk)->exec_file->f_path.mnt) : "/")
81999+
82000+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
82001+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
82002+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
82003+
82004+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
82005+
82006+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
82007+
82008+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
82009+{
82010+ if (file1 && file2) {
82011+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
82012+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
82013+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
82014+ return true;
82015+ }
82016+
82017+ return false;
82018+}
82019+
82020+#define GR_CHROOT_CAPS {{ \
82021+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
82022+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
82023+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
82024+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
82025+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
82026+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
82027+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
82028+
82029+#define security_learn(normal_msg,args...) \
82030+({ \
82031+ read_lock(&grsec_exec_file_lock); \
82032+ gr_add_learn_entry(normal_msg "\n", ## args); \
82033+ read_unlock(&grsec_exec_file_lock); \
82034+})
82035+
82036+enum {
82037+ GR_DO_AUDIT,
82038+ GR_DONT_AUDIT,
82039+ /* used for non-audit messages that we shouldn't kill the task on */
82040+ GR_DONT_AUDIT_GOOD
82041+};
82042+
82043+enum {
82044+ GR_TTYSNIFF,
82045+ GR_RBAC,
82046+ GR_RBAC_STR,
82047+ GR_STR_RBAC,
82048+ GR_RBAC_MODE2,
82049+ GR_RBAC_MODE3,
82050+ GR_FILENAME,
82051+ GR_SYSCTL_HIDDEN,
82052+ GR_NOARGS,
82053+ GR_ONE_INT,
82054+ GR_ONE_INT_TWO_STR,
82055+ GR_ONE_STR,
82056+ GR_STR_INT,
82057+ GR_TWO_STR_INT,
82058+ GR_TWO_INT,
82059+ GR_TWO_U64,
82060+ GR_THREE_INT,
82061+ GR_FIVE_INT_TWO_STR,
82062+ GR_TWO_STR,
82063+ GR_THREE_STR,
82064+ GR_FOUR_STR,
82065+ GR_STR_FILENAME,
82066+ GR_FILENAME_STR,
82067+ GR_FILENAME_TWO_INT,
82068+ GR_FILENAME_TWO_INT_STR,
82069+ GR_TEXTREL,
82070+ GR_PTRACE,
82071+ GR_RESOURCE,
82072+ GR_CAP,
82073+ GR_SIG,
82074+ GR_SIG2,
82075+ GR_CRASH1,
82076+ GR_CRASH2,
82077+ GR_PSACCT,
82078+ GR_RWXMAP,
82079+ GR_RWXMAPVMA
82080+};
82081+
82082+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
82083+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
82084+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
82085+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
82086+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
82087+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
82088+#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)
82089+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
82090+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
82091+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
82092+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
82093+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
82094+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
82095+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
82096+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
82097+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
82098+#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)
82099+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
82100+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
82101+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
82102+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
82103+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
82104+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
82105+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
82106+#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)
82107+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
82108+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
82109+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
82110+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
82111+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
82112+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
82113+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
82114+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
82115+#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)
82116+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
82117+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
82118+
82119+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
82120+
82121+#endif
82122+
82123+#endif
82124diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
82125new file mode 100644
82126index 0000000..26ef560
82127--- /dev/null
82128+++ b/include/linux/grmsg.h
82129@@ -0,0 +1,118 @@
82130+#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"
82131+#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"
82132+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
82133+#define GR_STOPMOD_MSG "denied modification of module state by "
82134+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
82135+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
82136+#define GR_IOPERM_MSG "denied use of ioperm() by "
82137+#define GR_IOPL_MSG "denied use of iopl() by "
82138+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
82139+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
82140+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
82141+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
82142+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
82143+#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"
82144+#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"
82145+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
82146+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
82147+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
82148+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
82149+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
82150+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
82151+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
82152+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
82153+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
82154+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
82155+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
82156+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
82157+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
82158+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
82159+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
82160+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
82161+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
82162+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
82163+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
82164+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
82165+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
82166+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
82167+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
82168+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
82169+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
82170+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
82171+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
82172+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
82173+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
82174+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
82175+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
82176+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
82177+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
82178+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
82179+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
82180+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
82181+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
82182+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
82183+#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"
82184+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
82185+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
82186+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
82187+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
82188+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
82189+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
82190+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
82191+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
82192+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
82193+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
82194+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
82195+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
82196+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
82197+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
82198+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
82199+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
82200+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
82201+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
82202+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
82203+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
82204+#define GR_FAILFORK_MSG "failed fork with errno %s by "
82205+#define GR_NICE_CHROOT_MSG "denied priority change by "
82206+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
82207+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
82208+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
82209+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
82210+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
82211+#define GR_TIME_MSG "time set by "
82212+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
82213+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
82214+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
82215+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
82216+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
82217+#define GR_BIND_MSG "denied bind() by "
82218+#define GR_CONNECT_MSG "denied connect() by "
82219+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
82220+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
82221+#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"
82222+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
82223+#define GR_CAP_ACL_MSG "use of %s denied for "
82224+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
82225+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
82226+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
82227+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
82228+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
82229+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
82230+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
82231+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
82232+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
82233+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
82234+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
82235+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
82236+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
82237+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
82238+#define GR_VM86_MSG "denied use of vm86 by "
82239+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
82240+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
82241+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
82242+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
82243+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
82244+#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 "
82245+#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 "
82246+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
82247+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
82248diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
82249new file mode 100644
82250index 0000000..6c76fcb
82251--- /dev/null
82252+++ b/include/linux/grsecurity.h
82253@@ -0,0 +1,249 @@
82254+#ifndef GR_SECURITY_H
82255+#define GR_SECURITY_H
82256+#include <linux/fs.h>
82257+#include <linux/fs_struct.h>
82258+#include <linux/binfmts.h>
82259+#include <linux/gracl.h>
82260+
82261+/* notify of brain-dead configs */
82262+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
82263+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
82264+#endif
82265+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
82266+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
82267+#endif
82268+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
82269+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
82270+#endif
82271+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
82272+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
82273+#endif
82274+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
82275+#error "CONFIG_PAX enabled, but no PaX options are enabled."
82276+#endif
82277+
82278+int gr_handle_new_usb(void);
82279+
82280+void gr_handle_brute_attach(int dumpable);
82281+void gr_handle_brute_check(void);
82282+void gr_handle_kernel_exploit(void);
82283+
82284+char gr_roletype_to_char(void);
82285+
82286+int gr_proc_is_restricted(void);
82287+
82288+int gr_acl_enable_at_secure(void);
82289+
82290+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
82291+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
82292+
82293+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
82294+
82295+void gr_del_task_from_ip_table(struct task_struct *p);
82296+
82297+int gr_pid_is_chrooted(struct task_struct *p);
82298+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
82299+int gr_handle_chroot_nice(void);
82300+int gr_handle_chroot_sysctl(const int op);
82301+int gr_handle_chroot_setpriority(struct task_struct *p,
82302+ const int niceval);
82303+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
82304+int gr_chroot_fhandle(void);
82305+int gr_handle_chroot_chroot(const struct dentry *dentry,
82306+ const struct vfsmount *mnt);
82307+void gr_handle_chroot_chdir(const struct path *path);
82308+int gr_handle_chroot_chmod(const struct dentry *dentry,
82309+ const struct vfsmount *mnt, const int mode);
82310+int gr_handle_chroot_mknod(const struct dentry *dentry,
82311+ const struct vfsmount *mnt, const int mode);
82312+int gr_handle_chroot_mount(const struct dentry *dentry,
82313+ const struct vfsmount *mnt,
82314+ const char *dev_name);
82315+int gr_handle_chroot_pivot(void);
82316+int gr_handle_chroot_unix(const pid_t pid);
82317+
82318+int gr_handle_rawio(const struct inode *inode);
82319+
82320+void gr_handle_ioperm(void);
82321+void gr_handle_iopl(void);
82322+void gr_handle_msr_write(void);
82323+
82324+umode_t gr_acl_umask(void);
82325+
82326+int gr_tpe_allow(const struct file *file);
82327+
82328+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
82329+void gr_clear_chroot_entries(struct task_struct *task);
82330+
82331+void gr_log_forkfail(const int retval);
82332+void gr_log_timechange(void);
82333+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
82334+void gr_log_chdir(const struct dentry *dentry,
82335+ const struct vfsmount *mnt);
82336+void gr_log_chroot_exec(const struct dentry *dentry,
82337+ const struct vfsmount *mnt);
82338+void gr_log_remount(const char *devname, const int retval);
82339+void gr_log_unmount(const char *devname, const int retval);
82340+void gr_log_mount(const char *from, struct path *to, const int retval);
82341+void gr_log_textrel(struct vm_area_struct *vma);
82342+void gr_log_ptgnustack(struct file *file);
82343+void gr_log_rwxmmap(struct file *file);
82344+void gr_log_rwxmprotect(struct vm_area_struct *vma);
82345+
82346+int gr_handle_follow_link(const struct inode *parent,
82347+ const struct inode *inode,
82348+ const struct dentry *dentry,
82349+ const struct vfsmount *mnt);
82350+int gr_handle_fifo(const struct dentry *dentry,
82351+ const struct vfsmount *mnt,
82352+ const struct dentry *dir, const int flag,
82353+ const int acc_mode);
82354+int gr_handle_hardlink(const struct dentry *dentry,
82355+ const struct vfsmount *mnt,
82356+ struct inode *inode,
82357+ const int mode, const struct filename *to);
82358+
82359+int gr_is_capable(const int cap);
82360+int gr_is_capable_nolog(const int cap);
82361+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
82362+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
82363+
82364+void gr_copy_label(struct task_struct *tsk);
82365+void gr_handle_crash(struct task_struct *task, const int sig);
82366+int gr_handle_signal(const struct task_struct *p, const int sig);
82367+int gr_check_crash_uid(const kuid_t uid);
82368+int gr_check_protected_task(const struct task_struct *task);
82369+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
82370+int gr_acl_handle_mmap(const struct file *file,
82371+ const unsigned long prot);
82372+int gr_acl_handle_mprotect(const struct file *file,
82373+ const unsigned long prot);
82374+int gr_check_hidden_task(const struct task_struct *tsk);
82375+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
82376+ const struct vfsmount *mnt);
82377+__u32 gr_acl_handle_utime(const struct dentry *dentry,
82378+ const struct vfsmount *mnt);
82379+__u32 gr_acl_handle_access(const struct dentry *dentry,
82380+ const struct vfsmount *mnt, const int fmode);
82381+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
82382+ const struct vfsmount *mnt, umode_t *mode);
82383+__u32 gr_acl_handle_chown(const struct dentry *dentry,
82384+ const struct vfsmount *mnt);
82385+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
82386+ const struct vfsmount *mnt);
82387+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
82388+ const struct vfsmount *mnt);
82389+int gr_handle_ptrace(struct task_struct *task, const long request);
82390+int gr_handle_proc_ptrace(struct task_struct *task);
82391+__u32 gr_acl_handle_execve(const struct dentry *dentry,
82392+ const struct vfsmount *mnt);
82393+int gr_check_crash_exec(const struct file *filp);
82394+int gr_acl_is_enabled(void);
82395+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
82396+ const kgid_t gid);
82397+int gr_set_proc_label(const struct dentry *dentry,
82398+ const struct vfsmount *mnt,
82399+ const int unsafe_flags);
82400+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
82401+ const struct vfsmount *mnt);
82402+__u32 gr_acl_handle_open(const struct dentry *dentry,
82403+ const struct vfsmount *mnt, int acc_mode);
82404+__u32 gr_acl_handle_creat(const struct dentry *dentry,
82405+ const struct dentry *p_dentry,
82406+ const struct vfsmount *p_mnt,
82407+ int open_flags, int acc_mode, const int imode);
82408+void gr_handle_create(const struct dentry *dentry,
82409+ const struct vfsmount *mnt);
82410+void gr_handle_proc_create(const struct dentry *dentry,
82411+ const struct inode *inode);
82412+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
82413+ const struct dentry *parent_dentry,
82414+ const struct vfsmount *parent_mnt,
82415+ const int mode);
82416+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
82417+ const struct dentry *parent_dentry,
82418+ const struct vfsmount *parent_mnt);
82419+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
82420+ const struct vfsmount *mnt);
82421+void gr_handle_delete(const ino_t ino, const dev_t dev);
82422+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
82423+ const struct vfsmount *mnt);
82424+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
82425+ const struct dentry *parent_dentry,
82426+ const struct vfsmount *parent_mnt,
82427+ const struct filename *from);
82428+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
82429+ const struct dentry *parent_dentry,
82430+ const struct vfsmount *parent_mnt,
82431+ const struct dentry *old_dentry,
82432+ const struct vfsmount *old_mnt, const struct filename *to);
82433+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
82434+int gr_acl_handle_rename(struct dentry *new_dentry,
82435+ struct dentry *parent_dentry,
82436+ const struct vfsmount *parent_mnt,
82437+ struct dentry *old_dentry,
82438+ struct inode *old_parent_inode,
82439+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
82440+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
82441+ struct dentry *old_dentry,
82442+ struct dentry *new_dentry,
82443+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
82444+__u32 gr_check_link(const struct dentry *new_dentry,
82445+ const struct dentry *parent_dentry,
82446+ const struct vfsmount *parent_mnt,
82447+ const struct dentry *old_dentry,
82448+ const struct vfsmount *old_mnt);
82449+int gr_acl_handle_filldir(const struct file *file, const char *name,
82450+ const unsigned int namelen, const ino_t ino);
82451+
82452+__u32 gr_acl_handle_unix(const struct dentry *dentry,
82453+ const struct vfsmount *mnt);
82454+void gr_acl_handle_exit(void);
82455+void gr_acl_handle_psacct(struct task_struct *task, const long code);
82456+int gr_acl_handle_procpidmem(const struct task_struct *task);
82457+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
82458+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
82459+void gr_audit_ptrace(struct task_struct *task);
82460+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
82461+void gr_put_exec_file(struct task_struct *task);
82462+
82463+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
82464+
82465+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
82466+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
82467+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
82468+ struct dentry *newdentry, struct vfsmount *newmnt);
82469+
82470+#ifdef CONFIG_GRKERNSEC_RESLOG
82471+extern void gr_log_resource(const struct task_struct *task, const int res,
82472+ const unsigned long wanted, const int gt);
82473+#else
82474+static inline void gr_log_resource(const struct task_struct *task, const int res,
82475+ const unsigned long wanted, const int gt)
82476+{
82477+}
82478+#endif
82479+
82480+#ifdef CONFIG_GRKERNSEC
82481+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
82482+void gr_handle_vm86(void);
82483+void gr_handle_mem_readwrite(u64 from, u64 to);
82484+
82485+void gr_log_badprocpid(const char *entry);
82486+
82487+extern int grsec_enable_dmesg;
82488+extern int grsec_disable_privio;
82489+
82490+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
82491+extern kgid_t grsec_proc_gid;
82492+#endif
82493+
82494+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
82495+extern int grsec_enable_chroot_findtask;
82496+#endif
82497+#ifdef CONFIG_GRKERNSEC_SETXID
82498+extern int grsec_enable_setxid;
82499+#endif
82500+#endif
82501+
82502+#endif
82503diff --git a/include/linux/grsock.h b/include/linux/grsock.h
82504new file mode 100644
82505index 0000000..e7ffaaf
82506--- /dev/null
82507+++ b/include/linux/grsock.h
82508@@ -0,0 +1,19 @@
82509+#ifndef __GRSOCK_H
82510+#define __GRSOCK_H
82511+
82512+extern void gr_attach_curr_ip(const struct sock *sk);
82513+extern int gr_handle_sock_all(const int family, const int type,
82514+ const int protocol);
82515+extern int gr_handle_sock_server(const struct sockaddr *sck);
82516+extern int gr_handle_sock_server_other(const struct sock *sck);
82517+extern int gr_handle_sock_client(const struct sockaddr *sck);
82518+extern int gr_search_connect(struct socket * sock,
82519+ struct sockaddr_in * addr);
82520+extern int gr_search_bind(struct socket * sock,
82521+ struct sockaddr_in * addr);
82522+extern int gr_search_listen(struct socket * sock);
82523+extern int gr_search_accept(struct socket * sock);
82524+extern int gr_search_socket(const int domain, const int type,
82525+ const int protocol);
82526+
82527+#endif
82528diff --git a/include/linux/hash.h b/include/linux/hash.h
82529index d0494c3..69b7715 100644
82530--- a/include/linux/hash.h
82531+++ b/include/linux/hash.h
82532@@ -87,7 +87,7 @@ static inline u32 hash32_ptr(const void *ptr)
82533 struct fast_hash_ops {
82534 u32 (*hash)(const void *data, u32 len, u32 seed);
82535 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
82536-};
82537+} __no_const;
82538
82539 /**
82540 * arch_fast_hash - Caclulates a hash over a given buffer that can have
82541diff --git a/include/linux/highmem.h b/include/linux/highmem.h
82542index 9286a46..373f27f 100644
82543--- a/include/linux/highmem.h
82544+++ b/include/linux/highmem.h
82545@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
82546 kunmap_atomic(kaddr);
82547 }
82548
82549+static inline void sanitize_highpage(struct page *page)
82550+{
82551+ void *kaddr;
82552+ unsigned long flags;
82553+
82554+ local_irq_save(flags);
82555+ kaddr = kmap_atomic(page);
82556+ clear_page(kaddr);
82557+ kunmap_atomic(kaddr);
82558+ local_irq_restore(flags);
82559+}
82560+
82561 static inline void zero_user_segments(struct page *page,
82562 unsigned start1, unsigned end1,
82563 unsigned start2, unsigned end2)
82564diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
82565index 1c7b89a..7dda400 100644
82566--- a/include/linux/hwmon-sysfs.h
82567+++ b/include/linux/hwmon-sysfs.h
82568@@ -25,7 +25,8 @@
82569 struct sensor_device_attribute{
82570 struct device_attribute dev_attr;
82571 int index;
82572-};
82573+} __do_const;
82574+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
82575 #define to_sensor_dev_attr(_dev_attr) \
82576 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
82577
82578@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
82579 struct device_attribute dev_attr;
82580 u8 index;
82581 u8 nr;
82582-};
82583+} __do_const;
82584+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
82585 #define to_sensor_dev_attr_2(_dev_attr) \
82586 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
82587
82588diff --git a/include/linux/i2c.h b/include/linux/i2c.h
82589index b556e0a..c10a515 100644
82590--- a/include/linux/i2c.h
82591+++ b/include/linux/i2c.h
82592@@ -378,6 +378,7 @@ struct i2c_algorithm {
82593 /* To determine what the adapter supports */
82594 u32 (*functionality) (struct i2c_adapter *);
82595 };
82596+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
82597
82598 /**
82599 * struct i2c_bus_recovery_info - I2C bus recovery information
82600diff --git a/include/linux/i2o.h b/include/linux/i2o.h
82601index d23c3c2..eb63c81 100644
82602--- a/include/linux/i2o.h
82603+++ b/include/linux/i2o.h
82604@@ -565,7 +565,7 @@ struct i2o_controller {
82605 struct i2o_device *exec; /* Executive */
82606 #if BITS_PER_LONG == 64
82607 spinlock_t context_list_lock; /* lock for context_list */
82608- atomic_t context_list_counter; /* needed for unique contexts */
82609+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
82610 struct list_head context_list; /* list of context id's
82611 and pointers */
82612 #endif
82613diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
82614index aff7ad8..3942bbd 100644
82615--- a/include/linux/if_pppox.h
82616+++ b/include/linux/if_pppox.h
82617@@ -76,7 +76,7 @@ struct pppox_proto {
82618 int (*ioctl)(struct socket *sock, unsigned int cmd,
82619 unsigned long arg);
82620 struct module *owner;
82621-};
82622+} __do_const;
82623
82624 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
82625 extern void unregister_pppox_proto(int proto_num);
82626diff --git a/include/linux/init.h b/include/linux/init.h
82627index 2df8e8d..3e1280d 100644
82628--- a/include/linux/init.h
82629+++ b/include/linux/init.h
82630@@ -37,9 +37,17 @@
82631 * section.
82632 */
82633
82634+#define add_init_latent_entropy __latent_entropy
82635+
82636+#ifdef CONFIG_MEMORY_HOTPLUG
82637+#define add_meminit_latent_entropy
82638+#else
82639+#define add_meminit_latent_entropy __latent_entropy
82640+#endif
82641+
82642 /* These are for everybody (although not all archs will actually
82643 discard it in modules) */
82644-#define __init __section(.init.text) __cold notrace
82645+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
82646 #define __initdata __section(.init.data)
82647 #define __initconst __constsection(.init.rodata)
82648 #define __exitdata __section(.exit.data)
82649@@ -100,7 +108,7 @@
82650 #define __cpuexitconst
82651
82652 /* Used for MEMORY_HOTPLUG */
82653-#define __meminit __section(.meminit.text) __cold notrace
82654+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
82655 #define __meminitdata __section(.meminit.data)
82656 #define __meminitconst __constsection(.meminit.rodata)
82657 #define __memexit __section(.memexit.text) __exitused __cold notrace
82658diff --git a/include/linux/init_task.h b/include/linux/init_task.h
82659index 77fc43f..73caf92 100644
82660--- a/include/linux/init_task.h
82661+++ b/include/linux/init_task.h
82662@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
82663
82664 #define INIT_TASK_COMM "swapper"
82665
82666+#ifdef CONFIG_X86
82667+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
82668+#else
82669+#define INIT_TASK_THREAD_INFO
82670+#endif
82671+
82672 #ifdef CONFIG_RT_MUTEXES
82673 # define INIT_RT_MUTEXES(tsk) \
82674 .pi_waiters = RB_ROOT, \
82675@@ -205,6 +211,7 @@ extern struct task_group root_task_group;
82676 RCU_POINTER_INITIALIZER(cred, &init_cred), \
82677 .comm = INIT_TASK_COMM, \
82678 .thread = INIT_THREAD, \
82679+ INIT_TASK_THREAD_INFO \
82680 .fs = &init_fs, \
82681 .files = &init_files, \
82682 .signal = &init_signals, \
82683diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
82684index 69517a2..6b12d37 100644
82685--- a/include/linux/interrupt.h
82686+++ b/include/linux/interrupt.h
82687@@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
82688
82689 struct softirq_action
82690 {
82691- void (*action)(struct softirq_action *);
82692-};
82693+ void (*action)(void);
82694+} __no_const;
82695
82696 asmlinkage void do_softirq(void);
82697 asmlinkage void __do_softirq(void);
82698@@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
82699 }
82700 #endif
82701
82702-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
82703+extern void open_softirq(int nr, void (*action)(void));
82704 extern void softirq_init(void);
82705 extern void __raise_softirq_irqoff(unsigned int nr);
82706
82707diff --git a/include/linux/iommu.h b/include/linux/iommu.h
82708index e6a7c9f..5804745 100644
82709--- a/include/linux/iommu.h
82710+++ b/include/linux/iommu.h
82711@@ -133,7 +133,7 @@ struct iommu_ops {
82712 u32 (*domain_get_windows)(struct iommu_domain *domain);
82713
82714 unsigned long pgsize_bitmap;
82715-};
82716+} __do_const;
82717
82718 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
82719 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
82720diff --git a/include/linux/ioport.h b/include/linux/ioport.h
82721index 2c525022..345b106 100644
82722--- a/include/linux/ioport.h
82723+++ b/include/linux/ioport.h
82724@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
82725 int adjust_resource(struct resource *res, resource_size_t start,
82726 resource_size_t size);
82727 resource_size_t resource_alignment(struct resource *res);
82728-static inline resource_size_t resource_size(const struct resource *res)
82729+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
82730 {
82731 return res->end - res->start + 1;
82732 }
82733diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
82734index 35e7eca..6afb7ad 100644
82735--- a/include/linux/ipc_namespace.h
82736+++ b/include/linux/ipc_namespace.h
82737@@ -69,7 +69,7 @@ struct ipc_namespace {
82738 struct user_namespace *user_ns;
82739
82740 unsigned int proc_inum;
82741-};
82742+} __randomize_layout;
82743
82744 extern struct ipc_namespace init_ipc_ns;
82745 extern atomic_t nr_ipc_ns;
82746diff --git a/include/linux/irq.h b/include/linux/irq.h
82747index 03f48d9..e86af0c 100644
82748--- a/include/linux/irq.h
82749+++ b/include/linux/irq.h
82750@@ -352,7 +352,8 @@ struct irq_chip {
82751 void (*irq_release_resources)(struct irq_data *data);
82752
82753 unsigned long flags;
82754-};
82755+} __do_const;
82756+typedef struct irq_chip __no_const irq_chip_no_const;
82757
82758 /*
82759 * irq_chip specific flags
82760diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
82761index 13eed92..3261c86 100644
82762--- a/include/linux/irqchip/arm-gic.h
82763+++ b/include/linux/irqchip/arm-gic.h
82764@@ -91,9 +91,11 @@
82765
82766 #ifndef __ASSEMBLY__
82767
82768+#include <linux/irq.h>
82769+
82770 struct device_node;
82771
82772-extern struct irq_chip gic_arch_extn;
82773+extern irq_chip_no_const gic_arch_extn;
82774
82775 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
82776 u32 offset, struct device_node *);
82777diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
82778index c367cbd..c9b79e6 100644
82779--- a/include/linux/jiffies.h
82780+++ b/include/linux/jiffies.h
82781@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
82782 /*
82783 * Convert various time units to each other:
82784 */
82785-extern unsigned int jiffies_to_msecs(const unsigned long j);
82786-extern unsigned int jiffies_to_usecs(const unsigned long j);
82787+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
82788+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
82789
82790-static inline u64 jiffies_to_nsecs(const unsigned long j)
82791+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
82792 {
82793 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
82794 }
82795
82796-extern unsigned long msecs_to_jiffies(const unsigned int m);
82797-extern unsigned long usecs_to_jiffies(const unsigned int u);
82798+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
82799+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
82800 extern unsigned long timespec_to_jiffies(const struct timespec *value);
82801 extern void jiffies_to_timespec(const unsigned long jiffies,
82802- struct timespec *value);
82803-extern unsigned long timeval_to_jiffies(const struct timeval *value);
82804+ struct timespec *value) __intentional_overflow(-1);
82805+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
82806 extern void jiffies_to_timeval(const unsigned long jiffies,
82807 struct timeval *value);
82808
82809diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
82810index 6883e19..e854fcb 100644
82811--- a/include/linux/kallsyms.h
82812+++ b/include/linux/kallsyms.h
82813@@ -15,7 +15,8 @@
82814
82815 struct module;
82816
82817-#ifdef CONFIG_KALLSYMS
82818+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
82819+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
82820 /* Lookup the address for a symbol. Returns 0 if not found. */
82821 unsigned long kallsyms_lookup_name(const char *name);
82822
82823@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
82824 /* Stupid that this does nothing, but I didn't create this mess. */
82825 #define __print_symbol(fmt, addr)
82826 #endif /*CONFIG_KALLSYMS*/
82827+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
82828+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
82829+extern unsigned long kallsyms_lookup_name(const char *name);
82830+extern void __print_symbol(const char *fmt, unsigned long address);
82831+extern int sprint_backtrace(char *buffer, unsigned long address);
82832+extern int sprint_symbol(char *buffer, unsigned long address);
82833+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
82834+const char *kallsyms_lookup(unsigned long addr,
82835+ unsigned long *symbolsize,
82836+ unsigned long *offset,
82837+ char **modname, char *namebuf);
82838+extern int kallsyms_lookup_size_offset(unsigned long addr,
82839+ unsigned long *symbolsize,
82840+ unsigned long *offset);
82841+#endif
82842
82843 /* This macro allows us to keep printk typechecking */
82844 static __printf(1, 2)
82845diff --git a/include/linux/key-type.h b/include/linux/key-type.h
82846index ff9f1d3..6712be5 100644
82847--- a/include/linux/key-type.h
82848+++ b/include/linux/key-type.h
82849@@ -152,7 +152,7 @@ struct key_type {
82850 /* internal fields */
82851 struct list_head link; /* link in types list */
82852 struct lock_class_key lock_class; /* key->sem lock class */
82853-};
82854+} __do_const;
82855
82856 extern struct key_type key_type_keyring;
82857
82858diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
82859index e465bb1..19f605fd 100644
82860--- a/include/linux/kgdb.h
82861+++ b/include/linux/kgdb.h
82862@@ -52,7 +52,7 @@ extern int kgdb_connected;
82863 extern int kgdb_io_module_registered;
82864
82865 extern atomic_t kgdb_setting_breakpoint;
82866-extern atomic_t kgdb_cpu_doing_single_step;
82867+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
82868
82869 extern struct task_struct *kgdb_usethread;
82870 extern struct task_struct *kgdb_contthread;
82871@@ -254,7 +254,7 @@ struct kgdb_arch {
82872 void (*correct_hw_break)(void);
82873
82874 void (*enable_nmi)(bool on);
82875-};
82876+} __do_const;
82877
82878 /**
82879 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
82880@@ -279,7 +279,7 @@ struct kgdb_io {
82881 void (*pre_exception) (void);
82882 void (*post_exception) (void);
82883 int is_console;
82884-};
82885+} __do_const;
82886
82887 extern struct kgdb_arch arch_kgdb_ops;
82888
82889diff --git a/include/linux/kmod.h b/include/linux/kmod.h
82890index 0555cc6..40116ce 100644
82891--- a/include/linux/kmod.h
82892+++ b/include/linux/kmod.h
82893@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
82894 * usually useless though. */
82895 extern __printf(2, 3)
82896 int __request_module(bool wait, const char *name, ...);
82897+extern __printf(3, 4)
82898+int ___request_module(bool wait, char *param_name, const char *name, ...);
82899 #define request_module(mod...) __request_module(true, mod)
82900 #define request_module_nowait(mod...) __request_module(false, mod)
82901 #define try_then_request_module(x, mod...) \
82902@@ -57,6 +59,9 @@ struct subprocess_info {
82903 struct work_struct work;
82904 struct completion *complete;
82905 char *path;
82906+#ifdef CONFIG_GRKERNSEC
82907+ char *origpath;
82908+#endif
82909 char **argv;
82910 char **envp;
82911 int wait;
82912diff --git a/include/linux/kobject.h b/include/linux/kobject.h
82913index 2d61b90..a1d0a13 100644
82914--- a/include/linux/kobject.h
82915+++ b/include/linux/kobject.h
82916@@ -118,7 +118,7 @@ struct kobj_type {
82917 struct attribute **default_attrs;
82918 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
82919 const void *(*namespace)(struct kobject *kobj);
82920-};
82921+} __do_const;
82922
82923 struct kobj_uevent_env {
82924 char *argv[3];
82925@@ -142,6 +142,7 @@ struct kobj_attribute {
82926 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
82927 const char *buf, size_t count);
82928 };
82929+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
82930
82931 extern const struct sysfs_ops kobj_sysfs_ops;
82932
82933@@ -169,7 +170,7 @@ struct kset {
82934 spinlock_t list_lock;
82935 struct kobject kobj;
82936 const struct kset_uevent_ops *uevent_ops;
82937-};
82938+} __randomize_layout;
82939
82940 extern void kset_init(struct kset *kset);
82941 extern int __must_check kset_register(struct kset *kset);
82942diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
82943index df32d25..fb52e27 100644
82944--- a/include/linux/kobject_ns.h
82945+++ b/include/linux/kobject_ns.h
82946@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
82947 const void *(*netlink_ns)(struct sock *sk);
82948 const void *(*initial_ns)(void);
82949 void (*drop_ns)(void *);
82950-};
82951+} __do_const;
82952
82953 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
82954 int kobj_ns_type_registered(enum kobj_ns_type type);
82955diff --git a/include/linux/kref.h b/include/linux/kref.h
82956index 484604d..0f6c5b6 100644
82957--- a/include/linux/kref.h
82958+++ b/include/linux/kref.h
82959@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
82960 static inline int kref_sub(struct kref *kref, unsigned int count,
82961 void (*release)(struct kref *kref))
82962 {
82963- WARN_ON(release == NULL);
82964+ BUG_ON(release == NULL);
82965
82966 if (atomic_sub_and_test((int) count, &kref->refcount)) {
82967 release(kref);
82968diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
82969index a6059bd..8126d5c 100644
82970--- a/include/linux/kvm_host.h
82971+++ b/include/linux/kvm_host.h
82972@@ -460,7 +460,7 @@ static inline void kvm_irqfd_exit(void)
82973 {
82974 }
82975 #endif
82976-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82977+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82978 struct module *module);
82979 void kvm_exit(void);
82980
82981@@ -629,7 +629,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
82982 struct kvm_guest_debug *dbg);
82983 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
82984
82985-int kvm_arch_init(void *opaque);
82986+int kvm_arch_init(const void *opaque);
82987 void kvm_arch_exit(void);
82988
82989 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
82990diff --git a/include/linux/libata.h b/include/linux/libata.h
82991index fe0bf8d..c511ca6 100644
82992--- a/include/linux/libata.h
82993+++ b/include/linux/libata.h
82994@@ -977,7 +977,7 @@ struct ata_port_operations {
82995 * fields must be pointers.
82996 */
82997 const struct ata_port_operations *inherits;
82998-};
82999+} __do_const;
83000
83001 struct ata_port_info {
83002 unsigned long flags;
83003diff --git a/include/linux/linkage.h b/include/linux/linkage.h
83004index a6a42dd..6c5ebce 100644
83005--- a/include/linux/linkage.h
83006+++ b/include/linux/linkage.h
83007@@ -36,6 +36,7 @@
83008 #endif
83009
83010 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
83011+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
83012 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
83013
83014 /*
83015diff --git a/include/linux/list.h b/include/linux/list.h
83016index f33f831..1ffe5e2 100644
83017--- a/include/linux/list.h
83018+++ b/include/linux/list.h
83019@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
83020 extern void list_del(struct list_head *entry);
83021 #endif
83022
83023+extern void __pax_list_add(struct list_head *new,
83024+ struct list_head *prev,
83025+ struct list_head *next);
83026+static inline void pax_list_add(struct list_head *new, struct list_head *head)
83027+{
83028+ __pax_list_add(new, head, head->next);
83029+}
83030+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
83031+{
83032+ __pax_list_add(new, head->prev, head);
83033+}
83034+extern void pax_list_del(struct list_head *entry);
83035+
83036 /**
83037 * list_replace - replace old entry by new one
83038 * @old : the element to be replaced
83039@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
83040 INIT_LIST_HEAD(entry);
83041 }
83042
83043+extern void pax_list_del_init(struct list_head *entry);
83044+
83045 /**
83046 * list_move - delete from one list and add as another's head
83047 * @list: the entry to move
83048diff --git a/include/linux/lockref.h b/include/linux/lockref.h
83049index 4bfde0e..d6e2e09 100644
83050--- a/include/linux/lockref.h
83051+++ b/include/linux/lockref.h
83052@@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
83053 return ((int)l->count < 0);
83054 }
83055
83056+static inline unsigned int __lockref_read(struct lockref *lockref)
83057+{
83058+ return lockref->count;
83059+}
83060+
83061+static inline void __lockref_set(struct lockref *lockref, unsigned int count)
83062+{
83063+ lockref->count = count;
83064+}
83065+
83066+static inline void __lockref_inc(struct lockref *lockref)
83067+{
83068+
83069+#ifdef CONFIG_PAX_REFCOUNT
83070+ atomic_inc((atomic_t *)&lockref->count);
83071+#else
83072+ lockref->count++;
83073+#endif
83074+
83075+}
83076+
83077+static inline void __lockref_dec(struct lockref *lockref)
83078+{
83079+
83080+#ifdef CONFIG_PAX_REFCOUNT
83081+ atomic_dec((atomic_t *)&lockref->count);
83082+#else
83083+ lockref->count--;
83084+#endif
83085+
83086+}
83087+
83088 #endif /* __LINUX_LOCKREF_H */
83089diff --git a/include/linux/math64.h b/include/linux/math64.h
83090index c45c089..298841c 100644
83091--- a/include/linux/math64.h
83092+++ b/include/linux/math64.h
83093@@ -15,7 +15,7 @@
83094 * This is commonly provided by 32bit archs to provide an optimized 64bit
83095 * divide.
83096 */
83097-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83098+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83099 {
83100 *remainder = dividend % divisor;
83101 return dividend / divisor;
83102@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
83103 /**
83104 * div64_u64 - unsigned 64bit divide with 64bit divisor
83105 */
83106-static inline u64 div64_u64(u64 dividend, u64 divisor)
83107+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
83108 {
83109 return dividend / divisor;
83110 }
83111@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
83112 #define div64_ul(x, y) div_u64((x), (y))
83113
83114 #ifndef div_u64_rem
83115-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83116+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
83117 {
83118 *remainder = do_div(dividend, divisor);
83119 return dividend;
83120@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
83121 #endif
83122
83123 #ifndef div64_u64
83124-extern u64 div64_u64(u64 dividend, u64 divisor);
83125+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
83126 #endif
83127
83128 #ifndef div64_s64
83129@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
83130 * divide.
83131 */
83132 #ifndef div_u64
83133-static inline u64 div_u64(u64 dividend, u32 divisor)
83134+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
83135 {
83136 u32 remainder;
83137 return div_u64_rem(dividend, divisor, &remainder);
83138diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
83139index 3d385c8..deacb6a 100644
83140--- a/include/linux/mempolicy.h
83141+++ b/include/linux/mempolicy.h
83142@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
83143 }
83144
83145 #define vma_policy(vma) ((vma)->vm_policy)
83146+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
83147+{
83148+ vma->vm_policy = pol;
83149+}
83150
83151 static inline void mpol_get(struct mempolicy *pol)
83152 {
83153@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
83154 }
83155
83156 #define vma_policy(vma) NULL
83157+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
83158+{
83159+}
83160
83161 static inline int
83162 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
83163diff --git a/include/linux/mm.h b/include/linux/mm.h
83164index 5ab2da9..5f0b3df 100644
83165--- a/include/linux/mm.h
83166+++ b/include/linux/mm.h
83167@@ -128,6 +128,11 @@ extern unsigned int kobjsize(const void *objp);
83168 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
83169 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
83170 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
83171+
83172+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
83173+#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
83174+#endif
83175+
83176 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
83177
83178 #ifdef CONFIG_MEM_SOFT_DIRTY
83179@@ -238,8 +243,8 @@ struct vm_operations_struct {
83180 /* called by access_process_vm when get_user_pages() fails, typically
83181 * for use by special VMAs that can switch between memory and hardware
83182 */
83183- int (*access)(struct vm_area_struct *vma, unsigned long addr,
83184- void *buf, int len, int write);
83185+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
83186+ void *buf, size_t len, int write);
83187
83188 /* Called by the /proc/PID/maps code to ask the vma whether it
83189 * has a special name. Returning non-NULL will also cause this
83190@@ -275,6 +280,7 @@ struct vm_operations_struct {
83191 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
83192 unsigned long size, pgoff_t pgoff);
83193 };
83194+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
83195
83196 struct mmu_gather;
83197 struct inode;
83198@@ -1165,8 +1171,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
83199 unsigned long *pfn);
83200 int follow_phys(struct vm_area_struct *vma, unsigned long address,
83201 unsigned int flags, unsigned long *prot, resource_size_t *phys);
83202-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
83203- void *buf, int len, int write);
83204+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
83205+ void *buf, size_t len, int write);
83206
83207 static inline void unmap_shared_mapping_range(struct address_space *mapping,
83208 loff_t const holebegin, loff_t const holelen)
83209@@ -1206,9 +1212,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
83210 }
83211 #endif
83212
83213-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
83214-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
83215- void *buf, int len, int write);
83216+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
83217+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
83218+ void *buf, size_t len, int write);
83219
83220 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
83221 unsigned long start, unsigned long nr_pages,
83222@@ -1240,34 +1246,6 @@ int set_page_dirty_lock(struct page *page);
83223 int clear_page_dirty_for_io(struct page *page);
83224 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
83225
83226-/* Is the vma a continuation of the stack vma above it? */
83227-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
83228-{
83229- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
83230-}
83231-
83232-static inline int stack_guard_page_start(struct vm_area_struct *vma,
83233- unsigned long addr)
83234-{
83235- return (vma->vm_flags & VM_GROWSDOWN) &&
83236- (vma->vm_start == addr) &&
83237- !vma_growsdown(vma->vm_prev, addr);
83238-}
83239-
83240-/* Is the vma a continuation of the stack vma below it? */
83241-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
83242-{
83243- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
83244-}
83245-
83246-static inline int stack_guard_page_end(struct vm_area_struct *vma,
83247- unsigned long addr)
83248-{
83249- return (vma->vm_flags & VM_GROWSUP) &&
83250- (vma->vm_end == addr) &&
83251- !vma_growsup(vma->vm_next, addr);
83252-}
83253-
83254 extern struct task_struct *task_of_stack(struct task_struct *task,
83255 struct vm_area_struct *vma, bool in_group);
83256
83257@@ -1385,8 +1363,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
83258 {
83259 return 0;
83260 }
83261+
83262+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
83263+ unsigned long address)
83264+{
83265+ return 0;
83266+}
83267 #else
83268 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
83269+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
83270 #endif
83271
83272 #ifdef __PAGETABLE_PMD_FOLDED
83273@@ -1395,8 +1380,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
83274 {
83275 return 0;
83276 }
83277+
83278+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
83279+ unsigned long address)
83280+{
83281+ return 0;
83282+}
83283 #else
83284 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
83285+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
83286 #endif
83287
83288 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
83289@@ -1414,11 +1406,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
83290 NULL: pud_offset(pgd, address);
83291 }
83292
83293+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
83294+{
83295+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
83296+ NULL: pud_offset(pgd, address);
83297+}
83298+
83299 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
83300 {
83301 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
83302 NULL: pmd_offset(pud, address);
83303 }
83304+
83305+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
83306+{
83307+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
83308+ NULL: pmd_offset(pud, address);
83309+}
83310 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
83311
83312 #if USE_SPLIT_PTE_PTLOCKS
83313@@ -1801,12 +1805,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
83314 bool *need_rmap_locks);
83315 extern void exit_mmap(struct mm_struct *);
83316
83317+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
83318+extern void gr_learn_resource(const struct task_struct *task, const int res,
83319+ const unsigned long wanted, const int gt);
83320+#else
83321+static inline void gr_learn_resource(const struct task_struct *task, const int res,
83322+ const unsigned long wanted, const int gt)
83323+{
83324+}
83325+#endif
83326+
83327 static inline int check_data_rlimit(unsigned long rlim,
83328 unsigned long new,
83329 unsigned long start,
83330 unsigned long end_data,
83331 unsigned long start_data)
83332 {
83333+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
83334 if (rlim < RLIM_INFINITY) {
83335 if (((new - start) + (end_data - start_data)) > rlim)
83336 return -ENOSPC;
83337@@ -1831,7 +1846,7 @@ extern int install_special_mapping(struct mm_struct *mm,
83338 unsigned long addr, unsigned long len,
83339 unsigned long flags, struct page **pages);
83340
83341-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
83342+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
83343
83344 extern unsigned long mmap_region(struct file *file, unsigned long addr,
83345 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
83346@@ -1839,6 +1854,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
83347 unsigned long len, unsigned long prot, unsigned long flags,
83348 unsigned long pgoff, unsigned long *populate);
83349 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
83350+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
83351
83352 #ifdef CONFIG_MMU
83353 extern int __mm_populate(unsigned long addr, unsigned long len,
83354@@ -1867,10 +1883,11 @@ struct vm_unmapped_area_info {
83355 unsigned long high_limit;
83356 unsigned long align_mask;
83357 unsigned long align_offset;
83358+ unsigned long threadstack_offset;
83359 };
83360
83361-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
83362-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83363+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
83364+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
83365
83366 /*
83367 * Search for an unmapped address range.
83368@@ -1882,7 +1899,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83369 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
83370 */
83371 static inline unsigned long
83372-vm_unmapped_area(struct vm_unmapped_area_info *info)
83373+vm_unmapped_area(const struct vm_unmapped_area_info *info)
83374 {
83375 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
83376 return unmapped_area(info);
83377@@ -1944,6 +1961,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
83378 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
83379 struct vm_area_struct **pprev);
83380
83381+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
83382+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
83383+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
83384+
83385 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
83386 NULL if none. Assume start_addr < end_addr. */
83387 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
83388@@ -1973,10 +1994,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
83389 }
83390
83391 #ifdef CONFIG_MMU
83392-pgprot_t vm_get_page_prot(unsigned long vm_flags);
83393+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
83394 void vma_set_page_prot(struct vm_area_struct *vma);
83395 #else
83396-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
83397+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
83398 {
83399 return __pgprot(0);
83400 }
83401@@ -2038,6 +2059,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
83402 static inline void vm_stat_account(struct mm_struct *mm,
83403 unsigned long flags, struct file *file, long pages)
83404 {
83405+
83406+#ifdef CONFIG_PAX_RANDMMAP
83407+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
83408+#endif
83409+
83410 mm->total_vm += pages;
83411 }
83412 #endif /* CONFIG_PROC_FS */
83413@@ -2126,7 +2152,7 @@ extern int unpoison_memory(unsigned long pfn);
83414 extern int sysctl_memory_failure_early_kill;
83415 extern int sysctl_memory_failure_recovery;
83416 extern void shake_page(struct page *p, int access);
83417-extern atomic_long_t num_poisoned_pages;
83418+extern atomic_long_unchecked_t num_poisoned_pages;
83419 extern int soft_offline_page(struct page *page, int flags);
83420
83421 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
83422@@ -2161,5 +2187,11 @@ void __init setup_nr_node_ids(void);
83423 static inline void setup_nr_node_ids(void) {}
83424 #endif
83425
83426+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
83427+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
83428+#else
83429+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
83430+#endif
83431+
83432 #endif /* __KERNEL__ */
83433 #endif /* _LINUX_MM_H */
83434diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
83435index 6e0b286..90d9c0d 100644
83436--- a/include/linux/mm_types.h
83437+++ b/include/linux/mm_types.h
83438@@ -308,7 +308,9 @@ struct vm_area_struct {
83439 #ifdef CONFIG_NUMA
83440 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
83441 #endif
83442-};
83443+
83444+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
83445+} __randomize_layout;
83446
83447 struct core_thread {
83448 struct task_struct *task;
83449@@ -454,7 +456,25 @@ struct mm_struct {
83450 bool tlb_flush_pending;
83451 #endif
83452 struct uprobes_state uprobes_state;
83453-};
83454+
83455+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
83456+ unsigned long pax_flags;
83457+#endif
83458+
83459+#ifdef CONFIG_PAX_DLRESOLVE
83460+ unsigned long call_dl_resolve;
83461+#endif
83462+
83463+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
83464+ unsigned long call_syscall;
83465+#endif
83466+
83467+#ifdef CONFIG_PAX_ASLR
83468+ unsigned long delta_mmap; /* randomized offset */
83469+ unsigned long delta_stack; /* randomized offset */
83470+#endif
83471+
83472+} __randomize_layout;
83473
83474 static inline void mm_init_cpumask(struct mm_struct *mm)
83475 {
83476diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
83477index c5d5278..f0b68c8 100644
83478--- a/include/linux/mmiotrace.h
83479+++ b/include/linux/mmiotrace.h
83480@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
83481 /* Called from ioremap.c */
83482 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
83483 void __iomem *addr);
83484-extern void mmiotrace_iounmap(volatile void __iomem *addr);
83485+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
83486
83487 /* For anyone to insert markers. Remember trailing newline. */
83488 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
83489@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
83490 {
83491 }
83492
83493-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
83494+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
83495 {
83496 }
83497
83498diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
83499index ffe66e3..b310722 100644
83500--- a/include/linux/mmzone.h
83501+++ b/include/linux/mmzone.h
83502@@ -527,7 +527,7 @@ struct zone {
83503
83504 ZONE_PADDING(_pad3_)
83505 /* Zone statistics */
83506- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83507+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83508 } ____cacheline_internodealigned_in_smp;
83509
83510 enum zone_flags {
83511diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
83512index 44eeef0..a92d3f9 100644
83513--- a/include/linux/mod_devicetable.h
83514+++ b/include/linux/mod_devicetable.h
83515@@ -139,7 +139,7 @@ struct usb_device_id {
83516 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
83517 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
83518
83519-#define HID_ANY_ID (~0)
83520+#define HID_ANY_ID (~0U)
83521 #define HID_BUS_ANY 0xffff
83522 #define HID_GROUP_ANY 0x0000
83523
83524@@ -475,7 +475,7 @@ struct dmi_system_id {
83525 const char *ident;
83526 struct dmi_strmatch matches[4];
83527 void *driver_data;
83528-};
83529+} __do_const;
83530 /*
83531 * struct dmi_device_id appears during expansion of
83532 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
83533diff --git a/include/linux/module.h b/include/linux/module.h
83534index 71f282a..b2387e2 100644
83535--- a/include/linux/module.h
83536+++ b/include/linux/module.h
83537@@ -17,9 +17,11 @@
83538 #include <linux/moduleparam.h>
83539 #include <linux/jump_label.h>
83540 #include <linux/export.h>
83541+#include <linux/fs.h>
83542
83543 #include <linux/percpu.h>
83544 #include <asm/module.h>
83545+#include <asm/pgtable.h>
83546
83547 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
83548 #define MODULE_SIG_STRING "~Module signature appended~\n"
83549@@ -42,7 +44,7 @@ struct module_kobject {
83550 struct kobject *drivers_dir;
83551 struct module_param_attrs *mp;
83552 struct completion *kobj_completion;
83553-};
83554+} __randomize_layout;
83555
83556 struct module_attribute {
83557 struct attribute attr;
83558@@ -54,12 +56,13 @@ struct module_attribute {
83559 int (*test)(struct module *);
83560 void (*free)(struct module *);
83561 };
83562+typedef struct module_attribute __no_const module_attribute_no_const;
83563
83564 struct module_version_attribute {
83565 struct module_attribute mattr;
83566 const char *module_name;
83567 const char *version;
83568-} __attribute__ ((__aligned__(sizeof(void *))));
83569+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
83570
83571 extern ssize_t __modver_version_show(struct module_attribute *,
83572 struct module_kobject *, char *);
83573@@ -235,7 +238,7 @@ struct module {
83574
83575 /* Sysfs stuff. */
83576 struct module_kobject mkobj;
83577- struct module_attribute *modinfo_attrs;
83578+ module_attribute_no_const *modinfo_attrs;
83579 const char *version;
83580 const char *srcversion;
83581 struct kobject *holders_dir;
83582@@ -284,19 +287,16 @@ struct module {
83583 int (*init)(void);
83584
83585 /* If this is non-NULL, vfree after init() returns */
83586- void *module_init;
83587+ void *module_init_rx, *module_init_rw;
83588
83589 /* Here is the actual code + data, vfree'd on unload. */
83590- void *module_core;
83591+ void *module_core_rx, *module_core_rw;
83592
83593 /* Here are the sizes of the init and core sections */
83594- unsigned int init_size, core_size;
83595+ unsigned int init_size_rw, core_size_rw;
83596
83597 /* The size of the executable code in each section. */
83598- unsigned int init_text_size, core_text_size;
83599-
83600- /* Size of RO sections of the module (text+rodata) */
83601- unsigned int init_ro_size, core_ro_size;
83602+ unsigned int init_size_rx, core_size_rx;
83603
83604 /* Arch-specific module values */
83605 struct mod_arch_specific arch;
83606@@ -352,6 +352,10 @@ struct module {
83607 #ifdef CONFIG_EVENT_TRACING
83608 struct ftrace_event_call **trace_events;
83609 unsigned int num_trace_events;
83610+ struct file_operations trace_id;
83611+ struct file_operations trace_enable;
83612+ struct file_operations trace_format;
83613+ struct file_operations trace_filter;
83614 #endif
83615 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
83616 unsigned int num_ftrace_callsites;
83617@@ -375,7 +379,7 @@ struct module {
83618 ctor_fn_t *ctors;
83619 unsigned int num_ctors;
83620 #endif
83621-};
83622+} __randomize_layout;
83623 #ifndef MODULE_ARCH_INIT
83624 #define MODULE_ARCH_INIT {}
83625 #endif
83626@@ -396,18 +400,48 @@ bool is_module_address(unsigned long addr);
83627 bool is_module_percpu_address(unsigned long addr);
83628 bool is_module_text_address(unsigned long addr);
83629
83630+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
83631+{
83632+
83633+#ifdef CONFIG_PAX_KERNEXEC
83634+ if (ktla_ktva(addr) >= (unsigned long)start &&
83635+ ktla_ktva(addr) < (unsigned long)start + size)
83636+ return 1;
83637+#endif
83638+
83639+ return ((void *)addr >= start && (void *)addr < start + size);
83640+}
83641+
83642+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
83643+{
83644+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
83645+}
83646+
83647+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
83648+{
83649+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
83650+}
83651+
83652+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
83653+{
83654+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
83655+}
83656+
83657+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
83658+{
83659+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
83660+}
83661+
83662 static inline bool within_module_core(unsigned long addr,
83663 const struct module *mod)
83664 {
83665- return (unsigned long)mod->module_core <= addr &&
83666- addr < (unsigned long)mod->module_core + mod->core_size;
83667+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
83668 }
83669
83670 static inline bool within_module_init(unsigned long addr,
83671 const struct module *mod)
83672 {
83673- return (unsigned long)mod->module_init <= addr &&
83674- addr < (unsigned long)mod->module_init + mod->init_size;
83675+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
83676 }
83677
83678 static inline bool within_module(unsigned long addr, const struct module *mod)
83679diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
83680index 7eeb9bb..68f37e0 100644
83681--- a/include/linux/moduleloader.h
83682+++ b/include/linux/moduleloader.h
83683@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
83684 sections. Returns NULL on failure. */
83685 void *module_alloc(unsigned long size);
83686
83687+#ifdef CONFIG_PAX_KERNEXEC
83688+void *module_alloc_exec(unsigned long size);
83689+#else
83690+#define module_alloc_exec(x) module_alloc(x)
83691+#endif
83692+
83693 /* Free memory returned from module_alloc. */
83694 void module_free(struct module *mod, void *module_region);
83695
83696+#ifdef CONFIG_PAX_KERNEXEC
83697+void module_free_exec(struct module *mod, void *module_region);
83698+#else
83699+#define module_free_exec(x, y) module_free((x), (y))
83700+#endif
83701+
83702 /*
83703 * Apply the given relocation to the (simplified) ELF. Return -error
83704 * or 0.
83705@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
83706 unsigned int relsec,
83707 struct module *me)
83708 {
83709+#ifdef CONFIG_MODULES
83710 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83711 module_name(me));
83712+#endif
83713 return -ENOEXEC;
83714 }
83715 #endif
83716@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
83717 unsigned int relsec,
83718 struct module *me)
83719 {
83720+#ifdef CONFIG_MODULES
83721 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83722 module_name(me));
83723+#endif
83724 return -ENOEXEC;
83725 }
83726 #endif
83727diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
83728index 1c9effa..1160bdd 100644
83729--- a/include/linux/moduleparam.h
83730+++ b/include/linux/moduleparam.h
83731@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
83732 * @len is usually just sizeof(string).
83733 */
83734 #define module_param_string(name, string, len, perm) \
83735- static const struct kparam_string __param_string_##name \
83736+ static const struct kparam_string __param_string_##name __used \
83737 = { len, string }; \
83738 __module_param_call(MODULE_PARAM_PREFIX, name, \
83739 &param_ops_string, \
83740@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
83741 */
83742 #define module_param_array_named(name, array, type, nump, perm) \
83743 param_check_##type(name, &(array)[0]); \
83744- static const struct kparam_array __param_arr_##name \
83745+ static const struct kparam_array __param_arr_##name __used \
83746 = { .max = ARRAY_SIZE(array), .num = nump, \
83747 .ops = &param_ops_##type, \
83748 .elemsize = sizeof(array[0]), .elem = array }; \
83749diff --git a/include/linux/mount.h b/include/linux/mount.h
83750index c2c561d..a5f2a8c 100644
83751--- a/include/linux/mount.h
83752+++ b/include/linux/mount.h
83753@@ -66,7 +66,7 @@ struct vfsmount {
83754 struct dentry *mnt_root; /* root of the mounted tree */
83755 struct super_block *mnt_sb; /* pointer to superblock */
83756 int mnt_flags;
83757-};
83758+} __randomize_layout;
83759
83760 struct file; /* forward dec */
83761 struct path;
83762diff --git a/include/linux/namei.h b/include/linux/namei.h
83763index 492de72..1bddcd4 100644
83764--- a/include/linux/namei.h
83765+++ b/include/linux/namei.h
83766@@ -19,7 +19,7 @@ struct nameidata {
83767 unsigned seq, m_seq;
83768 int last_type;
83769 unsigned depth;
83770- char *saved_names[MAX_NESTED_LINKS + 1];
83771+ const char *saved_names[MAX_NESTED_LINKS + 1];
83772 };
83773
83774 /*
83775@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
83776
83777 extern void nd_jump_link(struct nameidata *nd, struct path *path);
83778
83779-static inline void nd_set_link(struct nameidata *nd, char *path)
83780+static inline void nd_set_link(struct nameidata *nd, const char *path)
83781 {
83782 nd->saved_names[nd->depth] = path;
83783 }
83784
83785-static inline char *nd_get_link(struct nameidata *nd)
83786+static inline const char *nd_get_link(const struct nameidata *nd)
83787 {
83788 return nd->saved_names[nd->depth];
83789 }
83790diff --git a/include/linux/net.h b/include/linux/net.h
83791index 17d8339..81656c0 100644
83792--- a/include/linux/net.h
83793+++ b/include/linux/net.h
83794@@ -192,7 +192,7 @@ struct net_proto_family {
83795 int (*create)(struct net *net, struct socket *sock,
83796 int protocol, int kern);
83797 struct module *owner;
83798-};
83799+} __do_const;
83800
83801 struct iovec;
83802 struct kvec;
83803diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
83804index 22339b4..4b4d5b3 100644
83805--- a/include/linux/netdevice.h
83806+++ b/include/linux/netdevice.h
83807@@ -1160,6 +1160,7 @@ struct net_device_ops {
83808 struct net_device *dev,
83809 netdev_features_t features);
83810 };
83811+typedef struct net_device_ops __no_const net_device_ops_no_const;
83812
83813 /**
83814 * enum net_device_priv_flags - &struct net_device priv_flags
83815@@ -1502,10 +1503,10 @@ struct net_device {
83816
83817 struct net_device_stats stats;
83818
83819- atomic_long_t rx_dropped;
83820- atomic_long_t tx_dropped;
83821+ atomic_long_unchecked_t rx_dropped;
83822+ atomic_long_unchecked_t tx_dropped;
83823
83824- atomic_t carrier_changes;
83825+ atomic_unchecked_t carrier_changes;
83826
83827 #ifdef CONFIG_WIRELESS_EXT
83828 const struct iw_handler_def * wireless_handlers;
83829diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
83830index 2517ece..0bbfcfb 100644
83831--- a/include/linux/netfilter.h
83832+++ b/include/linux/netfilter.h
83833@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
83834 #endif
83835 /* Use the module struct to lock set/get code in place */
83836 struct module *owner;
83837-};
83838+} __do_const;
83839
83840 /* Function to register/unregister hook points. */
83841 int nf_register_hook(struct nf_hook_ops *reg);
83842diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
83843index e955d47..04a5338 100644
83844--- a/include/linux/netfilter/nfnetlink.h
83845+++ b/include/linux/netfilter/nfnetlink.h
83846@@ -19,7 +19,7 @@ struct nfnl_callback {
83847 const struct nlattr * const cda[]);
83848 const struct nla_policy *policy; /* netlink attribute policy */
83849 const u_int16_t attr_count; /* number of nlattr's */
83850-};
83851+} __do_const;
83852
83853 struct nfnetlink_subsystem {
83854 const char *name;
83855diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
83856new file mode 100644
83857index 0000000..33f4af8
83858--- /dev/null
83859+++ b/include/linux/netfilter/xt_gradm.h
83860@@ -0,0 +1,9 @@
83861+#ifndef _LINUX_NETFILTER_XT_GRADM_H
83862+#define _LINUX_NETFILTER_XT_GRADM_H 1
83863+
83864+struct xt_gradm_mtinfo {
83865+ __u16 flags;
83866+ __u16 invflags;
83867+};
83868+
83869+#endif
83870diff --git a/include/linux/nls.h b/include/linux/nls.h
83871index 520681b..2b7fabb 100644
83872--- a/include/linux/nls.h
83873+++ b/include/linux/nls.h
83874@@ -31,7 +31,7 @@ struct nls_table {
83875 const unsigned char *charset2upper;
83876 struct module *owner;
83877 struct nls_table *next;
83878-};
83879+} __do_const;
83880
83881 /* this value hold the maximum octet of charset */
83882 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
83883@@ -46,7 +46,7 @@ enum utf16_endian {
83884 /* nls_base.c */
83885 extern int __register_nls(struct nls_table *, struct module *);
83886 extern int unregister_nls(struct nls_table *);
83887-extern struct nls_table *load_nls(char *);
83888+extern struct nls_table *load_nls(const char *);
83889 extern void unload_nls(struct nls_table *);
83890 extern struct nls_table *load_nls_default(void);
83891 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
83892diff --git a/include/linux/notifier.h b/include/linux/notifier.h
83893index d14a4c3..a078786 100644
83894--- a/include/linux/notifier.h
83895+++ b/include/linux/notifier.h
83896@@ -54,7 +54,8 @@ struct notifier_block {
83897 notifier_fn_t notifier_call;
83898 struct notifier_block __rcu *next;
83899 int priority;
83900-};
83901+} __do_const;
83902+typedef struct notifier_block __no_const notifier_block_no_const;
83903
83904 struct atomic_notifier_head {
83905 spinlock_t lock;
83906diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
83907index b2a0f15..4d7da32 100644
83908--- a/include/linux/oprofile.h
83909+++ b/include/linux/oprofile.h
83910@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
83911 int oprofilefs_create_ro_ulong(struct dentry * root,
83912 char const * name, ulong * val);
83913
83914-/** Create a file for read-only access to an atomic_t. */
83915+/** Create a file for read-only access to an atomic_unchecked_t. */
83916 int oprofilefs_create_ro_atomic(struct dentry * root,
83917- char const * name, atomic_t * val);
83918+ char const * name, atomic_unchecked_t * val);
83919
83920 /** create a directory */
83921 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
83922diff --git a/include/linux/padata.h b/include/linux/padata.h
83923index 4386946..f50c615 100644
83924--- a/include/linux/padata.h
83925+++ b/include/linux/padata.h
83926@@ -129,7 +129,7 @@ struct parallel_data {
83927 struct padata_serial_queue __percpu *squeue;
83928 atomic_t reorder_objects;
83929 atomic_t refcnt;
83930- atomic_t seq_nr;
83931+ atomic_unchecked_t seq_nr;
83932 struct padata_cpumask cpumask;
83933 spinlock_t lock ____cacheline_aligned;
83934 unsigned int processed;
83935diff --git a/include/linux/path.h b/include/linux/path.h
83936index d137218..be0c176 100644
83937--- a/include/linux/path.h
83938+++ b/include/linux/path.h
83939@@ -1,13 +1,15 @@
83940 #ifndef _LINUX_PATH_H
83941 #define _LINUX_PATH_H
83942
83943+#include <linux/compiler.h>
83944+
83945 struct dentry;
83946 struct vfsmount;
83947
83948 struct path {
83949 struct vfsmount *mnt;
83950 struct dentry *dentry;
83951-};
83952+} __randomize_layout;
83953
83954 extern void path_get(const struct path *);
83955 extern void path_put(const struct path *);
83956diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
83957index 2706ee9..e691f7c 100644
83958--- a/include/linux/pci_hotplug.h
83959+++ b/include/linux/pci_hotplug.h
83960@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
83961 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
83962 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
83963 int (*reset_slot) (struct hotplug_slot *slot, int probe);
83964-};
83965+} __do_const;
83966+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
83967
83968 /**
83969 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
83970diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
83971index 893a0d0..d5f996e 100644
83972--- a/include/linux/perf_event.h
83973+++ b/include/linux/perf_event.h
83974@@ -341,8 +341,8 @@ struct perf_event {
83975
83976 enum perf_event_active_state state;
83977 unsigned int attach_state;
83978- local64_t count;
83979- atomic64_t child_count;
83980+ local64_t count; /* PaX: fix it one day */
83981+ atomic64_unchecked_t child_count;
83982
83983 /*
83984 * These are the total time in nanoseconds that the event
83985@@ -393,8 +393,8 @@ struct perf_event {
83986 * These accumulate total time (in nanoseconds) that children
83987 * events have been enabled and running, respectively.
83988 */
83989- atomic64_t child_total_time_enabled;
83990- atomic64_t child_total_time_running;
83991+ atomic64_unchecked_t child_total_time_enabled;
83992+ atomic64_unchecked_t child_total_time_running;
83993
83994 /*
83995 * Protect attach/detach and child_list:
83996@@ -734,7 +734,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
83997 entry->ip[entry->nr++] = ip;
83998 }
83999
84000-extern int sysctl_perf_event_paranoid;
84001+extern int sysctl_perf_event_legitimately_concerned;
84002 extern int sysctl_perf_event_mlock;
84003 extern int sysctl_perf_event_sample_rate;
84004 extern int sysctl_perf_cpu_time_max_percent;
84005@@ -749,19 +749,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
84006 loff_t *ppos);
84007
84008
84009+static inline bool perf_paranoid_any(void)
84010+{
84011+ return sysctl_perf_event_legitimately_concerned > 2;
84012+}
84013+
84014 static inline bool perf_paranoid_tracepoint_raw(void)
84015 {
84016- return sysctl_perf_event_paranoid > -1;
84017+ return sysctl_perf_event_legitimately_concerned > -1;
84018 }
84019
84020 static inline bool perf_paranoid_cpu(void)
84021 {
84022- return sysctl_perf_event_paranoid > 0;
84023+ return sysctl_perf_event_legitimately_concerned > 0;
84024 }
84025
84026 static inline bool perf_paranoid_kernel(void)
84027 {
84028- return sysctl_perf_event_paranoid > 1;
84029+ return sysctl_perf_event_legitimately_concerned > 1;
84030 }
84031
84032 extern void perf_event_init(void);
84033@@ -892,7 +897,7 @@ struct perf_pmu_events_attr {
84034 struct device_attribute attr;
84035 u64 id;
84036 const char *event_str;
84037-};
84038+} __do_const;
84039
84040 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
84041 static struct perf_pmu_events_attr _var = { \
84042diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
84043index 1997ffc..4f1f44d 100644
84044--- a/include/linux/pid_namespace.h
84045+++ b/include/linux/pid_namespace.h
84046@@ -44,7 +44,7 @@ struct pid_namespace {
84047 int hide_pid;
84048 int reboot; /* group exit code if this pidns was rebooted */
84049 unsigned int proc_inum;
84050-};
84051+} __randomize_layout;
84052
84053 extern struct pid_namespace init_pid_ns;
84054
84055diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
84056index eb8b8ac..62649e1 100644
84057--- a/include/linux/pipe_fs_i.h
84058+++ b/include/linux/pipe_fs_i.h
84059@@ -47,10 +47,10 @@ struct pipe_inode_info {
84060 struct mutex mutex;
84061 wait_queue_head_t wait;
84062 unsigned int nrbufs, curbuf, buffers;
84063- unsigned int readers;
84064- unsigned int writers;
84065- unsigned int files;
84066- unsigned int waiting_writers;
84067+ atomic_t readers;
84068+ atomic_t writers;
84069+ atomic_t files;
84070+ atomic_t waiting_writers;
84071 unsigned int r_counter;
84072 unsigned int w_counter;
84073 struct page *tmp_page;
84074diff --git a/include/linux/pm.h b/include/linux/pm.h
84075index 383fd68..7a11504 100644
84076--- a/include/linux/pm.h
84077+++ b/include/linux/pm.h
84078@@ -621,6 +621,7 @@ struct dev_pm_domain {
84079 struct dev_pm_ops ops;
84080 void (*detach)(struct device *dev, bool power_off);
84081 };
84082+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
84083
84084 /*
84085 * The PM_EVENT_ messages are also used by drivers implementing the legacy
84086diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
84087index 2e0e06d..824cc9b 100644
84088--- a/include/linux/pm_domain.h
84089+++ b/include/linux/pm_domain.h
84090@@ -36,11 +36,11 @@ struct gpd_dev_ops {
84091 int (*save_state)(struct device *dev);
84092 int (*restore_state)(struct device *dev);
84093 bool (*active_wakeup)(struct device *dev);
84094-};
84095+} __no_const;
84096
84097 struct gpd_cpuidle_data {
84098 unsigned int saved_exit_latency;
84099- struct cpuidle_state *idle_state;
84100+ cpuidle_state_no_const *idle_state;
84101 };
84102
84103 struct generic_pm_domain {
84104diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
84105index 367f49b..d2f5a14 100644
84106--- a/include/linux/pm_runtime.h
84107+++ b/include/linux/pm_runtime.h
84108@@ -125,7 +125,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
84109
84110 static inline void pm_runtime_mark_last_busy(struct device *dev)
84111 {
84112- ACCESS_ONCE(dev->power.last_busy) = jiffies;
84113+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
84114 }
84115
84116 #else /* !CONFIG_PM_RUNTIME */
84117diff --git a/include/linux/pnp.h b/include/linux/pnp.h
84118index 195aafc..49a7bc2 100644
84119--- a/include/linux/pnp.h
84120+++ b/include/linux/pnp.h
84121@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
84122 struct pnp_fixup {
84123 char id[7];
84124 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
84125-};
84126+} __do_const;
84127
84128 /* config parameters */
84129 #define PNP_CONFIG_NORMAL 0x0001
84130diff --git a/include/linux/poison.h b/include/linux/poison.h
84131index 2110a81..13a11bb 100644
84132--- a/include/linux/poison.h
84133+++ b/include/linux/poison.h
84134@@ -19,8 +19,8 @@
84135 * under normal circumstances, used to verify that nobody uses
84136 * non-initialized list entries.
84137 */
84138-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
84139-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
84140+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
84141+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
84142
84143 /********** include/linux/timer.h **********/
84144 /*
84145diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
84146index d8b187c3..9a9257a 100644
84147--- a/include/linux/power/smartreflex.h
84148+++ b/include/linux/power/smartreflex.h
84149@@ -238,7 +238,7 @@ struct omap_sr_class_data {
84150 int (*notify)(struct omap_sr *sr, u32 status);
84151 u8 notify_flags;
84152 u8 class_type;
84153-};
84154+} __do_const;
84155
84156 /**
84157 * struct omap_sr_nvalue_table - Smartreflex n-target value info
84158diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
84159index 4ea1d37..80f4b33 100644
84160--- a/include/linux/ppp-comp.h
84161+++ b/include/linux/ppp-comp.h
84162@@ -84,7 +84,7 @@ struct compressor {
84163 struct module *owner;
84164 /* Extra skb space needed by the compressor algorithm */
84165 unsigned int comp_extra;
84166-};
84167+} __do_const;
84168
84169 /*
84170 * The return value from decompress routine is the length of the
84171diff --git a/include/linux/preempt.h b/include/linux/preempt.h
84172index de83b4e..c4b997d 100644
84173--- a/include/linux/preempt.h
84174+++ b/include/linux/preempt.h
84175@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
84176 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
84177 #endif
84178
84179+#define raw_preempt_count_add(val) __preempt_count_add(val)
84180+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
84181+
84182 #define __preempt_count_inc() __preempt_count_add(1)
84183 #define __preempt_count_dec() __preempt_count_sub(1)
84184
84185 #define preempt_count_inc() preempt_count_add(1)
84186+#define raw_preempt_count_inc() raw_preempt_count_add(1)
84187 #define preempt_count_dec() preempt_count_sub(1)
84188+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
84189
84190 #ifdef CONFIG_PREEMPT_COUNT
84191
84192@@ -41,6 +46,12 @@ do { \
84193 barrier(); \
84194 } while (0)
84195
84196+#define raw_preempt_disable() \
84197+do { \
84198+ raw_preempt_count_inc(); \
84199+ barrier(); \
84200+} while (0)
84201+
84202 #define sched_preempt_enable_no_resched() \
84203 do { \
84204 barrier(); \
84205@@ -49,6 +60,12 @@ do { \
84206
84207 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
84208
84209+#define raw_preempt_enable_no_resched() \
84210+do { \
84211+ barrier(); \
84212+ raw_preempt_count_dec(); \
84213+} while (0)
84214+
84215 #ifdef CONFIG_PREEMPT
84216 #define preempt_enable() \
84217 do { \
84218@@ -113,8 +130,10 @@ do { \
84219 * region.
84220 */
84221 #define preempt_disable() barrier()
84222+#define raw_preempt_disable() barrier()
84223 #define sched_preempt_enable_no_resched() barrier()
84224 #define preempt_enable_no_resched() barrier()
84225+#define raw_preempt_enable_no_resched() barrier()
84226 #define preempt_enable() barrier()
84227 #define preempt_check_resched() do { } while (0)
84228
84229@@ -128,11 +147,13 @@ do { \
84230 /*
84231 * Modules have no business playing preemption tricks.
84232 */
84233+#ifndef CONFIG_PAX_KERNEXEC
84234 #undef sched_preempt_enable_no_resched
84235 #undef preempt_enable_no_resched
84236 #undef preempt_enable_no_resched_notrace
84237 #undef preempt_check_resched
84238 #endif
84239+#endif
84240
84241 #define preempt_set_need_resched() \
84242 do { \
84243diff --git a/include/linux/printk.h b/include/linux/printk.h
84244index d78125f..7f36596 100644
84245--- a/include/linux/printk.h
84246+++ b/include/linux/printk.h
84247@@ -124,6 +124,8 @@ static inline __printf(1, 2) __cold
84248 void early_printk(const char *s, ...) { }
84249 #endif
84250
84251+extern int kptr_restrict;
84252+
84253 #ifdef CONFIG_PRINTK
84254 asmlinkage __printf(5, 0)
84255 int vprintk_emit(int facility, int level,
84256@@ -158,7 +160,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
84257
84258 extern int printk_delay_msec;
84259 extern int dmesg_restrict;
84260-extern int kptr_restrict;
84261
84262 extern void wake_up_klogd(void);
84263
84264diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
84265index b97bf2e..f14c92d4 100644
84266--- a/include/linux/proc_fs.h
84267+++ b/include/linux/proc_fs.h
84268@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
84269 extern struct proc_dir_entry *proc_symlink(const char *,
84270 struct proc_dir_entry *, const char *);
84271 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
84272+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
84273 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
84274 struct proc_dir_entry *, void *);
84275+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
84276+ struct proc_dir_entry *, void *);
84277 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
84278 struct proc_dir_entry *);
84279
84280@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
84281 return proc_create_data(name, mode, parent, proc_fops, NULL);
84282 }
84283
84284+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
84285+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
84286+{
84287+#ifdef CONFIG_GRKERNSEC_PROC_USER
84288+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
84289+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
84290+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
84291+#else
84292+ return proc_create_data(name, mode, parent, proc_fops, NULL);
84293+#endif
84294+}
84295+
84296+
84297 extern void proc_set_size(struct proc_dir_entry *, loff_t);
84298 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
84299 extern void *PDE_DATA(const struct inode *);
84300@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
84301 struct proc_dir_entry *parent,const char *dest) { return NULL;}
84302 static inline struct proc_dir_entry *proc_mkdir(const char *name,
84303 struct proc_dir_entry *parent) {return NULL;}
84304+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
84305+ struct proc_dir_entry *parent) { return NULL; }
84306 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
84307 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
84308+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
84309+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
84310 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
84311 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
84312 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
84313@@ -79,7 +99,7 @@ struct net;
84314 static inline struct proc_dir_entry *proc_net_mkdir(
84315 struct net *net, const char *name, struct proc_dir_entry *parent)
84316 {
84317- return proc_mkdir_data(name, 0, parent, net);
84318+ return proc_mkdir_data_restrict(name, 0, parent, net);
84319 }
84320
84321 #endif /* _LINUX_PROC_FS_H */
84322diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
84323index 34a1e10..70f6bde 100644
84324--- a/include/linux/proc_ns.h
84325+++ b/include/linux/proc_ns.h
84326@@ -14,7 +14,7 @@ struct proc_ns_operations {
84327 void (*put)(void *ns);
84328 int (*install)(struct nsproxy *nsproxy, void *ns);
84329 unsigned int (*inum)(void *ns);
84330-};
84331+} __do_const __randomize_layout;
84332
84333 struct proc_ns {
84334 void *ns;
84335diff --git a/include/linux/quota.h b/include/linux/quota.h
84336index 80d345a..9e89a9a 100644
84337--- a/include/linux/quota.h
84338+++ b/include/linux/quota.h
84339@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
84340
84341 extern bool qid_eq(struct kqid left, struct kqid right);
84342 extern bool qid_lt(struct kqid left, struct kqid right);
84343-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
84344+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
84345 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
84346 extern bool qid_valid(struct kqid qid);
84347
84348diff --git a/include/linux/random.h b/include/linux/random.h
84349index b05856e..0a9f14e 100644
84350--- a/include/linux/random.h
84351+++ b/include/linux/random.h
84352@@ -9,9 +9,19 @@
84353 #include <uapi/linux/random.h>
84354
84355 extern void add_device_randomness(const void *, unsigned int);
84356+
84357+static inline void add_latent_entropy(void)
84358+{
84359+
84360+#ifdef LATENT_ENTROPY_PLUGIN
84361+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
84362+#endif
84363+
84364+}
84365+
84366 extern void add_input_randomness(unsigned int type, unsigned int code,
84367- unsigned int value);
84368-extern void add_interrupt_randomness(int irq, int irq_flags);
84369+ unsigned int value) __latent_entropy;
84370+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
84371
84372 extern void get_random_bytes(void *buf, int nbytes);
84373 extern void get_random_bytes_arch(void *buf, int nbytes);
84374@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
84375 extern const struct file_operations random_fops, urandom_fops;
84376 #endif
84377
84378-unsigned int get_random_int(void);
84379+unsigned int __intentional_overflow(-1) get_random_int(void);
84380 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
84381
84382-u32 prandom_u32(void);
84383+u32 prandom_u32(void) __intentional_overflow(-1);
84384 void prandom_bytes(void *buf, size_t nbytes);
84385 void prandom_seed(u32 seed);
84386 void prandom_reseed_late(void);
84387@@ -37,6 +47,11 @@ struct rnd_state {
84388 u32 prandom_u32_state(struct rnd_state *state);
84389 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84390
84391+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
84392+{
84393+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
84394+}
84395+
84396 /**
84397 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
84398 * @ep_ro: right open interval endpoint
84399@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84400 *
84401 * Returns: pseudo-random number in interval [0, ep_ro)
84402 */
84403-static inline u32 prandom_u32_max(u32 ep_ro)
84404+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
84405 {
84406 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
84407 }
84408diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
84409index 378c5ee..aa84a47 100644
84410--- a/include/linux/rbtree_augmented.h
84411+++ b/include/linux/rbtree_augmented.h
84412@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
84413 old->rbaugmented = rbcompute(old); \
84414 } \
84415 rbstatic const struct rb_augment_callbacks rbname = { \
84416- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
84417+ .propagate = rbname ## _propagate, \
84418+ .copy = rbname ## _copy, \
84419+ .rotate = rbname ## _rotate \
84420 };
84421
84422
84423diff --git a/include/linux/rculist.h b/include/linux/rculist.h
84424index 372ad5e..d4373f8 100644
84425--- a/include/linux/rculist.h
84426+++ b/include/linux/rculist.h
84427@@ -29,8 +29,8 @@
84428 */
84429 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
84430 {
84431- ACCESS_ONCE(list->next) = list;
84432- ACCESS_ONCE(list->prev) = list;
84433+ ACCESS_ONCE_RW(list->next) = list;
84434+ ACCESS_ONCE_RW(list->prev) = list;
84435 }
84436
84437 /*
84438@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
84439 struct list_head *prev, struct list_head *next);
84440 #endif
84441
84442+void __pax_list_add_rcu(struct list_head *new,
84443+ struct list_head *prev, struct list_head *next);
84444+
84445 /**
84446 * list_add_rcu - add a new entry to rcu-protected list
84447 * @new: new entry to be added
84448@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
84449 __list_add_rcu(new, head, head->next);
84450 }
84451
84452+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
84453+{
84454+ __pax_list_add_rcu(new, head, head->next);
84455+}
84456+
84457 /**
84458 * list_add_tail_rcu - add a new entry to rcu-protected list
84459 * @new: new entry to be added
84460@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
84461 __list_add_rcu(new, head->prev, head);
84462 }
84463
84464+static inline void pax_list_add_tail_rcu(struct list_head *new,
84465+ struct list_head *head)
84466+{
84467+ __pax_list_add_rcu(new, head->prev, head);
84468+}
84469+
84470 /**
84471 * list_del_rcu - deletes entry from list without re-initialization
84472 * @entry: the element to delete from the list.
84473@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
84474 entry->prev = LIST_POISON2;
84475 }
84476
84477+extern void pax_list_del_rcu(struct list_head *entry);
84478+
84479 /**
84480 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
84481 * @n: the element to delete from the hash list.
84482diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
84483index 53ff1a7..c40f0ab 100644
84484--- a/include/linux/rcupdate.h
84485+++ b/include/linux/rcupdate.h
84486@@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
84487 #define rcu_note_voluntary_context_switch(t) \
84488 do { \
84489 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
84490- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
84491+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
84492 } while (0)
84493 #else /* #ifdef CONFIG_TASKS_RCU */
84494 #define TASKS_RCU(x) do { } while (0)
84495diff --git a/include/linux/reboot.h b/include/linux/reboot.h
84496index 67fc8fc..a90f7d8 100644
84497--- a/include/linux/reboot.h
84498+++ b/include/linux/reboot.h
84499@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
84500 */
84501
84502 extern void migrate_to_reboot_cpu(void);
84503-extern void machine_restart(char *cmd);
84504-extern void machine_halt(void);
84505-extern void machine_power_off(void);
84506+extern void machine_restart(char *cmd) __noreturn;
84507+extern void machine_halt(void) __noreturn;
84508+extern void machine_power_off(void) __noreturn;
84509
84510 extern void machine_shutdown(void);
84511 struct pt_regs;
84512@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
84513 */
84514
84515 extern void kernel_restart_prepare(char *cmd);
84516-extern void kernel_restart(char *cmd);
84517-extern void kernel_halt(void);
84518-extern void kernel_power_off(void);
84519+extern void kernel_restart(char *cmd) __noreturn;
84520+extern void kernel_halt(void) __noreturn;
84521+extern void kernel_power_off(void) __noreturn;
84522
84523 extern int C_A_D; /* for sysctl */
84524 void ctrl_alt_del(void);
84525@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
84526 * Emergency restart, callable from an interrupt handler.
84527 */
84528
84529-extern void emergency_restart(void);
84530+extern void emergency_restart(void) __noreturn;
84531 #include <asm/emergency-restart.h>
84532
84533 #endif /* _LINUX_REBOOT_H */
84534diff --git a/include/linux/regset.h b/include/linux/regset.h
84535index 8e0c9fe..ac4d221 100644
84536--- a/include/linux/regset.h
84537+++ b/include/linux/regset.h
84538@@ -161,7 +161,8 @@ struct user_regset {
84539 unsigned int align;
84540 unsigned int bias;
84541 unsigned int core_note_type;
84542-};
84543+} __do_const;
84544+typedef struct user_regset __no_const user_regset_no_const;
84545
84546 /**
84547 * struct user_regset_view - available regsets
84548diff --git a/include/linux/relay.h b/include/linux/relay.h
84549index d7c8359..818daf5 100644
84550--- a/include/linux/relay.h
84551+++ b/include/linux/relay.h
84552@@ -157,7 +157,7 @@ struct rchan_callbacks
84553 * The callback should return 0 if successful, negative if not.
84554 */
84555 int (*remove_buf_file)(struct dentry *dentry);
84556-};
84557+} __no_const;
84558
84559 /*
84560 * CONFIG_RELAY kernel API, kernel/relay.c
84561diff --git a/include/linux/rio.h b/include/linux/rio.h
84562index 6bda06f..bf39a9b 100644
84563--- a/include/linux/rio.h
84564+++ b/include/linux/rio.h
84565@@ -358,7 +358,7 @@ struct rio_ops {
84566 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
84567 u64 rstart, u32 size, u32 flags);
84568 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
84569-};
84570+} __no_const;
84571
84572 #define RIO_RESOURCE_MEM 0x00000100
84573 #define RIO_RESOURCE_DOORBELL 0x00000200
84574diff --git a/include/linux/rmap.h b/include/linux/rmap.h
84575index c0c2bce..4813524 100644
84576--- a/include/linux/rmap.h
84577+++ b/include/linux/rmap.h
84578@@ -144,8 +144,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
84579 void anon_vma_init(void); /* create anon_vma_cachep */
84580 int anon_vma_prepare(struct vm_area_struct *);
84581 void unlink_anon_vmas(struct vm_area_struct *);
84582-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
84583-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
84584+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
84585+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
84586
84587 static inline void anon_vma_merge(struct vm_area_struct *vma,
84588 struct vm_area_struct *next)
84589diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
84590index ed8f9e7..999bc96 100644
84591--- a/include/linux/scatterlist.h
84592+++ b/include/linux/scatterlist.h
84593@@ -1,6 +1,7 @@
84594 #ifndef _LINUX_SCATTERLIST_H
84595 #define _LINUX_SCATTERLIST_H
84596
84597+#include <linux/sched.h>
84598 #include <linux/string.h>
84599 #include <linux/bug.h>
84600 #include <linux/mm.h>
84601@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
84602 #ifdef CONFIG_DEBUG_SG
84603 BUG_ON(!virt_addr_valid(buf));
84604 #endif
84605+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84606+ if (object_starts_on_stack(buf)) {
84607+ void *adjbuf = buf - current->stack + current->lowmem_stack;
84608+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
84609+ } else
84610+#endif
84611 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
84612 }
84613
84614diff --git a/include/linux/sched.h b/include/linux/sched.h
84615index 5e344bb..0743255 100644
84616--- a/include/linux/sched.h
84617+++ b/include/linux/sched.h
84618@@ -133,6 +133,7 @@ struct fs_struct;
84619 struct perf_event_context;
84620 struct blk_plug;
84621 struct filename;
84622+struct linux_binprm;
84623
84624 #define VMACACHE_BITS 2
84625 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
84626@@ -376,7 +377,7 @@ extern char __sched_text_start[], __sched_text_end[];
84627 extern int in_sched_functions(unsigned long addr);
84628
84629 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
84630-extern signed long schedule_timeout(signed long timeout);
84631+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
84632 extern signed long schedule_timeout_interruptible(signed long timeout);
84633 extern signed long schedule_timeout_killable(signed long timeout);
84634 extern signed long schedule_timeout_uninterruptible(signed long timeout);
84635@@ -387,6 +388,19 @@ struct nsproxy;
84636 struct user_namespace;
84637
84638 #ifdef CONFIG_MMU
84639+
84640+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
84641+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
84642+#else
84643+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
84644+{
84645+ return 0;
84646+}
84647+#endif
84648+
84649+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
84650+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
84651+
84652 extern void arch_pick_mmap_layout(struct mm_struct *mm);
84653 extern unsigned long
84654 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
84655@@ -685,6 +699,17 @@ struct signal_struct {
84656 #ifdef CONFIG_TASKSTATS
84657 struct taskstats *stats;
84658 #endif
84659+
84660+#ifdef CONFIG_GRKERNSEC
84661+ u32 curr_ip;
84662+ u32 saved_ip;
84663+ u32 gr_saddr;
84664+ u32 gr_daddr;
84665+ u16 gr_sport;
84666+ u16 gr_dport;
84667+ u8 used_accept:1;
84668+#endif
84669+
84670 #ifdef CONFIG_AUDIT
84671 unsigned audit_tty;
84672 unsigned audit_tty_log_passwd;
84673@@ -711,7 +736,7 @@ struct signal_struct {
84674 struct mutex cred_guard_mutex; /* guard against foreign influences on
84675 * credential calculations
84676 * (notably. ptrace) */
84677-};
84678+} __randomize_layout;
84679
84680 /*
84681 * Bits in flags field of signal_struct.
84682@@ -764,6 +789,14 @@ struct user_struct {
84683 struct key *session_keyring; /* UID's default session keyring */
84684 #endif
84685
84686+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
84687+ unsigned char kernel_banned;
84688+#endif
84689+#ifdef CONFIG_GRKERNSEC_BRUTE
84690+ unsigned char suid_banned;
84691+ unsigned long suid_ban_expires;
84692+#endif
84693+
84694 /* Hash table maintenance information */
84695 struct hlist_node uidhash_node;
84696 kuid_t uid;
84697@@ -771,7 +804,7 @@ struct user_struct {
84698 #ifdef CONFIG_PERF_EVENTS
84699 atomic_long_t locked_vm;
84700 #endif
84701-};
84702+} __randomize_layout;
84703
84704 extern int uids_sysfs_init(void);
84705
84706@@ -1235,6 +1268,9 @@ enum perf_event_task_context {
84707 struct task_struct {
84708 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
84709 void *stack;
84710+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84711+ void *lowmem_stack;
84712+#endif
84713 atomic_t usage;
84714 unsigned int flags; /* per process flags, defined below */
84715 unsigned int ptrace;
84716@@ -1362,8 +1398,8 @@ struct task_struct {
84717 struct list_head thread_node;
84718
84719 struct completion *vfork_done; /* for vfork() */
84720- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
84721- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84722+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
84723+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84724
84725 cputime_t utime, stime, utimescaled, stimescaled;
84726 cputime_t gtime;
84727@@ -1388,11 +1424,6 @@ struct task_struct {
84728 struct task_cputime cputime_expires;
84729 struct list_head cpu_timers[3];
84730
84731-/* process credentials */
84732- const struct cred __rcu *real_cred; /* objective and real subjective task
84733- * credentials (COW) */
84734- const struct cred __rcu *cred; /* effective (overridable) subjective task
84735- * credentials (COW) */
84736 char comm[TASK_COMM_LEN]; /* executable name excluding path
84737 - access with [gs]et_task_comm (which lock
84738 it with task_lock())
84739@@ -1410,6 +1441,10 @@ struct task_struct {
84740 #endif
84741 /* CPU-specific state of this task */
84742 struct thread_struct thread;
84743+/* thread_info moved to task_struct */
84744+#ifdef CONFIG_X86
84745+ struct thread_info tinfo;
84746+#endif
84747 /* filesystem information */
84748 struct fs_struct *fs;
84749 /* open file information */
84750@@ -1484,6 +1519,10 @@ struct task_struct {
84751 gfp_t lockdep_reclaim_gfp;
84752 #endif
84753
84754+/* process credentials */
84755+ const struct cred __rcu *real_cred; /* objective and real subjective task
84756+ * credentials (COW) */
84757+
84758 /* journalling filesystem info */
84759 void *journal_info;
84760
84761@@ -1522,6 +1561,10 @@ struct task_struct {
84762 /* cg_list protected by css_set_lock and tsk->alloc_lock */
84763 struct list_head cg_list;
84764 #endif
84765+
84766+ const struct cred __rcu *cred; /* effective (overridable) subjective task
84767+ * credentials (COW) */
84768+
84769 #ifdef CONFIG_FUTEX
84770 struct robust_list_head __user *robust_list;
84771 #ifdef CONFIG_COMPAT
84772@@ -1635,7 +1678,7 @@ struct task_struct {
84773 * Number of functions that haven't been traced
84774 * because of depth overrun.
84775 */
84776- atomic_t trace_overrun;
84777+ atomic_unchecked_t trace_overrun;
84778 /* Pause for the tracing */
84779 atomic_t tracing_graph_pause;
84780 #endif
84781@@ -1661,7 +1704,78 @@ struct task_struct {
84782 unsigned int sequential_io;
84783 unsigned int sequential_io_avg;
84784 #endif
84785-};
84786+
84787+#ifdef CONFIG_GRKERNSEC
84788+ /* grsecurity */
84789+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84790+ u64 exec_id;
84791+#endif
84792+#ifdef CONFIG_GRKERNSEC_SETXID
84793+ const struct cred *delayed_cred;
84794+#endif
84795+ struct dentry *gr_chroot_dentry;
84796+ struct acl_subject_label *acl;
84797+ struct acl_subject_label *tmpacl;
84798+ struct acl_role_label *role;
84799+ struct file *exec_file;
84800+ unsigned long brute_expires;
84801+ u16 acl_role_id;
84802+ u8 inherited;
84803+ /* is this the task that authenticated to the special role */
84804+ u8 acl_sp_role;
84805+ u8 is_writable;
84806+ u8 brute;
84807+ u8 gr_is_chrooted;
84808+#endif
84809+
84810+} __randomize_layout;
84811+
84812+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
84813+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
84814+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
84815+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
84816+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
84817+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
84818+
84819+#ifdef CONFIG_PAX_SOFTMODE
84820+extern int pax_softmode;
84821+#endif
84822+
84823+extern int pax_check_flags(unsigned long *);
84824+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
84825+
84826+/* if tsk != current then task_lock must be held on it */
84827+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84828+static inline unsigned long pax_get_flags(struct task_struct *tsk)
84829+{
84830+ if (likely(tsk->mm))
84831+ return tsk->mm->pax_flags;
84832+ else
84833+ return 0UL;
84834+}
84835+
84836+/* if tsk != current then task_lock must be held on it */
84837+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
84838+{
84839+ if (likely(tsk->mm)) {
84840+ tsk->mm->pax_flags = flags;
84841+ return 0;
84842+ }
84843+ return -EINVAL;
84844+}
84845+#endif
84846+
84847+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84848+extern void pax_set_initial_flags(struct linux_binprm *bprm);
84849+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
84850+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
84851+#endif
84852+
84853+struct path;
84854+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
84855+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
84856+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
84857+extern void pax_report_refcount_overflow(struct pt_regs *regs);
84858
84859 /* Future-safe accessor for struct task_struct's cpus_allowed. */
84860 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
84861@@ -1743,7 +1857,7 @@ struct pid_namespace;
84862 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
84863 struct pid_namespace *ns);
84864
84865-static inline pid_t task_pid_nr(struct task_struct *tsk)
84866+static inline pid_t task_pid_nr(const struct task_struct *tsk)
84867 {
84868 return tsk->pid;
84869 }
84870@@ -2106,6 +2220,25 @@ extern u64 sched_clock_cpu(int cpu);
84871
84872 extern void sched_clock_init(void);
84873
84874+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84875+static inline void populate_stack(void)
84876+{
84877+ struct task_struct *curtask = current;
84878+ int c;
84879+ int *ptr = curtask->stack;
84880+ int *end = curtask->stack + THREAD_SIZE;
84881+
84882+ while (ptr < end) {
84883+ c = *(volatile int *)ptr;
84884+ ptr += PAGE_SIZE/sizeof(int);
84885+ }
84886+}
84887+#else
84888+static inline void populate_stack(void)
84889+{
84890+}
84891+#endif
84892+
84893 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
84894 static inline void sched_clock_tick(void)
84895 {
84896@@ -2239,7 +2372,9 @@ void yield(void);
84897 extern struct exec_domain default_exec_domain;
84898
84899 union thread_union {
84900+#ifndef CONFIG_X86
84901 struct thread_info thread_info;
84902+#endif
84903 unsigned long stack[THREAD_SIZE/sizeof(long)];
84904 };
84905
84906@@ -2272,6 +2407,7 @@ extern struct pid_namespace init_pid_ns;
84907 */
84908
84909 extern struct task_struct *find_task_by_vpid(pid_t nr);
84910+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
84911 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
84912 struct pid_namespace *ns);
84913
84914@@ -2436,7 +2572,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
84915 extern void exit_itimers(struct signal_struct *);
84916 extern void flush_itimer_signals(void);
84917
84918-extern void do_group_exit(int);
84919+extern __noreturn void do_group_exit(int);
84920
84921 extern int do_execve(struct filename *,
84922 const char __user * const __user *,
84923@@ -2653,9 +2789,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
84924 #define task_stack_end_corrupted(task) \
84925 (*(end_of_stack(task)) != STACK_END_MAGIC)
84926
84927-static inline int object_is_on_stack(void *obj)
84928+static inline int object_starts_on_stack(const void *obj)
84929 {
84930- void *stack = task_stack_page(current);
84931+ const void *stack = task_stack_page(current);
84932
84933 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
84934 }
84935diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
84936index 596a0e0..bea77ec 100644
84937--- a/include/linux/sched/sysctl.h
84938+++ b/include/linux/sched/sysctl.h
84939@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
84940 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
84941
84942 extern int sysctl_max_map_count;
84943+extern unsigned long sysctl_heap_stack_gap;
84944
84945 extern unsigned int sysctl_sched_latency;
84946 extern unsigned int sysctl_sched_min_granularity;
84947diff --git a/include/linux/security.h b/include/linux/security.h
84948index ba96471..74fb3f6 100644
84949--- a/include/linux/security.h
84950+++ b/include/linux/security.h
84951@@ -27,6 +27,7 @@
84952 #include <linux/slab.h>
84953 #include <linux/err.h>
84954 #include <linux/string.h>
84955+#include <linux/grsecurity.h>
84956
84957 struct linux_binprm;
84958 struct cred;
84959@@ -116,8 +117,6 @@ struct seq_file;
84960
84961 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
84962
84963-void reset_security_ops(void);
84964-
84965 #ifdef CONFIG_MMU
84966 extern unsigned long mmap_min_addr;
84967 extern unsigned long dac_mmap_min_addr;
84968@@ -1729,7 +1728,7 @@ struct security_operations {
84969 struct audit_context *actx);
84970 void (*audit_rule_free) (void *lsmrule);
84971 #endif /* CONFIG_AUDIT */
84972-};
84973+} __randomize_layout;
84974
84975 /* prototypes */
84976 extern int security_init(void);
84977diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
84978index dc368b8..e895209 100644
84979--- a/include/linux/semaphore.h
84980+++ b/include/linux/semaphore.h
84981@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
84982 }
84983
84984 extern void down(struct semaphore *sem);
84985-extern int __must_check down_interruptible(struct semaphore *sem);
84986+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
84987 extern int __must_check down_killable(struct semaphore *sem);
84988 extern int __must_check down_trylock(struct semaphore *sem);
84989 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
84990diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
84991index 52e0097..383f21d 100644
84992--- a/include/linux/seq_file.h
84993+++ b/include/linux/seq_file.h
84994@@ -27,6 +27,9 @@ struct seq_file {
84995 struct mutex lock;
84996 const struct seq_operations *op;
84997 int poll_event;
84998+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84999+ u64 exec_id;
85000+#endif
85001 #ifdef CONFIG_USER_NS
85002 struct user_namespace *user_ns;
85003 #endif
85004@@ -39,6 +42,7 @@ struct seq_operations {
85005 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
85006 int (*show) (struct seq_file *m, void *v);
85007 };
85008+typedef struct seq_operations __no_const seq_operations_no_const;
85009
85010 #define SEQ_SKIP 1
85011
85012@@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
85013
85014 char *mangle_path(char *s, const char *p, const char *esc);
85015 int seq_open(struct file *, const struct seq_operations *);
85016+int seq_open_restrict(struct file *, const struct seq_operations *);
85017 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
85018 loff_t seq_lseek(struct file *, loff_t, int);
85019 int seq_release(struct inode *, struct file *);
85020@@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
85021 }
85022
85023 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
85024+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
85025 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
85026 int single_release(struct inode *, struct file *);
85027 void *__seq_open_private(struct file *, const struct seq_operations *, int);
85028diff --git a/include/linux/shm.h b/include/linux/shm.h
85029index 6fb8016..ab4465e 100644
85030--- a/include/linux/shm.h
85031+++ b/include/linux/shm.h
85032@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
85033 /* The task created the shm object. NULL if the task is dead. */
85034 struct task_struct *shm_creator;
85035 struct list_head shm_clist; /* list by creator */
85036+#ifdef CONFIG_GRKERNSEC
85037+ u64 shm_createtime;
85038+ pid_t shm_lapid;
85039+#endif
85040 };
85041
85042 /* shm_mode upper byte flags */
85043diff --git a/include/linux/signal.h b/include/linux/signal.h
85044index ab1e039..ad4229e 100644
85045--- a/include/linux/signal.h
85046+++ b/include/linux/signal.h
85047@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
85048 * know it'll be handled, so that they don't get converted to
85049 * SIGKILL or just silently dropped.
85050 */
85051- kernel_sigaction(sig, (__force __sighandler_t)2);
85052+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
85053 }
85054
85055 static inline void disallow_signal(int sig)
85056diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
85057index 6c8b6f6..5a0f4bd 100644
85058--- a/include/linux/skbuff.h
85059+++ b/include/linux/skbuff.h
85060@@ -773,7 +773,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
85061 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
85062 int node);
85063 struct sk_buff *build_skb(void *data, unsigned int frag_size);
85064-static inline struct sk_buff *alloc_skb(unsigned int size,
85065+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
85066 gfp_t priority)
85067 {
85068 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
85069@@ -1962,7 +1962,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
85070 return skb->inner_transport_header - skb->inner_network_header;
85071 }
85072
85073-static inline int skb_network_offset(const struct sk_buff *skb)
85074+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
85075 {
85076 return skb_network_header(skb) - skb->data;
85077 }
85078@@ -2022,7 +2022,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
85079 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
85080 */
85081 #ifndef NET_SKB_PAD
85082-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
85083+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
85084 #endif
85085
85086 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
85087@@ -2629,7 +2629,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
85088 int *err);
85089 unsigned int datagram_poll(struct file *file, struct socket *sock,
85090 struct poll_table_struct *wait);
85091-int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
85092+int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
85093 struct iovec *to, int size);
85094 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
85095 struct iovec *iov);
85096@@ -3091,6 +3091,9 @@ static inline void nf_reset(struct sk_buff *skb)
85097 nf_bridge_put(skb->nf_bridge);
85098 skb->nf_bridge = NULL;
85099 #endif
85100+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
85101+ skb->nf_trace = 0;
85102+#endif
85103 }
85104
85105 static inline void nf_reset_trace(struct sk_buff *skb)
85106diff --git a/include/linux/slab.h b/include/linux/slab.h
85107index c265bec..4867d28 100644
85108--- a/include/linux/slab.h
85109+++ b/include/linux/slab.h
85110@@ -14,15 +14,29 @@
85111 #include <linux/gfp.h>
85112 #include <linux/types.h>
85113 #include <linux/workqueue.h>
85114-
85115+#include <linux/err.h>
85116
85117 /*
85118 * Flags to pass to kmem_cache_create().
85119 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
85120 */
85121 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
85122+
85123+#ifdef CONFIG_PAX_USERCOPY_SLABS
85124+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
85125+#else
85126+#define SLAB_USERCOPY 0x00000000UL
85127+#endif
85128+
85129 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
85130 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
85131+
85132+#ifdef CONFIG_PAX_MEMORY_SANITIZE
85133+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
85134+#else
85135+#define SLAB_NO_SANITIZE 0x00000000UL
85136+#endif
85137+
85138 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
85139 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
85140 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
85141@@ -98,10 +112,13 @@
85142 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
85143 * Both make kfree a no-op.
85144 */
85145-#define ZERO_SIZE_PTR ((void *)16)
85146+#define ZERO_SIZE_PTR \
85147+({ \
85148+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
85149+ (void *)(-MAX_ERRNO-1L); \
85150+})
85151
85152-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
85153- (unsigned long)ZERO_SIZE_PTR)
85154+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
85155
85156 #include <linux/kmemleak.h>
85157
85158@@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
85159 void kfree(const void *);
85160 void kzfree(const void *);
85161 size_t ksize(const void *);
85162+const char *check_heap_object(const void *ptr, unsigned long n);
85163+bool is_usercopy_object(const void *ptr);
85164
85165 /*
85166 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
85167@@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
85168 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
85169 #endif
85170
85171+#ifdef CONFIG_PAX_USERCOPY_SLABS
85172+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
85173+#endif
85174+
85175 /*
85176 * Figure out which kmalloc slab an allocation of a certain size
85177 * belongs to.
85178@@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
85179 * 2 = 120 .. 192 bytes
85180 * n = 2^(n-1) .. 2^n -1
85181 */
85182-static __always_inline int kmalloc_index(size_t size)
85183+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
85184 {
85185 if (!size)
85186 return 0;
85187@@ -287,11 +310,11 @@ static __always_inline int kmalloc_index(size_t size)
85188 }
85189 #endif /* !CONFIG_SLOB */
85190
85191-void *__kmalloc(size_t size, gfp_t flags);
85192+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
85193 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
85194
85195 #ifdef CONFIG_NUMA
85196-void *__kmalloc_node(size_t size, gfp_t flags, int node);
85197+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
85198 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
85199 #else
85200 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
85201diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
85202index b869d16..1453c73 100644
85203--- a/include/linux/slab_def.h
85204+++ b/include/linux/slab_def.h
85205@@ -40,7 +40,7 @@ struct kmem_cache {
85206 /* 4) cache creation/removal */
85207 const char *name;
85208 struct list_head list;
85209- int refcount;
85210+ atomic_t refcount;
85211 int object_size;
85212 int align;
85213
85214@@ -56,10 +56,14 @@ struct kmem_cache {
85215 unsigned long node_allocs;
85216 unsigned long node_frees;
85217 unsigned long node_overflow;
85218- atomic_t allochit;
85219- atomic_t allocmiss;
85220- atomic_t freehit;
85221- atomic_t freemiss;
85222+ atomic_unchecked_t allochit;
85223+ atomic_unchecked_t allocmiss;
85224+ atomic_unchecked_t freehit;
85225+ atomic_unchecked_t freemiss;
85226+#ifdef CONFIG_PAX_MEMORY_SANITIZE
85227+ atomic_unchecked_t sanitized;
85228+ atomic_unchecked_t not_sanitized;
85229+#endif
85230
85231 /*
85232 * If debugging is enabled, then the allocator can add additional
85233diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
85234index d82abd4..408c3a0 100644
85235--- a/include/linux/slub_def.h
85236+++ b/include/linux/slub_def.h
85237@@ -74,7 +74,7 @@ struct kmem_cache {
85238 struct kmem_cache_order_objects max;
85239 struct kmem_cache_order_objects min;
85240 gfp_t allocflags; /* gfp flags to use on each alloc */
85241- int refcount; /* Refcount for slab cache destroy */
85242+ atomic_t refcount; /* Refcount for slab cache destroy */
85243 void (*ctor)(void *);
85244 int inuse; /* Offset to metadata */
85245 int align; /* Alignment */
85246diff --git a/include/linux/smp.h b/include/linux/smp.h
85247index 93dff5f..933c561 100644
85248--- a/include/linux/smp.h
85249+++ b/include/linux/smp.h
85250@@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
85251 #endif
85252
85253 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
85254+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
85255 #define put_cpu() preempt_enable()
85256+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
85257
85258 /*
85259 * Callback to arch code if there's nosmp or maxcpus=0 on the
85260diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
85261index 46cca4c..3323536 100644
85262--- a/include/linux/sock_diag.h
85263+++ b/include/linux/sock_diag.h
85264@@ -11,7 +11,7 @@ struct sock;
85265 struct sock_diag_handler {
85266 __u8 family;
85267 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
85268-};
85269+} __do_const;
85270
85271 int sock_diag_register(const struct sock_diag_handler *h);
85272 void sock_diag_unregister(const struct sock_diag_handler *h);
85273diff --git a/include/linux/sonet.h b/include/linux/sonet.h
85274index 680f9a3..f13aeb0 100644
85275--- a/include/linux/sonet.h
85276+++ b/include/linux/sonet.h
85277@@ -7,7 +7,7 @@
85278 #include <uapi/linux/sonet.h>
85279
85280 struct k_sonet_stats {
85281-#define __HANDLE_ITEM(i) atomic_t i
85282+#define __HANDLE_ITEM(i) atomic_unchecked_t i
85283 __SONET_ITEMS
85284 #undef __HANDLE_ITEM
85285 };
85286diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
85287index 07d8e53..dc934c9 100644
85288--- a/include/linux/sunrpc/addr.h
85289+++ b/include/linux/sunrpc/addr.h
85290@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
85291 {
85292 switch (sap->sa_family) {
85293 case AF_INET:
85294- return ntohs(((struct sockaddr_in *)sap)->sin_port);
85295+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
85296 case AF_INET6:
85297- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
85298+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
85299 }
85300 return 0;
85301 }
85302@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
85303 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
85304 const struct sockaddr *src)
85305 {
85306- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
85307+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
85308 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
85309
85310 dsin->sin_family = ssin->sin_family;
85311@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
85312 if (sa->sa_family != AF_INET6)
85313 return 0;
85314
85315- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
85316+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
85317 }
85318
85319 #endif /* _LINUX_SUNRPC_ADDR_H */
85320diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
85321index 70736b9..37f33db 100644
85322--- a/include/linux/sunrpc/clnt.h
85323+++ b/include/linux/sunrpc/clnt.h
85324@@ -97,7 +97,7 @@ struct rpc_procinfo {
85325 unsigned int p_timer; /* Which RTT timer to use */
85326 u32 p_statidx; /* Which procedure to account */
85327 const char * p_name; /* name of procedure */
85328-};
85329+} __do_const;
85330
85331 #ifdef __KERNEL__
85332
85333diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
85334index 2167846..0648fc3 100644
85335--- a/include/linux/sunrpc/svc.h
85336+++ b/include/linux/sunrpc/svc.h
85337@@ -416,7 +416,7 @@ struct svc_procedure {
85338 unsigned int pc_count; /* call count */
85339 unsigned int pc_cachetype; /* cache info (NFS) */
85340 unsigned int pc_xdrressize; /* maximum size of XDR reply */
85341-};
85342+} __do_const;
85343
85344 /*
85345 * Function prototypes.
85346diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
85347index 975da75..318c083 100644
85348--- a/include/linux/sunrpc/svc_rdma.h
85349+++ b/include/linux/sunrpc/svc_rdma.h
85350@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
85351 extern unsigned int svcrdma_max_requests;
85352 extern unsigned int svcrdma_max_req_size;
85353
85354-extern atomic_t rdma_stat_recv;
85355-extern atomic_t rdma_stat_read;
85356-extern atomic_t rdma_stat_write;
85357-extern atomic_t rdma_stat_sq_starve;
85358-extern atomic_t rdma_stat_rq_starve;
85359-extern atomic_t rdma_stat_rq_poll;
85360-extern atomic_t rdma_stat_rq_prod;
85361-extern atomic_t rdma_stat_sq_poll;
85362-extern atomic_t rdma_stat_sq_prod;
85363+extern atomic_unchecked_t rdma_stat_recv;
85364+extern atomic_unchecked_t rdma_stat_read;
85365+extern atomic_unchecked_t rdma_stat_write;
85366+extern atomic_unchecked_t rdma_stat_sq_starve;
85367+extern atomic_unchecked_t rdma_stat_rq_starve;
85368+extern atomic_unchecked_t rdma_stat_rq_poll;
85369+extern atomic_unchecked_t rdma_stat_rq_prod;
85370+extern atomic_unchecked_t rdma_stat_sq_poll;
85371+extern atomic_unchecked_t rdma_stat_sq_prod;
85372
85373 #define RPCRDMA_VERSION 1
85374
85375diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
85376index 8d71d65..f79586e 100644
85377--- a/include/linux/sunrpc/svcauth.h
85378+++ b/include/linux/sunrpc/svcauth.h
85379@@ -120,7 +120,7 @@ struct auth_ops {
85380 int (*release)(struct svc_rqst *rq);
85381 void (*domain_release)(struct auth_domain *);
85382 int (*set_client)(struct svc_rqst *rq);
85383-};
85384+} __do_const;
85385
85386 #define SVC_GARBAGE 1
85387 #define SVC_SYSERR 2
85388diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
85389index e7a018e..49f8b17 100644
85390--- a/include/linux/swiotlb.h
85391+++ b/include/linux/swiotlb.h
85392@@ -60,7 +60,8 @@ extern void
85393
85394 extern void
85395 swiotlb_free_coherent(struct device *hwdev, size_t size,
85396- void *vaddr, dma_addr_t dma_handle);
85397+ void *vaddr, dma_addr_t dma_handle,
85398+ struct dma_attrs *attrs);
85399
85400 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
85401 unsigned long offset, size_t size,
85402diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
85403index bda9b81..629e06e 100644
85404--- a/include/linux/syscalls.h
85405+++ b/include/linux/syscalls.h
85406@@ -99,10 +99,16 @@ union bpf_attr;
85407 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
85408
85409 #define __SC_DECL(t, a) t a
85410+#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))
85411 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
85412 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
85413 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
85414-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
85415+#define __SC_LONG(t, a) __typeof( \
85416+ __builtin_choose_expr( \
85417+ sizeof(t) > sizeof(int), \
85418+ (t) 0, \
85419+ __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
85420+ )) a
85421 #define __SC_CAST(t, a) (t) a
85422 #define __SC_ARGS(t, a) a
85423 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
85424@@ -384,11 +390,11 @@ asmlinkage long sys_sync(void);
85425 asmlinkage long sys_fsync(unsigned int fd);
85426 asmlinkage long sys_fdatasync(unsigned int fd);
85427 asmlinkage long sys_bdflush(int func, long data);
85428-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
85429- char __user *type, unsigned long flags,
85430+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
85431+ const char __user *type, unsigned long flags,
85432 void __user *data);
85433-asmlinkage long sys_umount(char __user *name, int flags);
85434-asmlinkage long sys_oldumount(char __user *name);
85435+asmlinkage long sys_umount(const char __user *name, int flags);
85436+asmlinkage long sys_oldumount(const char __user *name);
85437 asmlinkage long sys_truncate(const char __user *path, long length);
85438 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
85439 asmlinkage long sys_stat(const char __user *filename,
85440@@ -600,7 +606,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
85441 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
85442 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
85443 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
85444- struct sockaddr __user *, int);
85445+ struct sockaddr __user *, int) __intentional_overflow(0);
85446 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
85447 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
85448 unsigned int vlen, unsigned flags);
85449diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
85450index 27b3b0b..e093dd9 100644
85451--- a/include/linux/syscore_ops.h
85452+++ b/include/linux/syscore_ops.h
85453@@ -16,7 +16,7 @@ struct syscore_ops {
85454 int (*suspend)(void);
85455 void (*resume)(void);
85456 void (*shutdown)(void);
85457-};
85458+} __do_const;
85459
85460 extern void register_syscore_ops(struct syscore_ops *ops);
85461 extern void unregister_syscore_ops(struct syscore_ops *ops);
85462diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
85463index b7361f8..341a15a 100644
85464--- a/include/linux/sysctl.h
85465+++ b/include/linux/sysctl.h
85466@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
85467
85468 extern int proc_dostring(struct ctl_table *, int,
85469 void __user *, size_t *, loff_t *);
85470+extern int proc_dostring_modpriv(struct ctl_table *, int,
85471+ void __user *, size_t *, loff_t *);
85472 extern int proc_dointvec(struct ctl_table *, int,
85473 void __user *, size_t *, loff_t *);
85474 extern int proc_dointvec_minmax(struct ctl_table *, int,
85475@@ -113,7 +115,8 @@ struct ctl_table
85476 struct ctl_table_poll *poll;
85477 void *extra1;
85478 void *extra2;
85479-};
85480+} __do_const __randomize_layout;
85481+typedef struct ctl_table __no_const ctl_table_no_const;
85482
85483 struct ctl_node {
85484 struct rb_node node;
85485diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
85486index f97d0db..c1187dc 100644
85487--- a/include/linux/sysfs.h
85488+++ b/include/linux/sysfs.h
85489@@ -34,7 +34,8 @@ struct attribute {
85490 struct lock_class_key *key;
85491 struct lock_class_key skey;
85492 #endif
85493-};
85494+} __do_const;
85495+typedef struct attribute __no_const attribute_no_const;
85496
85497 /**
85498 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
85499@@ -63,7 +64,8 @@ struct attribute_group {
85500 struct attribute *, int);
85501 struct attribute **attrs;
85502 struct bin_attribute **bin_attrs;
85503-};
85504+} __do_const;
85505+typedef struct attribute_group __no_const attribute_group_no_const;
85506
85507 /**
85508 * Use these macros to make defining attributes easier. See include/linux/device.h
85509@@ -128,7 +130,8 @@ struct bin_attribute {
85510 char *, loff_t, size_t);
85511 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
85512 struct vm_area_struct *vma);
85513-};
85514+} __do_const;
85515+typedef struct bin_attribute __no_const bin_attribute_no_const;
85516
85517 /**
85518 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
85519diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
85520index 387fa7d..3fcde6b 100644
85521--- a/include/linux/sysrq.h
85522+++ b/include/linux/sysrq.h
85523@@ -16,6 +16,7 @@
85524
85525 #include <linux/errno.h>
85526 #include <linux/types.h>
85527+#include <linux/compiler.h>
85528
85529 /* Possible values of bitmask for enabling sysrq functions */
85530 /* 0x0001 is reserved for enable everything */
85531@@ -33,7 +34,7 @@ struct sysrq_key_op {
85532 char *help_msg;
85533 char *action_msg;
85534 int enable_mask;
85535-};
85536+} __do_const;
85537
85538 #ifdef CONFIG_MAGIC_SYSRQ
85539
85540diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
85541index ff307b5..f1a4468 100644
85542--- a/include/linux/thread_info.h
85543+++ b/include/linux/thread_info.h
85544@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
85545 #error "no set_restore_sigmask() provided and default one won't work"
85546 #endif
85547
85548+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
85549+
85550+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
85551+{
85552+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
85553+}
85554+
85555 #endif /* __KERNEL__ */
85556
85557 #endif /* _LINUX_THREAD_INFO_H */
85558diff --git a/include/linux/tty.h b/include/linux/tty.h
85559index 5171ef8..1048d83e 100644
85560--- a/include/linux/tty.h
85561+++ b/include/linux/tty.h
85562@@ -202,7 +202,7 @@ struct tty_port {
85563 const struct tty_port_operations *ops; /* Port operations */
85564 spinlock_t lock; /* Lock protecting tty field */
85565 int blocked_open; /* Waiting to open */
85566- int count; /* Usage count */
85567+ atomic_t count; /* Usage count */
85568 wait_queue_head_t open_wait; /* Open waiters */
85569 wait_queue_head_t close_wait; /* Close waiters */
85570 wait_queue_head_t delta_msr_wait; /* Modem status change */
85571@@ -290,7 +290,7 @@ struct tty_struct {
85572 /* If the tty has a pending do_SAK, queue it here - akpm */
85573 struct work_struct SAK_work;
85574 struct tty_port *port;
85575-};
85576+} __randomize_layout;
85577
85578 /* Each of a tty's open files has private_data pointing to tty_file_private */
85579 struct tty_file_private {
85580@@ -555,7 +555,7 @@ extern int tty_port_open(struct tty_port *port,
85581 struct tty_struct *tty, struct file *filp);
85582 static inline int tty_port_users(struct tty_port *port)
85583 {
85584- return port->count + port->blocked_open;
85585+ return atomic_read(&port->count) + port->blocked_open;
85586 }
85587
85588 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
85589diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
85590index 92e337c..f46757b 100644
85591--- a/include/linux/tty_driver.h
85592+++ b/include/linux/tty_driver.h
85593@@ -291,7 +291,7 @@ struct tty_operations {
85594 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
85595 #endif
85596 const struct file_operations *proc_fops;
85597-};
85598+} __do_const __randomize_layout;
85599
85600 struct tty_driver {
85601 int magic; /* magic number for this structure */
85602@@ -325,7 +325,7 @@ struct tty_driver {
85603
85604 const struct tty_operations *ops;
85605 struct list_head tty_drivers;
85606-};
85607+} __randomize_layout;
85608
85609 extern struct list_head tty_drivers;
85610
85611diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
85612index 00c9d68..bc0188b 100644
85613--- a/include/linux/tty_ldisc.h
85614+++ b/include/linux/tty_ldisc.h
85615@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
85616
85617 struct module *owner;
85618
85619- int refcount;
85620+ atomic_t refcount;
85621 };
85622
85623 struct tty_ldisc {
85624diff --git a/include/linux/types.h b/include/linux/types.h
85625index a0bb704..f511c77 100644
85626--- a/include/linux/types.h
85627+++ b/include/linux/types.h
85628@@ -177,10 +177,26 @@ typedef struct {
85629 int counter;
85630 } atomic_t;
85631
85632+#ifdef CONFIG_PAX_REFCOUNT
85633+typedef struct {
85634+ int counter;
85635+} atomic_unchecked_t;
85636+#else
85637+typedef atomic_t atomic_unchecked_t;
85638+#endif
85639+
85640 #ifdef CONFIG_64BIT
85641 typedef struct {
85642 long counter;
85643 } atomic64_t;
85644+
85645+#ifdef CONFIG_PAX_REFCOUNT
85646+typedef struct {
85647+ long counter;
85648+} atomic64_unchecked_t;
85649+#else
85650+typedef atomic64_t atomic64_unchecked_t;
85651+#endif
85652 #endif
85653
85654 struct list_head {
85655diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
85656index ecd3319..8a36ded 100644
85657--- a/include/linux/uaccess.h
85658+++ b/include/linux/uaccess.h
85659@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
85660 long ret; \
85661 mm_segment_t old_fs = get_fs(); \
85662 \
85663- set_fs(KERNEL_DS); \
85664 pagefault_disable(); \
85665- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
85666- pagefault_enable(); \
85667+ set_fs(KERNEL_DS); \
85668+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
85669 set_fs(old_fs); \
85670+ pagefault_enable(); \
85671 ret; \
85672 })
85673
85674diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
85675index 2d1f9b6..d7a9fce 100644
85676--- a/include/linux/uidgid.h
85677+++ b/include/linux/uidgid.h
85678@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
85679
85680 #endif /* CONFIG_USER_NS */
85681
85682+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
85683+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
85684+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
85685+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
85686+
85687 #endif /* _LINUX_UIDGID_H */
85688diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
85689index baa8171..9ca98ba 100644
85690--- a/include/linux/uio_driver.h
85691+++ b/include/linux/uio_driver.h
85692@@ -67,7 +67,7 @@ struct uio_device {
85693 struct module *owner;
85694 struct device *dev;
85695 int minor;
85696- atomic_t event;
85697+ atomic_unchecked_t event;
85698 struct fasync_struct *async_queue;
85699 wait_queue_head_t wait;
85700 struct uio_info *info;
85701diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
85702index 99c1b4d..562e6f3 100644
85703--- a/include/linux/unaligned/access_ok.h
85704+++ b/include/linux/unaligned/access_ok.h
85705@@ -4,34 +4,34 @@
85706 #include <linux/kernel.h>
85707 #include <asm/byteorder.h>
85708
85709-static inline u16 get_unaligned_le16(const void *p)
85710+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
85711 {
85712- return le16_to_cpup((__le16 *)p);
85713+ return le16_to_cpup((const __le16 *)p);
85714 }
85715
85716-static inline u32 get_unaligned_le32(const void *p)
85717+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
85718 {
85719- return le32_to_cpup((__le32 *)p);
85720+ return le32_to_cpup((const __le32 *)p);
85721 }
85722
85723-static inline u64 get_unaligned_le64(const void *p)
85724+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
85725 {
85726- return le64_to_cpup((__le64 *)p);
85727+ return le64_to_cpup((const __le64 *)p);
85728 }
85729
85730-static inline u16 get_unaligned_be16(const void *p)
85731+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
85732 {
85733- return be16_to_cpup((__be16 *)p);
85734+ return be16_to_cpup((const __be16 *)p);
85735 }
85736
85737-static inline u32 get_unaligned_be32(const void *p)
85738+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
85739 {
85740- return be32_to_cpup((__be32 *)p);
85741+ return be32_to_cpup((const __be32 *)p);
85742 }
85743
85744-static inline u64 get_unaligned_be64(const void *p)
85745+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
85746 {
85747- return be64_to_cpup((__be64 *)p);
85748+ return be64_to_cpup((const __be64 *)p);
85749 }
85750
85751 static inline void put_unaligned_le16(u16 val, void *p)
85752diff --git a/include/linux/usb.h b/include/linux/usb.h
85753index 447a7e2..9cea7e9 100644
85754--- a/include/linux/usb.h
85755+++ b/include/linux/usb.h
85756@@ -571,7 +571,7 @@ struct usb_device {
85757 int maxchild;
85758
85759 u32 quirks;
85760- atomic_t urbnum;
85761+ atomic_unchecked_t urbnum;
85762
85763 unsigned long active_duration;
85764
85765@@ -1655,7 +1655,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
85766
85767 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
85768 __u8 request, __u8 requesttype, __u16 value, __u16 index,
85769- void *data, __u16 size, int timeout);
85770+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
85771 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
85772 void *data, int len, int *actual_length, int timeout);
85773 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
85774diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
85775index d5952bb..9a626d4 100644
85776--- a/include/linux/usb/renesas_usbhs.h
85777+++ b/include/linux/usb/renesas_usbhs.h
85778@@ -39,7 +39,7 @@ enum {
85779 */
85780 struct renesas_usbhs_driver_callback {
85781 int (*notify_hotplug)(struct platform_device *pdev);
85782-};
85783+} __no_const;
85784
85785 /*
85786 * callback functions for platform
85787diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
85788index 9f3579f..3b2afa5 100644
85789--- a/include/linux/user_namespace.h
85790+++ b/include/linux/user_namespace.h
85791@@ -38,7 +38,7 @@ struct user_namespace {
85792 struct key *persistent_keyring_register;
85793 struct rw_semaphore persistent_keyring_register_sem;
85794 #endif
85795-};
85796+} __randomize_layout;
85797
85798 extern struct user_namespace init_user_ns;
85799
85800diff --git a/include/linux/utsname.h b/include/linux/utsname.h
85801index 239e277..22a5cf5 100644
85802--- a/include/linux/utsname.h
85803+++ b/include/linux/utsname.h
85804@@ -24,7 +24,7 @@ struct uts_namespace {
85805 struct new_utsname name;
85806 struct user_namespace *user_ns;
85807 unsigned int proc_inum;
85808-};
85809+} __randomize_layout;
85810 extern struct uts_namespace init_uts_ns;
85811
85812 #ifdef CONFIG_UTS_NS
85813diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
85814index 6f8fbcf..4efc177 100644
85815--- a/include/linux/vermagic.h
85816+++ b/include/linux/vermagic.h
85817@@ -25,9 +25,42 @@
85818 #define MODULE_ARCH_VERMAGIC ""
85819 #endif
85820
85821+#ifdef CONFIG_PAX_REFCOUNT
85822+#define MODULE_PAX_REFCOUNT "REFCOUNT "
85823+#else
85824+#define MODULE_PAX_REFCOUNT ""
85825+#endif
85826+
85827+#ifdef CONSTIFY_PLUGIN
85828+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
85829+#else
85830+#define MODULE_CONSTIFY_PLUGIN ""
85831+#endif
85832+
85833+#ifdef STACKLEAK_PLUGIN
85834+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
85835+#else
85836+#define MODULE_STACKLEAK_PLUGIN ""
85837+#endif
85838+
85839+#ifdef RANDSTRUCT_PLUGIN
85840+#include <generated/randomize_layout_hash.h>
85841+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
85842+#else
85843+#define MODULE_RANDSTRUCT_PLUGIN
85844+#endif
85845+
85846+#ifdef CONFIG_GRKERNSEC
85847+#define MODULE_GRSEC "GRSEC "
85848+#else
85849+#define MODULE_GRSEC ""
85850+#endif
85851+
85852 #define VERMAGIC_STRING \
85853 UTS_RELEASE " " \
85854 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
85855 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
85856- MODULE_ARCH_VERMAGIC
85857+ MODULE_ARCH_VERMAGIC \
85858+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
85859+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
85860
85861diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
85862index b483abd..af305ad 100644
85863--- a/include/linux/vga_switcheroo.h
85864+++ b/include/linux/vga_switcheroo.h
85865@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
85866
85867 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
85868
85869-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
85870+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
85871 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
85872-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
85873+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
85874 #else
85875
85876 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
85877@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
85878
85879 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
85880
85881-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85882+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85883 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
85884-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85885+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85886
85887 #endif
85888 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
85889diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
85890index b87696f..1d11de7 100644
85891--- a/include/linux/vmalloc.h
85892+++ b/include/linux/vmalloc.h
85893@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
85894 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
85895 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
85896 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
85897+
85898+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
85899+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
85900+#endif
85901+
85902 /* bits [20..32] reserved for arch specific ioremap internals */
85903
85904 /*
85905@@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
85906 unsigned long flags, pgprot_t prot);
85907 extern void vunmap(const void *addr);
85908
85909+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85910+extern void unmap_process_stacks(struct task_struct *task);
85911+#endif
85912+
85913 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
85914 unsigned long uaddr, void *kaddr,
85915 unsigned long size);
85916@@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
85917
85918 /* for /dev/kmem */
85919 extern long vread(char *buf, char *addr, unsigned long count);
85920-extern long vwrite(char *buf, char *addr, unsigned long count);
85921+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
85922
85923 /*
85924 * Internals. Dont't use..
85925diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
85926index 82e7db7..f8ce3d0 100644
85927--- a/include/linux/vmstat.h
85928+++ b/include/linux/vmstat.h
85929@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
85930 /*
85931 * Zone based page accounting with per cpu differentials.
85932 */
85933-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85934+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85935
85936 static inline void zone_page_state_add(long x, struct zone *zone,
85937 enum zone_stat_item item)
85938 {
85939- atomic_long_add(x, &zone->vm_stat[item]);
85940- atomic_long_add(x, &vm_stat[item]);
85941+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
85942+ atomic_long_add_unchecked(x, &vm_stat[item]);
85943 }
85944
85945-static inline unsigned long global_page_state(enum zone_stat_item item)
85946+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
85947 {
85948- long x = atomic_long_read(&vm_stat[item]);
85949+ long x = atomic_long_read_unchecked(&vm_stat[item]);
85950 #ifdef CONFIG_SMP
85951 if (x < 0)
85952 x = 0;
85953@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
85954 return x;
85955 }
85956
85957-static inline unsigned long zone_page_state(struct zone *zone,
85958+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
85959 enum zone_stat_item item)
85960 {
85961- long x = atomic_long_read(&zone->vm_stat[item]);
85962+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85963 #ifdef CONFIG_SMP
85964 if (x < 0)
85965 x = 0;
85966@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
85967 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
85968 enum zone_stat_item item)
85969 {
85970- long x = atomic_long_read(&zone->vm_stat[item]);
85971+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85972
85973 #ifdef CONFIG_SMP
85974 int cpu;
85975@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
85976
85977 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
85978 {
85979- atomic_long_inc(&zone->vm_stat[item]);
85980- atomic_long_inc(&vm_stat[item]);
85981+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
85982+ atomic_long_inc_unchecked(&vm_stat[item]);
85983 }
85984
85985 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
85986 {
85987- atomic_long_dec(&zone->vm_stat[item]);
85988- atomic_long_dec(&vm_stat[item]);
85989+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
85990+ atomic_long_dec_unchecked(&vm_stat[item]);
85991 }
85992
85993 static inline void __inc_zone_page_state(struct page *page,
85994diff --git a/include/linux/xattr.h b/include/linux/xattr.h
85995index 91b0a68..0e9adf6 100644
85996--- a/include/linux/xattr.h
85997+++ b/include/linux/xattr.h
85998@@ -28,7 +28,7 @@ struct xattr_handler {
85999 size_t size, int handler_flags);
86000 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
86001 size_t size, int flags, int handler_flags);
86002-};
86003+} __do_const;
86004
86005 struct xattr {
86006 const char *name;
86007@@ -37,6 +37,9 @@ struct xattr {
86008 };
86009
86010 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
86011+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
86012+ssize_t pax_getxattr(struct dentry *, void *, size_t);
86013+#endif
86014 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
86015 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
86016 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
86017diff --git a/include/linux/zlib.h b/include/linux/zlib.h
86018index 92dbbd3..13ab0b3 100644
86019--- a/include/linux/zlib.h
86020+++ b/include/linux/zlib.h
86021@@ -31,6 +31,7 @@
86022 #define _ZLIB_H
86023
86024 #include <linux/zconf.h>
86025+#include <linux/compiler.h>
86026
86027 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
86028 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
86029@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
86030
86031 /* basic functions */
86032
86033-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
86034+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
86035 /*
86036 Returns the number of bytes that needs to be allocated for a per-
86037 stream workspace with the specified parameters. A pointer to this
86038diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
86039index eb76cfd..9fd0e7c 100644
86040--- a/include/media/v4l2-dev.h
86041+++ b/include/media/v4l2-dev.h
86042@@ -75,7 +75,7 @@ struct v4l2_file_operations {
86043 int (*mmap) (struct file *, struct vm_area_struct *);
86044 int (*open) (struct file *);
86045 int (*release) (struct file *);
86046-};
86047+} __do_const;
86048
86049 /*
86050 * Newer version of video_device, handled by videodev2.c
86051diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
86052index ffb69da..040393e 100644
86053--- a/include/media/v4l2-device.h
86054+++ b/include/media/v4l2-device.h
86055@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
86056 this function returns 0. If the name ends with a digit (e.g. cx18),
86057 then the name will be set to cx18-0 since cx180 looks really odd. */
86058 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
86059- atomic_t *instance);
86060+ atomic_unchecked_t *instance);
86061
86062 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
86063 Since the parent disappears this ensures that v4l2_dev doesn't have an
86064diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
86065index 2a25dec..bf6dd8a 100644
86066--- a/include/net/9p/transport.h
86067+++ b/include/net/9p/transport.h
86068@@ -62,7 +62,7 @@ struct p9_trans_module {
86069 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
86070 int (*zc_request)(struct p9_client *, struct p9_req_t *,
86071 char *, char *, int , int, int, int);
86072-};
86073+} __do_const;
86074
86075 void v9fs_register_trans(struct p9_trans_module *m);
86076 void v9fs_unregister_trans(struct p9_trans_module *m);
86077diff --git a/include/net/af_unix.h b/include/net/af_unix.h
86078index a175ba4..196eb8242 100644
86079--- a/include/net/af_unix.h
86080+++ b/include/net/af_unix.h
86081@@ -36,7 +36,7 @@ struct unix_skb_parms {
86082 u32 secid; /* Security ID */
86083 #endif
86084 u32 consumed;
86085-};
86086+} __randomize_layout;
86087
86088 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
86089 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
86090diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
86091index ead99f0..6263c4b 100644
86092--- a/include/net/bluetooth/l2cap.h
86093+++ b/include/net/bluetooth/l2cap.h
86094@@ -608,7 +608,7 @@ struct l2cap_ops {
86095 unsigned char *kdata,
86096 struct iovec *iov,
86097 int len);
86098-};
86099+} __do_const;
86100
86101 struct l2cap_conn {
86102 struct hci_conn *hcon;
86103diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
86104index f2ae33d..c457cf0 100644
86105--- a/include/net/caif/cfctrl.h
86106+++ b/include/net/caif/cfctrl.h
86107@@ -52,7 +52,7 @@ struct cfctrl_rsp {
86108 void (*radioset_rsp)(void);
86109 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
86110 struct cflayer *client_layer);
86111-};
86112+} __no_const;
86113
86114 /* Link Setup Parameters for CAIF-Links. */
86115 struct cfctrl_link_param {
86116@@ -101,8 +101,8 @@ struct cfctrl_request_info {
86117 struct cfctrl {
86118 struct cfsrvl serv;
86119 struct cfctrl_rsp res;
86120- atomic_t req_seq_no;
86121- atomic_t rsp_seq_no;
86122+ atomic_unchecked_t req_seq_no;
86123+ atomic_unchecked_t rsp_seq_no;
86124 struct list_head list;
86125 /* Protects from simultaneous access to first_req list */
86126 spinlock_t info_list_lock;
86127diff --git a/include/net/flow.h b/include/net/flow.h
86128index 8109a15..504466d 100644
86129--- a/include/net/flow.h
86130+++ b/include/net/flow.h
86131@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
86132
86133 void flow_cache_flush(struct net *net);
86134 void flow_cache_flush_deferred(struct net *net);
86135-extern atomic_t flow_cache_genid;
86136+extern atomic_unchecked_t flow_cache_genid;
86137
86138 #endif
86139diff --git a/include/net/genetlink.h b/include/net/genetlink.h
86140index af10c2c..a431cc5 100644
86141--- a/include/net/genetlink.h
86142+++ b/include/net/genetlink.h
86143@@ -120,7 +120,7 @@ struct genl_ops {
86144 u8 cmd;
86145 u8 internal_flags;
86146 u8 flags;
86147-};
86148+} __do_const;
86149
86150 int __genl_register_family(struct genl_family *family);
86151
86152diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
86153index 734d9b5..48a9a4b 100644
86154--- a/include/net/gro_cells.h
86155+++ b/include/net/gro_cells.h
86156@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
86157 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
86158
86159 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
86160- atomic_long_inc(&dev->rx_dropped);
86161+ atomic_long_inc_unchecked(&dev->rx_dropped);
86162 kfree_skb(skb);
86163 return;
86164 }
86165diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
86166index 848e85c..051c7de 100644
86167--- a/include/net/inet_connection_sock.h
86168+++ b/include/net/inet_connection_sock.h
86169@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
86170 int (*bind_conflict)(const struct sock *sk,
86171 const struct inet_bind_bucket *tb, bool relax);
86172 void (*mtu_reduced)(struct sock *sk);
86173-};
86174+} __do_const;
86175
86176 /** inet_connection_sock - INET connection oriented sock
86177 *
86178diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
86179index 80479ab..0c3f647 100644
86180--- a/include/net/inetpeer.h
86181+++ b/include/net/inetpeer.h
86182@@ -47,7 +47,7 @@ struct inet_peer {
86183 */
86184 union {
86185 struct {
86186- atomic_t rid; /* Frag reception counter */
86187+ atomic_unchecked_t rid; /* Frag reception counter */
86188 };
86189 struct rcu_head rcu;
86190 struct inet_peer *gc_next;
86191diff --git a/include/net/ip.h b/include/net/ip.h
86192index 0bb6207..1f38247 100644
86193--- a/include/net/ip.h
86194+++ b/include/net/ip.h
86195@@ -39,11 +39,12 @@ struct inet_skb_parm {
86196 struct ip_options opt; /* Compiled IP options */
86197 unsigned char flags;
86198
86199-#define IPSKB_FORWARDED 1
86200-#define IPSKB_XFRM_TUNNEL_SIZE 2
86201-#define IPSKB_XFRM_TRANSFORMED 4
86202-#define IPSKB_FRAG_COMPLETE 8
86203-#define IPSKB_REROUTED 16
86204+#define IPSKB_FORWARDED BIT(0)
86205+#define IPSKB_XFRM_TUNNEL_SIZE BIT(1)
86206+#define IPSKB_XFRM_TRANSFORMED BIT(2)
86207+#define IPSKB_FRAG_COMPLETE BIT(3)
86208+#define IPSKB_REROUTED BIT(4)
86209+#define IPSKB_DOREDIRECT BIT(5)
86210
86211 u16 frag_max_size;
86212 };
86213@@ -316,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
86214 }
86215 }
86216
86217-u32 ip_idents_reserve(u32 hash, int segs);
86218+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
86219 void __ip_select_ident(struct iphdr *iph, int segs);
86220
86221 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
86222diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
86223index dc9d2a2..d985691 100644
86224--- a/include/net/ip_fib.h
86225+++ b/include/net/ip_fib.h
86226@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
86227
86228 #define FIB_RES_SADDR(net, res) \
86229 ((FIB_RES_NH(res).nh_saddr_genid == \
86230- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
86231+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
86232 FIB_RES_NH(res).nh_saddr : \
86233 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
86234 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
86235diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
86236index 615b20b..fd4cbd8 100644
86237--- a/include/net/ip_vs.h
86238+++ b/include/net/ip_vs.h
86239@@ -534,7 +534,7 @@ struct ip_vs_conn {
86240 struct ip_vs_conn *control; /* Master control connection */
86241 atomic_t n_control; /* Number of controlled ones */
86242 struct ip_vs_dest *dest; /* real server */
86243- atomic_t in_pkts; /* incoming packet counter */
86244+ atomic_unchecked_t in_pkts; /* incoming packet counter */
86245
86246 /* Packet transmitter for different forwarding methods. If it
86247 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
86248@@ -682,7 +682,7 @@ struct ip_vs_dest {
86249 __be16 port; /* port number of the server */
86250 union nf_inet_addr addr; /* IP address of the server */
86251 volatile unsigned int flags; /* dest status flags */
86252- atomic_t conn_flags; /* flags to copy to conn */
86253+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
86254 atomic_t weight; /* server weight */
86255
86256 atomic_t refcnt; /* reference counter */
86257@@ -928,11 +928,11 @@ struct netns_ipvs {
86258 /* ip_vs_lblc */
86259 int sysctl_lblc_expiration;
86260 struct ctl_table_header *lblc_ctl_header;
86261- struct ctl_table *lblc_ctl_table;
86262+ ctl_table_no_const *lblc_ctl_table;
86263 /* ip_vs_lblcr */
86264 int sysctl_lblcr_expiration;
86265 struct ctl_table_header *lblcr_ctl_header;
86266- struct ctl_table *lblcr_ctl_table;
86267+ ctl_table_no_const *lblcr_ctl_table;
86268 /* ip_vs_est */
86269 struct list_head est_list; /* estimator list */
86270 spinlock_t est_lock;
86271diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
86272index 8d4f588..2e37ad2 100644
86273--- a/include/net/irda/ircomm_tty.h
86274+++ b/include/net/irda/ircomm_tty.h
86275@@ -33,6 +33,7 @@
86276 #include <linux/termios.h>
86277 #include <linux/timer.h>
86278 #include <linux/tty.h> /* struct tty_struct */
86279+#include <asm/local.h>
86280
86281 #include <net/irda/irias_object.h>
86282 #include <net/irda/ircomm_core.h>
86283diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
86284index 714cc9a..ea05f3e 100644
86285--- a/include/net/iucv/af_iucv.h
86286+++ b/include/net/iucv/af_iucv.h
86287@@ -149,7 +149,7 @@ struct iucv_skb_cb {
86288 struct iucv_sock_list {
86289 struct hlist_head head;
86290 rwlock_t lock;
86291- atomic_t autobind_name;
86292+ atomic_unchecked_t autobind_name;
86293 };
86294
86295 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
86296diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
86297index f3be818..bf46196 100644
86298--- a/include/net/llc_c_ac.h
86299+++ b/include/net/llc_c_ac.h
86300@@ -87,7 +87,7 @@
86301 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
86302 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
86303
86304-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
86305+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
86306
86307 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
86308 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
86309diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
86310index 3948cf1..83b28c4 100644
86311--- a/include/net/llc_c_ev.h
86312+++ b/include/net/llc_c_ev.h
86313@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
86314 return (struct llc_conn_state_ev *)skb->cb;
86315 }
86316
86317-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
86318-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
86319+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
86320+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
86321
86322 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
86323 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
86324diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
86325index 0e79cfb..f46db31 100644
86326--- a/include/net/llc_c_st.h
86327+++ b/include/net/llc_c_st.h
86328@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
86329 u8 next_state;
86330 llc_conn_ev_qfyr_t *ev_qualifiers;
86331 llc_conn_action_t *ev_actions;
86332-};
86333+} __do_const;
86334
86335 struct llc_conn_state {
86336 u8 current_state;
86337diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
86338index a61b98c..aade1eb 100644
86339--- a/include/net/llc_s_ac.h
86340+++ b/include/net/llc_s_ac.h
86341@@ -23,7 +23,7 @@
86342 #define SAP_ACT_TEST_IND 9
86343
86344 /* All action functions must look like this */
86345-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86346+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86347
86348 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
86349 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
86350diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
86351index 567c681..cd73ac02 100644
86352--- a/include/net/llc_s_st.h
86353+++ b/include/net/llc_s_st.h
86354@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
86355 llc_sap_ev_t ev;
86356 u8 next_state;
86357 llc_sap_action_t *ev_actions;
86358-};
86359+} __do_const;
86360
86361 struct llc_sap_state {
86362 u8 curr_state;
86363diff --git a/include/net/mac80211.h b/include/net/mac80211.h
86364index a9de1da..df72057 100644
86365--- a/include/net/mac80211.h
86366+++ b/include/net/mac80211.h
86367@@ -4645,7 +4645,7 @@ struct rate_control_ops {
86368 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
86369
86370 u32 (*get_expected_throughput)(void *priv_sta);
86371-};
86372+} __do_const;
86373
86374 static inline int rate_supported(struct ieee80211_sta *sta,
86375 enum ieee80211_band band,
86376diff --git a/include/net/neighbour.h b/include/net/neighbour.h
86377index f60558d..e5ed9bd 100644
86378--- a/include/net/neighbour.h
86379+++ b/include/net/neighbour.h
86380@@ -163,7 +163,7 @@ struct neigh_ops {
86381 void (*error_report)(struct neighbour *, struct sk_buff *);
86382 int (*output)(struct neighbour *, struct sk_buff *);
86383 int (*connected_output)(struct neighbour *, struct sk_buff *);
86384-};
86385+} __do_const;
86386
86387 struct pneigh_entry {
86388 struct pneigh_entry *next;
86389@@ -217,7 +217,7 @@ struct neigh_table {
86390 struct neigh_statistics __percpu *stats;
86391 struct neigh_hash_table __rcu *nht;
86392 struct pneigh_entry **phash_buckets;
86393-};
86394+} __randomize_layout;
86395
86396 static inline int neigh_parms_family(struct neigh_parms *p)
86397 {
86398diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
86399index e0d6466..e2f3003 100644
86400--- a/include/net/net_namespace.h
86401+++ b/include/net/net_namespace.h
86402@@ -129,8 +129,8 @@ struct net {
86403 struct netns_ipvs *ipvs;
86404 #endif
86405 struct sock *diag_nlsk;
86406- atomic_t fnhe_genid;
86407-};
86408+ atomic_unchecked_t fnhe_genid;
86409+} __randomize_layout;
86410
86411 #include <linux/seq_file_net.h>
86412
86413@@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
86414 #define __net_init __init
86415 #define __net_exit __exit_refok
86416 #define __net_initdata __initdata
86417+#ifdef CONSTIFY_PLUGIN
86418 #define __net_initconst __initconst
86419+#else
86420+#define __net_initconst __initdata
86421+#endif
86422 #endif
86423
86424 struct pernet_operations {
86425@@ -296,7 +300,7 @@ struct pernet_operations {
86426 void (*exit_batch)(struct list_head *net_exit_list);
86427 int *id;
86428 size_t size;
86429-};
86430+} __do_const;
86431
86432 /*
86433 * Use these carefully. If you implement a network device and it
86434@@ -344,12 +348,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
86435
86436 static inline int rt_genid_ipv4(struct net *net)
86437 {
86438- return atomic_read(&net->ipv4.rt_genid);
86439+ return atomic_read_unchecked(&net->ipv4.rt_genid);
86440 }
86441
86442 static inline void rt_genid_bump_ipv4(struct net *net)
86443 {
86444- atomic_inc(&net->ipv4.rt_genid);
86445+ atomic_inc_unchecked(&net->ipv4.rt_genid);
86446 }
86447
86448 extern void (*__fib6_flush_trees)(struct net *net);
86449@@ -376,12 +380,12 @@ static inline void rt_genid_bump_all(struct net *net)
86450
86451 static inline int fnhe_genid(struct net *net)
86452 {
86453- return atomic_read(&net->fnhe_genid);
86454+ return atomic_read_unchecked(&net->fnhe_genid);
86455 }
86456
86457 static inline void fnhe_genid_bump(struct net *net)
86458 {
86459- atomic_inc(&net->fnhe_genid);
86460+ atomic_inc_unchecked(&net->fnhe_genid);
86461 }
86462
86463 #endif /* __NET_NET_NAMESPACE_H */
86464diff --git a/include/net/netlink.h b/include/net/netlink.h
86465index 7b903e1..ad9ca4b 100644
86466--- a/include/net/netlink.h
86467+++ b/include/net/netlink.h
86468@@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
86469 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
86470 {
86471 if (mark)
86472- skb_trim(skb, (unsigned char *) mark - skb->data);
86473+ skb_trim(skb, (const unsigned char *) mark - skb->data);
86474 }
86475
86476 /**
86477diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
86478index 29d6a94..235d3d84 100644
86479--- a/include/net/netns/conntrack.h
86480+++ b/include/net/netns/conntrack.h
86481@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
86482 struct nf_proto_net {
86483 #ifdef CONFIG_SYSCTL
86484 struct ctl_table_header *ctl_table_header;
86485- struct ctl_table *ctl_table;
86486+ ctl_table_no_const *ctl_table;
86487 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
86488 struct ctl_table_header *ctl_compat_header;
86489- struct ctl_table *ctl_compat_table;
86490+ ctl_table_no_const *ctl_compat_table;
86491 #endif
86492 #endif
86493 unsigned int users;
86494@@ -60,7 +60,7 @@ struct nf_ip_net {
86495 struct nf_icmp_net icmpv6;
86496 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
86497 struct ctl_table_header *ctl_table_header;
86498- struct ctl_table *ctl_table;
86499+ ctl_table_no_const *ctl_table;
86500 #endif
86501 };
86502
86503diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
86504index 24945ce..f19e42f 100644
86505--- a/include/net/netns/ipv4.h
86506+++ b/include/net/netns/ipv4.h
86507@@ -83,7 +83,7 @@ struct netns_ipv4 {
86508
86509 struct ping_group_range ping_group_range;
86510
86511- atomic_t dev_addr_genid;
86512+ atomic_unchecked_t dev_addr_genid;
86513
86514 #ifdef CONFIG_SYSCTL
86515 unsigned long *sysctl_local_reserved_ports;
86516@@ -97,6 +97,6 @@ struct netns_ipv4 {
86517 struct fib_rules_ops *mr_rules_ops;
86518 #endif
86519 #endif
86520- atomic_t rt_genid;
86521+ atomic_unchecked_t rt_genid;
86522 };
86523 #endif
86524diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
86525index 69ae41f..4f94868 100644
86526--- a/include/net/netns/ipv6.h
86527+++ b/include/net/netns/ipv6.h
86528@@ -75,8 +75,8 @@ struct netns_ipv6 {
86529 struct fib_rules_ops *mr6_rules_ops;
86530 #endif
86531 #endif
86532- atomic_t dev_addr_genid;
86533- atomic_t fib6_sernum;
86534+ atomic_unchecked_t dev_addr_genid;
86535+ atomic_unchecked_t fib6_sernum;
86536 };
86537
86538 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
86539diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
86540index 9da7982..099321b9 100644
86541--- a/include/net/netns/xfrm.h
86542+++ b/include/net/netns/xfrm.h
86543@@ -78,7 +78,7 @@ struct netns_xfrm {
86544
86545 /* flow cache part */
86546 struct flow_cache flow_cache_global;
86547- atomic_t flow_cache_genid;
86548+ atomic_unchecked_t flow_cache_genid;
86549 struct list_head flow_cache_gc_list;
86550 spinlock_t flow_cache_gc_lock;
86551 struct work_struct flow_cache_gc_work;
86552diff --git a/include/net/ping.h b/include/net/ping.h
86553index 026479b..d9b2829 100644
86554--- a/include/net/ping.h
86555+++ b/include/net/ping.h
86556@@ -54,7 +54,7 @@ struct ping_iter_state {
86557
86558 extern struct proto ping_prot;
86559 #if IS_ENABLED(CONFIG_IPV6)
86560-extern struct pingv6_ops pingv6_ops;
86561+extern struct pingv6_ops *pingv6_ops;
86562 #endif
86563
86564 struct pingfakehdr {
86565diff --git a/include/net/protocol.h b/include/net/protocol.h
86566index d6fcc1f..ca277058 100644
86567--- a/include/net/protocol.h
86568+++ b/include/net/protocol.h
86569@@ -49,7 +49,7 @@ struct net_protocol {
86570 * socket lookup?
86571 */
86572 icmp_strict_tag_validation:1;
86573-};
86574+} __do_const;
86575
86576 #if IS_ENABLED(CONFIG_IPV6)
86577 struct inet6_protocol {
86578@@ -62,7 +62,7 @@ struct inet6_protocol {
86579 u8 type, u8 code, int offset,
86580 __be32 info);
86581 unsigned int flags; /* INET6_PROTO_xxx */
86582-};
86583+} __do_const;
86584
86585 #define INET6_PROTO_NOPOLICY 0x1
86586 #define INET6_PROTO_FINAL 0x2
86587diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
86588index e21b9f9..0191ef0 100644
86589--- a/include/net/rtnetlink.h
86590+++ b/include/net/rtnetlink.h
86591@@ -93,7 +93,7 @@ struct rtnl_link_ops {
86592 int (*fill_slave_info)(struct sk_buff *skb,
86593 const struct net_device *dev,
86594 const struct net_device *slave_dev);
86595-};
86596+} __do_const;
86597
86598 int __rtnl_link_register(struct rtnl_link_ops *ops);
86599 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
86600diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
86601index 4a5b9a3..ca27d73 100644
86602--- a/include/net/sctp/checksum.h
86603+++ b/include/net/sctp/checksum.h
86604@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
86605 unsigned int offset)
86606 {
86607 struct sctphdr *sh = sctp_hdr(skb);
86608- __le32 ret, old = sh->checksum;
86609- const struct skb_checksum_ops ops = {
86610+ __le32 ret, old = sh->checksum;
86611+ static const struct skb_checksum_ops ops = {
86612 .update = sctp_csum_update,
86613 .combine = sctp_csum_combine,
86614 };
86615diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
86616index 72a31db..aaa63d9 100644
86617--- a/include/net/sctp/sm.h
86618+++ b/include/net/sctp/sm.h
86619@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
86620 typedef struct {
86621 sctp_state_fn_t *fn;
86622 const char *name;
86623-} sctp_sm_table_entry_t;
86624+} __do_const sctp_sm_table_entry_t;
86625
86626 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
86627 * currently in use.
86628@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
86629 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
86630
86631 /* Extern declarations for major data structures. */
86632-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86633+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86634
86635
86636 /* Get the size of a DATA chunk payload. */
86637diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
86638index 4ff3f67..89ae38e 100644
86639--- a/include/net/sctp/structs.h
86640+++ b/include/net/sctp/structs.h
86641@@ -509,7 +509,7 @@ struct sctp_pf {
86642 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
86643 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
86644 struct sctp_af *af;
86645-};
86646+} __do_const;
86647
86648
86649 /* Structure to track chunk fragments that have been acked, but peer
86650diff --git a/include/net/sock.h b/include/net/sock.h
86651index 7db3db1..a915cca 100644
86652--- a/include/net/sock.h
86653+++ b/include/net/sock.h
86654@@ -355,7 +355,7 @@ struct sock {
86655 unsigned int sk_napi_id;
86656 unsigned int sk_ll_usec;
86657 #endif
86658- atomic_t sk_drops;
86659+ atomic_unchecked_t sk_drops;
86660 int sk_rcvbuf;
86661
86662 struct sk_filter __rcu *sk_filter;
86663@@ -1048,7 +1048,7 @@ struct proto {
86664 void (*destroy_cgroup)(struct mem_cgroup *memcg);
86665 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
86666 #endif
86667-};
86668+} __randomize_layout;
86669
86670 /*
86671 * Bits in struct cg_proto.flags
86672@@ -1235,7 +1235,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
86673 return ret >> PAGE_SHIFT;
86674 }
86675
86676-static inline long
86677+static inline long __intentional_overflow(-1)
86678 sk_memory_allocated(const struct sock *sk)
86679 {
86680 struct proto *prot = sk->sk_prot;
86681@@ -1380,7 +1380,7 @@ struct sock_iocb {
86682 struct scm_cookie *scm;
86683 struct msghdr *msg, async_msg;
86684 struct kiocb *kiocb;
86685-};
86686+} __randomize_layout;
86687
86688 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
86689 {
86690@@ -1820,7 +1820,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
86691 }
86692
86693 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
86694- char __user *from, char *to,
86695+ char __user *from, unsigned char *to,
86696 int copy, int offset)
86697 {
86698 if (skb->ip_summed == CHECKSUM_NONE) {
86699@@ -2092,7 +2092,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
86700 }
86701 }
86702
86703-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86704+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86705
86706 /**
86707 * sk_page_frag - return an appropriate page_frag
86708diff --git a/include/net/tcp.h b/include/net/tcp.h
86709index 4062b4f..9ff45e7 100644
86710--- a/include/net/tcp.h
86711+++ b/include/net/tcp.h
86712@@ -519,7 +519,7 @@ void tcp_retransmit_timer(struct sock *sk);
86713 void tcp_xmit_retransmit_queue(struct sock *);
86714 void tcp_simple_retransmit(struct sock *);
86715 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
86716-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86717+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86718
86719 void tcp_send_probe0(struct sock *);
86720 void tcp_send_partial(struct sock *);
86721@@ -692,8 +692,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
86722 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
86723 */
86724 struct tcp_skb_cb {
86725- __u32 seq; /* Starting sequence number */
86726- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
86727+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
86728+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
86729 union {
86730 /* Note : tcp_tw_isn is used in input path only
86731 * (isn chosen by tcp_timewait_state_process())
86732@@ -718,7 +718,7 @@ struct tcp_skb_cb {
86733
86734 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
86735 /* 1 byte hole */
86736- __u32 ack_seq; /* Sequence number ACK'd */
86737+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
86738 union {
86739 struct inet_skb_parm h4;
86740 #if IS_ENABLED(CONFIG_IPV6)
86741diff --git a/include/net/xfrm.h b/include/net/xfrm.h
86742index dc4865e..152ee4c 100644
86743--- a/include/net/xfrm.h
86744+++ b/include/net/xfrm.h
86745@@ -285,7 +285,6 @@ struct xfrm_dst;
86746 struct xfrm_policy_afinfo {
86747 unsigned short family;
86748 struct dst_ops *dst_ops;
86749- void (*garbage_collect)(struct net *net);
86750 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
86751 const xfrm_address_t *saddr,
86752 const xfrm_address_t *daddr);
86753@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
86754 struct net_device *dev,
86755 const struct flowi *fl);
86756 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
86757-};
86758+} __do_const;
86759
86760 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
86761 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
86762@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
86763 int (*transport_finish)(struct sk_buff *skb,
86764 int async);
86765 void (*local_error)(struct sk_buff *skb, u32 mtu);
86766-};
86767+} __do_const;
86768
86769 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
86770 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
86771@@ -437,7 +436,7 @@ struct xfrm_mode {
86772 struct module *owner;
86773 unsigned int encap;
86774 int flags;
86775-};
86776+} __do_const;
86777
86778 /* Flags for xfrm_mode. */
86779 enum {
86780@@ -534,7 +533,7 @@ struct xfrm_policy {
86781 struct timer_list timer;
86782
86783 struct flow_cache_object flo;
86784- atomic_t genid;
86785+ atomic_unchecked_t genid;
86786 u32 priority;
86787 u32 index;
86788 struct xfrm_mark mark;
86789@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
86790 }
86791
86792 void xfrm_garbage_collect(struct net *net);
86793+void xfrm_garbage_collect_deferred(struct net *net);
86794
86795 #else
86796
86797@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
86798 static inline void xfrm_garbage_collect(struct net *net)
86799 {
86800 }
86801+static inline void xfrm_garbage_collect_deferred(struct net *net)
86802+{
86803+}
86804 #endif
86805
86806 static __inline__
86807diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
86808index 1017e0b..227aa4d 100644
86809--- a/include/rdma/iw_cm.h
86810+++ b/include/rdma/iw_cm.h
86811@@ -122,7 +122,7 @@ struct iw_cm_verbs {
86812 int backlog);
86813
86814 int (*destroy_listen)(struct iw_cm_id *cm_id);
86815-};
86816+} __no_const;
86817
86818 /**
86819 * iw_create_cm_id - Create an IW CM identifier.
86820diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
86821index 52beadf..598734c 100644
86822--- a/include/scsi/libfc.h
86823+++ b/include/scsi/libfc.h
86824@@ -771,6 +771,7 @@ struct libfc_function_template {
86825 */
86826 void (*disc_stop_final) (struct fc_lport *);
86827 };
86828+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
86829
86830 /**
86831 * struct fc_disc - Discovery context
86832@@ -875,7 +876,7 @@ struct fc_lport {
86833 struct fc_vport *vport;
86834
86835 /* Operational Information */
86836- struct libfc_function_template tt;
86837+ libfc_function_template_no_const tt;
86838 u8 link_up;
86839 u8 qfull;
86840 enum fc_lport_state state;
86841diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
86842index 27ecee7..5f42632 100644
86843--- a/include/scsi/scsi_device.h
86844+++ b/include/scsi/scsi_device.h
86845@@ -186,9 +186,9 @@ struct scsi_device {
86846 unsigned int max_device_blocked; /* what device_blocked counts down from */
86847 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
86848
86849- atomic_t iorequest_cnt;
86850- atomic_t iodone_cnt;
86851- atomic_t ioerr_cnt;
86852+ atomic_unchecked_t iorequest_cnt;
86853+ atomic_unchecked_t iodone_cnt;
86854+ atomic_unchecked_t ioerr_cnt;
86855
86856 struct device sdev_gendev,
86857 sdev_dev;
86858diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
86859index 007a0bc..7188db8 100644
86860--- a/include/scsi/scsi_transport_fc.h
86861+++ b/include/scsi/scsi_transport_fc.h
86862@@ -756,7 +756,8 @@ struct fc_function_template {
86863 unsigned long show_host_system_hostname:1;
86864
86865 unsigned long disable_target_scan:1;
86866-};
86867+} __do_const;
86868+typedef struct fc_function_template __no_const fc_function_template_no_const;
86869
86870
86871 /**
86872diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
86873index ae6c3b8..fd748ac 100644
86874--- a/include/sound/compress_driver.h
86875+++ b/include/sound/compress_driver.h
86876@@ -128,7 +128,7 @@ struct snd_compr_ops {
86877 struct snd_compr_caps *caps);
86878 int (*get_codec_caps) (struct snd_compr_stream *stream,
86879 struct snd_compr_codec_caps *codec);
86880-};
86881+} __no_const;
86882
86883 /**
86884 * struct snd_compr: Compressed device
86885diff --git a/include/sound/soc.h b/include/sound/soc.h
86886index 7ba7130..d46594d 100644
86887--- a/include/sound/soc.h
86888+++ b/include/sound/soc.h
86889@@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
86890 enum snd_soc_dapm_type, int);
86891
86892 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
86893-};
86894+} __do_const;
86895
86896 /* SoC platform interface */
86897 struct snd_soc_platform_driver {
86898@@ -882,7 +882,7 @@ struct snd_soc_platform_driver {
86899 const struct snd_compr_ops *compr_ops;
86900
86901 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
86902-};
86903+} __do_const;
86904
86905 struct snd_soc_dai_link_component {
86906 const char *name;
86907diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
86908index 23c518a..d6ef510 100644
86909--- a/include/target/target_core_base.h
86910+++ b/include/target/target_core_base.h
86911@@ -764,7 +764,7 @@ struct se_device {
86912 atomic_long_t write_bytes;
86913 /* Active commands on this virtual SE device */
86914 atomic_t simple_cmds;
86915- atomic_t dev_ordered_id;
86916+ atomic_unchecked_t dev_ordered_id;
86917 atomic_t dev_ordered_sync;
86918 atomic_t dev_qf_count;
86919 int export_count;
86920diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
86921new file mode 100644
86922index 0000000..fb634b7
86923--- /dev/null
86924+++ b/include/trace/events/fs.h
86925@@ -0,0 +1,53 @@
86926+#undef TRACE_SYSTEM
86927+#define TRACE_SYSTEM fs
86928+
86929+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
86930+#define _TRACE_FS_H
86931+
86932+#include <linux/fs.h>
86933+#include <linux/tracepoint.h>
86934+
86935+TRACE_EVENT(do_sys_open,
86936+
86937+ TP_PROTO(const char *filename, int flags, int mode),
86938+
86939+ TP_ARGS(filename, flags, mode),
86940+
86941+ TP_STRUCT__entry(
86942+ __string( filename, filename )
86943+ __field( int, flags )
86944+ __field( int, mode )
86945+ ),
86946+
86947+ TP_fast_assign(
86948+ __assign_str(filename, filename);
86949+ __entry->flags = flags;
86950+ __entry->mode = mode;
86951+ ),
86952+
86953+ TP_printk("\"%s\" %x %o",
86954+ __get_str(filename), __entry->flags, __entry->mode)
86955+);
86956+
86957+TRACE_EVENT(open_exec,
86958+
86959+ TP_PROTO(const char *filename),
86960+
86961+ TP_ARGS(filename),
86962+
86963+ TP_STRUCT__entry(
86964+ __string( filename, filename )
86965+ ),
86966+
86967+ TP_fast_assign(
86968+ __assign_str(filename, filename);
86969+ ),
86970+
86971+ TP_printk("\"%s\"",
86972+ __get_str(filename))
86973+);
86974+
86975+#endif /* _TRACE_FS_H */
86976+
86977+/* This part must be outside protection */
86978+#include <trace/define_trace.h>
86979diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
86980index 3608beb..df39d8a 100644
86981--- a/include/trace/events/irq.h
86982+++ b/include/trace/events/irq.h
86983@@ -36,7 +36,7 @@ struct softirq_action;
86984 */
86985 TRACE_EVENT(irq_handler_entry,
86986
86987- TP_PROTO(int irq, struct irqaction *action),
86988+ TP_PROTO(int irq, const struct irqaction *action),
86989
86990 TP_ARGS(irq, action),
86991
86992@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
86993 */
86994 TRACE_EVENT(irq_handler_exit,
86995
86996- TP_PROTO(int irq, struct irqaction *action, int ret),
86997+ TP_PROTO(int irq, const struct irqaction *action, int ret),
86998
86999 TP_ARGS(irq, action, ret),
87000
87001diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
87002index 7caf44c..23c6f27 100644
87003--- a/include/uapi/linux/a.out.h
87004+++ b/include/uapi/linux/a.out.h
87005@@ -39,6 +39,14 @@ enum machine_type {
87006 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
87007 };
87008
87009+/* Constants for the N_FLAGS field */
87010+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
87011+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
87012+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
87013+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
87014+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
87015+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
87016+
87017 #if !defined (N_MAGIC)
87018 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
87019 #endif
87020diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
87021index 22b6ad3..aeba37e 100644
87022--- a/include/uapi/linux/bcache.h
87023+++ b/include/uapi/linux/bcache.h
87024@@ -5,6 +5,7 @@
87025 * Bcache on disk data structures
87026 */
87027
87028+#include <linux/compiler.h>
87029 #include <asm/types.h>
87030
87031 #define BITMASK(name, type, field, offset, size) \
87032@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
87033 /* Btree keys - all units are in sectors */
87034
87035 struct bkey {
87036- __u64 high;
87037- __u64 low;
87038+ __u64 high __intentional_overflow(-1);
87039+ __u64 low __intentional_overflow(-1);
87040 __u64 ptr[];
87041 };
87042
87043diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
87044index d876736..ccce5c0 100644
87045--- a/include/uapi/linux/byteorder/little_endian.h
87046+++ b/include/uapi/linux/byteorder/little_endian.h
87047@@ -42,51 +42,51 @@
87048
87049 static inline __le64 __cpu_to_le64p(const __u64 *p)
87050 {
87051- return (__force __le64)*p;
87052+ return (__force const __le64)*p;
87053 }
87054-static inline __u64 __le64_to_cpup(const __le64 *p)
87055+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
87056 {
87057- return (__force __u64)*p;
87058+ return (__force const __u64)*p;
87059 }
87060 static inline __le32 __cpu_to_le32p(const __u32 *p)
87061 {
87062- return (__force __le32)*p;
87063+ return (__force const __le32)*p;
87064 }
87065 static inline __u32 __le32_to_cpup(const __le32 *p)
87066 {
87067- return (__force __u32)*p;
87068+ return (__force const __u32)*p;
87069 }
87070 static inline __le16 __cpu_to_le16p(const __u16 *p)
87071 {
87072- return (__force __le16)*p;
87073+ return (__force const __le16)*p;
87074 }
87075 static inline __u16 __le16_to_cpup(const __le16 *p)
87076 {
87077- return (__force __u16)*p;
87078+ return (__force const __u16)*p;
87079 }
87080 static inline __be64 __cpu_to_be64p(const __u64 *p)
87081 {
87082- return (__force __be64)__swab64p(p);
87083+ return (__force const __be64)__swab64p(p);
87084 }
87085 static inline __u64 __be64_to_cpup(const __be64 *p)
87086 {
87087- return __swab64p((__u64 *)p);
87088+ return __swab64p((const __u64 *)p);
87089 }
87090 static inline __be32 __cpu_to_be32p(const __u32 *p)
87091 {
87092- return (__force __be32)__swab32p(p);
87093+ return (__force const __be32)__swab32p(p);
87094 }
87095-static inline __u32 __be32_to_cpup(const __be32 *p)
87096+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
87097 {
87098- return __swab32p((__u32 *)p);
87099+ return __swab32p((const __u32 *)p);
87100 }
87101 static inline __be16 __cpu_to_be16p(const __u16 *p)
87102 {
87103- return (__force __be16)__swab16p(p);
87104+ return (__force const __be16)__swab16p(p);
87105 }
87106 static inline __u16 __be16_to_cpup(const __be16 *p)
87107 {
87108- return __swab16p((__u16 *)p);
87109+ return __swab16p((const __u16 *)p);
87110 }
87111 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
87112 #define __le64_to_cpus(x) do { (void)(x); } while (0)
87113diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
87114index ea9bf25..5140c61 100644
87115--- a/include/uapi/linux/elf.h
87116+++ b/include/uapi/linux/elf.h
87117@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
87118 #define PT_GNU_EH_FRAME 0x6474e550
87119
87120 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
87121+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
87122+
87123+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
87124+
87125+/* Constants for the e_flags field */
87126+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
87127+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
87128+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
87129+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
87130+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
87131+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
87132
87133 /*
87134 * Extended Numbering
87135@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
87136 #define DT_DEBUG 21
87137 #define DT_TEXTREL 22
87138 #define DT_JMPREL 23
87139+#define DT_FLAGS 30
87140+ #define DF_TEXTREL 0x00000004
87141 #define DT_ENCODING 32
87142 #define OLD_DT_LOOS 0x60000000
87143 #define DT_LOOS 0x6000000d
87144@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
87145 #define PF_W 0x2
87146 #define PF_X 0x1
87147
87148+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
87149+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
87150+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
87151+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
87152+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
87153+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
87154+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
87155+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
87156+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
87157+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
87158+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
87159+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
87160+
87161 typedef struct elf32_phdr{
87162 Elf32_Word p_type;
87163 Elf32_Off p_offset;
87164@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
87165 #define EI_OSABI 7
87166 #define EI_PAD 8
87167
87168+#define EI_PAX 14
87169+
87170 #define ELFMAG0 0x7f /* EI_MAG */
87171 #define ELFMAG1 'E'
87172 #define ELFMAG2 'L'
87173diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
87174index aa169c4..6a2771d 100644
87175--- a/include/uapi/linux/personality.h
87176+++ b/include/uapi/linux/personality.h
87177@@ -30,6 +30,7 @@ enum {
87178 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
87179 ADDR_NO_RANDOMIZE | \
87180 ADDR_COMPAT_LAYOUT | \
87181+ ADDR_LIMIT_3GB | \
87182 MMAP_PAGE_ZERO)
87183
87184 /*
87185diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
87186index 7530e74..e714828 100644
87187--- a/include/uapi/linux/screen_info.h
87188+++ b/include/uapi/linux/screen_info.h
87189@@ -43,7 +43,8 @@ struct screen_info {
87190 __u16 pages; /* 0x32 */
87191 __u16 vesa_attributes; /* 0x34 */
87192 __u32 capabilities; /* 0x36 */
87193- __u8 _reserved[6]; /* 0x3a */
87194+ __u16 vesapm_size; /* 0x3a */
87195+ __u8 _reserved[4]; /* 0x3c */
87196 } __attribute__((packed));
87197
87198 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
87199diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
87200index 0e011eb..82681b1 100644
87201--- a/include/uapi/linux/swab.h
87202+++ b/include/uapi/linux/swab.h
87203@@ -43,7 +43,7 @@
87204 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
87205 */
87206
87207-static inline __attribute_const__ __u16 __fswab16(__u16 val)
87208+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
87209 {
87210 #ifdef __HAVE_BUILTIN_BSWAP16__
87211 return __builtin_bswap16(val);
87212@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
87213 #endif
87214 }
87215
87216-static inline __attribute_const__ __u32 __fswab32(__u32 val)
87217+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
87218 {
87219 #ifdef __HAVE_BUILTIN_BSWAP32__
87220 return __builtin_bswap32(val);
87221@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
87222 #endif
87223 }
87224
87225-static inline __attribute_const__ __u64 __fswab64(__u64 val)
87226+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
87227 {
87228 #ifdef __HAVE_BUILTIN_BSWAP64__
87229 return __builtin_bswap64(val);
87230diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
87231index 43aaba1..1c30b48 100644
87232--- a/include/uapi/linux/sysctl.h
87233+++ b/include/uapi/linux/sysctl.h
87234@@ -155,8 +155,6 @@ enum
87235 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
87236 };
87237
87238-
87239-
87240 /* CTL_VM names: */
87241 enum
87242 {
87243diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
87244index 1590c49..5eab462 100644
87245--- a/include/uapi/linux/xattr.h
87246+++ b/include/uapi/linux/xattr.h
87247@@ -73,5 +73,9 @@
87248 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
87249 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
87250
87251+/* User namespace */
87252+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
87253+#define XATTR_PAX_FLAGS_SUFFIX "flags"
87254+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
87255
87256 #endif /* _UAPI_LINUX_XATTR_H */
87257diff --git a/include/video/udlfb.h b/include/video/udlfb.h
87258index f9466fa..f4e2b81 100644
87259--- a/include/video/udlfb.h
87260+++ b/include/video/udlfb.h
87261@@ -53,10 +53,10 @@ struct dlfb_data {
87262 u32 pseudo_palette[256];
87263 int blank_mode; /*one of FB_BLANK_ */
87264 /* blit-only rendering path metrics, exposed through sysfs */
87265- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
87266- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
87267- atomic_t bytes_sent; /* to usb, after compression including overhead */
87268- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
87269+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
87270+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
87271+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
87272+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
87273 };
87274
87275 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
87276diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
87277index 30f5362..8ed8ac9 100644
87278--- a/include/video/uvesafb.h
87279+++ b/include/video/uvesafb.h
87280@@ -122,6 +122,7 @@ struct uvesafb_par {
87281 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
87282 u8 pmi_setpal; /* PMI for palette changes */
87283 u16 *pmi_base; /* protected mode interface location */
87284+ u8 *pmi_code; /* protected mode code location */
87285 void *pmi_start;
87286 void *pmi_pal;
87287 u8 *vbe_state_orig; /*
87288diff --git a/init/Kconfig b/init/Kconfig
87289index 2081a4d..98d1149 100644
87290--- a/init/Kconfig
87291+++ b/init/Kconfig
87292@@ -1150,6 +1150,7 @@ endif # CGROUPS
87293
87294 config CHECKPOINT_RESTORE
87295 bool "Checkpoint/restore support" if EXPERT
87296+ depends on !GRKERNSEC
87297 default n
87298 help
87299 Enables additional kernel features in a sake of checkpoint/restore.
87300@@ -1659,7 +1660,7 @@ config SLUB_DEBUG
87301
87302 config COMPAT_BRK
87303 bool "Disable heap randomization"
87304- default y
87305+ default n
87306 help
87307 Randomizing heap placement makes heap exploits harder, but it
87308 also breaks ancient binaries (including anything libc5 based).
87309@@ -1990,7 +1991,7 @@ config INIT_ALL_POSSIBLE
87310 config STOP_MACHINE
87311 bool
87312 default y
87313- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
87314+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
87315 help
87316 Need stop_machine() primitive.
87317
87318diff --git a/init/Makefile b/init/Makefile
87319index 7bc47ee..6da2dc7 100644
87320--- a/init/Makefile
87321+++ b/init/Makefile
87322@@ -2,6 +2,9 @@
87323 # Makefile for the linux kernel.
87324 #
87325
87326+ccflags-y := $(GCC_PLUGINS_CFLAGS)
87327+asflags-y := $(GCC_PLUGINS_AFLAGS)
87328+
87329 obj-y := main.o version.o mounts.o
87330 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
87331 obj-y += noinitramfs.o
87332diff --git a/init/do_mounts.c b/init/do_mounts.c
87333index 9b3565c..3f90cf9 100644
87334--- a/init/do_mounts.c
87335+++ b/init/do_mounts.c
87336@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
87337 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
87338 {
87339 struct super_block *s;
87340- int err = sys_mount(name, "/root", fs, flags, data);
87341+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
87342 if (err)
87343 return err;
87344
87345- sys_chdir("/root");
87346+ sys_chdir((const char __force_user *)"/root");
87347 s = current->fs->pwd.dentry->d_sb;
87348 ROOT_DEV = s->s_dev;
87349 printk(KERN_INFO
87350@@ -485,18 +485,18 @@ void __init change_floppy(char *fmt, ...)
87351 va_start(args, fmt);
87352 vsprintf(buf, fmt, args);
87353 va_end(args);
87354- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
87355+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
87356 if (fd >= 0) {
87357 sys_ioctl(fd, FDEJECT, 0);
87358 sys_close(fd);
87359 }
87360 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
87361- fd = sys_open("/dev/console", O_RDWR, 0);
87362+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
87363 if (fd >= 0) {
87364 sys_ioctl(fd, TCGETS, (long)&termios);
87365 termios.c_lflag &= ~ICANON;
87366 sys_ioctl(fd, TCSETSF, (long)&termios);
87367- sys_read(fd, &c, 1);
87368+ sys_read(fd, (char __user *)&c, 1);
87369 termios.c_lflag |= ICANON;
87370 sys_ioctl(fd, TCSETSF, (long)&termios);
87371 sys_close(fd);
87372@@ -590,8 +590,8 @@ void __init prepare_namespace(void)
87373 mount_root();
87374 out:
87375 devtmpfs_mount("dev");
87376- sys_mount(".", "/", NULL, MS_MOVE, NULL);
87377- sys_chroot(".");
87378+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87379+ sys_chroot((const char __force_user *)".");
87380 }
87381
87382 static bool is_tmpfs;
87383diff --git a/init/do_mounts.h b/init/do_mounts.h
87384index f5b978a..69dbfe8 100644
87385--- a/init/do_mounts.h
87386+++ b/init/do_mounts.h
87387@@ -15,15 +15,15 @@ extern int root_mountflags;
87388
87389 static inline int create_dev(char *name, dev_t dev)
87390 {
87391- sys_unlink(name);
87392- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
87393+ sys_unlink((char __force_user *)name);
87394+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
87395 }
87396
87397 #if BITS_PER_LONG == 32
87398 static inline u32 bstat(char *name)
87399 {
87400 struct stat64 stat;
87401- if (sys_stat64(name, &stat) != 0)
87402+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
87403 return 0;
87404 if (!S_ISBLK(stat.st_mode))
87405 return 0;
87406@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
87407 static inline u32 bstat(char *name)
87408 {
87409 struct stat stat;
87410- if (sys_newstat(name, &stat) != 0)
87411+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
87412 return 0;
87413 if (!S_ISBLK(stat.st_mode))
87414 return 0;
87415diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
87416index 3e0878e..8a9d7a0 100644
87417--- a/init/do_mounts_initrd.c
87418+++ b/init/do_mounts_initrd.c
87419@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
87420 {
87421 sys_unshare(CLONE_FS | CLONE_FILES);
87422 /* stdin/stdout/stderr for /linuxrc */
87423- sys_open("/dev/console", O_RDWR, 0);
87424+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
87425 sys_dup(0);
87426 sys_dup(0);
87427 /* move initrd over / and chdir/chroot in initrd root */
87428- sys_chdir("/root");
87429- sys_mount(".", "/", NULL, MS_MOVE, NULL);
87430- sys_chroot(".");
87431+ sys_chdir((const char __force_user *)"/root");
87432+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87433+ sys_chroot((const char __force_user *)".");
87434 sys_setsid();
87435 return 0;
87436 }
87437@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
87438 create_dev("/dev/root.old", Root_RAM0);
87439 /* mount initrd on rootfs' /root */
87440 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
87441- sys_mkdir("/old", 0700);
87442- sys_chdir("/old");
87443+ sys_mkdir((const char __force_user *)"/old", 0700);
87444+ sys_chdir((const char __force_user *)"/old");
87445
87446 /* try loading default modules from initrd */
87447 load_default_modules();
87448@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
87449 current->flags &= ~PF_FREEZER_SKIP;
87450
87451 /* move initrd to rootfs' /old */
87452- sys_mount("..", ".", NULL, MS_MOVE, NULL);
87453+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
87454 /* switch root and cwd back to / of rootfs */
87455- sys_chroot("..");
87456+ sys_chroot((const char __force_user *)"..");
87457
87458 if (new_decode_dev(real_root_dev) == Root_RAM0) {
87459- sys_chdir("/old");
87460+ sys_chdir((const char __force_user *)"/old");
87461 return;
87462 }
87463
87464- sys_chdir("/");
87465+ sys_chdir((const char __force_user *)"/");
87466 ROOT_DEV = new_decode_dev(real_root_dev);
87467 mount_root();
87468
87469 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
87470- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
87471+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
87472 if (!error)
87473 printk("okay\n");
87474 else {
87475- int fd = sys_open("/dev/root.old", O_RDWR, 0);
87476+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
87477 if (error == -ENOENT)
87478 printk("/initrd does not exist. Ignored.\n");
87479 else
87480 printk("failed\n");
87481 printk(KERN_NOTICE "Unmounting old root\n");
87482- sys_umount("/old", MNT_DETACH);
87483+ sys_umount((char __force_user *)"/old", MNT_DETACH);
87484 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
87485 if (fd < 0) {
87486 error = fd;
87487@@ -127,11 +127,11 @@ int __init initrd_load(void)
87488 * mounted in the normal path.
87489 */
87490 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
87491- sys_unlink("/initrd.image");
87492+ sys_unlink((const char __force_user *)"/initrd.image");
87493 handle_initrd();
87494 return 1;
87495 }
87496 }
87497- sys_unlink("/initrd.image");
87498+ sys_unlink((const char __force_user *)"/initrd.image");
87499 return 0;
87500 }
87501diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
87502index 8cb6db5..d729f50 100644
87503--- a/init/do_mounts_md.c
87504+++ b/init/do_mounts_md.c
87505@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
87506 partitioned ? "_d" : "", minor,
87507 md_setup_args[ent].device_names);
87508
87509- fd = sys_open(name, 0, 0);
87510+ fd = sys_open((char __force_user *)name, 0, 0);
87511 if (fd < 0) {
87512 printk(KERN_ERR "md: open failed - cannot start "
87513 "array %s\n", name);
87514@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
87515 * array without it
87516 */
87517 sys_close(fd);
87518- fd = sys_open(name, 0, 0);
87519+ fd = sys_open((char __force_user *)name, 0, 0);
87520 sys_ioctl(fd, BLKRRPART, 0);
87521 }
87522 sys_close(fd);
87523@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
87524
87525 wait_for_device_probe();
87526
87527- fd = sys_open("/dev/md0", 0, 0);
87528+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
87529 if (fd >= 0) {
87530 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
87531 sys_close(fd);
87532diff --git a/init/init_task.c b/init/init_task.c
87533index ba0a7f36..2bcf1d5 100644
87534--- a/init/init_task.c
87535+++ b/init/init_task.c
87536@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
87537 * Initial thread structure. Alignment of this is handled by a special
87538 * linker map entry.
87539 */
87540+#ifdef CONFIG_X86
87541+union thread_union init_thread_union __init_task_data;
87542+#else
87543 union thread_union init_thread_union __init_task_data =
87544 { INIT_THREAD_INFO(init_task) };
87545+#endif
87546diff --git a/init/initramfs.c b/init/initramfs.c
87547index ad1bd77..dca2c1b 100644
87548--- a/init/initramfs.c
87549+++ b/init/initramfs.c
87550@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
87551
87552 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
87553 while (count) {
87554- ssize_t rv = sys_write(fd, p, count);
87555+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
87556
87557 if (rv < 0) {
87558 if (rv == -EINTR || rv == -EAGAIN)
87559@@ -107,7 +107,7 @@ static void __init free_hash(void)
87560 }
87561 }
87562
87563-static long __init do_utime(char *filename, time_t mtime)
87564+static long __init do_utime(char __force_user *filename, time_t mtime)
87565 {
87566 struct timespec t[2];
87567
87568@@ -142,7 +142,7 @@ static void __init dir_utime(void)
87569 struct dir_entry *de, *tmp;
87570 list_for_each_entry_safe(de, tmp, &dir_list, list) {
87571 list_del(&de->list);
87572- do_utime(de->name, de->mtime);
87573+ do_utime((char __force_user *)de->name, de->mtime);
87574 kfree(de->name);
87575 kfree(de);
87576 }
87577@@ -304,7 +304,7 @@ static int __init maybe_link(void)
87578 if (nlink >= 2) {
87579 char *old = find_link(major, minor, ino, mode, collected);
87580 if (old)
87581- return (sys_link(old, collected) < 0) ? -1 : 1;
87582+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
87583 }
87584 return 0;
87585 }
87586@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
87587 {
87588 struct stat st;
87589
87590- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
87591+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
87592 if (S_ISDIR(st.st_mode))
87593- sys_rmdir(path);
87594+ sys_rmdir((char __force_user *)path);
87595 else
87596- sys_unlink(path);
87597+ sys_unlink((char __force_user *)path);
87598 }
87599 }
87600
87601@@ -338,7 +338,7 @@ static int __init do_name(void)
87602 int openflags = O_WRONLY|O_CREAT;
87603 if (ml != 1)
87604 openflags |= O_TRUNC;
87605- wfd = sys_open(collected, openflags, mode);
87606+ wfd = sys_open((char __force_user *)collected, openflags, mode);
87607
87608 if (wfd >= 0) {
87609 sys_fchown(wfd, uid, gid);
87610@@ -350,17 +350,17 @@ static int __init do_name(void)
87611 }
87612 }
87613 } else if (S_ISDIR(mode)) {
87614- sys_mkdir(collected, mode);
87615- sys_chown(collected, uid, gid);
87616- sys_chmod(collected, mode);
87617+ sys_mkdir((char __force_user *)collected, mode);
87618+ sys_chown((char __force_user *)collected, uid, gid);
87619+ sys_chmod((char __force_user *)collected, mode);
87620 dir_add(collected, mtime);
87621 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
87622 S_ISFIFO(mode) || S_ISSOCK(mode)) {
87623 if (maybe_link() == 0) {
87624- sys_mknod(collected, mode, rdev);
87625- sys_chown(collected, uid, gid);
87626- sys_chmod(collected, mode);
87627- do_utime(collected, mtime);
87628+ sys_mknod((char __force_user *)collected, mode, rdev);
87629+ sys_chown((char __force_user *)collected, uid, gid);
87630+ sys_chmod((char __force_user *)collected, mode);
87631+ do_utime((char __force_user *)collected, mtime);
87632 }
87633 }
87634 return 0;
87635@@ -372,7 +372,7 @@ static int __init do_copy(void)
87636 if (xwrite(wfd, victim, body_len) != body_len)
87637 error("write error");
87638 sys_close(wfd);
87639- do_utime(vcollected, mtime);
87640+ do_utime((char __force_user *)vcollected, mtime);
87641 kfree(vcollected);
87642 eat(body_len);
87643 state = SkipIt;
87644@@ -390,9 +390,9 @@ static int __init do_symlink(void)
87645 {
87646 collected[N_ALIGN(name_len) + body_len] = '\0';
87647 clean_path(collected, 0);
87648- sys_symlink(collected + N_ALIGN(name_len), collected);
87649- sys_lchown(collected, uid, gid);
87650- do_utime(collected, mtime);
87651+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
87652+ sys_lchown((char __force_user *)collected, uid, gid);
87653+ do_utime((char __force_user *)collected, mtime);
87654 state = SkipIt;
87655 next_state = Reset;
87656 return 0;
87657diff --git a/init/main.c b/init/main.c
87658index 321d0ce..91b53e5 100644
87659--- a/init/main.c
87660+++ b/init/main.c
87661@@ -98,6 +98,8 @@ extern void radix_tree_init(void);
87662 static inline void mark_rodata_ro(void) { }
87663 #endif
87664
87665+extern void grsecurity_init(void);
87666+
87667 /*
87668 * Debug helper: via this flag we know that we are in 'early bootup code'
87669 * where only the boot processor is running with IRQ disabled. This means
87670@@ -159,6 +161,75 @@ static int __init set_reset_devices(char *str)
87671
87672 __setup("reset_devices", set_reset_devices);
87673
87674+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
87675+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
87676+static int __init setup_grsec_proc_gid(char *str)
87677+{
87678+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
87679+ return 1;
87680+}
87681+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
87682+#endif
87683+
87684+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
87685+unsigned long pax_user_shadow_base __read_only;
87686+EXPORT_SYMBOL(pax_user_shadow_base);
87687+extern char pax_enter_kernel_user[];
87688+extern char pax_exit_kernel_user[];
87689+#endif
87690+
87691+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
87692+static int __init setup_pax_nouderef(char *str)
87693+{
87694+#ifdef CONFIG_X86_32
87695+ unsigned int cpu;
87696+ struct desc_struct *gdt;
87697+
87698+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
87699+ gdt = get_cpu_gdt_table(cpu);
87700+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
87701+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
87702+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
87703+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
87704+ }
87705+ loadsegment(ds, __KERNEL_DS);
87706+ loadsegment(es, __KERNEL_DS);
87707+ loadsegment(ss, __KERNEL_DS);
87708+#else
87709+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
87710+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
87711+ clone_pgd_mask = ~(pgdval_t)0UL;
87712+ pax_user_shadow_base = 0UL;
87713+ setup_clear_cpu_cap(X86_FEATURE_PCID);
87714+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
87715+#endif
87716+
87717+ return 0;
87718+}
87719+early_param("pax_nouderef", setup_pax_nouderef);
87720+
87721+#ifdef CONFIG_X86_64
87722+static int __init setup_pax_weakuderef(char *str)
87723+{
87724+ if (clone_pgd_mask != ~(pgdval_t)0UL)
87725+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
87726+ return 1;
87727+}
87728+__setup("pax_weakuderef", setup_pax_weakuderef);
87729+#endif
87730+#endif
87731+
87732+#ifdef CONFIG_PAX_SOFTMODE
87733+int pax_softmode;
87734+
87735+static int __init setup_pax_softmode(char *str)
87736+{
87737+ get_option(&str, &pax_softmode);
87738+ return 1;
87739+}
87740+__setup("pax_softmode=", setup_pax_softmode);
87741+#endif
87742+
87743 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
87744 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
87745 static const char *panic_later, *panic_param;
87746@@ -728,7 +799,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
87747 struct blacklist_entry *entry;
87748 char *fn_name;
87749
87750- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
87751+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
87752 if (!fn_name)
87753 return false;
87754
87755@@ -780,7 +851,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
87756 {
87757 int count = preempt_count();
87758 int ret;
87759- char msgbuf[64];
87760+ const char *msg1 = "", *msg2 = "";
87761
87762 if (initcall_blacklisted(fn))
87763 return -EPERM;
87764@@ -790,18 +861,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
87765 else
87766 ret = fn();
87767
87768- msgbuf[0] = 0;
87769-
87770 if (preempt_count() != count) {
87771- sprintf(msgbuf, "preemption imbalance ");
87772+ msg1 = " preemption imbalance";
87773 preempt_count_set(count);
87774 }
87775 if (irqs_disabled()) {
87776- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
87777+ msg2 = " disabled interrupts";
87778 local_irq_enable();
87779 }
87780- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
87781+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
87782
87783+ add_latent_entropy();
87784 return ret;
87785 }
87786
87787@@ -907,8 +977,8 @@ static int run_init_process(const char *init_filename)
87788 {
87789 argv_init[0] = init_filename;
87790 return do_execve(getname_kernel(init_filename),
87791- (const char __user *const __user *)argv_init,
87792- (const char __user *const __user *)envp_init);
87793+ (const char __user *const __force_user *)argv_init,
87794+ (const char __user *const __force_user *)envp_init);
87795 }
87796
87797 static int try_to_run_init_process(const char *init_filename)
87798@@ -925,6 +995,10 @@ static int try_to_run_init_process(const char *init_filename)
87799 return ret;
87800 }
87801
87802+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87803+extern int gr_init_ran;
87804+#endif
87805+
87806 static noinline void __init kernel_init_freeable(void);
87807
87808 static int __ref kernel_init(void *unused)
87809@@ -949,6 +1023,11 @@ static int __ref kernel_init(void *unused)
87810 ramdisk_execute_command, ret);
87811 }
87812
87813+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87814+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
87815+ gr_init_ran = 1;
87816+#endif
87817+
87818 /*
87819 * We try each of these until one succeeds.
87820 *
87821@@ -1004,7 +1083,7 @@ static noinline void __init kernel_init_freeable(void)
87822 do_basic_setup();
87823
87824 /* Open the /dev/console on the rootfs, this should never fail */
87825- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
87826+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
87827 pr_err("Warning: unable to open an initial console.\n");
87828
87829 (void) sys_dup(0);
87830@@ -1017,11 +1096,13 @@ static noinline void __init kernel_init_freeable(void)
87831 if (!ramdisk_execute_command)
87832 ramdisk_execute_command = "/init";
87833
87834- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
87835+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
87836 ramdisk_execute_command = NULL;
87837 prepare_namespace();
87838 }
87839
87840+ grsecurity_init();
87841+
87842 /*
87843 * Ok, we have completed the initial bootup, and
87844 * we're essentially up and running. Get rid of the
87845diff --git a/ipc/compat.c b/ipc/compat.c
87846index 9b3c85f..1c4d897 100644
87847--- a/ipc/compat.c
87848+++ b/ipc/compat.c
87849@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
87850 COMPAT_SHMLBA);
87851 if (err < 0)
87852 return err;
87853- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
87854+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
87855 }
87856 case SHMDT:
87857 return sys_shmdt(compat_ptr(ptr));
87858diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
87859index e8075b2..76f2c6a 100644
87860--- a/ipc/ipc_sysctl.c
87861+++ b/ipc/ipc_sysctl.c
87862@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
87863 static int proc_ipc_dointvec(struct ctl_table *table, int write,
87864 void __user *buffer, size_t *lenp, loff_t *ppos)
87865 {
87866- struct ctl_table ipc_table;
87867+ ctl_table_no_const ipc_table;
87868
87869 memcpy(&ipc_table, table, sizeof(ipc_table));
87870 ipc_table.data = get_ipc(table);
87871@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
87872 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
87873 void __user *buffer, size_t *lenp, loff_t *ppos)
87874 {
87875- struct ctl_table ipc_table;
87876+ ctl_table_no_const ipc_table;
87877
87878 memcpy(&ipc_table, table, sizeof(ipc_table));
87879 ipc_table.data = get_ipc(table);
87880@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
87881 static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87882 void __user *buffer, size_t *lenp, loff_t *ppos)
87883 {
87884- struct ctl_table ipc_table;
87885+ ctl_table_no_const ipc_table;
87886 size_t lenp_bef = *lenp;
87887 int rc;
87888
87889@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87890 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
87891 void __user *buffer, size_t *lenp, loff_t *ppos)
87892 {
87893- struct ctl_table ipc_table;
87894+ ctl_table_no_const ipc_table;
87895 memcpy(&ipc_table, table, sizeof(ipc_table));
87896 ipc_table.data = get_ipc(table);
87897
87898@@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
87899 static int proc_ipcauto_dointvec_minmax(struct ctl_table *table, int write,
87900 void __user *buffer, size_t *lenp, loff_t *ppos)
87901 {
87902- struct ctl_table ipc_table;
87903+ ctl_table_no_const ipc_table;
87904 int oldval;
87905 int rc;
87906
87907diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
87908index 68d4e95..1477ded 100644
87909--- a/ipc/mq_sysctl.c
87910+++ b/ipc/mq_sysctl.c
87911@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
87912 static int proc_mq_dointvec(struct ctl_table *table, int write,
87913 void __user *buffer, size_t *lenp, loff_t *ppos)
87914 {
87915- struct ctl_table mq_table;
87916+ ctl_table_no_const mq_table;
87917 memcpy(&mq_table, table, sizeof(mq_table));
87918 mq_table.data = get_mq(table);
87919
87920@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
87921 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
87922 void __user *buffer, size_t *lenp, loff_t *ppos)
87923 {
87924- struct ctl_table mq_table;
87925+ ctl_table_no_const mq_table;
87926 memcpy(&mq_table, table, sizeof(mq_table));
87927 mq_table.data = get_mq(table);
87928
87929diff --git a/ipc/mqueue.c b/ipc/mqueue.c
87930index 4fcf39a..d3cc2ec 100644
87931--- a/ipc/mqueue.c
87932+++ b/ipc/mqueue.c
87933@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
87934 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
87935 info->attr.mq_msgsize);
87936
87937+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
87938 spin_lock(&mq_lock);
87939 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
87940 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
87941diff --git a/ipc/shm.c b/ipc/shm.c
87942index 0145479..3d27947 100644
87943--- a/ipc/shm.c
87944+++ b/ipc/shm.c
87945@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
87946 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
87947 #endif
87948
87949+#ifdef CONFIG_GRKERNSEC
87950+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87951+ const u64 shm_createtime, const kuid_t cuid,
87952+ const int shmid);
87953+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87954+ const u64 shm_createtime);
87955+#endif
87956+
87957 void shm_init_ns(struct ipc_namespace *ns)
87958 {
87959 ns->shm_ctlmax = SHMMAX;
87960@@ -559,6 +567,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
87961 shp->shm_lprid = 0;
87962 shp->shm_atim = shp->shm_dtim = 0;
87963 shp->shm_ctim = get_seconds();
87964+#ifdef CONFIG_GRKERNSEC
87965+ shp->shm_createtime = ktime_get_ns();
87966+#endif
87967 shp->shm_segsz = size;
87968 shp->shm_nattch = 0;
87969 shp->shm_file = file;
87970@@ -1095,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87971 f_mode = FMODE_READ | FMODE_WRITE;
87972 }
87973 if (shmflg & SHM_EXEC) {
87974+
87975+#ifdef CONFIG_PAX_MPROTECT
87976+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
87977+ goto out;
87978+#endif
87979+
87980 prot |= PROT_EXEC;
87981 acc_mode |= S_IXUGO;
87982 }
87983@@ -1119,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87984 if (err)
87985 goto out_unlock;
87986
87987+#ifdef CONFIG_GRKERNSEC
87988+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
87989+ shp->shm_perm.cuid, shmid) ||
87990+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
87991+ err = -EACCES;
87992+ goto out_unlock;
87993+ }
87994+#endif
87995+
87996 ipc_lock_object(&shp->shm_perm);
87997
87998 /* check if shm_destroy() is tearing down shp */
87999@@ -1131,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
88000 path = shp->shm_file->f_path;
88001 path_get(&path);
88002 shp->shm_nattch++;
88003+#ifdef CONFIG_GRKERNSEC
88004+ shp->shm_lapid = current->pid;
88005+#endif
88006 size = i_size_read(path.dentry->d_inode);
88007 ipc_unlock_object(&shp->shm_perm);
88008 rcu_read_unlock();
88009diff --git a/ipc/util.c b/ipc/util.c
88010index 88adc32..3867c68 100644
88011--- a/ipc/util.c
88012+++ b/ipc/util.c
88013@@ -71,6 +71,8 @@ struct ipc_proc_iface {
88014 int (*show)(struct seq_file *, void *);
88015 };
88016
88017+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
88018+
88019 static void ipc_memory_notifier(struct work_struct *work)
88020 {
88021 ipcns_notify(IPCNS_MEMCHANGED);
88022@@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
88023 granted_mode >>= 6;
88024 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
88025 granted_mode >>= 3;
88026+
88027+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
88028+ return -1;
88029+
88030 /* is there some bit set in requested_mode but not in granted_mode? */
88031 if ((requested_mode & ~granted_mode & 0007) &&
88032 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
88033diff --git a/kernel/audit.c b/kernel/audit.c
88034index c6df990..fde80b4 100644
88035--- a/kernel/audit.c
88036+++ b/kernel/audit.c
88037@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
88038 3) suppressed due to audit_rate_limit
88039 4) suppressed due to audit_backlog_limit
88040 */
88041-static atomic_t audit_lost = ATOMIC_INIT(0);
88042+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
88043
88044 /* The netlink socket. */
88045 static struct sock *audit_sock;
88046@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
88047 unsigned long now;
88048 int print;
88049
88050- atomic_inc(&audit_lost);
88051+ atomic_inc_unchecked(&audit_lost);
88052
88053 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
88054
88055@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
88056 if (print) {
88057 if (printk_ratelimit())
88058 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
88059- atomic_read(&audit_lost),
88060+ atomic_read_unchecked(&audit_lost),
88061 audit_rate_limit,
88062 audit_backlog_limit);
88063 audit_panic(message);
88064@@ -840,7 +840,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
88065 s.pid = audit_pid;
88066 s.rate_limit = audit_rate_limit;
88067 s.backlog_limit = audit_backlog_limit;
88068- s.lost = atomic_read(&audit_lost);
88069+ s.lost = atomic_read_unchecked(&audit_lost);
88070 s.backlog = skb_queue_len(&audit_skb_queue);
88071 s.version = AUDIT_VERSION_LATEST;
88072 s.backlog_wait_time = audit_backlog_wait_time;
88073diff --git a/kernel/auditsc.c b/kernel/auditsc.c
88074index e420a0c..38137fa 100644
88075--- a/kernel/auditsc.c
88076+++ b/kernel/auditsc.c
88077@@ -2014,7 +2014,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
88078 }
88079
88080 /* global counter which is incremented every time something logs in */
88081-static atomic_t session_id = ATOMIC_INIT(0);
88082+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
88083
88084 static int audit_set_loginuid_perm(kuid_t loginuid)
88085 {
88086@@ -2081,7 +2081,7 @@ int audit_set_loginuid(kuid_t loginuid)
88087
88088 /* are we setting or clearing? */
88089 if (uid_valid(loginuid))
88090- sessionid = (unsigned int)atomic_inc_return(&session_id);
88091+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
88092
88093 task->sessionid = sessionid;
88094 task->loginuid = loginuid;
88095diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
88096index d6594e4..597264b 100644
88097--- a/kernel/bpf/core.c
88098+++ b/kernel/bpf/core.c
88099@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
88100 * random section of illegal instructions.
88101 */
88102 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
88103- hdr = module_alloc(size);
88104+ hdr = module_alloc_exec(size);
88105 if (hdr == NULL)
88106 return NULL;
88107
88108 /* Fill space with illegal/arch-dep instructions. */
88109 bpf_fill_ill_insns(hdr, size);
88110
88111+ pax_open_kernel();
88112 hdr->pages = size / PAGE_SIZE;
88113+ pax_close_kernel();
88114+
88115 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
88116 PAGE_SIZE - sizeof(*hdr));
88117 start = (prandom_u32() % hole) & ~(alignment - 1);
88118@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
88119
88120 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
88121 {
88122- module_free(NULL, hdr);
88123+ module_free_exec(NULL, hdr);
88124 }
88125 #endif /* CONFIG_BPF_JIT */
88126
88127diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
88128index ba61c8c..c60c486 100644
88129--- a/kernel/bpf/syscall.c
88130+++ b/kernel/bpf/syscall.c
88131@@ -539,11 +539,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
88132 int err;
88133
88134 /* the syscall is limited to root temporarily. This restriction will be
88135- * lifted when security audit is clean. Note that eBPF+tracing must have
88136- * this restriction, since it may pass kernel data to user space
88137+ * lifted by upstream when a half-assed security audit is clean. Note
88138+ * that eBPF+tracing must have this restriction, since it may pass
88139+ * kernel data to user space
88140 */
88141 if (!capable(CAP_SYS_ADMIN))
88142 return -EPERM;
88143+#ifdef CONFIG_GRKERNSEC
88144+ return -EPERM;
88145+#endif
88146
88147 if (!access_ok(VERIFY_READ, uattr, 1))
88148 return -EFAULT;
88149diff --git a/kernel/capability.c b/kernel/capability.c
88150index 989f5bf..d317ca0 100644
88151--- a/kernel/capability.c
88152+++ b/kernel/capability.c
88153@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
88154 * before modification is attempted and the application
88155 * fails.
88156 */
88157+ if (tocopy > ARRAY_SIZE(kdata))
88158+ return -EFAULT;
88159+
88160 if (copy_to_user(dataptr, kdata, tocopy
88161 * sizeof(struct __user_cap_data_struct))) {
88162 return -EFAULT;
88163@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
88164 int ret;
88165
88166 rcu_read_lock();
88167- ret = security_capable(__task_cred(t), ns, cap);
88168+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
88169+ gr_task_is_capable(t, __task_cred(t), cap);
88170 rcu_read_unlock();
88171
88172- return (ret == 0);
88173+ return ret;
88174 }
88175
88176 /**
88177@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
88178 int ret;
88179
88180 rcu_read_lock();
88181- ret = security_capable_noaudit(__task_cred(t), ns, cap);
88182+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
88183 rcu_read_unlock();
88184
88185- return (ret == 0);
88186+ return ret;
88187 }
88188
88189 /**
88190@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
88191 BUG();
88192 }
88193
88194- if (security_capable(current_cred(), ns, cap) == 0) {
88195+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
88196 current->flags |= PF_SUPERPRIV;
88197 return true;
88198 }
88199@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
88200 }
88201 EXPORT_SYMBOL(ns_capable);
88202
88203+bool ns_capable_nolog(struct user_namespace *ns, int cap)
88204+{
88205+ if (unlikely(!cap_valid(cap))) {
88206+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
88207+ BUG();
88208+ }
88209+
88210+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
88211+ current->flags |= PF_SUPERPRIV;
88212+ return true;
88213+ }
88214+ return false;
88215+}
88216+EXPORT_SYMBOL(ns_capable_nolog);
88217+
88218 /**
88219 * file_ns_capable - Determine if the file's opener had a capability in effect
88220 * @file: The file we want to check
88221@@ -427,6 +446,12 @@ bool capable(int cap)
88222 }
88223 EXPORT_SYMBOL(capable);
88224
88225+bool capable_nolog(int cap)
88226+{
88227+ return ns_capable_nolog(&init_user_ns, cap);
88228+}
88229+EXPORT_SYMBOL(capable_nolog);
88230+
88231 /**
88232 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
88233 * @inode: The inode in question
88234@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
88235 kgid_has_mapping(ns, inode->i_gid);
88236 }
88237 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
88238+
88239+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
88240+{
88241+ struct user_namespace *ns = current_user_ns();
88242+
88243+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
88244+ kgid_has_mapping(ns, inode->i_gid);
88245+}
88246+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
88247diff --git a/kernel/cgroup.c b/kernel/cgroup.c
88248index 136ecea..45157a6 100644
88249--- a/kernel/cgroup.c
88250+++ b/kernel/cgroup.c
88251@@ -5276,6 +5276,9 @@ static void cgroup_release_agent(struct work_struct *work)
88252 if (!pathbuf || !agentbuf)
88253 goto out;
88254
88255+ if (agentbuf[0] == '\0')
88256+ goto out;
88257+
88258 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
88259 if (!path)
88260 goto out;
88261@@ -5461,7 +5464,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
88262 struct task_struct *task;
88263 int count = 0;
88264
88265- seq_printf(seq, "css_set %p\n", cset);
88266+ seq_printf(seq, "css_set %pK\n", cset);
88267
88268 list_for_each_entry(task, &cset->tasks, cg_list) {
88269 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
88270diff --git a/kernel/compat.c b/kernel/compat.c
88271index ebb3c36..1df606e 100644
88272--- a/kernel/compat.c
88273+++ b/kernel/compat.c
88274@@ -13,6 +13,7 @@
88275
88276 #include <linux/linkage.h>
88277 #include <linux/compat.h>
88278+#include <linux/module.h>
88279 #include <linux/errno.h>
88280 #include <linux/time.h>
88281 #include <linux/signal.h>
88282@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
88283 mm_segment_t oldfs;
88284 long ret;
88285
88286- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
88287+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
88288 oldfs = get_fs();
88289 set_fs(KERNEL_DS);
88290 ret = hrtimer_nanosleep_restart(restart);
88291@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
88292 oldfs = get_fs();
88293 set_fs(KERNEL_DS);
88294 ret = hrtimer_nanosleep(&tu,
88295- rmtp ? (struct timespec __user *)&rmt : NULL,
88296+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
88297 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
88298 set_fs(oldfs);
88299
88300@@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
88301 mm_segment_t old_fs = get_fs();
88302
88303 set_fs(KERNEL_DS);
88304- ret = sys_sigpending((old_sigset_t __user *) &s);
88305+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
88306 set_fs(old_fs);
88307 if (ret == 0)
88308 ret = put_user(s, set);
88309@@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
88310 mm_segment_t old_fs = get_fs();
88311
88312 set_fs(KERNEL_DS);
88313- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
88314+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
88315 set_fs(old_fs);
88316
88317 if (!ret) {
88318@@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
88319 set_fs (KERNEL_DS);
88320 ret = sys_wait4(pid,
88321 (stat_addr ?
88322- (unsigned int __user *) &status : NULL),
88323- options, (struct rusage __user *) &r);
88324+ (unsigned int __force_user *) &status : NULL),
88325+ options, (struct rusage __force_user *) &r);
88326 set_fs (old_fs);
88327
88328 if (ret > 0) {
88329@@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
88330 memset(&info, 0, sizeof(info));
88331
88332 set_fs(KERNEL_DS);
88333- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
88334- uru ? (struct rusage __user *)&ru : NULL);
88335+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
88336+ uru ? (struct rusage __force_user *)&ru : NULL);
88337 set_fs(old_fs);
88338
88339 if ((ret < 0) || (info.si_signo == 0))
88340@@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
88341 oldfs = get_fs();
88342 set_fs(KERNEL_DS);
88343 err = sys_timer_settime(timer_id, flags,
88344- (struct itimerspec __user *) &newts,
88345- (struct itimerspec __user *) &oldts);
88346+ (struct itimerspec __force_user *) &newts,
88347+ (struct itimerspec __force_user *) &oldts);
88348 set_fs(oldfs);
88349 if (!err && old && put_compat_itimerspec(old, &oldts))
88350 return -EFAULT;
88351@@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
88352 oldfs = get_fs();
88353 set_fs(KERNEL_DS);
88354 err = sys_timer_gettime(timer_id,
88355- (struct itimerspec __user *) &ts);
88356+ (struct itimerspec __force_user *) &ts);
88357 set_fs(oldfs);
88358 if (!err && put_compat_itimerspec(setting, &ts))
88359 return -EFAULT;
88360@@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
88361 oldfs = get_fs();
88362 set_fs(KERNEL_DS);
88363 err = sys_clock_settime(which_clock,
88364- (struct timespec __user *) &ts);
88365+ (struct timespec __force_user *) &ts);
88366 set_fs(oldfs);
88367 return err;
88368 }
88369@@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
88370 oldfs = get_fs();
88371 set_fs(KERNEL_DS);
88372 err = sys_clock_gettime(which_clock,
88373- (struct timespec __user *) &ts);
88374+ (struct timespec __force_user *) &ts);
88375 set_fs(oldfs);
88376 if (!err && compat_put_timespec(&ts, tp))
88377 return -EFAULT;
88378@@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
88379
88380 oldfs = get_fs();
88381 set_fs(KERNEL_DS);
88382- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
88383+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
88384 set_fs(oldfs);
88385
88386 err = compat_put_timex(utp, &txc);
88387@@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
88388 oldfs = get_fs();
88389 set_fs(KERNEL_DS);
88390 err = sys_clock_getres(which_clock,
88391- (struct timespec __user *) &ts);
88392+ (struct timespec __force_user *) &ts);
88393 set_fs(oldfs);
88394 if (!err && tp && compat_put_timespec(&ts, tp))
88395 return -EFAULT;
88396@@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
88397 struct timespec tu;
88398 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
88399
88400- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
88401+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
88402 oldfs = get_fs();
88403 set_fs(KERNEL_DS);
88404 err = clock_nanosleep_restart(restart);
88405@@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
88406 oldfs = get_fs();
88407 set_fs(KERNEL_DS);
88408 err = sys_clock_nanosleep(which_clock, flags,
88409- (struct timespec __user *) &in,
88410- (struct timespec __user *) &out);
88411+ (struct timespec __force_user *) &in,
88412+ (struct timespec __force_user *) &out);
88413 set_fs(oldfs);
88414
88415 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
88416@@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
88417 mm_segment_t old_fs = get_fs();
88418
88419 set_fs(KERNEL_DS);
88420- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
88421+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
88422 set_fs(old_fs);
88423 if (compat_put_timespec(&t, interval))
88424 return -EFAULT;
88425diff --git a/kernel/configs.c b/kernel/configs.c
88426index c18b1f1..b9a0132 100644
88427--- a/kernel/configs.c
88428+++ b/kernel/configs.c
88429@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
88430 struct proc_dir_entry *entry;
88431
88432 /* create the current config file */
88433+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
88434+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
88435+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
88436+ &ikconfig_file_ops);
88437+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
88438+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
88439+ &ikconfig_file_ops);
88440+#endif
88441+#else
88442 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
88443 &ikconfig_file_ops);
88444+#endif
88445+
88446 if (!entry)
88447 return -ENOMEM;
88448
88449diff --git a/kernel/cred.c b/kernel/cred.c
88450index e0573a4..26c0fd3 100644
88451--- a/kernel/cred.c
88452+++ b/kernel/cred.c
88453@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
88454 validate_creds(cred);
88455 alter_cred_subscribers(cred, -1);
88456 put_cred(cred);
88457+
88458+#ifdef CONFIG_GRKERNSEC_SETXID
88459+ cred = (struct cred *) tsk->delayed_cred;
88460+ if (cred != NULL) {
88461+ tsk->delayed_cred = NULL;
88462+ validate_creds(cred);
88463+ alter_cred_subscribers(cred, -1);
88464+ put_cred(cred);
88465+ }
88466+#endif
88467 }
88468
88469 /**
88470@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
88471 * Always returns 0 thus allowing this function to be tail-called at the end
88472 * of, say, sys_setgid().
88473 */
88474-int commit_creds(struct cred *new)
88475+static int __commit_creds(struct cred *new)
88476 {
88477 struct task_struct *task = current;
88478 const struct cred *old = task->real_cred;
88479@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
88480
88481 get_cred(new); /* we will require a ref for the subj creds too */
88482
88483+ gr_set_role_label(task, new->uid, new->gid);
88484+
88485 /* dumpability changes */
88486 if (!uid_eq(old->euid, new->euid) ||
88487 !gid_eq(old->egid, new->egid) ||
88488@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
88489 put_cred(old);
88490 return 0;
88491 }
88492+#ifdef CONFIG_GRKERNSEC_SETXID
88493+extern int set_user(struct cred *new);
88494+
88495+void gr_delayed_cred_worker(void)
88496+{
88497+ const struct cred *new = current->delayed_cred;
88498+ struct cred *ncred;
88499+
88500+ current->delayed_cred = NULL;
88501+
88502+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
88503+ // from doing get_cred on it when queueing this
88504+ put_cred(new);
88505+ return;
88506+ } else if (new == NULL)
88507+ return;
88508+
88509+ ncred = prepare_creds();
88510+ if (!ncred)
88511+ goto die;
88512+ // uids
88513+ ncred->uid = new->uid;
88514+ ncred->euid = new->euid;
88515+ ncred->suid = new->suid;
88516+ ncred->fsuid = new->fsuid;
88517+ // gids
88518+ ncred->gid = new->gid;
88519+ ncred->egid = new->egid;
88520+ ncred->sgid = new->sgid;
88521+ ncred->fsgid = new->fsgid;
88522+ // groups
88523+ set_groups(ncred, new->group_info);
88524+ // caps
88525+ ncred->securebits = new->securebits;
88526+ ncred->cap_inheritable = new->cap_inheritable;
88527+ ncred->cap_permitted = new->cap_permitted;
88528+ ncred->cap_effective = new->cap_effective;
88529+ ncred->cap_bset = new->cap_bset;
88530+
88531+ if (set_user(ncred)) {
88532+ abort_creds(ncred);
88533+ goto die;
88534+ }
88535+
88536+ // from doing get_cred on it when queueing this
88537+ put_cred(new);
88538+
88539+ __commit_creds(ncred);
88540+ return;
88541+die:
88542+ // from doing get_cred on it when queueing this
88543+ put_cred(new);
88544+ do_group_exit(SIGKILL);
88545+}
88546+#endif
88547+
88548+int commit_creds(struct cred *new)
88549+{
88550+#ifdef CONFIG_GRKERNSEC_SETXID
88551+ int ret;
88552+ int schedule_it = 0;
88553+ struct task_struct *t;
88554+ unsigned oldsecurebits = current_cred()->securebits;
88555+
88556+ /* we won't get called with tasklist_lock held for writing
88557+ and interrupts disabled as the cred struct in that case is
88558+ init_cred
88559+ */
88560+ if (grsec_enable_setxid && !current_is_single_threaded() &&
88561+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
88562+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
88563+ schedule_it = 1;
88564+ }
88565+ ret = __commit_creds(new);
88566+ if (schedule_it) {
88567+ rcu_read_lock();
88568+ read_lock(&tasklist_lock);
88569+ for (t = next_thread(current); t != current;
88570+ t = next_thread(t)) {
88571+ /* we'll check if the thread has uid 0 in
88572+ * the delayed worker routine
88573+ */
88574+ if (task_securebits(t) == oldsecurebits &&
88575+ t->delayed_cred == NULL) {
88576+ t->delayed_cred = get_cred(new);
88577+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
88578+ set_tsk_need_resched(t);
88579+ }
88580+ }
88581+ read_unlock(&tasklist_lock);
88582+ rcu_read_unlock();
88583+ }
88584+
88585+ return ret;
88586+#else
88587+ return __commit_creds(new);
88588+#endif
88589+}
88590+
88591 EXPORT_SYMBOL(commit_creds);
88592
88593 /**
88594diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
88595index 1adf62b..7736e06 100644
88596--- a/kernel/debug/debug_core.c
88597+++ b/kernel/debug/debug_core.c
88598@@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
88599 */
88600 static atomic_t masters_in_kgdb;
88601 static atomic_t slaves_in_kgdb;
88602-static atomic_t kgdb_break_tasklet_var;
88603+static atomic_unchecked_t kgdb_break_tasklet_var;
88604 atomic_t kgdb_setting_breakpoint;
88605
88606 struct task_struct *kgdb_usethread;
88607@@ -134,7 +134,7 @@ int kgdb_single_step;
88608 static pid_t kgdb_sstep_pid;
88609
88610 /* to keep track of the CPU which is doing the single stepping*/
88611-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88612+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88613
88614 /*
88615 * If you are debugging a problem where roundup (the collection of
88616@@ -549,7 +549,7 @@ return_normal:
88617 * kernel will only try for the value of sstep_tries before
88618 * giving up and continuing on.
88619 */
88620- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
88621+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
88622 (kgdb_info[cpu].task &&
88623 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
88624 atomic_set(&kgdb_active, -1);
88625@@ -647,8 +647,8 @@ cpu_master_loop:
88626 }
88627
88628 kgdb_restore:
88629- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
88630- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
88631+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
88632+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
88633 if (kgdb_info[sstep_cpu].task)
88634 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
88635 else
88636@@ -925,18 +925,18 @@ static void kgdb_unregister_callbacks(void)
88637 static void kgdb_tasklet_bpt(unsigned long ing)
88638 {
88639 kgdb_breakpoint();
88640- atomic_set(&kgdb_break_tasklet_var, 0);
88641+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
88642 }
88643
88644 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
88645
88646 void kgdb_schedule_breakpoint(void)
88647 {
88648- if (atomic_read(&kgdb_break_tasklet_var) ||
88649+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
88650 atomic_read(&kgdb_active) != -1 ||
88651 atomic_read(&kgdb_setting_breakpoint))
88652 return;
88653- atomic_inc(&kgdb_break_tasklet_var);
88654+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
88655 tasklet_schedule(&kgdb_tasklet_breakpoint);
88656 }
88657 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
88658diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
88659index 379650b..30c5180 100644
88660--- a/kernel/debug/kdb/kdb_main.c
88661+++ b/kernel/debug/kdb/kdb_main.c
88662@@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
88663 continue;
88664
88665 kdb_printf("%-20s%8u 0x%p ", mod->name,
88666- mod->core_size, (void *)mod);
88667+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
88668 #ifdef CONFIG_MODULE_UNLOAD
88669 kdb_printf("%4ld ", module_refcount(mod));
88670 #endif
88671@@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
88672 kdb_printf(" (Loading)");
88673 else
88674 kdb_printf(" (Live)");
88675- kdb_printf(" 0x%p", mod->module_core);
88676+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
88677
88678 #ifdef CONFIG_MODULE_UNLOAD
88679 {
88680diff --git a/kernel/events/core.c b/kernel/events/core.c
88681index 2ab0238..bf89262f5 100644
88682--- a/kernel/events/core.c
88683+++ b/kernel/events/core.c
88684@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
88685 * 0 - disallow raw tracepoint access for unpriv
88686 * 1 - disallow cpu events for unpriv
88687 * 2 - disallow kernel profiling for unpriv
88688+ * 3 - disallow all unpriv perf event use
88689 */
88690-int sysctl_perf_event_paranoid __read_mostly = 1;
88691+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88692+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
88693+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
88694+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
88695+#else
88696+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
88697+#endif
88698
88699 /* Minimum for 512 kiB + 1 user control page */
88700 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
88701@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
88702
88703 tmp *= sysctl_perf_cpu_time_max_percent;
88704 do_div(tmp, 100);
88705- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
88706+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
88707 }
88708
88709 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
88710@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
88711 }
88712 }
88713
88714-static atomic64_t perf_event_id;
88715+static atomic64_unchecked_t perf_event_id;
88716
88717 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
88718 enum event_type_t event_type);
88719@@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
88720
88721 static inline u64 perf_event_count(struct perf_event *event)
88722 {
88723- return local64_read(&event->count) + atomic64_read(&event->child_count);
88724+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
88725 }
88726
88727 static u64 perf_event_read(struct perf_event *event)
88728@@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
88729 mutex_lock(&event->child_mutex);
88730 total += perf_event_read(event);
88731 *enabled += event->total_time_enabled +
88732- atomic64_read(&event->child_total_time_enabled);
88733+ atomic64_read_unchecked(&event->child_total_time_enabled);
88734 *running += event->total_time_running +
88735- atomic64_read(&event->child_total_time_running);
88736+ atomic64_read_unchecked(&event->child_total_time_running);
88737
88738 list_for_each_entry(child, &event->child_list, child_list) {
88739 total += perf_event_read(child);
88740@@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
88741 userpg->offset -= local64_read(&event->hw.prev_count);
88742
88743 userpg->time_enabled = enabled +
88744- atomic64_read(&event->child_total_time_enabled);
88745+ atomic64_read_unchecked(&event->child_total_time_enabled);
88746
88747 userpg->time_running = running +
88748- atomic64_read(&event->child_total_time_running);
88749+ atomic64_read_unchecked(&event->child_total_time_running);
88750
88751 arch_perf_update_userpage(userpg, now);
88752
88753@@ -4561,7 +4568,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
88754
88755 /* Data. */
88756 sp = perf_user_stack_pointer(regs);
88757- rem = __output_copy_user(handle, (void *) sp, dump_size);
88758+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
88759 dyn_size = dump_size - rem;
88760
88761 perf_output_skip(handle, rem);
88762@@ -4652,11 +4659,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
88763 values[n++] = perf_event_count(event);
88764 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
88765 values[n++] = enabled +
88766- atomic64_read(&event->child_total_time_enabled);
88767+ atomic64_read_unchecked(&event->child_total_time_enabled);
88768 }
88769 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
88770 values[n++] = running +
88771- atomic64_read(&event->child_total_time_running);
88772+ atomic64_read_unchecked(&event->child_total_time_running);
88773 }
88774 if (read_format & PERF_FORMAT_ID)
88775 values[n++] = primary_event_id(event);
88776@@ -6958,7 +6965,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
88777 event->parent = parent_event;
88778
88779 event->ns = get_pid_ns(task_active_pid_ns(current));
88780- event->id = atomic64_inc_return(&perf_event_id);
88781+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
88782
88783 event->state = PERF_EVENT_STATE_INACTIVE;
88784
88785@@ -7237,6 +7244,11 @@ SYSCALL_DEFINE5(perf_event_open,
88786 if (flags & ~PERF_FLAG_ALL)
88787 return -EINVAL;
88788
88789+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88790+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
88791+ return -EACCES;
88792+#endif
88793+
88794 err = perf_copy_attr(attr_uptr, &attr);
88795 if (err)
88796 return err;
88797@@ -7592,10 +7604,10 @@ static void sync_child_event(struct perf_event *child_event,
88798 /*
88799 * Add back the child's count to the parent's count:
88800 */
88801- atomic64_add(child_val, &parent_event->child_count);
88802- atomic64_add(child_event->total_time_enabled,
88803+ atomic64_add_unchecked(child_val, &parent_event->child_count);
88804+ atomic64_add_unchecked(child_event->total_time_enabled,
88805 &parent_event->child_total_time_enabled);
88806- atomic64_add(child_event->total_time_running,
88807+ atomic64_add_unchecked(child_event->total_time_running,
88808 &parent_event->child_total_time_running);
88809
88810 /*
88811diff --git a/kernel/events/internal.h b/kernel/events/internal.h
88812index 569b2187..19940d9 100644
88813--- a/kernel/events/internal.h
88814+++ b/kernel/events/internal.h
88815@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
88816 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
88817 }
88818
88819-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
88820+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
88821 static inline unsigned long \
88822 func_name(struct perf_output_handle *handle, \
88823- const void *buf, unsigned long len) \
88824+ const void user *buf, unsigned long len) \
88825 { \
88826 unsigned long size, written; \
88827 \
88828@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
88829 return 0;
88830 }
88831
88832-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
88833+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
88834
88835 static inline unsigned long
88836 memcpy_skip(void *dst, const void *src, unsigned long n)
88837@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
88838 return 0;
88839 }
88840
88841-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
88842+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
88843
88844 #ifndef arch_perf_out_copy_user
88845 #define arch_perf_out_copy_user arch_perf_out_copy_user
88846@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
88847 }
88848 #endif
88849
88850-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
88851+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
88852
88853 /* Callchain handling */
88854 extern struct perf_callchain_entry *
88855diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
88856index ed8f2cd..fe8030c 100644
88857--- a/kernel/events/uprobes.c
88858+++ b/kernel/events/uprobes.c
88859@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
88860 {
88861 struct page *page;
88862 uprobe_opcode_t opcode;
88863- int result;
88864+ long result;
88865
88866 pagefault_disable();
88867 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
88868diff --git a/kernel/exit.c b/kernel/exit.c
88869index 2116aac..d95df2a 100644
88870--- a/kernel/exit.c
88871+++ b/kernel/exit.c
88872@@ -174,6 +174,10 @@ void release_task(struct task_struct *p)
88873 struct task_struct *leader;
88874 int zap_leader;
88875 repeat:
88876+#ifdef CONFIG_NET
88877+ gr_del_task_from_ip_table(p);
88878+#endif
88879+
88880 /* don't need to get the RCU readlock here - the process is dead and
88881 * can't be modifying its own credentials. But shut RCU-lockdep up */
88882 rcu_read_lock();
88883@@ -670,6 +674,8 @@ void do_exit(long code)
88884 int group_dead;
88885 TASKS_RCU(int tasks_rcu_i);
88886
88887+ set_fs(USER_DS);
88888+
88889 profile_task_exit(tsk);
88890
88891 WARN_ON(blk_needs_flush_plug(tsk));
88892@@ -686,7 +692,6 @@ void do_exit(long code)
88893 * mm_release()->clear_child_tid() from writing to a user-controlled
88894 * kernel address.
88895 */
88896- set_fs(USER_DS);
88897
88898 ptrace_event(PTRACE_EVENT_EXIT, code);
88899
88900@@ -744,6 +749,9 @@ void do_exit(long code)
88901 tsk->exit_code = code;
88902 taskstats_exit(tsk, group_dead);
88903
88904+ gr_acl_handle_psacct(tsk, code);
88905+ gr_acl_handle_exit();
88906+
88907 exit_mm(tsk);
88908
88909 if (group_dead)
88910@@ -863,7 +871,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
88911 * Take down every thread in the group. This is called by fatal signals
88912 * as well as by sys_exit_group (below).
88913 */
88914-void
88915+__noreturn void
88916 do_group_exit(int exit_code)
88917 {
88918 struct signal_struct *sig = current->signal;
88919diff --git a/kernel/fork.c b/kernel/fork.c
88920index 9b7d746..5b898ab 100644
88921--- a/kernel/fork.c
88922+++ b/kernel/fork.c
88923@@ -183,6 +183,48 @@ void thread_info_cache_init(void)
88924 # endif
88925 #endif
88926
88927+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88928+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88929+ int node, void **lowmem_stack)
88930+{
88931+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
88932+ void *ret = NULL;
88933+ unsigned int i;
88934+
88935+ *lowmem_stack = alloc_thread_info_node(tsk, node);
88936+ if (*lowmem_stack == NULL)
88937+ goto out;
88938+
88939+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
88940+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
88941+
88942+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
88943+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
88944+ if (ret == NULL) {
88945+ free_thread_info(*lowmem_stack);
88946+ *lowmem_stack = NULL;
88947+ }
88948+
88949+out:
88950+ return ret;
88951+}
88952+
88953+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88954+{
88955+ unmap_process_stacks(tsk);
88956+}
88957+#else
88958+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88959+ int node, void **lowmem_stack)
88960+{
88961+ return alloc_thread_info_node(tsk, node);
88962+}
88963+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88964+{
88965+ free_thread_info(ti);
88966+}
88967+#endif
88968+
88969 /* SLAB cache for signal_struct structures (tsk->signal) */
88970 static struct kmem_cache *signal_cachep;
88971
88972@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
88973 /* SLAB cache for mm_struct structures (tsk->mm) */
88974 static struct kmem_cache *mm_cachep;
88975
88976-static void account_kernel_stack(struct thread_info *ti, int account)
88977+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
88978 {
88979+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88980+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
88981+#else
88982 struct zone *zone = page_zone(virt_to_page(ti));
88983+#endif
88984
88985 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
88986 }
88987
88988 void free_task(struct task_struct *tsk)
88989 {
88990- account_kernel_stack(tsk->stack, -1);
88991+ account_kernel_stack(tsk, tsk->stack, -1);
88992 arch_release_thread_info(tsk->stack);
88993- free_thread_info(tsk->stack);
88994+ gr_free_thread_info(tsk, tsk->stack);
88995 rt_mutex_debug_task_free(tsk);
88996 ftrace_graph_exit_task(tsk);
88997 put_seccomp_filter(tsk);
88998@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88999 {
89000 struct task_struct *tsk;
89001 struct thread_info *ti;
89002+ void *lowmem_stack;
89003 int node = tsk_fork_get_node(orig);
89004 int err;
89005
89006@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89007 if (!tsk)
89008 return NULL;
89009
89010- ti = alloc_thread_info_node(tsk, node);
89011+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
89012 if (!ti)
89013 goto free_tsk;
89014
89015@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89016 goto free_ti;
89017
89018 tsk->stack = ti;
89019+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
89020+ tsk->lowmem_stack = lowmem_stack;
89021+#endif
89022 #ifdef CONFIG_SECCOMP
89023 /*
89024 * We must handle setting up seccomp filters once we're under
89025@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89026 set_task_stack_end_magic(tsk);
89027
89028 #ifdef CONFIG_CC_STACKPROTECTOR
89029- tsk->stack_canary = get_random_int();
89030+ tsk->stack_canary = pax_get_random_long();
89031 #endif
89032
89033 /*
89034@@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
89035 tsk->splice_pipe = NULL;
89036 tsk->task_frag.page = NULL;
89037
89038- account_kernel_stack(ti, 1);
89039+ account_kernel_stack(tsk, ti, 1);
89040
89041 return tsk;
89042
89043 free_ti:
89044- free_thread_info(ti);
89045+ gr_free_thread_info(tsk, ti);
89046 free_tsk:
89047 free_task_struct(tsk);
89048 return NULL;
89049 }
89050
89051 #ifdef CONFIG_MMU
89052-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89053+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
89054+{
89055+ struct vm_area_struct *tmp;
89056+ unsigned long charge;
89057+ struct file *file;
89058+ int retval;
89059+
89060+ charge = 0;
89061+ if (mpnt->vm_flags & VM_ACCOUNT) {
89062+ unsigned long len = vma_pages(mpnt);
89063+
89064+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
89065+ goto fail_nomem;
89066+ charge = len;
89067+ }
89068+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
89069+ if (!tmp)
89070+ goto fail_nomem;
89071+ *tmp = *mpnt;
89072+ tmp->vm_mm = mm;
89073+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
89074+ retval = vma_dup_policy(mpnt, tmp);
89075+ if (retval)
89076+ goto fail_nomem_policy;
89077+ if (anon_vma_fork(tmp, mpnt))
89078+ goto fail_nomem_anon_vma_fork;
89079+ tmp->vm_flags &= ~VM_LOCKED;
89080+ tmp->vm_next = tmp->vm_prev = NULL;
89081+ tmp->vm_mirror = NULL;
89082+ file = tmp->vm_file;
89083+ if (file) {
89084+ struct inode *inode = file_inode(file);
89085+ struct address_space *mapping = file->f_mapping;
89086+
89087+ get_file(file);
89088+ if (tmp->vm_flags & VM_DENYWRITE)
89089+ atomic_dec(&inode->i_writecount);
89090+ mutex_lock(&mapping->i_mmap_mutex);
89091+ if (tmp->vm_flags & VM_SHARED)
89092+ atomic_inc(&mapping->i_mmap_writable);
89093+ flush_dcache_mmap_lock(mapping);
89094+ /* insert tmp into the share list, just after mpnt */
89095+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
89096+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
89097+ else
89098+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
89099+ flush_dcache_mmap_unlock(mapping);
89100+ mutex_unlock(&mapping->i_mmap_mutex);
89101+ }
89102+
89103+ /*
89104+ * Clear hugetlb-related page reserves for children. This only
89105+ * affects MAP_PRIVATE mappings. Faults generated by the child
89106+ * are not guaranteed to succeed, even if read-only
89107+ */
89108+ if (is_vm_hugetlb_page(tmp))
89109+ reset_vma_resv_huge_pages(tmp);
89110+
89111+ return tmp;
89112+
89113+fail_nomem_anon_vma_fork:
89114+ mpol_put(vma_policy(tmp));
89115+fail_nomem_policy:
89116+ kmem_cache_free(vm_area_cachep, tmp);
89117+fail_nomem:
89118+ vm_unacct_memory(charge);
89119+ return NULL;
89120+}
89121+
89122+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89123 {
89124 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
89125 struct rb_node **rb_link, *rb_parent;
89126 int retval;
89127- unsigned long charge;
89128
89129 uprobe_start_dup_mmap();
89130 down_write(&oldmm->mmap_sem);
89131@@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89132
89133 prev = NULL;
89134 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
89135- struct file *file;
89136-
89137 if (mpnt->vm_flags & VM_DONTCOPY) {
89138 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
89139 -vma_pages(mpnt));
89140 continue;
89141 }
89142- charge = 0;
89143- if (mpnt->vm_flags & VM_ACCOUNT) {
89144- unsigned long len = vma_pages(mpnt);
89145-
89146- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
89147- goto fail_nomem;
89148- charge = len;
89149- }
89150- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
89151- if (!tmp)
89152- goto fail_nomem;
89153- *tmp = *mpnt;
89154- INIT_LIST_HEAD(&tmp->anon_vma_chain);
89155- retval = vma_dup_policy(mpnt, tmp);
89156- if (retval)
89157- goto fail_nomem_policy;
89158- tmp->vm_mm = mm;
89159- if (anon_vma_fork(tmp, mpnt))
89160- goto fail_nomem_anon_vma_fork;
89161- tmp->vm_flags &= ~VM_LOCKED;
89162- tmp->vm_next = tmp->vm_prev = NULL;
89163- file = tmp->vm_file;
89164- if (file) {
89165- struct inode *inode = file_inode(file);
89166- struct address_space *mapping = file->f_mapping;
89167-
89168- get_file(file);
89169- if (tmp->vm_flags & VM_DENYWRITE)
89170- atomic_dec(&inode->i_writecount);
89171- mutex_lock(&mapping->i_mmap_mutex);
89172- if (tmp->vm_flags & VM_SHARED)
89173- atomic_inc(&mapping->i_mmap_writable);
89174- flush_dcache_mmap_lock(mapping);
89175- /* insert tmp into the share list, just after mpnt */
89176- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
89177- vma_nonlinear_insert(tmp,
89178- &mapping->i_mmap_nonlinear);
89179- else
89180- vma_interval_tree_insert_after(tmp, mpnt,
89181- &mapping->i_mmap);
89182- flush_dcache_mmap_unlock(mapping);
89183- mutex_unlock(&mapping->i_mmap_mutex);
89184+ tmp = dup_vma(mm, oldmm, mpnt);
89185+ if (!tmp) {
89186+ retval = -ENOMEM;
89187+ goto out;
89188 }
89189
89190 /*
89191@@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
89192 if (retval)
89193 goto out;
89194 }
89195+
89196+#ifdef CONFIG_PAX_SEGMEXEC
89197+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
89198+ struct vm_area_struct *mpnt_m;
89199+
89200+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
89201+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
89202+
89203+ if (!mpnt->vm_mirror)
89204+ continue;
89205+
89206+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
89207+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
89208+ mpnt->vm_mirror = mpnt_m;
89209+ } else {
89210+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
89211+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
89212+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
89213+ mpnt->vm_mirror->vm_mirror = mpnt;
89214+ }
89215+ }
89216+ BUG_ON(mpnt_m);
89217+ }
89218+#endif
89219+
89220 /* a new mm has just been created */
89221 arch_dup_mmap(oldmm, mm);
89222 retval = 0;
89223@@ -486,14 +589,6 @@ out:
89224 up_write(&oldmm->mmap_sem);
89225 uprobe_end_dup_mmap();
89226 return retval;
89227-fail_nomem_anon_vma_fork:
89228- mpol_put(vma_policy(tmp));
89229-fail_nomem_policy:
89230- kmem_cache_free(vm_area_cachep, tmp);
89231-fail_nomem:
89232- retval = -ENOMEM;
89233- vm_unacct_memory(charge);
89234- goto out;
89235 }
89236
89237 static inline int mm_alloc_pgd(struct mm_struct *mm)
89238@@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
89239 return ERR_PTR(err);
89240
89241 mm = get_task_mm(task);
89242- if (mm && mm != current->mm &&
89243- !ptrace_may_access(task, mode)) {
89244+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
89245+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
89246 mmput(mm);
89247 mm = ERR_PTR(-EACCES);
89248 }
89249@@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
89250 spin_unlock(&fs->lock);
89251 return -EAGAIN;
89252 }
89253- fs->users++;
89254+ atomic_inc(&fs->users);
89255 spin_unlock(&fs->lock);
89256 return 0;
89257 }
89258 tsk->fs = copy_fs_struct(fs);
89259 if (!tsk->fs)
89260 return -ENOMEM;
89261+ /* Carry through gr_chroot_dentry and is_chrooted instead
89262+ of recomputing it here. Already copied when the task struct
89263+ is duplicated. This allows pivot_root to not be treated as
89264+ a chroot
89265+ */
89266+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
89267+
89268 return 0;
89269 }
89270
89271@@ -1179,7 +1281,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
89272 * parts of the process environment (as per the clone
89273 * flags). The actual kick-off is left to the caller.
89274 */
89275-static struct task_struct *copy_process(unsigned long clone_flags,
89276+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
89277 unsigned long stack_start,
89278 unsigned long stack_size,
89279 int __user *child_tidptr,
89280@@ -1250,6 +1352,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
89281 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
89282 #endif
89283 retval = -EAGAIN;
89284+
89285+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
89286+
89287 if (atomic_read(&p->real_cred->user->processes) >=
89288 task_rlimit(p, RLIMIT_NPROC)) {
89289 if (p->real_cred->user != INIT_USER &&
89290@@ -1499,6 +1604,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
89291 goto bad_fork_free_pid;
89292 }
89293
89294+ /* synchronizes with gr_set_acls()
89295+ we need to call this past the point of no return for fork()
89296+ */
89297+ gr_copy_label(p);
89298+
89299 if (likely(p->pid)) {
89300 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
89301
89302@@ -1589,6 +1699,8 @@ bad_fork_cleanup_count:
89303 bad_fork_free:
89304 free_task(p);
89305 fork_out:
89306+ gr_log_forkfail(retval);
89307+
89308 return ERR_PTR(retval);
89309 }
89310
89311@@ -1650,6 +1762,7 @@ long do_fork(unsigned long clone_flags,
89312
89313 p = copy_process(clone_flags, stack_start, stack_size,
89314 child_tidptr, NULL, trace);
89315+ add_latent_entropy();
89316 /*
89317 * Do this prior waking up the new thread - the thread pointer
89318 * might get invalid after that point, if the thread exits quickly.
89319@@ -1666,6 +1779,8 @@ long do_fork(unsigned long clone_flags,
89320 if (clone_flags & CLONE_PARENT_SETTID)
89321 put_user(nr, parent_tidptr);
89322
89323+ gr_handle_brute_check();
89324+
89325 if (clone_flags & CLONE_VFORK) {
89326 p->vfork_done = &vfork;
89327 init_completion(&vfork);
89328@@ -1784,7 +1899,7 @@ void __init proc_caches_init(void)
89329 mm_cachep = kmem_cache_create("mm_struct",
89330 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
89331 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
89332- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
89333+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
89334 mmap_init();
89335 nsproxy_cache_init();
89336 }
89337@@ -1824,7 +1939,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
89338 return 0;
89339
89340 /* don't need lock here; in the worst case we'll do useless copy */
89341- if (fs->users == 1)
89342+ if (atomic_read(&fs->users) == 1)
89343 return 0;
89344
89345 *new_fsp = copy_fs_struct(fs);
89346@@ -1936,7 +2051,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
89347 fs = current->fs;
89348 spin_lock(&fs->lock);
89349 current->fs = new_fs;
89350- if (--fs->users)
89351+ gr_set_chroot_entries(current, &current->fs->root);
89352+ if (atomic_dec_return(&fs->users))
89353 new_fs = NULL;
89354 else
89355 new_fs = fs;
89356diff --git a/kernel/futex.c b/kernel/futex.c
89357index 63678b5..512f9af 100644
89358--- a/kernel/futex.c
89359+++ b/kernel/futex.c
89360@@ -201,7 +201,7 @@ struct futex_pi_state {
89361 atomic_t refcount;
89362
89363 union futex_key key;
89364-};
89365+} __randomize_layout;
89366
89367 /**
89368 * struct futex_q - The hashed futex queue entry, one per waiting task
89369@@ -235,7 +235,7 @@ struct futex_q {
89370 struct rt_mutex_waiter *rt_waiter;
89371 union futex_key *requeue_pi_key;
89372 u32 bitset;
89373-};
89374+} __randomize_layout;
89375
89376 static const struct futex_q futex_q_init = {
89377 /* list gets initialized in queue_me()*/
89378@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
89379 struct page *page, *page_head;
89380 int err, ro = 0;
89381
89382+#ifdef CONFIG_PAX_SEGMEXEC
89383+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
89384+ return -EFAULT;
89385+#endif
89386+
89387 /*
89388 * The futex address must be "naturally" aligned.
89389 */
89390@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
89391
89392 static int get_futex_value_locked(u32 *dest, u32 __user *from)
89393 {
89394- int ret;
89395+ unsigned long ret;
89396
89397 pagefault_disable();
89398 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
89399@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
89400 {
89401 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
89402 u32 curval;
89403+ mm_segment_t oldfs;
89404
89405 /*
89406 * This will fail and we want it. Some arch implementations do
89407@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
89408 * implementation, the non-functional ones will return
89409 * -ENOSYS.
89410 */
89411+ oldfs = get_fs();
89412+ set_fs(USER_DS);
89413 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
89414 futex_cmpxchg_enabled = 1;
89415+ set_fs(oldfs);
89416 #endif
89417 }
89418
89419diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
89420index 55c8c93..9ba7ad6 100644
89421--- a/kernel/futex_compat.c
89422+++ b/kernel/futex_compat.c
89423@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
89424 return 0;
89425 }
89426
89427-static void __user *futex_uaddr(struct robust_list __user *entry,
89428+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
89429 compat_long_t futex_offset)
89430 {
89431 compat_uptr_t base = ptr_to_compat(entry);
89432diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
89433index b358a80..fc25240 100644
89434--- a/kernel/gcov/base.c
89435+++ b/kernel/gcov/base.c
89436@@ -114,11 +114,6 @@ void gcov_enable_events(void)
89437 }
89438
89439 #ifdef CONFIG_MODULES
89440-static inline int within(void *addr, void *start, unsigned long size)
89441-{
89442- return ((addr >= start) && (addr < start + size));
89443-}
89444-
89445 /* Update list and generate events when modules are unloaded. */
89446 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89447 void *data)
89448@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89449
89450 /* Remove entries located in module from linked list. */
89451 while ((info = gcov_info_next(info))) {
89452- if (within(info, mod->module_core, mod->core_size)) {
89453+ if (within_module_core_rw((unsigned long)info, mod)) {
89454 gcov_info_unlink(prev, info);
89455 if (gcov_events_enabled)
89456 gcov_event(GCOV_REMOVE, info);
89457diff --git a/kernel/jump_label.c b/kernel/jump_label.c
89458index 9019f15..9a3c42e 100644
89459--- a/kernel/jump_label.c
89460+++ b/kernel/jump_label.c
89461@@ -14,6 +14,7 @@
89462 #include <linux/err.h>
89463 #include <linux/static_key.h>
89464 #include <linux/jump_label_ratelimit.h>
89465+#include <linux/mm.h>
89466
89467 #ifdef HAVE_JUMP_LABEL
89468
89469@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
89470
89471 size = (((unsigned long)stop - (unsigned long)start)
89472 / sizeof(struct jump_entry));
89473+ pax_open_kernel();
89474 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
89475+ pax_close_kernel();
89476 }
89477
89478 static void jump_label_update(struct static_key *key, int enable);
89479@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
89480 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
89481 struct jump_entry *iter;
89482
89483+ pax_open_kernel();
89484 for (iter = iter_start; iter < iter_stop; iter++) {
89485 if (within_module_init(iter->code, mod))
89486 iter->code = 0;
89487 }
89488+ pax_close_kernel();
89489 }
89490
89491 static int
89492diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
89493index 5c5987f..bc502b0 100644
89494--- a/kernel/kallsyms.c
89495+++ b/kernel/kallsyms.c
89496@@ -11,6 +11,9 @@
89497 * Changed the compression method from stem compression to "table lookup"
89498 * compression (see scripts/kallsyms.c for a more complete description)
89499 */
89500+#ifdef CONFIG_GRKERNSEC_HIDESYM
89501+#define __INCLUDED_BY_HIDESYM 1
89502+#endif
89503 #include <linux/kallsyms.h>
89504 #include <linux/module.h>
89505 #include <linux/init.h>
89506@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
89507
89508 static inline int is_kernel_inittext(unsigned long addr)
89509 {
89510+ if (system_state != SYSTEM_BOOTING)
89511+ return 0;
89512+
89513 if (addr >= (unsigned long)_sinittext
89514 && addr <= (unsigned long)_einittext)
89515 return 1;
89516 return 0;
89517 }
89518
89519+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89520+#ifdef CONFIG_MODULES
89521+static inline int is_module_text(unsigned long addr)
89522+{
89523+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
89524+ return 1;
89525+
89526+ addr = ktla_ktva(addr);
89527+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
89528+}
89529+#else
89530+static inline int is_module_text(unsigned long addr)
89531+{
89532+ return 0;
89533+}
89534+#endif
89535+#endif
89536+
89537 static inline int is_kernel_text(unsigned long addr)
89538 {
89539 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
89540@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
89541
89542 static inline int is_kernel(unsigned long addr)
89543 {
89544+
89545+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89546+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
89547+ return 1;
89548+
89549+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
89550+#else
89551 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
89552+#endif
89553+
89554 return 1;
89555 return in_gate_area_no_mm(addr);
89556 }
89557
89558 static int is_ksym_addr(unsigned long addr)
89559 {
89560+
89561+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89562+ if (is_module_text(addr))
89563+ return 0;
89564+#endif
89565+
89566 if (all_var)
89567 return is_kernel(addr);
89568
89569@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
89570
89571 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
89572 {
89573- iter->name[0] = '\0';
89574 iter->nameoff = get_symbol_offset(new_pos);
89575 iter->pos = new_pos;
89576 }
89577@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
89578 {
89579 struct kallsym_iter *iter = m->private;
89580
89581+#ifdef CONFIG_GRKERNSEC_HIDESYM
89582+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
89583+ return 0;
89584+#endif
89585+
89586 /* Some debugging symbols have no name. Ignore them. */
89587 if (!iter->name[0])
89588 return 0;
89589@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
89590 */
89591 type = iter->exported ? toupper(iter->type) :
89592 tolower(iter->type);
89593+
89594 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
89595 type, iter->name, iter->module_name);
89596 } else
89597diff --git a/kernel/kcmp.c b/kernel/kcmp.c
89598index 0aa69ea..a7fcafb 100644
89599--- a/kernel/kcmp.c
89600+++ b/kernel/kcmp.c
89601@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
89602 struct task_struct *task1, *task2;
89603 int ret;
89604
89605+#ifdef CONFIG_GRKERNSEC
89606+ return -ENOSYS;
89607+#endif
89608+
89609 rcu_read_lock();
89610
89611 /*
89612diff --git a/kernel/kexec.c b/kernel/kexec.c
89613index 2abf9f6..c40cf85 100644
89614--- a/kernel/kexec.c
89615+++ b/kernel/kexec.c
89616@@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
89617 compat_ulong_t, flags)
89618 {
89619 struct compat_kexec_segment in;
89620- struct kexec_segment out, __user *ksegments;
89621+ struct kexec_segment out;
89622+ struct kexec_segment __user *ksegments;
89623 unsigned long i, result;
89624
89625 /* Don't allow clients that don't understand the native
89626diff --git a/kernel/kmod.c b/kernel/kmod.c
89627index 80f7a6d..3c476d3 100644
89628--- a/kernel/kmod.c
89629+++ b/kernel/kmod.c
89630@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
89631 kfree(info->argv);
89632 }
89633
89634-static int call_modprobe(char *module_name, int wait)
89635+static int call_modprobe(char *module_name, char *module_param, int wait)
89636 {
89637 struct subprocess_info *info;
89638 static char *envp[] = {
89639@@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
89640 NULL
89641 };
89642
89643- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
89644+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
89645 if (!argv)
89646 goto out;
89647
89648@@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
89649 argv[1] = "-q";
89650 argv[2] = "--";
89651 argv[3] = module_name; /* check free_modprobe_argv() */
89652- argv[4] = NULL;
89653+ argv[4] = module_param;
89654+ argv[5] = NULL;
89655
89656 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
89657 NULL, free_modprobe_argv, NULL);
89658@@ -129,9 +130,8 @@ out:
89659 * If module auto-loading support is disabled then this function
89660 * becomes a no-operation.
89661 */
89662-int __request_module(bool wait, const char *fmt, ...)
89663+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
89664 {
89665- va_list args;
89666 char module_name[MODULE_NAME_LEN];
89667 unsigned int max_modprobes;
89668 int ret;
89669@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
89670 if (!modprobe_path[0])
89671 return 0;
89672
89673- va_start(args, fmt);
89674- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
89675- va_end(args);
89676+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
89677 if (ret >= MODULE_NAME_LEN)
89678 return -ENAMETOOLONG;
89679
89680@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
89681 if (ret)
89682 return ret;
89683
89684+#ifdef CONFIG_GRKERNSEC_MODHARDEN
89685+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89686+ /* hack to workaround consolekit/udisks stupidity */
89687+ read_lock(&tasklist_lock);
89688+ if (!strcmp(current->comm, "mount") &&
89689+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
89690+ read_unlock(&tasklist_lock);
89691+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
89692+ return -EPERM;
89693+ }
89694+ read_unlock(&tasklist_lock);
89695+ }
89696+#endif
89697+
89698 /* If modprobe needs a service that is in a module, we get a recursive
89699 * loop. Limit the number of running kmod threads to max_threads/2 or
89700 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
89701@@ -188,16 +200,61 @@ int __request_module(bool wait, const char *fmt, ...)
89702
89703 trace_module_request(module_name, wait, _RET_IP_);
89704
89705- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89706+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89707
89708 atomic_dec(&kmod_concurrent);
89709 return ret;
89710 }
89711+
89712+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
89713+{
89714+ va_list args;
89715+ int ret;
89716+
89717+ va_start(args, fmt);
89718+ ret = ____request_module(wait, module_param, fmt, args);
89719+ va_end(args);
89720+
89721+ return ret;
89722+}
89723+
89724+int __request_module(bool wait, const char *fmt, ...)
89725+{
89726+ va_list args;
89727+ int ret;
89728+
89729+#ifdef CONFIG_GRKERNSEC_MODHARDEN
89730+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89731+ char module_param[MODULE_NAME_LEN];
89732+
89733+ memset(module_param, 0, sizeof(module_param));
89734+
89735+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
89736+
89737+ va_start(args, fmt);
89738+ ret = ____request_module(wait, module_param, fmt, args);
89739+ va_end(args);
89740+
89741+ return ret;
89742+ }
89743+#endif
89744+
89745+ va_start(args, fmt);
89746+ ret = ____request_module(wait, NULL, fmt, args);
89747+ va_end(args);
89748+
89749+ return ret;
89750+}
89751+
89752 EXPORT_SYMBOL(__request_module);
89753 #endif /* CONFIG_MODULES */
89754
89755 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
89756 {
89757+#ifdef CONFIG_GRKERNSEC
89758+ kfree(info->path);
89759+ info->path = info->origpath;
89760+#endif
89761 if (info->cleanup)
89762 (*info->cleanup)(info);
89763 kfree(info);
89764@@ -240,6 +297,20 @@ static int ____call_usermodehelper(void *data)
89765 */
89766 set_user_nice(current, 0);
89767
89768+#ifdef CONFIG_GRKERNSEC
89769+ /* this is race-free as far as userland is concerned as we copied
89770+ out the path to be used prior to this point and are now operating
89771+ on that copy
89772+ */
89773+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
89774+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
89775+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
89776+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
89777+ retval = -EPERM;
89778+ goto out;
89779+ }
89780+#endif
89781+
89782 retval = -ENOMEM;
89783 new = prepare_kernel_cred(current);
89784 if (!new)
89785@@ -262,8 +333,8 @@ static int ____call_usermodehelper(void *data)
89786 commit_creds(new);
89787
89788 retval = do_execve(getname_kernel(sub_info->path),
89789- (const char __user *const __user *)sub_info->argv,
89790- (const char __user *const __user *)sub_info->envp);
89791+ (const char __user *const __force_user *)sub_info->argv,
89792+ (const char __user *const __force_user *)sub_info->envp);
89793 out:
89794 sub_info->retval = retval;
89795 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
89796@@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
89797 *
89798 * Thus the __user pointer cast is valid here.
89799 */
89800- sys_wait4(pid, (int __user *)&ret, 0, NULL);
89801+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
89802
89803 /*
89804 * If ret is 0, either ____call_usermodehelper failed and the
89805@@ -532,7 +603,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
89806 goto out;
89807
89808 INIT_WORK(&sub_info->work, __call_usermodehelper);
89809+#ifdef CONFIG_GRKERNSEC
89810+ sub_info->origpath = path;
89811+ sub_info->path = kstrdup(path, gfp_mask);
89812+#else
89813 sub_info->path = path;
89814+#endif
89815 sub_info->argv = argv;
89816 sub_info->envp = envp;
89817
89818@@ -645,7 +721,7 @@ EXPORT_SYMBOL(call_usermodehelper);
89819 static int proc_cap_handler(struct ctl_table *table, int write,
89820 void __user *buffer, size_t *lenp, loff_t *ppos)
89821 {
89822- struct ctl_table t;
89823+ ctl_table_no_const t;
89824 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
89825 kernel_cap_t new_cap;
89826 int err, i;
89827diff --git a/kernel/kprobes.c b/kernel/kprobes.c
89828index 3995f54..e247879 100644
89829--- a/kernel/kprobes.c
89830+++ b/kernel/kprobes.c
89831@@ -31,6 +31,9 @@
89832 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
89833 * <prasanna@in.ibm.com> added function-return probes.
89834 */
89835+#ifdef CONFIG_GRKERNSEC_HIDESYM
89836+#define __INCLUDED_BY_HIDESYM 1
89837+#endif
89838 #include <linux/kprobes.h>
89839 #include <linux/hash.h>
89840 #include <linux/init.h>
89841@@ -122,12 +125,12 @@ enum kprobe_slot_state {
89842
89843 static void *alloc_insn_page(void)
89844 {
89845- return module_alloc(PAGE_SIZE);
89846+ return module_alloc_exec(PAGE_SIZE);
89847 }
89848
89849 static void free_insn_page(void *page)
89850 {
89851- module_free(NULL, page);
89852+ module_free_exec(NULL, page);
89853 }
89854
89855 struct kprobe_insn_cache kprobe_insn_slots = {
89856@@ -2187,11 +2190,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
89857 kprobe_type = "k";
89858
89859 if (sym)
89860- seq_printf(pi, "%p %s %s+0x%x %s ",
89861+ seq_printf(pi, "%pK %s %s+0x%x %s ",
89862 p->addr, kprobe_type, sym, offset,
89863 (modname ? modname : " "));
89864 else
89865- seq_printf(pi, "%p %s %p ",
89866+ seq_printf(pi, "%pK %s %pK ",
89867 p->addr, kprobe_type, p->addr);
89868
89869 if (!pp)
89870diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
89871index 6683cce..daf8999 100644
89872--- a/kernel/ksysfs.c
89873+++ b/kernel/ksysfs.c
89874@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
89875 {
89876 if (count+1 > UEVENT_HELPER_PATH_LEN)
89877 return -ENOENT;
89878+ if (!capable(CAP_SYS_ADMIN))
89879+ return -EPERM;
89880 memcpy(uevent_helper, buf, count);
89881 uevent_helper[count] = '\0';
89882 if (count && uevent_helper[count-1] == '\n')
89883@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
89884 return count;
89885 }
89886
89887-static struct bin_attribute notes_attr = {
89888+static bin_attribute_no_const notes_attr __read_only = {
89889 .attr = {
89890 .name = "notes",
89891 .mode = S_IRUGO,
89892diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
89893index 88d0d44..e9ce0ee 100644
89894--- a/kernel/locking/lockdep.c
89895+++ b/kernel/locking/lockdep.c
89896@@ -599,6 +599,10 @@ static int static_obj(void *obj)
89897 end = (unsigned long) &_end,
89898 addr = (unsigned long) obj;
89899
89900+#ifdef CONFIG_PAX_KERNEXEC
89901+ start = ktla_ktva(start);
89902+#endif
89903+
89904 /*
89905 * static variable?
89906 */
89907@@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
89908 if (!static_obj(lock->key)) {
89909 debug_locks_off();
89910 printk("INFO: trying to register non-static key.\n");
89911+ printk("lock:%pS key:%pS.\n", lock, lock->key);
89912 printk("the code is fine but needs lockdep annotation.\n");
89913 printk("turning off the locking correctness validator.\n");
89914 dump_stack();
89915@@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
89916 if (!class)
89917 return 0;
89918 }
89919- atomic_inc((atomic_t *)&class->ops);
89920+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
89921 if (very_verbose(class)) {
89922 printk("\nacquire class [%p] %s", class->key, class->name);
89923 if (class->name_version > 1)
89924diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
89925index ef43ac4..2720dfa 100644
89926--- a/kernel/locking/lockdep_proc.c
89927+++ b/kernel/locking/lockdep_proc.c
89928@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
89929 return 0;
89930 }
89931
89932- seq_printf(m, "%p", class->key);
89933+ seq_printf(m, "%pK", class->key);
89934 #ifdef CONFIG_DEBUG_LOCKDEP
89935 seq_printf(m, " OPS:%8ld", class->ops);
89936 #endif
89937@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
89938
89939 list_for_each_entry(entry, &class->locks_after, entry) {
89940 if (entry->distance == 1) {
89941- seq_printf(m, " -> [%p] ", entry->class->key);
89942+ seq_printf(m, " -> [%pK] ", entry->class->key);
89943 print_name(m, entry->class);
89944 seq_puts(m, "\n");
89945 }
89946@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
89947 if (!class->key)
89948 continue;
89949
89950- seq_printf(m, "[%p] ", class->key);
89951+ seq_printf(m, "[%pK] ", class->key);
89952 print_name(m, class);
89953 seq_puts(m, "\n");
89954 }
89955@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89956 if (!i)
89957 seq_line(m, '-', 40-namelen, namelen);
89958
89959- snprintf(ip, sizeof(ip), "[<%p>]",
89960+ snprintf(ip, sizeof(ip), "[<%pK>]",
89961 (void *)class->contention_point[i]);
89962 seq_printf(m, "%40s %14lu %29s %pS\n",
89963 name, stats->contention_point[i],
89964@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89965 if (!i)
89966 seq_line(m, '-', 40-namelen, namelen);
89967
89968- snprintf(ip, sizeof(ip), "[<%p>]",
89969+ snprintf(ip, sizeof(ip), "[<%pK>]",
89970 (void *)class->contending_point[i]);
89971 seq_printf(m, "%40s %14lu %29s %pS\n",
89972 name, stats->contending_point[i],
89973diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
89974index 9887a90..0cd2b1d 100644
89975--- a/kernel/locking/mcs_spinlock.c
89976+++ b/kernel/locking/mcs_spinlock.c
89977@@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
89978
89979 prev = decode_cpu(old);
89980 node->prev = prev;
89981- ACCESS_ONCE(prev->next) = node;
89982+ ACCESS_ONCE_RW(prev->next) = node;
89983
89984 /*
89985 * Normally @prev is untouchable after the above store; because at that
89986@@ -172,8 +172,8 @@ unqueue:
89987 * it will wait in Step-A.
89988 */
89989
89990- ACCESS_ONCE(next->prev) = prev;
89991- ACCESS_ONCE(prev->next) = next;
89992+ ACCESS_ONCE_RW(next->prev) = prev;
89993+ ACCESS_ONCE_RW(prev->next) = next;
89994
89995 return false;
89996 }
89997@@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
89998 node = this_cpu_ptr(&osq_node);
89999 next = xchg(&node->next, NULL);
90000 if (next) {
90001- ACCESS_ONCE(next->locked) = 1;
90002+ ACCESS_ONCE_RW(next->locked) = 1;
90003 return;
90004 }
90005
90006 next = osq_wait_next(lock, node, NULL);
90007 if (next)
90008- ACCESS_ONCE(next->locked) = 1;
90009+ ACCESS_ONCE_RW(next->locked) = 1;
90010 }
90011
90012 #endif
90013diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
90014index 4d60986..5d351c1 100644
90015--- a/kernel/locking/mcs_spinlock.h
90016+++ b/kernel/locking/mcs_spinlock.h
90017@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
90018 */
90019 return;
90020 }
90021- ACCESS_ONCE(prev->next) = node;
90022+ ACCESS_ONCE_RW(prev->next) = node;
90023
90024 /* Wait until the lock holder passes the lock down. */
90025 arch_mcs_spin_lock_contended(&node->locked);
90026diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
90027index 5cf6731..ce3bc5a 100644
90028--- a/kernel/locking/mutex-debug.c
90029+++ b/kernel/locking/mutex-debug.c
90030@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
90031 }
90032
90033 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90034- struct thread_info *ti)
90035+ struct task_struct *task)
90036 {
90037 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
90038
90039 /* Mark the current thread as blocked on the lock: */
90040- ti->task->blocked_on = waiter;
90041+ task->blocked_on = waiter;
90042 }
90043
90044 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90045- struct thread_info *ti)
90046+ struct task_struct *task)
90047 {
90048 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
90049- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
90050- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
90051- ti->task->blocked_on = NULL;
90052+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
90053+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
90054+ task->blocked_on = NULL;
90055
90056 list_del_init(&waiter->list);
90057 waiter->task = NULL;
90058diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
90059index 0799fd3..d06ae3b 100644
90060--- a/kernel/locking/mutex-debug.h
90061+++ b/kernel/locking/mutex-debug.h
90062@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
90063 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
90064 extern void debug_mutex_add_waiter(struct mutex *lock,
90065 struct mutex_waiter *waiter,
90066- struct thread_info *ti);
90067+ struct task_struct *task);
90068 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
90069- struct thread_info *ti);
90070+ struct task_struct *task);
90071 extern void debug_mutex_unlock(struct mutex *lock);
90072 extern void debug_mutex_init(struct mutex *lock, const char *name,
90073 struct lock_class_key *key);
90074diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
90075index dadbf88..4500507 100644
90076--- a/kernel/locking/mutex.c
90077+++ b/kernel/locking/mutex.c
90078@@ -518,7 +518,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
90079 goto skip_wait;
90080
90081 debug_mutex_lock_common(lock, &waiter);
90082- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
90083+ debug_mutex_add_waiter(lock, &waiter, task);
90084
90085 /* add waiting tasks to the end of the waitqueue (FIFO): */
90086 list_add_tail(&waiter.list, &lock->wait_list);
90087@@ -563,7 +563,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
90088 schedule_preempt_disabled();
90089 spin_lock_mutex(&lock->wait_lock, flags);
90090 }
90091- mutex_remove_waiter(lock, &waiter, current_thread_info());
90092+ mutex_remove_waiter(lock, &waiter, task);
90093 /* set it to 0 if there are no waiters left: */
90094 if (likely(list_empty(&lock->wait_list)))
90095 atomic_set(&lock->count, 0);
90096@@ -600,7 +600,7 @@ skip_wait:
90097 return 0;
90098
90099 err:
90100- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
90101+ mutex_remove_waiter(lock, &waiter, task);
90102 spin_unlock_mutex(&lock->wait_lock, flags);
90103 debug_mutex_free_waiter(&waiter);
90104 mutex_release(&lock->dep_map, 1, ip);
90105diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
90106index 1d96dd0..994ff19 100644
90107--- a/kernel/locking/rtmutex-tester.c
90108+++ b/kernel/locking/rtmutex-tester.c
90109@@ -22,7 +22,7 @@
90110 #define MAX_RT_TEST_MUTEXES 8
90111
90112 static spinlock_t rttest_lock;
90113-static atomic_t rttest_event;
90114+static atomic_unchecked_t rttest_event;
90115
90116 struct test_thread_data {
90117 int opcode;
90118@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90119
90120 case RTTEST_LOCKCONT:
90121 td->mutexes[td->opdata] = 1;
90122- td->event = atomic_add_return(1, &rttest_event);
90123+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90124 return 0;
90125
90126 case RTTEST_RESET:
90127@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90128 return 0;
90129
90130 case RTTEST_RESETEVENT:
90131- atomic_set(&rttest_event, 0);
90132+ atomic_set_unchecked(&rttest_event, 0);
90133 return 0;
90134
90135 default:
90136@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90137 return ret;
90138
90139 td->mutexes[id] = 1;
90140- td->event = atomic_add_return(1, &rttest_event);
90141+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90142 rt_mutex_lock(&mutexes[id]);
90143- td->event = atomic_add_return(1, &rttest_event);
90144+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90145 td->mutexes[id] = 4;
90146 return 0;
90147
90148@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90149 return ret;
90150
90151 td->mutexes[id] = 1;
90152- td->event = atomic_add_return(1, &rttest_event);
90153+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90154 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
90155- td->event = atomic_add_return(1, &rttest_event);
90156+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90157 td->mutexes[id] = ret ? 0 : 4;
90158 return ret ? -EINTR : 0;
90159
90160@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
90161 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
90162 return ret;
90163
90164- td->event = atomic_add_return(1, &rttest_event);
90165+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90166 rt_mutex_unlock(&mutexes[id]);
90167- td->event = atomic_add_return(1, &rttest_event);
90168+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90169 td->mutexes[id] = 0;
90170 return 0;
90171
90172@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90173 break;
90174
90175 td->mutexes[dat] = 2;
90176- td->event = atomic_add_return(1, &rttest_event);
90177+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90178 break;
90179
90180 default:
90181@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90182 return;
90183
90184 td->mutexes[dat] = 3;
90185- td->event = atomic_add_return(1, &rttest_event);
90186+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90187 break;
90188
90189 case RTTEST_LOCKNOWAIT:
90190@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
90191 return;
90192
90193 td->mutexes[dat] = 1;
90194- td->event = atomic_add_return(1, &rttest_event);
90195+ td->event = atomic_add_return_unchecked(1, &rttest_event);
90196 return;
90197
90198 default:
90199diff --git a/kernel/module.c b/kernel/module.c
90200index 88cec1d..d097c28 100644
90201--- a/kernel/module.c
90202+++ b/kernel/module.c
90203@@ -60,6 +60,7 @@
90204 #include <linux/jump_label.h>
90205 #include <linux/pfn.h>
90206 #include <linux/bsearch.h>
90207+#include <linux/grsecurity.h>
90208 #include <uapi/linux/module.h>
90209 #include "module-internal.h"
90210
90211@@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
90212
90213 /* Bounds of module allocation, for speeding __module_address.
90214 * Protected by module_mutex. */
90215-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
90216+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
90217+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
90218
90219 int register_module_notifier(struct notifier_block * nb)
90220 {
90221@@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
90222 return true;
90223
90224 list_for_each_entry_rcu(mod, &modules, list) {
90225- struct symsearch arr[] = {
90226+ struct symsearch modarr[] = {
90227 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
90228 NOT_GPL_ONLY, false },
90229 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
90230@@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
90231 if (mod->state == MODULE_STATE_UNFORMED)
90232 continue;
90233
90234- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
90235+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
90236 return true;
90237 }
90238 return false;
90239@@ -488,7 +490,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
90240 if (!pcpusec->sh_size)
90241 return 0;
90242
90243- if (align > PAGE_SIZE) {
90244+ if (align-1 >= PAGE_SIZE) {
90245 pr_warn("%s: per-cpu alignment %li > %li\n",
90246 mod->name, align, PAGE_SIZE);
90247 align = PAGE_SIZE;
90248@@ -1060,7 +1062,7 @@ struct module_attribute module_uevent =
90249 static ssize_t show_coresize(struct module_attribute *mattr,
90250 struct module_kobject *mk, char *buffer)
90251 {
90252- return sprintf(buffer, "%u\n", mk->mod->core_size);
90253+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
90254 }
90255
90256 static struct module_attribute modinfo_coresize =
90257@@ -1069,7 +1071,7 @@ static struct module_attribute modinfo_coresize =
90258 static ssize_t show_initsize(struct module_attribute *mattr,
90259 struct module_kobject *mk, char *buffer)
90260 {
90261- return sprintf(buffer, "%u\n", mk->mod->init_size);
90262+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
90263 }
90264
90265 static struct module_attribute modinfo_initsize =
90266@@ -1161,12 +1163,29 @@ static int check_version(Elf_Shdr *sechdrs,
90267 goto bad_version;
90268 }
90269
90270+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90271+ /*
90272+ * avoid potentially printing jibberish on attempted load
90273+ * of a module randomized with a different seed
90274+ */
90275+ pr_warn("no symbol version for %s\n", symname);
90276+#else
90277 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
90278+#endif
90279 return 0;
90280
90281 bad_version:
90282+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90283+ /*
90284+ * avoid potentially printing jibberish on attempted load
90285+ * of a module randomized with a different seed
90286+ */
90287+ printk("attempted module disagrees about version of symbol %s\n",
90288+ symname);
90289+#else
90290 printk("%s: disagrees about version of symbol %s\n",
90291 mod->name, symname);
90292+#endif
90293 return 0;
90294 }
90295
90296@@ -1282,7 +1301,7 @@ resolve_symbol_wait(struct module *mod,
90297 */
90298 #ifdef CONFIG_SYSFS
90299
90300-#ifdef CONFIG_KALLSYMS
90301+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
90302 static inline bool sect_empty(const Elf_Shdr *sect)
90303 {
90304 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
90305@@ -1422,7 +1441,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
90306 {
90307 unsigned int notes, loaded, i;
90308 struct module_notes_attrs *notes_attrs;
90309- struct bin_attribute *nattr;
90310+ bin_attribute_no_const *nattr;
90311
90312 /* failed to create section attributes, so can't create notes */
90313 if (!mod->sect_attrs)
90314@@ -1534,7 +1553,7 @@ static void del_usage_links(struct module *mod)
90315 static int module_add_modinfo_attrs(struct module *mod)
90316 {
90317 struct module_attribute *attr;
90318- struct module_attribute *temp_attr;
90319+ module_attribute_no_const *temp_attr;
90320 int error = 0;
90321 int i;
90322
90323@@ -1755,21 +1774,21 @@ static void set_section_ro_nx(void *base,
90324
90325 static void unset_module_core_ro_nx(struct module *mod)
90326 {
90327- set_page_attributes(mod->module_core + mod->core_text_size,
90328- mod->module_core + mod->core_size,
90329+ set_page_attributes(mod->module_core_rw,
90330+ mod->module_core_rw + mod->core_size_rw,
90331 set_memory_x);
90332- set_page_attributes(mod->module_core,
90333- mod->module_core + mod->core_ro_size,
90334+ set_page_attributes(mod->module_core_rx,
90335+ mod->module_core_rx + mod->core_size_rx,
90336 set_memory_rw);
90337 }
90338
90339 static void unset_module_init_ro_nx(struct module *mod)
90340 {
90341- set_page_attributes(mod->module_init + mod->init_text_size,
90342- mod->module_init + mod->init_size,
90343+ set_page_attributes(mod->module_init_rw,
90344+ mod->module_init_rw + mod->init_size_rw,
90345 set_memory_x);
90346- set_page_attributes(mod->module_init,
90347- mod->module_init + mod->init_ro_size,
90348+ set_page_attributes(mod->module_init_rx,
90349+ mod->module_init_rx + mod->init_size_rx,
90350 set_memory_rw);
90351 }
90352
90353@@ -1782,14 +1801,14 @@ void set_all_modules_text_rw(void)
90354 list_for_each_entry_rcu(mod, &modules, list) {
90355 if (mod->state == MODULE_STATE_UNFORMED)
90356 continue;
90357- if ((mod->module_core) && (mod->core_text_size)) {
90358- set_page_attributes(mod->module_core,
90359- mod->module_core + mod->core_text_size,
90360+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
90361+ set_page_attributes(mod->module_core_rx,
90362+ mod->module_core_rx + mod->core_size_rx,
90363 set_memory_rw);
90364 }
90365- if ((mod->module_init) && (mod->init_text_size)) {
90366- set_page_attributes(mod->module_init,
90367- mod->module_init + mod->init_text_size,
90368+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
90369+ set_page_attributes(mod->module_init_rx,
90370+ mod->module_init_rx + mod->init_size_rx,
90371 set_memory_rw);
90372 }
90373 }
90374@@ -1805,14 +1824,14 @@ void set_all_modules_text_ro(void)
90375 list_for_each_entry_rcu(mod, &modules, list) {
90376 if (mod->state == MODULE_STATE_UNFORMED)
90377 continue;
90378- if ((mod->module_core) && (mod->core_text_size)) {
90379- set_page_attributes(mod->module_core,
90380- mod->module_core + mod->core_text_size,
90381+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
90382+ set_page_attributes(mod->module_core_rx,
90383+ mod->module_core_rx + mod->core_size_rx,
90384 set_memory_ro);
90385 }
90386- if ((mod->module_init) && (mod->init_text_size)) {
90387- set_page_attributes(mod->module_init,
90388- mod->module_init + mod->init_text_size,
90389+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
90390+ set_page_attributes(mod->module_init_rx,
90391+ mod->module_init_rx + mod->init_size_rx,
90392 set_memory_ro);
90393 }
90394 }
90395@@ -1865,16 +1884,19 @@ static void free_module(struct module *mod)
90396
90397 /* This may be NULL, but that's OK */
90398 unset_module_init_ro_nx(mod);
90399- module_free(mod, mod->module_init);
90400+ module_free(mod, mod->module_init_rw);
90401+ module_free_exec(mod, mod->module_init_rx);
90402 kfree(mod->args);
90403 percpu_modfree(mod);
90404
90405 /* Free lock-classes: */
90406- lockdep_free_key_range(mod->module_core, mod->core_size);
90407+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
90408+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
90409
90410 /* Finally, free the core (containing the module structure) */
90411 unset_module_core_ro_nx(mod);
90412- module_free(mod, mod->module_core);
90413+ module_free_exec(mod, mod->module_core_rx);
90414+ module_free(mod, mod->module_core_rw);
90415
90416 #ifdef CONFIG_MPU
90417 update_protections(current->mm);
90418@@ -1943,9 +1965,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90419 int ret = 0;
90420 const struct kernel_symbol *ksym;
90421
90422+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90423+ int is_fs_load = 0;
90424+ int register_filesystem_found = 0;
90425+ char *p;
90426+
90427+ p = strstr(mod->args, "grsec_modharden_fs");
90428+ if (p) {
90429+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
90430+ /* copy \0 as well */
90431+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
90432+ is_fs_load = 1;
90433+ }
90434+#endif
90435+
90436 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
90437 const char *name = info->strtab + sym[i].st_name;
90438
90439+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90440+ /* it's a real shame this will never get ripped and copied
90441+ upstream! ;(
90442+ */
90443+ if (is_fs_load && !strcmp(name, "register_filesystem"))
90444+ register_filesystem_found = 1;
90445+#endif
90446+
90447 switch (sym[i].st_shndx) {
90448 case SHN_COMMON:
90449 /* Ignore common symbols */
90450@@ -1970,7 +2014,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90451 ksym = resolve_symbol_wait(mod, info, name);
90452 /* Ok if resolved. */
90453 if (ksym && !IS_ERR(ksym)) {
90454+ pax_open_kernel();
90455 sym[i].st_value = ksym->value;
90456+ pax_close_kernel();
90457 break;
90458 }
90459
90460@@ -1989,11 +2035,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90461 secbase = (unsigned long)mod_percpu(mod);
90462 else
90463 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
90464+ pax_open_kernel();
90465 sym[i].st_value += secbase;
90466+ pax_close_kernel();
90467 break;
90468 }
90469 }
90470
90471+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90472+ if (is_fs_load && !register_filesystem_found) {
90473+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
90474+ ret = -EPERM;
90475+ }
90476+#endif
90477+
90478 return ret;
90479 }
90480
90481@@ -2077,22 +2132,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
90482 || s->sh_entsize != ~0UL
90483 || strstarts(sname, ".init"))
90484 continue;
90485- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
90486+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90487+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
90488+ else
90489+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
90490 pr_debug("\t%s\n", sname);
90491 }
90492- switch (m) {
90493- case 0: /* executable */
90494- mod->core_size = debug_align(mod->core_size);
90495- mod->core_text_size = mod->core_size;
90496- break;
90497- case 1: /* RO: text and ro-data */
90498- mod->core_size = debug_align(mod->core_size);
90499- mod->core_ro_size = mod->core_size;
90500- break;
90501- case 3: /* whole core */
90502- mod->core_size = debug_align(mod->core_size);
90503- break;
90504- }
90505 }
90506
90507 pr_debug("Init section allocation order:\n");
90508@@ -2106,23 +2151,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
90509 || s->sh_entsize != ~0UL
90510 || !strstarts(sname, ".init"))
90511 continue;
90512- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
90513- | INIT_OFFSET_MASK);
90514+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90515+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
90516+ else
90517+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
90518+ s->sh_entsize |= INIT_OFFSET_MASK;
90519 pr_debug("\t%s\n", sname);
90520 }
90521- switch (m) {
90522- case 0: /* executable */
90523- mod->init_size = debug_align(mod->init_size);
90524- mod->init_text_size = mod->init_size;
90525- break;
90526- case 1: /* RO: text and ro-data */
90527- mod->init_size = debug_align(mod->init_size);
90528- mod->init_ro_size = mod->init_size;
90529- break;
90530- case 3: /* whole init */
90531- mod->init_size = debug_align(mod->init_size);
90532- break;
90533- }
90534 }
90535 }
90536
90537@@ -2295,7 +2330,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90538
90539 /* Put symbol section at end of init part of module. */
90540 symsect->sh_flags |= SHF_ALLOC;
90541- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
90542+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
90543 info->index.sym) | INIT_OFFSET_MASK;
90544 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
90545
90546@@ -2312,13 +2347,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90547 }
90548
90549 /* Append room for core symbols at end of core part. */
90550- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
90551- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
90552- mod->core_size += strtab_size;
90553+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
90554+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
90555+ mod->core_size_rx += strtab_size;
90556
90557 /* Put string table section at end of init part of module. */
90558 strsect->sh_flags |= SHF_ALLOC;
90559- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
90560+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
90561 info->index.str) | INIT_OFFSET_MASK;
90562 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
90563 }
90564@@ -2336,12 +2371,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90565 /* Make sure we get permanent strtab: don't use info->strtab. */
90566 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
90567
90568+ pax_open_kernel();
90569+
90570 /* Set types up while we still have access to sections. */
90571 for (i = 0; i < mod->num_symtab; i++)
90572 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
90573
90574- mod->core_symtab = dst = mod->module_core + info->symoffs;
90575- mod->core_strtab = s = mod->module_core + info->stroffs;
90576+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
90577+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
90578 src = mod->symtab;
90579 for (ndst = i = 0; i < mod->num_symtab; i++) {
90580 if (i == 0 ||
90581@@ -2353,6 +2390,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90582 }
90583 }
90584 mod->core_num_syms = ndst;
90585+
90586+ pax_close_kernel();
90587 }
90588 #else
90589 static inline void layout_symtab(struct module *mod, struct load_info *info)
90590@@ -2386,17 +2425,33 @@ void * __weak module_alloc(unsigned long size)
90591 return vmalloc_exec(size);
90592 }
90593
90594-static void *module_alloc_update_bounds(unsigned long size)
90595+static void *module_alloc_update_bounds_rw(unsigned long size)
90596 {
90597 void *ret = module_alloc(size);
90598
90599 if (ret) {
90600 mutex_lock(&module_mutex);
90601 /* Update module bounds. */
90602- if ((unsigned long)ret < module_addr_min)
90603- module_addr_min = (unsigned long)ret;
90604- if ((unsigned long)ret + size > module_addr_max)
90605- module_addr_max = (unsigned long)ret + size;
90606+ if ((unsigned long)ret < module_addr_min_rw)
90607+ module_addr_min_rw = (unsigned long)ret;
90608+ if ((unsigned long)ret + size > module_addr_max_rw)
90609+ module_addr_max_rw = (unsigned long)ret + size;
90610+ mutex_unlock(&module_mutex);
90611+ }
90612+ return ret;
90613+}
90614+
90615+static void *module_alloc_update_bounds_rx(unsigned long size)
90616+{
90617+ void *ret = module_alloc_exec(size);
90618+
90619+ if (ret) {
90620+ mutex_lock(&module_mutex);
90621+ /* Update module bounds. */
90622+ if ((unsigned long)ret < module_addr_min_rx)
90623+ module_addr_min_rx = (unsigned long)ret;
90624+ if ((unsigned long)ret + size > module_addr_max_rx)
90625+ module_addr_max_rx = (unsigned long)ret + size;
90626 mutex_unlock(&module_mutex);
90627 }
90628 return ret;
90629@@ -2650,7 +2705,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90630 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
90631
90632 if (info->index.sym == 0) {
90633+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90634+ /*
90635+ * avoid potentially printing jibberish on attempted load
90636+ * of a module randomized with a different seed
90637+ */
90638+ pr_warn("module has no symbols (stripped?)\n");
90639+#else
90640 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
90641+#endif
90642 return ERR_PTR(-ENOEXEC);
90643 }
90644
90645@@ -2666,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90646 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90647 {
90648 const char *modmagic = get_modinfo(info, "vermagic");
90649+ const char *license = get_modinfo(info, "license");
90650 int err;
90651
90652+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
90653+ if (!license || !license_is_gpl_compatible(license))
90654+ return -ENOEXEC;
90655+#endif
90656+
90657 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
90658 modmagic = NULL;
90659
90660@@ -2692,7 +2761,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90661 }
90662
90663 /* Set up license info based on the info section */
90664- set_license(mod, get_modinfo(info, "license"));
90665+ set_license(mod, license);
90666
90667 return 0;
90668 }
90669@@ -2786,7 +2855,7 @@ static int move_module(struct module *mod, struct load_info *info)
90670 void *ptr;
90671
90672 /* Do the allocs. */
90673- ptr = module_alloc_update_bounds(mod->core_size);
90674+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
90675 /*
90676 * The pointer to this block is stored in the module structure
90677 * which is inside the block. Just mark it as not being a
90678@@ -2796,11 +2865,11 @@ static int move_module(struct module *mod, struct load_info *info)
90679 if (!ptr)
90680 return -ENOMEM;
90681
90682- memset(ptr, 0, mod->core_size);
90683- mod->module_core = ptr;
90684+ memset(ptr, 0, mod->core_size_rw);
90685+ mod->module_core_rw = ptr;
90686
90687- if (mod->init_size) {
90688- ptr = module_alloc_update_bounds(mod->init_size);
90689+ if (mod->init_size_rw) {
90690+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
90691 /*
90692 * The pointer to this block is stored in the module structure
90693 * which is inside the block. This block doesn't need to be
90694@@ -2809,13 +2878,45 @@ static int move_module(struct module *mod, struct load_info *info)
90695 */
90696 kmemleak_ignore(ptr);
90697 if (!ptr) {
90698- module_free(mod, mod->module_core);
90699+ module_free(mod, mod->module_core_rw);
90700 return -ENOMEM;
90701 }
90702- memset(ptr, 0, mod->init_size);
90703- mod->module_init = ptr;
90704+ memset(ptr, 0, mod->init_size_rw);
90705+ mod->module_init_rw = ptr;
90706 } else
90707- mod->module_init = NULL;
90708+ mod->module_init_rw = NULL;
90709+
90710+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
90711+ kmemleak_not_leak(ptr);
90712+ if (!ptr) {
90713+ if (mod->module_init_rw)
90714+ module_free(mod, mod->module_init_rw);
90715+ module_free(mod, mod->module_core_rw);
90716+ return -ENOMEM;
90717+ }
90718+
90719+ pax_open_kernel();
90720+ memset(ptr, 0, mod->core_size_rx);
90721+ pax_close_kernel();
90722+ mod->module_core_rx = ptr;
90723+
90724+ if (mod->init_size_rx) {
90725+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
90726+ kmemleak_ignore(ptr);
90727+ if (!ptr && mod->init_size_rx) {
90728+ module_free_exec(mod, mod->module_core_rx);
90729+ if (mod->module_init_rw)
90730+ module_free(mod, mod->module_init_rw);
90731+ module_free(mod, mod->module_core_rw);
90732+ return -ENOMEM;
90733+ }
90734+
90735+ pax_open_kernel();
90736+ memset(ptr, 0, mod->init_size_rx);
90737+ pax_close_kernel();
90738+ mod->module_init_rx = ptr;
90739+ } else
90740+ mod->module_init_rx = NULL;
90741
90742 /* Transfer each section which specifies SHF_ALLOC */
90743 pr_debug("final section addresses:\n");
90744@@ -2826,16 +2927,45 @@ static int move_module(struct module *mod, struct load_info *info)
90745 if (!(shdr->sh_flags & SHF_ALLOC))
90746 continue;
90747
90748- if (shdr->sh_entsize & INIT_OFFSET_MASK)
90749- dest = mod->module_init
90750- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90751- else
90752- dest = mod->module_core + shdr->sh_entsize;
90753+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
90754+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90755+ dest = mod->module_init_rw
90756+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90757+ else
90758+ dest = mod->module_init_rx
90759+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90760+ } else {
90761+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90762+ dest = mod->module_core_rw + shdr->sh_entsize;
90763+ else
90764+ dest = mod->module_core_rx + shdr->sh_entsize;
90765+ }
90766+
90767+ if (shdr->sh_type != SHT_NOBITS) {
90768+
90769+#ifdef CONFIG_PAX_KERNEXEC
90770+#ifdef CONFIG_X86_64
90771+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
90772+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
90773+#endif
90774+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
90775+ pax_open_kernel();
90776+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90777+ pax_close_kernel();
90778+ } else
90779+#endif
90780
90781- if (shdr->sh_type != SHT_NOBITS)
90782 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90783+ }
90784 /* Update sh_addr to point to copy in image. */
90785- shdr->sh_addr = (unsigned long)dest;
90786+
90787+#ifdef CONFIG_PAX_KERNEXEC
90788+ if (shdr->sh_flags & SHF_EXECINSTR)
90789+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
90790+ else
90791+#endif
90792+
90793+ shdr->sh_addr = (unsigned long)dest;
90794 pr_debug("\t0x%lx %s\n",
90795 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
90796 }
90797@@ -2892,12 +3022,12 @@ static void flush_module_icache(const struct module *mod)
90798 * Do it before processing of module parameters, so the module
90799 * can provide parameter accessor functions of its own.
90800 */
90801- if (mod->module_init)
90802- flush_icache_range((unsigned long)mod->module_init,
90803- (unsigned long)mod->module_init
90804- + mod->init_size);
90805- flush_icache_range((unsigned long)mod->module_core,
90806- (unsigned long)mod->module_core + mod->core_size);
90807+ if (mod->module_init_rx)
90808+ flush_icache_range((unsigned long)mod->module_init_rx,
90809+ (unsigned long)mod->module_init_rx
90810+ + mod->init_size_rx);
90811+ flush_icache_range((unsigned long)mod->module_core_rx,
90812+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
90813
90814 set_fs(old_fs);
90815 }
90816@@ -2954,8 +3084,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
90817 static void module_deallocate(struct module *mod, struct load_info *info)
90818 {
90819 percpu_modfree(mod);
90820- module_free(mod, mod->module_init);
90821- module_free(mod, mod->module_core);
90822+ module_free_exec(mod, mod->module_init_rx);
90823+ module_free_exec(mod, mod->module_core_rx);
90824+ module_free(mod, mod->module_init_rw);
90825+ module_free(mod, mod->module_core_rw);
90826 }
90827
90828 int __weak module_finalize(const Elf_Ehdr *hdr,
90829@@ -2968,7 +3100,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
90830 static int post_relocation(struct module *mod, const struct load_info *info)
90831 {
90832 /* Sort exception table now relocations are done. */
90833+ pax_open_kernel();
90834 sort_extable(mod->extable, mod->extable + mod->num_exentries);
90835+ pax_close_kernel();
90836
90837 /* Copy relocated percpu area over. */
90838 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
90839@@ -3077,11 +3211,12 @@ static int do_init_module(struct module *mod)
90840 mod->strtab = mod->core_strtab;
90841 #endif
90842 unset_module_init_ro_nx(mod);
90843- module_free(mod, mod->module_init);
90844- mod->module_init = NULL;
90845- mod->init_size = 0;
90846- mod->init_ro_size = 0;
90847- mod->init_text_size = 0;
90848+ module_free(mod, mod->module_init_rw);
90849+ module_free_exec(mod, mod->module_init_rx);
90850+ mod->module_init_rw = NULL;
90851+ mod->module_init_rx = NULL;
90852+ mod->init_size_rw = 0;
90853+ mod->init_size_rx = 0;
90854 mutex_unlock(&module_mutex);
90855 wake_up_all(&module_wq);
90856
90857@@ -3149,16 +3284,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
90858 module_bug_finalize(info->hdr, info->sechdrs, mod);
90859
90860 /* Set RO and NX regions for core */
90861- set_section_ro_nx(mod->module_core,
90862- mod->core_text_size,
90863- mod->core_ro_size,
90864- mod->core_size);
90865+ set_section_ro_nx(mod->module_core_rx,
90866+ mod->core_size_rx,
90867+ mod->core_size_rx,
90868+ mod->core_size_rx);
90869
90870 /* Set RO and NX regions for init */
90871- set_section_ro_nx(mod->module_init,
90872- mod->init_text_size,
90873- mod->init_ro_size,
90874- mod->init_size);
90875+ set_section_ro_nx(mod->module_init_rx,
90876+ mod->init_size_rx,
90877+ mod->init_size_rx,
90878+ mod->init_size_rx);
90879
90880 /* Mark state as coming so strong_try_module_get() ignores us,
90881 * but kallsyms etc. can see us. */
90882@@ -3242,9 +3377,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
90883 if (err)
90884 goto free_unload;
90885
90886+ /* Now copy in args */
90887+ mod->args = strndup_user(uargs, ~0UL >> 1);
90888+ if (IS_ERR(mod->args)) {
90889+ err = PTR_ERR(mod->args);
90890+ goto free_unload;
90891+ }
90892+
90893 /* Set up MODINFO_ATTR fields */
90894 setup_modinfo(mod, info);
90895
90896+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90897+ {
90898+ char *p, *p2;
90899+
90900+ if (strstr(mod->args, "grsec_modharden_netdev")) {
90901+ 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);
90902+ err = -EPERM;
90903+ goto free_modinfo;
90904+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
90905+ p += sizeof("grsec_modharden_normal") - 1;
90906+ p2 = strstr(p, "_");
90907+ if (p2) {
90908+ *p2 = '\0';
90909+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
90910+ *p2 = '_';
90911+ }
90912+ err = -EPERM;
90913+ goto free_modinfo;
90914+ }
90915+ }
90916+#endif
90917+
90918 /* Fix up syms, so that st_value is a pointer to location. */
90919 err = simplify_symbols(mod, info);
90920 if (err < 0)
90921@@ -3260,13 +3424,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
90922
90923 flush_module_icache(mod);
90924
90925- /* Now copy in args */
90926- mod->args = strndup_user(uargs, ~0UL >> 1);
90927- if (IS_ERR(mod->args)) {
90928- err = PTR_ERR(mod->args);
90929- goto free_arch_cleanup;
90930- }
90931-
90932 dynamic_debug_setup(info->debug, info->num_debug);
90933
90934 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
90935@@ -3314,11 +3471,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
90936 ddebug_cleanup:
90937 dynamic_debug_remove(info->debug);
90938 synchronize_sched();
90939- kfree(mod->args);
90940- free_arch_cleanup:
90941 module_arch_cleanup(mod);
90942 free_modinfo:
90943 free_modinfo(mod);
90944+ kfree(mod->args);
90945 free_unload:
90946 module_unload_free(mod);
90947 unlink_mod:
90948@@ -3403,10 +3559,16 @@ static const char *get_ksymbol(struct module *mod,
90949 unsigned long nextval;
90950
90951 /* At worse, next value is at end of module */
90952- if (within_module_init(addr, mod))
90953- nextval = (unsigned long)mod->module_init+mod->init_text_size;
90954+ if (within_module_init_rx(addr, mod))
90955+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
90956+ else if (within_module_init_rw(addr, mod))
90957+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
90958+ else if (within_module_core_rx(addr, mod))
90959+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
90960+ else if (within_module_core_rw(addr, mod))
90961+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
90962 else
90963- nextval = (unsigned long)mod->module_core+mod->core_text_size;
90964+ return NULL;
90965
90966 /* Scan for closest preceding symbol, and next symbol. (ELF
90967 starts real symbols at 1). */
90968@@ -3654,7 +3816,7 @@ static int m_show(struct seq_file *m, void *p)
90969 return 0;
90970
90971 seq_printf(m, "%s %u",
90972- mod->name, mod->init_size + mod->core_size);
90973+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
90974 print_unload_info(m, mod);
90975
90976 /* Informative for users. */
90977@@ -3663,7 +3825,7 @@ static int m_show(struct seq_file *m, void *p)
90978 mod->state == MODULE_STATE_COMING ? "Loading":
90979 "Live");
90980 /* Used by oprofile and other similar tools. */
90981- seq_printf(m, " 0x%pK", mod->module_core);
90982+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
90983
90984 /* Taints info */
90985 if (mod->taints)
90986@@ -3699,7 +3861,17 @@ static const struct file_operations proc_modules_operations = {
90987
90988 static int __init proc_modules_init(void)
90989 {
90990+#ifndef CONFIG_GRKERNSEC_HIDESYM
90991+#ifdef CONFIG_GRKERNSEC_PROC_USER
90992+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90993+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90994+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
90995+#else
90996 proc_create("modules", 0, NULL, &proc_modules_operations);
90997+#endif
90998+#else
90999+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
91000+#endif
91001 return 0;
91002 }
91003 module_init(proc_modules_init);
91004@@ -3760,7 +3932,8 @@ struct module *__module_address(unsigned long addr)
91005 {
91006 struct module *mod;
91007
91008- if (addr < module_addr_min || addr > module_addr_max)
91009+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
91010+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
91011 return NULL;
91012
91013 list_for_each_entry_rcu(mod, &modules, list) {
91014@@ -3801,11 +3974,20 @@ bool is_module_text_address(unsigned long addr)
91015 */
91016 struct module *__module_text_address(unsigned long addr)
91017 {
91018- struct module *mod = __module_address(addr);
91019+ struct module *mod;
91020+
91021+#ifdef CONFIG_X86_32
91022+ addr = ktla_ktva(addr);
91023+#endif
91024+
91025+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
91026+ return NULL;
91027+
91028+ mod = __module_address(addr);
91029+
91030 if (mod) {
91031 /* Make sure it's within the text section. */
91032- if (!within(addr, mod->module_init, mod->init_text_size)
91033- && !within(addr, mod->module_core, mod->core_text_size))
91034+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
91035 mod = NULL;
91036 }
91037 return mod;
91038diff --git a/kernel/notifier.c b/kernel/notifier.c
91039index 4803da6..1c5eea6 100644
91040--- a/kernel/notifier.c
91041+++ b/kernel/notifier.c
91042@@ -5,6 +5,7 @@
91043 #include <linux/rcupdate.h>
91044 #include <linux/vmalloc.h>
91045 #include <linux/reboot.h>
91046+#include <linux/mm.h>
91047
91048 /*
91049 * Notifier list for kernel code which wants to be called
91050@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
91051 while ((*nl) != NULL) {
91052 if (n->priority > (*nl)->priority)
91053 break;
91054- nl = &((*nl)->next);
91055+ nl = (struct notifier_block **)&((*nl)->next);
91056 }
91057- n->next = *nl;
91058+ pax_open_kernel();
91059+ *(const void **)&n->next = *nl;
91060 rcu_assign_pointer(*nl, n);
91061+ pax_close_kernel();
91062 return 0;
91063 }
91064
91065@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
91066 return 0;
91067 if (n->priority > (*nl)->priority)
91068 break;
91069- nl = &((*nl)->next);
91070+ nl = (struct notifier_block **)&((*nl)->next);
91071 }
91072- n->next = *nl;
91073+ pax_open_kernel();
91074+ *(const void **)&n->next = *nl;
91075 rcu_assign_pointer(*nl, n);
91076+ pax_close_kernel();
91077 return 0;
91078 }
91079
91080@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
91081 {
91082 while ((*nl) != NULL) {
91083 if ((*nl) == n) {
91084+ pax_open_kernel();
91085 rcu_assign_pointer(*nl, n->next);
91086+ pax_close_kernel();
91087 return 0;
91088 }
91089- nl = &((*nl)->next);
91090+ nl = (struct notifier_block **)&((*nl)->next);
91091 }
91092 return -ENOENT;
91093 }
91094diff --git a/kernel/padata.c b/kernel/padata.c
91095index 161402f..598814c 100644
91096--- a/kernel/padata.c
91097+++ b/kernel/padata.c
91098@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
91099 * seq_nr mod. number of cpus in use.
91100 */
91101
91102- seq_nr = atomic_inc_return(&pd->seq_nr);
91103+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
91104 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
91105
91106 return padata_index_to_cpu(pd, cpu_index);
91107@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
91108 padata_init_pqueues(pd);
91109 padata_init_squeues(pd);
91110 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
91111- atomic_set(&pd->seq_nr, -1);
91112+ atomic_set_unchecked(&pd->seq_nr, -1);
91113 atomic_set(&pd->reorder_objects, 0);
91114 atomic_set(&pd->refcnt, 0);
91115 pd->pinst = pinst;
91116diff --git a/kernel/panic.c b/kernel/panic.c
91117index cf80672..f6771b2 100644
91118--- a/kernel/panic.c
91119+++ b/kernel/panic.c
91120@@ -53,7 +53,7 @@ EXPORT_SYMBOL(panic_blink);
91121 /*
91122 * Stop ourself in panic -- architecture code may override this
91123 */
91124-void __weak panic_smp_self_stop(void)
91125+void __weak __noreturn panic_smp_self_stop(void)
91126 {
91127 while (1)
91128 cpu_relax();
91129@@ -422,7 +422,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
91130 disable_trace_on_warning();
91131
91132 pr_warn("------------[ cut here ]------------\n");
91133- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
91134+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
91135 raw_smp_processor_id(), current->pid, file, line, caller);
91136
91137 if (args)
91138@@ -476,7 +476,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
91139 */
91140 __visible void __stack_chk_fail(void)
91141 {
91142- panic("stack-protector: Kernel stack is corrupted in: %p\n",
91143+ dump_stack();
91144+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
91145 __builtin_return_address(0));
91146 }
91147 EXPORT_SYMBOL(__stack_chk_fail);
91148diff --git a/kernel/pid.c b/kernel/pid.c
91149index 82430c8..53d7793 100644
91150--- a/kernel/pid.c
91151+++ b/kernel/pid.c
91152@@ -33,6 +33,7 @@
91153 #include <linux/rculist.h>
91154 #include <linux/bootmem.h>
91155 #include <linux/hash.h>
91156+#include <linux/security.h>
91157 #include <linux/pid_namespace.h>
91158 #include <linux/init_task.h>
91159 #include <linux/syscalls.h>
91160@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
91161
91162 int pid_max = PID_MAX_DEFAULT;
91163
91164-#define RESERVED_PIDS 300
91165+#define RESERVED_PIDS 500
91166
91167 int pid_max_min = RESERVED_PIDS + 1;
91168 int pid_max_max = PID_MAX_LIMIT;
91169@@ -447,10 +448,18 @@ EXPORT_SYMBOL(pid_task);
91170 */
91171 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
91172 {
91173+ struct task_struct *task;
91174+
91175 rcu_lockdep_assert(rcu_read_lock_held(),
91176 "find_task_by_pid_ns() needs rcu_read_lock()"
91177 " protection");
91178- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
91179+
91180+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
91181+
91182+ if (gr_pid_is_chrooted(task))
91183+ return NULL;
91184+
91185+ return task;
91186 }
91187
91188 struct task_struct *find_task_by_vpid(pid_t vnr)
91189@@ -458,6 +467,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
91190 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
91191 }
91192
91193+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
91194+{
91195+ rcu_lockdep_assert(rcu_read_lock_held(),
91196+ "find_task_by_pid_ns() needs rcu_read_lock()"
91197+ " protection");
91198+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
91199+}
91200+
91201 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
91202 {
91203 struct pid *pid;
91204diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
91205index db95d8e..a0ca23f 100644
91206--- a/kernel/pid_namespace.c
91207+++ b/kernel/pid_namespace.c
91208@@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
91209 void __user *buffer, size_t *lenp, loff_t *ppos)
91210 {
91211 struct pid_namespace *pid_ns = task_active_pid_ns(current);
91212- struct ctl_table tmp = *table;
91213+ ctl_table_no_const tmp = *table;
91214
91215 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
91216 return -EPERM;
91217diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
91218index bbef57f..5f94462 100644
91219--- a/kernel/power/Kconfig
91220+++ b/kernel/power/Kconfig
91221@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
91222 config HIBERNATION
91223 bool "Hibernation (aka 'suspend to disk')"
91224 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
91225+ depends on !GRKERNSEC_KMEM
91226+ depends on !PAX_MEMORY_SANITIZE
91227 select HIBERNATE_CALLBACKS
91228 select LZO_COMPRESS
91229 select LZO_DECOMPRESS
91230diff --git a/kernel/power/process.c b/kernel/power/process.c
91231index 5a6ec86..3a8c884 100644
91232--- a/kernel/power/process.c
91233+++ b/kernel/power/process.c
91234@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
91235 unsigned int elapsed_msecs;
91236 bool wakeup = false;
91237 int sleep_usecs = USEC_PER_MSEC;
91238+ bool timedout = false;
91239
91240 do_gettimeofday(&start);
91241
91242@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
91243
91244 while (true) {
91245 todo = 0;
91246+ if (time_after(jiffies, end_time))
91247+ timedout = true;
91248 read_lock(&tasklist_lock);
91249 for_each_process_thread(g, p) {
91250 if (p == current || !freeze_task(p))
91251 continue;
91252
91253- if (!freezer_should_skip(p))
91254+ if (!freezer_should_skip(p)) {
91255 todo++;
91256+ if (timedout) {
91257+ printk(KERN_ERR "Task refusing to freeze:\n");
91258+ sched_show_task(p);
91259+ }
91260+ }
91261 }
91262 read_unlock(&tasklist_lock);
91263
91264@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
91265 todo += wq_busy;
91266 }
91267
91268- if (!todo || time_after(jiffies, end_time))
91269+ if (!todo || timedout)
91270 break;
91271
91272 if (pm_wakeup_pending()) {
91273diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
91274index ced2b84..ffc4791 100644
91275--- a/kernel/printk/printk.c
91276+++ b/kernel/printk/printk.c
91277@@ -489,6 +489,11 @@ static int check_syslog_permissions(int type, bool from_file)
91278 if (from_file && type != SYSLOG_ACTION_OPEN)
91279 return 0;
91280
91281+#ifdef CONFIG_GRKERNSEC_DMESG
91282+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
91283+ return -EPERM;
91284+#endif
91285+
91286 if (syslog_action_restricted(type)) {
91287 if (capable(CAP_SYSLOG))
91288 return 0;
91289diff --git a/kernel/profile.c b/kernel/profile.c
91290index 54bf5ba..df6e0a2 100644
91291--- a/kernel/profile.c
91292+++ b/kernel/profile.c
91293@@ -37,7 +37,7 @@ struct profile_hit {
91294 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
91295 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
91296
91297-static atomic_t *prof_buffer;
91298+static atomic_unchecked_t *prof_buffer;
91299 static unsigned long prof_len, prof_shift;
91300
91301 int prof_on __read_mostly;
91302@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
91303 hits[i].pc = 0;
91304 continue;
91305 }
91306- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
91307+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
91308 hits[i].hits = hits[i].pc = 0;
91309 }
91310 }
91311@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
91312 * Add the current hit(s) and flush the write-queue out
91313 * to the global buffer:
91314 */
91315- atomic_add(nr_hits, &prof_buffer[pc]);
91316+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
91317 for (i = 0; i < NR_PROFILE_HIT; ++i) {
91318- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
91319+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
91320 hits[i].pc = hits[i].hits = 0;
91321 }
91322 out:
91323@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
91324 {
91325 unsigned long pc;
91326 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
91327- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
91328+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
91329 }
91330 #endif /* !CONFIG_SMP */
91331
91332@@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
91333 return -EFAULT;
91334 buf++; p++; count--; read++;
91335 }
91336- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
91337+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
91338 if (copy_to_user(buf, (void *)pnt, count))
91339 return -EFAULT;
91340 read += count;
91341@@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
91342 }
91343 #endif
91344 profile_discard_flip_buffers();
91345- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
91346+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
91347 return count;
91348 }
91349
91350diff --git a/kernel/ptrace.c b/kernel/ptrace.c
91351index 54e7522..5b82dd6 100644
91352--- a/kernel/ptrace.c
91353+++ b/kernel/ptrace.c
91354@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
91355 if (seize)
91356 flags |= PT_SEIZED;
91357 rcu_read_lock();
91358- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
91359+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
91360 flags |= PT_PTRACE_CAP;
91361 rcu_read_unlock();
91362 task->ptrace = flags;
91363@@ -532,7 +532,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
91364 break;
91365 return -EIO;
91366 }
91367- if (copy_to_user(dst, buf, retval))
91368+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
91369 return -EFAULT;
91370 copied += retval;
91371 src += retval;
91372@@ -800,7 +800,7 @@ int ptrace_request(struct task_struct *child, long request,
91373 bool seized = child->ptrace & PT_SEIZED;
91374 int ret = -EIO;
91375 siginfo_t siginfo, *si;
91376- void __user *datavp = (void __user *) data;
91377+ void __user *datavp = (__force void __user *) data;
91378 unsigned long __user *datalp = datavp;
91379 unsigned long flags;
91380
91381@@ -1046,14 +1046,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
91382 goto out;
91383 }
91384
91385+ if (gr_handle_ptrace(child, request)) {
91386+ ret = -EPERM;
91387+ goto out_put_task_struct;
91388+ }
91389+
91390 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91391 ret = ptrace_attach(child, request, addr, data);
91392 /*
91393 * Some architectures need to do book-keeping after
91394 * a ptrace attach.
91395 */
91396- if (!ret)
91397+ if (!ret) {
91398 arch_ptrace_attach(child);
91399+ gr_audit_ptrace(child);
91400+ }
91401 goto out_put_task_struct;
91402 }
91403
91404@@ -1081,7 +1088,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
91405 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
91406 if (copied != sizeof(tmp))
91407 return -EIO;
91408- return put_user(tmp, (unsigned long __user *)data);
91409+ return put_user(tmp, (__force unsigned long __user *)data);
91410 }
91411
91412 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
91413@@ -1175,7 +1182,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
91414 }
91415
91416 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
91417- compat_long_t, addr, compat_long_t, data)
91418+ compat_ulong_t, addr, compat_ulong_t, data)
91419 {
91420 struct task_struct *child;
91421 long ret;
91422@@ -1191,14 +1198,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
91423 goto out;
91424 }
91425
91426+ if (gr_handle_ptrace(child, request)) {
91427+ ret = -EPERM;
91428+ goto out_put_task_struct;
91429+ }
91430+
91431 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91432 ret = ptrace_attach(child, request, addr, data);
91433 /*
91434 * Some architectures need to do book-keeping after
91435 * a ptrace attach.
91436 */
91437- if (!ret)
91438+ if (!ret) {
91439 arch_ptrace_attach(child);
91440+ gr_audit_ptrace(child);
91441+ }
91442 goto out_put_task_struct;
91443 }
91444
91445diff --git a/kernel/range.c b/kernel/range.c
91446index 322ea8e..82cfc28 100644
91447--- a/kernel/range.c
91448+++ b/kernel/range.c
91449@@ -113,12 +113,12 @@ static int cmp_range(const void *x1, const void *x2)
91450 {
91451 const struct range *r1 = x1;
91452 const struct range *r2 = x2;
91453- s64 start1, start2;
91454
91455- start1 = r1->start;
91456- start2 = r2->start;
91457-
91458- return start1 - start2;
91459+ if (r1->start < r2->start)
91460+ return -1;
91461+ if (r1->start > r2->start)
91462+ return 1;
91463+ return 0;
91464 }
91465
91466 int clean_sort_range(struct range *range, int az)
91467diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
91468index 240fa90..5fa56bd 100644
91469--- a/kernel/rcu/rcutorture.c
91470+++ b/kernel/rcu/rcutorture.c
91471@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91472 rcu_torture_count) = { 0 };
91473 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91474 rcu_torture_batch) = { 0 };
91475-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91476-static atomic_t n_rcu_torture_alloc;
91477-static atomic_t n_rcu_torture_alloc_fail;
91478-static atomic_t n_rcu_torture_free;
91479-static atomic_t n_rcu_torture_mberror;
91480-static atomic_t n_rcu_torture_error;
91481+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91482+static atomic_unchecked_t n_rcu_torture_alloc;
91483+static atomic_unchecked_t n_rcu_torture_alloc_fail;
91484+static atomic_unchecked_t n_rcu_torture_free;
91485+static atomic_unchecked_t n_rcu_torture_mberror;
91486+static atomic_unchecked_t n_rcu_torture_error;
91487 static long n_rcu_torture_barrier_error;
91488 static long n_rcu_torture_boost_ktrerror;
91489 static long n_rcu_torture_boost_rterror;
91490@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
91491 static long n_rcu_torture_timers;
91492 static long n_barrier_attempts;
91493 static long n_barrier_successes;
91494-static atomic_long_t n_cbfloods;
91495+static atomic_long_unchecked_t n_cbfloods;
91496 static struct list_head rcu_torture_removed;
91497
91498 static int rcu_torture_writer_state;
91499@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
91500
91501 spin_lock_bh(&rcu_torture_lock);
91502 if (list_empty(&rcu_torture_freelist)) {
91503- atomic_inc(&n_rcu_torture_alloc_fail);
91504+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
91505 spin_unlock_bh(&rcu_torture_lock);
91506 return NULL;
91507 }
91508- atomic_inc(&n_rcu_torture_alloc);
91509+ atomic_inc_unchecked(&n_rcu_torture_alloc);
91510 p = rcu_torture_freelist.next;
91511 list_del_init(p);
91512 spin_unlock_bh(&rcu_torture_lock);
91513@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
91514 static void
91515 rcu_torture_free(struct rcu_torture *p)
91516 {
91517- atomic_inc(&n_rcu_torture_free);
91518+ atomic_inc_unchecked(&n_rcu_torture_free);
91519 spin_lock_bh(&rcu_torture_lock);
91520 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
91521 spin_unlock_bh(&rcu_torture_lock);
91522@@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
91523 i = rp->rtort_pipe_count;
91524 if (i > RCU_TORTURE_PIPE_LEN)
91525 i = RCU_TORTURE_PIPE_LEN;
91526- atomic_inc(&rcu_torture_wcount[i]);
91527+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
91528 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
91529 rp->rtort_mbtest = 0;
91530 return true;
91531@@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
91532 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
91533 do {
91534 schedule_timeout_interruptible(cbflood_inter_holdoff);
91535- atomic_long_inc(&n_cbfloods);
91536+ atomic_long_inc_unchecked(&n_cbfloods);
91537 WARN_ON(signal_pending(current));
91538 for (i = 0; i < cbflood_n_burst; i++) {
91539 for (j = 0; j < cbflood_n_per_burst; j++) {
91540@@ -917,7 +917,7 @@ rcu_torture_writer(void *arg)
91541 i = old_rp->rtort_pipe_count;
91542 if (i > RCU_TORTURE_PIPE_LEN)
91543 i = RCU_TORTURE_PIPE_LEN;
91544- atomic_inc(&rcu_torture_wcount[i]);
91545+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
91546 old_rp->rtort_pipe_count++;
91547 switch (synctype[torture_random(&rand) % nsynctypes]) {
91548 case RTWS_DEF_FREE:
91549@@ -1035,7 +1035,7 @@ static void rcu_torture_timer(unsigned long unused)
91550 return;
91551 }
91552 if (p->rtort_mbtest == 0)
91553- atomic_inc(&n_rcu_torture_mberror);
91554+ atomic_inc_unchecked(&n_rcu_torture_mberror);
91555 spin_lock(&rand_lock);
91556 cur_ops->read_delay(&rand);
91557 n_rcu_torture_timers++;
91558@@ -1105,7 +1105,7 @@ rcu_torture_reader(void *arg)
91559 continue;
91560 }
91561 if (p->rtort_mbtest == 0)
91562- atomic_inc(&n_rcu_torture_mberror);
91563+ atomic_inc_unchecked(&n_rcu_torture_mberror);
91564 cur_ops->read_delay(&rand);
91565 preempt_disable();
91566 pipe_count = p->rtort_pipe_count;
91567@@ -1172,11 +1172,11 @@ rcu_torture_stats_print(void)
91568 rcu_torture_current,
91569 rcu_torture_current_version,
91570 list_empty(&rcu_torture_freelist),
91571- atomic_read(&n_rcu_torture_alloc),
91572- atomic_read(&n_rcu_torture_alloc_fail),
91573- atomic_read(&n_rcu_torture_free));
91574+ atomic_read_unchecked(&n_rcu_torture_alloc),
91575+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
91576+ atomic_read_unchecked(&n_rcu_torture_free));
91577 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
91578- atomic_read(&n_rcu_torture_mberror),
91579+ atomic_read_unchecked(&n_rcu_torture_mberror),
91580 n_rcu_torture_boost_ktrerror,
91581 n_rcu_torture_boost_rterror);
91582 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
91583@@ -1188,17 +1188,17 @@ rcu_torture_stats_print(void)
91584 n_barrier_successes,
91585 n_barrier_attempts,
91586 n_rcu_torture_barrier_error);
91587- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
91588+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
91589
91590 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91591- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
91592+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
91593 n_rcu_torture_barrier_error != 0 ||
91594 n_rcu_torture_boost_ktrerror != 0 ||
91595 n_rcu_torture_boost_rterror != 0 ||
91596 n_rcu_torture_boost_failure != 0 ||
91597 i > 1) {
91598 pr_cont("%s", "!!! ");
91599- atomic_inc(&n_rcu_torture_error);
91600+ atomic_inc_unchecked(&n_rcu_torture_error);
91601 WARN_ON_ONCE(1);
91602 }
91603 pr_cont("Reader Pipe: ");
91604@@ -1215,7 +1215,7 @@ rcu_torture_stats_print(void)
91605 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91606 pr_cont("Free-Block Circulation: ");
91607 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91608- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
91609+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
91610 }
91611 pr_cont("\n");
91612
91613@@ -1559,7 +1559,7 @@ rcu_torture_cleanup(void)
91614
91615 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
91616
91617- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91618+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91619 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
91620 else if (torture_onoff_failures())
91621 rcu_torture_print_module_parms(cur_ops,
91622@@ -1684,18 +1684,18 @@ rcu_torture_init(void)
91623
91624 rcu_torture_current = NULL;
91625 rcu_torture_current_version = 0;
91626- atomic_set(&n_rcu_torture_alloc, 0);
91627- atomic_set(&n_rcu_torture_alloc_fail, 0);
91628- atomic_set(&n_rcu_torture_free, 0);
91629- atomic_set(&n_rcu_torture_mberror, 0);
91630- atomic_set(&n_rcu_torture_error, 0);
91631+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
91632+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
91633+ atomic_set_unchecked(&n_rcu_torture_free, 0);
91634+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
91635+ atomic_set_unchecked(&n_rcu_torture_error, 0);
91636 n_rcu_torture_barrier_error = 0;
91637 n_rcu_torture_boost_ktrerror = 0;
91638 n_rcu_torture_boost_rterror = 0;
91639 n_rcu_torture_boost_failure = 0;
91640 n_rcu_torture_boosts = 0;
91641 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
91642- atomic_set(&rcu_torture_wcount[i], 0);
91643+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
91644 for_each_possible_cpu(cpu) {
91645 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91646 per_cpu(rcu_torture_count, cpu)[i] = 0;
91647diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
91648index c0623fc..329c091 100644
91649--- a/kernel/rcu/tiny.c
91650+++ b/kernel/rcu/tiny.c
91651@@ -42,7 +42,7 @@
91652 /* Forward declarations for tiny_plugin.h. */
91653 struct rcu_ctrlblk;
91654 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
91655-static void rcu_process_callbacks(struct softirq_action *unused);
91656+static void rcu_process_callbacks(void);
91657 static void __call_rcu(struct rcu_head *head,
91658 void (*func)(struct rcu_head *rcu),
91659 struct rcu_ctrlblk *rcp);
91660@@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
91661 false));
91662 }
91663
91664-static void rcu_process_callbacks(struct softirq_action *unused)
91665+static __latent_entropy void rcu_process_callbacks(void)
91666 {
91667 __rcu_process_callbacks(&rcu_sched_ctrlblk);
91668 __rcu_process_callbacks(&rcu_bh_ctrlblk);
91669diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
91670index 858c565..7efd915 100644
91671--- a/kernel/rcu/tiny_plugin.h
91672+++ b/kernel/rcu/tiny_plugin.h
91673@@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
91674 dump_stack();
91675 }
91676 if (*rcp->curtail && ULONG_CMP_GE(j, js))
91677- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
91678+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
91679 3 * rcu_jiffies_till_stall_check() + 3;
91680 else if (ULONG_CMP_GE(j, js))
91681- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91682+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91683 }
91684
91685 static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
91686 {
91687 rcp->ticks_this_gp = 0;
91688 rcp->gp_start = jiffies;
91689- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91690+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91691 }
91692
91693 static void check_cpu_stalls(void)
91694diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
91695index 9815447..2cdf92a 100644
91696--- a/kernel/rcu/tree.c
91697+++ b/kernel/rcu/tree.c
91698@@ -274,7 +274,7 @@ static void rcu_momentary_dyntick_idle(void)
91699 */
91700 rdtp = this_cpu_ptr(&rcu_dynticks);
91701 smp_mb__before_atomic(); /* Earlier stuff before QS. */
91702- atomic_add(2, &rdtp->dynticks); /* QS. */
91703+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
91704 smp_mb__after_atomic(); /* Later stuff after QS. */
91705 break;
91706 }
91707@@ -534,9 +534,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
91708 rcu_prepare_for_idle(smp_processor_id());
91709 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91710 smp_mb__before_atomic(); /* See above. */
91711- atomic_inc(&rdtp->dynticks);
91712+ atomic_inc_unchecked(&rdtp->dynticks);
91713 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
91714- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91715+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91716 rcu_dynticks_task_enter();
91717
91718 /*
91719@@ -656,10 +656,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
91720 {
91721 rcu_dynticks_task_exit();
91722 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
91723- atomic_inc(&rdtp->dynticks);
91724+ atomic_inc_unchecked(&rdtp->dynticks);
91725 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91726 smp_mb__after_atomic(); /* See above. */
91727- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91728+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91729 rcu_cleanup_after_idle(smp_processor_id());
91730 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
91731 if (!user && !is_idle_task(current)) {
91732@@ -780,14 +780,14 @@ void rcu_nmi_enter(void)
91733 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
91734
91735 if (rdtp->dynticks_nmi_nesting == 0 &&
91736- (atomic_read(&rdtp->dynticks) & 0x1))
91737+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
91738 return;
91739 rdtp->dynticks_nmi_nesting++;
91740 smp_mb__before_atomic(); /* Force delay from prior write. */
91741- atomic_inc(&rdtp->dynticks);
91742+ atomic_inc_unchecked(&rdtp->dynticks);
91743 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91744 smp_mb__after_atomic(); /* See above. */
91745- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91746+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91747 }
91748
91749 /**
91750@@ -806,9 +806,9 @@ void rcu_nmi_exit(void)
91751 return;
91752 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91753 smp_mb__before_atomic(); /* See above. */
91754- atomic_inc(&rdtp->dynticks);
91755+ atomic_inc_unchecked(&rdtp->dynticks);
91756 smp_mb__after_atomic(); /* Force delay to next write. */
91757- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91758+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91759 }
91760
91761 /**
91762@@ -821,7 +821,7 @@ void rcu_nmi_exit(void)
91763 */
91764 bool notrace __rcu_is_watching(void)
91765 {
91766- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91767+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91768 }
91769
91770 /**
91771@@ -904,7 +904,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
91772 static int dyntick_save_progress_counter(struct rcu_data *rdp,
91773 bool *isidle, unsigned long *maxj)
91774 {
91775- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
91776+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91777 rcu_sysidle_check_cpu(rdp, isidle, maxj);
91778 if ((rdp->dynticks_snap & 0x1) == 0) {
91779 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
91780@@ -933,7 +933,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91781 int *rcrmp;
91782 unsigned int snap;
91783
91784- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
91785+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91786 snap = (unsigned int)rdp->dynticks_snap;
91787
91788 /*
91789@@ -996,10 +996,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91790 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
91791 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
91792 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
91793- ACCESS_ONCE(rdp->cond_resched_completed) =
91794+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
91795 ACCESS_ONCE(rdp->mynode->completed);
91796 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
91797- ACCESS_ONCE(*rcrmp) =
91798+ ACCESS_ONCE_RW(*rcrmp) =
91799 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
91800 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
91801 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
91802@@ -1021,7 +1021,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
91803 rsp->gp_start = j;
91804 smp_wmb(); /* Record start time before stall time. */
91805 j1 = rcu_jiffies_till_stall_check();
91806- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
91807+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
91808 rsp->jiffies_resched = j + j1 / 2;
91809 }
91810
91811@@ -1062,7 +1062,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
91812 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91813 return;
91814 }
91815- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91816+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91817 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91818
91819 /*
91820@@ -1139,7 +1139,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
91821
91822 raw_spin_lock_irqsave(&rnp->lock, flags);
91823 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
91824- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
91825+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
91826 3 * rcu_jiffies_till_stall_check() + 3;
91827 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91828
91829@@ -1223,7 +1223,7 @@ void rcu_cpu_stall_reset(void)
91830 struct rcu_state *rsp;
91831
91832 for_each_rcu_flavor(rsp)
91833- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91834+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91835 }
91836
91837 /*
91838@@ -1609,7 +1609,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
91839 raw_spin_unlock_irq(&rnp->lock);
91840 return 0;
91841 }
91842- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91843+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91844
91845 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
91846 /*
91847@@ -1650,9 +1650,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
91848 rdp = this_cpu_ptr(rsp->rda);
91849 rcu_preempt_check_blocked_tasks(rnp);
91850 rnp->qsmask = rnp->qsmaskinit;
91851- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
91852+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
91853 WARN_ON_ONCE(rnp->completed != rsp->completed);
91854- ACCESS_ONCE(rnp->completed) = rsp->completed;
91855+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
91856 if (rnp == rdp->mynode)
91857 (void)__note_gp_changes(rsp, rnp, rdp);
91858 rcu_preempt_boost_start_gp(rnp);
91859@@ -1697,7 +1697,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
91860 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
91861 raw_spin_lock_irq(&rnp->lock);
91862 smp_mb__after_unlock_lock();
91863- ACCESS_ONCE(rsp->gp_flags) =
91864+ ACCESS_ONCE_RW(rsp->gp_flags) =
91865 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
91866 raw_spin_unlock_irq(&rnp->lock);
91867 }
91868@@ -1743,7 +1743,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91869 rcu_for_each_node_breadth_first(rsp, rnp) {
91870 raw_spin_lock_irq(&rnp->lock);
91871 smp_mb__after_unlock_lock();
91872- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
91873+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
91874 rdp = this_cpu_ptr(rsp->rda);
91875 if (rnp == rdp->mynode)
91876 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
91877@@ -1758,14 +1758,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91878 rcu_nocb_gp_set(rnp, nocb);
91879
91880 /* Declare grace period done. */
91881- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
91882+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
91883 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
91884 rsp->fqs_state = RCU_GP_IDLE;
91885 rdp = this_cpu_ptr(rsp->rda);
91886 /* Advance CBs to reduce false positives below. */
91887 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
91888 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
91889- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91890+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91891 trace_rcu_grace_period(rsp->name,
91892 ACCESS_ONCE(rsp->gpnum),
91893 TPS("newreq"));
91894@@ -1890,7 +1890,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
91895 */
91896 return false;
91897 }
91898- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91899+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91900 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
91901 TPS("newreq"));
91902
91903@@ -2111,7 +2111,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
91904 rsp->qlen += rdp->qlen;
91905 rdp->n_cbs_orphaned += rdp->qlen;
91906 rdp->qlen_lazy = 0;
91907- ACCESS_ONCE(rdp->qlen) = 0;
91908+ ACCESS_ONCE_RW(rdp->qlen) = 0;
91909 }
91910
91911 /*
91912@@ -2356,7 +2356,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
91913 }
91914 smp_mb(); /* List handling before counting for rcu_barrier(). */
91915 rdp->qlen_lazy -= count_lazy;
91916- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
91917+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
91918 rdp->n_cbs_invoked += count;
91919
91920 /* Reinstate batch limit if we have worked down the excess. */
91921@@ -2519,7 +2519,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
91922 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91923 return; /* Someone beat us to it. */
91924 }
91925- ACCESS_ONCE(rsp->gp_flags) =
91926+ ACCESS_ONCE_RW(rsp->gp_flags) =
91927 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
91928 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91929 rcu_gp_kthread_wake(rsp);
91930@@ -2565,7 +2565,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
91931 /*
91932 * Do RCU core processing for the current CPU.
91933 */
91934-static void rcu_process_callbacks(struct softirq_action *unused)
91935+static void rcu_process_callbacks(void)
91936 {
91937 struct rcu_state *rsp;
91938
91939@@ -2677,7 +2677,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91940 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
91941 if (debug_rcu_head_queue(head)) {
91942 /* Probable double call_rcu(), so leak the callback. */
91943- ACCESS_ONCE(head->func) = rcu_leak_callback;
91944+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
91945 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
91946 return;
91947 }
91948@@ -2705,7 +2705,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91949 local_irq_restore(flags);
91950 return;
91951 }
91952- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
91953+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
91954 if (lazy)
91955 rdp->qlen_lazy++;
91956 else
91957@@ -2975,11 +2975,11 @@ void synchronize_sched_expedited(void)
91958 * counter wrap on a 32-bit system. Quite a few more CPUs would of
91959 * course be required on a 64-bit system.
91960 */
91961- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
91962+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
91963 (ulong)atomic_long_read(&rsp->expedited_done) +
91964 ULONG_MAX / 8)) {
91965 synchronize_sched();
91966- atomic_long_inc(&rsp->expedited_wrap);
91967+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
91968 return;
91969 }
91970
91971@@ -2987,12 +2987,12 @@ void synchronize_sched_expedited(void)
91972 * Take a ticket. Note that atomic_inc_return() implies a
91973 * full memory barrier.
91974 */
91975- snap = atomic_long_inc_return(&rsp->expedited_start);
91976+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
91977 firstsnap = snap;
91978 if (!try_get_online_cpus()) {
91979 /* CPU hotplug operation in flight, fall back to normal GP. */
91980 wait_rcu_gp(call_rcu_sched);
91981- atomic_long_inc(&rsp->expedited_normal);
91982+ atomic_long_inc_unchecked(&rsp->expedited_normal);
91983 return;
91984 }
91985 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
91986@@ -3005,14 +3005,14 @@ void synchronize_sched_expedited(void)
91987 synchronize_sched_expedited_cpu_stop,
91988 NULL) == -EAGAIN) {
91989 put_online_cpus();
91990- atomic_long_inc(&rsp->expedited_tryfail);
91991+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
91992
91993 /* Check to see if someone else did our work for us. */
91994 s = atomic_long_read(&rsp->expedited_done);
91995 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91996 /* ensure test happens before caller kfree */
91997 smp_mb__before_atomic(); /* ^^^ */
91998- atomic_long_inc(&rsp->expedited_workdone1);
91999+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
92000 return;
92001 }
92002
92003@@ -3021,7 +3021,7 @@ void synchronize_sched_expedited(void)
92004 udelay(trycount * num_online_cpus());
92005 } else {
92006 wait_rcu_gp(call_rcu_sched);
92007- atomic_long_inc(&rsp->expedited_normal);
92008+ atomic_long_inc_unchecked(&rsp->expedited_normal);
92009 return;
92010 }
92011
92012@@ -3030,7 +3030,7 @@ void synchronize_sched_expedited(void)
92013 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
92014 /* ensure test happens before caller kfree */
92015 smp_mb__before_atomic(); /* ^^^ */
92016- atomic_long_inc(&rsp->expedited_workdone2);
92017+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
92018 return;
92019 }
92020
92021@@ -3044,13 +3044,13 @@ void synchronize_sched_expedited(void)
92022 if (!try_get_online_cpus()) {
92023 /* CPU hotplug operation in flight, use normal GP. */
92024 wait_rcu_gp(call_rcu_sched);
92025- atomic_long_inc(&rsp->expedited_normal);
92026+ atomic_long_inc_unchecked(&rsp->expedited_normal);
92027 return;
92028 }
92029- snap = atomic_long_read(&rsp->expedited_start);
92030+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
92031 smp_mb(); /* ensure read is before try_stop_cpus(). */
92032 }
92033- atomic_long_inc(&rsp->expedited_stoppedcpus);
92034+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
92035
92036 /*
92037 * Everyone up to our most recent fetch is covered by our grace
92038@@ -3059,16 +3059,16 @@ void synchronize_sched_expedited(void)
92039 * than we did already did their update.
92040 */
92041 do {
92042- atomic_long_inc(&rsp->expedited_done_tries);
92043+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
92044 s = atomic_long_read(&rsp->expedited_done);
92045 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
92046 /* ensure test happens before caller kfree */
92047 smp_mb__before_atomic(); /* ^^^ */
92048- atomic_long_inc(&rsp->expedited_done_lost);
92049+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
92050 break;
92051 }
92052 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
92053- atomic_long_inc(&rsp->expedited_done_exit);
92054+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
92055
92056 put_online_cpus();
92057 }
92058@@ -3274,7 +3274,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
92059 * ACCESS_ONCE() to prevent the compiler from speculating
92060 * the increment to precede the early-exit check.
92061 */
92062- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92063+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92064 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
92065 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
92066 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
92067@@ -3329,7 +3329,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
92068
92069 /* Increment ->n_barrier_done to prevent duplicate work. */
92070 smp_mb(); /* Keep increment after above mechanism. */
92071- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92072+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
92073 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
92074 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
92075 smp_mb(); /* Keep increment before caller's subsequent code. */
92076@@ -3374,10 +3374,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
92077 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
92078 init_callback_list(rdp);
92079 rdp->qlen_lazy = 0;
92080- ACCESS_ONCE(rdp->qlen) = 0;
92081+ ACCESS_ONCE_RW(rdp->qlen) = 0;
92082 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
92083 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
92084- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
92085+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
92086 rdp->cpu = cpu;
92087 rdp->rsp = rsp;
92088 rcu_boot_init_nocb_percpu_data(rdp);
92089@@ -3410,8 +3410,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
92090 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
92091 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
92092 rcu_sysidle_init_percpu_data(rdp->dynticks);
92093- atomic_set(&rdp->dynticks->dynticks,
92094- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
92095+ atomic_set_unchecked(&rdp->dynticks->dynticks,
92096+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
92097 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
92098
92099 /* Add CPU to rcu_node bitmasks. */
92100diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
92101index bbdc45d..c882ccb 100644
92102--- a/kernel/rcu/tree.h
92103+++ b/kernel/rcu/tree.h
92104@@ -87,11 +87,11 @@ struct rcu_dynticks {
92105 long long dynticks_nesting; /* Track irq/process nesting level. */
92106 /* Process level is worth LLONG_MAX/2. */
92107 int dynticks_nmi_nesting; /* Track NMI nesting level. */
92108- atomic_t dynticks; /* Even value for idle, else odd. */
92109+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
92110 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
92111 long long dynticks_idle_nesting;
92112 /* irq/process nesting level from idle. */
92113- atomic_t dynticks_idle; /* Even value for idle, else odd. */
92114+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
92115 /* "Idle" excludes userspace execution. */
92116 unsigned long dynticks_idle_jiffies;
92117 /* End of last non-NMI non-idle period. */
92118@@ -466,17 +466,17 @@ struct rcu_state {
92119 /* _rcu_barrier(). */
92120 /* End of fields guarded by barrier_mutex. */
92121
92122- atomic_long_t expedited_start; /* Starting ticket. */
92123- atomic_long_t expedited_done; /* Done ticket. */
92124- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
92125- atomic_long_t expedited_tryfail; /* # acquisition failures. */
92126- atomic_long_t expedited_workdone1; /* # done by others #1. */
92127- atomic_long_t expedited_workdone2; /* # done by others #2. */
92128- atomic_long_t expedited_normal; /* # fallbacks to normal. */
92129- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
92130- atomic_long_t expedited_done_tries; /* # tries to update _done. */
92131- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
92132- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
92133+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
92134+ atomic_long_t expedited_done; /* Done ticket. */
92135+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
92136+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
92137+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
92138+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
92139+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
92140+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
92141+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
92142+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
92143+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
92144
92145 unsigned long jiffies_force_qs; /* Time at which to invoke */
92146 /* force_quiescent_state(). */
92147diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
92148index c1d7f27..a64bf49 100644
92149--- a/kernel/rcu/tree_plugin.h
92150+++ b/kernel/rcu/tree_plugin.h
92151@@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
92152 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
92153 {
92154 return !rcu_preempted_readers_exp(rnp) &&
92155- ACCESS_ONCE(rnp->expmask) == 0;
92156+ ACCESS_ONCE_RW(rnp->expmask) == 0;
92157 }
92158
92159 /*
92160@@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
92161
92162 /* Clean up and exit. */
92163 smp_mb(); /* ensure expedited GP seen before counter increment. */
92164- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
92165+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
92166 sync_rcu_preempt_exp_count + 1;
92167 unlock_mb_ret:
92168 mutex_unlock(&sync_rcu_preempt_exp_mutex);
92169@@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
92170 free_cpumask_var(cm);
92171 }
92172
92173-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
92174+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
92175 .store = &rcu_cpu_kthread_task,
92176 .thread_should_run = rcu_cpu_kthread_should_run,
92177 .thread_fn = rcu_cpu_kthread,
92178@@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
92179 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
92180 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
92181 cpu, ticks_value, ticks_title,
92182- atomic_read(&rdtp->dynticks) & 0xfff,
92183+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
92184 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
92185 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
92186 fast_no_hz);
92187@@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
92188 return;
92189 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
92190 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
92191- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
92192+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
92193 wake_up(&rdp_leader->nocb_wq);
92194 }
92195 }
92196@@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
92197
92198 /* Enqueue the callback on the nocb list and update counts. */
92199 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
92200- ACCESS_ONCE(*old_rhpp) = rhp;
92201+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
92202 atomic_long_add(rhcount, &rdp->nocb_q_count);
92203 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
92204 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
92205@@ -2286,7 +2286,7 @@ wait_again:
92206 continue; /* No CBs here, try next follower. */
92207
92208 /* Move callbacks to wait-for-GP list, which is empty. */
92209- ACCESS_ONCE(rdp->nocb_head) = NULL;
92210+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
92211 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
92212 rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
92213 rdp->nocb_gp_count_lazy =
92214@@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
92215 list = ACCESS_ONCE(rdp->nocb_follower_head);
92216 BUG_ON(!list);
92217 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
92218- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
92219+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
92220 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
92221 c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
92222 cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
92223@@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
92224 list = next;
92225 }
92226 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
92227- ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
92228- ACCESS_ONCE(rdp->nocb_p_count_lazy) =
92229+ ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
92230+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
92231 rdp->nocb_p_count_lazy - cl;
92232 rdp->n_nocbs_invoked += c;
92233 }
92234@@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
92235 if (!rcu_nocb_need_deferred_wakeup(rdp))
92236 return;
92237 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
92238- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
92239+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
92240 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
92241 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
92242 }
92243@@ -2584,7 +2584,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
92244 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
92245 "rcuo%c/%d", rsp->abbr, cpu);
92246 BUG_ON(IS_ERR(t));
92247- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
92248+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
92249 }
92250
92251 /*
92252@@ -2788,11 +2788,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
92253
92254 /* Record start of fully idle period. */
92255 j = jiffies;
92256- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
92257+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
92258 smp_mb__before_atomic();
92259- atomic_inc(&rdtp->dynticks_idle);
92260+ atomic_inc_unchecked(&rdtp->dynticks_idle);
92261 smp_mb__after_atomic();
92262- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
92263+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
92264 }
92265
92266 /*
92267@@ -2861,9 +2861,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
92268
92269 /* Record end of idle period. */
92270 smp_mb__before_atomic();
92271- atomic_inc(&rdtp->dynticks_idle);
92272+ atomic_inc_unchecked(&rdtp->dynticks_idle);
92273 smp_mb__after_atomic();
92274- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
92275+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
92276
92277 /*
92278 * If we are the timekeeping CPU, we are permitted to be non-idle
92279@@ -2908,7 +2908,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
92280 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
92281
92282 /* Pick up current idle and NMI-nesting counter and check. */
92283- cur = atomic_read(&rdtp->dynticks_idle);
92284+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
92285 if (cur & 0x1) {
92286 *isidle = false; /* We are not idle! */
92287 return;
92288@@ -2957,7 +2957,7 @@ static void rcu_sysidle(unsigned long j)
92289 case RCU_SYSIDLE_NOT:
92290
92291 /* First time all are idle, so note a short idle period. */
92292- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
92293+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
92294 break;
92295
92296 case RCU_SYSIDLE_SHORT:
92297@@ -2995,7 +2995,7 @@ static void rcu_sysidle_cancel(void)
92298 {
92299 smp_mb();
92300 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
92301- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
92302+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
92303 }
92304
92305 /*
92306@@ -3047,7 +3047,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
92307 smp_mb(); /* grace period precedes setting inuse. */
92308
92309 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
92310- ACCESS_ONCE(rshp->inuse) = 0;
92311+ ACCESS_ONCE_RW(rshp->inuse) = 0;
92312 }
92313
92314 /*
92315@@ -3200,7 +3200,7 @@ static void rcu_bind_gp_kthread(void)
92316 static void rcu_dynticks_task_enter(void)
92317 {
92318 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
92319- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
92320+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
92321 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
92322 }
92323
92324@@ -3208,6 +3208,6 @@ static void rcu_dynticks_task_enter(void)
92325 static void rcu_dynticks_task_exit(void)
92326 {
92327 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
92328- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
92329+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
92330 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
92331 }
92332diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
92333index 5cdc62e..cc52e88 100644
92334--- a/kernel/rcu/tree_trace.c
92335+++ b/kernel/rcu/tree_trace.c
92336@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
92337 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
92338 rdp->passed_quiesce, rdp->qs_pending);
92339 seq_printf(m, " dt=%d/%llx/%d df=%lu",
92340- atomic_read(&rdp->dynticks->dynticks),
92341+ atomic_read_unchecked(&rdp->dynticks->dynticks),
92342 rdp->dynticks->dynticks_nesting,
92343 rdp->dynticks->dynticks_nmi_nesting,
92344 rdp->dynticks_fqs);
92345@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
92346 struct rcu_state *rsp = (struct rcu_state *)m->private;
92347
92348 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",
92349- atomic_long_read(&rsp->expedited_start),
92350+ atomic_long_read_unchecked(&rsp->expedited_start),
92351 atomic_long_read(&rsp->expedited_done),
92352- atomic_long_read(&rsp->expedited_wrap),
92353- atomic_long_read(&rsp->expedited_tryfail),
92354- atomic_long_read(&rsp->expedited_workdone1),
92355- atomic_long_read(&rsp->expedited_workdone2),
92356- atomic_long_read(&rsp->expedited_normal),
92357- atomic_long_read(&rsp->expedited_stoppedcpus),
92358- atomic_long_read(&rsp->expedited_done_tries),
92359- atomic_long_read(&rsp->expedited_done_lost),
92360- atomic_long_read(&rsp->expedited_done_exit));
92361+ atomic_long_read_unchecked(&rsp->expedited_wrap),
92362+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
92363+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
92364+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
92365+ atomic_long_read_unchecked(&rsp->expedited_normal),
92366+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
92367+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
92368+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
92369+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
92370 return 0;
92371 }
92372
92373diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
92374index 3ef8ba5..8c5ebfb6 100644
92375--- a/kernel/rcu/update.c
92376+++ b/kernel/rcu/update.c
92377@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
92378 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
92379 */
92380 if (till_stall_check < 3) {
92381- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
92382+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
92383 till_stall_check = 3;
92384 } else if (till_stall_check > 300) {
92385- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
92386+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
92387 till_stall_check = 300;
92388 }
92389 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
92390@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
92391 !ACCESS_ONCE(t->on_rq) ||
92392 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
92393 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
92394- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
92395+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
92396 list_del_init(&t->rcu_tasks_holdout_list);
92397 put_task_struct(t);
92398 return;
92399@@ -588,7 +588,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
92400 !is_idle_task(t)) {
92401 get_task_struct(t);
92402 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
92403- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
92404+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
92405 list_add(&t->rcu_tasks_holdout_list,
92406 &rcu_tasks_holdouts);
92407 }
92408@@ -685,7 +685,7 @@ static void rcu_spawn_tasks_kthread(void)
92409 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
92410 BUG_ON(IS_ERR(t));
92411 smp_mb(); /* Ensure others see full kthread. */
92412- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
92413+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
92414 mutex_unlock(&rcu_tasks_kthread_mutex);
92415 }
92416
92417diff --git a/kernel/resource.c b/kernel/resource.c
92418index 0bcebff..e7cd5b2 100644
92419--- a/kernel/resource.c
92420+++ b/kernel/resource.c
92421@@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
92422
92423 static int __init ioresources_init(void)
92424 {
92425+#ifdef CONFIG_GRKERNSEC_PROC_ADD
92426+#ifdef CONFIG_GRKERNSEC_PROC_USER
92427+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
92428+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
92429+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92430+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
92431+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
92432+#endif
92433+#else
92434 proc_create("ioports", 0, NULL, &proc_ioports_operations);
92435 proc_create("iomem", 0, NULL, &proc_iomem_operations);
92436+#endif
92437 return 0;
92438 }
92439 __initcall(ioresources_init);
92440diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
92441index 8a2e230..6020954 100644
92442--- a/kernel/sched/auto_group.c
92443+++ b/kernel/sched/auto_group.c
92444@@ -11,7 +11,7 @@
92445
92446 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
92447 static struct autogroup autogroup_default;
92448-static atomic_t autogroup_seq_nr;
92449+static atomic_unchecked_t autogroup_seq_nr;
92450
92451 void __init autogroup_init(struct task_struct *init_task)
92452 {
92453@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
92454
92455 kref_init(&ag->kref);
92456 init_rwsem(&ag->lock);
92457- ag->id = atomic_inc_return(&autogroup_seq_nr);
92458+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
92459 ag->tg = tg;
92460 #ifdef CONFIG_RT_GROUP_SCHED
92461 /*
92462diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
92463index a63f4dc..349bbb0 100644
92464--- a/kernel/sched/completion.c
92465+++ b/kernel/sched/completion.c
92466@@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
92467 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92468 * or number of jiffies left till timeout) if completed.
92469 */
92470-long __sched
92471+long __sched __intentional_overflow(-1)
92472 wait_for_completion_interruptible_timeout(struct completion *x,
92473 unsigned long timeout)
92474 {
92475@@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
92476 *
92477 * Return: -ERESTARTSYS if interrupted, 0 if completed.
92478 */
92479-int __sched wait_for_completion_killable(struct completion *x)
92480+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
92481 {
92482 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
92483 if (t == -ERESTARTSYS)
92484@@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
92485 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92486 * or number of jiffies left till timeout) if completed.
92487 */
92488-long __sched
92489+long __sched __intentional_overflow(-1)
92490 wait_for_completion_killable_timeout(struct completion *x,
92491 unsigned long timeout)
92492 {
92493diff --git a/kernel/sched/core.c b/kernel/sched/core.c
92494index efdca2f..e361dfb 100644
92495--- a/kernel/sched/core.c
92496+++ b/kernel/sched/core.c
92497@@ -1890,7 +1890,7 @@ void set_numabalancing_state(bool enabled)
92498 int sysctl_numa_balancing(struct ctl_table *table, int write,
92499 void __user *buffer, size_t *lenp, loff_t *ppos)
92500 {
92501- struct ctl_table t;
92502+ ctl_table_no_const t;
92503 int err;
92504 int state = numabalancing_enabled;
92505
92506@@ -2353,8 +2353,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
92507 next->active_mm = oldmm;
92508 atomic_inc(&oldmm->mm_count);
92509 enter_lazy_tlb(oldmm, next);
92510- } else
92511+ } else {
92512 switch_mm(oldmm, mm, next);
92513+ populate_stack();
92514+ }
92515
92516 if (!prev->mm) {
92517 prev->active_mm = NULL;
92518@@ -3165,6 +3167,8 @@ int can_nice(const struct task_struct *p, const int nice)
92519 /* convert nice value [19,-20] to rlimit style value [1,40] */
92520 int nice_rlim = nice_to_rlimit(nice);
92521
92522+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
92523+
92524 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
92525 capable(CAP_SYS_NICE));
92526 }
92527@@ -3191,7 +3195,8 @@ SYSCALL_DEFINE1(nice, int, increment)
92528 nice = task_nice(current) + increment;
92529
92530 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
92531- if (increment < 0 && !can_nice(current, nice))
92532+ if (increment < 0 && (!can_nice(current, nice) ||
92533+ gr_handle_chroot_nice()))
92534 return -EPERM;
92535
92536 retval = security_task_setnice(current, nice);
92537@@ -3470,6 +3475,7 @@ recheck:
92538 if (policy != p->policy && !rlim_rtprio)
92539 return -EPERM;
92540
92541+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
92542 /* can't increase priority */
92543 if (attr->sched_priority > p->rt_priority &&
92544 attr->sched_priority > rlim_rtprio)
92545@@ -4890,6 +4896,7 @@ void idle_task_exit(void)
92546
92547 if (mm != &init_mm) {
92548 switch_mm(mm, &init_mm, current);
92549+ populate_stack();
92550 finish_arch_post_lock_switch();
92551 }
92552 mmdrop(mm);
92553@@ -4985,7 +4992,7 @@ static void migrate_tasks(unsigned int dead_cpu)
92554
92555 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
92556
92557-static struct ctl_table sd_ctl_dir[] = {
92558+static ctl_table_no_const sd_ctl_dir[] __read_only = {
92559 {
92560 .procname = "sched_domain",
92561 .mode = 0555,
92562@@ -5002,17 +5009,17 @@ static struct ctl_table sd_ctl_root[] = {
92563 {}
92564 };
92565
92566-static struct ctl_table *sd_alloc_ctl_entry(int n)
92567+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
92568 {
92569- struct ctl_table *entry =
92570+ ctl_table_no_const *entry =
92571 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
92572
92573 return entry;
92574 }
92575
92576-static void sd_free_ctl_entry(struct ctl_table **tablep)
92577+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
92578 {
92579- struct ctl_table *entry;
92580+ ctl_table_no_const *entry;
92581
92582 /*
92583 * In the intermediate directories, both the child directory and
92584@@ -5020,22 +5027,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
92585 * will always be set. In the lowest directory the names are
92586 * static strings and all have proc handlers.
92587 */
92588- for (entry = *tablep; entry->mode; entry++) {
92589- if (entry->child)
92590- sd_free_ctl_entry(&entry->child);
92591+ for (entry = tablep; entry->mode; entry++) {
92592+ if (entry->child) {
92593+ sd_free_ctl_entry(entry->child);
92594+ pax_open_kernel();
92595+ entry->child = NULL;
92596+ pax_close_kernel();
92597+ }
92598 if (entry->proc_handler == NULL)
92599 kfree(entry->procname);
92600 }
92601
92602- kfree(*tablep);
92603- *tablep = NULL;
92604+ kfree(tablep);
92605 }
92606
92607 static int min_load_idx = 0;
92608 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
92609
92610 static void
92611-set_table_entry(struct ctl_table *entry,
92612+set_table_entry(ctl_table_no_const *entry,
92613 const char *procname, void *data, int maxlen,
92614 umode_t mode, proc_handler *proc_handler,
92615 bool load_idx)
92616@@ -5055,7 +5065,7 @@ set_table_entry(struct ctl_table *entry,
92617 static struct ctl_table *
92618 sd_alloc_ctl_domain_table(struct sched_domain *sd)
92619 {
92620- struct ctl_table *table = sd_alloc_ctl_entry(14);
92621+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
92622
92623 if (table == NULL)
92624 return NULL;
92625@@ -5093,9 +5103,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
92626 return table;
92627 }
92628
92629-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
92630+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
92631 {
92632- struct ctl_table *entry, *table;
92633+ ctl_table_no_const *entry, *table;
92634 struct sched_domain *sd;
92635 int domain_num = 0, i;
92636 char buf[32];
92637@@ -5122,11 +5132,13 @@ static struct ctl_table_header *sd_sysctl_header;
92638 static void register_sched_domain_sysctl(void)
92639 {
92640 int i, cpu_num = num_possible_cpus();
92641- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
92642+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
92643 char buf[32];
92644
92645 WARN_ON(sd_ctl_dir[0].child);
92646+ pax_open_kernel();
92647 sd_ctl_dir[0].child = entry;
92648+ pax_close_kernel();
92649
92650 if (entry == NULL)
92651 return;
92652@@ -5149,8 +5161,12 @@ static void unregister_sched_domain_sysctl(void)
92653 if (sd_sysctl_header)
92654 unregister_sysctl_table(sd_sysctl_header);
92655 sd_sysctl_header = NULL;
92656- if (sd_ctl_dir[0].child)
92657- sd_free_ctl_entry(&sd_ctl_dir[0].child);
92658+ if (sd_ctl_dir[0].child) {
92659+ sd_free_ctl_entry(sd_ctl_dir[0].child);
92660+ pax_open_kernel();
92661+ sd_ctl_dir[0].child = NULL;
92662+ pax_close_kernel();
92663+ }
92664 }
92665 #else
92666 static void register_sched_domain_sysctl(void)
92667diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
92668index ef2b104..69961f6 100644
92669--- a/kernel/sched/fair.c
92670+++ b/kernel/sched/fair.c
92671@@ -1906,7 +1906,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
92672
92673 static void reset_ptenuma_scan(struct task_struct *p)
92674 {
92675- ACCESS_ONCE(p->mm->numa_scan_seq)++;
92676+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
92677 p->mm->numa_scan_offset = 0;
92678 }
92679
92680@@ -7465,7 +7465,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
92681 * run_rebalance_domains is triggered when needed from the scheduler tick.
92682 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
92683 */
92684-static void run_rebalance_domains(struct softirq_action *h)
92685+static __latent_entropy void run_rebalance_domains(void)
92686 {
92687 struct rq *this_rq = this_rq();
92688 enum cpu_idle_type idle = this_rq->idle_balance ?
92689diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
92690index 2df8ef0..aae070f 100644
92691--- a/kernel/sched/sched.h
92692+++ b/kernel/sched/sched.h
92693@@ -1140,7 +1140,7 @@ struct sched_class {
92694 #ifdef CONFIG_FAIR_GROUP_SCHED
92695 void (*task_move_group) (struct task_struct *p, int on_rq);
92696 #endif
92697-};
92698+} __do_const;
92699
92700 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
92701 {
92702diff --git a/kernel/signal.c b/kernel/signal.c
92703index 8f0876f..1153a5a 100644
92704--- a/kernel/signal.c
92705+++ b/kernel/signal.c
92706@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
92707
92708 int print_fatal_signals __read_mostly;
92709
92710-static void __user *sig_handler(struct task_struct *t, int sig)
92711+static __sighandler_t sig_handler(struct task_struct *t, int sig)
92712 {
92713 return t->sighand->action[sig - 1].sa.sa_handler;
92714 }
92715
92716-static int sig_handler_ignored(void __user *handler, int sig)
92717+static int sig_handler_ignored(__sighandler_t handler, int sig)
92718 {
92719 /* Is it explicitly or implicitly ignored? */
92720 return handler == SIG_IGN ||
92721@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
92722
92723 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
92724 {
92725- void __user *handler;
92726+ __sighandler_t handler;
92727
92728 handler = sig_handler(t, sig);
92729
92730@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
92731 atomic_inc(&user->sigpending);
92732 rcu_read_unlock();
92733
92734+ if (!override_rlimit)
92735+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
92736+
92737 if (override_rlimit ||
92738 atomic_read(&user->sigpending) <=
92739 task_rlimit(t, RLIMIT_SIGPENDING)) {
92740@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
92741
92742 int unhandled_signal(struct task_struct *tsk, int sig)
92743 {
92744- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
92745+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
92746 if (is_global_init(tsk))
92747 return 1;
92748 if (handler != SIG_IGN && handler != SIG_DFL)
92749@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
92750 }
92751 }
92752
92753+ /* allow glibc communication via tgkill to other threads in our
92754+ thread group */
92755+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
92756+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
92757+ && gr_handle_signal(t, sig))
92758+ return -EPERM;
92759+
92760 return security_task_kill(t, info, sig, 0);
92761 }
92762
92763@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92764 return send_signal(sig, info, p, 1);
92765 }
92766
92767-static int
92768+int
92769 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92770 {
92771 return send_signal(sig, info, t, 0);
92772@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92773 unsigned long int flags;
92774 int ret, blocked, ignored;
92775 struct k_sigaction *action;
92776+ int is_unhandled = 0;
92777
92778 spin_lock_irqsave(&t->sighand->siglock, flags);
92779 action = &t->sighand->action[sig-1];
92780@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92781 }
92782 if (action->sa.sa_handler == SIG_DFL)
92783 t->signal->flags &= ~SIGNAL_UNKILLABLE;
92784+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
92785+ is_unhandled = 1;
92786 ret = specific_send_sig_info(sig, info, t);
92787 spin_unlock_irqrestore(&t->sighand->siglock, flags);
92788
92789+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
92790+ normal operation */
92791+ if (is_unhandled) {
92792+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
92793+ gr_handle_crash(t, sig);
92794+ }
92795+
92796 return ret;
92797 }
92798
92799@@ -1300,8 +1320,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92800 ret = check_kill_permission(sig, info, p);
92801 rcu_read_unlock();
92802
92803- if (!ret && sig)
92804+ if (!ret && sig) {
92805 ret = do_send_sig_info(sig, info, p, true);
92806+ if (!ret)
92807+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
92808+ }
92809
92810 return ret;
92811 }
92812@@ -2903,7 +2926,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
92813 int error = -ESRCH;
92814
92815 rcu_read_lock();
92816- p = find_task_by_vpid(pid);
92817+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
92818+ /* allow glibc communication via tgkill to other threads in our
92819+ thread group */
92820+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
92821+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
92822+ p = find_task_by_vpid_unrestricted(pid);
92823+ else
92824+#endif
92825+ p = find_task_by_vpid(pid);
92826 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
92827 error = check_kill_permission(sig, info, p);
92828 /*
92829@@ -3236,8 +3267,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
92830 }
92831 seg = get_fs();
92832 set_fs(KERNEL_DS);
92833- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
92834- (stack_t __force __user *) &uoss,
92835+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
92836+ (stack_t __force_user *) &uoss,
92837 compat_user_stack_pointer());
92838 set_fs(seg);
92839 if (ret >= 0 && uoss_ptr) {
92840diff --git a/kernel/smpboot.c b/kernel/smpboot.c
92841index eb89e18..a4e6792 100644
92842--- a/kernel/smpboot.c
92843+++ b/kernel/smpboot.c
92844@@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
92845 }
92846 smpboot_unpark_thread(plug_thread, cpu);
92847 }
92848- list_add(&plug_thread->list, &hotplug_threads);
92849+ pax_list_add(&plug_thread->list, &hotplug_threads);
92850 out:
92851 mutex_unlock(&smpboot_threads_lock);
92852 return ret;
92853@@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
92854 {
92855 get_online_cpus();
92856 mutex_lock(&smpboot_threads_lock);
92857- list_del(&plug_thread->list);
92858+ pax_list_del(&plug_thread->list);
92859 smpboot_destroy_threads(plug_thread);
92860 mutex_unlock(&smpboot_threads_lock);
92861 put_online_cpus();
92862diff --git a/kernel/softirq.c b/kernel/softirq.c
92863index 0699add..d365ad8 100644
92864--- a/kernel/softirq.c
92865+++ b/kernel/softirq.c
92866@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
92867 EXPORT_SYMBOL(irq_stat);
92868 #endif
92869
92870-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
92871+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
92872
92873 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
92874
92875@@ -266,7 +266,7 @@ restart:
92876 kstat_incr_softirqs_this_cpu(vec_nr);
92877
92878 trace_softirq_entry(vec_nr);
92879- h->action(h);
92880+ h->action();
92881 trace_softirq_exit(vec_nr);
92882 if (unlikely(prev_count != preempt_count())) {
92883 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
92884@@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
92885 or_softirq_pending(1UL << nr);
92886 }
92887
92888-void open_softirq(int nr, void (*action)(struct softirq_action *))
92889+void __init open_softirq(int nr, void (*action)(void))
92890 {
92891 softirq_vec[nr].action = action;
92892 }
92893@@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
92894 }
92895 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
92896
92897-static void tasklet_action(struct softirq_action *a)
92898+static void tasklet_action(void)
92899 {
92900 struct tasklet_struct *list;
92901
92902@@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
92903 }
92904 }
92905
92906-static void tasklet_hi_action(struct softirq_action *a)
92907+static __latent_entropy void tasklet_hi_action(void)
92908 {
92909 struct tasklet_struct *list;
92910
92911@@ -741,7 +741,7 @@ static struct notifier_block cpu_nfb = {
92912 .notifier_call = cpu_callback
92913 };
92914
92915-static struct smp_hotplug_thread softirq_threads = {
92916+static struct smp_hotplug_thread softirq_threads __read_only = {
92917 .store = &ksoftirqd,
92918 .thread_should_run = ksoftirqd_should_run,
92919 .thread_fn = run_ksoftirqd,
92920diff --git a/kernel/sys.c b/kernel/sys.c
92921index 1eaa2f0..d80d27c 100644
92922--- a/kernel/sys.c
92923+++ b/kernel/sys.c
92924@@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
92925 error = -EACCES;
92926 goto out;
92927 }
92928+
92929+ if (gr_handle_chroot_setpriority(p, niceval)) {
92930+ error = -EACCES;
92931+ goto out;
92932+ }
92933+
92934 no_nice = security_task_setnice(p, niceval);
92935 if (no_nice) {
92936 error = no_nice;
92937@@ -353,6 +359,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
92938 goto error;
92939 }
92940
92941+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
92942+ goto error;
92943+
92944+ if (!gid_eq(new->gid, old->gid)) {
92945+ /* make sure we generate a learn log for what will
92946+ end up being a role transition after a full-learning
92947+ policy is generated
92948+ CAP_SETGID is required to perform a transition
92949+ we may not log a CAP_SETGID check above, e.g.
92950+ in the case where new rgid = old egid
92951+ */
92952+ gr_learn_cap(current, new, CAP_SETGID);
92953+ }
92954+
92955 if (rgid != (gid_t) -1 ||
92956 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
92957 new->sgid = new->egid;
92958@@ -388,6 +408,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
92959 old = current_cred();
92960
92961 retval = -EPERM;
92962+
92963+ if (gr_check_group_change(kgid, kgid, kgid))
92964+ goto error;
92965+
92966 if (ns_capable(old->user_ns, CAP_SETGID))
92967 new->gid = new->egid = new->sgid = new->fsgid = kgid;
92968 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
92969@@ -405,7 +429,7 @@ error:
92970 /*
92971 * change the user struct in a credentials set to match the new UID
92972 */
92973-static int set_user(struct cred *new)
92974+int set_user(struct cred *new)
92975 {
92976 struct user_struct *new_user;
92977
92978@@ -485,7 +509,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
92979 goto error;
92980 }
92981
92982+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
92983+ goto error;
92984+
92985 if (!uid_eq(new->uid, old->uid)) {
92986+ /* make sure we generate a learn log for what will
92987+ end up being a role transition after a full-learning
92988+ policy is generated
92989+ CAP_SETUID is required to perform a transition
92990+ we may not log a CAP_SETUID check above, e.g.
92991+ in the case where new ruid = old euid
92992+ */
92993+ gr_learn_cap(current, new, CAP_SETUID);
92994 retval = set_user(new);
92995 if (retval < 0)
92996 goto error;
92997@@ -535,6 +570,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
92998 old = current_cred();
92999
93000 retval = -EPERM;
93001+
93002+ if (gr_check_crash_uid(kuid))
93003+ goto error;
93004+ if (gr_check_user_change(kuid, kuid, kuid))
93005+ goto error;
93006+
93007 if (ns_capable(old->user_ns, CAP_SETUID)) {
93008 new->suid = new->uid = kuid;
93009 if (!uid_eq(kuid, old->uid)) {
93010@@ -604,6 +645,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
93011 goto error;
93012 }
93013
93014+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
93015+ goto error;
93016+
93017 if (ruid != (uid_t) -1) {
93018 new->uid = kruid;
93019 if (!uid_eq(kruid, old->uid)) {
93020@@ -688,6 +732,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
93021 goto error;
93022 }
93023
93024+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
93025+ goto error;
93026+
93027 if (rgid != (gid_t) -1)
93028 new->gid = krgid;
93029 if (egid != (gid_t) -1)
93030@@ -752,12 +799,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
93031 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
93032 ns_capable(old->user_ns, CAP_SETUID)) {
93033 if (!uid_eq(kuid, old->fsuid)) {
93034+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
93035+ goto error;
93036+
93037 new->fsuid = kuid;
93038 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
93039 goto change_okay;
93040 }
93041 }
93042
93043+error:
93044 abort_creds(new);
93045 return old_fsuid;
93046
93047@@ -790,12 +841,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
93048 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
93049 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
93050 ns_capable(old->user_ns, CAP_SETGID)) {
93051+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
93052+ goto error;
93053+
93054 if (!gid_eq(kgid, old->fsgid)) {
93055 new->fsgid = kgid;
93056 goto change_okay;
93057 }
93058 }
93059
93060+error:
93061 abort_creds(new);
93062 return old_fsgid;
93063
93064@@ -1172,19 +1227,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
93065 return -EFAULT;
93066
93067 down_read(&uts_sem);
93068- error = __copy_to_user(&name->sysname, &utsname()->sysname,
93069+ error = __copy_to_user(name->sysname, &utsname()->sysname,
93070 __OLD_UTS_LEN);
93071 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
93072- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
93073+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
93074 __OLD_UTS_LEN);
93075 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
93076- error |= __copy_to_user(&name->release, &utsname()->release,
93077+ error |= __copy_to_user(name->release, &utsname()->release,
93078 __OLD_UTS_LEN);
93079 error |= __put_user(0, name->release + __OLD_UTS_LEN);
93080- error |= __copy_to_user(&name->version, &utsname()->version,
93081+ error |= __copy_to_user(name->version, &utsname()->version,
93082 __OLD_UTS_LEN);
93083 error |= __put_user(0, name->version + __OLD_UTS_LEN);
93084- error |= __copy_to_user(&name->machine, &utsname()->machine,
93085+ error |= __copy_to_user(name->machine, &utsname()->machine,
93086 __OLD_UTS_LEN);
93087 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
93088 up_read(&uts_sem);
93089@@ -1385,6 +1440,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
93090 */
93091 new_rlim->rlim_cur = 1;
93092 }
93093+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
93094+ is changed to a lower value. Since tasks can be created by the same
93095+ user in between this limit change and an execve by this task, force
93096+ a recheck only for this task by setting PF_NPROC_EXCEEDED
93097+ */
93098+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
93099+ tsk->flags |= PF_NPROC_EXCEEDED;
93100 }
93101 if (!retval) {
93102 if (old_rlim)
93103diff --git a/kernel/sysctl.c b/kernel/sysctl.c
93104index 15f2511..181b356 100644
93105--- a/kernel/sysctl.c
93106+++ b/kernel/sysctl.c
93107@@ -94,7 +94,6 @@
93108
93109
93110 #if defined(CONFIG_SYSCTL)
93111-
93112 /* External variables not in a header file. */
93113 extern int max_threads;
93114 extern int suid_dumpable;
93115@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
93116
93117 /* Constants used for minimum and maximum */
93118 #ifdef CONFIG_LOCKUP_DETECTOR
93119-static int sixty = 60;
93120+static int sixty __read_only = 60;
93121 #endif
93122
93123-static int __maybe_unused neg_one = -1;
93124+static int __maybe_unused neg_one __read_only = -1;
93125
93126-static int zero;
93127-static int __maybe_unused one = 1;
93128-static int __maybe_unused two = 2;
93129-static int __maybe_unused four = 4;
93130-static unsigned long one_ul = 1;
93131-static int one_hundred = 100;
93132+static int zero __read_only = 0;
93133+static int __maybe_unused one __read_only = 1;
93134+static int __maybe_unused two __read_only = 2;
93135+static int __maybe_unused three __read_only = 3;
93136+static int __maybe_unused four __read_only = 4;
93137+static unsigned long one_ul __read_only = 1;
93138+static int one_hundred __read_only = 100;
93139 #ifdef CONFIG_PRINTK
93140-static int ten_thousand = 10000;
93141+static int ten_thousand __read_only = 10000;
93142 #endif
93143
93144 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
93145@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
93146 void __user *buffer, size_t *lenp, loff_t *ppos);
93147 #endif
93148
93149-#ifdef CONFIG_PRINTK
93150 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
93151 void __user *buffer, size_t *lenp, loff_t *ppos);
93152-#endif
93153
93154 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
93155 void __user *buffer, size_t *lenp, loff_t *ppos);
93156@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
93157
93158 #endif
93159
93160+extern struct ctl_table grsecurity_table[];
93161+
93162 static struct ctl_table kern_table[];
93163 static struct ctl_table vm_table[];
93164 static struct ctl_table fs_table[];
93165@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
93166 int sysctl_legacy_va_layout;
93167 #endif
93168
93169+#ifdef CONFIG_PAX_SOFTMODE
93170+static struct ctl_table pax_table[] = {
93171+ {
93172+ .procname = "softmode",
93173+ .data = &pax_softmode,
93174+ .maxlen = sizeof(unsigned int),
93175+ .mode = 0600,
93176+ .proc_handler = &proc_dointvec,
93177+ },
93178+
93179+ { }
93180+};
93181+#endif
93182+
93183 /* The default sysctl tables: */
93184
93185 static struct ctl_table sysctl_base_table[] = {
93186@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
93187 #endif
93188
93189 static struct ctl_table kern_table[] = {
93190+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
93191+ {
93192+ .procname = "grsecurity",
93193+ .mode = 0500,
93194+ .child = grsecurity_table,
93195+ },
93196+#endif
93197+
93198+#ifdef CONFIG_PAX_SOFTMODE
93199+ {
93200+ .procname = "pax",
93201+ .mode = 0500,
93202+ .child = pax_table,
93203+ },
93204+#endif
93205+
93206 {
93207 .procname = "sched_child_runs_first",
93208 .data = &sysctl_sched_child_runs_first,
93209@@ -642,7 +672,7 @@ static struct ctl_table kern_table[] = {
93210 .data = &modprobe_path,
93211 .maxlen = KMOD_PATH_LEN,
93212 .mode = 0644,
93213- .proc_handler = proc_dostring,
93214+ .proc_handler = proc_dostring_modpriv,
93215 },
93216 {
93217 .procname = "modules_disabled",
93218@@ -809,16 +839,20 @@ static struct ctl_table kern_table[] = {
93219 .extra1 = &zero,
93220 .extra2 = &one,
93221 },
93222+#endif
93223 {
93224 .procname = "kptr_restrict",
93225 .data = &kptr_restrict,
93226 .maxlen = sizeof(int),
93227 .mode = 0644,
93228 .proc_handler = proc_dointvec_minmax_sysadmin,
93229+#ifdef CONFIG_GRKERNSEC_HIDESYM
93230+ .extra1 = &two,
93231+#else
93232 .extra1 = &zero,
93233+#endif
93234 .extra2 = &two,
93235 },
93236-#endif
93237 {
93238 .procname = "ngroups_max",
93239 .data = &ngroups_max,
93240@@ -1065,10 +1099,17 @@ static struct ctl_table kern_table[] = {
93241 */
93242 {
93243 .procname = "perf_event_paranoid",
93244- .data = &sysctl_perf_event_paranoid,
93245- .maxlen = sizeof(sysctl_perf_event_paranoid),
93246+ .data = &sysctl_perf_event_legitimately_concerned,
93247+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
93248 .mode = 0644,
93249- .proc_handler = proc_dointvec,
93250+ /* go ahead, be a hero */
93251+ .proc_handler = proc_dointvec_minmax_sysadmin,
93252+ .extra1 = &neg_one,
93253+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
93254+ .extra2 = &three,
93255+#else
93256+ .extra2 = &two,
93257+#endif
93258 },
93259 {
93260 .procname = "perf_event_mlock_kb",
93261@@ -1327,6 +1368,13 @@ static struct ctl_table vm_table[] = {
93262 .proc_handler = proc_dointvec_minmax,
93263 .extra1 = &zero,
93264 },
93265+ {
93266+ .procname = "heap_stack_gap",
93267+ .data = &sysctl_heap_stack_gap,
93268+ .maxlen = sizeof(sysctl_heap_stack_gap),
93269+ .mode = 0644,
93270+ .proc_handler = proc_doulongvec_minmax,
93271+ },
93272 #else
93273 {
93274 .procname = "nr_trim_pages",
93275@@ -1809,6 +1857,16 @@ int proc_dostring(struct ctl_table *table, int write,
93276 (char __user *)buffer, lenp, ppos);
93277 }
93278
93279+int proc_dostring_modpriv(struct ctl_table *table, int write,
93280+ void __user *buffer, size_t *lenp, loff_t *ppos)
93281+{
93282+ if (write && !capable(CAP_SYS_MODULE))
93283+ return -EPERM;
93284+
93285+ return _proc_do_string(table->data, table->maxlen, write,
93286+ buffer, lenp, ppos);
93287+}
93288+
93289 static size_t proc_skip_spaces(char **buf)
93290 {
93291 size_t ret;
93292@@ -1914,6 +1972,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
93293 len = strlen(tmp);
93294 if (len > *size)
93295 len = *size;
93296+ if (len > sizeof(tmp))
93297+ len = sizeof(tmp);
93298 if (copy_to_user(*buf, tmp, len))
93299 return -EFAULT;
93300 *size -= len;
93301@@ -2091,7 +2151,7 @@ int proc_dointvec(struct ctl_table *table, int write,
93302 static int proc_taint(struct ctl_table *table, int write,
93303 void __user *buffer, size_t *lenp, loff_t *ppos)
93304 {
93305- struct ctl_table t;
93306+ ctl_table_no_const t;
93307 unsigned long tmptaint = get_taint();
93308 int err;
93309
93310@@ -2119,7 +2179,6 @@ static int proc_taint(struct ctl_table *table, int write,
93311 return err;
93312 }
93313
93314-#ifdef CONFIG_PRINTK
93315 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
93316 void __user *buffer, size_t *lenp, loff_t *ppos)
93317 {
93318@@ -2128,7 +2187,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
93319
93320 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
93321 }
93322-#endif
93323
93324 struct do_proc_dointvec_minmax_conv_param {
93325 int *min;
93326@@ -2688,6 +2746,12 @@ int proc_dostring(struct ctl_table *table, int write,
93327 return -ENOSYS;
93328 }
93329
93330+int proc_dostring_modpriv(struct ctl_table *table, int write,
93331+ void __user *buffer, size_t *lenp, loff_t *ppos)
93332+{
93333+ return -ENOSYS;
93334+}
93335+
93336 int proc_dointvec(struct ctl_table *table, int write,
93337 void __user *buffer, size_t *lenp, loff_t *ppos)
93338 {
93339@@ -2744,5 +2808,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
93340 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
93341 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
93342 EXPORT_SYMBOL(proc_dostring);
93343+EXPORT_SYMBOL(proc_dostring_modpriv);
93344 EXPORT_SYMBOL(proc_doulongvec_minmax);
93345 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
93346diff --git a/kernel/taskstats.c b/kernel/taskstats.c
93347index b312fcc7..753d72d 100644
93348--- a/kernel/taskstats.c
93349+++ b/kernel/taskstats.c
93350@@ -28,9 +28,12 @@
93351 #include <linux/fs.h>
93352 #include <linux/file.h>
93353 #include <linux/pid_namespace.h>
93354+#include <linux/grsecurity.h>
93355 #include <net/genetlink.h>
93356 #include <linux/atomic.h>
93357
93358+extern int gr_is_taskstats_denied(int pid);
93359+
93360 /*
93361 * Maximum length of a cpumask that can be specified in
93362 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
93363@@ -576,6 +579,9 @@ err:
93364
93365 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
93366 {
93367+ if (gr_is_taskstats_denied(current->pid))
93368+ return -EACCES;
93369+
93370 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
93371 return cmd_attr_register_cpumask(info);
93372 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
93373diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
93374index a7077d3..dd48a49 100644
93375--- a/kernel/time/alarmtimer.c
93376+++ b/kernel/time/alarmtimer.c
93377@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
93378 struct platform_device *pdev;
93379 int error = 0;
93380 int i;
93381- struct k_clock alarm_clock = {
93382+ static struct k_clock alarm_clock = {
93383 .clock_getres = alarm_clock_getres,
93384 .clock_get = alarm_clock_get,
93385 .timer_create = alarm_timer_create,
93386diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
93387index 37e50aa..57a9501 100644
93388--- a/kernel/time/hrtimer.c
93389+++ b/kernel/time/hrtimer.c
93390@@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
93391 local_irq_restore(flags);
93392 }
93393
93394-static void run_hrtimer_softirq(struct softirq_action *h)
93395+static __latent_entropy void run_hrtimer_softirq(void)
93396 {
93397 hrtimer_peek_ahead_timers();
93398 }
93399diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
93400index a16b678..8c5bd9d 100644
93401--- a/kernel/time/posix-cpu-timers.c
93402+++ b/kernel/time/posix-cpu-timers.c
93403@@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
93404
93405 static __init int init_posix_cpu_timers(void)
93406 {
93407- struct k_clock process = {
93408+ static struct k_clock process = {
93409 .clock_getres = process_cpu_clock_getres,
93410 .clock_get = process_cpu_clock_get,
93411 .timer_create = process_cpu_timer_create,
93412 .nsleep = process_cpu_nsleep,
93413 .nsleep_restart = process_cpu_nsleep_restart,
93414 };
93415- struct k_clock thread = {
93416+ static struct k_clock thread = {
93417 .clock_getres = thread_cpu_clock_getres,
93418 .clock_get = thread_cpu_clock_get,
93419 .timer_create = thread_cpu_timer_create,
93420diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
93421index 31ea01f..7fc61ef 100644
93422--- a/kernel/time/posix-timers.c
93423+++ b/kernel/time/posix-timers.c
93424@@ -43,6 +43,7 @@
93425 #include <linux/hash.h>
93426 #include <linux/posix-clock.h>
93427 #include <linux/posix-timers.h>
93428+#include <linux/grsecurity.h>
93429 #include <linux/syscalls.h>
93430 #include <linux/wait.h>
93431 #include <linux/workqueue.h>
93432@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
93433 * which we beg off on and pass to do_sys_settimeofday().
93434 */
93435
93436-static struct k_clock posix_clocks[MAX_CLOCKS];
93437+static struct k_clock *posix_clocks[MAX_CLOCKS];
93438
93439 /*
93440 * These ones are defined below.
93441@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
93442 */
93443 static __init int init_posix_timers(void)
93444 {
93445- struct k_clock clock_realtime = {
93446+ static struct k_clock clock_realtime = {
93447 .clock_getres = hrtimer_get_res,
93448 .clock_get = posix_clock_realtime_get,
93449 .clock_set = posix_clock_realtime_set,
93450@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
93451 .timer_get = common_timer_get,
93452 .timer_del = common_timer_del,
93453 };
93454- struct k_clock clock_monotonic = {
93455+ static struct k_clock clock_monotonic = {
93456 .clock_getres = hrtimer_get_res,
93457 .clock_get = posix_ktime_get_ts,
93458 .nsleep = common_nsleep,
93459@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
93460 .timer_get = common_timer_get,
93461 .timer_del = common_timer_del,
93462 };
93463- struct k_clock clock_monotonic_raw = {
93464+ static struct k_clock clock_monotonic_raw = {
93465 .clock_getres = hrtimer_get_res,
93466 .clock_get = posix_get_monotonic_raw,
93467 };
93468- struct k_clock clock_realtime_coarse = {
93469+ static struct k_clock clock_realtime_coarse = {
93470 .clock_getres = posix_get_coarse_res,
93471 .clock_get = posix_get_realtime_coarse,
93472 };
93473- struct k_clock clock_monotonic_coarse = {
93474+ static struct k_clock clock_monotonic_coarse = {
93475 .clock_getres = posix_get_coarse_res,
93476 .clock_get = posix_get_monotonic_coarse,
93477 };
93478- struct k_clock clock_tai = {
93479+ static struct k_clock clock_tai = {
93480 .clock_getres = hrtimer_get_res,
93481 .clock_get = posix_get_tai,
93482 .nsleep = common_nsleep,
93483@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
93484 .timer_get = common_timer_get,
93485 .timer_del = common_timer_del,
93486 };
93487- struct k_clock clock_boottime = {
93488+ static struct k_clock clock_boottime = {
93489 .clock_getres = hrtimer_get_res,
93490 .clock_get = posix_get_boottime,
93491 .nsleep = common_nsleep,
93492@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
93493 return;
93494 }
93495
93496- posix_clocks[clock_id] = *new_clock;
93497+ posix_clocks[clock_id] = new_clock;
93498 }
93499 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
93500
93501@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
93502 return (id & CLOCKFD_MASK) == CLOCKFD ?
93503 &clock_posix_dynamic : &clock_posix_cpu;
93504
93505- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
93506+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
93507 return NULL;
93508- return &posix_clocks[id];
93509+ return posix_clocks[id];
93510 }
93511
93512 static int common_timer_create(struct k_itimer *new_timer)
93513@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
93514 struct k_clock *kc = clockid_to_kclock(which_clock);
93515 struct k_itimer *new_timer;
93516 int error, new_timer_id;
93517- sigevent_t event;
93518+ sigevent_t event = { };
93519 int it_id_set = IT_ID_NOT_SET;
93520
93521 if (!kc)
93522@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
93523 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
93524 return -EFAULT;
93525
93526+ /* only the CLOCK_REALTIME clock can be set, all other clocks
93527+ have their clock_set fptr set to a nosettime dummy function
93528+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
93529+ call common_clock_set, which calls do_sys_settimeofday, which
93530+ we hook
93531+ */
93532+
93533 return kc->clock_set(which_clock, &new_tp);
93534 }
93535
93536diff --git a/kernel/time/time.c b/kernel/time/time.c
93537index 22d5d3b..70caeb2 100644
93538--- a/kernel/time/time.c
93539+++ b/kernel/time/time.c
93540@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
93541 return error;
93542
93543 if (tz) {
93544+ /* we log in do_settimeofday called below, so don't log twice
93545+ */
93546+ if (!tv)
93547+ gr_log_timechange();
93548+
93549 sys_tz = *tz;
93550 update_vsyscall_tz();
93551 if (firsttime) {
93552diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
93553index ec1791f..6a086cd 100644
93554--- a/kernel/time/timekeeping.c
93555+++ b/kernel/time/timekeeping.c
93556@@ -15,6 +15,7 @@
93557 #include <linux/init.h>
93558 #include <linux/mm.h>
93559 #include <linux/sched.h>
93560+#include <linux/grsecurity.h>
93561 #include <linux/syscore_ops.h>
93562 #include <linux/clocksource.h>
93563 #include <linux/jiffies.h>
93564@@ -717,6 +718,8 @@ int do_settimeofday(const struct timespec *tv)
93565 if (!timespec_valid_strict(tv))
93566 return -EINVAL;
93567
93568+ gr_log_timechange();
93569+
93570 raw_spin_lock_irqsave(&timekeeper_lock, flags);
93571 write_seqcount_begin(&tk_core.seq);
93572
93573diff --git a/kernel/time/timer.c b/kernel/time/timer.c
93574index 3260ffd..c93cd5e 100644
93575--- a/kernel/time/timer.c
93576+++ b/kernel/time/timer.c
93577@@ -1394,7 +1394,7 @@ void update_process_times(int user_tick)
93578 /*
93579 * This function runs timers and the timer-tq in bottom half context.
93580 */
93581-static void run_timer_softirq(struct softirq_action *h)
93582+static __latent_entropy void run_timer_softirq(void)
93583 {
93584 struct tvec_base *base = __this_cpu_read(tvec_bases);
93585
93586@@ -1457,7 +1457,7 @@ static void process_timeout(unsigned long __data)
93587 *
93588 * In all cases the return value is guaranteed to be non-negative.
93589 */
93590-signed long __sched schedule_timeout(signed long timeout)
93591+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
93592 {
93593 struct timer_list timer;
93594 unsigned long expire;
93595diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
93596index 61ed862..3b52c65 100644
93597--- a/kernel/time/timer_list.c
93598+++ b/kernel/time/timer_list.c
93599@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
93600
93601 static void print_name_offset(struct seq_file *m, void *sym)
93602 {
93603+#ifdef CONFIG_GRKERNSEC_HIDESYM
93604+ SEQ_printf(m, "<%p>", NULL);
93605+#else
93606 char symname[KSYM_NAME_LEN];
93607
93608 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
93609 SEQ_printf(m, "<%pK>", sym);
93610 else
93611 SEQ_printf(m, "%s", symname);
93612+#endif
93613 }
93614
93615 static void
93616@@ -119,7 +123,11 @@ next_one:
93617 static void
93618 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
93619 {
93620+#ifdef CONFIG_GRKERNSEC_HIDESYM
93621+ SEQ_printf(m, " .base: %p\n", NULL);
93622+#else
93623 SEQ_printf(m, " .base: %pK\n", base);
93624+#endif
93625 SEQ_printf(m, " .index: %d\n",
93626 base->index);
93627 SEQ_printf(m, " .resolution: %Lu nsecs\n",
93628@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
93629 {
93630 struct proc_dir_entry *pe;
93631
93632+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93633+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
93634+#else
93635 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
93636+#endif
93637 if (!pe)
93638 return -ENOMEM;
93639 return 0;
93640diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
93641index 1fb08f2..ca4bb1e 100644
93642--- a/kernel/time/timer_stats.c
93643+++ b/kernel/time/timer_stats.c
93644@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
93645 static unsigned long nr_entries;
93646 static struct entry entries[MAX_ENTRIES];
93647
93648-static atomic_t overflow_count;
93649+static atomic_unchecked_t overflow_count;
93650
93651 /*
93652 * The entries are in a hash-table, for fast lookup:
93653@@ -140,7 +140,7 @@ static void reset_entries(void)
93654 nr_entries = 0;
93655 memset(entries, 0, sizeof(entries));
93656 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
93657- atomic_set(&overflow_count, 0);
93658+ atomic_set_unchecked(&overflow_count, 0);
93659 }
93660
93661 static struct entry *alloc_entry(void)
93662@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93663 if (likely(entry))
93664 entry->count++;
93665 else
93666- atomic_inc(&overflow_count);
93667+ atomic_inc_unchecked(&overflow_count);
93668
93669 out_unlock:
93670 raw_spin_unlock_irqrestore(lock, flags);
93671@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93672
93673 static void print_name_offset(struct seq_file *m, unsigned long addr)
93674 {
93675+#ifdef CONFIG_GRKERNSEC_HIDESYM
93676+ seq_printf(m, "<%p>", NULL);
93677+#else
93678 char symname[KSYM_NAME_LEN];
93679
93680 if (lookup_symbol_name(addr, symname) < 0)
93681- seq_printf(m, "<%p>", (void *)addr);
93682+ seq_printf(m, "<%pK>", (void *)addr);
93683 else
93684 seq_printf(m, "%s", symname);
93685+#endif
93686 }
93687
93688 static int tstats_show(struct seq_file *m, void *v)
93689@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
93690
93691 seq_puts(m, "Timer Stats Version: v0.3\n");
93692 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
93693- if (atomic_read(&overflow_count))
93694- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
93695+ if (atomic_read_unchecked(&overflow_count))
93696+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
93697 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
93698
93699 for (i = 0; i < nr_entries; i++) {
93700@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
93701 {
93702 struct proc_dir_entry *pe;
93703
93704+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93705+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
93706+#else
93707 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
93708+#endif
93709 if (!pe)
93710 return -ENOMEM;
93711 return 0;
93712diff --git a/kernel/torture.c b/kernel/torture.c
93713index dd70993..0bf694b 100644
93714--- a/kernel/torture.c
93715+++ b/kernel/torture.c
93716@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
93717 mutex_lock(&fullstop_mutex);
93718 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
93719 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
93720- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
93721+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
93722 } else {
93723 pr_warn("Concurrent rmmod and shutdown illegal!\n");
93724 }
93725@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
93726 if (!torture_must_stop()) {
93727 if (stutter > 1) {
93728 schedule_timeout_interruptible(stutter - 1);
93729- ACCESS_ONCE(stutter_pause_test) = 2;
93730+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
93731 }
93732 schedule_timeout_interruptible(1);
93733- ACCESS_ONCE(stutter_pause_test) = 1;
93734+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
93735 }
93736 if (!torture_must_stop())
93737 schedule_timeout_interruptible(stutter);
93738- ACCESS_ONCE(stutter_pause_test) = 0;
93739+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
93740 torture_shutdown_absorb("torture_stutter");
93741 } while (!torture_must_stop());
93742 torture_kthread_stopping("torture_stutter");
93743@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
93744 schedule_timeout_uninterruptible(10);
93745 return true;
93746 }
93747- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
93748+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
93749 mutex_unlock(&fullstop_mutex);
93750 torture_shutdown_cleanup();
93751 torture_shuffle_cleanup();
93752diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
93753index c1bd4ad..4b861dc 100644
93754--- a/kernel/trace/blktrace.c
93755+++ b/kernel/trace/blktrace.c
93756@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
93757 struct blk_trace *bt = filp->private_data;
93758 char buf[16];
93759
93760- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
93761+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
93762
93763 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
93764 }
93765@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
93766 return 1;
93767
93768 bt = buf->chan->private_data;
93769- atomic_inc(&bt->dropped);
93770+ atomic_inc_unchecked(&bt->dropped);
93771 return 0;
93772 }
93773
93774@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
93775
93776 bt->dir = dir;
93777 bt->dev = dev;
93778- atomic_set(&bt->dropped, 0);
93779+ atomic_set_unchecked(&bt->dropped, 0);
93780 INIT_LIST_HEAD(&bt->running_list);
93781
93782 ret = -EIO;
93783diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
93784index 124e2c7..762ca29 100644
93785--- a/kernel/trace/ftrace.c
93786+++ b/kernel/trace/ftrace.c
93787@@ -2183,12 +2183,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
93788 if (unlikely(ftrace_disabled))
93789 return 0;
93790
93791+ ret = ftrace_arch_code_modify_prepare();
93792+ FTRACE_WARN_ON(ret);
93793+ if (ret)
93794+ return 0;
93795+
93796 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
93797+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
93798 if (ret) {
93799 ftrace_bug(ret, ip);
93800- return 0;
93801 }
93802- return 1;
93803+ return ret ? 0 : 1;
93804 }
93805
93806 /*
93807@@ -4529,8 +4534,10 @@ static int ftrace_process_locs(struct module *mod,
93808 if (!count)
93809 return 0;
93810
93811+ pax_open_kernel();
93812 sort(start, count, sizeof(*start),
93813 ftrace_cmp_ips, ftrace_swap_ips);
93814+ pax_close_kernel();
93815
93816 start_pg = ftrace_allocate_pages(count);
93817 if (!start_pg)
93818@@ -5377,7 +5384,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
93819
93820 if (t->ret_stack == NULL) {
93821 atomic_set(&t->tracing_graph_pause, 0);
93822- atomic_set(&t->trace_overrun, 0);
93823+ atomic_set_unchecked(&t->trace_overrun, 0);
93824 t->curr_ret_stack = -1;
93825 /* Make sure the tasks see the -1 first: */
93826 smp_wmb();
93827@@ -5590,7 +5597,7 @@ static void
93828 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
93829 {
93830 atomic_set(&t->tracing_graph_pause, 0);
93831- atomic_set(&t->trace_overrun, 0);
93832+ atomic_set_unchecked(&t->trace_overrun, 0);
93833 t->ftrace_timestamp = 0;
93834 /* make curr_ret_stack visible before we add the ret_stack */
93835 smp_wmb();
93836diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
93837index a56e07c..d46f0ba 100644
93838--- a/kernel/trace/ring_buffer.c
93839+++ b/kernel/trace/ring_buffer.c
93840@@ -352,9 +352,9 @@ struct buffer_data_page {
93841 */
93842 struct buffer_page {
93843 struct list_head list; /* list of buffer pages */
93844- local_t write; /* index for next write */
93845+ local_unchecked_t write; /* index for next write */
93846 unsigned read; /* index for next read */
93847- local_t entries; /* entries on this page */
93848+ local_unchecked_t entries; /* entries on this page */
93849 unsigned long real_end; /* real end of data */
93850 struct buffer_data_page *page; /* Actual data page */
93851 };
93852@@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
93853 unsigned long last_overrun;
93854 local_t entries_bytes;
93855 local_t entries;
93856- local_t overrun;
93857- local_t commit_overrun;
93858+ local_unchecked_t overrun;
93859+ local_unchecked_t commit_overrun;
93860 local_t dropped_events;
93861 local_t committing;
93862 local_t commits;
93863@@ -1032,8 +1032,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93864 *
93865 * We add a counter to the write field to denote this.
93866 */
93867- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
93868- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
93869+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
93870+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
93871
93872 /*
93873 * Just make sure we have seen our old_write and synchronize
93874@@ -1061,8 +1061,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93875 * cmpxchg to only update if an interrupt did not already
93876 * do it for us. If the cmpxchg fails, we don't care.
93877 */
93878- (void)local_cmpxchg(&next_page->write, old_write, val);
93879- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
93880+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
93881+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
93882
93883 /*
93884 * No need to worry about races with clearing out the commit.
93885@@ -1429,12 +1429,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
93886
93887 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
93888 {
93889- return local_read(&bpage->entries) & RB_WRITE_MASK;
93890+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
93891 }
93892
93893 static inline unsigned long rb_page_write(struct buffer_page *bpage)
93894 {
93895- return local_read(&bpage->write) & RB_WRITE_MASK;
93896+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
93897 }
93898
93899 static int
93900@@ -1529,7 +1529,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
93901 * bytes consumed in ring buffer from here.
93902 * Increment overrun to account for the lost events.
93903 */
93904- local_add(page_entries, &cpu_buffer->overrun);
93905+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
93906 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93907 }
93908
93909@@ -2091,7 +2091,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
93910 * it is our responsibility to update
93911 * the counters.
93912 */
93913- local_add(entries, &cpu_buffer->overrun);
93914+ local_add_unchecked(entries, &cpu_buffer->overrun);
93915 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93916
93917 /*
93918@@ -2241,7 +2241,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93919 if (tail == BUF_PAGE_SIZE)
93920 tail_page->real_end = 0;
93921
93922- local_sub(length, &tail_page->write);
93923+ local_sub_unchecked(length, &tail_page->write);
93924 return;
93925 }
93926
93927@@ -2276,7 +2276,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93928 rb_event_set_padding(event);
93929
93930 /* Set the write back to the previous setting */
93931- local_sub(length, &tail_page->write);
93932+ local_sub_unchecked(length, &tail_page->write);
93933 return;
93934 }
93935
93936@@ -2288,7 +2288,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93937
93938 /* Set write to end of buffer */
93939 length = (tail + length) - BUF_PAGE_SIZE;
93940- local_sub(length, &tail_page->write);
93941+ local_sub_unchecked(length, &tail_page->write);
93942 }
93943
93944 /*
93945@@ -2314,7 +2314,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93946 * about it.
93947 */
93948 if (unlikely(next_page == commit_page)) {
93949- local_inc(&cpu_buffer->commit_overrun);
93950+ local_inc_unchecked(&cpu_buffer->commit_overrun);
93951 goto out_reset;
93952 }
93953
93954@@ -2370,7 +2370,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93955 cpu_buffer->tail_page) &&
93956 (cpu_buffer->commit_page ==
93957 cpu_buffer->reader_page))) {
93958- local_inc(&cpu_buffer->commit_overrun);
93959+ local_inc_unchecked(&cpu_buffer->commit_overrun);
93960 goto out_reset;
93961 }
93962 }
93963@@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93964 length += RB_LEN_TIME_EXTEND;
93965
93966 tail_page = cpu_buffer->tail_page;
93967- write = local_add_return(length, &tail_page->write);
93968+ write = local_add_return_unchecked(length, &tail_page->write);
93969
93970 /* set write to only the index of the write */
93971 write &= RB_WRITE_MASK;
93972@@ -2442,7 +2442,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93973 kmemcheck_annotate_bitfield(event, bitfield);
93974 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
93975
93976- local_inc(&tail_page->entries);
93977+ local_inc_unchecked(&tail_page->entries);
93978
93979 /*
93980 * If this is the first commit on the page, then update
93981@@ -2475,7 +2475,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93982
93983 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
93984 unsigned long write_mask =
93985- local_read(&bpage->write) & ~RB_WRITE_MASK;
93986+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
93987 unsigned long event_length = rb_event_length(event);
93988 /*
93989 * This is on the tail page. It is possible that
93990@@ -2485,7 +2485,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93991 */
93992 old_index += write_mask;
93993 new_index += write_mask;
93994- index = local_cmpxchg(&bpage->write, old_index, new_index);
93995+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
93996 if (index == old_index) {
93997 /* update counters */
93998 local_sub(event_length, &cpu_buffer->entries_bytes);
93999@@ -2877,7 +2877,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
94000
94001 /* Do the likely case first */
94002 if (likely(bpage->page == (void *)addr)) {
94003- local_dec(&bpage->entries);
94004+ local_dec_unchecked(&bpage->entries);
94005 return;
94006 }
94007
94008@@ -2889,7 +2889,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
94009 start = bpage;
94010 do {
94011 if (bpage->page == (void *)addr) {
94012- local_dec(&bpage->entries);
94013+ local_dec_unchecked(&bpage->entries);
94014 return;
94015 }
94016 rb_inc_page(cpu_buffer, &bpage);
94017@@ -3173,7 +3173,7 @@ static inline unsigned long
94018 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
94019 {
94020 return local_read(&cpu_buffer->entries) -
94021- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
94022+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
94023 }
94024
94025 /**
94026@@ -3262,7 +3262,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
94027 return 0;
94028
94029 cpu_buffer = buffer->buffers[cpu];
94030- ret = local_read(&cpu_buffer->overrun);
94031+ ret = local_read_unchecked(&cpu_buffer->overrun);
94032
94033 return ret;
94034 }
94035@@ -3285,7 +3285,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
94036 return 0;
94037
94038 cpu_buffer = buffer->buffers[cpu];
94039- ret = local_read(&cpu_buffer->commit_overrun);
94040+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
94041
94042 return ret;
94043 }
94044@@ -3370,7 +3370,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
94045 /* if you care about this being correct, lock the buffer */
94046 for_each_buffer_cpu(buffer, cpu) {
94047 cpu_buffer = buffer->buffers[cpu];
94048- overruns += local_read(&cpu_buffer->overrun);
94049+ overruns += local_read_unchecked(&cpu_buffer->overrun);
94050 }
94051
94052 return overruns;
94053@@ -3541,8 +3541,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
94054 /*
94055 * Reset the reader page to size zero.
94056 */
94057- local_set(&cpu_buffer->reader_page->write, 0);
94058- local_set(&cpu_buffer->reader_page->entries, 0);
94059+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
94060+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
94061 local_set(&cpu_buffer->reader_page->page->commit, 0);
94062 cpu_buffer->reader_page->real_end = 0;
94063
94064@@ -3576,7 +3576,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
94065 * want to compare with the last_overrun.
94066 */
94067 smp_mb();
94068- overwrite = local_read(&(cpu_buffer->overrun));
94069+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
94070
94071 /*
94072 * Here's the tricky part.
94073@@ -4148,8 +4148,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
94074
94075 cpu_buffer->head_page
94076 = list_entry(cpu_buffer->pages, struct buffer_page, list);
94077- local_set(&cpu_buffer->head_page->write, 0);
94078- local_set(&cpu_buffer->head_page->entries, 0);
94079+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
94080+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
94081 local_set(&cpu_buffer->head_page->page->commit, 0);
94082
94083 cpu_buffer->head_page->read = 0;
94084@@ -4159,14 +4159,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
94085
94086 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
94087 INIT_LIST_HEAD(&cpu_buffer->new_pages);
94088- local_set(&cpu_buffer->reader_page->write, 0);
94089- local_set(&cpu_buffer->reader_page->entries, 0);
94090+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
94091+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
94092 local_set(&cpu_buffer->reader_page->page->commit, 0);
94093 cpu_buffer->reader_page->read = 0;
94094
94095 local_set(&cpu_buffer->entries_bytes, 0);
94096- local_set(&cpu_buffer->overrun, 0);
94097- local_set(&cpu_buffer->commit_overrun, 0);
94098+ local_set_unchecked(&cpu_buffer->overrun, 0);
94099+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
94100 local_set(&cpu_buffer->dropped_events, 0);
94101 local_set(&cpu_buffer->entries, 0);
94102 local_set(&cpu_buffer->committing, 0);
94103@@ -4571,8 +4571,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
94104 rb_init_page(bpage);
94105 bpage = reader->page;
94106 reader->page = *data_page;
94107- local_set(&reader->write, 0);
94108- local_set(&reader->entries, 0);
94109+ local_set_unchecked(&reader->write, 0);
94110+ local_set_unchecked(&reader->entries, 0);
94111 reader->read = 0;
94112 *data_page = bpage;
94113
94114diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
94115index 426962b..e8e2d9a 100644
94116--- a/kernel/trace/trace.c
94117+++ b/kernel/trace/trace.c
94118@@ -3488,7 +3488,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
94119 return 0;
94120 }
94121
94122-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
94123+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
94124 {
94125 /* do nothing if flag is already set */
94126 if (!!(trace_flags & mask) == !!enabled)
94127diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
94128index 385391f..8d2250f 100644
94129--- a/kernel/trace/trace.h
94130+++ b/kernel/trace/trace.h
94131@@ -1280,7 +1280,7 @@ extern const char *__stop___tracepoint_str[];
94132 void trace_printk_init_buffers(void);
94133 void trace_printk_start_comm(void);
94134 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
94135-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
94136+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
94137
94138 /*
94139 * Normal trace_printk() and friends allocates special buffers
94140diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
94141index 57b67b1..66082a9 100644
94142--- a/kernel/trace/trace_clock.c
94143+++ b/kernel/trace/trace_clock.c
94144@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
94145 return now;
94146 }
94147
94148-static atomic64_t trace_counter;
94149+static atomic64_unchecked_t trace_counter;
94150
94151 /*
94152 * trace_clock_counter(): simply an atomic counter.
94153@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
94154 */
94155 u64 notrace trace_clock_counter(void)
94156 {
94157- return atomic64_add_return(1, &trace_counter);
94158+ return atomic64_inc_return_unchecked(&trace_counter);
94159 }
94160diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
94161index 1b0df1e..4ebb965 100644
94162--- a/kernel/trace/trace_events.c
94163+++ b/kernel/trace/trace_events.c
94164@@ -1720,7 +1720,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
94165 return 0;
94166 }
94167
94168-struct ftrace_module_file_ops;
94169 static void __add_event_to_tracers(struct ftrace_event_call *call);
94170
94171 /* Add an additional event_call dynamically */
94172diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
94173index f0a0c98..3692dc8 100644
94174--- a/kernel/trace/trace_functions_graph.c
94175+++ b/kernel/trace/trace_functions_graph.c
94176@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
94177
94178 /* The return trace stack is full */
94179 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
94180- atomic_inc(&current->trace_overrun);
94181+ atomic_inc_unchecked(&current->trace_overrun);
94182 return -EBUSY;
94183 }
94184
94185@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
94186 *ret = current->ret_stack[index].ret;
94187 trace->func = current->ret_stack[index].func;
94188 trace->calltime = current->ret_stack[index].calltime;
94189- trace->overrun = atomic_read(&current->trace_overrun);
94190+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
94191 trace->depth = index;
94192 }
94193
94194diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
94195index 0abd9b8..6a663a2 100644
94196--- a/kernel/trace/trace_mmiotrace.c
94197+++ b/kernel/trace/trace_mmiotrace.c
94198@@ -24,7 +24,7 @@ struct header_iter {
94199 static struct trace_array *mmio_trace_array;
94200 static bool overrun_detected;
94201 static unsigned long prev_overruns;
94202-static atomic_t dropped_count;
94203+static atomic_unchecked_t dropped_count;
94204
94205 static void mmio_reset_data(struct trace_array *tr)
94206 {
94207@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
94208
94209 static unsigned long count_overruns(struct trace_iterator *iter)
94210 {
94211- unsigned long cnt = atomic_xchg(&dropped_count, 0);
94212+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
94213 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
94214
94215 if (over > prev_overruns)
94216@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
94217 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
94218 sizeof(*entry), 0, pc);
94219 if (!event) {
94220- atomic_inc(&dropped_count);
94221+ atomic_inc_unchecked(&dropped_count);
94222 return;
94223 }
94224 entry = ring_buffer_event_data(event);
94225@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
94226 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
94227 sizeof(*entry), 0, pc);
94228 if (!event) {
94229- atomic_inc(&dropped_count);
94230+ atomic_inc_unchecked(&dropped_count);
94231 return;
94232 }
94233 entry = ring_buffer_event_data(event);
94234diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
94235index c6977d5..d243785 100644
94236--- a/kernel/trace/trace_output.c
94237+++ b/kernel/trace/trace_output.c
94238@@ -712,14 +712,16 @@ int register_ftrace_event(struct trace_event *event)
94239 goto out;
94240 }
94241
94242+ pax_open_kernel();
94243 if (event->funcs->trace == NULL)
94244- event->funcs->trace = trace_nop_print;
94245+ *(void **)&event->funcs->trace = trace_nop_print;
94246 if (event->funcs->raw == NULL)
94247- event->funcs->raw = trace_nop_print;
94248+ *(void **)&event->funcs->raw = trace_nop_print;
94249 if (event->funcs->hex == NULL)
94250- event->funcs->hex = trace_nop_print;
94251+ *(void **)&event->funcs->hex = trace_nop_print;
94252 if (event->funcs->binary == NULL)
94253- event->funcs->binary = trace_nop_print;
94254+ *(void **)&event->funcs->binary = trace_nop_print;
94255+ pax_close_kernel();
94256
94257 key = event->type & (EVENT_HASHSIZE - 1);
94258
94259diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
94260index 1f24ed9..10407ec 100644
94261--- a/kernel/trace/trace_seq.c
94262+++ b/kernel/trace/trace_seq.c
94263@@ -367,7 +367,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
94264
94265 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
94266 if (!IS_ERR(p)) {
94267- p = mangle_path(s->buffer + s->len, p, "\n");
94268+ p = mangle_path(s->buffer + s->len, p, "\n\\");
94269 if (p) {
94270 s->len = p - s->buffer;
94271 return 1;
94272diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
94273index 16eddb3..758b308 100644
94274--- a/kernel/trace/trace_stack.c
94275+++ b/kernel/trace/trace_stack.c
94276@@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
94277 return;
94278
94279 /* we do not handle interrupt stacks yet */
94280- if (!object_is_on_stack(stack))
94281+ if (!object_starts_on_stack(stack))
94282 return;
94283
94284 local_irq_save(flags);
94285diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
94286index 29228c4..301bc8c 100644
94287--- a/kernel/trace/trace_syscalls.c
94288+++ b/kernel/trace/trace_syscalls.c
94289@@ -602,6 +602,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
94290 int num;
94291
94292 num = ((struct syscall_metadata *)call->data)->syscall_nr;
94293+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
94294+ return -EINVAL;
94295
94296 mutex_lock(&syscall_trace_lock);
94297 if (!sys_perf_refcount_enter)
94298@@ -622,6 +624,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
94299 int num;
94300
94301 num = ((struct syscall_metadata *)call->data)->syscall_nr;
94302+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
94303+ return;
94304
94305 mutex_lock(&syscall_trace_lock);
94306 sys_perf_refcount_enter--;
94307@@ -674,6 +678,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
94308 int num;
94309
94310 num = ((struct syscall_metadata *)call->data)->syscall_nr;
94311+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
94312+ return -EINVAL;
94313
94314 mutex_lock(&syscall_trace_lock);
94315 if (!sys_perf_refcount_exit)
94316@@ -694,6 +700,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
94317 int num;
94318
94319 num = ((struct syscall_metadata *)call->data)->syscall_nr;
94320+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
94321+ return;
94322
94323 mutex_lock(&syscall_trace_lock);
94324 sys_perf_refcount_exit--;
94325diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
94326index a2e37c5..4fa859b 100644
94327--- a/kernel/user_namespace.c
94328+++ b/kernel/user_namespace.c
94329@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
94330 !kgid_has_mapping(parent_ns, group))
94331 return -EPERM;
94332
94333+#ifdef CONFIG_GRKERNSEC
94334+ /*
94335+ * This doesn't really inspire confidence:
94336+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
94337+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
94338+ * Increases kernel attack surface in areas developers
94339+ * previously cared little about ("low importance due
94340+ * to requiring "root" capability")
94341+ * To be removed when this code receives *proper* review
94342+ */
94343+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
94344+ !capable(CAP_SETGID))
94345+ return -EPERM;
94346+#endif
94347+
94348 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
94349 if (!ns)
94350 return -ENOMEM;
94351@@ -974,7 +989,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
94352 if (atomic_read(&current->mm->mm_users) > 1)
94353 return -EINVAL;
94354
94355- if (current->fs->users != 1)
94356+ if (atomic_read(&current->fs->users) != 1)
94357 return -EINVAL;
94358
94359 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
94360diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
94361index c8eac43..4b5f08f 100644
94362--- a/kernel/utsname_sysctl.c
94363+++ b/kernel/utsname_sysctl.c
94364@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
94365 static int proc_do_uts_string(struct ctl_table *table, int write,
94366 void __user *buffer, size_t *lenp, loff_t *ppos)
94367 {
94368- struct ctl_table uts_table;
94369+ ctl_table_no_const uts_table;
94370 int r;
94371 memcpy(&uts_table, table, sizeof(uts_table));
94372 uts_table.data = get_uts(table, write);
94373diff --git a/kernel/watchdog.c b/kernel/watchdog.c
94374index 70bf118..4be3c37 100644
94375--- a/kernel/watchdog.c
94376+++ b/kernel/watchdog.c
94377@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
94378 static void watchdog_nmi_disable(unsigned int cpu) { return; }
94379 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
94380
94381-static struct smp_hotplug_thread watchdog_threads = {
94382+static struct smp_hotplug_thread watchdog_threads __read_only = {
94383 .store = &softlockup_watchdog,
94384 .thread_should_run = watchdog_should_run,
94385 .thread_fn = watchdog,
94386diff --git a/kernel/workqueue.c b/kernel/workqueue.c
94387index 66940a5..a44fed0 100644
94388--- a/kernel/workqueue.c
94389+++ b/kernel/workqueue.c
94390@@ -4499,7 +4499,7 @@ static void rebind_workers(struct worker_pool *pool)
94391 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
94392 worker_flags |= WORKER_REBOUND;
94393 worker_flags &= ~WORKER_UNBOUND;
94394- ACCESS_ONCE(worker->flags) = worker_flags;
94395+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
94396 }
94397
94398 spin_unlock_irq(&pool->lock);
94399diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
94400index 4e35a5d..8a1f3f0 100644
94401--- a/lib/Kconfig.debug
94402+++ b/lib/Kconfig.debug
94403@@ -894,7 +894,7 @@ config DEBUG_MUTEXES
94404
94405 config DEBUG_WW_MUTEX_SLOWPATH
94406 bool "Wait/wound mutex debugging: Slowpath testing"
94407- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94408+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94409 select DEBUG_LOCK_ALLOC
94410 select DEBUG_SPINLOCK
94411 select DEBUG_MUTEXES
94412@@ -911,7 +911,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
94413
94414 config DEBUG_LOCK_ALLOC
94415 bool "Lock debugging: detect incorrect freeing of live locks"
94416- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94417+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94418 select DEBUG_SPINLOCK
94419 select DEBUG_MUTEXES
94420 select LOCKDEP
94421@@ -925,7 +925,7 @@ config DEBUG_LOCK_ALLOC
94422
94423 config PROVE_LOCKING
94424 bool "Lock debugging: prove locking correctness"
94425- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94426+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94427 select LOCKDEP
94428 select DEBUG_SPINLOCK
94429 select DEBUG_MUTEXES
94430@@ -976,7 +976,7 @@ config LOCKDEP
94431
94432 config LOCK_STAT
94433 bool "Lock usage statistics"
94434- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94435+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94436 select LOCKDEP
94437 select DEBUG_SPINLOCK
94438 select DEBUG_MUTEXES
94439@@ -1449,6 +1449,7 @@ config LATENCYTOP
94440 depends on DEBUG_KERNEL
94441 depends on STACKTRACE_SUPPORT
94442 depends on PROC_FS
94443+ depends on !GRKERNSEC_HIDESYM
94444 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
94445 select KALLSYMS
94446 select KALLSYMS_ALL
94447@@ -1465,7 +1466,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94448 config DEBUG_STRICT_USER_COPY_CHECKS
94449 bool "Strict user copy size checks"
94450 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94451- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
94452+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
94453 help
94454 Enabling this option turns a certain set of sanity checks for user
94455 copy operations into compile time failures.
94456@@ -1593,7 +1594,7 @@ endmenu # runtime tests
94457
94458 config PROVIDE_OHCI1394_DMA_INIT
94459 bool "Remote debugging over FireWire early on boot"
94460- depends on PCI && X86
94461+ depends on PCI && X86 && !GRKERNSEC
94462 help
94463 If you want to debug problems which hang or crash the kernel early
94464 on boot and the crashing machine has a FireWire port, you can use
94465diff --git a/lib/Makefile b/lib/Makefile
94466index 0211d2b..93f5cc3 100644
94467--- a/lib/Makefile
94468+++ b/lib/Makefile
94469@@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
94470 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
94471 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
94472 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
94473-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
94474+obj-y += list_debug.o
94475 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
94476
94477 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
94478diff --git a/lib/average.c b/lib/average.c
94479index 114d1be..ab0350c 100644
94480--- a/lib/average.c
94481+++ b/lib/average.c
94482@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
94483 {
94484 unsigned long internal = ACCESS_ONCE(avg->internal);
94485
94486- ACCESS_ONCE(avg->internal) = internal ?
94487+ ACCESS_ONCE_RW(avg->internal) = internal ?
94488 (((internal << avg->weight) - internal) +
94489 (val << avg->factor)) >> avg->weight :
94490 (val << avg->factor);
94491diff --git a/lib/bitmap.c b/lib/bitmap.c
94492index b499ab6..fbdb76c 100644
94493--- a/lib/bitmap.c
94494+++ b/lib/bitmap.c
94495@@ -433,7 +433,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
94496 {
94497 int c, old_c, totaldigits, ndigits, nchunks, nbits;
94498 u32 chunk;
94499- const char __user __force *ubuf = (const char __user __force *)buf;
94500+ const char __user *ubuf = (const char __force_user *)buf;
94501
94502 bitmap_zero(maskp, nmaskbits);
94503
94504@@ -518,7 +518,7 @@ int bitmap_parse_user(const char __user *ubuf,
94505 {
94506 if (!access_ok(VERIFY_READ, ubuf, ulen))
94507 return -EFAULT;
94508- return __bitmap_parse((const char __force *)ubuf,
94509+ return __bitmap_parse((const char __force_kernel *)ubuf,
94510 ulen, 1, maskp, nmaskbits);
94511
94512 }
94513@@ -609,7 +609,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
94514 {
94515 unsigned a, b;
94516 int c, old_c, totaldigits;
94517- const char __user __force *ubuf = (const char __user __force *)buf;
94518+ const char __user *ubuf = (const char __force_user *)buf;
94519 int exp_digit, in_range;
94520
94521 totaldigits = c = 0;
94522@@ -704,7 +704,7 @@ int bitmap_parselist_user(const char __user *ubuf,
94523 {
94524 if (!access_ok(VERIFY_READ, ubuf, ulen))
94525 return -EFAULT;
94526- return __bitmap_parselist((const char __force *)ubuf,
94527+ return __bitmap_parselist((const char __force_kernel *)ubuf,
94528 ulen, 1, maskp, nmaskbits);
94529 }
94530 EXPORT_SYMBOL(bitmap_parselist_user);
94531diff --git a/lib/bug.c b/lib/bug.c
94532index d1d7c78..b354235 100644
94533--- a/lib/bug.c
94534+++ b/lib/bug.c
94535@@ -137,6 +137,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
94536 return BUG_TRAP_TYPE_NONE;
94537
94538 bug = find_bug(bugaddr);
94539+ if (!bug)
94540+ return BUG_TRAP_TYPE_NONE;
94541
94542 file = NULL;
94543 line = 0;
94544diff --git a/lib/debugobjects.c b/lib/debugobjects.c
94545index 547f7f9..a6d4ba0 100644
94546--- a/lib/debugobjects.c
94547+++ b/lib/debugobjects.c
94548@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
94549 if (limit > 4)
94550 return;
94551
94552- is_on_stack = object_is_on_stack(addr);
94553+ is_on_stack = object_starts_on_stack(addr);
94554 if (is_on_stack == onstack)
94555 return;
94556
94557diff --git a/lib/div64.c b/lib/div64.c
94558index 4382ad7..08aa558 100644
94559--- a/lib/div64.c
94560+++ b/lib/div64.c
94561@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
94562 EXPORT_SYMBOL(__div64_32);
94563
94564 #ifndef div_s64_rem
94565-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94566+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94567 {
94568 u64 quotient;
94569
94570@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
94571 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
94572 */
94573 #ifndef div64_u64
94574-u64 div64_u64(u64 dividend, u64 divisor)
94575+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
94576 {
94577 u32 high = divisor >> 32;
94578 u64 quot;
94579diff --git a/lib/dma-debug.c b/lib/dma-debug.c
94580index add80cc..0d27550 100644
94581--- a/lib/dma-debug.c
94582+++ b/lib/dma-debug.c
94583@@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
94584
94585 void dma_debug_add_bus(struct bus_type *bus)
94586 {
94587- struct notifier_block *nb;
94588+ notifier_block_no_const *nb;
94589
94590 if (global_disable)
94591 return;
94592@@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
94593
94594 static void check_for_stack(struct device *dev, void *addr)
94595 {
94596- if (object_is_on_stack(addr))
94597+ if (object_starts_on_stack(addr))
94598 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
94599 "stack [addr=%p]\n", addr);
94600 }
94601diff --git a/lib/hash.c b/lib/hash.c
94602index fea973f..386626f 100644
94603--- a/lib/hash.c
94604+++ b/lib/hash.c
94605@@ -14,7 +14,7 @@
94606 #include <linux/hash.h>
94607 #include <linux/cache.h>
94608
94609-static struct fast_hash_ops arch_hash_ops __read_mostly = {
94610+static struct fast_hash_ops arch_hash_ops __read_only = {
94611 .hash = jhash,
94612 .hash2 = jhash2,
94613 };
94614diff --git a/lib/inflate.c b/lib/inflate.c
94615index 013a761..c28f3fc 100644
94616--- a/lib/inflate.c
94617+++ b/lib/inflate.c
94618@@ -269,7 +269,7 @@ static void free(void *where)
94619 malloc_ptr = free_mem_ptr;
94620 }
94621 #else
94622-#define malloc(a) kmalloc(a, GFP_KERNEL)
94623+#define malloc(a) kmalloc((a), GFP_KERNEL)
94624 #define free(a) kfree(a)
94625 #endif
94626
94627diff --git a/lib/ioremap.c b/lib/ioremap.c
94628index 0c9216c..863bd89 100644
94629--- a/lib/ioremap.c
94630+++ b/lib/ioremap.c
94631@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
94632 unsigned long next;
94633
94634 phys_addr -= addr;
94635- pmd = pmd_alloc(&init_mm, pud, addr);
94636+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
94637 if (!pmd)
94638 return -ENOMEM;
94639 do {
94640@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
94641 unsigned long next;
94642
94643 phys_addr -= addr;
94644- pud = pud_alloc(&init_mm, pgd, addr);
94645+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
94646 if (!pud)
94647 return -ENOMEM;
94648 do {
94649diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
94650index bd2bea9..6b3c95e 100644
94651--- a/lib/is_single_threaded.c
94652+++ b/lib/is_single_threaded.c
94653@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
94654 struct task_struct *p, *t;
94655 bool ret;
94656
94657+ if (!mm)
94658+ return true;
94659+
94660 if (atomic_read(&task->signal->live) != 1)
94661 return false;
94662
94663diff --git a/lib/kobject.c b/lib/kobject.c
94664index 58751bb..93a1853 100644
94665--- a/lib/kobject.c
94666+++ b/lib/kobject.c
94667@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
94668
94669
94670 static DEFINE_SPINLOCK(kobj_ns_type_lock);
94671-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
94672+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
94673
94674-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94675+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94676 {
94677 enum kobj_ns_type type = ops->type;
94678 int error;
94679diff --git a/lib/list_debug.c b/lib/list_debug.c
94680index c24c2f7..f0296f4 100644
94681--- a/lib/list_debug.c
94682+++ b/lib/list_debug.c
94683@@ -11,7 +11,9 @@
94684 #include <linux/bug.h>
94685 #include <linux/kernel.h>
94686 #include <linux/rculist.h>
94687+#include <linux/mm.h>
94688
94689+#ifdef CONFIG_DEBUG_LIST
94690 /*
94691 * Insert a new entry between two known consecutive entries.
94692 *
94693@@ -19,21 +21,40 @@
94694 * the prev/next entries already!
94695 */
94696
94697+static bool __list_add_debug(struct list_head *new,
94698+ struct list_head *prev,
94699+ struct list_head *next)
94700+{
94701+ if (unlikely(next->prev != prev)) {
94702+ printk(KERN_ERR "list_add corruption. next->prev should be "
94703+ "prev (%p), but was %p. (next=%p).\n",
94704+ prev, next->prev, next);
94705+ BUG();
94706+ return false;
94707+ }
94708+ if (unlikely(prev->next != next)) {
94709+ printk(KERN_ERR "list_add corruption. prev->next should be "
94710+ "next (%p), but was %p. (prev=%p).\n",
94711+ next, prev->next, prev);
94712+ BUG();
94713+ return false;
94714+ }
94715+ if (unlikely(new == prev || new == next)) {
94716+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
94717+ new, prev, next);
94718+ BUG();
94719+ return false;
94720+ }
94721+ return true;
94722+}
94723+
94724 void __list_add(struct list_head *new,
94725- struct list_head *prev,
94726- struct list_head *next)
94727+ struct list_head *prev,
94728+ struct list_head *next)
94729 {
94730- WARN(next->prev != prev,
94731- "list_add corruption. next->prev should be "
94732- "prev (%p), but was %p. (next=%p).\n",
94733- prev, next->prev, next);
94734- WARN(prev->next != next,
94735- "list_add corruption. prev->next should be "
94736- "next (%p), but was %p. (prev=%p).\n",
94737- next, prev->next, prev);
94738- WARN(new == prev || new == next,
94739- "list_add double add: new=%p, prev=%p, next=%p.\n",
94740- new, prev, next);
94741+ if (!__list_add_debug(new, prev, next))
94742+ return;
94743+
94744 next->prev = new;
94745 new->next = next;
94746 new->prev = prev;
94747@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
94748 }
94749 EXPORT_SYMBOL(__list_add);
94750
94751-void __list_del_entry(struct list_head *entry)
94752+static bool __list_del_entry_debug(struct list_head *entry)
94753 {
94754 struct list_head *prev, *next;
94755
94756 prev = entry->prev;
94757 next = entry->next;
94758
94759- if (WARN(next == LIST_POISON1,
94760- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94761- entry, LIST_POISON1) ||
94762- WARN(prev == LIST_POISON2,
94763- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94764- entry, LIST_POISON2) ||
94765- WARN(prev->next != entry,
94766- "list_del corruption. prev->next should be %p, "
94767- "but was %p\n", entry, prev->next) ||
94768- WARN(next->prev != entry,
94769- "list_del corruption. next->prev should be %p, "
94770- "but was %p\n", entry, next->prev))
94771+ if (unlikely(next == LIST_POISON1)) {
94772+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94773+ entry, LIST_POISON1);
94774+ BUG();
94775+ return false;
94776+ }
94777+ if (unlikely(prev == LIST_POISON2)) {
94778+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94779+ entry, LIST_POISON2);
94780+ BUG();
94781+ return false;
94782+ }
94783+ if (unlikely(entry->prev->next != entry)) {
94784+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
94785+ "but was %p\n", entry, prev->next);
94786+ BUG();
94787+ return false;
94788+ }
94789+ if (unlikely(entry->next->prev != entry)) {
94790+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
94791+ "but was %p\n", entry, next->prev);
94792+ BUG();
94793+ return false;
94794+ }
94795+ return true;
94796+}
94797+
94798+void __list_del_entry(struct list_head *entry)
94799+{
94800+ if (!__list_del_entry_debug(entry))
94801 return;
94802
94803- __list_del(prev, next);
94804+ __list_del(entry->prev, entry->next);
94805 }
94806 EXPORT_SYMBOL(__list_del_entry);
94807
94808@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
94809 void __list_add_rcu(struct list_head *new,
94810 struct list_head *prev, struct list_head *next)
94811 {
94812- WARN(next->prev != prev,
94813- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
94814- prev, next->prev, next);
94815- WARN(prev->next != next,
94816- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
94817- next, prev->next, prev);
94818+ if (!__list_add_debug(new, prev, next))
94819+ return;
94820+
94821 new->next = next;
94822 new->prev = prev;
94823 rcu_assign_pointer(list_next_rcu(prev), new);
94824 next->prev = new;
94825 }
94826 EXPORT_SYMBOL(__list_add_rcu);
94827+#endif
94828+
94829+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
94830+{
94831+#ifdef CONFIG_DEBUG_LIST
94832+ if (!__list_add_debug(new, prev, next))
94833+ return;
94834+#endif
94835+
94836+ pax_open_kernel();
94837+ next->prev = new;
94838+ new->next = next;
94839+ new->prev = prev;
94840+ prev->next = new;
94841+ pax_close_kernel();
94842+}
94843+EXPORT_SYMBOL(__pax_list_add);
94844+
94845+void pax_list_del(struct list_head *entry)
94846+{
94847+#ifdef CONFIG_DEBUG_LIST
94848+ if (!__list_del_entry_debug(entry))
94849+ return;
94850+#endif
94851+
94852+ pax_open_kernel();
94853+ __list_del(entry->prev, entry->next);
94854+ entry->next = LIST_POISON1;
94855+ entry->prev = LIST_POISON2;
94856+ pax_close_kernel();
94857+}
94858+EXPORT_SYMBOL(pax_list_del);
94859+
94860+void pax_list_del_init(struct list_head *entry)
94861+{
94862+ pax_open_kernel();
94863+ __list_del(entry->prev, entry->next);
94864+ INIT_LIST_HEAD(entry);
94865+ pax_close_kernel();
94866+}
94867+EXPORT_SYMBOL(pax_list_del_init);
94868+
94869+void __pax_list_add_rcu(struct list_head *new,
94870+ struct list_head *prev, struct list_head *next)
94871+{
94872+#ifdef CONFIG_DEBUG_LIST
94873+ if (!__list_add_debug(new, prev, next))
94874+ return;
94875+#endif
94876+
94877+ pax_open_kernel();
94878+ new->next = next;
94879+ new->prev = prev;
94880+ rcu_assign_pointer(list_next_rcu(prev), new);
94881+ next->prev = new;
94882+ pax_close_kernel();
94883+}
94884+EXPORT_SYMBOL(__pax_list_add_rcu);
94885+
94886+void pax_list_del_rcu(struct list_head *entry)
94887+{
94888+#ifdef CONFIG_DEBUG_LIST
94889+ if (!__list_del_entry_debug(entry))
94890+ return;
94891+#endif
94892+
94893+ pax_open_kernel();
94894+ __list_del(entry->prev, entry->next);
94895+ entry->next = LIST_POISON1;
94896+ entry->prev = LIST_POISON2;
94897+ pax_close_kernel();
94898+}
94899+EXPORT_SYMBOL(pax_list_del_rcu);
94900diff --git a/lib/lockref.c b/lib/lockref.c
94901index d2233de..fa1a2f6 100644
94902--- a/lib/lockref.c
94903+++ b/lib/lockref.c
94904@@ -48,13 +48,13 @@
94905 void lockref_get(struct lockref *lockref)
94906 {
94907 CMPXCHG_LOOP(
94908- new.count++;
94909+ __lockref_inc(&new);
94910 ,
94911 return;
94912 );
94913
94914 spin_lock(&lockref->lock);
94915- lockref->count++;
94916+ __lockref_inc(lockref);
94917 spin_unlock(&lockref->lock);
94918 }
94919 EXPORT_SYMBOL(lockref_get);
94920@@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94921 int retval;
94922
94923 CMPXCHG_LOOP(
94924- new.count++;
94925+ __lockref_inc(&new);
94926 if (!old.count)
94927 return 0;
94928 ,
94929@@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94930 spin_lock(&lockref->lock);
94931 retval = 0;
94932 if (lockref->count) {
94933- lockref->count++;
94934+ __lockref_inc(lockref);
94935 retval = 1;
94936 }
94937 spin_unlock(&lockref->lock);
94938@@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
94939 int lockref_get_or_lock(struct lockref *lockref)
94940 {
94941 CMPXCHG_LOOP(
94942- new.count++;
94943+ __lockref_inc(&new);
94944 if (!old.count)
94945 break;
94946 ,
94947@@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
94948 spin_lock(&lockref->lock);
94949 if (!lockref->count)
94950 return 0;
94951- lockref->count++;
94952+ __lockref_inc(lockref);
94953 spin_unlock(&lockref->lock);
94954 return 1;
94955 }
94956@@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
94957 int lockref_put_or_lock(struct lockref *lockref)
94958 {
94959 CMPXCHG_LOOP(
94960- new.count--;
94961+ __lockref_dec(&new);
94962 if (old.count <= 1)
94963 break;
94964 ,
94965@@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
94966 spin_lock(&lockref->lock);
94967 if (lockref->count <= 1)
94968 return 0;
94969- lockref->count--;
94970+ __lockref_dec(lockref);
94971 spin_unlock(&lockref->lock);
94972 return 1;
94973 }
94974@@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94975 int retval;
94976
94977 CMPXCHG_LOOP(
94978- new.count++;
94979+ __lockref_inc(&new);
94980 if ((int)old.count < 0)
94981 return 0;
94982 ,
94983@@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94984 spin_lock(&lockref->lock);
94985 retval = 0;
94986 if ((int) lockref->count >= 0) {
94987- lockref->count++;
94988+ __lockref_inc(lockref);
94989 retval = 1;
94990 }
94991 spin_unlock(&lockref->lock);
94992diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
94993index 6111bcb..02e816b 100644
94994--- a/lib/percpu-refcount.c
94995+++ b/lib/percpu-refcount.c
94996@@ -31,7 +31,7 @@
94997 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
94998 */
94999
95000-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
95001+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
95002
95003 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
95004
95005diff --git a/lib/radix-tree.c b/lib/radix-tree.c
95006index 3291a8e..346a91e 100644
95007--- a/lib/radix-tree.c
95008+++ b/lib/radix-tree.c
95009@@ -67,7 +67,7 @@ struct radix_tree_preload {
95010 int nr;
95011 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
95012 };
95013-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
95014+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
95015
95016 static inline void *ptr_to_indirect(void *ptr)
95017 {
95018diff --git a/lib/random32.c b/lib/random32.c
95019index 0bee183..526f12f 100644
95020--- a/lib/random32.c
95021+++ b/lib/random32.c
95022@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
95023 }
95024 #endif
95025
95026-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
95027+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
95028
95029 /**
95030 * prandom_u32_state - seeded pseudo-random number generator.
95031diff --git a/lib/rbtree.c b/lib/rbtree.c
95032index c16c81a..4dcbda1 100644
95033--- a/lib/rbtree.c
95034+++ b/lib/rbtree.c
95035@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
95036 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
95037
95038 static const struct rb_augment_callbacks dummy_callbacks = {
95039- dummy_propagate, dummy_copy, dummy_rotate
95040+ .propagate = dummy_propagate,
95041+ .copy = dummy_copy,
95042+ .rotate = dummy_rotate
95043 };
95044
95045 void rb_insert_color(struct rb_node *node, struct rb_root *root)
95046diff --git a/lib/show_mem.c b/lib/show_mem.c
95047index 5e25627..3ed9d7f 100644
95048--- a/lib/show_mem.c
95049+++ b/lib/show_mem.c
95050@@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
95051 quicklist_total_size());
95052 #endif
95053 #ifdef CONFIG_MEMORY_FAILURE
95054- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
95055+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
95056 #endif
95057 }
95058diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
95059index bb2b201..46abaf9 100644
95060--- a/lib/strncpy_from_user.c
95061+++ b/lib/strncpy_from_user.c
95062@@ -21,7 +21,7 @@
95063 */
95064 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
95065 {
95066- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95067+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95068 long res = 0;
95069
95070 /*
95071diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
95072index a28df52..3d55877 100644
95073--- a/lib/strnlen_user.c
95074+++ b/lib/strnlen_user.c
95075@@ -26,7 +26,7 @@
95076 */
95077 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
95078 {
95079- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95080+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
95081 long align, res = 0;
95082 unsigned long c;
95083
95084diff --git a/lib/swiotlb.c b/lib/swiotlb.c
95085index 4abda07..b9d3765 100644
95086--- a/lib/swiotlb.c
95087+++ b/lib/swiotlb.c
95088@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
95089
95090 void
95091 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
95092- dma_addr_t dev_addr)
95093+ dma_addr_t dev_addr, struct dma_attrs *attrs)
95094 {
95095 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
95096
95097diff --git a/lib/usercopy.c b/lib/usercopy.c
95098index 4f5b1dd..7cab418 100644
95099--- a/lib/usercopy.c
95100+++ b/lib/usercopy.c
95101@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
95102 WARN(1, "Buffer overflow detected!\n");
95103 }
95104 EXPORT_SYMBOL(copy_from_user_overflow);
95105+
95106+void copy_to_user_overflow(void)
95107+{
95108+ WARN(1, "Buffer overflow detected!\n");
95109+}
95110+EXPORT_SYMBOL(copy_to_user_overflow);
95111diff --git a/lib/vsprintf.c b/lib/vsprintf.c
95112index ec337f6..8484eb2 100644
95113--- a/lib/vsprintf.c
95114+++ b/lib/vsprintf.c
95115@@ -16,6 +16,9 @@
95116 * - scnprintf and vscnprintf
95117 */
95118
95119+#ifdef CONFIG_GRKERNSEC_HIDESYM
95120+#define __INCLUDED_BY_HIDESYM 1
95121+#endif
95122 #include <stdarg.h>
95123 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
95124 #include <linux/types.h>
95125@@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
95126 #ifdef CONFIG_KALLSYMS
95127 if (*fmt == 'B')
95128 sprint_backtrace(sym, value);
95129- else if (*fmt != 'f' && *fmt != 's')
95130+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
95131 sprint_symbol(sym, value);
95132 else
95133 sprint_symbol_no_offset(sym, value);
95134@@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
95135 return number(buf, end, num, spec);
95136 }
95137
95138+#ifdef CONFIG_GRKERNSEC_HIDESYM
95139+int kptr_restrict __read_mostly = 2;
95140+#else
95141 int kptr_restrict __read_mostly;
95142+#endif
95143
95144 /*
95145 * Show a '%p' thing. A kernel extension is that the '%p' is followed
95146@@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
95147 *
95148 * - 'F' For symbolic function descriptor pointers with offset
95149 * - 'f' For simple symbolic function names without offset
95150+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
95151 * - 'S' For symbolic direct pointers with offset
95152 * - 's' For symbolic direct pointers without offset
95153+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
95154 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
95155 * - 'B' For backtraced symbolic direct pointers with offset
95156 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
95157@@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95158
95159 if (!ptr && *fmt != 'K') {
95160 /*
95161- * Print (null) with the same width as a pointer so it makes
95162+ * Print (nil) with the same width as a pointer so it makes
95163 * tabular output look nice.
95164 */
95165 if (spec.field_width == -1)
95166 spec.field_width = default_width;
95167- return string(buf, end, "(null)", spec);
95168+ return string(buf, end, "(nil)", spec);
95169 }
95170
95171 switch (*fmt) {
95172@@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95173 /* Fallthrough */
95174 case 'S':
95175 case 's':
95176+#ifdef CONFIG_GRKERNSEC_HIDESYM
95177+ break;
95178+#else
95179+ return symbol_string(buf, end, ptr, spec, fmt);
95180+#endif
95181+ case 'X':
95182+ ptr = dereference_function_descriptor(ptr);
95183+ case 'A':
95184 case 'B':
95185 return symbol_string(buf, end, ptr, spec, fmt);
95186 case 'R':
95187@@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95188 va_end(va);
95189 return buf;
95190 }
95191+ case 'P':
95192+ break;
95193 case 'K':
95194 /*
95195 * %pK cannot be used in IRQ context because its test
95196@@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
95197 ((const struct file *)ptr)->f_path.dentry,
95198 spec, fmt);
95199 }
95200+
95201+#ifdef CONFIG_GRKERNSEC_HIDESYM
95202+ /* 'P' = approved pointers to copy to userland,
95203+ as in the /proc/kallsyms case, as we make it display nothing
95204+ for non-root users, and the real contents for root users
95205+ 'X' = approved simple symbols
95206+ Also ignore 'K' pointers, since we force their NULLing for non-root users
95207+ above
95208+ */
95209+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
95210+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
95211+ dump_stack();
95212+ ptr = NULL;
95213+ }
95214+#endif
95215+
95216 spec.flags |= SMALL;
95217 if (spec.field_width == -1) {
95218 spec.field_width = default_width;
95219@@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
95220 typeof(type) value; \
95221 if (sizeof(type) == 8) { \
95222 args = PTR_ALIGN(args, sizeof(u32)); \
95223- *(u32 *)&value = *(u32 *)args; \
95224- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
95225+ *(u32 *)&value = *(const u32 *)args; \
95226+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
95227 } else { \
95228 args = PTR_ALIGN(args, sizeof(type)); \
95229- value = *(typeof(type) *)args; \
95230+ value = *(const typeof(type) *)args; \
95231 } \
95232 args += sizeof(type); \
95233 value; \
95234@@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
95235 case FORMAT_TYPE_STR: {
95236 const char *str_arg = args;
95237 args += strlen(str_arg) + 1;
95238- str = string(str, end, (char *)str_arg, spec);
95239+ str = string(str, end, str_arg, spec);
95240 break;
95241 }
95242
95243diff --git a/localversion-grsec b/localversion-grsec
95244new file mode 100644
95245index 0000000..7cd6065
95246--- /dev/null
95247+++ b/localversion-grsec
95248@@ -0,0 +1 @@
95249+-grsec
95250diff --git a/mm/Kconfig b/mm/Kconfig
95251index 1d1ae6b..0f05885 100644
95252--- a/mm/Kconfig
95253+++ b/mm/Kconfig
95254@@ -341,10 +341,11 @@ config KSM
95255 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
95256
95257 config DEFAULT_MMAP_MIN_ADDR
95258- int "Low address space to protect from user allocation"
95259+ int "Low address space to protect from user allocation"
95260 depends on MMU
95261- default 4096
95262- help
95263+ default 32768 if ALPHA || ARM || PARISC || SPARC32
95264+ default 65536
95265+ help
95266 This is the portion of low virtual memory which should be protected
95267 from userspace allocation. Keeping a user from writing to low pages
95268 can help reduce the impact of kernel NULL pointer bugs.
95269@@ -375,7 +376,7 @@ config MEMORY_FAILURE
95270
95271 config HWPOISON_INJECT
95272 tristate "HWPoison pages injector"
95273- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
95274+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
95275 select PROC_PAGE_MONITOR
95276
95277 config NOMMU_INITIAL_TRIM_EXCESS
95278diff --git a/mm/backing-dev.c b/mm/backing-dev.c
95279index 0ae0df5..82ac56b 100644
95280--- a/mm/backing-dev.c
95281+++ b/mm/backing-dev.c
95282@@ -12,7 +12,7 @@
95283 #include <linux/device.h>
95284 #include <trace/events/writeback.h>
95285
95286-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
95287+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
95288
95289 struct backing_dev_info default_backing_dev_info = {
95290 .name = "default",
95291@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
95292 return err;
95293
95294 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
95295- atomic_long_inc_return(&bdi_seq));
95296+ atomic_long_inc_return_unchecked(&bdi_seq));
95297 if (err) {
95298 bdi_destroy(bdi);
95299 return err;
95300diff --git a/mm/filemap.c b/mm/filemap.c
95301index 37beab9..2c55a85 100644
95302--- a/mm/filemap.c
95303+++ b/mm/filemap.c
95304@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
95305 struct address_space *mapping = file->f_mapping;
95306
95307 if (!mapping->a_ops->readpage)
95308- return -ENOEXEC;
95309+ return -ENODEV;
95310 file_accessed(file);
95311 vma->vm_ops = &generic_file_vm_ops;
95312 return 0;
95313@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
95314 *pos = i_size_read(inode);
95315
95316 if (limit != RLIM_INFINITY) {
95317+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
95318 if (*pos >= limit) {
95319 send_sig(SIGXFSZ, current, 0);
95320 return -EFBIG;
95321diff --git a/mm/fremap.c b/mm/fremap.c
95322index 72b8fa3..c5b39f1 100644
95323--- a/mm/fremap.c
95324+++ b/mm/fremap.c
95325@@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
95326 retry:
95327 vma = find_vma(mm, start);
95328
95329+#ifdef CONFIG_PAX_SEGMEXEC
95330+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
95331+ goto out;
95332+#endif
95333+
95334 /*
95335 * Make sure the vma is shared, that it supports prefaulting,
95336 * and that the remapped range is valid and fully within
95337diff --git a/mm/gup.c b/mm/gup.c
95338index cd62c8c..3bb2053 100644
95339--- a/mm/gup.c
95340+++ b/mm/gup.c
95341@@ -274,11 +274,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
95342 unsigned int fault_flags = 0;
95343 int ret;
95344
95345- /* For mlock, just skip the stack guard page. */
95346- if ((*flags & FOLL_MLOCK) &&
95347- (stack_guard_page_start(vma, address) ||
95348- stack_guard_page_end(vma, address + PAGE_SIZE)))
95349- return -ENOENT;
95350 if (*flags & FOLL_WRITE)
95351 fault_flags |= FAULT_FLAG_WRITE;
95352 if (nonblocking)
95353@@ -444,14 +439,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
95354 if (!(gup_flags & FOLL_FORCE))
95355 gup_flags |= FOLL_NUMA;
95356
95357- do {
95358+ while (nr_pages) {
95359 struct page *page;
95360 unsigned int foll_flags = gup_flags;
95361 unsigned int page_increm;
95362
95363 /* first iteration or cross vma bound */
95364 if (!vma || start >= vma->vm_end) {
95365- vma = find_extend_vma(mm, start);
95366+ vma = find_vma(mm, start);
95367 if (!vma && in_gate_area(mm, start)) {
95368 int ret;
95369 ret = get_gate_page(mm, start & PAGE_MASK,
95370@@ -463,7 +458,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
95371 goto next_page;
95372 }
95373
95374- if (!vma || check_vma_flags(vma, gup_flags))
95375+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
95376 return i ? : -EFAULT;
95377 if (is_vm_hugetlb_page(vma)) {
95378 i = follow_hugetlb_page(mm, vma, pages, vmas,
95379@@ -518,7 +513,7 @@ next_page:
95380 i += page_increm;
95381 start += page_increm * PAGE_SIZE;
95382 nr_pages -= page_increm;
95383- } while (nr_pages);
95384+ }
95385 return i;
95386 }
95387 EXPORT_SYMBOL(__get_user_pages);
95388diff --git a/mm/highmem.c b/mm/highmem.c
95389index 123bcd3..0de52ba 100644
95390--- a/mm/highmem.c
95391+++ b/mm/highmem.c
95392@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
95393 * So no dangers, even with speculative execution.
95394 */
95395 page = pte_page(pkmap_page_table[i]);
95396+ pax_open_kernel();
95397 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
95398-
95399+ pax_close_kernel();
95400 set_page_address(page, NULL);
95401 need_flush = 1;
95402 }
95403@@ -259,9 +260,11 @@ start:
95404 }
95405 }
95406 vaddr = PKMAP_ADDR(last_pkmap_nr);
95407+
95408+ pax_open_kernel();
95409 set_pte_at(&init_mm, vaddr,
95410 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
95411-
95412+ pax_close_kernel();
95413 pkmap_count[last_pkmap_nr] = 1;
95414 set_page_address(page, (void *)vaddr);
95415
95416diff --git a/mm/hugetlb.c b/mm/hugetlb.c
95417index 9fd7227..5628939 100644
95418--- a/mm/hugetlb.c
95419+++ b/mm/hugetlb.c
95420@@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
95421 struct ctl_table *table, int write,
95422 void __user *buffer, size_t *length, loff_t *ppos)
95423 {
95424+ ctl_table_no_const t;
95425 struct hstate *h = &default_hstate;
95426 unsigned long tmp = h->max_huge_pages;
95427 int ret;
95428@@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
95429 if (!hugepages_supported())
95430 return -ENOTSUPP;
95431
95432- table->data = &tmp;
95433- table->maxlen = sizeof(unsigned long);
95434- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95435+ t = *table;
95436+ t.data = &tmp;
95437+ t.maxlen = sizeof(unsigned long);
95438+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
95439 if (ret)
95440 goto out;
95441
95442@@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95443 struct hstate *h = &default_hstate;
95444 unsigned long tmp;
95445 int ret;
95446+ ctl_table_no_const hugetlb_table;
95447
95448 if (!hugepages_supported())
95449 return -ENOTSUPP;
95450@@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95451 if (write && hstate_is_gigantic(h))
95452 return -EINVAL;
95453
95454- table->data = &tmp;
95455- table->maxlen = sizeof(unsigned long);
95456- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95457+ hugetlb_table = *table;
95458+ hugetlb_table.data = &tmp;
95459+ hugetlb_table.maxlen = sizeof(unsigned long);
95460+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
95461 if (ret)
95462 goto out;
95463
95464@@ -2792,6 +2796,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
95465 mutex_unlock(&mapping->i_mmap_mutex);
95466 }
95467
95468+#ifdef CONFIG_PAX_SEGMEXEC
95469+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
95470+{
95471+ struct mm_struct *mm = vma->vm_mm;
95472+ struct vm_area_struct *vma_m;
95473+ unsigned long address_m;
95474+ pte_t *ptep_m;
95475+
95476+ vma_m = pax_find_mirror_vma(vma);
95477+ if (!vma_m)
95478+ return;
95479+
95480+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95481+ address_m = address + SEGMEXEC_TASK_SIZE;
95482+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
95483+ get_page(page_m);
95484+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
95485+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
95486+}
95487+#endif
95488+
95489 /*
95490 * Hugetlb_cow() should be called with page lock of the original hugepage held.
95491 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
95492@@ -2903,6 +2928,11 @@ retry_avoidcopy:
95493 make_huge_pte(vma, new_page, 1));
95494 page_remove_rmap(old_page);
95495 hugepage_add_new_anon_rmap(new_page, vma, address);
95496+
95497+#ifdef CONFIG_PAX_SEGMEXEC
95498+ pax_mirror_huge_pte(vma, address, new_page);
95499+#endif
95500+
95501 /* Make the old page be freed below */
95502 new_page = old_page;
95503 }
95504@@ -3063,6 +3093,10 @@ retry:
95505 && (vma->vm_flags & VM_SHARED)));
95506 set_huge_pte_at(mm, address, ptep, new_pte);
95507
95508+#ifdef CONFIG_PAX_SEGMEXEC
95509+ pax_mirror_huge_pte(vma, address, page);
95510+#endif
95511+
95512 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
95513 /* Optimization, do the COW without a second fault */
95514 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
95515@@ -3129,6 +3163,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95516 struct hstate *h = hstate_vma(vma);
95517 struct address_space *mapping;
95518
95519+#ifdef CONFIG_PAX_SEGMEXEC
95520+ struct vm_area_struct *vma_m;
95521+#endif
95522+
95523 address &= huge_page_mask(h);
95524
95525 ptep = huge_pte_offset(mm, address);
95526@@ -3142,6 +3180,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95527 VM_FAULT_SET_HINDEX(hstate_index(h));
95528 }
95529
95530+#ifdef CONFIG_PAX_SEGMEXEC
95531+ vma_m = pax_find_mirror_vma(vma);
95532+ if (vma_m) {
95533+ unsigned long address_m;
95534+
95535+ if (vma->vm_start > vma_m->vm_start) {
95536+ address_m = address;
95537+ address -= SEGMEXEC_TASK_SIZE;
95538+ vma = vma_m;
95539+ h = hstate_vma(vma);
95540+ } else
95541+ address_m = address + SEGMEXEC_TASK_SIZE;
95542+
95543+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
95544+ return VM_FAULT_OOM;
95545+ address_m &= HPAGE_MASK;
95546+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
95547+ }
95548+#endif
95549+
95550 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
95551 if (!ptep)
95552 return VM_FAULT_OOM;
95553diff --git a/mm/internal.h b/mm/internal.h
95554index a4f90ba..fbdc32b 100644
95555--- a/mm/internal.h
95556+++ b/mm/internal.h
95557@@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
95558
95559 extern int __isolate_free_page(struct page *page, unsigned int order);
95560 extern void __free_pages_bootmem(struct page *page, unsigned int order);
95561+extern void free_compound_page(struct page *page);
95562 extern void prep_compound_page(struct page *page, unsigned long order);
95563 #ifdef CONFIG_MEMORY_FAILURE
95564 extern bool is_free_buddy_page(struct page *page);
95565@@ -390,7 +391,7 @@ extern u32 hwpoison_filter_enable;
95566
95567 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
95568 unsigned long, unsigned long,
95569- unsigned long, unsigned long);
95570+ unsigned long, unsigned long) __intentional_overflow(-1);
95571
95572 extern void set_pageblock_order(void);
95573 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
95574diff --git a/mm/iov_iter.c b/mm/iov_iter.c
95575index e34a3cb..a810efe 100644
95576--- a/mm/iov_iter.c
95577+++ b/mm/iov_iter.c
95578@@ -307,7 +307,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
95579
95580 while (bytes) {
95581 char __user *buf = iov->iov_base + base;
95582- int copy = min(bytes, iov->iov_len - base);
95583+ size_t copy = min(bytes, iov->iov_len - base);
95584
95585 base = 0;
95586 left = __copy_from_user_inatomic(vaddr, buf, copy);
95587@@ -335,7 +335,7 @@ static size_t copy_from_user_atomic_iovec(struct page *page,
95588
95589 kaddr = kmap_atomic(page);
95590 if (likely(i->nr_segs == 1)) {
95591- int left;
95592+ size_t left;
95593 char __user *buf = i->iov->iov_base + i->iov_offset;
95594 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
95595 copied = bytes - left;
95596@@ -365,7 +365,7 @@ static void advance_iovec(struct iov_iter *i, size_t bytes)
95597 * zero-length segments (without overruning the iovec).
95598 */
95599 while (bytes || unlikely(i->count && !iov->iov_len)) {
95600- int copy;
95601+ size_t copy;
95602
95603 copy = min(bytes, iov->iov_len - base);
95604 BUG_ON(!i->count || i->count < copy);
95605diff --git a/mm/kmemleak.c b/mm/kmemleak.c
95606index 3cda50c..032ba634 100644
95607--- a/mm/kmemleak.c
95608+++ b/mm/kmemleak.c
95609@@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
95610
95611 for (i = 0; i < object->trace_len; i++) {
95612 void *ptr = (void *)object->trace[i];
95613- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
95614+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
95615 }
95616 }
95617
95618@@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
95619 return -ENOMEM;
95620 }
95621
95622- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
95623+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
95624 &kmemleak_fops);
95625 if (!dentry)
95626 pr_warning("Failed to create the debugfs kmemleak file\n");
95627diff --git a/mm/maccess.c b/mm/maccess.c
95628index d53adf9..03a24bf 100644
95629--- a/mm/maccess.c
95630+++ b/mm/maccess.c
95631@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
95632 set_fs(KERNEL_DS);
95633 pagefault_disable();
95634 ret = __copy_from_user_inatomic(dst,
95635- (__force const void __user *)src, size);
95636+ (const void __force_user *)src, size);
95637 pagefault_enable();
95638 set_fs(old_fs);
95639
95640@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
95641
95642 set_fs(KERNEL_DS);
95643 pagefault_disable();
95644- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
95645+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
95646 pagefault_enable();
95647 set_fs(old_fs);
95648
95649diff --git a/mm/madvise.c b/mm/madvise.c
95650index 0938b30..199abe8 100644
95651--- a/mm/madvise.c
95652+++ b/mm/madvise.c
95653@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
95654 pgoff_t pgoff;
95655 unsigned long new_flags = vma->vm_flags;
95656
95657+#ifdef CONFIG_PAX_SEGMEXEC
95658+ struct vm_area_struct *vma_m;
95659+#endif
95660+
95661 switch (behavior) {
95662 case MADV_NORMAL:
95663 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
95664@@ -126,6 +130,13 @@ success:
95665 /*
95666 * vm_flags is protected by the mmap_sem held in write mode.
95667 */
95668+
95669+#ifdef CONFIG_PAX_SEGMEXEC
95670+ vma_m = pax_find_mirror_vma(vma);
95671+ if (vma_m)
95672+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
95673+#endif
95674+
95675 vma->vm_flags = new_flags;
95676
95677 out:
95678@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95679 struct vm_area_struct **prev,
95680 unsigned long start, unsigned long end)
95681 {
95682+
95683+#ifdef CONFIG_PAX_SEGMEXEC
95684+ struct vm_area_struct *vma_m;
95685+#endif
95686+
95687 *prev = vma;
95688 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
95689 return -EINVAL;
95690@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95691 zap_page_range(vma, start, end - start, &details);
95692 } else
95693 zap_page_range(vma, start, end - start, NULL);
95694+
95695+#ifdef CONFIG_PAX_SEGMEXEC
95696+ vma_m = pax_find_mirror_vma(vma);
95697+ if (vma_m) {
95698+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
95699+ struct zap_details details = {
95700+ .nonlinear_vma = vma_m,
95701+ .last_index = ULONG_MAX,
95702+ };
95703+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
95704+ } else
95705+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
95706+ }
95707+#endif
95708+
95709 return 0;
95710 }
95711
95712@@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
95713 if (end < start)
95714 return error;
95715
95716+#ifdef CONFIG_PAX_SEGMEXEC
95717+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
95718+ if (end > SEGMEXEC_TASK_SIZE)
95719+ return error;
95720+ } else
95721+#endif
95722+
95723+ if (end > TASK_SIZE)
95724+ return error;
95725+
95726 error = 0;
95727 if (end == start)
95728 return error;
95729diff --git a/mm/memory-failure.c b/mm/memory-failure.c
95730index 8639f6b..b623882a 100644
95731--- a/mm/memory-failure.c
95732+++ b/mm/memory-failure.c
95733@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
95734
95735 int sysctl_memory_failure_recovery __read_mostly = 1;
95736
95737-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95738+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95739
95740 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
95741
95742@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
95743 pfn, t->comm, t->pid);
95744 si.si_signo = SIGBUS;
95745 si.si_errno = 0;
95746- si.si_addr = (void *)addr;
95747+ si.si_addr = (void __user *)addr;
95748 #ifdef __ARCH_SI_TRAPNO
95749 si.si_trapno = trapno;
95750 #endif
95751@@ -791,7 +791,7 @@ static struct page_state {
95752 unsigned long res;
95753 char *msg;
95754 int (*action)(struct page *p, unsigned long pfn);
95755-} error_states[] = {
95756+} __do_const error_states[] = {
95757 { reserved, reserved, "reserved kernel", me_kernel },
95758 /*
95759 * free pages are specially detected outside this table:
95760@@ -1099,7 +1099,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95761 nr_pages = 1 << compound_order(hpage);
95762 else /* normal page or thp */
95763 nr_pages = 1;
95764- atomic_long_add(nr_pages, &num_poisoned_pages);
95765+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
95766
95767 /*
95768 * We need/can do nothing about count=0 pages.
95769@@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95770 if (PageHWPoison(hpage)) {
95771 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
95772 || (p != hpage && TestSetPageHWPoison(hpage))) {
95773- atomic_long_sub(nr_pages, &num_poisoned_pages);
95774+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95775 unlock_page(hpage);
95776 return 0;
95777 }
95778@@ -1196,14 +1196,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95779 */
95780 if (!PageHWPoison(p)) {
95781 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
95782- atomic_long_sub(nr_pages, &num_poisoned_pages);
95783+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95784 put_page(hpage);
95785 res = 0;
95786 goto out;
95787 }
95788 if (hwpoison_filter(p)) {
95789 if (TestClearPageHWPoison(p))
95790- atomic_long_sub(nr_pages, &num_poisoned_pages);
95791+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95792 unlock_page(hpage);
95793 put_page(hpage);
95794 return 0;
95795@@ -1433,7 +1433,7 @@ int unpoison_memory(unsigned long pfn)
95796 return 0;
95797 }
95798 if (TestClearPageHWPoison(p))
95799- atomic_long_dec(&num_poisoned_pages);
95800+ atomic_long_dec_unchecked(&num_poisoned_pages);
95801 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
95802 return 0;
95803 }
95804@@ -1447,7 +1447,7 @@ int unpoison_memory(unsigned long pfn)
95805 */
95806 if (TestClearPageHWPoison(page)) {
95807 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
95808- atomic_long_sub(nr_pages, &num_poisoned_pages);
95809+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95810 freeit = 1;
95811 if (PageHuge(page))
95812 clear_page_hwpoison_huge_page(page);
95813@@ -1572,11 +1572,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
95814 if (PageHuge(page)) {
95815 set_page_hwpoison_huge_page(hpage);
95816 dequeue_hwpoisoned_huge_page(hpage);
95817- atomic_long_add(1 << compound_order(hpage),
95818+ atomic_long_add_unchecked(1 << compound_order(hpage),
95819 &num_poisoned_pages);
95820 } else {
95821 SetPageHWPoison(page);
95822- atomic_long_inc(&num_poisoned_pages);
95823+ atomic_long_inc_unchecked(&num_poisoned_pages);
95824 }
95825 }
95826 return ret;
95827@@ -1615,7 +1615,7 @@ static int __soft_offline_page(struct page *page, int flags)
95828 put_page(page);
95829 pr_info("soft_offline: %#lx: invalidated\n", pfn);
95830 SetPageHWPoison(page);
95831- atomic_long_inc(&num_poisoned_pages);
95832+ atomic_long_inc_unchecked(&num_poisoned_pages);
95833 return 0;
95834 }
95835
95836@@ -1666,7 +1666,7 @@ static int __soft_offline_page(struct page *page, int flags)
95837 if (!is_free_buddy_page(page))
95838 pr_info("soft offline: %#lx: page leaked\n",
95839 pfn);
95840- atomic_long_inc(&num_poisoned_pages);
95841+ atomic_long_inc_unchecked(&num_poisoned_pages);
95842 }
95843 } else {
95844 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
95845@@ -1736,11 +1736,11 @@ int soft_offline_page(struct page *page, int flags)
95846 if (PageHuge(page)) {
95847 set_page_hwpoison_huge_page(hpage);
95848 dequeue_hwpoisoned_huge_page(hpage);
95849- atomic_long_add(1 << compound_order(hpage),
95850+ atomic_long_add_unchecked(1 << compound_order(hpage),
95851 &num_poisoned_pages);
95852 } else {
95853 SetPageHWPoison(page);
95854- atomic_long_inc(&num_poisoned_pages);
95855+ atomic_long_inc_unchecked(&num_poisoned_pages);
95856 }
95857 }
95858 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
95859diff --git a/mm/memory.c b/mm/memory.c
95860index 7f86cf6..0600e22 100644
95861--- a/mm/memory.c
95862+++ b/mm/memory.c
95863@@ -415,6 +415,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95864 free_pte_range(tlb, pmd, addr);
95865 } while (pmd++, addr = next, addr != end);
95866
95867+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
95868 start &= PUD_MASK;
95869 if (start < floor)
95870 return;
95871@@ -429,6 +430,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95872 pmd = pmd_offset(pud, start);
95873 pud_clear(pud);
95874 pmd_free_tlb(tlb, pmd, start);
95875+#endif
95876+
95877 }
95878
95879 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95880@@ -448,6 +451,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95881 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
95882 } while (pud++, addr = next, addr != end);
95883
95884+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
95885 start &= PGDIR_MASK;
95886 if (start < floor)
95887 return;
95888@@ -462,6 +466,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95889 pud = pud_offset(pgd, start);
95890 pgd_clear(pgd);
95891 pud_free_tlb(tlb, pud, start);
95892+#endif
95893+
95894 }
95895
95896 /*
95897@@ -691,10 +697,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
95898 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
95899 */
95900 if (vma->vm_ops)
95901- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
95902+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
95903 vma->vm_ops->fault);
95904 if (vma->vm_file)
95905- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
95906+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
95907 vma->vm_file->f_op->mmap);
95908 dump_stack();
95909 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
95910@@ -1501,6 +1507,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
95911 page_add_file_rmap(page);
95912 set_pte_at(mm, addr, pte, mk_pte(page, prot));
95913
95914+#ifdef CONFIG_PAX_SEGMEXEC
95915+ pax_mirror_file_pte(vma, addr, page, ptl);
95916+#endif
95917+
95918 retval = 0;
95919 pte_unmap_unlock(pte, ptl);
95920 return retval;
95921@@ -1545,9 +1555,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
95922 if (!page_count(page))
95923 return -EINVAL;
95924 if (!(vma->vm_flags & VM_MIXEDMAP)) {
95925+
95926+#ifdef CONFIG_PAX_SEGMEXEC
95927+ struct vm_area_struct *vma_m;
95928+#endif
95929+
95930 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
95931 BUG_ON(vma->vm_flags & VM_PFNMAP);
95932 vma->vm_flags |= VM_MIXEDMAP;
95933+
95934+#ifdef CONFIG_PAX_SEGMEXEC
95935+ vma_m = pax_find_mirror_vma(vma);
95936+ if (vma_m)
95937+ vma_m->vm_flags |= VM_MIXEDMAP;
95938+#endif
95939+
95940 }
95941 return insert_page(vma, addr, page, vma->vm_page_prot);
95942 }
95943@@ -1630,6 +1652,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
95944 unsigned long pfn)
95945 {
95946 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
95947+ BUG_ON(vma->vm_mirror);
95948
95949 if (addr < vma->vm_start || addr >= vma->vm_end)
95950 return -EFAULT;
95951@@ -1877,7 +1900,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
95952
95953 BUG_ON(pud_huge(*pud));
95954
95955- pmd = pmd_alloc(mm, pud, addr);
95956+ pmd = (mm == &init_mm) ?
95957+ pmd_alloc_kernel(mm, pud, addr) :
95958+ pmd_alloc(mm, pud, addr);
95959 if (!pmd)
95960 return -ENOMEM;
95961 do {
95962@@ -1897,7 +1922,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
95963 unsigned long next;
95964 int err;
95965
95966- pud = pud_alloc(mm, pgd, addr);
95967+ pud = (mm == &init_mm) ?
95968+ pud_alloc_kernel(mm, pgd, addr) :
95969+ pud_alloc(mm, pgd, addr);
95970 if (!pud)
95971 return -ENOMEM;
95972 do {
95973@@ -2019,6 +2046,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
95974 return ret;
95975 }
95976
95977+#ifdef CONFIG_PAX_SEGMEXEC
95978+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
95979+{
95980+ struct mm_struct *mm = vma->vm_mm;
95981+ spinlock_t *ptl;
95982+ pte_t *pte, entry;
95983+
95984+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
95985+ entry = *pte;
95986+ if (!pte_present(entry)) {
95987+ if (!pte_none(entry)) {
95988+ BUG_ON(pte_file(entry));
95989+ free_swap_and_cache(pte_to_swp_entry(entry));
95990+ pte_clear_not_present_full(mm, address, pte, 0);
95991+ }
95992+ } else {
95993+ struct page *page;
95994+
95995+ flush_cache_page(vma, address, pte_pfn(entry));
95996+ entry = ptep_clear_flush(vma, address, pte);
95997+ BUG_ON(pte_dirty(entry));
95998+ page = vm_normal_page(vma, address, entry);
95999+ if (page) {
96000+ update_hiwater_rss(mm);
96001+ if (PageAnon(page))
96002+ dec_mm_counter_fast(mm, MM_ANONPAGES);
96003+ else
96004+ dec_mm_counter_fast(mm, MM_FILEPAGES);
96005+ page_remove_rmap(page);
96006+ page_cache_release(page);
96007+ }
96008+ }
96009+ pte_unmap_unlock(pte, ptl);
96010+}
96011+
96012+/* PaX: if vma is mirrored, synchronize the mirror's PTE
96013+ *
96014+ * the ptl of the lower mapped page is held on entry and is not released on exit
96015+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
96016+ */
96017+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
96018+{
96019+ struct mm_struct *mm = vma->vm_mm;
96020+ unsigned long address_m;
96021+ spinlock_t *ptl_m;
96022+ struct vm_area_struct *vma_m;
96023+ pmd_t *pmd_m;
96024+ pte_t *pte_m, entry_m;
96025+
96026+ BUG_ON(!page_m || !PageAnon(page_m));
96027+
96028+ vma_m = pax_find_mirror_vma(vma);
96029+ if (!vma_m)
96030+ return;
96031+
96032+ BUG_ON(!PageLocked(page_m));
96033+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96034+ address_m = address + SEGMEXEC_TASK_SIZE;
96035+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96036+ pte_m = pte_offset_map(pmd_m, address_m);
96037+ ptl_m = pte_lockptr(mm, pmd_m);
96038+ if (ptl != ptl_m) {
96039+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96040+ if (!pte_none(*pte_m))
96041+ goto out;
96042+ }
96043+
96044+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
96045+ page_cache_get(page_m);
96046+ page_add_anon_rmap(page_m, vma_m, address_m);
96047+ inc_mm_counter_fast(mm, MM_ANONPAGES);
96048+ set_pte_at(mm, address_m, pte_m, entry_m);
96049+ update_mmu_cache(vma_m, address_m, pte_m);
96050+out:
96051+ if (ptl != ptl_m)
96052+ spin_unlock(ptl_m);
96053+ pte_unmap(pte_m);
96054+ unlock_page(page_m);
96055+}
96056+
96057+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
96058+{
96059+ struct mm_struct *mm = vma->vm_mm;
96060+ unsigned long address_m;
96061+ spinlock_t *ptl_m;
96062+ struct vm_area_struct *vma_m;
96063+ pmd_t *pmd_m;
96064+ pte_t *pte_m, entry_m;
96065+
96066+ BUG_ON(!page_m || PageAnon(page_m));
96067+
96068+ vma_m = pax_find_mirror_vma(vma);
96069+ if (!vma_m)
96070+ return;
96071+
96072+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96073+ address_m = address + SEGMEXEC_TASK_SIZE;
96074+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96075+ pte_m = pte_offset_map(pmd_m, address_m);
96076+ ptl_m = pte_lockptr(mm, pmd_m);
96077+ if (ptl != ptl_m) {
96078+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96079+ if (!pte_none(*pte_m))
96080+ goto out;
96081+ }
96082+
96083+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
96084+ page_cache_get(page_m);
96085+ page_add_file_rmap(page_m);
96086+ inc_mm_counter_fast(mm, MM_FILEPAGES);
96087+ set_pte_at(mm, address_m, pte_m, entry_m);
96088+ update_mmu_cache(vma_m, address_m, pte_m);
96089+out:
96090+ if (ptl != ptl_m)
96091+ spin_unlock(ptl_m);
96092+ pte_unmap(pte_m);
96093+}
96094+
96095+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
96096+{
96097+ struct mm_struct *mm = vma->vm_mm;
96098+ unsigned long address_m;
96099+ spinlock_t *ptl_m;
96100+ struct vm_area_struct *vma_m;
96101+ pmd_t *pmd_m;
96102+ pte_t *pte_m, entry_m;
96103+
96104+ vma_m = pax_find_mirror_vma(vma);
96105+ if (!vma_m)
96106+ return;
96107+
96108+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
96109+ address_m = address + SEGMEXEC_TASK_SIZE;
96110+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
96111+ pte_m = pte_offset_map(pmd_m, address_m);
96112+ ptl_m = pte_lockptr(mm, pmd_m);
96113+ if (ptl != ptl_m) {
96114+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
96115+ if (!pte_none(*pte_m))
96116+ goto out;
96117+ }
96118+
96119+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
96120+ set_pte_at(mm, address_m, pte_m, entry_m);
96121+out:
96122+ if (ptl != ptl_m)
96123+ spin_unlock(ptl_m);
96124+ pte_unmap(pte_m);
96125+}
96126+
96127+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
96128+{
96129+ struct page *page_m;
96130+ pte_t entry;
96131+
96132+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
96133+ goto out;
96134+
96135+ entry = *pte;
96136+ page_m = vm_normal_page(vma, address, entry);
96137+ if (!page_m)
96138+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
96139+ else if (PageAnon(page_m)) {
96140+ if (pax_find_mirror_vma(vma)) {
96141+ pte_unmap_unlock(pte, ptl);
96142+ lock_page(page_m);
96143+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
96144+ if (pte_same(entry, *pte))
96145+ pax_mirror_anon_pte(vma, address, page_m, ptl);
96146+ else
96147+ unlock_page(page_m);
96148+ }
96149+ } else
96150+ pax_mirror_file_pte(vma, address, page_m, ptl);
96151+
96152+out:
96153+ pte_unmap_unlock(pte, ptl);
96154+}
96155+#endif
96156+
96157 /*
96158 * This routine handles present pages, when users try to write
96159 * to a shared page. It is done by copying the page to a new address
96160@@ -2225,6 +2432,12 @@ gotten:
96161 */
96162 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
96163 if (likely(pte_same(*page_table, orig_pte))) {
96164+
96165+#ifdef CONFIG_PAX_SEGMEXEC
96166+ if (pax_find_mirror_vma(vma))
96167+ BUG_ON(!trylock_page(new_page));
96168+#endif
96169+
96170 if (old_page) {
96171 if (!PageAnon(old_page)) {
96172 dec_mm_counter_fast(mm, MM_FILEPAGES);
96173@@ -2278,6 +2491,10 @@ gotten:
96174 page_remove_rmap(old_page);
96175 }
96176
96177+#ifdef CONFIG_PAX_SEGMEXEC
96178+ pax_mirror_anon_pte(vma, address, new_page, ptl);
96179+#endif
96180+
96181 /* Free the old page.. */
96182 new_page = old_page;
96183 ret |= VM_FAULT_WRITE;
96184@@ -2552,6 +2769,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
96185 swap_free(entry);
96186 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
96187 try_to_free_swap(page);
96188+
96189+#ifdef CONFIG_PAX_SEGMEXEC
96190+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
96191+#endif
96192+
96193 unlock_page(page);
96194 if (page != swapcache) {
96195 /*
96196@@ -2575,6 +2797,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
96197
96198 /* No need to invalidate - it was non-present before */
96199 update_mmu_cache(vma, address, page_table);
96200+
96201+#ifdef CONFIG_PAX_SEGMEXEC
96202+ pax_mirror_anon_pte(vma, address, page, ptl);
96203+#endif
96204+
96205 unlock:
96206 pte_unmap_unlock(page_table, ptl);
96207 out:
96208@@ -2594,40 +2821,6 @@ out_release:
96209 }
96210
96211 /*
96212- * This is like a special single-page "expand_{down|up}wards()",
96213- * except we must first make sure that 'address{-|+}PAGE_SIZE'
96214- * doesn't hit another vma.
96215- */
96216-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
96217-{
96218- address &= PAGE_MASK;
96219- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
96220- struct vm_area_struct *prev = vma->vm_prev;
96221-
96222- /*
96223- * Is there a mapping abutting this one below?
96224- *
96225- * That's only ok if it's the same stack mapping
96226- * that has gotten split..
96227- */
96228- if (prev && prev->vm_end == address)
96229- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
96230-
96231- return expand_downwards(vma, address - PAGE_SIZE);
96232- }
96233- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
96234- struct vm_area_struct *next = vma->vm_next;
96235-
96236- /* As VM_GROWSDOWN but s/below/above/ */
96237- if (next && next->vm_start == address + PAGE_SIZE)
96238- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
96239-
96240- return expand_upwards(vma, address + PAGE_SIZE);
96241- }
96242- return 0;
96243-}
96244-
96245-/*
96246 * We enter with non-exclusive mmap_sem (to exclude vma changes,
96247 * but allow concurrent faults), and pte mapped but not yet locked.
96248 * We return with mmap_sem still held, but pte unmapped and unlocked.
96249@@ -2637,27 +2830,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
96250 unsigned int flags)
96251 {
96252 struct mem_cgroup *memcg;
96253- struct page *page;
96254+ struct page *page = NULL;
96255 spinlock_t *ptl;
96256 pte_t entry;
96257
96258- pte_unmap(page_table);
96259-
96260- /* Check if we need to add a guard page to the stack */
96261- if (check_stack_guard_page(vma, address) < 0)
96262- return VM_FAULT_SIGBUS;
96263-
96264- /* Use the zero-page for reads */
96265 if (!(flags & FAULT_FLAG_WRITE)) {
96266 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
96267 vma->vm_page_prot));
96268- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
96269+ ptl = pte_lockptr(mm, pmd);
96270+ spin_lock(ptl);
96271 if (!pte_none(*page_table))
96272 goto unlock;
96273 goto setpte;
96274 }
96275
96276 /* Allocate our own private page. */
96277+ pte_unmap(page_table);
96278+
96279 if (unlikely(anon_vma_prepare(vma)))
96280 goto oom;
96281 page = alloc_zeroed_user_highpage_movable(vma, address);
96282@@ -2681,6 +2870,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
96283 if (!pte_none(*page_table))
96284 goto release;
96285
96286+#ifdef CONFIG_PAX_SEGMEXEC
96287+ if (pax_find_mirror_vma(vma))
96288+ BUG_ON(!trylock_page(page));
96289+#endif
96290+
96291 inc_mm_counter_fast(mm, MM_ANONPAGES);
96292 page_add_new_anon_rmap(page, vma, address);
96293 mem_cgroup_commit_charge(page, memcg, false);
96294@@ -2690,6 +2884,12 @@ setpte:
96295
96296 /* No need to invalidate - it was non-present before */
96297 update_mmu_cache(vma, address, page_table);
96298+
96299+#ifdef CONFIG_PAX_SEGMEXEC
96300+ if (page)
96301+ pax_mirror_anon_pte(vma, address, page, ptl);
96302+#endif
96303+
96304 unlock:
96305 pte_unmap_unlock(page_table, ptl);
96306 return 0;
96307@@ -2920,6 +3120,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96308 return ret;
96309 }
96310 do_set_pte(vma, address, fault_page, pte, false, false);
96311+
96312+#ifdef CONFIG_PAX_SEGMEXEC
96313+ pax_mirror_file_pte(vma, address, fault_page, ptl);
96314+#endif
96315+
96316 unlock_page(fault_page);
96317 unlock_out:
96318 pte_unmap_unlock(pte, ptl);
96319@@ -2962,7 +3167,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96320 page_cache_release(fault_page);
96321 goto uncharge_out;
96322 }
96323+
96324+#ifdef CONFIG_PAX_SEGMEXEC
96325+ if (pax_find_mirror_vma(vma))
96326+ BUG_ON(!trylock_page(new_page));
96327+#endif
96328+
96329 do_set_pte(vma, address, new_page, pte, true, true);
96330+
96331+#ifdef CONFIG_PAX_SEGMEXEC
96332+ pax_mirror_anon_pte(vma, address, new_page, ptl);
96333+#endif
96334+
96335 mem_cgroup_commit_charge(new_page, memcg, false);
96336 lru_cache_add_active_or_unevictable(new_page, vma);
96337 pte_unmap_unlock(pte, ptl);
96338@@ -3012,6 +3228,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96339 return ret;
96340 }
96341 do_set_pte(vma, address, fault_page, pte, true, false);
96342+
96343+#ifdef CONFIG_PAX_SEGMEXEC
96344+ pax_mirror_file_pte(vma, address, fault_page, ptl);
96345+#endif
96346+
96347 pte_unmap_unlock(pte, ptl);
96348
96349 if (set_page_dirty(fault_page))
96350@@ -3253,6 +3474,12 @@ static int handle_pte_fault(struct mm_struct *mm,
96351 if (flags & FAULT_FLAG_WRITE)
96352 flush_tlb_fix_spurious_fault(vma, address);
96353 }
96354+
96355+#ifdef CONFIG_PAX_SEGMEXEC
96356+ pax_mirror_pte(vma, address, pte, pmd, ptl);
96357+ return 0;
96358+#endif
96359+
96360 unlock:
96361 pte_unmap_unlock(pte, ptl);
96362 return 0;
96363@@ -3272,9 +3499,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96364 pmd_t *pmd;
96365 pte_t *pte;
96366
96367+#ifdef CONFIG_PAX_SEGMEXEC
96368+ struct vm_area_struct *vma_m;
96369+#endif
96370+
96371 if (unlikely(is_vm_hugetlb_page(vma)))
96372 return hugetlb_fault(mm, vma, address, flags);
96373
96374+#ifdef CONFIG_PAX_SEGMEXEC
96375+ vma_m = pax_find_mirror_vma(vma);
96376+ if (vma_m) {
96377+ unsigned long address_m;
96378+ pgd_t *pgd_m;
96379+ pud_t *pud_m;
96380+ pmd_t *pmd_m;
96381+
96382+ if (vma->vm_start > vma_m->vm_start) {
96383+ address_m = address;
96384+ address -= SEGMEXEC_TASK_SIZE;
96385+ vma = vma_m;
96386+ } else
96387+ address_m = address + SEGMEXEC_TASK_SIZE;
96388+
96389+ pgd_m = pgd_offset(mm, address_m);
96390+ pud_m = pud_alloc(mm, pgd_m, address_m);
96391+ if (!pud_m)
96392+ return VM_FAULT_OOM;
96393+ pmd_m = pmd_alloc(mm, pud_m, address_m);
96394+ if (!pmd_m)
96395+ return VM_FAULT_OOM;
96396+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
96397+ return VM_FAULT_OOM;
96398+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
96399+ }
96400+#endif
96401+
96402 pgd = pgd_offset(mm, address);
96403 pud = pud_alloc(mm, pgd, address);
96404 if (!pud)
96405@@ -3408,6 +3667,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
96406 spin_unlock(&mm->page_table_lock);
96407 return 0;
96408 }
96409+
96410+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
96411+{
96412+ pud_t *new = pud_alloc_one(mm, address);
96413+ if (!new)
96414+ return -ENOMEM;
96415+
96416+ smp_wmb(); /* See comment in __pte_alloc */
96417+
96418+ spin_lock(&mm->page_table_lock);
96419+ if (pgd_present(*pgd)) /* Another has populated it */
96420+ pud_free(mm, new);
96421+ else
96422+ pgd_populate_kernel(mm, pgd, new);
96423+ spin_unlock(&mm->page_table_lock);
96424+ return 0;
96425+}
96426 #endif /* __PAGETABLE_PUD_FOLDED */
96427
96428 #ifndef __PAGETABLE_PMD_FOLDED
96429@@ -3438,6 +3714,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
96430 spin_unlock(&mm->page_table_lock);
96431 return 0;
96432 }
96433+
96434+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
96435+{
96436+ pmd_t *new = pmd_alloc_one(mm, address);
96437+ if (!new)
96438+ return -ENOMEM;
96439+
96440+ smp_wmb(); /* See comment in __pte_alloc */
96441+
96442+ spin_lock(&mm->page_table_lock);
96443+#ifndef __ARCH_HAS_4LEVEL_HACK
96444+ if (pud_present(*pud)) /* Another has populated it */
96445+ pmd_free(mm, new);
96446+ else
96447+ pud_populate_kernel(mm, pud, new);
96448+#else
96449+ if (pgd_present(*pud)) /* Another has populated it */
96450+ pmd_free(mm, new);
96451+ else
96452+ pgd_populate_kernel(mm, pud, new);
96453+#endif /* __ARCH_HAS_4LEVEL_HACK */
96454+ spin_unlock(&mm->page_table_lock);
96455+ return 0;
96456+}
96457 #endif /* __PAGETABLE_PMD_FOLDED */
96458
96459 static int __follow_pte(struct mm_struct *mm, unsigned long address,
96460@@ -3547,8 +3847,8 @@ out:
96461 return ret;
96462 }
96463
96464-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96465- void *buf, int len, int write)
96466+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96467+ void *buf, size_t len, int write)
96468 {
96469 resource_size_t phys_addr;
96470 unsigned long prot = 0;
96471@@ -3574,8 +3874,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
96472 * Access another process' address space as given in mm. If non-NULL, use the
96473 * given task for page fault accounting.
96474 */
96475-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96476- unsigned long addr, void *buf, int len, int write)
96477+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96478+ unsigned long addr, void *buf, size_t len, int write)
96479 {
96480 struct vm_area_struct *vma;
96481 void *old_buf = buf;
96482@@ -3583,7 +3883,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96483 down_read(&mm->mmap_sem);
96484 /* ignore errors, just check how much was successfully transferred */
96485 while (len) {
96486- int bytes, ret, offset;
96487+ ssize_t bytes, ret, offset;
96488 void *maddr;
96489 struct page *page = NULL;
96490
96491@@ -3644,8 +3944,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96492 *
96493 * The caller must hold a reference on @mm.
96494 */
96495-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96496- void *buf, int len, int write)
96497+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
96498+ void *buf, size_t len, int write)
96499 {
96500 return __access_remote_vm(NULL, mm, addr, buf, len, write);
96501 }
96502@@ -3655,11 +3955,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96503 * Source/target buffer must be kernel space,
96504 * Do not walk the page table directly, use get_user_pages
96505 */
96506-int access_process_vm(struct task_struct *tsk, unsigned long addr,
96507- void *buf, int len, int write)
96508+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
96509+ void *buf, size_t len, int write)
96510 {
96511 struct mm_struct *mm;
96512- int ret;
96513+ ssize_t ret;
96514
96515 mm = get_task_mm(tsk);
96516 if (!mm)
96517diff --git a/mm/mempolicy.c b/mm/mempolicy.c
96518index e58725a..e0be017 100644
96519--- a/mm/mempolicy.c
96520+++ b/mm/mempolicy.c
96521@@ -750,6 +750,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96522 unsigned long vmstart;
96523 unsigned long vmend;
96524
96525+#ifdef CONFIG_PAX_SEGMEXEC
96526+ struct vm_area_struct *vma_m;
96527+#endif
96528+
96529 vma = find_vma(mm, start);
96530 if (!vma || vma->vm_start > start)
96531 return -EFAULT;
96532@@ -793,6 +797,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96533 err = vma_replace_policy(vma, new_pol);
96534 if (err)
96535 goto out;
96536+
96537+#ifdef CONFIG_PAX_SEGMEXEC
96538+ vma_m = pax_find_mirror_vma(vma);
96539+ if (vma_m) {
96540+ err = vma_replace_policy(vma_m, new_pol);
96541+ if (err)
96542+ goto out;
96543+ }
96544+#endif
96545+
96546 }
96547
96548 out:
96549@@ -1212,6 +1226,17 @@ static long do_mbind(unsigned long start, unsigned long len,
96550
96551 if (end < start)
96552 return -EINVAL;
96553+
96554+#ifdef CONFIG_PAX_SEGMEXEC
96555+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
96556+ if (end > SEGMEXEC_TASK_SIZE)
96557+ return -EINVAL;
96558+ } else
96559+#endif
96560+
96561+ if (end > TASK_SIZE)
96562+ return -EINVAL;
96563+
96564 if (end == start)
96565 return 0;
96566
96567@@ -1437,8 +1462,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96568 */
96569 tcred = __task_cred(task);
96570 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96571- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96572- !capable(CAP_SYS_NICE)) {
96573+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96574 rcu_read_unlock();
96575 err = -EPERM;
96576 goto out_put;
96577@@ -1469,6 +1493,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96578 goto out;
96579 }
96580
96581+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96582+ if (mm != current->mm &&
96583+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
96584+ mmput(mm);
96585+ err = -EPERM;
96586+ goto out;
96587+ }
96588+#endif
96589+
96590 err = do_migrate_pages(mm, old, new,
96591 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
96592
96593diff --git a/mm/migrate.c b/mm/migrate.c
96594index 0143995..b294728 100644
96595--- a/mm/migrate.c
96596+++ b/mm/migrate.c
96597@@ -1495,8 +1495,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
96598 */
96599 tcred = __task_cred(task);
96600 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96601- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96602- !capable(CAP_SYS_NICE)) {
96603+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96604 rcu_read_unlock();
96605 err = -EPERM;
96606 goto out;
96607diff --git a/mm/mlock.c b/mm/mlock.c
96608index 73cf098..ab547c7 100644
96609--- a/mm/mlock.c
96610+++ b/mm/mlock.c
96611@@ -14,6 +14,7 @@
96612 #include <linux/pagevec.h>
96613 #include <linux/mempolicy.h>
96614 #include <linux/syscalls.h>
96615+#include <linux/security.h>
96616 #include <linux/sched.h>
96617 #include <linux/export.h>
96618 #include <linux/rmap.h>
96619@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
96620 {
96621 unsigned long nstart, end, tmp;
96622 struct vm_area_struct * vma, * prev;
96623- int error;
96624+ int error = 0;
96625
96626 VM_BUG_ON(start & ~PAGE_MASK);
96627 VM_BUG_ON(len != PAGE_ALIGN(len));
96628@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
96629 return -EINVAL;
96630 if (end == start)
96631 return 0;
96632+ if (end > TASK_SIZE)
96633+ return -EINVAL;
96634+
96635 vma = find_vma(current->mm, start);
96636 if (!vma || vma->vm_start > start)
96637 return -ENOMEM;
96638@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
96639 for (nstart = start ; ; ) {
96640 vm_flags_t newflags;
96641
96642+#ifdef CONFIG_PAX_SEGMEXEC
96643+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96644+ break;
96645+#endif
96646+
96647 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
96648
96649 newflags = vma->vm_flags & ~VM_LOCKED;
96650@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
96651 locked += current->mm->locked_vm;
96652
96653 /* check against resource limits */
96654+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
96655 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
96656 error = do_mlock(start, len, 1);
96657
96658@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
96659 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
96660 vm_flags_t newflags;
96661
96662+#ifdef CONFIG_PAX_SEGMEXEC
96663+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96664+ break;
96665+#endif
96666+
96667 newflags = vma->vm_flags & ~VM_LOCKED;
96668 if (flags & MCL_CURRENT)
96669 newflags |= VM_LOCKED;
96670@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
96671 lock_limit >>= PAGE_SHIFT;
96672
96673 ret = -ENOMEM;
96674+
96675+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
96676+
96677 down_write(&current->mm->mmap_sem);
96678-
96679 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
96680 capable(CAP_IPC_LOCK))
96681 ret = do_mlockall(flags);
96682diff --git a/mm/mmap.c b/mm/mmap.c
96683index 1620adb..348da48 100644
96684--- a/mm/mmap.c
96685+++ b/mm/mmap.c
96686@@ -41,6 +41,7 @@
96687 #include <linux/notifier.h>
96688 #include <linux/memory.h>
96689 #include <linux/printk.h>
96690+#include <linux/random.h>
96691
96692 #include <asm/uaccess.h>
96693 #include <asm/cacheflush.h>
96694@@ -57,6 +58,16 @@
96695 #define arch_rebalance_pgtables(addr, len) (addr)
96696 #endif
96697
96698+static inline void verify_mm_writelocked(struct mm_struct *mm)
96699+{
96700+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
96701+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
96702+ up_read(&mm->mmap_sem);
96703+ BUG();
96704+ }
96705+#endif
96706+}
96707+
96708 static void unmap_region(struct mm_struct *mm,
96709 struct vm_area_struct *vma, struct vm_area_struct *prev,
96710 unsigned long start, unsigned long end);
96711@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
96712 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
96713 *
96714 */
96715-pgprot_t protection_map[16] = {
96716+pgprot_t protection_map[16] __read_only = {
96717 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
96718 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
96719 };
96720
96721-pgprot_t vm_get_page_prot(unsigned long vm_flags)
96722+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
96723 {
96724- return __pgprot(pgprot_val(protection_map[vm_flags &
96725+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
96726 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
96727 pgprot_val(arch_vm_get_page_prot(vm_flags)));
96728+
96729+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96730+ if (!(__supported_pte_mask & _PAGE_NX) &&
96731+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
96732+ (vm_flags & (VM_READ | VM_WRITE)))
96733+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
96734+#endif
96735+
96736+ return prot;
96737 }
96738 EXPORT_SYMBOL(vm_get_page_prot);
96739
96740@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
96741 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
96742 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
96743 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
96744+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
96745 /*
96746 * Make sure vm_committed_as in one cacheline and not cacheline shared with
96747 * other variables. It can be updated by several CPUs frequently.
96748@@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
96749 struct vm_area_struct *next = vma->vm_next;
96750
96751 might_sleep();
96752+ BUG_ON(vma->vm_mirror);
96753 if (vma->vm_ops && vma->vm_ops->close)
96754 vma->vm_ops->close(vma);
96755 if (vma->vm_file)
96756@@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
96757
96758 SYSCALL_DEFINE1(brk, unsigned long, brk)
96759 {
96760+ unsigned long rlim;
96761 unsigned long retval;
96762 unsigned long newbrk, oldbrk;
96763 struct mm_struct *mm = current->mm;
96764@@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
96765 * segment grow beyond its set limit the in case where the limit is
96766 * not page aligned -Ram Gupta
96767 */
96768- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
96769+ rlim = rlimit(RLIMIT_DATA);
96770+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96771+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
96772+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
96773+ rlim = 4096 * PAGE_SIZE;
96774+#endif
96775+ if (check_data_rlimit(rlim, brk, mm->start_brk,
96776 mm->end_data, mm->start_data))
96777 goto out;
96778
96779@@ -976,6 +1005,12 @@ static int
96780 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
96781 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96782 {
96783+
96784+#ifdef CONFIG_PAX_SEGMEXEC
96785+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
96786+ return 0;
96787+#endif
96788+
96789 if (is_mergeable_vma(vma, file, vm_flags) &&
96790 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96791 if (vma->vm_pgoff == vm_pgoff)
96792@@ -995,6 +1030,12 @@ static int
96793 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
96794 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96795 {
96796+
96797+#ifdef CONFIG_PAX_SEGMEXEC
96798+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
96799+ return 0;
96800+#endif
96801+
96802 if (is_mergeable_vma(vma, file, vm_flags) &&
96803 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96804 pgoff_t vm_pglen;
96805@@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96806 struct vm_area_struct *area, *next;
96807 int err;
96808
96809+#ifdef CONFIG_PAX_SEGMEXEC
96810+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
96811+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
96812+
96813+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
96814+#endif
96815+
96816 /*
96817 * We later require that vma->vm_flags == vm_flags,
96818 * so this tests vma->vm_flags & VM_SPECIAL, too.
96819@@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96820 if (next && next->vm_end == end) /* cases 6, 7, 8 */
96821 next = next->vm_next;
96822
96823+#ifdef CONFIG_PAX_SEGMEXEC
96824+ if (prev)
96825+ prev_m = pax_find_mirror_vma(prev);
96826+ if (area)
96827+ area_m = pax_find_mirror_vma(area);
96828+ if (next)
96829+ next_m = pax_find_mirror_vma(next);
96830+#endif
96831+
96832 /*
96833 * Can it merge with the predecessor?
96834 */
96835@@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96836 /* cases 1, 6 */
96837 err = vma_adjust(prev, prev->vm_start,
96838 next->vm_end, prev->vm_pgoff, NULL);
96839- } else /* cases 2, 5, 7 */
96840+
96841+#ifdef CONFIG_PAX_SEGMEXEC
96842+ if (!err && prev_m)
96843+ err = vma_adjust(prev_m, prev_m->vm_start,
96844+ next_m->vm_end, prev_m->vm_pgoff, NULL);
96845+#endif
96846+
96847+ } else { /* cases 2, 5, 7 */
96848 err = vma_adjust(prev, prev->vm_start,
96849 end, prev->vm_pgoff, NULL);
96850+
96851+#ifdef CONFIG_PAX_SEGMEXEC
96852+ if (!err && prev_m)
96853+ err = vma_adjust(prev_m, prev_m->vm_start,
96854+ end_m, prev_m->vm_pgoff, NULL);
96855+#endif
96856+
96857+ }
96858 if (err)
96859 return NULL;
96860 khugepaged_enter_vma_merge(prev, vm_flags);
96861@@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96862 mpol_equal(policy, vma_policy(next)) &&
96863 can_vma_merge_before(next, vm_flags,
96864 anon_vma, file, pgoff+pglen)) {
96865- if (prev && addr < prev->vm_end) /* case 4 */
96866+ if (prev && addr < prev->vm_end) { /* case 4 */
96867 err = vma_adjust(prev, prev->vm_start,
96868 addr, prev->vm_pgoff, NULL);
96869- else /* cases 3, 8 */
96870+
96871+#ifdef CONFIG_PAX_SEGMEXEC
96872+ if (!err && prev_m)
96873+ err = vma_adjust(prev_m, prev_m->vm_start,
96874+ addr_m, prev_m->vm_pgoff, NULL);
96875+#endif
96876+
96877+ } else { /* cases 3, 8 */
96878 err = vma_adjust(area, addr, next->vm_end,
96879 next->vm_pgoff - pglen, NULL);
96880+
96881+#ifdef CONFIG_PAX_SEGMEXEC
96882+ if (!err && area_m)
96883+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
96884+ next_m->vm_pgoff - pglen, NULL);
96885+#endif
96886+
96887+ }
96888 if (err)
96889 return NULL;
96890 khugepaged_enter_vma_merge(area, vm_flags);
96891@@ -1208,8 +1295,10 @@ none:
96892 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96893 struct file *file, long pages)
96894 {
96895- const unsigned long stack_flags
96896- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
96897+
96898+#ifdef CONFIG_PAX_RANDMMAP
96899+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96900+#endif
96901
96902 mm->total_vm += pages;
96903
96904@@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96905 mm->shared_vm += pages;
96906 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
96907 mm->exec_vm += pages;
96908- } else if (flags & stack_flags)
96909+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
96910 mm->stack_vm += pages;
96911 }
96912 #endif /* CONFIG_PROC_FS */
96913@@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
96914 locked += mm->locked_vm;
96915 lock_limit = rlimit(RLIMIT_MEMLOCK);
96916 lock_limit >>= PAGE_SHIFT;
96917+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96918 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
96919 return -EAGAIN;
96920 }
96921@@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96922 * (the exception is when the underlying filesystem is noexec
96923 * mounted, in which case we dont add PROT_EXEC.)
96924 */
96925- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
96926+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
96927 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
96928 prot |= PROT_EXEC;
96929
96930@@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96931 /* Obtain the address to map to. we verify (or select) it and ensure
96932 * that it represents a valid section of the address space.
96933 */
96934- addr = get_unmapped_area(file, addr, len, pgoff, flags);
96935+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
96936 if (addr & ~PAGE_MASK)
96937 return addr;
96938
96939@@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96940 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
96941 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
96942
96943+#ifdef CONFIG_PAX_MPROTECT
96944+ if (mm->pax_flags & MF_PAX_MPROTECT) {
96945+
96946+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
96947+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
96948+ mm->binfmt->handle_mmap)
96949+ mm->binfmt->handle_mmap(file);
96950+#endif
96951+
96952+#ifndef CONFIG_PAX_MPROTECT_COMPAT
96953+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
96954+ gr_log_rwxmmap(file);
96955+
96956+#ifdef CONFIG_PAX_EMUPLT
96957+ vm_flags &= ~VM_EXEC;
96958+#else
96959+ return -EPERM;
96960+#endif
96961+
96962+ }
96963+
96964+ if (!(vm_flags & VM_EXEC))
96965+ vm_flags &= ~VM_MAYEXEC;
96966+#else
96967+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
96968+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
96969+#endif
96970+ else
96971+ vm_flags &= ~VM_MAYWRITE;
96972+ }
96973+#endif
96974+
96975+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96976+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
96977+ vm_flags &= ~VM_PAGEEXEC;
96978+#endif
96979+
96980 if (flags & MAP_LOCKED)
96981 if (!can_do_mlock())
96982 return -EPERM;
96983@@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96984 vm_flags |= VM_NORESERVE;
96985 }
96986
96987+ if (!gr_acl_handle_mmap(file, prot))
96988+ return -EACCES;
96989+
96990 addr = mmap_region(file, addr, len, vm_flags, pgoff);
96991 if (!IS_ERR_VALUE(addr) &&
96992 ((vm_flags & VM_LOCKED) ||
96993@@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
96994 vm_flags_t vm_flags = vma->vm_flags;
96995
96996 /* If it was private or non-writable, the write bit is already clear */
96997- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
96998+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
96999 return 0;
97000
97001 /* The backer wishes to know when pages are first written to? */
97002@@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
97003 struct rb_node **rb_link, *rb_parent;
97004 unsigned long charged = 0;
97005
97006+#ifdef CONFIG_PAX_SEGMEXEC
97007+ struct vm_area_struct *vma_m = NULL;
97008+#endif
97009+
97010+ /*
97011+ * mm->mmap_sem is required to protect against another thread
97012+ * changing the mappings in case we sleep.
97013+ */
97014+ verify_mm_writelocked(mm);
97015+
97016 /* Check against address space limit. */
97017+
97018+#ifdef CONFIG_PAX_RANDMMAP
97019+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
97020+#endif
97021+
97022 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
97023 unsigned long nr_pages;
97024
97025@@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
97026
97027 /* Clear old maps */
97028 error = -ENOMEM;
97029-munmap_back:
97030 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97031 if (do_munmap(mm, addr, len))
97032 return -ENOMEM;
97033- goto munmap_back;
97034+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97035 }
97036
97037 /*
97038@@ -1595,6 +1739,16 @@ munmap_back:
97039 goto unacct_error;
97040 }
97041
97042+#ifdef CONFIG_PAX_SEGMEXEC
97043+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
97044+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97045+ if (!vma_m) {
97046+ error = -ENOMEM;
97047+ goto free_vma;
97048+ }
97049+ }
97050+#endif
97051+
97052 vma->vm_mm = mm;
97053 vma->vm_start = addr;
97054 vma->vm_end = addr + len;
97055@@ -1625,6 +1779,13 @@ munmap_back:
97056 if (error)
97057 goto unmap_and_free_vma;
97058
97059+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97060+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
97061+ vma->vm_flags |= VM_PAGEEXEC;
97062+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97063+ }
97064+#endif
97065+
97066 /* Can addr have changed??
97067 *
97068 * Answer: Yes, several device drivers can do it in their
97069@@ -1643,6 +1804,12 @@ munmap_back:
97070 }
97071
97072 vma_link(mm, vma, prev, rb_link, rb_parent);
97073+
97074+#ifdef CONFIG_PAX_SEGMEXEC
97075+ if (vma_m)
97076+ BUG_ON(pax_mirror_vma(vma_m, vma));
97077+#endif
97078+
97079 /* Once vma denies write, undo our temporary denial count */
97080 if (file) {
97081 if (vm_flags & VM_SHARED)
97082@@ -1655,6 +1822,7 @@ out:
97083 perf_event_mmap(vma);
97084
97085 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
97086+ track_exec_limit(mm, addr, addr + len, vm_flags);
97087 if (vm_flags & VM_LOCKED) {
97088 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
97089 vma == get_gate_vma(current->mm)))
97090@@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
97091 if (vm_flags & VM_DENYWRITE)
97092 allow_write_access(file);
97093 free_vma:
97094+
97095+#ifdef CONFIG_PAX_SEGMEXEC
97096+ if (vma_m)
97097+ kmem_cache_free(vm_area_cachep, vma_m);
97098+#endif
97099+
97100 kmem_cache_free(vm_area_cachep, vma);
97101 unacct_error:
97102 if (charged)
97103@@ -1699,7 +1873,63 @@ unacct_error:
97104 return error;
97105 }
97106
97107-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
97108+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
97109+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
97110+{
97111+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
97112+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
97113+
97114+ return 0;
97115+}
97116+#endif
97117+
97118+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
97119+{
97120+ if (!vma) {
97121+#ifdef CONFIG_STACK_GROWSUP
97122+ if (addr > sysctl_heap_stack_gap)
97123+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
97124+ else
97125+ vma = find_vma(current->mm, 0);
97126+ if (vma && (vma->vm_flags & VM_GROWSUP))
97127+ return false;
97128+#endif
97129+ return true;
97130+ }
97131+
97132+ if (addr + len > vma->vm_start)
97133+ return false;
97134+
97135+ if (vma->vm_flags & VM_GROWSDOWN)
97136+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
97137+#ifdef CONFIG_STACK_GROWSUP
97138+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
97139+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
97140+#endif
97141+ else if (offset)
97142+ return offset <= vma->vm_start - addr - len;
97143+
97144+ return true;
97145+}
97146+
97147+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
97148+{
97149+ if (vma->vm_start < len)
97150+ return -ENOMEM;
97151+
97152+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
97153+ if (offset <= vma->vm_start - len)
97154+ return vma->vm_start - len - offset;
97155+ else
97156+ return -ENOMEM;
97157+ }
97158+
97159+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
97160+ return vma->vm_start - len - sysctl_heap_stack_gap;
97161+ return -ENOMEM;
97162+}
97163+
97164+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
97165 {
97166 /*
97167 * We implement the search by looking for an rbtree node that
97168@@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
97169 }
97170 }
97171
97172- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
97173+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
97174 check_current:
97175 /* Check if current node has a suitable gap */
97176 if (gap_start > high_limit)
97177 return -ENOMEM;
97178+
97179+ if (gap_end - gap_start > info->threadstack_offset)
97180+ gap_start += info->threadstack_offset;
97181+ else
97182+ gap_start = gap_end;
97183+
97184+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
97185+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97186+ gap_start += sysctl_heap_stack_gap;
97187+ else
97188+ gap_start = gap_end;
97189+ }
97190+ if (vma->vm_flags & VM_GROWSDOWN) {
97191+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97192+ gap_end -= sysctl_heap_stack_gap;
97193+ else
97194+ gap_end = gap_start;
97195+ }
97196 if (gap_end >= low_limit && gap_end - gap_start >= length)
97197 goto found;
97198
97199@@ -1801,7 +2049,7 @@ found:
97200 return gap_start;
97201 }
97202
97203-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
97204+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
97205 {
97206 struct mm_struct *mm = current->mm;
97207 struct vm_area_struct *vma;
97208@@ -1855,6 +2103,24 @@ check_current:
97209 gap_end = vma->vm_start;
97210 if (gap_end < low_limit)
97211 return -ENOMEM;
97212+
97213+ if (gap_end - gap_start > info->threadstack_offset)
97214+ gap_end -= info->threadstack_offset;
97215+ else
97216+ gap_end = gap_start;
97217+
97218+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
97219+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97220+ gap_start += sysctl_heap_stack_gap;
97221+ else
97222+ gap_start = gap_end;
97223+ }
97224+ if (vma->vm_flags & VM_GROWSDOWN) {
97225+ if (gap_end - gap_start > sysctl_heap_stack_gap)
97226+ gap_end -= sysctl_heap_stack_gap;
97227+ else
97228+ gap_end = gap_start;
97229+ }
97230 if (gap_start <= high_limit && gap_end - gap_start >= length)
97231 goto found;
97232
97233@@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
97234 struct mm_struct *mm = current->mm;
97235 struct vm_area_struct *vma;
97236 struct vm_unmapped_area_info info;
97237+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
97238
97239 if (len > TASK_SIZE - mmap_min_addr)
97240 return -ENOMEM;
97241@@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
97242 if (flags & MAP_FIXED)
97243 return addr;
97244
97245+#ifdef CONFIG_PAX_RANDMMAP
97246+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
97247+#endif
97248+
97249 if (addr) {
97250 addr = PAGE_ALIGN(addr);
97251 vma = find_vma(mm, addr);
97252 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
97253- (!vma || addr + len <= vma->vm_start))
97254+ check_heap_stack_gap(vma, addr, len, offset))
97255 return addr;
97256 }
97257
97258@@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
97259 info.low_limit = mm->mmap_base;
97260 info.high_limit = TASK_SIZE;
97261 info.align_mask = 0;
97262+ info.threadstack_offset = offset;
97263 return vm_unmapped_area(&info);
97264 }
97265 #endif
97266@@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
97267 struct mm_struct *mm = current->mm;
97268 unsigned long addr = addr0;
97269 struct vm_unmapped_area_info info;
97270+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
97271
97272 /* requested length too big for entire address space */
97273 if (len > TASK_SIZE - mmap_min_addr)
97274@@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
97275 if (flags & MAP_FIXED)
97276 return addr;
97277
97278+#ifdef CONFIG_PAX_RANDMMAP
97279+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
97280+#endif
97281+
97282 /* requesting a specific address */
97283 if (addr) {
97284 addr = PAGE_ALIGN(addr);
97285 vma = find_vma(mm, addr);
97286 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
97287- (!vma || addr + len <= vma->vm_start))
97288+ check_heap_stack_gap(vma, addr, len, offset))
97289 return addr;
97290 }
97291
97292@@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
97293 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
97294 info.high_limit = mm->mmap_base;
97295 info.align_mask = 0;
97296+ info.threadstack_offset = offset;
97297 addr = vm_unmapped_area(&info);
97298
97299 /*
97300@@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
97301 VM_BUG_ON(addr != -ENOMEM);
97302 info.flags = 0;
97303 info.low_limit = TASK_UNMAPPED_BASE;
97304+
97305+#ifdef CONFIG_PAX_RANDMMAP
97306+ if (mm->pax_flags & MF_PAX_RANDMMAP)
97307+ info.low_limit += mm->delta_mmap;
97308+#endif
97309+
97310 info.high_limit = TASK_SIZE;
97311 addr = vm_unmapped_area(&info);
97312 }
97313@@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
97314 return vma;
97315 }
97316
97317+#ifdef CONFIG_PAX_SEGMEXEC
97318+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
97319+{
97320+ struct vm_area_struct *vma_m;
97321+
97322+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
97323+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
97324+ BUG_ON(vma->vm_mirror);
97325+ return NULL;
97326+ }
97327+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
97328+ vma_m = vma->vm_mirror;
97329+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
97330+ BUG_ON(vma->vm_file != vma_m->vm_file);
97331+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
97332+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
97333+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
97334+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
97335+ return vma_m;
97336+}
97337+#endif
97338+
97339 /*
97340 * Verify that the stack growth is acceptable and
97341 * update accounting. This is shared with both the
97342@@ -2107,8 +2413,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
97343
97344 /* Stack limit test */
97345 actual_size = size;
97346- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
97347- actual_size -= PAGE_SIZE;
97348+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
97349 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
97350 return -ENOMEM;
97351
97352@@ -2119,6 +2424,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
97353 locked = mm->locked_vm + grow;
97354 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
97355 limit >>= PAGE_SHIFT;
97356+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
97357 if (locked > limit && !capable(CAP_IPC_LOCK))
97358 return -ENOMEM;
97359 }
97360@@ -2148,37 +2454,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
97361 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
97362 * vma is the last one with address > vma->vm_end. Have to extend vma.
97363 */
97364+#ifndef CONFIG_IA64
97365+static
97366+#endif
97367 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
97368 {
97369 int error;
97370+ bool locknext;
97371
97372 if (!(vma->vm_flags & VM_GROWSUP))
97373 return -EFAULT;
97374
97375+ /* Also guard against wrapping around to address 0. */
97376+ if (address < PAGE_ALIGN(address+1))
97377+ address = PAGE_ALIGN(address+1);
97378+ else
97379+ return -ENOMEM;
97380+
97381 /*
97382 * We must make sure the anon_vma is allocated
97383 * so that the anon_vma locking is not a noop.
97384 */
97385 if (unlikely(anon_vma_prepare(vma)))
97386 return -ENOMEM;
97387+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
97388+ if (locknext && anon_vma_prepare(vma->vm_next))
97389+ return -ENOMEM;
97390 vma_lock_anon_vma(vma);
97391+ if (locknext)
97392+ vma_lock_anon_vma(vma->vm_next);
97393
97394 /*
97395 * vma->vm_start/vm_end cannot change under us because the caller
97396 * is required to hold the mmap_sem in read mode. We need the
97397- * anon_vma lock to serialize against concurrent expand_stacks.
97398- * Also guard against wrapping around to address 0.
97399+ * anon_vma locks to serialize against concurrent expand_stacks
97400+ * and expand_upwards.
97401 */
97402- if (address < PAGE_ALIGN(address+4))
97403- address = PAGE_ALIGN(address+4);
97404- else {
97405- vma_unlock_anon_vma(vma);
97406- return -ENOMEM;
97407- }
97408 error = 0;
97409
97410 /* Somebody else might have raced and expanded it already */
97411- if (address > vma->vm_end) {
97412+ 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)
97413+ error = -ENOMEM;
97414+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
97415 unsigned long size, grow;
97416
97417 size = address - vma->vm_start;
97418@@ -2213,6 +2530,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
97419 }
97420 }
97421 }
97422+ if (locknext)
97423+ vma_unlock_anon_vma(vma->vm_next);
97424 vma_unlock_anon_vma(vma);
97425 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97426 validate_mm(vma->vm_mm);
97427@@ -2227,6 +2546,8 @@ int expand_downwards(struct vm_area_struct *vma,
97428 unsigned long address)
97429 {
97430 int error;
97431+ bool lockprev = false;
97432+ struct vm_area_struct *prev;
97433
97434 /*
97435 * We must make sure the anon_vma is allocated
97436@@ -2240,6 +2561,15 @@ int expand_downwards(struct vm_area_struct *vma,
97437 if (error)
97438 return error;
97439
97440+ prev = vma->vm_prev;
97441+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
97442+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
97443+#endif
97444+ if (lockprev && anon_vma_prepare(prev))
97445+ return -ENOMEM;
97446+ if (lockprev)
97447+ vma_lock_anon_vma(prev);
97448+
97449 vma_lock_anon_vma(vma);
97450
97451 /*
97452@@ -2249,9 +2579,17 @@ int expand_downwards(struct vm_area_struct *vma,
97453 */
97454
97455 /* Somebody else might have raced and expanded it already */
97456- if (address < vma->vm_start) {
97457+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
97458+ error = -ENOMEM;
97459+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
97460 unsigned long size, grow;
97461
97462+#ifdef CONFIG_PAX_SEGMEXEC
97463+ struct vm_area_struct *vma_m;
97464+
97465+ vma_m = pax_find_mirror_vma(vma);
97466+#endif
97467+
97468 size = vma->vm_end - address;
97469 grow = (vma->vm_start - address) >> PAGE_SHIFT;
97470
97471@@ -2276,13 +2614,27 @@ int expand_downwards(struct vm_area_struct *vma,
97472 vma->vm_pgoff -= grow;
97473 anon_vma_interval_tree_post_update_vma(vma);
97474 vma_gap_update(vma);
97475+
97476+#ifdef CONFIG_PAX_SEGMEXEC
97477+ if (vma_m) {
97478+ anon_vma_interval_tree_pre_update_vma(vma_m);
97479+ vma_m->vm_start -= grow << PAGE_SHIFT;
97480+ vma_m->vm_pgoff -= grow;
97481+ anon_vma_interval_tree_post_update_vma(vma_m);
97482+ vma_gap_update(vma_m);
97483+ }
97484+#endif
97485+
97486 spin_unlock(&vma->vm_mm->page_table_lock);
97487
97488+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
97489 perf_event_mmap(vma);
97490 }
97491 }
97492 }
97493 vma_unlock_anon_vma(vma);
97494+ if (lockprev)
97495+ vma_unlock_anon_vma(prev);
97496 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97497 validate_mm(vma->vm_mm);
97498 return error;
97499@@ -2380,6 +2732,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
97500 do {
97501 long nrpages = vma_pages(vma);
97502
97503+#ifdef CONFIG_PAX_SEGMEXEC
97504+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
97505+ vma = remove_vma(vma);
97506+ continue;
97507+ }
97508+#endif
97509+
97510 if (vma->vm_flags & VM_ACCOUNT)
97511 nr_accounted += nrpages;
97512 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
97513@@ -2424,6 +2783,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
97514 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
97515 vma->vm_prev = NULL;
97516 do {
97517+
97518+#ifdef CONFIG_PAX_SEGMEXEC
97519+ if (vma->vm_mirror) {
97520+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
97521+ vma->vm_mirror->vm_mirror = NULL;
97522+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
97523+ vma->vm_mirror = NULL;
97524+ }
97525+#endif
97526+
97527 vma_rb_erase(vma, &mm->mm_rb);
97528 mm->map_count--;
97529 tail_vma = vma;
97530@@ -2451,14 +2820,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97531 struct vm_area_struct *new;
97532 int err = -ENOMEM;
97533
97534+#ifdef CONFIG_PAX_SEGMEXEC
97535+ struct vm_area_struct *vma_m, *new_m = NULL;
97536+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
97537+#endif
97538+
97539 if (is_vm_hugetlb_page(vma) && (addr &
97540 ~(huge_page_mask(hstate_vma(vma)))))
97541 return -EINVAL;
97542
97543+#ifdef CONFIG_PAX_SEGMEXEC
97544+ vma_m = pax_find_mirror_vma(vma);
97545+#endif
97546+
97547 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97548 if (!new)
97549 goto out_err;
97550
97551+#ifdef CONFIG_PAX_SEGMEXEC
97552+ if (vma_m) {
97553+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97554+ if (!new_m) {
97555+ kmem_cache_free(vm_area_cachep, new);
97556+ goto out_err;
97557+ }
97558+ }
97559+#endif
97560+
97561 /* most fields are the same, copy all, and then fixup */
97562 *new = *vma;
97563
97564@@ -2471,6 +2859,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97565 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
97566 }
97567
97568+#ifdef CONFIG_PAX_SEGMEXEC
97569+ if (vma_m) {
97570+ *new_m = *vma_m;
97571+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
97572+ new_m->vm_mirror = new;
97573+ new->vm_mirror = new_m;
97574+
97575+ if (new_below)
97576+ new_m->vm_end = addr_m;
97577+ else {
97578+ new_m->vm_start = addr_m;
97579+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
97580+ }
97581+ }
97582+#endif
97583+
97584 err = vma_dup_policy(vma, new);
97585 if (err)
97586 goto out_free_vma;
97587@@ -2491,6 +2895,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97588 else
97589 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
97590
97591+#ifdef CONFIG_PAX_SEGMEXEC
97592+ if (!err && vma_m) {
97593+ struct mempolicy *pol = vma_policy(new);
97594+
97595+ if (anon_vma_clone(new_m, vma_m))
97596+ goto out_free_mpol;
97597+
97598+ mpol_get(pol);
97599+ set_vma_policy(new_m, pol);
97600+
97601+ if (new_m->vm_file)
97602+ get_file(new_m->vm_file);
97603+
97604+ if (new_m->vm_ops && new_m->vm_ops->open)
97605+ new_m->vm_ops->open(new_m);
97606+
97607+ if (new_below)
97608+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
97609+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
97610+ else
97611+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
97612+
97613+ if (err) {
97614+ if (new_m->vm_ops && new_m->vm_ops->close)
97615+ new_m->vm_ops->close(new_m);
97616+ if (new_m->vm_file)
97617+ fput(new_m->vm_file);
97618+ mpol_put(pol);
97619+ }
97620+ }
97621+#endif
97622+
97623 /* Success. */
97624 if (!err)
97625 return 0;
97626@@ -2500,10 +2936,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97627 new->vm_ops->close(new);
97628 if (new->vm_file)
97629 fput(new->vm_file);
97630- unlink_anon_vmas(new);
97631 out_free_mpol:
97632 mpol_put(vma_policy(new));
97633 out_free_vma:
97634+
97635+#ifdef CONFIG_PAX_SEGMEXEC
97636+ if (new_m) {
97637+ unlink_anon_vmas(new_m);
97638+ kmem_cache_free(vm_area_cachep, new_m);
97639+ }
97640+#endif
97641+
97642+ unlink_anon_vmas(new);
97643 kmem_cache_free(vm_area_cachep, new);
97644 out_err:
97645 return err;
97646@@ -2516,6 +2960,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97647 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97648 unsigned long addr, int new_below)
97649 {
97650+
97651+#ifdef CONFIG_PAX_SEGMEXEC
97652+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
97653+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
97654+ if (mm->map_count >= sysctl_max_map_count-1)
97655+ return -ENOMEM;
97656+ } else
97657+#endif
97658+
97659 if (mm->map_count >= sysctl_max_map_count)
97660 return -ENOMEM;
97661
97662@@ -2527,11 +2980,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97663 * work. This now handles partial unmappings.
97664 * Jeremy Fitzhardinge <jeremy@goop.org>
97665 */
97666+#ifdef CONFIG_PAX_SEGMEXEC
97667 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97668 {
97669+ int ret = __do_munmap(mm, start, len);
97670+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
97671+ return ret;
97672+
97673+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
97674+}
97675+
97676+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97677+#else
97678+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97679+#endif
97680+{
97681 unsigned long end;
97682 struct vm_area_struct *vma, *prev, *last;
97683
97684+ /*
97685+ * mm->mmap_sem is required to protect against another thread
97686+ * changing the mappings in case we sleep.
97687+ */
97688+ verify_mm_writelocked(mm);
97689+
97690 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
97691 return -EINVAL;
97692
97693@@ -2607,6 +3079,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97694 /* Fix up all other VM information */
97695 remove_vma_list(mm, vma);
97696
97697+ track_exec_limit(mm, start, end, 0UL);
97698+
97699 return 0;
97700 }
97701
97702@@ -2615,6 +3089,13 @@ int vm_munmap(unsigned long start, size_t len)
97703 int ret;
97704 struct mm_struct *mm = current->mm;
97705
97706+
97707+#ifdef CONFIG_PAX_SEGMEXEC
97708+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
97709+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
97710+ return -EINVAL;
97711+#endif
97712+
97713 down_write(&mm->mmap_sem);
97714 ret = do_munmap(mm, start, len);
97715 up_write(&mm->mmap_sem);
97716@@ -2628,16 +3109,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
97717 return vm_munmap(addr, len);
97718 }
97719
97720-static inline void verify_mm_writelocked(struct mm_struct *mm)
97721-{
97722-#ifdef CONFIG_DEBUG_VM
97723- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
97724- WARN_ON(1);
97725- up_read(&mm->mmap_sem);
97726- }
97727-#endif
97728-}
97729-
97730 /*
97731 * this is really a simplified "do_mmap". it only handles
97732 * anonymous maps. eventually we may be able to do some
97733@@ -2651,6 +3122,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97734 struct rb_node **rb_link, *rb_parent;
97735 pgoff_t pgoff = addr >> PAGE_SHIFT;
97736 int error;
97737+ unsigned long charged;
97738
97739 len = PAGE_ALIGN(len);
97740 if (!len)
97741@@ -2658,10 +3130,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97742
97743 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
97744
97745+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
97746+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
97747+ flags &= ~VM_EXEC;
97748+
97749+#ifdef CONFIG_PAX_MPROTECT
97750+ if (mm->pax_flags & MF_PAX_MPROTECT)
97751+ flags &= ~VM_MAYEXEC;
97752+#endif
97753+
97754+ }
97755+#endif
97756+
97757 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
97758 if (error & ~PAGE_MASK)
97759 return error;
97760
97761+ charged = len >> PAGE_SHIFT;
97762+
97763 error = mlock_future_check(mm, mm->def_flags, len);
97764 if (error)
97765 return error;
97766@@ -2675,21 +3161,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97767 /*
97768 * Clear old maps. this also does some error checking for us
97769 */
97770- munmap_back:
97771 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97772 if (do_munmap(mm, addr, len))
97773 return -ENOMEM;
97774- goto munmap_back;
97775+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97776 }
97777
97778 /* Check against address space limits *after* clearing old maps... */
97779- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
97780+ if (!may_expand_vm(mm, charged))
97781 return -ENOMEM;
97782
97783 if (mm->map_count > sysctl_max_map_count)
97784 return -ENOMEM;
97785
97786- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
97787+ if (security_vm_enough_memory_mm(mm, charged))
97788 return -ENOMEM;
97789
97790 /* Can we just expand an old private anonymous mapping? */
97791@@ -2703,7 +3188,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97792 */
97793 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97794 if (!vma) {
97795- vm_unacct_memory(len >> PAGE_SHIFT);
97796+ vm_unacct_memory(charged);
97797 return -ENOMEM;
97798 }
97799
97800@@ -2717,10 +3202,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97801 vma_link(mm, vma, prev, rb_link, rb_parent);
97802 out:
97803 perf_event_mmap(vma);
97804- mm->total_vm += len >> PAGE_SHIFT;
97805+ mm->total_vm += charged;
97806 if (flags & VM_LOCKED)
97807- mm->locked_vm += (len >> PAGE_SHIFT);
97808+ mm->locked_vm += charged;
97809 vma->vm_flags |= VM_SOFTDIRTY;
97810+ track_exec_limit(mm, addr, addr + len, flags);
97811 return addr;
97812 }
97813
97814@@ -2782,6 +3268,7 @@ void exit_mmap(struct mm_struct *mm)
97815 while (vma) {
97816 if (vma->vm_flags & VM_ACCOUNT)
97817 nr_accounted += vma_pages(vma);
97818+ vma->vm_mirror = NULL;
97819 vma = remove_vma(vma);
97820 }
97821 vm_unacct_memory(nr_accounted);
97822@@ -2799,6 +3286,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97823 struct vm_area_struct *prev;
97824 struct rb_node **rb_link, *rb_parent;
97825
97826+#ifdef CONFIG_PAX_SEGMEXEC
97827+ struct vm_area_struct *vma_m = NULL;
97828+#endif
97829+
97830+ if (security_mmap_addr(vma->vm_start))
97831+ return -EPERM;
97832+
97833 /*
97834 * The vm_pgoff of a purely anonymous vma should be irrelevant
97835 * until its first write fault, when page's anon_vma and index
97836@@ -2822,7 +3316,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97837 security_vm_enough_memory_mm(mm, vma_pages(vma)))
97838 return -ENOMEM;
97839
97840+#ifdef CONFIG_PAX_SEGMEXEC
97841+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
97842+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97843+ if (!vma_m)
97844+ return -ENOMEM;
97845+ }
97846+#endif
97847+
97848 vma_link(mm, vma, prev, rb_link, rb_parent);
97849+
97850+#ifdef CONFIG_PAX_SEGMEXEC
97851+ if (vma_m)
97852+ BUG_ON(pax_mirror_vma(vma_m, vma));
97853+#endif
97854+
97855 return 0;
97856 }
97857
97858@@ -2841,6 +3349,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97859 struct rb_node **rb_link, *rb_parent;
97860 bool faulted_in_anon_vma = true;
97861
97862+ BUG_ON(vma->vm_mirror);
97863+
97864 /*
97865 * If anonymous vma has not yet been faulted, update new pgoff
97866 * to match new location, to increase its chance of merging.
97867@@ -2905,6 +3415,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97868 return NULL;
97869 }
97870
97871+#ifdef CONFIG_PAX_SEGMEXEC
97872+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
97873+{
97874+ struct vm_area_struct *prev_m;
97875+ struct rb_node **rb_link_m, *rb_parent_m;
97876+ struct mempolicy *pol_m;
97877+
97878+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
97879+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
97880+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
97881+ *vma_m = *vma;
97882+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
97883+ if (anon_vma_clone(vma_m, vma))
97884+ return -ENOMEM;
97885+ pol_m = vma_policy(vma_m);
97886+ mpol_get(pol_m);
97887+ set_vma_policy(vma_m, pol_m);
97888+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
97889+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
97890+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
97891+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
97892+ if (vma_m->vm_file)
97893+ get_file(vma_m->vm_file);
97894+ if (vma_m->vm_ops && vma_m->vm_ops->open)
97895+ vma_m->vm_ops->open(vma_m);
97896+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
97897+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
97898+ vma_m->vm_mirror = vma;
97899+ vma->vm_mirror = vma_m;
97900+ return 0;
97901+}
97902+#endif
97903+
97904 /*
97905 * Return true if the calling process may expand its vm space by the passed
97906 * number of pages
97907@@ -2916,6 +3459,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
97908
97909 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
97910
97911+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
97912 if (cur + npages > lim)
97913 return 0;
97914 return 1;
97915@@ -2998,6 +3542,22 @@ static struct vm_area_struct *__install_special_mapping(
97916 vma->vm_start = addr;
97917 vma->vm_end = addr + len;
97918
97919+#ifdef CONFIG_PAX_MPROTECT
97920+ if (mm->pax_flags & MF_PAX_MPROTECT) {
97921+#ifndef CONFIG_PAX_MPROTECT_COMPAT
97922+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
97923+ return ERR_PTR(-EPERM);
97924+ if (!(vm_flags & VM_EXEC))
97925+ vm_flags &= ~VM_MAYEXEC;
97926+#else
97927+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
97928+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
97929+#endif
97930+ else
97931+ vm_flags &= ~VM_MAYWRITE;
97932+ }
97933+#endif
97934+
97935 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
97936 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97937
97938diff --git a/mm/mprotect.c b/mm/mprotect.c
97939index ace9345..63320dc 100644
97940--- a/mm/mprotect.c
97941+++ b/mm/mprotect.c
97942@@ -24,10 +24,18 @@
97943 #include <linux/migrate.h>
97944 #include <linux/perf_event.h>
97945 #include <linux/ksm.h>
97946+#include <linux/sched/sysctl.h>
97947+
97948+#ifdef CONFIG_PAX_MPROTECT
97949+#include <linux/elf.h>
97950+#include <linux/binfmts.h>
97951+#endif
97952+
97953 #include <asm/uaccess.h>
97954 #include <asm/pgtable.h>
97955 #include <asm/cacheflush.h>
97956 #include <asm/tlbflush.h>
97957+#include <asm/mmu_context.h>
97958
97959 /*
97960 * For a prot_numa update we only hold mmap_sem for read so there is a
97961@@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
97962 return pages;
97963 }
97964
97965+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97966+/* called while holding the mmap semaphor for writing except stack expansion */
97967+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
97968+{
97969+ unsigned long oldlimit, newlimit = 0UL;
97970+
97971+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
97972+ return;
97973+
97974+ spin_lock(&mm->page_table_lock);
97975+ oldlimit = mm->context.user_cs_limit;
97976+ if ((prot & VM_EXEC) && oldlimit < end)
97977+ /* USER_CS limit moved up */
97978+ newlimit = end;
97979+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
97980+ /* USER_CS limit moved down */
97981+ newlimit = start;
97982+
97983+ if (newlimit) {
97984+ mm->context.user_cs_limit = newlimit;
97985+
97986+#ifdef CONFIG_SMP
97987+ wmb();
97988+ cpus_clear(mm->context.cpu_user_cs_mask);
97989+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
97990+#endif
97991+
97992+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
97993+ }
97994+ spin_unlock(&mm->page_table_lock);
97995+ if (newlimit == end) {
97996+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
97997+
97998+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
97999+ if (is_vm_hugetlb_page(vma))
98000+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
98001+ else
98002+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
98003+ }
98004+}
98005+#endif
98006+
98007 int
98008 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98009 unsigned long start, unsigned long end, unsigned long newflags)
98010@@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98011 int error;
98012 int dirty_accountable = 0;
98013
98014+#ifdef CONFIG_PAX_SEGMEXEC
98015+ struct vm_area_struct *vma_m = NULL;
98016+ unsigned long start_m, end_m;
98017+
98018+ start_m = start + SEGMEXEC_TASK_SIZE;
98019+ end_m = end + SEGMEXEC_TASK_SIZE;
98020+#endif
98021+
98022 if (newflags == oldflags) {
98023 *pprev = vma;
98024 return 0;
98025 }
98026
98027+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
98028+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
98029+
98030+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
98031+ return -ENOMEM;
98032+
98033+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
98034+ return -ENOMEM;
98035+ }
98036+
98037 /*
98038 * If we make a private mapping writable we increase our commit;
98039 * but (without finer accounting) cannot reduce our commit if we
98040@@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
98041 }
98042 }
98043
98044+#ifdef CONFIG_PAX_SEGMEXEC
98045+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
98046+ if (start != vma->vm_start) {
98047+ error = split_vma(mm, vma, start, 1);
98048+ if (error)
98049+ goto fail;
98050+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
98051+ *pprev = (*pprev)->vm_next;
98052+ }
98053+
98054+ if (end != vma->vm_end) {
98055+ error = split_vma(mm, vma, end, 0);
98056+ if (error)
98057+ goto fail;
98058+ }
98059+
98060+ if (pax_find_mirror_vma(vma)) {
98061+ error = __do_munmap(mm, start_m, end_m - start_m);
98062+ if (error)
98063+ goto fail;
98064+ } else {
98065+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
98066+ if (!vma_m) {
98067+ error = -ENOMEM;
98068+ goto fail;
98069+ }
98070+ vma->vm_flags = newflags;
98071+ error = pax_mirror_vma(vma_m, vma);
98072+ if (error) {
98073+ vma->vm_flags = oldflags;
98074+ goto fail;
98075+ }
98076+ }
98077+ }
98078+#endif
98079+
98080 /*
98081 * First try to merge with previous and/or next vma.
98082 */
98083@@ -314,7 +418,19 @@ success:
98084 * vm_flags and vm_page_prot are protected by the mmap_sem
98085 * held in write mode.
98086 */
98087+
98088+#ifdef CONFIG_PAX_SEGMEXEC
98089+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
98090+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
98091+#endif
98092+
98093 vma->vm_flags = newflags;
98094+
98095+#ifdef CONFIG_PAX_MPROTECT
98096+ if (mm->binfmt && mm->binfmt->handle_mprotect)
98097+ mm->binfmt->handle_mprotect(vma, newflags);
98098+#endif
98099+
98100 dirty_accountable = vma_wants_writenotify(vma);
98101 vma_set_page_prot(vma);
98102
98103@@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98104 end = start + len;
98105 if (end <= start)
98106 return -ENOMEM;
98107+
98108+#ifdef CONFIG_PAX_SEGMEXEC
98109+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
98110+ if (end > SEGMEXEC_TASK_SIZE)
98111+ return -EINVAL;
98112+ } else
98113+#endif
98114+
98115+ if (end > TASK_SIZE)
98116+ return -EINVAL;
98117+
98118 if (!arch_validate_prot(prot))
98119 return -EINVAL;
98120
98121@@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98122 /*
98123 * Does the application expect PROT_READ to imply PROT_EXEC:
98124 */
98125- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
98126+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
98127 prot |= PROT_EXEC;
98128
98129 vm_flags = calc_vm_prot_bits(prot);
98130@@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98131 if (start > vma->vm_start)
98132 prev = vma;
98133
98134+#ifdef CONFIG_PAX_MPROTECT
98135+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
98136+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
98137+#endif
98138+
98139 for (nstart = start ; ; ) {
98140 unsigned long newflags;
98141
98142@@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98143
98144 /* newflags >> 4 shift VM_MAY% in place of VM_% */
98145 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
98146+ if (prot & (PROT_WRITE | PROT_EXEC))
98147+ gr_log_rwxmprotect(vma);
98148+
98149+ error = -EACCES;
98150+ goto out;
98151+ }
98152+
98153+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
98154 error = -EACCES;
98155 goto out;
98156 }
98157@@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
98158 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
98159 if (error)
98160 goto out;
98161+
98162+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
98163+
98164 nstart = tmp;
98165
98166 if (nstart < prev->vm_end)
98167diff --git a/mm/mremap.c b/mm/mremap.c
98168index b147f66..98a695a 100644
98169--- a/mm/mremap.c
98170+++ b/mm/mremap.c
98171@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
98172 continue;
98173 pte = ptep_get_and_clear(mm, old_addr, old_pte);
98174 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
98175+
98176+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98177+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
98178+ pte = pte_exprotect(pte);
98179+#endif
98180+
98181 pte = move_soft_dirty_pte(pte);
98182 set_pte_at(mm, new_addr, new_pte, pte);
98183 }
98184@@ -345,6 +351,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
98185 if (is_vm_hugetlb_page(vma))
98186 goto Einval;
98187
98188+#ifdef CONFIG_PAX_SEGMEXEC
98189+ if (pax_find_mirror_vma(vma))
98190+ goto Einval;
98191+#endif
98192+
98193 /* We can't remap across vm area boundaries */
98194 if (old_len > vma->vm_end - addr)
98195 goto Efault;
98196@@ -400,20 +411,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
98197 unsigned long ret = -EINVAL;
98198 unsigned long charged = 0;
98199 unsigned long map_flags;
98200+ unsigned long pax_task_size = TASK_SIZE;
98201
98202 if (new_addr & ~PAGE_MASK)
98203 goto out;
98204
98205- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
98206+#ifdef CONFIG_PAX_SEGMEXEC
98207+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
98208+ pax_task_size = SEGMEXEC_TASK_SIZE;
98209+#endif
98210+
98211+ pax_task_size -= PAGE_SIZE;
98212+
98213+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
98214 goto out;
98215
98216 /* Check if the location we're moving into overlaps the
98217 * old location at all, and fail if it does.
98218 */
98219- if ((new_addr <= addr) && (new_addr+new_len) > addr)
98220- goto out;
98221-
98222- if ((addr <= new_addr) && (addr+old_len) > new_addr)
98223+ if (addr + old_len > new_addr && new_addr + new_len > addr)
98224 goto out;
98225
98226 ret = do_munmap(mm, new_addr, new_len);
98227@@ -482,6 +498,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
98228 unsigned long ret = -EINVAL;
98229 unsigned long charged = 0;
98230 bool locked = false;
98231+ unsigned long pax_task_size = TASK_SIZE;
98232
98233 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
98234 return ret;
98235@@ -503,6 +520,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
98236 if (!new_len)
98237 return ret;
98238
98239+#ifdef CONFIG_PAX_SEGMEXEC
98240+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
98241+ pax_task_size = SEGMEXEC_TASK_SIZE;
98242+#endif
98243+
98244+ pax_task_size -= PAGE_SIZE;
98245+
98246+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
98247+ old_len > pax_task_size || addr > pax_task_size-old_len)
98248+ return ret;
98249+
98250 down_write(&current->mm->mmap_sem);
98251
98252 if (flags & MREMAP_FIXED) {
98253@@ -553,6 +581,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
98254 new_addr = addr;
98255 }
98256 ret = addr;
98257+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
98258 goto out;
98259 }
98260 }
98261@@ -576,7 +605,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
98262 goto out;
98263 }
98264
98265+ map_flags = vma->vm_flags;
98266 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
98267+ if (!(ret & ~PAGE_MASK)) {
98268+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
98269+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
98270+ }
98271 }
98272 out:
98273 if (ret & ~PAGE_MASK)
98274diff --git a/mm/nommu.c b/mm/nommu.c
98275index bd1808e..b63d87c 100644
98276--- a/mm/nommu.c
98277+++ b/mm/nommu.c
98278@@ -70,7 +70,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
98279 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
98280 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
98281 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
98282-int heap_stack_gap = 0;
98283
98284 atomic_long_t mmap_pages_allocated;
98285
98286@@ -857,15 +856,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
98287 EXPORT_SYMBOL(find_vma);
98288
98289 /*
98290- * find a VMA
98291- * - we don't extend stack VMAs under NOMMU conditions
98292- */
98293-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
98294-{
98295- return find_vma(mm, addr);
98296-}
98297-
98298-/*
98299 * expand a stack to a given address
98300 * - not supported under NOMMU conditions
98301 */
98302@@ -1572,6 +1562,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98303
98304 /* most fields are the same, copy all, and then fixup */
98305 *new = *vma;
98306+ INIT_LIST_HEAD(&new->anon_vma_chain);
98307 *region = *vma->vm_region;
98308 new->vm_region = region;
98309
98310@@ -2002,8 +1993,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
98311 }
98312 EXPORT_SYMBOL(generic_file_remap_pages);
98313
98314-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
98315- unsigned long addr, void *buf, int len, int write)
98316+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
98317+ unsigned long addr, void *buf, size_t len, int write)
98318 {
98319 struct vm_area_struct *vma;
98320
98321@@ -2044,8 +2035,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
98322 *
98323 * The caller must hold a reference on @mm.
98324 */
98325-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98326- void *buf, int len, int write)
98327+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
98328+ void *buf, size_t len, int write)
98329 {
98330 return __access_remote_vm(NULL, mm, addr, buf, len, write);
98331 }
98332@@ -2054,7 +2045,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98333 * Access another process' address space.
98334 * - source/target buffer must be kernel space
98335 */
98336-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
98337+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
98338 {
98339 struct mm_struct *mm;
98340
98341diff --git a/mm/page-writeback.c b/mm/page-writeback.c
98342index 437174a..8b86707 100644
98343--- a/mm/page-writeback.c
98344+++ b/mm/page-writeback.c
98345@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
98346 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
98347 * - the bdi dirty thresh drops quickly due to change of JBOD workload
98348 */
98349-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
98350+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
98351 unsigned long thresh,
98352 unsigned long bg_thresh,
98353 unsigned long dirty,
98354diff --git a/mm/page_alloc.c b/mm/page_alloc.c
98355index 616a2c9..0e755f6 100644
98356--- a/mm/page_alloc.c
98357+++ b/mm/page_alloc.c
98358@@ -59,6 +59,7 @@
98359 #include <linux/page-debug-flags.h>
98360 #include <linux/hugetlb.h>
98361 #include <linux/sched/rt.h>
98362+#include <linux/random.h>
98363
98364 #include <asm/sections.h>
98365 #include <asm/tlbflush.h>
98366@@ -356,7 +357,7 @@ out:
98367 * This usage means that zero-order pages may not be compound.
98368 */
98369
98370-static void free_compound_page(struct page *page)
98371+void free_compound_page(struct page *page)
98372 {
98373 __free_pages_ok(page, compound_order(page));
98374 }
98375@@ -741,6 +742,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
98376 int i;
98377 int bad = 0;
98378
98379+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98380+ unsigned long index = 1UL << order;
98381+#endif
98382+
98383 trace_mm_page_free(page, order);
98384 kmemcheck_free_shadow(page, order);
98385
98386@@ -757,6 +762,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
98387 debug_check_no_obj_freed(page_address(page),
98388 PAGE_SIZE << order);
98389 }
98390+
98391+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98392+ for (; index; --index)
98393+ sanitize_highpage(page + index - 1);
98394+#endif
98395+
98396 arch_free_page(page, order);
98397 kernel_map_pages(page, 1 << order, 0);
98398
98399@@ -780,6 +791,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
98400 local_irq_restore(flags);
98401 }
98402
98403+#ifdef CONFIG_PAX_LATENT_ENTROPY
98404+bool __meminitdata extra_latent_entropy;
98405+
98406+static int __init setup_pax_extra_latent_entropy(char *str)
98407+{
98408+ extra_latent_entropy = true;
98409+ return 0;
98410+}
98411+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
98412+
98413+volatile u64 latent_entropy __latent_entropy;
98414+EXPORT_SYMBOL(latent_entropy);
98415+#endif
98416+
98417 void __init __free_pages_bootmem(struct page *page, unsigned int order)
98418 {
98419 unsigned int nr_pages = 1 << order;
98420@@ -795,6 +820,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
98421 __ClearPageReserved(p);
98422 set_page_count(p, 0);
98423
98424+#ifdef CONFIG_PAX_LATENT_ENTROPY
98425+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
98426+ u64 hash = 0;
98427+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
98428+ const u64 *data = lowmem_page_address(page);
98429+
98430+ for (index = 0; index < end; index++)
98431+ hash ^= hash + data[index];
98432+ latent_entropy ^= hash;
98433+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
98434+ }
98435+#endif
98436+
98437 page_zone(page)->managed_pages += nr_pages;
98438 set_page_refcounted(page);
98439 __free_pages(page, order);
98440@@ -923,8 +961,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
98441 arch_alloc_page(page, order);
98442 kernel_map_pages(page, 1 << order, 1);
98443
98444+#ifndef CONFIG_PAX_MEMORY_SANITIZE
98445 if (gfp_flags & __GFP_ZERO)
98446 prep_zero_page(page, order, gfp_flags);
98447+#endif
98448
98449 if (order && (gfp_flags & __GFP_COMP))
98450 prep_compound_page(page, order);
98451@@ -1602,7 +1642,7 @@ again:
98452 }
98453
98454 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
98455- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98456+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98457 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
98458 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98459
98460@@ -1923,7 +1963,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
98461 do {
98462 mod_zone_page_state(zone, NR_ALLOC_BATCH,
98463 high_wmark_pages(zone) - low_wmark_pages(zone) -
98464- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98465+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98466 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98467 } while (zone++ != preferred_zone);
98468 }
98469@@ -5698,7 +5738,7 @@ static void __setup_per_zone_wmarks(void)
98470
98471 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
98472 high_wmark_pages(zone) - low_wmark_pages(zone) -
98473- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98474+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98475
98476 setup_zone_migrate_reserve(zone);
98477 spin_unlock_irqrestore(&zone->lock, flags);
98478diff --git a/mm/percpu.c b/mm/percpu.c
98479index 014bab6..db5a76f 100644
98480--- a/mm/percpu.c
98481+++ b/mm/percpu.c
98482@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
98483 static unsigned int pcpu_high_unit_cpu __read_mostly;
98484
98485 /* the address of the first chunk which starts with the kernel static area */
98486-void *pcpu_base_addr __read_mostly;
98487+void *pcpu_base_addr __read_only;
98488 EXPORT_SYMBOL_GPL(pcpu_base_addr);
98489
98490 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
98491diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
98492index 5077afc..846c9ef 100644
98493--- a/mm/process_vm_access.c
98494+++ b/mm/process_vm_access.c
98495@@ -13,6 +13,7 @@
98496 #include <linux/uio.h>
98497 #include <linux/sched.h>
98498 #include <linux/highmem.h>
98499+#include <linux/security.h>
98500 #include <linux/ptrace.h>
98501 #include <linux/slab.h>
98502 #include <linux/syscalls.h>
98503@@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98504 ssize_t iov_len;
98505 size_t total_len = iov_iter_count(iter);
98506
98507+ return -ENOSYS; // PaX: until properly audited
98508+
98509 /*
98510 * Work out how many pages of struct pages we're going to need
98511 * when eventually calling get_user_pages
98512 */
98513 for (i = 0; i < riovcnt; i++) {
98514 iov_len = rvec[i].iov_len;
98515- if (iov_len > 0) {
98516- nr_pages_iov = ((unsigned long)rvec[i].iov_base
98517- + iov_len)
98518- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
98519- / PAGE_SIZE + 1;
98520- nr_pages = max(nr_pages, nr_pages_iov);
98521- }
98522+ if (iov_len <= 0)
98523+ continue;
98524+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
98525+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
98526+ nr_pages = max(nr_pages, nr_pages_iov);
98527 }
98528
98529 if (nr_pages == 0)
98530@@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98531 goto free_proc_pages;
98532 }
98533
98534+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
98535+ rc = -EPERM;
98536+ goto put_task_struct;
98537+ }
98538+
98539 mm = mm_access(task, PTRACE_MODE_ATTACH);
98540 if (!mm || IS_ERR(mm)) {
98541 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
98542diff --git a/mm/rmap.c b/mm/rmap.c
98543index 3e4c721..a5e3e39 100644
98544--- a/mm/rmap.c
98545+++ b/mm/rmap.c
98546@@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98547 struct anon_vma *anon_vma = vma->anon_vma;
98548 struct anon_vma_chain *avc;
98549
98550+#ifdef CONFIG_PAX_SEGMEXEC
98551+ struct anon_vma_chain *avc_m = NULL;
98552+#endif
98553+
98554 might_sleep();
98555 if (unlikely(!anon_vma)) {
98556 struct mm_struct *mm = vma->vm_mm;
98557@@ -173,6 +177,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98558 if (!avc)
98559 goto out_enomem;
98560
98561+#ifdef CONFIG_PAX_SEGMEXEC
98562+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
98563+ if (!avc_m)
98564+ goto out_enomem_free_avc;
98565+#endif
98566+
98567 anon_vma = find_mergeable_anon_vma(vma);
98568 allocated = NULL;
98569 if (!anon_vma) {
98570@@ -186,6 +196,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98571 /* page_table_lock to protect against threads */
98572 spin_lock(&mm->page_table_lock);
98573 if (likely(!vma->anon_vma)) {
98574+
98575+#ifdef CONFIG_PAX_SEGMEXEC
98576+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
98577+
98578+ if (vma_m) {
98579+ BUG_ON(vma_m->anon_vma);
98580+ vma_m->anon_vma = anon_vma;
98581+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
98582+ avc_m = NULL;
98583+ }
98584+#endif
98585+
98586 vma->anon_vma = anon_vma;
98587 anon_vma_chain_link(vma, avc, anon_vma);
98588 allocated = NULL;
98589@@ -196,12 +218,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98590
98591 if (unlikely(allocated))
98592 put_anon_vma(allocated);
98593+
98594+#ifdef CONFIG_PAX_SEGMEXEC
98595+ if (unlikely(avc_m))
98596+ anon_vma_chain_free(avc_m);
98597+#endif
98598+
98599 if (unlikely(avc))
98600 anon_vma_chain_free(avc);
98601 }
98602 return 0;
98603
98604 out_enomem_free_avc:
98605+
98606+#ifdef CONFIG_PAX_SEGMEXEC
98607+ if (avc_m)
98608+ anon_vma_chain_free(avc_m);
98609+#endif
98610+
98611 anon_vma_chain_free(avc);
98612 out_enomem:
98613 return -ENOMEM;
98614@@ -237,7 +271,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
98615 * Attach the anon_vmas from src to dst.
98616 * Returns 0 on success, -ENOMEM on failure.
98617 */
98618-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98619+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
98620 {
98621 struct anon_vma_chain *avc, *pavc;
98622 struct anon_vma *root = NULL;
98623@@ -270,7 +304,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98624 * the corresponding VMA in the parent process is attached to.
98625 * Returns 0 on success, non-zero on failure.
98626 */
98627-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
98628+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
98629 {
98630 struct anon_vma_chain *avc;
98631 struct anon_vma *anon_vma;
98632@@ -376,8 +410,10 @@ static void anon_vma_ctor(void *data)
98633 void __init anon_vma_init(void)
98634 {
98635 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
98636- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
98637- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
98638+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
98639+ anon_vma_ctor);
98640+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
98641+ SLAB_PANIC|SLAB_NO_SANITIZE);
98642 }
98643
98644 /*
98645diff --git a/mm/shmem.c b/mm/shmem.c
98646index 185836b..d7255a1 100644
98647--- a/mm/shmem.c
98648+++ b/mm/shmem.c
98649@@ -33,7 +33,7 @@
98650 #include <linux/swap.h>
98651 #include <linux/aio.h>
98652
98653-static struct vfsmount *shm_mnt;
98654+struct vfsmount *shm_mnt;
98655
98656 #ifdef CONFIG_SHMEM
98657 /*
98658@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
98659 #define BOGO_DIRENT_SIZE 20
98660
98661 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
98662-#define SHORT_SYMLINK_LEN 128
98663+#define SHORT_SYMLINK_LEN 64
98664
98665 /*
98666 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
98667@@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
98668 static int shmem_xattr_validate(const char *name)
98669 {
98670 struct { const char *prefix; size_t len; } arr[] = {
98671+
98672+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98673+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
98674+#endif
98675+
98676 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
98677 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
98678 };
98679@@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
98680 if (err)
98681 return err;
98682
98683+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98684+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
98685+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
98686+ return -EOPNOTSUPP;
98687+ if (size > 8)
98688+ return -EINVAL;
98689+ }
98690+#endif
98691+
98692 return simple_xattr_set(&info->xattrs, name, value, size, flags);
98693 }
98694
98695@@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
98696 int err = -ENOMEM;
98697
98698 /* Round up to L1_CACHE_BYTES to resist false sharing */
98699- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
98700- L1_CACHE_BYTES), GFP_KERNEL);
98701+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
98702 if (!sbinfo)
98703 return -ENOMEM;
98704
98705diff --git a/mm/slab.c b/mm/slab.c
98706index f34e053..78a3839 100644
98707--- a/mm/slab.c
98708+++ b/mm/slab.c
98709@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98710 if ((x)->max_freeable < i) \
98711 (x)->max_freeable = i; \
98712 } while (0)
98713-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
98714-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
98715-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
98716-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
98717+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
98718+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
98719+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
98720+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
98721+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
98722+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
98723 #else
98724 #define STATS_INC_ACTIVE(x) do { } while (0)
98725 #define STATS_DEC_ACTIVE(x) do { } while (0)
98726@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98727 #define STATS_INC_ALLOCMISS(x) do { } while (0)
98728 #define STATS_INC_FREEHIT(x) do { } while (0)
98729 #define STATS_INC_FREEMISS(x) do { } while (0)
98730+#define STATS_INC_SANITIZED(x) do { } while (0)
98731+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
98732 #endif
98733
98734 #if DEBUG
98735@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
98736 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
98737 */
98738 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
98739- const struct page *page, void *obj)
98740+ const struct page *page, const void *obj)
98741 {
98742 u32 offset = (obj - page->s_mem);
98743 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
98744@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
98745 * structures first. Without this, further allocations will bug.
98746 */
98747 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
98748- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
98749+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
98750 slab_state = PARTIAL_NODE;
98751
98752 slab_early_init = 0;
98753@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
98754
98755 cachep = find_mergeable(size, align, flags, name, ctor);
98756 if (cachep) {
98757- cachep->refcount++;
98758+ atomic_inc(&cachep->refcount);
98759
98760 /*
98761 * Adjust the object sizes so that we clear
98762@@ -3352,6 +3356,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
98763 struct array_cache *ac = cpu_cache_get(cachep);
98764
98765 check_irq_off();
98766+
98767+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98768+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
98769+ STATS_INC_NOT_SANITIZED(cachep);
98770+ else {
98771+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
98772+
98773+ if (cachep->ctor)
98774+ cachep->ctor(objp);
98775+
98776+ STATS_INC_SANITIZED(cachep);
98777+ }
98778+#endif
98779+
98780 kmemleak_free_recursive(objp, cachep->flags);
98781 objp = cache_free_debugcheck(cachep, objp, caller);
98782
98783@@ -3557,6 +3575,7 @@ void kfree(const void *objp)
98784
98785 if (unlikely(ZERO_OR_NULL_PTR(objp)))
98786 return;
98787+ VM_BUG_ON(!virt_addr_valid(objp));
98788 local_irq_save(flags);
98789 kfree_debugcheck(objp);
98790 c = virt_to_cache(objp);
98791@@ -3979,14 +3998,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
98792 }
98793 /* cpu stats */
98794 {
98795- unsigned long allochit = atomic_read(&cachep->allochit);
98796- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
98797- unsigned long freehit = atomic_read(&cachep->freehit);
98798- unsigned long freemiss = atomic_read(&cachep->freemiss);
98799+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
98800+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
98801+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
98802+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
98803
98804 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
98805 allochit, allocmiss, freehit, freemiss);
98806 }
98807+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98808+ {
98809+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
98810+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
98811+
98812+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
98813+ }
98814+#endif
98815 #endif
98816 }
98817
98818@@ -4200,13 +4227,69 @@ static const struct file_operations proc_slabstats_operations = {
98819 static int __init slab_proc_init(void)
98820 {
98821 #ifdef CONFIG_DEBUG_SLAB_LEAK
98822- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
98823+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
98824 #endif
98825 return 0;
98826 }
98827 module_init(slab_proc_init);
98828 #endif
98829
98830+bool is_usercopy_object(const void *ptr)
98831+{
98832+ struct page *page;
98833+ struct kmem_cache *cachep;
98834+
98835+ if (ZERO_OR_NULL_PTR(ptr))
98836+ return false;
98837+
98838+ if (!slab_is_available())
98839+ return false;
98840+
98841+ if (!virt_addr_valid(ptr))
98842+ return false;
98843+
98844+ page = virt_to_head_page(ptr);
98845+
98846+ if (!PageSlab(page))
98847+ return false;
98848+
98849+ cachep = page->slab_cache;
98850+ return cachep->flags & SLAB_USERCOPY;
98851+}
98852+
98853+#ifdef CONFIG_PAX_USERCOPY
98854+const char *check_heap_object(const void *ptr, unsigned long n)
98855+{
98856+ struct page *page;
98857+ struct kmem_cache *cachep;
98858+ unsigned int objnr;
98859+ unsigned long offset;
98860+
98861+ if (ZERO_OR_NULL_PTR(ptr))
98862+ return "<null>";
98863+
98864+ if (!virt_addr_valid(ptr))
98865+ return NULL;
98866+
98867+ page = virt_to_head_page(ptr);
98868+
98869+ if (!PageSlab(page))
98870+ return NULL;
98871+
98872+ cachep = page->slab_cache;
98873+ if (!(cachep->flags & SLAB_USERCOPY))
98874+ return cachep->name;
98875+
98876+ objnr = obj_to_index(cachep, page, ptr);
98877+ BUG_ON(objnr >= cachep->num);
98878+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
98879+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
98880+ return NULL;
98881+
98882+ return cachep->name;
98883+}
98884+#endif
98885+
98886 /**
98887 * ksize - get the actual amount of memory allocated for a given object
98888 * @objp: Pointer to the object
98889diff --git a/mm/slab.h b/mm/slab.h
98890index ab019e6..fbcac34 100644
98891--- a/mm/slab.h
98892+++ b/mm/slab.h
98893@@ -22,7 +22,7 @@ struct kmem_cache {
98894 unsigned int align; /* Alignment as calculated */
98895 unsigned long flags; /* Active flags on the slab */
98896 const char *name; /* Slab name for sysfs */
98897- int refcount; /* Use counter */
98898+ atomic_t refcount; /* Use counter */
98899 void (*ctor)(void *); /* Called on object slot creation */
98900 struct list_head list; /* List of all slab caches on the system */
98901 };
98902@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
98903 /* The slab cache that manages slab cache information */
98904 extern struct kmem_cache *kmem_cache;
98905
98906+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98907+#ifdef CONFIG_X86_64
98908+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
98909+#else
98910+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
98911+#endif
98912+enum pax_sanitize_mode {
98913+ PAX_SANITIZE_SLAB_OFF = 0,
98914+ PAX_SANITIZE_SLAB_FAST,
98915+ PAX_SANITIZE_SLAB_FULL,
98916+};
98917+extern enum pax_sanitize_mode pax_sanitize_slab;
98918+#endif
98919+
98920 unsigned long calculate_alignment(unsigned long flags,
98921 unsigned long align, unsigned long size);
98922
98923@@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
98924
98925 /* Legal flag mask for kmem_cache_create(), for various configurations */
98926 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
98927- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
98928+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
98929+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
98930
98931 #if defined(CONFIG_DEBUG_SLAB)
98932 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
98933@@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
98934 return s;
98935
98936 page = virt_to_head_page(x);
98937+
98938+ BUG_ON(!PageSlab(page));
98939+
98940 cachep = page->slab_cache;
98941 if (slab_equal_or_root(cachep, s))
98942 return cachep;
98943diff --git a/mm/slab_common.c b/mm/slab_common.c
98944index dcdab81..3576646 100644
98945--- a/mm/slab_common.c
98946+++ b/mm/slab_common.c
98947@@ -25,11 +25,35 @@
98948
98949 #include "slab.h"
98950
98951-enum slab_state slab_state;
98952+enum slab_state slab_state __read_only;
98953 LIST_HEAD(slab_caches);
98954 DEFINE_MUTEX(slab_mutex);
98955 struct kmem_cache *kmem_cache;
98956
98957+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98958+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
98959+static int __init pax_sanitize_slab_setup(char *str)
98960+{
98961+ if (!str)
98962+ return 0;
98963+
98964+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
98965+ pr_info("PaX slab sanitization: %s\n", "disabled");
98966+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
98967+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
98968+ pr_info("PaX slab sanitization: %s\n", "fast");
98969+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
98970+ } else if (!strcmp(str, "full")) {
98971+ pr_info("PaX slab sanitization: %s\n", "full");
98972+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
98973+ } else
98974+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
98975+
98976+ return 0;
98977+}
98978+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
98979+#endif
98980+
98981 /*
98982 * Set of flags that will prevent slab merging
98983 */
98984@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
98985 * Merge control. If this is set then no merging of slab caches will occur.
98986 * (Could be removed. This was introduced to pacify the merge skeptics.)
98987 */
98988-static int slab_nomerge;
98989+static int slab_nomerge = 1;
98990
98991 static int __init setup_slab_nomerge(char *str)
98992 {
98993@@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
98994 /*
98995 * We may have set a slab to be unmergeable during bootstrap.
98996 */
98997- if (s->refcount < 0)
98998+ if (atomic_read(&s->refcount) < 0)
98999 return 1;
99000
99001 return 0;
99002@@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
99003 if (err)
99004 goto out_free_cache;
99005
99006- s->refcount = 1;
99007+ atomic_set(&s->refcount, 1);
99008 list_add(&s->list, &slab_caches);
99009 out:
99010 if (err)
99011@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
99012 */
99013 flags &= CACHE_CREATE_MASK;
99014
99015+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99016+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
99017+ flags |= SLAB_NO_SANITIZE;
99018+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
99019+ flags &= ~SLAB_NO_SANITIZE;
99020+#endif
99021+
99022 s = __kmem_cache_alias(name, size, align, flags, ctor);
99023 if (s)
99024 goto out_unlock;
99025@@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
99026
99027 mutex_lock(&slab_mutex);
99028
99029- s->refcount--;
99030- if (s->refcount)
99031+ if (!atomic_dec_and_test(&s->refcount))
99032 goto out_unlock;
99033
99034 if (memcg_cleanup_cache_params(s) != 0)
99035@@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
99036 rcu_barrier();
99037
99038 memcg_free_cache_params(s);
99039-#ifdef SLAB_SUPPORTS_SYSFS
99040+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99041 sysfs_slab_remove(s);
99042 #else
99043 slab_kmem_cache_release(s);
99044@@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
99045 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
99046 name, size, err);
99047
99048- s->refcount = -1; /* Exempt from merging for now */
99049+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
99050 }
99051
99052 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
99053@@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
99054
99055 create_boot_cache(s, name, size, flags);
99056 list_add(&s->list, &slab_caches);
99057- s->refcount = 1;
99058+ atomic_set(&s->refcount, 1);
99059 return s;
99060 }
99061
99062@@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
99063 EXPORT_SYMBOL(kmalloc_dma_caches);
99064 #endif
99065
99066+#ifdef CONFIG_PAX_USERCOPY_SLABS
99067+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
99068+EXPORT_SYMBOL(kmalloc_usercopy_caches);
99069+#endif
99070+
99071 /*
99072 * Conversion table for small slabs sizes / 8 to the index in the
99073 * kmalloc array. This is necessary for slabs < 192 since we have non power
99074@@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
99075 return kmalloc_dma_caches[index];
99076
99077 #endif
99078+
99079+#ifdef CONFIG_PAX_USERCOPY_SLABS
99080+ if (unlikely((flags & GFP_USERCOPY)))
99081+ return kmalloc_usercopy_caches[index];
99082+
99083+#endif
99084+
99085 return kmalloc_caches[index];
99086 }
99087
99088@@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
99089 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
99090 if (!kmalloc_caches[i]) {
99091 kmalloc_caches[i] = create_kmalloc_cache(NULL,
99092- 1 << i, flags);
99093+ 1 << i, SLAB_USERCOPY | flags);
99094 }
99095
99096 /*
99097@@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
99098 * earlier power of two caches
99099 */
99100 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
99101- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
99102+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
99103
99104 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
99105- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
99106+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
99107 }
99108
99109 /* Kmalloc array is now usable */
99110@@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
99111 }
99112 }
99113 #endif
99114+
99115+#ifdef CONFIG_PAX_USERCOPY_SLABS
99116+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
99117+ struct kmem_cache *s = kmalloc_caches[i];
99118+
99119+ if (s) {
99120+ int size = kmalloc_size(i);
99121+ char *n = kasprintf(GFP_NOWAIT,
99122+ "usercopy-kmalloc-%d", size);
99123+
99124+ BUG_ON(!n);
99125+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
99126+ size, SLAB_USERCOPY | flags);
99127+ }
99128+ }
99129+#endif
99130+
99131 }
99132 #endif /* !CONFIG_SLOB */
99133
99134@@ -830,6 +889,9 @@ void print_slabinfo_header(struct seq_file *m)
99135 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
99136 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
99137 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
99138+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99139+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
99140+#endif
99141 #endif
99142 seq_putc(m, '\n');
99143 }
99144diff --git a/mm/slob.c b/mm/slob.c
99145index 96a8620..3e7e663 100644
99146--- a/mm/slob.c
99147+++ b/mm/slob.c
99148@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
99149 /*
99150 * Return the size of a slob block.
99151 */
99152-static slobidx_t slob_units(slob_t *s)
99153+static slobidx_t slob_units(const slob_t *s)
99154 {
99155 if (s->units > 0)
99156 return s->units;
99157@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
99158 /*
99159 * Return the next free slob block pointer after this one.
99160 */
99161-static slob_t *slob_next(slob_t *s)
99162+static slob_t *slob_next(const slob_t *s)
99163 {
99164 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
99165 slobidx_t next;
99166@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
99167 /*
99168 * Returns true if s is the last free block in its page.
99169 */
99170-static int slob_last(slob_t *s)
99171+static int slob_last(const slob_t *s)
99172 {
99173 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
99174 }
99175
99176-static void *slob_new_pages(gfp_t gfp, int order, int node)
99177+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
99178 {
99179- void *page;
99180+ struct page *page;
99181
99182 #ifdef CONFIG_NUMA
99183 if (node != NUMA_NO_NODE)
99184@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
99185 if (!page)
99186 return NULL;
99187
99188- return page_address(page);
99189+ __SetPageSlab(page);
99190+ return page;
99191 }
99192
99193-static void slob_free_pages(void *b, int order)
99194+static void slob_free_pages(struct page *sp, int order)
99195 {
99196 if (current->reclaim_state)
99197 current->reclaim_state->reclaimed_slab += 1 << order;
99198- free_pages((unsigned long)b, order);
99199+ __ClearPageSlab(sp);
99200+ page_mapcount_reset(sp);
99201+ sp->private = 0;
99202+ __free_pages(sp, order);
99203 }
99204
99205 /*
99206@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
99207
99208 /* Not enough space: must allocate a new page */
99209 if (!b) {
99210- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
99211- if (!b)
99212+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
99213+ if (!sp)
99214 return NULL;
99215- sp = virt_to_page(b);
99216- __SetPageSlab(sp);
99217+ b = page_address(sp);
99218
99219 spin_lock_irqsave(&slob_lock, flags);
99220 sp->units = SLOB_UNITS(PAGE_SIZE);
99221 sp->freelist = b;
99222+ sp->private = 0;
99223 INIT_LIST_HEAD(&sp->lru);
99224 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
99225 set_slob_page_free(sp, slob_list);
99226@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
99227 /*
99228 * slob_free: entry point into the slob allocator.
99229 */
99230-static void slob_free(void *block, int size)
99231+static void slob_free(struct kmem_cache *c, void *block, int size)
99232 {
99233 struct page *sp;
99234 slob_t *prev, *next, *b = (slob_t *)block;
99235@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
99236 if (slob_page_free(sp))
99237 clear_slob_page_free(sp);
99238 spin_unlock_irqrestore(&slob_lock, flags);
99239- __ClearPageSlab(sp);
99240- page_mapcount_reset(sp);
99241- slob_free_pages(b, 0);
99242+ slob_free_pages(sp, 0);
99243 return;
99244 }
99245
99246+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99247+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
99248+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
99249+#endif
99250+
99251 if (!slob_page_free(sp)) {
99252 /* This slob page is about to become partially free. Easy! */
99253 sp->units = units;
99254@@ -424,11 +431,10 @@ out:
99255 */
99256
99257 static __always_inline void *
99258-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
99259+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
99260 {
99261- unsigned int *m;
99262- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99263- void *ret;
99264+ slob_t *m;
99265+ void *ret = NULL;
99266
99267 gfp &= gfp_allowed_mask;
99268
99269@@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
99270
99271 if (!m)
99272 return NULL;
99273- *m = size;
99274+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
99275+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
99276+ m[0].units = size;
99277+ m[1].units = align;
99278 ret = (void *)m + align;
99279
99280 trace_kmalloc_node(caller, ret,
99281 size, size + align, gfp, node);
99282 } else {
99283 unsigned int order = get_order(size);
99284+ struct page *page;
99285
99286 if (likely(order))
99287 gfp |= __GFP_COMP;
99288- ret = slob_new_pages(gfp, order, node);
99289+ page = slob_new_pages(gfp, order, node);
99290+ if (page) {
99291+ ret = page_address(page);
99292+ page->private = size;
99293+ }
99294
99295 trace_kmalloc_node(caller, ret,
99296 size, PAGE_SIZE << order, gfp, node);
99297 }
99298
99299- kmemleak_alloc(ret, size, 1, gfp);
99300+ return ret;
99301+}
99302+
99303+static __always_inline void *
99304+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
99305+{
99306+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99307+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
99308+
99309+ if (!ZERO_OR_NULL_PTR(ret))
99310+ kmemleak_alloc(ret, size, 1, gfp);
99311 return ret;
99312 }
99313
99314@@ -491,34 +515,112 @@ void kfree(const void *block)
99315 return;
99316 kmemleak_free(block);
99317
99318+ VM_BUG_ON(!virt_addr_valid(block));
99319 sp = virt_to_page(block);
99320- if (PageSlab(sp)) {
99321+ VM_BUG_ON(!PageSlab(sp));
99322+ if (!sp->private) {
99323 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99324- unsigned int *m = (unsigned int *)(block - align);
99325- slob_free(m, *m + align);
99326- } else
99327+ slob_t *m = (slob_t *)(block - align);
99328+ slob_free(NULL, m, m[0].units + align);
99329+ } else {
99330+ __ClearPageSlab(sp);
99331+ page_mapcount_reset(sp);
99332+ sp->private = 0;
99333 __free_pages(sp, compound_order(sp));
99334+ }
99335 }
99336 EXPORT_SYMBOL(kfree);
99337
99338+bool is_usercopy_object(const void *ptr)
99339+{
99340+ if (!slab_is_available())
99341+ return false;
99342+
99343+ // PAX: TODO
99344+
99345+ return false;
99346+}
99347+
99348+#ifdef CONFIG_PAX_USERCOPY
99349+const char *check_heap_object(const void *ptr, unsigned long n)
99350+{
99351+ struct page *page;
99352+ const slob_t *free;
99353+ const void *base;
99354+ unsigned long flags;
99355+
99356+ if (ZERO_OR_NULL_PTR(ptr))
99357+ return "<null>";
99358+
99359+ if (!virt_addr_valid(ptr))
99360+ return NULL;
99361+
99362+ page = virt_to_head_page(ptr);
99363+ if (!PageSlab(page))
99364+ return NULL;
99365+
99366+ if (page->private) {
99367+ base = page;
99368+ if (base <= ptr && n <= page->private - (ptr - base))
99369+ return NULL;
99370+ return "<slob>";
99371+ }
99372+
99373+ /* some tricky double walking to find the chunk */
99374+ spin_lock_irqsave(&slob_lock, flags);
99375+ base = (void *)((unsigned long)ptr & PAGE_MASK);
99376+ free = page->freelist;
99377+
99378+ while (!slob_last(free) && (void *)free <= ptr) {
99379+ base = free + slob_units(free);
99380+ free = slob_next(free);
99381+ }
99382+
99383+ while (base < (void *)free) {
99384+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
99385+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
99386+ int offset;
99387+
99388+ if (ptr < base + align)
99389+ break;
99390+
99391+ offset = ptr - base - align;
99392+ if (offset >= m) {
99393+ base += size;
99394+ continue;
99395+ }
99396+
99397+ if (n > m - offset)
99398+ break;
99399+
99400+ spin_unlock_irqrestore(&slob_lock, flags);
99401+ return NULL;
99402+ }
99403+
99404+ spin_unlock_irqrestore(&slob_lock, flags);
99405+ return "<slob>";
99406+}
99407+#endif
99408+
99409 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
99410 size_t ksize(const void *block)
99411 {
99412 struct page *sp;
99413 int align;
99414- unsigned int *m;
99415+ slob_t *m;
99416
99417 BUG_ON(!block);
99418 if (unlikely(block == ZERO_SIZE_PTR))
99419 return 0;
99420
99421 sp = virt_to_page(block);
99422- if (unlikely(!PageSlab(sp)))
99423- return PAGE_SIZE << compound_order(sp);
99424+ VM_BUG_ON(!PageSlab(sp));
99425+ if (sp->private)
99426+ return sp->private;
99427
99428 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99429- m = (unsigned int *)(block - align);
99430- return SLOB_UNITS(*m) * SLOB_UNIT;
99431+ m = (slob_t *)(block - align);
99432+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
99433 }
99434 EXPORT_SYMBOL(ksize);
99435
99436@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
99437
99438 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
99439 {
99440- void *b;
99441+ void *b = NULL;
99442
99443 flags &= gfp_allowed_mask;
99444
99445 lockdep_trace_alloc(flags);
99446
99447+#ifdef CONFIG_PAX_USERCOPY_SLABS
99448+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
99449+#else
99450 if (c->size < PAGE_SIZE) {
99451 b = slob_alloc(c->size, flags, c->align, node);
99452 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99453 SLOB_UNITS(c->size) * SLOB_UNIT,
99454 flags, node);
99455 } else {
99456- b = slob_new_pages(flags, get_order(c->size), node);
99457+ struct page *sp;
99458+
99459+ sp = slob_new_pages(flags, get_order(c->size), node);
99460+ if (sp) {
99461+ b = page_address(sp);
99462+ sp->private = c->size;
99463+ }
99464 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99465 PAGE_SIZE << get_order(c->size),
99466 flags, node);
99467 }
99468+#endif
99469
99470 if (b && c->ctor)
99471 c->ctor(b);
99472@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
99473 EXPORT_SYMBOL(kmem_cache_alloc_node);
99474 #endif
99475
99476-static void __kmem_cache_free(void *b, int size)
99477+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
99478 {
99479- if (size < PAGE_SIZE)
99480- slob_free(b, size);
99481+ struct page *sp;
99482+
99483+ sp = virt_to_page(b);
99484+ BUG_ON(!PageSlab(sp));
99485+ if (!sp->private)
99486+ slob_free(c, b, size);
99487 else
99488- slob_free_pages(b, get_order(size));
99489+ slob_free_pages(sp, get_order(size));
99490 }
99491
99492 static void kmem_rcu_free(struct rcu_head *head)
99493@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
99494 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
99495 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
99496
99497- __kmem_cache_free(b, slob_rcu->size);
99498+ __kmem_cache_free(NULL, b, slob_rcu->size);
99499 }
99500
99501 void kmem_cache_free(struct kmem_cache *c, void *b)
99502 {
99503+ int size = c->size;
99504+
99505+#ifdef CONFIG_PAX_USERCOPY_SLABS
99506+ if (size + c->align < PAGE_SIZE) {
99507+ size += c->align;
99508+ b -= c->align;
99509+ }
99510+#endif
99511+
99512 kmemleak_free_recursive(b, c->flags);
99513 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
99514 struct slob_rcu *slob_rcu;
99515- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
99516- slob_rcu->size = c->size;
99517+ slob_rcu = b + (size - sizeof(struct slob_rcu));
99518+ slob_rcu->size = size;
99519 call_rcu(&slob_rcu->head, kmem_rcu_free);
99520 } else {
99521- __kmem_cache_free(b, c->size);
99522+ __kmem_cache_free(c, b, size);
99523 }
99524
99525+#ifdef CONFIG_PAX_USERCOPY_SLABS
99526+ trace_kfree(_RET_IP_, b);
99527+#else
99528 trace_kmem_cache_free(_RET_IP_, b);
99529+#endif
99530+
99531 }
99532 EXPORT_SYMBOL(kmem_cache_free);
99533
99534diff --git a/mm/slub.c b/mm/slub.c
99535index ae7b9f1..7b3fdbe 100644
99536--- a/mm/slub.c
99537+++ b/mm/slub.c
99538@@ -197,7 +197,7 @@ struct track {
99539
99540 enum track_item { TRACK_ALLOC, TRACK_FREE };
99541
99542-#ifdef CONFIG_SYSFS
99543+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99544 static int sysfs_slab_add(struct kmem_cache *);
99545 static int sysfs_slab_alias(struct kmem_cache *, const char *);
99546 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
99547@@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
99548 if (!t->addr)
99549 return;
99550
99551- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
99552+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
99553 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
99554 #ifdef CONFIG_STACKTRACE
99555 {
99556@@ -2645,6 +2645,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
99557
99558 slab_free_hook(s, x);
99559
99560+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99561+ if (!(s->flags & SLAB_NO_SANITIZE)) {
99562+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
99563+ if (s->ctor)
99564+ s->ctor(x);
99565+ }
99566+#endif
99567+
99568 redo:
99569 /*
99570 * Determine the currently cpus per cpu slab.
99571@@ -2982,6 +2990,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
99572 s->inuse = size;
99573
99574 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
99575+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99576+ (!(flags & SLAB_NO_SANITIZE)) ||
99577+#endif
99578 s->ctor)) {
99579 /*
99580 * Relocate free pointer after the object if it is not
99581@@ -3301,6 +3312,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
99582 EXPORT_SYMBOL(__kmalloc_node);
99583 #endif
99584
99585+bool is_usercopy_object(const void *ptr)
99586+{
99587+ struct page *page;
99588+ struct kmem_cache *s;
99589+
99590+ if (ZERO_OR_NULL_PTR(ptr))
99591+ return false;
99592+
99593+ if (!slab_is_available())
99594+ return false;
99595+
99596+ if (!virt_addr_valid(ptr))
99597+ return false;
99598+
99599+ page = virt_to_head_page(ptr);
99600+
99601+ if (!PageSlab(page))
99602+ return false;
99603+
99604+ s = page->slab_cache;
99605+ return s->flags & SLAB_USERCOPY;
99606+}
99607+
99608+#ifdef CONFIG_PAX_USERCOPY
99609+const char *check_heap_object(const void *ptr, unsigned long n)
99610+{
99611+ struct page *page;
99612+ struct kmem_cache *s;
99613+ unsigned long offset;
99614+
99615+ if (ZERO_OR_NULL_PTR(ptr))
99616+ return "<null>";
99617+
99618+ if (!virt_addr_valid(ptr))
99619+ return NULL;
99620+
99621+ page = virt_to_head_page(ptr);
99622+
99623+ if (!PageSlab(page))
99624+ return NULL;
99625+
99626+ s = page->slab_cache;
99627+ if (!(s->flags & SLAB_USERCOPY))
99628+ return s->name;
99629+
99630+ offset = (ptr - page_address(page)) % s->size;
99631+ if (offset <= s->object_size && n <= s->object_size - offset)
99632+ return NULL;
99633+
99634+ return s->name;
99635+}
99636+#endif
99637+
99638 size_t ksize(const void *object)
99639 {
99640 struct page *page;
99641@@ -3329,6 +3393,7 @@ void kfree(const void *x)
99642 if (unlikely(ZERO_OR_NULL_PTR(x)))
99643 return;
99644
99645+ VM_BUG_ON(!virt_addr_valid(x));
99646 page = virt_to_head_page(x);
99647 if (unlikely(!PageSlab(page))) {
99648 BUG_ON(!PageCompound(page));
99649@@ -3624,7 +3689,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99650 int i;
99651 struct kmem_cache *c;
99652
99653- s->refcount++;
99654+ atomic_inc(&s->refcount);
99655
99656 /*
99657 * Adjust the object sizes so that we clear
99658@@ -3643,7 +3708,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99659 }
99660
99661 if (sysfs_slab_alias(s, name)) {
99662- s->refcount--;
99663+ atomic_dec(&s->refcount);
99664 s = NULL;
99665 }
99666 }
99667@@ -3760,7 +3825,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
99668 }
99669 #endif
99670
99671-#ifdef CONFIG_SYSFS
99672+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99673 static int count_inuse(struct page *page)
99674 {
99675 return page->inuse;
99676@@ -4041,7 +4106,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
99677 len += sprintf(buf + len, "%7ld ", l->count);
99678
99679 if (l->addr)
99680+#ifdef CONFIG_GRKERNSEC_HIDESYM
99681+ len += sprintf(buf + len, "%pS", NULL);
99682+#else
99683 len += sprintf(buf + len, "%pS", (void *)l->addr);
99684+#endif
99685 else
99686 len += sprintf(buf + len, "<not-available>");
99687
99688@@ -4143,12 +4212,12 @@ static void __init resiliency_test(void)
99689 validate_slab_cache(kmalloc_caches[9]);
99690 }
99691 #else
99692-#ifdef CONFIG_SYSFS
99693+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99694 static void resiliency_test(void) {};
99695 #endif
99696 #endif
99697
99698-#ifdef CONFIG_SYSFS
99699+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99700 enum slab_stat_type {
99701 SL_ALL, /* All slabs */
99702 SL_PARTIAL, /* Only partially allocated slabs */
99703@@ -4385,13 +4454,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
99704 {
99705 if (!s->ctor)
99706 return 0;
99707+#ifdef CONFIG_GRKERNSEC_HIDESYM
99708+ return sprintf(buf, "%pS\n", NULL);
99709+#else
99710 return sprintf(buf, "%pS\n", s->ctor);
99711+#endif
99712 }
99713 SLAB_ATTR_RO(ctor);
99714
99715 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
99716 {
99717- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
99718+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
99719 }
99720 SLAB_ATTR_RO(aliases);
99721
99722@@ -4479,6 +4552,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
99723 SLAB_ATTR_RO(cache_dma);
99724 #endif
99725
99726+#ifdef CONFIG_PAX_USERCOPY_SLABS
99727+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
99728+{
99729+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
99730+}
99731+SLAB_ATTR_RO(usercopy);
99732+#endif
99733+
99734+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99735+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
99736+{
99737+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
99738+}
99739+SLAB_ATTR_RO(sanitize);
99740+#endif
99741+
99742 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
99743 {
99744 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
99745@@ -4534,7 +4623,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
99746 * as well as cause other issues like converting a mergeable
99747 * cache into an umergeable one.
99748 */
99749- if (s->refcount > 1)
99750+ if (atomic_read(&s->refcount) > 1)
99751 return -EINVAL;
99752
99753 s->flags &= ~SLAB_TRACE;
99754@@ -4654,7 +4743,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
99755 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
99756 size_t length)
99757 {
99758- if (s->refcount > 1)
99759+ if (atomic_read(&s->refcount) > 1)
99760 return -EINVAL;
99761
99762 s->flags &= ~SLAB_FAILSLAB;
99763@@ -4824,6 +4913,12 @@ static struct attribute *slab_attrs[] = {
99764 #ifdef CONFIG_ZONE_DMA
99765 &cache_dma_attr.attr,
99766 #endif
99767+#ifdef CONFIG_PAX_USERCOPY_SLABS
99768+ &usercopy_attr.attr,
99769+#endif
99770+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99771+ &sanitize_attr.attr,
99772+#endif
99773 #ifdef CONFIG_NUMA
99774 &remote_node_defrag_ratio_attr.attr,
99775 #endif
99776@@ -5068,6 +5163,7 @@ static char *create_unique_id(struct kmem_cache *s)
99777 return name;
99778 }
99779
99780+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99781 static int sysfs_slab_add(struct kmem_cache *s)
99782 {
99783 int err;
99784@@ -5141,6 +5237,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
99785 kobject_del(&s->kobj);
99786 kobject_put(&s->kobj);
99787 }
99788+#endif
99789
99790 /*
99791 * Need to buffer aliases during bootup until sysfs becomes
99792@@ -5154,6 +5251,7 @@ struct saved_alias {
99793
99794 static struct saved_alias *alias_list;
99795
99796+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99797 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99798 {
99799 struct saved_alias *al;
99800@@ -5176,6 +5274,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99801 alias_list = al;
99802 return 0;
99803 }
99804+#endif
99805
99806 static int __init slab_sysfs_init(void)
99807 {
99808diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
99809index 4cba9c2..b4f9fcc 100644
99810--- a/mm/sparse-vmemmap.c
99811+++ b/mm/sparse-vmemmap.c
99812@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
99813 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99814 if (!p)
99815 return NULL;
99816- pud_populate(&init_mm, pud, p);
99817+ pud_populate_kernel(&init_mm, pud, p);
99818 }
99819 return pud;
99820 }
99821@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
99822 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99823 if (!p)
99824 return NULL;
99825- pgd_populate(&init_mm, pgd, p);
99826+ pgd_populate_kernel(&init_mm, pgd, p);
99827 }
99828 return pgd;
99829 }
99830diff --git a/mm/sparse.c b/mm/sparse.c
99831index d1b48b6..6e8590e 100644
99832--- a/mm/sparse.c
99833+++ b/mm/sparse.c
99834@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
99835
99836 for (i = 0; i < PAGES_PER_SECTION; i++) {
99837 if (PageHWPoison(&memmap[i])) {
99838- atomic_long_sub(1, &num_poisoned_pages);
99839+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
99840 ClearPageHWPoison(&memmap[i]);
99841 }
99842 }
99843diff --git a/mm/swap.c b/mm/swap.c
99844index 8a12b33..7068e78 100644
99845--- a/mm/swap.c
99846+++ b/mm/swap.c
99847@@ -31,6 +31,7 @@
99848 #include <linux/memcontrol.h>
99849 #include <linux/gfp.h>
99850 #include <linux/uio.h>
99851+#include <linux/hugetlb.h>
99852
99853 #include "internal.h"
99854
99855@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
99856
99857 __page_cache_release(page);
99858 dtor = get_compound_page_dtor(page);
99859+ if (!PageHuge(page))
99860+ BUG_ON(dtor != free_compound_page);
99861 (*dtor)(page);
99862 }
99863
99864diff --git a/mm/swapfile.c b/mm/swapfile.c
99865index 8798b2e..348f9dd 100644
99866--- a/mm/swapfile.c
99867+++ b/mm/swapfile.c
99868@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
99869
99870 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
99871 /* Activity counter to indicate that a swapon or swapoff has occurred */
99872-static atomic_t proc_poll_event = ATOMIC_INIT(0);
99873+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
99874
99875 static inline unsigned char swap_count(unsigned char ent)
99876 {
99877@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
99878 spin_unlock(&swap_lock);
99879
99880 err = 0;
99881- atomic_inc(&proc_poll_event);
99882+ atomic_inc_unchecked(&proc_poll_event);
99883 wake_up_interruptible(&proc_poll_wait);
99884
99885 out_dput:
99886@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
99887
99888 poll_wait(file, &proc_poll_wait, wait);
99889
99890- if (seq->poll_event != atomic_read(&proc_poll_event)) {
99891- seq->poll_event = atomic_read(&proc_poll_event);
99892+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
99893+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99894 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
99895 }
99896
99897@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
99898 return ret;
99899
99900 seq = file->private_data;
99901- seq->poll_event = atomic_read(&proc_poll_event);
99902+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99903 return 0;
99904 }
99905
99906@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
99907 (frontswap_map) ? "FS" : "");
99908
99909 mutex_unlock(&swapon_mutex);
99910- atomic_inc(&proc_poll_event);
99911+ atomic_inc_unchecked(&proc_poll_event);
99912 wake_up_interruptible(&proc_poll_wait);
99913
99914 if (S_ISREG(inode->i_mode))
99915diff --git a/mm/util.c b/mm/util.c
99916index fec39d4..3e60325 100644
99917--- a/mm/util.c
99918+++ b/mm/util.c
99919@@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
99920 void arch_pick_mmap_layout(struct mm_struct *mm)
99921 {
99922 mm->mmap_base = TASK_UNMAPPED_BASE;
99923+
99924+#ifdef CONFIG_PAX_RANDMMAP
99925+ if (mm->pax_flags & MF_PAX_RANDMMAP)
99926+ mm->mmap_base += mm->delta_mmap;
99927+#endif
99928+
99929 mm->get_unmapped_area = arch_get_unmapped_area;
99930 }
99931 #endif
99932@@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
99933 if (!mm->arg_end)
99934 goto out_mm; /* Shh! No looking before we're done */
99935
99936+ if (gr_acl_handle_procpidmem(task))
99937+ goto out_mm;
99938+
99939 len = mm->arg_end - mm->arg_start;
99940
99941 if (len > buflen)
99942diff --git a/mm/vmalloc.c b/mm/vmalloc.c
99943index 90520af..24231aa 100644
99944--- a/mm/vmalloc.c
99945+++ b/mm/vmalloc.c
99946@@ -40,6 +40,21 @@ struct vfree_deferred {
99947 };
99948 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
99949
99950+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99951+struct stack_deferred_llist {
99952+ struct llist_head list;
99953+ void *stack;
99954+ void *lowmem_stack;
99955+};
99956+
99957+struct stack_deferred {
99958+ struct stack_deferred_llist list;
99959+ struct work_struct wq;
99960+};
99961+
99962+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
99963+#endif
99964+
99965 static void __vunmap(const void *, int);
99966
99967 static void free_work(struct work_struct *w)
99968@@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
99969 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
99970 struct llist_node *llnode = llist_del_all(&p->list);
99971 while (llnode) {
99972- void *p = llnode;
99973+ void *x = llnode;
99974 llnode = llist_next(llnode);
99975- __vunmap(p, 1);
99976+ __vunmap(x, 1);
99977 }
99978 }
99979
99980+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99981+static void unmap_work(struct work_struct *w)
99982+{
99983+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
99984+ struct llist_node *llnode = llist_del_all(&p->list.list);
99985+ while (llnode) {
99986+ struct stack_deferred_llist *x =
99987+ llist_entry((struct llist_head *)llnode,
99988+ struct stack_deferred_llist, list);
99989+ void *stack = ACCESS_ONCE(x->stack);
99990+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
99991+ llnode = llist_next(llnode);
99992+ __vunmap(stack, 0);
99993+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
99994+ }
99995+}
99996+#endif
99997+
99998 /*** Page table manipulation functions ***/
99999
100000 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
100001@@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
100002
100003 pte = pte_offset_kernel(pmd, addr);
100004 do {
100005- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
100006- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
100007+
100008+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100009+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
100010+ BUG_ON(!pte_exec(*pte));
100011+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
100012+ continue;
100013+ }
100014+#endif
100015+
100016+ {
100017+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
100018+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
100019+ }
100020 } while (pte++, addr += PAGE_SIZE, addr != end);
100021 }
100022
100023@@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
100024 pte = pte_alloc_kernel(pmd, addr);
100025 if (!pte)
100026 return -ENOMEM;
100027+
100028+ pax_open_kernel();
100029 do {
100030 struct page *page = pages[*nr];
100031
100032- if (WARN_ON(!pte_none(*pte)))
100033+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100034+ if (pgprot_val(prot) & _PAGE_NX)
100035+#endif
100036+
100037+ if (!pte_none(*pte)) {
100038+ pax_close_kernel();
100039+ WARN_ON(1);
100040 return -EBUSY;
100041- if (WARN_ON(!page))
100042+ }
100043+ if (!page) {
100044+ pax_close_kernel();
100045+ WARN_ON(1);
100046 return -ENOMEM;
100047+ }
100048 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
100049 (*nr)++;
100050 } while (pte++, addr += PAGE_SIZE, addr != end);
100051+ pax_close_kernel();
100052 return 0;
100053 }
100054
100055@@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
100056 pmd_t *pmd;
100057 unsigned long next;
100058
100059- pmd = pmd_alloc(&init_mm, pud, addr);
100060+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
100061 if (!pmd)
100062 return -ENOMEM;
100063 do {
100064@@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
100065 pud_t *pud;
100066 unsigned long next;
100067
100068- pud = pud_alloc(&init_mm, pgd, addr);
100069+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
100070 if (!pud)
100071 return -ENOMEM;
100072 do {
100073@@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
100074 if (addr >= MODULES_VADDR && addr < MODULES_END)
100075 return 1;
100076 #endif
100077+
100078+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
100079+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
100080+ return 1;
100081+#endif
100082+
100083 return is_vmalloc_addr(x);
100084 }
100085
100086@@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
100087
100088 if (!pgd_none(*pgd)) {
100089 pud_t *pud = pud_offset(pgd, addr);
100090+#ifdef CONFIG_X86
100091+ if (!pud_large(*pud))
100092+#endif
100093 if (!pud_none(*pud)) {
100094 pmd_t *pmd = pmd_offset(pud, addr);
100095+#ifdef CONFIG_X86
100096+ if (!pmd_large(*pmd))
100097+#endif
100098 if (!pmd_none(*pmd)) {
100099 pte_t *ptep, pte;
100100
100101@@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
100102 for_each_possible_cpu(i) {
100103 struct vmap_block_queue *vbq;
100104 struct vfree_deferred *p;
100105+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100106+ struct stack_deferred *p2;
100107+#endif
100108
100109 vbq = &per_cpu(vmap_block_queue, i);
100110 spin_lock_init(&vbq->lock);
100111 INIT_LIST_HEAD(&vbq->free);
100112+
100113 p = &per_cpu(vfree_deferred, i);
100114 init_llist_head(&p->list);
100115 INIT_WORK(&p->wq, free_work);
100116+
100117+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100118+ p2 = &per_cpu(stack_deferred, i);
100119+ init_llist_head(&p2->list.list);
100120+ INIT_WORK(&p2->wq, unmap_work);
100121+#endif
100122 }
100123
100124 /* Import existing vmlist entries. */
100125@@ -1314,6 +1393,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
100126 struct vm_struct *area;
100127
100128 BUG_ON(in_interrupt());
100129+
100130+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100131+ if (flags & VM_KERNEXEC) {
100132+ if (start != VMALLOC_START || end != VMALLOC_END)
100133+ return NULL;
100134+ start = (unsigned long)MODULES_EXEC_VADDR;
100135+ end = (unsigned long)MODULES_EXEC_END;
100136+ }
100137+#endif
100138+
100139 if (flags & VM_IOREMAP)
100140 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
100141
100142@@ -1519,6 +1608,23 @@ void vunmap(const void *addr)
100143 }
100144 EXPORT_SYMBOL(vunmap);
100145
100146+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100147+void unmap_process_stacks(struct task_struct *task)
100148+{
100149+ if (unlikely(in_interrupt())) {
100150+ struct stack_deferred *p = &__get_cpu_var(stack_deferred);
100151+ struct stack_deferred_llist *list = task->stack;
100152+ list->stack = task->stack;
100153+ list->lowmem_stack = task->lowmem_stack;
100154+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
100155+ schedule_work(&p->wq);
100156+ } else {
100157+ __vunmap(task->stack, 0);
100158+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
100159+ }
100160+}
100161+#endif
100162+
100163 /**
100164 * vmap - map an array of pages into virtually contiguous space
100165 * @pages: array of page pointers
100166@@ -1539,6 +1645,11 @@ void *vmap(struct page **pages, unsigned int count,
100167 if (count > totalram_pages)
100168 return NULL;
100169
100170+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100171+ if (!(pgprot_val(prot) & _PAGE_NX))
100172+ flags |= VM_KERNEXEC;
100173+#endif
100174+
100175 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
100176 __builtin_return_address(0));
100177 if (!area)
100178@@ -1641,6 +1752,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
100179 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
100180 goto fail;
100181
100182+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100183+ if (!(pgprot_val(prot) & _PAGE_NX))
100184+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
100185+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
100186+ else
100187+#endif
100188+
100189 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
100190 start, end, node, gfp_mask, caller);
100191 if (!area)
100192@@ -1817,10 +1935,9 @@ EXPORT_SYMBOL(vzalloc_node);
100193 * For tight control over page level allocator and protection flags
100194 * use __vmalloc() instead.
100195 */
100196-
100197 void *vmalloc_exec(unsigned long size)
100198 {
100199- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
100200+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
100201 NUMA_NO_NODE, __builtin_return_address(0));
100202 }
100203
100204@@ -2127,6 +2244,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
100205 {
100206 struct vm_struct *area;
100207
100208+ BUG_ON(vma->vm_mirror);
100209+
100210 size = PAGE_ALIGN(size);
100211
100212 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
100213@@ -2609,7 +2728,11 @@ static int s_show(struct seq_file *m, void *p)
100214 v->addr, v->addr + v->size, v->size);
100215
100216 if (v->caller)
100217+#ifdef CONFIG_GRKERNSEC_HIDESYM
100218+ seq_printf(m, " %pK", v->caller);
100219+#else
100220 seq_printf(m, " %pS", v->caller);
100221+#endif
100222
100223 if (v->nr_pages)
100224 seq_printf(m, " pages=%d", v->nr_pages);
100225diff --git a/mm/vmstat.c b/mm/vmstat.c
100226index 1b12d39..57b29b2 100644
100227--- a/mm/vmstat.c
100228+++ b/mm/vmstat.c
100229@@ -22,6 +22,7 @@
100230 #include <linux/writeback.h>
100231 #include <linux/compaction.h>
100232 #include <linux/mm_inline.h>
100233+#include <linux/grsecurity.h>
100234
100235 #include "internal.h"
100236
100237@@ -81,7 +82,7 @@ void vm_events_fold_cpu(int cpu)
100238 *
100239 * vm_stat contains the global counters
100240 */
100241-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
100242+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
100243 EXPORT_SYMBOL(vm_stat);
100244
100245 #ifdef CONFIG_SMP
100246@@ -433,7 +434,7 @@ static int fold_diff(int *diff)
100247
100248 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
100249 if (diff[i]) {
100250- atomic_long_add(diff[i], &vm_stat[i]);
100251+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
100252 changes++;
100253 }
100254 return changes;
100255@@ -471,7 +472,7 @@ static int refresh_cpu_vm_stats(void)
100256 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
100257 if (v) {
100258
100259- atomic_long_add(v, &zone->vm_stat[i]);
100260+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
100261 global_diff[i] += v;
100262 #ifdef CONFIG_NUMA
100263 /* 3 seconds idle till flush */
100264@@ -535,7 +536,7 @@ void cpu_vm_stats_fold(int cpu)
100265
100266 v = p->vm_stat_diff[i];
100267 p->vm_stat_diff[i] = 0;
100268- atomic_long_add(v, &zone->vm_stat[i]);
100269+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
100270 global_diff[i] += v;
100271 }
100272 }
100273@@ -555,8 +556,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
100274 if (pset->vm_stat_diff[i]) {
100275 int v = pset->vm_stat_diff[i];
100276 pset->vm_stat_diff[i] = 0;
100277- atomic_long_add(v, &zone->vm_stat[i]);
100278- atomic_long_add(v, &vm_stat[i]);
100279+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
100280+ atomic_long_add_unchecked(v, &vm_stat[i]);
100281 }
100282 }
100283 #endif
100284@@ -1189,10 +1190,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
100285 stat_items_size += sizeof(struct vm_event_state);
100286 #endif
100287
100288- v = kmalloc(stat_items_size, GFP_KERNEL);
100289+ v = kzalloc(stat_items_size, GFP_KERNEL);
100290 m->private = v;
100291 if (!v)
100292 return ERR_PTR(-ENOMEM);
100293+
100294+#ifdef CONFIG_GRKERNSEC_PROC_ADD
100295+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
100296+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
100297+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
100298+ && !in_group_p(grsec_proc_gid)
100299+#endif
100300+ )
100301+ return (unsigned long *)m->private + *pos;
100302+#endif
100303+#endif
100304+
100305 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
100306 v[i] = global_page_state(i);
100307 v += NR_VM_ZONE_STAT_ITEMS;
100308@@ -1424,10 +1437,16 @@ static int __init setup_vmstat(void)
100309 cpu_notifier_register_done();
100310 #endif
100311 #ifdef CONFIG_PROC_FS
100312- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
100313- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
100314- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
100315- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
100316+ {
100317+ mode_t gr_mode = S_IRUGO;
100318+#ifdef CONFIG_GRKERNSEC_PROC_ADD
100319+ gr_mode = S_IRUSR;
100320+#endif
100321+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
100322+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
100323+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
100324+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
100325+ }
100326 #endif
100327 return 0;
100328 }
100329diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
100330index 64c6bed..b79a5de 100644
100331--- a/net/8021q/vlan.c
100332+++ b/net/8021q/vlan.c
100333@@ -481,7 +481,7 @@ out:
100334 return NOTIFY_DONE;
100335 }
100336
100337-static struct notifier_block vlan_notifier_block __read_mostly = {
100338+static struct notifier_block vlan_notifier_block = {
100339 .notifier_call = vlan_device_event,
100340 };
100341
100342@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
100343 err = -EPERM;
100344 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
100345 break;
100346- if ((args.u.name_type >= 0) &&
100347- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
100348+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
100349 struct vlan_net *vn;
100350
100351 vn = net_generic(net, vlan_net_id);
100352diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
100353index 8ac8a5c..991defc 100644
100354--- a/net/8021q/vlan_netlink.c
100355+++ b/net/8021q/vlan_netlink.c
100356@@ -238,7 +238,7 @@ nla_put_failure:
100357 return -EMSGSIZE;
100358 }
100359
100360-struct rtnl_link_ops vlan_link_ops __read_mostly = {
100361+struct rtnl_link_ops vlan_link_ops = {
100362 .kind = "vlan",
100363 .maxtype = IFLA_VLAN_MAX,
100364 .policy = vlan_policy,
100365diff --git a/net/9p/client.c b/net/9p/client.c
100366index e86a9bea..e91f70e 100644
100367--- a/net/9p/client.c
100368+++ b/net/9p/client.c
100369@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
100370 len - inline_len);
100371 } else {
100372 err = copy_from_user(ename + inline_len,
100373- uidata, len - inline_len);
100374+ (char __force_user *)uidata, len - inline_len);
100375 if (err) {
100376 err = -EFAULT;
100377 goto out_err;
100378@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
100379 kernel_buf = 1;
100380 indata = data;
100381 } else
100382- indata = (__force char *)udata;
100383+ indata = (__force_kernel char *)udata;
100384 /*
100385 * response header len is 11
100386 * PDU Header(7) + IO Size (4)
100387@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
100388 kernel_buf = 1;
100389 odata = data;
100390 } else
100391- odata = (char *)udata;
100392+ odata = (char __force_kernel *)udata;
100393 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
100394 P9_ZC_HDR_SZ, kernel_buf, "dqd",
100395 fid->fid, offset, rsize);
100396diff --git a/net/9p/mod.c b/net/9p/mod.c
100397index 6ab36ae..6f1841b 100644
100398--- a/net/9p/mod.c
100399+++ b/net/9p/mod.c
100400@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
100401 void v9fs_register_trans(struct p9_trans_module *m)
100402 {
100403 spin_lock(&v9fs_trans_lock);
100404- list_add_tail(&m->list, &v9fs_trans_list);
100405+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
100406 spin_unlock(&v9fs_trans_lock);
100407 }
100408 EXPORT_SYMBOL(v9fs_register_trans);
100409@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
100410 void v9fs_unregister_trans(struct p9_trans_module *m)
100411 {
100412 spin_lock(&v9fs_trans_lock);
100413- list_del_init(&m->list);
100414+ pax_list_del_init((struct list_head *)&m->list);
100415 spin_unlock(&v9fs_trans_lock);
100416 }
100417 EXPORT_SYMBOL(v9fs_unregister_trans);
100418diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
100419index 80d08f6..de63fd1 100644
100420--- a/net/9p/trans_fd.c
100421+++ b/net/9p/trans_fd.c
100422@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
100423 oldfs = get_fs();
100424 set_fs(get_ds());
100425 /* The cast to a user pointer is valid due to the set_fs() */
100426- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
100427+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
100428 set_fs(oldfs);
100429
100430 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
100431diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
100432index af46bc4..f9adfcd 100644
100433--- a/net/appletalk/atalk_proc.c
100434+++ b/net/appletalk/atalk_proc.c
100435@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
100436 struct proc_dir_entry *p;
100437 int rc = -ENOMEM;
100438
100439- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
100440+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
100441 if (!atalk_proc_dir)
100442 goto out;
100443
100444diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
100445index 876fbe8..8bbea9f 100644
100446--- a/net/atm/atm_misc.c
100447+++ b/net/atm/atm_misc.c
100448@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
100449 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
100450 return 1;
100451 atm_return(vcc, truesize);
100452- atomic_inc(&vcc->stats->rx_drop);
100453+ atomic_inc_unchecked(&vcc->stats->rx_drop);
100454 return 0;
100455 }
100456 EXPORT_SYMBOL(atm_charge);
100457@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
100458 }
100459 }
100460 atm_return(vcc, guess);
100461- atomic_inc(&vcc->stats->rx_drop);
100462+ atomic_inc_unchecked(&vcc->stats->rx_drop);
100463 return NULL;
100464 }
100465 EXPORT_SYMBOL(atm_alloc_charge);
100466@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
100467
100468 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100469 {
100470-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100471+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100472 __SONET_ITEMS
100473 #undef __HANDLE_ITEM
100474 }
100475@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
100476
100477 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100478 {
100479-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100480+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
100481 __SONET_ITEMS
100482 #undef __HANDLE_ITEM
100483 }
100484diff --git a/net/atm/lec.c b/net/atm/lec.c
100485index 4b98f89..5a2f6cb 100644
100486--- a/net/atm/lec.c
100487+++ b/net/atm/lec.c
100488@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
100489 }
100490
100491 static struct lane2_ops lane2_ops = {
100492- lane2_resolve, /* resolve, spec 3.1.3 */
100493- lane2_associate_req, /* associate_req, spec 3.1.4 */
100494- NULL /* associate indicator, spec 3.1.5 */
100495+ .resolve = lane2_resolve,
100496+ .associate_req = lane2_associate_req,
100497+ .associate_indicator = NULL
100498 };
100499
100500 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
100501diff --git a/net/atm/lec.h b/net/atm/lec.h
100502index 4149db1..f2ab682 100644
100503--- a/net/atm/lec.h
100504+++ b/net/atm/lec.h
100505@@ -48,7 +48,7 @@ struct lane2_ops {
100506 const u8 *tlvs, u32 sizeoftlvs);
100507 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
100508 const u8 *tlvs, u32 sizeoftlvs);
100509-};
100510+} __no_const;
100511
100512 /*
100513 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
100514diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
100515index d1b2d9a..d549f7f 100644
100516--- a/net/atm/mpoa_caches.c
100517+++ b/net/atm/mpoa_caches.c
100518@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
100519
100520
100521 static struct in_cache_ops ingress_ops = {
100522- in_cache_add_entry, /* add_entry */
100523- in_cache_get, /* get */
100524- in_cache_get_with_mask, /* get_with_mask */
100525- in_cache_get_by_vcc, /* get_by_vcc */
100526- in_cache_put, /* put */
100527- in_cache_remove_entry, /* remove_entry */
100528- cache_hit, /* cache_hit */
100529- clear_count_and_expired, /* clear_count */
100530- check_resolving_entries, /* check_resolving */
100531- refresh_entries, /* refresh */
100532- in_destroy_cache /* destroy_cache */
100533+ .add_entry = in_cache_add_entry,
100534+ .get = in_cache_get,
100535+ .get_with_mask = in_cache_get_with_mask,
100536+ .get_by_vcc = in_cache_get_by_vcc,
100537+ .put = in_cache_put,
100538+ .remove_entry = in_cache_remove_entry,
100539+ .cache_hit = cache_hit,
100540+ .clear_count = clear_count_and_expired,
100541+ .check_resolving = check_resolving_entries,
100542+ .refresh = refresh_entries,
100543+ .destroy_cache = in_destroy_cache
100544 };
100545
100546 static struct eg_cache_ops egress_ops = {
100547- eg_cache_add_entry, /* add_entry */
100548- eg_cache_get_by_cache_id, /* get_by_cache_id */
100549- eg_cache_get_by_tag, /* get_by_tag */
100550- eg_cache_get_by_vcc, /* get_by_vcc */
100551- eg_cache_get_by_src_ip, /* get_by_src_ip */
100552- eg_cache_put, /* put */
100553- eg_cache_remove_entry, /* remove_entry */
100554- update_eg_cache_entry, /* update */
100555- clear_expired, /* clear_expired */
100556- eg_destroy_cache /* destroy_cache */
100557+ .add_entry = eg_cache_add_entry,
100558+ .get_by_cache_id = eg_cache_get_by_cache_id,
100559+ .get_by_tag = eg_cache_get_by_tag,
100560+ .get_by_vcc = eg_cache_get_by_vcc,
100561+ .get_by_src_ip = eg_cache_get_by_src_ip,
100562+ .put = eg_cache_put,
100563+ .remove_entry = eg_cache_remove_entry,
100564+ .update = update_eg_cache_entry,
100565+ .clear_expired = clear_expired,
100566+ .destroy_cache = eg_destroy_cache
100567 };
100568
100569
100570diff --git a/net/atm/proc.c b/net/atm/proc.c
100571index bbb6461..cf04016 100644
100572--- a/net/atm/proc.c
100573+++ b/net/atm/proc.c
100574@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
100575 const struct k_atm_aal_stats *stats)
100576 {
100577 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
100578- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
100579- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
100580- atomic_read(&stats->rx_drop));
100581+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
100582+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
100583+ atomic_read_unchecked(&stats->rx_drop));
100584 }
100585
100586 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
100587diff --git a/net/atm/resources.c b/net/atm/resources.c
100588index 0447d5d..3cf4728 100644
100589--- a/net/atm/resources.c
100590+++ b/net/atm/resources.c
100591@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
100592 static void copy_aal_stats(struct k_atm_aal_stats *from,
100593 struct atm_aal_stats *to)
100594 {
100595-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100596+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100597 __AAL_STAT_ITEMS
100598 #undef __HANDLE_ITEM
100599 }
100600@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
100601 static void subtract_aal_stats(struct k_atm_aal_stats *from,
100602 struct atm_aal_stats *to)
100603 {
100604-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100605+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
100606 __AAL_STAT_ITEMS
100607 #undef __HANDLE_ITEM
100608 }
100609diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
100610index 919a5ce..cc6b444 100644
100611--- a/net/ax25/sysctl_net_ax25.c
100612+++ b/net/ax25/sysctl_net_ax25.c
100613@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
100614 {
100615 char path[sizeof("net/ax25/") + IFNAMSIZ];
100616 int k;
100617- struct ctl_table *table;
100618+ ctl_table_no_const *table;
100619
100620 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
100621 if (!table)
100622diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
100623index 1e80539..676c37a 100644
100624--- a/net/batman-adv/bat_iv_ogm.c
100625+++ b/net/batman-adv/bat_iv_ogm.c
100626@@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
100627
100628 /* randomize initial seqno to avoid collision */
100629 get_random_bytes(&random_seqno, sizeof(random_seqno));
100630- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100631+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100632
100633 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
100634 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
100635@@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
100636 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
100637
100638 /* change sequence number to network order */
100639- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
100640+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
100641 batadv_ogm_packet->seqno = htonl(seqno);
100642- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
100643+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
100644
100645 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
100646
100647@@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
100648 return;
100649
100650 /* could be changed by schedule_own_packet() */
100651- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
100652+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
100653
100654 if (ogm_packet->flags & BATADV_DIRECTLINK)
100655 has_directlink_flag = true;
100656diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
100657index 00f9e14..e1c7203 100644
100658--- a/net/batman-adv/fragmentation.c
100659+++ b/net/batman-adv/fragmentation.c
100660@@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
100661 frag_header.packet_type = BATADV_UNICAST_FRAG;
100662 frag_header.version = BATADV_COMPAT_VERSION;
100663 frag_header.ttl = BATADV_TTL;
100664- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
100665+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
100666 frag_header.reserved = 0;
100667 frag_header.no = 0;
100668 frag_header.total_size = htons(skb->len);
100669diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
100670index 5467955..75ad4e3 100644
100671--- a/net/batman-adv/soft-interface.c
100672+++ b/net/batman-adv/soft-interface.c
100673@@ -296,7 +296,7 @@ send:
100674 primary_if->net_dev->dev_addr);
100675
100676 /* set broadcast sequence number */
100677- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
100678+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
100679 bcast_packet->seqno = htonl(seqno);
100680
100681 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
100682@@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100683 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
100684
100685 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
100686- atomic_set(&bat_priv->bcast_seqno, 1);
100687+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
100688 atomic_set(&bat_priv->tt.vn, 0);
100689 atomic_set(&bat_priv->tt.local_changes, 0);
100690 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
100691@@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100692
100693 /* randomize initial seqno to avoid collision */
100694 get_random_bytes(&random_seqno, sizeof(random_seqno));
100695- atomic_set(&bat_priv->frag_seqno, random_seqno);
100696+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
100697
100698 bat_priv->primary_if = NULL;
100699 bat_priv->num_ifaces = 0;
100700@@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
100701 return 0;
100702 }
100703
100704-struct rtnl_link_ops batadv_link_ops __read_mostly = {
100705+struct rtnl_link_ops batadv_link_ops = {
100706 .kind = "batadv",
100707 .priv_size = sizeof(struct batadv_priv),
100708 .setup = batadv_softif_init_early,
100709diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
100710index 8854c05..ee5d5497 100644
100711--- a/net/batman-adv/types.h
100712+++ b/net/batman-adv/types.h
100713@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
100714 struct batadv_hard_iface_bat_iv {
100715 unsigned char *ogm_buff;
100716 int ogm_buff_len;
100717- atomic_t ogm_seqno;
100718+ atomic_unchecked_t ogm_seqno;
100719 };
100720
100721 /**
100722@@ -768,7 +768,7 @@ struct batadv_priv {
100723 atomic_t bonding;
100724 atomic_t fragmentation;
100725 atomic_t packet_size_max;
100726- atomic_t frag_seqno;
100727+ atomic_unchecked_t frag_seqno;
100728 #ifdef CONFIG_BATMAN_ADV_BLA
100729 atomic_t bridge_loop_avoidance;
100730 #endif
100731@@ -787,7 +787,7 @@ struct batadv_priv {
100732 #endif
100733 uint32_t isolation_mark;
100734 uint32_t isolation_mark_mask;
100735- atomic_t bcast_seqno;
100736+ atomic_unchecked_t bcast_seqno;
100737 atomic_t bcast_queue_left;
100738 atomic_t batman_queue_left;
100739 char num_ifaces;
100740diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
100741index cfbb39e..0bbfc9d 100644
100742--- a/net/bluetooth/6lowpan.c
100743+++ b/net/bluetooth/6lowpan.c
100744@@ -367,7 +367,6 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
100745
100746 drop:
100747 dev->stats.rx_dropped++;
100748- kfree_skb(skb);
100749 return NET_RX_DROP;
100750 }
100751
100752diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
100753index 85bcc21..ce82722d 100644
100754--- a/net/bluetooth/bnep/core.c
100755+++ b/net/bluetooth/bnep/core.c
100756@@ -533,6 +533,9 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
100757
100758 BT_DBG("");
100759
100760+ if (!l2cap_is_socket(sock))
100761+ return -EBADFD;
100762+
100763 baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
100764 baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);
100765
100766diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
100767index 67fe5e8..278a194 100644
100768--- a/net/bluetooth/cmtp/core.c
100769+++ b/net/bluetooth/cmtp/core.c
100770@@ -334,6 +334,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
100771
100772 BT_DBG("");
100773
100774+ if (!l2cap_is_socket(sock))
100775+ return -EBADFD;
100776+
100777 session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
100778 if (!session)
100779 return -ENOMEM;
100780diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
100781index 115f149..f0ba286 100644
100782--- a/net/bluetooth/hci_sock.c
100783+++ b/net/bluetooth/hci_sock.c
100784@@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
100785 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
100786 }
100787
100788- len = min_t(unsigned int, len, sizeof(uf));
100789+ len = min((size_t)len, sizeof(uf));
100790 if (copy_from_user(&uf, optval, len)) {
100791 err = -EFAULT;
100792 break;
100793diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
100794index 1b7d605..02ebd10 100644
100795--- a/net/bluetooth/hidp/core.c
100796+++ b/net/bluetooth/hidp/core.c
100797@@ -1318,13 +1318,14 @@ int hidp_connection_add(struct hidp_connadd_req *req,
100798 {
100799 struct hidp_session *session;
100800 struct l2cap_conn *conn;
100801- struct l2cap_chan *chan = l2cap_pi(ctrl_sock->sk)->chan;
100802+ struct l2cap_chan *chan;
100803 int ret;
100804
100805 ret = hidp_verify_sockets(ctrl_sock, intr_sock);
100806 if (ret)
100807 return ret;
100808
100809+ chan = l2cap_pi(ctrl_sock->sk)->chan;
100810 conn = NULL;
100811 l2cap_chan_lock(chan);
100812 if (chan->conn)
100813diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
100814index b6f9777..36d3039 100644
100815--- a/net/bluetooth/l2cap_core.c
100816+++ b/net/bluetooth/l2cap_core.c
100817@@ -3512,8 +3512,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
100818 break;
100819
100820 case L2CAP_CONF_RFC:
100821- if (olen == sizeof(rfc))
100822- memcpy(&rfc, (void *)val, olen);
100823+ if (olen != sizeof(rfc))
100824+ break;
100825+
100826+ memcpy(&rfc, (void *)val, olen);
100827
100828 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
100829 rfc.mode != chan->mode)
100830diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
100831index 31f106e..323f606 100644
100832--- a/net/bluetooth/l2cap_sock.c
100833+++ b/net/bluetooth/l2cap_sock.c
100834@@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100835 struct sock *sk = sock->sk;
100836 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
100837 struct l2cap_options opts;
100838- int len, err = 0;
100839+ int err = 0;
100840+ size_t len = optlen;
100841 u32 opt;
100842
100843 BT_DBG("sk %p", sk);
100844@@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100845 opts.max_tx = chan->max_tx;
100846 opts.txwin_size = chan->tx_win;
100847
100848- len = min_t(unsigned int, sizeof(opts), optlen);
100849+ len = min(sizeof(opts), len);
100850 if (copy_from_user((char *) &opts, optval, len)) {
100851 err = -EFAULT;
100852 break;
100853@@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100854 struct bt_security sec;
100855 struct bt_power pwr;
100856 struct l2cap_conn *conn;
100857- int len, err = 0;
100858+ int err = 0;
100859+ size_t len = optlen;
100860 u32 opt;
100861
100862 BT_DBG("sk %p", sk);
100863@@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100864
100865 sec.level = BT_SECURITY_LOW;
100866
100867- len = min_t(unsigned int, sizeof(sec), optlen);
100868+ len = min(sizeof(sec), len);
100869 if (copy_from_user((char *) &sec, optval, len)) {
100870 err = -EFAULT;
100871 break;
100872@@ -862,7 +864,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100873
100874 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
100875
100876- len = min_t(unsigned int, sizeof(pwr), optlen);
100877+ len = min(sizeof(pwr), len);
100878 if (copy_from_user((char *) &pwr, optval, len)) {
100879 err = -EFAULT;
100880 break;
100881diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
100882index 8bbbb5e..6fc0950 100644
100883--- a/net/bluetooth/rfcomm/sock.c
100884+++ b/net/bluetooth/rfcomm/sock.c
100885@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100886 struct sock *sk = sock->sk;
100887 struct bt_security sec;
100888 int err = 0;
100889- size_t len;
100890+ size_t len = optlen;
100891 u32 opt;
100892
100893 BT_DBG("sk %p", sk);
100894@@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100895
100896 sec.level = BT_SECURITY_LOW;
100897
100898- len = min_t(unsigned int, sizeof(sec), optlen);
100899+ len = min(sizeof(sec), len);
100900 if (copy_from_user((char *) &sec, optval, len)) {
100901 err = -EFAULT;
100902 break;
100903diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
100904index 8e385a0..a5bdd8e 100644
100905--- a/net/bluetooth/rfcomm/tty.c
100906+++ b/net/bluetooth/rfcomm/tty.c
100907@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
100908 BT_DBG("tty %p id %d", tty, tty->index);
100909
100910 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
100911- dev->channel, dev->port.count);
100912+ dev->channel, atomic_read(&dev->port.count));
100913
100914 err = tty_port_open(&dev->port, tty, filp);
100915 if (err)
100916@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
100917 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
100918
100919 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
100920- dev->port.count);
100921+ atomic_read(&dev->port.count));
100922
100923 tty_port_close(&dev->port, tty, filp);
100924 }
100925diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
100926index e5ec470..cbfabd1 100644
100927--- a/net/bridge/br_netlink.c
100928+++ b/net/bridge/br_netlink.c
100929@@ -564,7 +564,7 @@ static struct rtnl_af_ops br_af_ops = {
100930 .get_link_af_size = br_get_link_af_size,
100931 };
100932
100933-struct rtnl_link_ops br_link_ops __read_mostly = {
100934+struct rtnl_link_ops br_link_ops = {
100935 .kind = "bridge",
100936 .priv_size = sizeof(struct net_bridge),
100937 .setup = br_dev_setup,
100938diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
100939index d9a8c05..8dadc6c6 100644
100940--- a/net/bridge/netfilter/ebtables.c
100941+++ b/net/bridge/netfilter/ebtables.c
100942@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100943 tmp.valid_hooks = t->table->valid_hooks;
100944 }
100945 mutex_unlock(&ebt_mutex);
100946- if (copy_to_user(user, &tmp, *len) != 0) {
100947+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100948 BUGPRINT("c2u Didn't work\n");
100949 ret = -EFAULT;
100950 break;
100951@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100952 goto out;
100953 tmp.valid_hooks = t->valid_hooks;
100954
100955- if (copy_to_user(user, &tmp, *len) != 0) {
100956+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100957 ret = -EFAULT;
100958 break;
100959 }
100960@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100961 tmp.entries_size = t->table->entries_size;
100962 tmp.valid_hooks = t->table->valid_hooks;
100963
100964- if (copy_to_user(user, &tmp, *len) != 0) {
100965+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100966 ret = -EFAULT;
100967 break;
100968 }
100969diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
100970index f5afda1..dcf770a 100644
100971--- a/net/caif/cfctrl.c
100972+++ b/net/caif/cfctrl.c
100973@@ -10,6 +10,7 @@
100974 #include <linux/spinlock.h>
100975 #include <linux/slab.h>
100976 #include <linux/pkt_sched.h>
100977+#include <linux/sched.h>
100978 #include <net/caif/caif_layer.h>
100979 #include <net/caif/cfpkt.h>
100980 #include <net/caif/cfctrl.h>
100981@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
100982 memset(&dev_info, 0, sizeof(dev_info));
100983 dev_info.id = 0xff;
100984 cfsrvl_init(&this->serv, 0, &dev_info, false);
100985- atomic_set(&this->req_seq_no, 1);
100986- atomic_set(&this->rsp_seq_no, 1);
100987+ atomic_set_unchecked(&this->req_seq_no, 1);
100988+ atomic_set_unchecked(&this->rsp_seq_no, 1);
100989 this->serv.layer.receive = cfctrl_recv;
100990 sprintf(this->serv.layer.name, "ctrl");
100991 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
100992@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
100993 struct cfctrl_request_info *req)
100994 {
100995 spin_lock_bh(&ctrl->info_list_lock);
100996- atomic_inc(&ctrl->req_seq_no);
100997- req->sequence_no = atomic_read(&ctrl->req_seq_no);
100998+ atomic_inc_unchecked(&ctrl->req_seq_no);
100999+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
101000 list_add_tail(&req->list, &ctrl->list);
101001 spin_unlock_bh(&ctrl->info_list_lock);
101002 }
101003@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
101004 if (p != first)
101005 pr_warn("Requests are not received in order\n");
101006
101007- atomic_set(&ctrl->rsp_seq_no,
101008+ atomic_set_unchecked(&ctrl->rsp_seq_no,
101009 p->sequence_no);
101010 list_del(&p->list);
101011 goto out;
101012diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
101013index 4589ff67..46d6b8f 100644
101014--- a/net/caif/chnl_net.c
101015+++ b/net/caif/chnl_net.c
101016@@ -516,7 +516,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
101017 };
101018
101019
101020-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
101021+static struct rtnl_link_ops ipcaif_link_ops = {
101022 .kind = "caif",
101023 .priv_size = sizeof(struct chnl_net),
101024 .setup = ipcaif_net_setup,
101025diff --git a/net/can/af_can.c b/net/can/af_can.c
101026index ce82337..5d17b4d 100644
101027--- a/net/can/af_can.c
101028+++ b/net/can/af_can.c
101029@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
101030 };
101031
101032 /* notifier block for netdevice event */
101033-static struct notifier_block can_netdev_notifier __read_mostly = {
101034+static struct notifier_block can_netdev_notifier = {
101035 .notifier_call = can_notifier,
101036 };
101037
101038diff --git a/net/can/bcm.c b/net/can/bcm.c
101039index dcb75c0..24b1b43 100644
101040--- a/net/can/bcm.c
101041+++ b/net/can/bcm.c
101042@@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
101043 }
101044
101045 /* create /proc/net/can-bcm directory */
101046- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
101047+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
101048 return 0;
101049 }
101050
101051diff --git a/net/can/gw.c b/net/can/gw.c
101052index 050a211..bb9fe33 100644
101053--- a/net/can/gw.c
101054+++ b/net/can/gw.c
101055@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
101056 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
101057
101058 static HLIST_HEAD(cgw_list);
101059-static struct notifier_block notifier;
101060
101061 static struct kmem_cache *cgw_cache __read_mostly;
101062
101063@@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
101064 return err;
101065 }
101066
101067+static struct notifier_block notifier = {
101068+ .notifier_call = cgw_notifier
101069+};
101070+
101071 static __init int cgw_module_init(void)
101072 {
101073 /* sanitize given module parameter */
101074@@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
101075 return -ENOMEM;
101076
101077 /* set notifier */
101078- notifier.notifier_call = cgw_notifier;
101079 register_netdevice_notifier(&notifier);
101080
101081 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
101082diff --git a/net/can/proc.c b/net/can/proc.c
101083index 1a19b98..df2b4ec 100644
101084--- a/net/can/proc.c
101085+++ b/net/can/proc.c
101086@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
101087 void can_init_proc(void)
101088 {
101089 /* create /proc/net/can directory */
101090- can_dir = proc_mkdir("can", init_net.proc_net);
101091+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
101092
101093 if (!can_dir) {
101094 printk(KERN_INFO "can: failed to create /proc/net/can . "
101095diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
101096index 8d1653c..77ad145 100644
101097--- a/net/ceph/messenger.c
101098+++ b/net/ceph/messenger.c
101099@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
101100 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
101101
101102 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
101103-static atomic_t addr_str_seq = ATOMIC_INIT(0);
101104+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
101105
101106 static struct page *zero_page; /* used in certain error cases */
101107
101108@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
101109 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
101110 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
101111
101112- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
101113+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
101114 s = addr_str[i];
101115
101116 switch (ss->ss_family) {
101117diff --git a/net/compat.c b/net/compat.c
101118index bc8aeef..f9c070c 100644
101119--- a/net/compat.c
101120+++ b/net/compat.c
101121@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
101122 return -EFAULT;
101123 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
101124 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
101125- kmsg->msg_name = compat_ptr(tmp1);
101126- kmsg->msg_iov = compat_ptr(tmp2);
101127- kmsg->msg_control = compat_ptr(tmp3);
101128+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
101129+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
101130+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
101131 return 0;
101132 }
101133
101134@@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
101135
101136 if (kern_msg->msg_name && kern_msg->msg_namelen) {
101137 if (mode == VERIFY_READ) {
101138- int err = move_addr_to_kernel(kern_msg->msg_name,
101139+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
101140 kern_msg->msg_namelen,
101141 kern_address);
101142 if (err < 0)
101143@@ -100,7 +100,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
101144 }
101145
101146 tot_len = iov_from_user_compat_to_kern(kern_iov,
101147- (struct compat_iovec __user *)kern_msg->msg_iov,
101148+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
101149 kern_msg->msg_iovlen);
101150 if (tot_len >= 0)
101151 kern_msg->msg_iov = kern_iov;
101152@@ -120,20 +120,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
101153
101154 #define CMSG_COMPAT_FIRSTHDR(msg) \
101155 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
101156- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
101157+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
101158 (struct compat_cmsghdr __user *)NULL)
101159
101160 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
101161 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
101162 (ucmlen) <= (unsigned long) \
101163 ((mhdr)->msg_controllen - \
101164- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
101165+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
101166
101167 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
101168 struct compat_cmsghdr __user *cmsg, int cmsg_len)
101169 {
101170 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
101171- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
101172+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
101173 msg->msg_controllen)
101174 return NULL;
101175 return (struct compat_cmsghdr __user *)ptr;
101176@@ -223,7 +223,7 @@ Efault:
101177
101178 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
101179 {
101180- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
101181+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
101182 struct compat_cmsghdr cmhdr;
101183 struct compat_timeval ctv;
101184 struct compat_timespec cts[3];
101185@@ -279,7 +279,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
101186
101187 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
101188 {
101189- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
101190+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
101191 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
101192 int fdnum = scm->fp->count;
101193 struct file **fp = scm->fp->fp;
101194@@ -367,7 +367,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
101195 return -EFAULT;
101196 old_fs = get_fs();
101197 set_fs(KERNEL_DS);
101198- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
101199+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
101200 set_fs(old_fs);
101201
101202 return err;
101203@@ -428,7 +428,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
101204 len = sizeof(ktime);
101205 old_fs = get_fs();
101206 set_fs(KERNEL_DS);
101207- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
101208+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
101209 set_fs(old_fs);
101210
101211 if (!err) {
101212@@ -571,7 +571,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
101213 case MCAST_JOIN_GROUP:
101214 case MCAST_LEAVE_GROUP:
101215 {
101216- struct compat_group_req __user *gr32 = (void *)optval;
101217+ struct compat_group_req __user *gr32 = (void __user *)optval;
101218 struct group_req __user *kgr =
101219 compat_alloc_user_space(sizeof(struct group_req));
101220 u32 interface;
101221@@ -592,7 +592,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
101222 case MCAST_BLOCK_SOURCE:
101223 case MCAST_UNBLOCK_SOURCE:
101224 {
101225- struct compat_group_source_req __user *gsr32 = (void *)optval;
101226+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
101227 struct group_source_req __user *kgsr = compat_alloc_user_space(
101228 sizeof(struct group_source_req));
101229 u32 interface;
101230@@ -613,7 +613,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
101231 }
101232 case MCAST_MSFILTER:
101233 {
101234- struct compat_group_filter __user *gf32 = (void *)optval;
101235+ struct compat_group_filter __user *gf32 = (void __user *)optval;
101236 struct group_filter __user *kgf;
101237 u32 interface, fmode, numsrc;
101238
101239@@ -651,7 +651,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
101240 char __user *optval, int __user *optlen,
101241 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
101242 {
101243- struct compat_group_filter __user *gf32 = (void *)optval;
101244+ struct compat_group_filter __user *gf32 = (void __user *)optval;
101245 struct group_filter __user *kgf;
101246 int __user *koptlen;
101247 u32 interface, fmode, numsrc;
101248@@ -804,7 +804,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
101249
101250 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
101251 return -EINVAL;
101252- if (copy_from_user(a, args, nas[call]))
101253+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
101254 return -EFAULT;
101255 a0 = a[0];
101256 a1 = a[1];
101257diff --git a/net/core/datagram.c b/net/core/datagram.c
101258index fdbc9a8..cd6972c 100644
101259--- a/net/core/datagram.c
101260+++ b/net/core/datagram.c
101261@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
101262 }
101263
101264 kfree_skb(skb);
101265- atomic_inc(&sk->sk_drops);
101266+ atomic_inc_unchecked(&sk->sk_drops);
101267 sk_mem_reclaim_partial(sk);
101268
101269 return err;
101270diff --git a/net/core/dev.c b/net/core/dev.c
101271index 8440968..d1d6bea 100644
101272--- a/net/core/dev.c
101273+++ b/net/core/dev.c
101274@@ -1683,14 +1683,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
101275 {
101276 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
101277 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
101278- atomic_long_inc(&dev->rx_dropped);
101279+ atomic_long_inc_unchecked(&dev->rx_dropped);
101280 kfree_skb(skb);
101281 return NET_RX_DROP;
101282 }
101283 }
101284
101285 if (unlikely(!is_skb_forwardable(dev, skb))) {
101286- atomic_long_inc(&dev->rx_dropped);
101287+ atomic_long_inc_unchecked(&dev->rx_dropped);
101288 kfree_skb(skb);
101289 return NET_RX_DROP;
101290 }
101291@@ -2994,7 +2994,7 @@ recursion_alert:
101292 drop:
101293 rcu_read_unlock_bh();
101294
101295- atomic_long_inc(&dev->tx_dropped);
101296+ atomic_long_inc_unchecked(&dev->tx_dropped);
101297 kfree_skb_list(skb);
101298 return rc;
101299 out:
101300@@ -3337,7 +3337,7 @@ enqueue:
101301
101302 local_irq_restore(flags);
101303
101304- atomic_long_inc(&skb->dev->rx_dropped);
101305+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
101306 kfree_skb(skb);
101307 return NET_RX_DROP;
101308 }
101309@@ -3414,7 +3414,7 @@ int netif_rx_ni(struct sk_buff *skb)
101310 }
101311 EXPORT_SYMBOL(netif_rx_ni);
101312
101313-static void net_tx_action(struct softirq_action *h)
101314+static __latent_entropy void net_tx_action(void)
101315 {
101316 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
101317
101318@@ -3747,7 +3747,7 @@ ncls:
101319 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
101320 } else {
101321 drop:
101322- atomic_long_inc(&skb->dev->rx_dropped);
101323+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
101324 kfree_skb(skb);
101325 /* Jamal, now you will not able to escape explaining
101326 * me how you were going to use this. :-)
101327@@ -4511,7 +4511,7 @@ void netif_napi_del(struct napi_struct *napi)
101328 }
101329 EXPORT_SYMBOL(netif_napi_del);
101330
101331-static void net_rx_action(struct softirq_action *h)
101332+static __latent_entropy void net_rx_action(void)
101333 {
101334 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
101335 unsigned long time_limit = jiffies + 2;
101336@@ -6557,8 +6557,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
101337 } else {
101338 netdev_stats_to_stats64(storage, &dev->stats);
101339 }
101340- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
101341- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
101342+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
101343+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
101344 return storage;
101345 }
101346 EXPORT_SYMBOL(dev_get_stats);
101347diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
101348index 72e899a..79a9409 100644
101349--- a/net/core/dev_ioctl.c
101350+++ b/net/core/dev_ioctl.c
101351@@ -365,8 +365,13 @@ void dev_load(struct net *net, const char *name)
101352 no_module = !dev;
101353 if (no_module && capable(CAP_NET_ADMIN))
101354 no_module = request_module("netdev-%s", name);
101355- if (no_module && capable(CAP_SYS_MODULE))
101356+ if (no_module && capable(CAP_SYS_MODULE)) {
101357+#ifdef CONFIG_GRKERNSEC_MODHARDEN
101358+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
101359+#else
101360 request_module("%s", name);
101361+#endif
101362+ }
101363 }
101364 EXPORT_SYMBOL(dev_load);
101365
101366diff --git a/net/core/filter.c b/net/core/filter.c
101367index 647b122..18a7ff6 100644
101368--- a/net/core/filter.c
101369+++ b/net/core/filter.c
101370@@ -532,7 +532,11 @@ do_pass:
101371
101372 /* Unkown instruction. */
101373 default:
101374- goto err;
101375+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
101376+ fp->code, fp->jt, fp->jf, fp->k);
101377+ kfree(addrs);
101378+ BUG();
101379+ return -EINVAL;
101380 }
101381
101382 insn++;
101383@@ -576,7 +580,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
101384 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
101385 int pc, ret = 0;
101386
101387- BUILD_BUG_ON(BPF_MEMWORDS > 16);
101388+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
101389
101390 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
101391 if (!masks)
101392@@ -987,7 +991,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
101393 if (!fp)
101394 return -ENOMEM;
101395
101396- memcpy(fp->insns, fprog->filter, fsize);
101397+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
101398
101399 fp->len = fprog->len;
101400 /* Since unattached filters are not copied back to user
101401diff --git a/net/core/flow.c b/net/core/flow.c
101402index a0348fd..340f65d 100644
101403--- a/net/core/flow.c
101404+++ b/net/core/flow.c
101405@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
101406 static int flow_entry_valid(struct flow_cache_entry *fle,
101407 struct netns_xfrm *xfrm)
101408 {
101409- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
101410+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
101411 return 0;
101412 if (fle->object && !fle->object->ops->check(fle->object))
101413 return 0;
101414@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
101415 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
101416 fcp->hash_count++;
101417 }
101418- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
101419+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
101420 flo = fle->object;
101421 if (!flo)
101422 goto ret_object;
101423@@ -263,7 +263,7 @@ nocache:
101424 }
101425 flo = resolver(net, key, family, dir, flo, ctx);
101426 if (fle) {
101427- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
101428+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
101429 if (!IS_ERR(flo))
101430 fle->object = flo;
101431 else
101432@@ -379,7 +379,7 @@ done:
101433 static void flow_cache_flush_task(struct work_struct *work)
101434 {
101435 struct netns_xfrm *xfrm = container_of(work, struct netns_xfrm,
101436- flow_cache_gc_work);
101437+ flow_cache_flush_work);
101438 struct net *net = container_of(xfrm, struct net, xfrm);
101439
101440 flow_cache_flush(net);
101441diff --git a/net/core/iovec.c b/net/core/iovec.c
101442index e1ec45a..e5c6f16 100644
101443--- a/net/core/iovec.c
101444+++ b/net/core/iovec.c
101445@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
101446 if (m->msg_name && m->msg_namelen) {
101447 if (mode == VERIFY_READ) {
101448 void __user *namep;
101449- namep = (void __user __force *) m->msg_name;
101450+ namep = (void __force_user *) m->msg_name;
101451 err = move_addr_to_kernel(namep, m->msg_namelen,
101452 address);
101453 if (err < 0)
101454@@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
101455 }
101456
101457 size = m->msg_iovlen * sizeof(struct iovec);
101458- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
101459+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
101460 return -EFAULT;
101461
101462 m->msg_iov = iov;
101463diff --git a/net/core/neighbour.c b/net/core/neighbour.c
101464index ef31fef..8be66d9 100644
101465--- a/net/core/neighbour.c
101466+++ b/net/core/neighbour.c
101467@@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
101468 void __user *buffer, size_t *lenp, loff_t *ppos)
101469 {
101470 int size, ret;
101471- struct ctl_table tmp = *ctl;
101472+ ctl_table_no_const tmp = *ctl;
101473
101474 tmp.extra1 = &zero;
101475 tmp.extra2 = &unres_qlen_max;
101476@@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
101477 void __user *buffer,
101478 size_t *lenp, loff_t *ppos)
101479 {
101480- struct ctl_table tmp = *ctl;
101481+ ctl_table_no_const tmp = *ctl;
101482 int ret;
101483
101484 tmp.extra1 = &zero;
101485diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
101486index 2bf8329..2eb1423 100644
101487--- a/net/core/net-procfs.c
101488+++ b/net/core/net-procfs.c
101489@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
101490 struct rtnl_link_stats64 temp;
101491 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
101492
101493- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101494+ if (gr_proc_is_restricted())
101495+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101496+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101497+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
101498+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
101499+ else
101500+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101501 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101502 dev->name, stats->rx_bytes, stats->rx_packets,
101503 stats->rx_errors,
101504@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
101505 return 0;
101506 }
101507
101508-static const struct seq_operations dev_seq_ops = {
101509+const struct seq_operations dev_seq_ops = {
101510 .start = dev_seq_start,
101511 .next = dev_seq_next,
101512 .stop = dev_seq_stop,
101513@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
101514
101515 static int softnet_seq_open(struct inode *inode, struct file *file)
101516 {
101517- return seq_open(file, &softnet_seq_ops);
101518+ return seq_open_restrict(file, &softnet_seq_ops);
101519 }
101520
101521 static const struct file_operations softnet_seq_fops = {
101522@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
101523 else
101524 seq_printf(seq, "%04x", ntohs(pt->type));
101525
101526+#ifdef CONFIG_GRKERNSEC_HIDESYM
101527+ seq_printf(seq, " %-8s %pf\n",
101528+ pt->dev ? pt->dev->name : "", NULL);
101529+#else
101530 seq_printf(seq, " %-8s %pf\n",
101531 pt->dev ? pt->dev->name : "", pt->func);
101532+#endif
101533 }
101534
101535 return 0;
101536diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
101537index 9dd0669..c52fb1b 100644
101538--- a/net/core/net-sysfs.c
101539+++ b/net/core/net-sysfs.c
101540@@ -278,7 +278,7 @@ static ssize_t carrier_changes_show(struct device *dev,
101541 {
101542 struct net_device *netdev = to_net_dev(dev);
101543 return sprintf(buf, fmt_dec,
101544- atomic_read(&netdev->carrier_changes));
101545+ atomic_read_unchecked(&netdev->carrier_changes));
101546 }
101547 static DEVICE_ATTR_RO(carrier_changes);
101548
101549diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
101550index 7f15517..f7d65c0 100644
101551--- a/net/core/net_namespace.c
101552+++ b/net/core/net_namespace.c
101553@@ -445,7 +445,7 @@ static int __register_pernet_operations(struct list_head *list,
101554 int error;
101555 LIST_HEAD(net_exit_list);
101556
101557- list_add_tail(&ops->list, list);
101558+ pax_list_add_tail((struct list_head *)&ops->list, list);
101559 if (ops->init || (ops->id && ops->size)) {
101560 for_each_net(net) {
101561 error = ops_init(ops, net);
101562@@ -458,7 +458,7 @@ static int __register_pernet_operations(struct list_head *list,
101563
101564 out_undo:
101565 /* If I have an error cleanup all namespaces I initialized */
101566- list_del(&ops->list);
101567+ pax_list_del((struct list_head *)&ops->list);
101568 ops_exit_list(ops, &net_exit_list);
101569 ops_free_list(ops, &net_exit_list);
101570 return error;
101571@@ -469,7 +469,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
101572 struct net *net;
101573 LIST_HEAD(net_exit_list);
101574
101575- list_del(&ops->list);
101576+ pax_list_del((struct list_head *)&ops->list);
101577 for_each_net(net)
101578 list_add_tail(&net->exit_list, &net_exit_list);
101579 ops_exit_list(ops, &net_exit_list);
101580@@ -603,7 +603,7 @@ int register_pernet_device(struct pernet_operations *ops)
101581 mutex_lock(&net_mutex);
101582 error = register_pernet_operations(&pernet_list, ops);
101583 if (!error && (first_device == &pernet_list))
101584- first_device = &ops->list;
101585+ first_device = (struct list_head *)&ops->list;
101586 mutex_unlock(&net_mutex);
101587 return error;
101588 }
101589diff --git a/net/core/netpoll.c b/net/core/netpoll.c
101590index e6645b4..43e1af9 100644
101591--- a/net/core/netpoll.c
101592+++ b/net/core/netpoll.c
101593@@ -379,7 +379,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101594 struct udphdr *udph;
101595 struct iphdr *iph;
101596 struct ethhdr *eth;
101597- static atomic_t ip_ident;
101598+ static atomic_unchecked_t ip_ident;
101599 struct ipv6hdr *ip6h;
101600
101601 udp_len = len + sizeof(*udph);
101602@@ -450,7 +450,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101603 put_unaligned(0x45, (unsigned char *)iph);
101604 iph->tos = 0;
101605 put_unaligned(htons(ip_len), &(iph->tot_len));
101606- iph->id = htons(atomic_inc_return(&ip_ident));
101607+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
101608 iph->frag_off = 0;
101609 iph->ttl = 64;
101610 iph->protocol = IPPROTO_UDP;
101611diff --git a/net/core/pktgen.c b/net/core/pktgen.c
101612index 443256b..bbff424 100644
101613--- a/net/core/pktgen.c
101614+++ b/net/core/pktgen.c
101615@@ -3753,7 +3753,7 @@ static int __net_init pg_net_init(struct net *net)
101616 pn->net = net;
101617 INIT_LIST_HEAD(&pn->pktgen_threads);
101618 pn->pktgen_exiting = false;
101619- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
101620+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
101621 if (!pn->proc_dir) {
101622 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
101623 return -ENODEV;
101624diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
101625index 76321ea..3129bd6 100644
101626--- a/net/core/rtnetlink.c
101627+++ b/net/core/rtnetlink.c
101628@@ -58,7 +58,7 @@ struct rtnl_link {
101629 rtnl_doit_func doit;
101630 rtnl_dumpit_func dumpit;
101631 rtnl_calcit_func calcit;
101632-};
101633+} __no_const;
101634
101635 static DEFINE_MUTEX(rtnl_mutex);
101636
101637@@ -304,10 +304,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
101638 * to use the ops for creating device. So do not
101639 * fill up dellink as well. That disables rtnl_dellink.
101640 */
101641- if (ops->setup && !ops->dellink)
101642- ops->dellink = unregister_netdevice_queue;
101643+ if (ops->setup && !ops->dellink) {
101644+ pax_open_kernel();
101645+ *(void **)&ops->dellink = unregister_netdevice_queue;
101646+ pax_close_kernel();
101647+ }
101648
101649- list_add_tail(&ops->list, &link_ops);
101650+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
101651 return 0;
101652 }
101653 EXPORT_SYMBOL_GPL(__rtnl_link_register);
101654@@ -354,7 +357,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
101655 for_each_net(net) {
101656 __rtnl_kill_links(net, ops);
101657 }
101658- list_del(&ops->list);
101659+ pax_list_del((struct list_head *)&ops->list);
101660 }
101661 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
101662
101663@@ -1014,7 +1017,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
101664 (dev->ifalias &&
101665 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
101666 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
101667- atomic_read(&dev->carrier_changes)))
101668+ atomic_read_unchecked(&dev->carrier_changes)))
101669 goto nla_put_failure;
101670
101671 if (1) {
101672diff --git a/net/core/scm.c b/net/core/scm.c
101673index b442e7e..6f5b5a2 100644
101674--- a/net/core/scm.c
101675+++ b/net/core/scm.c
101676@@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
101677 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101678 {
101679 struct cmsghdr __user *cm
101680- = (__force struct cmsghdr __user *)msg->msg_control;
101681+ = (struct cmsghdr __force_user *)msg->msg_control;
101682 struct cmsghdr cmhdr;
101683 int cmlen = CMSG_LEN(len);
101684 int err;
101685@@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101686 err = -EFAULT;
101687 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
101688 goto out;
101689- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
101690+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
101691 goto out;
101692 cmlen = CMSG_SPACE(len);
101693 if (msg->msg_controllen < cmlen)
101694@@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
101695 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101696 {
101697 struct cmsghdr __user *cm
101698- = (__force struct cmsghdr __user*)msg->msg_control;
101699+ = (struct cmsghdr __force_user *)msg->msg_control;
101700
101701 int fdmax = 0;
101702 int fdnum = scm->fp->count;
101703@@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101704 if (fdnum < fdmax)
101705 fdmax = fdnum;
101706
101707- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
101708+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
101709 i++, cmfptr++)
101710 {
101711 struct socket *sock;
101712diff --git a/net/core/skbuff.c b/net/core/skbuff.c
101713index d7543d0..ff96aec 100644
101714--- a/net/core/skbuff.c
101715+++ b/net/core/skbuff.c
101716@@ -2025,7 +2025,7 @@ EXPORT_SYMBOL(__skb_checksum);
101717 __wsum skb_checksum(const struct sk_buff *skb, int offset,
101718 int len, __wsum csum)
101719 {
101720- const struct skb_checksum_ops ops = {
101721+ static const struct skb_checksum_ops ops = {
101722 .update = csum_partial_ext,
101723 .combine = csum_block_add_ext,
101724 };
101725@@ -3255,12 +3255,14 @@ void __init skb_init(void)
101726 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
101727 sizeof(struct sk_buff),
101728 0,
101729- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101730+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101731+ SLAB_NO_SANITIZE,
101732 NULL);
101733 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
101734 sizeof(struct sk_buff_fclones),
101735 0,
101736- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101737+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101738+ SLAB_NO_SANITIZE,
101739 NULL);
101740 }
101741
101742diff --git a/net/core/sock.c b/net/core/sock.c
101743index 15e0c67..0310f4a 100644
101744--- a/net/core/sock.c
101745+++ b/net/core/sock.c
101746@@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101747 struct sk_buff_head *list = &sk->sk_receive_queue;
101748
101749 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
101750- atomic_inc(&sk->sk_drops);
101751+ atomic_inc_unchecked(&sk->sk_drops);
101752 trace_sock_rcvqueue_full(sk, skb);
101753 return -ENOMEM;
101754 }
101755@@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101756 return err;
101757
101758 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
101759- atomic_inc(&sk->sk_drops);
101760+ atomic_inc_unchecked(&sk->sk_drops);
101761 return -ENOBUFS;
101762 }
101763
101764@@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101765 skb_dst_force(skb);
101766
101767 spin_lock_irqsave(&list->lock, flags);
101768- skb->dropcount = atomic_read(&sk->sk_drops);
101769+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
101770 __skb_queue_tail(list, skb);
101771 spin_unlock_irqrestore(&list->lock, flags);
101772
101773@@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101774 skb->dev = NULL;
101775
101776 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
101777- atomic_inc(&sk->sk_drops);
101778+ atomic_inc_unchecked(&sk->sk_drops);
101779 goto discard_and_relse;
101780 }
101781 if (nested)
101782@@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101783 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
101784 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
101785 bh_unlock_sock(sk);
101786- atomic_inc(&sk->sk_drops);
101787+ atomic_inc_unchecked(&sk->sk_drops);
101788 goto discard_and_relse;
101789 }
101790
101791@@ -991,12 +991,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101792 struct timeval tm;
101793 } v;
101794
101795- int lv = sizeof(int);
101796- int len;
101797+ unsigned int lv = sizeof(int);
101798+ unsigned int len;
101799
101800 if (get_user(len, optlen))
101801 return -EFAULT;
101802- if (len < 0)
101803+ if (len > INT_MAX)
101804 return -EINVAL;
101805
101806 memset(&v, 0, sizeof(v));
101807@@ -1134,11 +1134,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101808
101809 case SO_PEERNAME:
101810 {
101811- char address[128];
101812+ char address[_K_SS_MAXSIZE];
101813
101814 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
101815 return -ENOTCONN;
101816- if (lv < len)
101817+ if (lv < len || sizeof address < len)
101818 return -EINVAL;
101819 if (copy_to_user(optval, address, len))
101820 return -EFAULT;
101821@@ -1219,7 +1219,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101822
101823 if (len > lv)
101824 len = lv;
101825- if (copy_to_user(optval, &v, len))
101826+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
101827 return -EFAULT;
101828 lenout:
101829 if (put_user(len, optlen))
101830@@ -2315,7 +2315,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
101831 */
101832 smp_wmb();
101833 atomic_set(&sk->sk_refcnt, 1);
101834- atomic_set(&sk->sk_drops, 0);
101835+ atomic_set_unchecked(&sk->sk_drops, 0);
101836 }
101837 EXPORT_SYMBOL(sock_init_data);
101838
101839@@ -2443,6 +2443,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
101840 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101841 int level, int type)
101842 {
101843+ struct sock_extended_err ee;
101844 struct sock_exterr_skb *serr;
101845 struct sk_buff *skb;
101846 int copied, err;
101847@@ -2464,7 +2465,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101848 sock_recv_timestamp(msg, sk, skb);
101849
101850 serr = SKB_EXT_ERR(skb);
101851- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
101852+ ee = serr->ee;
101853+ put_cmsg(msg, level, type, sizeof ee, &ee);
101854
101855 msg->msg_flags |= MSG_ERRQUEUE;
101856 err = copied;
101857diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
101858index ad704c7..ca48aff 100644
101859--- a/net/core/sock_diag.c
101860+++ b/net/core/sock_diag.c
101861@@ -9,26 +9,33 @@
101862 #include <linux/inet_diag.h>
101863 #include <linux/sock_diag.h>
101864
101865-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
101866+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
101867 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
101868 static DEFINE_MUTEX(sock_diag_table_mutex);
101869
101870 int sock_diag_check_cookie(void *sk, __u32 *cookie)
101871 {
101872+#ifndef CONFIG_GRKERNSEC_HIDESYM
101873 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
101874 cookie[1] != INET_DIAG_NOCOOKIE) &&
101875 ((u32)(unsigned long)sk != cookie[0] ||
101876 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
101877 return -ESTALE;
101878 else
101879+#endif
101880 return 0;
101881 }
101882 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
101883
101884 void sock_diag_save_cookie(void *sk, __u32 *cookie)
101885 {
101886+#ifdef CONFIG_GRKERNSEC_HIDESYM
101887+ cookie[0] = 0;
101888+ cookie[1] = 0;
101889+#else
101890 cookie[0] = (u32)(unsigned long)sk;
101891 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
101892+#endif
101893 }
101894 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
101895
101896@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
101897 mutex_lock(&sock_diag_table_mutex);
101898 if (sock_diag_handlers[hndl->family])
101899 err = -EBUSY;
101900- else
101901+ else {
101902+ pax_open_kernel();
101903 sock_diag_handlers[hndl->family] = hndl;
101904+ pax_close_kernel();
101905+ }
101906 mutex_unlock(&sock_diag_table_mutex);
101907
101908 return err;
101909@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
101910
101911 mutex_lock(&sock_diag_table_mutex);
101912 BUG_ON(sock_diag_handlers[family] != hnld);
101913+ pax_open_kernel();
101914 sock_diag_handlers[family] = NULL;
101915+ pax_close_kernel();
101916 mutex_unlock(&sock_diag_table_mutex);
101917 }
101918 EXPORT_SYMBOL_GPL(sock_diag_unregister);
101919diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
101920index cf9cd13..50683950 100644
101921--- a/net/core/sysctl_net_core.c
101922+++ b/net/core/sysctl_net_core.c
101923@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
101924 {
101925 unsigned int orig_size, size;
101926 int ret, i;
101927- struct ctl_table tmp = {
101928+ ctl_table_no_const tmp = {
101929 .data = &size,
101930 .maxlen = sizeof(size),
101931 .mode = table->mode
101932@@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
101933 void __user *buffer, size_t *lenp, loff_t *ppos)
101934 {
101935 char id[IFNAMSIZ];
101936- struct ctl_table tbl = {
101937+ ctl_table_no_const tbl = {
101938 .data = id,
101939 .maxlen = IFNAMSIZ,
101940 };
101941@@ -263,7 +263,7 @@ static struct ctl_table net_core_table[] = {
101942 .mode = 0644,
101943 .proc_handler = proc_dointvec
101944 },
101945-#ifdef CONFIG_BPF_JIT
101946+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
101947 {
101948 .procname = "bpf_jit_enable",
101949 .data = &bpf_jit_enable,
101950@@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
101951
101952 static __net_init int sysctl_core_net_init(struct net *net)
101953 {
101954- struct ctl_table *tbl;
101955+ ctl_table_no_const *tbl = NULL;
101956
101957 net->core.sysctl_somaxconn = SOMAXCONN;
101958
101959- tbl = netns_core_table;
101960 if (!net_eq(net, &init_net)) {
101961- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
101962+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
101963 if (tbl == NULL)
101964 goto err_dup;
101965
101966@@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
101967 if (net->user_ns != &init_user_ns) {
101968 tbl[0].procname = NULL;
101969 }
101970- }
101971-
101972- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101973+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101974+ } else
101975+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
101976 if (net->core.sysctl_hdr == NULL)
101977 goto err_reg;
101978
101979 return 0;
101980
101981 err_reg:
101982- if (tbl != netns_core_table)
101983- kfree(tbl);
101984+ kfree(tbl);
101985 err_dup:
101986 return -ENOMEM;
101987 }
101988@@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
101989 kfree(tbl);
101990 }
101991
101992-static __net_initdata struct pernet_operations sysctl_core_ops = {
101993+static __net_initconst struct pernet_operations sysctl_core_ops = {
101994 .init = sysctl_core_net_init,
101995 .exit = sysctl_core_net_exit,
101996 };
101997diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
101998index 25733d5..b9360f0 100644
101999--- a/net/decnet/af_decnet.c
102000+++ b/net/decnet/af_decnet.c
102001@@ -466,6 +466,7 @@ static struct proto dn_proto = {
102002 .sysctl_rmem = sysctl_decnet_rmem,
102003 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
102004 .obj_size = sizeof(struct dn_sock),
102005+ .slab_flags = SLAB_USERCOPY,
102006 };
102007
102008 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
102009diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
102010index 4400da7..3429972 100644
102011--- a/net/decnet/dn_dev.c
102012+++ b/net/decnet/dn_dev.c
102013@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
102014 .extra1 = &min_t3,
102015 .extra2 = &max_t3
102016 },
102017- {0}
102018+ { }
102019 },
102020 };
102021
102022diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
102023index 5325b54..a0d4d69 100644
102024--- a/net/decnet/sysctl_net_decnet.c
102025+++ b/net/decnet/sysctl_net_decnet.c
102026@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
102027
102028 if (len > *lenp) len = *lenp;
102029
102030- if (copy_to_user(buffer, addr, len))
102031+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
102032 return -EFAULT;
102033
102034 *lenp = len;
102035@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
102036
102037 if (len > *lenp) len = *lenp;
102038
102039- if (copy_to_user(buffer, devname, len))
102040+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
102041 return -EFAULT;
102042
102043 *lenp = len;
102044diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
102045index a2c7e4c..3dc9f67 100644
102046--- a/net/hsr/hsr_netlink.c
102047+++ b/net/hsr/hsr_netlink.c
102048@@ -102,7 +102,7 @@ nla_put_failure:
102049 return -EMSGSIZE;
102050 }
102051
102052-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
102053+static struct rtnl_link_ops hsr_link_ops = {
102054 .kind = "hsr",
102055 .maxtype = IFLA_HSR_MAX,
102056 .policy = hsr_policy,
102057diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
102058index 4413629..dea596a 100644
102059--- a/net/ieee802154/6lowpan_rtnl.c
102060+++ b/net/ieee802154/6lowpan_rtnl.c
102061@@ -635,7 +635,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
102062 dev_put(real_dev);
102063 }
102064
102065-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
102066+static struct rtnl_link_ops lowpan_link_ops = {
102067 .kind = "lowpan",
102068 .priv_size = sizeof(struct lowpan_dev_info),
102069 .setup = lowpan_setup,
102070diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
102071index 7cfcd68..84ca5b7 100644
102072--- a/net/ieee802154/reassembly.c
102073+++ b/net/ieee802154/reassembly.c
102074@@ -433,14 +433,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
102075
102076 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102077 {
102078- struct ctl_table *table;
102079+ ctl_table_no_const *table = NULL;
102080 struct ctl_table_header *hdr;
102081 struct netns_ieee802154_lowpan *ieee802154_lowpan =
102082 net_ieee802154_lowpan(net);
102083
102084- table = lowpan_frags_ns_ctl_table;
102085 if (!net_eq(net, &init_net)) {
102086- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
102087+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
102088 GFP_KERNEL);
102089 if (table == NULL)
102090 goto err_alloc;
102091@@ -455,9 +454,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102092 /* Don't export sysctls to unprivileged users */
102093 if (net->user_ns != &init_user_ns)
102094 table[0].procname = NULL;
102095- }
102096-
102097- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
102098+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
102099+ } else
102100+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
102101 if (hdr == NULL)
102102 goto err_reg;
102103
102104@@ -465,8 +464,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
102105 return 0;
102106
102107 err_reg:
102108- if (!net_eq(net, &init_net))
102109- kfree(table);
102110+ kfree(table);
102111 err_alloc:
102112 return -ENOMEM;
102113 }
102114diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
102115index e67da4e..da217942 100644
102116--- a/net/ipv4/af_inet.c
102117+++ b/net/ipv4/af_inet.c
102118@@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
102119 return ip_recv_error(sk, msg, len, addr_len);
102120 #if IS_ENABLED(CONFIG_IPV6)
102121 if (sk->sk_family == AF_INET6)
102122- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
102123+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
102124 #endif
102125 return -EINVAL;
102126 }
102127diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
102128index 214882e..ec032f6 100644
102129--- a/net/ipv4/devinet.c
102130+++ b/net/ipv4/devinet.c
102131@@ -69,7 +69,8 @@
102132
102133 static struct ipv4_devconf ipv4_devconf = {
102134 .data = {
102135- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
102136+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
102137+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
102138 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
102139 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
102140 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
102141@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
102142
102143 static struct ipv4_devconf ipv4_devconf_dflt = {
102144 .data = {
102145- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
102146+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
102147+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
102148 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
102149 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
102150 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
102151@@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
102152 idx = 0;
102153 head = &net->dev_index_head[h];
102154 rcu_read_lock();
102155- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
102156+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
102157 net->dev_base_seq;
102158 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102159 if (idx < s_idx)
102160@@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
102161 idx = 0;
102162 head = &net->dev_index_head[h];
102163 rcu_read_lock();
102164- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
102165+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
102166 net->dev_base_seq;
102167 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102168 if (idx < s_idx)
102169@@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
102170 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
102171 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
102172
102173-static struct devinet_sysctl_table {
102174+static const struct devinet_sysctl_table {
102175 struct ctl_table_header *sysctl_header;
102176 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
102177 } devinet_sysctl = {
102178@@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
102179 int err;
102180 struct ipv4_devconf *all, *dflt;
102181 #ifdef CONFIG_SYSCTL
102182- struct ctl_table *tbl = ctl_forward_entry;
102183+ ctl_table_no_const *tbl = NULL;
102184 struct ctl_table_header *forw_hdr;
102185 #endif
102186
102187@@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
102188 goto err_alloc_dflt;
102189
102190 #ifdef CONFIG_SYSCTL
102191- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
102192+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
102193 if (tbl == NULL)
102194 goto err_alloc_ctl;
102195
102196@@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
102197 goto err_reg_dflt;
102198
102199 err = -ENOMEM;
102200- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
102201+ if (!net_eq(net, &init_net))
102202+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
102203+ else
102204+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
102205 if (forw_hdr == NULL)
102206 goto err_reg_ctl;
102207 net->ipv4.forw_hdr = forw_hdr;
102208@@ -2287,8 +2292,7 @@ err_reg_ctl:
102209 err_reg_dflt:
102210 __devinet_sysctl_unregister(all);
102211 err_reg_all:
102212- if (tbl != ctl_forward_entry)
102213- kfree(tbl);
102214+ kfree(tbl);
102215 err_alloc_ctl:
102216 #endif
102217 if (dflt != &ipv4_devconf_dflt)
102218diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
102219index 23104a3..9f5570b 100644
102220--- a/net/ipv4/fib_frontend.c
102221+++ b/net/ipv4/fib_frontend.c
102222@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
102223 #ifdef CONFIG_IP_ROUTE_MULTIPATH
102224 fib_sync_up(dev);
102225 #endif
102226- atomic_inc(&net->ipv4.dev_addr_genid);
102227+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
102228 rt_cache_flush(dev_net(dev));
102229 break;
102230 case NETDEV_DOWN:
102231 fib_del_ifaddr(ifa, NULL);
102232- atomic_inc(&net->ipv4.dev_addr_genid);
102233+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
102234 if (ifa->ifa_dev->ifa_list == NULL) {
102235 /* Last address was deleted from this interface.
102236 * Disable IP.
102237@@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
102238 #ifdef CONFIG_IP_ROUTE_MULTIPATH
102239 fib_sync_up(dev);
102240 #endif
102241- atomic_inc(&net->ipv4.dev_addr_genid);
102242+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
102243 rt_cache_flush(net);
102244 break;
102245 case NETDEV_DOWN:
102246diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
102247index f99f41b..1879da9 100644
102248--- a/net/ipv4/fib_semantics.c
102249+++ b/net/ipv4/fib_semantics.c
102250@@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
102251 nh->nh_saddr = inet_select_addr(nh->nh_dev,
102252 nh->nh_gw,
102253 nh->nh_parent->fib_scope);
102254- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
102255+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
102256
102257 return nh->nh_saddr;
102258 }
102259diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
102260index 9111a4e..3576905 100644
102261--- a/net/ipv4/inet_hashtables.c
102262+++ b/net/ipv4/inet_hashtables.c
102263@@ -18,6 +18,7 @@
102264 #include <linux/sched.h>
102265 #include <linux/slab.h>
102266 #include <linux/wait.h>
102267+#include <linux/security.h>
102268
102269 #include <net/inet_connection_sock.h>
102270 #include <net/inet_hashtables.h>
102271@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
102272 return inet_ehashfn(net, laddr, lport, faddr, fport);
102273 }
102274
102275+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
102276+
102277 /*
102278 * Allocate and initialize a new local port bind bucket.
102279 * The bindhash mutex for snum's hash chain must be held here.
102280@@ -554,6 +557,8 @@ ok:
102281 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
102282 spin_unlock(&head->lock);
102283
102284+ gr_update_task_in_ip_table(inet_sk(sk));
102285+
102286 if (tw) {
102287 inet_twsk_deschedule(tw, death_row);
102288 while (twrefcnt) {
102289diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
102290index 241afd7..31b95d5 100644
102291--- a/net/ipv4/inetpeer.c
102292+++ b/net/ipv4/inetpeer.c
102293@@ -461,7 +461,7 @@ relookup:
102294 if (p) {
102295 p->daddr = *daddr;
102296 atomic_set(&p->refcnt, 1);
102297- atomic_set(&p->rid, 0);
102298+ atomic_set_unchecked(&p->rid, 0);
102299 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
102300 p->rate_tokens = 0;
102301 /* 60*HZ is arbitrary, but chosen enough high so that the first
102302diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
102303index 3a83ce5..787b3c2 100644
102304--- a/net/ipv4/ip_forward.c
102305+++ b/net/ipv4/ip_forward.c
102306@@ -129,7 +129,8 @@ int ip_forward(struct sk_buff *skb)
102307 * We now generate an ICMP HOST REDIRECT giving the route
102308 * we calculated.
102309 */
102310- if (rt->rt_flags&RTCF_DOREDIRECT && !opt->srr && !skb_sec_path(skb))
102311+ if (IPCB(skb)->flags & IPSKB_DOREDIRECT && !opt->srr &&
102312+ !skb_sec_path(skb))
102313 ip_rt_send_redirect(skb);
102314
102315 skb->priority = rt_tos2priority(iph->tos);
102316diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
102317index 2811cc1..ad5a534 100644
102318--- a/net/ipv4/ip_fragment.c
102319+++ b/net/ipv4/ip_fragment.c
102320@@ -268,7 +268,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
102321 return 0;
102322
102323 start = qp->rid;
102324- end = atomic_inc_return(&peer->rid);
102325+ end = atomic_inc_return_unchecked(&peer->rid);
102326 qp->rid = end;
102327
102328 rc = qp->q.fragments && (end - start) > max;
102329@@ -746,12 +746,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
102330
102331 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
102332 {
102333- struct ctl_table *table;
102334+ ctl_table_no_const *table = NULL;
102335 struct ctl_table_header *hdr;
102336
102337- table = ip4_frags_ns_ctl_table;
102338 if (!net_eq(net, &init_net)) {
102339- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
102340+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
102341 if (table == NULL)
102342 goto err_alloc;
102343
102344@@ -765,9 +764,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
102345 /* Don't export sysctls to unprivileged users */
102346 if (net->user_ns != &init_user_ns)
102347 table[0].procname = NULL;
102348- }
102349+ hdr = register_net_sysctl(net, "net/ipv4", table);
102350+ } else
102351+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
102352
102353- hdr = register_net_sysctl(net, "net/ipv4", table);
102354 if (hdr == NULL)
102355 goto err_reg;
102356
102357@@ -775,8 +775,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
102358 return 0;
102359
102360 err_reg:
102361- if (!net_eq(net, &init_net))
102362- kfree(table);
102363+ kfree(table);
102364 err_alloc:
102365 return -ENOMEM;
102366 }
102367diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
102368index 69aaf0a..8298c029 100644
102369--- a/net/ipv4/ip_gre.c
102370+++ b/net/ipv4/ip_gre.c
102371@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
102372 module_param(log_ecn_error, bool, 0644);
102373 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
102374
102375-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
102376+static struct rtnl_link_ops ipgre_link_ops;
102377 static int ipgre_tunnel_init(struct net_device *dev);
102378
102379 static int ipgre_net_id __read_mostly;
102380@@ -816,7 +816,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
102381 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
102382 };
102383
102384-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
102385+static struct rtnl_link_ops ipgre_link_ops = {
102386 .kind = "gre",
102387 .maxtype = IFLA_GRE_MAX,
102388 .policy = ipgre_policy,
102389@@ -830,7 +830,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
102390 .fill_info = ipgre_fill_info,
102391 };
102392
102393-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
102394+static struct rtnl_link_ops ipgre_tap_ops = {
102395 .kind = "gretap",
102396 .maxtype = IFLA_GRE_MAX,
102397 .policy = ipgre_policy,
102398diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
102399index 3d4da2c..40f9c29 100644
102400--- a/net/ipv4/ip_input.c
102401+++ b/net/ipv4/ip_input.c
102402@@ -147,6 +147,10 @@
102403 #include <linux/mroute.h>
102404 #include <linux/netlink.h>
102405
102406+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102407+extern int grsec_enable_blackhole;
102408+#endif
102409+
102410 /*
102411 * Process Router Attention IP option (RFC 2113)
102412 */
102413@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
102414 if (!raw) {
102415 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
102416 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
102417+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102418+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102419+#endif
102420 icmp_send(skb, ICMP_DEST_UNREACH,
102421 ICMP_PROT_UNREACH, 0);
102422 }
102423diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
102424index bc6471d..c5e8a0c 100644
102425--- a/net/ipv4/ip_output.c
102426+++ b/net/ipv4/ip_output.c
102427@@ -1517,6 +1517,7 @@ static DEFINE_PER_CPU(struct inet_sock, unicast_sock) = {
102428 .sk_wmem_alloc = ATOMIC_INIT(1),
102429 .sk_allocation = GFP_ATOMIC,
102430 .sk_flags = (1UL << SOCK_USE_WRITE_QUEUE),
102431+ .sk_pacing_rate = ~0U,
102432 },
102433 .pmtudisc = IP_PMTUDISC_WANT,
102434 .uc_ttl = -1,
102435diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
102436index 9daf217..373d454 100644
102437--- a/net/ipv4/ip_sockglue.c
102438+++ b/net/ipv4/ip_sockglue.c
102439@@ -443,15 +443,12 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
102440
102441 memcpy(&errhdr.ee, &serr->ee, sizeof(struct sock_extended_err));
102442 sin = &errhdr.offender;
102443- sin->sin_family = AF_UNSPEC;
102444+ memset(sin, 0, sizeof(*sin));
102445+
102446 if (serr->ee.ee_origin == SO_EE_ORIGIN_ICMP) {
102447- struct inet_sock *inet = inet_sk(sk);
102448-
102449 sin->sin_family = AF_INET;
102450 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
102451- sin->sin_port = 0;
102452- memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
102453- if (inet->cmsg_flags)
102454+ if (inet_sk(sk)->cmsg_flags)
102455 ip_cmsg_recv(msg, skb);
102456 }
102457
102458@@ -1177,7 +1174,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
102459 len = min_t(unsigned int, len, opt->optlen);
102460 if (put_user(len, optlen))
102461 return -EFAULT;
102462- if (copy_to_user(optval, opt->__data, len))
102463+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
102464+ copy_to_user(optval, opt->__data, len))
102465 return -EFAULT;
102466 return 0;
102467 }
102468@@ -1308,7 +1306,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
102469 if (sk->sk_type != SOCK_STREAM)
102470 return -ENOPROTOOPT;
102471
102472- msg.msg_control = (__force void *) optval;
102473+ msg.msg_control = (__force_kernel void *) optval;
102474 msg.msg_controllen = len;
102475 msg.msg_flags = flags;
102476
102477diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
102478index 1a7e979..fd05aa4 100644
102479--- a/net/ipv4/ip_vti.c
102480+++ b/net/ipv4/ip_vti.c
102481@@ -45,7 +45,7 @@
102482 #include <net/net_namespace.h>
102483 #include <net/netns/generic.h>
102484
102485-static struct rtnl_link_ops vti_link_ops __read_mostly;
102486+static struct rtnl_link_ops vti_link_ops;
102487
102488 static int vti_net_id __read_mostly;
102489 static int vti_tunnel_init(struct net_device *dev);
102490@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
102491 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
102492 };
102493
102494-static struct rtnl_link_ops vti_link_ops __read_mostly = {
102495+static struct rtnl_link_ops vti_link_ops = {
102496 .kind = "vti",
102497 .maxtype = IFLA_VTI_MAX,
102498 .policy = vti_policy,
102499diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
102500index 648fa14..97864d0 100644
102501--- a/net/ipv4/ipconfig.c
102502+++ b/net/ipv4/ipconfig.c
102503@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
102504
102505 mm_segment_t oldfs = get_fs();
102506 set_fs(get_ds());
102507- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102508+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102509 set_fs(oldfs);
102510 return res;
102511 }
102512@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
102513
102514 mm_segment_t oldfs = get_fs();
102515 set_fs(get_ds());
102516- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102517+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102518 set_fs(oldfs);
102519 return res;
102520 }
102521@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
102522
102523 mm_segment_t oldfs = get_fs();
102524 set_fs(get_ds());
102525- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
102526+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
102527 set_fs(oldfs);
102528 return res;
102529 }
102530diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
102531index 37096d6..86abb03 100644
102532--- a/net/ipv4/ipip.c
102533+++ b/net/ipv4/ipip.c
102534@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
102535 static int ipip_net_id __read_mostly;
102536
102537 static int ipip_tunnel_init(struct net_device *dev);
102538-static struct rtnl_link_ops ipip_link_ops __read_mostly;
102539+static struct rtnl_link_ops ipip_link_ops;
102540
102541 static int ipip_err(struct sk_buff *skb, u32 info)
102542 {
102543@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
102544 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
102545 };
102546
102547-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
102548+static struct rtnl_link_ops ipip_link_ops = {
102549 .kind = "ipip",
102550 .maxtype = IFLA_IPTUN_MAX,
102551 .policy = ipip_policy,
102552diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
102553index f95b6f9..2ee2097 100644
102554--- a/net/ipv4/netfilter/arp_tables.c
102555+++ b/net/ipv4/netfilter/arp_tables.c
102556@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
102557 #endif
102558
102559 static int get_info(struct net *net, void __user *user,
102560- const int *len, int compat)
102561+ int len, int compat)
102562 {
102563 char name[XT_TABLE_MAXNAMELEN];
102564 struct xt_table *t;
102565 int ret;
102566
102567- if (*len != sizeof(struct arpt_getinfo)) {
102568- duprintf("length %u != %Zu\n", *len,
102569+ if (len != sizeof(struct arpt_getinfo)) {
102570+ duprintf("length %u != %Zu\n", len,
102571 sizeof(struct arpt_getinfo));
102572 return -EINVAL;
102573 }
102574@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
102575 info.size = private->size;
102576 strcpy(info.name, name);
102577
102578- if (copy_to_user(user, &info, *len) != 0)
102579+ if (copy_to_user(user, &info, len) != 0)
102580 ret = -EFAULT;
102581 else
102582 ret = 0;
102583@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
102584
102585 switch (cmd) {
102586 case ARPT_SO_GET_INFO:
102587- ret = get_info(sock_net(sk), user, len, 1);
102588+ ret = get_info(sock_net(sk), user, *len, 1);
102589 break;
102590 case ARPT_SO_GET_ENTRIES:
102591 ret = compat_get_entries(sock_net(sk), user, len);
102592@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
102593
102594 switch (cmd) {
102595 case ARPT_SO_GET_INFO:
102596- ret = get_info(sock_net(sk), user, len, 0);
102597+ ret = get_info(sock_net(sk), user, *len, 0);
102598 break;
102599
102600 case ARPT_SO_GET_ENTRIES:
102601diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
102602index 99e810f..3711b81 100644
102603--- a/net/ipv4/netfilter/ip_tables.c
102604+++ b/net/ipv4/netfilter/ip_tables.c
102605@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
102606 #endif
102607
102608 static int get_info(struct net *net, void __user *user,
102609- const int *len, int compat)
102610+ int len, int compat)
102611 {
102612 char name[XT_TABLE_MAXNAMELEN];
102613 struct xt_table *t;
102614 int ret;
102615
102616- if (*len != sizeof(struct ipt_getinfo)) {
102617- duprintf("length %u != %zu\n", *len,
102618+ if (len != sizeof(struct ipt_getinfo)) {
102619+ duprintf("length %u != %zu\n", len,
102620 sizeof(struct ipt_getinfo));
102621 return -EINVAL;
102622 }
102623@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
102624 info.size = private->size;
102625 strcpy(info.name, name);
102626
102627- if (copy_to_user(user, &info, *len) != 0)
102628+ if (copy_to_user(user, &info, len) != 0)
102629 ret = -EFAULT;
102630 else
102631 ret = 0;
102632@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102633
102634 switch (cmd) {
102635 case IPT_SO_GET_INFO:
102636- ret = get_info(sock_net(sk), user, len, 1);
102637+ ret = get_info(sock_net(sk), user, *len, 1);
102638 break;
102639 case IPT_SO_GET_ENTRIES:
102640 ret = compat_get_entries(sock_net(sk), user, len);
102641@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102642
102643 switch (cmd) {
102644 case IPT_SO_GET_INFO:
102645- ret = get_info(sock_net(sk), user, len, 0);
102646+ ret = get_info(sock_net(sk), user, *len, 0);
102647 break;
102648
102649 case IPT_SO_GET_ENTRIES:
102650diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102651index e90f83a..3e6acca 100644
102652--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
102653+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102654@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
102655 spin_lock_init(&cn->lock);
102656
102657 #ifdef CONFIG_PROC_FS
102658- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
102659+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
102660 if (!cn->procdir) {
102661 pr_err("Unable to proc dir entry\n");
102662 return -ENOMEM;
102663diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
102664index 5d740cc..22c8e65 100644
102665--- a/net/ipv4/ping.c
102666+++ b/net/ipv4/ping.c
102667@@ -59,7 +59,7 @@ struct ping_table {
102668 };
102669
102670 static struct ping_table ping_table;
102671-struct pingv6_ops pingv6_ops;
102672+struct pingv6_ops *pingv6_ops;
102673 EXPORT_SYMBOL_GPL(pingv6_ops);
102674
102675 static u16 ping_port_rover;
102676@@ -350,7 +350,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
102677 return -ENODEV;
102678 }
102679 }
102680- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
102681+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
102682 scoped);
102683 rcu_read_unlock();
102684
102685@@ -558,7 +558,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102686 }
102687 #if IS_ENABLED(CONFIG_IPV6)
102688 } else if (skb->protocol == htons(ETH_P_IPV6)) {
102689- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
102690+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
102691 #endif
102692 }
102693
102694@@ -576,7 +576,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102695 info, (u8 *)icmph);
102696 #if IS_ENABLED(CONFIG_IPV6)
102697 } else if (family == AF_INET6) {
102698- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
102699+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
102700 info, (u8 *)icmph);
102701 #endif
102702 }
102703@@ -910,10 +910,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102704 }
102705
102706 if (inet6_sk(sk)->rxopt.all)
102707- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
102708+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
102709 if (skb->protocol == htons(ETH_P_IPV6) &&
102710 inet6_sk(sk)->rxopt.all)
102711- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
102712+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
102713 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
102714 ip_cmsg_recv(msg, skb);
102715 #endif
102716@@ -965,8 +965,11 @@ void ping_rcv(struct sk_buff *skb)
102717
102718 sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id));
102719 if (sk != NULL) {
102720+ struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
102721+
102722 pr_debug("rcv on socket %p\n", sk);
102723- ping_queue_rcv_skb(sk, skb_get(skb));
102724+ if (skb2)
102725+ ping_queue_rcv_skb(sk, skb2);
102726 sock_put(sk);
102727 return;
102728 }
102729@@ -1105,7 +1108,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
102730 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102731 0, sock_i_ino(sp),
102732 atomic_read(&sp->sk_refcnt), sp,
102733- atomic_read(&sp->sk_drops));
102734+ atomic_read_unchecked(&sp->sk_drops));
102735 }
102736
102737 static int ping_v4_seq_show(struct seq_file *seq, void *v)
102738diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
102739index 739db31..74f0210 100644
102740--- a/net/ipv4/raw.c
102741+++ b/net/ipv4/raw.c
102742@@ -314,7 +314,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
102743 int raw_rcv(struct sock *sk, struct sk_buff *skb)
102744 {
102745 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
102746- atomic_inc(&sk->sk_drops);
102747+ atomic_inc_unchecked(&sk->sk_drops);
102748 kfree_skb(skb);
102749 return NET_RX_DROP;
102750 }
102751@@ -755,16 +755,20 @@ static int raw_init(struct sock *sk)
102752
102753 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
102754 {
102755+ struct icmp_filter filter;
102756+
102757 if (optlen > sizeof(struct icmp_filter))
102758 optlen = sizeof(struct icmp_filter);
102759- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
102760+ if (copy_from_user(&filter, optval, optlen))
102761 return -EFAULT;
102762+ raw_sk(sk)->filter = filter;
102763 return 0;
102764 }
102765
102766 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
102767 {
102768 int len, ret = -EFAULT;
102769+ struct icmp_filter filter;
102770
102771 if (get_user(len, optlen))
102772 goto out;
102773@@ -774,8 +778,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
102774 if (len > sizeof(struct icmp_filter))
102775 len = sizeof(struct icmp_filter);
102776 ret = -EFAULT;
102777- if (put_user(len, optlen) ||
102778- copy_to_user(optval, &raw_sk(sk)->filter, len))
102779+ filter = raw_sk(sk)->filter;
102780+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
102781 goto out;
102782 ret = 0;
102783 out: return ret;
102784@@ -1004,7 +1008,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
102785 0, 0L, 0,
102786 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
102787 0, sock_i_ino(sp),
102788- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
102789+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
102790 }
102791
102792 static int raw_seq_show(struct seq_file *seq, void *v)
102793diff --git a/net/ipv4/route.c b/net/ipv4/route.c
102794index 6a2155b..47de388 100644
102795--- a/net/ipv4/route.c
102796+++ b/net/ipv4/route.c
102797@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
102798
102799 static int rt_cache_seq_open(struct inode *inode, struct file *file)
102800 {
102801- return seq_open(file, &rt_cache_seq_ops);
102802+ return seq_open_restrict(file, &rt_cache_seq_ops);
102803 }
102804
102805 static const struct file_operations rt_cache_seq_fops = {
102806@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
102807
102808 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
102809 {
102810- return seq_open(file, &rt_cpu_seq_ops);
102811+ return seq_open_restrict(file, &rt_cpu_seq_ops);
102812 }
102813
102814 static const struct file_operations rt_cpu_seq_fops = {
102815@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
102816
102817 static int rt_acct_proc_open(struct inode *inode, struct file *file)
102818 {
102819- return single_open(file, rt_acct_proc_show, NULL);
102820+ return single_open_restrict(file, rt_acct_proc_show, NULL);
102821 }
102822
102823 static const struct file_operations rt_acct_proc_fops = {
102824@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
102825
102826 #define IP_IDENTS_SZ 2048u
102827 struct ip_ident_bucket {
102828- atomic_t id;
102829+ atomic_unchecked_t id;
102830 u32 stamp32;
102831 };
102832
102833-static struct ip_ident_bucket *ip_idents __read_mostly;
102834+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
102835
102836 /* In order to protect privacy, we add a perturbation to identifiers
102837 * if one generator is seldom used. This makes hard for an attacker
102838@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
102839 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
102840 delta = prandom_u32_max(now - old);
102841
102842- return atomic_add_return(segs + delta, &bucket->id) - segs;
102843+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
102844 }
102845 EXPORT_SYMBOL(ip_idents_reserve);
102846
102847@@ -1554,11 +1554,10 @@ static int __mkroute_input(struct sk_buff *skb,
102848
102849 do_cache = res->fi && !itag;
102850 if (out_dev == in_dev && err && IN_DEV_TX_REDIRECTS(out_dev) &&
102851+ skb->protocol == htons(ETH_P_IP) &&
102852 (IN_DEV_SHARED_MEDIA(out_dev) ||
102853- inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res)))) {
102854- flags |= RTCF_DOREDIRECT;
102855- do_cache = false;
102856- }
102857+ inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
102858+ IPCB(skb)->flags |= IPSKB_DOREDIRECT;
102859
102860 if (skb->protocol != htons(ETH_P_IP)) {
102861 /* Not IP (i.e. ARP). Do not create route, if it is
102862@@ -2303,6 +2302,8 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,
102863 r->rtm_flags = (rt->rt_flags & ~0xFFFF) | RTM_F_CLONED;
102864 if (rt->rt_flags & RTCF_NOTIFY)
102865 r->rtm_flags |= RTM_F_NOTIFY;
102866+ if (IPCB(skb)->flags & IPSKB_DOREDIRECT)
102867+ r->rtm_flags |= RTCF_DOREDIRECT;
102868
102869 if (nla_put_be32(skb, RTA_DST, dst))
102870 goto nla_put_failure;
102871@@ -2624,34 +2625,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
102872 .maxlen = sizeof(int),
102873 .mode = 0200,
102874 .proc_handler = ipv4_sysctl_rtcache_flush,
102875+ .extra1 = &init_net,
102876 },
102877 { },
102878 };
102879
102880 static __net_init int sysctl_route_net_init(struct net *net)
102881 {
102882- struct ctl_table *tbl;
102883+ ctl_table_no_const *tbl = NULL;
102884
102885- tbl = ipv4_route_flush_table;
102886 if (!net_eq(net, &init_net)) {
102887- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102888+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102889 if (tbl == NULL)
102890 goto err_dup;
102891
102892 /* Don't export sysctls to unprivileged users */
102893 if (net->user_ns != &init_user_ns)
102894 tbl[0].procname = NULL;
102895- }
102896- tbl[0].extra1 = net;
102897+ tbl[0].extra1 = net;
102898+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102899+ } else
102900+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
102901
102902- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102903 if (net->ipv4.route_hdr == NULL)
102904 goto err_reg;
102905 return 0;
102906
102907 err_reg:
102908- if (tbl != ipv4_route_flush_table)
102909- kfree(tbl);
102910+ kfree(tbl);
102911 err_dup:
102912 return -ENOMEM;
102913 }
102914@@ -2674,8 +2675,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
102915
102916 static __net_init int rt_genid_init(struct net *net)
102917 {
102918- atomic_set(&net->ipv4.rt_genid, 0);
102919- atomic_set(&net->fnhe_genid, 0);
102920+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
102921+ atomic_set_unchecked(&net->fnhe_genid, 0);
102922 get_random_bytes(&net->ipv4.dev_addr_genid,
102923 sizeof(net->ipv4.dev_addr_genid));
102924 return 0;
102925@@ -2718,11 +2719,7 @@ int __init ip_rt_init(void)
102926 {
102927 int rc = 0;
102928
102929- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
102930- if (!ip_idents)
102931- panic("IP: failed to allocate ip_idents\n");
102932-
102933- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
102934+ prandom_bytes(ip_idents, sizeof(ip_idents));
102935
102936 #ifdef CONFIG_IP_ROUTE_CLASSID
102937 ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
102938diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
102939index b3c53c8..35cc18d 100644
102940--- a/net/ipv4/sysctl_net_ipv4.c
102941+++ b/net/ipv4/sysctl_net_ipv4.c
102942@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
102943 container_of(table->data, struct net, ipv4.ip_local_ports.range);
102944 int ret;
102945 int range[2];
102946- struct ctl_table tmp = {
102947+ ctl_table_no_const tmp = {
102948 .data = &range,
102949 .maxlen = sizeof(range),
102950 .mode = table->mode,
102951@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
102952 int ret;
102953 gid_t urange[2];
102954 kgid_t low, high;
102955- struct ctl_table tmp = {
102956+ ctl_table_no_const tmp = {
102957 .data = &urange,
102958 .maxlen = sizeof(urange),
102959 .mode = table->mode,
102960@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
102961 void __user *buffer, size_t *lenp, loff_t *ppos)
102962 {
102963 char val[TCP_CA_NAME_MAX];
102964- struct ctl_table tbl = {
102965+ ctl_table_no_const tbl = {
102966 .data = val,
102967 .maxlen = TCP_CA_NAME_MAX,
102968 };
102969@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
102970 void __user *buffer, size_t *lenp,
102971 loff_t *ppos)
102972 {
102973- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
102974+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
102975 int ret;
102976
102977 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102978@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
102979 void __user *buffer, size_t *lenp,
102980 loff_t *ppos)
102981 {
102982- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
102983+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
102984 int ret;
102985
102986 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102987@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
102988 void __user *buffer, size_t *lenp,
102989 loff_t *ppos)
102990 {
102991- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102992+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102993 struct tcp_fastopen_context *ctxt;
102994 int ret;
102995 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
102996@@ -874,13 +874,12 @@ static struct ctl_table ipv4_net_table[] = {
102997
102998 static __net_init int ipv4_sysctl_init_net(struct net *net)
102999 {
103000- struct ctl_table *table;
103001+ ctl_table_no_const *table = NULL;
103002
103003- table = ipv4_net_table;
103004 if (!net_eq(net, &init_net)) {
103005 int i;
103006
103007- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
103008+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
103009 if (table == NULL)
103010 goto err_alloc;
103011
103012@@ -889,7 +888,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
103013 table[i].data += (void *)net - (void *)&init_net;
103014 }
103015
103016- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
103017+ if (!net_eq(net, &init_net))
103018+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
103019+ else
103020+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
103021 if (net->ipv4.ipv4_hdr == NULL)
103022 goto err_reg;
103023
103024diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
103025index d107ee2..bcebf11 100644
103026--- a/net/ipv4/tcp_input.c
103027+++ b/net/ipv4/tcp_input.c
103028@@ -765,7 +765,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
103029 * without any lock. We want to make sure compiler wont store
103030 * intermediate values in this location.
103031 */
103032- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
103033+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
103034 sk->sk_max_pacing_rate);
103035 }
103036
103037@@ -4527,7 +4527,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
103038 * simplifies code)
103039 */
103040 static void
103041-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
103042+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
103043 struct sk_buff *head, struct sk_buff *tail,
103044 u32 start, u32 end)
103045 {
103046@@ -5506,6 +5506,7 @@ discard:
103047 tcp_paws_reject(&tp->rx_opt, 0))
103048 goto discard_and_undo;
103049
103050+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
103051 if (th->syn) {
103052 /* We see SYN without ACK. It is attempt of
103053 * simultaneous connect with crossed SYNs.
103054@@ -5556,6 +5557,7 @@ discard:
103055 goto discard;
103056 #endif
103057 }
103058+#endif
103059 /* "fifth, if neither of the SYN or RST bits is set then
103060 * drop the segment and return."
103061 */
103062@@ -5602,7 +5604,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
103063 goto discard;
103064
103065 if (th->syn) {
103066- if (th->fin)
103067+ if (th->fin || th->urg || th->psh)
103068 goto discard;
103069 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
103070 return 1;
103071diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
103072index ef7089c..a3e65fb 100644
103073--- a/net/ipv4/tcp_ipv4.c
103074+++ b/net/ipv4/tcp_ipv4.c
103075@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
103076 int sysctl_tcp_low_latency __read_mostly;
103077 EXPORT_SYMBOL(sysctl_tcp_low_latency);
103078
103079+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103080+extern int grsec_enable_blackhole;
103081+#endif
103082+
103083 #ifdef CONFIG_TCP_MD5SIG
103084 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
103085 __be32 daddr, __be32 saddr, const struct tcphdr *th);
103086@@ -1469,6 +1473,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
103087 return 0;
103088
103089 reset:
103090+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103091+ if (!grsec_enable_blackhole)
103092+#endif
103093 tcp_v4_send_reset(rsk, skb);
103094 discard:
103095 kfree_skb(skb);
103096@@ -1633,12 +1640,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
103097 TCP_SKB_CB(skb)->sacked = 0;
103098
103099 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
103100- if (!sk)
103101+ if (!sk) {
103102+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103103+ ret = 1;
103104+#endif
103105 goto no_tcp_socket;
103106-
103107+ }
103108 process:
103109- if (sk->sk_state == TCP_TIME_WAIT)
103110+ if (sk->sk_state == TCP_TIME_WAIT) {
103111+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103112+ ret = 2;
103113+#endif
103114 goto do_time_wait;
103115+ }
103116
103117 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
103118 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
103119@@ -1694,6 +1708,10 @@ csum_error:
103120 bad_packet:
103121 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
103122 } else {
103123+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103124+ if (!grsec_enable_blackhole || (ret == 1 &&
103125+ (skb->dev->flags & IFF_LOOPBACK)))
103126+#endif
103127 tcp_v4_send_reset(NULL, skb);
103128 }
103129
103130diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
103131index 63d2680..2db9d6b 100644
103132--- a/net/ipv4/tcp_minisocks.c
103133+++ b/net/ipv4/tcp_minisocks.c
103134@@ -27,6 +27,10 @@
103135 #include <net/inet_common.h>
103136 #include <net/xfrm.h>
103137
103138+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103139+extern int grsec_enable_blackhole;
103140+#endif
103141+
103142 int sysctl_tcp_syncookies __read_mostly = 1;
103143 EXPORT_SYMBOL(sysctl_tcp_syncookies);
103144
103145@@ -739,7 +743,10 @@ embryonic_reset:
103146 * avoid becoming vulnerable to outside attack aiming at
103147 * resetting legit local connections.
103148 */
103149- req->rsk_ops->send_reset(sk, skb);
103150+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103151+ if (!grsec_enable_blackhole)
103152+#endif
103153+ req->rsk_ops->send_reset(sk, skb);
103154 } else if (fastopen) { /* received a valid RST pkt */
103155 reqsk_fastopen_remove(sk, req, true);
103156 tcp_reset(sk);
103157diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
103158index ebf5ff5..4d1ff32 100644
103159--- a/net/ipv4/tcp_probe.c
103160+++ b/net/ipv4/tcp_probe.c
103161@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
103162 if (cnt + width >= len)
103163 break;
103164
103165- if (copy_to_user(buf + cnt, tbuf, width))
103166+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
103167 return -EFAULT;
103168 cnt += width;
103169 }
103170diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
103171index 9b21ae8..4eb67df 100644
103172--- a/net/ipv4/tcp_timer.c
103173+++ b/net/ipv4/tcp_timer.c
103174@@ -22,6 +22,10 @@
103175 #include <linux/gfp.h>
103176 #include <net/tcp.h>
103177
103178+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103179+extern int grsec_lastack_retries;
103180+#endif
103181+
103182 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
103183 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
103184 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
103185@@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
103186 }
103187 }
103188
103189+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103190+ if ((sk->sk_state == TCP_LAST_ACK) &&
103191+ (grsec_lastack_retries > 0) &&
103192+ (grsec_lastack_retries < retry_until))
103193+ retry_until = grsec_lastack_retries;
103194+#endif
103195+
103196 if (retransmits_timed_out(sk, retry_until,
103197 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
103198 /* Has it gone just too far? */
103199diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
103200index cd0db54..93a6518 100644
103201--- a/net/ipv4/udp.c
103202+++ b/net/ipv4/udp.c
103203@@ -87,6 +87,7 @@
103204 #include <linux/types.h>
103205 #include <linux/fcntl.h>
103206 #include <linux/module.h>
103207+#include <linux/security.h>
103208 #include <linux/socket.h>
103209 #include <linux/sockios.h>
103210 #include <linux/igmp.h>
103211@@ -114,6 +115,10 @@
103212 #include <net/busy_poll.h>
103213 #include "udp_impl.h"
103214
103215+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103216+extern int grsec_enable_blackhole;
103217+#endif
103218+
103219 struct udp_table udp_table __read_mostly;
103220 EXPORT_SYMBOL(udp_table);
103221
103222@@ -595,6 +600,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
103223 return true;
103224 }
103225
103226+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
103227+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
103228+
103229 /*
103230 * This routine is called by the ICMP module when it gets some
103231 * sort of error condition. If err < 0 then the socket should
103232@@ -932,9 +940,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
103233 dport = usin->sin_port;
103234 if (dport == 0)
103235 return -EINVAL;
103236+
103237+ err = gr_search_udp_sendmsg(sk, usin);
103238+ if (err)
103239+ return err;
103240 } else {
103241 if (sk->sk_state != TCP_ESTABLISHED)
103242 return -EDESTADDRREQ;
103243+
103244+ err = gr_search_udp_sendmsg(sk, NULL);
103245+ if (err)
103246+ return err;
103247+
103248 daddr = inet->inet_daddr;
103249 dport = inet->inet_dport;
103250 /* Open fast path for connected socket.
103251@@ -1182,7 +1199,7 @@ static unsigned int first_packet_length(struct sock *sk)
103252 IS_UDPLITE(sk));
103253 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
103254 IS_UDPLITE(sk));
103255- atomic_inc(&sk->sk_drops);
103256+ atomic_inc_unchecked(&sk->sk_drops);
103257 __skb_unlink(skb, rcvq);
103258 __skb_queue_tail(&list_kill, skb);
103259 }
103260@@ -1262,6 +1279,10 @@ try_again:
103261 if (!skb)
103262 goto out;
103263
103264+ err = gr_search_udp_recvmsg(sk, skb);
103265+ if (err)
103266+ goto out_free;
103267+
103268 ulen = skb->len - sizeof(struct udphdr);
103269 copied = len;
103270 if (copied > ulen)
103271@@ -1295,7 +1316,7 @@ try_again:
103272 if (unlikely(err)) {
103273 trace_kfree_skb(skb, udp_recvmsg);
103274 if (!peeked) {
103275- atomic_inc(&sk->sk_drops);
103276+ atomic_inc_unchecked(&sk->sk_drops);
103277 UDP_INC_STATS_USER(sock_net(sk),
103278 UDP_MIB_INERRORS, is_udplite);
103279 }
103280@@ -1592,7 +1613,7 @@ csum_error:
103281 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
103282 drop:
103283 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
103284- atomic_inc(&sk->sk_drops);
103285+ atomic_inc_unchecked(&sk->sk_drops);
103286 kfree_skb(skb);
103287 return -1;
103288 }
103289@@ -1611,7 +1632,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
103290 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
103291
103292 if (!skb1) {
103293- atomic_inc(&sk->sk_drops);
103294+ atomic_inc_unchecked(&sk->sk_drops);
103295 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
103296 IS_UDPLITE(sk));
103297 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
103298@@ -1812,6 +1833,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
103299 goto csum_error;
103300
103301 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
103302+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103303+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103304+#endif
103305 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
103306
103307 /*
103308@@ -2398,7 +2422,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
103309 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
103310 0, sock_i_ino(sp),
103311 atomic_read(&sp->sk_refcnt), sp,
103312- atomic_read(&sp->sk_drops));
103313+ atomic_read_unchecked(&sp->sk_drops));
103314 }
103315
103316 int udp4_seq_show(struct seq_file *seq, void *v)
103317diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
103318index 6156f68..d6ab46d 100644
103319--- a/net/ipv4/xfrm4_policy.c
103320+++ b/net/ipv4/xfrm4_policy.c
103321@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
103322 fl4->flowi4_tos = iph->tos;
103323 }
103324
103325-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
103326+static int xfrm4_garbage_collect(struct dst_ops *ops)
103327 {
103328 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
103329
103330- xfrm4_policy_afinfo.garbage_collect(net);
103331+ xfrm_garbage_collect_deferred(net);
103332 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
103333 }
103334
103335@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
103336
103337 static int __net_init xfrm4_net_init(struct net *net)
103338 {
103339- struct ctl_table *table;
103340+ ctl_table_no_const *table = NULL;
103341 struct ctl_table_header *hdr;
103342
103343- table = xfrm4_policy_table;
103344 if (!net_eq(net, &init_net)) {
103345- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
103346+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
103347 if (!table)
103348 goto err_alloc;
103349
103350 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
103351- }
103352-
103353- hdr = register_net_sysctl(net, "net/ipv4", table);
103354+ hdr = register_net_sysctl(net, "net/ipv4", table);
103355+ } else
103356+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
103357 if (!hdr)
103358 goto err_reg;
103359
103360@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
103361 return 0;
103362
103363 err_reg:
103364- if (!net_eq(net, &init_net))
103365- kfree(table);
103366+ kfree(table);
103367 err_alloc:
103368 return -ENOMEM;
103369 }
103370diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
103371index 0169ccf..50d7b04 100644
103372--- a/net/ipv6/addrconf.c
103373+++ b/net/ipv6/addrconf.c
103374@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
103375 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
103376 .mtu6 = IPV6_MIN_MTU,
103377 .accept_ra = 1,
103378- .accept_redirects = 1,
103379+ .accept_redirects = 0,
103380 .autoconf = 1,
103381 .force_mld_version = 0,
103382 .mldv1_unsolicited_report_interval = 10 * HZ,
103383@@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
103384 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
103385 .mtu6 = IPV6_MIN_MTU,
103386 .accept_ra = 1,
103387- .accept_redirects = 1,
103388+ .accept_redirects = 0,
103389 .autoconf = 1,
103390 .force_mld_version = 0,
103391 .mldv1_unsolicited_report_interval = 10 * HZ,
103392@@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
103393 idx = 0;
103394 head = &net->dev_index_head[h];
103395 rcu_read_lock();
103396- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
103397+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
103398 net->dev_base_seq;
103399 hlist_for_each_entry_rcu(dev, head, index_hlist) {
103400 if (idx < s_idx)
103401@@ -2396,7 +2396,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
103402 p.iph.ihl = 5;
103403 p.iph.protocol = IPPROTO_IPV6;
103404 p.iph.ttl = 64;
103405- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
103406+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
103407
103408 if (ops->ndo_do_ioctl) {
103409 mm_segment_t oldfs = get_fs();
103410@@ -3534,16 +3534,23 @@ static const struct file_operations if6_fops = {
103411 .release = seq_release_net,
103412 };
103413
103414+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
103415+extern void unregister_ipv6_seq_ops_addr(void);
103416+
103417 static int __net_init if6_proc_net_init(struct net *net)
103418 {
103419- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
103420+ register_ipv6_seq_ops_addr(&if6_seq_ops);
103421+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
103422+ unregister_ipv6_seq_ops_addr();
103423 return -ENOMEM;
103424+ }
103425 return 0;
103426 }
103427
103428 static void __net_exit if6_proc_net_exit(struct net *net)
103429 {
103430 remove_proc_entry("if_inet6", net->proc_net);
103431+ unregister_ipv6_seq_ops_addr();
103432 }
103433
103434 static struct pernet_operations if6_proc_net_ops = {
103435@@ -4159,7 +4166,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
103436 s_ip_idx = ip_idx = cb->args[2];
103437
103438 rcu_read_lock();
103439- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
103440+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
103441 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
103442 idx = 0;
103443 head = &net->dev_index_head[h];
103444@@ -4788,7 +4795,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
103445 rt_genid_bump_ipv6(net);
103446 break;
103447 }
103448- atomic_inc(&net->ipv6.dev_addr_genid);
103449+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
103450 }
103451
103452 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
103453@@ -4808,7 +4815,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
103454 int *valp = ctl->data;
103455 int val = *valp;
103456 loff_t pos = *ppos;
103457- struct ctl_table lctl;
103458+ ctl_table_no_const lctl;
103459 int ret;
103460
103461 /*
103462@@ -4893,7 +4900,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
103463 int *valp = ctl->data;
103464 int val = *valp;
103465 loff_t pos = *ppos;
103466- struct ctl_table lctl;
103467+ ctl_table_no_const lctl;
103468 int ret;
103469
103470 /*
103471diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
103472index e8c4400..a4cd5da 100644
103473--- a/net/ipv6/af_inet6.c
103474+++ b/net/ipv6/af_inet6.c
103475@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
103476 net->ipv6.sysctl.icmpv6_time = 1*HZ;
103477 net->ipv6.sysctl.flowlabel_consistency = 1;
103478 net->ipv6.sysctl.auto_flowlabels = 0;
103479- atomic_set(&net->ipv6.fib6_sernum, 1);
103480+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
103481
103482 err = ipv6_init_mibs(net);
103483 if (err)
103484diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
103485index 2cdc383..4f1b785 100644
103486--- a/net/ipv6/datagram.c
103487+++ b/net/ipv6/datagram.c
103488@@ -383,11 +383,10 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
103489
103490 memcpy(&errhdr.ee, &serr->ee, sizeof(struct sock_extended_err));
103491 sin = &errhdr.offender;
103492- sin->sin6_family = AF_UNSPEC;
103493+ memset(sin, 0, sizeof(*sin));
103494+
103495 if (serr->ee.ee_origin != SO_EE_ORIGIN_LOCAL) {
103496 sin->sin6_family = AF_INET6;
103497- sin->sin6_flowinfo = 0;
103498- sin->sin6_port = 0;
103499 if (np->rxopt.all)
103500 ip6_datagram_recv_common_ctl(sk, msg, skb);
103501 if (skb->protocol == htons(ETH_P_IPV6)) {
103502@@ -398,12 +397,9 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
103503 ipv6_iface_scope_id(&sin->sin6_addr,
103504 IP6CB(skb)->iif);
103505 } else {
103506- struct inet_sock *inet = inet_sk(sk);
103507-
103508 ipv6_addr_set_v4mapped(ip_hdr(skb)->saddr,
103509 &sin->sin6_addr);
103510- sin->sin6_scope_id = 0;
103511- if (inet->cmsg_flags)
103512+ if (inet_sk(sk)->cmsg_flags)
103513 ip_cmsg_recv(msg, skb);
103514 }
103515 }
103516@@ -928,5 +924,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
103517 0,
103518 sock_i_ino(sp),
103519 atomic_read(&sp->sk_refcnt), sp,
103520- atomic_read(&sp->sk_drops));
103521+ atomic_read_unchecked(&sp->sk_drops));
103522 }
103523diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
103524index 97ae700..18dcae0 100644
103525--- a/net/ipv6/icmp.c
103526+++ b/net/ipv6/icmp.c
103527@@ -997,7 +997,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
103528
103529 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
103530 {
103531- struct ctl_table *table;
103532+ ctl_table_no_const *table;
103533
103534 table = kmemdup(ipv6_icmp_table_template,
103535 sizeof(ipv6_icmp_table_template),
103536diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
103537index b2d1838..0194c04 100644
103538--- a/net/ipv6/ip6_fib.c
103539+++ b/net/ipv6/ip6_fib.c
103540@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
103541 int new, old;
103542
103543 do {
103544- old = atomic_read(&net->ipv6.fib6_sernum);
103545+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
103546 new = old < INT_MAX ? old + 1 : 1;
103547- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
103548+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
103549 old, new) != old);
103550 return new;
103551 }
103552diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
103553index 0e32d2e..98cbe65 100644
103554--- a/net/ipv6/ip6_gre.c
103555+++ b/net/ipv6/ip6_gre.c
103556@@ -71,8 +71,8 @@ struct ip6gre_net {
103557 struct net_device *fb_tunnel_dev;
103558 };
103559
103560-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
103561-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
103562+static struct rtnl_link_ops ip6gre_link_ops;
103563+static struct rtnl_link_ops ip6gre_tap_ops;
103564 static int ip6gre_tunnel_init(struct net_device *dev);
103565 static void ip6gre_tunnel_setup(struct net_device *dev);
103566 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
103567@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
103568 }
103569
103570
103571-static struct inet6_protocol ip6gre_protocol __read_mostly = {
103572+static struct inet6_protocol ip6gre_protocol = {
103573 .handler = ip6gre_rcv,
103574 .err_handler = ip6gre_err,
103575 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
103576@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
103577 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
103578 };
103579
103580-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103581+static struct rtnl_link_ops ip6gre_link_ops = {
103582 .kind = "ip6gre",
103583 .maxtype = IFLA_GRE_MAX,
103584 .policy = ip6gre_policy,
103585@@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103586 .fill_info = ip6gre_fill_info,
103587 };
103588
103589-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
103590+static struct rtnl_link_ops ip6gre_tap_ops = {
103591 .kind = "ip6gretap",
103592 .maxtype = IFLA_GRE_MAX,
103593 .policy = ip6gre_policy,
103594diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
103595index 9cb94cf..5678108 100644
103596--- a/net/ipv6/ip6_tunnel.c
103597+++ b/net/ipv6/ip6_tunnel.c
103598@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103599
103600 static int ip6_tnl_dev_init(struct net_device *dev);
103601 static void ip6_tnl_dev_setup(struct net_device *dev);
103602-static struct rtnl_link_ops ip6_link_ops __read_mostly;
103603+static struct rtnl_link_ops ip6_link_ops;
103604
103605 static int ip6_tnl_net_id __read_mostly;
103606 struct ip6_tnl_net {
103607@@ -1706,7 +1706,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
103608 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
103609 };
103610
103611-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
103612+static struct rtnl_link_ops ip6_link_ops = {
103613 .kind = "ip6tnl",
103614 .maxtype = IFLA_IPTUN_MAX,
103615 .policy = ip6_tnl_policy,
103616diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
103617index bcda14d..49378c9 100644
103618--- a/net/ipv6/ip6_vti.c
103619+++ b/net/ipv6/ip6_vti.c
103620@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103621
103622 static int vti6_dev_init(struct net_device *dev);
103623 static void vti6_dev_setup(struct net_device *dev);
103624-static struct rtnl_link_ops vti6_link_ops __read_mostly;
103625+static struct rtnl_link_ops vti6_link_ops;
103626
103627 static int vti6_net_id __read_mostly;
103628 struct vti6_net {
103629@@ -981,7 +981,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
103630 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
103631 };
103632
103633-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
103634+static struct rtnl_link_ops vti6_link_ops = {
103635 .kind = "vti6",
103636 .maxtype = IFLA_VTI_MAX,
103637 .policy = vti6_policy,
103638diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
103639index e1a9583..7dd8f4d 100644
103640--- a/net/ipv6/ipv6_sockglue.c
103641+++ b/net/ipv6/ipv6_sockglue.c
103642@@ -993,7 +993,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
103643 if (sk->sk_type != SOCK_STREAM)
103644 return -ENOPROTOOPT;
103645
103646- msg.msg_control = optval;
103647+ msg.msg_control = (void __force_kernel *)optval;
103648 msg.msg_controllen = len;
103649 msg.msg_flags = flags;
103650
103651diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
103652index e080fbb..412b3cf 100644
103653--- a/net/ipv6/netfilter/ip6_tables.c
103654+++ b/net/ipv6/netfilter/ip6_tables.c
103655@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
103656 #endif
103657
103658 static int get_info(struct net *net, void __user *user,
103659- const int *len, int compat)
103660+ int len, int compat)
103661 {
103662 char name[XT_TABLE_MAXNAMELEN];
103663 struct xt_table *t;
103664 int ret;
103665
103666- if (*len != sizeof(struct ip6t_getinfo)) {
103667- duprintf("length %u != %zu\n", *len,
103668+ if (len != sizeof(struct ip6t_getinfo)) {
103669+ duprintf("length %u != %zu\n", len,
103670 sizeof(struct ip6t_getinfo));
103671 return -EINVAL;
103672 }
103673@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
103674 info.size = private->size;
103675 strcpy(info.name, name);
103676
103677- if (copy_to_user(user, &info, *len) != 0)
103678+ if (copy_to_user(user, &info, len) != 0)
103679 ret = -EFAULT;
103680 else
103681 ret = 0;
103682@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103683
103684 switch (cmd) {
103685 case IP6T_SO_GET_INFO:
103686- ret = get_info(sock_net(sk), user, len, 1);
103687+ ret = get_info(sock_net(sk), user, *len, 1);
103688 break;
103689 case IP6T_SO_GET_ENTRIES:
103690 ret = compat_get_entries(sock_net(sk), user, len);
103691@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103692
103693 switch (cmd) {
103694 case IP6T_SO_GET_INFO:
103695- ret = get_info(sock_net(sk), user, len, 0);
103696+ ret = get_info(sock_net(sk), user, *len, 0);
103697 break;
103698
103699 case IP6T_SO_GET_ENTRIES:
103700diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
103701index 6f187c8..34b367f 100644
103702--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
103703+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
103704@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
103705
103706 static int nf_ct_frag6_sysctl_register(struct net *net)
103707 {
103708- struct ctl_table *table;
103709+ ctl_table_no_const *table = NULL;
103710 struct ctl_table_header *hdr;
103711
103712- table = nf_ct_frag6_sysctl_table;
103713 if (!net_eq(net, &init_net)) {
103714- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
103715+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
103716 GFP_KERNEL);
103717 if (table == NULL)
103718 goto err_alloc;
103719@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103720 table[2].data = &net->nf_frag.frags.high_thresh;
103721 table[2].extra1 = &net->nf_frag.frags.low_thresh;
103722 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
103723- }
103724-
103725- hdr = register_net_sysctl(net, "net/netfilter", table);
103726+ hdr = register_net_sysctl(net, "net/netfilter", table);
103727+ } else
103728+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
103729 if (hdr == NULL)
103730 goto err_reg;
103731
103732@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103733 return 0;
103734
103735 err_reg:
103736- if (!net_eq(net, &init_net))
103737- kfree(table);
103738+ kfree(table);
103739 err_alloc:
103740 return -ENOMEM;
103741 }
103742diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
103743index 5b7a1ed..d9da205 100644
103744--- a/net/ipv6/ping.c
103745+++ b/net/ipv6/ping.c
103746@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
103747 };
103748 #endif
103749
103750+static struct pingv6_ops real_pingv6_ops = {
103751+ .ipv6_recv_error = ipv6_recv_error,
103752+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
103753+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
103754+ .icmpv6_err_convert = icmpv6_err_convert,
103755+ .ipv6_icmp_error = ipv6_icmp_error,
103756+ .ipv6_chk_addr = ipv6_chk_addr,
103757+};
103758+
103759+static struct pingv6_ops dummy_pingv6_ops = {
103760+ .ipv6_recv_error = dummy_ipv6_recv_error,
103761+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
103762+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
103763+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
103764+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
103765+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
103766+};
103767+
103768 int __init pingv6_init(void)
103769 {
103770 #ifdef CONFIG_PROC_FS
103771@@ -247,13 +265,7 @@ int __init pingv6_init(void)
103772 if (ret)
103773 return ret;
103774 #endif
103775- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
103776- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
103777- pingv6_ops.ip6_datagram_recv_specific_ctl =
103778- ip6_datagram_recv_specific_ctl;
103779- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
103780- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
103781- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
103782+ pingv6_ops = &real_pingv6_ops;
103783 return inet6_register_protosw(&pingv6_protosw);
103784 }
103785
103786@@ -262,14 +274,9 @@ int __init pingv6_init(void)
103787 */
103788 void pingv6_exit(void)
103789 {
103790- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
103791- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
103792- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
103793- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
103794- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
103795- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
103796 #ifdef CONFIG_PROC_FS
103797 unregister_pernet_subsys(&ping_v6_net_ops);
103798 #endif
103799+ pingv6_ops = &dummy_pingv6_ops;
103800 inet6_unregister_protosw(&pingv6_protosw);
103801 }
103802diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
103803index 1752cd0..3c6af41 100644
103804--- a/net/ipv6/proc.c
103805+++ b/net/ipv6/proc.c
103806@@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
103807 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
103808 goto proc_snmp6_fail;
103809
103810- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
103811+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
103812 if (!net->mib.proc_net_devsnmp6)
103813 goto proc_dev_snmp6_fail;
103814 return 0;
103815diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
103816index 896af88..6e2ba628 100644
103817--- a/net/ipv6/raw.c
103818+++ b/net/ipv6/raw.c
103819@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
103820 {
103821 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
103822 skb_checksum_complete(skb)) {
103823- atomic_inc(&sk->sk_drops);
103824+ atomic_inc_unchecked(&sk->sk_drops);
103825 kfree_skb(skb);
103826 return NET_RX_DROP;
103827 }
103828@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103829 struct raw6_sock *rp = raw6_sk(sk);
103830
103831 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
103832- atomic_inc(&sk->sk_drops);
103833+ atomic_inc_unchecked(&sk->sk_drops);
103834 kfree_skb(skb);
103835 return NET_RX_DROP;
103836 }
103837@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103838
103839 if (inet->hdrincl) {
103840 if (skb_checksum_complete(skb)) {
103841- atomic_inc(&sk->sk_drops);
103842+ atomic_inc_unchecked(&sk->sk_drops);
103843 kfree_skb(skb);
103844 return NET_RX_DROP;
103845 }
103846@@ -608,7 +608,7 @@ out:
103847 return err;
103848 }
103849
103850-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
103851+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
103852 struct flowi6 *fl6, struct dst_entry **dstp,
103853 unsigned int flags)
103854 {
103855@@ -914,12 +914,15 @@ do_confirm:
103856 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
103857 char __user *optval, int optlen)
103858 {
103859+ struct icmp6_filter filter;
103860+
103861 switch (optname) {
103862 case ICMPV6_FILTER:
103863 if (optlen > sizeof(struct icmp6_filter))
103864 optlen = sizeof(struct icmp6_filter);
103865- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
103866+ if (copy_from_user(&filter, optval, optlen))
103867 return -EFAULT;
103868+ raw6_sk(sk)->filter = filter;
103869 return 0;
103870 default:
103871 return -ENOPROTOOPT;
103872@@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103873 char __user *optval, int __user *optlen)
103874 {
103875 int len;
103876+ struct icmp6_filter filter;
103877
103878 switch (optname) {
103879 case ICMPV6_FILTER:
103880@@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103881 len = sizeof(struct icmp6_filter);
103882 if (put_user(len, optlen))
103883 return -EFAULT;
103884- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
103885+ filter = raw6_sk(sk)->filter;
103886+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
103887 return -EFAULT;
103888 return 0;
103889 default:
103890diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
103891index 1a157ca..9fc05f4 100644
103892--- a/net/ipv6/reassembly.c
103893+++ b/net/ipv6/reassembly.c
103894@@ -625,12 +625,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
103895
103896 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103897 {
103898- struct ctl_table *table;
103899+ ctl_table_no_const *table = NULL;
103900 struct ctl_table_header *hdr;
103901
103902- table = ip6_frags_ns_ctl_table;
103903 if (!net_eq(net, &init_net)) {
103904- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103905+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103906 if (table == NULL)
103907 goto err_alloc;
103908
103909@@ -644,9 +643,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103910 /* Don't export sysctls to unprivileged users */
103911 if (net->user_ns != &init_user_ns)
103912 table[0].procname = NULL;
103913- }
103914+ hdr = register_net_sysctl(net, "net/ipv6", table);
103915+ } else
103916+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
103917
103918- hdr = register_net_sysctl(net, "net/ipv6", table);
103919 if (hdr == NULL)
103920 goto err_reg;
103921
103922@@ -654,8 +654,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103923 return 0;
103924
103925 err_reg:
103926- if (!net_eq(net, &init_net))
103927- kfree(table);
103928+ kfree(table);
103929 err_alloc:
103930 return -ENOMEM;
103931 }
103932diff --git a/net/ipv6/route.c b/net/ipv6/route.c
103933index a318dd89..42a612c 100644
103934--- a/net/ipv6/route.c
103935+++ b/net/ipv6/route.c
103936@@ -1150,12 +1150,9 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
103937 struct net *net = dev_net(dst->dev);
103938
103939 rt6->rt6i_flags |= RTF_MODIFIED;
103940- if (mtu < IPV6_MIN_MTU) {
103941- u32 features = dst_metric(dst, RTAX_FEATURES);
103942+ if (mtu < IPV6_MIN_MTU)
103943 mtu = IPV6_MIN_MTU;
103944- features |= RTAX_FEATURE_ALLFRAG;
103945- dst_metric_set(dst, RTAX_FEATURES, features);
103946- }
103947+
103948 dst_metric_set(dst, RTAX_MTU, mtu);
103949 rt6_update_expires(rt6, net->ipv6.sysctl.ip6_rt_mtu_expires);
103950 }
103951@@ -2965,7 +2962,7 @@ struct ctl_table ipv6_route_table_template[] = {
103952
103953 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
103954 {
103955- struct ctl_table *table;
103956+ ctl_table_no_const *table;
103957
103958 table = kmemdup(ipv6_route_table_template,
103959 sizeof(ipv6_route_table_template),
103960diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
103961index a24557a..00a9ed1 100644
103962--- a/net/ipv6/sit.c
103963+++ b/net/ipv6/sit.c
103964@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
103965 static void ipip6_dev_free(struct net_device *dev);
103966 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
103967 __be32 *v4dst);
103968-static struct rtnl_link_ops sit_link_ops __read_mostly;
103969+static struct rtnl_link_ops sit_link_ops;
103970
103971 static int sit_net_id __read_mostly;
103972 struct sit_net {
103973@@ -1750,7 +1750,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
103974 unregister_netdevice_queue(dev, head);
103975 }
103976
103977-static struct rtnl_link_ops sit_link_ops __read_mostly = {
103978+static struct rtnl_link_ops sit_link_ops = {
103979 .kind = "sit",
103980 .maxtype = IFLA_IPTUN_MAX,
103981 .policy = ipip6_policy,
103982diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
103983index c5c10fa..2577d51 100644
103984--- a/net/ipv6/sysctl_net_ipv6.c
103985+++ b/net/ipv6/sysctl_net_ipv6.c
103986@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
103987
103988 static int __net_init ipv6_sysctl_net_init(struct net *net)
103989 {
103990- struct ctl_table *ipv6_table;
103991+ ctl_table_no_const *ipv6_table;
103992 struct ctl_table *ipv6_route_table;
103993 struct ctl_table *ipv6_icmp_table;
103994 int err;
103995diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
103996index c113602..0cccb46 100644
103997--- a/net/ipv6/tcp_ipv6.c
103998+++ b/net/ipv6/tcp_ipv6.c
103999@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
104000 }
104001 }
104002
104003+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104004+extern int grsec_enable_blackhole;
104005+#endif
104006+
104007 static void tcp_v6_hash(struct sock *sk)
104008 {
104009 if (sk->sk_state != TCP_CLOSE) {
104010@@ -1341,6 +1345,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
104011 return 0;
104012
104013 reset:
104014+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104015+ if (!grsec_enable_blackhole)
104016+#endif
104017 tcp_v6_send_reset(sk, skb);
104018 discard:
104019 if (opt_skb)
104020@@ -1441,12 +1448,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
104021
104022 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
104023 inet6_iif(skb));
104024- if (!sk)
104025+ if (!sk) {
104026+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104027+ ret = 1;
104028+#endif
104029 goto no_tcp_socket;
104030+ }
104031
104032 process:
104033- if (sk->sk_state == TCP_TIME_WAIT)
104034+ if (sk->sk_state == TCP_TIME_WAIT) {
104035+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104036+ ret = 2;
104037+#endif
104038 goto do_time_wait;
104039+ }
104040
104041 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
104042 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
104043@@ -1497,6 +1512,10 @@ csum_error:
104044 bad_packet:
104045 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
104046 } else {
104047+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104048+ if (!grsec_enable_blackhole || (ret == 1 &&
104049+ (skb->dev->flags & IFF_LOOPBACK)))
104050+#endif
104051 tcp_v6_send_reset(NULL, skb);
104052 }
104053
104054diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
104055index f6ba535..b41033f 100644
104056--- a/net/ipv6/udp.c
104057+++ b/net/ipv6/udp.c
104058@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
104059 udp_ipv6_hash_secret + net_hash_mix(net));
104060 }
104061
104062+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104063+extern int grsec_enable_blackhole;
104064+#endif
104065+
104066 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
104067 {
104068 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
104069@@ -434,7 +438,7 @@ try_again:
104070 if (unlikely(err)) {
104071 trace_kfree_skb(skb, udpv6_recvmsg);
104072 if (!peeked) {
104073- atomic_inc(&sk->sk_drops);
104074+ atomic_inc_unchecked(&sk->sk_drops);
104075 if (is_udp4)
104076 UDP_INC_STATS_USER(sock_net(sk),
104077 UDP_MIB_INERRORS,
104078@@ -701,7 +705,7 @@ csum_error:
104079 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
104080 drop:
104081 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
104082- atomic_inc(&sk->sk_drops);
104083+ atomic_inc_unchecked(&sk->sk_drops);
104084 kfree_skb(skb);
104085 return -1;
104086 }
104087@@ -740,7 +744,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
104088 if (likely(skb1 == NULL))
104089 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
104090 if (!skb1) {
104091- atomic_inc(&sk->sk_drops);
104092+ atomic_inc_unchecked(&sk->sk_drops);
104093 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
104094 IS_UDPLITE(sk));
104095 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104096@@ -919,6 +923,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
104097 goto csum_error;
104098
104099 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
104100+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104101+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
104102+#endif
104103 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
104104
104105 kfree_skb(skb);
104106diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
104107index 5f98364..691985a 100644
104108--- a/net/ipv6/xfrm6_policy.c
104109+++ b/net/ipv6/xfrm6_policy.c
104110@@ -130,12 +130,18 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
104111 {
104112 struct flowi6 *fl6 = &fl->u.ip6;
104113 int onlyproto = 0;
104114- u16 offset = skb_network_header_len(skb);
104115 const struct ipv6hdr *hdr = ipv6_hdr(skb);
104116+ u16 offset = sizeof(*hdr);
104117 struct ipv6_opt_hdr *exthdr;
104118 const unsigned char *nh = skb_network_header(skb);
104119- u8 nexthdr = nh[IP6CB(skb)->nhoff];
104120+ u16 nhoff = IP6CB(skb)->nhoff;
104121 int oif = 0;
104122+ u8 nexthdr;
104123+
104124+ if (!nhoff)
104125+ nhoff = offsetof(struct ipv6hdr, nexthdr);
104126+
104127+ nexthdr = nh[nhoff];
104128
104129 if (skb_dst(skb))
104130 oif = skb_dst(skb)->dev->ifindex;
104131@@ -217,11 +223,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
104132 }
104133 }
104134
104135-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
104136+static int xfrm6_garbage_collect(struct dst_ops *ops)
104137 {
104138 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
104139
104140- xfrm6_policy_afinfo.garbage_collect(net);
104141+ xfrm_garbage_collect_deferred(net);
104142 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
104143 }
104144
104145@@ -334,19 +340,19 @@ static struct ctl_table xfrm6_policy_table[] = {
104146
104147 static int __net_init xfrm6_net_init(struct net *net)
104148 {
104149- struct ctl_table *table;
104150+ ctl_table_no_const *table = NULL;
104151 struct ctl_table_header *hdr;
104152
104153- table = xfrm6_policy_table;
104154 if (!net_eq(net, &init_net)) {
104155- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
104156+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
104157 if (!table)
104158 goto err_alloc;
104159
104160 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
104161- }
104162+ hdr = register_net_sysctl(net, "net/ipv6", table);
104163+ } else
104164+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
104165
104166- hdr = register_net_sysctl(net, "net/ipv6", table);
104167 if (!hdr)
104168 goto err_reg;
104169
104170@@ -354,8 +360,7 @@ static int __net_init xfrm6_net_init(struct net *net)
104171 return 0;
104172
104173 err_reg:
104174- if (!net_eq(net, &init_net))
104175- kfree(table);
104176+ kfree(table);
104177 err_alloc:
104178 return -ENOMEM;
104179 }
104180diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
104181index e15c16a..7cf07aa 100644
104182--- a/net/ipx/ipx_proc.c
104183+++ b/net/ipx/ipx_proc.c
104184@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
104185 struct proc_dir_entry *p;
104186 int rc = -ENOMEM;
104187
104188- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
104189+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
104190
104191 if (!ipx_proc_dir)
104192 goto out;
104193diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
104194index 61ceb4c..e788eb8 100644
104195--- a/net/irda/ircomm/ircomm_tty.c
104196+++ b/net/irda/ircomm/ircomm_tty.c
104197@@ -317,10 +317,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104198 add_wait_queue(&port->open_wait, &wait);
104199
104200 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
104201- __FILE__, __LINE__, tty->driver->name, port->count);
104202+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104203
104204 spin_lock_irqsave(&port->lock, flags);
104205- port->count--;
104206+ atomic_dec(&port->count);
104207 port->blocked_open++;
104208 spin_unlock_irqrestore(&port->lock, flags);
104209
104210@@ -355,7 +355,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104211 }
104212
104213 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
104214- __FILE__, __LINE__, tty->driver->name, port->count);
104215+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104216
104217 schedule();
104218 }
104219@@ -365,12 +365,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
104220
104221 spin_lock_irqsave(&port->lock, flags);
104222 if (!tty_hung_up_p(filp))
104223- port->count++;
104224+ atomic_inc(&port->count);
104225 port->blocked_open--;
104226 spin_unlock_irqrestore(&port->lock, flags);
104227
104228 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
104229- __FILE__, __LINE__, tty->driver->name, port->count);
104230+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
104231
104232 if (!retval)
104233 port->flags |= ASYNC_NORMAL_ACTIVE;
104234@@ -444,12 +444,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
104235
104236 /* ++ is not atomic, so this should be protected - Jean II */
104237 spin_lock_irqsave(&self->port.lock, flags);
104238- self->port.count++;
104239+ atomic_inc(&self->port.count);
104240 spin_unlock_irqrestore(&self->port.lock, flags);
104241 tty_port_tty_set(&self->port, tty);
104242
104243 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
104244- self->line, self->port.count);
104245+ self->line, atomic_read(&self->port.count));
104246
104247 /* Not really used by us, but lets do it anyway */
104248 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
104249@@ -985,7 +985,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
104250 tty_kref_put(port->tty);
104251 }
104252 port->tty = NULL;
104253- port->count = 0;
104254+ atomic_set(&port->count, 0);
104255 spin_unlock_irqrestore(&port->lock, flags);
104256
104257 wake_up_interruptible(&port->open_wait);
104258@@ -1342,7 +1342,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
104259 seq_putc(m, '\n');
104260
104261 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
104262- seq_printf(m, "Open count: %d\n", self->port.count);
104263+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
104264 seq_printf(m, "Max data size: %d\n", self->max_data_size);
104265 seq_printf(m, "Max header size: %d\n", self->max_header_size);
104266
104267diff --git a/net/irda/irproc.c b/net/irda/irproc.c
104268index b9ac598..f88cc56 100644
104269--- a/net/irda/irproc.c
104270+++ b/net/irda/irproc.c
104271@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
104272 {
104273 int i;
104274
104275- proc_irda = proc_mkdir("irda", init_net.proc_net);
104276+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
104277 if (proc_irda == NULL)
104278 return;
104279
104280diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
104281index a089b6b..3ca3b60 100644
104282--- a/net/iucv/af_iucv.c
104283+++ b/net/iucv/af_iucv.c
104284@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
104285 {
104286 char name[12];
104287
104288- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
104289+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
104290 while (__iucv_get_sock_by_name(name)) {
104291 sprintf(name, "%08x",
104292- atomic_inc_return(&iucv_sk_list.autobind_name));
104293+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
104294 }
104295 memcpy(iucv->src_name, name, 8);
104296 }
104297diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
104298index 2a6a1fd..6c112b0 100644
104299--- a/net/iucv/iucv.c
104300+++ b/net/iucv/iucv.c
104301@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
104302 return NOTIFY_OK;
104303 }
104304
104305-static struct notifier_block __refdata iucv_cpu_notifier = {
104306+static struct notifier_block iucv_cpu_notifier = {
104307 .notifier_call = iucv_cpu_notify,
104308 };
104309
104310diff --git a/net/key/af_key.c b/net/key/af_key.c
104311index 1847ec4..26ef732 100644
104312--- a/net/key/af_key.c
104313+++ b/net/key/af_key.c
104314@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
104315 static u32 get_acqseq(void)
104316 {
104317 u32 res;
104318- static atomic_t acqseq;
104319+ static atomic_unchecked_t acqseq;
104320
104321 do {
104322- res = atomic_inc_return(&acqseq);
104323+ res = atomic_inc_return_unchecked(&acqseq);
104324 } while (!res);
104325 return res;
104326 }
104327diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
104328index edb78e6..8dc654a 100644
104329--- a/net/l2tp/l2tp_eth.c
104330+++ b/net/l2tp/l2tp_eth.c
104331@@ -42,12 +42,12 @@ struct l2tp_eth {
104332 struct sock *tunnel_sock;
104333 struct l2tp_session *session;
104334 struct list_head list;
104335- atomic_long_t tx_bytes;
104336- atomic_long_t tx_packets;
104337- atomic_long_t tx_dropped;
104338- atomic_long_t rx_bytes;
104339- atomic_long_t rx_packets;
104340- atomic_long_t rx_errors;
104341+ atomic_long_unchecked_t tx_bytes;
104342+ atomic_long_unchecked_t tx_packets;
104343+ atomic_long_unchecked_t tx_dropped;
104344+ atomic_long_unchecked_t rx_bytes;
104345+ atomic_long_unchecked_t rx_packets;
104346+ atomic_long_unchecked_t rx_errors;
104347 };
104348
104349 /* via l2tp_session_priv() */
104350@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
104351 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
104352
104353 if (likely(ret == NET_XMIT_SUCCESS)) {
104354- atomic_long_add(len, &priv->tx_bytes);
104355- atomic_long_inc(&priv->tx_packets);
104356+ atomic_long_add_unchecked(len, &priv->tx_bytes);
104357+ atomic_long_inc_unchecked(&priv->tx_packets);
104358 } else {
104359- atomic_long_inc(&priv->tx_dropped);
104360+ atomic_long_inc_unchecked(&priv->tx_dropped);
104361 }
104362 return NETDEV_TX_OK;
104363 }
104364@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
104365 {
104366 struct l2tp_eth *priv = netdev_priv(dev);
104367
104368- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
104369- stats->tx_packets = atomic_long_read(&priv->tx_packets);
104370- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
104371- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
104372- stats->rx_packets = atomic_long_read(&priv->rx_packets);
104373- stats->rx_errors = atomic_long_read(&priv->rx_errors);
104374+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
104375+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
104376+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
104377+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
104378+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
104379+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
104380 return stats;
104381 }
104382
104383@@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
104384 nf_reset(skb);
104385
104386 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
104387- atomic_long_inc(&priv->rx_packets);
104388- atomic_long_add(data_len, &priv->rx_bytes);
104389+ atomic_long_inc_unchecked(&priv->rx_packets);
104390+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
104391 } else {
104392- atomic_long_inc(&priv->rx_errors);
104393+ atomic_long_inc_unchecked(&priv->rx_errors);
104394 }
104395 return;
104396
104397 error:
104398- atomic_long_inc(&priv->rx_errors);
104399+ atomic_long_inc_unchecked(&priv->rx_errors);
104400 kfree_skb(skb);
104401 }
104402
104403diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
104404index 1a3c7e0..80f8b0c 100644
104405--- a/net/llc/llc_proc.c
104406+++ b/net/llc/llc_proc.c
104407@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
104408 int rc = -ENOMEM;
104409 struct proc_dir_entry *p;
104410
104411- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
104412+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
104413 if (!llc_proc_dir)
104414 goto out;
104415
104416diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
104417index 343da1e..509873f 100644
104418--- a/net/mac80211/cfg.c
104419+++ b/net/mac80211/cfg.c
104420@@ -541,7 +541,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
104421 ret = ieee80211_vif_use_channel(sdata, chandef,
104422 IEEE80211_CHANCTX_EXCLUSIVE);
104423 }
104424- } else if (local->open_count == local->monitors) {
104425+ } else if (local_read(&local->open_count) == local->monitors) {
104426 local->_oper_chandef = *chandef;
104427 ieee80211_hw_config(local, 0);
104428 }
104429@@ -3326,7 +3326,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
104430 else
104431 local->probe_req_reg--;
104432
104433- if (!local->open_count)
104434+ if (!local_read(&local->open_count))
104435 break;
104436
104437 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
104438@@ -3460,8 +3460,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
104439 if (chanctx_conf) {
104440 *chandef = sdata->vif.bss_conf.chandef;
104441 ret = 0;
104442- } else if (local->open_count > 0 &&
104443- local->open_count == local->monitors &&
104444+ } else if (local_read(&local->open_count) > 0 &&
104445+ local_read(&local->open_count) == local->monitors &&
104446 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
104447 if (local->use_chanctx)
104448 *chandef = local->monitor_chandef;
104449diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
104450index 8c68da3..0695016 100644
104451--- a/net/mac80211/ieee80211_i.h
104452+++ b/net/mac80211/ieee80211_i.h
104453@@ -29,6 +29,7 @@
104454 #include <net/ieee80211_radiotap.h>
104455 #include <net/cfg80211.h>
104456 #include <net/mac80211.h>
104457+#include <asm/local.h>
104458 #include "key.h"
104459 #include "sta_info.h"
104460 #include "debug.h"
104461@@ -1057,7 +1058,7 @@ struct ieee80211_local {
104462 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
104463 spinlock_t queue_stop_reason_lock;
104464
104465- int open_count;
104466+ local_t open_count;
104467 int monitors, cooked_mntrs;
104468 /* number of interfaces with corresponding FIF_ flags */
104469 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
104470diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
104471index eeae0ab..0f24585 100644
104472--- a/net/mac80211/iface.c
104473+++ b/net/mac80211/iface.c
104474@@ -533,7 +533,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
104475 break;
104476 }
104477
104478- if (local->open_count == 0) {
104479+ if (local_read(&local->open_count) == 0) {
104480 res = drv_start(local);
104481 if (res)
104482 goto err_del_bss;
104483@@ -580,7 +580,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
104484 res = drv_add_interface(local, sdata);
104485 if (res)
104486 goto err_stop;
104487- } else if (local->monitors == 0 && local->open_count == 0) {
104488+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
104489 res = ieee80211_add_virtual_monitor(local);
104490 if (res)
104491 goto err_stop;
104492@@ -689,7 +689,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
104493 atomic_inc(&local->iff_promiscs);
104494
104495 if (coming_up)
104496- local->open_count++;
104497+ local_inc(&local->open_count);
104498
104499 if (hw_reconf_flags)
104500 ieee80211_hw_config(local, hw_reconf_flags);
104501@@ -727,7 +727,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
104502 err_del_interface:
104503 drv_remove_interface(local, sdata);
104504 err_stop:
104505- if (!local->open_count)
104506+ if (!local_read(&local->open_count))
104507 drv_stop(local);
104508 err_del_bss:
104509 sdata->bss = NULL;
104510@@ -893,7 +893,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104511 }
104512
104513 if (going_down)
104514- local->open_count--;
104515+ local_dec(&local->open_count);
104516
104517 switch (sdata->vif.type) {
104518 case NL80211_IFTYPE_AP_VLAN:
104519@@ -955,7 +955,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104520 }
104521 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
104522
104523- if (local->open_count == 0)
104524+ if (local_read(&local->open_count) == 0)
104525 ieee80211_clear_tx_pending(local);
104526
104527 /*
104528@@ -998,7 +998,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104529 if (cancel_scan)
104530 flush_delayed_work(&local->scan_work);
104531
104532- if (local->open_count == 0) {
104533+ if (local_read(&local->open_count) == 0) {
104534 ieee80211_stop_device(local);
104535
104536 /* no reconfiguring after stop! */
104537@@ -1009,7 +1009,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104538 ieee80211_configure_filter(local);
104539 ieee80211_hw_config(local, hw_reconf_flags);
104540
104541- if (local->monitors == local->open_count)
104542+ if (local->monitors == local_read(&local->open_count))
104543 ieee80211_add_virtual_monitor(local);
104544 }
104545
104546diff --git a/net/mac80211/main.c b/net/mac80211/main.c
104547index 0de7c93..884b2ca 100644
104548--- a/net/mac80211/main.c
104549+++ b/net/mac80211/main.c
104550@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
104551 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
104552 IEEE80211_CONF_CHANGE_POWER);
104553
104554- if (changed && local->open_count) {
104555+ if (changed && local_read(&local->open_count)) {
104556 ret = drv_config(local, changed);
104557 /*
104558 * Goal:
104559diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
104560index 4c5192e..04cc0d8 100644
104561--- a/net/mac80211/pm.c
104562+++ b/net/mac80211/pm.c
104563@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104564 struct ieee80211_sub_if_data *sdata;
104565 struct sta_info *sta;
104566
104567- if (!local->open_count)
104568+ if (!local_read(&local->open_count))
104569 goto suspend;
104570
104571 ieee80211_scan_cancel(local);
104572@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104573 cancel_work_sync(&local->dynamic_ps_enable_work);
104574 del_timer_sync(&local->dynamic_ps_timer);
104575
104576- local->wowlan = wowlan && local->open_count;
104577+ local->wowlan = wowlan && local_read(&local->open_count);
104578 if (local->wowlan) {
104579 int err = drv_suspend(local, wowlan);
104580 if (err < 0) {
104581@@ -125,7 +125,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104582 WARN_ON(!list_empty(&local->chanctx_list));
104583
104584 /* stop hardware - this must stop RX */
104585- if (local->open_count)
104586+ if (local_read(&local->open_count))
104587 ieee80211_stop_device(local);
104588
104589 suspend:
104590diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
104591index 6081329..ab23834 100644
104592--- a/net/mac80211/rate.c
104593+++ b/net/mac80211/rate.c
104594@@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
104595
104596 ASSERT_RTNL();
104597
104598- if (local->open_count)
104599+ if (local_read(&local->open_count))
104600 return -EBUSY;
104601
104602 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
104603diff --git a/net/mac80211/util.c b/net/mac80211/util.c
104604index 3c61060..7bed2e3 100644
104605--- a/net/mac80211/util.c
104606+++ b/net/mac80211/util.c
104607@@ -1669,7 +1669,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104608 }
104609 #endif
104610 /* everything else happens only if HW was up & running */
104611- if (!local->open_count)
104612+ if (!local_read(&local->open_count))
104613 goto wake_up;
104614
104615 /*
104616@@ -1895,7 +1895,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104617 local->in_reconfig = false;
104618 barrier();
104619
104620- if (local->monitors == local->open_count && local->monitors > 0)
104621+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
104622 ieee80211_add_virtual_monitor(local);
104623
104624 /*
104625diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
104626index ae5096ab..e5aa70a 100644
104627--- a/net/netfilter/Kconfig
104628+++ b/net/netfilter/Kconfig
104629@@ -1105,6 +1105,16 @@ config NETFILTER_XT_MATCH_ESP
104630
104631 To compile it as a module, choose M here. If unsure, say N.
104632
104633+config NETFILTER_XT_MATCH_GRADM
104634+ tristate '"gradm" match support'
104635+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
104636+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
104637+ ---help---
104638+ The gradm match allows to match on grsecurity RBAC being enabled.
104639+ It is useful when iptables rules are applied early on bootup to
104640+ prevent connections to the machine (except from a trusted host)
104641+ while the RBAC system is disabled.
104642+
104643 config NETFILTER_XT_MATCH_HASHLIMIT
104644 tristate '"hashlimit" match support'
104645 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
104646diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
104647index a9571be..c59e173 100644
104648--- a/net/netfilter/Makefile
104649+++ b/net/netfilter/Makefile
104650@@ -137,6 +137,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
104651 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
104652 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
104653 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
104654+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
104655 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
104656 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
104657 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
104658diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
104659index d259da3..6a32b2c 100644
104660--- a/net/netfilter/ipset/ip_set_core.c
104661+++ b/net/netfilter/ipset/ip_set_core.c
104662@@ -1952,7 +1952,7 @@ done:
104663 return ret;
104664 }
104665
104666-static struct nf_sockopt_ops so_set __read_mostly = {
104667+static struct nf_sockopt_ops so_set = {
104668 .pf = PF_INET,
104669 .get_optmin = SO_IP_SET,
104670 .get_optmax = SO_IP_SET + 1,
104671diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
104672index b0f7b62..0541842 100644
104673--- a/net/netfilter/ipvs/ip_vs_conn.c
104674+++ b/net/netfilter/ipvs/ip_vs_conn.c
104675@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
104676 /* Increase the refcnt counter of the dest */
104677 ip_vs_dest_hold(dest);
104678
104679- conn_flags = atomic_read(&dest->conn_flags);
104680+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
104681 if (cp->protocol != IPPROTO_UDP)
104682 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
104683 flags = cp->flags;
104684@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
104685
104686 cp->control = NULL;
104687 atomic_set(&cp->n_control, 0);
104688- atomic_set(&cp->in_pkts, 0);
104689+ atomic_set_unchecked(&cp->in_pkts, 0);
104690
104691 cp->packet_xmit = NULL;
104692 cp->app = NULL;
104693@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
104694
104695 /* Don't drop the entry if its number of incoming packets is not
104696 located in [0, 8] */
104697- i = atomic_read(&cp->in_pkts);
104698+ i = atomic_read_unchecked(&cp->in_pkts);
104699 if (i > 8 || i < 0) return 0;
104700
104701 if (!todrop_rate[i]) return 0;
104702diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
104703index 990decb..5075248 100644
104704--- a/net/netfilter/ipvs/ip_vs_core.c
104705+++ b/net/netfilter/ipvs/ip_vs_core.c
104706@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
104707 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
104708 /* do not touch skb anymore */
104709
104710- atomic_inc(&cp->in_pkts);
104711+ atomic_inc_unchecked(&cp->in_pkts);
104712 ip_vs_conn_put(cp);
104713 return ret;
104714 }
104715@@ -1712,7 +1712,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
104716 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
104717 pkts = sysctl_sync_threshold(ipvs);
104718 else
104719- pkts = atomic_add_return(1, &cp->in_pkts);
104720+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104721
104722 if (ipvs->sync_state & IP_VS_STATE_MASTER)
104723 ip_vs_sync_conn(net, cp, pkts);
104724diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
104725index ac7ba68..9735acb9 100644
104726--- a/net/netfilter/ipvs/ip_vs_ctl.c
104727+++ b/net/netfilter/ipvs/ip_vs_ctl.c
104728@@ -800,7 +800,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
104729 */
104730 ip_vs_rs_hash(ipvs, dest);
104731 }
104732- atomic_set(&dest->conn_flags, conn_flags);
104733+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
104734
104735 /* bind the service */
104736 old_svc = rcu_dereference_protected(dest->svc, 1);
104737@@ -1665,7 +1665,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
104738 * align with netns init in ip_vs_control_net_init()
104739 */
104740
104741-static struct ctl_table vs_vars[] = {
104742+static ctl_table_no_const vs_vars[] __read_only = {
104743 {
104744 .procname = "amemthresh",
104745 .maxlen = sizeof(int),
104746@@ -2000,7 +2000,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104747 " %-7s %-6d %-10d %-10d\n",
104748 &dest->addr.in6,
104749 ntohs(dest->port),
104750- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104751+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104752 atomic_read(&dest->weight),
104753 atomic_read(&dest->activeconns),
104754 atomic_read(&dest->inactconns));
104755@@ -2011,7 +2011,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104756 "%-7s %-6d %-10d %-10d\n",
104757 ntohl(dest->addr.ip),
104758 ntohs(dest->port),
104759- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104760+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104761 atomic_read(&dest->weight),
104762 atomic_read(&dest->activeconns),
104763 atomic_read(&dest->inactconns));
104764@@ -2500,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
104765
104766 entry.addr = dest->addr.ip;
104767 entry.port = dest->port;
104768- entry.conn_flags = atomic_read(&dest->conn_flags);
104769+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
104770 entry.weight = atomic_read(&dest->weight);
104771 entry.u_threshold = dest->u_threshold;
104772 entry.l_threshold = dest->l_threshold;
104773@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
104774 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
104775 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
104776 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
104777- (atomic_read(&dest->conn_flags) &
104778+ (atomic_read_unchecked(&dest->conn_flags) &
104779 IP_VS_CONN_F_FWD_MASK)) ||
104780 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
104781 atomic_read(&dest->weight)) ||
104782@@ -3673,7 +3673,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
104783 {
104784 int idx;
104785 struct netns_ipvs *ipvs = net_ipvs(net);
104786- struct ctl_table *tbl;
104787+ ctl_table_no_const *tbl;
104788
104789 atomic_set(&ipvs->dropentry, 0);
104790 spin_lock_init(&ipvs->dropentry_lock);
104791diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
104792index 127f140..553d652 100644
104793--- a/net/netfilter/ipvs/ip_vs_lblc.c
104794+++ b/net/netfilter/ipvs/ip_vs_lblc.c
104795@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
104796 * IPVS LBLC sysctl table
104797 */
104798 #ifdef CONFIG_SYSCTL
104799-static struct ctl_table vs_vars_table[] = {
104800+static ctl_table_no_const vs_vars_table[] __read_only = {
104801 {
104802 .procname = "lblc_expiration",
104803 .data = NULL,
104804diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
104805index 2229d2d..b32b785 100644
104806--- a/net/netfilter/ipvs/ip_vs_lblcr.c
104807+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
104808@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
104809 * IPVS LBLCR sysctl table
104810 */
104811
104812-static struct ctl_table vs_vars_table[] = {
104813+static ctl_table_no_const vs_vars_table[] __read_only = {
104814 {
104815 .procname = "lblcr_expiration",
104816 .data = NULL,
104817diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
104818index 7162c86..9eeb60e 100644
104819--- a/net/netfilter/ipvs/ip_vs_sync.c
104820+++ b/net/netfilter/ipvs/ip_vs_sync.c
104821@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
104822 cp = cp->control;
104823 if (cp) {
104824 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104825- pkts = atomic_add_return(1, &cp->in_pkts);
104826+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104827 else
104828 pkts = sysctl_sync_threshold(ipvs);
104829 ip_vs_sync_conn(net, cp->control, pkts);
104830@@ -771,7 +771,7 @@ control:
104831 if (!cp)
104832 return;
104833 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104834- pkts = atomic_add_return(1, &cp->in_pkts);
104835+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104836 else
104837 pkts = sysctl_sync_threshold(ipvs);
104838 goto sloop;
104839@@ -901,7 +901,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
104840
104841 if (opt)
104842 memcpy(&cp->in_seq, opt, sizeof(*opt));
104843- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104844+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104845 cp->state = state;
104846 cp->old_state = cp->state;
104847 /*
104848diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
104849index bd90bf8..816a020d 100644
104850--- a/net/netfilter/ipvs/ip_vs_xmit.c
104851+++ b/net/netfilter/ipvs/ip_vs_xmit.c
104852@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
104853 else
104854 rc = NF_ACCEPT;
104855 /* do not touch skb anymore */
104856- atomic_inc(&cp->in_pkts);
104857+ atomic_inc_unchecked(&cp->in_pkts);
104858 goto out;
104859 }
104860
104861@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
104862 else
104863 rc = NF_ACCEPT;
104864 /* do not touch skb anymore */
104865- atomic_inc(&cp->in_pkts);
104866+ atomic_inc_unchecked(&cp->in_pkts);
104867 goto out;
104868 }
104869
104870diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
104871index a4b5e2a..13b1de3 100644
104872--- a/net/netfilter/nf_conntrack_acct.c
104873+++ b/net/netfilter/nf_conntrack_acct.c
104874@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
104875 #ifdef CONFIG_SYSCTL
104876 static int nf_conntrack_acct_init_sysctl(struct net *net)
104877 {
104878- struct ctl_table *table;
104879+ ctl_table_no_const *table;
104880
104881 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
104882 GFP_KERNEL);
104883diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
104884index c588012..b0d4ef8 100644
104885--- a/net/netfilter/nf_conntrack_core.c
104886+++ b/net/netfilter/nf_conntrack_core.c
104887@@ -1737,6 +1737,10 @@ void nf_conntrack_init_end(void)
104888 #define DYING_NULLS_VAL ((1<<30)+1)
104889 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
104890
104891+#ifdef CONFIG_GRKERNSEC_HIDESYM
104892+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
104893+#endif
104894+
104895 int nf_conntrack_init_net(struct net *net)
104896 {
104897 int ret = -ENOMEM;
104898@@ -1762,7 +1766,11 @@ int nf_conntrack_init_net(struct net *net)
104899 if (!net->ct.stat)
104900 goto err_pcpu_lists;
104901
104902+#ifdef CONFIG_GRKERNSEC_HIDESYM
104903+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
104904+#else
104905 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
104906+#endif
104907 if (!net->ct.slabname)
104908 goto err_slabname;
104909
104910diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
104911index 4e78c57..ec8fb74 100644
104912--- a/net/netfilter/nf_conntrack_ecache.c
104913+++ b/net/netfilter/nf_conntrack_ecache.c
104914@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
104915 #ifdef CONFIG_SYSCTL
104916 static int nf_conntrack_event_init_sysctl(struct net *net)
104917 {
104918- struct ctl_table *table;
104919+ ctl_table_no_const *table;
104920
104921 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
104922 GFP_KERNEL);
104923diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
104924index 5b3eae7..dd4b8fe 100644
104925--- a/net/netfilter/nf_conntrack_helper.c
104926+++ b/net/netfilter/nf_conntrack_helper.c
104927@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
104928
104929 static int nf_conntrack_helper_init_sysctl(struct net *net)
104930 {
104931- struct ctl_table *table;
104932+ ctl_table_no_const *table;
104933
104934 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
104935 GFP_KERNEL);
104936diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
104937index b65d586..beec902 100644
104938--- a/net/netfilter/nf_conntrack_proto.c
104939+++ b/net/netfilter/nf_conntrack_proto.c
104940@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
104941
104942 static void
104943 nf_ct_unregister_sysctl(struct ctl_table_header **header,
104944- struct ctl_table **table,
104945+ ctl_table_no_const **table,
104946 unsigned int users)
104947 {
104948 if (users > 0)
104949diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
104950index cf65a1e..2f291e9 100644
104951--- a/net/netfilter/nf_conntrack_standalone.c
104952+++ b/net/netfilter/nf_conntrack_standalone.c
104953@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
104954
104955 static int nf_conntrack_standalone_init_sysctl(struct net *net)
104956 {
104957- struct ctl_table *table;
104958+ ctl_table_no_const *table;
104959
104960 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
104961 GFP_KERNEL);
104962diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
104963index 7a394df..bd91a8a 100644
104964--- a/net/netfilter/nf_conntrack_timestamp.c
104965+++ b/net/netfilter/nf_conntrack_timestamp.c
104966@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
104967 #ifdef CONFIG_SYSCTL
104968 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
104969 {
104970- struct ctl_table *table;
104971+ ctl_table_no_const *table;
104972
104973 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
104974 GFP_KERNEL);
104975diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
104976index d719764..311bc60 100644
104977--- a/net/netfilter/nf_log.c
104978+++ b/net/netfilter/nf_log.c
104979@@ -353,7 +353,7 @@ static const struct file_operations nflog_file_ops = {
104980
104981 #ifdef CONFIG_SYSCTL
104982 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
104983-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
104984+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
104985
104986 static int nf_log_proc_dostring(struct ctl_table *table, int write,
104987 void __user *buffer, size_t *lenp, loff_t *ppos)
104988@@ -384,14 +384,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
104989 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
104990 mutex_unlock(&nf_log_mutex);
104991 } else {
104992+ ctl_table_no_const nf_log_table = *table;
104993+
104994 mutex_lock(&nf_log_mutex);
104995 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
104996 lockdep_is_held(&nf_log_mutex));
104997 if (!logger)
104998- table->data = "NONE";
104999+ nf_log_table.data = "NONE";
105000 else
105001- table->data = logger->name;
105002- r = proc_dostring(table, write, buffer, lenp, ppos);
105003+ nf_log_table.data = logger->name;
105004+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
105005 mutex_unlock(&nf_log_mutex);
105006 }
105007
105008diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
105009index c68c1e5..8b5d670 100644
105010--- a/net/netfilter/nf_sockopt.c
105011+++ b/net/netfilter/nf_sockopt.c
105012@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
105013 }
105014 }
105015
105016- list_add(&reg->list, &nf_sockopts);
105017+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
105018 out:
105019 mutex_unlock(&nf_sockopt_mutex);
105020 return ret;
105021@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
105022 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
105023 {
105024 mutex_lock(&nf_sockopt_mutex);
105025- list_del(&reg->list);
105026+ pax_list_del((struct list_head *)&reg->list);
105027 mutex_unlock(&nf_sockopt_mutex);
105028 }
105029 EXPORT_SYMBOL(nf_unregister_sockopt);
105030diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
105031index 5f1be5b..2cba8cd 100644
105032--- a/net/netfilter/nfnetlink_log.c
105033+++ b/net/netfilter/nfnetlink_log.c
105034@@ -80,7 +80,7 @@ static int nfnl_log_net_id __read_mostly;
105035 struct nfnl_log_net {
105036 spinlock_t instances_lock;
105037 struct hlist_head instance_table[INSTANCE_BUCKETS];
105038- atomic_t global_seq;
105039+ atomic_unchecked_t global_seq;
105040 };
105041
105042 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
105043@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
105044 /* global sequence number */
105045 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
105046 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
105047- htonl(atomic_inc_return(&log->global_seq))))
105048+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
105049 goto nla_put_failure;
105050
105051 if (data_len) {
105052diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
105053new file mode 100644
105054index 0000000..c566332
105055--- /dev/null
105056+++ b/net/netfilter/xt_gradm.c
105057@@ -0,0 +1,51 @@
105058+/*
105059+ * gradm match for netfilter
105060