]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.0-3.12.7-201401131812.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.12.7-201401131812.patch
CommitLineData
e0fa61e2
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index b89a739..79768fb 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -48,14 +51,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@@ -69,9 +75,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@@ -80,6 +88,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@@ -92,19 +101,24 @@ 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@@ -115,9 +129,11 @@ devlist.h*
90 dnotify_test
91 docproc
92 dslm
93+dtc-lexer.lex.c
94 elf2ecoff
95 elfconfig.h*
96 evergreen_reg_safe.h
97+exception_policy.conf
98 fixdep
99 flask.h
100 fore200e_mkfirm
101@@ -125,12 +141,15 @@ fore200e_pca_fw.c*
102 gconf
103 gconf.glade.h
104 gen-devlist
105+gen-kdb_cmds.c
106 gen_crc32table
107 gen_init_cpio
108 generated
109 genheaders
110 genksyms
111 *_gray256.c
112+hash
113+hid-example
114 hpet_example
115 hugepage-mmap
116 hugepage-shm
117@@ -145,14 +164,14 @@ int32.c
118 int4.c
119 int8.c
120 kallsyms
121-kconfig
122+kern_constants.h
123 keywords.c
124 ksym.c*
125 ksym.h*
126 kxgettext
127 lex.c
128 lex.*.c
129-linux
130+lib1funcs.S
131 logo_*.c
132 logo_*_clut224.c
133 logo_*_mono.c
134@@ -162,14 +181,15 @@ mach-types.h
135 machtypes.h
136 map
137 map_hugetlb
138-media
139 mconf
140+mdp
141 miboot*
142 mk_elfconfig
143 mkboot
144 mkbugboot
145 mkcpustr
146 mkdep
147+mkpiggy
148 mkprep
149 mkregtable
150 mktables
151@@ -185,6 +205,8 @@ oui.c*
152 page-types
153 parse.c
154 parse.h
155+parse-events*
156+pasyms.h
157 patches*
158 pca200e.bin
159 pca200e_ecd.bin2
160@@ -194,6 +216,7 @@ perf-archive
161 piggyback
162 piggy.gzip
163 piggy.S
164+pmu-*
165 pnmtologo
166 ppc_defs.h*
167 pss_boot.h
168@@ -203,7 +226,10 @@ r200_reg_safe.h
169 r300_reg_safe.h
170 r420_reg_safe.h
171 r600_reg_safe.h
172+realmode.lds
173+realmode.relocs
174 recordmcount
175+regdb.c
176 relocs
177 rlim_names.h
178 rn50_reg_safe.h
179@@ -213,8 +239,12 @@ series
180 setup
181 setup.bin
182 setup.elf
183+signing_key*
184+size_overflow_hash.h
185 sImage
186+slabinfo
187 sm_tbl*
188+sortextable
189 split-include
190 syscalltab.h
191 tables.c
192@@ -224,6 +254,7 @@ tftpboot.img
193 timeconst.h
194 times.h*
195 trix_boot.h
196+user_constants.h
197 utsrelease.h*
198 vdso-syms.lds
199 vdso.lds
200@@ -235,13 +266,17 @@ vdso32.lds
201 vdso32.so.dbg
202 vdso64.lds
203 vdso64.so.dbg
204+vdsox32.lds
205+vdsox32-syms.lds
206 version.h*
207 vmImage
208 vmlinux
209 vmlinux-*
210 vmlinux.aout
211 vmlinux.bin.all
212+vmlinux.bin.bz2
213 vmlinux.lds
214+vmlinux.relocs
215 vmlinuz
216 voffset.h
217 vsyscall.lds
218@@ -249,9 +284,12 @@ vsyscall_32.lds
219 wanxlfw.inc
220 uImage
221 unifdef
222+utsrelease.h
223 wakeup.bin
224 wakeup.elf
225 wakeup.lds
226+x509*
227 zImage*
228 zconf.hash.c
229+zconf.lex.c
230 zoffset.h
231diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
232index 4f7c57c..a2dc685 100644
233--- a/Documentation/kernel-parameters.txt
234+++ b/Documentation/kernel-parameters.txt
235@@ -1031,6 +1031,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
236 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
237 Default: 1024
238
239+ grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
240+ ignore grsecurity's /proc restrictions
241+
242+
243 hashdist= [KNL,NUMA] Large hashes allocated during boot
244 are distributed across NUMA nodes. Defaults on
245 for 64-bit NUMA, off otherwise.
246@@ -2001,6 +2005,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
247 noexec=on: enable non-executable mappings (default)
248 noexec=off: disable non-executable mappings
249
250+ nopcid [X86-64]
251+ Disable PCID (Process-Context IDentifier) even if it
252+ is supported by the processor.
253+
254 nosmap [X86]
255 Disable SMAP (Supervisor Mode Access Prevention)
256 even if it is supported by processor.
257@@ -2268,6 +2276,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
258 the specified number of seconds. This is to be used if
259 your oopses keep scrolling off the screen.
260
261+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
262+ virtualization environments that don't cope well with the
263+ expand down segment used by UDEREF on X86-32 or the frequent
264+ page table updates on X86-64.
265+
266+ pax_sanitize_slab=
267+ 0/1 to disable/enable slab object sanitization (enabled by
268+ default).
269+
270+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
271+
272+ pax_extra_latent_entropy
273+ Enable a very simple form of latent entropy extraction
274+ from the first 4GB of memory as the bootmem allocator
275+ passes the memory pages to the buddy allocator.
276+
277+ pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
278+ when the processor supports PCID.
279+
280 pcbit= [HW,ISDN]
281
282 pcd. [PARIDE]
283diff --git a/Makefile b/Makefile
284index c2f0b79..2e5e090 100644
285--- a/Makefile
286+++ b/Makefile
287@@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
288
289 HOSTCC = gcc
290 HOSTCXX = g++
291-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
292-HOSTCXXFLAGS = -O2
293+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
294+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
295+HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
296
297 # Decide whether to build built-in, modular, or both.
298 # Normally, just do built-in.
299@@ -414,8 +415,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
300 # Rules shared between *config targets and build targets
301
302 # Basic helpers built in scripts/
303-PHONY += scripts_basic
304-scripts_basic:
305+PHONY += scripts_basic gcc-plugins
306+scripts_basic: gcc-plugins
307 $(Q)$(MAKE) $(build)=scripts/basic
308 $(Q)rm -f .tmp_quiet_recordmcount
309
310@@ -576,6 +577,65 @@ else
311 KBUILD_CFLAGS += -O2
312 endif
313
314+ifndef DISABLE_PAX_PLUGINS
315+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
316+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
317+else
318+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
319+endif
320+ifneq ($(PLUGINCC),)
321+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
322+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
323+endif
324+ifdef CONFIG_PAX_MEMORY_STACKLEAK
325+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
326+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
327+endif
328+ifdef CONFIG_KALLOCSTAT_PLUGIN
329+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
330+endif
331+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
332+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
333+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
334+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
335+endif
336+ifdef CONFIG_CHECKER_PLUGIN
337+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
338+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
339+endif
340+endif
341+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
342+ifdef CONFIG_PAX_SIZE_OVERFLOW
343+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
344+endif
345+ifdef CONFIG_PAX_LATENT_ENTROPY
346+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
347+endif
348+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
349+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
350+endif
351+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
352+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
353+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
354+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
355+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN
356+ifeq ($(KBUILD_EXTMOD),)
357+gcc-plugins:
358+ $(Q)$(MAKE) $(build)=tools/gcc
359+else
360+gcc-plugins: ;
361+endif
362+else
363+gcc-plugins:
364+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
365+ $(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.))
366+else
367+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
368+endif
369+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
370+endif
371+endif
372+
373 include $(srctree)/arch/$(SRCARCH)/Makefile
374
375 ifdef CONFIG_READABLE_ASM
376@@ -733,7 +793,7 @@ export mod_sign_cmd
377
378
379 ifeq ($(KBUILD_EXTMOD),)
380-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
381+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
382
383 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
384 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
385@@ -782,6 +842,8 @@ endif
386
387 # The actual objects are generated when descending,
388 # make sure no implicit rule kicks in
389+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
390+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
391 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
392
393 # Handle descending into subdirectories listed in $(vmlinux-dirs)
394@@ -791,7 +853,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
395 # Error messages still appears in the original language
396
397 PHONY += $(vmlinux-dirs)
398-$(vmlinux-dirs): prepare scripts
399+$(vmlinux-dirs): gcc-plugins prepare scripts
400 $(Q)$(MAKE) $(build)=$@
401
402 define filechk_kernel.release
403@@ -838,6 +900,7 @@ prepare0: archprepare FORCE
404 $(Q)$(MAKE) $(build)=.
405
406 # All the preparing..
407+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
408 prepare: prepare0
409
410 # Generate some files
411@@ -945,6 +1008,8 @@ all: modules
412 # using awk while concatenating to the final file.
413
414 PHONY += modules
415+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
416+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
417 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
418 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
419 @$(kecho) ' Building modules, stage 2.';
420@@ -960,7 +1025,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
421
422 # Target to prepare building external modules
423 PHONY += modules_prepare
424-modules_prepare: prepare scripts
425+modules_prepare: gcc-plugins prepare scripts
426
427 # Target to install modules
428 PHONY += modules_install
429@@ -1026,7 +1091,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
430 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
431 signing_key.priv signing_key.x509 x509.genkey \
432 extra_certificates signing_key.x509.keyid \
433- signing_key.x509.signer
434+ signing_key.x509.signer tools/gcc/size_overflow_hash.h
435
436 # clean - Delete most, but leave enough to build external modules
437 #
438@@ -1066,6 +1131,7 @@ distclean: mrproper
439 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
440 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
441 -o -name '.*.rej' \
442+ -o -name '.*.rej' -o -name '*.so' \
443 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
444 -type f -print | xargs rm -f
445
446@@ -1227,6 +1293,8 @@ PHONY += $(module-dirs) modules
447 $(module-dirs): crmodverdir $(objtree)/Module.symvers
448 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
449
450+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
451+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
452 modules: $(module-dirs)
453 @$(kecho) ' Building modules, stage 2.';
454 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
455@@ -1366,17 +1434,21 @@ else
456 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
457 endif
458
459-%.s: %.c prepare scripts FORCE
460+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
461+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
462+%.s: %.c gcc-plugins prepare scripts FORCE
463 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
464 %.i: %.c prepare scripts FORCE
465 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
466-%.o: %.c prepare scripts FORCE
467+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
468+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
469+%.o: %.c gcc-plugins prepare scripts FORCE
470 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
471 %.lst: %.c prepare scripts FORCE
472 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
473-%.s: %.S prepare scripts FORCE
474+%.s: %.S gcc-plugins prepare scripts FORCE
475 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
476-%.o: %.S prepare scripts FORCE
477+%.o: %.S gcc-plugins prepare scripts FORCE
478 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
479 %.symtypes: %.c prepare scripts FORCE
480 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
481@@ -1386,11 +1458,15 @@ endif
482 $(cmd_crmodverdir)
483 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
484 $(build)=$(build-dir)
485-%/: prepare scripts FORCE
486+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
487+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
488+%/: gcc-plugins prepare scripts FORCE
489 $(cmd_crmodverdir)
490 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
491 $(build)=$(build-dir)
492-%.ko: prepare scripts FORCE
493+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
494+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
495+%.ko: gcc-plugins prepare scripts FORCE
496 $(cmd_crmodverdir)
497 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
498 $(build)=$(build-dir) $(@:.ko=.o)
499diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
500index 78b03ef..da28a51 100644
501--- a/arch/alpha/include/asm/atomic.h
502+++ b/arch/alpha/include/asm/atomic.h
503@@ -292,6 +292,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
504 #define atomic_dec(v) atomic_sub(1,(v))
505 #define atomic64_dec(v) atomic64_sub(1,(v))
506
507+#define atomic64_read_unchecked(v) atomic64_read(v)
508+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
509+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
510+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
511+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
512+#define atomic64_inc_unchecked(v) atomic64_inc(v)
513+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
514+#define atomic64_dec_unchecked(v) atomic64_dec(v)
515+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
516+
517 #define smp_mb__before_atomic_dec() smp_mb()
518 #define smp_mb__after_atomic_dec() smp_mb()
519 #define smp_mb__before_atomic_inc() smp_mb()
520diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
521index ad368a9..fbe0f25 100644
522--- a/arch/alpha/include/asm/cache.h
523+++ b/arch/alpha/include/asm/cache.h
524@@ -4,19 +4,19 @@
525 #ifndef __ARCH_ALPHA_CACHE_H
526 #define __ARCH_ALPHA_CACHE_H
527
528+#include <linux/const.h>
529
530 /* Bytes per L1 (data) cache line. */
531 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
532-# define L1_CACHE_BYTES 64
533 # define L1_CACHE_SHIFT 6
534 #else
535 /* Both EV4 and EV5 are write-through, read-allocate,
536 direct-mapped, physical.
537 */
538-# define L1_CACHE_BYTES 32
539 # define L1_CACHE_SHIFT 5
540 #endif
541
542+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
543 #define SMP_CACHE_BYTES L1_CACHE_BYTES
544
545 #endif
546diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
547index 968d999..d36b2df 100644
548--- a/arch/alpha/include/asm/elf.h
549+++ b/arch/alpha/include/asm/elf.h
550@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
551
552 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
553
554+#ifdef CONFIG_PAX_ASLR
555+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
556+
557+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
558+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
559+#endif
560+
561 /* $0 is set by ld.so to a pointer to a function which might be
562 registered using atexit. This provides a mean for the dynamic
563 linker to call DT_FINI functions for shared libraries that have
564diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
565index bc2a0da..8ad11ee 100644
566--- a/arch/alpha/include/asm/pgalloc.h
567+++ b/arch/alpha/include/asm/pgalloc.h
568@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
569 pgd_set(pgd, pmd);
570 }
571
572+static inline void
573+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
574+{
575+ pgd_populate(mm, pgd, pmd);
576+}
577+
578 extern pgd_t *pgd_alloc(struct mm_struct *mm);
579
580 static inline void
581diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
582index d8f9b7e..f6222fa 100644
583--- a/arch/alpha/include/asm/pgtable.h
584+++ b/arch/alpha/include/asm/pgtable.h
585@@ -102,6 +102,17 @@ struct vm_area_struct;
586 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
587 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
588 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
589+
590+#ifdef CONFIG_PAX_PAGEEXEC
591+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
592+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
593+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
594+#else
595+# define PAGE_SHARED_NOEXEC PAGE_SHARED
596+# define PAGE_COPY_NOEXEC PAGE_COPY
597+# define PAGE_READONLY_NOEXEC PAGE_READONLY
598+#endif
599+
600 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
601
602 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
603diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
604index 2fd00b7..cfd5069 100644
605--- a/arch/alpha/kernel/module.c
606+++ b/arch/alpha/kernel/module.c
607@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
608
609 /* The small sections were sorted to the end of the segment.
610 The following should definitely cover them. */
611- gp = (u64)me->module_core + me->core_size - 0x8000;
612+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
613 got = sechdrs[me->arch.gotsecindex].sh_addr;
614
615 for (i = 0; i < n; i++) {
616diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
617index 1402fcc..0b1abd2 100644
618--- a/arch/alpha/kernel/osf_sys.c
619+++ b/arch/alpha/kernel/osf_sys.c
620@@ -1298,10 +1298,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
621 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
622
623 static unsigned long
624-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
625- unsigned long limit)
626+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
627+ unsigned long limit, unsigned long flags)
628 {
629 struct vm_unmapped_area_info info;
630+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
631
632 info.flags = 0;
633 info.length = len;
634@@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
635 info.high_limit = limit;
636 info.align_mask = 0;
637 info.align_offset = 0;
638+ info.threadstack_offset = offset;
639 return vm_unmapped_area(&info);
640 }
641
642@@ -1341,20 +1343,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
643 merely specific addresses, but regions of memory -- perhaps
644 this feature should be incorporated into all ports? */
645
646+#ifdef CONFIG_PAX_RANDMMAP
647+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
648+#endif
649+
650 if (addr) {
651- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
652+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
653 if (addr != (unsigned long) -ENOMEM)
654 return addr;
655 }
656
657 /* Next, try allocating at TASK_UNMAPPED_BASE. */
658- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
659- len, limit);
660+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
661+
662 if (addr != (unsigned long) -ENOMEM)
663 return addr;
664
665 /* Finally, try allocating in low memory. */
666- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
667+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
668
669 return addr;
670 }
671diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
672index 98838a0..b304fb4 100644
673--- a/arch/alpha/mm/fault.c
674+++ b/arch/alpha/mm/fault.c
675@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
676 __reload_thread(pcb);
677 }
678
679+#ifdef CONFIG_PAX_PAGEEXEC
680+/*
681+ * PaX: decide what to do with offenders (regs->pc = fault address)
682+ *
683+ * returns 1 when task should be killed
684+ * 2 when patched PLT trampoline was detected
685+ * 3 when unpatched PLT trampoline was detected
686+ */
687+static int pax_handle_fetch_fault(struct pt_regs *regs)
688+{
689+
690+#ifdef CONFIG_PAX_EMUPLT
691+ int err;
692+
693+ do { /* PaX: patched PLT emulation #1 */
694+ unsigned int ldah, ldq, jmp;
695+
696+ err = get_user(ldah, (unsigned int *)regs->pc);
697+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
698+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
699+
700+ if (err)
701+ break;
702+
703+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
704+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
705+ jmp == 0x6BFB0000U)
706+ {
707+ unsigned long r27, addr;
708+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
709+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
710+
711+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
712+ err = get_user(r27, (unsigned long *)addr);
713+ if (err)
714+ break;
715+
716+ regs->r27 = r27;
717+ regs->pc = r27;
718+ return 2;
719+ }
720+ } while (0);
721+
722+ do { /* PaX: patched PLT emulation #2 */
723+ unsigned int ldah, lda, br;
724+
725+ err = get_user(ldah, (unsigned int *)regs->pc);
726+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
727+ err |= get_user(br, (unsigned int *)(regs->pc+8));
728+
729+ if (err)
730+ break;
731+
732+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
733+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
734+ (br & 0xFFE00000U) == 0xC3E00000U)
735+ {
736+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
737+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
738+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
739+
740+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
741+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
742+ return 2;
743+ }
744+ } while (0);
745+
746+ do { /* PaX: unpatched PLT emulation */
747+ unsigned int br;
748+
749+ err = get_user(br, (unsigned int *)regs->pc);
750+
751+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
752+ unsigned int br2, ldq, nop, jmp;
753+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
754+
755+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
756+ err = get_user(br2, (unsigned int *)addr);
757+ err |= get_user(ldq, (unsigned int *)(addr+4));
758+ err |= get_user(nop, (unsigned int *)(addr+8));
759+ err |= get_user(jmp, (unsigned int *)(addr+12));
760+ err |= get_user(resolver, (unsigned long *)(addr+16));
761+
762+ if (err)
763+ break;
764+
765+ if (br2 == 0xC3600000U &&
766+ ldq == 0xA77B000CU &&
767+ nop == 0x47FF041FU &&
768+ jmp == 0x6B7B0000U)
769+ {
770+ regs->r28 = regs->pc+4;
771+ regs->r27 = addr+16;
772+ regs->pc = resolver;
773+ return 3;
774+ }
775+ }
776+ } while (0);
777+#endif
778+
779+ return 1;
780+}
781+
782+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
783+{
784+ unsigned long i;
785+
786+ printk(KERN_ERR "PAX: bytes at PC: ");
787+ for (i = 0; i < 5; i++) {
788+ unsigned int c;
789+ if (get_user(c, (unsigned int *)pc+i))
790+ printk(KERN_CONT "???????? ");
791+ else
792+ printk(KERN_CONT "%08x ", c);
793+ }
794+ printk("\n");
795+}
796+#endif
797
798 /*
799 * This routine handles page faults. It determines the address,
800@@ -133,8 +251,29 @@ retry:
801 good_area:
802 si_code = SEGV_ACCERR;
803 if (cause < 0) {
804- if (!(vma->vm_flags & VM_EXEC))
805+ if (!(vma->vm_flags & VM_EXEC)) {
806+
807+#ifdef CONFIG_PAX_PAGEEXEC
808+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
809+ goto bad_area;
810+
811+ up_read(&mm->mmap_sem);
812+ switch (pax_handle_fetch_fault(regs)) {
813+
814+#ifdef CONFIG_PAX_EMUPLT
815+ case 2:
816+ case 3:
817+ return;
818+#endif
819+
820+ }
821+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
822+ do_group_exit(SIGKILL);
823+#else
824 goto bad_area;
825+#endif
826+
827+ }
828 } else if (!cause) {
829 /* Allow reads even for write-only mappings */
830 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
831diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
832index 1ad6fb6..9406b3d 100644
833--- a/arch/arm/Kconfig
834+++ b/arch/arm/Kconfig
835@@ -1832,7 +1832,7 @@ config ALIGNMENT_TRAP
836
837 config UACCESS_WITH_MEMCPY
838 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
839- depends on MMU
840+ depends on MMU && !PAX_MEMORY_UDEREF
841 default y if CPU_FEROCEON
842 help
843 Implement faster copy_to_user and clear_user methods for CPU
844@@ -2097,6 +2097,7 @@ config XIP_PHYS_ADDR
845 config KEXEC
846 bool "Kexec system call (EXPERIMENTAL)"
847 depends on (!SMP || PM_SLEEP_SMP)
848+ depends on !GRKERNSEC_KMEM
849 help
850 kexec is a system call that implements the ability to shutdown your
851 current kernel, and to start another kernel. It is like a reboot
852diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
853index da1c77d..2ee6056 100644
854--- a/arch/arm/include/asm/atomic.h
855+++ b/arch/arm/include/asm/atomic.h
856@@ -17,17 +17,35 @@
857 #include <asm/barrier.h>
858 #include <asm/cmpxchg.h>
859
860+#ifdef CONFIG_GENERIC_ATOMIC64
861+#include <asm-generic/atomic64.h>
862+#endif
863+
864 #define ATOMIC_INIT(i) { (i) }
865
866 #ifdef __KERNEL__
867
868+#define _ASM_EXTABLE(from, to) \
869+" .pushsection __ex_table,\"a\"\n"\
870+" .align 3\n" \
871+" .long " #from ", " #to"\n" \
872+" .popsection"
873+
874 /*
875 * On ARM, ordinary assignment (str instruction) doesn't clear the local
876 * strex/ldrex monitor on some implementations. The reason we can use it for
877 * atomic_set() is the clrex or dummy strex done on every exception return.
878 */
879 #define atomic_read(v) (*(volatile int *)&(v)->counter)
880+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
881+{
882+ return v->counter;
883+}
884 #define atomic_set(v,i) (((v)->counter) = (i))
885+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
886+{
887+ v->counter = i;
888+}
889
890 #if __LINUX_ARM_ARCH__ >= 6
891
892@@ -42,6 +60,35 @@ static inline void atomic_add(int i, atomic_t *v)
893 int result;
894
895 __asm__ __volatile__("@ atomic_add\n"
896+"1: ldrex %1, [%3]\n"
897+" adds %0, %1, %4\n"
898+
899+#ifdef CONFIG_PAX_REFCOUNT
900+" bvc 3f\n"
901+"2: bkpt 0xf103\n"
902+"3:\n"
903+#endif
904+
905+" strex %1, %0, [%3]\n"
906+" teq %1, #0\n"
907+" bne 1b"
908+
909+#ifdef CONFIG_PAX_REFCOUNT
910+"\n4:\n"
911+ _ASM_EXTABLE(2b, 4b)
912+#endif
913+
914+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
915+ : "r" (&v->counter), "Ir" (i)
916+ : "cc");
917+}
918+
919+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
920+{
921+ unsigned long tmp;
922+ int result;
923+
924+ __asm__ __volatile__("@ atomic_add_unchecked\n"
925 "1: ldrex %0, [%3]\n"
926 " add %0, %0, %4\n"
927 " strex %1, %0, [%3]\n"
928@@ -60,6 +107,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
929 smp_mb();
930
931 __asm__ __volatile__("@ atomic_add_return\n"
932+"1: ldrex %1, [%3]\n"
933+" adds %0, %1, %4\n"
934+
935+#ifdef CONFIG_PAX_REFCOUNT
936+" bvc 3f\n"
937+" mov %0, %1\n"
938+"2: bkpt 0xf103\n"
939+"3:\n"
940+#endif
941+
942+" strex %1, %0, [%3]\n"
943+" teq %1, #0\n"
944+" bne 1b"
945+
946+#ifdef CONFIG_PAX_REFCOUNT
947+"\n4:\n"
948+ _ASM_EXTABLE(2b, 4b)
949+#endif
950+
951+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
952+ : "r" (&v->counter), "Ir" (i)
953+ : "cc");
954+
955+ smp_mb();
956+
957+ return result;
958+}
959+
960+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
961+{
962+ unsigned long tmp;
963+ int result;
964+
965+ smp_mb();
966+
967+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
968 "1: ldrex %0, [%3]\n"
969 " add %0, %0, %4\n"
970 " strex %1, %0, [%3]\n"
971@@ -80,6 +163,35 @@ static inline void atomic_sub(int i, atomic_t *v)
972 int result;
973
974 __asm__ __volatile__("@ atomic_sub\n"
975+"1: ldrex %1, [%3]\n"
976+" subs %0, %1, %4\n"
977+
978+#ifdef CONFIG_PAX_REFCOUNT
979+" bvc 3f\n"
980+"2: bkpt 0xf103\n"
981+"3:\n"
982+#endif
983+
984+" strex %1, %0, [%3]\n"
985+" teq %1, #0\n"
986+" bne 1b"
987+
988+#ifdef CONFIG_PAX_REFCOUNT
989+"\n4:\n"
990+ _ASM_EXTABLE(2b, 4b)
991+#endif
992+
993+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
994+ : "r" (&v->counter), "Ir" (i)
995+ : "cc");
996+}
997+
998+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
999+{
1000+ unsigned long tmp;
1001+ int result;
1002+
1003+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
1004 "1: ldrex %0, [%3]\n"
1005 " sub %0, %0, %4\n"
1006 " strex %1, %0, [%3]\n"
1007@@ -98,11 +210,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1008 smp_mb();
1009
1010 __asm__ __volatile__("@ atomic_sub_return\n"
1011-"1: ldrex %0, [%3]\n"
1012-" sub %0, %0, %4\n"
1013+"1: ldrex %1, [%3]\n"
1014+" subs %0, %1, %4\n"
1015+
1016+#ifdef CONFIG_PAX_REFCOUNT
1017+" bvc 3f\n"
1018+" mov %0, %1\n"
1019+"2: bkpt 0xf103\n"
1020+"3:\n"
1021+#endif
1022+
1023 " strex %1, %0, [%3]\n"
1024 " teq %1, #0\n"
1025 " bne 1b"
1026+
1027+#ifdef CONFIG_PAX_REFCOUNT
1028+"\n4:\n"
1029+ _ASM_EXTABLE(2b, 4b)
1030+#endif
1031+
1032 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1033 : "r" (&v->counter), "Ir" (i)
1034 : "cc");
1035@@ -134,6 +260,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1036 return oldval;
1037 }
1038
1039+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1040+{
1041+ unsigned long oldval, res;
1042+
1043+ smp_mb();
1044+
1045+ do {
1046+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1047+ "ldrex %1, [%3]\n"
1048+ "mov %0, #0\n"
1049+ "teq %1, %4\n"
1050+ "strexeq %0, %5, [%3]\n"
1051+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1052+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1053+ : "cc");
1054+ } while (res);
1055+
1056+ smp_mb();
1057+
1058+ return oldval;
1059+}
1060+
1061 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1062 {
1063 unsigned long tmp, tmp2;
1064@@ -167,7 +315,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
1065
1066 return val;
1067 }
1068+
1069+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
1070+{
1071+ return atomic_add_return(i, v);
1072+}
1073+
1074 #define atomic_add(i, v) (void) atomic_add_return(i, v)
1075+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
1076+{
1077+ (void) atomic_add_return(i, v);
1078+}
1079
1080 static inline int atomic_sub_return(int i, atomic_t *v)
1081 {
1082@@ -182,6 +340,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1083 return val;
1084 }
1085 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
1086+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1087+{
1088+ (void) atomic_sub_return(i, v);
1089+}
1090
1091 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1092 {
1093@@ -197,6 +359,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1094 return ret;
1095 }
1096
1097+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1098+{
1099+ return atomic_cmpxchg(v, old, new);
1100+}
1101+
1102 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1103 {
1104 unsigned long flags;
1105@@ -209,6 +376,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1106 #endif /* __LINUX_ARM_ARCH__ */
1107
1108 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1109+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1110+{
1111+ return xchg(&v->counter, new);
1112+}
1113
1114 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1115 {
1116@@ -221,11 +392,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1117 }
1118
1119 #define atomic_inc(v) atomic_add(1, v)
1120+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1121+{
1122+ atomic_add_unchecked(1, v);
1123+}
1124 #define atomic_dec(v) atomic_sub(1, v)
1125+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1126+{
1127+ atomic_sub_unchecked(1, v);
1128+}
1129
1130 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1131+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1132+{
1133+ return atomic_add_return_unchecked(1, v) == 0;
1134+}
1135 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1136 #define atomic_inc_return(v) (atomic_add_return(1, v))
1137+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1138+{
1139+ return atomic_add_return_unchecked(1, v);
1140+}
1141 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1142 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1143
1144@@ -241,6 +428,14 @@ typedef struct {
1145 u64 __aligned(8) counter;
1146 } atomic64_t;
1147
1148+#ifdef CONFIG_PAX_REFCOUNT
1149+typedef struct {
1150+ u64 __aligned(8) counter;
1151+} atomic64_unchecked_t;
1152+#else
1153+typedef atomic64_t atomic64_unchecked_t;
1154+#endif
1155+
1156 #define ATOMIC64_INIT(i) { (i) }
1157
1158 #ifdef CONFIG_ARM_LPAE
1159@@ -257,6 +452,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
1160 return result;
1161 }
1162
1163+static inline u64 atomic64_read_unchecked(const atomic64_unchecked_t *v)
1164+{
1165+ u64 result;
1166+
1167+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1168+" ldrd %0, %H0, [%1]"
1169+ : "=&r" (result)
1170+ : "r" (&v->counter), "Qo" (v->counter)
1171+ );
1172+
1173+ return result;
1174+}
1175+
1176 static inline void atomic64_set(atomic64_t *v, u64 i)
1177 {
1178 __asm__ __volatile__("@ atomic64_set\n"
1179@@ -265,6 +473,15 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1180 : "r" (&v->counter), "r" (i)
1181 );
1182 }
1183+
1184+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1185+{
1186+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1187+" strd %2, %H2, [%1]"
1188+ : "=Qo" (v->counter)
1189+ : "r" (&v->counter), "r" (i)
1190+ );
1191+}
1192 #else
1193 static inline u64 atomic64_read(const atomic64_t *v)
1194 {
1195@@ -279,6 +496,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
1196 return result;
1197 }
1198
1199+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
1200+{
1201+ u64 result;
1202+
1203+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1204+" ldrexd %0, %H0, [%1]"
1205+ : "=&r" (result)
1206+ : "r" (&v->counter), "Qo" (v->counter)
1207+ );
1208+
1209+ return result;
1210+}
1211+
1212 static inline void atomic64_set(atomic64_t *v, u64 i)
1213 {
1214 u64 tmp;
1215@@ -292,6 +522,21 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1216 : "r" (&v->counter), "r" (i)
1217 : "cc");
1218 }
1219+
1220+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1221+{
1222+ u64 tmp;
1223+
1224+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1225+"1: ldrexd %0, %H0, [%2]\n"
1226+" strexd %0, %3, %H3, [%2]\n"
1227+" teq %0, #0\n"
1228+" bne 1b"
1229+ : "=&r" (tmp), "=Qo" (v->counter)
1230+ : "r" (&v->counter), "r" (i)
1231+ : "cc");
1232+}
1233+
1234 #endif
1235
1236 static inline void atomic64_add(u64 i, atomic64_t *v)
1237@@ -302,6 +547,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1238 __asm__ __volatile__("@ atomic64_add\n"
1239 "1: ldrexd %0, %H0, [%3]\n"
1240 " adds %0, %0, %4\n"
1241+" adcs %H0, %H0, %H4\n"
1242+
1243+#ifdef CONFIG_PAX_REFCOUNT
1244+" bvc 3f\n"
1245+"2: bkpt 0xf103\n"
1246+"3:\n"
1247+#endif
1248+
1249+" strexd %1, %0, %H0, [%3]\n"
1250+" teq %1, #0\n"
1251+" bne 1b"
1252+
1253+#ifdef CONFIG_PAX_REFCOUNT
1254+"\n4:\n"
1255+ _ASM_EXTABLE(2b, 4b)
1256+#endif
1257+
1258+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1259+ : "r" (&v->counter), "r" (i)
1260+ : "cc");
1261+}
1262+
1263+static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1264+{
1265+ u64 result;
1266+ unsigned long tmp;
1267+
1268+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
1269+"1: ldrexd %0, %H0, [%3]\n"
1270+" adds %0, %0, %4\n"
1271 " adc %H0, %H0, %H4\n"
1272 " strexd %1, %0, %H0, [%3]\n"
1273 " teq %1, #0\n"
1274@@ -313,12 +588,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1275
1276 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1277 {
1278- u64 result;
1279- unsigned long tmp;
1280+ u64 result, tmp;
1281
1282 smp_mb();
1283
1284 __asm__ __volatile__("@ atomic64_add_return\n"
1285+"1: ldrexd %1, %H1, [%3]\n"
1286+" adds %0, %1, %4\n"
1287+" adcs %H0, %H1, %H4\n"
1288+
1289+#ifdef CONFIG_PAX_REFCOUNT
1290+" bvc 3f\n"
1291+" mov %0, %1\n"
1292+" mov %H0, %H1\n"
1293+"2: bkpt 0xf103\n"
1294+"3:\n"
1295+#endif
1296+
1297+" strexd %1, %0, %H0, [%3]\n"
1298+" teq %1, #0\n"
1299+" bne 1b"
1300+
1301+#ifdef CONFIG_PAX_REFCOUNT
1302+"\n4:\n"
1303+ _ASM_EXTABLE(2b, 4b)
1304+#endif
1305+
1306+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1307+ : "r" (&v->counter), "r" (i)
1308+ : "cc");
1309+
1310+ smp_mb();
1311+
1312+ return result;
1313+}
1314+
1315+static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1316+{
1317+ u64 result;
1318+ unsigned long tmp;
1319+
1320+ smp_mb();
1321+
1322+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1323 "1: ldrexd %0, %H0, [%3]\n"
1324 " adds %0, %0, %4\n"
1325 " adc %H0, %H0, %H4\n"
1326@@ -342,6 +654,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1327 __asm__ __volatile__("@ atomic64_sub\n"
1328 "1: ldrexd %0, %H0, [%3]\n"
1329 " subs %0, %0, %4\n"
1330+" sbcs %H0, %H0, %H4\n"
1331+
1332+#ifdef CONFIG_PAX_REFCOUNT
1333+" bvc 3f\n"
1334+"2: bkpt 0xf103\n"
1335+"3:\n"
1336+#endif
1337+
1338+" strexd %1, %0, %H0, [%3]\n"
1339+" teq %1, #0\n"
1340+" bne 1b"
1341+
1342+#ifdef CONFIG_PAX_REFCOUNT
1343+"\n4:\n"
1344+ _ASM_EXTABLE(2b, 4b)
1345+#endif
1346+
1347+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1348+ : "r" (&v->counter), "r" (i)
1349+ : "cc");
1350+}
1351+
1352+static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1353+{
1354+ u64 result;
1355+ unsigned long tmp;
1356+
1357+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1358+"1: ldrexd %0, %H0, [%3]\n"
1359+" subs %0, %0, %4\n"
1360 " sbc %H0, %H0, %H4\n"
1361 " strexd %1, %0, %H0, [%3]\n"
1362 " teq %1, #0\n"
1363@@ -353,18 +695,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1364
1365 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1366 {
1367- u64 result;
1368- unsigned long tmp;
1369+ u64 result, tmp;
1370
1371 smp_mb();
1372
1373 __asm__ __volatile__("@ atomic64_sub_return\n"
1374-"1: ldrexd %0, %H0, [%3]\n"
1375-" subs %0, %0, %4\n"
1376-" sbc %H0, %H0, %H4\n"
1377+"1: ldrexd %1, %H1, [%3]\n"
1378+" subs %0, %1, %4\n"
1379+" sbcs %H0, %H1, %H4\n"
1380+
1381+#ifdef CONFIG_PAX_REFCOUNT
1382+" bvc 3f\n"
1383+" mov %0, %1\n"
1384+" mov %H0, %H1\n"
1385+"2: bkpt 0xf103\n"
1386+"3:\n"
1387+#endif
1388+
1389 " strexd %1, %0, %H0, [%3]\n"
1390 " teq %1, #0\n"
1391 " bne 1b"
1392+
1393+#ifdef CONFIG_PAX_REFCOUNT
1394+"\n4:\n"
1395+ _ASM_EXTABLE(2b, 4b)
1396+#endif
1397+
1398 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1399 : "r" (&v->counter), "r" (i)
1400 : "cc");
1401@@ -398,6 +754,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1402 return oldval;
1403 }
1404
1405+static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1406+{
1407+ u64 oldval;
1408+ unsigned long res;
1409+
1410+ smp_mb();
1411+
1412+ do {
1413+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1414+ "ldrexd %1, %H1, [%3]\n"
1415+ "mov %0, #0\n"
1416+ "teq %1, %4\n"
1417+ "teqeq %H1, %H4\n"
1418+ "strexdeq %0, %5, %H5, [%3]"
1419+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1420+ : "r" (&ptr->counter), "r" (old), "r" (new)
1421+ : "cc");
1422+ } while (res);
1423+
1424+ smp_mb();
1425+
1426+ return oldval;
1427+}
1428+
1429 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1430 {
1431 u64 result;
1432@@ -421,21 +801,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1433
1434 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1435 {
1436- u64 result;
1437- unsigned long tmp;
1438+ u64 result, tmp;
1439
1440 smp_mb();
1441
1442 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1443-"1: ldrexd %0, %H0, [%3]\n"
1444-" subs %0, %0, #1\n"
1445-" sbc %H0, %H0, #0\n"
1446+"1: ldrexd %1, %H1, [%3]\n"
1447+" subs %0, %1, #1\n"
1448+" sbcs %H0, %H1, #0\n"
1449+
1450+#ifdef CONFIG_PAX_REFCOUNT
1451+" bvc 3f\n"
1452+" mov %0, %1\n"
1453+" mov %H0, %H1\n"
1454+"2: bkpt 0xf103\n"
1455+"3:\n"
1456+#endif
1457+
1458 " teq %H0, #0\n"
1459-" bmi 2f\n"
1460+" bmi 4f\n"
1461 " strexd %1, %0, %H0, [%3]\n"
1462 " teq %1, #0\n"
1463 " bne 1b\n"
1464-"2:"
1465+"4:\n"
1466+
1467+#ifdef CONFIG_PAX_REFCOUNT
1468+ _ASM_EXTABLE(2b, 4b)
1469+#endif
1470+
1471 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1472 : "r" (&v->counter)
1473 : "cc");
1474@@ -458,13 +851,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1475 " teq %0, %5\n"
1476 " teqeq %H0, %H5\n"
1477 " moveq %1, #0\n"
1478-" beq 2f\n"
1479+" beq 4f\n"
1480 " adds %0, %0, %6\n"
1481-" adc %H0, %H0, %H6\n"
1482+" adcs %H0, %H0, %H6\n"
1483+
1484+#ifdef CONFIG_PAX_REFCOUNT
1485+" bvc 3f\n"
1486+"2: bkpt 0xf103\n"
1487+"3:\n"
1488+#endif
1489+
1490 " strexd %2, %0, %H0, [%4]\n"
1491 " teq %2, #0\n"
1492 " bne 1b\n"
1493-"2:"
1494+"4:\n"
1495+
1496+#ifdef CONFIG_PAX_REFCOUNT
1497+ _ASM_EXTABLE(2b, 4b)
1498+#endif
1499+
1500 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1501 : "r" (&v->counter), "r" (u), "r" (a)
1502 : "cc");
1503@@ -477,10 +882,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1504
1505 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1506 #define atomic64_inc(v) atomic64_add(1LL, (v))
1507+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1508 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1509+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1510 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1511 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1512 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1513+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1514 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1515 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1516 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1517diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1518index 75fe66b..ba3dee4 100644
1519--- a/arch/arm/include/asm/cache.h
1520+++ b/arch/arm/include/asm/cache.h
1521@@ -4,8 +4,10 @@
1522 #ifndef __ASMARM_CACHE_H
1523 #define __ASMARM_CACHE_H
1524
1525+#include <linux/const.h>
1526+
1527 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1528-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1529+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1530
1531 /*
1532 * Memory returned by kmalloc() may be used for DMA, so we must make
1533@@ -24,5 +26,6 @@
1534 #endif
1535
1536 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1537+#define __read_only __attribute__ ((__section__(".data..read_only")))
1538
1539 #endif
1540diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1541index 15f2d5b..43ffa53 100644
1542--- a/arch/arm/include/asm/cacheflush.h
1543+++ b/arch/arm/include/asm/cacheflush.h
1544@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1545 void (*dma_unmap_area)(const void *, size_t, int);
1546
1547 void (*dma_flush_range)(const void *, const void *);
1548-};
1549+} __no_const;
1550
1551 /*
1552 * Select the calling method
1553diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1554index 6dcc164..b14d917 100644
1555--- a/arch/arm/include/asm/checksum.h
1556+++ b/arch/arm/include/asm/checksum.h
1557@@ -37,7 +37,19 @@ __wsum
1558 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1559
1560 __wsum
1561-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1562+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1563+
1564+static inline __wsum
1565+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1566+{
1567+ __wsum ret;
1568+ pax_open_userland();
1569+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1570+ pax_close_userland();
1571+ return ret;
1572+}
1573+
1574+
1575
1576 /*
1577 * Fold a partial checksum without adding pseudo headers
1578diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1579index 4f009c1..466c59b 100644
1580--- a/arch/arm/include/asm/cmpxchg.h
1581+++ b/arch/arm/include/asm/cmpxchg.h
1582@@ -102,6 +102,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1583
1584 #define xchg(ptr,x) \
1585 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1586+#define xchg_unchecked(ptr,x) \
1587+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1588
1589 #include <asm-generic/cmpxchg-local.h>
1590
1591diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1592index 6ddbe44..b5e38b1 100644
1593--- a/arch/arm/include/asm/domain.h
1594+++ b/arch/arm/include/asm/domain.h
1595@@ -48,18 +48,37 @@
1596 * Domain types
1597 */
1598 #define DOMAIN_NOACCESS 0
1599-#define DOMAIN_CLIENT 1
1600 #ifdef CONFIG_CPU_USE_DOMAINS
1601+#define DOMAIN_USERCLIENT 1
1602+#define DOMAIN_KERNELCLIENT 1
1603 #define DOMAIN_MANAGER 3
1604+#define DOMAIN_VECTORS DOMAIN_USER
1605 #else
1606+
1607+#ifdef CONFIG_PAX_KERNEXEC
1608 #define DOMAIN_MANAGER 1
1609+#define DOMAIN_KERNEXEC 3
1610+#else
1611+#define DOMAIN_MANAGER 1
1612+#endif
1613+
1614+#ifdef CONFIG_PAX_MEMORY_UDEREF
1615+#define DOMAIN_USERCLIENT 0
1616+#define DOMAIN_UDEREF 1
1617+#define DOMAIN_VECTORS DOMAIN_KERNEL
1618+#else
1619+#define DOMAIN_USERCLIENT 1
1620+#define DOMAIN_VECTORS DOMAIN_USER
1621+#endif
1622+#define DOMAIN_KERNELCLIENT 1
1623+
1624 #endif
1625
1626 #define domain_val(dom,type) ((type) << (2*(dom)))
1627
1628 #ifndef __ASSEMBLY__
1629
1630-#ifdef CONFIG_CPU_USE_DOMAINS
1631+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1632 static inline void set_domain(unsigned val)
1633 {
1634 asm volatile(
1635@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1636 isb();
1637 }
1638
1639-#define modify_domain(dom,type) \
1640- do { \
1641- struct thread_info *thread = current_thread_info(); \
1642- unsigned int domain = thread->cpu_domain; \
1643- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1644- thread->cpu_domain = domain | domain_val(dom, type); \
1645- set_domain(thread->cpu_domain); \
1646- } while (0)
1647-
1648+extern void modify_domain(unsigned int dom, unsigned int type);
1649 #else
1650 static inline void set_domain(unsigned val) { }
1651 static inline void modify_domain(unsigned dom, unsigned type) { }
1652diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1653index f4b46d3..abc9b2b 100644
1654--- a/arch/arm/include/asm/elf.h
1655+++ b/arch/arm/include/asm/elf.h
1656@@ -114,7 +114,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1657 the loader. We need to make sure that it is out of the way of the program
1658 that it will "exec", and that there is sufficient room for the brk. */
1659
1660-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1661+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1662+
1663+#ifdef CONFIG_PAX_ASLR
1664+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1665+
1666+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1667+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1668+#endif
1669
1670 /* When the program starts, a1 contains a pointer to a function to be
1671 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1672@@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1673 extern void elf_set_personality(const struct elf32_hdr *);
1674 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1675
1676-struct mm_struct;
1677-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1678-#define arch_randomize_brk arch_randomize_brk
1679-
1680 #ifdef CONFIG_MMU
1681 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1682 struct linux_binprm;
1683diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1684index de53547..52b9a28 100644
1685--- a/arch/arm/include/asm/fncpy.h
1686+++ b/arch/arm/include/asm/fncpy.h
1687@@ -81,7 +81,9 @@
1688 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1689 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1690 \
1691+ pax_open_kernel(); \
1692 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1693+ pax_close_kernel(); \
1694 flush_icache_range((unsigned long)(dest_buf), \
1695 (unsigned long)(dest_buf) + (size)); \
1696 \
1697diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1698index e42cf59..7b94b8f 100644
1699--- a/arch/arm/include/asm/futex.h
1700+++ b/arch/arm/include/asm/futex.h
1701@@ -50,6 +50,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1702 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1703 return -EFAULT;
1704
1705+ pax_open_userland();
1706+
1707 smp_mb();
1708 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1709 "1: ldrex %1, [%4]\n"
1710@@ -65,6 +67,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1711 : "cc", "memory");
1712 smp_mb();
1713
1714+ pax_close_userland();
1715+
1716 *uval = val;
1717 return ret;
1718 }
1719@@ -95,6 +99,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1720 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1721 return -EFAULT;
1722
1723+ pax_open_userland();
1724+
1725 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1726 "1: " TUSER(ldr) " %1, [%4]\n"
1727 " teq %1, %2\n"
1728@@ -105,6 +111,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1729 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1730 : "cc", "memory");
1731
1732+ pax_close_userland();
1733+
1734 *uval = val;
1735 return ret;
1736 }
1737@@ -127,6 +135,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1738 return -EFAULT;
1739
1740 pagefault_disable(); /* implies preempt_disable() */
1741+ pax_open_userland();
1742
1743 switch (op) {
1744 case FUTEX_OP_SET:
1745@@ -148,6 +157,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1746 ret = -ENOSYS;
1747 }
1748
1749+ pax_close_userland();
1750 pagefault_enable(); /* subsumes preempt_enable() */
1751
1752 if (!ret) {
1753diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1754index 83eb2f7..ed77159 100644
1755--- a/arch/arm/include/asm/kmap_types.h
1756+++ b/arch/arm/include/asm/kmap_types.h
1757@@ -4,6 +4,6 @@
1758 /*
1759 * This is the "bare minimum". AIO seems to require this.
1760 */
1761-#define KM_TYPE_NR 16
1762+#define KM_TYPE_NR 17
1763
1764 #endif
1765diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1766index 9e614a1..3302cca 100644
1767--- a/arch/arm/include/asm/mach/dma.h
1768+++ b/arch/arm/include/asm/mach/dma.h
1769@@ -22,7 +22,7 @@ struct dma_ops {
1770 int (*residue)(unsigned int, dma_t *); /* optional */
1771 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1772 const char *type;
1773-};
1774+} __do_const;
1775
1776 struct dma_struct {
1777 void *addr; /* single DMA address */
1778diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1779index 2fe141f..192dc01 100644
1780--- a/arch/arm/include/asm/mach/map.h
1781+++ b/arch/arm/include/asm/mach/map.h
1782@@ -27,13 +27,16 @@ struct map_desc {
1783 #define MT_MINICLEAN 6
1784 #define MT_LOW_VECTORS 7
1785 #define MT_HIGH_VECTORS 8
1786-#define MT_MEMORY 9
1787+#define MT_MEMORY_RWX 9
1788 #define MT_ROM 10
1789-#define MT_MEMORY_NONCACHED 11
1790+#define MT_MEMORY_NONCACHED_RX 11
1791 #define MT_MEMORY_DTCM 12
1792 #define MT_MEMORY_ITCM 13
1793 #define MT_MEMORY_SO 14
1794 #define MT_MEMORY_DMA_READY 15
1795+#define MT_MEMORY_RW 16
1796+#define MT_MEMORY_RX 17
1797+#define MT_MEMORY_NONCACHED_RW 18
1798
1799 #ifdef CONFIG_MMU
1800 extern void iotable_init(struct map_desc *, int);
1801diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1802index f94784f..9a09a4a 100644
1803--- a/arch/arm/include/asm/outercache.h
1804+++ b/arch/arm/include/asm/outercache.h
1805@@ -35,7 +35,7 @@ struct outer_cache_fns {
1806 #endif
1807 void (*set_debug)(unsigned long);
1808 void (*resume)(void);
1809-};
1810+} __no_const;
1811
1812 extern struct outer_cache_fns outer_cache;
1813
1814diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1815index 4355f0e..c229913 100644
1816--- a/arch/arm/include/asm/page.h
1817+++ b/arch/arm/include/asm/page.h
1818@@ -114,7 +114,7 @@ struct cpu_user_fns {
1819 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1820 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1821 unsigned long vaddr, struct vm_area_struct *vma);
1822-};
1823+} __no_const;
1824
1825 #ifdef MULTI_USER
1826 extern struct cpu_user_fns cpu_user;
1827diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1828index 943504f..c37a730 100644
1829--- a/arch/arm/include/asm/pgalloc.h
1830+++ b/arch/arm/include/asm/pgalloc.h
1831@@ -17,6 +17,7 @@
1832 #include <asm/processor.h>
1833 #include <asm/cacheflush.h>
1834 #include <asm/tlbflush.h>
1835+#include <asm/system_info.h>
1836
1837 #define check_pgt_cache() do { } while (0)
1838
1839@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1840 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1841 }
1842
1843+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1844+{
1845+ pud_populate(mm, pud, pmd);
1846+}
1847+
1848 #else /* !CONFIG_ARM_LPAE */
1849
1850 /*
1851@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1852 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1853 #define pmd_free(mm, pmd) do { } while (0)
1854 #define pud_populate(mm,pmd,pte) BUG()
1855+#define pud_populate_kernel(mm,pmd,pte) BUG()
1856
1857 #endif /* CONFIG_ARM_LPAE */
1858
1859@@ -126,6 +133,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1860 __free_page(pte);
1861 }
1862
1863+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1864+{
1865+#ifdef CONFIG_ARM_LPAE
1866+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1867+#else
1868+ if (addr & SECTION_SIZE)
1869+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1870+ else
1871+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1872+#endif
1873+ flush_pmd_entry(pmdp);
1874+}
1875+
1876 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1877 pmdval_t prot)
1878 {
1879@@ -155,7 +175,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1880 static inline void
1881 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1882 {
1883- __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1884+ __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1885 }
1886 #define pmd_pgtable(pmd) pmd_page(pmd)
1887
1888diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1889index 5cfba15..f415e1a 100644
1890--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1891+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1892@@ -20,12 +20,15 @@
1893 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1894 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1895 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1896+#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1897 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1898 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1899 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1900+
1901 /*
1902 * - section
1903 */
1904+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1905 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1906 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1907 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1908@@ -37,6 +40,7 @@
1909 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1910 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1911 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1912+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1913
1914 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1915 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1916@@ -66,6 +70,7 @@
1917 * - extended small page/tiny page
1918 */
1919 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1920+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1921 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1922 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1923 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1924diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1925index f97ee02..cc9fe9e 100644
1926--- a/arch/arm/include/asm/pgtable-2level.h
1927+++ b/arch/arm/include/asm/pgtable-2level.h
1928@@ -126,6 +126,9 @@
1929 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1930 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1931
1932+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1933+#define L_PTE_PXN (_AT(pteval_t, 0))
1934+
1935 /*
1936 * These are the memory types, defined to be compatible with
1937 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1938diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1939index 626989f..9d67a33 100644
1940--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1941+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1942@@ -75,6 +75,7 @@
1943 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1944 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1945 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1946+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1947 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1948
1949 /*
1950diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1951index 5689c18..eea12f9 100644
1952--- a/arch/arm/include/asm/pgtable-3level.h
1953+++ b/arch/arm/include/asm/pgtable-3level.h
1954@@ -82,6 +82,7 @@
1955 #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */
1956 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1957 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1958+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1959 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1960 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55) /* unused */
1961 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56) /* unused */
1962@@ -95,6 +96,7 @@
1963 /*
1964 * To be used in assembly code with the upper page attributes.
1965 */
1966+#define L_PTE_PXN_HIGH (1 << (53 - 32))
1967 #define L_PTE_XN_HIGH (1 << (54 - 32))
1968 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1969
1970diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1971index 1571d12..b8a9b43 100644
1972--- a/arch/arm/include/asm/pgtable.h
1973+++ b/arch/arm/include/asm/pgtable.h
1974@@ -33,6 +33,9 @@
1975 #include <asm/pgtable-2level.h>
1976 #endif
1977
1978+#define ktla_ktva(addr) (addr)
1979+#define ktva_ktla(addr) (addr)
1980+
1981 /*
1982 * Just any arbitrary offset to the start of the vmalloc VM area: the
1983 * current 8MB value just means that there will be a 8MB "hole" after the
1984@@ -48,6 +51,9 @@
1985 #define LIBRARY_TEXT_START 0x0c000000
1986
1987 #ifndef __ASSEMBLY__
1988+extern pteval_t __supported_pte_mask;
1989+extern pmdval_t __supported_pmd_mask;
1990+
1991 extern void __pte_error(const char *file, int line, pte_t);
1992 extern void __pmd_error(const char *file, int line, pmd_t);
1993 extern void __pgd_error(const char *file, int line, pgd_t);
1994@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
1995 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
1996 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
1997
1998+#define __HAVE_ARCH_PAX_OPEN_KERNEL
1999+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2000+
2001+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2002+#include <asm/domain.h>
2003+#include <linux/thread_info.h>
2004+#include <linux/preempt.h>
2005+
2006+static inline int test_domain(int domain, int domaintype)
2007+{
2008+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2009+}
2010+#endif
2011+
2012+#ifdef CONFIG_PAX_KERNEXEC
2013+static inline unsigned long pax_open_kernel(void) {
2014+#ifdef CONFIG_ARM_LPAE
2015+ /* TODO */
2016+#else
2017+ preempt_disable();
2018+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2019+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2020+#endif
2021+ return 0;
2022+}
2023+
2024+static inline unsigned long pax_close_kernel(void) {
2025+#ifdef CONFIG_ARM_LPAE
2026+ /* TODO */
2027+#else
2028+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2029+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2030+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2031+ preempt_enable_no_resched();
2032+#endif
2033+ return 0;
2034+}
2035+#else
2036+static inline unsigned long pax_open_kernel(void) { return 0; }
2037+static inline unsigned long pax_close_kernel(void) { return 0; }
2038+#endif
2039+
2040 /*
2041 * This is the lowest virtual address we can permit any user space
2042 * mapping to be mapped at. This is particularly important for
2043@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2044 /*
2045 * The pgprot_* and protection_map entries will be fixed up in runtime
2046 * to include the cachable and bufferable bits based on memory policy,
2047- * as well as any architecture dependent bits like global/ASID and SMP
2048- * shared mapping bits.
2049+ * as well as any architecture dependent bits like global/ASID, PXN,
2050+ * and SMP shared mapping bits.
2051 */
2052 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2053
2054@@ -260,7 +308,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
2055 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2056 {
2057 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2058- L_PTE_NONE | L_PTE_VALID;
2059+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2060 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2061 return pte;
2062 }
2063diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h
2064index 5324c11..bcae5f0 100644
2065--- a/arch/arm/include/asm/proc-fns.h
2066+++ b/arch/arm/include/asm/proc-fns.h
2067@@ -75,7 +75,7 @@ extern struct processor {
2068 unsigned int suspend_size;
2069 void (*do_suspend)(void *);
2070 void (*do_resume)(void *);
2071-} processor;
2072+} __do_const processor;
2073
2074 #ifndef MULTI_CPU
2075 extern void cpu_proc_init(void);
2076diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2077index c4ae171..ea0c0c2 100644
2078--- a/arch/arm/include/asm/psci.h
2079+++ b/arch/arm/include/asm/psci.h
2080@@ -29,7 +29,7 @@ struct psci_operations {
2081 int (*cpu_off)(struct psci_power_state state);
2082 int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
2083 int (*migrate)(unsigned long cpuid);
2084-};
2085+} __no_const;
2086
2087 extern struct psci_operations psci_ops;
2088 extern struct smp_operations psci_smp_ops;
2089diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2090index a8cae71c..65dd797 100644
2091--- a/arch/arm/include/asm/smp.h
2092+++ b/arch/arm/include/asm/smp.h
2093@@ -110,7 +110,7 @@ struct smp_operations {
2094 int (*cpu_disable)(unsigned int cpu);
2095 #endif
2096 #endif
2097-};
2098+} __no_const;
2099
2100 /*
2101 * set platform specific SMP operations
2102diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2103index df5e13d..97efb82 100644
2104--- a/arch/arm/include/asm/thread_info.h
2105+++ b/arch/arm/include/asm/thread_info.h
2106@@ -88,9 +88,9 @@ struct thread_info {
2107 .flags = 0, \
2108 .preempt_count = INIT_PREEMPT_COUNT, \
2109 .addr_limit = KERNEL_DS, \
2110- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2111- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2112- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2113+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2114+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2115+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2116 .restart_block = { \
2117 .fn = do_no_restart_syscall, \
2118 }, \
2119@@ -163,7 +163,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2120 #define TIF_SYSCALL_AUDIT 9
2121 #define TIF_SYSCALL_TRACEPOINT 10
2122 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2123-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2124+/* within 8 bits of TIF_SYSCALL_TRACE
2125+ * to meet flexible second operand requirements
2126+ */
2127+#define TIF_GRSEC_SETXID 12
2128+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2129 #define TIF_USING_IWMMXT 17
2130 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2131 #define TIF_RESTORE_SIGMASK 20
2132@@ -176,10 +180,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2133 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2134 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2135 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2136+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2137
2138 /* Checks for any syscall work in entry-common.S */
2139 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2140- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2141+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2142
2143 /*
2144 * Change these and you break ASM code in entry-common.S
2145diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2146index 72abdc5..9eba222 100644
2147--- a/arch/arm/include/asm/uaccess.h
2148+++ b/arch/arm/include/asm/uaccess.h
2149@@ -18,6 +18,7 @@
2150 #include <asm/domain.h>
2151 #include <asm/unified.h>
2152 #include <asm/compiler.h>
2153+#include <asm/pgtable.h>
2154
2155 #if __LINUX_ARM_ARCH__ < 6
2156 #include <asm-generic/uaccess-unaligned.h>
2157@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2158 static inline void set_fs(mm_segment_t fs)
2159 {
2160 current_thread_info()->addr_limit = fs;
2161- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2162+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2163 }
2164
2165 #define segment_eq(a,b) ((a) == (b))
2166
2167+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2168+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2169+
2170+static inline void pax_open_userland(void)
2171+{
2172+
2173+#ifdef CONFIG_PAX_MEMORY_UDEREF
2174+ if (segment_eq(get_fs(), USER_DS)) {
2175+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2176+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2177+ }
2178+#endif
2179+
2180+}
2181+
2182+static inline void pax_close_userland(void)
2183+{
2184+
2185+#ifdef CONFIG_PAX_MEMORY_UDEREF
2186+ if (segment_eq(get_fs(), USER_DS)) {
2187+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2188+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2189+ }
2190+#endif
2191+
2192+}
2193+
2194 #define __addr_ok(addr) ({ \
2195 unsigned long flag; \
2196 __asm__("cmp %2, %0; movlo %0, #0" \
2197@@ -150,8 +178,12 @@ extern int __get_user_4(void *);
2198
2199 #define get_user(x,p) \
2200 ({ \
2201+ int __e; \
2202 might_fault(); \
2203- __get_user_check(x,p); \
2204+ pax_open_userland(); \
2205+ __e = __get_user_check(x,p); \
2206+ pax_close_userland(); \
2207+ __e; \
2208 })
2209
2210 extern int __put_user_1(void *, unsigned int);
2211@@ -195,8 +227,12 @@ extern int __put_user_8(void *, unsigned long long);
2212
2213 #define put_user(x,p) \
2214 ({ \
2215+ int __e; \
2216 might_fault(); \
2217- __put_user_check(x,p); \
2218+ pax_open_userland(); \
2219+ __e = __put_user_check(x,p); \
2220+ pax_close_userland(); \
2221+ __e; \
2222 })
2223
2224 #else /* CONFIG_MMU */
2225@@ -237,13 +273,17 @@ static inline void set_fs(mm_segment_t fs)
2226 #define __get_user(x,ptr) \
2227 ({ \
2228 long __gu_err = 0; \
2229+ pax_open_userland(); \
2230 __get_user_err((x),(ptr),__gu_err); \
2231+ pax_close_userland(); \
2232 __gu_err; \
2233 })
2234
2235 #define __get_user_error(x,ptr,err) \
2236 ({ \
2237+ pax_open_userland(); \
2238 __get_user_err((x),(ptr),err); \
2239+ pax_close_userland(); \
2240 (void) 0; \
2241 })
2242
2243@@ -319,13 +359,17 @@ do { \
2244 #define __put_user(x,ptr) \
2245 ({ \
2246 long __pu_err = 0; \
2247+ pax_open_userland(); \
2248 __put_user_err((x),(ptr),__pu_err); \
2249+ pax_close_userland(); \
2250 __pu_err; \
2251 })
2252
2253 #define __put_user_error(x,ptr,err) \
2254 ({ \
2255+ pax_open_userland(); \
2256 __put_user_err((x),(ptr),err); \
2257+ pax_close_userland(); \
2258 (void) 0; \
2259 })
2260
2261@@ -425,11 +469,44 @@ do { \
2262
2263
2264 #ifdef CONFIG_MMU
2265-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2266-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2267+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2268+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2269+
2270+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2271+{
2272+ unsigned long ret;
2273+
2274+ check_object_size(to, n, false);
2275+ pax_open_userland();
2276+ ret = ___copy_from_user(to, from, n);
2277+ pax_close_userland();
2278+ return ret;
2279+}
2280+
2281+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2282+{
2283+ unsigned long ret;
2284+
2285+ check_object_size(from, n, true);
2286+ pax_open_userland();
2287+ ret = ___copy_to_user(to, from, n);
2288+ pax_close_userland();
2289+ return ret;
2290+}
2291+
2292 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2293-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2294+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2295 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2296+
2297+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2298+{
2299+ unsigned long ret;
2300+ pax_open_userland();
2301+ ret = ___clear_user(addr, n);
2302+ pax_close_userland();
2303+ return ret;
2304+}
2305+
2306 #else
2307 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2308 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2309@@ -438,6 +515,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2310
2311 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2312 {
2313+ if ((long)n < 0)
2314+ return n;
2315+
2316 if (access_ok(VERIFY_READ, from, n))
2317 n = __copy_from_user(to, from, n);
2318 else /* security hole - plug it */
2319@@ -447,6 +527,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2320
2321 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2322 {
2323+ if ((long)n < 0)
2324+ return n;
2325+
2326 if (access_ok(VERIFY_WRITE, to, n))
2327 n = __copy_to_user(to, from, n);
2328 return n;
2329diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2330index 5af0ed1..cea83883 100644
2331--- a/arch/arm/include/uapi/asm/ptrace.h
2332+++ b/arch/arm/include/uapi/asm/ptrace.h
2333@@ -92,7 +92,7 @@
2334 * ARMv7 groups of PSR bits
2335 */
2336 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2337-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2338+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2339 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2340 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2341
2342diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2343index 60d3b73..e5a0f22 100644
2344--- a/arch/arm/kernel/armksyms.c
2345+++ b/arch/arm/kernel/armksyms.c
2346@@ -53,7 +53,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2347
2348 /* networking */
2349 EXPORT_SYMBOL(csum_partial);
2350-EXPORT_SYMBOL(csum_partial_copy_from_user);
2351+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2352 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2353 EXPORT_SYMBOL(__csum_ipv6_magic);
2354
2355@@ -89,9 +89,9 @@ EXPORT_SYMBOL(__memzero);
2356 #ifdef CONFIG_MMU
2357 EXPORT_SYMBOL(copy_page);
2358
2359-EXPORT_SYMBOL(__copy_from_user);
2360-EXPORT_SYMBOL(__copy_to_user);
2361-EXPORT_SYMBOL(__clear_user);
2362+EXPORT_SYMBOL(___copy_from_user);
2363+EXPORT_SYMBOL(___copy_to_user);
2364+EXPORT_SYMBOL(___clear_user);
2365
2366 EXPORT_SYMBOL(__get_user_1);
2367 EXPORT_SYMBOL(__get_user_2);
2368diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2369index ec3e5cf..b450ee3 100644
2370--- a/arch/arm/kernel/entry-armv.S
2371+++ b/arch/arm/kernel/entry-armv.S
2372@@ -47,6 +47,87 @@
2373 9997:
2374 .endm
2375
2376+ .macro pax_enter_kernel
2377+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2378+ @ make aligned space for saved DACR
2379+ sub sp, sp, #8
2380+ @ save regs
2381+ stmdb sp!, {r1, r2}
2382+ @ read DACR from cpu_domain into r1
2383+ mov r2, sp
2384+ @ assume 8K pages, since we have to split the immediate in two
2385+ bic r2, r2, #(0x1fc0)
2386+ bic r2, r2, #(0x3f)
2387+ ldr r1, [r2, #TI_CPU_DOMAIN]
2388+ @ store old DACR on stack
2389+ str r1, [sp, #8]
2390+#ifdef CONFIG_PAX_KERNEXEC
2391+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2392+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2393+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2394+#endif
2395+#ifdef CONFIG_PAX_MEMORY_UDEREF
2396+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2397+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2398+#endif
2399+ @ write r1 to current_thread_info()->cpu_domain
2400+ str r1, [r2, #TI_CPU_DOMAIN]
2401+ @ write r1 to DACR
2402+ mcr p15, 0, r1, c3, c0, 0
2403+ @ instruction sync
2404+ instr_sync
2405+ @ restore regs
2406+ ldmia sp!, {r1, r2}
2407+#endif
2408+ .endm
2409+
2410+ .macro pax_open_userland
2411+#ifdef CONFIG_PAX_MEMORY_UDEREF
2412+ @ save regs
2413+ stmdb sp!, {r0, r1}
2414+ @ read DACR from cpu_domain into r1
2415+ mov r0, sp
2416+ @ assume 8K pages, since we have to split the immediate in two
2417+ bic r0, r0, #(0x1fc0)
2418+ bic r0, r0, #(0x3f)
2419+ ldr r1, [r0, #TI_CPU_DOMAIN]
2420+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2421+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2422+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2423+ @ write r1 to current_thread_info()->cpu_domain
2424+ str r1, [r0, #TI_CPU_DOMAIN]
2425+ @ write r1 to DACR
2426+ mcr p15, 0, r1, c3, c0, 0
2427+ @ instruction sync
2428+ instr_sync
2429+ @ restore regs
2430+ ldmia sp!, {r0, r1}
2431+#endif
2432+ .endm
2433+
2434+ .macro pax_close_userland
2435+#ifdef CONFIG_PAX_MEMORY_UDEREF
2436+ @ save regs
2437+ stmdb sp!, {r0, r1}
2438+ @ read DACR from cpu_domain into r1
2439+ mov r0, sp
2440+ @ assume 8K pages, since we have to split the immediate in two
2441+ bic r0, r0, #(0x1fc0)
2442+ bic r0, r0, #(0x3f)
2443+ ldr r1, [r0, #TI_CPU_DOMAIN]
2444+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2445+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2446+ @ write r1 to current_thread_info()->cpu_domain
2447+ str r1, [r0, #TI_CPU_DOMAIN]
2448+ @ write r1 to DACR
2449+ mcr p15, 0, r1, c3, c0, 0
2450+ @ instruction sync
2451+ instr_sync
2452+ @ restore regs
2453+ ldmia sp!, {r0, r1}
2454+#endif
2455+ .endm
2456+
2457 .macro pabt_helper
2458 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2459 #ifdef MULTI_PABORT
2460@@ -89,11 +170,15 @@
2461 * Invalid mode handlers
2462 */
2463 .macro inv_entry, reason
2464+
2465+ pax_enter_kernel
2466+
2467 sub sp, sp, #S_FRAME_SIZE
2468 ARM( stmib sp, {r1 - lr} )
2469 THUMB( stmia sp, {r0 - r12} )
2470 THUMB( str sp, [sp, #S_SP] )
2471 THUMB( str lr, [sp, #S_LR] )
2472+
2473 mov r1, #\reason
2474 .endm
2475
2476@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2477 .macro svc_entry, stack_hole=0
2478 UNWIND(.fnstart )
2479 UNWIND(.save {r0 - pc} )
2480+
2481+ pax_enter_kernel
2482+
2483 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2484+
2485 #ifdef CONFIG_THUMB2_KERNEL
2486 SPFIX( str r0, [sp] ) @ temporarily saved
2487 SPFIX( mov r0, sp )
2488@@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2489 ldmia r0, {r3 - r5}
2490 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2491 mov r6, #-1 @ "" "" "" ""
2492+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2493+ @ offset sp by 8 as done in pax_enter_kernel
2494+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2495+#else
2496 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2497+#endif
2498 SPFIX( addeq r2, r2, #4 )
2499 str r3, [sp, #-4]! @ save the "real" r0 copied
2500 @ from the exception stack
2501@@ -317,6 +411,9 @@ ENDPROC(__pabt_svc)
2502 .macro usr_entry
2503 UNWIND(.fnstart )
2504 UNWIND(.cantunwind ) @ don't unwind the user space
2505+
2506+ pax_enter_kernel_user
2507+
2508 sub sp, sp, #S_FRAME_SIZE
2509 ARM( stmib sp, {r1 - r12} )
2510 THUMB( stmia sp, {r0 - r12} )
2511@@ -416,7 +513,9 @@ __und_usr:
2512 tst r3, #PSR_T_BIT @ Thumb mode?
2513 bne __und_usr_thumb
2514 sub r4, r2, #4 @ ARM instr at LR - 4
2515+ pax_open_userland
2516 1: ldrt r0, [r4]
2517+ pax_close_userland
2518 #ifdef CONFIG_CPU_ENDIAN_BE8
2519 rev r0, r0 @ little endian instruction
2520 #endif
2521@@ -451,10 +550,14 @@ __und_usr_thumb:
2522 */
2523 .arch armv6t2
2524 #endif
2525+ pax_open_userland
2526 2: ldrht r5, [r4]
2527+ pax_close_userland
2528 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2529 blo __und_usr_fault_16 @ 16bit undefined instruction
2530+ pax_open_userland
2531 3: ldrht r0, [r2]
2532+ pax_close_userland
2533 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2534 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2535 orr r0, r0, r5, lsl #16
2536@@ -483,7 +586,8 @@ ENDPROC(__und_usr)
2537 */
2538 .pushsection .fixup, "ax"
2539 .align 2
2540-4: mov pc, r9
2541+4: pax_close_userland
2542+ mov pc, r9
2543 .popsection
2544 .pushsection __ex_table,"a"
2545 .long 1b, 4b
2546@@ -693,7 +797,7 @@ ENTRY(__switch_to)
2547 THUMB( str lr, [ip], #4 )
2548 ldr r4, [r2, #TI_TP_VALUE]
2549 ldr r5, [r2, #TI_TP_VALUE + 4]
2550-#ifdef CONFIG_CPU_USE_DOMAINS
2551+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2552 ldr r6, [r2, #TI_CPU_DOMAIN]
2553 #endif
2554 switch_tls r1, r4, r5, r3, r7
2555@@ -702,7 +806,7 @@ ENTRY(__switch_to)
2556 ldr r8, =__stack_chk_guard
2557 ldr r7, [r7, #TSK_STACK_CANARY]
2558 #endif
2559-#ifdef CONFIG_CPU_USE_DOMAINS
2560+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2561 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2562 #endif
2563 mov r5, r0
2564diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2565index bc6bd96..bd026cb 100644
2566--- a/arch/arm/kernel/entry-common.S
2567+++ b/arch/arm/kernel/entry-common.S
2568@@ -10,18 +10,46 @@
2569
2570 #include <asm/unistd.h>
2571 #include <asm/ftrace.h>
2572+#include <asm/domain.h>
2573 #include <asm/unwind.h>
2574
2575+#include "entry-header.S"
2576+
2577 #ifdef CONFIG_NEED_RET_TO_USER
2578 #include <mach/entry-macro.S>
2579 #else
2580 .macro arch_ret_to_user, tmp1, tmp2
2581+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2582+ @ save regs
2583+ stmdb sp!, {r1, r2}
2584+ @ read DACR from cpu_domain into r1
2585+ mov r2, sp
2586+ @ assume 8K pages, since we have to split the immediate in two
2587+ bic r2, r2, #(0x1fc0)
2588+ bic r2, r2, #(0x3f)
2589+ ldr r1, [r2, #TI_CPU_DOMAIN]
2590+#ifdef CONFIG_PAX_KERNEXEC
2591+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2592+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2593+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2594+#endif
2595+#ifdef CONFIG_PAX_MEMORY_UDEREF
2596+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2597+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2598+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2599+#endif
2600+ @ write r1 to current_thread_info()->cpu_domain
2601+ str r1, [r2, #TI_CPU_DOMAIN]
2602+ @ write r1 to DACR
2603+ mcr p15, 0, r1, c3, c0, 0
2604+ @ instruction sync
2605+ instr_sync
2606+ @ restore regs
2607+ ldmia sp!, {r1, r2}
2608+#endif
2609 .endm
2610 #endif
2611
2612-#include "entry-header.S"
2613-
2614-
2615 .align 5
2616 /*
2617 * This is the fast syscall return path. We do as little as
2618@@ -413,6 +441,12 @@ ENTRY(vector_swi)
2619 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2620 #endif
2621
2622+ /*
2623+ * do this here to avoid a performance hit of wrapping the code above
2624+ * that directly dereferences userland to parse the SWI instruction
2625+ */
2626+ pax_enter_kernel_user
2627+
2628 adr tbl, sys_call_table @ load syscall table pointer
2629
2630 #if defined(CONFIG_OABI_COMPAT)
2631diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2632index 39f89fb..d612bd9 100644
2633--- a/arch/arm/kernel/entry-header.S
2634+++ b/arch/arm/kernel/entry-header.S
2635@@ -184,6 +184,60 @@
2636 msr cpsr_c, \rtemp @ switch back to the SVC mode
2637 .endm
2638
2639+ .macro pax_enter_kernel_user
2640+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2641+ @ save regs
2642+ stmdb sp!, {r0, r1}
2643+ @ read DACR from cpu_domain into r1
2644+ mov r0, sp
2645+ @ assume 8K pages, since we have to split the immediate in two
2646+ bic r0, r0, #(0x1fc0)
2647+ bic r0, r0, #(0x3f)
2648+ ldr r1, [r0, #TI_CPU_DOMAIN]
2649+#ifdef CONFIG_PAX_MEMORY_UDEREF
2650+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2651+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2652+#endif
2653+#ifdef CONFIG_PAX_KERNEXEC
2654+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2655+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2656+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2657+#endif
2658+ @ write r1 to current_thread_info()->cpu_domain
2659+ str r1, [r0, #TI_CPU_DOMAIN]
2660+ @ write r1 to DACR
2661+ mcr p15, 0, r1, c3, c0, 0
2662+ @ instruction sync
2663+ instr_sync
2664+ @ restore regs
2665+ ldmia sp!, {r0, r1}
2666+#endif
2667+ .endm
2668+
2669+ .macro pax_exit_kernel
2670+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2671+ @ save regs
2672+ stmdb sp!, {r0, r1}
2673+ @ read old DACR from stack into r1
2674+ ldr r1, [sp, #(8 + S_SP)]
2675+ sub r1, r1, #8
2676+ ldr r1, [r1]
2677+
2678+ @ write r1 to current_thread_info()->cpu_domain
2679+ mov r0, sp
2680+ @ assume 8K pages, since we have to split the immediate in two
2681+ bic r0, r0, #(0x1fc0)
2682+ bic r0, r0, #(0x3f)
2683+ str r1, [r0, #TI_CPU_DOMAIN]
2684+ @ write r1 to DACR
2685+ mcr p15, 0, r1, c3, c0, 0
2686+ @ instruction sync
2687+ instr_sync
2688+ @ restore regs
2689+ ldmia sp!, {r0, r1}
2690+#endif
2691+ .endm
2692+
2693 #ifndef CONFIG_THUMB2_KERNEL
2694 .macro svc_exit, rpsr, irq = 0
2695 .if \irq != 0
2696@@ -203,6 +257,9 @@
2697 blne trace_hardirqs_off
2698 #endif
2699 .endif
2700+
2701+ pax_exit_kernel
2702+
2703 msr spsr_cxsf, \rpsr
2704 #if defined(CONFIG_CPU_V6)
2705 ldr r0, [sp]
2706@@ -266,6 +323,9 @@
2707 blne trace_hardirqs_off
2708 #endif
2709 .endif
2710+
2711+ pax_exit_kernel
2712+
2713 ldr lr, [sp, #S_SP] @ top of the stack
2714 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2715 clrex @ clear the exclusive monitor
2716diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2717index 918875d..cd5fa27 100644
2718--- a/arch/arm/kernel/fiq.c
2719+++ b/arch/arm/kernel/fiq.c
2720@@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length)
2721 void *base = vectors_page;
2722 unsigned offset = FIQ_OFFSET;
2723
2724+ pax_open_kernel();
2725 memcpy(base + offset, start, length);
2726+ pax_close_kernel();
2727+
2728 if (!cache_is_vipt_nonaliasing())
2729 flush_icache_range((unsigned long)base + offset, offset +
2730 length);
2731diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2732index 476de57..4857a76 100644
2733--- a/arch/arm/kernel/head.S
2734+++ b/arch/arm/kernel/head.S
2735@@ -52,7 +52,9 @@
2736 .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE
2737
2738 .macro pgtbl, rd, phys
2739- add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE
2740+ mov \rd, #TEXT_OFFSET
2741+ sub \rd, #PG_DIR_SIZE
2742+ add \rd, \rd, \phys
2743 .endm
2744
2745 /*
2746@@ -432,7 +434,7 @@ __enable_mmu:
2747 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2748 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2749 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2750- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2751+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2752 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2753 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2754 #endif
2755diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2756index 084dc88..fce4e68 100644
2757--- a/arch/arm/kernel/module.c
2758+++ b/arch/arm/kernel/module.c
2759@@ -37,12 +37,39 @@
2760 #endif
2761
2762 #ifdef CONFIG_MMU
2763-void *module_alloc(unsigned long size)
2764+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2765 {
2766+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2767+ return NULL;
2768 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2769- GFP_KERNEL, PAGE_KERNEL_EXEC, -1,
2770+ GFP_KERNEL, prot, -1,
2771 __builtin_return_address(0));
2772 }
2773+
2774+void *module_alloc(unsigned long size)
2775+{
2776+
2777+#ifdef CONFIG_PAX_KERNEXEC
2778+ return __module_alloc(size, PAGE_KERNEL);
2779+#else
2780+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2781+#endif
2782+
2783+}
2784+
2785+#ifdef CONFIG_PAX_KERNEXEC
2786+void module_free_exec(struct module *mod, void *module_region)
2787+{
2788+ module_free(mod, module_region);
2789+}
2790+EXPORT_SYMBOL(module_free_exec);
2791+
2792+void *module_alloc_exec(unsigned long size)
2793+{
2794+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2795+}
2796+EXPORT_SYMBOL(module_alloc_exec);
2797+#endif
2798 #endif
2799
2800 int
2801diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2802index 07314af..c46655c 100644
2803--- a/arch/arm/kernel/patch.c
2804+++ b/arch/arm/kernel/patch.c
2805@@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2806 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2807 int size;
2808
2809+ pax_open_kernel();
2810 if (thumb2 && __opcode_is_thumb16(insn)) {
2811 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2812 size = sizeof(u16);
2813@@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2814 *(u32 *)addr = insn;
2815 size = sizeof(u32);
2816 }
2817+ pax_close_kernel();
2818
2819 flush_icache_range((uintptr_t)(addr),
2820 (uintptr_t)(addr) + size);
2821diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2822index 92f7b15..7048500 100644
2823--- a/arch/arm/kernel/process.c
2824+++ b/arch/arm/kernel/process.c
2825@@ -217,6 +217,7 @@ void machine_power_off(void)
2826
2827 if (pm_power_off)
2828 pm_power_off();
2829+ BUG();
2830 }
2831
2832 /*
2833@@ -230,7 +231,7 @@ void machine_power_off(void)
2834 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2835 * to use. Implementing such co-ordination would be essentially impossible.
2836 */
2837-void machine_restart(char *cmd)
2838+__noreturn void machine_restart(char *cmd)
2839 {
2840 local_irq_disable();
2841 smp_send_stop();
2842@@ -253,8 +254,8 @@ void __show_regs(struct pt_regs *regs)
2843
2844 show_regs_print_info(KERN_DEFAULT);
2845
2846- print_symbol("PC is at %s\n", instruction_pointer(regs));
2847- print_symbol("LR is at %s\n", regs->ARM_lr);
2848+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2849+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2850 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2851 "sp : %08lx ip : %08lx fp : %08lx\n",
2852 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2853@@ -425,12 +426,6 @@ unsigned long get_wchan(struct task_struct *p)
2854 return 0;
2855 }
2856
2857-unsigned long arch_randomize_brk(struct mm_struct *mm)
2858-{
2859- unsigned long range_end = mm->brk + 0x02000000;
2860- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2861-}
2862-
2863 #ifdef CONFIG_MMU
2864 #ifdef CONFIG_KUSER_HELPERS
2865 /*
2866@@ -446,7 +441,7 @@ static struct vm_area_struct gate_vma = {
2867
2868 static int __init gate_vma_init(void)
2869 {
2870- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2871+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2872 return 0;
2873 }
2874 arch_initcall(gate_vma_init);
2875@@ -472,41 +467,16 @@ int in_gate_area_no_mm(unsigned long addr)
2876
2877 const char *arch_vma_name(struct vm_area_struct *vma)
2878 {
2879- return is_gate_vma(vma) ? "[vectors]" :
2880- (vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?
2881- "[sigpage]" : NULL;
2882+ return is_gate_vma(vma) ? "[vectors]" : NULL;
2883 }
2884
2885-static struct page *signal_page;
2886-extern struct page *get_signal_page(void);
2887-
2888 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2889 {
2890 struct mm_struct *mm = current->mm;
2891- unsigned long addr;
2892- int ret;
2893-
2894- if (!signal_page)
2895- signal_page = get_signal_page();
2896- if (!signal_page)
2897- return -ENOMEM;
2898
2899 down_write(&mm->mmap_sem);
2900- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
2901- if (IS_ERR_VALUE(addr)) {
2902- ret = addr;
2903- goto up_fail;
2904- }
2905-
2906- ret = install_special_mapping(mm, addr, PAGE_SIZE,
2907- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2908- &signal_page);
2909-
2910- if (ret == 0)
2911- mm->context.sigpage = addr;
2912-
2913- up_fail:
2914+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2915 up_write(&mm->mmap_sem);
2916- return ret;
2917+ return 0;
2918 }
2919 #endif
2920diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2921index 4693188..4596c5e 100644
2922--- a/arch/arm/kernel/psci.c
2923+++ b/arch/arm/kernel/psci.c
2924@@ -24,7 +24,7 @@
2925 #include <asm/opcodes-virt.h>
2926 #include <asm/psci.h>
2927
2928-struct psci_operations psci_ops;
2929+struct psci_operations psci_ops __read_only;
2930
2931 static int (*invoke_psci_fn)(u32, u32, u32, u32);
2932
2933diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
2934index 0dd3b79..e018f64 100644
2935--- a/arch/arm/kernel/ptrace.c
2936+++ b/arch/arm/kernel/ptrace.c
2937@@ -929,10 +929,19 @@ static int tracehook_report_syscall(struct pt_regs *regs,
2938 return current_thread_info()->syscall;
2939 }
2940
2941+#ifdef CONFIG_GRKERNSEC_SETXID
2942+extern void gr_delayed_cred_worker(void);
2943+#endif
2944+
2945 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
2946 {
2947 current_thread_info()->syscall = scno;
2948
2949+#ifdef CONFIG_GRKERNSEC_SETXID
2950+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
2951+ gr_delayed_cred_worker();
2952+#endif
2953+
2954 /* Do the secure computing check first; failures should be fast. */
2955 if (secure_computing(scno) == -1)
2956 return -1;
2957diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
2958index 0e1e2b3..c0e821d 100644
2959--- a/arch/arm/kernel/setup.c
2960+++ b/arch/arm/kernel/setup.c
2961@@ -98,21 +98,23 @@ EXPORT_SYMBOL(system_serial_high);
2962 unsigned int elf_hwcap __read_mostly;
2963 EXPORT_SYMBOL(elf_hwcap);
2964
2965+pteval_t __supported_pte_mask __read_only;
2966+pmdval_t __supported_pmd_mask __read_only;
2967
2968 #ifdef MULTI_CPU
2969-struct processor processor __read_mostly;
2970+struct processor processor;
2971 #endif
2972 #ifdef MULTI_TLB
2973-struct cpu_tlb_fns cpu_tlb __read_mostly;
2974+struct cpu_tlb_fns cpu_tlb __read_only;
2975 #endif
2976 #ifdef MULTI_USER
2977-struct cpu_user_fns cpu_user __read_mostly;
2978+struct cpu_user_fns cpu_user __read_only;
2979 #endif
2980 #ifdef MULTI_CACHE
2981-struct cpu_cache_fns cpu_cache __read_mostly;
2982+struct cpu_cache_fns cpu_cache __read_only;
2983 #endif
2984 #ifdef CONFIG_OUTER_CACHE
2985-struct outer_cache_fns outer_cache __read_mostly;
2986+struct outer_cache_fns outer_cache __read_only;
2987 EXPORT_SYMBOL(outer_cache);
2988 #endif
2989
2990@@ -245,9 +247,13 @@ static int __get_cpu_architecture(void)
2991 asm("mrc p15, 0, %0, c0, c1, 4"
2992 : "=r" (mmfr0));
2993 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
2994- (mmfr0 & 0x000000f0) >= 0x00000030)
2995+ (mmfr0 & 0x000000f0) >= 0x00000030) {
2996 cpu_arch = CPU_ARCH_ARMv7;
2997- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
2998+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
2999+ __supported_pte_mask |= L_PTE_PXN;
3000+ __supported_pmd_mask |= PMD_PXNTABLE;
3001+ }
3002+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3003 (mmfr0 & 0x000000f0) == 0x00000020)
3004 cpu_arch = CPU_ARCH_ARMv6;
3005 else
3006@@ -571,7 +577,7 @@ static void __init setup_processor(void)
3007 __cpu_architecture = __get_cpu_architecture();
3008
3009 #ifdef MULTI_CPU
3010- processor = *list->proc;
3011+ memcpy((void *)&processor, list->proc, sizeof processor);
3012 #endif
3013 #ifdef MULTI_TLB
3014 cpu_tlb = *list->tlb;
3015diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3016index ab33042..11248a8 100644
3017--- a/arch/arm/kernel/signal.c
3018+++ b/arch/arm/kernel/signal.c
3019@@ -45,8 +45,6 @@ static const unsigned long sigreturn_codes[7] = {
3020 MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
3021 };
3022
3023-static unsigned long signal_return_offset;
3024-
3025 #ifdef CONFIG_CRUNCH
3026 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3027 {
3028@@ -411,8 +409,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3029 * except when the MPU has protected the vectors
3030 * page from PL0
3031 */
3032- retcode = mm->context.sigpage + signal_return_offset +
3033- (idx << 2) + thumb;
3034+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3035 } else
3036 #endif
3037 {
3038@@ -616,33 +613,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3039 } while (thread_flags & _TIF_WORK_MASK);
3040 return 0;
3041 }
3042-
3043-struct page *get_signal_page(void)
3044-{
3045- unsigned long ptr;
3046- unsigned offset;
3047- struct page *page;
3048- void *addr;
3049-
3050- page = alloc_pages(GFP_KERNEL, 0);
3051-
3052- if (!page)
3053- return NULL;
3054-
3055- addr = page_address(page);
3056-
3057- /* Give the signal return code some randomness */
3058- offset = 0x200 + (get_random_int() & 0x7fc);
3059- signal_return_offset = offset;
3060-
3061- /*
3062- * Copy signal return handlers into the vector page, and
3063- * set sigreturn to be a pointer to these.
3064- */
3065- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3066-
3067- ptr = (unsigned long)addr + offset;
3068- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3069-
3070- return page;
3071-}
3072diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3073index 72024ea..ae302dd 100644
3074--- a/arch/arm/kernel/smp.c
3075+++ b/arch/arm/kernel/smp.c
3076@@ -70,7 +70,7 @@ enum ipi_msg_type {
3077
3078 static DECLARE_COMPLETION(cpu_running);
3079
3080-static struct smp_operations smp_ops;
3081+static struct smp_operations smp_ops __read_only;
3082
3083 void __init smp_set_ops(struct smp_operations *ops)
3084 {
3085diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3086index 65ed63f..430c478 100644
3087--- a/arch/arm/kernel/traps.c
3088+++ b/arch/arm/kernel/traps.c
3089@@ -55,7 +55,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3090 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3091 {
3092 #ifdef CONFIG_KALLSYMS
3093- printk("[<%08lx>] (%pS) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3094+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3095 #else
3096 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3097 #endif
3098@@ -257,6 +257,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3099 static int die_owner = -1;
3100 static unsigned int die_nest_count;
3101
3102+extern void gr_handle_kernel_exploit(void);
3103+
3104 static unsigned long oops_begin(void)
3105 {
3106 int cpu;
3107@@ -299,6 +301,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3108 panic("Fatal exception in interrupt");
3109 if (panic_on_oops)
3110 panic("Fatal exception");
3111+
3112+ gr_handle_kernel_exploit();
3113+
3114 if (signr)
3115 do_exit(signr);
3116 }
3117@@ -629,7 +634,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
3118 * The user helper at 0xffff0fe0 must be used instead.
3119 * (see entry-armv.S for details)
3120 */
3121+ pax_open_kernel();
3122 *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
3123+ pax_close_kernel();
3124 }
3125 return 0;
3126
3127@@ -886,7 +893,11 @@ void __init early_trap_init(void *vectors_base)
3128 kuser_init(vectors_base);
3129
3130 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3131- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3132+
3133+#ifndef CONFIG_PAX_MEMORY_UDEREF
3134+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3135+#endif
3136+
3137 #else /* ifndef CONFIG_CPU_V7M */
3138 /*
3139 * on V7-M there is no need to copy the vector table to a dedicated
3140diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3141index 7bcee5c..e2f3249 100644
3142--- a/arch/arm/kernel/vmlinux.lds.S
3143+++ b/arch/arm/kernel/vmlinux.lds.S
3144@@ -8,7 +8,11 @@
3145 #include <asm/thread_info.h>
3146 #include <asm/memory.h>
3147 #include <asm/page.h>
3148-
3149+
3150+#ifdef CONFIG_PAX_KERNEXEC
3151+#include <asm/pgtable.h>
3152+#endif
3153+
3154 #define PROC_INFO \
3155 . = ALIGN(4); \
3156 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3157@@ -34,7 +38,7 @@
3158 #endif
3159
3160 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3161- defined(CONFIG_GENERIC_BUG)
3162+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3163 #define ARM_EXIT_KEEP(x) x
3164 #define ARM_EXIT_DISCARD(x)
3165 #else
3166@@ -90,6 +94,11 @@ SECTIONS
3167 _text = .;
3168 HEAD_TEXT
3169 }
3170+
3171+#ifdef CONFIG_PAX_KERNEXEC
3172+ . = ALIGN(1<<SECTION_SHIFT);
3173+#endif
3174+
3175 .text : { /* Real text segment */
3176 _stext = .; /* Text and read-only data */
3177 __exception_text_start = .;
3178@@ -112,6 +121,8 @@ SECTIONS
3179 ARM_CPU_KEEP(PROC_INFO)
3180 }
3181
3182+ _etext = .; /* End of text section */
3183+
3184 RO_DATA(PAGE_SIZE)
3185
3186 . = ALIGN(4);
3187@@ -142,7 +153,9 @@ SECTIONS
3188
3189 NOTES
3190
3191- _etext = .; /* End of text and rodata section */
3192+#ifdef CONFIG_PAX_KERNEXEC
3193+ . = ALIGN(1<<SECTION_SHIFT);
3194+#endif
3195
3196 #ifndef CONFIG_XIP_KERNEL
3197 . = ALIGN(PAGE_SIZE);
3198@@ -220,6 +233,11 @@ SECTIONS
3199 . = PAGE_OFFSET + TEXT_OFFSET;
3200 #else
3201 __init_end = .;
3202+
3203+#ifdef CONFIG_PAX_KERNEXEC
3204+ . = ALIGN(1<<SECTION_SHIFT);
3205+#endif
3206+
3207 . = ALIGN(THREAD_SIZE);
3208 __data_loc = .;
3209 #endif
3210diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3211index 9c697db..115237f 100644
3212--- a/arch/arm/kvm/arm.c
3213+++ b/arch/arm/kvm/arm.c
3214@@ -56,7 +56,7 @@ static unsigned long hyp_default_vectors;
3215 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3216
3217 /* The VMID used in the VTTBR */
3218-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3219+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3220 static u8 kvm_next_vmid;
3221 static DEFINE_SPINLOCK(kvm_vmid_lock);
3222
3223@@ -396,7 +396,7 @@ void force_vm_exit(const cpumask_t *mask)
3224 */
3225 static bool need_new_vmid_gen(struct kvm *kvm)
3226 {
3227- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3228+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3229 }
3230
3231 /**
3232@@ -429,7 +429,7 @@ static void update_vttbr(struct kvm *kvm)
3233
3234 /* First user of a new VMID generation? */
3235 if (unlikely(kvm_next_vmid == 0)) {
3236- atomic64_inc(&kvm_vmid_gen);
3237+ atomic64_inc_unchecked(&kvm_vmid_gen);
3238 kvm_next_vmid = 1;
3239
3240 /*
3241@@ -446,7 +446,7 @@ static void update_vttbr(struct kvm *kvm)
3242 kvm_call_hyp(__kvm_flush_vm_context);
3243 }
3244
3245- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3246+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3247 kvm->arch.vmid = kvm_next_vmid;
3248 kvm_next_vmid++;
3249
3250diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3251index 14a0d98..7771a7d 100644
3252--- a/arch/arm/lib/clear_user.S
3253+++ b/arch/arm/lib/clear_user.S
3254@@ -12,14 +12,14 @@
3255
3256 .text
3257
3258-/* Prototype: int __clear_user(void *addr, size_t sz)
3259+/* Prototype: int ___clear_user(void *addr, size_t sz)
3260 * Purpose : clear some user memory
3261 * Params : addr - user memory address to clear
3262 * : sz - number of bytes to clear
3263 * Returns : number of bytes NOT cleared
3264 */
3265 ENTRY(__clear_user_std)
3266-WEAK(__clear_user)
3267+WEAK(___clear_user)
3268 stmfd sp!, {r1, lr}
3269 mov r2, #0
3270 cmp r1, #4
3271@@ -44,7 +44,7 @@ WEAK(__clear_user)
3272 USER( strnebt r2, [r0])
3273 mov r0, #0
3274 ldmfd sp!, {r1, pc}
3275-ENDPROC(__clear_user)
3276+ENDPROC(___clear_user)
3277 ENDPROC(__clear_user_std)
3278
3279 .pushsection .fixup,"ax"
3280diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3281index 66a477a..bee61d3 100644
3282--- a/arch/arm/lib/copy_from_user.S
3283+++ b/arch/arm/lib/copy_from_user.S
3284@@ -16,7 +16,7 @@
3285 /*
3286 * Prototype:
3287 *
3288- * size_t __copy_from_user(void *to, const void *from, size_t n)
3289+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3290 *
3291 * Purpose:
3292 *
3293@@ -84,11 +84,11 @@
3294
3295 .text
3296
3297-ENTRY(__copy_from_user)
3298+ENTRY(___copy_from_user)
3299
3300 #include "copy_template.S"
3301
3302-ENDPROC(__copy_from_user)
3303+ENDPROC(___copy_from_user)
3304
3305 .pushsection .fixup,"ax"
3306 .align 0
3307diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3308index 6ee2f67..d1cce76 100644
3309--- a/arch/arm/lib/copy_page.S
3310+++ b/arch/arm/lib/copy_page.S
3311@@ -10,6 +10,7 @@
3312 * ASM optimised string functions
3313 */
3314 #include <linux/linkage.h>
3315+#include <linux/const.h>
3316 #include <asm/assembler.h>
3317 #include <asm/asm-offsets.h>
3318 #include <asm/cache.h>
3319diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3320index d066df6..df28194 100644
3321--- a/arch/arm/lib/copy_to_user.S
3322+++ b/arch/arm/lib/copy_to_user.S
3323@@ -16,7 +16,7 @@
3324 /*
3325 * Prototype:
3326 *
3327- * size_t __copy_to_user(void *to, const void *from, size_t n)
3328+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3329 *
3330 * Purpose:
3331 *
3332@@ -88,11 +88,11 @@
3333 .text
3334
3335 ENTRY(__copy_to_user_std)
3336-WEAK(__copy_to_user)
3337+WEAK(___copy_to_user)
3338
3339 #include "copy_template.S"
3340
3341-ENDPROC(__copy_to_user)
3342+ENDPROC(___copy_to_user)
3343 ENDPROC(__copy_to_user_std)
3344
3345 .pushsection .fixup,"ax"
3346diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3347index 7d08b43..f7ca7ea 100644
3348--- a/arch/arm/lib/csumpartialcopyuser.S
3349+++ b/arch/arm/lib/csumpartialcopyuser.S
3350@@ -57,8 +57,8 @@
3351 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3352 */
3353
3354-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3355-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3356+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3357+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3358
3359 #include "csumpartialcopygeneric.S"
3360
3361diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3362index 5306de3..aed6d03 100644
3363--- a/arch/arm/lib/delay.c
3364+++ b/arch/arm/lib/delay.c
3365@@ -28,7 +28,7 @@
3366 /*
3367 * Default to the loop-based delay implementation.
3368 */
3369-struct arm_delay_ops arm_delay_ops = {
3370+struct arm_delay_ops arm_delay_ops __read_only = {
3371 .delay = __loop_delay,
3372 .const_udelay = __loop_const_udelay,
3373 .udelay = __loop_udelay,
3374diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3375index 025f742..a9e5b3b 100644
3376--- a/arch/arm/lib/uaccess_with_memcpy.c
3377+++ b/arch/arm/lib/uaccess_with_memcpy.c
3378@@ -104,7 +104,7 @@ out:
3379 }
3380
3381 unsigned long
3382-__copy_to_user(void __user *to, const void *from, unsigned long n)
3383+___copy_to_user(void __user *to, const void *from, unsigned long n)
3384 {
3385 /*
3386 * This test is stubbed out of the main function above to keep
3387@@ -155,7 +155,7 @@ out:
3388 return n;
3389 }
3390
3391-unsigned long __clear_user(void __user *addr, unsigned long n)
3392+unsigned long ___clear_user(void __user *addr, unsigned long n)
3393 {
3394 /* See rational for this in __copy_to_user() above. */
3395 if (n < 64)
3396diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
3397index 1767611..d2e7e24 100644
3398--- a/arch/arm/mach-kirkwood/common.c
3399+++ b/arch/arm/mach-kirkwood/common.c
3400@@ -156,7 +156,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
3401 clk_gate_ops.disable(hw);
3402 }
3403
3404-static struct clk_ops clk_gate_fn_ops;
3405+static int clk_gate_fn_is_enabled(struct clk_hw *hw)
3406+{
3407+ return clk_gate_ops.is_enabled(hw);
3408+}
3409+
3410+static struct clk_ops clk_gate_fn_ops = {
3411+ .enable = clk_gate_fn_enable,
3412+ .disable = clk_gate_fn_disable,
3413+ .is_enabled = clk_gate_fn_is_enabled,
3414+};
3415
3416 static struct clk __init *clk_register_gate_fn(struct device *dev,
3417 const char *name,
3418@@ -190,14 +199,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
3419 gate_fn->fn_en = fn_en;
3420 gate_fn->fn_dis = fn_dis;
3421
3422- /* ops is the gate ops, but with our enable/disable functions */
3423- if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
3424- clk_gate_fn_ops.disable != clk_gate_fn_disable) {
3425- clk_gate_fn_ops = clk_gate_ops;
3426- clk_gate_fn_ops.enable = clk_gate_fn_enable;
3427- clk_gate_fn_ops.disable = clk_gate_fn_disable;
3428- }
3429-
3430 clk = clk_register(dev, &gate_fn->gate.hw);
3431
3432 if (IS_ERR(clk))
3433diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3434index 827d1500..2885dc6 100644
3435--- a/arch/arm/mach-omap2/board-n8x0.c
3436+++ b/arch/arm/mach-omap2/board-n8x0.c
3437@@ -627,7 +627,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3438 }
3439 #endif
3440
3441-static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3442+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3443 .late_init = n8x0_menelaus_late_init,
3444 };
3445
3446diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3447index 579697a..1d5a3b2 100644
3448--- a/arch/arm/mach-omap2/gpmc.c
3449+++ b/arch/arm/mach-omap2/gpmc.c
3450@@ -148,7 +148,6 @@ struct omap3_gpmc_regs {
3451 };
3452
3453 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3454-static struct irq_chip gpmc_irq_chip;
3455 static int gpmc_irq_start;
3456
3457 static struct resource gpmc_mem_root;
3458@@ -716,6 +715,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3459
3460 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3461
3462+static struct irq_chip gpmc_irq_chip = {
3463+ .name = "gpmc",
3464+ .irq_startup = gpmc_irq_noop_ret,
3465+ .irq_enable = gpmc_irq_enable,
3466+ .irq_disable = gpmc_irq_disable,
3467+ .irq_shutdown = gpmc_irq_noop,
3468+ .irq_ack = gpmc_irq_noop,
3469+ .irq_mask = gpmc_irq_noop,
3470+ .irq_unmask = gpmc_irq_noop,
3471+
3472+};
3473+
3474 static int gpmc_setup_irq(void)
3475 {
3476 int i;
3477@@ -730,15 +741,6 @@ static int gpmc_setup_irq(void)
3478 return gpmc_irq_start;
3479 }
3480
3481- gpmc_irq_chip.name = "gpmc";
3482- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3483- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3484- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3485- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3486- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3487- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3488- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3489-
3490 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3491 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3492
3493diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3494index f991016..145ebeb 100644
3495--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3496+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3497@@ -84,7 +84,7 @@ struct cpu_pm_ops {
3498 int (*finish_suspend)(unsigned long cpu_state);
3499 void (*resume)(void);
3500 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3501-};
3502+} __no_const;
3503
3504 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3505 static struct powerdomain *mpuss_pd;
3506@@ -102,7 +102,7 @@ static void dummy_cpu_resume(void)
3507 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3508 {}
3509
3510-struct cpu_pm_ops omap_pm_ops = {
3511+static struct cpu_pm_ops omap_pm_ops __read_only = {
3512 .finish_suspend = default_finish_suspend,
3513 .resume = dummy_cpu_resume,
3514 .scu_prepare = dummy_scu_prepare,
3515diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3516index 813c615..ce467c6 100644
3517--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3518+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3519@@ -339,7 +339,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3520 return NOTIFY_OK;
3521 }
3522
3523-static struct notifier_block __refdata irq_hotplug_notifier = {
3524+static struct notifier_block irq_hotplug_notifier = {
3525 .notifier_call = irq_cpu_hotplug_notify,
3526 };
3527
3528diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3529index 53f0735..5b54eb6 100644
3530--- a/arch/arm/mach-omap2/omap_device.c
3531+++ b/arch/arm/mach-omap2/omap_device.c
3532@@ -504,7 +504,7 @@ void omap_device_delete(struct omap_device *od)
3533 struct platform_device __init *omap_device_build(const char *pdev_name,
3534 int pdev_id,
3535 struct omap_hwmod *oh,
3536- void *pdata, int pdata_len)
3537+ const void *pdata, int pdata_len)
3538 {
3539 struct omap_hwmod *ohs[] = { oh };
3540
3541@@ -532,7 +532,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3542 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3543 int pdev_id,
3544 struct omap_hwmod **ohs,
3545- int oh_cnt, void *pdata,
3546+ int oh_cnt, const void *pdata,
3547 int pdata_len)
3548 {
3549 int ret = -ENOMEM;
3550diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3551index 17ca1ae..beba869 100644
3552--- a/arch/arm/mach-omap2/omap_device.h
3553+++ b/arch/arm/mach-omap2/omap_device.h
3554@@ -71,12 +71,12 @@ int omap_device_idle(struct platform_device *pdev);
3555 /* Core code interface */
3556
3557 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3558- struct omap_hwmod *oh, void *pdata,
3559+ struct omap_hwmod *oh, const void *pdata,
3560 int pdata_len);
3561
3562 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3563 struct omap_hwmod **oh, int oh_cnt,
3564- void *pdata, int pdata_len);
3565+ const void *pdata, int pdata_len);
3566
3567 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3568 struct omap_hwmod **ohs, int oh_cnt);
3569diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3570index 832adb1..49b62c4 100644
3571--- a/arch/arm/mach-omap2/omap_hwmod.c
3572+++ b/arch/arm/mach-omap2/omap_hwmod.c
3573@@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3574 int (*init_clkdm)(struct omap_hwmod *oh);
3575 void (*update_context_lost)(struct omap_hwmod *oh);
3576 int (*get_context_lost)(struct omap_hwmod *oh);
3577-};
3578+} __no_const;
3579
3580 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3581-static struct omap_hwmod_soc_ops soc_ops;
3582+static struct omap_hwmod_soc_ops soc_ops __read_only;
3583
3584 /* omap_hwmod_list contains all registered struct omap_hwmods */
3585 static LIST_HEAD(omap_hwmod_list);
3586diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3587index d15c7bb..b2d1f0c 100644
3588--- a/arch/arm/mach-omap2/wd_timer.c
3589+++ b/arch/arm/mach-omap2/wd_timer.c
3590@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3591 struct omap_hwmod *oh;
3592 char *oh_name = "wd_timer2";
3593 char *dev_name = "omap_wdt";
3594- struct omap_wd_timer_platform_data pdata;
3595+ static struct omap_wd_timer_platform_data pdata = {
3596+ .read_reset_sources = prm_read_reset_sources
3597+ };
3598
3599 if (!cpu_class_is_omap2() || of_have_populated_dt())
3600 return 0;
3601@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3602 return -EINVAL;
3603 }
3604
3605- pdata.read_reset_sources = prm_read_reset_sources;
3606-
3607 pdev = omap_device_build(dev_name, id, oh, &pdata,
3608 sizeof(struct omap_wd_timer_platform_data));
3609 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3610diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3611index b82dcae..44ee5b6 100644
3612--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3613+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3614@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3615 bool entered_lp2 = false;
3616
3617 if (tegra_pending_sgi())
3618- ACCESS_ONCE(abort_flag) = true;
3619+ ACCESS_ONCE_RW(abort_flag) = true;
3620
3621 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3622
3623diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3624index 656324a..0beba28 100644
3625--- a/arch/arm/mach-ux500/setup.h
3626+++ b/arch/arm/mach-ux500/setup.h
3627@@ -40,13 +40,6 @@ extern void ux500_timer_init(void);
3628 .type = MT_DEVICE, \
3629 }
3630
3631-#define __MEM_DEV_DESC(x, sz) { \
3632- .virtual = IO_ADDRESS(x), \
3633- .pfn = __phys_to_pfn(x), \
3634- .length = sz, \
3635- .type = MT_MEMORY, \
3636-}
3637-
3638 extern struct smp_operations ux500_smp_ops;
3639 extern void ux500_cpu_die(unsigned int cpu);
3640
3641diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3642index cd2c88e..4dd9b67 100644
3643--- a/arch/arm/mm/Kconfig
3644+++ b/arch/arm/mm/Kconfig
3645@@ -446,7 +446,7 @@ config CPU_32v5
3646
3647 config CPU_32v6
3648 bool
3649- select CPU_USE_DOMAINS if CPU_V6 && MMU
3650+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3651 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3652
3653 config CPU_32v6K
3654@@ -601,6 +601,7 @@ config CPU_CP15_MPU
3655
3656 config CPU_USE_DOMAINS
3657 bool
3658+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3659 help
3660 This option enables or disables the use of domain switching
3661 via the set_fs() function.
3662@@ -800,6 +801,7 @@ config NEED_KUSER_HELPERS
3663 config KUSER_HELPERS
3664 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3665 default y
3666+ depends on !(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND
3667 help
3668 Warning: disabling this option may break user programs.
3669
3670@@ -812,7 +814,7 @@ config KUSER_HELPERS
3671 See Documentation/arm/kernel_user_helpers.txt for details.
3672
3673 However, the fixed address nature of these helpers can be used
3674- by ROP (return orientated programming) authors when creating
3675+ by ROP (Return Oriented Programming) authors when creating
3676 exploits.
3677
3678 If all of the binaries and libraries which run on your platform
3679diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3680index 6f4585b..7b6f52b 100644
3681--- a/arch/arm/mm/alignment.c
3682+++ b/arch/arm/mm/alignment.c
3683@@ -211,10 +211,12 @@ union offset_union {
3684 #define __get16_unaligned_check(ins,val,addr) \
3685 do { \
3686 unsigned int err = 0, v, a = addr; \
3687+ pax_open_userland(); \
3688 __get8_unaligned_check(ins,v,a,err); \
3689 val = v << ((BE) ? 8 : 0); \
3690 __get8_unaligned_check(ins,v,a,err); \
3691 val |= v << ((BE) ? 0 : 8); \
3692+ pax_close_userland(); \
3693 if (err) \
3694 goto fault; \
3695 } while (0)
3696@@ -228,6 +230,7 @@ union offset_union {
3697 #define __get32_unaligned_check(ins,val,addr) \
3698 do { \
3699 unsigned int err = 0, v, a = addr; \
3700+ pax_open_userland(); \
3701 __get8_unaligned_check(ins,v,a,err); \
3702 val = v << ((BE) ? 24 : 0); \
3703 __get8_unaligned_check(ins,v,a,err); \
3704@@ -236,6 +239,7 @@ union offset_union {
3705 val |= v << ((BE) ? 8 : 16); \
3706 __get8_unaligned_check(ins,v,a,err); \
3707 val |= v << ((BE) ? 0 : 24); \
3708+ pax_close_userland(); \
3709 if (err) \
3710 goto fault; \
3711 } while (0)
3712@@ -249,6 +253,7 @@ union offset_union {
3713 #define __put16_unaligned_check(ins,val,addr) \
3714 do { \
3715 unsigned int err = 0, v = val, a = addr; \
3716+ pax_open_userland(); \
3717 __asm__( FIRST_BYTE_16 \
3718 ARM( "1: "ins" %1, [%2], #1\n" ) \
3719 THUMB( "1: "ins" %1, [%2]\n" ) \
3720@@ -268,6 +273,7 @@ union offset_union {
3721 " .popsection\n" \
3722 : "=r" (err), "=&r" (v), "=&r" (a) \
3723 : "0" (err), "1" (v), "2" (a)); \
3724+ pax_close_userland(); \
3725 if (err) \
3726 goto fault; \
3727 } while (0)
3728@@ -281,6 +287,7 @@ union offset_union {
3729 #define __put32_unaligned_check(ins,val,addr) \
3730 do { \
3731 unsigned int err = 0, v = val, a = addr; \
3732+ pax_open_userland(); \
3733 __asm__( FIRST_BYTE_32 \
3734 ARM( "1: "ins" %1, [%2], #1\n" ) \
3735 THUMB( "1: "ins" %1, [%2]\n" ) \
3736@@ -310,6 +317,7 @@ union offset_union {
3737 " .popsection\n" \
3738 : "=r" (err), "=&r" (v), "=&r" (a) \
3739 : "0" (err), "1" (v), "2" (a)); \
3740+ pax_close_userland(); \
3741 if (err) \
3742 goto fault; \
3743 } while (0)
3744diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3745index 447da6f..77a5057 100644
3746--- a/arch/arm/mm/cache-l2x0.c
3747+++ b/arch/arm/mm/cache-l2x0.c
3748@@ -45,7 +45,7 @@ struct l2x0_of_data {
3749 void (*setup)(const struct device_node *, u32 *, u32 *);
3750 void (*save)(void);
3751 struct outer_cache_fns outer_cache;
3752-};
3753+} __do_const;
3754
3755 static bool of_init = false;
3756
3757diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3758index 84e6f77..0b52f31 100644
3759--- a/arch/arm/mm/context.c
3760+++ b/arch/arm/mm/context.c
3761@@ -43,7 +43,7 @@
3762 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3763
3764 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3765-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3766+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3767 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3768
3769 static DEFINE_PER_CPU(atomic64_t, active_asids);
3770@@ -180,7 +180,7 @@ static int is_reserved_asid(u64 asid)
3771 static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3772 {
3773 u64 asid = atomic64_read(&mm->context.id);
3774- u64 generation = atomic64_read(&asid_generation);
3775+ u64 generation = atomic64_read_unchecked(&asid_generation);
3776
3777 if (asid != 0 && is_reserved_asid(asid)) {
3778 /*
3779@@ -198,7 +198,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3780 */
3781 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3782 if (asid == NUM_USER_ASIDS) {
3783- generation = atomic64_add_return(ASID_FIRST_VERSION,
3784+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3785 &asid_generation);
3786 flush_context(cpu);
3787 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3788@@ -227,14 +227,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3789 cpu_set_reserved_ttbr0();
3790
3791 asid = atomic64_read(&mm->context.id);
3792- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3793+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3794 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3795 goto switch_mm_fastpath;
3796
3797 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3798 /* Check that our ASID belongs to the current generation. */
3799 asid = atomic64_read(&mm->context.id);
3800- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3801+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3802 asid = new_context(mm, cpu);
3803 atomic64_set(&mm->context.id, asid);
3804 }
3805diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3806index eb8830a..5360ce7 100644
3807--- a/arch/arm/mm/fault.c
3808+++ b/arch/arm/mm/fault.c
3809@@ -25,6 +25,7 @@
3810 #include <asm/system_misc.h>
3811 #include <asm/system_info.h>
3812 #include <asm/tlbflush.h>
3813+#include <asm/sections.h>
3814
3815 #include "fault.h"
3816
3817@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3818 if (fixup_exception(regs))
3819 return;
3820
3821+#ifdef CONFIG_PAX_MEMORY_UDEREF
3822+ if (addr < TASK_SIZE) {
3823+ if (current->signal->curr_ip)
3824+ 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),
3825+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3826+ else
3827+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3828+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3829+ }
3830+#endif
3831+
3832+#ifdef CONFIG_PAX_KERNEXEC
3833+ if ((fsr & FSR_WRITE) &&
3834+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3835+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3836+ {
3837+ if (current->signal->curr_ip)
3838+ 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),
3839+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3840+ else
3841+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3842+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3843+ }
3844+#endif
3845+
3846 /*
3847 * No handler, we'll have to terminate things with extreme prejudice.
3848 */
3849@@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3850 }
3851 #endif
3852
3853+#ifdef CONFIG_PAX_PAGEEXEC
3854+ if (fsr & FSR_LNX_PF) {
3855+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3856+ do_group_exit(SIGKILL);
3857+ }
3858+#endif
3859+
3860 tsk->thread.address = addr;
3861 tsk->thread.error_code = fsr;
3862 tsk->thread.trap_no = 14;
3863@@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3864 }
3865 #endif /* CONFIG_MMU */
3866
3867+#ifdef CONFIG_PAX_PAGEEXEC
3868+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3869+{
3870+ long i;
3871+
3872+ printk(KERN_ERR "PAX: bytes at PC: ");
3873+ for (i = 0; i < 20; i++) {
3874+ unsigned char c;
3875+ if (get_user(c, (__force unsigned char __user *)pc+i))
3876+ printk(KERN_CONT "?? ");
3877+ else
3878+ printk(KERN_CONT "%02x ", c);
3879+ }
3880+ printk("\n");
3881+
3882+ printk(KERN_ERR "PAX: bytes at SP-4: ");
3883+ for (i = -1; i < 20; i++) {
3884+ unsigned long c;
3885+ if (get_user(c, (__force unsigned long __user *)sp+i))
3886+ printk(KERN_CONT "???????? ");
3887+ else
3888+ printk(KERN_CONT "%08lx ", c);
3889+ }
3890+ printk("\n");
3891+}
3892+#endif
3893+
3894 /*
3895 * First Level Translation Fault Handler
3896 *
3897@@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3898 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
3899 struct siginfo info;
3900
3901+#ifdef CONFIG_PAX_MEMORY_UDEREF
3902+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
3903+ if (current->signal->curr_ip)
3904+ 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),
3905+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3906+ else
3907+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3908+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3909+ goto die;
3910+ }
3911+#endif
3912+
3913 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
3914 return;
3915
3916+die:
3917 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
3918 inf->name, fsr, addr);
3919
3920@@ -574,15 +647,98 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
3921 ifsr_info[nr].name = name;
3922 }
3923
3924+asmlinkage int sys_sigreturn(struct pt_regs *regs);
3925+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
3926+
3927 asmlinkage void __exception
3928 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
3929 {
3930 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
3931 struct siginfo info;
3932+ unsigned long pc = instruction_pointer(regs);
3933+
3934+ if (user_mode(regs)) {
3935+ unsigned long sigpage = current->mm->context.sigpage;
3936+
3937+ if (sigpage <= pc && pc < sigpage + 7*4) {
3938+ if (pc < sigpage + 3*4)
3939+ sys_sigreturn(regs);
3940+ else
3941+ sys_rt_sigreturn(regs);
3942+ return;
3943+ }
3944+ if (pc == 0xffff0f60UL) {
3945+ /*
3946+ * PaX: __kuser_cmpxchg64 emulation
3947+ */
3948+ // TODO
3949+ //regs->ARM_pc = regs->ARM_lr;
3950+ //return;
3951+ }
3952+ if (pc == 0xffff0fa0UL) {
3953+ /*
3954+ * PaX: __kuser_memory_barrier emulation
3955+ */
3956+ // dmb(); implied by the exception
3957+ regs->ARM_pc = regs->ARM_lr;
3958+ return;
3959+ }
3960+ if (pc == 0xffff0fc0UL) {
3961+ /*
3962+ * PaX: __kuser_cmpxchg emulation
3963+ */
3964+ // TODO
3965+ //long new;
3966+ //int op;
3967+
3968+ //op = FUTEX_OP_SET << 28;
3969+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
3970+ //regs->ARM_r0 = old != new;
3971+ //regs->ARM_pc = regs->ARM_lr;
3972+ //return;
3973+ }
3974+ if (pc == 0xffff0fe0UL) {
3975+ /*
3976+ * PaX: __kuser_get_tls emulation
3977+ */
3978+ regs->ARM_r0 = current_thread_info()->tp_value[0];
3979+ regs->ARM_pc = regs->ARM_lr;
3980+ return;
3981+ }
3982+ }
3983+
3984+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
3985+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
3986+ if (current->signal->curr_ip)
3987+ 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),
3988+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
3989+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
3990+ else
3991+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
3992+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
3993+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
3994+ goto die;
3995+ }
3996+#endif
3997+
3998+#ifdef CONFIG_PAX_REFCOUNT
3999+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4000+ unsigned int bkpt;
4001+
4002+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4003+ current->thread.error_code = ifsr;
4004+ current->thread.trap_no = 0;
4005+ pax_report_refcount_overflow(regs);
4006+ fixup_exception(regs);
4007+ return;
4008+ }
4009+ }
4010+#endif
4011
4012 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4013 return;
4014
4015+die:
4016 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4017 inf->name, ifsr, addr);
4018
4019diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4020index cf08bdf..772656c 100644
4021--- a/arch/arm/mm/fault.h
4022+++ b/arch/arm/mm/fault.h
4023@@ -3,6 +3,7 @@
4024
4025 /*
4026 * Fault status register encodings. We steal bit 31 for our own purposes.
4027+ * Set when the FSR value is from an instruction fault.
4028 */
4029 #define FSR_LNX_PF (1 << 31)
4030 #define FSR_WRITE (1 << 11)
4031@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4032 }
4033 #endif
4034
4035+/* valid for LPAE and !LPAE */
4036+static inline int is_xn_fault(unsigned int fsr)
4037+{
4038+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4039+}
4040+
4041+static inline int is_domain_fault(unsigned int fsr)
4042+{
4043+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4044+}
4045+
4046 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4047 unsigned long search_exception_table(unsigned long addr);
4048
4049diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4050index 18ec4c5..479bb6a 100644
4051--- a/arch/arm/mm/init.c
4052+++ b/arch/arm/mm/init.c
4053@@ -30,6 +30,8 @@
4054 #include <asm/setup.h>
4055 #include <asm/tlb.h>
4056 #include <asm/fixmap.h>
4057+#include <asm/system_info.h>
4058+#include <asm/cp15.h>
4059
4060 #include <asm/mach/arch.h>
4061 #include <asm/mach/map.h>
4062@@ -684,7 +686,46 @@ void free_initmem(void)
4063 {
4064 #ifdef CONFIG_HAVE_TCM
4065 extern char __tcm_start, __tcm_end;
4066+#endif
4067
4068+#ifdef CONFIG_PAX_KERNEXEC
4069+ unsigned long addr;
4070+ pgd_t *pgd;
4071+ pud_t *pud;
4072+ pmd_t *pmd;
4073+ int cpu_arch = cpu_architecture();
4074+ unsigned int cr = get_cr();
4075+
4076+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4077+ /* make pages tables, etc before .text NX */
4078+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4079+ pgd = pgd_offset_k(addr);
4080+ pud = pud_offset(pgd, addr);
4081+ pmd = pmd_offset(pud, addr);
4082+ __section_update(pmd, addr, PMD_SECT_XN);
4083+ }
4084+ /* make init NX */
4085+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4086+ pgd = pgd_offset_k(addr);
4087+ pud = pud_offset(pgd, addr);
4088+ pmd = pmd_offset(pud, addr);
4089+ __section_update(pmd, addr, PMD_SECT_XN);
4090+ }
4091+ /* make kernel code/rodata RX */
4092+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4093+ pgd = pgd_offset_k(addr);
4094+ pud = pud_offset(pgd, addr);
4095+ pmd = pmd_offset(pud, addr);
4096+#ifdef CONFIG_ARM_LPAE
4097+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4098+#else
4099+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4100+#endif
4101+ }
4102+ }
4103+#endif
4104+
4105+#ifdef CONFIG_HAVE_TCM
4106 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4107 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4108 #endif
4109diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4110index f123d6e..04bf569 100644
4111--- a/arch/arm/mm/ioremap.c
4112+++ b/arch/arm/mm/ioremap.c
4113@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4114 unsigned int mtype;
4115
4116 if (cached)
4117- mtype = MT_MEMORY;
4118+ mtype = MT_MEMORY_RX;
4119 else
4120- mtype = MT_MEMORY_NONCACHED;
4121+ mtype = MT_MEMORY_NONCACHED_RX;
4122
4123 return __arm_ioremap_caller(phys_addr, size, mtype,
4124 __builtin_return_address(0));
4125diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4126index 304661d..53a6b19 100644
4127--- a/arch/arm/mm/mmap.c
4128+++ b/arch/arm/mm/mmap.c
4129@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4130 struct vm_area_struct *vma;
4131 int do_align = 0;
4132 int aliasing = cache_is_vipt_aliasing();
4133+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4134 struct vm_unmapped_area_info info;
4135
4136 /*
4137@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4138 if (len > TASK_SIZE)
4139 return -ENOMEM;
4140
4141+#ifdef CONFIG_PAX_RANDMMAP
4142+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4143+#endif
4144+
4145 if (addr) {
4146 if (do_align)
4147 addr = COLOUR_ALIGN(addr, pgoff);
4148@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4149 addr = PAGE_ALIGN(addr);
4150
4151 vma = find_vma(mm, addr);
4152- if (TASK_SIZE - len >= addr &&
4153- (!vma || addr + len <= vma->vm_start))
4154+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4155 return addr;
4156 }
4157
4158@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4159 info.high_limit = TASK_SIZE;
4160 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4161 info.align_offset = pgoff << PAGE_SHIFT;
4162+ info.threadstack_offset = offset;
4163 return vm_unmapped_area(&info);
4164 }
4165
4166@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4167 unsigned long addr = addr0;
4168 int do_align = 0;
4169 int aliasing = cache_is_vipt_aliasing();
4170+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4171 struct vm_unmapped_area_info info;
4172
4173 /*
4174@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4175 return addr;
4176 }
4177
4178+#ifdef CONFIG_PAX_RANDMMAP
4179+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4180+#endif
4181+
4182 /* requesting a specific address */
4183 if (addr) {
4184 if (do_align)
4185@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4186 else
4187 addr = PAGE_ALIGN(addr);
4188 vma = find_vma(mm, addr);
4189- if (TASK_SIZE - len >= addr &&
4190- (!vma || addr + len <= vma->vm_start))
4191+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4192 return addr;
4193 }
4194
4195@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4196 info.high_limit = mm->mmap_base;
4197 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4198 info.align_offset = pgoff << PAGE_SHIFT;
4199+ info.threadstack_offset = offset;
4200 addr = vm_unmapped_area(&info);
4201
4202 /*
4203@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4204 {
4205 unsigned long random_factor = 0UL;
4206
4207+#ifdef CONFIG_PAX_RANDMMAP
4208+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4209+#endif
4210+
4211 /* 8 bits of randomness in 20 address space bits */
4212 if ((current->flags & PF_RANDOMIZE) &&
4213 !(current->personality & ADDR_NO_RANDOMIZE))
4214@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4215
4216 if (mmap_is_legacy()) {
4217 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4218+
4219+#ifdef CONFIG_PAX_RANDMMAP
4220+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4221+ mm->mmap_base += mm->delta_mmap;
4222+#endif
4223+
4224 mm->get_unmapped_area = arch_get_unmapped_area;
4225 } else {
4226 mm->mmap_base = mmap_base(random_factor);
4227+
4228+#ifdef CONFIG_PAX_RANDMMAP
4229+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4230+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4231+#endif
4232+
4233 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4234 }
4235 }
4236diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4237index b1d17ee..7a6f4d3 100644
4238--- a/arch/arm/mm/mmu.c
4239+++ b/arch/arm/mm/mmu.c
4240@@ -36,6 +36,22 @@
4241 #include "mm.h"
4242 #include "tcm.h"
4243
4244+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4245+void modify_domain(unsigned int dom, unsigned int type)
4246+{
4247+ struct thread_info *thread = current_thread_info();
4248+ unsigned int domain = thread->cpu_domain;
4249+ /*
4250+ * DOMAIN_MANAGER might be defined to some other value,
4251+ * use the arch-defined constant
4252+ */
4253+ domain &= ~domain_val(dom, 3);
4254+ thread->cpu_domain = domain | domain_val(dom, type);
4255+ set_domain(thread->cpu_domain);
4256+}
4257+EXPORT_SYMBOL(modify_domain);
4258+#endif
4259+
4260 /*
4261 * empty_zero_page is a special page that is used for
4262 * zero-initialized data and COW.
4263@@ -228,10 +244,18 @@ __setup("noalign", noalign_setup);
4264
4265 #endif /* ifdef CONFIG_CPU_CP15 / else */
4266
4267-#define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_XN
4268+#define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY
4269 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4270
4271-static struct mem_type mem_types[] = {
4272+#ifdef CONFIG_PAX_KERNEXEC
4273+#define L_PTE_KERNEXEC L_PTE_RDONLY
4274+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4275+#else
4276+#define L_PTE_KERNEXEC L_PTE_DIRTY
4277+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4278+#endif
4279+
4280+static struct mem_type mem_types[] __read_only = {
4281 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4282 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4283 L_PTE_SHARED,
4284@@ -260,16 +284,16 @@ static struct mem_type mem_types[] = {
4285 [MT_UNCACHED] = {
4286 .prot_pte = PROT_PTE_DEVICE,
4287 .prot_l1 = PMD_TYPE_TABLE,
4288- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4289+ .prot_sect = PROT_SECT_DEVICE,
4290 .domain = DOMAIN_IO,
4291 },
4292 [MT_CACHECLEAN] = {
4293- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4294+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4295 .domain = DOMAIN_KERNEL,
4296 },
4297 #ifndef CONFIG_ARM_LPAE
4298 [MT_MINICLEAN] = {
4299- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4300+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_RDONLY,
4301 .domain = DOMAIN_KERNEL,
4302 },
4303 #endif
4304@@ -277,36 +301,54 @@ static struct mem_type mem_types[] = {
4305 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4306 L_PTE_RDONLY,
4307 .prot_l1 = PMD_TYPE_TABLE,
4308- .domain = DOMAIN_USER,
4309+ .domain = DOMAIN_VECTORS,
4310 },
4311 [MT_HIGH_VECTORS] = {
4312 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4313 L_PTE_USER | L_PTE_RDONLY,
4314 .prot_l1 = PMD_TYPE_TABLE,
4315- .domain = DOMAIN_USER,
4316+ .domain = DOMAIN_VECTORS,
4317 },
4318- [MT_MEMORY] = {
4319+ [MT_MEMORY_RWX] = {
4320 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4321 .prot_l1 = PMD_TYPE_TABLE,
4322 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4323 .domain = DOMAIN_KERNEL,
4324 },
4325+ [MT_MEMORY_RW] = {
4326+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4327+ .prot_l1 = PMD_TYPE_TABLE,
4328+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4329+ .domain = DOMAIN_KERNEL,
4330+ },
4331+ [MT_MEMORY_RX] = {
4332+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4333+ .prot_l1 = PMD_TYPE_TABLE,
4334+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4335+ .domain = DOMAIN_KERNEL,
4336+ },
4337 [MT_ROM] = {
4338- .prot_sect = PMD_TYPE_SECT,
4339+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4340 .domain = DOMAIN_KERNEL,
4341 },
4342- [MT_MEMORY_NONCACHED] = {
4343+ [MT_MEMORY_NONCACHED_RW] = {
4344 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4345 L_PTE_MT_BUFFERABLE,
4346 .prot_l1 = PMD_TYPE_TABLE,
4347 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4348 .domain = DOMAIN_KERNEL,
4349 },
4350+ [MT_MEMORY_NONCACHED_RX] = {
4351+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4352+ L_PTE_MT_BUFFERABLE,
4353+ .prot_l1 = PMD_TYPE_TABLE,
4354+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4355+ .domain = DOMAIN_KERNEL,
4356+ },
4357 [MT_MEMORY_DTCM] = {
4358- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4359- L_PTE_XN,
4360+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4361 .prot_l1 = PMD_TYPE_TABLE,
4362- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4363+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4364 .domain = DOMAIN_KERNEL,
4365 },
4366 [MT_MEMORY_ITCM] = {
4367@@ -316,10 +358,10 @@ static struct mem_type mem_types[] = {
4368 },
4369 [MT_MEMORY_SO] = {
4370 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4371- L_PTE_MT_UNCACHED | L_PTE_XN,
4372+ L_PTE_MT_UNCACHED,
4373 .prot_l1 = PMD_TYPE_TABLE,
4374 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S |
4375- PMD_SECT_UNCACHED | PMD_SECT_XN,
4376+ PMD_SECT_UNCACHED,
4377 .domain = DOMAIN_KERNEL,
4378 },
4379 [MT_MEMORY_DMA_READY] = {
4380@@ -405,9 +447,35 @@ static void __init build_mem_type_table(void)
4381 * to prevent speculative instruction fetches.
4382 */
4383 mem_types[MT_DEVICE].prot_sect |= PMD_SECT_XN;
4384+ mem_types[MT_DEVICE].prot_pte |= L_PTE_XN;
4385 mem_types[MT_DEVICE_NONSHARED].prot_sect |= PMD_SECT_XN;
4386+ mem_types[MT_DEVICE_NONSHARED].prot_pte |= L_PTE_XN;
4387 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_XN;
4388+ mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_XN;
4389 mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_XN;
4390+ mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_XN;
4391+
4392+ /* Mark other regions on ARMv6+ as execute-never */
4393+
4394+#ifdef CONFIG_PAX_KERNEXEC
4395+ mem_types[MT_UNCACHED].prot_sect |= PMD_SECT_XN;
4396+ mem_types[MT_UNCACHED].prot_pte |= L_PTE_XN;
4397+ mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_XN;
4398+ mem_types[MT_CACHECLEAN].prot_pte |= L_PTE_XN;
4399+#ifndef CONFIG_ARM_LPAE
4400+ mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_XN;
4401+ mem_types[MT_MINICLEAN].prot_pte |= L_PTE_XN;
4402+#endif
4403+ mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_XN;
4404+ mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_XN;
4405+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_XN;
4406+ mem_types[MT_MEMORY_NONCACHED_RW].prot_pte |= PMD_SECT_XN;
4407+ mem_types[MT_MEMORY_DTCM].prot_sect |= PMD_SECT_XN;
4408+ mem_types[MT_MEMORY_DTCM].prot_pte |= L_PTE_XN;
4409+#endif
4410+
4411+ mem_types[MT_MEMORY_SO].prot_sect |= PMD_SECT_XN;
4412+ mem_types[MT_MEMORY_SO].prot_pte |= L_PTE_XN;
4413 }
4414 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4415 /*
4416@@ -468,6 +536,9 @@ static void __init build_mem_type_table(void)
4417 * from SVC mode and no access from userspace.
4418 */
4419 mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4420+#ifdef CONFIG_PAX_KERNEXEC
4421+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4422+#endif
4423 mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4424 mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4425 #endif
4426@@ -485,11 +556,17 @@ static void __init build_mem_type_table(void)
4427 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4428 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4429 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4430- mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;
4431- mem_types[MT_MEMORY].prot_pte |= L_PTE_SHARED;
4432+ mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4433+ mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4434+ mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4435+ mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4436+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4437+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4438 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4439- mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S;
4440- mem_types[MT_MEMORY_NONCACHED].prot_pte |= L_PTE_SHARED;
4441+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_S;
4442+ mem_types[MT_MEMORY_NONCACHED_RW].prot_pte |= L_PTE_SHARED;
4443+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= PMD_SECT_S;
4444+ mem_types[MT_MEMORY_NONCACHED_RX].prot_pte |= L_PTE_SHARED;
4445 }
4446 }
4447
4448@@ -500,15 +577,20 @@ static void __init build_mem_type_table(void)
4449 if (cpu_arch >= CPU_ARCH_ARMv6) {
4450 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4451 /* Non-cacheable Normal is XCB = 001 */
4452- mem_types[MT_MEMORY_NONCACHED].prot_sect |=
4453+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |=
4454+ PMD_SECT_BUFFERED;
4455+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |=
4456 PMD_SECT_BUFFERED;
4457 } else {
4458 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4459- mem_types[MT_MEMORY_NONCACHED].prot_sect |=
4460+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |=
4461+ PMD_SECT_TEX(1);
4462+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |=
4463 PMD_SECT_TEX(1);
4464 }
4465 } else {
4466- mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4467+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_BUFFERABLE;
4468+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= PMD_SECT_BUFFERABLE;
4469 }
4470
4471 #ifdef CONFIG_ARM_LPAE
4472@@ -524,6 +606,8 @@ static void __init build_mem_type_table(void)
4473 vecs_pgprot |= PTE_EXT_AF;
4474 #endif
4475
4476+ user_pgprot |= __supported_pte_mask;
4477+
4478 for (i = 0; i < 16; i++) {
4479 pteval_t v = pgprot_val(protection_map[i]);
4480 protection_map[i] = __pgprot(v | user_pgprot);
4481@@ -541,10 +625,15 @@ static void __init build_mem_type_table(void)
4482
4483 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4484 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4485- mem_types[MT_MEMORY].prot_sect |= ecc_mask | cp->pmd;
4486- mem_types[MT_MEMORY].prot_pte |= kern_pgprot;
4487+ mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4488+ mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4489+ mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4490+ mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4491+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4492+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4493 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4494- mem_types[MT_MEMORY_NONCACHED].prot_sect |= ecc_mask;
4495+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= ecc_mask;
4496+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= ecc_mask;
4497 mem_types[MT_ROM].prot_sect |= cp->pmd;
4498
4499 switch (cp->pmd) {
4500@@ -1186,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4501 * called function. This means you can't use any function or debugging
4502 * method which may touch any device, otherwise the kernel _will_ crash.
4503 */
4504+
4505+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4506+
4507 static void __init devicemaps_init(const struct machine_desc *mdesc)
4508 {
4509 struct map_desc map;
4510 unsigned long addr;
4511- void *vectors;
4512
4513- /*
4514- * Allocate the vector page early.
4515- */
4516- vectors = early_alloc(PAGE_SIZE * 2);
4517-
4518- early_trap_init(vectors);
4519+ early_trap_init(&vectors);
4520
4521 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4522 pmd_clear(pmd_off_k(addr));
4523@@ -1237,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4524 * location (0xffff0000). If we aren't using high-vectors, also
4525 * create a mapping at the low-vectors virtual address.
4526 */
4527- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4528+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4529 map.virtual = 0xffff0000;
4530 map.length = PAGE_SIZE;
4531 #ifdef CONFIG_KUSER_HELPERS
4532@@ -1309,8 +1395,39 @@ static void __init map_lowmem(void)
4533 map.pfn = __phys_to_pfn(start);
4534 map.virtual = __phys_to_virt(start);
4535 map.length = end - start;
4536- map.type = MT_MEMORY;
4537
4538+#ifdef CONFIG_PAX_KERNEXEC
4539+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4540+ struct map_desc kernel;
4541+ struct map_desc initmap;
4542+
4543+ /* when freeing initmem we will make this RW */
4544+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4545+ initmap.virtual = (unsigned long)__init_begin;
4546+ initmap.length = _sdata - __init_begin;
4547+ initmap.type = MT_MEMORY_RWX;
4548+ create_mapping(&initmap);
4549+
4550+ /* when freeing initmem we will make this RX */
4551+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4552+ kernel.virtual = (unsigned long)_stext;
4553+ kernel.length = __init_begin - _stext;
4554+ kernel.type = MT_MEMORY_RWX;
4555+ create_mapping(&kernel);
4556+
4557+ if (map.virtual < (unsigned long)_stext) {
4558+ map.length = (unsigned long)_stext - map.virtual;
4559+ map.type = MT_MEMORY_RWX;
4560+ create_mapping(&map);
4561+ }
4562+
4563+ map.pfn = __phys_to_pfn(__pa(_sdata));
4564+ map.virtual = (unsigned long)_sdata;
4565+ map.length = end - __pa(_sdata);
4566+ }
4567+#endif
4568+
4569+ map.type = MT_MEMORY_RW;
4570 create_mapping(&map);
4571 }
4572 }
4573diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4574index a5bc92d..0bb4730 100644
4575--- a/arch/arm/plat-omap/sram.c
4576+++ b/arch/arm/plat-omap/sram.c
4577@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4578 * Looks like we need to preserve some bootloader code at the
4579 * beginning of SRAM for jumping to flash for reboot to work...
4580 */
4581+ pax_open_kernel();
4582 memset_io(omap_sram_base + omap_sram_skip, 0,
4583 omap_sram_size - omap_sram_skip);
4584+ pax_close_kernel();
4585 }
4586diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4587index ce6d763..cfea917 100644
4588--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4589+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4590@@ -47,7 +47,7 @@ struct samsung_dma_ops {
4591 int (*started)(unsigned ch);
4592 int (*flush)(unsigned ch);
4593 int (*stop)(unsigned ch);
4594-};
4595+} __no_const;
4596
4597 extern void *samsung_dmadev_get_ops(void);
4598 extern void *s3c_dma_get_ops(void);
4599diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4600index c3a58a1..78fbf54 100644
4601--- a/arch/avr32/include/asm/cache.h
4602+++ b/arch/avr32/include/asm/cache.h
4603@@ -1,8 +1,10 @@
4604 #ifndef __ASM_AVR32_CACHE_H
4605 #define __ASM_AVR32_CACHE_H
4606
4607+#include <linux/const.h>
4608+
4609 #define L1_CACHE_SHIFT 5
4610-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4611+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4612
4613 /*
4614 * Memory returned by kmalloc() may be used for DMA, so we must make
4615diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4616index d232888..87c8df1 100644
4617--- a/arch/avr32/include/asm/elf.h
4618+++ b/arch/avr32/include/asm/elf.h
4619@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4620 the loader. We need to make sure that it is out of the way of the program
4621 that it will "exec", and that there is sufficient room for the brk. */
4622
4623-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4624+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4625
4626+#ifdef CONFIG_PAX_ASLR
4627+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4628+
4629+#define PAX_DELTA_MMAP_LEN 15
4630+#define PAX_DELTA_STACK_LEN 15
4631+#endif
4632
4633 /* This yields a mask that user programs can use to figure out what
4634 instruction set this CPU supports. This could be done in user space,
4635diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4636index 479330b..53717a8 100644
4637--- a/arch/avr32/include/asm/kmap_types.h
4638+++ b/arch/avr32/include/asm/kmap_types.h
4639@@ -2,9 +2,9 @@
4640 #define __ASM_AVR32_KMAP_TYPES_H
4641
4642 #ifdef CONFIG_DEBUG_HIGHMEM
4643-# define KM_TYPE_NR 29
4644+# define KM_TYPE_NR 30
4645 #else
4646-# define KM_TYPE_NR 14
4647+# define KM_TYPE_NR 15
4648 #endif
4649
4650 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4651diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4652index 0eca933..eb78c7b 100644
4653--- a/arch/avr32/mm/fault.c
4654+++ b/arch/avr32/mm/fault.c
4655@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4656
4657 int exception_trace = 1;
4658
4659+#ifdef CONFIG_PAX_PAGEEXEC
4660+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4661+{
4662+ unsigned long i;
4663+
4664+ printk(KERN_ERR "PAX: bytes at PC: ");
4665+ for (i = 0; i < 20; i++) {
4666+ unsigned char c;
4667+ if (get_user(c, (unsigned char *)pc+i))
4668+ printk(KERN_CONT "???????? ");
4669+ else
4670+ printk(KERN_CONT "%02x ", c);
4671+ }
4672+ printk("\n");
4673+}
4674+#endif
4675+
4676 /*
4677 * This routine handles page faults. It determines the address and the
4678 * problem, and then passes it off to one of the appropriate routines.
4679@@ -176,6 +193,16 @@ bad_area:
4680 up_read(&mm->mmap_sem);
4681
4682 if (user_mode(regs)) {
4683+
4684+#ifdef CONFIG_PAX_PAGEEXEC
4685+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4686+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4687+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4688+ do_group_exit(SIGKILL);
4689+ }
4690+ }
4691+#endif
4692+
4693 if (exception_trace && printk_ratelimit())
4694 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4695 "sp %08lx ecr %lu\n",
4696diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4697index 568885a..f8008df 100644
4698--- a/arch/blackfin/include/asm/cache.h
4699+++ b/arch/blackfin/include/asm/cache.h
4700@@ -7,6 +7,7 @@
4701 #ifndef __ARCH_BLACKFIN_CACHE_H
4702 #define __ARCH_BLACKFIN_CACHE_H
4703
4704+#include <linux/const.h>
4705 #include <linux/linkage.h> /* for asmlinkage */
4706
4707 /*
4708@@ -14,7 +15,7 @@
4709 * Blackfin loads 32 bytes for cache
4710 */
4711 #define L1_CACHE_SHIFT 5
4712-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4713+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4714 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4715
4716 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4717diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4718index aea2718..3639a60 100644
4719--- a/arch/cris/include/arch-v10/arch/cache.h
4720+++ b/arch/cris/include/arch-v10/arch/cache.h
4721@@ -1,8 +1,9 @@
4722 #ifndef _ASM_ARCH_CACHE_H
4723 #define _ASM_ARCH_CACHE_H
4724
4725+#include <linux/const.h>
4726 /* Etrax 100LX have 32-byte cache-lines. */
4727-#define L1_CACHE_BYTES 32
4728 #define L1_CACHE_SHIFT 5
4729+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4730
4731 #endif /* _ASM_ARCH_CACHE_H */
4732diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4733index 7caf25d..ee65ac5 100644
4734--- a/arch/cris/include/arch-v32/arch/cache.h
4735+++ b/arch/cris/include/arch-v32/arch/cache.h
4736@@ -1,11 +1,12 @@
4737 #ifndef _ASM_CRIS_ARCH_CACHE_H
4738 #define _ASM_CRIS_ARCH_CACHE_H
4739
4740+#include <linux/const.h>
4741 #include <arch/hwregs/dma.h>
4742
4743 /* A cache-line is 32 bytes. */
4744-#define L1_CACHE_BYTES 32
4745 #define L1_CACHE_SHIFT 5
4746+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4747
4748 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4749
4750diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
4751index b86329d..6709906 100644
4752--- a/arch/frv/include/asm/atomic.h
4753+++ b/arch/frv/include/asm/atomic.h
4754@@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
4755 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
4756 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
4757
4758+#define atomic64_read_unchecked(v) atomic64_read(v)
4759+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4760+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4761+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4762+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4763+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4764+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4765+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4766+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4767+
4768 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
4769 {
4770 int c, old;
4771diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
4772index 2797163..c2a401d 100644
4773--- a/arch/frv/include/asm/cache.h
4774+++ b/arch/frv/include/asm/cache.h
4775@@ -12,10 +12,11 @@
4776 #ifndef __ASM_CACHE_H
4777 #define __ASM_CACHE_H
4778
4779+#include <linux/const.h>
4780
4781 /* bytes per L1 cache line */
4782 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
4783-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4784+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4785
4786 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4787 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4788diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
4789index 43901f2..0d8b865 100644
4790--- a/arch/frv/include/asm/kmap_types.h
4791+++ b/arch/frv/include/asm/kmap_types.h
4792@@ -2,6 +2,6 @@
4793 #ifndef _ASM_KMAP_TYPES_H
4794 #define _ASM_KMAP_TYPES_H
4795
4796-#define KM_TYPE_NR 17
4797+#define KM_TYPE_NR 18
4798
4799 #endif
4800diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
4801index 836f147..4cf23f5 100644
4802--- a/arch/frv/mm/elf-fdpic.c
4803+++ b/arch/frv/mm/elf-fdpic.c
4804@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4805 {
4806 struct vm_area_struct *vma;
4807 struct vm_unmapped_area_info info;
4808+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
4809
4810 if (len > TASK_SIZE)
4811 return -ENOMEM;
4812@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4813 if (addr) {
4814 addr = PAGE_ALIGN(addr);
4815 vma = find_vma(current->mm, addr);
4816- if (TASK_SIZE - len >= addr &&
4817- (!vma || addr + len <= vma->vm_start))
4818+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4819 goto success;
4820 }
4821
4822@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4823 info.high_limit = (current->mm->start_stack - 0x00200000);
4824 info.align_mask = 0;
4825 info.align_offset = 0;
4826+ info.threadstack_offset = offset;
4827 addr = vm_unmapped_area(&info);
4828 if (!(addr & ~PAGE_MASK))
4829 goto success;
4830diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
4831index f4ca594..adc72fd6 100644
4832--- a/arch/hexagon/include/asm/cache.h
4833+++ b/arch/hexagon/include/asm/cache.h
4834@@ -21,9 +21,11 @@
4835 #ifndef __ASM_CACHE_H
4836 #define __ASM_CACHE_H
4837
4838+#include <linux/const.h>
4839+
4840 /* Bytes per L1 cache line */
4841-#define L1_CACHE_SHIFT (5)
4842-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4843+#define L1_CACHE_SHIFT 5
4844+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4845
4846 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
4847 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
4848diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
4849index 7740ab1..17fa8c5 100644
4850--- a/arch/ia64/Kconfig
4851+++ b/arch/ia64/Kconfig
4852@@ -554,6 +554,7 @@ source "drivers/sn/Kconfig"
4853 config KEXEC
4854 bool "kexec system call"
4855 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
4856+ depends on !GRKERNSEC_KMEM
4857 help
4858 kexec is a system call that implements the ability to shutdown your
4859 current kernel, and to start another kernel. It is like a reboot
4860diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
4861index 6e6fe18..a6ae668 100644
4862--- a/arch/ia64/include/asm/atomic.h
4863+++ b/arch/ia64/include/asm/atomic.h
4864@@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
4865 #define atomic64_inc(v) atomic64_add(1, (v))
4866 #define atomic64_dec(v) atomic64_sub(1, (v))
4867
4868+#define atomic64_read_unchecked(v) atomic64_read(v)
4869+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4870+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4871+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4872+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4873+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4874+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4875+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4876+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4877+
4878 /* Atomic operations are already serializing */
4879 #define smp_mb__before_atomic_dec() barrier()
4880 #define smp_mb__after_atomic_dec() barrier()
4881diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
4882index 988254a..e1ee885 100644
4883--- a/arch/ia64/include/asm/cache.h
4884+++ b/arch/ia64/include/asm/cache.h
4885@@ -1,6 +1,7 @@
4886 #ifndef _ASM_IA64_CACHE_H
4887 #define _ASM_IA64_CACHE_H
4888
4889+#include <linux/const.h>
4890
4891 /*
4892 * Copyright (C) 1998-2000 Hewlett-Packard Co
4893@@ -9,7 +10,7 @@
4894
4895 /* Bytes per L1 (data) cache line. */
4896 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
4897-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4898+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4899
4900 #ifdef CONFIG_SMP
4901 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
4902diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
4903index 5a83c5c..4d7f553 100644
4904--- a/arch/ia64/include/asm/elf.h
4905+++ b/arch/ia64/include/asm/elf.h
4906@@ -42,6 +42,13 @@
4907 */
4908 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
4909
4910+#ifdef CONFIG_PAX_ASLR
4911+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
4912+
4913+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
4914+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
4915+#endif
4916+
4917 #define PT_IA_64_UNWIND 0x70000001
4918
4919 /* IA-64 relocations: */
4920diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
4921index 96a8d92..617a1cf 100644
4922--- a/arch/ia64/include/asm/pgalloc.h
4923+++ b/arch/ia64/include/asm/pgalloc.h
4924@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
4925 pgd_val(*pgd_entry) = __pa(pud);
4926 }
4927
4928+static inline void
4929+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
4930+{
4931+ pgd_populate(mm, pgd_entry, pud);
4932+}
4933+
4934 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
4935 {
4936 return quicklist_alloc(0, GFP_KERNEL, NULL);
4937@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
4938 pud_val(*pud_entry) = __pa(pmd);
4939 }
4940
4941+static inline void
4942+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
4943+{
4944+ pud_populate(mm, pud_entry, pmd);
4945+}
4946+
4947 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
4948 {
4949 return quicklist_alloc(0, GFP_KERNEL, NULL);
4950diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
4951index 7935115..c0eca6a 100644
4952--- a/arch/ia64/include/asm/pgtable.h
4953+++ b/arch/ia64/include/asm/pgtable.h
4954@@ -12,7 +12,7 @@
4955 * David Mosberger-Tang <davidm@hpl.hp.com>
4956 */
4957
4958-
4959+#include <linux/const.h>
4960 #include <asm/mman.h>
4961 #include <asm/page.h>
4962 #include <asm/processor.h>
4963@@ -142,6 +142,17 @@
4964 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4965 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4966 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
4967+
4968+#ifdef CONFIG_PAX_PAGEEXEC
4969+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
4970+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4971+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4972+#else
4973+# define PAGE_SHARED_NOEXEC PAGE_SHARED
4974+# define PAGE_READONLY_NOEXEC PAGE_READONLY
4975+# define PAGE_COPY_NOEXEC PAGE_COPY
4976+#endif
4977+
4978 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
4979 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
4980 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
4981diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
4982index 45698cd..e8e2dbc 100644
4983--- a/arch/ia64/include/asm/spinlock.h
4984+++ b/arch/ia64/include/asm/spinlock.h
4985@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
4986 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
4987
4988 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
4989- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
4990+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
4991 }
4992
4993 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
4994diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
4995index 449c8c0..18965fb 100644
4996--- a/arch/ia64/include/asm/uaccess.h
4997+++ b/arch/ia64/include/asm/uaccess.h
4998@@ -240,12 +240,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
4999 static inline unsigned long
5000 __copy_to_user (void __user *to, const void *from, unsigned long count)
5001 {
5002+ if (count > INT_MAX)
5003+ return count;
5004+
5005+ if (!__builtin_constant_p(count))
5006+ check_object_size(from, count, true);
5007+
5008 return __copy_user(to, (__force void __user *) from, count);
5009 }
5010
5011 static inline unsigned long
5012 __copy_from_user (void *to, const void __user *from, unsigned long count)
5013 {
5014+ if (count > INT_MAX)
5015+ return count;
5016+
5017+ if (!__builtin_constant_p(count))
5018+ check_object_size(to, count, false);
5019+
5020 return __copy_user((__force void __user *) to, from, count);
5021 }
5022
5023@@ -255,10 +267,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5024 ({ \
5025 void __user *__cu_to = (to); \
5026 const void *__cu_from = (from); \
5027- long __cu_len = (n); \
5028+ unsigned long __cu_len = (n); \
5029 \
5030- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5031+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5032+ if (!__builtin_constant_p(n)) \
5033+ check_object_size(__cu_from, __cu_len, true); \
5034 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5035+ } \
5036 __cu_len; \
5037 })
5038
5039@@ -266,11 +281,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5040 ({ \
5041 void *__cu_to = (to); \
5042 const void __user *__cu_from = (from); \
5043- long __cu_len = (n); \
5044+ unsigned long __cu_len = (n); \
5045 \
5046 __chk_user_ptr(__cu_from); \
5047- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5048+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5049+ if (!__builtin_constant_p(n)) \
5050+ check_object_size(__cu_to, __cu_len, false); \
5051 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5052+ } \
5053 __cu_len; \
5054 })
5055
5056diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5057index 24603be..948052d 100644
5058--- a/arch/ia64/kernel/module.c
5059+++ b/arch/ia64/kernel/module.c
5060@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5061 void
5062 module_free (struct module *mod, void *module_region)
5063 {
5064- if (mod && mod->arch.init_unw_table &&
5065- module_region == mod->module_init) {
5066+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5067 unw_remove_unwind_table(mod->arch.init_unw_table);
5068 mod->arch.init_unw_table = NULL;
5069 }
5070@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5071 }
5072
5073 static inline int
5074+in_init_rx (const struct module *mod, uint64_t addr)
5075+{
5076+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5077+}
5078+
5079+static inline int
5080+in_init_rw (const struct module *mod, uint64_t addr)
5081+{
5082+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5083+}
5084+
5085+static inline int
5086 in_init (const struct module *mod, uint64_t addr)
5087 {
5088- return addr - (uint64_t) mod->module_init < mod->init_size;
5089+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5090+}
5091+
5092+static inline int
5093+in_core_rx (const struct module *mod, uint64_t addr)
5094+{
5095+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5096+}
5097+
5098+static inline int
5099+in_core_rw (const struct module *mod, uint64_t addr)
5100+{
5101+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5102 }
5103
5104 static inline int
5105 in_core (const struct module *mod, uint64_t addr)
5106 {
5107- return addr - (uint64_t) mod->module_core < mod->core_size;
5108+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5109 }
5110
5111 static inline int
5112@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5113 break;
5114
5115 case RV_BDREL:
5116- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5117+ if (in_init_rx(mod, val))
5118+ val -= (uint64_t) mod->module_init_rx;
5119+ else if (in_init_rw(mod, val))
5120+ val -= (uint64_t) mod->module_init_rw;
5121+ else if (in_core_rx(mod, val))
5122+ val -= (uint64_t) mod->module_core_rx;
5123+ else if (in_core_rw(mod, val))
5124+ val -= (uint64_t) mod->module_core_rw;
5125 break;
5126
5127 case RV_LTV:
5128@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5129 * addresses have been selected...
5130 */
5131 uint64_t gp;
5132- if (mod->core_size > MAX_LTOFF)
5133+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5134 /*
5135 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5136 * at the end of the module.
5137 */
5138- gp = mod->core_size - MAX_LTOFF / 2;
5139+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5140 else
5141- gp = mod->core_size / 2;
5142- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5143+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5144+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5145 mod->arch.gp = gp;
5146 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5147 }
5148diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5149index ab33328..f39506c 100644
5150--- a/arch/ia64/kernel/palinfo.c
5151+++ b/arch/ia64/kernel/palinfo.c
5152@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5153 return NOTIFY_OK;
5154 }
5155
5156-static struct notifier_block __refdata palinfo_cpu_notifier =
5157+static struct notifier_block palinfo_cpu_notifier =
5158 {
5159 .notifier_call = palinfo_cpu_callback,
5160 .priority = 0,
5161diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5162index 41e33f8..65180b2a 100644
5163--- a/arch/ia64/kernel/sys_ia64.c
5164+++ b/arch/ia64/kernel/sys_ia64.c
5165@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5166 unsigned long align_mask = 0;
5167 struct mm_struct *mm = current->mm;
5168 struct vm_unmapped_area_info info;
5169+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5170
5171 if (len > RGN_MAP_LIMIT)
5172 return -ENOMEM;
5173@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5174 if (REGION_NUMBER(addr) == RGN_HPAGE)
5175 addr = 0;
5176 #endif
5177+
5178+#ifdef CONFIG_PAX_RANDMMAP
5179+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5180+ addr = mm->free_area_cache;
5181+ else
5182+#endif
5183+
5184 if (!addr)
5185 addr = TASK_UNMAPPED_BASE;
5186
5187@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5188 info.high_limit = TASK_SIZE;
5189 info.align_mask = align_mask;
5190 info.align_offset = 0;
5191+ info.threadstack_offset = offset;
5192 return vm_unmapped_area(&info);
5193 }
5194
5195diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5196index 0ccb28f..8992469 100644
5197--- a/arch/ia64/kernel/vmlinux.lds.S
5198+++ b/arch/ia64/kernel/vmlinux.lds.S
5199@@ -198,7 +198,7 @@ SECTIONS {
5200 /* Per-cpu data: */
5201 . = ALIGN(PERCPU_PAGE_SIZE);
5202 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5203- __phys_per_cpu_start = __per_cpu_load;
5204+ __phys_per_cpu_start = per_cpu_load;
5205 /*
5206 * ensure percpu data fits
5207 * into percpu page size
5208diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5209index 7225dad..2a7c8256 100644
5210--- a/arch/ia64/mm/fault.c
5211+++ b/arch/ia64/mm/fault.c
5212@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5213 return pte_present(pte);
5214 }
5215
5216+#ifdef CONFIG_PAX_PAGEEXEC
5217+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5218+{
5219+ unsigned long i;
5220+
5221+ printk(KERN_ERR "PAX: bytes at PC: ");
5222+ for (i = 0; i < 8; i++) {
5223+ unsigned int c;
5224+ if (get_user(c, (unsigned int *)pc+i))
5225+ printk(KERN_CONT "???????? ");
5226+ else
5227+ printk(KERN_CONT "%08x ", c);
5228+ }
5229+ printk("\n");
5230+}
5231+#endif
5232+
5233 # define VM_READ_BIT 0
5234 # define VM_WRITE_BIT 1
5235 # define VM_EXEC_BIT 2
5236@@ -151,8 +168,21 @@ retry:
5237 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5238 goto bad_area;
5239
5240- if ((vma->vm_flags & mask) != mask)
5241+ if ((vma->vm_flags & mask) != mask) {
5242+
5243+#ifdef CONFIG_PAX_PAGEEXEC
5244+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5245+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5246+ goto bad_area;
5247+
5248+ up_read(&mm->mmap_sem);
5249+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5250+ do_group_exit(SIGKILL);
5251+ }
5252+#endif
5253+
5254 goto bad_area;
5255+ }
5256
5257 /*
5258 * If for any reason at all we couldn't handle the fault, make
5259diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5260index 68232db..6ca80af 100644
5261--- a/arch/ia64/mm/hugetlbpage.c
5262+++ b/arch/ia64/mm/hugetlbpage.c
5263@@ -154,6 +154,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5264 unsigned long pgoff, unsigned long flags)
5265 {
5266 struct vm_unmapped_area_info info;
5267+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5268
5269 if (len > RGN_MAP_LIMIT)
5270 return -ENOMEM;
5271@@ -177,6 +178,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5272 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5273 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5274 info.align_offset = 0;
5275+ info.threadstack_offset = offset;
5276 return vm_unmapped_area(&info);
5277 }
5278
5279diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5280index b6f7f43..c04320d 100644
5281--- a/arch/ia64/mm/init.c
5282+++ b/arch/ia64/mm/init.c
5283@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5284 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5285 vma->vm_end = vma->vm_start + PAGE_SIZE;
5286 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5287+
5288+#ifdef CONFIG_PAX_PAGEEXEC
5289+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5290+ vma->vm_flags &= ~VM_EXEC;
5291+
5292+#ifdef CONFIG_PAX_MPROTECT
5293+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5294+ vma->vm_flags &= ~VM_MAYEXEC;
5295+#endif
5296+
5297+ }
5298+#endif
5299+
5300 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5301 down_write(&current->mm->mmap_sem);
5302 if (insert_vm_struct(current->mm, vma)) {
5303diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5304index 40b3ee9..8c2c112 100644
5305--- a/arch/m32r/include/asm/cache.h
5306+++ b/arch/m32r/include/asm/cache.h
5307@@ -1,8 +1,10 @@
5308 #ifndef _ASM_M32R_CACHE_H
5309 #define _ASM_M32R_CACHE_H
5310
5311+#include <linux/const.h>
5312+
5313 /* L1 cache line size */
5314 #define L1_CACHE_SHIFT 4
5315-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5316+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5317
5318 #endif /* _ASM_M32R_CACHE_H */
5319diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5320index 82abd15..d95ae5d 100644
5321--- a/arch/m32r/lib/usercopy.c
5322+++ b/arch/m32r/lib/usercopy.c
5323@@ -14,6 +14,9 @@
5324 unsigned long
5325 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5326 {
5327+ if ((long)n < 0)
5328+ return n;
5329+
5330 prefetch(from);
5331 if (access_ok(VERIFY_WRITE, to, n))
5332 __copy_user(to,from,n);
5333@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5334 unsigned long
5335 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5336 {
5337+ if ((long)n < 0)
5338+ return n;
5339+
5340 prefetchw(to);
5341 if (access_ok(VERIFY_READ, from, n))
5342 __copy_user_zeroing(to,from,n);
5343diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5344index 0395c51..5f26031 100644
5345--- a/arch/m68k/include/asm/cache.h
5346+++ b/arch/m68k/include/asm/cache.h
5347@@ -4,9 +4,11 @@
5348 #ifndef __ARCH_M68K_CACHE_H
5349 #define __ARCH_M68K_CACHE_H
5350
5351+#include <linux/const.h>
5352+
5353 /* bytes per L1 cache line */
5354 #define L1_CACHE_SHIFT 4
5355-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5356+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5357
5358 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5359
5360diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5361index 0424315..defcca9 100644
5362--- a/arch/metag/mm/hugetlbpage.c
5363+++ b/arch/metag/mm/hugetlbpage.c
5364@@ -205,6 +205,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5365 info.high_limit = TASK_SIZE;
5366 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5367 info.align_offset = 0;
5368+ info.threadstack_offset = 0;
5369 return vm_unmapped_area(&info);
5370 }
5371
5372diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5373index 4efe96a..60e8699 100644
5374--- a/arch/microblaze/include/asm/cache.h
5375+++ b/arch/microblaze/include/asm/cache.h
5376@@ -13,11 +13,12 @@
5377 #ifndef _ASM_MICROBLAZE_CACHE_H
5378 #define _ASM_MICROBLAZE_CACHE_H
5379
5380+#include <linux/const.h>
5381 #include <asm/registers.h>
5382
5383 #define L1_CACHE_SHIFT 5
5384 /* word-granular cache in microblaze */
5385-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5386+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5387
5388 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5389
5390diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5391index f75ab4a..adc6968 100644
5392--- a/arch/mips/Kconfig
5393+++ b/arch/mips/Kconfig
5394@@ -2283,6 +2283,7 @@ source "kernel/Kconfig.preempt"
5395
5396 config KEXEC
5397 bool "Kexec system call"
5398+ depends on !GRKERNSEC_KMEM
5399 help
5400 kexec is a system call that implements the ability to shutdown your
5401 current kernel, and to start another kernel. It is like a reboot
5402diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5403index 08b6079..8b554d2 100644
5404--- a/arch/mips/include/asm/atomic.h
5405+++ b/arch/mips/include/asm/atomic.h
5406@@ -21,15 +21,39 @@
5407 #include <asm/cmpxchg.h>
5408 #include <asm/war.h>
5409
5410+#ifdef CONFIG_GENERIC_ATOMIC64
5411+#include <asm-generic/atomic64.h>
5412+#endif
5413+
5414 #define ATOMIC_INIT(i) { (i) }
5415
5416+#ifdef CONFIG_64BIT
5417+#define _ASM_EXTABLE(from, to) \
5418+" .section __ex_table,\"a\"\n" \
5419+" .dword " #from ", " #to"\n" \
5420+" .previous\n"
5421+#else
5422+#define _ASM_EXTABLE(from, to) \
5423+" .section __ex_table,\"a\"\n" \
5424+" .word " #from ", " #to"\n" \
5425+" .previous\n"
5426+#endif
5427+
5428 /*
5429 * atomic_read - read atomic variable
5430 * @v: pointer of type atomic_t
5431 *
5432 * Atomically reads the value of @v.
5433 */
5434-#define atomic_read(v) (*(volatile int *)&(v)->counter)
5435+static inline int atomic_read(const atomic_t *v)
5436+{
5437+ return (*(volatile const int *) &v->counter);
5438+}
5439+
5440+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5441+{
5442+ return (*(volatile const int *) &v->counter);
5443+}
5444
5445 /*
5446 * atomic_set - set atomic variable
5447@@ -38,7 +62,15 @@
5448 *
5449 * Atomically sets the value of @v to @i.
5450 */
5451-#define atomic_set(v, i) ((v)->counter = (i))
5452+static inline void atomic_set(atomic_t *v, int i)
5453+{
5454+ v->counter = i;
5455+}
5456+
5457+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5458+{
5459+ v->counter = i;
5460+}
5461
5462 /*
5463 * atomic_add - add integer to atomic variable
5464@@ -47,7 +79,67 @@
5465 *
5466 * Atomically adds @i to @v.
5467 */
5468-static __inline__ void atomic_add(int i, atomic_t * v)
5469+static __inline__ void atomic_add(int i, atomic_t *v)
5470+{
5471+ int temp;
5472+
5473+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5474+ __asm__ __volatile__(
5475+ " .set mips3 \n"
5476+ "1: ll %0, %1 # atomic_add \n"
5477+#ifdef CONFIG_PAX_REFCOUNT
5478+ /* Exception on overflow. */
5479+ "2: add %0, %2 \n"
5480+#else
5481+ " addu %0, %2 \n"
5482+#endif
5483+ " sc %0, %1 \n"
5484+ " beqzl %0, 1b \n"
5485+#ifdef CONFIG_PAX_REFCOUNT
5486+ "3: \n"
5487+ _ASM_EXTABLE(2b, 3b)
5488+#endif
5489+ " .set mips0 \n"
5490+ : "=&r" (temp), "+m" (v->counter)
5491+ : "Ir" (i));
5492+ } else if (kernel_uses_llsc) {
5493+ __asm__ __volatile__(
5494+ " .set mips3 \n"
5495+ "1: ll %0, %1 # atomic_add \n"
5496+#ifdef CONFIG_PAX_REFCOUNT
5497+ /* Exception on overflow. */
5498+ "2: add %0, %2 \n"
5499+#else
5500+ " addu %0, %2 \n"
5501+#endif
5502+ " sc %0, %1 \n"
5503+ " beqz %0, 1b \n"
5504+#ifdef CONFIG_PAX_REFCOUNT
5505+ "3: \n"
5506+ _ASM_EXTABLE(2b, 3b)
5507+#endif
5508+ " .set mips0 \n"
5509+ : "=&r" (temp), "+m" (v->counter)
5510+ : "Ir" (i));
5511+ } else {
5512+ unsigned long flags;
5513+
5514+ raw_local_irq_save(flags);
5515+ __asm__ __volatile__(
5516+#ifdef CONFIG_PAX_REFCOUNT
5517+ /* Exception on overflow. */
5518+ "1: add %0, %1 \n"
5519+ "2: \n"
5520+ _ASM_EXTABLE(1b, 2b)
5521+#else
5522+ " addu %0, %1 \n"
5523+#endif
5524+ : "+r" (v->counter) : "Ir" (i));
5525+ raw_local_irq_restore(flags);
5526+ }
5527+}
5528+
5529+static __inline__ void atomic_add_unchecked(int i, atomic_unchecked_t *v)
5530 {
5531 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5532 int temp;
5533@@ -90,7 +182,67 @@ static __inline__ void atomic_add(int i, atomic_t * v)
5534 *
5535 * Atomically subtracts @i from @v.
5536 */
5537-static __inline__ void atomic_sub(int i, atomic_t * v)
5538+static __inline__ void atomic_sub(int i, atomic_t *v)
5539+{
5540+ int temp;
5541+
5542+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5543+ __asm__ __volatile__(
5544+ " .set mips3 \n"
5545+ "1: ll %0, %1 # atomic64_sub \n"
5546+#ifdef CONFIG_PAX_REFCOUNT
5547+ /* Exception on overflow. */
5548+ "2: sub %0, %2 \n"
5549+#else
5550+ " subu %0, %2 \n"
5551+#endif
5552+ " sc %0, %1 \n"
5553+ " beqzl %0, 1b \n"
5554+#ifdef CONFIG_PAX_REFCOUNT
5555+ "3: \n"
5556+ _ASM_EXTABLE(2b, 3b)
5557+#endif
5558+ " .set mips0 \n"
5559+ : "=&r" (temp), "+m" (v->counter)
5560+ : "Ir" (i));
5561+ } else if (kernel_uses_llsc) {
5562+ __asm__ __volatile__(
5563+ " .set mips3 \n"
5564+ "1: ll %0, %1 # atomic64_sub \n"
5565+#ifdef CONFIG_PAX_REFCOUNT
5566+ /* Exception on overflow. */
5567+ "2: sub %0, %2 \n"
5568+#else
5569+ " subu %0, %2 \n"
5570+#endif
5571+ " sc %0, %1 \n"
5572+ " beqz %0, 1b \n"
5573+#ifdef CONFIG_PAX_REFCOUNT
5574+ "3: \n"
5575+ _ASM_EXTABLE(2b, 3b)
5576+#endif
5577+ " .set mips0 \n"
5578+ : "=&r" (temp), "+m" (v->counter)
5579+ : "Ir" (i));
5580+ } else {
5581+ unsigned long flags;
5582+
5583+ raw_local_irq_save(flags);
5584+ __asm__ __volatile__(
5585+#ifdef CONFIG_PAX_REFCOUNT
5586+ /* Exception on overflow. */
5587+ "1: sub %0, %1 \n"
5588+ "2: \n"
5589+ _ASM_EXTABLE(1b, 2b)
5590+#else
5591+ " subu %0, %1 \n"
5592+#endif
5593+ : "+r" (v->counter) : "Ir" (i));
5594+ raw_local_irq_restore(flags);
5595+ }
5596+}
5597+
5598+static __inline__ void atomic_sub_unchecked(long i, atomic_unchecked_t *v)
5599 {
5600 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5601 int temp;
5602@@ -129,7 +281,93 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
5603 /*
5604 * Same as above, but return the result value
5605 */
5606-static __inline__ int atomic_add_return(int i, atomic_t * v)
5607+static __inline__ int atomic_add_return(int i, atomic_t *v)
5608+{
5609+ int result;
5610+ int temp;
5611+
5612+ smp_mb__before_llsc();
5613+
5614+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5615+ __asm__ __volatile__(
5616+ " .set mips3 \n"
5617+ "1: ll %1, %2 # atomic_add_return \n"
5618+#ifdef CONFIG_PAX_REFCOUNT
5619+ "2: add %0, %1, %3 \n"
5620+#else
5621+ " addu %0, %1, %3 \n"
5622+#endif
5623+ " sc %0, %2 \n"
5624+ " beqzl %0, 1b \n"
5625+#ifdef CONFIG_PAX_REFCOUNT
5626+ " b 4f \n"
5627+ " .set noreorder \n"
5628+ "3: b 5f \n"
5629+ " move %0, %1 \n"
5630+ " .set reorder \n"
5631+ _ASM_EXTABLE(2b, 3b)
5632+#endif
5633+ "4: addu %0, %1, %3 \n"
5634+#ifdef CONFIG_PAX_REFCOUNT
5635+ "5: \n"
5636+#endif
5637+ " .set mips0 \n"
5638+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5639+ : "Ir" (i));
5640+ } else if (kernel_uses_llsc) {
5641+ __asm__ __volatile__(
5642+ " .set mips3 \n"
5643+ "1: ll %1, %2 # atomic_add_return \n"
5644+#ifdef CONFIG_PAX_REFCOUNT
5645+ "2: add %0, %1, %3 \n"
5646+#else
5647+ " addu %0, %1, %3 \n"
5648+#endif
5649+ " sc %0, %2 \n"
5650+ " bnez %0, 4f \n"
5651+ " b 1b \n"
5652+#ifdef CONFIG_PAX_REFCOUNT
5653+ " .set noreorder \n"
5654+ "3: b 5f \n"
5655+ " move %0, %1 \n"
5656+ " .set reorder \n"
5657+ _ASM_EXTABLE(2b, 3b)
5658+#endif
5659+ "4: addu %0, %1, %3 \n"
5660+#ifdef CONFIG_PAX_REFCOUNT
5661+ "5: \n"
5662+#endif
5663+ " .set mips0 \n"
5664+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5665+ : "Ir" (i));
5666+ } else {
5667+ unsigned long flags;
5668+
5669+ raw_local_irq_save(flags);
5670+ __asm__ __volatile__(
5671+ " lw %0, %1 \n"
5672+#ifdef CONFIG_PAX_REFCOUNT
5673+ /* Exception on overflow. */
5674+ "1: add %0, %2 \n"
5675+#else
5676+ " addu %0, %2 \n"
5677+#endif
5678+ " sw %0, %1 \n"
5679+#ifdef CONFIG_PAX_REFCOUNT
5680+ /* Note: Dest reg is not modified on overflow */
5681+ "2: \n"
5682+ _ASM_EXTABLE(1b, 2b)
5683+#endif
5684+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
5685+ raw_local_irq_restore(flags);
5686+ }
5687+
5688+ smp_llsc_mb();
5689+
5690+ return result;
5691+}
5692+
5693+static __inline__ int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
5694 {
5695 int result;
5696
5697@@ -178,7 +416,93 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
5698 return result;
5699 }
5700
5701-static __inline__ int atomic_sub_return(int i, atomic_t * v)
5702+static __inline__ int atomic_sub_return(int i, atomic_t *v)
5703+{
5704+ int result;
5705+ int temp;
5706+
5707+ smp_mb__before_llsc();
5708+
5709+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5710+ __asm__ __volatile__(
5711+ " .set mips3 \n"
5712+ "1: ll %1, %2 # atomic_sub_return \n"
5713+#ifdef CONFIG_PAX_REFCOUNT
5714+ "2: sub %0, %1, %3 \n"
5715+#else
5716+ " subu %0, %1, %3 \n"
5717+#endif
5718+ " sc %0, %2 \n"
5719+ " beqzl %0, 1b \n"
5720+#ifdef CONFIG_PAX_REFCOUNT
5721+ " b 4f \n"
5722+ " .set noreorder \n"
5723+ "3: b 5f \n"
5724+ " move %0, %1 \n"
5725+ " .set reorder \n"
5726+ _ASM_EXTABLE(2b, 3b)
5727+#endif
5728+ "4: subu %0, %1, %3 \n"
5729+#ifdef CONFIG_PAX_REFCOUNT
5730+ "5: \n"
5731+#endif
5732+ " .set mips0 \n"
5733+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
5734+ : "Ir" (i), "m" (v->counter)
5735+ : "memory");
5736+ } else if (kernel_uses_llsc) {
5737+ __asm__ __volatile__(
5738+ " .set mips3 \n"
5739+ "1: ll %1, %2 # atomic_sub_return \n"
5740+#ifdef CONFIG_PAX_REFCOUNT
5741+ "2: sub %0, %1, %3 \n"
5742+#else
5743+ " subu %0, %1, %3 \n"
5744+#endif
5745+ " sc %0, %2 \n"
5746+ " bnez %0, 4f \n"
5747+ " b 1b \n"
5748+#ifdef CONFIG_PAX_REFCOUNT
5749+ " .set noreorder \n"
5750+ "3: b 5f \n"
5751+ " move %0, %1 \n"
5752+ " .set reorder \n"
5753+ _ASM_EXTABLE(2b, 3b)
5754+#endif
5755+ "4: subu %0, %1, %3 \n"
5756+#ifdef CONFIG_PAX_REFCOUNT
5757+ "5: \n"
5758+#endif
5759+ " .set mips0 \n"
5760+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5761+ : "Ir" (i));
5762+ } else {
5763+ unsigned long flags;
5764+
5765+ raw_local_irq_save(flags);
5766+ __asm__ __volatile__(
5767+ " lw %0, %1 \n"
5768+#ifdef CONFIG_PAX_REFCOUNT
5769+ /* Exception on overflow. */
5770+ "1: sub %0, %2 \n"
5771+#else
5772+ " subu %0, %2 \n"
5773+#endif
5774+ " sw %0, %1 \n"
5775+#ifdef CONFIG_PAX_REFCOUNT
5776+ /* Note: Dest reg is not modified on overflow */
5777+ "2: \n"
5778+ _ASM_EXTABLE(1b, 2b)
5779+#endif
5780+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
5781+ raw_local_irq_restore(flags);
5782+ }
5783+
5784+ smp_llsc_mb();
5785+
5786+ return result;
5787+}
5788+static __inline__ int atomic_sub_return_unchecked(int i, atomic_unchecked_t *v)
5789 {
5790 int result;
5791
5792@@ -238,7 +562,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
5793 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5794 * The function returns the old value of @v minus @i.
5795 */
5796-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5797+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5798 {
5799 int result;
5800
5801@@ -295,8 +619,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5802 return result;
5803 }
5804
5805-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5806-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5807+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5808+{
5809+ return cmpxchg(&v->counter, old, new);
5810+}
5811+
5812+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5813+ int new)
5814+{
5815+ return cmpxchg(&(v->counter), old, new);
5816+}
5817+
5818+static inline int atomic_xchg(atomic_t *v, int new)
5819+{
5820+ return xchg(&v->counter, new);
5821+}
5822+
5823+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5824+{
5825+ return xchg(&(v->counter), new);
5826+}
5827
5828 /**
5829 * __atomic_add_unless - add unless the number is a given value
5830@@ -324,6 +666,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5831
5832 #define atomic_dec_return(v) atomic_sub_return(1, (v))
5833 #define atomic_inc_return(v) atomic_add_return(1, (v))
5834+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
5835+{
5836+ return atomic_add_return_unchecked(1, v);
5837+}
5838
5839 /*
5840 * atomic_sub_and_test - subtract value from variable and test result
5841@@ -345,6 +691,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5842 * other cases.
5843 */
5844 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
5845+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
5846+{
5847+ return atomic_add_return_unchecked(1, v) == 0;
5848+}
5849
5850 /*
5851 * atomic_dec_and_test - decrement by 1 and test
5852@@ -369,6 +719,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5853 * Atomically increments @v by 1.
5854 */
5855 #define atomic_inc(v) atomic_add(1, (v))
5856+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
5857+{
5858+ atomic_add_unchecked(1, v);
5859+}
5860
5861 /*
5862 * atomic_dec - decrement and test
5863@@ -377,6 +731,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5864 * Atomically decrements @v by 1.
5865 */
5866 #define atomic_dec(v) atomic_sub(1, (v))
5867+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
5868+{
5869+ atomic_sub_unchecked(1, v);
5870+}
5871
5872 /*
5873 * atomic_add_negative - add and test if negative
5874@@ -398,14 +756,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5875 * @v: pointer of type atomic64_t
5876 *
5877 */
5878-#define atomic64_read(v) (*(volatile long *)&(v)->counter)
5879+static inline long atomic64_read(const atomic64_t *v)
5880+{
5881+ return (*(volatile const long *) &v->counter);
5882+}
5883+
5884+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
5885+{
5886+ return (*(volatile const long *) &v->counter);
5887+}
5888
5889 /*
5890 * atomic64_set - set atomic variable
5891 * @v: pointer of type atomic64_t
5892 * @i: required value
5893 */
5894-#define atomic64_set(v, i) ((v)->counter = (i))
5895+static inline void atomic64_set(atomic64_t *v, long i)
5896+{
5897+ v->counter = i;
5898+}
5899+
5900+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
5901+{
5902+ v->counter = i;
5903+}
5904
5905 /*
5906 * atomic64_add - add integer to atomic variable
5907@@ -414,7 +788,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5908 *
5909 * Atomically adds @i to @v.
5910 */
5911-static __inline__ void atomic64_add(long i, atomic64_t * v)
5912+static __inline__ void atomic64_add(long i, atomic64_t *v)
5913+{
5914+ long temp;
5915+
5916+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5917+ __asm__ __volatile__(
5918+ " .set mips3 \n"
5919+ "1: lld %0, %1 # atomic64_add \n"
5920+#ifdef CONFIG_PAX_REFCOUNT
5921+ /* Exception on overflow. */
5922+ "2: dadd %0, %2 \n"
5923+#else
5924+ " daddu %0, %2 \n"
5925+#endif
5926+ " scd %0, %1 \n"
5927+ " beqzl %0, 1b \n"
5928+#ifdef CONFIG_PAX_REFCOUNT
5929+ "3: \n"
5930+ _ASM_EXTABLE(2b, 3b)
5931+#endif
5932+ " .set mips0 \n"
5933+ : "=&r" (temp), "+m" (v->counter)
5934+ : "Ir" (i));
5935+ } else if (kernel_uses_llsc) {
5936+ __asm__ __volatile__(
5937+ " .set mips3 \n"
5938+ "1: lld %0, %1 # atomic64_add \n"
5939+#ifdef CONFIG_PAX_REFCOUNT
5940+ /* Exception on overflow. */
5941+ "2: dadd %0, %2 \n"
5942+#else
5943+ " daddu %0, %2 \n"
5944+#endif
5945+ " scd %0, %1 \n"
5946+ " beqz %0, 1b \n"
5947+#ifdef CONFIG_PAX_REFCOUNT
5948+ "3: \n"
5949+ _ASM_EXTABLE(2b, 3b)
5950+#endif
5951+ " .set mips0 \n"
5952+ : "=&r" (temp), "+m" (v->counter)
5953+ : "Ir" (i));
5954+ } else {
5955+ unsigned long flags;
5956+
5957+ raw_local_irq_save(flags);
5958+ __asm__ __volatile__(
5959+#ifdef CONFIG_PAX_REFCOUNT
5960+ /* Exception on overflow. */
5961+ "1: dadd %0, %1 \n"
5962+ "2: \n"
5963+ _ASM_EXTABLE(1b, 2b)
5964+#else
5965+ " daddu %0, %1 \n"
5966+#endif
5967+ : "+r" (v->counter) : "Ir" (i));
5968+ raw_local_irq_restore(flags);
5969+ }
5970+}
5971+static __inline__ void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
5972 {
5973 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5974 long temp;
5975@@ -457,7 +890,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
5976 *
5977 * Atomically subtracts @i from @v.
5978 */
5979-static __inline__ void atomic64_sub(long i, atomic64_t * v)
5980+static __inline__ void atomic64_sub(long i, atomic64_t *v)
5981+{
5982+ long temp;
5983+
5984+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5985+ __asm__ __volatile__(
5986+ " .set mips3 \n"
5987+ "1: lld %0, %1 # atomic64_sub \n"
5988+#ifdef CONFIG_PAX_REFCOUNT
5989+ /* Exception on overflow. */
5990+ "2: dsub %0, %2 \n"
5991+#else
5992+ " dsubu %0, %2 \n"
5993+#endif
5994+ " scd %0, %1 \n"
5995+ " beqzl %0, 1b \n"
5996+#ifdef CONFIG_PAX_REFCOUNT
5997+ "3: \n"
5998+ _ASM_EXTABLE(2b, 3b)
5999+#endif
6000+ " .set mips0 \n"
6001+ : "=&r" (temp), "+m" (v->counter)
6002+ : "Ir" (i));
6003+ } else if (kernel_uses_llsc) {
6004+ __asm__ __volatile__(
6005+ " .set mips3 \n"
6006+ "1: lld %0, %1 # atomic64_sub \n"
6007+#ifdef CONFIG_PAX_REFCOUNT
6008+ /* Exception on overflow. */
6009+ "2: dsub %0, %2 \n"
6010+#else
6011+ " dsubu %0, %2 \n"
6012+#endif
6013+ " scd %0, %1 \n"
6014+ " beqz %0, 1b \n"
6015+#ifdef CONFIG_PAX_REFCOUNT
6016+ "3: \n"
6017+ _ASM_EXTABLE(2b, 3b)
6018+#endif
6019+ " .set mips0 \n"
6020+ : "=&r" (temp), "+m" (v->counter)
6021+ : "Ir" (i));
6022+ } else {
6023+ unsigned long flags;
6024+
6025+ raw_local_irq_save(flags);
6026+ __asm__ __volatile__(
6027+#ifdef CONFIG_PAX_REFCOUNT
6028+ /* Exception on overflow. */
6029+ "1: dsub %0, %1 \n"
6030+ "2: \n"
6031+ _ASM_EXTABLE(1b, 2b)
6032+#else
6033+ " dsubu %0, %1 \n"
6034+#endif
6035+ : "+r" (v->counter) : "Ir" (i));
6036+ raw_local_irq_restore(flags);
6037+ }
6038+}
6039+
6040+static __inline__ void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
6041 {
6042 if (kernel_uses_llsc && R10000_LLSC_WAR) {
6043 long temp;
6044@@ -496,7 +989,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
6045 /*
6046 * Same as above, but return the result value
6047 */
6048-static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6049+static __inline__ long atomic64_add_return(long i, atomic64_t *v)
6050+{
6051+ long result;
6052+ long temp;
6053+
6054+ smp_mb__before_llsc();
6055+
6056+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6057+ __asm__ __volatile__(
6058+ " .set mips3 \n"
6059+ "1: lld %1, %2 # atomic64_add_return \n"
6060+#ifdef CONFIG_PAX_REFCOUNT
6061+ "2: dadd %0, %1, %3 \n"
6062+#else
6063+ " daddu %0, %1, %3 \n"
6064+#endif
6065+ " scd %0, %2 \n"
6066+ " beqzl %0, 1b \n"
6067+#ifdef CONFIG_PAX_REFCOUNT
6068+ " b 4f \n"
6069+ " .set noreorder \n"
6070+ "3: b 5f \n"
6071+ " move %0, %1 \n"
6072+ " .set reorder \n"
6073+ _ASM_EXTABLE(2b, 3b)
6074+#endif
6075+ "4: daddu %0, %1, %3 \n"
6076+#ifdef CONFIG_PAX_REFCOUNT
6077+ "5: \n"
6078+#endif
6079+ " .set mips0 \n"
6080+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
6081+ : "Ir" (i));
6082+ } else if (kernel_uses_llsc) {
6083+ __asm__ __volatile__(
6084+ " .set mips3 \n"
6085+ "1: lld %1, %2 # atomic64_add_return \n"
6086+#ifdef CONFIG_PAX_REFCOUNT
6087+ "2: dadd %0, %1, %3 \n"
6088+#else
6089+ " daddu %0, %1, %3 \n"
6090+#endif
6091+ " scd %0, %2 \n"
6092+ " bnez %0, 4f \n"
6093+ " b 1b \n"
6094+#ifdef CONFIG_PAX_REFCOUNT
6095+ " .set noreorder \n"
6096+ "3: b 5f \n"
6097+ " move %0, %1 \n"
6098+ " .set reorder \n"
6099+ _ASM_EXTABLE(2b, 3b)
6100+#endif
6101+ "4: daddu %0, %1, %3 \n"
6102+#ifdef CONFIG_PAX_REFCOUNT
6103+ "5: \n"
6104+#endif
6105+ " .set mips0 \n"
6106+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6107+ : "Ir" (i), "m" (v->counter)
6108+ : "memory");
6109+ } else {
6110+ unsigned long flags;
6111+
6112+ raw_local_irq_save(flags);
6113+ __asm__ __volatile__(
6114+ " ld %0, %1 \n"
6115+#ifdef CONFIG_PAX_REFCOUNT
6116+ /* Exception on overflow. */
6117+ "1: dadd %0, %2 \n"
6118+#else
6119+ " daddu %0, %2 \n"
6120+#endif
6121+ " sd %0, %1 \n"
6122+#ifdef CONFIG_PAX_REFCOUNT
6123+ /* Note: Dest reg is not modified on overflow */
6124+ "2: \n"
6125+ _ASM_EXTABLE(1b, 2b)
6126+#endif
6127+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6128+ raw_local_irq_restore(flags);
6129+ }
6130+
6131+ smp_llsc_mb();
6132+
6133+ return result;
6134+}
6135+static __inline__ long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
6136 {
6137 long result;
6138
6139@@ -546,7 +1125,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6140 return result;
6141 }
6142
6143-static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6144+static __inline__ long atomic64_sub_return(long i, atomic64_t *v)
6145+{
6146+ long result;
6147+ long temp;
6148+
6149+ smp_mb__before_llsc();
6150+
6151+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6152+ long temp;
6153+
6154+ __asm__ __volatile__(
6155+ " .set mips3 \n"
6156+ "1: lld %1, %2 # atomic64_sub_return \n"
6157+#ifdef CONFIG_PAX_REFCOUNT
6158+ "2: dsub %0, %1, %3 \n"
6159+#else
6160+ " dsubu %0, %1, %3 \n"
6161+#endif
6162+ " scd %0, %2 \n"
6163+ " beqzl %0, 1b \n"
6164+#ifdef CONFIG_PAX_REFCOUNT
6165+ " b 4f \n"
6166+ " .set noreorder \n"
6167+ "3: b 5f \n"
6168+ " move %0, %1 \n"
6169+ " .set reorder \n"
6170+ _ASM_EXTABLE(2b, 3b)
6171+#endif
6172+ "4: dsubu %0, %1, %3 \n"
6173+#ifdef CONFIG_PAX_REFCOUNT
6174+ "5: \n"
6175+#endif
6176+ " .set mips0 \n"
6177+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6178+ : "Ir" (i), "m" (v->counter)
6179+ : "memory");
6180+ } else if (kernel_uses_llsc) {
6181+ __asm__ __volatile__(
6182+ " .set mips3 \n"
6183+ "1: lld %1, %2 # atomic64_sub_return \n"
6184+#ifdef CONFIG_PAX_REFCOUNT
6185+ "2: dsub %0, %1, %3 \n"
6186+#else
6187+ " dsubu %0, %1, %3 \n"
6188+#endif
6189+ " scd %0, %2 \n"
6190+ " bnez %0, 4f \n"
6191+ " b 1b \n"
6192+#ifdef CONFIG_PAX_REFCOUNT
6193+ " .set noreorder \n"
6194+ "3: b 5f \n"
6195+ " move %0, %1 \n"
6196+ " .set reorder \n"
6197+ _ASM_EXTABLE(2b, 3b)
6198+#endif
6199+ "4: dsubu %0, %1, %3 \n"
6200+#ifdef CONFIG_PAX_REFCOUNT
6201+ "5: \n"
6202+#endif
6203+ " .set mips0 \n"
6204+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6205+ : "Ir" (i), "m" (v->counter)
6206+ : "memory");
6207+ } else {
6208+ unsigned long flags;
6209+
6210+ raw_local_irq_save(flags);
6211+ __asm__ __volatile__(
6212+ " ld %0, %1 \n"
6213+#ifdef CONFIG_PAX_REFCOUNT
6214+ /* Exception on overflow. */
6215+ "1: dsub %0, %2 \n"
6216+#else
6217+ " dsubu %0, %2 \n"
6218+#endif
6219+ " sd %0, %1 \n"
6220+#ifdef CONFIG_PAX_REFCOUNT
6221+ /* Note: Dest reg is not modified on overflow */
6222+ "2: \n"
6223+ _ASM_EXTABLE(1b, 2b)
6224+#endif
6225+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6226+ raw_local_irq_restore(flags);
6227+ }
6228+
6229+ smp_llsc_mb();
6230+
6231+ return result;
6232+}
6233+
6234+static __inline__ long atomic64_sub_return_unchecked(long i, atomic64_unchecked_t *v)
6235 {
6236 long result;
6237
6238@@ -605,7 +1274,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6239 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6240 * The function returns the old value of @v minus @i.
6241 */
6242-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6243+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6244 {
6245 long result;
6246
6247@@ -662,9 +1331,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6248 return result;
6249 }
6250
6251-#define atomic64_cmpxchg(v, o, n) \
6252- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6253-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6254+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6255+{
6256+ return cmpxchg(&v->counter, old, new);
6257+}
6258+
6259+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6260+ long new)
6261+{
6262+ return cmpxchg(&(v->counter), old, new);
6263+}
6264+
6265+static inline long atomic64_xchg(atomic64_t *v, long new)
6266+{
6267+ return xchg(&v->counter, new);
6268+}
6269+
6270+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6271+{
6272+ return xchg(&(v->counter), new);
6273+}
6274
6275 /**
6276 * atomic64_add_unless - add unless the number is a given value
6277@@ -694,6 +1380,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6278
6279 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6280 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6281+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6282
6283 /*
6284 * atomic64_sub_and_test - subtract value from variable and test result
6285@@ -715,6 +1402,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6286 * other cases.
6287 */
6288 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6289+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6290
6291 /*
6292 * atomic64_dec_and_test - decrement by 1 and test
6293@@ -739,6 +1427,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6294 * Atomically increments @v by 1.
6295 */
6296 #define atomic64_inc(v) atomic64_add(1, (v))
6297+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6298
6299 /*
6300 * atomic64_dec - decrement and test
6301@@ -747,6 +1436,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6302 * Atomically decrements @v by 1.
6303 */
6304 #define atomic64_dec(v) atomic64_sub(1, (v))
6305+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6306
6307 /*
6308 * atomic64_add_negative - add and test if negative
6309diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6310index b4db69f..8f3b093 100644
6311--- a/arch/mips/include/asm/cache.h
6312+++ b/arch/mips/include/asm/cache.h
6313@@ -9,10 +9,11 @@
6314 #ifndef _ASM_CACHE_H
6315 #define _ASM_CACHE_H
6316
6317+#include <linux/const.h>
6318 #include <kmalloc.h>
6319
6320 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6321-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6322+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6323
6324 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6325 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6326diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6327index cf3ae24..238d22f 100644
6328--- a/arch/mips/include/asm/elf.h
6329+++ b/arch/mips/include/asm/elf.h
6330@@ -372,13 +372,16 @@ extern const char *__elf_platform;
6331 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6332 #endif
6333
6334+#ifdef CONFIG_PAX_ASLR
6335+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6336+
6337+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6338+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6339+#endif
6340+
6341 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6342 struct linux_binprm;
6343 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6344 int uses_interp);
6345
6346-struct mm_struct;
6347-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6348-#define arch_randomize_brk arch_randomize_brk
6349-
6350 #endif /* _ASM_ELF_H */
6351diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6352index c1f6afa..38cc6e9 100644
6353--- a/arch/mips/include/asm/exec.h
6354+++ b/arch/mips/include/asm/exec.h
6355@@ -12,6 +12,6 @@
6356 #ifndef _ASM_EXEC_H
6357 #define _ASM_EXEC_H
6358
6359-extern unsigned long arch_align_stack(unsigned long sp);
6360+#define arch_align_stack(x) ((x) & ~0xfUL)
6361
6362 #endif /* _ASM_EXEC_H */
6363diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6364index d44622c..64990d2 100644
6365--- a/arch/mips/include/asm/local.h
6366+++ b/arch/mips/include/asm/local.h
6367@@ -12,15 +12,25 @@ typedef struct
6368 atomic_long_t a;
6369 } local_t;
6370
6371+typedef struct {
6372+ atomic_long_unchecked_t a;
6373+} local_unchecked_t;
6374+
6375 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6376
6377 #define local_read(l) atomic_long_read(&(l)->a)
6378+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6379 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6380+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6381
6382 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6383+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6384 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6385+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6386 #define local_inc(l) atomic_long_inc(&(l)->a)
6387+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6388 #define local_dec(l) atomic_long_dec(&(l)->a)
6389+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6390
6391 /*
6392 * Same as above, but return the result value
6393@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6394 return result;
6395 }
6396
6397+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6398+{
6399+ unsigned long result;
6400+
6401+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6402+ unsigned long temp;
6403+
6404+ __asm__ __volatile__(
6405+ " .set mips3 \n"
6406+ "1:" __LL "%1, %2 # local_add_return \n"
6407+ " addu %0, %1, %3 \n"
6408+ __SC "%0, %2 \n"
6409+ " beqzl %0, 1b \n"
6410+ " addu %0, %1, %3 \n"
6411+ " .set mips0 \n"
6412+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6413+ : "Ir" (i), "m" (l->a.counter)
6414+ : "memory");
6415+ } else if (kernel_uses_llsc) {
6416+ unsigned long temp;
6417+
6418+ __asm__ __volatile__(
6419+ " .set mips3 \n"
6420+ "1:" __LL "%1, %2 # local_add_return \n"
6421+ " addu %0, %1, %3 \n"
6422+ __SC "%0, %2 \n"
6423+ " beqz %0, 1b \n"
6424+ " addu %0, %1, %3 \n"
6425+ " .set mips0 \n"
6426+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6427+ : "Ir" (i), "m" (l->a.counter)
6428+ : "memory");
6429+ } else {
6430+ unsigned long flags;
6431+
6432+ local_irq_save(flags);
6433+ result = l->a.counter;
6434+ result += i;
6435+ l->a.counter = result;
6436+ local_irq_restore(flags);
6437+ }
6438+
6439+ return result;
6440+}
6441+
6442 static __inline__ long local_sub_return(long i, local_t * l)
6443 {
6444 unsigned long result;
6445@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6446
6447 #define local_cmpxchg(l, o, n) \
6448 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6449+#define local_cmpxchg_unchecked(l, o, n) \
6450+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6451 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6452
6453 /**
6454diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6455index f6be474..12ad554 100644
6456--- a/arch/mips/include/asm/page.h
6457+++ b/arch/mips/include/asm/page.h
6458@@ -95,7 +95,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6459 #ifdef CONFIG_CPU_MIPS32
6460 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6461 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6462- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6463+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6464 #else
6465 typedef struct { unsigned long long pte; } pte_t;
6466 #define pte_val(x) ((x).pte)
6467diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6468index 881d18b..cea38bc 100644
6469--- a/arch/mips/include/asm/pgalloc.h
6470+++ b/arch/mips/include/asm/pgalloc.h
6471@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6472 {
6473 set_pud(pud, __pud((unsigned long)pmd));
6474 }
6475+
6476+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6477+{
6478+ pud_populate(mm, pud, pmd);
6479+}
6480 #endif
6481
6482 /*
6483diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
6484index 25da651..ae2a259 100644
6485--- a/arch/mips/include/asm/smtc_proc.h
6486+++ b/arch/mips/include/asm/smtc_proc.h
6487@@ -18,6 +18,6 @@ extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
6488
6489 /* Count of number of recoveries of "stolen" FPU access rights on 34K */
6490
6491-extern atomic_t smtc_fpu_recoveries;
6492+extern atomic_unchecked_t smtc_fpu_recoveries;
6493
6494 #endif /* __ASM_SMTC_PROC_H */
6495diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6496index 61215a3..213ee0e 100644
6497--- a/arch/mips/include/asm/thread_info.h
6498+++ b/arch/mips/include/asm/thread_info.h
6499@@ -116,6 +116,8 @@ static inline struct thread_info *current_thread_info(void)
6500 #define TIF_32BIT_ADDR 23 /* 32-bit address space (o32/n32) */
6501 #define TIF_FPUBOUND 24 /* thread bound to FPU-full CPU set */
6502 #define TIF_LOAD_WATCH 25 /* If set, load watch registers */
6503+/* li takes a 32bit immediate */
6504+#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
6505 #define TIF_SYSCALL_TRACE 31 /* syscall trace active */
6506
6507 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
6508@@ -132,20 +134,18 @@ static inline struct thread_info *current_thread_info(void)
6509 #define _TIF_32BIT_ADDR (1<<TIF_32BIT_ADDR)
6510 #define _TIF_FPUBOUND (1<<TIF_FPUBOUND)
6511 #define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
6512+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6513
6514-#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6515- _TIF_SYSCALL_AUDIT)
6516+#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
6517
6518 /* work to do in syscall_trace_leave() */
6519-#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6520- _TIF_SYSCALL_AUDIT)
6521+#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
6522
6523 /* work to do on interrupt/exception return */
6524 #define _TIF_WORK_MASK \
6525 (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME)
6526 /* work to do on any return to u-space */
6527-#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6528- _TIF_WORK_SYSCALL_EXIT)
6529+#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID)
6530
6531 #endif /* __KERNEL__ */
6532
6533diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6534index 1188e00..41cf144 100644
6535--- a/arch/mips/kernel/binfmt_elfn32.c
6536+++ b/arch/mips/kernel/binfmt_elfn32.c
6537@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6538 #undef ELF_ET_DYN_BASE
6539 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6540
6541+#ifdef CONFIG_PAX_ASLR
6542+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6543+
6544+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6545+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6546+#endif
6547+
6548 #include <asm/processor.h>
6549 #include <linux/module.h>
6550 #include <linux/elfcore.h>
6551diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6552index 202e581..689ca79 100644
6553--- a/arch/mips/kernel/binfmt_elfo32.c
6554+++ b/arch/mips/kernel/binfmt_elfo32.c
6555@@ -56,6 +56,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6556 #undef ELF_ET_DYN_BASE
6557 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6558
6559+#ifdef CONFIG_PAX_ASLR
6560+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6561+
6562+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6563+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6564+#endif
6565+
6566 #include <asm/processor.h>
6567
6568 /*
6569diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6570index d1fea7a..45602ea 100644
6571--- a/arch/mips/kernel/irq.c
6572+++ b/arch/mips/kernel/irq.c
6573@@ -77,17 +77,17 @@ void ack_bad_irq(unsigned int irq)
6574 printk("unexpected IRQ # %d\n", irq);
6575 }
6576
6577-atomic_t irq_err_count;
6578+atomic_unchecked_t irq_err_count;
6579
6580 int arch_show_interrupts(struct seq_file *p, int prec)
6581 {
6582- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6583+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6584 return 0;
6585 }
6586
6587 asmlinkage void spurious_interrupt(void)
6588 {
6589- atomic_inc(&irq_err_count);
6590+ atomic_inc_unchecked(&irq_err_count);
6591 }
6592
6593 void __init init_IRQ(void)
6594diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6595index ddc7610..8c58f17 100644
6596--- a/arch/mips/kernel/process.c
6597+++ b/arch/mips/kernel/process.c
6598@@ -566,15 +566,3 @@ unsigned long get_wchan(struct task_struct *task)
6599 out:
6600 return pc;
6601 }
6602-
6603-/*
6604- * Don't forget that the stack pointer must be aligned on a 8 bytes
6605- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6606- */
6607-unsigned long arch_align_stack(unsigned long sp)
6608-{
6609- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6610- sp -= get_random_int() & ~PAGE_MASK;
6611-
6612- return sp & ALMASK;
6613-}
6614diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6615index 8ae1ebe..1bcbf47 100644
6616--- a/arch/mips/kernel/ptrace.c
6617+++ b/arch/mips/kernel/ptrace.c
6618@@ -529,6 +529,10 @@ static inline int audit_arch(void)
6619 return arch;
6620 }
6621
6622+#ifdef CONFIG_GRKERNSEC_SETXID
6623+extern void gr_delayed_cred_worker(void);
6624+#endif
6625+
6626 /*
6627 * Notification of system call entry/exit
6628 * - triggered by current->work.syscall_trace
6629@@ -540,6 +544,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
6630 /* do the secure computing check first */
6631 secure_computing_strict(regs->regs[2]);
6632
6633+#ifdef CONFIG_GRKERNSEC_SETXID
6634+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6635+ gr_delayed_cred_worker();
6636+#endif
6637+
6638 if (!(current->ptrace & PT_PTRACED))
6639 goto out;
6640
6641diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
6642index c10aa84..9ec2e60 100644
6643--- a/arch/mips/kernel/smtc-proc.c
6644+++ b/arch/mips/kernel/smtc-proc.c
6645@@ -31,7 +31,7 @@ unsigned long selfipis[NR_CPUS];
6646
6647 struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
6648
6649-atomic_t smtc_fpu_recoveries;
6650+atomic_unchecked_t smtc_fpu_recoveries;
6651
6652 static int smtc_proc_show(struct seq_file *m, void *v)
6653 {
6654@@ -48,7 +48,7 @@ static int smtc_proc_show(struct seq_file *m, void *v)
6655 for(i = 0; i < NR_CPUS; i++)
6656 seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
6657 seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
6658- atomic_read(&smtc_fpu_recoveries));
6659+ atomic_read_unchecked(&smtc_fpu_recoveries));
6660 return 0;
6661 }
6662
6663@@ -73,7 +73,7 @@ void init_smtc_stats(void)
6664 smtc_cpu_stats[i].selfipis = 0;
6665 }
6666
6667- atomic_set(&smtc_fpu_recoveries, 0);
6668+ atomic_set_unchecked(&smtc_fpu_recoveries, 0);
6669
6670 proc_create("smtc", 0444, NULL, &smtc_proc_fops);
6671 }
6672diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
6673index dfc1b91..11a2c07 100644
6674--- a/arch/mips/kernel/smtc.c
6675+++ b/arch/mips/kernel/smtc.c
6676@@ -1359,7 +1359,7 @@ void smtc_soft_dump(void)
6677 }
6678 smtc_ipi_qdump();
6679 printk("%d Recoveries of \"stolen\" FPU\n",
6680- atomic_read(&smtc_fpu_recoveries));
6681+ atomic_read_unchecked(&smtc_fpu_recoveries));
6682 }
6683
6684
6685diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6686index 84536bf..79caa4d 100644
6687--- a/arch/mips/kernel/sync-r4k.c
6688+++ b/arch/mips/kernel/sync-r4k.c
6689@@ -21,8 +21,8 @@
6690 #include <asm/mipsregs.h>
6691
6692 static atomic_t count_start_flag = ATOMIC_INIT(0);
6693-static atomic_t count_count_start = ATOMIC_INIT(0);
6694-static atomic_t count_count_stop = ATOMIC_INIT(0);
6695+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6696+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6697 static atomic_t count_reference = ATOMIC_INIT(0);
6698
6699 #define COUNTON 100
6700@@ -69,13 +69,13 @@ void synchronise_count_master(int cpu)
6701
6702 for (i = 0; i < NR_LOOPS; i++) {
6703 /* slaves loop on '!= 2' */
6704- while (atomic_read(&count_count_start) != 1)
6705+ while (atomic_read_unchecked(&count_count_start) != 1)
6706 mb();
6707- atomic_set(&count_count_stop, 0);
6708+ atomic_set_unchecked(&count_count_stop, 0);
6709 smp_wmb();
6710
6711 /* this lets the slaves write their count register */
6712- atomic_inc(&count_count_start);
6713+ atomic_inc_unchecked(&count_count_start);
6714
6715 /*
6716 * Everyone initialises count in the last loop:
6717@@ -86,11 +86,11 @@ void synchronise_count_master(int cpu)
6718 /*
6719 * Wait for all slaves to leave the synchronization point:
6720 */
6721- while (atomic_read(&count_count_stop) != 1)
6722+ while (atomic_read_unchecked(&count_count_stop) != 1)
6723 mb();
6724- atomic_set(&count_count_start, 0);
6725+ atomic_set_unchecked(&count_count_start, 0);
6726 smp_wmb();
6727- atomic_inc(&count_count_stop);
6728+ atomic_inc_unchecked(&count_count_stop);
6729 }
6730 /* Arrange for an interrupt in a short while */
6731 write_c0_compare(read_c0_count() + COUNTON);
6732@@ -131,8 +131,8 @@ void synchronise_count_slave(int cpu)
6733 initcount = atomic_read(&count_reference);
6734
6735 for (i = 0; i < NR_LOOPS; i++) {
6736- atomic_inc(&count_count_start);
6737- while (atomic_read(&count_count_start) != 2)
6738+ atomic_inc_unchecked(&count_count_start);
6739+ while (atomic_read_unchecked(&count_count_start) != 2)
6740 mb();
6741
6742 /*
6743@@ -141,8 +141,8 @@ void synchronise_count_slave(int cpu)
6744 if (i == NR_LOOPS-1)
6745 write_c0_count(initcount);
6746
6747- atomic_inc(&count_count_stop);
6748- while (atomic_read(&count_count_stop) != 2)
6749+ atomic_inc_unchecked(&count_count_stop);
6750+ while (atomic_read_unchecked(&count_count_stop) != 2)
6751 mb();
6752 }
6753 /* Arrange for an interrupt in a short while */
6754diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6755index 524841f..3eef41e 100644
6756--- a/arch/mips/kernel/traps.c
6757+++ b/arch/mips/kernel/traps.c
6758@@ -684,7 +684,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6759 siginfo_t info;
6760
6761 prev_state = exception_enter();
6762- die_if_kernel("Integer overflow", regs);
6763+ if (unlikely(!user_mode(regs))) {
6764+
6765+#ifdef CONFIG_PAX_REFCOUNT
6766+ if (fixup_exception(regs)) {
6767+ pax_report_refcount_overflow(regs);
6768+ exception_exit(prev_state);
6769+ return;
6770+ }
6771+#endif
6772+
6773+ die("Integer overflow", regs);
6774+ }
6775
6776 info.si_code = FPE_INTOVF;
6777 info.si_signo = SIGFPE;
6778diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6779index becc42b..9e43d4b 100644
6780--- a/arch/mips/mm/fault.c
6781+++ b/arch/mips/mm/fault.c
6782@@ -28,6 +28,23 @@
6783 #include <asm/highmem.h> /* For VMALLOC_END */
6784 #include <linux/kdebug.h>
6785
6786+#ifdef CONFIG_PAX_PAGEEXEC
6787+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6788+{
6789+ unsigned long i;
6790+
6791+ printk(KERN_ERR "PAX: bytes at PC: ");
6792+ for (i = 0; i < 5; i++) {
6793+ unsigned int c;
6794+ if (get_user(c, (unsigned int *)pc+i))
6795+ printk(KERN_CONT "???????? ");
6796+ else
6797+ printk(KERN_CONT "%08x ", c);
6798+ }
6799+ printk("\n");
6800+}
6801+#endif
6802+
6803 /*
6804 * This routine handles page faults. It determines the address,
6805 * and the problem, and then passes it off to one of the appropriate
6806@@ -199,6 +216,14 @@ bad_area:
6807 bad_area_nosemaphore:
6808 /* User mode accesses just cause a SIGSEGV */
6809 if (user_mode(regs)) {
6810+
6811+#ifdef CONFIG_PAX_PAGEEXEC
6812+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6813+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6814+ do_group_exit(SIGKILL);
6815+ }
6816+#endif
6817+
6818 tsk->thread.cp0_badvaddr = address;
6819 tsk->thread.error_code = write;
6820 #if 0
6821diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6822index f1baadd..8537544 100644
6823--- a/arch/mips/mm/mmap.c
6824+++ b/arch/mips/mm/mmap.c
6825@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6826 struct vm_area_struct *vma;
6827 unsigned long addr = addr0;
6828 int do_color_align;
6829+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6830 struct vm_unmapped_area_info info;
6831
6832 if (unlikely(len > TASK_SIZE))
6833@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6834 do_color_align = 1;
6835
6836 /* requesting a specific address */
6837+
6838+#ifdef CONFIG_PAX_RANDMMAP
6839+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6840+#endif
6841+
6842 if (addr) {
6843 if (do_color_align)
6844 addr = COLOUR_ALIGN(addr, pgoff);
6845@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6846 addr = PAGE_ALIGN(addr);
6847
6848 vma = find_vma(mm, addr);
6849- if (TASK_SIZE - len >= addr &&
6850- (!vma || addr + len <= vma->vm_start))
6851+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len, offset))
6852 return addr;
6853 }
6854
6855 info.length = len;
6856 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6857 info.align_offset = pgoff << PAGE_SHIFT;
6858+ info.threadstack_offset = offset;
6859
6860 if (dir == DOWN) {
6861 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6862@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6863 {
6864 unsigned long random_factor = 0UL;
6865
6866+#ifdef CONFIG_PAX_RANDMMAP
6867+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6868+#endif
6869+
6870 if (current->flags & PF_RANDOMIZE) {
6871 random_factor = get_random_int();
6872 random_factor = random_factor << PAGE_SHIFT;
6873@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6874
6875 if (mmap_is_legacy()) {
6876 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
6877+
6878+#ifdef CONFIG_PAX_RANDMMAP
6879+ if (mm->pax_flags & MF_PAX_RANDMMAP)
6880+ mm->mmap_base += mm->delta_mmap;
6881+#endif
6882+
6883 mm->get_unmapped_area = arch_get_unmapped_area;
6884 } else {
6885 mm->mmap_base = mmap_base(random_factor);
6886+
6887+#ifdef CONFIG_PAX_RANDMMAP
6888+ if (mm->pax_flags & MF_PAX_RANDMMAP)
6889+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6890+#endif
6891+
6892 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6893 }
6894 }
6895
6896-static inline unsigned long brk_rnd(void)
6897-{
6898- unsigned long rnd = get_random_int();
6899-
6900- rnd = rnd << PAGE_SHIFT;
6901- /* 8MB for 32bit, 256MB for 64bit */
6902- if (TASK_IS_32BIT_ADDR)
6903- rnd = rnd & 0x7ffffful;
6904- else
6905- rnd = rnd & 0xffffffful;
6906-
6907- return rnd;
6908-}
6909-
6910-unsigned long arch_randomize_brk(struct mm_struct *mm)
6911-{
6912- unsigned long base = mm->brk;
6913- unsigned long ret;
6914-
6915- ret = PAGE_ALIGN(base + brk_rnd());
6916-
6917- if (ret < mm->brk)
6918- return mm->brk;
6919-
6920- return ret;
6921-}
6922-
6923 int __virt_addr_valid(const volatile void *kaddr)
6924 {
6925 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
6926diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
6927index a2358b4..7cead4f 100644
6928--- a/arch/mips/sgi-ip27/ip27-nmi.c
6929+++ b/arch/mips/sgi-ip27/ip27-nmi.c
6930@@ -187,9 +187,9 @@ void
6931 cont_nmi_dump(void)
6932 {
6933 #ifndef REAL_NMI_SIGNAL
6934- static atomic_t nmied_cpus = ATOMIC_INIT(0);
6935+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
6936
6937- atomic_inc(&nmied_cpus);
6938+ atomic_inc_unchecked(&nmied_cpus);
6939 #endif
6940 /*
6941 * Only allow 1 cpu to proceed
6942@@ -233,7 +233,7 @@ cont_nmi_dump(void)
6943 udelay(10000);
6944 }
6945 #else
6946- while (atomic_read(&nmied_cpus) != num_online_cpus());
6947+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
6948 #endif
6949
6950 /*
6951diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
6952index 967d144..db12197 100644
6953--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
6954+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
6955@@ -11,12 +11,14 @@
6956 #ifndef _ASM_PROC_CACHE_H
6957 #define _ASM_PROC_CACHE_H
6958
6959+#include <linux/const.h>
6960+
6961 /* L1 cache */
6962
6963 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
6964 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
6965-#define L1_CACHE_BYTES 16 /* bytes per entry */
6966 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
6967+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
6968 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
6969
6970 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
6971diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
6972index bcb5df2..84fabd2 100644
6973--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
6974+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
6975@@ -16,13 +16,15 @@
6976 #ifndef _ASM_PROC_CACHE_H
6977 #define _ASM_PROC_CACHE_H
6978
6979+#include <linux/const.h>
6980+
6981 /*
6982 * L1 cache
6983 */
6984 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
6985 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
6986-#define L1_CACHE_BYTES 32 /* bytes per entry */
6987 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
6988+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
6989 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
6990
6991 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
6992diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
6993index 4ce7a01..449202a 100644
6994--- a/arch/openrisc/include/asm/cache.h
6995+++ b/arch/openrisc/include/asm/cache.h
6996@@ -19,11 +19,13 @@
6997 #ifndef __ASM_OPENRISC_CACHE_H
6998 #define __ASM_OPENRISC_CACHE_H
6999
7000+#include <linux/const.h>
7001+
7002 /* FIXME: How can we replace these with values from the CPU...
7003 * they shouldn't be hard-coded!
7004 */
7005
7006-#define L1_CACHE_BYTES 16
7007 #define L1_CACHE_SHIFT 4
7008+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7009
7010 #endif /* __ASM_OPENRISC_CACHE_H */
7011diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7012index 472886c..00e7df9 100644
7013--- a/arch/parisc/include/asm/atomic.h
7014+++ b/arch/parisc/include/asm/atomic.h
7015@@ -252,6 +252,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7016 return dec;
7017 }
7018
7019+#define atomic64_read_unchecked(v) atomic64_read(v)
7020+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7021+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7022+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7023+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7024+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7025+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7026+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7027+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7028+
7029 #endif /* !CONFIG_64BIT */
7030
7031
7032diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7033index 47f11c7..3420df2 100644
7034--- a/arch/parisc/include/asm/cache.h
7035+++ b/arch/parisc/include/asm/cache.h
7036@@ -5,6 +5,7 @@
7037 #ifndef __ARCH_PARISC_CACHE_H
7038 #define __ARCH_PARISC_CACHE_H
7039
7040+#include <linux/const.h>
7041
7042 /*
7043 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7044@@ -15,13 +16,13 @@
7045 * just ruin performance.
7046 */
7047 #ifdef CONFIG_PA20
7048-#define L1_CACHE_BYTES 64
7049 #define L1_CACHE_SHIFT 6
7050 #else
7051-#define L1_CACHE_BYTES 32
7052 #define L1_CACHE_SHIFT 5
7053 #endif
7054
7055+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7056+
7057 #ifndef __ASSEMBLY__
7058
7059 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7060diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7061index ad2b503..bdf1651 100644
7062--- a/arch/parisc/include/asm/elf.h
7063+++ b/arch/parisc/include/asm/elf.h
7064@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7065
7066 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7067
7068+#ifdef CONFIG_PAX_ASLR
7069+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7070+
7071+#define PAX_DELTA_MMAP_LEN 16
7072+#define PAX_DELTA_STACK_LEN 16
7073+#endif
7074+
7075 /* This yields a mask that user programs can use to figure out what
7076 instruction set this CPU supports. This could be done in user space,
7077 but it's not easy, and we've already done it here. */
7078diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7079index fc987a1..6e068ef 100644
7080--- a/arch/parisc/include/asm/pgalloc.h
7081+++ b/arch/parisc/include/asm/pgalloc.h
7082@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7083 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7084 }
7085
7086+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7087+{
7088+ pgd_populate(mm, pgd, pmd);
7089+}
7090+
7091 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7092 {
7093 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7094@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7095 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7096 #define pmd_free(mm, x) do { } while (0)
7097 #define pgd_populate(mm, pmd, pte) BUG()
7098+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7099
7100 #endif
7101
7102diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7103index 34899b5..02dd060 100644
7104--- a/arch/parisc/include/asm/pgtable.h
7105+++ b/arch/parisc/include/asm/pgtable.h
7106@@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7107 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7108 #define PAGE_COPY PAGE_EXECREAD
7109 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7110+
7111+#ifdef CONFIG_PAX_PAGEEXEC
7112+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7113+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7114+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7115+#else
7116+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7117+# define PAGE_COPY_NOEXEC PAGE_COPY
7118+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7119+#endif
7120+
7121 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7122 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7123 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7124diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7125index e0a8235..ce2f1e1 100644
7126--- a/arch/parisc/include/asm/uaccess.h
7127+++ b/arch/parisc/include/asm/uaccess.h
7128@@ -245,10 +245,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7129 const void __user *from,
7130 unsigned long n)
7131 {
7132- int sz = __compiletime_object_size(to);
7133+ size_t sz = __compiletime_object_size(to);
7134 int ret = -EFAULT;
7135
7136- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7137+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7138 ret = __copy_from_user(to, from, n);
7139 else
7140 copy_from_user_overflow();
7141diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7142index 2a625fb..9908930 100644
7143--- a/arch/parisc/kernel/module.c
7144+++ b/arch/parisc/kernel/module.c
7145@@ -98,16 +98,38 @@
7146
7147 /* three functions to determine where in the module core
7148 * or init pieces the location is */
7149+static inline int in_init_rx(struct module *me, void *loc)
7150+{
7151+ return (loc >= me->module_init_rx &&
7152+ loc < (me->module_init_rx + me->init_size_rx));
7153+}
7154+
7155+static inline int in_init_rw(struct module *me, void *loc)
7156+{
7157+ return (loc >= me->module_init_rw &&
7158+ loc < (me->module_init_rw + me->init_size_rw));
7159+}
7160+
7161 static inline int in_init(struct module *me, void *loc)
7162 {
7163- return (loc >= me->module_init &&
7164- loc <= (me->module_init + me->init_size));
7165+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7166+}
7167+
7168+static inline int in_core_rx(struct module *me, void *loc)
7169+{
7170+ return (loc >= me->module_core_rx &&
7171+ loc < (me->module_core_rx + me->core_size_rx));
7172+}
7173+
7174+static inline int in_core_rw(struct module *me, void *loc)
7175+{
7176+ return (loc >= me->module_core_rw &&
7177+ loc < (me->module_core_rw + me->core_size_rw));
7178 }
7179
7180 static inline int in_core(struct module *me, void *loc)
7181 {
7182- return (loc >= me->module_core &&
7183- loc <= (me->module_core + me->core_size));
7184+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7185 }
7186
7187 static inline int in_local(struct module *me, void *loc)
7188@@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7189 }
7190
7191 /* align things a bit */
7192- me->core_size = ALIGN(me->core_size, 16);
7193- me->arch.got_offset = me->core_size;
7194- me->core_size += gots * sizeof(struct got_entry);
7195+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7196+ me->arch.got_offset = me->core_size_rw;
7197+ me->core_size_rw += gots * sizeof(struct got_entry);
7198
7199- me->core_size = ALIGN(me->core_size, 16);
7200- me->arch.fdesc_offset = me->core_size;
7201- me->core_size += fdescs * sizeof(Elf_Fdesc);
7202+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7203+ me->arch.fdesc_offset = me->core_size_rw;
7204+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7205
7206 me->arch.got_max = gots;
7207 me->arch.fdesc_max = fdescs;
7208@@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7209
7210 BUG_ON(value == 0);
7211
7212- got = me->module_core + me->arch.got_offset;
7213+ got = me->module_core_rw + me->arch.got_offset;
7214 for (i = 0; got[i].addr; i++)
7215 if (got[i].addr == value)
7216 goto out;
7217@@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7218 #ifdef CONFIG_64BIT
7219 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7220 {
7221- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7222+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7223
7224 if (!value) {
7225 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7226@@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7227
7228 /* Create new one */
7229 fdesc->addr = value;
7230- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7231+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7232 return (Elf_Addr)fdesc;
7233 }
7234 #endif /* CONFIG_64BIT */
7235@@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7236
7237 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7238 end = table + sechdrs[me->arch.unwind_section].sh_size;
7239- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7240+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7241
7242 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7243 me->arch.unwind_section, table, end, gp);
7244diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7245index 0d3a9d4..44975d0 100644
7246--- a/arch/parisc/kernel/sys_parisc.c
7247+++ b/arch/parisc/kernel/sys_parisc.c
7248@@ -33,9 +33,11 @@
7249 #include <linux/utsname.h>
7250 #include <linux/personality.h>
7251
7252-static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
7253+static unsigned long get_unshared_area(struct file *filp, unsigned long addr, unsigned long len,
7254+ unsigned long flags)
7255 {
7256 struct vm_unmapped_area_info info;
7257+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7258
7259 info.flags = 0;
7260 info.length = len;
7261@@ -43,6 +45,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
7262 info.high_limit = TASK_SIZE;
7263 info.align_mask = 0;
7264 info.align_offset = 0;
7265+ info.threadstack_offset = offset;
7266 return vm_unmapped_area(&info);
7267 }
7268
7269@@ -69,15 +72,17 @@ static unsigned long shared_align_offset(struct file *filp, unsigned long pgoff)
7270 }
7271
7272 static unsigned long get_shared_area(struct file *filp, unsigned long addr,
7273- unsigned long len, unsigned long pgoff)
7274+ unsigned long len, unsigned long pgoff, unsigned long flags)
7275 {
7276 struct vm_unmapped_area_info info;
7277+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7278
7279 info.flags = 0;
7280 info.length = len;
7281 info.low_limit = PAGE_ALIGN(addr);
7282 info.high_limit = TASK_SIZE;
7283 info.align_mask = PAGE_MASK & (SHMLBA - 1);
7284+ info.threadstack_offset = offset;
7285 info.align_offset = shared_align_offset(filp, pgoff);
7286 return vm_unmapped_area(&info);
7287 }
7288@@ -93,13 +98,20 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7289 return -EINVAL;
7290 return addr;
7291 }
7292- if (!addr)
7293+ if (!addr) {
7294 addr = TASK_UNMAPPED_BASE;
7295
7296+#ifdef CONFIG_PAX_RANDMMAP
7297+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
7298+ addr += current->mm->delta_mmap;
7299+#endif
7300+
7301+ }
7302+
7303 if (filp || (flags & MAP_SHARED))
7304- addr = get_shared_area(filp, addr, len, pgoff);
7305+ addr = get_shared_area(filp, addr, len, pgoff, flags);
7306 else
7307- addr = get_unshared_area(addr, len);
7308+ addr = get_unshared_area(addr, len, flags);
7309
7310 return addr;
7311 }
7312diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7313index 1cd1d0c..44ec918 100644
7314--- a/arch/parisc/kernel/traps.c
7315+++ b/arch/parisc/kernel/traps.c
7316@@ -722,9 +722,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7317
7318 down_read(&current->mm->mmap_sem);
7319 vma = find_vma(current->mm,regs->iaoq[0]);
7320- if (vma && (regs->iaoq[0] >= vma->vm_start)
7321- && (vma->vm_flags & VM_EXEC)) {
7322-
7323+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7324 fault_address = regs->iaoq[0];
7325 fault_space = regs->iasq[0];
7326
7327diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7328index 0293588..3b229aa 100644
7329--- a/arch/parisc/mm/fault.c
7330+++ b/arch/parisc/mm/fault.c
7331@@ -15,6 +15,7 @@
7332 #include <linux/sched.h>
7333 #include <linux/interrupt.h>
7334 #include <linux/module.h>
7335+#include <linux/unistd.h>
7336
7337 #include <asm/uaccess.h>
7338 #include <asm/traps.h>
7339@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
7340 static unsigned long
7341 parisc_acctyp(unsigned long code, unsigned int inst)
7342 {
7343- if (code == 6 || code == 16)
7344+ if (code == 6 || code == 7 || code == 16)
7345 return VM_EXEC;
7346
7347 switch (inst & 0xf0000000) {
7348@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7349 }
7350 #endif
7351
7352+#ifdef CONFIG_PAX_PAGEEXEC
7353+/*
7354+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7355+ *
7356+ * returns 1 when task should be killed
7357+ * 2 when rt_sigreturn trampoline was detected
7358+ * 3 when unpatched PLT trampoline was detected
7359+ */
7360+static int pax_handle_fetch_fault(struct pt_regs *regs)
7361+{
7362+
7363+#ifdef CONFIG_PAX_EMUPLT
7364+ int err;
7365+
7366+ do { /* PaX: unpatched PLT emulation */
7367+ unsigned int bl, depwi;
7368+
7369+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7370+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7371+
7372+ if (err)
7373+ break;
7374+
7375+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7376+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7377+
7378+ err = get_user(ldw, (unsigned int *)addr);
7379+ err |= get_user(bv, (unsigned int *)(addr+4));
7380+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7381+
7382+ if (err)
7383+ break;
7384+
7385+ if (ldw == 0x0E801096U &&
7386+ bv == 0xEAC0C000U &&
7387+ ldw2 == 0x0E881095U)
7388+ {
7389+ unsigned int resolver, map;
7390+
7391+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7392+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7393+ if (err)
7394+ break;
7395+
7396+ regs->gr[20] = instruction_pointer(regs)+8;
7397+ regs->gr[21] = map;
7398+ regs->gr[22] = resolver;
7399+ regs->iaoq[0] = resolver | 3UL;
7400+ regs->iaoq[1] = regs->iaoq[0] + 4;
7401+ return 3;
7402+ }
7403+ }
7404+ } while (0);
7405+#endif
7406+
7407+#ifdef CONFIG_PAX_EMUTRAMP
7408+
7409+#ifndef CONFIG_PAX_EMUSIGRT
7410+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7411+ return 1;
7412+#endif
7413+
7414+ do { /* PaX: rt_sigreturn emulation */
7415+ unsigned int ldi1, ldi2, bel, nop;
7416+
7417+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7418+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7419+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7420+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7421+
7422+ if (err)
7423+ break;
7424+
7425+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7426+ ldi2 == 0x3414015AU &&
7427+ bel == 0xE4008200U &&
7428+ nop == 0x08000240U)
7429+ {
7430+ regs->gr[25] = (ldi1 & 2) >> 1;
7431+ regs->gr[20] = __NR_rt_sigreturn;
7432+ regs->gr[31] = regs->iaoq[1] + 16;
7433+ regs->sr[0] = regs->iasq[1];
7434+ regs->iaoq[0] = 0x100UL;
7435+ regs->iaoq[1] = regs->iaoq[0] + 4;
7436+ regs->iasq[0] = regs->sr[2];
7437+ regs->iasq[1] = regs->sr[2];
7438+ return 2;
7439+ }
7440+ } while (0);
7441+#endif
7442+
7443+ return 1;
7444+}
7445+
7446+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7447+{
7448+ unsigned long i;
7449+
7450+ printk(KERN_ERR "PAX: bytes at PC: ");
7451+ for (i = 0; i < 5; i++) {
7452+ unsigned int c;
7453+ if (get_user(c, (unsigned int *)pc+i))
7454+ printk(KERN_CONT "???????? ");
7455+ else
7456+ printk(KERN_CONT "%08x ", c);
7457+ }
7458+ printk("\n");
7459+}
7460+#endif
7461+
7462 int fixup_exception(struct pt_regs *regs)
7463 {
7464 const struct exception_table_entry *fix;
7465@@ -204,8 +315,33 @@ retry:
7466
7467 good_area:
7468
7469- if ((vma->vm_flags & acc_type) != acc_type)
7470+ if ((vma->vm_flags & acc_type) != acc_type) {
7471+
7472+#ifdef CONFIG_PAX_PAGEEXEC
7473+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7474+ (address & ~3UL) == instruction_pointer(regs))
7475+ {
7476+ up_read(&mm->mmap_sem);
7477+ switch (pax_handle_fetch_fault(regs)) {
7478+
7479+#ifdef CONFIG_PAX_EMUPLT
7480+ case 3:
7481+ return;
7482+#endif
7483+
7484+#ifdef CONFIG_PAX_EMUTRAMP
7485+ case 2:
7486+ return;
7487+#endif
7488+
7489+ }
7490+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7491+ do_group_exit(SIGKILL);
7492+ }
7493+#endif
7494+
7495 goto bad_area;
7496+ }
7497
7498 /*
7499 * If for any reason at all we couldn't handle the fault, make
7500diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7501index 38f3b7e..7e485c0 100644
7502--- a/arch/powerpc/Kconfig
7503+++ b/arch/powerpc/Kconfig
7504@@ -378,6 +378,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
7505 config KEXEC
7506 bool "kexec system call"
7507 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7508+ depends on !GRKERNSEC_KMEM
7509 help
7510 kexec is a system call that implements the ability to shutdown your
7511 current kernel, and to start another kernel. It is like a reboot
7512diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7513index e3b1d41..8e81edf 100644
7514--- a/arch/powerpc/include/asm/atomic.h
7515+++ b/arch/powerpc/include/asm/atomic.h
7516@@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
7517 return t1;
7518 }
7519
7520+#define atomic64_read_unchecked(v) atomic64_read(v)
7521+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7522+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7523+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7524+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7525+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7526+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7527+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7528+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7529+
7530 #endif /* __powerpc64__ */
7531
7532 #endif /* __KERNEL__ */
7533diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
7534index 9e495c9..b6878e5 100644
7535--- a/arch/powerpc/include/asm/cache.h
7536+++ b/arch/powerpc/include/asm/cache.h
7537@@ -3,6 +3,7 @@
7538
7539 #ifdef __KERNEL__
7540
7541+#include <linux/const.h>
7542
7543 /* bytes per L1 cache line */
7544 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
7545@@ -22,7 +23,7 @@
7546 #define L1_CACHE_SHIFT 7
7547 #endif
7548
7549-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7550+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7551
7552 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7553
7554diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
7555index cc0655a..13eac2e 100644
7556--- a/arch/powerpc/include/asm/elf.h
7557+++ b/arch/powerpc/include/asm/elf.h
7558@@ -28,8 +28,19 @@
7559 the loader. We need to make sure that it is out of the way of the program
7560 that it will "exec", and that there is sufficient room for the brk. */
7561
7562-extern unsigned long randomize_et_dyn(unsigned long base);
7563-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
7564+#define ELF_ET_DYN_BASE (0x20000000)
7565+
7566+#ifdef CONFIG_PAX_ASLR
7567+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
7568+
7569+#ifdef __powerpc64__
7570+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
7571+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
7572+#else
7573+#define PAX_DELTA_MMAP_LEN 15
7574+#define PAX_DELTA_STACK_LEN 15
7575+#endif
7576+#endif
7577
7578 /*
7579 * Our registers are always unsigned longs, whether we're a 32 bit
7580@@ -123,10 +134,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
7581 (0x7ff >> (PAGE_SHIFT - 12)) : \
7582 (0x3ffff >> (PAGE_SHIFT - 12)))
7583
7584-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
7585-#define arch_randomize_brk arch_randomize_brk
7586-
7587-
7588 #ifdef CONFIG_SPU_BASE
7589 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
7590 #define NT_SPU 1
7591diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
7592index 8196e9c..d83a9f3 100644
7593--- a/arch/powerpc/include/asm/exec.h
7594+++ b/arch/powerpc/include/asm/exec.h
7595@@ -4,6 +4,6 @@
7596 #ifndef _ASM_POWERPC_EXEC_H
7597 #define _ASM_POWERPC_EXEC_H
7598
7599-extern unsigned long arch_align_stack(unsigned long sp);
7600+#define arch_align_stack(x) ((x) & ~0xfUL)
7601
7602 #endif /* _ASM_POWERPC_EXEC_H */
7603diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
7604index 5acabbd..7ea14fa 100644
7605--- a/arch/powerpc/include/asm/kmap_types.h
7606+++ b/arch/powerpc/include/asm/kmap_types.h
7607@@ -10,7 +10,7 @@
7608 * 2 of the License, or (at your option) any later version.
7609 */
7610
7611-#define KM_TYPE_NR 16
7612+#define KM_TYPE_NR 17
7613
7614 #endif /* __KERNEL__ */
7615 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
7616diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
7617index 8565c25..2865190 100644
7618--- a/arch/powerpc/include/asm/mman.h
7619+++ b/arch/powerpc/include/asm/mman.h
7620@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
7621 }
7622 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
7623
7624-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
7625+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
7626 {
7627 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
7628 }
7629diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
7630index b9f4262..dcf04f7 100644
7631--- a/arch/powerpc/include/asm/page.h
7632+++ b/arch/powerpc/include/asm/page.h
7633@@ -230,8 +230,9 @@ extern long long virt_phys_offset;
7634 * and needs to be executable. This means the whole heap ends
7635 * up being executable.
7636 */
7637-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
7638- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7639+#define VM_DATA_DEFAULT_FLAGS32 \
7640+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
7641+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7642
7643 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
7644 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7645@@ -259,6 +260,9 @@ extern long long virt_phys_offset;
7646 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
7647 #endif
7648
7649+#define ktla_ktva(addr) (addr)
7650+#define ktva_ktla(addr) (addr)
7651+
7652 #ifndef CONFIG_PPC_BOOK3S_64
7653 /*
7654 * Use the top bit of the higher-level page table entries to indicate whether
7655diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
7656index 88693ce..ac6f9ab 100644
7657--- a/arch/powerpc/include/asm/page_64.h
7658+++ b/arch/powerpc/include/asm/page_64.h
7659@@ -153,15 +153,18 @@ do { \
7660 * stack by default, so in the absence of a PT_GNU_STACK program header
7661 * we turn execute permission off.
7662 */
7663-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
7664- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7665+#define VM_STACK_DEFAULT_FLAGS32 \
7666+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
7667+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7668
7669 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
7670 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
7671
7672+#ifndef CONFIG_PAX_PAGEEXEC
7673 #define VM_STACK_DEFAULT_FLAGS \
7674 (is_32bit_task() ? \
7675 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
7676+#endif
7677
7678 #include <asm-generic/getorder.h>
7679
7680diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
7681index 256d6f8..b0166a7 100644
7682--- a/arch/powerpc/include/asm/pgalloc-64.h
7683+++ b/arch/powerpc/include/asm/pgalloc-64.h
7684@@ -53,6 +53,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
7685 #ifndef CONFIG_PPC_64K_PAGES
7686
7687 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
7688+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
7689
7690 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
7691 {
7692@@ -70,6 +71,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
7693 pud_set(pud, (unsigned long)pmd);
7694 }
7695
7696+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
7697+{
7698+ pud_populate(mm, pud, pmd);
7699+}
7700+
7701 #define pmd_populate(mm, pmd, pte_page) \
7702 pmd_populate_kernel(mm, pmd, page_address(pte_page))
7703 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
7704@@ -169,6 +175,7 @@ extern void __tlb_remove_table(void *_table);
7705 #endif
7706
7707 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
7708+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
7709
7710 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
7711 pte_t *pte)
7712diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
7713index 7d6eacf..14c0240 100644
7714--- a/arch/powerpc/include/asm/pgtable.h
7715+++ b/arch/powerpc/include/asm/pgtable.h
7716@@ -2,6 +2,7 @@
7717 #define _ASM_POWERPC_PGTABLE_H
7718 #ifdef __KERNEL__
7719
7720+#include <linux/const.h>
7721 #ifndef __ASSEMBLY__
7722 #include <asm/processor.h> /* For TASK_SIZE */
7723 #include <asm/mmu.h>
7724diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
7725index 4aad413..85d86bf 100644
7726--- a/arch/powerpc/include/asm/pte-hash32.h
7727+++ b/arch/powerpc/include/asm/pte-hash32.h
7728@@ -21,6 +21,7 @@
7729 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
7730 #define _PAGE_USER 0x004 /* usermode access allowed */
7731 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
7732+#define _PAGE_EXEC _PAGE_GUARDED
7733 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
7734 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
7735 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
7736diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
7737index 10d1ef0..8f83abc 100644
7738--- a/arch/powerpc/include/asm/reg.h
7739+++ b/arch/powerpc/include/asm/reg.h
7740@@ -234,6 +234,7 @@
7741 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
7742 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
7743 #define DSISR_NOHPTE 0x40000000 /* no translation found */
7744+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
7745 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
7746 #define DSISR_ISSTORE 0x02000000 /* access was a store */
7747 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
7748diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
7749index 98da78e..dc68271 100644
7750--- a/arch/powerpc/include/asm/smp.h
7751+++ b/arch/powerpc/include/asm/smp.h
7752@@ -50,7 +50,7 @@ struct smp_ops_t {
7753 int (*cpu_disable)(void);
7754 void (*cpu_die)(unsigned int nr);
7755 int (*cpu_bootable)(unsigned int nr);
7756-};
7757+} __no_const;
7758
7759 extern void smp_send_debugger_break(void);
7760 extern void start_secondary_resume(void);
7761diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
7762index ba7b197..d292e26 100644
7763--- a/arch/powerpc/include/asm/thread_info.h
7764+++ b/arch/powerpc/include/asm/thread_info.h
7765@@ -93,7 +93,6 @@ static inline struct thread_info *current_thread_info(void)
7766 #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
7767 TIF_NEED_RESCHED */
7768 #define TIF_32BIT 4 /* 32 bit binary */
7769-#define TIF_PERFMON_WORK 5 /* work for pfm_handle_work() */
7770 #define TIF_PERFMON_CTXSW 6 /* perfmon needs ctxsw calls */
7771 #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
7772 #define TIF_SINGLESTEP 8 /* singlestepping active */
7773@@ -107,6 +106,9 @@ static inline struct thread_info *current_thread_info(void)
7774 #define TIF_EMULATE_STACK_STORE 16 /* Is an instruction emulation
7775 for stack store? */
7776 #define TIF_MEMDIE 17 /* is terminating due to OOM killer */
7777+#define TIF_PERFMON_WORK 18 /* work for pfm_handle_work() */
7778+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
7779+#define TIF_GRSEC_SETXID 5 /* update credentials on syscall entry/exit */
7780
7781 /* as above, but as bit values */
7782 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
7783@@ -126,9 +128,10 @@ static inline struct thread_info *current_thread_info(void)
7784 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
7785 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
7786 #define _TIF_NOHZ (1<<TIF_NOHZ)
7787+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
7788 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
7789 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
7790- _TIF_NOHZ)
7791+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
7792
7793 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
7794 _TIF_NOTIFY_RESUME | _TIF_UPROBE)
7795diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
7796index 9485b43..4718d50 100644
7797--- a/arch/powerpc/include/asm/uaccess.h
7798+++ b/arch/powerpc/include/asm/uaccess.h
7799@@ -318,52 +318,6 @@ do { \
7800 extern unsigned long __copy_tofrom_user(void __user *to,
7801 const void __user *from, unsigned long size);
7802
7803-#ifndef __powerpc64__
7804-
7805-static inline unsigned long copy_from_user(void *to,
7806- const void __user *from, unsigned long n)
7807-{
7808- unsigned long over;
7809-
7810- if (access_ok(VERIFY_READ, from, n))
7811- return __copy_tofrom_user((__force void __user *)to, from, n);
7812- if ((unsigned long)from < TASK_SIZE) {
7813- over = (unsigned long)from + n - TASK_SIZE;
7814- return __copy_tofrom_user((__force void __user *)to, from,
7815- n - over) + over;
7816- }
7817- return n;
7818-}
7819-
7820-static inline unsigned long copy_to_user(void __user *to,
7821- const void *from, unsigned long n)
7822-{
7823- unsigned long over;
7824-
7825- if (access_ok(VERIFY_WRITE, to, n))
7826- return __copy_tofrom_user(to, (__force void __user *)from, n);
7827- if ((unsigned long)to < TASK_SIZE) {
7828- over = (unsigned long)to + n - TASK_SIZE;
7829- return __copy_tofrom_user(to, (__force void __user *)from,
7830- n - over) + over;
7831- }
7832- return n;
7833-}
7834-
7835-#else /* __powerpc64__ */
7836-
7837-#define __copy_in_user(to, from, size) \
7838- __copy_tofrom_user((to), (from), (size))
7839-
7840-extern unsigned long copy_from_user(void *to, const void __user *from,
7841- unsigned long n);
7842-extern unsigned long copy_to_user(void __user *to, const void *from,
7843- unsigned long n);
7844-extern unsigned long copy_in_user(void __user *to, const void __user *from,
7845- unsigned long n);
7846-
7847-#endif /* __powerpc64__ */
7848-
7849 static inline unsigned long __copy_from_user_inatomic(void *to,
7850 const void __user *from, unsigned long n)
7851 {
7852@@ -387,6 +341,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
7853 if (ret == 0)
7854 return 0;
7855 }
7856+
7857+ if (!__builtin_constant_p(n))
7858+ check_object_size(to, n, false);
7859+
7860 return __copy_tofrom_user((__force void __user *)to, from, n);
7861 }
7862
7863@@ -413,6 +371,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
7864 if (ret == 0)
7865 return 0;
7866 }
7867+
7868+ if (!__builtin_constant_p(n))
7869+ check_object_size(from, n, true);
7870+
7871 return __copy_tofrom_user(to, (__force const void __user *)from, n);
7872 }
7873
7874@@ -430,6 +392,92 @@ static inline unsigned long __copy_to_user(void __user *to,
7875 return __copy_to_user_inatomic(to, from, size);
7876 }
7877
7878+#ifndef __powerpc64__
7879+
7880+static inline unsigned long __must_check copy_from_user(void *to,
7881+ const void __user *from, unsigned long n)
7882+{
7883+ unsigned long over;
7884+
7885+ if ((long)n < 0)
7886+ return n;
7887+
7888+ if (access_ok(VERIFY_READ, from, n)) {
7889+ if (!__builtin_constant_p(n))
7890+ check_object_size(to, n, false);
7891+ return __copy_tofrom_user((__force void __user *)to, from, n);
7892+ }
7893+ if ((unsigned long)from < TASK_SIZE) {
7894+ over = (unsigned long)from + n - TASK_SIZE;
7895+ if (!__builtin_constant_p(n - over))
7896+ check_object_size(to, n - over, false);
7897+ return __copy_tofrom_user((__force void __user *)to, from,
7898+ n - over) + over;
7899+ }
7900+ return n;
7901+}
7902+
7903+static inline unsigned long __must_check copy_to_user(void __user *to,
7904+ const void *from, unsigned long n)
7905+{
7906+ unsigned long over;
7907+
7908+ if ((long)n < 0)
7909+ return n;
7910+
7911+ if (access_ok(VERIFY_WRITE, to, n)) {
7912+ if (!__builtin_constant_p(n))
7913+ check_object_size(from, n, true);
7914+ return __copy_tofrom_user(to, (__force void __user *)from, n);
7915+ }
7916+ if ((unsigned long)to < TASK_SIZE) {
7917+ over = (unsigned long)to + n - TASK_SIZE;
7918+ if (!__builtin_constant_p(n))
7919+ check_object_size(from, n - over, true);
7920+ return __copy_tofrom_user(to, (__force void __user *)from,
7921+ n - over) + over;
7922+ }
7923+ return n;
7924+}
7925+
7926+#else /* __powerpc64__ */
7927+
7928+#define __copy_in_user(to, from, size) \
7929+ __copy_tofrom_user((to), (from), (size))
7930+
7931+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
7932+{
7933+ if ((long)n < 0 || n > INT_MAX)
7934+ return n;
7935+
7936+ if (!__builtin_constant_p(n))
7937+ check_object_size(to, n, false);
7938+
7939+ if (likely(access_ok(VERIFY_READ, from, n)))
7940+ n = __copy_from_user(to, from, n);
7941+ else
7942+ memset(to, 0, n);
7943+ return n;
7944+}
7945+
7946+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
7947+{
7948+ if ((long)n < 0 || n > INT_MAX)
7949+ return n;
7950+
7951+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
7952+ if (!__builtin_constant_p(n))
7953+ check_object_size(from, n, true);
7954+ n = __copy_to_user(to, from, n);
7955+ }
7956+ return n;
7957+}
7958+
7959+extern unsigned long copy_in_user(void __user *to, const void __user *from,
7960+ unsigned long n);
7961+
7962+#endif /* __powerpc64__ */
7963+
7964 extern unsigned long __clear_user(void __user *addr, unsigned long size);
7965
7966 static inline unsigned long clear_user(void __user *addr, unsigned long size)
7967diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
7968index 2d06704..1616f1b 100644
7969--- a/arch/powerpc/kernel/exceptions-64e.S
7970+++ b/arch/powerpc/kernel/exceptions-64e.S
7971@@ -757,6 +757,7 @@ storage_fault_common:
7972 std r14,_DAR(r1)
7973 std r15,_DSISR(r1)
7974 addi r3,r1,STACK_FRAME_OVERHEAD
7975+ bl .save_nvgprs
7976 mr r4,r14
7977 mr r5,r15
7978 ld r14,PACA_EXGEN+EX_R14(r13)
7979@@ -765,8 +766,7 @@ storage_fault_common:
7980 cmpdi r3,0
7981 bne- 1f
7982 b .ret_from_except_lite
7983-1: bl .save_nvgprs
7984- mr r5,r3
7985+1: mr r5,r3
7986 addi r3,r1,STACK_FRAME_OVERHEAD
7987 ld r4,_DAR(r1)
7988 bl .bad_page_fault
7989diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
7990index 3a9ed6a..b534681 100644
7991--- a/arch/powerpc/kernel/exceptions-64s.S
7992+++ b/arch/powerpc/kernel/exceptions-64s.S
7993@@ -1364,10 +1364,10 @@ handle_page_fault:
7994 11: ld r4,_DAR(r1)
7995 ld r5,_DSISR(r1)
7996 addi r3,r1,STACK_FRAME_OVERHEAD
7997+ bl .save_nvgprs
7998 bl .do_page_fault
7999 cmpdi r3,0
8000 beq+ 12f
8001- bl .save_nvgprs
8002 mr r5,r3
8003 addi r3,r1,STACK_FRAME_OVERHEAD
8004 lwz r4,_DAR(r1)
8005diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8006index 2e3200c..7118986 100644
8007--- a/arch/powerpc/kernel/module_32.c
8008+++ b/arch/powerpc/kernel/module_32.c
8009@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8010 me->arch.core_plt_section = i;
8011 }
8012 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8013- printk("Module doesn't contain .plt or .init.plt sections.\n");
8014+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
8015 return -ENOEXEC;
8016 }
8017
8018@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
8019
8020 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8021 /* Init, or core PLT? */
8022- if (location >= mod->module_core
8023- && location < mod->module_core + mod->core_size)
8024+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8025+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8026 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8027- else
8028+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8029+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8030 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8031+ else {
8032+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8033+ return ~0UL;
8034+ }
8035
8036 /* Find this entry, or if that fails, the next avail. entry */
8037 while (entry->jump[0]) {
8038@@ -300,7 +305,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8039 }
8040 #ifdef CONFIG_DYNAMIC_FTRACE
8041 module->arch.tramp =
8042- do_plt_call(module->module_core,
8043+ do_plt_call(module->module_core_rx,
8044 (unsigned long)ftrace_caller,
8045 sechdrs, module);
8046 #endif
8047diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8048index 96d2fdf..f6d10c8 100644
8049--- a/arch/powerpc/kernel/process.c
8050+++ b/arch/powerpc/kernel/process.c
8051@@ -886,8 +886,8 @@ void show_regs(struct pt_regs * regs)
8052 * Lookup NIP late so we have the best change of getting the
8053 * above info out without failing
8054 */
8055- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8056- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8057+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8058+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8059 #endif
8060 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
8061 printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch);
8062@@ -1352,10 +1352,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8063 newsp = stack[0];
8064 ip = stack[STACK_FRAME_LR_SAVE];
8065 if (!firstframe || ip != lr) {
8066- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8067+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8068 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8069 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8070- printk(" (%pS)",
8071+ printk(" (%pA)",
8072 (void *)current->ret_stack[curr_frame].ret);
8073 curr_frame--;
8074 }
8075@@ -1375,7 +1375,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8076 struct pt_regs *regs = (struct pt_regs *)
8077 (sp + STACK_FRAME_OVERHEAD);
8078 lr = regs->link;
8079- printk("--- Exception: %lx at %pS\n LR = %pS\n",
8080+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
8081 regs->trap, (void *)regs->nip, (void *)lr);
8082 firstframe = 1;
8083 }
8084@@ -1411,58 +1411,3 @@ void notrace __ppc64_runlatch_off(void)
8085 mtspr(SPRN_CTRLT, ctrl);
8086 }
8087 #endif /* CONFIG_PPC64 */
8088-
8089-unsigned long arch_align_stack(unsigned long sp)
8090-{
8091- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8092- sp -= get_random_int() & ~PAGE_MASK;
8093- return sp & ~0xf;
8094-}
8095-
8096-static inline unsigned long brk_rnd(void)
8097-{
8098- unsigned long rnd = 0;
8099-
8100- /* 8MB for 32bit, 1GB for 64bit */
8101- if (is_32bit_task())
8102- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8103- else
8104- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8105-
8106- return rnd << PAGE_SHIFT;
8107-}
8108-
8109-unsigned long arch_randomize_brk(struct mm_struct *mm)
8110-{
8111- unsigned long base = mm->brk;
8112- unsigned long ret;
8113-
8114-#ifdef CONFIG_PPC_STD_MMU_64
8115- /*
8116- * If we are using 1TB segments and we are allowed to randomise
8117- * the heap, we can put it above 1TB so it is backed by a 1TB
8118- * segment. Otherwise the heap will be in the bottom 1TB
8119- * which always uses 256MB segments and this may result in a
8120- * performance penalty.
8121- */
8122- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8123- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8124-#endif
8125-
8126- ret = PAGE_ALIGN(base + brk_rnd());
8127-
8128- if (ret < mm->brk)
8129- return mm->brk;
8130-
8131- return ret;
8132-}
8133-
8134-unsigned long randomize_et_dyn(unsigned long base)
8135-{
8136- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8137-
8138- if (ret < base)
8139- return base;
8140-
8141- return ret;
8142-}
8143diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
8144index 9a0d24c..e7fbedf 100644
8145--- a/arch/powerpc/kernel/ptrace.c
8146+++ b/arch/powerpc/kernel/ptrace.c
8147@@ -1761,6 +1761,10 @@ long arch_ptrace(struct task_struct *child, long request,
8148 return ret;
8149 }
8150
8151+#ifdef CONFIG_GRKERNSEC_SETXID
8152+extern void gr_delayed_cred_worker(void);
8153+#endif
8154+
8155 /*
8156 * We must return the syscall number to actually look up in the table.
8157 * This can be -1L to skip running any syscall at all.
8158@@ -1773,6 +1777,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
8159
8160 secure_computing_strict(regs->gpr[0]);
8161
8162+#ifdef CONFIG_GRKERNSEC_SETXID
8163+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8164+ gr_delayed_cred_worker();
8165+#endif
8166+
8167 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
8168 tracehook_report_syscall_entry(regs))
8169 /*
8170@@ -1807,6 +1816,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
8171 {
8172 int step;
8173
8174+#ifdef CONFIG_GRKERNSEC_SETXID
8175+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8176+ gr_delayed_cred_worker();
8177+#endif
8178+
8179 audit_syscall_exit(regs);
8180
8181 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
8182diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
8183index fea2dba..a779f6b 100644
8184--- a/arch/powerpc/kernel/signal_32.c
8185+++ b/arch/powerpc/kernel/signal_32.c
8186@@ -1002,7 +1002,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
8187 /* Save user registers on the stack */
8188 frame = &rt_sf->uc.uc_mcontext;
8189 addr = frame;
8190- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
8191+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8192 sigret = 0;
8193 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
8194 } else {
8195diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
8196index 1e7ba88..17afb1b 100644
8197--- a/arch/powerpc/kernel/signal_64.c
8198+++ b/arch/powerpc/kernel/signal_64.c
8199@@ -763,7 +763,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
8200 #endif
8201
8202 /* Set up to return from userspace. */
8203- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
8204+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8205 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
8206 } else {
8207 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
8208diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
8209index f783c93..619baf1 100644
8210--- a/arch/powerpc/kernel/traps.c
8211+++ b/arch/powerpc/kernel/traps.c
8212@@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
8213 return flags;
8214 }
8215
8216+extern void gr_handle_kernel_exploit(void);
8217+
8218 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8219 int signr)
8220 {
8221@@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8222 panic("Fatal exception in interrupt");
8223 if (panic_on_oops)
8224 panic("Fatal exception");
8225+
8226+ gr_handle_kernel_exploit();
8227+
8228 do_exit(signr);
8229 }
8230
8231diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
8232index 1d9c926..25f4741 100644
8233--- a/arch/powerpc/kernel/vdso.c
8234+++ b/arch/powerpc/kernel/vdso.c
8235@@ -34,6 +34,7 @@
8236 #include <asm/firmware.h>
8237 #include <asm/vdso.h>
8238 #include <asm/vdso_datapage.h>
8239+#include <asm/mman.h>
8240
8241 #include "setup.h"
8242
8243@@ -222,7 +223,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8244 vdso_base = VDSO32_MBASE;
8245 #endif
8246
8247- current->mm->context.vdso_base = 0;
8248+ current->mm->context.vdso_base = ~0UL;
8249
8250 /* vDSO has a problem and was disabled, just don't "enable" it for the
8251 * process
8252@@ -242,7 +243,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8253 vdso_base = get_unmapped_area(NULL, vdso_base,
8254 (vdso_pages << PAGE_SHIFT) +
8255 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
8256- 0, 0);
8257+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
8258 if (IS_ERR_VALUE(vdso_base)) {
8259 rc = vdso_base;
8260 goto fail_mmapsem;
8261diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
8262index 5eea6f3..5d10396 100644
8263--- a/arch/powerpc/lib/usercopy_64.c
8264+++ b/arch/powerpc/lib/usercopy_64.c
8265@@ -9,22 +9,6 @@
8266 #include <linux/module.h>
8267 #include <asm/uaccess.h>
8268
8269-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
8270-{
8271- if (likely(access_ok(VERIFY_READ, from, n)))
8272- n = __copy_from_user(to, from, n);
8273- else
8274- memset(to, 0, n);
8275- return n;
8276-}
8277-
8278-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
8279-{
8280- if (likely(access_ok(VERIFY_WRITE, to, n)))
8281- n = __copy_to_user(to, from, n);
8282- return n;
8283-}
8284-
8285 unsigned long copy_in_user(void __user *to, const void __user *from,
8286 unsigned long n)
8287 {
8288@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
8289 return n;
8290 }
8291
8292-EXPORT_SYMBOL(copy_from_user);
8293-EXPORT_SYMBOL(copy_to_user);
8294 EXPORT_SYMBOL(copy_in_user);
8295
8296diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
8297index 51ab9e7..7d3c78b 100644
8298--- a/arch/powerpc/mm/fault.c
8299+++ b/arch/powerpc/mm/fault.c
8300@@ -33,6 +33,10 @@
8301 #include <linux/magic.h>
8302 #include <linux/ratelimit.h>
8303 #include <linux/context_tracking.h>
8304+#include <linux/slab.h>
8305+#include <linux/pagemap.h>
8306+#include <linux/compiler.h>
8307+#include <linux/unistd.h>
8308
8309 #include <asm/firmware.h>
8310 #include <asm/page.h>
8311@@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
8312 }
8313 #endif
8314
8315+#ifdef CONFIG_PAX_PAGEEXEC
8316+/*
8317+ * PaX: decide what to do with offenders (regs->nip = fault address)
8318+ *
8319+ * returns 1 when task should be killed
8320+ */
8321+static int pax_handle_fetch_fault(struct pt_regs *regs)
8322+{
8323+ return 1;
8324+}
8325+
8326+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
8327+{
8328+ unsigned long i;
8329+
8330+ printk(KERN_ERR "PAX: bytes at PC: ");
8331+ for (i = 0; i < 5; i++) {
8332+ unsigned int c;
8333+ if (get_user(c, (unsigned int __user *)pc+i))
8334+ printk(KERN_CONT "???????? ");
8335+ else
8336+ printk(KERN_CONT "%08x ", c);
8337+ }
8338+ printk("\n");
8339+}
8340+#endif
8341+
8342 /*
8343 * Check whether the instruction at regs->nip is a store using
8344 * an update addressing form which will update r1.
8345@@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
8346 * indicate errors in DSISR but can validly be set in SRR1.
8347 */
8348 if (trap == 0x400)
8349- error_code &= 0x48200000;
8350+ error_code &= 0x58200000;
8351 else
8352 is_write = error_code & DSISR_ISSTORE;
8353 #else
8354@@ -378,7 +409,7 @@ good_area:
8355 * "undefined". Of those that can be set, this is the only
8356 * one which seems bad.
8357 */
8358- if (error_code & 0x10000000)
8359+ if (error_code & DSISR_GUARDED)
8360 /* Guarded storage error. */
8361 goto bad_area;
8362 #endif /* CONFIG_8xx */
8363@@ -393,7 +424,7 @@ good_area:
8364 * processors use the same I/D cache coherency mechanism
8365 * as embedded.
8366 */
8367- if (error_code & DSISR_PROTFAULT)
8368+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
8369 goto bad_area;
8370 #endif /* CONFIG_PPC_STD_MMU */
8371
8372@@ -483,6 +514,23 @@ bad_area:
8373 bad_area_nosemaphore:
8374 /* User mode accesses cause a SIGSEGV */
8375 if (user_mode(regs)) {
8376+
8377+#ifdef CONFIG_PAX_PAGEEXEC
8378+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
8379+#ifdef CONFIG_PPC_STD_MMU
8380+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
8381+#else
8382+ if (is_exec && regs->nip == address) {
8383+#endif
8384+ switch (pax_handle_fetch_fault(regs)) {
8385+ }
8386+
8387+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
8388+ do_group_exit(SIGKILL);
8389+ }
8390+ }
8391+#endif
8392+
8393 _exception(SIGSEGV, regs, code, address);
8394 goto bail;
8395 }
8396diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
8397index cb8bdbe..d770680 100644
8398--- a/arch/powerpc/mm/mmap.c
8399+++ b/arch/powerpc/mm/mmap.c
8400@@ -57,6 +57,10 @@ static unsigned long mmap_rnd(void)
8401 {
8402 unsigned long rnd = 0;
8403
8404+#ifdef CONFIG_PAX_RANDMMAP
8405+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8406+#endif
8407+
8408 if (current->flags & PF_RANDOMIZE) {
8409 /* 8MB for 32bit, 1GB for 64bit */
8410 if (is_32bit_task())
8411@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8412 */
8413 if (mmap_is_legacy()) {
8414 mm->mmap_base = TASK_UNMAPPED_BASE;
8415+
8416+#ifdef CONFIG_PAX_RANDMMAP
8417+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8418+ mm->mmap_base += mm->delta_mmap;
8419+#endif
8420+
8421 mm->get_unmapped_area = arch_get_unmapped_area;
8422 } else {
8423 mm->mmap_base = mmap_base();
8424+
8425+#ifdef CONFIG_PAX_RANDMMAP
8426+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8427+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
8428+#endif
8429+
8430 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
8431 }
8432 }
8433diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
8434index 7ce9cf3..a964087 100644
8435--- a/arch/powerpc/mm/slice.c
8436+++ b/arch/powerpc/mm/slice.c
8437@@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
8438 if ((mm->task_size - len) < addr)
8439 return 0;
8440 vma = find_vma(mm, addr);
8441- return (!vma || (addr + len) <= vma->vm_start);
8442+ return check_heap_stack_gap(vma, addr, len, 0);
8443 }
8444
8445 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
8446@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
8447 info.align_offset = 0;
8448
8449 addr = TASK_UNMAPPED_BASE;
8450+
8451+#ifdef CONFIG_PAX_RANDMMAP
8452+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8453+ addr += mm->delta_mmap;
8454+#endif
8455+
8456 while (addr < TASK_SIZE) {
8457 info.low_limit = addr;
8458 if (!slice_scan_available(addr, available, 1, &addr))
8459@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
8460 if (fixed && addr > (mm->task_size - len))
8461 return -EINVAL;
8462
8463+#ifdef CONFIG_PAX_RANDMMAP
8464+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
8465+ addr = 0;
8466+#endif
8467+
8468 /* If hint, make sure it matches our alignment restrictions */
8469 if (!fixed && addr) {
8470 addr = _ALIGN_UP(addr, 1ul << pshift);
8471diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
8472index 9098692..3d54cd1 100644
8473--- a/arch/powerpc/platforms/cell/spufs/file.c
8474+++ b/arch/powerpc/platforms/cell/spufs/file.c
8475@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
8476 return VM_FAULT_NOPAGE;
8477 }
8478
8479-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
8480+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
8481 unsigned long address,
8482- void *buf, int len, int write)
8483+ void *buf, size_t len, int write)
8484 {
8485 struct spu_context *ctx = vma->vm_file->private_data;
8486 unsigned long offset = address - vma->vm_start;
8487diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
8488index c797832..ce575c8 100644
8489--- a/arch/s390/include/asm/atomic.h
8490+++ b/arch/s390/include/asm/atomic.h
8491@@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
8492 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
8493 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
8494
8495+#define atomic64_read_unchecked(v) atomic64_read(v)
8496+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
8497+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
8498+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
8499+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
8500+#define atomic64_inc_unchecked(v) atomic64_inc(v)
8501+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
8502+#define atomic64_dec_unchecked(v) atomic64_dec(v)
8503+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
8504+
8505 #define smp_mb__before_atomic_dec() smp_mb()
8506 #define smp_mb__after_atomic_dec() smp_mb()
8507 #define smp_mb__before_atomic_inc() smp_mb()
8508diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
8509index 4d7ccac..d03d0ad 100644
8510--- a/arch/s390/include/asm/cache.h
8511+++ b/arch/s390/include/asm/cache.h
8512@@ -9,8 +9,10 @@
8513 #ifndef __ARCH_S390_CACHE_H
8514 #define __ARCH_S390_CACHE_H
8515
8516-#define L1_CACHE_BYTES 256
8517+#include <linux/const.h>
8518+
8519 #define L1_CACHE_SHIFT 8
8520+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8521 #define NET_SKB_PAD 32
8522
8523 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
8524diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
8525index 78f4f87..598ce39 100644
8526--- a/arch/s390/include/asm/elf.h
8527+++ b/arch/s390/include/asm/elf.h
8528@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
8529 the loader. We need to make sure that it is out of the way of the program
8530 that it will "exec", and that there is sufficient room for the brk. */
8531
8532-extern unsigned long randomize_et_dyn(unsigned long base);
8533-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
8534+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
8535+
8536+#ifdef CONFIG_PAX_ASLR
8537+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
8538+
8539+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
8540+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
8541+#endif
8542
8543 /* This yields a mask that user programs can use to figure out what
8544 instruction set this CPU supports. */
8545@@ -222,9 +228,6 @@ struct linux_binprm;
8546 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
8547 int arch_setup_additional_pages(struct linux_binprm *, int);
8548
8549-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8550-#define arch_randomize_brk arch_randomize_brk
8551-
8552 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
8553
8554 #endif
8555diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
8556index c4a93d6..4d2a9b4 100644
8557--- a/arch/s390/include/asm/exec.h
8558+++ b/arch/s390/include/asm/exec.h
8559@@ -7,6 +7,6 @@
8560 #ifndef __ASM_EXEC_H
8561 #define __ASM_EXEC_H
8562
8563-extern unsigned long arch_align_stack(unsigned long sp);
8564+#define arch_align_stack(x) ((x) & ~0xfUL)
8565
8566 #endif /* __ASM_EXEC_H */
8567diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
8568index 9c33ed4..e40cbef 100644
8569--- a/arch/s390/include/asm/uaccess.h
8570+++ b/arch/s390/include/asm/uaccess.h
8571@@ -252,6 +252,10 @@ static inline unsigned long __must_check
8572 copy_to_user(void __user *to, const void *from, unsigned long n)
8573 {
8574 might_fault();
8575+
8576+ if ((long)n < 0)
8577+ return n;
8578+
8579 return __copy_to_user(to, from, n);
8580 }
8581
8582@@ -275,6 +279,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
8583 static inline unsigned long __must_check
8584 __copy_from_user(void *to, const void __user *from, unsigned long n)
8585 {
8586+ if ((long)n < 0)
8587+ return n;
8588+
8589 if (__builtin_constant_p(n) && (n <= 256))
8590 return uaccess.copy_from_user_small(n, from, to);
8591 else
8592@@ -306,10 +313,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
8593 static inline unsigned long __must_check
8594 copy_from_user(void *to, const void __user *from, unsigned long n)
8595 {
8596- unsigned int sz = __compiletime_object_size(to);
8597+ size_t sz = __compiletime_object_size(to);
8598
8599 might_fault();
8600- if (unlikely(sz != -1 && sz < n)) {
8601+
8602+ if ((long)n < 0)
8603+ return n;
8604+
8605+ if (unlikely(sz != (size_t)-1 && sz < n)) {
8606 copy_from_user_overflow();
8607 return n;
8608 }
8609diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
8610index 7845e15..59c4353 100644
8611--- a/arch/s390/kernel/module.c
8612+++ b/arch/s390/kernel/module.c
8613@@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
8614
8615 /* Increase core size by size of got & plt and set start
8616 offsets for got and plt. */
8617- me->core_size = ALIGN(me->core_size, 4);
8618- me->arch.got_offset = me->core_size;
8619- me->core_size += me->arch.got_size;
8620- me->arch.plt_offset = me->core_size;
8621- me->core_size += me->arch.plt_size;
8622+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
8623+ me->arch.got_offset = me->core_size_rw;
8624+ me->core_size_rw += me->arch.got_size;
8625+ me->arch.plt_offset = me->core_size_rx;
8626+ me->core_size_rx += me->arch.plt_size;
8627 return 0;
8628 }
8629
8630@@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8631 if (info->got_initialized == 0) {
8632 Elf_Addr *gotent;
8633
8634- gotent = me->module_core + me->arch.got_offset +
8635+ gotent = me->module_core_rw + me->arch.got_offset +
8636 info->got_offset;
8637 *gotent = val;
8638 info->got_initialized = 1;
8639@@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8640 rc = apply_rela_bits(loc, val, 0, 64, 0);
8641 else if (r_type == R_390_GOTENT ||
8642 r_type == R_390_GOTPLTENT) {
8643- val += (Elf_Addr) me->module_core - loc;
8644+ val += (Elf_Addr) me->module_core_rw - loc;
8645 rc = apply_rela_bits(loc, val, 1, 32, 1);
8646 }
8647 break;
8648@@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8649 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
8650 if (info->plt_initialized == 0) {
8651 unsigned int *ip;
8652- ip = me->module_core + me->arch.plt_offset +
8653+ ip = me->module_core_rx + me->arch.plt_offset +
8654 info->plt_offset;
8655 #ifndef CONFIG_64BIT
8656 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
8657@@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8658 val - loc + 0xffffUL < 0x1ffffeUL) ||
8659 (r_type == R_390_PLT32DBL &&
8660 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
8661- val = (Elf_Addr) me->module_core +
8662+ val = (Elf_Addr) me->module_core_rx +
8663 me->arch.plt_offset +
8664 info->plt_offset;
8665 val += rela->r_addend - loc;
8666@@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8667 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
8668 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
8669 val = val + rela->r_addend -
8670- ((Elf_Addr) me->module_core + me->arch.got_offset);
8671+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
8672 if (r_type == R_390_GOTOFF16)
8673 rc = apply_rela_bits(loc, val, 0, 16, 0);
8674 else if (r_type == R_390_GOTOFF32)
8675@@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
8676 break;
8677 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
8678 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
8679- val = (Elf_Addr) me->module_core + me->arch.got_offset +
8680+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
8681 rela->r_addend - loc;
8682 if (r_type == R_390_GOTPC)
8683 rc = apply_rela_bits(loc, val, 1, 32, 0);
8684diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
8685index c5dbb33..b41f4ee 100644
8686--- a/arch/s390/kernel/process.c
8687+++ b/arch/s390/kernel/process.c
8688@@ -237,39 +237,3 @@ unsigned long get_wchan(struct task_struct *p)
8689 }
8690 return 0;
8691 }
8692-
8693-unsigned long arch_align_stack(unsigned long sp)
8694-{
8695- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8696- sp -= get_random_int() & ~PAGE_MASK;
8697- return sp & ~0xf;
8698-}
8699-
8700-static inline unsigned long brk_rnd(void)
8701-{
8702- /* 8MB for 32bit, 1GB for 64bit */
8703- if (is_32bit_task())
8704- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
8705- else
8706- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
8707-}
8708-
8709-unsigned long arch_randomize_brk(struct mm_struct *mm)
8710-{
8711- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
8712-
8713- if (ret < mm->brk)
8714- return mm->brk;
8715- return ret;
8716-}
8717-
8718-unsigned long randomize_et_dyn(unsigned long base)
8719-{
8720- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8721-
8722- if (!(current->flags & PF_RANDOMIZE))
8723- return base;
8724- if (ret < base)
8725- return base;
8726- return ret;
8727-}
8728diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
8729index 4002329..99b67cb 100644
8730--- a/arch/s390/mm/mmap.c
8731+++ b/arch/s390/mm/mmap.c
8732@@ -90,9 +90,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8733 */
8734 if (mmap_is_legacy()) {
8735 mm->mmap_base = TASK_UNMAPPED_BASE;
8736+
8737+#ifdef CONFIG_PAX_RANDMMAP
8738+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8739+ mm->mmap_base += mm->delta_mmap;
8740+#endif
8741+
8742 mm->get_unmapped_area = arch_get_unmapped_area;
8743 } else {
8744 mm->mmap_base = mmap_base();
8745+
8746+#ifdef CONFIG_PAX_RANDMMAP
8747+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8748+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
8749+#endif
8750+
8751 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
8752 }
8753 }
8754@@ -173,9 +185,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8755 */
8756 if (mmap_is_legacy()) {
8757 mm->mmap_base = TASK_UNMAPPED_BASE;
8758+
8759+#ifdef CONFIG_PAX_RANDMMAP
8760+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8761+ mm->mmap_base += mm->delta_mmap;
8762+#endif
8763+
8764 mm->get_unmapped_area = s390_get_unmapped_area;
8765 } else {
8766 mm->mmap_base = mmap_base();
8767+
8768+#ifdef CONFIG_PAX_RANDMMAP
8769+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8770+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
8771+#endif
8772+
8773 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
8774 }
8775 }
8776diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
8777index ae3d59f..f65f075 100644
8778--- a/arch/score/include/asm/cache.h
8779+++ b/arch/score/include/asm/cache.h
8780@@ -1,7 +1,9 @@
8781 #ifndef _ASM_SCORE_CACHE_H
8782 #define _ASM_SCORE_CACHE_H
8783
8784+#include <linux/const.h>
8785+
8786 #define L1_CACHE_SHIFT 4
8787-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8788+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8789
8790 #endif /* _ASM_SCORE_CACHE_H */
8791diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
8792index f9f3cd5..58ff438 100644
8793--- a/arch/score/include/asm/exec.h
8794+++ b/arch/score/include/asm/exec.h
8795@@ -1,6 +1,6 @@
8796 #ifndef _ASM_SCORE_EXEC_H
8797 #define _ASM_SCORE_EXEC_H
8798
8799-extern unsigned long arch_align_stack(unsigned long sp);
8800+#define arch_align_stack(x) (x)
8801
8802 #endif /* _ASM_SCORE_EXEC_H */
8803diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
8804index a1519ad3..e8ac1ff 100644
8805--- a/arch/score/kernel/process.c
8806+++ b/arch/score/kernel/process.c
8807@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
8808
8809 return task_pt_regs(task)->cp0_epc;
8810 }
8811-
8812-unsigned long arch_align_stack(unsigned long sp)
8813-{
8814- return sp;
8815-}
8816diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
8817index ef9e555..331bd29 100644
8818--- a/arch/sh/include/asm/cache.h
8819+++ b/arch/sh/include/asm/cache.h
8820@@ -9,10 +9,11 @@
8821 #define __ASM_SH_CACHE_H
8822 #ifdef __KERNEL__
8823
8824+#include <linux/const.h>
8825 #include <linux/init.h>
8826 #include <cpu/cache.h>
8827
8828-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8829+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8830
8831 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
8832
8833diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
8834index 6777177..cb5e44f 100644
8835--- a/arch/sh/mm/mmap.c
8836+++ b/arch/sh/mm/mmap.c
8837@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
8838 struct mm_struct *mm = current->mm;
8839 struct vm_area_struct *vma;
8840 int do_colour_align;
8841+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
8842 struct vm_unmapped_area_info info;
8843
8844 if (flags & MAP_FIXED) {
8845@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
8846 if (filp || (flags & MAP_SHARED))
8847 do_colour_align = 1;
8848
8849+#ifdef CONFIG_PAX_RANDMMAP
8850+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8851+#endif
8852+
8853 if (addr) {
8854 if (do_colour_align)
8855 addr = COLOUR_ALIGN(addr, pgoff);
8856@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
8857 addr = PAGE_ALIGN(addr);
8858
8859 vma = find_vma(mm, addr);
8860- if (TASK_SIZE - len >= addr &&
8861- (!vma || addr + len <= vma->vm_start))
8862+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
8863 return addr;
8864 }
8865
8866 info.flags = 0;
8867 info.length = len;
8868- info.low_limit = TASK_UNMAPPED_BASE;
8869+ info.low_limit = mm->mmap_base;
8870 info.high_limit = TASK_SIZE;
8871 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
8872 info.align_offset = pgoff << PAGE_SHIFT;
8873@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8874 struct mm_struct *mm = current->mm;
8875 unsigned long addr = addr0;
8876 int do_colour_align;
8877+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
8878 struct vm_unmapped_area_info info;
8879
8880 if (flags & MAP_FIXED) {
8881@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8882 if (filp || (flags & MAP_SHARED))
8883 do_colour_align = 1;
8884
8885+#ifdef CONFIG_PAX_RANDMMAP
8886+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8887+#endif
8888+
8889 /* requesting a specific address */
8890 if (addr) {
8891 if (do_colour_align)
8892@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8893 addr = PAGE_ALIGN(addr);
8894
8895 vma = find_vma(mm, addr);
8896- if (TASK_SIZE - len >= addr &&
8897- (!vma || addr + len <= vma->vm_start))
8898+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
8899 return addr;
8900 }
8901
8902@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8903 VM_BUG_ON(addr != -ENOMEM);
8904 info.flags = 0;
8905 info.low_limit = TASK_UNMAPPED_BASE;
8906+
8907+#ifdef CONFIG_PAX_RANDMMAP
8908+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8909+ info.low_limit += mm->delta_mmap;
8910+#endif
8911+
8912 info.high_limit = TASK_SIZE;
8913 addr = vm_unmapped_area(&info);
8914 }
8915diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
8916index be56a24..443328f 100644
8917--- a/arch/sparc/include/asm/atomic_64.h
8918+++ b/arch/sparc/include/asm/atomic_64.h
8919@@ -14,18 +14,40 @@
8920 #define ATOMIC64_INIT(i) { (i) }
8921
8922 #define atomic_read(v) (*(volatile int *)&(v)->counter)
8923+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8924+{
8925+ return v->counter;
8926+}
8927 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
8928+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8929+{
8930+ return v->counter;
8931+}
8932
8933 #define atomic_set(v, i) (((v)->counter) = i)
8934+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8935+{
8936+ v->counter = i;
8937+}
8938 #define atomic64_set(v, i) (((v)->counter) = i)
8939+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8940+{
8941+ v->counter = i;
8942+}
8943
8944 extern void atomic_add(int, atomic_t *);
8945+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
8946 extern void atomic64_add(long, atomic64_t *);
8947+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
8948 extern void atomic_sub(int, atomic_t *);
8949+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
8950 extern void atomic64_sub(long, atomic64_t *);
8951+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
8952
8953 extern int atomic_add_ret(int, atomic_t *);
8954+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
8955 extern long atomic64_add_ret(long, atomic64_t *);
8956+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
8957 extern int atomic_sub_ret(int, atomic_t *);
8958 extern long atomic64_sub_ret(long, atomic64_t *);
8959
8960@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
8961 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
8962
8963 #define atomic_inc_return(v) atomic_add_ret(1, v)
8964+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
8965+{
8966+ return atomic_add_ret_unchecked(1, v);
8967+}
8968 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
8969+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8970+{
8971+ return atomic64_add_ret_unchecked(1, v);
8972+}
8973
8974 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
8975 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
8976
8977 #define atomic_add_return(i, v) atomic_add_ret(i, v)
8978+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8979+{
8980+ return atomic_add_ret_unchecked(i, v);
8981+}
8982 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
8983+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
8984+{
8985+ return atomic64_add_ret_unchecked(i, v);
8986+}
8987
8988 /*
8989 * atomic_inc_and_test - increment and test
8990@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
8991 * other cases.
8992 */
8993 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
8994+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
8995+{
8996+ return atomic_inc_return_unchecked(v) == 0;
8997+}
8998 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8999
9000 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
9001@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9002 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
9003
9004 #define atomic_inc(v) atomic_add(1, v)
9005+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9006+{
9007+ atomic_add_unchecked(1, v);
9008+}
9009 #define atomic64_inc(v) atomic64_add(1, v)
9010+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9011+{
9012+ atomic64_add_unchecked(1, v);
9013+}
9014
9015 #define atomic_dec(v) atomic_sub(1, v)
9016+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9017+{
9018+ atomic_sub_unchecked(1, v);
9019+}
9020 #define atomic64_dec(v) atomic64_sub(1, v)
9021+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9022+{
9023+ atomic64_sub_unchecked(1, v);
9024+}
9025
9026 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
9027 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
9028
9029 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9030+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9031+{
9032+ return cmpxchg(&v->counter, old, new);
9033+}
9034 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9035+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9036+{
9037+ return xchg(&v->counter, new);
9038+}
9039
9040 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9041 {
9042- int c, old;
9043+ int c, old, new;
9044 c = atomic_read(v);
9045 for (;;) {
9046- if (unlikely(c == (u)))
9047+ if (unlikely(c == u))
9048 break;
9049- old = atomic_cmpxchg((v), c, c + (a));
9050+
9051+ asm volatile("addcc %2, %0, %0\n"
9052+
9053+#ifdef CONFIG_PAX_REFCOUNT
9054+ "tvs %%icc, 6\n"
9055+#endif
9056+
9057+ : "=r" (new)
9058+ : "0" (c), "ir" (a)
9059+ : "cc");
9060+
9061+ old = atomic_cmpxchg(v, c, new);
9062 if (likely(old == c))
9063 break;
9064 c = old;
9065@@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9066 #define atomic64_cmpxchg(v, o, n) \
9067 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9068 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9069+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9070+{
9071+ return xchg(&v->counter, new);
9072+}
9073
9074 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
9075 {
9076- long c, old;
9077+ long c, old, new;
9078 c = atomic64_read(v);
9079 for (;;) {
9080- if (unlikely(c == (u)))
9081+ if (unlikely(c == u))
9082 break;
9083- old = atomic64_cmpxchg((v), c, c + (a));
9084+
9085+ asm volatile("addcc %2, %0, %0\n"
9086+
9087+#ifdef CONFIG_PAX_REFCOUNT
9088+ "tvs %%xcc, 6\n"
9089+#endif
9090+
9091+ : "=r" (new)
9092+ : "0" (c), "ir" (a)
9093+ : "cc");
9094+
9095+ old = atomic64_cmpxchg(v, c, new);
9096 if (likely(old == c))
9097 break;
9098 c = old;
9099 }
9100- return c != (u);
9101+ return c != u;
9102 }
9103
9104 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9105diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
9106index 5bb6991..5c2132e 100644
9107--- a/arch/sparc/include/asm/cache.h
9108+++ b/arch/sparc/include/asm/cache.h
9109@@ -7,10 +7,12 @@
9110 #ifndef _SPARC_CACHE_H
9111 #define _SPARC_CACHE_H
9112
9113+#include <linux/const.h>
9114+
9115 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
9116
9117 #define L1_CACHE_SHIFT 5
9118-#define L1_CACHE_BYTES 32
9119+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9120
9121 #ifdef CONFIG_SPARC32
9122 #define SMP_CACHE_BYTES_SHIFT 5
9123diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
9124index a24e41f..47677ff 100644
9125--- a/arch/sparc/include/asm/elf_32.h
9126+++ b/arch/sparc/include/asm/elf_32.h
9127@@ -114,6 +114,13 @@ typedef struct {
9128
9129 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
9130
9131+#ifdef CONFIG_PAX_ASLR
9132+#define PAX_ELF_ET_DYN_BASE 0x10000UL
9133+
9134+#define PAX_DELTA_MMAP_LEN 16
9135+#define PAX_DELTA_STACK_LEN 16
9136+#endif
9137+
9138 /* This yields a mask that user programs can use to figure out what
9139 instruction set this cpu supports. This can NOT be done in userspace
9140 on Sparc. */
9141diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
9142index 370ca1e..d4f4a98 100644
9143--- a/arch/sparc/include/asm/elf_64.h
9144+++ b/arch/sparc/include/asm/elf_64.h
9145@@ -189,6 +189,13 @@ typedef struct {
9146 #define ELF_ET_DYN_BASE 0x0000010000000000UL
9147 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
9148
9149+#ifdef CONFIG_PAX_ASLR
9150+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
9151+
9152+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
9153+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
9154+#endif
9155+
9156 extern unsigned long sparc64_elf_hwcap;
9157 #define ELF_HWCAP sparc64_elf_hwcap
9158
9159diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
9160index 9b1c36d..209298b 100644
9161--- a/arch/sparc/include/asm/pgalloc_32.h
9162+++ b/arch/sparc/include/asm/pgalloc_32.h
9163@@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
9164 }
9165
9166 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
9167+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
9168
9169 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
9170 unsigned long address)
9171diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
9172index bcfe063..b333142 100644
9173--- a/arch/sparc/include/asm/pgalloc_64.h
9174+++ b/arch/sparc/include/asm/pgalloc_64.h
9175@@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
9176 }
9177
9178 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
9179+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
9180
9181 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
9182 {
9183diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
9184index 502f632..da1917f 100644
9185--- a/arch/sparc/include/asm/pgtable_32.h
9186+++ b/arch/sparc/include/asm/pgtable_32.h
9187@@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
9188 #define PAGE_SHARED SRMMU_PAGE_SHARED
9189 #define PAGE_COPY SRMMU_PAGE_COPY
9190 #define PAGE_READONLY SRMMU_PAGE_RDONLY
9191+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
9192+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
9193+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
9194 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
9195
9196 /* Top-level page directory - dummy used by init-mm.
9197@@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
9198
9199 /* xwr */
9200 #define __P000 PAGE_NONE
9201-#define __P001 PAGE_READONLY
9202-#define __P010 PAGE_COPY
9203-#define __P011 PAGE_COPY
9204+#define __P001 PAGE_READONLY_NOEXEC
9205+#define __P010 PAGE_COPY_NOEXEC
9206+#define __P011 PAGE_COPY_NOEXEC
9207 #define __P100 PAGE_READONLY
9208 #define __P101 PAGE_READONLY
9209 #define __P110 PAGE_COPY
9210 #define __P111 PAGE_COPY
9211
9212 #define __S000 PAGE_NONE
9213-#define __S001 PAGE_READONLY
9214-#define __S010 PAGE_SHARED
9215-#define __S011 PAGE_SHARED
9216+#define __S001 PAGE_READONLY_NOEXEC
9217+#define __S010 PAGE_SHARED_NOEXEC
9218+#define __S011 PAGE_SHARED_NOEXEC
9219 #define __S100 PAGE_READONLY
9220 #define __S101 PAGE_READONLY
9221 #define __S110 PAGE_SHARED
9222diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
9223index 79da178..c2eede8 100644
9224--- a/arch/sparc/include/asm/pgtsrmmu.h
9225+++ b/arch/sparc/include/asm/pgtsrmmu.h
9226@@ -115,6 +115,11 @@
9227 SRMMU_EXEC | SRMMU_REF)
9228 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
9229 SRMMU_EXEC | SRMMU_REF)
9230+
9231+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
9232+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9233+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9234+
9235 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
9236 SRMMU_DIRTY | SRMMU_REF)
9237
9238diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
9239index 9689176..63c18ea 100644
9240--- a/arch/sparc/include/asm/spinlock_64.h
9241+++ b/arch/sparc/include/asm/spinlock_64.h
9242@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
9243
9244 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
9245
9246-static void inline arch_read_lock(arch_rwlock_t *lock)
9247+static inline void arch_read_lock(arch_rwlock_t *lock)
9248 {
9249 unsigned long tmp1, tmp2;
9250
9251 __asm__ __volatile__ (
9252 "1: ldsw [%2], %0\n"
9253 " brlz,pn %0, 2f\n"
9254-"4: add %0, 1, %1\n"
9255+"4: addcc %0, 1, %1\n"
9256+
9257+#ifdef CONFIG_PAX_REFCOUNT
9258+" tvs %%icc, 6\n"
9259+#endif
9260+
9261 " cas [%2], %0, %1\n"
9262 " cmp %0, %1\n"
9263 " bne,pn %%icc, 1b\n"
9264@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
9265 " .previous"
9266 : "=&r" (tmp1), "=&r" (tmp2)
9267 : "r" (lock)
9268- : "memory");
9269+ : "memory", "cc");
9270 }
9271
9272-static int inline arch_read_trylock(arch_rwlock_t *lock)
9273+static inline int arch_read_trylock(arch_rwlock_t *lock)
9274 {
9275 int tmp1, tmp2;
9276
9277@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9278 "1: ldsw [%2], %0\n"
9279 " brlz,a,pn %0, 2f\n"
9280 " mov 0, %0\n"
9281-" add %0, 1, %1\n"
9282+" addcc %0, 1, %1\n"
9283+
9284+#ifdef CONFIG_PAX_REFCOUNT
9285+" tvs %%icc, 6\n"
9286+#endif
9287+
9288 " cas [%2], %0, %1\n"
9289 " cmp %0, %1\n"
9290 " bne,pn %%icc, 1b\n"
9291@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9292 return tmp1;
9293 }
9294
9295-static void inline arch_read_unlock(arch_rwlock_t *lock)
9296+static inline void arch_read_unlock(arch_rwlock_t *lock)
9297 {
9298 unsigned long tmp1, tmp2;
9299
9300 __asm__ __volatile__(
9301 "1: lduw [%2], %0\n"
9302-" sub %0, 1, %1\n"
9303+" subcc %0, 1, %1\n"
9304+
9305+#ifdef CONFIG_PAX_REFCOUNT
9306+" tvs %%icc, 6\n"
9307+#endif
9308+
9309 " cas [%2], %0, %1\n"
9310 " cmp %0, %1\n"
9311 " bne,pn %%xcc, 1b\n"
9312@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
9313 : "memory");
9314 }
9315
9316-static void inline arch_write_lock(arch_rwlock_t *lock)
9317+static inline void arch_write_lock(arch_rwlock_t *lock)
9318 {
9319 unsigned long mask, tmp1, tmp2;
9320
9321@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
9322 : "memory");
9323 }
9324
9325-static void inline arch_write_unlock(arch_rwlock_t *lock)
9326+static inline void arch_write_unlock(arch_rwlock_t *lock)
9327 {
9328 __asm__ __volatile__(
9329 " stw %%g0, [%0]"
9330@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
9331 : "memory");
9332 }
9333
9334-static int inline arch_write_trylock(arch_rwlock_t *lock)
9335+static inline int arch_write_trylock(arch_rwlock_t *lock)
9336 {
9337 unsigned long mask, tmp1, tmp2, result;
9338
9339diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
9340index dd38075..e7cac83 100644
9341--- a/arch/sparc/include/asm/thread_info_32.h
9342+++ b/arch/sparc/include/asm/thread_info_32.h
9343@@ -49,6 +49,8 @@ struct thread_info {
9344 unsigned long w_saved;
9345
9346 struct restart_block restart_block;
9347+
9348+ unsigned long lowest_stack;
9349 };
9350
9351 /*
9352diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
9353index d5e5042..9bfee76 100644
9354--- a/arch/sparc/include/asm/thread_info_64.h
9355+++ b/arch/sparc/include/asm/thread_info_64.h
9356@@ -63,6 +63,8 @@ struct thread_info {
9357 struct pt_regs *kern_una_regs;
9358 unsigned int kern_una_insn;
9359
9360+ unsigned long lowest_stack;
9361+
9362 unsigned long fpregs[0] __attribute__ ((aligned(64)));
9363 };
9364
9365@@ -192,10 +194,11 @@ register struct thread_info *current_thread_info_reg asm("g6");
9366 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
9367 /* flag bit 6 is available */
9368 #define TIF_32BIT 7 /* 32-bit binary */
9369-/* flag bit 8 is available */
9370+#define TIF_GRSEC_SETXID 8 /* update credentials on syscall entry/exit */
9371 #define TIF_SECCOMP 9 /* secure computing */
9372 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
9373 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
9374+
9375 /* NOTE: Thread flags >= 12 should be ones we have no interest
9376 * in using in assembly, else we can't use the mask as
9377 * an immediate value in instructions such as andcc.
9378@@ -214,12 +217,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
9379 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
9380 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
9381 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
9382+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
9383
9384 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
9385 _TIF_DO_NOTIFY_RESUME_MASK | \
9386 _TIF_NEED_RESCHED)
9387 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
9388
9389+#define _TIF_WORK_SYSCALL \
9390+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
9391+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
9392+
9393+
9394 /*
9395 * Thread-synchronous status.
9396 *
9397diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
9398index 0167d26..767bb0c 100644
9399--- a/arch/sparc/include/asm/uaccess.h
9400+++ b/arch/sparc/include/asm/uaccess.h
9401@@ -1,5 +1,6 @@
9402 #ifndef ___ASM_SPARC_UACCESS_H
9403 #define ___ASM_SPARC_UACCESS_H
9404+
9405 #if defined(__sparc__) && defined(__arch64__)
9406 #include <asm/uaccess_64.h>
9407 #else
9408diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
9409index 53a28dd..50c38c3 100644
9410--- a/arch/sparc/include/asm/uaccess_32.h
9411+++ b/arch/sparc/include/asm/uaccess_32.h
9412@@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
9413
9414 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9415 {
9416- if (n && __access_ok((unsigned long) to, n))
9417+ if ((long)n < 0)
9418+ return n;
9419+
9420+ if (n && __access_ok((unsigned long) to, n)) {
9421+ if (!__builtin_constant_p(n))
9422+ check_object_size(from, n, true);
9423 return __copy_user(to, (__force void __user *) from, n);
9424- else
9425+ } else
9426 return n;
9427 }
9428
9429 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
9430 {
9431+ if ((long)n < 0)
9432+ return n;
9433+
9434+ if (!__builtin_constant_p(n))
9435+ check_object_size(from, n, true);
9436+
9437 return __copy_user(to, (__force void __user *) from, n);
9438 }
9439
9440 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9441 {
9442- if (n && __access_ok((unsigned long) from, n))
9443+ if ((long)n < 0)
9444+ return n;
9445+
9446+ if (n && __access_ok((unsigned long) from, n)) {
9447+ if (!__builtin_constant_p(n))
9448+ check_object_size(to, n, false);
9449 return __copy_user((__force void __user *) to, from, n);
9450- else
9451+ } else
9452 return n;
9453 }
9454
9455 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
9456 {
9457+ if ((long)n < 0)
9458+ return n;
9459+
9460 return __copy_user((__force void __user *) to, from, n);
9461 }
9462
9463diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
9464index e562d3c..191f176 100644
9465--- a/arch/sparc/include/asm/uaccess_64.h
9466+++ b/arch/sparc/include/asm/uaccess_64.h
9467@@ -10,6 +10,7 @@
9468 #include <linux/compiler.h>
9469 #include <linux/string.h>
9470 #include <linux/thread_info.h>
9471+#include <linux/kernel.h>
9472 #include <asm/asi.h>
9473 #include <asm/spitfire.h>
9474 #include <asm-generic/uaccess-unaligned.h>
9475@@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
9476 static inline unsigned long __must_check
9477 copy_from_user(void *to, const void __user *from, unsigned long size)
9478 {
9479- unsigned long ret = ___copy_from_user(to, from, size);
9480+ unsigned long ret;
9481
9482+ if ((long)size < 0 || size > INT_MAX)
9483+ return size;
9484+
9485+ if (!__builtin_constant_p(size))
9486+ check_object_size(to, size, false);
9487+
9488+ ret = ___copy_from_user(to, from, size);
9489 if (unlikely(ret))
9490 ret = copy_from_user_fixup(to, from, size);
9491
9492@@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
9493 static inline unsigned long __must_check
9494 copy_to_user(void __user *to, const void *from, unsigned long size)
9495 {
9496- unsigned long ret = ___copy_to_user(to, from, size);
9497+ unsigned long ret;
9498
9499+ if ((long)size < 0 || size > INT_MAX)
9500+ return size;
9501+
9502+ if (!__builtin_constant_p(size))
9503+ check_object_size(from, size, true);
9504+
9505+ ret = ___copy_to_user(to, from, size);
9506 if (unlikely(ret))
9507 ret = copy_to_user_fixup(to, from, size);
9508 return ret;
9509diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
9510index d15cc17..d0ae796 100644
9511--- a/arch/sparc/kernel/Makefile
9512+++ b/arch/sparc/kernel/Makefile
9513@@ -4,7 +4,7 @@
9514 #
9515
9516 asflags-y := -ansi
9517-ccflags-y := -Werror
9518+#ccflags-y := -Werror
9519
9520 extra-y := head_$(BITS).o
9521
9522diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
9523index fdd819d..5af08c8 100644
9524--- a/arch/sparc/kernel/process_32.c
9525+++ b/arch/sparc/kernel/process_32.c
9526@@ -116,14 +116,14 @@ void show_regs(struct pt_regs *r)
9527
9528 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
9529 r->psr, r->pc, r->npc, r->y, print_tainted());
9530- printk("PC: <%pS>\n", (void *) r->pc);
9531+ printk("PC: <%pA>\n", (void *) r->pc);
9532 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
9533 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
9534 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
9535 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
9536 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
9537 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
9538- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
9539+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
9540
9541 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
9542 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
9543@@ -160,7 +160,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
9544 rw = (struct reg_window32 *) fp;
9545 pc = rw->ins[7];
9546 printk("[%08lx : ", pc);
9547- printk("%pS ] ", (void *) pc);
9548+ printk("%pA ] ", (void *) pc);
9549 fp = rw->ins[6];
9550 } while (++count < 16);
9551 printk("\n");
9552diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
9553index baebab2..9cd13b1 100644
9554--- a/arch/sparc/kernel/process_64.c
9555+++ b/arch/sparc/kernel/process_64.c
9556@@ -158,7 +158,7 @@ static void show_regwindow(struct pt_regs *regs)
9557 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
9558 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
9559 if (regs->tstate & TSTATE_PRIV)
9560- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
9561+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
9562 }
9563
9564 void show_regs(struct pt_regs *regs)
9565@@ -167,7 +167,7 @@ void show_regs(struct pt_regs *regs)
9566
9567 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
9568 regs->tpc, regs->tnpc, regs->y, print_tainted());
9569- printk("TPC: <%pS>\n", (void *) regs->tpc);
9570+ printk("TPC: <%pA>\n", (void *) regs->tpc);
9571 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
9572 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
9573 regs->u_regs[3]);
9574@@ -180,7 +180,7 @@ void show_regs(struct pt_regs *regs)
9575 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
9576 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
9577 regs->u_regs[15]);
9578- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
9579+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
9580 show_regwindow(regs);
9581 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
9582 }
9583@@ -269,7 +269,7 @@ void arch_trigger_all_cpu_backtrace(void)
9584 ((tp && tp->task) ? tp->task->pid : -1));
9585
9586 if (gp->tstate & TSTATE_PRIV) {
9587- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
9588+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
9589 (void *) gp->tpc,
9590 (void *) gp->o7,
9591 (void *) gp->i7,
9592diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
9593index 79cc0d1..ec62734 100644
9594--- a/arch/sparc/kernel/prom_common.c
9595+++ b/arch/sparc/kernel/prom_common.c
9596@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
9597
9598 unsigned int prom_early_allocated __initdata;
9599
9600-static struct of_pdt_ops prom_sparc_ops __initdata = {
9601+static struct of_pdt_ops prom_sparc_ops __initconst = {
9602 .nextprop = prom_common_nextprop,
9603 .getproplen = prom_getproplen,
9604 .getproperty = prom_getproperty,
9605diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
9606index 773c1f2..a8bdd87 100644
9607--- a/arch/sparc/kernel/ptrace_64.c
9608+++ b/arch/sparc/kernel/ptrace_64.c
9609@@ -1059,6 +1059,10 @@ long arch_ptrace(struct task_struct *child, long request,
9610 return ret;
9611 }
9612
9613+#ifdef CONFIG_GRKERNSEC_SETXID
9614+extern void gr_delayed_cred_worker(void);
9615+#endif
9616+
9617 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
9618 {
9619 int ret = 0;
9620@@ -1066,6 +1070,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
9621 /* do the secure computing check first */
9622 secure_computing_strict(regs->u_regs[UREG_G1]);
9623
9624+#ifdef CONFIG_GRKERNSEC_SETXID
9625+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9626+ gr_delayed_cred_worker();
9627+#endif
9628+
9629 if (test_thread_flag(TIF_SYSCALL_TRACE))
9630 ret = tracehook_report_syscall_entry(regs);
9631
9632@@ -1086,6 +1095,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
9633
9634 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
9635 {
9636+#ifdef CONFIG_GRKERNSEC_SETXID
9637+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9638+ gr_delayed_cred_worker();
9639+#endif
9640+
9641 audit_syscall_exit(regs);
9642
9643 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9644diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
9645index e142545..fd29654 100644
9646--- a/arch/sparc/kernel/smp_64.c
9647+++ b/arch/sparc/kernel/smp_64.c
9648@@ -869,8 +869,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
9649 extern unsigned long xcall_flush_dcache_page_spitfire;
9650
9651 #ifdef CONFIG_DEBUG_DCFLUSH
9652-extern atomic_t dcpage_flushes;
9653-extern atomic_t dcpage_flushes_xcall;
9654+extern atomic_unchecked_t dcpage_flushes;
9655+extern atomic_unchecked_t dcpage_flushes_xcall;
9656 #endif
9657
9658 static inline void __local_flush_dcache_page(struct page *page)
9659@@ -894,7 +894,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
9660 return;
9661
9662 #ifdef CONFIG_DEBUG_DCFLUSH
9663- atomic_inc(&dcpage_flushes);
9664+ atomic_inc_unchecked(&dcpage_flushes);
9665 #endif
9666
9667 this_cpu = get_cpu();
9668@@ -918,7 +918,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
9669 xcall_deliver(data0, __pa(pg_addr),
9670 (u64) pg_addr, cpumask_of(cpu));
9671 #ifdef CONFIG_DEBUG_DCFLUSH
9672- atomic_inc(&dcpage_flushes_xcall);
9673+ atomic_inc_unchecked(&dcpage_flushes_xcall);
9674 #endif
9675 }
9676 }
9677@@ -937,7 +937,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
9678 preempt_disable();
9679
9680 #ifdef CONFIG_DEBUG_DCFLUSH
9681- atomic_inc(&dcpage_flushes);
9682+ atomic_inc_unchecked(&dcpage_flushes);
9683 #endif
9684 data0 = 0;
9685 pg_addr = page_address(page);
9686@@ -954,7 +954,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
9687 xcall_deliver(data0, __pa(pg_addr),
9688 (u64) pg_addr, cpu_online_mask);
9689 #ifdef CONFIG_DEBUG_DCFLUSH
9690- atomic_inc(&dcpage_flushes_xcall);
9691+ atomic_inc_unchecked(&dcpage_flushes_xcall);
9692 #endif
9693 }
9694 __local_flush_dcache_page(page);
9695diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
9696index 3a8d184..49498a8 100644
9697--- a/arch/sparc/kernel/sys_sparc_32.c
9698+++ b/arch/sparc/kernel/sys_sparc_32.c
9699@@ -52,7 +52,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
9700 if (len > TASK_SIZE - PAGE_SIZE)
9701 return -ENOMEM;
9702 if (!addr)
9703- addr = TASK_UNMAPPED_BASE;
9704+ addr = current->mm->mmap_base;
9705
9706 info.flags = 0;
9707 info.length = len;
9708diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
9709index 51561b8..8256764 100644
9710--- a/arch/sparc/kernel/sys_sparc_64.c
9711+++ b/arch/sparc/kernel/sys_sparc_64.c
9712@@ -90,13 +90,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
9713 struct vm_area_struct * vma;
9714 unsigned long task_size = TASK_SIZE;
9715 int do_color_align;
9716+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9717 struct vm_unmapped_area_info info;
9718
9719 if (flags & MAP_FIXED) {
9720 /* We do not accept a shared mapping if it would violate
9721 * cache aliasing constraints.
9722 */
9723- if ((flags & MAP_SHARED) &&
9724+ if ((filp || (flags & MAP_SHARED)) &&
9725 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
9726 return -EINVAL;
9727 return addr;
9728@@ -111,6 +112,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
9729 if (filp || (flags & MAP_SHARED))
9730 do_color_align = 1;
9731
9732+#ifdef CONFIG_PAX_RANDMMAP
9733+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9734+#endif
9735+
9736 if (addr) {
9737 if (do_color_align)
9738 addr = COLOR_ALIGN(addr, pgoff);
9739@@ -118,22 +123,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
9740 addr = PAGE_ALIGN(addr);
9741
9742 vma = find_vma(mm, addr);
9743- if (task_size - len >= addr &&
9744- (!vma || addr + len <= vma->vm_start))
9745+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9746 return addr;
9747 }
9748
9749 info.flags = 0;
9750 info.length = len;
9751- info.low_limit = TASK_UNMAPPED_BASE;
9752+ info.low_limit = mm->mmap_base;
9753 info.high_limit = min(task_size, VA_EXCLUDE_START);
9754 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
9755 info.align_offset = pgoff << PAGE_SHIFT;
9756+ info.threadstack_offset = offset;
9757 addr = vm_unmapped_area(&info);
9758
9759 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
9760 VM_BUG_ON(addr != -ENOMEM);
9761 info.low_limit = VA_EXCLUDE_END;
9762+
9763+#ifdef CONFIG_PAX_RANDMMAP
9764+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9765+ info.low_limit += mm->delta_mmap;
9766+#endif
9767+
9768 info.high_limit = task_size;
9769 addr = vm_unmapped_area(&info);
9770 }
9771@@ -151,6 +162,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9772 unsigned long task_size = STACK_TOP32;
9773 unsigned long addr = addr0;
9774 int do_color_align;
9775+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9776 struct vm_unmapped_area_info info;
9777
9778 /* This should only ever run for 32-bit processes. */
9779@@ -160,7 +172,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9780 /* We do not accept a shared mapping if it would violate
9781 * cache aliasing constraints.
9782 */
9783- if ((flags & MAP_SHARED) &&
9784+ if ((filp || (flags & MAP_SHARED)) &&
9785 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
9786 return -EINVAL;
9787 return addr;
9788@@ -173,6 +185,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9789 if (filp || (flags & MAP_SHARED))
9790 do_color_align = 1;
9791
9792+#ifdef CONFIG_PAX_RANDMMAP
9793+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9794+#endif
9795+
9796 /* requesting a specific address */
9797 if (addr) {
9798 if (do_color_align)
9799@@ -181,8 +197,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9800 addr = PAGE_ALIGN(addr);
9801
9802 vma = find_vma(mm, addr);
9803- if (task_size - len >= addr &&
9804- (!vma || addr + len <= vma->vm_start))
9805+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9806 return addr;
9807 }
9808
9809@@ -192,6 +207,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9810 info.high_limit = mm->mmap_base;
9811 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
9812 info.align_offset = pgoff << PAGE_SHIFT;
9813+ info.threadstack_offset = offset;
9814 addr = vm_unmapped_area(&info);
9815
9816 /*
9817@@ -204,6 +220,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9818 VM_BUG_ON(addr != -ENOMEM);
9819 info.flags = 0;
9820 info.low_limit = TASK_UNMAPPED_BASE;
9821+
9822+#ifdef CONFIG_PAX_RANDMMAP
9823+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9824+ info.low_limit += mm->delta_mmap;
9825+#endif
9826+
9827 info.high_limit = STACK_TOP32;
9828 addr = vm_unmapped_area(&info);
9829 }
9830@@ -260,10 +282,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
9831 EXPORT_SYMBOL(get_fb_unmapped_area);
9832
9833 /* Essentially the same as PowerPC. */
9834-static unsigned long mmap_rnd(void)
9835+static unsigned long mmap_rnd(struct mm_struct *mm)
9836 {
9837 unsigned long rnd = 0UL;
9838
9839+#ifdef CONFIG_PAX_RANDMMAP
9840+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9841+#endif
9842+
9843 if (current->flags & PF_RANDOMIZE) {
9844 unsigned long val = get_random_int();
9845 if (test_thread_flag(TIF_32BIT))
9846@@ -276,7 +302,7 @@ static unsigned long mmap_rnd(void)
9847
9848 void arch_pick_mmap_layout(struct mm_struct *mm)
9849 {
9850- unsigned long random_factor = mmap_rnd();
9851+ unsigned long random_factor = mmap_rnd(mm);
9852 unsigned long gap;
9853
9854 /*
9855@@ -289,6 +315,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9856 gap == RLIM_INFINITY ||
9857 sysctl_legacy_va_layout) {
9858 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
9859+
9860+#ifdef CONFIG_PAX_RANDMMAP
9861+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9862+ mm->mmap_base += mm->delta_mmap;
9863+#endif
9864+
9865 mm->get_unmapped_area = arch_get_unmapped_area;
9866 } else {
9867 /* We know it's 32-bit */
9868@@ -300,6 +332,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9869 gap = (task_size / 6 * 5);
9870
9871 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
9872+
9873+#ifdef CONFIG_PAX_RANDMMAP
9874+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9875+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9876+#endif
9877+
9878 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9879 }
9880 }
9881diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
9882index d950197..192f9d8 100644
9883--- a/arch/sparc/kernel/syscalls.S
9884+++ b/arch/sparc/kernel/syscalls.S
9885@@ -52,7 +52,7 @@ sys32_rt_sigreturn:
9886 #endif
9887 .align 32
9888 1: ldx [%g6 + TI_FLAGS], %l5
9889- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
9890+ andcc %l5, _TIF_WORK_SYSCALL, %g0
9891 be,pt %icc, rtrap
9892 nop
9893 call syscall_trace_leave
9894@@ -184,7 +184,7 @@ linux_sparc_syscall32:
9895
9896 srl %i3, 0, %o3 ! IEU0
9897 srl %i2, 0, %o2 ! IEU0 Group
9898- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
9899+ andcc %l0, _TIF_WORK_SYSCALL, %g0
9900 bne,pn %icc, linux_syscall_trace32 ! CTI
9901 mov %i0, %l5 ! IEU1
9902 5: call %l7 ! CTI Group brk forced
9903@@ -207,7 +207,7 @@ linux_sparc_syscall:
9904
9905 mov %i3, %o3 ! IEU1
9906 mov %i4, %o4 ! IEU0 Group
9907- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
9908+ andcc %l0, _TIF_WORK_SYSCALL, %g0
9909 bne,pn %icc, linux_syscall_trace ! CTI Group
9910 mov %i0, %l5 ! IEU0
9911 2: call %l7 ! CTI Group brk forced
9912@@ -223,7 +223,7 @@ ret_sys_call:
9913
9914 cmp %o0, -ERESTART_RESTARTBLOCK
9915 bgeu,pn %xcc, 1f
9916- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
9917+ andcc %l0, _TIF_WORK_SYSCALL, %g0
9918 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
9919
9920 2:
9921diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
9922index 6629829..036032d 100644
9923--- a/arch/sparc/kernel/traps_32.c
9924+++ b/arch/sparc/kernel/traps_32.c
9925@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
9926 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
9927 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
9928
9929+extern void gr_handle_kernel_exploit(void);
9930+
9931 void die_if_kernel(char *str, struct pt_regs *regs)
9932 {
9933 static int die_counter;
9934@@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
9935 count++ < 30 &&
9936 (((unsigned long) rw) >= PAGE_OFFSET) &&
9937 !(((unsigned long) rw) & 0x7)) {
9938- printk("Caller[%08lx]: %pS\n", rw->ins[7],
9939+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
9940 (void *) rw->ins[7]);
9941 rw = (struct reg_window32 *)rw->ins[6];
9942 }
9943 }
9944 printk("Instruction DUMP:");
9945 instruction_dump ((unsigned long *) regs->pc);
9946- if(regs->psr & PSR_PS)
9947+ if(regs->psr & PSR_PS) {
9948+ gr_handle_kernel_exploit();
9949 do_exit(SIGKILL);
9950+ }
9951 do_exit(SIGSEGV);
9952 }
9953
9954diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
9955index b3f833a..f485f80 100644
9956--- a/arch/sparc/kernel/traps_64.c
9957+++ b/arch/sparc/kernel/traps_64.c
9958@@ -76,7 +76,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
9959 i + 1,
9960 p->trapstack[i].tstate, p->trapstack[i].tpc,
9961 p->trapstack[i].tnpc, p->trapstack[i].tt);
9962- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
9963+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
9964 }
9965 }
9966
9967@@ -96,6 +96,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
9968
9969 lvl -= 0x100;
9970 if (regs->tstate & TSTATE_PRIV) {
9971+
9972+#ifdef CONFIG_PAX_REFCOUNT
9973+ if (lvl == 6)
9974+ pax_report_refcount_overflow(regs);
9975+#endif
9976+
9977 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
9978 die_if_kernel(buffer, regs);
9979 }
9980@@ -114,11 +120,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
9981 void bad_trap_tl1(struct pt_regs *regs, long lvl)
9982 {
9983 char buffer[32];
9984-
9985+
9986 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
9987 0, lvl, SIGTRAP) == NOTIFY_STOP)
9988 return;
9989
9990+#ifdef CONFIG_PAX_REFCOUNT
9991+ if (lvl == 6)
9992+ pax_report_refcount_overflow(regs);
9993+#endif
9994+
9995 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
9996
9997 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
9998@@ -1142,7 +1153,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
9999 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10000 printk("%s" "ERROR(%d): ",
10001 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10002- printk("TPC<%pS>\n", (void *) regs->tpc);
10003+ printk("TPC<%pA>\n", (void *) regs->tpc);
10004 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10005 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10006 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10007@@ -1749,7 +1760,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10008 smp_processor_id(),
10009 (type & 0x1) ? 'I' : 'D',
10010 regs->tpc);
10011- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10012+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10013 panic("Irrecoverable Cheetah+ parity error.");
10014 }
10015
10016@@ -1757,7 +1768,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10017 smp_processor_id(),
10018 (type & 0x1) ? 'I' : 'D',
10019 regs->tpc);
10020- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
10021+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
10022 }
10023
10024 struct sun4v_error_entry {
10025@@ -1830,8 +1841,8 @@ struct sun4v_error_entry {
10026 /*0x38*/u64 reserved_5;
10027 };
10028
10029-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10030-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10031+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10032+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10033
10034 static const char *sun4v_err_type_to_str(u8 type)
10035 {
10036@@ -1923,7 +1934,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
10037 }
10038
10039 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10040- int cpu, const char *pfx, atomic_t *ocnt)
10041+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
10042 {
10043 u64 *raw_ptr = (u64 *) ent;
10044 u32 attrs;
10045@@ -1981,8 +1992,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10046
10047 show_regs(regs);
10048
10049- if ((cnt = atomic_read(ocnt)) != 0) {
10050- atomic_set(ocnt, 0);
10051+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
10052+ atomic_set_unchecked(ocnt, 0);
10053 wmb();
10054 printk("%s: Queue overflowed %d times.\n",
10055 pfx, cnt);
10056@@ -2036,7 +2047,7 @@ void sun4v_resum_error(struct pt_regs *regs, unsigned long offset)
10057 */
10058 void sun4v_resum_overflow(struct pt_regs *regs)
10059 {
10060- atomic_inc(&sun4v_resum_oflow_cnt);
10061+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
10062 }
10063
10064 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
10065@@ -2089,7 +2100,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
10066 /* XXX Actually even this can make not that much sense. Perhaps
10067 * XXX we should just pull the plug and panic directly from here?
10068 */
10069- atomic_inc(&sun4v_nonresum_oflow_cnt);
10070+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
10071 }
10072
10073 unsigned long sun4v_err_itlb_vaddr;
10074@@ -2104,9 +2115,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
10075
10076 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
10077 regs->tpc, tl);
10078- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
10079+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
10080 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10081- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
10082+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
10083 (void *) regs->u_regs[UREG_I7]);
10084 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
10085 "pte[%lx] error[%lx]\n",
10086@@ -2128,9 +2139,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
10087
10088 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
10089 regs->tpc, tl);
10090- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
10091+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
10092 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10093- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
10094+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
10095 (void *) regs->u_regs[UREG_I7]);
10096 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
10097 "pte[%lx] error[%lx]\n",
10098@@ -2336,13 +2347,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10099 fp = (unsigned long)sf->fp + STACK_BIAS;
10100 }
10101
10102- printk(" [%016lx] %pS\n", pc, (void *) pc);
10103+ printk(" [%016lx] %pA\n", pc, (void *) pc);
10104 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
10105 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
10106 int index = tsk->curr_ret_stack;
10107 if (tsk->ret_stack && index >= graph) {
10108 pc = tsk->ret_stack[index - graph].ret;
10109- printk(" [%016lx] %pS\n", pc, (void *) pc);
10110+ printk(" [%016lx] %pA\n", pc, (void *) pc);
10111 graph++;
10112 }
10113 }
10114@@ -2360,6 +2371,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
10115 return (struct reg_window *) (fp + STACK_BIAS);
10116 }
10117
10118+extern void gr_handle_kernel_exploit(void);
10119+
10120 void die_if_kernel(char *str, struct pt_regs *regs)
10121 {
10122 static int die_counter;
10123@@ -2388,7 +2401,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10124 while (rw &&
10125 count++ < 30 &&
10126 kstack_valid(tp, (unsigned long) rw)) {
10127- printk("Caller[%016lx]: %pS\n", rw->ins[7],
10128+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
10129 (void *) rw->ins[7]);
10130
10131 rw = kernel_stack_up(rw);
10132@@ -2401,8 +2414,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10133 }
10134 user_instruction_dump ((unsigned int __user *) regs->tpc);
10135 }
10136- if (regs->tstate & TSTATE_PRIV)
10137+ if (regs->tstate & TSTATE_PRIV) {
10138+ gr_handle_kernel_exploit();
10139 do_exit(SIGKILL);
10140+ }
10141 do_exit(SIGSEGV);
10142 }
10143 EXPORT_SYMBOL(die_if_kernel);
10144diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
10145index 8201c25e..072a2a7 100644
10146--- a/arch/sparc/kernel/unaligned_64.c
10147+++ b/arch/sparc/kernel/unaligned_64.c
10148@@ -286,7 +286,7 @@ static void log_unaligned(struct pt_regs *regs)
10149 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
10150
10151 if (__ratelimit(&ratelimit)) {
10152- printk("Kernel unaligned access at TPC[%lx] %pS\n",
10153+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
10154 regs->tpc, (void *) regs->tpc);
10155 }
10156 }
10157diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
10158index dbe119b..089c7c1 100644
10159--- a/arch/sparc/lib/Makefile
10160+++ b/arch/sparc/lib/Makefile
10161@@ -2,7 +2,7 @@
10162 #
10163
10164 asflags-y := -ansi -DST_DIV0=0x02
10165-ccflags-y := -Werror
10166+#ccflags-y := -Werror
10167
10168 lib-$(CONFIG_SPARC32) += ashrdi3.o
10169 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
10170diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
10171index 85c233d..68500e0 100644
10172--- a/arch/sparc/lib/atomic_64.S
10173+++ b/arch/sparc/lib/atomic_64.S
10174@@ -17,7 +17,12 @@
10175 ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10176 BACKOFF_SETUP(%o2)
10177 1: lduw [%o1], %g1
10178- add %g1, %o0, %g7
10179+ addcc %g1, %o0, %g7
10180+
10181+#ifdef CONFIG_PAX_REFCOUNT
10182+ tvs %icc, 6
10183+#endif
10184+
10185 cas [%o1], %g1, %g7
10186 cmp %g1, %g7
10187 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10188@@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10189 2: BACKOFF_SPIN(%o2, %o3, 1b)
10190 ENDPROC(atomic_add)
10191
10192+ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10193+ BACKOFF_SETUP(%o2)
10194+1: lduw [%o1], %g1
10195+ add %g1, %o0, %g7
10196+ cas [%o1], %g1, %g7
10197+ cmp %g1, %g7
10198+ bne,pn %icc, 2f
10199+ nop
10200+ retl
10201+ nop
10202+2: BACKOFF_SPIN(%o2, %o3, 1b)
10203+ENDPROC(atomic_add_unchecked)
10204+
10205 ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10206 BACKOFF_SETUP(%o2)
10207 1: lduw [%o1], %g1
10208- sub %g1, %o0, %g7
10209+ subcc %g1, %o0, %g7
10210+
10211+#ifdef CONFIG_PAX_REFCOUNT
10212+ tvs %icc, 6
10213+#endif
10214+
10215 cas [%o1], %g1, %g7
10216 cmp %g1, %g7
10217 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10218@@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10219 2: BACKOFF_SPIN(%o2, %o3, 1b)
10220 ENDPROC(atomic_sub)
10221
10222+ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
10223+ BACKOFF_SETUP(%o2)
10224+1: lduw [%o1], %g1
10225+ sub %g1, %o0, %g7
10226+ cas [%o1], %g1, %g7
10227+ cmp %g1, %g7
10228+ bne,pn %icc, 2f
10229+ nop
10230+ retl
10231+ nop
10232+2: BACKOFF_SPIN(%o2, %o3, 1b)
10233+ENDPROC(atomic_sub_unchecked)
10234+
10235 ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10236 BACKOFF_SETUP(%o2)
10237 1: lduw [%o1], %g1
10238- add %g1, %o0, %g7
10239+ addcc %g1, %o0, %g7
10240+
10241+#ifdef CONFIG_PAX_REFCOUNT
10242+ tvs %icc, 6
10243+#endif
10244+
10245 cas [%o1], %g1, %g7
10246 cmp %g1, %g7
10247 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10248@@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10249 2: BACKOFF_SPIN(%o2, %o3, 1b)
10250 ENDPROC(atomic_add_ret)
10251
10252+ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10253+ BACKOFF_SETUP(%o2)
10254+1: lduw [%o1], %g1
10255+ addcc %g1, %o0, %g7
10256+ cas [%o1], %g1, %g7
10257+ cmp %g1, %g7
10258+ bne,pn %icc, 2f
10259+ add %g7, %o0, %g7
10260+ sra %g7, 0, %o0
10261+ retl
10262+ nop
10263+2: BACKOFF_SPIN(%o2, %o3, 1b)
10264+ENDPROC(atomic_add_ret_unchecked)
10265+
10266 ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
10267 BACKOFF_SETUP(%o2)
10268 1: lduw [%o1], %g1
10269- sub %g1, %o0, %g7
10270+ subcc %g1, %o0, %g7
10271+
10272+#ifdef CONFIG_PAX_REFCOUNT
10273+ tvs %icc, 6
10274+#endif
10275+
10276 cas [%o1], %g1, %g7
10277 cmp %g1, %g7
10278 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10279@@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
10280 ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10281 BACKOFF_SETUP(%o2)
10282 1: ldx [%o1], %g1
10283- add %g1, %o0, %g7
10284+ addcc %g1, %o0, %g7
10285+
10286+#ifdef CONFIG_PAX_REFCOUNT
10287+ tvs %xcc, 6
10288+#endif
10289+
10290 casx [%o1], %g1, %g7
10291 cmp %g1, %g7
10292 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10293@@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10294 2: BACKOFF_SPIN(%o2, %o3, 1b)
10295 ENDPROC(atomic64_add)
10296
10297+ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10298+ BACKOFF_SETUP(%o2)
10299+1: ldx [%o1], %g1
10300+ addcc %g1, %o0, %g7
10301+ casx [%o1], %g1, %g7
10302+ cmp %g1, %g7
10303+ bne,pn %xcc, 2f
10304+ nop
10305+ retl
10306+ nop
10307+2: BACKOFF_SPIN(%o2, %o3, 1b)
10308+ENDPROC(atomic64_add_unchecked)
10309+
10310 ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10311 BACKOFF_SETUP(%o2)
10312 1: ldx [%o1], %g1
10313- sub %g1, %o0, %g7
10314+ subcc %g1, %o0, %g7
10315+
10316+#ifdef CONFIG_PAX_REFCOUNT
10317+ tvs %xcc, 6
10318+#endif
10319+
10320 casx [%o1], %g1, %g7
10321 cmp %g1, %g7
10322 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10323@@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10324 2: BACKOFF_SPIN(%o2, %o3, 1b)
10325 ENDPROC(atomic64_sub)
10326
10327+ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
10328+ BACKOFF_SETUP(%o2)
10329+1: ldx [%o1], %g1
10330+ subcc %g1, %o0, %g7
10331+ casx [%o1], %g1, %g7
10332+ cmp %g1, %g7
10333+ bne,pn %xcc, 2f
10334+ nop
10335+ retl
10336+ nop
10337+2: BACKOFF_SPIN(%o2, %o3, 1b)
10338+ENDPROC(atomic64_sub_unchecked)
10339+
10340 ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10341 BACKOFF_SETUP(%o2)
10342 1: ldx [%o1], %g1
10343- add %g1, %o0, %g7
10344+ addcc %g1, %o0, %g7
10345+
10346+#ifdef CONFIG_PAX_REFCOUNT
10347+ tvs %xcc, 6
10348+#endif
10349+
10350 casx [%o1], %g1, %g7
10351 cmp %g1, %g7
10352 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10353@@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10354 2: BACKOFF_SPIN(%o2, %o3, 1b)
10355 ENDPROC(atomic64_add_ret)
10356
10357+ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10358+ BACKOFF_SETUP(%o2)
10359+1: ldx [%o1], %g1
10360+ addcc %g1, %o0, %g7
10361+ casx [%o1], %g1, %g7
10362+ cmp %g1, %g7
10363+ bne,pn %xcc, 2f
10364+ add %g7, %o0, %g7
10365+ mov %g7, %o0
10366+ retl
10367+ nop
10368+2: BACKOFF_SPIN(%o2, %o3, 1b)
10369+ENDPROC(atomic64_add_ret_unchecked)
10370+
10371 ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
10372 BACKOFF_SETUP(%o2)
10373 1: ldx [%o1], %g1
10374- sub %g1, %o0, %g7
10375+ subcc %g1, %o0, %g7
10376+
10377+#ifdef CONFIG_PAX_REFCOUNT
10378+ tvs %xcc, 6
10379+#endif
10380+
10381 casx [%o1], %g1, %g7
10382 cmp %g1, %g7
10383 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10384diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
10385index 323335b..ed85ea2 100644
10386--- a/arch/sparc/lib/ksyms.c
10387+++ b/arch/sparc/lib/ksyms.c
10388@@ -100,12 +100,18 @@ EXPORT_SYMBOL(__clear_user);
10389
10390 /* Atomic counter implementation. */
10391 EXPORT_SYMBOL(atomic_add);
10392+EXPORT_SYMBOL(atomic_add_unchecked);
10393 EXPORT_SYMBOL(atomic_add_ret);
10394+EXPORT_SYMBOL(atomic_add_ret_unchecked);
10395 EXPORT_SYMBOL(atomic_sub);
10396+EXPORT_SYMBOL(atomic_sub_unchecked);
10397 EXPORT_SYMBOL(atomic_sub_ret);
10398 EXPORT_SYMBOL(atomic64_add);
10399+EXPORT_SYMBOL(atomic64_add_unchecked);
10400 EXPORT_SYMBOL(atomic64_add_ret);
10401+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
10402 EXPORT_SYMBOL(atomic64_sub);
10403+EXPORT_SYMBOL(atomic64_sub_unchecked);
10404 EXPORT_SYMBOL(atomic64_sub_ret);
10405 EXPORT_SYMBOL(atomic64_dec_if_positive);
10406
10407diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
10408index 30c3ecc..736f015 100644
10409--- a/arch/sparc/mm/Makefile
10410+++ b/arch/sparc/mm/Makefile
10411@@ -2,7 +2,7 @@
10412 #
10413
10414 asflags-y := -ansi
10415-ccflags-y := -Werror
10416+#ccflags-y := -Werror
10417
10418 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
10419 obj-y += fault_$(BITS).o
10420diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
10421index 59dbd46..1dd7f5e 100644
10422--- a/arch/sparc/mm/fault_32.c
10423+++ b/arch/sparc/mm/fault_32.c
10424@@ -21,6 +21,9 @@
10425 #include <linux/perf_event.h>
10426 #include <linux/interrupt.h>
10427 #include <linux/kdebug.h>
10428+#include <linux/slab.h>
10429+#include <linux/pagemap.h>
10430+#include <linux/compiler.h>
10431
10432 #include <asm/page.h>
10433 #include <asm/pgtable.h>
10434@@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
10435 return safe_compute_effective_address(regs, insn);
10436 }
10437
10438+#ifdef CONFIG_PAX_PAGEEXEC
10439+#ifdef CONFIG_PAX_DLRESOLVE
10440+static void pax_emuplt_close(struct vm_area_struct *vma)
10441+{
10442+ vma->vm_mm->call_dl_resolve = 0UL;
10443+}
10444+
10445+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
10446+{
10447+ unsigned int *kaddr;
10448+
10449+ vmf->page = alloc_page(GFP_HIGHUSER);
10450+ if (!vmf->page)
10451+ return VM_FAULT_OOM;
10452+
10453+ kaddr = kmap(vmf->page);
10454+ memset(kaddr, 0, PAGE_SIZE);
10455+ kaddr[0] = 0x9DE3BFA8U; /* save */
10456+ flush_dcache_page(vmf->page);
10457+ kunmap(vmf->page);
10458+ return VM_FAULT_MAJOR;
10459+}
10460+
10461+static const struct vm_operations_struct pax_vm_ops = {
10462+ .close = pax_emuplt_close,
10463+ .fault = pax_emuplt_fault
10464+};
10465+
10466+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
10467+{
10468+ int ret;
10469+
10470+ INIT_LIST_HEAD(&vma->anon_vma_chain);
10471+ vma->vm_mm = current->mm;
10472+ vma->vm_start = addr;
10473+ vma->vm_end = addr + PAGE_SIZE;
10474+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
10475+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
10476+ vma->vm_ops = &pax_vm_ops;
10477+
10478+ ret = insert_vm_struct(current->mm, vma);
10479+ if (ret)
10480+ return ret;
10481+
10482+ ++current->mm->total_vm;
10483+ return 0;
10484+}
10485+#endif
10486+
10487+/*
10488+ * PaX: decide what to do with offenders (regs->pc = fault address)
10489+ *
10490+ * returns 1 when task should be killed
10491+ * 2 when patched PLT trampoline was detected
10492+ * 3 when unpatched PLT trampoline was detected
10493+ */
10494+static int pax_handle_fetch_fault(struct pt_regs *regs)
10495+{
10496+
10497+#ifdef CONFIG_PAX_EMUPLT
10498+ int err;
10499+
10500+ do { /* PaX: patched PLT emulation #1 */
10501+ unsigned int sethi1, sethi2, jmpl;
10502+
10503+ err = get_user(sethi1, (unsigned int *)regs->pc);
10504+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
10505+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
10506+
10507+ if (err)
10508+ break;
10509+
10510+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
10511+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
10512+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
10513+ {
10514+ unsigned int addr;
10515+
10516+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
10517+ addr = regs->u_regs[UREG_G1];
10518+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
10519+ regs->pc = addr;
10520+ regs->npc = addr+4;
10521+ return 2;
10522+ }
10523+ } while (0);
10524+
10525+ do { /* PaX: patched PLT emulation #2 */
10526+ unsigned int ba;
10527+
10528+ err = get_user(ba, (unsigned int *)regs->pc);
10529+
10530+ if (err)
10531+ break;
10532+
10533+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
10534+ unsigned int addr;
10535+
10536+ if ((ba & 0xFFC00000U) == 0x30800000U)
10537+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
10538+ else
10539+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
10540+ regs->pc = addr;
10541+ regs->npc = addr+4;
10542+ return 2;
10543+ }
10544+ } while (0);
10545+
10546+ do { /* PaX: patched PLT emulation #3 */
10547+ unsigned int sethi, bajmpl, nop;
10548+
10549+ err = get_user(sethi, (unsigned int *)regs->pc);
10550+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
10551+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
10552+
10553+ if (err)
10554+ break;
10555+
10556+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
10557+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
10558+ nop == 0x01000000U)
10559+ {
10560+ unsigned int addr;
10561+
10562+ addr = (sethi & 0x003FFFFFU) << 10;
10563+ regs->u_regs[UREG_G1] = addr;
10564+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
10565+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
10566+ else
10567+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
10568+ regs->pc = addr;
10569+ regs->npc = addr+4;
10570+ return 2;
10571+ }
10572+ } while (0);
10573+
10574+ do { /* PaX: unpatched PLT emulation step 1 */
10575+ unsigned int sethi, ba, nop;
10576+
10577+ err = get_user(sethi, (unsigned int *)regs->pc);
10578+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
10579+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
10580+
10581+ if (err)
10582+ break;
10583+
10584+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
10585+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
10586+ nop == 0x01000000U)
10587+ {
10588+ unsigned int addr, save, call;
10589+
10590+ if ((ba & 0xFFC00000U) == 0x30800000U)
10591+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
10592+ else
10593+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
10594+
10595+ err = get_user(save, (unsigned int *)addr);
10596+ err |= get_user(call, (unsigned int *)(addr+4));
10597+ err |= get_user(nop, (unsigned int *)(addr+8));
10598+ if (err)
10599+ break;
10600+
10601+#ifdef CONFIG_PAX_DLRESOLVE
10602+ if (save == 0x9DE3BFA8U &&
10603+ (call & 0xC0000000U) == 0x40000000U &&
10604+ nop == 0x01000000U)
10605+ {
10606+ struct vm_area_struct *vma;
10607+ unsigned long call_dl_resolve;
10608+
10609+ down_read(&current->mm->mmap_sem);
10610+ call_dl_resolve = current->mm->call_dl_resolve;
10611+ up_read(&current->mm->mmap_sem);
10612+ if (likely(call_dl_resolve))
10613+ goto emulate;
10614+
10615+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
10616+
10617+ down_write(&current->mm->mmap_sem);
10618+ if (current->mm->call_dl_resolve) {
10619+ call_dl_resolve = current->mm->call_dl_resolve;
10620+ up_write(&current->mm->mmap_sem);
10621+ if (vma)
10622+ kmem_cache_free(vm_area_cachep, vma);
10623+ goto emulate;
10624+ }
10625+
10626+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
10627+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
10628+ up_write(&current->mm->mmap_sem);
10629+ if (vma)
10630+ kmem_cache_free(vm_area_cachep, vma);
10631+ return 1;
10632+ }
10633+
10634+ if (pax_insert_vma(vma, call_dl_resolve)) {
10635+ up_write(&current->mm->mmap_sem);
10636+ kmem_cache_free(vm_area_cachep, vma);
10637+ return 1;
10638+ }
10639+
10640+ current->mm->call_dl_resolve = call_dl_resolve;
10641+ up_write(&current->mm->mmap_sem);
10642+
10643+emulate:
10644+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
10645+ regs->pc = call_dl_resolve;
10646+ regs->npc = addr+4;
10647+ return 3;
10648+ }
10649+#endif
10650+
10651+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
10652+ if ((save & 0xFFC00000U) == 0x05000000U &&
10653+ (call & 0xFFFFE000U) == 0x85C0A000U &&
10654+ nop == 0x01000000U)
10655+ {
10656+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
10657+ regs->u_regs[UREG_G2] = addr + 4;
10658+ addr = (save & 0x003FFFFFU) << 10;
10659+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
10660+ regs->pc = addr;
10661+ regs->npc = addr+4;
10662+ return 3;
10663+ }
10664+ }
10665+ } while (0);
10666+
10667+ do { /* PaX: unpatched PLT emulation step 2 */
10668+ unsigned int save, call, nop;
10669+
10670+ err = get_user(save, (unsigned int *)(regs->pc-4));
10671+ err |= get_user(call, (unsigned int *)regs->pc);
10672+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
10673+ if (err)
10674+ break;
10675+
10676+ if (save == 0x9DE3BFA8U &&
10677+ (call & 0xC0000000U) == 0x40000000U &&
10678+ nop == 0x01000000U)
10679+ {
10680+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
10681+
10682+ regs->u_regs[UREG_RETPC] = regs->pc;
10683+ regs->pc = dl_resolve;
10684+ regs->npc = dl_resolve+4;
10685+ return 3;
10686+ }
10687+ } while (0);
10688+#endif
10689+
10690+ return 1;
10691+}
10692+
10693+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
10694+{
10695+ unsigned long i;
10696+
10697+ printk(KERN_ERR "PAX: bytes at PC: ");
10698+ for (i = 0; i < 8; i++) {
10699+ unsigned int c;
10700+ if (get_user(c, (unsigned int *)pc+i))
10701+ printk(KERN_CONT "???????? ");
10702+ else
10703+ printk(KERN_CONT "%08x ", c);
10704+ }
10705+ printk("\n");
10706+}
10707+#endif
10708+
10709 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
10710 int text_fault)
10711 {
10712@@ -229,6 +503,24 @@ good_area:
10713 if (!(vma->vm_flags & VM_WRITE))
10714 goto bad_area;
10715 } else {
10716+
10717+#ifdef CONFIG_PAX_PAGEEXEC
10718+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
10719+ up_read(&mm->mmap_sem);
10720+ switch (pax_handle_fetch_fault(regs)) {
10721+
10722+#ifdef CONFIG_PAX_EMUPLT
10723+ case 2:
10724+ case 3:
10725+ return;
10726+#endif
10727+
10728+ }
10729+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
10730+ do_group_exit(SIGKILL);
10731+ }
10732+#endif
10733+
10734 /* Allow reads even for write-only mappings */
10735 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
10736 goto bad_area;
10737diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
10738index 2ebec26..b212598 100644
10739--- a/arch/sparc/mm/fault_64.c
10740+++ b/arch/sparc/mm/fault_64.c
10741@@ -21,6 +21,9 @@
10742 #include <linux/kprobes.h>
10743 #include <linux/kdebug.h>
10744 #include <linux/percpu.h>
10745+#include <linux/slab.h>
10746+#include <linux/pagemap.h>
10747+#include <linux/compiler.h>
10748
10749 #include <asm/page.h>
10750 #include <asm/pgtable.h>
10751@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
10752 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
10753 regs->tpc);
10754 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
10755- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
10756+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
10757 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
10758 dump_stack();
10759 unhandled_fault(regs->tpc, current, regs);
10760@@ -270,6 +273,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
10761 show_regs(regs);
10762 }
10763
10764+#ifdef CONFIG_PAX_PAGEEXEC
10765+#ifdef CONFIG_PAX_DLRESOLVE
10766+static void pax_emuplt_close(struct vm_area_struct *vma)
10767+{
10768+ vma->vm_mm->call_dl_resolve = 0UL;
10769+}
10770+
10771+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
10772+{
10773+ unsigned int *kaddr;
10774+
10775+ vmf->page = alloc_page(GFP_HIGHUSER);
10776+ if (!vmf->page)
10777+ return VM_FAULT_OOM;
10778+
10779+ kaddr = kmap(vmf->page);
10780+ memset(kaddr, 0, PAGE_SIZE);
10781+ kaddr[0] = 0x9DE3BFA8U; /* save */
10782+ flush_dcache_page(vmf->page);
10783+ kunmap(vmf->page);
10784+ return VM_FAULT_MAJOR;
10785+}
10786+
10787+static const struct vm_operations_struct pax_vm_ops = {
10788+ .close = pax_emuplt_close,
10789+ .fault = pax_emuplt_fault
10790+};
10791+
10792+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
10793+{
10794+ int ret;
10795+
10796+ INIT_LIST_HEAD(&vma->anon_vma_chain);
10797+ vma->vm_mm = current->mm;
10798+ vma->vm_start = addr;
10799+ vma->vm_end = addr + PAGE_SIZE;
10800+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
10801+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
10802+ vma->vm_ops = &pax_vm_ops;
10803+
10804+ ret = insert_vm_struct(current->mm, vma);
10805+ if (ret)
10806+ return ret;
10807+
10808+ ++current->mm->total_vm;
10809+ return 0;
10810+}
10811+#endif
10812+
10813+/*
10814+ * PaX: decide what to do with offenders (regs->tpc = fault address)
10815+ *
10816+ * returns 1 when task should be killed
10817+ * 2 when patched PLT trampoline was detected
10818+ * 3 when unpatched PLT trampoline was detected
10819+ */
10820+static int pax_handle_fetch_fault(struct pt_regs *regs)
10821+{
10822+
10823+#ifdef CONFIG_PAX_EMUPLT
10824+ int err;
10825+
10826+ do { /* PaX: patched PLT emulation #1 */
10827+ unsigned int sethi1, sethi2, jmpl;
10828+
10829+ err = get_user(sethi1, (unsigned int *)regs->tpc);
10830+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
10831+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
10832+
10833+ if (err)
10834+ break;
10835+
10836+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
10837+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
10838+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
10839+ {
10840+ unsigned long addr;
10841+
10842+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
10843+ addr = regs->u_regs[UREG_G1];
10844+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
10845+
10846+ if (test_thread_flag(TIF_32BIT))
10847+ addr &= 0xFFFFFFFFUL;
10848+
10849+ regs->tpc = addr;
10850+ regs->tnpc = addr+4;
10851+ return 2;
10852+ }
10853+ } while (0);
10854+
10855+ do { /* PaX: patched PLT emulation #2 */
10856+ unsigned int ba;
10857+
10858+ err = get_user(ba, (unsigned int *)regs->tpc);
10859+
10860+ if (err)
10861+ break;
10862+
10863+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
10864+ unsigned long addr;
10865+
10866+ if ((ba & 0xFFC00000U) == 0x30800000U)
10867+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
10868+ else
10869+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
10870+
10871+ if (test_thread_flag(TIF_32BIT))
10872+ addr &= 0xFFFFFFFFUL;
10873+
10874+ regs->tpc = addr;
10875+ regs->tnpc = addr+4;
10876+ return 2;
10877+ }
10878+ } while (0);
10879+
10880+ do { /* PaX: patched PLT emulation #3 */
10881+ unsigned int sethi, bajmpl, nop;
10882+
10883+ err = get_user(sethi, (unsigned int *)regs->tpc);
10884+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
10885+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
10886+
10887+ if (err)
10888+ break;
10889+
10890+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
10891+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
10892+ nop == 0x01000000U)
10893+ {
10894+ unsigned long addr;
10895+
10896+ addr = (sethi & 0x003FFFFFU) << 10;
10897+ regs->u_regs[UREG_G1] = addr;
10898+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
10899+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
10900+ else
10901+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
10902+
10903+ if (test_thread_flag(TIF_32BIT))
10904+ addr &= 0xFFFFFFFFUL;
10905+
10906+ regs->tpc = addr;
10907+ regs->tnpc = addr+4;
10908+ return 2;
10909+ }
10910+ } while (0);
10911+
10912+ do { /* PaX: patched PLT emulation #4 */
10913+ unsigned int sethi, mov1, call, mov2;
10914+
10915+ err = get_user(sethi, (unsigned int *)regs->tpc);
10916+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
10917+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
10918+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
10919+
10920+ if (err)
10921+ break;
10922+
10923+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
10924+ mov1 == 0x8210000FU &&
10925+ (call & 0xC0000000U) == 0x40000000U &&
10926+ mov2 == 0x9E100001U)
10927+ {
10928+ unsigned long addr;
10929+
10930+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
10931+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
10932+
10933+ if (test_thread_flag(TIF_32BIT))
10934+ addr &= 0xFFFFFFFFUL;
10935+
10936+ regs->tpc = addr;
10937+ regs->tnpc = addr+4;
10938+ return 2;
10939+ }
10940+ } while (0);
10941+
10942+ do { /* PaX: patched PLT emulation #5 */
10943+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
10944+
10945+ err = get_user(sethi, (unsigned int *)regs->tpc);
10946+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
10947+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
10948+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
10949+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
10950+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
10951+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
10952+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
10953+
10954+ if (err)
10955+ break;
10956+
10957+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
10958+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
10959+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
10960+ (or1 & 0xFFFFE000U) == 0x82106000U &&
10961+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
10962+ sllx == 0x83287020U &&
10963+ jmpl == 0x81C04005U &&
10964+ nop == 0x01000000U)
10965+ {
10966+ unsigned long addr;
10967+
10968+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
10969+ regs->u_regs[UREG_G1] <<= 32;
10970+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
10971+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
10972+ regs->tpc = addr;
10973+ regs->tnpc = addr+4;
10974+ return 2;
10975+ }
10976+ } while (0);
10977+
10978+ do { /* PaX: patched PLT emulation #6 */
10979+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
10980+
10981+ err = get_user(sethi, (unsigned int *)regs->tpc);
10982+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
10983+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
10984+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
10985+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
10986+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
10987+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
10988+
10989+ if (err)
10990+ break;
10991+
10992+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
10993+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
10994+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
10995+ sllx == 0x83287020U &&
10996+ (or & 0xFFFFE000U) == 0x8A116000U &&
10997+ jmpl == 0x81C04005U &&
10998+ nop == 0x01000000U)
10999+ {
11000+ unsigned long addr;
11001+
11002+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11003+ regs->u_regs[UREG_G1] <<= 32;
11004+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11005+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11006+ regs->tpc = addr;
11007+ regs->tnpc = addr+4;
11008+ return 2;
11009+ }
11010+ } while (0);
11011+
11012+ do { /* PaX: unpatched PLT emulation step 1 */
11013+ unsigned int sethi, ba, nop;
11014+
11015+ err = get_user(sethi, (unsigned int *)regs->tpc);
11016+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11017+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11018+
11019+ if (err)
11020+ break;
11021+
11022+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11023+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11024+ nop == 0x01000000U)
11025+ {
11026+ unsigned long addr;
11027+ unsigned int save, call;
11028+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11029+
11030+ if ((ba & 0xFFC00000U) == 0x30800000U)
11031+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11032+ else
11033+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11034+
11035+ if (test_thread_flag(TIF_32BIT))
11036+ addr &= 0xFFFFFFFFUL;
11037+
11038+ err = get_user(save, (unsigned int *)addr);
11039+ err |= get_user(call, (unsigned int *)(addr+4));
11040+ err |= get_user(nop, (unsigned int *)(addr+8));
11041+ if (err)
11042+ break;
11043+
11044+#ifdef CONFIG_PAX_DLRESOLVE
11045+ if (save == 0x9DE3BFA8U &&
11046+ (call & 0xC0000000U) == 0x40000000U &&
11047+ nop == 0x01000000U)
11048+ {
11049+ struct vm_area_struct *vma;
11050+ unsigned long call_dl_resolve;
11051+
11052+ down_read(&current->mm->mmap_sem);
11053+ call_dl_resolve = current->mm->call_dl_resolve;
11054+ up_read(&current->mm->mmap_sem);
11055+ if (likely(call_dl_resolve))
11056+ goto emulate;
11057+
11058+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11059+
11060+ down_write(&current->mm->mmap_sem);
11061+ if (current->mm->call_dl_resolve) {
11062+ call_dl_resolve = current->mm->call_dl_resolve;
11063+ up_write(&current->mm->mmap_sem);
11064+ if (vma)
11065+ kmem_cache_free(vm_area_cachep, vma);
11066+ goto emulate;
11067+ }
11068+
11069+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11070+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11071+ up_write(&current->mm->mmap_sem);
11072+ if (vma)
11073+ kmem_cache_free(vm_area_cachep, vma);
11074+ return 1;
11075+ }
11076+
11077+ if (pax_insert_vma(vma, call_dl_resolve)) {
11078+ up_write(&current->mm->mmap_sem);
11079+ kmem_cache_free(vm_area_cachep, vma);
11080+ return 1;
11081+ }
11082+
11083+ current->mm->call_dl_resolve = call_dl_resolve;
11084+ up_write(&current->mm->mmap_sem);
11085+
11086+emulate:
11087+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11088+ regs->tpc = call_dl_resolve;
11089+ regs->tnpc = addr+4;
11090+ return 3;
11091+ }
11092+#endif
11093+
11094+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11095+ if ((save & 0xFFC00000U) == 0x05000000U &&
11096+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11097+ nop == 0x01000000U)
11098+ {
11099+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11100+ regs->u_regs[UREG_G2] = addr + 4;
11101+ addr = (save & 0x003FFFFFU) << 10;
11102+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11103+
11104+ if (test_thread_flag(TIF_32BIT))
11105+ addr &= 0xFFFFFFFFUL;
11106+
11107+ regs->tpc = addr;
11108+ regs->tnpc = addr+4;
11109+ return 3;
11110+ }
11111+
11112+ /* PaX: 64-bit PLT stub */
11113+ err = get_user(sethi1, (unsigned int *)addr);
11114+ err |= get_user(sethi2, (unsigned int *)(addr+4));
11115+ err |= get_user(or1, (unsigned int *)(addr+8));
11116+ err |= get_user(or2, (unsigned int *)(addr+12));
11117+ err |= get_user(sllx, (unsigned int *)(addr+16));
11118+ err |= get_user(add, (unsigned int *)(addr+20));
11119+ err |= get_user(jmpl, (unsigned int *)(addr+24));
11120+ err |= get_user(nop, (unsigned int *)(addr+28));
11121+ if (err)
11122+ break;
11123+
11124+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
11125+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11126+ (or1 & 0xFFFFE000U) == 0x88112000U &&
11127+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11128+ sllx == 0x89293020U &&
11129+ add == 0x8A010005U &&
11130+ jmpl == 0x89C14000U &&
11131+ nop == 0x01000000U)
11132+ {
11133+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11134+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11135+ regs->u_regs[UREG_G4] <<= 32;
11136+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11137+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
11138+ regs->u_regs[UREG_G4] = addr + 24;
11139+ addr = regs->u_regs[UREG_G5];
11140+ regs->tpc = addr;
11141+ regs->tnpc = addr+4;
11142+ return 3;
11143+ }
11144+ }
11145+ } while (0);
11146+
11147+#ifdef CONFIG_PAX_DLRESOLVE
11148+ do { /* PaX: unpatched PLT emulation step 2 */
11149+ unsigned int save, call, nop;
11150+
11151+ err = get_user(save, (unsigned int *)(regs->tpc-4));
11152+ err |= get_user(call, (unsigned int *)regs->tpc);
11153+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
11154+ if (err)
11155+ break;
11156+
11157+ if (save == 0x9DE3BFA8U &&
11158+ (call & 0xC0000000U) == 0x40000000U &&
11159+ nop == 0x01000000U)
11160+ {
11161+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11162+
11163+ if (test_thread_flag(TIF_32BIT))
11164+ dl_resolve &= 0xFFFFFFFFUL;
11165+
11166+ regs->u_regs[UREG_RETPC] = regs->tpc;
11167+ regs->tpc = dl_resolve;
11168+ regs->tnpc = dl_resolve+4;
11169+ return 3;
11170+ }
11171+ } while (0);
11172+#endif
11173+
11174+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
11175+ unsigned int sethi, ba, nop;
11176+
11177+ err = get_user(sethi, (unsigned int *)regs->tpc);
11178+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11179+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11180+
11181+ if (err)
11182+ break;
11183+
11184+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11185+ (ba & 0xFFF00000U) == 0x30600000U &&
11186+ nop == 0x01000000U)
11187+ {
11188+ unsigned long addr;
11189+
11190+ addr = (sethi & 0x003FFFFFU) << 10;
11191+ regs->u_regs[UREG_G1] = addr;
11192+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11193+
11194+ if (test_thread_flag(TIF_32BIT))
11195+ addr &= 0xFFFFFFFFUL;
11196+
11197+ regs->tpc = addr;
11198+ regs->tnpc = addr+4;
11199+ return 2;
11200+ }
11201+ } while (0);
11202+
11203+#endif
11204+
11205+ return 1;
11206+}
11207+
11208+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11209+{
11210+ unsigned long i;
11211+
11212+ printk(KERN_ERR "PAX: bytes at PC: ");
11213+ for (i = 0; i < 8; i++) {
11214+ unsigned int c;
11215+ if (get_user(c, (unsigned int *)pc+i))
11216+ printk(KERN_CONT "???????? ");
11217+ else
11218+ printk(KERN_CONT "%08x ", c);
11219+ }
11220+ printk("\n");
11221+}
11222+#endif
11223+
11224 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
11225 {
11226 struct mm_struct *mm = current->mm;
11227@@ -342,6 +805,29 @@ retry:
11228 if (!vma)
11229 goto bad_area;
11230
11231+#ifdef CONFIG_PAX_PAGEEXEC
11232+ /* PaX: detect ITLB misses on non-exec pages */
11233+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
11234+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
11235+ {
11236+ if (address != regs->tpc)
11237+ goto good_area;
11238+
11239+ up_read(&mm->mmap_sem);
11240+ switch (pax_handle_fetch_fault(regs)) {
11241+
11242+#ifdef CONFIG_PAX_EMUPLT
11243+ case 2:
11244+ case 3:
11245+ return;
11246+#endif
11247+
11248+ }
11249+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
11250+ do_group_exit(SIGKILL);
11251+ }
11252+#endif
11253+
11254 /* Pure DTLB misses do not tell us whether the fault causing
11255 * load/store/atomic was a write or not, it only says that there
11256 * was no match. So in such a case we (carefully) read the
11257diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
11258index 9639964..806cd0c 100644
11259--- a/arch/sparc/mm/hugetlbpage.c
11260+++ b/arch/sparc/mm/hugetlbpage.c
11261@@ -28,7 +28,8 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11262 unsigned long addr,
11263 unsigned long len,
11264 unsigned long pgoff,
11265- unsigned long flags)
11266+ unsigned long flags,
11267+ unsigned long offset)
11268 {
11269 unsigned long task_size = TASK_SIZE;
11270 struct vm_unmapped_area_info info;
11271@@ -38,15 +39,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11272
11273 info.flags = 0;
11274 info.length = len;
11275- info.low_limit = TASK_UNMAPPED_BASE;
11276+ info.low_limit = mm->mmap_base;
11277 info.high_limit = min(task_size, VA_EXCLUDE_START);
11278 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11279 info.align_offset = 0;
11280+ info.threadstack_offset = offset;
11281 addr = vm_unmapped_area(&info);
11282
11283 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
11284 VM_BUG_ON(addr != -ENOMEM);
11285 info.low_limit = VA_EXCLUDE_END;
11286+
11287+#ifdef CONFIG_PAX_RANDMMAP
11288+ if (mm->pax_flags & MF_PAX_RANDMMAP)
11289+ info.low_limit += mm->delta_mmap;
11290+#endif
11291+
11292 info.high_limit = task_size;
11293 addr = vm_unmapped_area(&info);
11294 }
11295@@ -58,7 +66,8 @@ static unsigned long
11296 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11297 const unsigned long len,
11298 const unsigned long pgoff,
11299- const unsigned long flags)
11300+ const unsigned long flags,
11301+ const unsigned long offset)
11302 {
11303 struct mm_struct *mm = current->mm;
11304 unsigned long addr = addr0;
11305@@ -73,6 +82,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11306 info.high_limit = mm->mmap_base;
11307 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11308 info.align_offset = 0;
11309+ info.threadstack_offset = offset;
11310 addr = vm_unmapped_area(&info);
11311
11312 /*
11313@@ -85,6 +95,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11314 VM_BUG_ON(addr != -ENOMEM);
11315 info.flags = 0;
11316 info.low_limit = TASK_UNMAPPED_BASE;
11317+
11318+#ifdef CONFIG_PAX_RANDMMAP
11319+ if (mm->pax_flags & MF_PAX_RANDMMAP)
11320+ info.low_limit += mm->delta_mmap;
11321+#endif
11322+
11323 info.high_limit = STACK_TOP32;
11324 addr = vm_unmapped_area(&info);
11325 }
11326@@ -99,6 +115,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
11327 struct mm_struct *mm = current->mm;
11328 struct vm_area_struct *vma;
11329 unsigned long task_size = TASK_SIZE;
11330+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
11331
11332 if (test_thread_flag(TIF_32BIT))
11333 task_size = STACK_TOP32;
11334@@ -114,19 +131,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
11335 return addr;
11336 }
11337
11338+#ifdef CONFIG_PAX_RANDMMAP
11339+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
11340+#endif
11341+
11342 if (addr) {
11343 addr = ALIGN(addr, HPAGE_SIZE);
11344 vma = find_vma(mm, addr);
11345- if (task_size - len >= addr &&
11346- (!vma || addr + len <= vma->vm_start))
11347+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
11348 return addr;
11349 }
11350 if (mm->get_unmapped_area == arch_get_unmapped_area)
11351 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
11352- pgoff, flags);
11353+ pgoff, flags, offset);
11354 else
11355 return hugetlb_get_unmapped_area_topdown(file, addr, len,
11356- pgoff, flags);
11357+ pgoff, flags, offset);
11358 }
11359
11360 pte_t *huge_pte_alloc(struct mm_struct *mm,
11361diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
11362index ed82eda..0d80e77 100644
11363--- a/arch/sparc/mm/init_64.c
11364+++ b/arch/sparc/mm/init_64.c
11365@@ -188,9 +188,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
11366 int num_kernel_image_mappings;
11367
11368 #ifdef CONFIG_DEBUG_DCFLUSH
11369-atomic_t dcpage_flushes = ATOMIC_INIT(0);
11370+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
11371 #ifdef CONFIG_SMP
11372-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
11373+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
11374 #endif
11375 #endif
11376
11377@@ -198,7 +198,7 @@ inline void flush_dcache_page_impl(struct page *page)
11378 {
11379 BUG_ON(tlb_type == hypervisor);
11380 #ifdef CONFIG_DEBUG_DCFLUSH
11381- atomic_inc(&dcpage_flushes);
11382+ atomic_inc_unchecked(&dcpage_flushes);
11383 #endif
11384
11385 #ifdef DCACHE_ALIASING_POSSIBLE
11386@@ -466,10 +466,10 @@ void mmu_info(struct seq_file *m)
11387
11388 #ifdef CONFIG_DEBUG_DCFLUSH
11389 seq_printf(m, "DCPageFlushes\t: %d\n",
11390- atomic_read(&dcpage_flushes));
11391+ atomic_read_unchecked(&dcpage_flushes));
11392 #ifdef CONFIG_SMP
11393 seq_printf(m, "DCPageFlushesXC\t: %d\n",
11394- atomic_read(&dcpage_flushes_xcall));
11395+ atomic_read_unchecked(&dcpage_flushes_xcall));
11396 #endif /* CONFIG_SMP */
11397 #endif /* CONFIG_DEBUG_DCFLUSH */
11398 }
11399diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
11400index d45a2c4..3c05a78 100644
11401--- a/arch/tile/Kconfig
11402+++ b/arch/tile/Kconfig
11403@@ -185,6 +185,7 @@ source "kernel/Kconfig.hz"
11404
11405 config KEXEC
11406 bool "kexec system call"
11407+ depends on !GRKERNSEC_KMEM
11408 ---help---
11409 kexec is a system call that implements the ability to shutdown your
11410 current kernel, and to start another kernel. It is like a reboot
11411diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
11412index ad220ee..2f537b3 100644
11413--- a/arch/tile/include/asm/atomic_64.h
11414+++ b/arch/tile/include/asm/atomic_64.h
11415@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
11416
11417 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
11418
11419+#define atomic64_read_unchecked(v) atomic64_read(v)
11420+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
11421+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
11422+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
11423+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
11424+#define atomic64_inc_unchecked(v) atomic64_inc(v)
11425+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
11426+#define atomic64_dec_unchecked(v) atomic64_dec(v)
11427+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
11428+
11429 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
11430 #define smp_mb__before_atomic_dec() smp_mb()
11431 #define smp_mb__after_atomic_dec() smp_mb()
11432diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
11433index 6160761..00cac88 100644
11434--- a/arch/tile/include/asm/cache.h
11435+++ b/arch/tile/include/asm/cache.h
11436@@ -15,11 +15,12 @@
11437 #ifndef _ASM_TILE_CACHE_H
11438 #define _ASM_TILE_CACHE_H
11439
11440+#include <linux/const.h>
11441 #include <arch/chip.h>
11442
11443 /* bytes per L1 data cache line */
11444 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
11445-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
11446+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
11447
11448 /* bytes per L2 cache line */
11449 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
11450diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
11451index b6cde32..c0cb736 100644
11452--- a/arch/tile/include/asm/uaccess.h
11453+++ b/arch/tile/include/asm/uaccess.h
11454@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
11455 const void __user *from,
11456 unsigned long n)
11457 {
11458- int sz = __compiletime_object_size(to);
11459+ size_t sz = __compiletime_object_size(to);
11460
11461- if (likely(sz == -1 || sz >= n))
11462+ if (likely(sz == (size_t)-1 || sz >= n))
11463 n = _copy_from_user(to, from, n);
11464 else
11465 copy_from_user_overflow();
11466diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
11467index 0cb3bba..7338b2d 100644
11468--- a/arch/tile/mm/hugetlbpage.c
11469+++ b/arch/tile/mm/hugetlbpage.c
11470@@ -212,6 +212,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
11471 info.high_limit = TASK_SIZE;
11472 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
11473 info.align_offset = 0;
11474+ info.threadstack_offset = 0;
11475 return vm_unmapped_area(&info);
11476 }
11477
11478@@ -229,6 +230,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
11479 info.high_limit = current->mm->mmap_base;
11480 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
11481 info.align_offset = 0;
11482+ info.threadstack_offset = 0;
11483 addr = vm_unmapped_area(&info);
11484
11485 /*
11486diff --git a/arch/um/Makefile b/arch/um/Makefile
11487index 133f7de..1d6f2f1 100644
11488--- a/arch/um/Makefile
11489+++ b/arch/um/Makefile
11490@@ -62,6 +62,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
11491 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
11492 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
11493
11494+ifdef CONSTIFY_PLUGIN
11495+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
11496+endif
11497+
11498 #This will adjust *FLAGS accordingly to the platform.
11499 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
11500
11501diff --git a/arch/um/defconfig b/arch/um/defconfig
11502index 2665e6b..3e3822b 100644
11503--- a/arch/um/defconfig
11504+++ b/arch/um/defconfig
11505@@ -51,7 +51,6 @@ CONFIG_X86_CMPXCHG=y
11506 CONFIG_X86_L1_CACHE_SHIFT=5
11507 CONFIG_X86_XADD=y
11508 CONFIG_X86_PPRO_FENCE=y
11509-CONFIG_X86_WP_WORKS_OK=y
11510 CONFIG_X86_INVLPG=y
11511 CONFIG_X86_BSWAP=y
11512 CONFIG_X86_POPAD_OK=y
11513diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
11514index 19e1bdd..3665b77 100644
11515--- a/arch/um/include/asm/cache.h
11516+++ b/arch/um/include/asm/cache.h
11517@@ -1,6 +1,7 @@
11518 #ifndef __UM_CACHE_H
11519 #define __UM_CACHE_H
11520
11521+#include <linux/const.h>
11522
11523 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
11524 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
11525@@ -12,6 +13,6 @@
11526 # define L1_CACHE_SHIFT 5
11527 #endif
11528
11529-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
11530+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
11531
11532 #endif
11533diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
11534index 2e0a6b1..a64d0f5 100644
11535--- a/arch/um/include/asm/kmap_types.h
11536+++ b/arch/um/include/asm/kmap_types.h
11537@@ -8,6 +8,6 @@
11538
11539 /* No more #include "asm/arch/kmap_types.h" ! */
11540
11541-#define KM_TYPE_NR 14
11542+#define KM_TYPE_NR 15
11543
11544 #endif
11545diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
11546index 5ff53d9..5850cdf 100644
11547--- a/arch/um/include/asm/page.h
11548+++ b/arch/um/include/asm/page.h
11549@@ -14,6 +14,9 @@
11550 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
11551 #define PAGE_MASK (~(PAGE_SIZE-1))
11552
11553+#define ktla_ktva(addr) (addr)
11554+#define ktva_ktla(addr) (addr)
11555+
11556 #ifndef __ASSEMBLY__
11557
11558 struct page;
11559diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
11560index 0032f92..cd151e0 100644
11561--- a/arch/um/include/asm/pgtable-3level.h
11562+++ b/arch/um/include/asm/pgtable-3level.h
11563@@ -58,6 +58,7 @@
11564 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
11565 #define pud_populate(mm, pud, pmd) \
11566 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
11567+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
11568
11569 #ifdef CONFIG_64BIT
11570 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
11571diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
11572index bbcef52..6a2a483 100644
11573--- a/arch/um/kernel/process.c
11574+++ b/arch/um/kernel/process.c
11575@@ -367,22 +367,6 @@ int singlestepping(void * t)
11576 return 2;
11577 }
11578
11579-/*
11580- * Only x86 and x86_64 have an arch_align_stack().
11581- * All other arches have "#define arch_align_stack(x) (x)"
11582- * in their asm/system.h
11583- * As this is included in UML from asm-um/system-generic.h,
11584- * we can use it to behave as the subarch does.
11585- */
11586-#ifndef arch_align_stack
11587-unsigned long arch_align_stack(unsigned long sp)
11588-{
11589- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
11590- sp -= get_random_int() % 8192;
11591- return sp & ~0xf;
11592-}
11593-#endif
11594-
11595 unsigned long get_wchan(struct task_struct *p)
11596 {
11597 unsigned long stack_page, sp, ip;
11598diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
11599index ad8f795..2c7eec6 100644
11600--- a/arch/unicore32/include/asm/cache.h
11601+++ b/arch/unicore32/include/asm/cache.h
11602@@ -12,8 +12,10 @@
11603 #ifndef __UNICORE_CACHE_H__
11604 #define __UNICORE_CACHE_H__
11605
11606-#define L1_CACHE_SHIFT (5)
11607-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
11608+#include <linux/const.h>
11609+
11610+#define L1_CACHE_SHIFT 5
11611+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
11612
11613 /*
11614 * Memory returned by kmalloc() may be used for DMA, so we must make
11615diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
11616index f67e839..bfd4748 100644
11617--- a/arch/x86/Kconfig
11618+++ b/arch/x86/Kconfig
11619@@ -247,7 +247,7 @@ config X86_HT
11620
11621 config X86_32_LAZY_GS
11622 def_bool y
11623- depends on X86_32 && !CC_STACKPROTECTOR
11624+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
11625
11626 config ARCH_HWEIGHT_CFLAGS
11627 string
11628@@ -1099,6 +1099,7 @@ config MICROCODE_EARLY
11629
11630 config X86_MSR
11631 tristate "/dev/cpu/*/msr - Model-specific register support"
11632+ depends on !GRKERNSEC_KMEM
11633 ---help---
11634 This device gives privileged processes access to the x86
11635 Model-Specific Registers (MSRs). It is a character device with
11636@@ -1122,7 +1123,7 @@ choice
11637
11638 config NOHIGHMEM
11639 bool "off"
11640- depends on !X86_NUMAQ
11641+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
11642 ---help---
11643 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
11644 However, the address space of 32-bit x86 processors is only 4
11645@@ -1159,7 +1160,7 @@ config NOHIGHMEM
11646
11647 config HIGHMEM4G
11648 bool "4GB"
11649- depends on !X86_NUMAQ
11650+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
11651 ---help---
11652 Select this if you have a 32-bit processor and between 1 and 4
11653 gigabytes of physical RAM.
11654@@ -1212,7 +1213,7 @@ config PAGE_OFFSET
11655 hex
11656 default 0xB0000000 if VMSPLIT_3G_OPT
11657 default 0x80000000 if VMSPLIT_2G
11658- default 0x78000000 if VMSPLIT_2G_OPT
11659+ default 0x70000000 if VMSPLIT_2G_OPT
11660 default 0x40000000 if VMSPLIT_1G
11661 default 0xC0000000
11662 depends on X86_32
11663@@ -1614,6 +1615,7 @@ config SECCOMP
11664
11665 config CC_STACKPROTECTOR
11666 bool "Enable -fstack-protector buffer overflow detection"
11667+ depends on X86_64 || !PAX_MEMORY_UDEREF
11668 ---help---
11669 This option turns on the -fstack-protector GCC feature. This
11670 feature puts, at the beginning of functions, a canary value on
11671@@ -1632,6 +1634,7 @@ source kernel/Kconfig.hz
11672
11673 config KEXEC
11674 bool "kexec system call"
11675+ depends on !GRKERNSEC_KMEM
11676 ---help---
11677 kexec is a system call that implements the ability to shutdown your
11678 current kernel, and to start another kernel. It is like a reboot
11679@@ -1733,6 +1736,8 @@ config X86_NEED_RELOCS
11680 config PHYSICAL_ALIGN
11681 hex "Alignment value to which kernel should be aligned"
11682 default "0x1000000"
11683+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
11684+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
11685 range 0x2000 0x1000000 if X86_32
11686 range 0x200000 0x1000000 if X86_64
11687 ---help---
11688@@ -1812,9 +1817,10 @@ config DEBUG_HOTPLUG_CPU0
11689 If unsure, say N.
11690
11691 config COMPAT_VDSO
11692- def_bool y
11693+ def_bool n
11694 prompt "Compat VDSO support"
11695 depends on X86_32 || IA32_EMULATION
11696+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
11697 ---help---
11698 Map the 32-bit VDSO to the predictable old-style address too.
11699
11700diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
11701index c026cca..14657ae 100644
11702--- a/arch/x86/Kconfig.cpu
11703+++ b/arch/x86/Kconfig.cpu
11704@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
11705
11706 config X86_F00F_BUG
11707 def_bool y
11708- depends on M586MMX || M586TSC || M586 || M486
11709+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
11710
11711 config X86_INVD_BUG
11712 def_bool y
11713@@ -327,7 +327,7 @@ config X86_INVD_BUG
11714
11715 config X86_ALIGNMENT_16
11716 def_bool y
11717- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
11718+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
11719
11720 config X86_INTEL_USERCOPY
11721 def_bool y
11722@@ -373,7 +373,7 @@ config X86_CMPXCHG64
11723 # generates cmov.
11724 config X86_CMOV
11725 def_bool y
11726- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
11727+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
11728
11729 config X86_MINIMUM_CPU_FAMILY
11730 int
11731diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
11732index 78d91af..8ceb94b 100644
11733--- a/arch/x86/Kconfig.debug
11734+++ b/arch/x86/Kconfig.debug
11735@@ -74,7 +74,7 @@ config X86_PTDUMP
11736 config DEBUG_RODATA
11737 bool "Write protect kernel read-only data structures"
11738 default y
11739- depends on DEBUG_KERNEL
11740+ depends on DEBUG_KERNEL && BROKEN
11741 ---help---
11742 Mark the kernel read-only data as write-protected in the pagetables,
11743 in order to catch accidental (and incorrect) writes to such const
11744@@ -92,7 +92,7 @@ config DEBUG_RODATA_TEST
11745
11746 config DEBUG_SET_MODULE_RONX
11747 bool "Set loadable kernel module data as NX and text as RO"
11748- depends on MODULES
11749+ depends on MODULES && BROKEN
11750 ---help---
11751 This option helps catch unintended modifications to loadable
11752 kernel module's text and read-only data. It also prevents execution
11753diff --git a/arch/x86/Makefile b/arch/x86/Makefile
11754index 57d0215..b4373fb 100644
11755--- a/arch/x86/Makefile
11756+++ b/arch/x86/Makefile
11757@@ -49,14 +49,12 @@ ifeq ($(CONFIG_X86_32),y)
11758 # CPU-specific tuning. Anything which can be shared with UML should go here.
11759 include $(srctree)/arch/x86/Makefile_32.cpu
11760 KBUILD_CFLAGS += $(cflags-y)
11761-
11762- # temporary until string.h is fixed
11763- KBUILD_CFLAGS += -ffreestanding
11764 else
11765 BITS := 64
11766 UTS_MACHINE := x86_64
11767 CHECKFLAGS += -D__x86_64__ -m64
11768
11769+ biarch := $(call cc-option,-m64)
11770 KBUILD_AFLAGS += -m64
11771 KBUILD_CFLAGS += -m64
11772
11773@@ -89,6 +87,9 @@ else
11774 KBUILD_CFLAGS += -maccumulate-outgoing-args
11775 endif
11776
11777+# temporary until string.h is fixed
11778+KBUILD_CFLAGS += -ffreestanding
11779+
11780 ifdef CONFIG_CC_STACKPROTECTOR
11781 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
11782 ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)
11783@@ -247,3 +248,12 @@ define archhelp
11784 echo ' FDINITRD=file initrd for the booted kernel'
11785 echo ' kvmconfig - Enable additional options for guest kernel support'
11786 endef
11787+
11788+define OLD_LD
11789+
11790+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
11791+*** Please upgrade your binutils to 2.18 or newer
11792+endef
11793+
11794+archprepare:
11795+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
11796diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
11797index 6cf0111..f2e2398 100644
11798--- a/arch/x86/boot/Makefile
11799+++ b/arch/x86/boot/Makefile
11800@@ -65,6 +65,9 @@ KBUILD_CFLAGS := $(USERINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \
11801 $(call cc-option, -fno-unit-at-a-time)) \
11802 $(call cc-option, -fno-stack-protector) \
11803 $(call cc-option, -mpreferred-stack-boundary=2)
11804+ifdef CONSTIFY_PLUGIN
11805+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
11806+endif
11807 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
11808 GCOV_PROFILE := n
11809
11810diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
11811index 878e4b9..20537ab 100644
11812--- a/arch/x86/boot/bitops.h
11813+++ b/arch/x86/boot/bitops.h
11814@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
11815 u8 v;
11816 const u32 *p = (const u32 *)addr;
11817
11818- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
11819+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
11820 return v;
11821 }
11822
11823@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
11824
11825 static inline void set_bit(int nr, void *addr)
11826 {
11827- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
11828+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
11829 }
11830
11831 #endif /* BOOT_BITOPS_H */
11832diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
11833index ef72bae..353a184 100644
11834--- a/arch/x86/boot/boot.h
11835+++ b/arch/x86/boot/boot.h
11836@@ -85,7 +85,7 @@ static inline void io_delay(void)
11837 static inline u16 ds(void)
11838 {
11839 u16 seg;
11840- asm("movw %%ds,%0" : "=rm" (seg));
11841+ asm volatile("movw %%ds,%0" : "=rm" (seg));
11842 return seg;
11843 }
11844
11845@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
11846 static inline int memcmp(const void *s1, const void *s2, size_t len)
11847 {
11848 u8 diff;
11849- asm("repe; cmpsb; setnz %0"
11850+ asm volatile("repe; cmpsb; setnz %0"
11851 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
11852 return diff;
11853 }
11854diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
11855index c8a6792..2402765 100644
11856--- a/arch/x86/boot/compressed/Makefile
11857+++ b/arch/x86/boot/compressed/Makefile
11858@@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
11859 KBUILD_CFLAGS += -mno-mmx -mno-sse
11860 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
11861 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
11862+ifdef CONSTIFY_PLUGIN
11863+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
11864+endif
11865
11866 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
11867 GCOV_PROFILE := n
11868diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
11869index b7388a4..03844ec 100644
11870--- a/arch/x86/boot/compressed/eboot.c
11871+++ b/arch/x86/boot/compressed/eboot.c
11872@@ -150,7 +150,6 @@ again:
11873 *addr = max_addr;
11874 }
11875
11876-free_pool:
11877 efi_call_phys1(sys_table->boottime->free_pool, map);
11878
11879 fail:
11880@@ -214,7 +213,6 @@ static efi_status_t low_alloc(unsigned long size, unsigned long align,
11881 if (i == map_size / desc_size)
11882 status = EFI_NOT_FOUND;
11883
11884-free_pool:
11885 efi_call_phys1(sys_table->boottime->free_pool, map);
11886 fail:
11887 return status;
11888diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
11889index a53440e..c3dbf1e 100644
11890--- a/arch/x86/boot/compressed/efi_stub_32.S
11891+++ b/arch/x86/boot/compressed/efi_stub_32.S
11892@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
11893 * parameter 2, ..., param n. To make things easy, we save the return
11894 * address of efi_call_phys in a global variable.
11895 */
11896- popl %ecx
11897- movl %ecx, saved_return_addr(%edx)
11898- /* get the function pointer into ECX*/
11899- popl %ecx
11900- movl %ecx, efi_rt_function_ptr(%edx)
11901+ popl saved_return_addr(%edx)
11902+ popl efi_rt_function_ptr(%edx)
11903
11904 /*
11905 * 3. Call the physical function.
11906 */
11907- call *%ecx
11908+ call *efi_rt_function_ptr(%edx)
11909
11910 /*
11911 * 4. Balance the stack. And because EAX contain the return value,
11912@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
11913 1: popl %edx
11914 subl $1b, %edx
11915
11916- movl efi_rt_function_ptr(%edx), %ecx
11917- pushl %ecx
11918+ pushl efi_rt_function_ptr(%edx)
11919
11920 /*
11921 * 10. Push the saved return address onto the stack and return.
11922 */
11923- movl saved_return_addr(%edx), %ecx
11924- pushl %ecx
11925- ret
11926+ jmpl *saved_return_addr(%edx)
11927 ENDPROC(efi_call_phys)
11928 .previous
11929
11930diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
11931index 5d6f689..9d06730 100644
11932--- a/arch/x86/boot/compressed/head_32.S
11933+++ b/arch/x86/boot/compressed/head_32.S
11934@@ -118,7 +118,7 @@ preferred_addr:
11935 notl %eax
11936 andl %eax, %ebx
11937 #else
11938- movl $LOAD_PHYSICAL_ADDR, %ebx
11939+ movl $____LOAD_PHYSICAL_ADDR, %ebx
11940 #endif
11941
11942 /* Target address to relocate to for decompression */
11943diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
11944index c337422..2c5be72 100644
11945--- a/arch/x86/boot/compressed/head_64.S
11946+++ b/arch/x86/boot/compressed/head_64.S
11947@@ -95,7 +95,7 @@ ENTRY(startup_32)
11948 notl %eax
11949 andl %eax, %ebx
11950 #else
11951- movl $LOAD_PHYSICAL_ADDR, %ebx
11952+ movl $____LOAD_PHYSICAL_ADDR, %ebx
11953 #endif
11954
11955 /* Target address to relocate to for decompression */
11956@@ -270,7 +270,7 @@ preferred_addr:
11957 notq %rax
11958 andq %rax, %rbp
11959 #else
11960- movq $LOAD_PHYSICAL_ADDR, %rbp
11961+ movq $____LOAD_PHYSICAL_ADDR, %rbp
11962 #endif
11963
11964 /* Target address to relocate to for decompression */
11965@@ -362,8 +362,8 @@ gdt:
11966 .long gdt
11967 .word 0
11968 .quad 0x0000000000000000 /* NULL descriptor */
11969- .quad 0x00af9a000000ffff /* __KERNEL_CS */
11970- .quad 0x00cf92000000ffff /* __KERNEL_DS */
11971+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
11972+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
11973 .quad 0x0080890000000000 /* TS descriptor */
11974 .quad 0x0000000000000000 /* TS continued */
11975 gdt_end:
11976diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
11977index 434f077..b6b4b38 100644
11978--- a/arch/x86/boot/compressed/misc.c
11979+++ b/arch/x86/boot/compressed/misc.c
11980@@ -283,7 +283,7 @@ static void handle_relocations(void *output, unsigned long output_len)
11981 * Calculate the delta between where vmlinux was linked to load
11982 * and where it was actually loaded.
11983 */
11984- delta = min_addr - LOAD_PHYSICAL_ADDR;
11985+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
11986 if (!delta) {
11987 debug_putstr("No relocation needed... ");
11988 return;
11989@@ -380,7 +380,7 @@ static void parse_elf(void *output)
11990 case PT_LOAD:
11991 #ifdef CONFIG_RELOCATABLE
11992 dest = output;
11993- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
11994+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
11995 #else
11996 dest = (void *)(phdr->p_paddr);
11997 #endif
11998@@ -432,7 +432,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
11999 error("Destination address too large");
12000 #endif
12001 #ifndef CONFIG_RELOCATABLE
12002- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12003+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12004 error("Wrong destination address");
12005 #endif
12006
12007diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12008index 4d3ff03..e4972ff 100644
12009--- a/arch/x86/boot/cpucheck.c
12010+++ b/arch/x86/boot/cpucheck.c
12011@@ -74,7 +74,7 @@ static int has_fpu(void)
12012 u16 fcw = -1, fsw = -1;
12013 u32 cr0;
12014
12015- asm("movl %%cr0,%0" : "=r" (cr0));
12016+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
12017 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
12018 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
12019 asm volatile("movl %0,%%cr0" : : "r" (cr0));
12020@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
12021 {
12022 u32 f0, f1;
12023
12024- asm("pushfl ; "
12025+ asm volatile("pushfl ; "
12026 "pushfl ; "
12027 "popl %0 ; "
12028 "movl %0,%1 ; "
12029@@ -115,7 +115,7 @@ static void get_flags(void)
12030 set_bit(X86_FEATURE_FPU, cpu.flags);
12031
12032 if (has_eflag(X86_EFLAGS_ID)) {
12033- asm("cpuid"
12034+ asm volatile("cpuid"
12035 : "=a" (max_intel_level),
12036 "=b" (cpu_vendor[0]),
12037 "=d" (cpu_vendor[1]),
12038@@ -124,7 +124,7 @@ static void get_flags(void)
12039
12040 if (max_intel_level >= 0x00000001 &&
12041 max_intel_level <= 0x0000ffff) {
12042- asm("cpuid"
12043+ asm volatile("cpuid"
12044 : "=a" (tfms),
12045 "=c" (cpu.flags[4]),
12046 "=d" (cpu.flags[0])
12047@@ -136,7 +136,7 @@ static void get_flags(void)
12048 cpu.model += ((tfms >> 16) & 0xf) << 4;
12049 }
12050
12051- asm("cpuid"
12052+ asm volatile("cpuid"
12053 : "=a" (max_amd_level)
12054 : "a" (0x80000000)
12055 : "ebx", "ecx", "edx");
12056@@ -144,7 +144,7 @@ static void get_flags(void)
12057 if (max_amd_level >= 0x80000001 &&
12058 max_amd_level <= 0x8000ffff) {
12059 u32 eax = 0x80000001;
12060- asm("cpuid"
12061+ asm volatile("cpuid"
12062 : "+a" (eax),
12063 "=c" (cpu.flags[6]),
12064 "=d" (cpu.flags[1])
12065@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12066 u32 ecx = MSR_K7_HWCR;
12067 u32 eax, edx;
12068
12069- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12070+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12071 eax &= ~(1 << 15);
12072- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12073+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12074
12075 get_flags(); /* Make sure it really did something */
12076 err = check_flags();
12077@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12078 u32 ecx = MSR_VIA_FCR;
12079 u32 eax, edx;
12080
12081- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12082+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12083 eax |= (1<<1)|(1<<7);
12084- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12085+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12086
12087 set_bit(X86_FEATURE_CX8, cpu.flags);
12088 err = check_flags();
12089@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12090 u32 eax, edx;
12091 u32 level = 1;
12092
12093- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12094- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12095- asm("cpuid"
12096+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12097+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12098+ asm volatile("cpuid"
12099 : "+a" (level), "=d" (cpu.flags[0])
12100 : : "ecx", "ebx");
12101- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12102+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12103
12104 err = check_flags();
12105 }
12106diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12107index 9ec06a1..2c25e79 100644
12108--- a/arch/x86/boot/header.S
12109+++ b/arch/x86/boot/header.S
12110@@ -409,10 +409,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12111 # single linked list of
12112 # struct setup_data
12113
12114-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12115+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12116
12117 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12118+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12119+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12120+#else
12121 #define VO_INIT_SIZE (VO__end - VO__text)
12122+#endif
12123 #if ZO_INIT_SIZE > VO_INIT_SIZE
12124 #define INIT_SIZE ZO_INIT_SIZE
12125 #else
12126diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12127index db75d07..8e6d0af 100644
12128--- a/arch/x86/boot/memory.c
12129+++ b/arch/x86/boot/memory.c
12130@@ -19,7 +19,7 @@
12131
12132 static int detect_memory_e820(void)
12133 {
12134- int count = 0;
12135+ unsigned int count = 0;
12136 struct biosregs ireg, oreg;
12137 struct e820entry *desc = boot_params.e820_map;
12138 static struct e820entry buf; /* static so it is zeroed */
12139diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12140index 11e8c6e..fdbb1ed 100644
12141--- a/arch/x86/boot/video-vesa.c
12142+++ b/arch/x86/boot/video-vesa.c
12143@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
12144
12145 boot_params.screen_info.vesapm_seg = oreg.es;
12146 boot_params.screen_info.vesapm_off = oreg.di;
12147+ boot_params.screen_info.vesapm_size = oreg.cx;
12148 }
12149
12150 /*
12151diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
12152index 43eda28..5ab5fdb 100644
12153--- a/arch/x86/boot/video.c
12154+++ b/arch/x86/boot/video.c
12155@@ -96,7 +96,7 @@ static void store_mode_params(void)
12156 static unsigned int get_entry(void)
12157 {
12158 char entry_buf[4];
12159- int i, len = 0;
12160+ unsigned int i, len = 0;
12161 int key;
12162 unsigned int v;
12163
12164diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
12165index 9105655..41779c1 100644
12166--- a/arch/x86/crypto/aes-x86_64-asm_64.S
12167+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
12168@@ -8,6 +8,8 @@
12169 * including this sentence is retained in full.
12170 */
12171
12172+#include <asm/alternative-asm.h>
12173+
12174 .extern crypto_ft_tab
12175 .extern crypto_it_tab
12176 .extern crypto_fl_tab
12177@@ -70,6 +72,8 @@
12178 je B192; \
12179 leaq 32(r9),r9;
12180
12181+#define ret pax_force_retaddr; ret
12182+
12183 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
12184 movq r1,r2; \
12185 movq r3,r4; \
12186diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
12187index 477e9d7..c92c7d8 100644
12188--- a/arch/x86/crypto/aesni-intel_asm.S
12189+++ b/arch/x86/crypto/aesni-intel_asm.S
12190@@ -31,6 +31,7 @@
12191
12192 #include <linux/linkage.h>
12193 #include <asm/inst.h>
12194+#include <asm/alternative-asm.h>
12195
12196 #ifdef __x86_64__
12197 .data
12198@@ -205,7 +206,7 @@ enc: .octa 0x2
12199 * num_initial_blocks = b mod 4
12200 * encrypt the initial num_initial_blocks blocks and apply ghash on
12201 * the ciphertext
12202-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12203+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12204 * are clobbered
12205 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12206 */
12207@@ -214,8 +215,8 @@ enc: .octa 0x2
12208 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12209 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12210 mov arg7, %r10 # %r10 = AAD
12211- mov arg8, %r12 # %r12 = aadLen
12212- mov %r12, %r11
12213+ mov arg8, %r15 # %r15 = aadLen
12214+ mov %r15, %r11
12215 pxor %xmm\i, %xmm\i
12216 _get_AAD_loop\num_initial_blocks\operation:
12217 movd (%r10), \TMP1
12218@@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12219 psrldq $4, %xmm\i
12220 pxor \TMP1, %xmm\i
12221 add $4, %r10
12222- sub $4, %r12
12223+ sub $4, %r15
12224 jne _get_AAD_loop\num_initial_blocks\operation
12225 cmp $16, %r11
12226 je _get_AAD_loop2_done\num_initial_blocks\operation
12227- mov $16, %r12
12228+ mov $16, %r15
12229 _get_AAD_loop2\num_initial_blocks\operation:
12230 psrldq $4, %xmm\i
12231- sub $4, %r12
12232- cmp %r11, %r12
12233+ sub $4, %r15
12234+ cmp %r11, %r15
12235 jne _get_AAD_loop2\num_initial_blocks\operation
12236 _get_AAD_loop2_done\num_initial_blocks\operation:
12237 movdqa SHUF_MASK(%rip), %xmm14
12238@@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
12239 * num_initial_blocks = b mod 4
12240 * encrypt the initial num_initial_blocks blocks and apply ghash on
12241 * the ciphertext
12242-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12243+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12244 * are clobbered
12245 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12246 */
12247@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
12248 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12249 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12250 mov arg7, %r10 # %r10 = AAD
12251- mov arg8, %r12 # %r12 = aadLen
12252- mov %r12, %r11
12253+ mov arg8, %r15 # %r15 = aadLen
12254+ mov %r15, %r11
12255 pxor %xmm\i, %xmm\i
12256 _get_AAD_loop\num_initial_blocks\operation:
12257 movd (%r10), \TMP1
12258@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12259 psrldq $4, %xmm\i
12260 pxor \TMP1, %xmm\i
12261 add $4, %r10
12262- sub $4, %r12
12263+ sub $4, %r15
12264 jne _get_AAD_loop\num_initial_blocks\operation
12265 cmp $16, %r11
12266 je _get_AAD_loop2_done\num_initial_blocks\operation
12267- mov $16, %r12
12268+ mov $16, %r15
12269 _get_AAD_loop2\num_initial_blocks\operation:
12270 psrldq $4, %xmm\i
12271- sub $4, %r12
12272- cmp %r11, %r12
12273+ sub $4, %r15
12274+ cmp %r11, %r15
12275 jne _get_AAD_loop2\num_initial_blocks\operation
12276 _get_AAD_loop2_done\num_initial_blocks\operation:
12277 movdqa SHUF_MASK(%rip), %xmm14
12278@@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
12279 *
12280 *****************************************************************************/
12281 ENTRY(aesni_gcm_dec)
12282- push %r12
12283+ push %r15
12284 push %r13
12285 push %r14
12286 mov %rsp, %r14
12287@@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
12288 */
12289 sub $VARIABLE_OFFSET, %rsp
12290 and $~63, %rsp # align rsp to 64 bytes
12291- mov %arg6, %r12
12292- movdqu (%r12), %xmm13 # %xmm13 = HashKey
12293+ mov %arg6, %r15
12294+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
12295 movdqa SHUF_MASK(%rip), %xmm2
12296 PSHUFB_XMM %xmm2, %xmm13
12297
12298@@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
12299 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
12300 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
12301 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
12302- mov %r13, %r12
12303- and $(3<<4), %r12
12304+ mov %r13, %r15
12305+ and $(3<<4), %r15
12306 jz _initial_num_blocks_is_0_decrypt
12307- cmp $(2<<4), %r12
12308+ cmp $(2<<4), %r15
12309 jb _initial_num_blocks_is_1_decrypt
12310 je _initial_num_blocks_is_2_decrypt
12311 _initial_num_blocks_is_3_decrypt:
12312@@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
12313 sub $16, %r11
12314 add %r13, %r11
12315 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
12316- lea SHIFT_MASK+16(%rip), %r12
12317- sub %r13, %r12
12318+ lea SHIFT_MASK+16(%rip), %r15
12319+ sub %r13, %r15
12320 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
12321 # (%r13 is the number of bytes in plaintext mod 16)
12322- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
12323+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
12324 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
12325
12326 movdqa %xmm1, %xmm2
12327 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
12328- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
12329+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
12330 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
12331 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
12332 pand %xmm1, %xmm2
12333@@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
12334 sub $1, %r13
12335 jne _less_than_8_bytes_left_decrypt
12336 _multiple_of_16_bytes_decrypt:
12337- mov arg8, %r12 # %r13 = aadLen (number of bytes)
12338- shl $3, %r12 # convert into number of bits
12339- movd %r12d, %xmm15 # len(A) in %xmm15
12340+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
12341+ shl $3, %r15 # convert into number of bits
12342+ movd %r15d, %xmm15 # len(A) in %xmm15
12343 shl $3, %arg4 # len(C) in bits (*128)
12344 MOVQ_R64_XMM %arg4, %xmm1
12345 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
12346@@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
12347 mov %r14, %rsp
12348 pop %r14
12349 pop %r13
12350- pop %r12
12351+ pop %r15
12352+ pax_force_retaddr
12353 ret
12354 ENDPROC(aesni_gcm_dec)
12355
12356@@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
12357 * poly = x^128 + x^127 + x^126 + x^121 + 1
12358 ***************************************************************************/
12359 ENTRY(aesni_gcm_enc)
12360- push %r12
12361+ push %r15
12362 push %r13
12363 push %r14
12364 mov %rsp, %r14
12365@@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
12366 #
12367 sub $VARIABLE_OFFSET, %rsp
12368 and $~63, %rsp
12369- mov %arg6, %r12
12370- movdqu (%r12), %xmm13
12371+ mov %arg6, %r15
12372+ movdqu (%r15), %xmm13
12373 movdqa SHUF_MASK(%rip), %xmm2
12374 PSHUFB_XMM %xmm2, %xmm13
12375
12376@@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
12377 movdqa %xmm13, HashKey(%rsp)
12378 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
12379 and $-16, %r13
12380- mov %r13, %r12
12381+ mov %r13, %r15
12382
12383 # Encrypt first few blocks
12384
12385- and $(3<<4), %r12
12386+ and $(3<<4), %r15
12387 jz _initial_num_blocks_is_0_encrypt
12388- cmp $(2<<4), %r12
12389+ cmp $(2<<4), %r15
12390 jb _initial_num_blocks_is_1_encrypt
12391 je _initial_num_blocks_is_2_encrypt
12392 _initial_num_blocks_is_3_encrypt:
12393@@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
12394 sub $16, %r11
12395 add %r13, %r11
12396 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
12397- lea SHIFT_MASK+16(%rip), %r12
12398- sub %r13, %r12
12399+ lea SHIFT_MASK+16(%rip), %r15
12400+ sub %r13, %r15
12401 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
12402 # (%r13 is the number of bytes in plaintext mod 16)
12403- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
12404+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
12405 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
12406 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
12407- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
12408+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
12409 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
12410 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
12411 movdqa SHUF_MASK(%rip), %xmm10
12412@@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
12413 sub $1, %r13
12414 jne _less_than_8_bytes_left_encrypt
12415 _multiple_of_16_bytes_encrypt:
12416- mov arg8, %r12 # %r12 = addLen (number of bytes)
12417- shl $3, %r12
12418- movd %r12d, %xmm15 # len(A) in %xmm15
12419+ mov arg8, %r15 # %r15 = addLen (number of bytes)
12420+ shl $3, %r15
12421+ movd %r15d, %xmm15 # len(A) in %xmm15
12422 shl $3, %arg4 # len(C) in bits (*128)
12423 MOVQ_R64_XMM %arg4, %xmm1
12424 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
12425@@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
12426 mov %r14, %rsp
12427 pop %r14
12428 pop %r13
12429- pop %r12
12430+ pop %r15
12431+ pax_force_retaddr
12432 ret
12433 ENDPROC(aesni_gcm_enc)
12434
12435@@ -1722,6 +1725,7 @@ _key_expansion_256a:
12436 pxor %xmm1, %xmm0
12437 movaps %xmm0, (TKEYP)
12438 add $0x10, TKEYP
12439+ pax_force_retaddr
12440 ret
12441 ENDPROC(_key_expansion_128)
12442 ENDPROC(_key_expansion_256a)
12443@@ -1748,6 +1752,7 @@ _key_expansion_192a:
12444 shufps $0b01001110, %xmm2, %xmm1
12445 movaps %xmm1, 0x10(TKEYP)
12446 add $0x20, TKEYP
12447+ pax_force_retaddr
12448 ret
12449 ENDPROC(_key_expansion_192a)
12450
12451@@ -1768,6 +1773,7 @@ _key_expansion_192b:
12452
12453 movaps %xmm0, (TKEYP)
12454 add $0x10, TKEYP
12455+ pax_force_retaddr
12456 ret
12457 ENDPROC(_key_expansion_192b)
12458
12459@@ -1781,6 +1787,7 @@ _key_expansion_256b:
12460 pxor %xmm1, %xmm2
12461 movaps %xmm2, (TKEYP)
12462 add $0x10, TKEYP
12463+ pax_force_retaddr
12464 ret
12465 ENDPROC(_key_expansion_256b)
12466
12467@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
12468 #ifndef __x86_64__
12469 popl KEYP
12470 #endif
12471+ pax_force_retaddr
12472 ret
12473 ENDPROC(aesni_set_key)
12474
12475@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
12476 popl KLEN
12477 popl KEYP
12478 #endif
12479+ pax_force_retaddr
12480 ret
12481 ENDPROC(aesni_enc)
12482
12483@@ -1974,6 +1983,7 @@ _aesni_enc1:
12484 AESENC KEY STATE
12485 movaps 0x70(TKEYP), KEY
12486 AESENCLAST KEY STATE
12487+ pax_force_retaddr
12488 ret
12489 ENDPROC(_aesni_enc1)
12490
12491@@ -2083,6 +2093,7 @@ _aesni_enc4:
12492 AESENCLAST KEY STATE2
12493 AESENCLAST KEY STATE3
12494 AESENCLAST KEY STATE4
12495+ pax_force_retaddr
12496 ret
12497 ENDPROC(_aesni_enc4)
12498
12499@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
12500 popl KLEN
12501 popl KEYP
12502 #endif
12503+ pax_force_retaddr
12504 ret
12505 ENDPROC(aesni_dec)
12506
12507@@ -2164,6 +2176,7 @@ _aesni_dec1:
12508 AESDEC KEY STATE
12509 movaps 0x70(TKEYP), KEY
12510 AESDECLAST KEY STATE
12511+ pax_force_retaddr
12512 ret
12513 ENDPROC(_aesni_dec1)
12514
12515@@ -2273,6 +2286,7 @@ _aesni_dec4:
12516 AESDECLAST KEY STATE2
12517 AESDECLAST KEY STATE3
12518 AESDECLAST KEY STATE4
12519+ pax_force_retaddr
12520 ret
12521 ENDPROC(_aesni_dec4)
12522
12523@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
12524 popl KEYP
12525 popl LEN
12526 #endif
12527+ pax_force_retaddr
12528 ret
12529 ENDPROC(aesni_ecb_enc)
12530
12531@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
12532 popl KEYP
12533 popl LEN
12534 #endif
12535+ pax_force_retaddr
12536 ret
12537 ENDPROC(aesni_ecb_dec)
12538
12539@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
12540 popl LEN
12541 popl IVP
12542 #endif
12543+ pax_force_retaddr
12544 ret
12545 ENDPROC(aesni_cbc_enc)
12546
12547@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
12548 popl LEN
12549 popl IVP
12550 #endif
12551+ pax_force_retaddr
12552 ret
12553 ENDPROC(aesni_cbc_dec)
12554
12555@@ -2550,6 +2568,7 @@ _aesni_inc_init:
12556 mov $1, TCTR_LOW
12557 MOVQ_R64_XMM TCTR_LOW INC
12558 MOVQ_R64_XMM CTR TCTR_LOW
12559+ pax_force_retaddr
12560 ret
12561 ENDPROC(_aesni_inc_init)
12562
12563@@ -2579,6 +2598,7 @@ _aesni_inc:
12564 .Linc_low:
12565 movaps CTR, IV
12566 PSHUFB_XMM BSWAP_MASK IV
12567+ pax_force_retaddr
12568 ret
12569 ENDPROC(_aesni_inc)
12570
12571@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
12572 .Lctr_enc_ret:
12573 movups IV, (IVP)
12574 .Lctr_enc_just_ret:
12575+ pax_force_retaddr
12576 ret
12577 ENDPROC(aesni_ctr_enc)
12578
12579@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
12580 pxor INC, STATE4
12581 movdqu STATE4, 0x70(OUTP)
12582
12583+ pax_force_retaddr
12584 ret
12585 ENDPROC(aesni_xts_crypt8)
12586
12587diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
12588index 246c670..466e2d6 100644
12589--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
12590+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
12591@@ -21,6 +21,7 @@
12592 */
12593
12594 #include <linux/linkage.h>
12595+#include <asm/alternative-asm.h>
12596
12597 .file "blowfish-x86_64-asm.S"
12598 .text
12599@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
12600 jnz .L__enc_xor;
12601
12602 write_block();
12603+ pax_force_retaddr
12604 ret;
12605 .L__enc_xor:
12606 xor_block();
12607+ pax_force_retaddr
12608 ret;
12609 ENDPROC(__blowfish_enc_blk)
12610
12611@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
12612
12613 movq %r11, %rbp;
12614
12615+ pax_force_retaddr
12616 ret;
12617 ENDPROC(blowfish_dec_blk)
12618
12619@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
12620
12621 popq %rbx;
12622 popq %rbp;
12623+ pax_force_retaddr
12624 ret;
12625
12626 .L__enc_xor4:
12627@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
12628
12629 popq %rbx;
12630 popq %rbp;
12631+ pax_force_retaddr
12632 ret;
12633 ENDPROC(__blowfish_enc_blk_4way)
12634
12635@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
12636 popq %rbx;
12637 popq %rbp;
12638
12639+ pax_force_retaddr
12640 ret;
12641 ENDPROC(blowfish_dec_blk_4way)
12642diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
12643index ce71f92..1dce7ec 100644
12644--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
12645+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
12646@@ -16,6 +16,7 @@
12647 */
12648
12649 #include <linux/linkage.h>
12650+#include <asm/alternative-asm.h>
12651
12652 #define CAMELLIA_TABLE_BYTE_LEN 272
12653
12654@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
12655 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
12656 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
12657 %rcx, (%r9));
12658+ pax_force_retaddr
12659 ret;
12660 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
12661
12662@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
12663 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
12664 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
12665 %rax, (%r9));
12666+ pax_force_retaddr
12667 ret;
12668 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
12669
12670@@ -780,6 +783,7 @@ __camellia_enc_blk16:
12671 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
12672 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
12673
12674+ pax_force_retaddr
12675 ret;
12676
12677 .align 8
12678@@ -865,6 +869,7 @@ __camellia_dec_blk16:
12679 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
12680 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
12681
12682+ pax_force_retaddr
12683 ret;
12684
12685 .align 8
12686@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
12687 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12688 %xmm8, %rsi);
12689
12690+ pax_force_retaddr
12691 ret;
12692 ENDPROC(camellia_ecb_enc_16way)
12693
12694@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
12695 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12696 %xmm8, %rsi);
12697
12698+ pax_force_retaddr
12699 ret;
12700 ENDPROC(camellia_ecb_dec_16way)
12701
12702@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
12703 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12704 %xmm8, %rsi);
12705
12706+ pax_force_retaddr
12707 ret;
12708 ENDPROC(camellia_cbc_dec_16way)
12709
12710@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
12711 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12712 %xmm8, %rsi);
12713
12714+ pax_force_retaddr
12715 ret;
12716 ENDPROC(camellia_ctr_16way)
12717
12718@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
12719 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
12720 %xmm8, %rsi);
12721
12722+ pax_force_retaddr
12723 ret;
12724 ENDPROC(camellia_xts_crypt_16way)
12725
12726diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
12727index 0e0b886..5a3123c 100644
12728--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
12729+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
12730@@ -11,6 +11,7 @@
12731 */
12732
12733 #include <linux/linkage.h>
12734+#include <asm/alternative-asm.h>
12735
12736 #define CAMELLIA_TABLE_BYTE_LEN 272
12737
12738@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
12739 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
12740 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
12741 %rcx, (%r9));
12742+ pax_force_retaddr
12743 ret;
12744 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
12745
12746@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
12747 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
12748 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
12749 %rax, (%r9));
12750+ pax_force_retaddr
12751 ret;
12752 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
12753
12754@@ -820,6 +823,7 @@ __camellia_enc_blk32:
12755 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
12756 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
12757
12758+ pax_force_retaddr
12759 ret;
12760
12761 .align 8
12762@@ -905,6 +909,7 @@ __camellia_dec_blk32:
12763 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
12764 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
12765
12766+ pax_force_retaddr
12767 ret;
12768
12769 .align 8
12770@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
12771
12772 vzeroupper;
12773
12774+ pax_force_retaddr
12775 ret;
12776 ENDPROC(camellia_ecb_enc_32way)
12777
12778@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
12779
12780 vzeroupper;
12781
12782+ pax_force_retaddr
12783 ret;
12784 ENDPROC(camellia_ecb_dec_32way)
12785
12786@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
12787
12788 vzeroupper;
12789
12790+ pax_force_retaddr
12791 ret;
12792 ENDPROC(camellia_cbc_dec_32way)
12793
12794@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
12795
12796 vzeroupper;
12797
12798+ pax_force_retaddr
12799 ret;
12800 ENDPROC(camellia_ctr_32way)
12801
12802@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
12803
12804 vzeroupper;
12805
12806+ pax_force_retaddr
12807 ret;
12808 ENDPROC(camellia_xts_crypt_32way)
12809
12810diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
12811index 310319c..db3d7b5 100644
12812--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
12813+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
12814@@ -21,6 +21,7 @@
12815 */
12816
12817 #include <linux/linkage.h>
12818+#include <asm/alternative-asm.h>
12819
12820 .file "camellia-x86_64-asm_64.S"
12821 .text
12822@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
12823 enc_outunpack(mov, RT1);
12824
12825 movq RRBP, %rbp;
12826+ pax_force_retaddr
12827 ret;
12828
12829 .L__enc_xor:
12830 enc_outunpack(xor, RT1);
12831
12832 movq RRBP, %rbp;
12833+ pax_force_retaddr
12834 ret;
12835 ENDPROC(__camellia_enc_blk)
12836
12837@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
12838 dec_outunpack();
12839
12840 movq RRBP, %rbp;
12841+ pax_force_retaddr
12842 ret;
12843 ENDPROC(camellia_dec_blk)
12844
12845@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
12846
12847 movq RRBP, %rbp;
12848 popq %rbx;
12849+ pax_force_retaddr
12850 ret;
12851
12852 .L__enc2_xor:
12853@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
12854
12855 movq RRBP, %rbp;
12856 popq %rbx;
12857+ pax_force_retaddr
12858 ret;
12859 ENDPROC(__camellia_enc_blk_2way)
12860
12861@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
12862
12863 movq RRBP, %rbp;
12864 movq RXOR, %rbx;
12865+ pax_force_retaddr
12866 ret;
12867 ENDPROC(camellia_dec_blk_2way)
12868diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
12869index c35fd5d..2d8c7db 100644
12870--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
12871+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
12872@@ -24,6 +24,7 @@
12873 */
12874
12875 #include <linux/linkage.h>
12876+#include <asm/alternative-asm.h>
12877
12878 .file "cast5-avx-x86_64-asm_64.S"
12879
12880@@ -281,6 +282,7 @@ __cast5_enc_blk16:
12881 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
12882 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
12883
12884+ pax_force_retaddr
12885 ret;
12886 ENDPROC(__cast5_enc_blk16)
12887
12888@@ -352,6 +354,7 @@ __cast5_dec_blk16:
12889 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
12890 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
12891
12892+ pax_force_retaddr
12893 ret;
12894
12895 .L__skip_dec:
12896@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
12897 vmovdqu RR4, (6*4*4)(%r11);
12898 vmovdqu RL4, (7*4*4)(%r11);
12899
12900+ pax_force_retaddr
12901 ret;
12902 ENDPROC(cast5_ecb_enc_16way)
12903
12904@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
12905 vmovdqu RR4, (6*4*4)(%r11);
12906 vmovdqu RL4, (7*4*4)(%r11);
12907
12908+ pax_force_retaddr
12909 ret;
12910 ENDPROC(cast5_ecb_dec_16way)
12911
12912@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
12913 * %rdx: src
12914 */
12915
12916- pushq %r12;
12917+ pushq %r14;
12918
12919 movq %rsi, %r11;
12920- movq %rdx, %r12;
12921+ movq %rdx, %r14;
12922
12923 vmovdqu (0*16)(%rdx), RL1;
12924 vmovdqu (1*16)(%rdx), RR1;
12925@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
12926 call __cast5_dec_blk16;
12927
12928 /* xor with src */
12929- vmovq (%r12), RX;
12930+ vmovq (%r14), RX;
12931 vpshufd $0x4f, RX, RX;
12932 vpxor RX, RR1, RR1;
12933- vpxor 0*16+8(%r12), RL1, RL1;
12934- vpxor 1*16+8(%r12), RR2, RR2;
12935- vpxor 2*16+8(%r12), RL2, RL2;
12936- vpxor 3*16+8(%r12), RR3, RR3;
12937- vpxor 4*16+8(%r12), RL3, RL3;
12938- vpxor 5*16+8(%r12), RR4, RR4;
12939- vpxor 6*16+8(%r12), RL4, RL4;
12940+ vpxor 0*16+8(%r14), RL1, RL1;
12941+ vpxor 1*16+8(%r14), RR2, RR2;
12942+ vpxor 2*16+8(%r14), RL2, RL2;
12943+ vpxor 3*16+8(%r14), RR3, RR3;
12944+ vpxor 4*16+8(%r14), RL3, RL3;
12945+ vpxor 5*16+8(%r14), RR4, RR4;
12946+ vpxor 6*16+8(%r14), RL4, RL4;
12947
12948 vmovdqu RR1, (0*16)(%r11);
12949 vmovdqu RL1, (1*16)(%r11);
12950@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
12951 vmovdqu RR4, (6*16)(%r11);
12952 vmovdqu RL4, (7*16)(%r11);
12953
12954- popq %r12;
12955+ popq %r14;
12956
12957+ pax_force_retaddr
12958 ret;
12959 ENDPROC(cast5_cbc_dec_16way)
12960
12961@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
12962 * %rcx: iv (big endian, 64bit)
12963 */
12964
12965- pushq %r12;
12966+ pushq %r14;
12967
12968 movq %rsi, %r11;
12969- movq %rdx, %r12;
12970+ movq %rdx, %r14;
12971
12972 vpcmpeqd RTMP, RTMP, RTMP;
12973 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
12974@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
12975 call __cast5_enc_blk16;
12976
12977 /* dst = src ^ iv */
12978- vpxor (0*16)(%r12), RR1, RR1;
12979- vpxor (1*16)(%r12), RL1, RL1;
12980- vpxor (2*16)(%r12), RR2, RR2;
12981- vpxor (3*16)(%r12), RL2, RL2;
12982- vpxor (4*16)(%r12), RR3, RR3;
12983- vpxor (5*16)(%r12), RL3, RL3;
12984- vpxor (6*16)(%r12), RR4, RR4;
12985- vpxor (7*16)(%r12), RL4, RL4;
12986+ vpxor (0*16)(%r14), RR1, RR1;
12987+ vpxor (1*16)(%r14), RL1, RL1;
12988+ vpxor (2*16)(%r14), RR2, RR2;
12989+ vpxor (3*16)(%r14), RL2, RL2;
12990+ vpxor (4*16)(%r14), RR3, RR3;
12991+ vpxor (5*16)(%r14), RL3, RL3;
12992+ vpxor (6*16)(%r14), RR4, RR4;
12993+ vpxor (7*16)(%r14), RL4, RL4;
12994 vmovdqu RR1, (0*16)(%r11);
12995 vmovdqu RL1, (1*16)(%r11);
12996 vmovdqu RR2, (2*16)(%r11);
12997@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
12998 vmovdqu RR4, (6*16)(%r11);
12999 vmovdqu RL4, (7*16)(%r11);
13000
13001- popq %r12;
13002+ popq %r14;
13003
13004+ pax_force_retaddr
13005 ret;
13006 ENDPROC(cast5_ctr_16way)
13007diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13008index e3531f8..e123f35 100644
13009--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13010+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13011@@ -24,6 +24,7 @@
13012 */
13013
13014 #include <linux/linkage.h>
13015+#include <asm/alternative-asm.h>
13016 #include "glue_helper-asm-avx.S"
13017
13018 .file "cast6-avx-x86_64-asm_64.S"
13019@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13020 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13021 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13022
13023+ pax_force_retaddr
13024 ret;
13025 ENDPROC(__cast6_enc_blk8)
13026
13027@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13028 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13029 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13030
13031+ pax_force_retaddr
13032 ret;
13033 ENDPROC(__cast6_dec_blk8)
13034
13035@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13036
13037 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13038
13039+ pax_force_retaddr
13040 ret;
13041 ENDPROC(cast6_ecb_enc_8way)
13042
13043@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13044
13045 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13046
13047+ pax_force_retaddr
13048 ret;
13049 ENDPROC(cast6_ecb_dec_8way)
13050
13051@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13052 * %rdx: src
13053 */
13054
13055- pushq %r12;
13056+ pushq %r14;
13057
13058 movq %rsi, %r11;
13059- movq %rdx, %r12;
13060+ movq %rdx, %r14;
13061
13062 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13063
13064 call __cast6_dec_blk8;
13065
13066- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13067+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13068
13069- popq %r12;
13070+ popq %r14;
13071
13072+ pax_force_retaddr
13073 ret;
13074 ENDPROC(cast6_cbc_dec_8way)
13075
13076@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13077 * %rcx: iv (little endian, 128bit)
13078 */
13079
13080- pushq %r12;
13081+ pushq %r14;
13082
13083 movq %rsi, %r11;
13084- movq %rdx, %r12;
13085+ movq %rdx, %r14;
13086
13087 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13088 RD2, RX, RKR, RKM);
13089
13090 call __cast6_enc_blk8;
13091
13092- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13093+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13094
13095- popq %r12;
13096+ popq %r14;
13097
13098+ pax_force_retaddr
13099 ret;
13100 ENDPROC(cast6_ctr_8way)
13101
13102@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13103 /* dst <= regs xor IVs(in dst) */
13104 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13105
13106+ pax_force_retaddr
13107 ret;
13108 ENDPROC(cast6_xts_enc_8way)
13109
13110@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13111 /* dst <= regs xor IVs(in dst) */
13112 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13113
13114+ pax_force_retaddr
13115 ret;
13116 ENDPROC(cast6_xts_dec_8way)
13117diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13118index dbc4339..de6e120 100644
13119--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13120+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13121@@ -45,6 +45,7 @@
13122
13123 #include <asm/inst.h>
13124 #include <linux/linkage.h>
13125+#include <asm/alternative-asm.h>
13126
13127 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13128
13129@@ -312,6 +313,7 @@ do_return:
13130 popq %rsi
13131 popq %rdi
13132 popq %rbx
13133+ pax_force_retaddr
13134 ret
13135
13136 ################################################################
13137diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13138index 586f41a..d02851e 100644
13139--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
13140+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13141@@ -18,6 +18,7 @@
13142
13143 #include <linux/linkage.h>
13144 #include <asm/inst.h>
13145+#include <asm/alternative-asm.h>
13146
13147 .data
13148
13149@@ -93,6 +94,7 @@ __clmul_gf128mul_ble:
13150 psrlq $1, T2
13151 pxor T2, T1
13152 pxor T1, DATA
13153+ pax_force_retaddr
13154 ret
13155 ENDPROC(__clmul_gf128mul_ble)
13156
13157@@ -105,6 +107,7 @@ ENTRY(clmul_ghash_mul)
13158 call __clmul_gf128mul_ble
13159 PSHUFB_XMM BSWAP DATA
13160 movups DATA, (%rdi)
13161+ pax_force_retaddr
13162 ret
13163 ENDPROC(clmul_ghash_mul)
13164
13165@@ -132,6 +135,7 @@ ENTRY(clmul_ghash_update)
13166 PSHUFB_XMM BSWAP DATA
13167 movups DATA, (%rdi)
13168 .Lupdate_just_ret:
13169+ pax_force_retaddr
13170 ret
13171 ENDPROC(clmul_ghash_update)
13172
13173@@ -157,5 +161,6 @@ ENTRY(clmul_ghash_setkey)
13174 pand .Lpoly, %xmm1
13175 pxor %xmm1, %xmm0
13176 movups %xmm0, (%rdi)
13177+ pax_force_retaddr
13178 ret
13179 ENDPROC(clmul_ghash_setkey)
13180diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13181index 9279e0b..c4b3d2c 100644
13182--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
13183+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13184@@ -1,4 +1,5 @@
13185 #include <linux/linkage.h>
13186+#include <asm/alternative-asm.h>
13187
13188 # enter salsa20_encrypt_bytes
13189 ENTRY(salsa20_encrypt_bytes)
13190@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
13191 add %r11,%rsp
13192 mov %rdi,%rax
13193 mov %rsi,%rdx
13194+ pax_force_retaddr
13195 ret
13196 # bytesatleast65:
13197 ._bytesatleast65:
13198@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
13199 add %r11,%rsp
13200 mov %rdi,%rax
13201 mov %rsi,%rdx
13202+ pax_force_retaddr
13203 ret
13204 ENDPROC(salsa20_keysetup)
13205
13206@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
13207 add %r11,%rsp
13208 mov %rdi,%rax
13209 mov %rsi,%rdx
13210+ pax_force_retaddr
13211 ret
13212 ENDPROC(salsa20_ivsetup)
13213diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13214index 2f202f4..d9164d6 100644
13215--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13216+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13217@@ -24,6 +24,7 @@
13218 */
13219
13220 #include <linux/linkage.h>
13221+#include <asm/alternative-asm.h>
13222 #include "glue_helper-asm-avx.S"
13223
13224 .file "serpent-avx-x86_64-asm_64.S"
13225@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
13226 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13227 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13228
13229+ pax_force_retaddr
13230 ret;
13231 ENDPROC(__serpent_enc_blk8_avx)
13232
13233@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
13234 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13235 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13236
13237+ pax_force_retaddr
13238 ret;
13239 ENDPROC(__serpent_dec_blk8_avx)
13240
13241@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
13242
13243 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13244
13245+ pax_force_retaddr
13246 ret;
13247 ENDPROC(serpent_ecb_enc_8way_avx)
13248
13249@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
13250
13251 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13252
13253+ pax_force_retaddr
13254 ret;
13255 ENDPROC(serpent_ecb_dec_8way_avx)
13256
13257@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
13258
13259 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13260
13261+ pax_force_retaddr
13262 ret;
13263 ENDPROC(serpent_cbc_dec_8way_avx)
13264
13265@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
13266
13267 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13268
13269+ pax_force_retaddr
13270 ret;
13271 ENDPROC(serpent_ctr_8way_avx)
13272
13273@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
13274 /* dst <= regs xor IVs(in dst) */
13275 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13276
13277+ pax_force_retaddr
13278 ret;
13279 ENDPROC(serpent_xts_enc_8way_avx)
13280
13281@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
13282 /* dst <= regs xor IVs(in dst) */
13283 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13284
13285+ pax_force_retaddr
13286 ret;
13287 ENDPROC(serpent_xts_dec_8way_avx)
13288diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
13289index b222085..abd483c 100644
13290--- a/arch/x86/crypto/serpent-avx2-asm_64.S
13291+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
13292@@ -15,6 +15,7 @@
13293 */
13294
13295 #include <linux/linkage.h>
13296+#include <asm/alternative-asm.h>
13297 #include "glue_helper-asm-avx2.S"
13298
13299 .file "serpent-avx2-asm_64.S"
13300@@ -610,6 +611,7 @@ __serpent_enc_blk16:
13301 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13302 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13303
13304+ pax_force_retaddr
13305 ret;
13306 ENDPROC(__serpent_enc_blk16)
13307
13308@@ -664,6 +666,7 @@ __serpent_dec_blk16:
13309 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13310 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13311
13312+ pax_force_retaddr
13313 ret;
13314 ENDPROC(__serpent_dec_blk16)
13315
13316@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
13317
13318 vzeroupper;
13319
13320+ pax_force_retaddr
13321 ret;
13322 ENDPROC(serpent_ecb_enc_16way)
13323
13324@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
13325
13326 vzeroupper;
13327
13328+ pax_force_retaddr
13329 ret;
13330 ENDPROC(serpent_ecb_dec_16way)
13331
13332@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
13333
13334 vzeroupper;
13335
13336+ pax_force_retaddr
13337 ret;
13338 ENDPROC(serpent_cbc_dec_16way)
13339
13340@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
13341
13342 vzeroupper;
13343
13344+ pax_force_retaddr
13345 ret;
13346 ENDPROC(serpent_ctr_16way)
13347
13348@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
13349
13350 vzeroupper;
13351
13352+ pax_force_retaddr
13353 ret;
13354 ENDPROC(serpent_xts_enc_16way)
13355
13356@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
13357
13358 vzeroupper;
13359
13360+ pax_force_retaddr
13361 ret;
13362 ENDPROC(serpent_xts_dec_16way)
13363diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13364index acc066c..1559cc4 100644
13365--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13366+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13367@@ -25,6 +25,7 @@
13368 */
13369
13370 #include <linux/linkage.h>
13371+#include <asm/alternative-asm.h>
13372
13373 .file "serpent-sse2-x86_64-asm_64.S"
13374 .text
13375@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
13376 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13377 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13378
13379+ pax_force_retaddr
13380 ret;
13381
13382 .L__enc_xor8:
13383 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13384 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13385
13386+ pax_force_retaddr
13387 ret;
13388 ENDPROC(__serpent_enc_blk_8way)
13389
13390@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
13391 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13392 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13393
13394+ pax_force_retaddr
13395 ret;
13396 ENDPROC(serpent_dec_blk_8way)
13397diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
13398index a410950..9dfe7ad 100644
13399--- a/arch/x86/crypto/sha1_ssse3_asm.S
13400+++ b/arch/x86/crypto/sha1_ssse3_asm.S
13401@@ -29,6 +29,7 @@
13402 */
13403
13404 #include <linux/linkage.h>
13405+#include <asm/alternative-asm.h>
13406
13407 #define CTX %rdi // arg1
13408 #define BUF %rsi // arg2
13409@@ -75,9 +76,9 @@
13410
13411 push %rbx
13412 push %rbp
13413- push %r12
13414+ push %r14
13415
13416- mov %rsp, %r12
13417+ mov %rsp, %r14
13418 sub $64, %rsp # allocate workspace
13419 and $~15, %rsp # align stack
13420
13421@@ -99,11 +100,12 @@
13422 xor %rax, %rax
13423 rep stosq
13424
13425- mov %r12, %rsp # deallocate workspace
13426+ mov %r14, %rsp # deallocate workspace
13427
13428- pop %r12
13429+ pop %r14
13430 pop %rbp
13431 pop %rbx
13432+ pax_force_retaddr
13433 ret
13434
13435 ENDPROC(\name)
13436diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
13437index 642f156..51a513c 100644
13438--- a/arch/x86/crypto/sha256-avx-asm.S
13439+++ b/arch/x86/crypto/sha256-avx-asm.S
13440@@ -49,6 +49,7 @@
13441
13442 #ifdef CONFIG_AS_AVX
13443 #include <linux/linkage.h>
13444+#include <asm/alternative-asm.h>
13445
13446 ## assume buffers not aligned
13447 #define VMOVDQ vmovdqu
13448@@ -460,6 +461,7 @@ done_hash:
13449 popq %r13
13450 popq %rbp
13451 popq %rbx
13452+ pax_force_retaddr
13453 ret
13454 ENDPROC(sha256_transform_avx)
13455
13456diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
13457index 9e86944..3795e6a 100644
13458--- a/arch/x86/crypto/sha256-avx2-asm.S
13459+++ b/arch/x86/crypto/sha256-avx2-asm.S
13460@@ -50,6 +50,7 @@
13461
13462 #ifdef CONFIG_AS_AVX2
13463 #include <linux/linkage.h>
13464+#include <asm/alternative-asm.h>
13465
13466 ## assume buffers not aligned
13467 #define VMOVDQ vmovdqu
13468@@ -720,6 +721,7 @@ done_hash:
13469 popq %r12
13470 popq %rbp
13471 popq %rbx
13472+ pax_force_retaddr
13473 ret
13474 ENDPROC(sha256_transform_rorx)
13475
13476diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
13477index f833b74..8c62a9e 100644
13478--- a/arch/x86/crypto/sha256-ssse3-asm.S
13479+++ b/arch/x86/crypto/sha256-ssse3-asm.S
13480@@ -47,6 +47,7 @@
13481 ########################################################################
13482
13483 #include <linux/linkage.h>
13484+#include <asm/alternative-asm.h>
13485
13486 ## assume buffers not aligned
13487 #define MOVDQ movdqu
13488@@ -471,6 +472,7 @@ done_hash:
13489 popq %rbp
13490 popq %rbx
13491
13492+ pax_force_retaddr
13493 ret
13494 ENDPROC(sha256_transform_ssse3)
13495
13496diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
13497index 974dde9..a823ff9 100644
13498--- a/arch/x86/crypto/sha512-avx-asm.S
13499+++ b/arch/x86/crypto/sha512-avx-asm.S
13500@@ -49,6 +49,7 @@
13501
13502 #ifdef CONFIG_AS_AVX
13503 #include <linux/linkage.h>
13504+#include <asm/alternative-asm.h>
13505
13506 .text
13507
13508@@ -364,6 +365,7 @@ updateblock:
13509 mov frame_RSPSAVE(%rsp), %rsp
13510
13511 nowork:
13512+ pax_force_retaddr
13513 ret
13514 ENDPROC(sha512_transform_avx)
13515
13516diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
13517index 568b961..ed20c37 100644
13518--- a/arch/x86/crypto/sha512-avx2-asm.S
13519+++ b/arch/x86/crypto/sha512-avx2-asm.S
13520@@ -51,6 +51,7 @@
13521
13522 #ifdef CONFIG_AS_AVX2
13523 #include <linux/linkage.h>
13524+#include <asm/alternative-asm.h>
13525
13526 .text
13527
13528@@ -678,6 +679,7 @@ done_hash:
13529
13530 # Restore Stack Pointer
13531 mov frame_RSPSAVE(%rsp), %rsp
13532+ pax_force_retaddr
13533 ret
13534 ENDPROC(sha512_transform_rorx)
13535
13536diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
13537index fb56855..6edd768 100644
13538--- a/arch/x86/crypto/sha512-ssse3-asm.S
13539+++ b/arch/x86/crypto/sha512-ssse3-asm.S
13540@@ -48,6 +48,7 @@
13541 ########################################################################
13542
13543 #include <linux/linkage.h>
13544+#include <asm/alternative-asm.h>
13545
13546 .text
13547
13548@@ -363,6 +364,7 @@ updateblock:
13549 mov frame_RSPSAVE(%rsp), %rsp
13550
13551 nowork:
13552+ pax_force_retaddr
13553 ret
13554 ENDPROC(sha512_transform_ssse3)
13555
13556diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
13557index 0505813..b067311 100644
13558--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
13559+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
13560@@ -24,6 +24,7 @@
13561 */
13562
13563 #include <linux/linkage.h>
13564+#include <asm/alternative-asm.h>
13565 #include "glue_helper-asm-avx.S"
13566
13567 .file "twofish-avx-x86_64-asm_64.S"
13568@@ -284,6 +285,7 @@ __twofish_enc_blk8:
13569 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
13570 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
13571
13572+ pax_force_retaddr
13573 ret;
13574 ENDPROC(__twofish_enc_blk8)
13575
13576@@ -324,6 +326,7 @@ __twofish_dec_blk8:
13577 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
13578 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
13579
13580+ pax_force_retaddr
13581 ret;
13582 ENDPROC(__twofish_dec_blk8)
13583
13584@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
13585
13586 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13587
13588+ pax_force_retaddr
13589 ret;
13590 ENDPROC(twofish_ecb_enc_8way)
13591
13592@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
13593
13594 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13595
13596+ pax_force_retaddr
13597 ret;
13598 ENDPROC(twofish_ecb_dec_8way)
13599
13600@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
13601 * %rdx: src
13602 */
13603
13604- pushq %r12;
13605+ pushq %r14;
13606
13607 movq %rsi, %r11;
13608- movq %rdx, %r12;
13609+ movq %rdx, %r14;
13610
13611 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13612
13613 call __twofish_dec_blk8;
13614
13615- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13616+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13617
13618- popq %r12;
13619+ popq %r14;
13620
13621+ pax_force_retaddr
13622 ret;
13623 ENDPROC(twofish_cbc_dec_8way)
13624
13625@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
13626 * %rcx: iv (little endian, 128bit)
13627 */
13628
13629- pushq %r12;
13630+ pushq %r14;
13631
13632 movq %rsi, %r11;
13633- movq %rdx, %r12;
13634+ movq %rdx, %r14;
13635
13636 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13637 RD2, RX0, RX1, RY0);
13638
13639 call __twofish_enc_blk8;
13640
13641- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13642+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13643
13644- popq %r12;
13645+ popq %r14;
13646
13647+ pax_force_retaddr
13648 ret;
13649 ENDPROC(twofish_ctr_8way)
13650
13651@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
13652 /* dst <= regs xor IVs(in dst) */
13653 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
13654
13655+ pax_force_retaddr
13656 ret;
13657 ENDPROC(twofish_xts_enc_8way)
13658
13659@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
13660 /* dst <= regs xor IVs(in dst) */
13661 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13662
13663+ pax_force_retaddr
13664 ret;
13665 ENDPROC(twofish_xts_dec_8way)
13666diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
13667index 1c3b7ce..02f578d 100644
13668--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
13669+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
13670@@ -21,6 +21,7 @@
13671 */
13672
13673 #include <linux/linkage.h>
13674+#include <asm/alternative-asm.h>
13675
13676 .file "twofish-x86_64-asm-3way.S"
13677 .text
13678@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
13679 popq %r13;
13680 popq %r14;
13681 popq %r15;
13682+ pax_force_retaddr
13683 ret;
13684
13685 .L__enc_xor3:
13686@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
13687 popq %r13;
13688 popq %r14;
13689 popq %r15;
13690+ pax_force_retaddr
13691 ret;
13692 ENDPROC(__twofish_enc_blk_3way)
13693
13694@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
13695 popq %r13;
13696 popq %r14;
13697 popq %r15;
13698+ pax_force_retaddr
13699 ret;
13700 ENDPROC(twofish_dec_blk_3way)
13701diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
13702index a039d21..524b8b2 100644
13703--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
13704+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
13705@@ -22,6 +22,7 @@
13706
13707 #include <linux/linkage.h>
13708 #include <asm/asm-offsets.h>
13709+#include <asm/alternative-asm.h>
13710
13711 #define a_offset 0
13712 #define b_offset 4
13713@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
13714
13715 popq R1
13716 movq $1,%rax
13717+ pax_force_retaddr
13718 ret
13719 ENDPROC(twofish_enc_blk)
13720
13721@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
13722
13723 popq R1
13724 movq $1,%rax
13725+ pax_force_retaddr
13726 ret
13727 ENDPROC(twofish_dec_blk)
13728diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
13729index bae3aba..c1788c1 100644
13730--- a/arch/x86/ia32/ia32_aout.c
13731+++ b/arch/x86/ia32/ia32_aout.c
13732@@ -159,6 +159,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
13733 unsigned long dump_start, dump_size;
13734 struct user32 dump;
13735
13736+ memset(&dump, 0, sizeof(dump));
13737+
13738 fs = get_fs();
13739 set_fs(KERNEL_DS);
13740 has_dumped = 1;
13741diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
13742index 665a730..8e7a67a 100644
13743--- a/arch/x86/ia32/ia32_signal.c
13744+++ b/arch/x86/ia32/ia32_signal.c
13745@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
13746 sp -= frame_size;
13747 /* Align the stack pointer according to the i386 ABI,
13748 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
13749- sp = ((sp + 4) & -16ul) - 4;
13750+ sp = ((sp - 12) & -16ul) - 4;
13751 return (void __user *) sp;
13752 }
13753
13754@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
13755 * These are actually not used anymore, but left because some
13756 * gdb versions depend on them as a marker.
13757 */
13758- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
13759+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
13760 } put_user_catch(err);
13761
13762 if (err)
13763@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
13764 0xb8,
13765 __NR_ia32_rt_sigreturn,
13766 0x80cd,
13767- 0,
13768+ 0
13769 };
13770
13771 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
13772@@ -461,16 +461,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
13773
13774 if (ksig->ka.sa.sa_flags & SA_RESTORER)
13775 restorer = ksig->ka.sa.sa_restorer;
13776+ else if (current->mm->context.vdso)
13777+ /* Return stub is in 32bit vsyscall page */
13778+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
13779 else
13780- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
13781- rt_sigreturn);
13782+ restorer = &frame->retcode;
13783 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
13784
13785 /*
13786 * Not actually used anymore, but left because some gdb
13787 * versions need it.
13788 */
13789- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
13790+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
13791 } put_user_catch(err);
13792
13793 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
13794diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
13795index 4299eb0..c0687a7 100644
13796--- a/arch/x86/ia32/ia32entry.S
13797+++ b/arch/x86/ia32/ia32entry.S
13798@@ -15,8 +15,10 @@
13799 #include <asm/irqflags.h>
13800 #include <asm/asm.h>
13801 #include <asm/smap.h>
13802+#include <asm/pgtable.h>
13803 #include <linux/linkage.h>
13804 #include <linux/err.h>
13805+#include <asm/alternative-asm.h>
13806
13807 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
13808 #include <linux/elf-em.h>
13809@@ -62,12 +64,12 @@
13810 */
13811 .macro LOAD_ARGS32 offset, _r9=0
13812 .if \_r9
13813- movl \offset+16(%rsp),%r9d
13814+ movl \offset+R9(%rsp),%r9d
13815 .endif
13816- movl \offset+40(%rsp),%ecx
13817- movl \offset+48(%rsp),%edx
13818- movl \offset+56(%rsp),%esi
13819- movl \offset+64(%rsp),%edi
13820+ movl \offset+RCX(%rsp),%ecx
13821+ movl \offset+RDX(%rsp),%edx
13822+ movl \offset+RSI(%rsp),%esi
13823+ movl \offset+RDI(%rsp),%edi
13824 movl %eax,%eax /* zero extension */
13825 .endm
13826
13827@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
13828 ENDPROC(native_irq_enable_sysexit)
13829 #endif
13830
13831+ .macro pax_enter_kernel_user
13832+ pax_set_fptr_mask
13833+#ifdef CONFIG_PAX_MEMORY_UDEREF
13834+ call pax_enter_kernel_user
13835+#endif
13836+ .endm
13837+
13838+ .macro pax_exit_kernel_user
13839+#ifdef CONFIG_PAX_MEMORY_UDEREF
13840+ call pax_exit_kernel_user
13841+#endif
13842+#ifdef CONFIG_PAX_RANDKSTACK
13843+ pushq %rax
13844+ pushq %r11
13845+ call pax_randomize_kstack
13846+ popq %r11
13847+ popq %rax
13848+#endif
13849+ .endm
13850+
13851+ .macro pax_erase_kstack
13852+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
13853+ call pax_erase_kstack
13854+#endif
13855+ .endm
13856+
13857 /*
13858 * 32bit SYSENTER instruction entry.
13859 *
13860@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
13861 CFI_REGISTER rsp,rbp
13862 SWAPGS_UNSAFE_STACK
13863 movq PER_CPU_VAR(kernel_stack), %rsp
13864- addq $(KERNEL_STACK_OFFSET),%rsp
13865- /*
13866- * No need to follow this irqs on/off section: the syscall
13867- * disabled irqs, here we enable it straight after entry:
13868- */
13869- ENABLE_INTERRUPTS(CLBR_NONE)
13870 movl %ebp,%ebp /* zero extension */
13871 pushq_cfi $__USER32_DS
13872 /*CFI_REL_OFFSET ss,0*/
13873@@ -135,24 +157,49 @@ ENTRY(ia32_sysenter_target)
13874 CFI_REL_OFFSET rsp,0
13875 pushfq_cfi
13876 /*CFI_REL_OFFSET rflags,0*/
13877- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
13878- CFI_REGISTER rip,r10
13879+ orl $X86_EFLAGS_IF,(%rsp)
13880+ GET_THREAD_INFO(%r11)
13881+ movl TI_sysenter_return(%r11), %r11d
13882+ CFI_REGISTER rip,r11
13883 pushq_cfi $__USER32_CS
13884 /*CFI_REL_OFFSET cs,0*/
13885 movl %eax, %eax
13886- pushq_cfi %r10
13887+ pushq_cfi %r11
13888 CFI_REL_OFFSET rip,0
13889 pushq_cfi %rax
13890 cld
13891 SAVE_ARGS 0,1,0
13892+ pax_enter_kernel_user
13893+
13894+#ifdef CONFIG_PAX_RANDKSTACK
13895+ pax_erase_kstack
13896+#endif
13897+
13898+ /*
13899+ * No need to follow this irqs on/off section: the syscall
13900+ * disabled irqs, here we enable it straight after entry:
13901+ */
13902+ ENABLE_INTERRUPTS(CLBR_NONE)
13903 /* no need to do an access_ok check here because rbp has been
13904 32bit zero extended */
13905+
13906+#ifdef CONFIG_PAX_MEMORY_UDEREF
13907+ addq pax_user_shadow_base,%rbp
13908+ ASM_PAX_OPEN_USERLAND
13909+#endif
13910+
13911 ASM_STAC
13912 1: movl (%rbp),%ebp
13913 _ASM_EXTABLE(1b,ia32_badarg)
13914 ASM_CLAC
13915- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13916- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13917+
13918+#ifdef CONFIG_PAX_MEMORY_UDEREF
13919+ ASM_PAX_CLOSE_USERLAND
13920+#endif
13921+
13922+ GET_THREAD_INFO(%r11)
13923+ orl $TS_COMPAT,TI_status(%r11)
13924+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
13925 CFI_REMEMBER_STATE
13926 jnz sysenter_tracesys
13927 cmpq $(IA32_NR_syscalls-1),%rax
13928@@ -162,15 +209,18 @@ sysenter_do_call:
13929 sysenter_dispatch:
13930 call *ia32_sys_call_table(,%rax,8)
13931 movq %rax,RAX-ARGOFFSET(%rsp)
13932+ GET_THREAD_INFO(%r11)
13933 DISABLE_INTERRUPTS(CLBR_NONE)
13934 TRACE_IRQS_OFF
13935- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13936+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
13937 jnz sysexit_audit
13938 sysexit_from_sys_call:
13939- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13940+ pax_exit_kernel_user
13941+ pax_erase_kstack
13942+ andl $~TS_COMPAT,TI_status(%r11)
13943 /* clear IF, that popfq doesn't enable interrupts early */
13944- andl $~0x200,EFLAGS-R11(%rsp)
13945- movl RIP-R11(%rsp),%edx /* User %eip */
13946+ andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
13947+ movl RIP(%rsp),%edx /* User %eip */
13948 CFI_REGISTER rip,rdx
13949 RESTORE_ARGS 0,24,0,0,0,0
13950 xorq %r8,%r8
13951@@ -193,6 +243,9 @@ sysexit_from_sys_call:
13952 movl %eax,%esi /* 2nd arg: syscall number */
13953 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
13954 call __audit_syscall_entry
13955+
13956+ pax_erase_kstack
13957+
13958 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
13959 cmpq $(IA32_NR_syscalls-1),%rax
13960 ja ia32_badsys
13961@@ -204,7 +257,7 @@ sysexit_from_sys_call:
13962 .endm
13963
13964 .macro auditsys_exit exit
13965- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13966+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
13967 jnz ia32_ret_from_sys_call
13968 TRACE_IRQS_ON
13969 ENABLE_INTERRUPTS(CLBR_NONE)
13970@@ -215,11 +268,12 @@ sysexit_from_sys_call:
13971 1: setbe %al /* 1 if error, 0 if not */
13972 movzbl %al,%edi /* zero-extend that into %edi */
13973 call __audit_syscall_exit
13974+ GET_THREAD_INFO(%r11)
13975 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
13976 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
13977 DISABLE_INTERRUPTS(CLBR_NONE)
13978 TRACE_IRQS_OFF
13979- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13980+ testl %edi,TI_flags(%r11)
13981 jz \exit
13982 CLEAR_RREGS -ARGOFFSET
13983 jmp int_with_check
13984@@ -237,7 +291,7 @@ sysexit_audit:
13985
13986 sysenter_tracesys:
13987 #ifdef CONFIG_AUDITSYSCALL
13988- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
13989+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
13990 jz sysenter_auditsys
13991 #endif
13992 SAVE_REST
13993@@ -249,6 +303,9 @@ sysenter_tracesys:
13994 RESTORE_REST
13995 cmpq $(IA32_NR_syscalls-1),%rax
13996 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
13997+
13998+ pax_erase_kstack
13999+
14000 jmp sysenter_do_call
14001 CFI_ENDPROC
14002 ENDPROC(ia32_sysenter_target)
14003@@ -276,19 +333,25 @@ ENDPROC(ia32_sysenter_target)
14004 ENTRY(ia32_cstar_target)
14005 CFI_STARTPROC32 simple
14006 CFI_SIGNAL_FRAME
14007- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14008+ CFI_DEF_CFA rsp,0
14009 CFI_REGISTER rip,rcx
14010 /*CFI_REGISTER rflags,r11*/
14011 SWAPGS_UNSAFE_STACK
14012 movl %esp,%r8d
14013 CFI_REGISTER rsp,r8
14014 movq PER_CPU_VAR(kernel_stack),%rsp
14015+ SAVE_ARGS 8*6,0,0
14016+ pax_enter_kernel_user
14017+
14018+#ifdef CONFIG_PAX_RANDKSTACK
14019+ pax_erase_kstack
14020+#endif
14021+
14022 /*
14023 * No need to follow this irqs on/off section: the syscall
14024 * disabled irqs and here we enable it straight after entry:
14025 */
14026 ENABLE_INTERRUPTS(CLBR_NONE)
14027- SAVE_ARGS 8,0,0
14028 movl %eax,%eax /* zero extension */
14029 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14030 movq %rcx,RIP-ARGOFFSET(%rsp)
14031@@ -304,12 +367,25 @@ ENTRY(ia32_cstar_target)
14032 /* no need to do an access_ok check here because r8 has been
14033 32bit zero extended */
14034 /* hardware stack frame is complete now */
14035+
14036+#ifdef CONFIG_PAX_MEMORY_UDEREF
14037+ ASM_PAX_OPEN_USERLAND
14038+ movq pax_user_shadow_base,%r8
14039+ addq RSP-ARGOFFSET(%rsp),%r8
14040+#endif
14041+
14042 ASM_STAC
14043 1: movl (%r8),%r9d
14044 _ASM_EXTABLE(1b,ia32_badarg)
14045 ASM_CLAC
14046- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14047- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14048+
14049+#ifdef CONFIG_PAX_MEMORY_UDEREF
14050+ ASM_PAX_CLOSE_USERLAND
14051+#endif
14052+
14053+ GET_THREAD_INFO(%r11)
14054+ orl $TS_COMPAT,TI_status(%r11)
14055+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14056 CFI_REMEMBER_STATE
14057 jnz cstar_tracesys
14058 cmpq $IA32_NR_syscalls-1,%rax
14059@@ -319,13 +395,16 @@ cstar_do_call:
14060 cstar_dispatch:
14061 call *ia32_sys_call_table(,%rax,8)
14062 movq %rax,RAX-ARGOFFSET(%rsp)
14063+ GET_THREAD_INFO(%r11)
14064 DISABLE_INTERRUPTS(CLBR_NONE)
14065 TRACE_IRQS_OFF
14066- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14067+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14068 jnz sysretl_audit
14069 sysretl_from_sys_call:
14070- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14071- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14072+ pax_exit_kernel_user
14073+ pax_erase_kstack
14074+ andl $~TS_COMPAT,TI_status(%r11)
14075+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14076 movl RIP-ARGOFFSET(%rsp),%ecx
14077 CFI_REGISTER rip,rcx
14078 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14079@@ -352,7 +431,7 @@ sysretl_audit:
14080
14081 cstar_tracesys:
14082 #ifdef CONFIG_AUDITSYSCALL
14083- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14084+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14085 jz cstar_auditsys
14086 #endif
14087 xchgl %r9d,%ebp
14088@@ -366,11 +445,19 @@ cstar_tracesys:
14089 xchgl %ebp,%r9d
14090 cmpq $(IA32_NR_syscalls-1),%rax
14091 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14092+
14093+ pax_erase_kstack
14094+
14095 jmp cstar_do_call
14096 END(ia32_cstar_target)
14097
14098 ia32_badarg:
14099 ASM_CLAC
14100+
14101+#ifdef CONFIG_PAX_MEMORY_UDEREF
14102+ ASM_PAX_CLOSE_USERLAND
14103+#endif
14104+
14105 movq $-EFAULT,%rax
14106 jmp ia32_sysret
14107 CFI_ENDPROC
14108@@ -407,19 +494,26 @@ ENTRY(ia32_syscall)
14109 CFI_REL_OFFSET rip,RIP-RIP
14110 PARAVIRT_ADJUST_EXCEPTION_FRAME
14111 SWAPGS
14112- /*
14113- * No need to follow this irqs on/off section: the syscall
14114- * disabled irqs and here we enable it straight after entry:
14115- */
14116- ENABLE_INTERRUPTS(CLBR_NONE)
14117 movl %eax,%eax
14118 pushq_cfi %rax
14119 cld
14120 /* note the registers are not zero extended to the sf.
14121 this could be a problem. */
14122 SAVE_ARGS 0,1,0
14123- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14124- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14125+ pax_enter_kernel_user
14126+
14127+#ifdef CONFIG_PAX_RANDKSTACK
14128+ pax_erase_kstack
14129+#endif
14130+
14131+ /*
14132+ * No need to follow this irqs on/off section: the syscall
14133+ * disabled irqs and here we enable it straight after entry:
14134+ */
14135+ ENABLE_INTERRUPTS(CLBR_NONE)
14136+ GET_THREAD_INFO(%r11)
14137+ orl $TS_COMPAT,TI_status(%r11)
14138+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14139 jnz ia32_tracesys
14140 cmpq $(IA32_NR_syscalls-1),%rax
14141 ja ia32_badsys
14142@@ -442,6 +536,9 @@ ia32_tracesys:
14143 RESTORE_REST
14144 cmpq $(IA32_NR_syscalls-1),%rax
14145 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
14146+
14147+ pax_erase_kstack
14148+
14149 jmp ia32_do_call
14150 END(ia32_syscall)
14151
14152diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
14153index 8e0ceec..af13504 100644
14154--- a/arch/x86/ia32/sys_ia32.c
14155+++ b/arch/x86/ia32/sys_ia32.c
14156@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
14157 */
14158 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
14159 {
14160- typeof(ubuf->st_uid) uid = 0;
14161- typeof(ubuf->st_gid) gid = 0;
14162+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
14163+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
14164 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
14165 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
14166 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
14167diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
14168index 372231c..51b537d 100644
14169--- a/arch/x86/include/asm/alternative-asm.h
14170+++ b/arch/x86/include/asm/alternative-asm.h
14171@@ -18,6 +18,45 @@
14172 .endm
14173 #endif
14174
14175+#ifdef KERNEXEC_PLUGIN
14176+ .macro pax_force_retaddr_bts rip=0
14177+ btsq $63,\rip(%rsp)
14178+ .endm
14179+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
14180+ .macro pax_force_retaddr rip=0, reload=0
14181+ btsq $63,\rip(%rsp)
14182+ .endm
14183+ .macro pax_force_fptr ptr
14184+ btsq $63,\ptr
14185+ .endm
14186+ .macro pax_set_fptr_mask
14187+ .endm
14188+#endif
14189+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14190+ .macro pax_force_retaddr rip=0, reload=0
14191+ .if \reload
14192+ pax_set_fptr_mask
14193+ .endif
14194+ orq %r12,\rip(%rsp)
14195+ .endm
14196+ .macro pax_force_fptr ptr
14197+ orq %r12,\ptr
14198+ .endm
14199+ .macro pax_set_fptr_mask
14200+ movabs $0x8000000000000000,%r12
14201+ .endm
14202+#endif
14203+#else
14204+ .macro pax_force_retaddr rip=0, reload=0
14205+ .endm
14206+ .macro pax_force_fptr ptr
14207+ .endm
14208+ .macro pax_force_retaddr_bts rip=0
14209+ .endm
14210+ .macro pax_set_fptr_mask
14211+ .endm
14212+#endif
14213+
14214 .macro altinstruction_entry orig alt feature orig_len alt_len
14215 .long \orig - .
14216 .long \alt - .
14217diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
14218index 0a3f9c9..c9d081d 100644
14219--- a/arch/x86/include/asm/alternative.h
14220+++ b/arch/x86/include/asm/alternative.h
14221@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14222 ".pushsection .discard,\"aw\",@progbits\n" \
14223 DISCARD_ENTRY(1) \
14224 ".popsection\n" \
14225- ".pushsection .altinstr_replacement, \"ax\"\n" \
14226+ ".pushsection .altinstr_replacement, \"a\"\n" \
14227 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
14228 ".popsection"
14229
14230@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14231 DISCARD_ENTRY(1) \
14232 DISCARD_ENTRY(2) \
14233 ".popsection\n" \
14234- ".pushsection .altinstr_replacement, \"ax\"\n" \
14235+ ".pushsection .altinstr_replacement, \"a\"\n" \
14236 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
14237 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
14238 ".popsection"
14239diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
14240index 1d2091a..f5074c1 100644
14241--- a/arch/x86/include/asm/apic.h
14242+++ b/arch/x86/include/asm/apic.h
14243@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
14244
14245 #ifdef CONFIG_X86_LOCAL_APIC
14246
14247-extern unsigned int apic_verbosity;
14248+extern int apic_verbosity;
14249 extern int local_apic_timer_c2_ok;
14250
14251 extern int disable_apic;
14252diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
14253index 20370c6..a2eb9b0 100644
14254--- a/arch/x86/include/asm/apm.h
14255+++ b/arch/x86/include/asm/apm.h
14256@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
14257 __asm__ __volatile__(APM_DO_ZERO_SEGS
14258 "pushl %%edi\n\t"
14259 "pushl %%ebp\n\t"
14260- "lcall *%%cs:apm_bios_entry\n\t"
14261+ "lcall *%%ss:apm_bios_entry\n\t"
14262 "setc %%al\n\t"
14263 "popl %%ebp\n\t"
14264 "popl %%edi\n\t"
14265@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
14266 __asm__ __volatile__(APM_DO_ZERO_SEGS
14267 "pushl %%edi\n\t"
14268 "pushl %%ebp\n\t"
14269- "lcall *%%cs:apm_bios_entry\n\t"
14270+ "lcall *%%ss:apm_bios_entry\n\t"
14271 "setc %%bl\n\t"
14272 "popl %%ebp\n\t"
14273 "popl %%edi\n\t"
14274diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
14275index 722aa3b..c392d85 100644
14276--- a/arch/x86/include/asm/atomic.h
14277+++ b/arch/x86/include/asm/atomic.h
14278@@ -22,7 +22,18 @@
14279 */
14280 static inline int atomic_read(const atomic_t *v)
14281 {
14282- return (*(volatile int *)&(v)->counter);
14283+ return (*(volatile const int *)&(v)->counter);
14284+}
14285+
14286+/**
14287+ * atomic_read_unchecked - read atomic variable
14288+ * @v: pointer of type atomic_unchecked_t
14289+ *
14290+ * Atomically reads the value of @v.
14291+ */
14292+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
14293+{
14294+ return (*(volatile const int *)&(v)->counter);
14295 }
14296
14297 /**
14298@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
14299 }
14300
14301 /**
14302+ * atomic_set_unchecked - set atomic variable
14303+ * @v: pointer of type atomic_unchecked_t
14304+ * @i: required value
14305+ *
14306+ * Atomically sets the value of @v to @i.
14307+ */
14308+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
14309+{
14310+ v->counter = i;
14311+}
14312+
14313+/**
14314 * atomic_add - add integer to atomic variable
14315 * @i: integer value to add
14316 * @v: pointer of type atomic_t
14317@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
14318 */
14319 static inline void atomic_add(int i, atomic_t *v)
14320 {
14321- asm volatile(LOCK_PREFIX "addl %1,%0"
14322+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
14323+
14324+#ifdef CONFIG_PAX_REFCOUNT
14325+ "jno 0f\n"
14326+ LOCK_PREFIX "subl %1,%0\n"
14327+ "int $4\n0:\n"
14328+ _ASM_EXTABLE(0b, 0b)
14329+#endif
14330+
14331+ : "+m" (v->counter)
14332+ : "ir" (i));
14333+}
14334+
14335+/**
14336+ * atomic_add_unchecked - add integer to atomic variable
14337+ * @i: integer value to add
14338+ * @v: pointer of type atomic_unchecked_t
14339+ *
14340+ * Atomically adds @i to @v.
14341+ */
14342+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
14343+{
14344+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
14345 : "+m" (v->counter)
14346 : "ir" (i));
14347 }
14348@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
14349 */
14350 static inline void atomic_sub(int i, atomic_t *v)
14351 {
14352- asm volatile(LOCK_PREFIX "subl %1,%0"
14353+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
14354+
14355+#ifdef CONFIG_PAX_REFCOUNT
14356+ "jno 0f\n"
14357+ LOCK_PREFIX "addl %1,%0\n"
14358+ "int $4\n0:\n"
14359+ _ASM_EXTABLE(0b, 0b)
14360+#endif
14361+
14362+ : "+m" (v->counter)
14363+ : "ir" (i));
14364+}
14365+
14366+/**
14367+ * atomic_sub_unchecked - subtract integer from atomic variable
14368+ * @i: integer value to subtract
14369+ * @v: pointer of type atomic_unchecked_t
14370+ *
14371+ * Atomically subtracts @i from @v.
14372+ */
14373+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
14374+{
14375+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
14376 : "+m" (v->counter)
14377 : "ir" (i));
14378 }
14379@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
14380 {
14381 unsigned char c;
14382
14383- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
14384+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
14385+
14386+#ifdef CONFIG_PAX_REFCOUNT
14387+ "jno 0f\n"
14388+ LOCK_PREFIX "addl %2,%0\n"
14389+ "int $4\n0:\n"
14390+ _ASM_EXTABLE(0b, 0b)
14391+#endif
14392+
14393+ "sete %1\n"
14394 : "+m" (v->counter), "=qm" (c)
14395 : "ir" (i) : "memory");
14396 return c;
14397@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
14398 */
14399 static inline void atomic_inc(atomic_t *v)
14400 {
14401- asm volatile(LOCK_PREFIX "incl %0"
14402+ asm volatile(LOCK_PREFIX "incl %0\n"
14403+
14404+#ifdef CONFIG_PAX_REFCOUNT
14405+ "jno 0f\n"
14406+ LOCK_PREFIX "decl %0\n"
14407+ "int $4\n0:\n"
14408+ _ASM_EXTABLE(0b, 0b)
14409+#endif
14410+
14411+ : "+m" (v->counter));
14412+}
14413+
14414+/**
14415+ * atomic_inc_unchecked - increment atomic variable
14416+ * @v: pointer of type atomic_unchecked_t
14417+ *
14418+ * Atomically increments @v by 1.
14419+ */
14420+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
14421+{
14422+ asm volatile(LOCK_PREFIX "incl %0\n"
14423 : "+m" (v->counter));
14424 }
14425
14426@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
14427 */
14428 static inline void atomic_dec(atomic_t *v)
14429 {
14430- asm volatile(LOCK_PREFIX "decl %0"
14431+ asm volatile(LOCK_PREFIX "decl %0\n"
14432+
14433+#ifdef CONFIG_PAX_REFCOUNT
14434+ "jno 0f\n"
14435+ LOCK_PREFIX "incl %0\n"
14436+ "int $4\n0:\n"
14437+ _ASM_EXTABLE(0b, 0b)
14438+#endif
14439+
14440+ : "+m" (v->counter));
14441+}
14442+
14443+/**
14444+ * atomic_dec_unchecked - decrement atomic variable
14445+ * @v: pointer of type atomic_unchecked_t
14446+ *
14447+ * Atomically decrements @v by 1.
14448+ */
14449+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
14450+{
14451+ asm volatile(LOCK_PREFIX "decl %0\n"
14452 : "+m" (v->counter));
14453 }
14454
14455@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
14456 {
14457 unsigned char c;
14458
14459- asm volatile(LOCK_PREFIX "decl %0; sete %1"
14460+ asm volatile(LOCK_PREFIX "decl %0\n"
14461+
14462+#ifdef CONFIG_PAX_REFCOUNT
14463+ "jno 0f\n"
14464+ LOCK_PREFIX "incl %0\n"
14465+ "int $4\n0:\n"
14466+ _ASM_EXTABLE(0b, 0b)
14467+#endif
14468+
14469+ "sete %1\n"
14470 : "+m" (v->counter), "=qm" (c)
14471 : : "memory");
14472 return c != 0;
14473@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
14474 {
14475 unsigned char c;
14476
14477- asm volatile(LOCK_PREFIX "incl %0; sete %1"
14478+ asm volatile(LOCK_PREFIX "incl %0\n"
14479+
14480+#ifdef CONFIG_PAX_REFCOUNT
14481+ "jno 0f\n"
14482+ LOCK_PREFIX "decl %0\n"
14483+ "int $4\n0:\n"
14484+ _ASM_EXTABLE(0b, 0b)
14485+#endif
14486+
14487+ "sete %1\n"
14488+ : "+m" (v->counter), "=qm" (c)
14489+ : : "memory");
14490+ return c != 0;
14491+}
14492+
14493+/**
14494+ * atomic_inc_and_test_unchecked - increment and test
14495+ * @v: pointer of type atomic_unchecked_t
14496+ *
14497+ * Atomically increments @v by 1
14498+ * and returns true if the result is zero, or false for all
14499+ * other cases.
14500+ */
14501+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
14502+{
14503+ unsigned char c;
14504+
14505+ asm volatile(LOCK_PREFIX "incl %0\n"
14506+ "sete %1\n"
14507 : "+m" (v->counter), "=qm" (c)
14508 : : "memory");
14509 return c != 0;
14510@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
14511 {
14512 unsigned char c;
14513
14514- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
14515+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
14516+
14517+#ifdef CONFIG_PAX_REFCOUNT
14518+ "jno 0f\n"
14519+ LOCK_PREFIX "subl %2,%0\n"
14520+ "int $4\n0:\n"
14521+ _ASM_EXTABLE(0b, 0b)
14522+#endif
14523+
14524+ "sets %1\n"
14525 : "+m" (v->counter), "=qm" (c)
14526 : "ir" (i) : "memory");
14527 return c;
14528@@ -172,6 +334,18 @@ static inline int atomic_add_negative(int i, atomic_t *v)
14529 */
14530 static inline int atomic_add_return(int i, atomic_t *v)
14531 {
14532+ return i + xadd_check_overflow(&v->counter, i);
14533+}
14534+
14535+/**
14536+ * atomic_add_return_unchecked - add integer and return
14537+ * @i: integer value to add
14538+ * @v: pointer of type atomic_unchecked_t
14539+ *
14540+ * Atomically adds @i to @v and returns @i + @v
14541+ */
14542+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
14543+{
14544 return i + xadd(&v->counter, i);
14545 }
14546
14547@@ -188,9 +362,18 @@ static inline int atomic_sub_return(int i, atomic_t *v)
14548 }
14549
14550 #define atomic_inc_return(v) (atomic_add_return(1, v))
14551+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
14552+{
14553+ return atomic_add_return_unchecked(1, v);
14554+}
14555 #define atomic_dec_return(v) (atomic_sub_return(1, v))
14556
14557-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
14558+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
14559+{
14560+ return cmpxchg(&v->counter, old, new);
14561+}
14562+
14563+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
14564 {
14565 return cmpxchg(&v->counter, old, new);
14566 }
14567@@ -200,6 +383,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
14568 return xchg(&v->counter, new);
14569 }
14570
14571+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
14572+{
14573+ return xchg(&v->counter, new);
14574+}
14575+
14576 /**
14577 * __atomic_add_unless - add unless the number is already a given value
14578 * @v: pointer of type atomic_t
14579@@ -209,14 +397,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
14580 * Atomically adds @a to @v, so long as @v was not already @u.
14581 * Returns the old value of @v.
14582 */
14583-static inline int __atomic_add_unless(atomic_t *v, int a, int u)
14584+static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
14585 {
14586- int c, old;
14587+ int c, old, new;
14588 c = atomic_read(v);
14589 for (;;) {
14590- if (unlikely(c == (u)))
14591+ if (unlikely(c == u))
14592 break;
14593- old = atomic_cmpxchg((v), c, c + (a));
14594+
14595+ asm volatile("addl %2,%0\n"
14596+
14597+#ifdef CONFIG_PAX_REFCOUNT
14598+ "jno 0f\n"
14599+ "subl %2,%0\n"
14600+ "int $4\n0:\n"
14601+ _ASM_EXTABLE(0b, 0b)
14602+#endif
14603+
14604+ : "=r" (new)
14605+ : "0" (c), "ir" (a));
14606+
14607+ old = atomic_cmpxchg(v, c, new);
14608 if (likely(old == c))
14609 break;
14610 c = old;
14611@@ -225,6 +426,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
14612 }
14613
14614 /**
14615+ * atomic_inc_not_zero_hint - increment if not null
14616+ * @v: pointer of type atomic_t
14617+ * @hint: probable value of the atomic before the increment
14618+ *
14619+ * This version of atomic_inc_not_zero() gives a hint of probable
14620+ * value of the atomic. This helps processor to not read the memory
14621+ * before doing the atomic read/modify/write cycle, lowering
14622+ * number of bus transactions on some arches.
14623+ *
14624+ * Returns: 0 if increment was not done, 1 otherwise.
14625+ */
14626+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
14627+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
14628+{
14629+ int val, c = hint, new;
14630+
14631+ /* sanity test, should be removed by compiler if hint is a constant */
14632+ if (!hint)
14633+ return __atomic_add_unless(v, 1, 0);
14634+
14635+ do {
14636+ asm volatile("incl %0\n"
14637+
14638+#ifdef CONFIG_PAX_REFCOUNT
14639+ "jno 0f\n"
14640+ "decl %0\n"
14641+ "int $4\n0:\n"
14642+ _ASM_EXTABLE(0b, 0b)
14643+#endif
14644+
14645+ : "=r" (new)
14646+ : "0" (c));
14647+
14648+ val = atomic_cmpxchg(v, c, new);
14649+ if (val == c)
14650+ return 1;
14651+ c = val;
14652+ } while (c);
14653+
14654+ return 0;
14655+}
14656+
14657+/**
14658 * atomic_inc_short - increment of a short integer
14659 * @v: pointer to type int
14660 *
14661@@ -253,14 +497,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
14662 #endif
14663
14664 /* These are x86-specific, used by some header files */
14665-#define atomic_clear_mask(mask, addr) \
14666- asm volatile(LOCK_PREFIX "andl %0,%1" \
14667- : : "r" (~(mask)), "m" (*(addr)) : "memory")
14668+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
14669+{
14670+ asm volatile(LOCK_PREFIX "andl %1,%0"
14671+ : "+m" (v->counter)
14672+ : "r" (~(mask))
14673+ : "memory");
14674+}
14675
14676-#define atomic_set_mask(mask, addr) \
14677- asm volatile(LOCK_PREFIX "orl %0,%1" \
14678- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
14679- : "memory")
14680+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
14681+{
14682+ asm volatile(LOCK_PREFIX "andl %1,%0"
14683+ : "+m" (v->counter)
14684+ : "r" (~(mask))
14685+ : "memory");
14686+}
14687+
14688+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
14689+{
14690+ asm volatile(LOCK_PREFIX "orl %1,%0"
14691+ : "+m" (v->counter)
14692+ : "r" (mask)
14693+ : "memory");
14694+}
14695+
14696+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
14697+{
14698+ asm volatile(LOCK_PREFIX "orl %1,%0"
14699+ : "+m" (v->counter)
14700+ : "r" (mask)
14701+ : "memory");
14702+}
14703
14704 /* Atomic operations are already serializing on x86 */
14705 #define smp_mb__before_atomic_dec() barrier()
14706diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
14707index b154de7..bf18a5a 100644
14708--- a/arch/x86/include/asm/atomic64_32.h
14709+++ b/arch/x86/include/asm/atomic64_32.h
14710@@ -12,6 +12,14 @@ typedef struct {
14711 u64 __aligned(8) counter;
14712 } atomic64_t;
14713
14714+#ifdef CONFIG_PAX_REFCOUNT
14715+typedef struct {
14716+ u64 __aligned(8) counter;
14717+} atomic64_unchecked_t;
14718+#else
14719+typedef atomic64_t atomic64_unchecked_t;
14720+#endif
14721+
14722 #define ATOMIC64_INIT(val) { (val) }
14723
14724 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
14725@@ -37,21 +45,31 @@ typedef struct {
14726 ATOMIC64_DECL_ONE(sym##_386)
14727
14728 ATOMIC64_DECL_ONE(add_386);
14729+ATOMIC64_DECL_ONE(add_unchecked_386);
14730 ATOMIC64_DECL_ONE(sub_386);
14731+ATOMIC64_DECL_ONE(sub_unchecked_386);
14732 ATOMIC64_DECL_ONE(inc_386);
14733+ATOMIC64_DECL_ONE(inc_unchecked_386);
14734 ATOMIC64_DECL_ONE(dec_386);
14735+ATOMIC64_DECL_ONE(dec_unchecked_386);
14736 #endif
14737
14738 #define alternative_atomic64(f, out, in...) \
14739 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
14740
14741 ATOMIC64_DECL(read);
14742+ATOMIC64_DECL(read_unchecked);
14743 ATOMIC64_DECL(set);
14744+ATOMIC64_DECL(set_unchecked);
14745 ATOMIC64_DECL(xchg);
14746 ATOMIC64_DECL(add_return);
14747+ATOMIC64_DECL(add_return_unchecked);
14748 ATOMIC64_DECL(sub_return);
14749+ATOMIC64_DECL(sub_return_unchecked);
14750 ATOMIC64_DECL(inc_return);
14751+ATOMIC64_DECL(inc_return_unchecked);
14752 ATOMIC64_DECL(dec_return);
14753+ATOMIC64_DECL(dec_return_unchecked);
14754 ATOMIC64_DECL(dec_if_positive);
14755 ATOMIC64_DECL(inc_not_zero);
14756 ATOMIC64_DECL(add_unless);
14757@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
14758 }
14759
14760 /**
14761+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
14762+ * @p: pointer to type atomic64_unchecked_t
14763+ * @o: expected value
14764+ * @n: new value
14765+ *
14766+ * Atomically sets @v to @n if it was equal to @o and returns
14767+ * the old value.
14768+ */
14769+
14770+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
14771+{
14772+ return cmpxchg64(&v->counter, o, n);
14773+}
14774+
14775+/**
14776 * atomic64_xchg - xchg atomic64 variable
14777 * @v: pointer to type atomic64_t
14778 * @n: value to assign
14779@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
14780 }
14781
14782 /**
14783+ * atomic64_set_unchecked - set atomic64 variable
14784+ * @v: pointer to type atomic64_unchecked_t
14785+ * @n: value to assign
14786+ *
14787+ * Atomically sets the value of @v to @n.
14788+ */
14789+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
14790+{
14791+ unsigned high = (unsigned)(i >> 32);
14792+ unsigned low = (unsigned)i;
14793+ alternative_atomic64(set, /* no output */,
14794+ "S" (v), "b" (low), "c" (high)
14795+ : "eax", "edx", "memory");
14796+}
14797+
14798+/**
14799 * atomic64_read - read atomic64 variable
14800 * @v: pointer to type atomic64_t
14801 *
14802@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
14803 }
14804
14805 /**
14806+ * atomic64_read_unchecked - read atomic64 variable
14807+ * @v: pointer to type atomic64_unchecked_t
14808+ *
14809+ * Atomically reads the value of @v and returns it.
14810+ */
14811+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
14812+{
14813+ long long r;
14814+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
14815+ return r;
14816+ }
14817+
14818+/**
14819 * atomic64_add_return - add and return
14820 * @i: integer value to add
14821 * @v: pointer to type atomic64_t
14822@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
14823 return i;
14824 }
14825
14826+/**
14827+ * atomic64_add_return_unchecked - add and return
14828+ * @i: integer value to add
14829+ * @v: pointer to type atomic64_unchecked_t
14830+ *
14831+ * Atomically adds @i to @v and returns @i + *@v
14832+ */
14833+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
14834+{
14835+ alternative_atomic64(add_return_unchecked,
14836+ ASM_OUTPUT2("+A" (i), "+c" (v)),
14837+ ASM_NO_INPUT_CLOBBER("memory"));
14838+ return i;
14839+}
14840+
14841 /*
14842 * Other variants with different arithmetic operators:
14843 */
14844@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
14845 return a;
14846 }
14847
14848+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
14849+{
14850+ long long a;
14851+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
14852+ "S" (v) : "memory", "ecx");
14853+ return a;
14854+}
14855+
14856 static inline long long atomic64_dec_return(atomic64_t *v)
14857 {
14858 long long a;
14859@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
14860 }
14861
14862 /**
14863+ * atomic64_add_unchecked - add integer to atomic64 variable
14864+ * @i: integer value to add
14865+ * @v: pointer to type atomic64_unchecked_t
14866+ *
14867+ * Atomically adds @i to @v.
14868+ */
14869+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
14870+{
14871+ __alternative_atomic64(add_unchecked, add_return_unchecked,
14872+ ASM_OUTPUT2("+A" (i), "+c" (v)),
14873+ ASM_NO_INPUT_CLOBBER("memory"));
14874+ return i;
14875+}
14876+
14877+/**
14878 * atomic64_sub - subtract the atomic64 variable
14879 * @i: integer value to subtract
14880 * @v: pointer to type atomic64_t
14881diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
14882index 0e1cbfc..a891fc7 100644
14883--- a/arch/x86/include/asm/atomic64_64.h
14884+++ b/arch/x86/include/asm/atomic64_64.h
14885@@ -18,7 +18,19 @@
14886 */
14887 static inline long atomic64_read(const atomic64_t *v)
14888 {
14889- return (*(volatile long *)&(v)->counter);
14890+ return (*(volatile const long *)&(v)->counter);
14891+}
14892+
14893+/**
14894+ * atomic64_read_unchecked - read atomic64 variable
14895+ * @v: pointer of type atomic64_unchecked_t
14896+ *
14897+ * Atomically reads the value of @v.
14898+ * Doesn't imply a read memory barrier.
14899+ */
14900+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
14901+{
14902+ return (*(volatile const long *)&(v)->counter);
14903 }
14904
14905 /**
14906@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
14907 }
14908
14909 /**
14910+ * atomic64_set_unchecked - set atomic64 variable
14911+ * @v: pointer to type atomic64_unchecked_t
14912+ * @i: required value
14913+ *
14914+ * Atomically sets the value of @v to @i.
14915+ */
14916+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
14917+{
14918+ v->counter = i;
14919+}
14920+
14921+/**
14922 * atomic64_add - add integer to atomic64 variable
14923 * @i: integer value to add
14924 * @v: pointer to type atomic64_t
14925@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
14926 */
14927 static inline void atomic64_add(long i, atomic64_t *v)
14928 {
14929+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
14930+
14931+#ifdef CONFIG_PAX_REFCOUNT
14932+ "jno 0f\n"
14933+ LOCK_PREFIX "subq %1,%0\n"
14934+ "int $4\n0:\n"
14935+ _ASM_EXTABLE(0b, 0b)
14936+#endif
14937+
14938+ : "=m" (v->counter)
14939+ : "er" (i), "m" (v->counter));
14940+}
14941+
14942+/**
14943+ * atomic64_add_unchecked - add integer to atomic64 variable
14944+ * @i: integer value to add
14945+ * @v: pointer to type atomic64_unchecked_t
14946+ *
14947+ * Atomically adds @i to @v.
14948+ */
14949+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
14950+{
14951 asm volatile(LOCK_PREFIX "addq %1,%0"
14952 : "=m" (v->counter)
14953 : "er" (i), "m" (v->counter));
14954@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
14955 */
14956 static inline void atomic64_sub(long i, atomic64_t *v)
14957 {
14958- asm volatile(LOCK_PREFIX "subq %1,%0"
14959+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
14960+
14961+#ifdef CONFIG_PAX_REFCOUNT
14962+ "jno 0f\n"
14963+ LOCK_PREFIX "addq %1,%0\n"
14964+ "int $4\n0:\n"
14965+ _ASM_EXTABLE(0b, 0b)
14966+#endif
14967+
14968+ : "=m" (v->counter)
14969+ : "er" (i), "m" (v->counter));
14970+}
14971+
14972+/**
14973+ * atomic64_sub_unchecked - subtract the atomic64 variable
14974+ * @i: integer value to subtract
14975+ * @v: pointer to type atomic64_unchecked_t
14976+ *
14977+ * Atomically subtracts @i from @v.
14978+ */
14979+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
14980+{
14981+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
14982 : "=m" (v->counter)
14983 : "er" (i), "m" (v->counter));
14984 }
14985@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
14986 {
14987 unsigned char c;
14988
14989- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
14990+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
14991+
14992+#ifdef CONFIG_PAX_REFCOUNT
14993+ "jno 0f\n"
14994+ LOCK_PREFIX "addq %2,%0\n"
14995+ "int $4\n0:\n"
14996+ _ASM_EXTABLE(0b, 0b)
14997+#endif
14998+
14999+ "sete %1\n"
15000 : "=m" (v->counter), "=qm" (c)
15001 : "er" (i), "m" (v->counter) : "memory");
15002 return c;
15003@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15004 */
15005 static inline void atomic64_inc(atomic64_t *v)
15006 {
15007+ asm volatile(LOCK_PREFIX "incq %0\n"
15008+
15009+#ifdef CONFIG_PAX_REFCOUNT
15010+ "jno 0f\n"
15011+ LOCK_PREFIX "decq %0\n"
15012+ "int $4\n0:\n"
15013+ _ASM_EXTABLE(0b, 0b)
15014+#endif
15015+
15016+ : "=m" (v->counter)
15017+ : "m" (v->counter));
15018+}
15019+
15020+/**
15021+ * atomic64_inc_unchecked - increment atomic64 variable
15022+ * @v: pointer to type atomic64_unchecked_t
15023+ *
15024+ * Atomically increments @v by 1.
15025+ */
15026+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15027+{
15028 asm volatile(LOCK_PREFIX "incq %0"
15029 : "=m" (v->counter)
15030 : "m" (v->counter));
15031@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
15032 */
15033 static inline void atomic64_dec(atomic64_t *v)
15034 {
15035- asm volatile(LOCK_PREFIX "decq %0"
15036+ asm volatile(LOCK_PREFIX "decq %0\n"
15037+
15038+#ifdef CONFIG_PAX_REFCOUNT
15039+ "jno 0f\n"
15040+ LOCK_PREFIX "incq %0\n"
15041+ "int $4\n0:\n"
15042+ _ASM_EXTABLE(0b, 0b)
15043+#endif
15044+
15045+ : "=m" (v->counter)
15046+ : "m" (v->counter));
15047+}
15048+
15049+/**
15050+ * atomic64_dec_unchecked - decrement atomic64 variable
15051+ * @v: pointer to type atomic64_t
15052+ *
15053+ * Atomically decrements @v by 1.
15054+ */
15055+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15056+{
15057+ asm volatile(LOCK_PREFIX "decq %0\n"
15058 : "=m" (v->counter)
15059 : "m" (v->counter));
15060 }
15061@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15062 {
15063 unsigned char c;
15064
15065- asm volatile(LOCK_PREFIX "decq %0; sete %1"
15066+ asm volatile(LOCK_PREFIX "decq %0\n"
15067+
15068+#ifdef CONFIG_PAX_REFCOUNT
15069+ "jno 0f\n"
15070+ LOCK_PREFIX "incq %0\n"
15071+ "int $4\n0:\n"
15072+ _ASM_EXTABLE(0b, 0b)
15073+#endif
15074+
15075+ "sete %1\n"
15076 : "=m" (v->counter), "=qm" (c)
15077 : "m" (v->counter) : "memory");
15078 return c != 0;
15079@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15080 {
15081 unsigned char c;
15082
15083- asm volatile(LOCK_PREFIX "incq %0; sete %1"
15084+ asm volatile(LOCK_PREFIX "incq %0\n"
15085+
15086+#ifdef CONFIG_PAX_REFCOUNT
15087+ "jno 0f\n"
15088+ LOCK_PREFIX "decq %0\n"
15089+ "int $4\n0:\n"
15090+ _ASM_EXTABLE(0b, 0b)
15091+#endif
15092+
15093+ "sete %1\n"
15094 : "=m" (v->counter), "=qm" (c)
15095 : "m" (v->counter) : "memory");
15096 return c != 0;
15097@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15098 {
15099 unsigned char c;
15100
15101- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
15102+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
15103+
15104+#ifdef CONFIG_PAX_REFCOUNT
15105+ "jno 0f\n"
15106+ LOCK_PREFIX "subq %2,%0\n"
15107+ "int $4\n0:\n"
15108+ _ASM_EXTABLE(0b, 0b)
15109+#endif
15110+
15111+ "sets %1\n"
15112 : "=m" (v->counter), "=qm" (c)
15113 : "er" (i), "m" (v->counter) : "memory");
15114 return c;
15115@@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15116 */
15117 static inline long atomic64_add_return(long i, atomic64_t *v)
15118 {
15119+ return i + xadd_check_overflow(&v->counter, i);
15120+}
15121+
15122+/**
15123+ * atomic64_add_return_unchecked - add and return
15124+ * @i: integer value to add
15125+ * @v: pointer to type atomic64_unchecked_t
15126+ *
15127+ * Atomically adds @i to @v and returns @i + @v
15128+ */
15129+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15130+{
15131 return i + xadd(&v->counter, i);
15132 }
15133
15134@@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15135 }
15136
15137 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15138+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15139+{
15140+ return atomic64_add_return_unchecked(1, v);
15141+}
15142 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15143
15144 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15145@@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15146 return cmpxchg(&v->counter, old, new);
15147 }
15148
15149+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15150+{
15151+ return cmpxchg(&v->counter, old, new);
15152+}
15153+
15154 static inline long atomic64_xchg(atomic64_t *v, long new)
15155 {
15156 return xchg(&v->counter, new);
15157@@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15158 */
15159 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15160 {
15161- long c, old;
15162+ long c, old, new;
15163 c = atomic64_read(v);
15164 for (;;) {
15165- if (unlikely(c == (u)))
15166+ if (unlikely(c == u))
15167 break;
15168- old = atomic64_cmpxchg((v), c, c + (a));
15169+
15170+ asm volatile("add %2,%0\n"
15171+
15172+#ifdef CONFIG_PAX_REFCOUNT
15173+ "jno 0f\n"
15174+ "sub %2,%0\n"
15175+ "int $4\n0:\n"
15176+ _ASM_EXTABLE(0b, 0b)
15177+#endif
15178+
15179+ : "=r" (new)
15180+ : "0" (c), "ir" (a));
15181+
15182+ old = atomic64_cmpxchg(v, c, new);
15183 if (likely(old == c))
15184 break;
15185 c = old;
15186 }
15187- return c != (u);
15188+ return c != u;
15189 }
15190
15191 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
15192diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
15193index 41639ce..ebce552 100644
15194--- a/arch/x86/include/asm/bitops.h
15195+++ b/arch/x86/include/asm/bitops.h
15196@@ -48,7 +48,7 @@
15197 * a mask operation on a byte.
15198 */
15199 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
15200-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
15201+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
15202 #define CONST_MASK(nr) (1 << ((nr) & 7))
15203
15204 /**
15205@@ -361,7 +361,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
15206 *
15207 * Undefined if no bit exists, so code should check against 0 first.
15208 */
15209-static inline unsigned long __ffs(unsigned long word)
15210+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
15211 {
15212 asm("rep; bsf %1,%0"
15213 : "=r" (word)
15214@@ -375,7 +375,7 @@ static inline unsigned long __ffs(unsigned long word)
15215 *
15216 * Undefined if no zero exists, so code should check against ~0UL first.
15217 */
15218-static inline unsigned long ffz(unsigned long word)
15219+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
15220 {
15221 asm("rep; bsf %1,%0"
15222 : "=r" (word)
15223@@ -389,7 +389,7 @@ static inline unsigned long ffz(unsigned long word)
15224 *
15225 * Undefined if no set bit exists, so code should check against 0 first.
15226 */
15227-static inline unsigned long __fls(unsigned long word)
15228+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
15229 {
15230 asm("bsr %1,%0"
15231 : "=r" (word)
15232@@ -452,7 +452,7 @@ static inline int ffs(int x)
15233 * set bit if value is nonzero. The last (most significant) bit is
15234 * at position 32.
15235 */
15236-static inline int fls(int x)
15237+static inline int __intentional_overflow(-1) fls(int x)
15238 {
15239 int r;
15240
15241@@ -494,7 +494,7 @@ static inline int fls(int x)
15242 * at position 64.
15243 */
15244 #ifdef CONFIG_X86_64
15245-static __always_inline int fls64(__u64 x)
15246+static __always_inline long fls64(__u64 x)
15247 {
15248 int bitpos = -1;
15249 /*
15250diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
15251index 4fa687a..60f2d39 100644
15252--- a/arch/x86/include/asm/boot.h
15253+++ b/arch/x86/include/asm/boot.h
15254@@ -6,10 +6,15 @@
15255 #include <uapi/asm/boot.h>
15256
15257 /* Physical address where kernel should be loaded. */
15258-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15259+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15260 + (CONFIG_PHYSICAL_ALIGN - 1)) \
15261 & ~(CONFIG_PHYSICAL_ALIGN - 1))
15262
15263+#ifndef __ASSEMBLY__
15264+extern unsigned char __LOAD_PHYSICAL_ADDR[];
15265+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
15266+#endif
15267+
15268 /* Minimum kernel alignment, as a power of two */
15269 #ifdef CONFIG_X86_64
15270 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
15271diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
15272index 48f99f1..d78ebf9 100644
15273--- a/arch/x86/include/asm/cache.h
15274+++ b/arch/x86/include/asm/cache.h
15275@@ -5,12 +5,13 @@
15276
15277 /* L1 cache line size */
15278 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
15279-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
15280+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
15281
15282 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
15283+#define __read_only __attribute__((__section__(".data..read_only")))
15284
15285 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
15286-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
15287+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
15288
15289 #ifdef CONFIG_X86_VSMP
15290 #ifdef CONFIG_SMP
15291diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
15292index 9863ee3..4a1f8e1 100644
15293--- a/arch/x86/include/asm/cacheflush.h
15294+++ b/arch/x86/include/asm/cacheflush.h
15295@@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
15296 unsigned long pg_flags = pg->flags & _PGMT_MASK;
15297
15298 if (pg_flags == _PGMT_DEFAULT)
15299- return -1;
15300+ return ~0UL;
15301 else if (pg_flags == _PGMT_WC)
15302 return _PAGE_CACHE_WC;
15303 else if (pg_flags == _PGMT_UC_MINUS)
15304diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
15305index 0fa6750..cb7b2c3 100644
15306--- a/arch/x86/include/asm/calling.h
15307+++ b/arch/x86/include/asm/calling.h
15308@@ -80,103 +80,113 @@ For 32-bit we have the following conventions - kernel is built with
15309 #define RSP 152
15310 #define SS 160
15311
15312-#define ARGOFFSET R11
15313-#define SWFRAME ORIG_RAX
15314+#define ARGOFFSET R15
15315
15316 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1
15317- subq $9*8+\addskip, %rsp
15318- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
15319- movq_cfi rdi, 8*8
15320- movq_cfi rsi, 7*8
15321- movq_cfi rdx, 6*8
15322+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
15323+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
15324+ movq_cfi rdi, RDI
15325+ movq_cfi rsi, RSI
15326+ movq_cfi rdx, RDX
15327
15328 .if \save_rcx
15329- movq_cfi rcx, 5*8
15330+ movq_cfi rcx, RCX
15331 .endif
15332
15333- movq_cfi rax, 4*8
15334+ movq_cfi rax, RAX
15335
15336 .if \save_r891011
15337- movq_cfi r8, 3*8
15338- movq_cfi r9, 2*8
15339- movq_cfi r10, 1*8
15340- movq_cfi r11, 0*8
15341+ movq_cfi r8, R8
15342+ movq_cfi r9, R9
15343+ movq_cfi r10, R10
15344+ movq_cfi r11, R11
15345 .endif
15346
15347+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15348+ movq_cfi r12, R12
15349+#endif
15350+
15351 .endm
15352
15353-#define ARG_SKIP (9*8)
15354+#define ARG_SKIP ORIG_RAX
15355
15356 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
15357 rstor_r8910=1, rstor_rdx=1
15358+
15359+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15360+ movq_cfi_restore R12, r12
15361+#endif
15362+
15363 .if \rstor_r11
15364- movq_cfi_restore 0*8, r11
15365+ movq_cfi_restore R11, r11
15366 .endif
15367
15368 .if \rstor_r8910
15369- movq_cfi_restore 1*8, r10
15370- movq_cfi_restore 2*8, r9
15371- movq_cfi_restore 3*8, r8
15372+ movq_cfi_restore R10, r10
15373+ movq_cfi_restore R9, r9
15374+ movq_cfi_restore R8, r8
15375 .endif
15376
15377 .if \rstor_rax
15378- movq_cfi_restore 4*8, rax
15379+ movq_cfi_restore RAX, rax
15380 .endif
15381
15382 .if \rstor_rcx
15383- movq_cfi_restore 5*8, rcx
15384+ movq_cfi_restore RCX, rcx
15385 .endif
15386
15387 .if \rstor_rdx
15388- movq_cfi_restore 6*8, rdx
15389+ movq_cfi_restore RDX, rdx
15390 .endif
15391
15392- movq_cfi_restore 7*8, rsi
15393- movq_cfi_restore 8*8, rdi
15394+ movq_cfi_restore RSI, rsi
15395+ movq_cfi_restore RDI, rdi
15396
15397- .if ARG_SKIP+\addskip > 0
15398- addq $ARG_SKIP+\addskip, %rsp
15399- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
15400+ .if ORIG_RAX+\addskip > 0
15401+ addq $ORIG_RAX+\addskip, %rsp
15402+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
15403 .endif
15404 .endm
15405
15406- .macro LOAD_ARGS offset, skiprax=0
15407- movq \offset(%rsp), %r11
15408- movq \offset+8(%rsp), %r10
15409- movq \offset+16(%rsp), %r9
15410- movq \offset+24(%rsp), %r8
15411- movq \offset+40(%rsp), %rcx
15412- movq \offset+48(%rsp), %rdx
15413- movq \offset+56(%rsp), %rsi
15414- movq \offset+64(%rsp), %rdi
15415+ .macro LOAD_ARGS skiprax=0
15416+ movq R11(%rsp), %r11
15417+ movq R10(%rsp), %r10
15418+ movq R9(%rsp), %r9
15419+ movq R8(%rsp), %r8
15420+ movq RCX(%rsp), %rcx
15421+ movq RDX(%rsp), %rdx
15422+ movq RSI(%rsp), %rsi
15423+ movq RDI(%rsp), %rdi
15424 .if \skiprax
15425 .else
15426- movq \offset+72(%rsp), %rax
15427+ movq RAX(%rsp), %rax
15428 .endif
15429 .endm
15430
15431-#define REST_SKIP (6*8)
15432-
15433 .macro SAVE_REST
15434- subq $REST_SKIP, %rsp
15435- CFI_ADJUST_CFA_OFFSET REST_SKIP
15436- movq_cfi rbx, 5*8
15437- movq_cfi rbp, 4*8
15438- movq_cfi r12, 3*8
15439- movq_cfi r13, 2*8
15440- movq_cfi r14, 1*8
15441- movq_cfi r15, 0*8
15442+ movq_cfi rbx, RBX
15443+ movq_cfi rbp, RBP
15444+
15445+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15446+ movq_cfi r12, R12
15447+#endif
15448+
15449+ movq_cfi r13, R13
15450+ movq_cfi r14, R14
15451+ movq_cfi r15, R15
15452 .endm
15453
15454 .macro RESTORE_REST
15455- movq_cfi_restore 0*8, r15
15456- movq_cfi_restore 1*8, r14
15457- movq_cfi_restore 2*8, r13
15458- movq_cfi_restore 3*8, r12
15459- movq_cfi_restore 4*8, rbp
15460- movq_cfi_restore 5*8, rbx
15461- addq $REST_SKIP, %rsp
15462- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
15463+ movq_cfi_restore R15, r15
15464+ movq_cfi_restore R14, r14
15465+ movq_cfi_restore R13, r13
15466+
15467+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15468+ movq_cfi_restore R12, r12
15469+#endif
15470+
15471+ movq_cfi_restore RBP, rbp
15472+ movq_cfi_restore RBX, rbx
15473 .endm
15474
15475 .macro SAVE_ALL
15476diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
15477index f50de69..2b0a458 100644
15478--- a/arch/x86/include/asm/checksum_32.h
15479+++ b/arch/x86/include/asm/checksum_32.h
15480@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
15481 int len, __wsum sum,
15482 int *src_err_ptr, int *dst_err_ptr);
15483
15484+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
15485+ int len, __wsum sum,
15486+ int *src_err_ptr, int *dst_err_ptr);
15487+
15488+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
15489+ int len, __wsum sum,
15490+ int *src_err_ptr, int *dst_err_ptr);
15491+
15492 /*
15493 * Note: when you get a NULL pointer exception here this means someone
15494 * passed in an incorrect kernel address to one of these functions.
15495@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
15496
15497 might_sleep();
15498 stac();
15499- ret = csum_partial_copy_generic((__force void *)src, dst,
15500+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
15501 len, sum, err_ptr, NULL);
15502 clac();
15503
15504@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
15505 might_sleep();
15506 if (access_ok(VERIFY_WRITE, dst, len)) {
15507 stac();
15508- ret = csum_partial_copy_generic(src, (__force void *)dst,
15509+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
15510 len, sum, NULL, err_ptr);
15511 clac();
15512 return ret;
15513diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
15514index d47786a..ce1b05d 100644
15515--- a/arch/x86/include/asm/cmpxchg.h
15516+++ b/arch/x86/include/asm/cmpxchg.h
15517@@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
15518 __compiletime_error("Bad argument size for cmpxchg");
15519 extern void __xadd_wrong_size(void)
15520 __compiletime_error("Bad argument size for xadd");
15521+extern void __xadd_check_overflow_wrong_size(void)
15522+ __compiletime_error("Bad argument size for xadd_check_overflow");
15523 extern void __add_wrong_size(void)
15524 __compiletime_error("Bad argument size for add");
15525+extern void __add_check_overflow_wrong_size(void)
15526+ __compiletime_error("Bad argument size for add_check_overflow");
15527
15528 /*
15529 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
15530@@ -67,6 +71,34 @@ extern void __add_wrong_size(void)
15531 __ret; \
15532 })
15533
15534+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
15535+ ({ \
15536+ __typeof__ (*(ptr)) __ret = (arg); \
15537+ switch (sizeof(*(ptr))) { \
15538+ case __X86_CASE_L: \
15539+ asm volatile (lock #op "l %0, %1\n" \
15540+ "jno 0f\n" \
15541+ "mov %0,%1\n" \
15542+ "int $4\n0:\n" \
15543+ _ASM_EXTABLE(0b, 0b) \
15544+ : "+r" (__ret), "+m" (*(ptr)) \
15545+ : : "memory", "cc"); \
15546+ break; \
15547+ case __X86_CASE_Q: \
15548+ asm volatile (lock #op "q %q0, %1\n" \
15549+ "jno 0f\n" \
15550+ "mov %0,%1\n" \
15551+ "int $4\n0:\n" \
15552+ _ASM_EXTABLE(0b, 0b) \
15553+ : "+r" (__ret), "+m" (*(ptr)) \
15554+ : : "memory", "cc"); \
15555+ break; \
15556+ default: \
15557+ __ ## op ## _check_overflow_wrong_size(); \
15558+ } \
15559+ __ret; \
15560+ })
15561+
15562 /*
15563 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
15564 * Since this is generally used to protect other memory information, we
15565@@ -167,6 +199,9 @@ extern void __add_wrong_size(void)
15566 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
15567 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
15568
15569+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
15570+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
15571+
15572 #define __add(ptr, inc, lock) \
15573 ({ \
15574 __typeof__ (*(ptr)) __ret = (inc); \
15575diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
15576index 59c6c40..5e0b22c 100644
15577--- a/arch/x86/include/asm/compat.h
15578+++ b/arch/x86/include/asm/compat.h
15579@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
15580 typedef u32 compat_uint_t;
15581 typedef u32 compat_ulong_t;
15582 typedef u64 __attribute__((aligned(4))) compat_u64;
15583-typedef u32 compat_uptr_t;
15584+typedef u32 __user compat_uptr_t;
15585
15586 struct compat_timespec {
15587 compat_time_t tv_sec;
15588diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
15589index 89270b4..f0abf8e 100644
15590--- a/arch/x86/include/asm/cpufeature.h
15591+++ b/arch/x86/include/asm/cpufeature.h
15592@@ -203,7 +203,7 @@
15593 #define X86_FEATURE_DECODEASSISTS (8*32+12) /* AMD Decode Assists support */
15594 #define X86_FEATURE_PAUSEFILTER (8*32+13) /* AMD filtered pause intercept */
15595 #define X86_FEATURE_PFTHRESHOLD (8*32+14) /* AMD pause filter threshold */
15596-
15597+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
15598
15599 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
15600 #define X86_FEATURE_FSGSBASE (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
15601@@ -211,7 +211,7 @@
15602 #define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
15603 #define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
15604 #define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
15605-#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
15606+#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
15607 #define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
15608 #define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
15609 #define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
15610@@ -353,6 +353,7 @@ extern const char * const x86_power_flags[32];
15611 #undef cpu_has_centaur_mcr
15612 #define cpu_has_centaur_mcr 0
15613
15614+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
15615 #endif /* CONFIG_X86_64 */
15616
15617 #if __GNUC__ >= 4
15618@@ -405,7 +406,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
15619
15620 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
15621 t_warn:
15622- warn_pre_alternatives();
15623+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
15624+ warn_pre_alternatives();
15625 return false;
15626 #endif
15627
15628@@ -425,7 +427,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
15629 ".section .discard,\"aw\",@progbits\n"
15630 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
15631 ".previous\n"
15632- ".section .altinstr_replacement,\"ax\"\n"
15633+ ".section .altinstr_replacement,\"a\"\n"
15634 "3: movb $1,%0\n"
15635 "4:\n"
15636 ".previous\n"
15637@@ -462,7 +464,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
15638 " .byte 2b - 1b\n" /* src len */
15639 " .byte 4f - 3f\n" /* repl len */
15640 ".previous\n"
15641- ".section .altinstr_replacement,\"ax\"\n"
15642+ ".section .altinstr_replacement,\"a\"\n"
15643 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
15644 "4:\n"
15645 ".previous\n"
15646@@ -495,7 +497,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
15647 ".section .discard,\"aw\",@progbits\n"
15648 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
15649 ".previous\n"
15650- ".section .altinstr_replacement,\"ax\"\n"
15651+ ".section .altinstr_replacement,\"a\"\n"
15652 "3: movb $0,%0\n"
15653 "4:\n"
15654 ".previous\n"
15655@@ -509,7 +511,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
15656 ".section .discard,\"aw\",@progbits\n"
15657 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
15658 ".previous\n"
15659- ".section .altinstr_replacement,\"ax\"\n"
15660+ ".section .altinstr_replacement,\"a\"\n"
15661 "5: movb $1,%0\n"
15662 "6:\n"
15663 ".previous\n"
15664diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
15665index b90e5df..b462c91 100644
15666--- a/arch/x86/include/asm/desc.h
15667+++ b/arch/x86/include/asm/desc.h
15668@@ -4,6 +4,7 @@
15669 #include <asm/desc_defs.h>
15670 #include <asm/ldt.h>
15671 #include <asm/mmu.h>
15672+#include <asm/pgtable.h>
15673
15674 #include <linux/smp.h>
15675 #include <linux/percpu.h>
15676@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
15677
15678 desc->type = (info->read_exec_only ^ 1) << 1;
15679 desc->type |= info->contents << 2;
15680+ desc->type |= info->seg_not_present ^ 1;
15681
15682 desc->s = 1;
15683 desc->dpl = 0x3;
15684@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
15685 }
15686
15687 extern struct desc_ptr idt_descr;
15688-extern gate_desc idt_table[];
15689-extern struct desc_ptr debug_idt_descr;
15690-extern gate_desc debug_idt_table[];
15691-
15692-struct gdt_page {
15693- struct desc_struct gdt[GDT_ENTRIES];
15694-} __attribute__((aligned(PAGE_SIZE)));
15695-
15696-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
15697+extern gate_desc idt_table[IDT_ENTRIES];
15698+extern const struct desc_ptr debug_idt_descr;
15699+extern gate_desc debug_idt_table[IDT_ENTRIES];
15700
15701+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
15702 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
15703 {
15704- return per_cpu(gdt_page, cpu).gdt;
15705+ return cpu_gdt_table[cpu];
15706 }
15707
15708 #ifdef CONFIG_X86_64
15709@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
15710 unsigned long base, unsigned dpl, unsigned flags,
15711 unsigned short seg)
15712 {
15713- gate->a = (seg << 16) | (base & 0xffff);
15714- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
15715+ gate->gate.offset_low = base;
15716+ gate->gate.seg = seg;
15717+ gate->gate.reserved = 0;
15718+ gate->gate.type = type;
15719+ gate->gate.s = 0;
15720+ gate->gate.dpl = dpl;
15721+ gate->gate.p = 1;
15722+ gate->gate.offset_high = base >> 16;
15723 }
15724
15725 #endif
15726@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
15727
15728 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
15729 {
15730+ pax_open_kernel();
15731 memcpy(&idt[entry], gate, sizeof(*gate));
15732+ pax_close_kernel();
15733 }
15734
15735 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
15736 {
15737+ pax_open_kernel();
15738 memcpy(&ldt[entry], desc, 8);
15739+ pax_close_kernel();
15740 }
15741
15742 static inline void
15743@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
15744 default: size = sizeof(*gdt); break;
15745 }
15746
15747+ pax_open_kernel();
15748 memcpy(&gdt[entry], desc, size);
15749+ pax_close_kernel();
15750 }
15751
15752 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
15753@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
15754
15755 static inline void native_load_tr_desc(void)
15756 {
15757+ pax_open_kernel();
15758 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
15759+ pax_close_kernel();
15760 }
15761
15762 static inline void native_load_gdt(const struct desc_ptr *dtr)
15763@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
15764 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
15765 unsigned int i;
15766
15767+ pax_open_kernel();
15768 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
15769 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
15770+ pax_close_kernel();
15771 }
15772
15773 #define _LDT_empty(info) \
15774@@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
15775 preempt_enable();
15776 }
15777
15778-static inline unsigned long get_desc_base(const struct desc_struct *desc)
15779+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
15780 {
15781 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
15782 }
15783@@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
15784 }
15785
15786 #ifdef CONFIG_X86_64
15787-static inline void set_nmi_gate(int gate, void *addr)
15788+static inline void set_nmi_gate(int gate, const void *addr)
15789 {
15790 gate_desc s;
15791
15792@@ -321,8 +334,8 @@ static inline void set_nmi_gate(int gate, void *addr)
15793 #endif
15794
15795 #ifdef CONFIG_TRACING
15796-extern struct desc_ptr trace_idt_descr;
15797-extern gate_desc trace_idt_table[];
15798+extern const struct desc_ptr trace_idt_descr;
15799+extern gate_desc trace_idt_table[IDT_ENTRIES];
15800 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
15801 {
15802 write_idt_entry(trace_idt_table, entry, gate);
15803@@ -333,7 +346,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
15804 }
15805 #endif
15806
15807-static inline void _set_gate(int gate, unsigned type, void *addr,
15808+static inline void _set_gate(int gate, unsigned type, const void *addr,
15809 unsigned dpl, unsigned ist, unsigned seg)
15810 {
15811 gate_desc s;
15812@@ -353,7 +366,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
15813 * Pentium F0 0F bugfix can have resulted in the mapped
15814 * IDT being write-protected.
15815 */
15816-static inline void set_intr_gate(unsigned int n, void *addr)
15817+static inline void set_intr_gate(unsigned int n, const void *addr)
15818 {
15819 BUG_ON((unsigned)n > 0xFF);
15820 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
15821@@ -410,19 +423,19 @@ static inline void __alloc_intr_gate(unsigned int n, void *addr)
15822 /*
15823 * This routine sets up an interrupt gate at directory privilege level 3.
15824 */
15825-static inline void set_system_intr_gate(unsigned int n, void *addr)
15826+static inline void set_system_intr_gate(unsigned int n, const void *addr)
15827 {
15828 BUG_ON((unsigned)n > 0xFF);
15829 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
15830 }
15831
15832-static inline void set_system_trap_gate(unsigned int n, void *addr)
15833+static inline void set_system_trap_gate(unsigned int n, const void *addr)
15834 {
15835 BUG_ON((unsigned)n > 0xFF);
15836 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
15837 }
15838
15839-static inline void set_trap_gate(unsigned int n, void *addr)
15840+static inline void set_trap_gate(unsigned int n, const void *addr)
15841 {
15842 BUG_ON((unsigned)n > 0xFF);
15843 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
15844@@ -431,16 +444,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
15845 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
15846 {
15847 BUG_ON((unsigned)n > 0xFF);
15848- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
15849+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
15850 }
15851
15852-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
15853+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
15854 {
15855 BUG_ON((unsigned)n > 0xFF);
15856 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
15857 }
15858
15859-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
15860+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
15861 {
15862 BUG_ON((unsigned)n > 0xFF);
15863 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
15864@@ -512,4 +525,17 @@ static inline void load_current_idt(void)
15865 else
15866 load_idt((const struct desc_ptr *)&idt_descr);
15867 }
15868+
15869+#ifdef CONFIG_X86_32
15870+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
15871+{
15872+ struct desc_struct d;
15873+
15874+ if (likely(limit))
15875+ limit = (limit - 1UL) >> PAGE_SHIFT;
15876+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
15877+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
15878+}
15879+#endif
15880+
15881 #endif /* _ASM_X86_DESC_H */
15882diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
15883index 278441f..b95a174 100644
15884--- a/arch/x86/include/asm/desc_defs.h
15885+++ b/arch/x86/include/asm/desc_defs.h
15886@@ -31,6 +31,12 @@ struct desc_struct {
15887 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
15888 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
15889 };
15890+ struct {
15891+ u16 offset_low;
15892+ u16 seg;
15893+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
15894+ unsigned offset_high: 16;
15895+ } gate;
15896 };
15897 } __attribute__((packed));
15898
15899diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
15900index ced283a..ffe04cc 100644
15901--- a/arch/x86/include/asm/div64.h
15902+++ b/arch/x86/include/asm/div64.h
15903@@ -39,7 +39,7 @@
15904 __mod; \
15905 })
15906
15907-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
15908+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
15909 {
15910 union {
15911 u64 v64;
15912diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
15913index 9c999c1..3860cb8 100644
15914--- a/arch/x86/include/asm/elf.h
15915+++ b/arch/x86/include/asm/elf.h
15916@@ -243,7 +243,25 @@ extern int force_personality32;
15917 the loader. We need to make sure that it is out of the way of the program
15918 that it will "exec", and that there is sufficient room for the brk. */
15919
15920+#ifdef CONFIG_PAX_SEGMEXEC
15921+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
15922+#else
15923 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
15924+#endif
15925+
15926+#ifdef CONFIG_PAX_ASLR
15927+#ifdef CONFIG_X86_32
15928+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
15929+
15930+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
15931+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
15932+#else
15933+#define PAX_ELF_ET_DYN_BASE 0x400000UL
15934+
15935+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
15936+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
15937+#endif
15938+#endif
15939
15940 /* This yields a mask that user programs can use to figure out what
15941 instruction set this CPU supports. This could be done in user space,
15942@@ -296,16 +314,12 @@ do { \
15943
15944 #define ARCH_DLINFO \
15945 do { \
15946- if (vdso_enabled) \
15947- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
15948- (unsigned long)current->mm->context.vdso); \
15949+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
15950 } while (0)
15951
15952 #define ARCH_DLINFO_X32 \
15953 do { \
15954- if (vdso_enabled) \
15955- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
15956- (unsigned long)current->mm->context.vdso); \
15957+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
15958 } while (0)
15959
15960 #define AT_SYSINFO 32
15961@@ -320,7 +334,7 @@ else \
15962
15963 #endif /* !CONFIG_X86_32 */
15964
15965-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
15966+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
15967
15968 #define VDSO_ENTRY \
15969 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
15970@@ -336,9 +350,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
15971 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
15972 #define compat_arch_setup_additional_pages syscall32_setup_pages
15973
15974-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
15975-#define arch_randomize_brk arch_randomize_brk
15976-
15977 /*
15978 * True on X86_32 or when emulating IA32 on X86_64
15979 */
15980diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
15981index 77a99ac..39ff7f5 100644
15982--- a/arch/x86/include/asm/emergency-restart.h
15983+++ b/arch/x86/include/asm/emergency-restart.h
15984@@ -1,6 +1,6 @@
15985 #ifndef _ASM_X86_EMERGENCY_RESTART_H
15986 #define _ASM_X86_EMERGENCY_RESTART_H
15987
15988-extern void machine_emergency_restart(void);
15989+extern void machine_emergency_restart(void) __noreturn;
15990
15991 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
15992diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
15993index 4d0bda7..221da4d 100644
15994--- a/arch/x86/include/asm/fpu-internal.h
15995+++ b/arch/x86/include/asm/fpu-internal.h
15996@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
15997 #define user_insn(insn, output, input...) \
15998 ({ \
15999 int err; \
16000+ pax_open_userland(); \
16001 asm volatile(ASM_STAC "\n" \
16002- "1:" #insn "\n\t" \
16003+ "1:" \
16004+ __copyuser_seg \
16005+ #insn "\n\t" \
16006 "2: " ASM_CLAC "\n" \
16007 ".section .fixup,\"ax\"\n" \
16008 "3: movl $-1,%[err]\n" \
16009@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16010 _ASM_EXTABLE(1b, 3b) \
16011 : [err] "=r" (err), output \
16012 : "0"(0), input); \
16013+ pax_close_userland(); \
16014 err; \
16015 })
16016
16017@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16018 "emms\n\t" /* clear stack tags */
16019 "fildl %P[addr]", /* set F?P to defined value */
16020 X86_FEATURE_FXSAVE_LEAK,
16021- [addr] "m" (tsk->thread.fpu.has_fpu));
16022+ [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16023
16024 return fpu_restore_checking(&tsk->thread.fpu);
16025 }
16026diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16027index be27ba1..04a8801 100644
16028--- a/arch/x86/include/asm/futex.h
16029+++ b/arch/x86/include/asm/futex.h
16030@@ -12,6 +12,7 @@
16031 #include <asm/smap.h>
16032
16033 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16034+ typecheck(u32 __user *, uaddr); \
16035 asm volatile("\t" ASM_STAC "\n" \
16036 "1:\t" insn "\n" \
16037 "2:\t" ASM_CLAC "\n" \
16038@@ -20,15 +21,16 @@
16039 "\tjmp\t2b\n" \
16040 "\t.previous\n" \
16041 _ASM_EXTABLE(1b, 3b) \
16042- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16043+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16044 : "i" (-EFAULT), "0" (oparg), "1" (0))
16045
16046 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16047+ typecheck(u32 __user *, uaddr); \
16048 asm volatile("\t" ASM_STAC "\n" \
16049 "1:\tmovl %2, %0\n" \
16050 "\tmovl\t%0, %3\n" \
16051 "\t" insn "\n" \
16052- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16053+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16054 "\tjnz\t1b\n" \
16055 "3:\t" ASM_CLAC "\n" \
16056 "\t.section .fixup,\"ax\"\n" \
16057@@ -38,7 +40,7 @@
16058 _ASM_EXTABLE(1b, 4b) \
16059 _ASM_EXTABLE(2b, 4b) \
16060 : "=&a" (oldval), "=&r" (ret), \
16061- "+m" (*uaddr), "=&r" (tem) \
16062+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16063 : "r" (oparg), "i" (-EFAULT), "1" (0))
16064
16065 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16066@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16067
16068 pagefault_disable();
16069
16070+ pax_open_userland();
16071 switch (op) {
16072 case FUTEX_OP_SET:
16073- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16074+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16075 break;
16076 case FUTEX_OP_ADD:
16077- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16078+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16079 uaddr, oparg);
16080 break;
16081 case FUTEX_OP_OR:
16082@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16083 default:
16084 ret = -ENOSYS;
16085 }
16086+ pax_close_userland();
16087
16088 pagefault_enable();
16089
16090@@ -115,18 +119,20 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
16091 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
16092 return -EFAULT;
16093
16094+ pax_open_userland();
16095 asm volatile("\t" ASM_STAC "\n"
16096- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
16097+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
16098 "2:\t" ASM_CLAC "\n"
16099 "\t.section .fixup, \"ax\"\n"
16100 "3:\tmov %3, %0\n"
16101 "\tjmp 2b\n"
16102 "\t.previous\n"
16103 _ASM_EXTABLE(1b, 3b)
16104- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
16105+ : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
16106 : "i" (-EFAULT), "r" (newval), "1" (oldval)
16107 : "memory"
16108 );
16109+ pax_close_userland();
16110
16111 *uval = oldval;
16112 return ret;
16113diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16114index 92b3bae..3866449 100644
16115--- a/arch/x86/include/asm/hw_irq.h
16116+++ b/arch/x86/include/asm/hw_irq.h
16117@@ -165,8 +165,8 @@ extern void setup_ioapic_dest(void);
16118 extern void enable_IO_APIC(void);
16119
16120 /* Statistics */
16121-extern atomic_t irq_err_count;
16122-extern atomic_t irq_mis_count;
16123+extern atomic_unchecked_t irq_err_count;
16124+extern atomic_unchecked_t irq_mis_count;
16125
16126 /* EISA */
16127 extern void eisa_set_level_irq(unsigned int irq);
16128diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
16129index a203659..9889f1c 100644
16130--- a/arch/x86/include/asm/i8259.h
16131+++ b/arch/x86/include/asm/i8259.h
16132@@ -62,7 +62,7 @@ struct legacy_pic {
16133 void (*init)(int auto_eoi);
16134 int (*irq_pending)(unsigned int irq);
16135 void (*make_irq)(unsigned int irq);
16136-};
16137+} __do_const;
16138
16139 extern struct legacy_pic *legacy_pic;
16140 extern struct legacy_pic null_legacy_pic;
16141diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
16142index 34f69cb..6d95446 100644
16143--- a/arch/x86/include/asm/io.h
16144+++ b/arch/x86/include/asm/io.h
16145@@ -51,12 +51,12 @@ static inline void name(type val, volatile void __iomem *addr) \
16146 "m" (*(volatile type __force *)addr) barrier); }
16147
16148 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
16149-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
16150-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
16151+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
16152+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
16153
16154 build_mmio_read(__readb, "b", unsigned char, "=q", )
16155-build_mmio_read(__readw, "w", unsigned short, "=r", )
16156-build_mmio_read(__readl, "l", unsigned int, "=r", )
16157+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
16158+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
16159
16160 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
16161 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
16162@@ -184,7 +184,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
16163 return ioremap_nocache(offset, size);
16164 }
16165
16166-extern void iounmap(volatile void __iomem *addr);
16167+extern void iounmap(const volatile void __iomem *addr);
16168
16169 extern void set_iounmap_nonlazy(void);
16170
16171@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
16172
16173 #include <linux/vmalloc.h>
16174
16175+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
16176+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
16177+{
16178+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16179+}
16180+
16181+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
16182+{
16183+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16184+}
16185+
16186 /*
16187 * Convert a virtual cached pointer to an uncached pointer
16188 */
16189diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
16190index bba3cf8..06bc8da 100644
16191--- a/arch/x86/include/asm/irqflags.h
16192+++ b/arch/x86/include/asm/irqflags.h
16193@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
16194 sti; \
16195 sysexit
16196
16197+#define GET_CR0_INTO_RDI mov %cr0, %rdi
16198+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
16199+#define GET_CR3_INTO_RDI mov %cr3, %rdi
16200+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
16201+
16202 #else
16203 #define INTERRUPT_RETURN iret
16204 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
16205diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
16206index 9454c16..e4100e3 100644
16207--- a/arch/x86/include/asm/kprobes.h
16208+++ b/arch/x86/include/asm/kprobes.h
16209@@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
16210 #define RELATIVEJUMP_SIZE 5
16211 #define RELATIVECALL_OPCODE 0xe8
16212 #define RELATIVE_ADDR_SIZE 4
16213-#define MAX_STACK_SIZE 64
16214-#define MIN_STACK_SIZE(ADDR) \
16215- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
16216- THREAD_SIZE - (unsigned long)(ADDR))) \
16217- ? (MAX_STACK_SIZE) \
16218- : (((unsigned long)current_thread_info()) + \
16219- THREAD_SIZE - (unsigned long)(ADDR)))
16220+#define MAX_STACK_SIZE 64UL
16221+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
16222
16223 #define flush_insn_slot(p) do { } while (0)
16224
16225diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
16226index 2d89e39..baee879 100644
16227--- a/arch/x86/include/asm/local.h
16228+++ b/arch/x86/include/asm/local.h
16229@@ -10,33 +10,97 @@ typedef struct {
16230 atomic_long_t a;
16231 } local_t;
16232
16233+typedef struct {
16234+ atomic_long_unchecked_t a;
16235+} local_unchecked_t;
16236+
16237 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
16238
16239 #define local_read(l) atomic_long_read(&(l)->a)
16240+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
16241 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
16242+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
16243
16244 static inline void local_inc(local_t *l)
16245 {
16246- asm volatile(_ASM_INC "%0"
16247+ asm volatile(_ASM_INC "%0\n"
16248+
16249+#ifdef CONFIG_PAX_REFCOUNT
16250+ "jno 0f\n"
16251+ _ASM_DEC "%0\n"
16252+ "int $4\n0:\n"
16253+ _ASM_EXTABLE(0b, 0b)
16254+#endif
16255+
16256+ : "+m" (l->a.counter));
16257+}
16258+
16259+static inline void local_inc_unchecked(local_unchecked_t *l)
16260+{
16261+ asm volatile(_ASM_INC "%0\n"
16262 : "+m" (l->a.counter));
16263 }
16264
16265 static inline void local_dec(local_t *l)
16266 {
16267- asm volatile(_ASM_DEC "%0"
16268+ asm volatile(_ASM_DEC "%0\n"
16269+
16270+#ifdef CONFIG_PAX_REFCOUNT
16271+ "jno 0f\n"
16272+ _ASM_INC "%0\n"
16273+ "int $4\n0:\n"
16274+ _ASM_EXTABLE(0b, 0b)
16275+#endif
16276+
16277+ : "+m" (l->a.counter));
16278+}
16279+
16280+static inline void local_dec_unchecked(local_unchecked_t *l)
16281+{
16282+ asm volatile(_ASM_DEC "%0\n"
16283 : "+m" (l->a.counter));
16284 }
16285
16286 static inline void local_add(long i, local_t *l)
16287 {
16288- asm volatile(_ASM_ADD "%1,%0"
16289+ asm volatile(_ASM_ADD "%1,%0\n"
16290+
16291+#ifdef CONFIG_PAX_REFCOUNT
16292+ "jno 0f\n"
16293+ _ASM_SUB "%1,%0\n"
16294+ "int $4\n0:\n"
16295+ _ASM_EXTABLE(0b, 0b)
16296+#endif
16297+
16298+ : "+m" (l->a.counter)
16299+ : "ir" (i));
16300+}
16301+
16302+static inline void local_add_unchecked(long i, local_unchecked_t *l)
16303+{
16304+ asm volatile(_ASM_ADD "%1,%0\n"
16305 : "+m" (l->a.counter)
16306 : "ir" (i));
16307 }
16308
16309 static inline void local_sub(long i, local_t *l)
16310 {
16311- asm volatile(_ASM_SUB "%1,%0"
16312+ asm volatile(_ASM_SUB "%1,%0\n"
16313+
16314+#ifdef CONFIG_PAX_REFCOUNT
16315+ "jno 0f\n"
16316+ _ASM_ADD "%1,%0\n"
16317+ "int $4\n0:\n"
16318+ _ASM_EXTABLE(0b, 0b)
16319+#endif
16320+
16321+ : "+m" (l->a.counter)
16322+ : "ir" (i));
16323+}
16324+
16325+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
16326+{
16327+ asm volatile(_ASM_SUB "%1,%0\n"
16328 : "+m" (l->a.counter)
16329 : "ir" (i));
16330 }
16331@@ -54,7 +118,16 @@ static inline int local_sub_and_test(long i, local_t *l)
16332 {
16333 unsigned char c;
16334
16335- asm volatile(_ASM_SUB "%2,%0; sete %1"
16336+ asm volatile(_ASM_SUB "%2,%0\n"
16337+
16338+#ifdef CONFIG_PAX_REFCOUNT
16339+ "jno 0f\n"
16340+ _ASM_ADD "%2,%0\n"
16341+ "int $4\n0:\n"
16342+ _ASM_EXTABLE(0b, 0b)
16343+#endif
16344+
16345+ "sete %1\n"
16346 : "+m" (l->a.counter), "=qm" (c)
16347 : "ir" (i) : "memory");
16348 return c;
16349@@ -72,7 +145,16 @@ static inline int local_dec_and_test(local_t *l)
16350 {
16351 unsigned char c;
16352
16353- asm volatile(_ASM_DEC "%0; sete %1"
16354+ asm volatile(_ASM_DEC "%0\n"
16355+
16356+#ifdef CONFIG_PAX_REFCOUNT
16357+ "jno 0f\n"
16358+ _ASM_INC "%0\n"
16359+ "int $4\n0:\n"
16360+ _ASM_EXTABLE(0b, 0b)
16361+#endif
16362+
16363+ "sete %1\n"
16364 : "+m" (l->a.counter), "=qm" (c)
16365 : : "memory");
16366 return c != 0;
16367@@ -90,7 +172,16 @@ static inline int local_inc_and_test(local_t *l)
16368 {
16369 unsigned char c;
16370
16371- asm volatile(_ASM_INC "%0; sete %1"
16372+ asm volatile(_ASM_INC "%0\n"
16373+
16374+#ifdef CONFIG_PAX_REFCOUNT
16375+ "jno 0f\n"
16376+ _ASM_DEC "%0\n"
16377+ "int $4\n0:\n"
16378+ _ASM_EXTABLE(0b, 0b)
16379+#endif
16380+
16381+ "sete %1\n"
16382 : "+m" (l->a.counter), "=qm" (c)
16383 : : "memory");
16384 return c != 0;
16385@@ -109,7 +200,16 @@ static inline int local_add_negative(long i, local_t *l)
16386 {
16387 unsigned char c;
16388
16389- asm volatile(_ASM_ADD "%2,%0; sets %1"
16390+ asm volatile(_ASM_ADD "%2,%0\n"
16391+
16392+#ifdef CONFIG_PAX_REFCOUNT
16393+ "jno 0f\n"
16394+ _ASM_SUB "%2,%0\n"
16395+ "int $4\n0:\n"
16396+ _ASM_EXTABLE(0b, 0b)
16397+#endif
16398+
16399+ "sets %1\n"
16400 : "+m" (l->a.counter), "=qm" (c)
16401 : "ir" (i) : "memory");
16402 return c;
16403@@ -125,6 +225,30 @@ static inline int local_add_negative(long i, local_t *l)
16404 static inline long local_add_return(long i, local_t *l)
16405 {
16406 long __i = i;
16407+ asm volatile(_ASM_XADD "%0, %1\n"
16408+
16409+#ifdef CONFIG_PAX_REFCOUNT
16410+ "jno 0f\n"
16411+ _ASM_MOV "%0,%1\n"
16412+ "int $4\n0:\n"
16413+ _ASM_EXTABLE(0b, 0b)
16414+#endif
16415+
16416+ : "+r" (i), "+m" (l->a.counter)
16417+ : : "memory");
16418+ return i + __i;
16419+}
16420+
16421+/**
16422+ * local_add_return_unchecked - add and return
16423+ * @i: integer value to add
16424+ * @l: pointer to type local_unchecked_t
16425+ *
16426+ * Atomically adds @i to @l and returns @i + @l
16427+ */
16428+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
16429+{
16430+ long __i = i;
16431 asm volatile(_ASM_XADD "%0, %1;"
16432 : "+r" (i), "+m" (l->a.counter)
16433 : : "memory");
16434@@ -141,6 +265,8 @@ static inline long local_sub_return(long i, local_t *l)
16435
16436 #define local_cmpxchg(l, o, n) \
16437 (cmpxchg_local(&((l)->a.counter), (o), (n)))
16438+#define local_cmpxchg_unchecked(l, o, n) \
16439+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
16440 /* Always has a lock prefix */
16441 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
16442
16443diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
16444new file mode 100644
16445index 0000000..2bfd3ba
16446--- /dev/null
16447+++ b/arch/x86/include/asm/mman.h
16448@@ -0,0 +1,15 @@
16449+#ifndef _X86_MMAN_H
16450+#define _X86_MMAN_H
16451+
16452+#include <uapi/asm/mman.h>
16453+
16454+#ifdef __KERNEL__
16455+#ifndef __ASSEMBLY__
16456+#ifdef CONFIG_X86_32
16457+#define arch_mmap_check i386_mmap_check
16458+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
16459+#endif
16460+#endif
16461+#endif
16462+
16463+#endif /* X86_MMAN_H */
16464diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
16465index 5f55e69..e20bfb1 100644
16466--- a/arch/x86/include/asm/mmu.h
16467+++ b/arch/x86/include/asm/mmu.h
16468@@ -9,7 +9,7 @@
16469 * we put the segment information here.
16470 */
16471 typedef struct {
16472- void *ldt;
16473+ struct desc_struct *ldt;
16474 int size;
16475
16476 #ifdef CONFIG_X86_64
16477@@ -18,7 +18,19 @@ typedef struct {
16478 #endif
16479
16480 struct mutex lock;
16481- void *vdso;
16482+ unsigned long vdso;
16483+
16484+#ifdef CONFIG_X86_32
16485+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
16486+ unsigned long user_cs_base;
16487+ unsigned long user_cs_limit;
16488+
16489+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
16490+ cpumask_t cpu_user_cs_mask;
16491+#endif
16492+
16493+#endif
16494+#endif
16495 } mm_context_t;
16496
16497 #ifdef CONFIG_SMP
16498diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
16499index be12c53..4d24039 100644
16500--- a/arch/x86/include/asm/mmu_context.h
16501+++ b/arch/x86/include/asm/mmu_context.h
16502@@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
16503
16504 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
16505 {
16506+
16507+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16508+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
16509+ unsigned int i;
16510+ pgd_t *pgd;
16511+
16512+ pax_open_kernel();
16513+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
16514+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
16515+ set_pgd_batched(pgd+i, native_make_pgd(0));
16516+ pax_close_kernel();
16517+ }
16518+#endif
16519+
16520 #ifdef CONFIG_SMP
16521 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
16522 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
16523@@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
16524 struct task_struct *tsk)
16525 {
16526 unsigned cpu = smp_processor_id();
16527+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16528+ int tlbstate = TLBSTATE_OK;
16529+#endif
16530
16531 if (likely(prev != next)) {
16532 #ifdef CONFIG_SMP
16533+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16534+ tlbstate = this_cpu_read(cpu_tlbstate.state);
16535+#endif
16536 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
16537 this_cpu_write(cpu_tlbstate.active_mm, next);
16538 #endif
16539 cpumask_set_cpu(cpu, mm_cpumask(next));
16540
16541 /* Re-load page tables */
16542+#ifdef CONFIG_PAX_PER_CPU_PGD
16543+ pax_open_kernel();
16544+
16545+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16546+ if (static_cpu_has(X86_FEATURE_PCID))
16547+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
16548+ else
16549+#endif
16550+
16551+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
16552+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
16553+ pax_close_kernel();
16554+ 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));
16555+
16556+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16557+ if (static_cpu_has(X86_FEATURE_PCID)) {
16558+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
16559+ u64 descriptor[2];
16560+ descriptor[0] = PCID_USER;
16561+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16562+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
16563+ descriptor[0] = PCID_KERNEL;
16564+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16565+ }
16566+ } else {
16567+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
16568+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
16569+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
16570+ else
16571+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
16572+ }
16573+ } else
16574+#endif
16575+
16576+ load_cr3(get_cpu_pgd(cpu, kernel));
16577+#else
16578 load_cr3(next->pgd);
16579+#endif
16580
16581 /* Stop flush ipis for the previous mm */
16582 cpumask_clear_cpu(cpu, mm_cpumask(prev));
16583@@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
16584 /* Load the LDT, if the LDT is different: */
16585 if (unlikely(prev->context.ldt != next->context.ldt))
16586 load_LDT_nolock(&next->context);
16587+
16588+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
16589+ if (!(__supported_pte_mask & _PAGE_NX)) {
16590+ smp_mb__before_clear_bit();
16591+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
16592+ smp_mb__after_clear_bit();
16593+ cpu_set(cpu, next->context.cpu_user_cs_mask);
16594+ }
16595+#endif
16596+
16597+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16598+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
16599+ prev->context.user_cs_limit != next->context.user_cs_limit))
16600+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
16601+#ifdef CONFIG_SMP
16602+ else if (unlikely(tlbstate != TLBSTATE_OK))
16603+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
16604+#endif
16605+#endif
16606+
16607 }
16608+ else {
16609+
16610+#ifdef CONFIG_PAX_PER_CPU_PGD
16611+ pax_open_kernel();
16612+
16613+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16614+ if (static_cpu_has(X86_FEATURE_PCID))
16615+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
16616+ else
16617+#endif
16618+
16619+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
16620+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
16621+ pax_close_kernel();
16622+ 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));
16623+
16624+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16625+ if (static_cpu_has(X86_FEATURE_PCID)) {
16626+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
16627+ u64 descriptor[2];
16628+ descriptor[0] = PCID_USER;
16629+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16630+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
16631+ descriptor[0] = PCID_KERNEL;
16632+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
16633+ }
16634+ } else {
16635+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
16636+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
16637+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
16638+ else
16639+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
16640+ }
16641+ } else
16642+#endif
16643+
16644+ load_cr3(get_cpu_pgd(cpu, kernel));
16645+#endif
16646+
16647 #ifdef CONFIG_SMP
16648- else {
16649 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
16650 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
16651
16652@@ -70,11 +185,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
16653 * tlb flush IPI delivery. We must reload CR3
16654 * to make sure to use no freed page tables.
16655 */
16656+
16657+#ifndef CONFIG_PAX_PER_CPU_PGD
16658 load_cr3(next->pgd);
16659+#endif
16660+
16661 load_LDT_nolock(&next->context);
16662+
16663+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
16664+ if (!(__supported_pte_mask & _PAGE_NX))
16665+ cpu_set(cpu, next->context.cpu_user_cs_mask);
16666+#endif
16667+
16668+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
16669+#ifdef CONFIG_PAX_PAGEEXEC
16670+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
16671+#endif
16672+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
16673+#endif
16674+
16675 }
16676+#endif
16677 }
16678-#endif
16679 }
16680
16681 #define activate_mm(prev, next) \
16682diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
16683index e3b7819..b257c64 100644
16684--- a/arch/x86/include/asm/module.h
16685+++ b/arch/x86/include/asm/module.h
16686@@ -5,6 +5,7 @@
16687
16688 #ifdef CONFIG_X86_64
16689 /* X86_64 does not define MODULE_PROC_FAMILY */
16690+#define MODULE_PROC_FAMILY ""
16691 #elif defined CONFIG_M486
16692 #define MODULE_PROC_FAMILY "486 "
16693 #elif defined CONFIG_M586
16694@@ -57,8 +58,20 @@
16695 #error unknown processor family
16696 #endif
16697
16698-#ifdef CONFIG_X86_32
16699-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
16700+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
16701+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
16702+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
16703+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
16704+#else
16705+#define MODULE_PAX_KERNEXEC ""
16706 #endif
16707
16708+#ifdef CONFIG_PAX_MEMORY_UDEREF
16709+#define MODULE_PAX_UDEREF "UDEREF "
16710+#else
16711+#define MODULE_PAX_UDEREF ""
16712+#endif
16713+
16714+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
16715+
16716 #endif /* _ASM_X86_MODULE_H */
16717diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
16718index 86f9301..b365cda 100644
16719--- a/arch/x86/include/asm/nmi.h
16720+++ b/arch/x86/include/asm/nmi.h
16721@@ -40,11 +40,11 @@ struct nmiaction {
16722 nmi_handler_t handler;
16723 unsigned long flags;
16724 const char *name;
16725-};
16726+} __do_const;
16727
16728 #define register_nmi_handler(t, fn, fg, n, init...) \
16729 ({ \
16730- static struct nmiaction init fn##_na = { \
16731+ static const struct nmiaction init fn##_na = { \
16732 .handler = (fn), \
16733 .name = (n), \
16734 .flags = (fg), \
16735@@ -52,7 +52,7 @@ struct nmiaction {
16736 __register_nmi_handler((t), &fn##_na); \
16737 })
16738
16739-int __register_nmi_handler(unsigned int, struct nmiaction *);
16740+int __register_nmi_handler(unsigned int, const struct nmiaction *);
16741
16742 void unregister_nmi_handler(unsigned int, const char *);
16743
16744diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
16745index c878924..21f4889 100644
16746--- a/arch/x86/include/asm/page.h
16747+++ b/arch/x86/include/asm/page.h
16748@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
16749 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
16750
16751 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
16752+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
16753
16754 #define __boot_va(x) __va(x)
16755 #define __boot_pa(x) __pa(x)
16756diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
16757index 0f1ddee..e2fc3d1 100644
16758--- a/arch/x86/include/asm/page_64.h
16759+++ b/arch/x86/include/asm/page_64.h
16760@@ -7,9 +7,9 @@
16761
16762 /* duplicated to the one in bootmem.h */
16763 extern unsigned long max_pfn;
16764-extern unsigned long phys_base;
16765+extern const unsigned long phys_base;
16766
16767-static inline unsigned long __phys_addr_nodebug(unsigned long x)
16768+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
16769 {
16770 unsigned long y = x - __START_KERNEL_map;
16771
16772diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
16773index 401f350..dee5d13 100644
16774--- a/arch/x86/include/asm/paravirt.h
16775+++ b/arch/x86/include/asm/paravirt.h
16776@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
16777 return (pmd_t) { ret };
16778 }
16779
16780-static inline pmdval_t pmd_val(pmd_t pmd)
16781+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
16782 {
16783 pmdval_t ret;
16784
16785@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
16786 val);
16787 }
16788
16789+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
16790+{
16791+ pgdval_t val = native_pgd_val(pgd);
16792+
16793+ if (sizeof(pgdval_t) > sizeof(long))
16794+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
16795+ val, (u64)val >> 32);
16796+ else
16797+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
16798+ val);
16799+}
16800+
16801 static inline void pgd_clear(pgd_t *pgdp)
16802 {
16803 set_pgd(pgdp, __pgd(0));
16804@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
16805 pv_mmu_ops.set_fixmap(idx, phys, flags);
16806 }
16807
16808+#ifdef CONFIG_PAX_KERNEXEC
16809+static inline unsigned long pax_open_kernel(void)
16810+{
16811+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
16812+}
16813+
16814+static inline unsigned long pax_close_kernel(void)
16815+{
16816+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
16817+}
16818+#else
16819+static inline unsigned long pax_open_kernel(void) { return 0; }
16820+static inline unsigned long pax_close_kernel(void) { return 0; }
16821+#endif
16822+
16823 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
16824
16825 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
16826@@ -906,7 +933,7 @@ extern void default_banner(void);
16827
16828 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
16829 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
16830-#define PARA_INDIRECT(addr) *%cs:addr
16831+#define PARA_INDIRECT(addr) *%ss:addr
16832 #endif
16833
16834 #define INTERRUPT_RETURN \
16835@@ -981,6 +1008,21 @@ extern void default_banner(void);
16836 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
16837 CLBR_NONE, \
16838 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
16839+
16840+#define GET_CR0_INTO_RDI \
16841+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
16842+ mov %rax,%rdi
16843+
16844+#define SET_RDI_INTO_CR0 \
16845+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
16846+
16847+#define GET_CR3_INTO_RDI \
16848+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
16849+ mov %rax,%rdi
16850+
16851+#define SET_RDI_INTO_CR3 \
16852+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
16853+
16854 #endif /* CONFIG_X86_32 */
16855
16856 #endif /* __ASSEMBLY__ */
16857diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
16858index aab8f67..2531748 100644
16859--- a/arch/x86/include/asm/paravirt_types.h
16860+++ b/arch/x86/include/asm/paravirt_types.h
16861@@ -84,7 +84,7 @@ struct pv_init_ops {
16862 */
16863 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
16864 unsigned long addr, unsigned len);
16865-};
16866+} __no_const;
16867
16868
16869 struct pv_lazy_ops {
16870@@ -98,7 +98,7 @@ struct pv_time_ops {
16871 unsigned long long (*sched_clock)(void);
16872 unsigned long long (*steal_clock)(int cpu);
16873 unsigned long (*get_tsc_khz)(void);
16874-};
16875+} __no_const;
16876
16877 struct pv_cpu_ops {
16878 /* hooks for various privileged instructions */
16879@@ -192,7 +192,7 @@ struct pv_cpu_ops {
16880
16881 void (*start_context_switch)(struct task_struct *prev);
16882 void (*end_context_switch)(struct task_struct *next);
16883-};
16884+} __no_const;
16885
16886 struct pv_irq_ops {
16887 /*
16888@@ -223,7 +223,7 @@ struct pv_apic_ops {
16889 unsigned long start_eip,
16890 unsigned long start_esp);
16891 #endif
16892-};
16893+} __no_const;
16894
16895 struct pv_mmu_ops {
16896 unsigned long (*read_cr2)(void);
16897@@ -313,6 +313,7 @@ struct pv_mmu_ops {
16898 struct paravirt_callee_save make_pud;
16899
16900 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
16901+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
16902 #endif /* PAGETABLE_LEVELS == 4 */
16903 #endif /* PAGETABLE_LEVELS >= 3 */
16904
16905@@ -324,6 +325,12 @@ struct pv_mmu_ops {
16906 an mfn. We can tell which is which from the index. */
16907 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
16908 phys_addr_t phys, pgprot_t flags);
16909+
16910+#ifdef CONFIG_PAX_KERNEXEC
16911+ unsigned long (*pax_open_kernel)(void);
16912+ unsigned long (*pax_close_kernel)(void);
16913+#endif
16914+
16915 };
16916
16917 struct arch_spinlock;
16918diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
16919index b4389a4..7024269 100644
16920--- a/arch/x86/include/asm/pgalloc.h
16921+++ b/arch/x86/include/asm/pgalloc.h
16922@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
16923 pmd_t *pmd, pte_t *pte)
16924 {
16925 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
16926+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
16927+}
16928+
16929+static inline void pmd_populate_user(struct mm_struct *mm,
16930+ pmd_t *pmd, pte_t *pte)
16931+{
16932+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
16933 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
16934 }
16935
16936@@ -99,12 +106,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
16937
16938 #ifdef CONFIG_X86_PAE
16939 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
16940+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
16941+{
16942+ pud_populate(mm, pudp, pmd);
16943+}
16944 #else /* !CONFIG_X86_PAE */
16945 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
16946 {
16947 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
16948 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
16949 }
16950+
16951+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
16952+{
16953+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
16954+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
16955+}
16956 #endif /* CONFIG_X86_PAE */
16957
16958 #if PAGETABLE_LEVELS > 3
16959@@ -114,6 +131,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
16960 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
16961 }
16962
16963+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
16964+{
16965+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
16966+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
16967+}
16968+
16969 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
16970 {
16971 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
16972diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
16973index 3bf2dd0..23d2a9f 100644
16974--- a/arch/x86/include/asm/pgtable-2level.h
16975+++ b/arch/x86/include/asm/pgtable-2level.h
16976@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
16977
16978 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
16979 {
16980+ pax_open_kernel();
16981 *pmdp = pmd;
16982+ pax_close_kernel();
16983 }
16984
16985 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
16986diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
16987index 81bb91b..9392125 100644
16988--- a/arch/x86/include/asm/pgtable-3level.h
16989+++ b/arch/x86/include/asm/pgtable-3level.h
16990@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
16991
16992 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
16993 {
16994+ pax_open_kernel();
16995 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
16996+ pax_close_kernel();
16997 }
16998
16999 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17000 {
17001+ pax_open_kernel();
17002 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17003+ pax_close_kernel();
17004 }
17005
17006 /*
17007diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17008index bbc8b12..f228861 100644
17009--- a/arch/x86/include/asm/pgtable.h
17010+++ b/arch/x86/include/asm/pgtable.h
17011@@ -45,6 +45,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17012
17013 #ifndef __PAGETABLE_PUD_FOLDED
17014 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17015+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17016 #define pgd_clear(pgd) native_pgd_clear(pgd)
17017 #endif
17018
17019@@ -82,12 +83,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17020
17021 #define arch_end_context_switch(prev) do {} while(0)
17022
17023+#define pax_open_kernel() native_pax_open_kernel()
17024+#define pax_close_kernel() native_pax_close_kernel()
17025 #endif /* CONFIG_PARAVIRT */
17026
17027+#define __HAVE_ARCH_PAX_OPEN_KERNEL
17028+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17029+
17030+#ifdef CONFIG_PAX_KERNEXEC
17031+static inline unsigned long native_pax_open_kernel(void)
17032+{
17033+ unsigned long cr0;
17034+
17035+ preempt_disable();
17036+ barrier();
17037+ cr0 = read_cr0() ^ X86_CR0_WP;
17038+ BUG_ON(cr0 & X86_CR0_WP);
17039+ write_cr0(cr0);
17040+ return cr0 ^ X86_CR0_WP;
17041+}
17042+
17043+static inline unsigned long native_pax_close_kernel(void)
17044+{
17045+ unsigned long cr0;
17046+
17047+ cr0 = read_cr0() ^ X86_CR0_WP;
17048+ BUG_ON(!(cr0 & X86_CR0_WP));
17049+ write_cr0(cr0);
17050+ barrier();
17051+ preempt_enable_no_resched();
17052+ return cr0 ^ X86_CR0_WP;
17053+}
17054+#else
17055+static inline unsigned long native_pax_open_kernel(void) { return 0; }
17056+static inline unsigned long native_pax_close_kernel(void) { return 0; }
17057+#endif
17058+
17059 /*
17060 * The following only work if pte_present() is true.
17061 * Undefined behaviour if not..
17062 */
17063+static inline int pte_user(pte_t pte)
17064+{
17065+ return pte_val(pte) & _PAGE_USER;
17066+}
17067+
17068 static inline int pte_dirty(pte_t pte)
17069 {
17070 return pte_flags(pte) & _PAGE_DIRTY;
17071@@ -148,6 +188,11 @@ static inline unsigned long pud_pfn(pud_t pud)
17072 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
17073 }
17074
17075+static inline unsigned long pgd_pfn(pgd_t pgd)
17076+{
17077+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
17078+}
17079+
17080 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
17081
17082 static inline int pmd_large(pmd_t pte)
17083@@ -201,9 +246,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
17084 return pte_clear_flags(pte, _PAGE_RW);
17085 }
17086
17087+static inline pte_t pte_mkread(pte_t pte)
17088+{
17089+ return __pte(pte_val(pte) | _PAGE_USER);
17090+}
17091+
17092 static inline pte_t pte_mkexec(pte_t pte)
17093 {
17094- return pte_clear_flags(pte, _PAGE_NX);
17095+#ifdef CONFIG_X86_PAE
17096+ if (__supported_pte_mask & _PAGE_NX)
17097+ return pte_clear_flags(pte, _PAGE_NX);
17098+ else
17099+#endif
17100+ return pte_set_flags(pte, _PAGE_USER);
17101+}
17102+
17103+static inline pte_t pte_exprotect(pte_t pte)
17104+{
17105+#ifdef CONFIG_X86_PAE
17106+ if (__supported_pte_mask & _PAGE_NX)
17107+ return pte_set_flags(pte, _PAGE_NX);
17108+ else
17109+#endif
17110+ return pte_clear_flags(pte, _PAGE_USER);
17111 }
17112
17113 static inline pte_t pte_mkdirty(pte_t pte)
17114@@ -430,6 +495,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
17115 #endif
17116
17117 #ifndef __ASSEMBLY__
17118+
17119+#ifdef CONFIG_PAX_PER_CPU_PGD
17120+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
17121+enum cpu_pgd_type {kernel = 0, user = 1};
17122+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
17123+{
17124+ return cpu_pgd[cpu][type];
17125+}
17126+#endif
17127+
17128 #include <linux/mm_types.h>
17129 #include <linux/mmdebug.h>
17130 #include <linux/log2.h>
17131@@ -570,7 +645,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
17132 * Currently stuck as a macro due to indirect forward reference to
17133 * linux/mmzone.h's __section_mem_map_addr() definition:
17134 */
17135-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
17136+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
17137
17138 /* Find an entry in the second-level page table.. */
17139 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
17140@@ -610,7 +685,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
17141 * Currently stuck as a macro due to indirect forward reference to
17142 * linux/mmzone.h's __section_mem_map_addr() definition:
17143 */
17144-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
17145+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
17146
17147 /* to find an entry in a page-table-directory. */
17148 static inline unsigned long pud_index(unsigned long address)
17149@@ -625,7 +700,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
17150
17151 static inline int pgd_bad(pgd_t pgd)
17152 {
17153- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
17154+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
17155 }
17156
17157 static inline int pgd_none(pgd_t pgd)
17158@@ -648,7 +723,12 @@ static inline int pgd_none(pgd_t pgd)
17159 * pgd_offset() returns a (pgd_t *)
17160 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
17161 */
17162-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
17163+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
17164+
17165+#ifdef CONFIG_PAX_PER_CPU_PGD
17166+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
17167+#endif
17168+
17169 /*
17170 * a shortcut which implies the use of the kernel's pgd, instead
17171 * of a process's
17172@@ -659,6 +739,23 @@ static inline int pgd_none(pgd_t pgd)
17173 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
17174 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
17175
17176+#ifdef CONFIG_X86_32
17177+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
17178+#else
17179+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
17180+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
17181+
17182+#ifdef CONFIG_PAX_MEMORY_UDEREF
17183+#ifdef __ASSEMBLY__
17184+#define pax_user_shadow_base pax_user_shadow_base(%rip)
17185+#else
17186+extern unsigned long pax_user_shadow_base;
17187+extern pgdval_t clone_pgd_mask;
17188+#endif
17189+#endif
17190+
17191+#endif
17192+
17193 #ifndef __ASSEMBLY__
17194
17195 extern int direct_gbpages;
17196@@ -825,11 +922,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
17197 * dst and src can be on the same page, but the range must not overlap,
17198 * and must not cross a page boundary.
17199 */
17200-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
17201+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
17202 {
17203- memcpy(dst, src, count * sizeof(pgd_t));
17204+ pax_open_kernel();
17205+ while (count--)
17206+ *dst++ = *src++;
17207+ pax_close_kernel();
17208 }
17209
17210+#ifdef CONFIG_PAX_PER_CPU_PGD
17211+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
17212+#endif
17213+
17214+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17215+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
17216+#else
17217+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
17218+#endif
17219+
17220 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
17221 static inline int page_level_shift(enum pg_level level)
17222 {
17223diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
17224index 9ee3221..b979c6b 100644
17225--- a/arch/x86/include/asm/pgtable_32.h
17226+++ b/arch/x86/include/asm/pgtable_32.h
17227@@ -25,9 +25,6 @@
17228 struct mm_struct;
17229 struct vm_area_struct;
17230
17231-extern pgd_t swapper_pg_dir[1024];
17232-extern pgd_t initial_page_table[1024];
17233-
17234 static inline void pgtable_cache_init(void) { }
17235 static inline void check_pgt_cache(void) { }
17236 void paging_init(void);
17237@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17238 # include <asm/pgtable-2level.h>
17239 #endif
17240
17241+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
17242+extern pgd_t initial_page_table[PTRS_PER_PGD];
17243+#ifdef CONFIG_X86_PAE
17244+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
17245+#endif
17246+
17247 #if defined(CONFIG_HIGHPTE)
17248 #define pte_offset_map(dir, address) \
17249 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
17250@@ -62,12 +65,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17251 /* Clear a kernel PTE and flush it from the TLB */
17252 #define kpte_clear_flush(ptep, vaddr) \
17253 do { \
17254+ pax_open_kernel(); \
17255 pte_clear(&init_mm, (vaddr), (ptep)); \
17256+ pax_close_kernel(); \
17257 __flush_tlb_one((vaddr)); \
17258 } while (0)
17259
17260 #endif /* !__ASSEMBLY__ */
17261
17262+#define HAVE_ARCH_UNMAPPED_AREA
17263+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
17264+
17265 /*
17266 * kern_addr_valid() is (1) for FLATMEM and (0) for
17267 * SPARSEMEM and DISCONTIGMEM
17268diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
17269index ed5903b..c7fe163 100644
17270--- a/arch/x86/include/asm/pgtable_32_types.h
17271+++ b/arch/x86/include/asm/pgtable_32_types.h
17272@@ -8,7 +8,7 @@
17273 */
17274 #ifdef CONFIG_X86_PAE
17275 # include <asm/pgtable-3level_types.h>
17276-# define PMD_SIZE (1UL << PMD_SHIFT)
17277+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
17278 # define PMD_MASK (~(PMD_SIZE - 1))
17279 #else
17280 # include <asm/pgtable-2level_types.h>
17281@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
17282 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
17283 #endif
17284
17285+#ifdef CONFIG_PAX_KERNEXEC
17286+#ifndef __ASSEMBLY__
17287+extern unsigned char MODULES_EXEC_VADDR[];
17288+extern unsigned char MODULES_EXEC_END[];
17289+#endif
17290+#include <asm/boot.h>
17291+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
17292+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
17293+#else
17294+#define ktla_ktva(addr) (addr)
17295+#define ktva_ktla(addr) (addr)
17296+#endif
17297+
17298 #define MODULES_VADDR VMALLOC_START
17299 #define MODULES_END VMALLOC_END
17300 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
17301diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
17302index e22c1db..23a625a 100644
17303--- a/arch/x86/include/asm/pgtable_64.h
17304+++ b/arch/x86/include/asm/pgtable_64.h
17305@@ -16,10 +16,14 @@
17306
17307 extern pud_t level3_kernel_pgt[512];
17308 extern pud_t level3_ident_pgt[512];
17309+extern pud_t level3_vmalloc_start_pgt[512];
17310+extern pud_t level3_vmalloc_end_pgt[512];
17311+extern pud_t level3_vmemmap_pgt[512];
17312+extern pud_t level2_vmemmap_pgt[512];
17313 extern pmd_t level2_kernel_pgt[512];
17314 extern pmd_t level2_fixmap_pgt[512];
17315-extern pmd_t level2_ident_pgt[512];
17316-extern pgd_t init_level4_pgt[];
17317+extern pmd_t level2_ident_pgt[512*2];
17318+extern pgd_t init_level4_pgt[512];
17319
17320 #define swapper_pg_dir init_level4_pgt
17321
17322@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17323
17324 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17325 {
17326+ pax_open_kernel();
17327 *pmdp = pmd;
17328+ pax_close_kernel();
17329 }
17330
17331 static inline void native_pmd_clear(pmd_t *pmd)
17332@@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
17333
17334 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17335 {
17336+ pax_open_kernel();
17337 *pudp = pud;
17338+ pax_close_kernel();
17339 }
17340
17341 static inline void native_pud_clear(pud_t *pud)
17342@@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
17343
17344 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
17345 {
17346+ pax_open_kernel();
17347+ *pgdp = pgd;
17348+ pax_close_kernel();
17349+}
17350+
17351+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17352+{
17353 *pgdp = pgd;
17354 }
17355
17356diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
17357index 2d88344..4679fc3 100644
17358--- a/arch/x86/include/asm/pgtable_64_types.h
17359+++ b/arch/x86/include/asm/pgtable_64_types.h
17360@@ -61,6 +61,11 @@ typedef struct { pteval_t pte; } pte_t;
17361 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
17362 #define MODULES_END _AC(0xffffffffff000000, UL)
17363 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
17364+#define MODULES_EXEC_VADDR MODULES_VADDR
17365+#define MODULES_EXEC_END MODULES_END
17366+
17367+#define ktla_ktva(addr) (addr)
17368+#define ktva_ktla(addr) (addr)
17369
17370 #define EARLY_DYNAMIC_PAGE_TABLES 64
17371
17372diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
17373index 0ecac25..306c276 100644
17374--- a/arch/x86/include/asm/pgtable_types.h
17375+++ b/arch/x86/include/asm/pgtable_types.h
17376@@ -16,13 +16,12 @@
17377 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
17378 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
17379 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
17380-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
17381+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
17382 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
17383 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
17384 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
17385-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
17386-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
17387-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
17388+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
17389+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
17390 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
17391
17392 /* If _PAGE_BIT_PRESENT is clear, we use these: */
17393@@ -40,7 +39,6 @@
17394 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
17395 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
17396 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
17397-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
17398 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
17399 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
17400 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
17401@@ -87,8 +85,10 @@
17402
17403 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
17404 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
17405-#else
17406+#elif defined(CONFIG_KMEMCHECK)
17407 #define _PAGE_NX (_AT(pteval_t, 0))
17408+#else
17409+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
17410 #endif
17411
17412 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
17413@@ -146,6 +146,9 @@
17414 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
17415 _PAGE_ACCESSED)
17416
17417+#define PAGE_READONLY_NOEXEC PAGE_READONLY
17418+#define PAGE_SHARED_NOEXEC PAGE_SHARED
17419+
17420 #define __PAGE_KERNEL_EXEC \
17421 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
17422 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
17423@@ -156,7 +159,7 @@
17424 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
17425 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
17426 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
17427-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
17428+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
17429 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
17430 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
17431 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
17432@@ -218,8 +221,8 @@
17433 * bits are combined, this will alow user to access the high address mapped
17434 * VDSO in the presence of CONFIG_COMPAT_VDSO
17435 */
17436-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
17437-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
17438+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
17439+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
17440 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
17441 #endif
17442
17443@@ -257,7 +260,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
17444 {
17445 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
17446 }
17447+#endif
17448
17449+#if PAGETABLE_LEVELS == 3
17450+#include <asm-generic/pgtable-nopud.h>
17451+#endif
17452+
17453+#if PAGETABLE_LEVELS == 2
17454+#include <asm-generic/pgtable-nopmd.h>
17455+#endif
17456+
17457+#ifndef __ASSEMBLY__
17458 #if PAGETABLE_LEVELS > 3
17459 typedef struct { pudval_t pud; } pud_t;
17460
17461@@ -271,8 +284,6 @@ static inline pudval_t native_pud_val(pud_t pud)
17462 return pud.pud;
17463 }
17464 #else
17465-#include <asm-generic/pgtable-nopud.h>
17466-
17467 static inline pudval_t native_pud_val(pud_t pud)
17468 {
17469 return native_pgd_val(pud.pgd);
17470@@ -292,8 +303,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
17471 return pmd.pmd;
17472 }
17473 #else
17474-#include <asm-generic/pgtable-nopmd.h>
17475-
17476 static inline pmdval_t native_pmd_val(pmd_t pmd)
17477 {
17478 return native_pgd_val(pmd.pud.pgd);
17479@@ -333,7 +342,6 @@ typedef struct page *pgtable_t;
17480
17481 extern pteval_t __supported_pte_mask;
17482 extern void set_nx(void);
17483-extern int nx_enabled;
17484
17485 #define pgprot_writecombine pgprot_writecombine
17486 extern pgprot_t pgprot_writecombine(pgprot_t prot);
17487diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
17488index 987c75e..2723054 100644
17489--- a/arch/x86/include/asm/processor.h
17490+++ b/arch/x86/include/asm/processor.h
17491@@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
17492 : "memory");
17493 }
17494
17495+/* invpcid (%rdx),%rax */
17496+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
17497+
17498+#define INVPCID_SINGLE_ADDRESS 0UL
17499+#define INVPCID_SINGLE_CONTEXT 1UL
17500+#define INVPCID_ALL_GLOBAL 2UL
17501+#define INVPCID_ALL_MONGLOBAL 3UL
17502+
17503+#define PCID_KERNEL 0UL
17504+#define PCID_USER 1UL
17505+#define PCID_NOFLUSH (1UL << 63)
17506+
17507 static inline void load_cr3(pgd_t *pgdir)
17508 {
17509- write_cr3(__pa(pgdir));
17510+ write_cr3(__pa(pgdir) | PCID_KERNEL);
17511 }
17512
17513 #ifdef CONFIG_X86_32
17514@@ -283,7 +295,7 @@ struct tss_struct {
17515
17516 } ____cacheline_aligned;
17517
17518-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
17519+extern struct tss_struct init_tss[NR_CPUS];
17520
17521 /*
17522 * Save the original ist values for checking stack pointers during debugging
17523@@ -453,6 +465,7 @@ struct thread_struct {
17524 unsigned short ds;
17525 unsigned short fsindex;
17526 unsigned short gsindex;
17527+ unsigned short ss;
17528 #endif
17529 #ifdef CONFIG_X86_32
17530 unsigned long ip;
17531@@ -553,29 +566,8 @@ static inline void load_sp0(struct tss_struct *tss,
17532 extern unsigned long mmu_cr4_features;
17533 extern u32 *trampoline_cr4_features;
17534
17535-static inline void set_in_cr4(unsigned long mask)
17536-{
17537- unsigned long cr4;
17538-
17539- mmu_cr4_features |= mask;
17540- if (trampoline_cr4_features)
17541- *trampoline_cr4_features = mmu_cr4_features;
17542- cr4 = read_cr4();
17543- cr4 |= mask;
17544- write_cr4(cr4);
17545-}
17546-
17547-static inline void clear_in_cr4(unsigned long mask)
17548-{
17549- unsigned long cr4;
17550-
17551- mmu_cr4_features &= ~mask;
17552- if (trampoline_cr4_features)
17553- *trampoline_cr4_features = mmu_cr4_features;
17554- cr4 = read_cr4();
17555- cr4 &= ~mask;
17556- write_cr4(cr4);
17557-}
17558+extern void set_in_cr4(unsigned long mask);
17559+extern void clear_in_cr4(unsigned long mask);
17560
17561 typedef struct {
17562 unsigned long seg;
17563@@ -824,11 +816,18 @@ static inline void spin_lock_prefetch(const void *x)
17564 */
17565 #define TASK_SIZE PAGE_OFFSET
17566 #define TASK_SIZE_MAX TASK_SIZE
17567+
17568+#ifdef CONFIG_PAX_SEGMEXEC
17569+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
17570+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
17571+#else
17572 #define STACK_TOP TASK_SIZE
17573-#define STACK_TOP_MAX STACK_TOP
17574+#endif
17575+
17576+#define STACK_TOP_MAX TASK_SIZE
17577
17578 #define INIT_THREAD { \
17579- .sp0 = sizeof(init_stack) + (long)&init_stack, \
17580+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
17581 .vm86_info = NULL, \
17582 .sysenter_cs = __KERNEL_CS, \
17583 .io_bitmap_ptr = NULL, \
17584@@ -842,7 +841,7 @@ static inline void spin_lock_prefetch(const void *x)
17585 */
17586 #define INIT_TSS { \
17587 .x86_tss = { \
17588- .sp0 = sizeof(init_stack) + (long)&init_stack, \
17589+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
17590 .ss0 = __KERNEL_DS, \
17591 .ss1 = __KERNEL_CS, \
17592 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
17593@@ -853,11 +852,7 @@ static inline void spin_lock_prefetch(const void *x)
17594 extern unsigned long thread_saved_pc(struct task_struct *tsk);
17595
17596 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
17597-#define KSTK_TOP(info) \
17598-({ \
17599- unsigned long *__ptr = (unsigned long *)(info); \
17600- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
17601-})
17602+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
17603
17604 /*
17605 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
17606@@ -872,7 +867,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
17607 #define task_pt_regs(task) \
17608 ({ \
17609 struct pt_regs *__regs__; \
17610- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
17611+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
17612 __regs__ - 1; \
17613 })
17614
17615@@ -882,13 +877,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
17616 /*
17617 * User space process size. 47bits minus one guard page.
17618 */
17619-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
17620+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
17621
17622 /* This decides where the kernel will search for a free chunk of vm
17623 * space during mmap's.
17624 */
17625 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
17626- 0xc0000000 : 0xFFFFe000)
17627+ 0xc0000000 : 0xFFFFf000)
17628
17629 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
17630 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
17631@@ -899,11 +894,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
17632 #define STACK_TOP_MAX TASK_SIZE_MAX
17633
17634 #define INIT_THREAD { \
17635- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
17636+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
17637 }
17638
17639 #define INIT_TSS { \
17640- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
17641+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
17642 }
17643
17644 /*
17645@@ -931,6 +926,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
17646 */
17647 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
17648
17649+#ifdef CONFIG_PAX_SEGMEXEC
17650+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
17651+#endif
17652+
17653 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
17654
17655 /* Get/set a process' ability to use the timestamp counter instruction */
17656@@ -957,7 +956,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
17657 return 0;
17658 }
17659
17660-extern unsigned long arch_align_stack(unsigned long sp);
17661+#define arch_align_stack(x) ((x) & ~0xfUL)
17662 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
17663
17664 void default_idle(void);
17665@@ -967,6 +966,6 @@ bool xen_set_default_idle(void);
17666 #define xen_set_default_idle 0
17667 #endif
17668
17669-void stop_this_cpu(void *dummy);
17670+void stop_this_cpu(void *dummy) __noreturn;
17671 void df_debug(struct pt_regs *regs, long error_code);
17672 #endif /* _ASM_X86_PROCESSOR_H */
17673diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
17674index 942a086..6c26446 100644
17675--- a/arch/x86/include/asm/ptrace.h
17676+++ b/arch/x86/include/asm/ptrace.h
17677@@ -85,28 +85,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
17678 }
17679
17680 /*
17681- * user_mode_vm(regs) determines whether a register set came from user mode.
17682+ * user_mode(regs) determines whether a register set came from user mode.
17683 * This is true if V8086 mode was enabled OR if the register set was from
17684 * protected mode with RPL-3 CS value. This tricky test checks that with
17685 * one comparison. Many places in the kernel can bypass this full check
17686- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
17687+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
17688+ * be used.
17689 */
17690-static inline int user_mode(struct pt_regs *regs)
17691+static inline int user_mode_novm(struct pt_regs *regs)
17692 {
17693 #ifdef CONFIG_X86_32
17694 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
17695 #else
17696- return !!(regs->cs & 3);
17697+ return !!(regs->cs & SEGMENT_RPL_MASK);
17698 #endif
17699 }
17700
17701-static inline int user_mode_vm(struct pt_regs *regs)
17702+static inline int user_mode(struct pt_regs *regs)
17703 {
17704 #ifdef CONFIG_X86_32
17705 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
17706 USER_RPL;
17707 #else
17708- return user_mode(regs);
17709+ return user_mode_novm(regs);
17710 #endif
17711 }
17712
17713@@ -122,15 +123,16 @@ static inline int v8086_mode(struct pt_regs *regs)
17714 #ifdef CONFIG_X86_64
17715 static inline bool user_64bit_mode(struct pt_regs *regs)
17716 {
17717+ unsigned long cs = regs->cs & 0xffff;
17718 #ifndef CONFIG_PARAVIRT
17719 /*
17720 * On non-paravirt systems, this is the only long mode CPL 3
17721 * selector. We do not allow long mode selectors in the LDT.
17722 */
17723- return regs->cs == __USER_CS;
17724+ return cs == __USER_CS;
17725 #else
17726 /* Headers are too twisted for this to go in paravirt.h. */
17727- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
17728+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
17729 #endif
17730 }
17731
17732@@ -181,9 +183,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
17733 * Traps from the kernel do not save sp and ss.
17734 * Use the helper function to retrieve sp.
17735 */
17736- if (offset == offsetof(struct pt_regs, sp) &&
17737- regs->cs == __KERNEL_CS)
17738- return kernel_stack_pointer(regs);
17739+ if (offset == offsetof(struct pt_regs, sp)) {
17740+ unsigned long cs = regs->cs & 0xffff;
17741+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
17742+ return kernel_stack_pointer(regs);
17743+ }
17744 #endif
17745 return *(unsigned long *)((unsigned long)regs + offset);
17746 }
17747diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
17748index 9c6b890..5305f53 100644
17749--- a/arch/x86/include/asm/realmode.h
17750+++ b/arch/x86/include/asm/realmode.h
17751@@ -22,16 +22,14 @@ struct real_mode_header {
17752 #endif
17753 /* APM/BIOS reboot */
17754 u32 machine_real_restart_asm;
17755-#ifdef CONFIG_X86_64
17756 u32 machine_real_restart_seg;
17757-#endif
17758 };
17759
17760 /* This must match data at trampoline_32/64.S */
17761 struct trampoline_header {
17762 #ifdef CONFIG_X86_32
17763 u32 start;
17764- u16 gdt_pad;
17765+ u16 boot_cs;
17766 u16 gdt_limit;
17767 u32 gdt_base;
17768 #else
17769diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
17770index a82c4f1..ac45053 100644
17771--- a/arch/x86/include/asm/reboot.h
17772+++ b/arch/x86/include/asm/reboot.h
17773@@ -6,13 +6,13 @@
17774 struct pt_regs;
17775
17776 struct machine_ops {
17777- void (*restart)(char *cmd);
17778- void (*halt)(void);
17779- void (*power_off)(void);
17780+ void (* __noreturn restart)(char *cmd);
17781+ void (* __noreturn halt)(void);
17782+ void (* __noreturn power_off)(void);
17783 void (*shutdown)(void);
17784 void (*crash_shutdown)(struct pt_regs *);
17785- void (*emergency_restart)(void);
17786-};
17787+ void (* __noreturn emergency_restart)(void);
17788+} __no_const;
17789
17790 extern struct machine_ops machine_ops;
17791
17792diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
17793index cad82c9..2e5c5c1 100644
17794--- a/arch/x86/include/asm/rwsem.h
17795+++ b/arch/x86/include/asm/rwsem.h
17796@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
17797 {
17798 asm volatile("# beginning down_read\n\t"
17799 LOCK_PREFIX _ASM_INC "(%1)\n\t"
17800+
17801+#ifdef CONFIG_PAX_REFCOUNT
17802+ "jno 0f\n"
17803+ LOCK_PREFIX _ASM_DEC "(%1)\n"
17804+ "int $4\n0:\n"
17805+ _ASM_EXTABLE(0b, 0b)
17806+#endif
17807+
17808 /* adds 0x00000001 */
17809 " jns 1f\n"
17810 " call call_rwsem_down_read_failed\n"
17811@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
17812 "1:\n\t"
17813 " mov %1,%2\n\t"
17814 " add %3,%2\n\t"
17815+
17816+#ifdef CONFIG_PAX_REFCOUNT
17817+ "jno 0f\n"
17818+ "sub %3,%2\n"
17819+ "int $4\n0:\n"
17820+ _ASM_EXTABLE(0b, 0b)
17821+#endif
17822+
17823 " jle 2f\n\t"
17824 LOCK_PREFIX " cmpxchg %2,%0\n\t"
17825 " jnz 1b\n\t"
17826@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
17827 long tmp;
17828 asm volatile("# beginning down_write\n\t"
17829 LOCK_PREFIX " xadd %1,(%2)\n\t"
17830+
17831+#ifdef CONFIG_PAX_REFCOUNT
17832+ "jno 0f\n"
17833+ "mov %1,(%2)\n"
17834+ "int $4\n0:\n"
17835+ _ASM_EXTABLE(0b, 0b)
17836+#endif
17837+
17838 /* adds 0xffff0001, returns the old value */
17839 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
17840 /* was the active mask 0 before? */
17841@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
17842 long tmp;
17843 asm volatile("# beginning __up_read\n\t"
17844 LOCK_PREFIX " xadd %1,(%2)\n\t"
17845+
17846+#ifdef CONFIG_PAX_REFCOUNT
17847+ "jno 0f\n"
17848+ "mov %1,(%2)\n"
17849+ "int $4\n0:\n"
17850+ _ASM_EXTABLE(0b, 0b)
17851+#endif
17852+
17853 /* subtracts 1, returns the old value */
17854 " jns 1f\n\t"
17855 " call call_rwsem_wake\n" /* expects old value in %edx */
17856@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
17857 long tmp;
17858 asm volatile("# beginning __up_write\n\t"
17859 LOCK_PREFIX " xadd %1,(%2)\n\t"
17860+
17861+#ifdef CONFIG_PAX_REFCOUNT
17862+ "jno 0f\n"
17863+ "mov %1,(%2)\n"
17864+ "int $4\n0:\n"
17865+ _ASM_EXTABLE(0b, 0b)
17866+#endif
17867+
17868 /* subtracts 0xffff0001, returns the old value */
17869 " jns 1f\n\t"
17870 " call call_rwsem_wake\n" /* expects old value in %edx */
17871@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
17872 {
17873 asm volatile("# beginning __downgrade_write\n\t"
17874 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
17875+
17876+#ifdef CONFIG_PAX_REFCOUNT
17877+ "jno 0f\n"
17878+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
17879+ "int $4\n0:\n"
17880+ _ASM_EXTABLE(0b, 0b)
17881+#endif
17882+
17883 /*
17884 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
17885 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
17886@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
17887 */
17888 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
17889 {
17890- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
17891+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
17892+
17893+#ifdef CONFIG_PAX_REFCOUNT
17894+ "jno 0f\n"
17895+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
17896+ "int $4\n0:\n"
17897+ _ASM_EXTABLE(0b, 0b)
17898+#endif
17899+
17900 : "+m" (sem->count)
17901 : "er" (delta));
17902 }
17903@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
17904 */
17905 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
17906 {
17907- return delta + xadd(&sem->count, delta);
17908+ return delta + xadd_check_overflow(&sem->count, delta);
17909 }
17910
17911 #endif /* __KERNEL__ */
17912diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
17913index c48a950..bc40804 100644
17914--- a/arch/x86/include/asm/segment.h
17915+++ b/arch/x86/include/asm/segment.h
17916@@ -64,10 +64,15 @@
17917 * 26 - ESPFIX small SS
17918 * 27 - per-cpu [ offset to per-cpu data area ]
17919 * 28 - stack_canary-20 [ for stack protector ]
17920- * 29 - unused
17921- * 30 - unused
17922+ * 29 - PCI BIOS CS
17923+ * 30 - PCI BIOS DS
17924 * 31 - TSS for double fault handler
17925 */
17926+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
17927+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
17928+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
17929+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
17930+
17931 #define GDT_ENTRY_TLS_MIN 6
17932 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
17933
17934@@ -79,6 +84,8 @@
17935
17936 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
17937
17938+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
17939+
17940 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
17941
17942 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
17943@@ -104,6 +111,12 @@
17944 #define __KERNEL_STACK_CANARY 0
17945 #endif
17946
17947+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
17948+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
17949+
17950+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
17951+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
17952+
17953 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
17954
17955 /*
17956@@ -141,7 +154,7 @@
17957 */
17958
17959 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
17960-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
17961+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
17962
17963
17964 #else
17965@@ -165,6 +178,8 @@
17966 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
17967 #define __USER32_DS __USER_DS
17968
17969+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
17970+
17971 #define GDT_ENTRY_TSS 8 /* needs two entries */
17972 #define GDT_ENTRY_LDT 10 /* needs two entries */
17973 #define GDT_ENTRY_TLS_MIN 12
17974@@ -173,6 +188,8 @@
17975 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
17976 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
17977
17978+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
17979+
17980 /* TLS indexes for 64bit - hardcoded in arch_prctl */
17981 #define FS_TLS 0
17982 #define GS_TLS 1
17983@@ -180,12 +197,14 @@
17984 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
17985 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
17986
17987-#define GDT_ENTRIES 16
17988+#define GDT_ENTRIES 17
17989
17990 #endif
17991
17992 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
17993+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
17994 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
17995+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
17996 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
17997 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
17998 #ifndef CONFIG_PARAVIRT
17999@@ -265,7 +284,7 @@ static inline unsigned long get_limit(unsigned long segment)
18000 {
18001 unsigned long __limit;
18002 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
18003- return __limit + 1;
18004+ return __limit;
18005 }
18006
18007 #endif /* !__ASSEMBLY__ */
18008diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
18009index 8d3120f..352b440 100644
18010--- a/arch/x86/include/asm/smap.h
18011+++ b/arch/x86/include/asm/smap.h
18012@@ -25,11 +25,40 @@
18013
18014 #include <asm/alternative-asm.h>
18015
18016+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18017+#define ASM_PAX_OPEN_USERLAND \
18018+ 661: jmp 663f; \
18019+ .pushsection .altinstr_replacement, "a" ; \
18020+ 662: pushq %rax; nop; \
18021+ .popsection ; \
18022+ .pushsection .altinstructions, "a" ; \
18023+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18024+ .popsection ; \
18025+ call __pax_open_userland; \
18026+ popq %rax; \
18027+ 663:
18028+
18029+#define ASM_PAX_CLOSE_USERLAND \
18030+ 661: jmp 663f; \
18031+ .pushsection .altinstr_replacement, "a" ; \
18032+ 662: pushq %rax; nop; \
18033+ .popsection; \
18034+ .pushsection .altinstructions, "a" ; \
18035+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18036+ .popsection; \
18037+ call __pax_close_userland; \
18038+ popq %rax; \
18039+ 663:
18040+#else
18041+#define ASM_PAX_OPEN_USERLAND
18042+#define ASM_PAX_CLOSE_USERLAND
18043+#endif
18044+
18045 #ifdef CONFIG_X86_SMAP
18046
18047 #define ASM_CLAC \
18048 661: ASM_NOP3 ; \
18049- .pushsection .altinstr_replacement, "ax" ; \
18050+ .pushsection .altinstr_replacement, "a" ; \
18051 662: __ASM_CLAC ; \
18052 .popsection ; \
18053 .pushsection .altinstructions, "a" ; \
18054@@ -38,7 +67,7 @@
18055
18056 #define ASM_STAC \
18057 661: ASM_NOP3 ; \
18058- .pushsection .altinstr_replacement, "ax" ; \
18059+ .pushsection .altinstr_replacement, "a" ; \
18060 662: __ASM_STAC ; \
18061 .popsection ; \
18062 .pushsection .altinstructions, "a" ; \
18063@@ -56,6 +85,37 @@
18064
18065 #include <asm/alternative.h>
18066
18067+#define __HAVE_ARCH_PAX_OPEN_USERLAND
18068+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
18069+
18070+extern void __pax_open_userland(void);
18071+static __always_inline unsigned long pax_open_userland(void)
18072+{
18073+
18074+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18075+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
18076+ :
18077+ : [open] "i" (__pax_open_userland)
18078+ : "memory", "rax");
18079+#endif
18080+
18081+ return 0;
18082+}
18083+
18084+extern void __pax_close_userland(void);
18085+static __always_inline unsigned long pax_close_userland(void)
18086+{
18087+
18088+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18089+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
18090+ :
18091+ : [close] "i" (__pax_close_userland)
18092+ : "memory", "rax");
18093+#endif
18094+
18095+ return 0;
18096+}
18097+
18098 #ifdef CONFIG_X86_SMAP
18099
18100 static __always_inline void clac(void)
18101diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
18102index 4137890..03fa172 100644
18103--- a/arch/x86/include/asm/smp.h
18104+++ b/arch/x86/include/asm/smp.h
18105@@ -36,7 +36,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
18106 /* cpus sharing the last level cache: */
18107 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
18108 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
18109-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
18110+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
18111
18112 static inline struct cpumask *cpu_sibling_mask(int cpu)
18113 {
18114@@ -79,7 +79,7 @@ struct smp_ops {
18115
18116 void (*send_call_func_ipi)(const struct cpumask *mask);
18117 void (*send_call_func_single_ipi)(int cpu);
18118-};
18119+} __no_const;
18120
18121 /* Globals due to paravirt */
18122 extern void set_cpu_sibling_map(int cpu);
18123@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
18124 extern int safe_smp_processor_id(void);
18125
18126 #elif defined(CONFIG_X86_64_SMP)
18127-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18128-
18129-#define stack_smp_processor_id() \
18130-({ \
18131- struct thread_info *ti; \
18132- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
18133- ti->cpu; \
18134-})
18135+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18136+#define stack_smp_processor_id() raw_smp_processor_id()
18137 #define safe_smp_processor_id() smp_processor_id()
18138
18139 #endif
18140diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
18141index bf156de..1a782ab 100644
18142--- a/arch/x86/include/asm/spinlock.h
18143+++ b/arch/x86/include/asm/spinlock.h
18144@@ -223,6 +223,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
18145 static inline void arch_read_lock(arch_rwlock_t *rw)
18146 {
18147 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
18148+
18149+#ifdef CONFIG_PAX_REFCOUNT
18150+ "jno 0f\n"
18151+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
18152+ "int $4\n0:\n"
18153+ _ASM_EXTABLE(0b, 0b)
18154+#endif
18155+
18156 "jns 1f\n"
18157 "call __read_lock_failed\n\t"
18158 "1:\n"
18159@@ -232,6 +240,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
18160 static inline void arch_write_lock(arch_rwlock_t *rw)
18161 {
18162 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
18163+
18164+#ifdef CONFIG_PAX_REFCOUNT
18165+ "jno 0f\n"
18166+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
18167+ "int $4\n0:\n"
18168+ _ASM_EXTABLE(0b, 0b)
18169+#endif
18170+
18171 "jz 1f\n"
18172 "call __write_lock_failed\n\t"
18173 "1:\n"
18174@@ -261,13 +277,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
18175
18176 static inline void arch_read_unlock(arch_rwlock_t *rw)
18177 {
18178- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
18179+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
18180+
18181+#ifdef CONFIG_PAX_REFCOUNT
18182+ "jno 0f\n"
18183+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
18184+ "int $4\n0:\n"
18185+ _ASM_EXTABLE(0b, 0b)
18186+#endif
18187+
18188 :"+m" (rw->lock) : : "memory");
18189 }
18190
18191 static inline void arch_write_unlock(arch_rwlock_t *rw)
18192 {
18193- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
18194+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
18195+
18196+#ifdef CONFIG_PAX_REFCOUNT
18197+ "jno 0f\n"
18198+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
18199+ "int $4\n0:\n"
18200+ _ASM_EXTABLE(0b, 0b)
18201+#endif
18202+
18203 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
18204 }
18205
18206diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
18207index 6a99859..03cb807 100644
18208--- a/arch/x86/include/asm/stackprotector.h
18209+++ b/arch/x86/include/asm/stackprotector.h
18210@@ -47,7 +47,7 @@
18211 * head_32 for boot CPU and setup_per_cpu_areas() for others.
18212 */
18213 #define GDT_STACK_CANARY_INIT \
18214- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
18215+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
18216
18217 /*
18218 * Initialize the stackprotector canary value.
18219@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
18220
18221 static inline void load_stack_canary_segment(void)
18222 {
18223-#ifdef CONFIG_X86_32
18224+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18225 asm volatile ("mov %0, %%gs" : : "r" (0));
18226 #endif
18227 }
18228diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
18229index 70bbe39..4ae2bd4 100644
18230--- a/arch/x86/include/asm/stacktrace.h
18231+++ b/arch/x86/include/asm/stacktrace.h
18232@@ -11,28 +11,20 @@
18233
18234 extern int kstack_depth_to_print;
18235
18236-struct thread_info;
18237+struct task_struct;
18238 struct stacktrace_ops;
18239
18240-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
18241- unsigned long *stack,
18242- unsigned long bp,
18243- const struct stacktrace_ops *ops,
18244- void *data,
18245- unsigned long *end,
18246- int *graph);
18247+typedef unsigned long walk_stack_t(struct task_struct *task,
18248+ void *stack_start,
18249+ unsigned long *stack,
18250+ unsigned long bp,
18251+ const struct stacktrace_ops *ops,
18252+ void *data,
18253+ unsigned long *end,
18254+ int *graph);
18255
18256-extern unsigned long
18257-print_context_stack(struct thread_info *tinfo,
18258- unsigned long *stack, unsigned long bp,
18259- const struct stacktrace_ops *ops, void *data,
18260- unsigned long *end, int *graph);
18261-
18262-extern unsigned long
18263-print_context_stack_bp(struct thread_info *tinfo,
18264- unsigned long *stack, unsigned long bp,
18265- const struct stacktrace_ops *ops, void *data,
18266- unsigned long *end, int *graph);
18267+extern walk_stack_t print_context_stack;
18268+extern walk_stack_t print_context_stack_bp;
18269
18270 /* Generic stack tracer with callbacks */
18271
18272@@ -40,7 +32,7 @@ struct stacktrace_ops {
18273 void (*address)(void *data, unsigned long address, int reliable);
18274 /* On negative return stop dumping */
18275 int (*stack)(void *data, char *name);
18276- walk_stack_t walk_stack;
18277+ walk_stack_t *walk_stack;
18278 };
18279
18280 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
18281diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
18282index d7f3b3b..3cc39f1 100644
18283--- a/arch/x86/include/asm/switch_to.h
18284+++ b/arch/x86/include/asm/switch_to.h
18285@@ -108,7 +108,7 @@ do { \
18286 "call __switch_to\n\t" \
18287 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
18288 __switch_canary \
18289- "movq %P[thread_info](%%rsi),%%r8\n\t" \
18290+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
18291 "movq %%rax,%%rdi\n\t" \
18292 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
18293 "jnz ret_from_fork\n\t" \
18294@@ -119,7 +119,7 @@ do { \
18295 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
18296 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
18297 [_tif_fork] "i" (_TIF_FORK), \
18298- [thread_info] "i" (offsetof(struct task_struct, stack)), \
18299+ [thread_info] "m" (current_tinfo), \
18300 [current_task] "m" (current_task) \
18301 __switch_canary_iparam \
18302 : "memory", "cc" __EXTRA_CLOBBER)
18303diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
18304index 2781119..618b59b 100644
18305--- a/arch/x86/include/asm/thread_info.h
18306+++ b/arch/x86/include/asm/thread_info.h
18307@@ -10,6 +10,7 @@
18308 #include <linux/compiler.h>
18309 #include <asm/page.h>
18310 #include <asm/types.h>
18311+#include <asm/percpu.h>
18312
18313 /*
18314 * low level task data that entry.S needs immediate access to
18315@@ -23,7 +24,6 @@ struct exec_domain;
18316 #include <linux/atomic.h>
18317
18318 struct thread_info {
18319- struct task_struct *task; /* main task structure */
18320 struct exec_domain *exec_domain; /* execution domain */
18321 __u32 flags; /* low level flags */
18322 __u32 status; /* thread synchronous flags */
18323@@ -33,19 +33,13 @@ struct thread_info {
18324 mm_segment_t addr_limit;
18325 struct restart_block restart_block;
18326 void __user *sysenter_return;
18327-#ifdef CONFIG_X86_32
18328- unsigned long previous_esp; /* ESP of the previous stack in
18329- case of nested (IRQ) stacks
18330- */
18331- __u8 supervisor_stack[0];
18332-#endif
18333+ unsigned long lowest_stack;
18334 unsigned int sig_on_uaccess_error:1;
18335 unsigned int uaccess_err:1; /* uaccess failed */
18336 };
18337
18338-#define INIT_THREAD_INFO(tsk) \
18339+#define INIT_THREAD_INFO \
18340 { \
18341- .task = &tsk, \
18342 .exec_domain = &default_exec_domain, \
18343 .flags = 0, \
18344 .cpu = 0, \
18345@@ -56,7 +50,7 @@ struct thread_info {
18346 }, \
18347 }
18348
18349-#define init_thread_info (init_thread_union.thread_info)
18350+#define init_thread_info (init_thread_union.stack)
18351 #define init_stack (init_thread_union.stack)
18352
18353 #else /* !__ASSEMBLY__ */
18354@@ -96,6 +90,7 @@ struct thread_info {
18355 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
18356 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
18357 #define TIF_X32 30 /* 32-bit native x86-64 binary */
18358+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
18359
18360 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
18361 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
18362@@ -119,17 +114,18 @@ struct thread_info {
18363 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
18364 #define _TIF_ADDR32 (1 << TIF_ADDR32)
18365 #define _TIF_X32 (1 << TIF_X32)
18366+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
18367
18368 /* work to do in syscall_trace_enter() */
18369 #define _TIF_WORK_SYSCALL_ENTRY \
18370 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
18371 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
18372- _TIF_NOHZ)
18373+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
18374
18375 /* work to do in syscall_trace_leave() */
18376 #define _TIF_WORK_SYSCALL_EXIT \
18377 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
18378- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
18379+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
18380
18381 /* work to do on interrupt/exception return */
18382 #define _TIF_WORK_MASK \
18383@@ -140,7 +136,7 @@ struct thread_info {
18384 /* work to do on any return to user space */
18385 #define _TIF_ALLWORK_MASK \
18386 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
18387- _TIF_NOHZ)
18388+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
18389
18390 /* Only used for 64 bit */
18391 #define _TIF_DO_NOTIFY_MASK \
18392@@ -156,45 +152,40 @@ struct thread_info {
18393
18394 #define PREEMPT_ACTIVE 0x10000000
18395
18396-#ifdef CONFIG_X86_32
18397-
18398-#define STACK_WARN (THREAD_SIZE/8)
18399-/*
18400- * macros/functions for gaining access to the thread information structure
18401- *
18402- * preempt_count needs to be 1 initially, until the scheduler is functional.
18403- */
18404-#ifndef __ASSEMBLY__
18405-
18406-
18407-/* how to get the current stack pointer from C */
18408-register unsigned long current_stack_pointer asm("esp") __used;
18409-
18410-/* how to get the thread information struct from C */
18411-static inline struct thread_info *current_thread_info(void)
18412-{
18413- return (struct thread_info *)
18414- (current_stack_pointer & ~(THREAD_SIZE - 1));
18415-}
18416-
18417-#else /* !__ASSEMBLY__ */
18418-
18419+#ifdef __ASSEMBLY__
18420 /* how to get the thread information struct from ASM */
18421 #define GET_THREAD_INFO(reg) \
18422- movl $-THREAD_SIZE, reg; \
18423- andl %esp, reg
18424+ mov PER_CPU_VAR(current_tinfo), reg
18425
18426 /* use this one if reg already contains %esp */
18427-#define GET_THREAD_INFO_WITH_ESP(reg) \
18428- andl $-THREAD_SIZE, reg
18429+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
18430+#else
18431+/* how to get the thread information struct from C */
18432+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
18433+
18434+static __always_inline struct thread_info *current_thread_info(void)
18435+{
18436+ return this_cpu_read_stable(current_tinfo);
18437+}
18438+#endif
18439+
18440+#ifdef CONFIG_X86_32
18441+
18442+#define STACK_WARN (THREAD_SIZE/8)
18443+/*
18444+ * macros/functions for gaining access to the thread information structure
18445+ *
18446+ * preempt_count needs to be 1 initially, until the scheduler is functional.
18447+ */
18448+#ifndef __ASSEMBLY__
18449+
18450+/* how to get the current stack pointer from C */
18451+register unsigned long current_stack_pointer asm("esp") __used;
18452
18453 #endif
18454
18455 #else /* X86_32 */
18456
18457-#include <asm/percpu.h>
18458-#define KERNEL_STACK_OFFSET (5*8)
18459-
18460 /*
18461 * macros/functions for gaining access to the thread information structure
18462 * preempt_count needs to be 1 initially, until the scheduler is functional.
18463@@ -202,27 +193,8 @@ static inline struct thread_info *current_thread_info(void)
18464 #ifndef __ASSEMBLY__
18465 DECLARE_PER_CPU(unsigned long, kernel_stack);
18466
18467-static inline struct thread_info *current_thread_info(void)
18468-{
18469- struct thread_info *ti;
18470- ti = (void *)(this_cpu_read_stable(kernel_stack) +
18471- KERNEL_STACK_OFFSET - THREAD_SIZE);
18472- return ti;
18473-}
18474-
18475-#else /* !__ASSEMBLY__ */
18476-
18477-/* how to get the thread information struct from ASM */
18478-#define GET_THREAD_INFO(reg) \
18479- movq PER_CPU_VAR(kernel_stack),reg ; \
18480- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
18481-
18482-/*
18483- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
18484- * a certain register (to be used in assembler memory operands).
18485- */
18486-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
18487-
18488+/* how to get the current stack pointer from C */
18489+register unsigned long current_stack_pointer asm("rsp") __used;
18490 #endif
18491
18492 #endif /* !X86_32 */
18493@@ -281,5 +253,12 @@ static inline bool is_ia32_task(void)
18494 extern void arch_task_cache_init(void);
18495 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
18496 extern void arch_release_task_struct(struct task_struct *tsk);
18497+
18498+#define __HAVE_THREAD_FUNCTIONS
18499+#define task_thread_info(task) (&(task)->tinfo)
18500+#define task_stack_page(task) ((task)->stack)
18501+#define setup_thread_stack(p, org) do {} while (0)
18502+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
18503+
18504 #endif
18505 #endif /* _ASM_X86_THREAD_INFO_H */
18506diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
18507index e6d90ba..0897f44 100644
18508--- a/arch/x86/include/asm/tlbflush.h
18509+++ b/arch/x86/include/asm/tlbflush.h
18510@@ -17,18 +17,44 @@
18511
18512 static inline void __native_flush_tlb(void)
18513 {
18514+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
18515+ u64 descriptor[2];
18516+
18517+ descriptor[0] = PCID_KERNEL;
18518+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
18519+ return;
18520+ }
18521+
18522+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18523+ if (static_cpu_has(X86_FEATURE_PCID)) {
18524+ unsigned int cpu = raw_get_cpu();
18525+
18526+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
18527+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
18528+ raw_put_cpu_no_resched();
18529+ return;
18530+ }
18531+#endif
18532+
18533 native_write_cr3(native_read_cr3());
18534 }
18535
18536 static inline void __native_flush_tlb_global_irq_disabled(void)
18537 {
18538- unsigned long cr4;
18539+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
18540+ u64 descriptor[2];
18541
18542- cr4 = native_read_cr4();
18543- /* clear PGE */
18544- native_write_cr4(cr4 & ~X86_CR4_PGE);
18545- /* write old PGE again and flush TLBs */
18546- native_write_cr4(cr4);
18547+ descriptor[0] = PCID_KERNEL;
18548+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
18549+ } else {
18550+ unsigned long cr4;
18551+
18552+ cr4 = native_read_cr4();
18553+ /* clear PGE */
18554+ native_write_cr4(cr4 & ~X86_CR4_PGE);
18555+ /* write old PGE again and flush TLBs */
18556+ native_write_cr4(cr4);
18557+ }
18558 }
18559
18560 static inline void __native_flush_tlb_global(void)
18561@@ -49,6 +75,42 @@ static inline void __native_flush_tlb_global(void)
18562
18563 static inline void __native_flush_tlb_single(unsigned long addr)
18564 {
18565+
18566+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
18567+ u64 descriptor[2];
18568+
18569+ descriptor[0] = PCID_KERNEL;
18570+ descriptor[1] = addr;
18571+
18572+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18573+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
18574+ if (addr < TASK_SIZE_MAX)
18575+ descriptor[1] += pax_user_shadow_base;
18576+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
18577+ }
18578+
18579+ descriptor[0] = PCID_USER;
18580+ descriptor[1] = addr;
18581+#endif
18582+
18583+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
18584+ return;
18585+ }
18586+
18587+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18588+ if (static_cpu_has(X86_FEATURE_PCID)) {
18589+ unsigned int cpu = raw_get_cpu();
18590+
18591+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
18592+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
18593+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
18594+ raw_put_cpu_no_resched();
18595+
18596+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
18597+ addr += pax_user_shadow_base;
18598+ }
18599+#endif
18600+
18601 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
18602 }
18603
18604diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
18605index 5838fa9..f7ae572 100644
18606--- a/arch/x86/include/asm/uaccess.h
18607+++ b/arch/x86/include/asm/uaccess.h
18608@@ -7,6 +7,7 @@
18609 #include <linux/compiler.h>
18610 #include <linux/thread_info.h>
18611 #include <linux/string.h>
18612+#include <linux/sched.h>
18613 #include <asm/asm.h>
18614 #include <asm/page.h>
18615 #include <asm/smap.h>
18616@@ -29,7 +30,12 @@
18617
18618 #define get_ds() (KERNEL_DS)
18619 #define get_fs() (current_thread_info()->addr_limit)
18620+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
18621+void __set_fs(mm_segment_t x);
18622+void set_fs(mm_segment_t x);
18623+#else
18624 #define set_fs(x) (current_thread_info()->addr_limit = (x))
18625+#endif
18626
18627 #define segment_eq(a, b) ((a).seg == (b).seg)
18628
18629@@ -77,8 +83,33 @@
18630 * checks that the pointer is in the user space range - after calling
18631 * this function, memory access functions may still return -EFAULT.
18632 */
18633-#define access_ok(type, addr, size) \
18634- (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
18635+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
18636+#define access_ok(type, addr, size) \
18637+({ \
18638+ long __size = size; \
18639+ unsigned long __addr = (unsigned long)addr; \
18640+ unsigned long __addr_ao = __addr & PAGE_MASK; \
18641+ unsigned long __end_ao = __addr + __size - 1; \
18642+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
18643+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
18644+ while(__addr_ao <= __end_ao) { \
18645+ char __c_ao; \
18646+ __addr_ao += PAGE_SIZE; \
18647+ if (__size > PAGE_SIZE) \
18648+ cond_resched(); \
18649+ if (__get_user(__c_ao, (char __user *)__addr)) \
18650+ break; \
18651+ if (type != VERIFY_WRITE) { \
18652+ __addr = __addr_ao; \
18653+ continue; \
18654+ } \
18655+ if (__put_user(__c_ao, (char __user *)__addr)) \
18656+ break; \
18657+ __addr = __addr_ao; \
18658+ } \
18659+ } \
18660+ __ret_ao; \
18661+})
18662
18663 /*
18664 * The exception table consists of pairs of addresses relative to the
18665@@ -168,10 +199,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
18666 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
18667 __chk_user_ptr(ptr); \
18668 might_fault(); \
18669+ pax_open_userland(); \
18670 asm volatile("call __get_user_%P3" \
18671 : "=a" (__ret_gu), "=r" (__val_gu) \
18672 : "0" (ptr), "i" (sizeof(*(ptr)))); \
18673 (x) = (__typeof__(*(ptr))) __val_gu; \
18674+ pax_close_userland(); \
18675 __ret_gu; \
18676 })
18677
18678@@ -179,13 +212,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
18679 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
18680 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
18681
18682-
18683+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
18684+#define __copyuser_seg "gs;"
18685+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
18686+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
18687+#else
18688+#define __copyuser_seg
18689+#define __COPYUSER_SET_ES
18690+#define __COPYUSER_RESTORE_ES
18691+#endif
18692
18693 #ifdef CONFIG_X86_32
18694 #define __put_user_asm_u64(x, addr, err, errret) \
18695 asm volatile(ASM_STAC "\n" \
18696- "1: movl %%eax,0(%2)\n" \
18697- "2: movl %%edx,4(%2)\n" \
18698+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
18699+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
18700 "3: " ASM_CLAC "\n" \
18701 ".section .fixup,\"ax\"\n" \
18702 "4: movl %3,%0\n" \
18703@@ -198,8 +239,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
18704
18705 #define __put_user_asm_ex_u64(x, addr) \
18706 asm volatile(ASM_STAC "\n" \
18707- "1: movl %%eax,0(%1)\n" \
18708- "2: movl %%edx,4(%1)\n" \
18709+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
18710+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
18711 "3: " ASM_CLAC "\n" \
18712 _ASM_EXTABLE_EX(1b, 2b) \
18713 _ASM_EXTABLE_EX(2b, 3b) \
18714@@ -249,7 +290,8 @@ extern void __put_user_8(void);
18715 __typeof__(*(ptr)) __pu_val; \
18716 __chk_user_ptr(ptr); \
18717 might_fault(); \
18718- __pu_val = x; \
18719+ __pu_val = (x); \
18720+ pax_open_userland(); \
18721 switch (sizeof(*(ptr))) { \
18722 case 1: \
18723 __put_user_x(1, __pu_val, ptr, __ret_pu); \
18724@@ -267,6 +309,7 @@ extern void __put_user_8(void);
18725 __put_user_x(X, __pu_val, ptr, __ret_pu); \
18726 break; \
18727 } \
18728+ pax_close_userland(); \
18729 __ret_pu; \
18730 })
18731
18732@@ -347,8 +390,10 @@ do { \
18733 } while (0)
18734
18735 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
18736+do { \
18737+ pax_open_userland(); \
18738 asm volatile(ASM_STAC "\n" \
18739- "1: mov"itype" %2,%"rtype"1\n" \
18740+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
18741 "2: " ASM_CLAC "\n" \
18742 ".section .fixup,\"ax\"\n" \
18743 "3: mov %3,%0\n" \
18744@@ -356,8 +401,10 @@ do { \
18745 " jmp 2b\n" \
18746 ".previous\n" \
18747 _ASM_EXTABLE(1b, 3b) \
18748- : "=r" (err), ltype(x) \
18749- : "m" (__m(addr)), "i" (errret), "0" (err))
18750+ : "=r" (err), ltype (x) \
18751+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
18752+ pax_close_userland(); \
18753+} while (0)
18754
18755 #define __get_user_size_ex(x, ptr, size) \
18756 do { \
18757@@ -381,7 +428,7 @@ do { \
18758 } while (0)
18759
18760 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
18761- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
18762+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
18763 "2:\n" \
18764 _ASM_EXTABLE_EX(1b, 2b) \
18765 : ltype(x) : "m" (__m(addr)))
18766@@ -398,13 +445,24 @@ do { \
18767 int __gu_err; \
18768 unsigned long __gu_val; \
18769 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
18770- (x) = (__force __typeof__(*(ptr)))__gu_val; \
18771+ (x) = (__typeof__(*(ptr)))__gu_val; \
18772 __gu_err; \
18773 })
18774
18775 /* FIXME: this hack is definitely wrong -AK */
18776 struct __large_struct { unsigned long buf[100]; };
18777-#define __m(x) (*(struct __large_struct __user *)(x))
18778+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18779+#define ____m(x) \
18780+({ \
18781+ unsigned long ____x = (unsigned long)(x); \
18782+ if (____x < pax_user_shadow_base) \
18783+ ____x += pax_user_shadow_base; \
18784+ (typeof(x))____x; \
18785+})
18786+#else
18787+#define ____m(x) (x)
18788+#endif
18789+#define __m(x) (*(struct __large_struct __user *)____m(x))
18790
18791 /*
18792 * Tell gcc we read from memory instead of writing: this is because
18793@@ -412,8 +470,10 @@ struct __large_struct { unsigned long buf[100]; };
18794 * aliasing issues.
18795 */
18796 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
18797+do { \
18798+ pax_open_userland(); \
18799 asm volatile(ASM_STAC "\n" \
18800- "1: mov"itype" %"rtype"1,%2\n" \
18801+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
18802 "2: " ASM_CLAC "\n" \
18803 ".section .fixup,\"ax\"\n" \
18804 "3: mov %3,%0\n" \
18805@@ -421,10 +481,12 @@ struct __large_struct { unsigned long buf[100]; };
18806 ".previous\n" \
18807 _ASM_EXTABLE(1b, 3b) \
18808 : "=r"(err) \
18809- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
18810+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
18811+ pax_close_userland(); \
18812+} while (0)
18813
18814 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
18815- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
18816+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
18817 "2:\n" \
18818 _ASM_EXTABLE_EX(1b, 2b) \
18819 : : ltype(x), "m" (__m(addr)))
18820@@ -434,11 +496,13 @@ struct __large_struct { unsigned long buf[100]; };
18821 */
18822 #define uaccess_try do { \
18823 current_thread_info()->uaccess_err = 0; \
18824+ pax_open_userland(); \
18825 stac(); \
18826 barrier();
18827
18828 #define uaccess_catch(err) \
18829 clac(); \
18830+ pax_close_userland(); \
18831 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
18832 } while (0)
18833
18834@@ -463,8 +527,12 @@ struct __large_struct { unsigned long buf[100]; };
18835 * On error, the variable @x is set to zero.
18836 */
18837
18838+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18839+#define __get_user(x, ptr) get_user((x), (ptr))
18840+#else
18841 #define __get_user(x, ptr) \
18842 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
18843+#endif
18844
18845 /**
18846 * __put_user: - Write a simple value into user space, with less checking.
18847@@ -486,8 +554,12 @@ struct __large_struct { unsigned long buf[100]; };
18848 * Returns zero on success, or -EFAULT on error.
18849 */
18850
18851+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18852+#define __put_user(x, ptr) put_user((x), (ptr))
18853+#else
18854 #define __put_user(x, ptr) \
18855 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
18856+#endif
18857
18858 #define __get_user_unaligned __get_user
18859 #define __put_user_unaligned __put_user
18860@@ -505,7 +577,7 @@ struct __large_struct { unsigned long buf[100]; };
18861 #define get_user_ex(x, ptr) do { \
18862 unsigned long __gue_val; \
18863 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
18864- (x) = (__force __typeof__(*(ptr)))__gue_val; \
18865+ (x) = (__typeof__(*(ptr)))__gue_val; \
18866 } while (0)
18867
18868 #define put_user_try uaccess_try
18869diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
18870index 7f760a9..b596b9a 100644
18871--- a/arch/x86/include/asm/uaccess_32.h
18872+++ b/arch/x86/include/asm/uaccess_32.h
18873@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
18874 static __always_inline unsigned long __must_check
18875 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
18876 {
18877+ if ((long)n < 0)
18878+ return n;
18879+
18880+ check_object_size(from, n, true);
18881+
18882 if (__builtin_constant_p(n)) {
18883 unsigned long ret;
18884
18885@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
18886 __copy_to_user(void __user *to, const void *from, unsigned long n)
18887 {
18888 might_fault();
18889+
18890 return __copy_to_user_inatomic(to, from, n);
18891 }
18892
18893 static __always_inline unsigned long
18894 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
18895 {
18896+ if ((long)n < 0)
18897+ return n;
18898+
18899 /* Avoid zeroing the tail if the copy fails..
18900 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
18901 * but as the zeroing behaviour is only significant when n is not
18902@@ -137,6 +146,12 @@ static __always_inline unsigned long
18903 __copy_from_user(void *to, const void __user *from, unsigned long n)
18904 {
18905 might_fault();
18906+
18907+ if ((long)n < 0)
18908+ return n;
18909+
18910+ check_object_size(to, n, false);
18911+
18912 if (__builtin_constant_p(n)) {
18913 unsigned long ret;
18914
18915@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
18916 const void __user *from, unsigned long n)
18917 {
18918 might_fault();
18919+
18920+ if ((long)n < 0)
18921+ return n;
18922+
18923 if (__builtin_constant_p(n)) {
18924 unsigned long ret;
18925
18926@@ -181,15 +200,19 @@ static __always_inline unsigned long
18927 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
18928 unsigned long n)
18929 {
18930- return __copy_from_user_ll_nocache_nozero(to, from, n);
18931+ if ((long)n < 0)
18932+ return n;
18933+
18934+ return __copy_from_user_ll_nocache_nozero(to, from, n);
18935 }
18936
18937-unsigned long __must_check copy_to_user(void __user *to,
18938- const void *from, unsigned long n);
18939-unsigned long __must_check _copy_from_user(void *to,
18940- const void __user *from,
18941- unsigned long n);
18942-
18943+extern void copy_to_user_overflow(void)
18944+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
18945+ __compiletime_error("copy_to_user() buffer size is not provably correct")
18946+#else
18947+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
18948+#endif
18949+;
18950
18951 extern void copy_from_user_overflow(void)
18952 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
18953@@ -199,17 +222,60 @@ extern void copy_from_user_overflow(void)
18954 #endif
18955 ;
18956
18957-static inline unsigned long __must_check copy_from_user(void *to,
18958- const void __user *from,
18959- unsigned long n)
18960+/**
18961+ * copy_to_user: - Copy a block of data into user space.
18962+ * @to: Destination address, in user space.
18963+ * @from: Source address, in kernel space.
18964+ * @n: Number of bytes to copy.
18965+ *
18966+ * Context: User context only. This function may sleep.
18967+ *
18968+ * Copy data from kernel space to user space.
18969+ *
18970+ * Returns number of bytes that could not be copied.
18971+ * On success, this will be zero.
18972+ */
18973+static inline unsigned long __must_check
18974+copy_to_user(void __user *to, const void *from, unsigned long n)
18975 {
18976- int sz = __compiletime_object_size(to);
18977+ size_t sz = __compiletime_object_size(from);
18978
18979- if (likely(sz == -1 || sz >= n))
18980- n = _copy_from_user(to, from, n);
18981- else
18982+ if (unlikely(sz != (size_t)-1 && sz < n))
18983+ copy_to_user_overflow();
18984+ else if (access_ok(VERIFY_WRITE, to, n))
18985+ n = __copy_to_user(to, from, n);
18986+ return n;
18987+}
18988+
18989+/**
18990+ * copy_from_user: - Copy a block of data from user space.
18991+ * @to: Destination address, in kernel space.
18992+ * @from: Source address, in user space.
18993+ * @n: Number of bytes to copy.
18994+ *
18995+ * Context: User context only. This function may sleep.
18996+ *
18997+ * Copy data from user space to kernel space.
18998+ *
18999+ * Returns number of bytes that could not be copied.
19000+ * On success, this will be zero.
19001+ *
19002+ * If some data could not be copied, this function will pad the copied
19003+ * data to the requested size using zero bytes.
19004+ */
19005+static inline unsigned long __must_check
19006+copy_from_user(void *to, const void __user *from, unsigned long n)
19007+{
19008+ size_t sz = __compiletime_object_size(to);
19009+
19010+ check_object_size(to, n, false);
19011+
19012+ if (unlikely(sz != (size_t)-1 && sz < n))
19013 copy_from_user_overflow();
19014-
19015+ else if (access_ok(VERIFY_READ, from, n))
19016+ n = __copy_from_user(to, from, n);
19017+ else if ((long)n > 0)
19018+ memset(to, 0, n);
19019 return n;
19020 }
19021
19022diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
19023index 4f7923d..201b58d 100644
19024--- a/arch/x86/include/asm/uaccess_64.h
19025+++ b/arch/x86/include/asm/uaccess_64.h
19026@@ -10,6 +10,9 @@
19027 #include <asm/alternative.h>
19028 #include <asm/cpufeature.h>
19029 #include <asm/page.h>
19030+#include <asm/pgtable.h>
19031+
19032+#define set_fs(x) (current_thread_info()->addr_limit = (x))
19033
19034 /*
19035 * Copy To/From Userspace
19036@@ -17,14 +20,14 @@
19037
19038 /* Handles exceptions in both to and from, but doesn't do access_ok */
19039 __must_check unsigned long
19040-copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
19041+copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
19042 __must_check unsigned long
19043-copy_user_generic_string(void *to, const void *from, unsigned len);
19044+copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
19045 __must_check unsigned long
19046-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
19047+copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
19048
19049-static __always_inline __must_check unsigned long
19050-copy_user_generic(void *to, const void *from, unsigned len)
19051+static __always_inline __must_check unsigned long
19052+copy_user_generic(void *to, const void *from, unsigned long len)
19053 {
19054 unsigned ret;
19055
19056@@ -45,138 +48,200 @@ copy_user_generic(void *to, const void *from, unsigned len)
19057 return ret;
19058 }
19059
19060+static __always_inline __must_check unsigned long
19061+__copy_to_user(void __user *to, const void *from, unsigned long len);
19062+static __always_inline __must_check unsigned long
19063+__copy_from_user(void *to, const void __user *from, unsigned long len);
19064 __must_check unsigned long
19065-_copy_to_user(void __user *to, const void *from, unsigned len);
19066-__must_check unsigned long
19067-_copy_from_user(void *to, const void __user *from, unsigned len);
19068-__must_check unsigned long
19069-copy_in_user(void __user *to, const void __user *from, unsigned len);
19070+copy_in_user(void __user *to, const void __user *from, unsigned long len);
19071+
19072+extern void copy_to_user_overflow(void)
19073+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19074+ __compiletime_error("copy_to_user() buffer size is not provably correct")
19075+#else
19076+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
19077+#endif
19078+;
19079+
19080+extern void copy_from_user_overflow(void)
19081+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19082+ __compiletime_error("copy_from_user() buffer size is not provably correct")
19083+#else
19084+ __compiletime_warning("copy_from_user() buffer size is not provably correct")
19085+#endif
19086+;
19087
19088 static inline unsigned long __must_check copy_from_user(void *to,
19089 const void __user *from,
19090 unsigned long n)
19091 {
19092- int sz = __compiletime_object_size(to);
19093-
19094 might_fault();
19095- if (likely(sz == -1 || sz >= n))
19096- n = _copy_from_user(to, from, n);
19097-#ifdef CONFIG_DEBUG_VM
19098- else
19099- WARN(1, "Buffer overflow detected!\n");
19100-#endif
19101+
19102+ check_object_size(to, n, false);
19103+
19104+ if (access_ok(VERIFY_READ, from, n))
19105+ n = __copy_from_user(to, from, n);
19106+ else if (n < INT_MAX)
19107+ memset(to, 0, n);
19108 return n;
19109 }
19110
19111 static __always_inline __must_check
19112-int copy_to_user(void __user *dst, const void *src, unsigned size)
19113+int copy_to_user(void __user *dst, const void *src, unsigned long size)
19114 {
19115 might_fault();
19116
19117- return _copy_to_user(dst, src, size);
19118+ if (access_ok(VERIFY_WRITE, dst, size))
19119+ size = __copy_to_user(dst, src, size);
19120+ return size;
19121 }
19122
19123 static __always_inline __must_check
19124-int __copy_from_user(void *dst, const void __user *src, unsigned size)
19125+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
19126 {
19127- int ret = 0;
19128+ size_t sz = __compiletime_object_size(dst);
19129+ unsigned ret = 0;
19130
19131 might_fault();
19132+
19133+ if (size > INT_MAX)
19134+ return size;
19135+
19136+ check_object_size(dst, size, false);
19137+
19138+#ifdef CONFIG_PAX_MEMORY_UDEREF
19139+ if (!__access_ok(VERIFY_READ, src, size))
19140+ return size;
19141+#endif
19142+
19143+ if (unlikely(sz != (size_t)-1 && sz < size)) {
19144+ copy_from_user_overflow();
19145+ return size;
19146+ }
19147+
19148 if (!__builtin_constant_p(size))
19149- return copy_user_generic(dst, (__force void *)src, size);
19150+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19151 switch (size) {
19152- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
19153+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
19154 ret, "b", "b", "=q", 1);
19155 return ret;
19156- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
19157+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
19158 ret, "w", "w", "=r", 2);
19159 return ret;
19160- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
19161+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
19162 ret, "l", "k", "=r", 4);
19163 return ret;
19164- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
19165+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19166 ret, "q", "", "=r", 8);
19167 return ret;
19168 case 10:
19169- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19170+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19171 ret, "q", "", "=r", 10);
19172 if (unlikely(ret))
19173 return ret;
19174 __get_user_asm(*(u16 *)(8 + (char *)dst),
19175- (u16 __user *)(8 + (char __user *)src),
19176+ (const u16 __user *)(8 + (const char __user *)src),
19177 ret, "w", "w", "=r", 2);
19178 return ret;
19179 case 16:
19180- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19181+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19182 ret, "q", "", "=r", 16);
19183 if (unlikely(ret))
19184 return ret;
19185 __get_user_asm(*(u64 *)(8 + (char *)dst),
19186- (u64 __user *)(8 + (char __user *)src),
19187+ (const u64 __user *)(8 + (const char __user *)src),
19188 ret, "q", "", "=r", 8);
19189 return ret;
19190 default:
19191- return copy_user_generic(dst, (__force void *)src, size);
19192+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19193 }
19194 }
19195
19196 static __always_inline __must_check
19197-int __copy_to_user(void __user *dst, const void *src, unsigned size)
19198+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
19199 {
19200- int ret = 0;
19201+ size_t sz = __compiletime_object_size(src);
19202+ unsigned ret = 0;
19203
19204 might_fault();
19205+
19206+ if (size > INT_MAX)
19207+ return size;
19208+
19209+ check_object_size(src, size, true);
19210+
19211+#ifdef CONFIG_PAX_MEMORY_UDEREF
19212+ if (!__access_ok(VERIFY_WRITE, dst, size))
19213+ return size;
19214+#endif
19215+
19216+ if (unlikely(sz != (size_t)-1 && sz < size)) {
19217+ copy_to_user_overflow();
19218+ return size;
19219+ }
19220+
19221 if (!__builtin_constant_p(size))
19222- return copy_user_generic((__force void *)dst, src, size);
19223+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
19224 switch (size) {
19225- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
19226+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
19227 ret, "b", "b", "iq", 1);
19228 return ret;
19229- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
19230+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
19231 ret, "w", "w", "ir", 2);
19232 return ret;
19233- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
19234+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
19235 ret, "l", "k", "ir", 4);
19236 return ret;
19237- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
19238+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19239 ret, "q", "", "er", 8);
19240 return ret;
19241 case 10:
19242- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
19243+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19244 ret, "q", "", "er", 10);
19245 if (unlikely(ret))
19246 return ret;
19247 asm("":::"memory");
19248- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
19249+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
19250 ret, "w", "w", "ir", 2);
19251 return ret;
19252 case 16:
19253- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
19254+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
19255 ret, "q", "", "er", 16);
19256 if (unlikely(ret))
19257 return ret;
19258 asm("":::"memory");
19259- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
19260+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
19261 ret, "q", "", "er", 8);
19262 return ret;
19263 default:
19264- return copy_user_generic((__force void *)dst, src, size);
19265+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
19266 }
19267 }
19268
19269 static __always_inline __must_check
19270-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19271+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
19272 {
19273- int ret = 0;
19274+ unsigned ret = 0;
19275
19276 might_fault();
19277+
19278+ if (size > INT_MAX)
19279+ return size;
19280+
19281+#ifdef CONFIG_PAX_MEMORY_UDEREF
19282+ if (!__access_ok(VERIFY_READ, src, size))
19283+ return size;
19284+ if (!__access_ok(VERIFY_WRITE, dst, size))
19285+ return size;
19286+#endif
19287+
19288 if (!__builtin_constant_p(size))
19289- return copy_user_generic((__force void *)dst,
19290- (__force void *)src, size);
19291+ return copy_user_generic((__force_kernel void *)____m(dst),
19292+ (__force_kernel const void *)____m(src), size);
19293 switch (size) {
19294 case 1: {
19295 u8 tmp;
19296- __get_user_asm(tmp, (u8 __user *)src,
19297+ __get_user_asm(tmp, (const u8 __user *)src,
19298 ret, "b", "b", "=q", 1);
19299 if (likely(!ret))
19300 __put_user_asm(tmp, (u8 __user *)dst,
19301@@ -185,7 +250,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19302 }
19303 case 2: {
19304 u16 tmp;
19305- __get_user_asm(tmp, (u16 __user *)src,
19306+ __get_user_asm(tmp, (const u16 __user *)src,
19307 ret, "w", "w", "=r", 2);
19308 if (likely(!ret))
19309 __put_user_asm(tmp, (u16 __user *)dst,
19310@@ -195,7 +260,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19311
19312 case 4: {
19313 u32 tmp;
19314- __get_user_asm(tmp, (u32 __user *)src,
19315+ __get_user_asm(tmp, (const u32 __user *)src,
19316 ret, "l", "k", "=r", 4);
19317 if (likely(!ret))
19318 __put_user_asm(tmp, (u32 __user *)dst,
19319@@ -204,7 +269,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19320 }
19321 case 8: {
19322 u64 tmp;
19323- __get_user_asm(tmp, (u64 __user *)src,
19324+ __get_user_asm(tmp, (const u64 __user *)src,
19325 ret, "q", "", "=r", 8);
19326 if (likely(!ret))
19327 __put_user_asm(tmp, (u64 __user *)dst,
19328@@ -212,41 +277,74 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
19329 return ret;
19330 }
19331 default:
19332- return copy_user_generic((__force void *)dst,
19333- (__force void *)src, size);
19334+ return copy_user_generic((__force_kernel void *)____m(dst),
19335+ (__force_kernel const void *)____m(src), size);
19336 }
19337 }
19338
19339-static __must_check __always_inline int
19340-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
19341+static __must_check __always_inline unsigned long
19342+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
19343 {
19344- return copy_user_generic(dst, (__force const void *)src, size);
19345+ if (size > INT_MAX)
19346+ return size;
19347+
19348+#ifdef CONFIG_PAX_MEMORY_UDEREF
19349+ if (!__access_ok(VERIFY_READ, src, size))
19350+ return size;
19351+#endif
19352+
19353+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19354 }
19355
19356-static __must_check __always_inline int
19357-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
19358+static __must_check __always_inline unsigned long
19359+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
19360 {
19361- return copy_user_generic((__force void *)dst, src, size);
19362+ if (size > INT_MAX)
19363+ return size;
19364+
19365+#ifdef CONFIG_PAX_MEMORY_UDEREF
19366+ if (!__access_ok(VERIFY_WRITE, dst, size))
19367+ return size;
19368+#endif
19369+
19370+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
19371 }
19372
19373-extern long __copy_user_nocache(void *dst, const void __user *src,
19374- unsigned size, int zerorest);
19375+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
19376+ unsigned long size, int zerorest);
19377
19378-static inline int
19379-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
19380+static inline unsigned long
19381+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
19382 {
19383 might_fault();
19384+
19385+ if (size > INT_MAX)
19386+ return size;
19387+
19388+#ifdef CONFIG_PAX_MEMORY_UDEREF
19389+ if (!__access_ok(VERIFY_READ, src, size))
19390+ return size;
19391+#endif
19392+
19393 return __copy_user_nocache(dst, src, size, 1);
19394 }
19395
19396-static inline int
19397+static inline unsigned long
19398 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
19399- unsigned size)
19400+ unsigned long size)
19401 {
19402+ if (size > INT_MAX)
19403+ return size;
19404+
19405+#ifdef CONFIG_PAX_MEMORY_UDEREF
19406+ if (!__access_ok(VERIFY_READ, src, size))
19407+ return size;
19408+#endif
19409+
19410 return __copy_user_nocache(dst, src, size, 0);
19411 }
19412
19413 unsigned long
19414-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
19415+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
19416
19417 #endif /* _ASM_X86_UACCESS_64_H */
19418diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
19419index 5b238981..77fdd78 100644
19420--- a/arch/x86/include/asm/word-at-a-time.h
19421+++ b/arch/x86/include/asm/word-at-a-time.h
19422@@ -11,7 +11,7 @@
19423 * and shift, for example.
19424 */
19425 struct word_at_a_time {
19426- const unsigned long one_bits, high_bits;
19427+ unsigned long one_bits, high_bits;
19428 };
19429
19430 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
19431diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
19432index 828a156..650e625 100644
19433--- a/arch/x86/include/asm/x86_init.h
19434+++ b/arch/x86/include/asm/x86_init.h
19435@@ -129,7 +129,7 @@ struct x86_init_ops {
19436 struct x86_init_timers timers;
19437 struct x86_init_iommu iommu;
19438 struct x86_init_pci pci;
19439-};
19440+} __no_const;
19441
19442 /**
19443 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
19444@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
19445 void (*setup_percpu_clockev)(void);
19446 void (*early_percpu_clock_init)(void);
19447 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
19448-};
19449+} __no_const;
19450
19451 struct timespec;
19452
19453@@ -168,7 +168,7 @@ struct x86_platform_ops {
19454 void (*save_sched_clock_state)(void);
19455 void (*restore_sched_clock_state)(void);
19456 void (*apic_post_init)(void);
19457-};
19458+} __no_const;
19459
19460 struct pci_dev;
19461 struct msi_msg;
19462@@ -182,7 +182,7 @@ struct x86_msi_ops {
19463 void (*teardown_msi_irqs)(struct pci_dev *dev);
19464 void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
19465 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
19466-};
19467+} __no_const;
19468
19469 struct IO_APIC_route_entry;
19470 struct io_apic_irq_attr;
19471@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
19472 unsigned int destination, int vector,
19473 struct io_apic_irq_attr *attr);
19474 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
19475-};
19476+} __no_const;
19477
19478 extern struct x86_init_ops x86_init;
19479 extern struct x86_cpuinit_ops x86_cpuinit;
19480diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
19481index b913915..4f5a581 100644
19482--- a/arch/x86/include/asm/xen/page.h
19483+++ b/arch/x86/include/asm/xen/page.h
19484@@ -56,7 +56,7 @@ extern int m2p_remove_override(struct page *page,
19485 extern struct page *m2p_find_override(unsigned long mfn);
19486 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
19487
19488-static inline unsigned long pfn_to_mfn(unsigned long pfn)
19489+static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
19490 {
19491 unsigned long mfn;
19492
19493diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
19494index 0415cda..3b22adc 100644
19495--- a/arch/x86/include/asm/xsave.h
19496+++ b/arch/x86/include/asm/xsave.h
19497@@ -70,8 +70,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
19498 if (unlikely(err))
19499 return -EFAULT;
19500
19501+ pax_open_userland();
19502 __asm__ __volatile__(ASM_STAC "\n"
19503- "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
19504+ "1:"
19505+ __copyuser_seg
19506+ ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
19507 "2: " ASM_CLAC "\n"
19508 ".section .fixup,\"ax\"\n"
19509 "3: movl $-1,%[err]\n"
19510@@ -81,18 +84,22 @@ static inline int xsave_user(struct xsave_struct __user *buf)
19511 : [err] "=r" (err)
19512 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
19513 : "memory");
19514+ pax_close_userland();
19515 return err;
19516 }
19517
19518 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
19519 {
19520 int err;
19521- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
19522+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
19523 u32 lmask = mask;
19524 u32 hmask = mask >> 32;
19525
19526+ pax_open_userland();
19527 __asm__ __volatile__(ASM_STAC "\n"
19528- "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
19529+ "1:"
19530+ __copyuser_seg
19531+ ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
19532 "2: " ASM_CLAC "\n"
19533 ".section .fixup,\"ax\"\n"
19534 "3: movl $-1,%[err]\n"
19535@@ -102,6 +109,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
19536 : [err] "=r" (err)
19537 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
19538 : "memory"); /* memory required? */
19539+ pax_close_userland();
19540 return err;
19541 }
19542
19543diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
19544index bbae024..e1528f9 100644
19545--- a/arch/x86/include/uapi/asm/e820.h
19546+++ b/arch/x86/include/uapi/asm/e820.h
19547@@ -63,7 +63,7 @@ struct e820map {
19548 #define ISA_START_ADDRESS 0xa0000
19549 #define ISA_END_ADDRESS 0x100000
19550
19551-#define BIOS_BEGIN 0x000a0000
19552+#define BIOS_BEGIN 0x000c0000
19553 #define BIOS_END 0x00100000
19554
19555 #define BIOS_ROM_BASE 0xffe00000
19556diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
19557index 7b0a55a..ad115bf 100644
19558--- a/arch/x86/include/uapi/asm/ptrace-abi.h
19559+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
19560@@ -49,7 +49,6 @@
19561 #define EFLAGS 144
19562 #define RSP 152
19563 #define SS 160
19564-#define ARGOFFSET R11
19565 #endif /* __ASSEMBLY__ */
19566
19567 /* top of stack page */
19568diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
19569index a5408b9..5133813 100644
19570--- a/arch/x86/kernel/Makefile
19571+++ b/arch/x86/kernel/Makefile
19572@@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
19573 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
19574 obj-$(CONFIG_IRQ_WORK) += irq_work.o
19575 obj-y += probe_roms.o
19576-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
19577+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
19578 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
19579 obj-y += syscall_$(BITS).o
19580 obj-$(CONFIG_X86_64) += vsyscall_64.o
19581diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
19582index 40c7660..f709f4b 100644
19583--- a/arch/x86/kernel/acpi/boot.c
19584+++ b/arch/x86/kernel/acpi/boot.c
19585@@ -1365,7 +1365,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
19586 * If your system is blacklisted here, but you find that acpi=force
19587 * works for you, please contact linux-acpi@vger.kernel.org
19588 */
19589-static struct dmi_system_id __initdata acpi_dmi_table[] = {
19590+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
19591 /*
19592 * Boxes that need ACPI disabled
19593 */
19594@@ -1440,7 +1440,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
19595 };
19596
19597 /* second table for DMI checks that should run after early-quirks */
19598-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
19599+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
19600 /*
19601 * HP laptops which use a DSDT reporting as HP/SB400/10000,
19602 * which includes some code which overrides all temperature
19603diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
19604index 3312010..a65ca7b 100644
19605--- a/arch/x86/kernel/acpi/sleep.c
19606+++ b/arch/x86/kernel/acpi/sleep.c
19607@@ -88,8 +88,12 @@ int x86_acpi_suspend_lowlevel(void)
19608 #else /* CONFIG_64BIT */
19609 #ifdef CONFIG_SMP
19610 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
19611+
19612+ pax_open_kernel();
19613 early_gdt_descr.address =
19614 (unsigned long)get_cpu_gdt_table(smp_processor_id());
19615+ pax_close_kernel();
19616+
19617 initial_gs = per_cpu_offset(smp_processor_id());
19618 #endif
19619 initial_code = (unsigned long)wakeup_long64;
19620diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
19621index d1daa66..59fecba 100644
19622--- a/arch/x86/kernel/acpi/wakeup_32.S
19623+++ b/arch/x86/kernel/acpi/wakeup_32.S
19624@@ -29,13 +29,11 @@ wakeup_pmode_return:
19625 # and restore the stack ... but you need gdt for this to work
19626 movl saved_context_esp, %esp
19627
19628- movl %cs:saved_magic, %eax
19629- cmpl $0x12345678, %eax
19630+ cmpl $0x12345678, saved_magic
19631 jne bogus_magic
19632
19633 # jump to place where we left off
19634- movl saved_eip, %eax
19635- jmp *%eax
19636+ jmp *(saved_eip)
19637
19638 bogus_magic:
19639 jmp bogus_magic
19640diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
19641index 15e8563..323cbe1 100644
19642--- a/arch/x86/kernel/alternative.c
19643+++ b/arch/x86/kernel/alternative.c
19644@@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
19645 */
19646 for (a = start; a < end; a++) {
19647 instr = (u8 *)&a->instr_offset + a->instr_offset;
19648+
19649+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19650+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19651+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
19652+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19653+#endif
19654+
19655 replacement = (u8 *)&a->repl_offset + a->repl_offset;
19656 BUG_ON(a->replacementlen > a->instrlen);
19657 BUG_ON(a->instrlen > sizeof(insnbuf));
19658@@ -300,10 +307,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
19659 for (poff = start; poff < end; poff++) {
19660 u8 *ptr = (u8 *)poff + *poff;
19661
19662+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19663+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19664+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
19665+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19666+#endif
19667+
19668 if (!*poff || ptr < text || ptr >= text_end)
19669 continue;
19670 /* turn DS segment override prefix into lock prefix */
19671- if (*ptr == 0x3e)
19672+ if (*ktla_ktva(ptr) == 0x3e)
19673 text_poke(ptr, ((unsigned char []){0xf0}), 1);
19674 }
19675 mutex_unlock(&text_mutex);
19676@@ -318,10 +331,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
19677 for (poff = start; poff < end; poff++) {
19678 u8 *ptr = (u8 *)poff + *poff;
19679
19680+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19681+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19682+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
19683+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
19684+#endif
19685+
19686 if (!*poff || ptr < text || ptr >= text_end)
19687 continue;
19688 /* turn lock prefix into DS segment override prefix */
19689- if (*ptr == 0xf0)
19690+ if (*ktla_ktva(ptr) == 0xf0)
19691 text_poke(ptr, ((unsigned char []){0x3E}), 1);
19692 }
19693 mutex_unlock(&text_mutex);
19694@@ -469,7 +488,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
19695
19696 BUG_ON(p->len > MAX_PATCH_LEN);
19697 /* prep the buffer with the original instructions */
19698- memcpy(insnbuf, p->instr, p->len);
19699+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
19700 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
19701 (unsigned long)p->instr, p->len);
19702
19703@@ -516,7 +535,7 @@ void __init alternative_instructions(void)
19704 if (!uniproc_patched || num_possible_cpus() == 1)
19705 free_init_pages("SMP alternatives",
19706 (unsigned long)__smp_locks,
19707- (unsigned long)__smp_locks_end);
19708+ PAGE_ALIGN((unsigned long)__smp_locks_end));
19709 #endif
19710
19711 apply_paravirt(__parainstructions, __parainstructions_end);
19712@@ -536,13 +555,17 @@ void __init alternative_instructions(void)
19713 * instructions. And on the local CPU you need to be protected again NMI or MCE
19714 * handlers seeing an inconsistent instruction while you patch.
19715 */
19716-void *__init_or_module text_poke_early(void *addr, const void *opcode,
19717+void *__kprobes text_poke_early(void *addr, const void *opcode,
19718 size_t len)
19719 {
19720 unsigned long flags;
19721 local_irq_save(flags);
19722- memcpy(addr, opcode, len);
19723+
19724+ pax_open_kernel();
19725+ memcpy(ktla_ktva(addr), opcode, len);
19726 sync_core();
19727+ pax_close_kernel();
19728+
19729 local_irq_restore(flags);
19730 /* Could also do a CLFLUSH here to speed up CPU recovery; but
19731 that causes hangs on some VIA CPUs. */
19732@@ -564,36 +587,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
19733 */
19734 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
19735 {
19736- unsigned long flags;
19737- char *vaddr;
19738+ unsigned char *vaddr = ktla_ktva(addr);
19739 struct page *pages[2];
19740- int i;
19741+ size_t i;
19742
19743 if (!core_kernel_text((unsigned long)addr)) {
19744- pages[0] = vmalloc_to_page(addr);
19745- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
19746+ pages[0] = vmalloc_to_page(vaddr);
19747+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
19748 } else {
19749- pages[0] = virt_to_page(addr);
19750+ pages[0] = virt_to_page(vaddr);
19751 WARN_ON(!PageReserved(pages[0]));
19752- pages[1] = virt_to_page(addr + PAGE_SIZE);
19753+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
19754 }
19755 BUG_ON(!pages[0]);
19756- local_irq_save(flags);
19757- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
19758- if (pages[1])
19759- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
19760- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
19761- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
19762- clear_fixmap(FIX_TEXT_POKE0);
19763- if (pages[1])
19764- clear_fixmap(FIX_TEXT_POKE1);
19765- local_flush_tlb();
19766- sync_core();
19767- /* Could also do a CLFLUSH here to speed up CPU recovery; but
19768- that causes hangs on some VIA CPUs. */
19769+ text_poke_early(addr, opcode, len);
19770 for (i = 0; i < len; i++)
19771- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
19772- local_irq_restore(flags);
19773+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
19774 return addr;
19775 }
19776
19777@@ -613,7 +622,7 @@ int poke_int3_handler(struct pt_regs *regs)
19778 if (likely(!bp_patching_in_progress))
19779 return 0;
19780
19781- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
19782+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
19783 return 0;
19784
19785 /* set up the specified breakpoint handler */
19786@@ -647,7 +656,7 @@ int poke_int3_handler(struct pt_regs *regs)
19787 */
19788 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
19789 {
19790- unsigned char int3 = 0xcc;
19791+ const unsigned char int3 = 0xcc;
19792
19793 bp_int3_handler = handler;
19794 bp_int3_addr = (u8 *)addr + sizeof(int3);
19795diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
19796index a7eb82d..f6e52d4 100644
19797--- a/arch/x86/kernel/apic/apic.c
19798+++ b/arch/x86/kernel/apic/apic.c
19799@@ -190,7 +190,7 @@ int first_system_vector = 0xfe;
19800 /*
19801 * Debug level, exported for io_apic.c
19802 */
19803-unsigned int apic_verbosity;
19804+int apic_verbosity;
19805
19806 int pic_mode;
19807
19808@@ -1985,7 +1985,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
19809 apic_write(APIC_ESR, 0);
19810 v1 = apic_read(APIC_ESR);
19811 ack_APIC_irq();
19812- atomic_inc(&irq_err_count);
19813+ atomic_inc_unchecked(&irq_err_count);
19814
19815 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
19816 smp_processor_id(), v0 , v1);
19817diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
19818index 00c77cf..2dc6a2d 100644
19819--- a/arch/x86/kernel/apic/apic_flat_64.c
19820+++ b/arch/x86/kernel/apic/apic_flat_64.c
19821@@ -157,7 +157,7 @@ static int flat_probe(void)
19822 return 1;
19823 }
19824
19825-static struct apic apic_flat = {
19826+static struct apic apic_flat __read_only = {
19827 .name = "flat",
19828 .probe = flat_probe,
19829 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
19830@@ -271,7 +271,7 @@ static int physflat_probe(void)
19831 return 0;
19832 }
19833
19834-static struct apic apic_physflat = {
19835+static struct apic apic_physflat __read_only = {
19836
19837 .name = "physical flat",
19838 .probe = physflat_probe,
19839diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
19840index e145f28..2752888 100644
19841--- a/arch/x86/kernel/apic/apic_noop.c
19842+++ b/arch/x86/kernel/apic/apic_noop.c
19843@@ -119,7 +119,7 @@ static void noop_apic_write(u32 reg, u32 v)
19844 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
19845 }
19846
19847-struct apic apic_noop = {
19848+struct apic apic_noop __read_only = {
19849 .name = "noop",
19850 .probe = noop_probe,
19851 .acpi_madt_oem_check = NULL,
19852diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
19853index d50e364..543bee3 100644
19854--- a/arch/x86/kernel/apic/bigsmp_32.c
19855+++ b/arch/x86/kernel/apic/bigsmp_32.c
19856@@ -152,7 +152,7 @@ static int probe_bigsmp(void)
19857 return dmi_bigsmp;
19858 }
19859
19860-static struct apic apic_bigsmp = {
19861+static struct apic apic_bigsmp __read_only = {
19862
19863 .name = "bigsmp",
19864 .probe = probe_bigsmp,
19865diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
19866index c552247..587a316 100644
19867--- a/arch/x86/kernel/apic/es7000_32.c
19868+++ b/arch/x86/kernel/apic/es7000_32.c
19869@@ -608,8 +608,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
19870 return ret && es7000_apic_is_cluster();
19871 }
19872
19873-/* We've been warned by a false positive warning.Use __refdata to keep calm. */
19874-static struct apic __refdata apic_es7000_cluster = {
19875+static struct apic apic_es7000_cluster __read_only = {
19876
19877 .name = "es7000",
19878 .probe = probe_es7000,
19879@@ -675,7 +674,7 @@ static struct apic __refdata apic_es7000_cluster = {
19880 .x86_32_early_logical_apicid = es7000_early_logical_apicid,
19881 };
19882
19883-static struct apic __refdata apic_es7000 = {
19884+static struct apic apic_es7000 __read_only = {
19885
19886 .name = "es7000",
19887 .probe = probe_es7000,
19888diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
19889index e63a5bd..c0babf8 100644
19890--- a/arch/x86/kernel/apic/io_apic.c
19891+++ b/arch/x86/kernel/apic/io_apic.c
19892@@ -1060,7 +1060,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
19893 }
19894 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
19895
19896-void lock_vector_lock(void)
19897+void lock_vector_lock(void) __acquires(vector_lock)
19898 {
19899 /* Used to the online set of cpus does not change
19900 * during assign_irq_vector.
19901@@ -1068,7 +1068,7 @@ void lock_vector_lock(void)
19902 raw_spin_lock(&vector_lock);
19903 }
19904
19905-void unlock_vector_lock(void)
19906+void unlock_vector_lock(void) __releases(vector_lock)
19907 {
19908 raw_spin_unlock(&vector_lock);
19909 }
19910@@ -2367,7 +2367,7 @@ static void ack_apic_edge(struct irq_data *data)
19911 ack_APIC_irq();
19912 }
19913
19914-atomic_t irq_mis_count;
19915+atomic_unchecked_t irq_mis_count;
19916
19917 #ifdef CONFIG_GENERIC_PENDING_IRQ
19918 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
19919@@ -2508,7 +2508,7 @@ static void ack_apic_level(struct irq_data *data)
19920 * at the cpu.
19921 */
19922 if (!(v & (1 << (i & 0x1f)))) {
19923- atomic_inc(&irq_mis_count);
19924+ atomic_inc_unchecked(&irq_mis_count);
19925
19926 eoi_ioapic_irq(irq, cfg);
19927 }
19928diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
19929index 1e42e8f..daacf44 100644
19930--- a/arch/x86/kernel/apic/numaq_32.c
19931+++ b/arch/x86/kernel/apic/numaq_32.c
19932@@ -455,8 +455,7 @@ static void numaq_setup_portio_remap(void)
19933 (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);
19934 }
19935
19936-/* Use __refdata to keep false positive warning calm. */
19937-static struct apic __refdata apic_numaq = {
19938+static struct apic apic_numaq __read_only = {
19939
19940 .name = "NUMAQ",
19941 .probe = probe_numaq,
19942diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
19943index eb35ef9..f184a21 100644
19944--- a/arch/x86/kernel/apic/probe_32.c
19945+++ b/arch/x86/kernel/apic/probe_32.c
19946@@ -72,7 +72,7 @@ static int probe_default(void)
19947 return 1;
19948 }
19949
19950-static struct apic apic_default = {
19951+static struct apic apic_default __read_only = {
19952
19953 .name = "default",
19954 .probe = probe_default,
19955diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
19956index 77c95c0..434f8a4 100644
19957--- a/arch/x86/kernel/apic/summit_32.c
19958+++ b/arch/x86/kernel/apic/summit_32.c
19959@@ -486,7 +486,7 @@ void setup_summit(void)
19960 }
19961 #endif
19962
19963-static struct apic apic_summit = {
19964+static struct apic apic_summit __read_only = {
19965
19966 .name = "summit",
19967 .probe = probe_summit,
19968diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
19969index 140e29d..d88bc95 100644
19970--- a/arch/x86/kernel/apic/x2apic_cluster.c
19971+++ b/arch/x86/kernel/apic/x2apic_cluster.c
19972@@ -183,7 +183,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
19973 return notifier_from_errno(err);
19974 }
19975
19976-static struct notifier_block __refdata x2apic_cpu_notifier = {
19977+static struct notifier_block x2apic_cpu_notifier = {
19978 .notifier_call = update_clusterinfo,
19979 };
19980
19981@@ -235,7 +235,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
19982 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
19983 }
19984
19985-static struct apic apic_x2apic_cluster = {
19986+static struct apic apic_x2apic_cluster __read_only = {
19987
19988 .name = "cluster x2apic",
19989 .probe = x2apic_cluster_probe,
19990diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
19991index 562a76d..a003c0f 100644
19992--- a/arch/x86/kernel/apic/x2apic_phys.c
19993+++ b/arch/x86/kernel/apic/x2apic_phys.c
19994@@ -89,7 +89,7 @@ static int x2apic_phys_probe(void)
19995 return apic == &apic_x2apic_phys;
19996 }
19997
19998-static struct apic apic_x2apic_phys = {
19999+static struct apic apic_x2apic_phys __read_only = {
20000
20001 .name = "physical x2apic",
20002 .probe = x2apic_phys_probe,
20003diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20004index a419814..1dd34a0 100644
20005--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20006+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20007@@ -357,7 +357,7 @@ static int uv_probe(void)
20008 return apic == &apic_x2apic_uv_x;
20009 }
20010
20011-static struct apic __refdata apic_x2apic_uv_x = {
20012+static struct apic apic_x2apic_uv_x __read_only = {
20013
20014 .name = "UV large system",
20015 .probe = uv_probe,
20016diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20017index 3ab0343..814c4787 100644
20018--- a/arch/x86/kernel/apm_32.c
20019+++ b/arch/x86/kernel/apm_32.c
20020@@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20021 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20022 * even though they are called in protected mode.
20023 */
20024-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20025+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20026 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20027
20028 static const char driver_version[] = "1.16ac"; /* no spaces */
20029@@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
20030 BUG_ON(cpu != 0);
20031 gdt = get_cpu_gdt_table(cpu);
20032 save_desc_40 = gdt[0x40 / 8];
20033+
20034+ pax_open_kernel();
20035 gdt[0x40 / 8] = bad_bios_desc;
20036+ pax_close_kernel();
20037
20038 apm_irq_save(flags);
20039 APM_DO_SAVE_SEGS;
20040@@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
20041 &call->esi);
20042 APM_DO_RESTORE_SEGS;
20043 apm_irq_restore(flags);
20044+
20045+ pax_open_kernel();
20046 gdt[0x40 / 8] = save_desc_40;
20047+ pax_close_kernel();
20048+
20049 put_cpu();
20050
20051 return call->eax & 0xff;
20052@@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
20053 BUG_ON(cpu != 0);
20054 gdt = get_cpu_gdt_table(cpu);
20055 save_desc_40 = gdt[0x40 / 8];
20056+
20057+ pax_open_kernel();
20058 gdt[0x40 / 8] = bad_bios_desc;
20059+ pax_close_kernel();
20060
20061 apm_irq_save(flags);
20062 APM_DO_SAVE_SEGS;
20063@@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
20064 &call->eax);
20065 APM_DO_RESTORE_SEGS;
20066 apm_irq_restore(flags);
20067+
20068+ pax_open_kernel();
20069 gdt[0x40 / 8] = save_desc_40;
20070+ pax_close_kernel();
20071+
20072 put_cpu();
20073 return error;
20074 }
20075@@ -2362,12 +2376,15 @@ static int __init apm_init(void)
20076 * code to that CPU.
20077 */
20078 gdt = get_cpu_gdt_table(0);
20079+
20080+ pax_open_kernel();
20081 set_desc_base(&gdt[APM_CS >> 3],
20082 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
20083 set_desc_base(&gdt[APM_CS_16 >> 3],
20084 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
20085 set_desc_base(&gdt[APM_DS >> 3],
20086 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
20087+ pax_close_kernel();
20088
20089 proc_create("apm", 0, NULL, &apm_file_ops);
20090
20091diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
20092index 2861082..6d4718e 100644
20093--- a/arch/x86/kernel/asm-offsets.c
20094+++ b/arch/x86/kernel/asm-offsets.c
20095@@ -33,6 +33,8 @@ void common(void) {
20096 OFFSET(TI_status, thread_info, status);
20097 OFFSET(TI_addr_limit, thread_info, addr_limit);
20098 OFFSET(TI_preempt_count, thread_info, preempt_count);
20099+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
20100+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
20101
20102 BLANK();
20103 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
20104@@ -53,8 +55,26 @@ void common(void) {
20105 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
20106 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
20107 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
20108+
20109+#ifdef CONFIG_PAX_KERNEXEC
20110+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
20111 #endif
20112
20113+#ifdef CONFIG_PAX_MEMORY_UDEREF
20114+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
20115+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
20116+#ifdef CONFIG_X86_64
20117+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
20118+#endif
20119+#endif
20120+
20121+#endif
20122+
20123+ BLANK();
20124+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
20125+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
20126+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
20127+
20128 #ifdef CONFIG_XEN
20129 BLANK();
20130 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
20131diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
20132index e7c798b..2b2019b 100644
20133--- a/arch/x86/kernel/asm-offsets_64.c
20134+++ b/arch/x86/kernel/asm-offsets_64.c
20135@@ -77,6 +77,7 @@ int main(void)
20136 BLANK();
20137 #undef ENTRY
20138
20139+ DEFINE(TSS_size, sizeof(struct tss_struct));
20140 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
20141 BLANK();
20142
20143diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
20144index 47b56a7..efc2bc6 100644
20145--- a/arch/x86/kernel/cpu/Makefile
20146+++ b/arch/x86/kernel/cpu/Makefile
20147@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
20148 CFLAGS_REMOVE_perf_event.o = -pg
20149 endif
20150
20151-# Make sure load_percpu_segment has no stackprotector
20152-nostackp := $(call cc-option, -fno-stack-protector)
20153-CFLAGS_common.o := $(nostackp)
20154-
20155 obj-y := intel_cacheinfo.o scattered.o topology.o
20156 obj-y += proc.o capflags.o powerflags.o common.o
20157 obj-y += rdrand.o
20158diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
20159index 903a264..fc955f3 100644
20160--- a/arch/x86/kernel/cpu/amd.c
20161+++ b/arch/x86/kernel/cpu/amd.c
20162@@ -743,7 +743,7 @@ static void init_amd(struct cpuinfo_x86 *c)
20163 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
20164 {
20165 /* AMD errata T13 (order #21922) */
20166- if ((c->x86 == 6)) {
20167+ if (c->x86 == 6) {
20168 /* Duron Rev A0 */
20169 if (c->x86_model == 3 && c->x86_mask == 0)
20170 size = 64;
20171diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
20172index 2793d1f..b4f313a 100644
20173--- a/arch/x86/kernel/cpu/common.c
20174+++ b/arch/x86/kernel/cpu/common.c
20175@@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = {
20176
20177 static const struct cpu_dev *this_cpu = &default_cpu;
20178
20179-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
20180-#ifdef CONFIG_X86_64
20181- /*
20182- * We need valid kernel segments for data and code in long mode too
20183- * IRET will check the segment types kkeil 2000/10/28
20184- * Also sysret mandates a special GDT layout
20185- *
20186- * TLS descriptors are currently at a different place compared to i386.
20187- * Hopefully nobody expects them at a fixed place (Wine?)
20188- */
20189- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
20190- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
20191- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
20192- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
20193- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
20194- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
20195-#else
20196- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
20197- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20198- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
20199- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
20200- /*
20201- * Segments used for calling PnP BIOS have byte granularity.
20202- * They code segments and data segments have fixed 64k limits,
20203- * the transfer segment sizes are set at run time.
20204- */
20205- /* 32-bit code */
20206- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20207- /* 16-bit code */
20208- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20209- /* 16-bit data */
20210- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
20211- /* 16-bit data */
20212- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
20213- /* 16-bit data */
20214- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
20215- /*
20216- * The APM segments have byte granularity and their bases
20217- * are set at run time. All have 64k limits.
20218- */
20219- /* 32-bit code */
20220- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20221- /* 16-bit code */
20222- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20223- /* data */
20224- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
20225-
20226- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20227- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20228- GDT_STACK_CANARY_INIT
20229-#endif
20230-} };
20231-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
20232-
20233 static int __init x86_xsave_setup(char *s)
20234 {
20235 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
20236@@ -288,6 +234,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
20237 set_in_cr4(X86_CR4_SMAP);
20238 }
20239
20240+#ifdef CONFIG_X86_64
20241+static __init int setup_disable_pcid(char *arg)
20242+{
20243+ setup_clear_cpu_cap(X86_FEATURE_PCID);
20244+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
20245+
20246+#ifdef CONFIG_PAX_MEMORY_UDEREF
20247+ if (clone_pgd_mask != ~(pgdval_t)0UL)
20248+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20249+#endif
20250+
20251+ return 1;
20252+}
20253+__setup("nopcid", setup_disable_pcid);
20254+
20255+static void setup_pcid(struct cpuinfo_x86 *c)
20256+{
20257+ if (!cpu_has(c, X86_FEATURE_PCID)) {
20258+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
20259+
20260+#ifdef CONFIG_PAX_MEMORY_UDEREF
20261+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
20262+ pax_open_kernel();
20263+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20264+ pax_close_kernel();
20265+ printk("PAX: slow and weak UDEREF enabled\n");
20266+ } else
20267+ printk("PAX: UDEREF disabled\n");
20268+#endif
20269+
20270+ return;
20271+ }
20272+
20273+ printk("PAX: PCID detected\n");
20274+ set_in_cr4(X86_CR4_PCIDE);
20275+
20276+#ifdef CONFIG_PAX_MEMORY_UDEREF
20277+ pax_open_kernel();
20278+ clone_pgd_mask = ~(pgdval_t)0UL;
20279+ pax_close_kernel();
20280+ if (pax_user_shadow_base)
20281+ printk("PAX: weak UDEREF enabled\n");
20282+ else {
20283+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
20284+ printk("PAX: strong UDEREF enabled\n");
20285+ }
20286+#endif
20287+
20288+ if (cpu_has(c, X86_FEATURE_INVPCID))
20289+ printk("PAX: INVPCID detected\n");
20290+}
20291+#endif
20292+
20293 /*
20294 * Some CPU features depend on higher CPUID levels, which may not always
20295 * be available due to CPUID level capping or broken virtualization
20296@@ -386,7 +385,7 @@ void switch_to_new_gdt(int cpu)
20297 {
20298 struct desc_ptr gdt_descr;
20299
20300- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
20301+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
20302 gdt_descr.size = GDT_SIZE - 1;
20303 load_gdt(&gdt_descr);
20304 /* Reload the per-cpu base */
20305@@ -875,6 +874,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
20306 setup_smep(c);
20307 setup_smap(c);
20308
20309+#ifdef CONFIG_X86_64
20310+ setup_pcid(c);
20311+#endif
20312+
20313 /*
20314 * The vendor-specific functions might have changed features.
20315 * Now we do "generic changes."
20316@@ -883,6 +886,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
20317 /* Filter out anything that depends on CPUID levels we don't have */
20318 filter_cpuid_features(c, true);
20319
20320+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
20321+ setup_clear_cpu_cap(X86_FEATURE_SEP);
20322+#endif
20323+
20324 /* If the model name is still unset, do table lookup. */
20325 if (!c->x86_model_id[0]) {
20326 const char *p;
20327@@ -1070,10 +1077,12 @@ static __init int setup_disablecpuid(char *arg)
20328 }
20329 __setup("clearcpuid=", setup_disablecpuid);
20330
20331+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
20332+EXPORT_PER_CPU_SYMBOL(current_tinfo);
20333+
20334 #ifdef CONFIG_X86_64
20335-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
20336-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
20337- (unsigned long) debug_idt_table };
20338+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
20339+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
20340
20341 DEFINE_PER_CPU_FIRST(union irq_stack_union,
20342 irq_stack_union) __aligned(PAGE_SIZE) __visible;
20343@@ -1087,7 +1096,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
20344 EXPORT_PER_CPU_SYMBOL(current_task);
20345
20346 DEFINE_PER_CPU(unsigned long, kernel_stack) =
20347- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
20348+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
20349 EXPORT_PER_CPU_SYMBOL(kernel_stack);
20350
20351 DEFINE_PER_CPU(char *, irq_stack_ptr) =
20352@@ -1232,7 +1241,7 @@ void cpu_init(void)
20353 load_ucode_ap();
20354
20355 cpu = stack_smp_processor_id();
20356- t = &per_cpu(init_tss, cpu);
20357+ t = init_tss + cpu;
20358 oist = &per_cpu(orig_ist, cpu);
20359
20360 #ifdef CONFIG_NUMA
20361@@ -1267,7 +1276,6 @@ void cpu_init(void)
20362 wrmsrl(MSR_KERNEL_GS_BASE, 0);
20363 barrier();
20364
20365- x86_configure_nx();
20366 enable_x2apic();
20367
20368 /*
20369@@ -1319,7 +1327,7 @@ void cpu_init(void)
20370 {
20371 int cpu = smp_processor_id();
20372 struct task_struct *curr = current;
20373- struct tss_struct *t = &per_cpu(init_tss, cpu);
20374+ struct tss_struct *t = init_tss + cpu;
20375 struct thread_struct *thread = &curr->thread;
20376
20377 show_ucode_info_early();
20378diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
20379index 1414c90..1159406 100644
20380--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
20381+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
20382@@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = {
20383 };
20384
20385 #ifdef CONFIG_AMD_NB
20386+static struct attribute *default_attrs_amd_nb[] = {
20387+ &type.attr,
20388+ &level.attr,
20389+ &coherency_line_size.attr,
20390+ &physical_line_partition.attr,
20391+ &ways_of_associativity.attr,
20392+ &number_of_sets.attr,
20393+ &size.attr,
20394+ &shared_cpu_map.attr,
20395+ &shared_cpu_list.attr,
20396+ NULL,
20397+ NULL,
20398+ NULL,
20399+ NULL
20400+};
20401+
20402 static struct attribute **amd_l3_attrs(void)
20403 {
20404 static struct attribute **attrs;
20405@@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void)
20406
20407 n = ARRAY_SIZE(default_attrs);
20408
20409- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
20410- n += 2;
20411-
20412- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
20413- n += 1;
20414-
20415- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
20416- if (attrs == NULL)
20417- return attrs = default_attrs;
20418-
20419- for (n = 0; default_attrs[n]; n++)
20420- attrs[n] = default_attrs[n];
20421+ attrs = default_attrs_amd_nb;
20422
20423 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
20424 attrs[n++] = &cache_disable_0.attr;
20425@@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = {
20426 .default_attrs = default_attrs,
20427 };
20428
20429+#ifdef CONFIG_AMD_NB
20430+static struct kobj_type ktype_cache_amd_nb = {
20431+ .sysfs_ops = &sysfs_ops,
20432+ .default_attrs = default_attrs_amd_nb,
20433+};
20434+#endif
20435+
20436 static struct kobj_type ktype_percpu_entry = {
20437 .sysfs_ops = &sysfs_ops,
20438 };
20439@@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev)
20440 return retval;
20441 }
20442
20443+#ifdef CONFIG_AMD_NB
20444+ amd_l3_attrs();
20445+#endif
20446+
20447 for (i = 0; i < num_cache_leaves; i++) {
20448+ struct kobj_type *ktype;
20449+
20450 this_object = INDEX_KOBJECT_PTR(cpu, i);
20451 this_object->cpu = cpu;
20452 this_object->index = i;
20453
20454 this_leaf = CPUID4_INFO_IDX(cpu, i);
20455
20456- ktype_cache.default_attrs = default_attrs;
20457+ ktype = &ktype_cache;
20458 #ifdef CONFIG_AMD_NB
20459 if (this_leaf->base.nb)
20460- ktype_cache.default_attrs = amd_l3_attrs();
20461+ ktype = &ktype_cache_amd_nb;
20462 #endif
20463 retval = kobject_init_and_add(&(this_object->kobj),
20464- &ktype_cache,
20465+ ktype,
20466 per_cpu(ici_cache_kobject, cpu),
20467 "index%1lu", i);
20468 if (unlikely(retval)) {
20469diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
20470index b3218cd..99a75de 100644
20471--- a/arch/x86/kernel/cpu/mcheck/mce.c
20472+++ b/arch/x86/kernel/cpu/mcheck/mce.c
20473@@ -45,6 +45,7 @@
20474 #include <asm/processor.h>
20475 #include <asm/mce.h>
20476 #include <asm/msr.h>
20477+#include <asm/local.h>
20478
20479 #include "mce-internal.h"
20480
20481@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
20482 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
20483 m->cs, m->ip);
20484
20485- if (m->cs == __KERNEL_CS)
20486+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
20487 print_symbol("{%s}", m->ip);
20488 pr_cont("\n");
20489 }
20490@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
20491
20492 #define PANIC_TIMEOUT 5 /* 5 seconds */
20493
20494-static atomic_t mce_paniced;
20495+static atomic_unchecked_t mce_paniced;
20496
20497 static int fake_panic;
20498-static atomic_t mce_fake_paniced;
20499+static atomic_unchecked_t mce_fake_paniced;
20500
20501 /* Panic in progress. Enable interrupts and wait for final IPI */
20502 static void wait_for_panic(void)
20503@@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
20504 /*
20505 * Make sure only one CPU runs in machine check panic
20506 */
20507- if (atomic_inc_return(&mce_paniced) > 1)
20508+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
20509 wait_for_panic();
20510 barrier();
20511
20512@@ -326,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
20513 console_verbose();
20514 } else {
20515 /* Don't log too much for fake panic */
20516- if (atomic_inc_return(&mce_fake_paniced) > 1)
20517+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
20518 return;
20519 }
20520 /* First print corrected ones that are still unlogged */
20521@@ -365,7 +366,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
20522 if (!fake_panic) {
20523 if (panic_timeout == 0)
20524 panic_timeout = mca_cfg.panic_timeout;
20525- panic(msg);
20526+ panic("%s", msg);
20527 } else
20528 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
20529 }
20530@@ -695,7 +696,7 @@ static int mce_timed_out(u64 *t)
20531 * might have been modified by someone else.
20532 */
20533 rmb();
20534- if (atomic_read(&mce_paniced))
20535+ if (atomic_read_unchecked(&mce_paniced))
20536 wait_for_panic();
20537 if (!mca_cfg.monarch_timeout)
20538 goto out;
20539@@ -1666,7 +1667,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
20540 }
20541
20542 /* Call the installed machine check handler for this CPU setup. */
20543-void (*machine_check_vector)(struct pt_regs *, long error_code) =
20544+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
20545 unexpected_machine_check;
20546
20547 /*
20548@@ -1689,7 +1690,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
20549 return;
20550 }
20551
20552+ pax_open_kernel();
20553 machine_check_vector = do_machine_check;
20554+ pax_close_kernel();
20555
20556 __mcheck_cpu_init_generic();
20557 __mcheck_cpu_init_vendor(c);
20558@@ -1703,7 +1706,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
20559 */
20560
20561 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
20562-static int mce_chrdev_open_count; /* #times opened */
20563+static local_t mce_chrdev_open_count; /* #times opened */
20564 static int mce_chrdev_open_exclu; /* already open exclusive? */
20565
20566 static int mce_chrdev_open(struct inode *inode, struct file *file)
20567@@ -1711,7 +1714,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
20568 spin_lock(&mce_chrdev_state_lock);
20569
20570 if (mce_chrdev_open_exclu ||
20571- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
20572+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
20573 spin_unlock(&mce_chrdev_state_lock);
20574
20575 return -EBUSY;
20576@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
20577
20578 if (file->f_flags & O_EXCL)
20579 mce_chrdev_open_exclu = 1;
20580- mce_chrdev_open_count++;
20581+ local_inc(&mce_chrdev_open_count);
20582
20583 spin_unlock(&mce_chrdev_state_lock);
20584
20585@@ -1730,7 +1733,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
20586 {
20587 spin_lock(&mce_chrdev_state_lock);
20588
20589- mce_chrdev_open_count--;
20590+ local_dec(&mce_chrdev_open_count);
20591 mce_chrdev_open_exclu = 0;
20592
20593 spin_unlock(&mce_chrdev_state_lock);
20594@@ -2404,7 +2407,7 @@ static __init void mce_init_banks(void)
20595
20596 for (i = 0; i < mca_cfg.banks; i++) {
20597 struct mce_bank *b = &mce_banks[i];
20598- struct device_attribute *a = &b->attr;
20599+ device_attribute_no_const *a = &b->attr;
20600
20601 sysfs_attr_init(&a->attr);
20602 a->attr.name = b->attrname;
20603@@ -2472,7 +2475,7 @@ struct dentry *mce_get_debugfs_dir(void)
20604 static void mce_reset(void)
20605 {
20606 cpu_missing = 0;
20607- atomic_set(&mce_fake_paniced, 0);
20608+ atomic_set_unchecked(&mce_fake_paniced, 0);
20609 atomic_set(&mce_executing, 0);
20610 atomic_set(&mce_callin, 0);
20611 atomic_set(&global_nwo, 0);
20612diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
20613index 1c044b1..37a2a43 100644
20614--- a/arch/x86/kernel/cpu/mcheck/p5.c
20615+++ b/arch/x86/kernel/cpu/mcheck/p5.c
20616@@ -11,6 +11,7 @@
20617 #include <asm/processor.h>
20618 #include <asm/mce.h>
20619 #include <asm/msr.h>
20620+#include <asm/pgtable.h>
20621
20622 /* By default disabled */
20623 int mce_p5_enabled __read_mostly;
20624@@ -49,7 +50,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
20625 if (!cpu_has(c, X86_FEATURE_MCE))
20626 return;
20627
20628+ pax_open_kernel();
20629 machine_check_vector = pentium_machine_check;
20630+ pax_close_kernel();
20631 /* Make sure the vector pointer is visible before we enable MCEs: */
20632 wmb();
20633
20634diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
20635index e9a701a..35317d6 100644
20636--- a/arch/x86/kernel/cpu/mcheck/winchip.c
20637+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
20638@@ -10,6 +10,7 @@
20639 #include <asm/processor.h>
20640 #include <asm/mce.h>
20641 #include <asm/msr.h>
20642+#include <asm/pgtable.h>
20643
20644 /* Machine check handler for WinChip C6: */
20645 static void winchip_machine_check(struct pt_regs *regs, long error_code)
20646@@ -23,7 +24,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
20647 {
20648 u32 lo, hi;
20649
20650+ pax_open_kernel();
20651 machine_check_vector = winchip_machine_check;
20652+ pax_close_kernel();
20653 /* Make sure the vector pointer is visible before we enable MCEs: */
20654 wmb();
20655
20656diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
20657index f961de9..8a9d332 100644
20658--- a/arch/x86/kernel/cpu/mtrr/main.c
20659+++ b/arch/x86/kernel/cpu/mtrr/main.c
20660@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
20661 u64 size_or_mask, size_and_mask;
20662 static bool mtrr_aps_delayed_init;
20663
20664-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
20665+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
20666
20667 const struct mtrr_ops *mtrr_if;
20668
20669diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
20670index df5e41f..816c719 100644
20671--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
20672+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
20673@@ -25,7 +25,7 @@ struct mtrr_ops {
20674 int (*validate_add_page)(unsigned long base, unsigned long size,
20675 unsigned int type);
20676 int (*have_wrcomb)(void);
20677-};
20678+} __do_const;
20679
20680 extern int generic_get_free_region(unsigned long base, unsigned long size,
20681 int replace_reg);
20682diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
20683index 8a87a32..682a22a 100644
20684--- a/arch/x86/kernel/cpu/perf_event.c
20685+++ b/arch/x86/kernel/cpu/perf_event.c
20686@@ -1348,7 +1348,7 @@ static void __init pmu_check_apic(void)
20687 pr_info("no hardware sampling interrupt available.\n");
20688 }
20689
20690-static struct attribute_group x86_pmu_format_group = {
20691+static attribute_group_no_const x86_pmu_format_group = {
20692 .name = "format",
20693 .attrs = NULL,
20694 };
20695@@ -1447,7 +1447,7 @@ static struct attribute *events_attr[] = {
20696 NULL,
20697 };
20698
20699-static struct attribute_group x86_pmu_events_group = {
20700+static attribute_group_no_const x86_pmu_events_group = {
20701 .name = "events",
20702 .attrs = events_attr,
20703 };
20704@@ -1958,7 +1958,7 @@ static unsigned long get_segment_base(unsigned int segment)
20705 if (idx > GDT_ENTRIES)
20706 return 0;
20707
20708- desc = __this_cpu_ptr(&gdt_page.gdt[0]);
20709+ desc = get_cpu_gdt_table(smp_processor_id());
20710 }
20711
20712 return get_desc_base(desc + idx);
20713@@ -2048,7 +2048,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
20714 break;
20715
20716 perf_callchain_store(entry, frame.return_address);
20717- fp = frame.next_frame;
20718+ fp = (const void __force_user *)frame.next_frame;
20719 }
20720 }
20721
20722diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
20723index 639d128..e92d7e5 100644
20724--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
20725+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
20726@@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
20727 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
20728 {
20729 struct attribute **attrs;
20730- struct attribute_group *attr_group;
20731+ attribute_group_no_const *attr_group;
20732 int i = 0, j;
20733
20734 while (amd_iommu_v2_event_descs[i].attr.attr.name)
20735diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
20736index f31a165..7b46cd8 100644
20737--- a/arch/x86/kernel/cpu/perf_event_intel.c
20738+++ b/arch/x86/kernel/cpu/perf_event_intel.c
20739@@ -2247,10 +2247,10 @@ __init int intel_pmu_init(void)
20740 * v2 and above have a perf capabilities MSR
20741 */
20742 if (version > 1) {
20743- u64 capabilities;
20744+ u64 capabilities = x86_pmu.intel_cap.capabilities;
20745
20746- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
20747- x86_pmu.intel_cap.capabilities = capabilities;
20748+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
20749+ x86_pmu.intel_cap.capabilities = capabilities;
20750 }
20751
20752 intel_ds_init();
20753diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
20754index 4118f9f..f91d0ab 100644
20755--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
20756+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
20757@@ -3204,7 +3204,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
20758 static int __init uncore_type_init(struct intel_uncore_type *type)
20759 {
20760 struct intel_uncore_pmu *pmus;
20761- struct attribute_group *attr_group;
20762+ attribute_group_no_const *attr_group;
20763 struct attribute **attrs;
20764 int i, j;
20765
20766diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
20767index a80ab71..4089da5 100644
20768--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
20769+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
20770@@ -498,7 +498,7 @@ struct intel_uncore_box {
20771 struct uncore_event_desc {
20772 struct kobj_attribute attr;
20773 const char *config;
20774-};
20775+} __do_const;
20776
20777 #define INTEL_UNCORE_EVENT_DESC(_name, _config) \
20778 { \
20779diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
20780index 7d9481c..99c7e4b 100644
20781--- a/arch/x86/kernel/cpuid.c
20782+++ b/arch/x86/kernel/cpuid.c
20783@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
20784 return notifier_from_errno(err);
20785 }
20786
20787-static struct notifier_block __refdata cpuid_class_cpu_notifier =
20788+static struct notifier_block cpuid_class_cpu_notifier =
20789 {
20790 .notifier_call = cpuid_class_cpu_callback,
20791 };
20792diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
20793index 18677a9..f67c45b 100644
20794--- a/arch/x86/kernel/crash.c
20795+++ b/arch/x86/kernel/crash.c
20796@@ -58,10 +58,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
20797 {
20798 #ifdef CONFIG_X86_32
20799 struct pt_regs fixed_regs;
20800-#endif
20801
20802-#ifdef CONFIG_X86_32
20803- if (!user_mode_vm(regs)) {
20804+ if (!user_mode(regs)) {
20805 crash_fixup_ss_esp(&fixed_regs, regs);
20806 regs = &fixed_regs;
20807 }
20808diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
20809index afa64ad..dce67dd 100644
20810--- a/arch/x86/kernel/crash_dump_64.c
20811+++ b/arch/x86/kernel/crash_dump_64.c
20812@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
20813 return -ENOMEM;
20814
20815 if (userbuf) {
20816- if (copy_to_user(buf, vaddr + offset, csize)) {
20817+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
20818 iounmap(vaddr);
20819 return -EFAULT;
20820 }
20821diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
20822index 5d3fe8d..02e1429 100644
20823--- a/arch/x86/kernel/doublefault.c
20824+++ b/arch/x86/kernel/doublefault.c
20825@@ -13,7 +13,7 @@
20826
20827 #define DOUBLEFAULT_STACKSIZE (1024)
20828 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
20829-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
20830+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
20831
20832 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
20833
20834@@ -23,7 +23,7 @@ static void doublefault_fn(void)
20835 unsigned long gdt, tss;
20836
20837 native_store_gdt(&gdt_desc);
20838- gdt = gdt_desc.address;
20839+ gdt = (unsigned long)gdt_desc.address;
20840
20841 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
20842
20843@@ -60,10 +60,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
20844 /* 0x2 bit is always set */
20845 .flags = X86_EFLAGS_SF | 0x2,
20846 .sp = STACK_START,
20847- .es = __USER_DS,
20848+ .es = __KERNEL_DS,
20849 .cs = __KERNEL_CS,
20850 .ss = __KERNEL_DS,
20851- .ds = __USER_DS,
20852+ .ds = __KERNEL_DS,
20853 .fs = __KERNEL_PERCPU,
20854
20855 .__cr3 = __pa_nodebug(swapper_pg_dir),
20856diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
20857index deb6421..76bbc12 100644
20858--- a/arch/x86/kernel/dumpstack.c
20859+++ b/arch/x86/kernel/dumpstack.c
20860@@ -2,6 +2,9 @@
20861 * Copyright (C) 1991, 1992 Linus Torvalds
20862 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
20863 */
20864+#ifdef CONFIG_GRKERNSEC_HIDESYM
20865+#define __INCLUDED_BY_HIDESYM 1
20866+#endif
20867 #include <linux/kallsyms.h>
20868 #include <linux/kprobes.h>
20869 #include <linux/uaccess.h>
20870@@ -35,16 +38,14 @@ void printk_address(unsigned long address, int reliable)
20871 static void
20872 print_ftrace_graph_addr(unsigned long addr, void *data,
20873 const struct stacktrace_ops *ops,
20874- struct thread_info *tinfo, int *graph)
20875+ struct task_struct *task, int *graph)
20876 {
20877- struct task_struct *task;
20878 unsigned long ret_addr;
20879 int index;
20880
20881 if (addr != (unsigned long)return_to_handler)
20882 return;
20883
20884- task = tinfo->task;
20885 index = task->curr_ret_stack;
20886
20887 if (!task->ret_stack || index < *graph)
20888@@ -61,7 +62,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
20889 static inline void
20890 print_ftrace_graph_addr(unsigned long addr, void *data,
20891 const struct stacktrace_ops *ops,
20892- struct thread_info *tinfo, int *graph)
20893+ struct task_struct *task, int *graph)
20894 { }
20895 #endif
20896
20897@@ -72,10 +73,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
20898 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
20899 */
20900
20901-static inline int valid_stack_ptr(struct thread_info *tinfo,
20902- void *p, unsigned int size, void *end)
20903+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
20904 {
20905- void *t = tinfo;
20906 if (end) {
20907 if (p < end && p >= (end-THREAD_SIZE))
20908 return 1;
20909@@ -86,14 +85,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
20910 }
20911
20912 unsigned long
20913-print_context_stack(struct thread_info *tinfo,
20914+print_context_stack(struct task_struct *task, void *stack_start,
20915 unsigned long *stack, unsigned long bp,
20916 const struct stacktrace_ops *ops, void *data,
20917 unsigned long *end, int *graph)
20918 {
20919 struct stack_frame *frame = (struct stack_frame *)bp;
20920
20921- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
20922+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
20923 unsigned long addr;
20924
20925 addr = *stack;
20926@@ -105,7 +104,7 @@ print_context_stack(struct thread_info *tinfo,
20927 } else {
20928 ops->address(data, addr, 0);
20929 }
20930- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
20931+ print_ftrace_graph_addr(addr, data, ops, task, graph);
20932 }
20933 stack++;
20934 }
20935@@ -114,7 +113,7 @@ print_context_stack(struct thread_info *tinfo,
20936 EXPORT_SYMBOL_GPL(print_context_stack);
20937
20938 unsigned long
20939-print_context_stack_bp(struct thread_info *tinfo,
20940+print_context_stack_bp(struct task_struct *task, void *stack_start,
20941 unsigned long *stack, unsigned long bp,
20942 const struct stacktrace_ops *ops, void *data,
20943 unsigned long *end, int *graph)
20944@@ -122,7 +121,7 @@ print_context_stack_bp(struct thread_info *tinfo,
20945 struct stack_frame *frame = (struct stack_frame *)bp;
20946 unsigned long *ret_addr = &frame->return_address;
20947
20948- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
20949+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
20950 unsigned long addr = *ret_addr;
20951
20952 if (!__kernel_text_address(addr))
20953@@ -131,7 +130,7 @@ print_context_stack_bp(struct thread_info *tinfo,
20954 ops->address(data, addr, 1);
20955 frame = frame->next_frame;
20956 ret_addr = &frame->return_address;
20957- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
20958+ print_ftrace_graph_addr(addr, data, ops, task, graph);
20959 }
20960
20961 return (unsigned long)frame;
20962@@ -150,7 +149,7 @@ static int print_trace_stack(void *data, char *name)
20963 static void print_trace_address(void *data, unsigned long addr, int reliable)
20964 {
20965 touch_nmi_watchdog();
20966- printk(data);
20967+ printk("%s", (char *)data);
20968 printk_address(addr, reliable);
20969 }
20970
20971@@ -219,6 +218,8 @@ unsigned __kprobes long oops_begin(void)
20972 }
20973 EXPORT_SYMBOL_GPL(oops_begin);
20974
20975+extern void gr_handle_kernel_exploit(void);
20976+
20977 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
20978 {
20979 if (regs && kexec_should_crash(current))
20980@@ -240,7 +241,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
20981 panic("Fatal exception in interrupt");
20982 if (panic_on_oops)
20983 panic("Fatal exception");
20984- do_exit(signr);
20985+
20986+ gr_handle_kernel_exploit();
20987+
20988+ do_group_exit(signr);
20989 }
20990
20991 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
20992@@ -268,7 +272,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
20993 print_modules();
20994 show_regs(regs);
20995 #ifdef CONFIG_X86_32
20996- if (user_mode_vm(regs)) {
20997+ if (user_mode(regs)) {
20998 sp = regs->sp;
20999 ss = regs->ss & 0xffff;
21000 } else {
21001@@ -296,7 +300,7 @@ void die(const char *str, struct pt_regs *regs, long err)
21002 unsigned long flags = oops_begin();
21003 int sig = SIGSEGV;
21004
21005- if (!user_mode_vm(regs))
21006+ if (!user_mode(regs))
21007 report_bug(regs->ip, regs);
21008
21009 if (__die(str, regs, err))
21010diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
21011index f2a1770..540657f 100644
21012--- a/arch/x86/kernel/dumpstack_32.c
21013+++ b/arch/x86/kernel/dumpstack_32.c
21014@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21015 bp = stack_frame(task, regs);
21016
21017 for (;;) {
21018- struct thread_info *context;
21019+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21020
21021- context = (struct thread_info *)
21022- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
21023- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
21024+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
21025
21026- stack = (unsigned long *)context->previous_esp;
21027- if (!stack)
21028+ if (stack_start == task_stack_page(task))
21029 break;
21030+ stack = *(unsigned long **)stack_start;
21031 if (ops->stack(data, "IRQ") < 0)
21032 break;
21033 touch_nmi_watchdog();
21034@@ -87,27 +85,28 @@ void show_regs(struct pt_regs *regs)
21035 int i;
21036
21037 show_regs_print_info(KERN_EMERG);
21038- __show_regs(regs, !user_mode_vm(regs));
21039+ __show_regs(regs, !user_mode(regs));
21040
21041 /*
21042 * When in-kernel, we also print out the stack and code at the
21043 * time of the fault..
21044 */
21045- if (!user_mode_vm(regs)) {
21046+ if (!user_mode(regs)) {
21047 unsigned int code_prologue = code_bytes * 43 / 64;
21048 unsigned int code_len = code_bytes;
21049 unsigned char c;
21050 u8 *ip;
21051+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
21052
21053 pr_emerg("Stack:\n");
21054 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
21055
21056 pr_emerg("Code:");
21057
21058- ip = (u8 *)regs->ip - code_prologue;
21059+ ip = (u8 *)regs->ip - code_prologue + cs_base;
21060 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
21061 /* try starting at IP */
21062- ip = (u8 *)regs->ip;
21063+ ip = (u8 *)regs->ip + cs_base;
21064 code_len = code_len - code_prologue + 1;
21065 }
21066 for (i = 0; i < code_len; i++, ip++) {
21067@@ -116,7 +115,7 @@ void show_regs(struct pt_regs *regs)
21068 pr_cont(" Bad EIP value.");
21069 break;
21070 }
21071- if (ip == (u8 *)regs->ip)
21072+ if (ip == (u8 *)regs->ip + cs_base)
21073 pr_cont(" <%02x>", c);
21074 else
21075 pr_cont(" %02x", c);
21076@@ -129,6 +128,7 @@ int is_valid_bugaddr(unsigned long ip)
21077 {
21078 unsigned short ud2;
21079
21080+ ip = ktla_ktva(ip);
21081 if (ip < PAGE_OFFSET)
21082 return 0;
21083 if (probe_kernel_address((unsigned short *)ip, ud2))
21084@@ -136,3 +136,15 @@ int is_valid_bugaddr(unsigned long ip)
21085
21086 return ud2 == 0x0b0f;
21087 }
21088+
21089+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21090+void pax_check_alloca(unsigned long size)
21091+{
21092+ unsigned long sp = (unsigned long)&sp, stack_left;
21093+
21094+ /* all kernel stacks are of the same size */
21095+ stack_left = sp & (THREAD_SIZE - 1);
21096+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
21097+}
21098+EXPORT_SYMBOL(pax_check_alloca);
21099+#endif
21100diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
21101index addb207..99635fa 100644
21102--- a/arch/x86/kernel/dumpstack_64.c
21103+++ b/arch/x86/kernel/dumpstack_64.c
21104@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21105 unsigned long *irq_stack_end =
21106 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
21107 unsigned used = 0;
21108- struct thread_info *tinfo;
21109 int graph = 0;
21110 unsigned long dummy;
21111+ void *stack_start;
21112
21113 if (!task)
21114 task = current;
21115@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21116 * current stack address. If the stacks consist of nested
21117 * exceptions
21118 */
21119- tinfo = task_thread_info(task);
21120 for (;;) {
21121 char *id;
21122 unsigned long *estack_end;
21123+
21124 estack_end = in_exception_stack(cpu, (unsigned long)stack,
21125 &used, &id);
21126
21127@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21128 if (ops->stack(data, id) < 0)
21129 break;
21130
21131- bp = ops->walk_stack(tinfo, stack, bp, ops,
21132+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
21133 data, estack_end, &graph);
21134 ops->stack(data, "<EOE>");
21135 /*
21136@@ -161,6 +161,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21137 * second-to-last pointer (index -2 to end) in the
21138 * exception stack:
21139 */
21140+ if ((u16)estack_end[-1] != __KERNEL_DS)
21141+ goto out;
21142 stack = (unsigned long *) estack_end[-2];
21143 continue;
21144 }
21145@@ -172,7 +174,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21146 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
21147 if (ops->stack(data, "IRQ") < 0)
21148 break;
21149- bp = ops->walk_stack(tinfo, stack, bp,
21150+ bp = ops->walk_stack(task, irq_stack, stack, bp,
21151 ops, data, irq_stack_end, &graph);
21152 /*
21153 * We link to the next stack (which would be
21154@@ -191,7 +193,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21155 /*
21156 * This handles the process stack:
21157 */
21158- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
21159+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21160+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
21161+out:
21162 put_cpu();
21163 }
21164 EXPORT_SYMBOL(dump_trace);
21165@@ -300,3 +304,50 @@ int is_valid_bugaddr(unsigned long ip)
21166
21167 return ud2 == 0x0b0f;
21168 }
21169+
21170+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21171+void pax_check_alloca(unsigned long size)
21172+{
21173+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
21174+ unsigned cpu, used;
21175+ char *id;
21176+
21177+ /* check the process stack first */
21178+ stack_start = (unsigned long)task_stack_page(current);
21179+ stack_end = stack_start + THREAD_SIZE;
21180+ if (likely(stack_start <= sp && sp < stack_end)) {
21181+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
21182+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
21183+ return;
21184+ }
21185+
21186+ cpu = get_cpu();
21187+
21188+ /* check the irq stacks */
21189+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
21190+ stack_start = stack_end - IRQ_STACK_SIZE;
21191+ if (stack_start <= sp && sp < stack_end) {
21192+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
21193+ put_cpu();
21194+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
21195+ return;
21196+ }
21197+
21198+ /* check the exception stacks */
21199+ used = 0;
21200+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
21201+ stack_start = stack_end - EXCEPTION_STKSZ;
21202+ if (stack_end && stack_start <= sp && sp < stack_end) {
21203+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
21204+ put_cpu();
21205+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
21206+ return;
21207+ }
21208+
21209+ put_cpu();
21210+
21211+ /* unknown stack */
21212+ BUG();
21213+}
21214+EXPORT_SYMBOL(pax_check_alloca);
21215+#endif
21216diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
21217index 174da5f..5e55606 100644
21218--- a/arch/x86/kernel/e820.c
21219+++ b/arch/x86/kernel/e820.c
21220@@ -803,8 +803,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
21221
21222 static void early_panic(char *msg)
21223 {
21224- early_printk(msg);
21225- panic(msg);
21226+ early_printk("%s", msg);
21227+ panic("%s", msg);
21228 }
21229
21230 static int userdef __initdata;
21231diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
21232index d15f575..d692043 100644
21233--- a/arch/x86/kernel/early_printk.c
21234+++ b/arch/x86/kernel/early_printk.c
21235@@ -7,6 +7,7 @@
21236 #include <linux/pci_regs.h>
21237 #include <linux/pci_ids.h>
21238 #include <linux/errno.h>
21239+#include <linux/sched.h>
21240 #include <asm/io.h>
21241 #include <asm/processor.h>
21242 #include <asm/fcntl.h>
21243diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
21244index f0dcb0c..9f39b80 100644
21245--- a/arch/x86/kernel/entry_32.S
21246+++ b/arch/x86/kernel/entry_32.S
21247@@ -177,13 +177,153 @@
21248 /*CFI_REL_OFFSET gs, PT_GS*/
21249 .endm
21250 .macro SET_KERNEL_GS reg
21251+
21252+#ifdef CONFIG_CC_STACKPROTECTOR
21253 movl $(__KERNEL_STACK_CANARY), \reg
21254+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
21255+ movl $(__USER_DS), \reg
21256+#else
21257+ xorl \reg, \reg
21258+#endif
21259+
21260 movl \reg, %gs
21261 .endm
21262
21263 #endif /* CONFIG_X86_32_LAZY_GS */
21264
21265-.macro SAVE_ALL
21266+.macro pax_enter_kernel
21267+#ifdef CONFIG_PAX_KERNEXEC
21268+ call pax_enter_kernel
21269+#endif
21270+.endm
21271+
21272+.macro pax_exit_kernel
21273+#ifdef CONFIG_PAX_KERNEXEC
21274+ call pax_exit_kernel
21275+#endif
21276+.endm
21277+
21278+#ifdef CONFIG_PAX_KERNEXEC
21279+ENTRY(pax_enter_kernel)
21280+#ifdef CONFIG_PARAVIRT
21281+ pushl %eax
21282+ pushl %ecx
21283+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
21284+ mov %eax, %esi
21285+#else
21286+ mov %cr0, %esi
21287+#endif
21288+ bts $16, %esi
21289+ jnc 1f
21290+ mov %cs, %esi
21291+ cmp $__KERNEL_CS, %esi
21292+ jz 3f
21293+ ljmp $__KERNEL_CS, $3f
21294+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
21295+2:
21296+#ifdef CONFIG_PARAVIRT
21297+ mov %esi, %eax
21298+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
21299+#else
21300+ mov %esi, %cr0
21301+#endif
21302+3:
21303+#ifdef CONFIG_PARAVIRT
21304+ popl %ecx
21305+ popl %eax
21306+#endif
21307+ ret
21308+ENDPROC(pax_enter_kernel)
21309+
21310+ENTRY(pax_exit_kernel)
21311+#ifdef CONFIG_PARAVIRT
21312+ pushl %eax
21313+ pushl %ecx
21314+#endif
21315+ mov %cs, %esi
21316+ cmp $__KERNEXEC_KERNEL_CS, %esi
21317+ jnz 2f
21318+#ifdef CONFIG_PARAVIRT
21319+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
21320+ mov %eax, %esi
21321+#else
21322+ mov %cr0, %esi
21323+#endif
21324+ btr $16, %esi
21325+ ljmp $__KERNEL_CS, $1f
21326+1:
21327+#ifdef CONFIG_PARAVIRT
21328+ mov %esi, %eax
21329+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
21330+#else
21331+ mov %esi, %cr0
21332+#endif
21333+2:
21334+#ifdef CONFIG_PARAVIRT
21335+ popl %ecx
21336+ popl %eax
21337+#endif
21338+ ret
21339+ENDPROC(pax_exit_kernel)
21340+#endif
21341+
21342+ .macro pax_erase_kstack
21343+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21344+ call pax_erase_kstack
21345+#endif
21346+ .endm
21347+
21348+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
21349+/*
21350+ * ebp: thread_info
21351+ */
21352+ENTRY(pax_erase_kstack)
21353+ pushl %edi
21354+ pushl %ecx
21355+ pushl %eax
21356+
21357+ mov TI_lowest_stack(%ebp), %edi
21358+ mov $-0xBEEF, %eax
21359+ std
21360+
21361+1: mov %edi, %ecx
21362+ and $THREAD_SIZE_asm - 1, %ecx
21363+ shr $2, %ecx
21364+ repne scasl
21365+ jecxz 2f
21366+
21367+ cmp $2*16, %ecx
21368+ jc 2f
21369+
21370+ mov $2*16, %ecx
21371+ repe scasl
21372+ jecxz 2f
21373+ jne 1b
21374+
21375+2: cld
21376+ mov %esp, %ecx
21377+ sub %edi, %ecx
21378+
21379+ cmp $THREAD_SIZE_asm, %ecx
21380+ jb 3f
21381+ ud2
21382+3:
21383+
21384+ shr $2, %ecx
21385+ rep stosl
21386+
21387+ mov TI_task_thread_sp0(%ebp), %edi
21388+ sub $128, %edi
21389+ mov %edi, TI_lowest_stack(%ebp)
21390+
21391+ popl %eax
21392+ popl %ecx
21393+ popl %edi
21394+ ret
21395+ENDPROC(pax_erase_kstack)
21396+#endif
21397+
21398+.macro __SAVE_ALL _DS
21399 cld
21400 PUSH_GS
21401 pushl_cfi %fs
21402@@ -206,7 +346,7 @@
21403 CFI_REL_OFFSET ecx, 0
21404 pushl_cfi %ebx
21405 CFI_REL_OFFSET ebx, 0
21406- movl $(__USER_DS), %edx
21407+ movl $\_DS, %edx
21408 movl %edx, %ds
21409 movl %edx, %es
21410 movl $(__KERNEL_PERCPU), %edx
21411@@ -214,6 +354,15 @@
21412 SET_KERNEL_GS %edx
21413 .endm
21414
21415+.macro SAVE_ALL
21416+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21417+ __SAVE_ALL __KERNEL_DS
21418+ pax_enter_kernel
21419+#else
21420+ __SAVE_ALL __USER_DS
21421+#endif
21422+.endm
21423+
21424 .macro RESTORE_INT_REGS
21425 popl_cfi %ebx
21426 CFI_RESTORE ebx
21427@@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
21428 popfl_cfi
21429 jmp syscall_exit
21430 CFI_ENDPROC
21431-END(ret_from_fork)
21432+ENDPROC(ret_from_fork)
21433
21434 ENTRY(ret_from_kernel_thread)
21435 CFI_STARTPROC
21436@@ -344,7 +493,15 @@ ret_from_intr:
21437 andl $SEGMENT_RPL_MASK, %eax
21438 #endif
21439 cmpl $USER_RPL, %eax
21440+
21441+#ifdef CONFIG_PAX_KERNEXEC
21442+ jae resume_userspace
21443+
21444+ pax_exit_kernel
21445+ jmp resume_kernel
21446+#else
21447 jb resume_kernel # not returning to v8086 or userspace
21448+#endif
21449
21450 ENTRY(resume_userspace)
21451 LOCKDEP_SYS_EXIT
21452@@ -356,8 +513,8 @@ ENTRY(resume_userspace)
21453 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
21454 # int/exception return?
21455 jne work_pending
21456- jmp restore_all
21457-END(ret_from_exception)
21458+ jmp restore_all_pax
21459+ENDPROC(ret_from_exception)
21460
21461 #ifdef CONFIG_PREEMPT
21462 ENTRY(resume_kernel)
21463@@ -372,7 +529,7 @@ need_resched:
21464 jz restore_all
21465 call preempt_schedule_irq
21466 jmp need_resched
21467-END(resume_kernel)
21468+ENDPROC(resume_kernel)
21469 #endif
21470 CFI_ENDPROC
21471 /*
21472@@ -406,30 +563,45 @@ sysenter_past_esp:
21473 /*CFI_REL_OFFSET cs, 0*/
21474 /*
21475 * Push current_thread_info()->sysenter_return to the stack.
21476- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
21477- * pushed above; +8 corresponds to copy_thread's esp0 setting.
21478 */
21479- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
21480+ pushl_cfi $0
21481 CFI_REL_OFFSET eip, 0
21482
21483 pushl_cfi %eax
21484 SAVE_ALL
21485+ GET_THREAD_INFO(%ebp)
21486+ movl TI_sysenter_return(%ebp),%ebp
21487+ movl %ebp,PT_EIP(%esp)
21488 ENABLE_INTERRUPTS(CLBR_NONE)
21489
21490 /*
21491 * Load the potential sixth argument from user stack.
21492 * Careful about security.
21493 */
21494+ movl PT_OLDESP(%esp),%ebp
21495+
21496+#ifdef CONFIG_PAX_MEMORY_UDEREF
21497+ mov PT_OLDSS(%esp),%ds
21498+1: movl %ds:(%ebp),%ebp
21499+ push %ss
21500+ pop %ds
21501+#else
21502 cmpl $__PAGE_OFFSET-3,%ebp
21503 jae syscall_fault
21504 ASM_STAC
21505 1: movl (%ebp),%ebp
21506 ASM_CLAC
21507+#endif
21508+
21509 movl %ebp,PT_EBP(%esp)
21510 _ASM_EXTABLE(1b,syscall_fault)
21511
21512 GET_THREAD_INFO(%ebp)
21513
21514+#ifdef CONFIG_PAX_RANDKSTACK
21515+ pax_erase_kstack
21516+#endif
21517+
21518 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
21519 jnz sysenter_audit
21520 sysenter_do_call:
21521@@ -444,12 +616,24 @@ sysenter_do_call:
21522 testl $_TIF_ALLWORK_MASK, %ecx
21523 jne sysexit_audit
21524 sysenter_exit:
21525+
21526+#ifdef CONFIG_PAX_RANDKSTACK
21527+ pushl_cfi %eax
21528+ movl %esp, %eax
21529+ call pax_randomize_kstack
21530+ popl_cfi %eax
21531+#endif
21532+
21533+ pax_erase_kstack
21534+
21535 /* if something modifies registers it must also disable sysexit */
21536 movl PT_EIP(%esp), %edx
21537 movl PT_OLDESP(%esp), %ecx
21538 xorl %ebp,%ebp
21539 TRACE_IRQS_ON
21540 1: mov PT_FS(%esp), %fs
21541+2: mov PT_DS(%esp), %ds
21542+3: mov PT_ES(%esp), %es
21543 PTGS_TO_GS
21544 ENABLE_INTERRUPTS_SYSEXIT
21545
21546@@ -466,6 +650,9 @@ sysenter_audit:
21547 movl %eax,%edx /* 2nd arg: syscall number */
21548 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
21549 call __audit_syscall_entry
21550+
21551+ pax_erase_kstack
21552+
21553 pushl_cfi %ebx
21554 movl PT_EAX(%esp),%eax /* reload syscall number */
21555 jmp sysenter_do_call
21556@@ -491,10 +678,16 @@ sysexit_audit:
21557
21558 CFI_ENDPROC
21559 .pushsection .fixup,"ax"
21560-2: movl $0,PT_FS(%esp)
21561+4: movl $0,PT_FS(%esp)
21562+ jmp 1b
21563+5: movl $0,PT_DS(%esp)
21564+ jmp 1b
21565+6: movl $0,PT_ES(%esp)
21566 jmp 1b
21567 .popsection
21568- _ASM_EXTABLE(1b,2b)
21569+ _ASM_EXTABLE(1b,4b)
21570+ _ASM_EXTABLE(2b,5b)
21571+ _ASM_EXTABLE(3b,6b)
21572 PTGS_TO_GS_EX
21573 ENDPROC(ia32_sysenter_target)
21574
21575@@ -509,6 +702,11 @@ ENTRY(system_call)
21576 pushl_cfi %eax # save orig_eax
21577 SAVE_ALL
21578 GET_THREAD_INFO(%ebp)
21579+
21580+#ifdef CONFIG_PAX_RANDKSTACK
21581+ pax_erase_kstack
21582+#endif
21583+
21584 # system call tracing in operation / emulation
21585 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
21586 jnz syscall_trace_entry
21587@@ -527,6 +725,15 @@ syscall_exit:
21588 testl $_TIF_ALLWORK_MASK, %ecx # current->work
21589 jne syscall_exit_work
21590
21591+restore_all_pax:
21592+
21593+#ifdef CONFIG_PAX_RANDKSTACK
21594+ movl %esp, %eax
21595+ call pax_randomize_kstack
21596+#endif
21597+
21598+ pax_erase_kstack
21599+
21600 restore_all:
21601 TRACE_IRQS_IRET
21602 restore_all_notrace:
21603@@ -583,14 +790,34 @@ ldt_ss:
21604 * compensating for the offset by changing to the ESPFIX segment with
21605 * a base address that matches for the difference.
21606 */
21607-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
21608+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
21609 mov %esp, %edx /* load kernel esp */
21610 mov PT_OLDESP(%esp), %eax /* load userspace esp */
21611 mov %dx, %ax /* eax: new kernel esp */
21612 sub %eax, %edx /* offset (low word is 0) */
21613+#ifdef CONFIG_SMP
21614+ movl PER_CPU_VAR(cpu_number), %ebx
21615+ shll $PAGE_SHIFT_asm, %ebx
21616+ addl $cpu_gdt_table, %ebx
21617+#else
21618+ movl $cpu_gdt_table, %ebx
21619+#endif
21620 shr $16, %edx
21621- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
21622- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
21623+
21624+#ifdef CONFIG_PAX_KERNEXEC
21625+ mov %cr0, %esi
21626+ btr $16, %esi
21627+ mov %esi, %cr0
21628+#endif
21629+
21630+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
21631+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
21632+
21633+#ifdef CONFIG_PAX_KERNEXEC
21634+ bts $16, %esi
21635+ mov %esi, %cr0
21636+#endif
21637+
21638 pushl_cfi $__ESPFIX_SS
21639 pushl_cfi %eax /* new kernel esp */
21640 /* Disable interrupts, but do not irqtrace this section: we
21641@@ -619,20 +846,18 @@ work_resched:
21642 movl TI_flags(%ebp), %ecx
21643 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
21644 # than syscall tracing?
21645- jz restore_all
21646+ jz restore_all_pax
21647 testb $_TIF_NEED_RESCHED, %cl
21648 jnz work_resched
21649
21650 work_notifysig: # deal with pending signals and
21651 # notify-resume requests
21652+ movl %esp, %eax
21653 #ifdef CONFIG_VM86
21654 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
21655- movl %esp, %eax
21656 jne work_notifysig_v86 # returning to kernel-space or
21657 # vm86-space
21658 1:
21659-#else
21660- movl %esp, %eax
21661 #endif
21662 TRACE_IRQS_ON
21663 ENABLE_INTERRUPTS(CLBR_NONE)
21664@@ -653,7 +878,7 @@ work_notifysig_v86:
21665 movl %eax, %esp
21666 jmp 1b
21667 #endif
21668-END(work_pending)
21669+ENDPROC(work_pending)
21670
21671 # perform syscall exit tracing
21672 ALIGN
21673@@ -661,11 +886,14 @@ syscall_trace_entry:
21674 movl $-ENOSYS,PT_EAX(%esp)
21675 movl %esp, %eax
21676 call syscall_trace_enter
21677+
21678+ pax_erase_kstack
21679+
21680 /* What it returned is what we'll actually use. */
21681 cmpl $(NR_syscalls), %eax
21682 jnae syscall_call
21683 jmp syscall_exit
21684-END(syscall_trace_entry)
21685+ENDPROC(syscall_trace_entry)
21686
21687 # perform syscall exit tracing
21688 ALIGN
21689@@ -678,21 +906,25 @@ syscall_exit_work:
21690 movl %esp, %eax
21691 call syscall_trace_leave
21692 jmp resume_userspace
21693-END(syscall_exit_work)
21694+ENDPROC(syscall_exit_work)
21695 CFI_ENDPROC
21696
21697 RING0_INT_FRAME # can't unwind into user space anyway
21698 syscall_fault:
21699+#ifdef CONFIG_PAX_MEMORY_UDEREF
21700+ push %ss
21701+ pop %ds
21702+#endif
21703 ASM_CLAC
21704 GET_THREAD_INFO(%ebp)
21705 movl $-EFAULT,PT_EAX(%esp)
21706 jmp resume_userspace
21707-END(syscall_fault)
21708+ENDPROC(syscall_fault)
21709
21710 syscall_badsys:
21711 movl $-ENOSYS,PT_EAX(%esp)
21712 jmp resume_userspace
21713-END(syscall_badsys)
21714+ENDPROC(syscall_badsys)
21715 CFI_ENDPROC
21716 /*
21717 * End of kprobes section
21718@@ -708,8 +940,15 @@ END(syscall_badsys)
21719 * normal stack and adjusts ESP with the matching offset.
21720 */
21721 /* fixup the stack */
21722- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
21723- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
21724+#ifdef CONFIG_SMP
21725+ movl PER_CPU_VAR(cpu_number), %ebx
21726+ shll $PAGE_SHIFT_asm, %ebx
21727+ addl $cpu_gdt_table, %ebx
21728+#else
21729+ movl $cpu_gdt_table, %ebx
21730+#endif
21731+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
21732+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
21733 shl $16, %eax
21734 addl %esp, %eax /* the adjusted stack pointer */
21735 pushl_cfi $__KERNEL_DS
21736@@ -762,7 +1001,7 @@ vector=vector+1
21737 .endr
21738 2: jmp common_interrupt
21739 .endr
21740-END(irq_entries_start)
21741+ENDPROC(irq_entries_start)
21742
21743 .previous
21744 END(interrupt)
21745@@ -823,7 +1062,7 @@ ENTRY(coprocessor_error)
21746 pushl_cfi $do_coprocessor_error
21747 jmp error_code
21748 CFI_ENDPROC
21749-END(coprocessor_error)
21750+ENDPROC(coprocessor_error)
21751
21752 ENTRY(simd_coprocessor_error)
21753 RING0_INT_FRAME
21754@@ -836,7 +1075,7 @@ ENTRY(simd_coprocessor_error)
21755 .section .altinstructions,"a"
21756 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
21757 .previous
21758-.section .altinstr_replacement,"ax"
21759+.section .altinstr_replacement,"a"
21760 663: pushl $do_simd_coprocessor_error
21761 664:
21762 .previous
21763@@ -845,7 +1084,7 @@ ENTRY(simd_coprocessor_error)
21764 #endif
21765 jmp error_code
21766 CFI_ENDPROC
21767-END(simd_coprocessor_error)
21768+ENDPROC(simd_coprocessor_error)
21769
21770 ENTRY(device_not_available)
21771 RING0_INT_FRAME
21772@@ -854,18 +1093,18 @@ ENTRY(device_not_available)
21773 pushl_cfi $do_device_not_available
21774 jmp error_code
21775 CFI_ENDPROC
21776-END(device_not_available)
21777+ENDPROC(device_not_available)
21778
21779 #ifdef CONFIG_PARAVIRT
21780 ENTRY(native_iret)
21781 iret
21782 _ASM_EXTABLE(native_iret, iret_exc)
21783-END(native_iret)
21784+ENDPROC(native_iret)
21785
21786 ENTRY(native_irq_enable_sysexit)
21787 sti
21788 sysexit
21789-END(native_irq_enable_sysexit)
21790+ENDPROC(native_irq_enable_sysexit)
21791 #endif
21792
21793 ENTRY(overflow)
21794@@ -875,7 +1114,7 @@ ENTRY(overflow)
21795 pushl_cfi $do_overflow
21796 jmp error_code
21797 CFI_ENDPROC
21798-END(overflow)
21799+ENDPROC(overflow)
21800
21801 ENTRY(bounds)
21802 RING0_INT_FRAME
21803@@ -884,7 +1123,7 @@ ENTRY(bounds)
21804 pushl_cfi $do_bounds
21805 jmp error_code
21806 CFI_ENDPROC
21807-END(bounds)
21808+ENDPROC(bounds)
21809
21810 ENTRY(invalid_op)
21811 RING0_INT_FRAME
21812@@ -893,7 +1132,7 @@ ENTRY(invalid_op)
21813 pushl_cfi $do_invalid_op
21814 jmp error_code
21815 CFI_ENDPROC
21816-END(invalid_op)
21817+ENDPROC(invalid_op)
21818
21819 ENTRY(coprocessor_segment_overrun)
21820 RING0_INT_FRAME
21821@@ -902,7 +1141,7 @@ ENTRY(coprocessor_segment_overrun)
21822 pushl_cfi $do_coprocessor_segment_overrun
21823 jmp error_code
21824 CFI_ENDPROC
21825-END(coprocessor_segment_overrun)
21826+ENDPROC(coprocessor_segment_overrun)
21827
21828 ENTRY(invalid_TSS)
21829 RING0_EC_FRAME
21830@@ -910,7 +1149,7 @@ ENTRY(invalid_TSS)
21831 pushl_cfi $do_invalid_TSS
21832 jmp error_code
21833 CFI_ENDPROC
21834-END(invalid_TSS)
21835+ENDPROC(invalid_TSS)
21836
21837 ENTRY(segment_not_present)
21838 RING0_EC_FRAME
21839@@ -918,7 +1157,7 @@ ENTRY(segment_not_present)
21840 pushl_cfi $do_segment_not_present
21841 jmp error_code
21842 CFI_ENDPROC
21843-END(segment_not_present)
21844+ENDPROC(segment_not_present)
21845
21846 ENTRY(stack_segment)
21847 RING0_EC_FRAME
21848@@ -926,7 +1165,7 @@ ENTRY(stack_segment)
21849 pushl_cfi $do_stack_segment
21850 jmp error_code
21851 CFI_ENDPROC
21852-END(stack_segment)
21853+ENDPROC(stack_segment)
21854
21855 ENTRY(alignment_check)
21856 RING0_EC_FRAME
21857@@ -934,7 +1173,7 @@ ENTRY(alignment_check)
21858 pushl_cfi $do_alignment_check
21859 jmp error_code
21860 CFI_ENDPROC
21861-END(alignment_check)
21862+ENDPROC(alignment_check)
21863
21864 ENTRY(divide_error)
21865 RING0_INT_FRAME
21866@@ -943,7 +1182,7 @@ ENTRY(divide_error)
21867 pushl_cfi $do_divide_error
21868 jmp error_code
21869 CFI_ENDPROC
21870-END(divide_error)
21871+ENDPROC(divide_error)
21872
21873 #ifdef CONFIG_X86_MCE
21874 ENTRY(machine_check)
21875@@ -953,7 +1192,7 @@ ENTRY(machine_check)
21876 pushl_cfi machine_check_vector
21877 jmp error_code
21878 CFI_ENDPROC
21879-END(machine_check)
21880+ENDPROC(machine_check)
21881 #endif
21882
21883 ENTRY(spurious_interrupt_bug)
21884@@ -963,7 +1202,7 @@ ENTRY(spurious_interrupt_bug)
21885 pushl_cfi $do_spurious_interrupt_bug
21886 jmp error_code
21887 CFI_ENDPROC
21888-END(spurious_interrupt_bug)
21889+ENDPROC(spurious_interrupt_bug)
21890 /*
21891 * End of kprobes section
21892 */
21893@@ -1073,7 +1312,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
21894
21895 ENTRY(mcount)
21896 ret
21897-END(mcount)
21898+ENDPROC(mcount)
21899
21900 ENTRY(ftrace_caller)
21901 cmpl $0, function_trace_stop
21902@@ -1106,7 +1345,7 @@ ftrace_graph_call:
21903 .globl ftrace_stub
21904 ftrace_stub:
21905 ret
21906-END(ftrace_caller)
21907+ENDPROC(ftrace_caller)
21908
21909 ENTRY(ftrace_regs_caller)
21910 pushf /* push flags before compare (in cs location) */
21911@@ -1210,7 +1449,7 @@ trace:
21912 popl %ecx
21913 popl %eax
21914 jmp ftrace_stub
21915-END(mcount)
21916+ENDPROC(mcount)
21917 #endif /* CONFIG_DYNAMIC_FTRACE */
21918 #endif /* CONFIG_FUNCTION_TRACER */
21919
21920@@ -1228,7 +1467,7 @@ ENTRY(ftrace_graph_caller)
21921 popl %ecx
21922 popl %eax
21923 ret
21924-END(ftrace_graph_caller)
21925+ENDPROC(ftrace_graph_caller)
21926
21927 .globl return_to_handler
21928 return_to_handler:
21929@@ -1284,15 +1523,18 @@ error_code:
21930 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
21931 REG_TO_PTGS %ecx
21932 SET_KERNEL_GS %ecx
21933- movl $(__USER_DS), %ecx
21934+ movl $(__KERNEL_DS), %ecx
21935 movl %ecx, %ds
21936 movl %ecx, %es
21937+
21938+ pax_enter_kernel
21939+
21940 TRACE_IRQS_OFF
21941 movl %esp,%eax # pt_regs pointer
21942 call *%edi
21943 jmp ret_from_exception
21944 CFI_ENDPROC
21945-END(page_fault)
21946+ENDPROC(page_fault)
21947
21948 /*
21949 * Debug traps and NMI can happen at the one SYSENTER instruction
21950@@ -1335,7 +1577,7 @@ debug_stack_correct:
21951 call do_debug
21952 jmp ret_from_exception
21953 CFI_ENDPROC
21954-END(debug)
21955+ENDPROC(debug)
21956
21957 /*
21958 * NMI is doubly nasty. It can happen _while_ we're handling
21959@@ -1373,6 +1615,9 @@ nmi_stack_correct:
21960 xorl %edx,%edx # zero error code
21961 movl %esp,%eax # pt_regs pointer
21962 call do_nmi
21963+
21964+ pax_exit_kernel
21965+
21966 jmp restore_all_notrace
21967 CFI_ENDPROC
21968
21969@@ -1409,12 +1654,15 @@ nmi_espfix_stack:
21970 FIXUP_ESPFIX_STACK # %eax == %esp
21971 xorl %edx,%edx # zero error code
21972 call do_nmi
21973+
21974+ pax_exit_kernel
21975+
21976 RESTORE_REGS
21977 lss 12+4(%esp), %esp # back to espfix stack
21978 CFI_ADJUST_CFA_OFFSET -24
21979 jmp irq_return
21980 CFI_ENDPROC
21981-END(nmi)
21982+ENDPROC(nmi)
21983
21984 ENTRY(int3)
21985 RING0_INT_FRAME
21986@@ -1427,14 +1675,14 @@ ENTRY(int3)
21987 call do_int3
21988 jmp ret_from_exception
21989 CFI_ENDPROC
21990-END(int3)
21991+ENDPROC(int3)
21992
21993 ENTRY(general_protection)
21994 RING0_EC_FRAME
21995 pushl_cfi $do_general_protection
21996 jmp error_code
21997 CFI_ENDPROC
21998-END(general_protection)
21999+ENDPROC(general_protection)
22000
22001 #ifdef CONFIG_KVM_GUEST
22002 ENTRY(async_page_fault)
22003@@ -1443,7 +1691,7 @@ ENTRY(async_page_fault)
22004 pushl_cfi $do_async_page_fault
22005 jmp error_code
22006 CFI_ENDPROC
22007-END(async_page_fault)
22008+ENDPROC(async_page_fault)
22009 #endif
22010
22011 /*
22012diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
22013index b077f4c..8e0df9f 100644
22014--- a/arch/x86/kernel/entry_64.S
22015+++ b/arch/x86/kernel/entry_64.S
22016@@ -59,6 +59,8 @@
22017 #include <asm/context_tracking.h>
22018 #include <asm/smap.h>
22019 #include <linux/err.h>
22020+#include <asm/pgtable.h>
22021+#include <asm/alternative-asm.h>
22022
22023 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
22024 #include <linux/elf-em.h>
22025@@ -80,8 +82,9 @@
22026 #ifdef CONFIG_DYNAMIC_FTRACE
22027
22028 ENTRY(function_hook)
22029+ pax_force_retaddr
22030 retq
22031-END(function_hook)
22032+ENDPROC(function_hook)
22033
22034 /* skip is set if stack has been adjusted */
22035 .macro ftrace_caller_setup skip=0
22036@@ -122,8 +125,9 @@ GLOBAL(ftrace_graph_call)
22037 #endif
22038
22039 GLOBAL(ftrace_stub)
22040+ pax_force_retaddr
22041 retq
22042-END(ftrace_caller)
22043+ENDPROC(ftrace_caller)
22044
22045 ENTRY(ftrace_regs_caller)
22046 /* Save the current flags before compare (in SS location)*/
22047@@ -191,7 +195,7 @@ ftrace_restore_flags:
22048 popfq
22049 jmp ftrace_stub
22050
22051-END(ftrace_regs_caller)
22052+ENDPROC(ftrace_regs_caller)
22053
22054
22055 #else /* ! CONFIG_DYNAMIC_FTRACE */
22056@@ -212,6 +216,7 @@ ENTRY(function_hook)
22057 #endif
22058
22059 GLOBAL(ftrace_stub)
22060+ pax_force_retaddr
22061 retq
22062
22063 trace:
22064@@ -225,12 +230,13 @@ trace:
22065 #endif
22066 subq $MCOUNT_INSN_SIZE, %rdi
22067
22068+ pax_force_fptr ftrace_trace_function
22069 call *ftrace_trace_function
22070
22071 MCOUNT_RESTORE_FRAME
22072
22073 jmp ftrace_stub
22074-END(function_hook)
22075+ENDPROC(function_hook)
22076 #endif /* CONFIG_DYNAMIC_FTRACE */
22077 #endif /* CONFIG_FUNCTION_TRACER */
22078
22079@@ -252,8 +258,9 @@ ENTRY(ftrace_graph_caller)
22080
22081 MCOUNT_RESTORE_FRAME
22082
22083+ pax_force_retaddr
22084 retq
22085-END(ftrace_graph_caller)
22086+ENDPROC(ftrace_graph_caller)
22087
22088 GLOBAL(return_to_handler)
22089 subq $24, %rsp
22090@@ -269,7 +276,9 @@ GLOBAL(return_to_handler)
22091 movq 8(%rsp), %rdx
22092 movq (%rsp), %rax
22093 addq $24, %rsp
22094+ pax_force_fptr %rdi
22095 jmp *%rdi
22096+ENDPROC(return_to_handler)
22097 #endif
22098
22099
22100@@ -284,6 +293,430 @@ ENTRY(native_usergs_sysret64)
22101 ENDPROC(native_usergs_sysret64)
22102 #endif /* CONFIG_PARAVIRT */
22103
22104+ .macro ljmpq sel, off
22105+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
22106+ .byte 0x48; ljmp *1234f(%rip)
22107+ .pushsection .rodata
22108+ .align 16
22109+ 1234: .quad \off; .word \sel
22110+ .popsection
22111+#else
22112+ pushq $\sel
22113+ pushq $\off
22114+ lretq
22115+#endif
22116+ .endm
22117+
22118+ .macro pax_enter_kernel
22119+ pax_set_fptr_mask
22120+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22121+ call pax_enter_kernel
22122+#endif
22123+ .endm
22124+
22125+ .macro pax_exit_kernel
22126+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22127+ call pax_exit_kernel
22128+#endif
22129+
22130+ .endm
22131+
22132+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22133+ENTRY(pax_enter_kernel)
22134+ pushq %rdi
22135+
22136+#ifdef CONFIG_PARAVIRT
22137+ PV_SAVE_REGS(CLBR_RDI)
22138+#endif
22139+
22140+#ifdef CONFIG_PAX_KERNEXEC
22141+ GET_CR0_INTO_RDI
22142+ bts $16,%rdi
22143+ jnc 3f
22144+ mov %cs,%edi
22145+ cmp $__KERNEL_CS,%edi
22146+ jnz 2f
22147+1:
22148+#endif
22149+
22150+#ifdef CONFIG_PAX_MEMORY_UDEREF
22151+ 661: jmp 111f
22152+ .pushsection .altinstr_replacement, "a"
22153+ 662: ASM_NOP2
22154+ .popsection
22155+ .pushsection .altinstructions, "a"
22156+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22157+ .popsection
22158+ GET_CR3_INTO_RDI
22159+ cmp $0,%dil
22160+ jnz 112f
22161+ mov $__KERNEL_DS,%edi
22162+ mov %edi,%ss
22163+ jmp 111f
22164+112: cmp $1,%dil
22165+ jz 113f
22166+ ud2
22167+113: sub $4097,%rdi
22168+ bts $63,%rdi
22169+ SET_RDI_INTO_CR3
22170+ mov $__UDEREF_KERNEL_DS,%edi
22171+ mov %edi,%ss
22172+111:
22173+#endif
22174+
22175+#ifdef CONFIG_PARAVIRT
22176+ PV_RESTORE_REGS(CLBR_RDI)
22177+#endif
22178+
22179+ popq %rdi
22180+ pax_force_retaddr
22181+ retq
22182+
22183+#ifdef CONFIG_PAX_KERNEXEC
22184+2: ljmpq __KERNEL_CS,1b
22185+3: ljmpq __KERNEXEC_KERNEL_CS,4f
22186+4: SET_RDI_INTO_CR0
22187+ jmp 1b
22188+#endif
22189+ENDPROC(pax_enter_kernel)
22190+
22191+ENTRY(pax_exit_kernel)
22192+ pushq %rdi
22193+
22194+#ifdef CONFIG_PARAVIRT
22195+ PV_SAVE_REGS(CLBR_RDI)
22196+#endif
22197+
22198+#ifdef CONFIG_PAX_KERNEXEC
22199+ mov %cs,%rdi
22200+ cmp $__KERNEXEC_KERNEL_CS,%edi
22201+ jz 2f
22202+ GET_CR0_INTO_RDI
22203+ bts $16,%rdi
22204+ jnc 4f
22205+1:
22206+#endif
22207+
22208+#ifdef CONFIG_PAX_MEMORY_UDEREF
22209+ 661: jmp 111f
22210+ .pushsection .altinstr_replacement, "a"
22211+ 662: ASM_NOP2
22212+ .popsection
22213+ .pushsection .altinstructions, "a"
22214+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22215+ .popsection
22216+ mov %ss,%edi
22217+ cmp $__UDEREF_KERNEL_DS,%edi
22218+ jnz 111f
22219+ GET_CR3_INTO_RDI
22220+ cmp $0,%dil
22221+ jz 112f
22222+ ud2
22223+112: add $4097,%rdi
22224+ bts $63,%rdi
22225+ SET_RDI_INTO_CR3
22226+ mov $__KERNEL_DS,%edi
22227+ mov %edi,%ss
22228+111:
22229+#endif
22230+
22231+#ifdef CONFIG_PARAVIRT
22232+ PV_RESTORE_REGS(CLBR_RDI);
22233+#endif
22234+
22235+ popq %rdi
22236+ pax_force_retaddr
22237+ retq
22238+
22239+#ifdef CONFIG_PAX_KERNEXEC
22240+2: GET_CR0_INTO_RDI
22241+ btr $16,%rdi
22242+ jnc 4f
22243+ ljmpq __KERNEL_CS,3f
22244+3: SET_RDI_INTO_CR0
22245+ jmp 1b
22246+4: ud2
22247+ jmp 4b
22248+#endif
22249+ENDPROC(pax_exit_kernel)
22250+#endif
22251+
22252+ .macro pax_enter_kernel_user
22253+ pax_set_fptr_mask
22254+#ifdef CONFIG_PAX_MEMORY_UDEREF
22255+ call pax_enter_kernel_user
22256+#endif
22257+ .endm
22258+
22259+ .macro pax_exit_kernel_user
22260+#ifdef CONFIG_PAX_MEMORY_UDEREF
22261+ call pax_exit_kernel_user
22262+#endif
22263+#ifdef CONFIG_PAX_RANDKSTACK
22264+ pushq %rax
22265+ pushq %r11
22266+ call pax_randomize_kstack
22267+ popq %r11
22268+ popq %rax
22269+#endif
22270+ .endm
22271+
22272+#ifdef CONFIG_PAX_MEMORY_UDEREF
22273+ENTRY(pax_enter_kernel_user)
22274+ pushq %rdi
22275+ pushq %rbx
22276+
22277+#ifdef CONFIG_PARAVIRT
22278+ PV_SAVE_REGS(CLBR_RDI)
22279+#endif
22280+
22281+ 661: jmp 111f
22282+ .pushsection .altinstr_replacement, "a"
22283+ 662: ASM_NOP2
22284+ .popsection
22285+ .pushsection .altinstructions, "a"
22286+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22287+ .popsection
22288+ GET_CR3_INTO_RDI
22289+ cmp $1,%dil
22290+ jnz 4f
22291+ sub $4097,%rdi
22292+ bts $63,%rdi
22293+ SET_RDI_INTO_CR3
22294+ jmp 3f
22295+111:
22296+
22297+ GET_CR3_INTO_RDI
22298+ mov %rdi,%rbx
22299+ add $__START_KERNEL_map,%rbx
22300+ sub phys_base(%rip),%rbx
22301+
22302+#ifdef CONFIG_PARAVIRT
22303+ cmpl $0, pv_info+PARAVIRT_enabled
22304+ jz 1f
22305+ pushq %rdi
22306+ i = 0
22307+ .rept USER_PGD_PTRS
22308+ mov i*8(%rbx),%rsi
22309+ mov $0,%sil
22310+ lea i*8(%rbx),%rdi
22311+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
22312+ i = i + 1
22313+ .endr
22314+ popq %rdi
22315+ jmp 2f
22316+1:
22317+#endif
22318+
22319+ i = 0
22320+ .rept USER_PGD_PTRS
22321+ movb $0,i*8(%rbx)
22322+ i = i + 1
22323+ .endr
22324+
22325+2: SET_RDI_INTO_CR3
22326+
22327+#ifdef CONFIG_PAX_KERNEXEC
22328+ GET_CR0_INTO_RDI
22329+ bts $16,%rdi
22330+ SET_RDI_INTO_CR0
22331+#endif
22332+
22333+3:
22334+
22335+#ifdef CONFIG_PARAVIRT
22336+ PV_RESTORE_REGS(CLBR_RDI)
22337+#endif
22338+
22339+ popq %rbx
22340+ popq %rdi
22341+ pax_force_retaddr
22342+ retq
22343+4: ud2
22344+ENDPROC(pax_enter_kernel_user)
22345+
22346+ENTRY(pax_exit_kernel_user)
22347+ pushq %rdi
22348+ pushq %rbx
22349+
22350+#ifdef CONFIG_PARAVIRT
22351+ PV_SAVE_REGS(CLBR_RDI)
22352+#endif
22353+
22354+ GET_CR3_INTO_RDI
22355+ 661: jmp 1f
22356+ .pushsection .altinstr_replacement, "a"
22357+ 662: ASM_NOP2
22358+ .popsection
22359+ .pushsection .altinstructions, "a"
22360+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22361+ .popsection
22362+ cmp $0,%dil
22363+ jnz 3f
22364+ add $4097,%rdi
22365+ bts $63,%rdi
22366+ SET_RDI_INTO_CR3
22367+ jmp 2f
22368+1:
22369+
22370+ mov %rdi,%rbx
22371+
22372+#ifdef CONFIG_PAX_KERNEXEC
22373+ GET_CR0_INTO_RDI
22374+ btr $16,%rdi
22375+ jnc 3f
22376+ SET_RDI_INTO_CR0
22377+#endif
22378+
22379+ add $__START_KERNEL_map,%rbx
22380+ sub phys_base(%rip),%rbx
22381+
22382+#ifdef CONFIG_PARAVIRT
22383+ cmpl $0, pv_info+PARAVIRT_enabled
22384+ jz 1f
22385+ i = 0
22386+ .rept USER_PGD_PTRS
22387+ mov i*8(%rbx),%rsi
22388+ mov $0x67,%sil
22389+ lea i*8(%rbx),%rdi
22390+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
22391+ i = i + 1
22392+ .endr
22393+ jmp 2f
22394+1:
22395+#endif
22396+
22397+ i = 0
22398+ .rept USER_PGD_PTRS
22399+ movb $0x67,i*8(%rbx)
22400+ i = i + 1
22401+ .endr
22402+2:
22403+
22404+#ifdef CONFIG_PARAVIRT
22405+ PV_RESTORE_REGS(CLBR_RDI)
22406+#endif
22407+
22408+ popq %rbx
22409+ popq %rdi
22410+ pax_force_retaddr
22411+ retq
22412+3: ud2
22413+ENDPROC(pax_exit_kernel_user)
22414+#endif
22415+
22416+ .macro pax_enter_kernel_nmi
22417+ pax_set_fptr_mask
22418+
22419+#ifdef CONFIG_PAX_KERNEXEC
22420+ GET_CR0_INTO_RDI
22421+ bts $16,%rdi
22422+ jc 110f
22423+ SET_RDI_INTO_CR0
22424+ or $2,%ebx
22425+110:
22426+#endif
22427+
22428+#ifdef CONFIG_PAX_MEMORY_UDEREF
22429+ 661: jmp 111f
22430+ .pushsection .altinstr_replacement, "a"
22431+ 662: ASM_NOP2
22432+ .popsection
22433+ .pushsection .altinstructions, "a"
22434+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22435+ .popsection
22436+ GET_CR3_INTO_RDI
22437+ cmp $0,%dil
22438+ jz 111f
22439+ sub $4097,%rdi
22440+ or $4,%ebx
22441+ bts $63,%rdi
22442+ SET_RDI_INTO_CR3
22443+ mov $__UDEREF_KERNEL_DS,%edi
22444+ mov %edi,%ss
22445+111:
22446+#endif
22447+ .endm
22448+
22449+ .macro pax_exit_kernel_nmi
22450+#ifdef CONFIG_PAX_KERNEXEC
22451+ btr $1,%ebx
22452+ jnc 110f
22453+ GET_CR0_INTO_RDI
22454+ btr $16,%rdi
22455+ SET_RDI_INTO_CR0
22456+110:
22457+#endif
22458+
22459+#ifdef CONFIG_PAX_MEMORY_UDEREF
22460+ btr $2,%ebx
22461+ jnc 111f
22462+ GET_CR3_INTO_RDI
22463+ add $4097,%rdi
22464+ bts $63,%rdi
22465+ SET_RDI_INTO_CR3
22466+ mov $__KERNEL_DS,%edi
22467+ mov %edi,%ss
22468+111:
22469+#endif
22470+ .endm
22471+
22472+ .macro pax_erase_kstack
22473+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22474+ call pax_erase_kstack
22475+#endif
22476+ .endm
22477+
22478+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22479+ENTRY(pax_erase_kstack)
22480+ pushq %rdi
22481+ pushq %rcx
22482+ pushq %rax
22483+ pushq %r11
22484+
22485+ GET_THREAD_INFO(%r11)
22486+ mov TI_lowest_stack(%r11), %rdi
22487+ mov $-0xBEEF, %rax
22488+ std
22489+
22490+1: mov %edi, %ecx
22491+ and $THREAD_SIZE_asm - 1, %ecx
22492+ shr $3, %ecx
22493+ repne scasq
22494+ jecxz 2f
22495+
22496+ cmp $2*8, %ecx
22497+ jc 2f
22498+
22499+ mov $2*8, %ecx
22500+ repe scasq
22501+ jecxz 2f
22502+ jne 1b
22503+
22504+2: cld
22505+ mov %esp, %ecx
22506+ sub %edi, %ecx
22507+
22508+ cmp $THREAD_SIZE_asm, %rcx
22509+ jb 3f
22510+ ud2
22511+3:
22512+
22513+ shr $3, %ecx
22514+ rep stosq
22515+
22516+ mov TI_task_thread_sp0(%r11), %rdi
22517+ sub $256, %rdi
22518+ mov %rdi, TI_lowest_stack(%r11)
22519+
22520+ popq %r11
22521+ popq %rax
22522+ popq %rcx
22523+ popq %rdi
22524+ pax_force_retaddr
22525+ ret
22526+ENDPROC(pax_erase_kstack)
22527+#endif
22528
22529 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
22530 #ifdef CONFIG_TRACE_IRQFLAGS
22531@@ -320,7 +753,7 @@ ENDPROC(native_usergs_sysret64)
22532 .endm
22533
22534 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
22535- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
22536+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
22537 jnc 1f
22538 TRACE_IRQS_ON_DEBUG
22539 1:
22540@@ -358,27 +791,6 @@ ENDPROC(native_usergs_sysret64)
22541 movq \tmp,R11+\offset(%rsp)
22542 .endm
22543
22544- .macro FAKE_STACK_FRAME child_rip
22545- /* push in order ss, rsp, eflags, cs, rip */
22546- xorl %eax, %eax
22547- pushq_cfi $__KERNEL_DS /* ss */
22548- /*CFI_REL_OFFSET ss,0*/
22549- pushq_cfi %rax /* rsp */
22550- CFI_REL_OFFSET rsp,0
22551- pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
22552- /*CFI_REL_OFFSET rflags,0*/
22553- pushq_cfi $__KERNEL_CS /* cs */
22554- /*CFI_REL_OFFSET cs,0*/
22555- pushq_cfi \child_rip /* rip */
22556- CFI_REL_OFFSET rip,0
22557- pushq_cfi %rax /* orig rax */
22558- .endm
22559-
22560- .macro UNFAKE_STACK_FRAME
22561- addq $8*6, %rsp
22562- CFI_ADJUST_CFA_OFFSET -(6*8)
22563- .endm
22564-
22565 /*
22566 * initial frame state for interrupts (and exceptions without error code)
22567 */
22568@@ -445,25 +857,26 @@ ENDPROC(native_usergs_sysret64)
22569 /* save partial stack frame */
22570 .macro SAVE_ARGS_IRQ
22571 cld
22572- /* start from rbp in pt_regs and jump over */
22573- movq_cfi rdi, (RDI-RBP)
22574- movq_cfi rsi, (RSI-RBP)
22575- movq_cfi rdx, (RDX-RBP)
22576- movq_cfi rcx, (RCX-RBP)
22577- movq_cfi rax, (RAX-RBP)
22578- movq_cfi r8, (R8-RBP)
22579- movq_cfi r9, (R9-RBP)
22580- movq_cfi r10, (R10-RBP)
22581- movq_cfi r11, (R11-RBP)
22582+ /* start from r15 in pt_regs and jump over */
22583+ movq_cfi rdi, RDI
22584+ movq_cfi rsi, RSI
22585+ movq_cfi rdx, RDX
22586+ movq_cfi rcx, RCX
22587+ movq_cfi rax, RAX
22588+ movq_cfi r8, R8
22589+ movq_cfi r9, R9
22590+ movq_cfi r10, R10
22591+ movq_cfi r11, R11
22592+ movq_cfi r12, R12
22593
22594 /* Save rbp so that we can unwind from get_irq_regs() */
22595- movq_cfi rbp, 0
22596+ movq_cfi rbp, RBP
22597
22598 /* Save previous stack value */
22599 movq %rsp, %rsi
22600
22601- leaq -RBP(%rsp),%rdi /* arg1 for handler */
22602- testl $3, CS-RBP(%rsi)
22603+ movq %rsp,%rdi /* arg1 for handler */
22604+ testb $3, CS(%rsi)
22605 je 1f
22606 SWAPGS
22607 /*
22608@@ -514,9 +927,10 @@ ENTRY(save_paranoid)
22609 js 1f /* negative -> in kernel */
22610 SWAPGS
22611 xorl %ebx,%ebx
22612-1: ret
22613+1: pax_force_retaddr_bts
22614+ ret
22615 CFI_ENDPROC
22616-END(save_paranoid)
22617+ENDPROC(save_paranoid)
22618 .popsection
22619
22620 /*
22621@@ -538,7 +952,7 @@ ENTRY(ret_from_fork)
22622
22623 RESTORE_REST
22624
22625- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
22626+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
22627 jz 1f
22628
22629 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
22630@@ -548,15 +962,13 @@ ENTRY(ret_from_fork)
22631 jmp ret_from_sys_call # go to the SYSRET fastpath
22632
22633 1:
22634- subq $REST_SKIP, %rsp # leave space for volatiles
22635- CFI_ADJUST_CFA_OFFSET REST_SKIP
22636 movq %rbp, %rdi
22637 call *%rbx
22638 movl $0, RAX(%rsp)
22639 RESTORE_REST
22640 jmp int_ret_from_sys_call
22641 CFI_ENDPROC
22642-END(ret_from_fork)
22643+ENDPROC(ret_from_fork)
22644
22645 /*
22646 * System call entry. Up to 6 arguments in registers are supported.
22647@@ -593,7 +1005,7 @@ END(ret_from_fork)
22648 ENTRY(system_call)
22649 CFI_STARTPROC simple
22650 CFI_SIGNAL_FRAME
22651- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
22652+ CFI_DEF_CFA rsp,0
22653 CFI_REGISTER rip,rcx
22654 /*CFI_REGISTER rflags,r11*/
22655 SWAPGS_UNSAFE_STACK
22656@@ -606,16 +1018,23 @@ GLOBAL(system_call_after_swapgs)
22657
22658 movq %rsp,PER_CPU_VAR(old_rsp)
22659 movq PER_CPU_VAR(kernel_stack),%rsp
22660+ SAVE_ARGS 8*6,0
22661+ pax_enter_kernel_user
22662+
22663+#ifdef CONFIG_PAX_RANDKSTACK
22664+ pax_erase_kstack
22665+#endif
22666+
22667 /*
22668 * No need to follow this irqs off/on section - it's straight
22669 * and short:
22670 */
22671 ENABLE_INTERRUPTS(CLBR_NONE)
22672- SAVE_ARGS 8,0
22673 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
22674 movq %rcx,RIP-ARGOFFSET(%rsp)
22675 CFI_REL_OFFSET rip,RIP-ARGOFFSET
22676- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
22677+ GET_THREAD_INFO(%rcx)
22678+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
22679 jnz tracesys
22680 system_call_fastpath:
22681 #if __SYSCALL_MASK == ~0
22682@@ -639,10 +1058,13 @@ sysret_check:
22683 LOCKDEP_SYS_EXIT
22684 DISABLE_INTERRUPTS(CLBR_NONE)
22685 TRACE_IRQS_OFF
22686- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
22687+ GET_THREAD_INFO(%rcx)
22688+ movl TI_flags(%rcx),%edx
22689 andl %edi,%edx
22690 jnz sysret_careful
22691 CFI_REMEMBER_STATE
22692+ pax_exit_kernel_user
22693+ pax_erase_kstack
22694 /*
22695 * sysretq will re-enable interrupts:
22696 */
22697@@ -701,6 +1123,9 @@ auditsys:
22698 movq %rax,%rsi /* 2nd arg: syscall number */
22699 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
22700 call __audit_syscall_entry
22701+
22702+ pax_erase_kstack
22703+
22704 LOAD_ARGS 0 /* reload call-clobbered registers */
22705 jmp system_call_fastpath
22706
22707@@ -722,7 +1147,7 @@ sysret_audit:
22708 /* Do syscall tracing */
22709 tracesys:
22710 #ifdef CONFIG_AUDITSYSCALL
22711- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
22712+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
22713 jz auditsys
22714 #endif
22715 SAVE_REST
22716@@ -730,12 +1155,15 @@ tracesys:
22717 FIXUP_TOP_OF_STACK %rdi
22718 movq %rsp,%rdi
22719 call syscall_trace_enter
22720+
22721+ pax_erase_kstack
22722+
22723 /*
22724 * Reload arg registers from stack in case ptrace changed them.
22725 * We don't reload %rax because syscall_trace_enter() returned
22726 * the value it wants us to use in the table lookup.
22727 */
22728- LOAD_ARGS ARGOFFSET, 1
22729+ LOAD_ARGS 1
22730 RESTORE_REST
22731 #if __SYSCALL_MASK == ~0
22732 cmpq $__NR_syscall_max,%rax
22733@@ -765,7 +1193,9 @@ GLOBAL(int_with_check)
22734 andl %edi,%edx
22735 jnz int_careful
22736 andl $~TS_COMPAT,TI_status(%rcx)
22737- jmp retint_swapgs
22738+ pax_exit_kernel_user
22739+ pax_erase_kstack
22740+ jmp retint_swapgs_pax
22741
22742 /* Either reschedule or signal or syscall exit tracking needed. */
22743 /* First do a reschedule test. */
22744@@ -811,7 +1241,7 @@ int_restore_rest:
22745 TRACE_IRQS_OFF
22746 jmp int_with_check
22747 CFI_ENDPROC
22748-END(system_call)
22749+ENDPROC(system_call)
22750
22751 .macro FORK_LIKE func
22752 ENTRY(stub_\func)
22753@@ -824,9 +1254,10 @@ ENTRY(stub_\func)
22754 DEFAULT_FRAME 0 8 /* offset 8: return address */
22755 call sys_\func
22756 RESTORE_TOP_OF_STACK %r11, 8
22757- ret $REST_SKIP /* pop extended registers */
22758+ pax_force_retaddr
22759+ ret
22760 CFI_ENDPROC
22761-END(stub_\func)
22762+ENDPROC(stub_\func)
22763 .endm
22764
22765 .macro FIXED_FRAME label,func
22766@@ -836,9 +1267,10 @@ ENTRY(\label)
22767 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
22768 call \func
22769 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
22770+ pax_force_retaddr
22771 ret
22772 CFI_ENDPROC
22773-END(\label)
22774+ENDPROC(\label)
22775 .endm
22776
22777 FORK_LIKE clone
22778@@ -846,19 +1278,6 @@ END(\label)
22779 FORK_LIKE vfork
22780 FIXED_FRAME stub_iopl, sys_iopl
22781
22782-ENTRY(ptregscall_common)
22783- DEFAULT_FRAME 1 8 /* offset 8: return address */
22784- RESTORE_TOP_OF_STACK %r11, 8
22785- movq_cfi_restore R15+8, r15
22786- movq_cfi_restore R14+8, r14
22787- movq_cfi_restore R13+8, r13
22788- movq_cfi_restore R12+8, r12
22789- movq_cfi_restore RBP+8, rbp
22790- movq_cfi_restore RBX+8, rbx
22791- ret $REST_SKIP /* pop extended registers */
22792- CFI_ENDPROC
22793-END(ptregscall_common)
22794-
22795 ENTRY(stub_execve)
22796 CFI_STARTPROC
22797 addq $8, %rsp
22798@@ -870,7 +1289,7 @@ ENTRY(stub_execve)
22799 RESTORE_REST
22800 jmp int_ret_from_sys_call
22801 CFI_ENDPROC
22802-END(stub_execve)
22803+ENDPROC(stub_execve)
22804
22805 /*
22806 * sigreturn is special because it needs to restore all registers on return.
22807@@ -887,7 +1306,7 @@ ENTRY(stub_rt_sigreturn)
22808 RESTORE_REST
22809 jmp int_ret_from_sys_call
22810 CFI_ENDPROC
22811-END(stub_rt_sigreturn)
22812+ENDPROC(stub_rt_sigreturn)
22813
22814 #ifdef CONFIG_X86_X32_ABI
22815 ENTRY(stub_x32_rt_sigreturn)
22816@@ -901,7 +1320,7 @@ ENTRY(stub_x32_rt_sigreturn)
22817 RESTORE_REST
22818 jmp int_ret_from_sys_call
22819 CFI_ENDPROC
22820-END(stub_x32_rt_sigreturn)
22821+ENDPROC(stub_x32_rt_sigreturn)
22822
22823 ENTRY(stub_x32_execve)
22824 CFI_STARTPROC
22825@@ -915,7 +1334,7 @@ ENTRY(stub_x32_execve)
22826 RESTORE_REST
22827 jmp int_ret_from_sys_call
22828 CFI_ENDPROC
22829-END(stub_x32_execve)
22830+ENDPROC(stub_x32_execve)
22831
22832 #endif
22833
22834@@ -952,7 +1371,7 @@ vector=vector+1
22835 2: jmp common_interrupt
22836 .endr
22837 CFI_ENDPROC
22838-END(irq_entries_start)
22839+ENDPROC(irq_entries_start)
22840
22841 .previous
22842 END(interrupt)
22843@@ -969,9 +1388,19 @@ END(interrupt)
22844 /* 0(%rsp): ~(interrupt number) */
22845 .macro interrupt func
22846 /* reserve pt_regs for scratch regs and rbp */
22847- subq $ORIG_RAX-RBP, %rsp
22848- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
22849+ subq $ORIG_RAX, %rsp
22850+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
22851 SAVE_ARGS_IRQ
22852+#ifdef CONFIG_PAX_MEMORY_UDEREF
22853+ testb $3, CS(%rdi)
22854+ jnz 1f
22855+ pax_enter_kernel
22856+ jmp 2f
22857+1: pax_enter_kernel_user
22858+2:
22859+#else
22860+ pax_enter_kernel
22861+#endif
22862 call \func
22863 .endm
22864
22865@@ -997,14 +1426,14 @@ ret_from_intr:
22866
22867 /* Restore saved previous stack */
22868 popq %rsi
22869- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
22870- leaq ARGOFFSET-RBP(%rsi), %rsp
22871+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
22872+ movq %rsi, %rsp
22873 CFI_DEF_CFA_REGISTER rsp
22874- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
22875+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
22876
22877 exit_intr:
22878 GET_THREAD_INFO(%rcx)
22879- testl $3,CS-ARGOFFSET(%rsp)
22880+ testb $3,CS-ARGOFFSET(%rsp)
22881 je retint_kernel
22882
22883 /* Interrupt came from user space */
22884@@ -1026,12 +1455,16 @@ retint_swapgs: /* return to user-space */
22885 * The iretq could re-enable interrupts:
22886 */
22887 DISABLE_INTERRUPTS(CLBR_ANY)
22888+ pax_exit_kernel_user
22889+retint_swapgs_pax:
22890 TRACE_IRQS_IRETQ
22891 SWAPGS
22892 jmp restore_args
22893
22894 retint_restore_args: /* return to kernel space */
22895 DISABLE_INTERRUPTS(CLBR_ANY)
22896+ pax_exit_kernel
22897+ pax_force_retaddr (RIP-ARGOFFSET)
22898 /*
22899 * The iretq could re-enable interrupts:
22900 */
22901@@ -1114,7 +1547,7 @@ ENTRY(retint_kernel)
22902 #endif
22903
22904 CFI_ENDPROC
22905-END(common_interrupt)
22906+ENDPROC(common_interrupt)
22907 /*
22908 * End of kprobes section
22909 */
22910@@ -1132,7 +1565,7 @@ ENTRY(\sym)
22911 interrupt \do_sym
22912 jmp ret_from_intr
22913 CFI_ENDPROC
22914-END(\sym)
22915+ENDPROC(\sym)
22916 .endm
22917
22918 #ifdef CONFIG_TRACING
22919@@ -1215,12 +1648,22 @@ ENTRY(\sym)
22920 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
22921 call error_entry
22922 DEFAULT_FRAME 0
22923+#ifdef CONFIG_PAX_MEMORY_UDEREF
22924+ testb $3, CS(%rsp)
22925+ jnz 1f
22926+ pax_enter_kernel
22927+ jmp 2f
22928+1: pax_enter_kernel_user
22929+2:
22930+#else
22931+ pax_enter_kernel
22932+#endif
22933 movq %rsp,%rdi /* pt_regs pointer */
22934 xorl %esi,%esi /* no error code */
22935 call \do_sym
22936 jmp error_exit /* %ebx: no swapgs flag */
22937 CFI_ENDPROC
22938-END(\sym)
22939+ENDPROC(\sym)
22940 .endm
22941
22942 .macro paranoidzeroentry sym do_sym
22943@@ -1233,15 +1676,25 @@ ENTRY(\sym)
22944 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
22945 call save_paranoid
22946 TRACE_IRQS_OFF
22947+#ifdef CONFIG_PAX_MEMORY_UDEREF
22948+ testb $3, CS(%rsp)
22949+ jnz 1f
22950+ pax_enter_kernel
22951+ jmp 2f
22952+1: pax_enter_kernel_user
22953+2:
22954+#else
22955+ pax_enter_kernel
22956+#endif
22957 movq %rsp,%rdi /* pt_regs pointer */
22958 xorl %esi,%esi /* no error code */
22959 call \do_sym
22960 jmp paranoid_exit /* %ebx: no swapgs flag */
22961 CFI_ENDPROC
22962-END(\sym)
22963+ENDPROC(\sym)
22964 .endm
22965
22966-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
22967+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
22968 .macro paranoidzeroentry_ist sym do_sym ist
22969 ENTRY(\sym)
22970 INTR_FRAME
22971@@ -1252,14 +1705,30 @@ ENTRY(\sym)
22972 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
22973 call save_paranoid
22974 TRACE_IRQS_OFF_DEBUG
22975+#ifdef CONFIG_PAX_MEMORY_UDEREF
22976+ testb $3, CS(%rsp)
22977+ jnz 1f
22978+ pax_enter_kernel
22979+ jmp 2f
22980+1: pax_enter_kernel_user
22981+2:
22982+#else
22983+ pax_enter_kernel
22984+#endif
22985 movq %rsp,%rdi /* pt_regs pointer */
22986 xorl %esi,%esi /* no error code */
22987+#ifdef CONFIG_SMP
22988+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
22989+ lea init_tss(%r13), %r13
22990+#else
22991+ lea init_tss(%rip), %r13
22992+#endif
22993 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
22994 call \do_sym
22995 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
22996 jmp paranoid_exit /* %ebx: no swapgs flag */
22997 CFI_ENDPROC
22998-END(\sym)
22999+ENDPROC(\sym)
23000 .endm
23001
23002 .macro errorentry sym do_sym
23003@@ -1271,13 +1740,23 @@ ENTRY(\sym)
23004 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
23005 call error_entry
23006 DEFAULT_FRAME 0
23007+#ifdef CONFIG_PAX_MEMORY_UDEREF
23008+ testb $3, CS(%rsp)
23009+ jnz 1f
23010+ pax_enter_kernel
23011+ jmp 2f
23012+1: pax_enter_kernel_user
23013+2:
23014+#else
23015+ pax_enter_kernel
23016+#endif
23017 movq %rsp,%rdi /* pt_regs pointer */
23018 movq ORIG_RAX(%rsp),%rsi /* get error code */
23019 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
23020 call \do_sym
23021 jmp error_exit /* %ebx: no swapgs flag */
23022 CFI_ENDPROC
23023-END(\sym)
23024+ENDPROC(\sym)
23025 .endm
23026
23027 /* error code is on the stack already */
23028@@ -1291,13 +1770,23 @@ ENTRY(\sym)
23029 call save_paranoid
23030 DEFAULT_FRAME 0
23031 TRACE_IRQS_OFF
23032+#ifdef CONFIG_PAX_MEMORY_UDEREF
23033+ testb $3, CS(%rsp)
23034+ jnz 1f
23035+ pax_enter_kernel
23036+ jmp 2f
23037+1: pax_enter_kernel_user
23038+2:
23039+#else
23040+ pax_enter_kernel
23041+#endif
23042 movq %rsp,%rdi /* pt_regs pointer */
23043 movq ORIG_RAX(%rsp),%rsi /* get error code */
23044 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
23045 call \do_sym
23046 jmp paranoid_exit /* %ebx: no swapgs flag */
23047 CFI_ENDPROC
23048-END(\sym)
23049+ENDPROC(\sym)
23050 .endm
23051
23052 zeroentry divide_error do_divide_error
23053@@ -1327,9 +1816,10 @@ gs_change:
23054 2: mfence /* workaround */
23055 SWAPGS
23056 popfq_cfi
23057+ pax_force_retaddr
23058 ret
23059 CFI_ENDPROC
23060-END(native_load_gs_index)
23061+ENDPROC(native_load_gs_index)
23062
23063 _ASM_EXTABLE(gs_change,bad_gs)
23064 .section .fixup,"ax"
23065@@ -1357,9 +1847,10 @@ ENTRY(call_softirq)
23066 CFI_DEF_CFA_REGISTER rsp
23067 CFI_ADJUST_CFA_OFFSET -8
23068 decl PER_CPU_VAR(irq_count)
23069+ pax_force_retaddr
23070 ret
23071 CFI_ENDPROC
23072-END(call_softirq)
23073+ENDPROC(call_softirq)
23074
23075 #ifdef CONFIG_XEN
23076 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
23077@@ -1397,7 +1888,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23078 decl PER_CPU_VAR(irq_count)
23079 jmp error_exit
23080 CFI_ENDPROC
23081-END(xen_do_hypervisor_callback)
23082+ENDPROC(xen_do_hypervisor_callback)
23083
23084 /*
23085 * Hypervisor uses this for application faults while it executes.
23086@@ -1456,7 +1947,7 @@ ENTRY(xen_failsafe_callback)
23087 SAVE_ALL
23088 jmp error_exit
23089 CFI_ENDPROC
23090-END(xen_failsafe_callback)
23091+ENDPROC(xen_failsafe_callback)
23092
23093 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23094 xen_hvm_callback_vector xen_evtchn_do_upcall
23095@@ -1508,18 +1999,33 @@ ENTRY(paranoid_exit)
23096 DEFAULT_FRAME
23097 DISABLE_INTERRUPTS(CLBR_NONE)
23098 TRACE_IRQS_OFF_DEBUG
23099- testl %ebx,%ebx /* swapgs needed? */
23100+ testl $1,%ebx /* swapgs needed? */
23101 jnz paranoid_restore
23102- testl $3,CS(%rsp)
23103+ testb $3,CS(%rsp)
23104 jnz paranoid_userspace
23105+#ifdef CONFIG_PAX_MEMORY_UDEREF
23106+ pax_exit_kernel
23107+ TRACE_IRQS_IRETQ 0
23108+ SWAPGS_UNSAFE_STACK
23109+ RESTORE_ALL 8
23110+ pax_force_retaddr_bts
23111+ jmp irq_return
23112+#endif
23113 paranoid_swapgs:
23114+#ifdef CONFIG_PAX_MEMORY_UDEREF
23115+ pax_exit_kernel_user
23116+#else
23117+ pax_exit_kernel
23118+#endif
23119 TRACE_IRQS_IRETQ 0
23120 SWAPGS_UNSAFE_STACK
23121 RESTORE_ALL 8
23122 jmp irq_return
23123 paranoid_restore:
23124+ pax_exit_kernel
23125 TRACE_IRQS_IRETQ_DEBUG 0
23126 RESTORE_ALL 8
23127+ pax_force_retaddr_bts
23128 jmp irq_return
23129 paranoid_userspace:
23130 GET_THREAD_INFO(%rcx)
23131@@ -1548,7 +2054,7 @@ paranoid_schedule:
23132 TRACE_IRQS_OFF
23133 jmp paranoid_userspace
23134 CFI_ENDPROC
23135-END(paranoid_exit)
23136+ENDPROC(paranoid_exit)
23137
23138 /*
23139 * Exception entry point. This expects an error code/orig_rax on the stack.
23140@@ -1575,12 +2081,13 @@ ENTRY(error_entry)
23141 movq_cfi r14, R14+8
23142 movq_cfi r15, R15+8
23143 xorl %ebx,%ebx
23144- testl $3,CS+8(%rsp)
23145+ testb $3,CS+8(%rsp)
23146 je error_kernelspace
23147 error_swapgs:
23148 SWAPGS
23149 error_sti:
23150 TRACE_IRQS_OFF
23151+ pax_force_retaddr_bts
23152 ret
23153
23154 /*
23155@@ -1607,7 +2114,7 @@ bstep_iret:
23156 movq %rcx,RIP+8(%rsp)
23157 jmp error_swapgs
23158 CFI_ENDPROC
23159-END(error_entry)
23160+ENDPROC(error_entry)
23161
23162
23163 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
23164@@ -1618,7 +2125,7 @@ ENTRY(error_exit)
23165 DISABLE_INTERRUPTS(CLBR_NONE)
23166 TRACE_IRQS_OFF
23167 GET_THREAD_INFO(%rcx)
23168- testl %eax,%eax
23169+ testl $1,%eax
23170 jne retint_kernel
23171 LOCKDEP_SYS_EXIT_IRQ
23172 movl TI_flags(%rcx),%edx
23173@@ -1627,7 +2134,7 @@ ENTRY(error_exit)
23174 jnz retint_careful
23175 jmp retint_swapgs
23176 CFI_ENDPROC
23177-END(error_exit)
23178+ENDPROC(error_exit)
23179
23180 /*
23181 * Test if a given stack is an NMI stack or not.
23182@@ -1685,9 +2192,11 @@ ENTRY(nmi)
23183 * If %cs was not the kernel segment, then the NMI triggered in user
23184 * space, which means it is definitely not nested.
23185 */
23186+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
23187+ je 1f
23188 cmpl $__KERNEL_CS, 16(%rsp)
23189 jne first_nmi
23190-
23191+1:
23192 /*
23193 * Check the special variable on the stack to see if NMIs are
23194 * executing.
23195@@ -1721,8 +2230,7 @@ nested_nmi:
23196
23197 1:
23198 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
23199- leaq -1*8(%rsp), %rdx
23200- movq %rdx, %rsp
23201+ subq $8, %rsp
23202 CFI_ADJUST_CFA_OFFSET 1*8
23203 leaq -10*8(%rsp), %rdx
23204 pushq_cfi $__KERNEL_DS
23205@@ -1740,6 +2248,7 @@ nested_nmi_out:
23206 CFI_RESTORE rdx
23207
23208 /* No need to check faults here */
23209+# pax_force_retaddr_bts
23210 INTERRUPT_RETURN
23211
23212 CFI_RESTORE_STATE
23213@@ -1852,9 +2361,11 @@ end_repeat_nmi:
23214 * NMI itself takes a page fault, the page fault that was preempted
23215 * will read the information from the NMI page fault and not the
23216 * origin fault. Save it off and restore it if it changes.
23217- * Use the r12 callee-saved register.
23218+ * Use the r13 callee-saved register.
23219 */
23220- movq %cr2, %r12
23221+ movq %cr2, %r13
23222+
23223+ pax_enter_kernel_nmi
23224
23225 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
23226 movq %rsp,%rdi
23227@@ -1863,31 +2374,36 @@ end_repeat_nmi:
23228
23229 /* Did the NMI take a page fault? Restore cr2 if it did */
23230 movq %cr2, %rcx
23231- cmpq %rcx, %r12
23232+ cmpq %rcx, %r13
23233 je 1f
23234- movq %r12, %cr2
23235+ movq %r13, %cr2
23236 1:
23237
23238- testl %ebx,%ebx /* swapgs needed? */
23239+ testl $1,%ebx /* swapgs needed? */
23240 jnz nmi_restore
23241 nmi_swapgs:
23242 SWAPGS_UNSAFE_STACK
23243 nmi_restore:
23244+ pax_exit_kernel_nmi
23245 /* Pop the extra iret frame at once */
23246 RESTORE_ALL 6*8
23247+ testb $3, 8(%rsp)
23248+ jnz 1f
23249+ pax_force_retaddr_bts
23250+1:
23251
23252 /* Clear the NMI executing stack variable */
23253 movq $0, 5*8(%rsp)
23254 jmp irq_return
23255 CFI_ENDPROC
23256-END(nmi)
23257+ENDPROC(nmi)
23258
23259 ENTRY(ignore_sysret)
23260 CFI_STARTPROC
23261 mov $-ENOSYS,%eax
23262 sysret
23263 CFI_ENDPROC
23264-END(ignore_sysret)
23265+ENDPROC(ignore_sysret)
23266
23267 /*
23268 * End of kprobes section
23269diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
23270index d4bdd25..912664c 100644
23271--- a/arch/x86/kernel/ftrace.c
23272+++ b/arch/x86/kernel/ftrace.c
23273@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
23274 {
23275 unsigned char replaced[MCOUNT_INSN_SIZE];
23276
23277+ ip = ktla_ktva(ip);
23278+
23279 /*
23280 * Note: Due to modules and __init, code can
23281 * disappear and change, we need to protect against faulting
23282@@ -227,7 +229,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
23283 unsigned char old[MCOUNT_INSN_SIZE], *new;
23284 int ret;
23285
23286- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
23287+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
23288 new = ftrace_call_replace(ip, (unsigned long)func);
23289
23290 /* See comment above by declaration of modifying_ftrace_code */
23291@@ -238,7 +240,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
23292 /* Also update the regs callback function */
23293 if (!ret) {
23294 ip = (unsigned long)(&ftrace_regs_call);
23295- memcpy(old, &ftrace_regs_call, MCOUNT_INSN_SIZE);
23296+ memcpy(old, ktla_ktva((void *)&ftrace_regs_call), MCOUNT_INSN_SIZE);
23297 new = ftrace_call_replace(ip, (unsigned long)func);
23298 ret = ftrace_modify_code(ip, old, new);
23299 }
23300@@ -291,7 +293,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size)
23301 * kernel identity mapping to modify code.
23302 */
23303 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
23304- ip = (unsigned long)__va(__pa_symbol(ip));
23305+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
23306
23307 return probe_kernel_write((void *)ip, val, size);
23308 }
23309@@ -301,7 +303,7 @@ static int add_break(unsigned long ip, const char *old)
23310 unsigned char replaced[MCOUNT_INSN_SIZE];
23311 unsigned char brk = BREAKPOINT_INSTRUCTION;
23312
23313- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
23314+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
23315 return -EFAULT;
23316
23317 /* Make sure it is what we expect it to be */
23318@@ -649,7 +651,7 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
23319 return ret;
23320
23321 fail_update:
23322- probe_kernel_write((void *)ip, &old_code[0], 1);
23323+ probe_kernel_write((void *)ktla_ktva(ip), &old_code[0], 1);
23324 goto out;
23325 }
23326
23327@@ -682,6 +684,8 @@ static int ftrace_mod_jmp(unsigned long ip,
23328 {
23329 unsigned char code[MCOUNT_INSN_SIZE];
23330
23331+ ip = ktla_ktva(ip);
23332+
23333 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
23334 return -EFAULT;
23335
23336diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
23337index 1be8e43..d9b9ef6 100644
23338--- a/arch/x86/kernel/head64.c
23339+++ b/arch/x86/kernel/head64.c
23340@@ -67,12 +67,12 @@ again:
23341 pgd = *pgd_p;
23342
23343 /*
23344- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
23345- * critical -- __PAGE_OFFSET would point us back into the dynamic
23346+ * The use of __early_va rather than __va here is critical:
23347+ * __va would point us back into the dynamic
23348 * range and we might end up looping forever...
23349 */
23350 if (pgd)
23351- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
23352+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
23353 else {
23354 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
23355 reset_early_page_tables();
23356@@ -82,13 +82,13 @@ again:
23357 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
23358 for (i = 0; i < PTRS_PER_PUD; i++)
23359 pud_p[i] = 0;
23360- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
23361+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
23362 }
23363 pud_p += pud_index(address);
23364 pud = *pud_p;
23365
23366 if (pud)
23367- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
23368+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
23369 else {
23370 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
23371 reset_early_page_tables();
23372@@ -98,7 +98,7 @@ again:
23373 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
23374 for (i = 0; i < PTRS_PER_PMD; i++)
23375 pmd_p[i] = 0;
23376- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
23377+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
23378 }
23379 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
23380 pmd_p[pmd_index(address)] = pmd;
23381@@ -175,7 +175,6 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data)
23382 if (console_loglevel == 10)
23383 early_printk("Kernel alive\n");
23384
23385- clear_page(init_level4_pgt);
23386 /* set init_level4_pgt kernel high mapping*/
23387 init_level4_pgt[511] = early_level4_pgt[511];
23388
23389diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
23390index 81ba276..30c5411 100644
23391--- a/arch/x86/kernel/head_32.S
23392+++ b/arch/x86/kernel/head_32.S
23393@@ -26,6 +26,12 @@
23394 /* Physical address */
23395 #define pa(X) ((X) - __PAGE_OFFSET)
23396
23397+#ifdef CONFIG_PAX_KERNEXEC
23398+#define ta(X) (X)
23399+#else
23400+#define ta(X) ((X) - __PAGE_OFFSET)
23401+#endif
23402+
23403 /*
23404 * References to members of the new_cpu_data structure.
23405 */
23406@@ -55,11 +61,7 @@
23407 * and small than max_low_pfn, otherwise will waste some page table entries
23408 */
23409
23410-#if PTRS_PER_PMD > 1
23411-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
23412-#else
23413-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
23414-#endif
23415+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
23416
23417 /* Number of possible pages in the lowmem region */
23418 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
23419@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
23420 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
23421
23422 /*
23423+ * Real beginning of normal "text" segment
23424+ */
23425+ENTRY(stext)
23426+ENTRY(_stext)
23427+
23428+/*
23429 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
23430 * %esi points to the real-mode code as a 32-bit pointer.
23431 * CS and DS must be 4 GB flat segments, but we don't depend on
23432@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
23433 * can.
23434 */
23435 __HEAD
23436+
23437+#ifdef CONFIG_PAX_KERNEXEC
23438+ jmp startup_32
23439+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
23440+.fill PAGE_SIZE-5,1,0xcc
23441+#endif
23442+
23443 ENTRY(startup_32)
23444 movl pa(stack_start),%ecx
23445
23446@@ -106,6 +121,59 @@ ENTRY(startup_32)
23447 2:
23448 leal -__PAGE_OFFSET(%ecx),%esp
23449
23450+#ifdef CONFIG_SMP
23451+ movl $pa(cpu_gdt_table),%edi
23452+ movl $__per_cpu_load,%eax
23453+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
23454+ rorl $16,%eax
23455+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
23456+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
23457+ movl $__per_cpu_end - 1,%eax
23458+ subl $__per_cpu_start,%eax
23459+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
23460+#endif
23461+
23462+#ifdef CONFIG_PAX_MEMORY_UDEREF
23463+ movl $NR_CPUS,%ecx
23464+ movl $pa(cpu_gdt_table),%edi
23465+1:
23466+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
23467+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
23468+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
23469+ addl $PAGE_SIZE_asm,%edi
23470+ loop 1b
23471+#endif
23472+
23473+#ifdef CONFIG_PAX_KERNEXEC
23474+ movl $pa(boot_gdt),%edi
23475+ movl $__LOAD_PHYSICAL_ADDR,%eax
23476+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
23477+ rorl $16,%eax
23478+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
23479+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
23480+ rorl $16,%eax
23481+
23482+ ljmp $(__BOOT_CS),$1f
23483+1:
23484+
23485+ movl $NR_CPUS,%ecx
23486+ movl $pa(cpu_gdt_table),%edi
23487+ addl $__PAGE_OFFSET,%eax
23488+1:
23489+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
23490+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
23491+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
23492+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
23493+ rorl $16,%eax
23494+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
23495+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
23496+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
23497+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
23498+ rorl $16,%eax
23499+ addl $PAGE_SIZE_asm,%edi
23500+ loop 1b
23501+#endif
23502+
23503 /*
23504 * Clear BSS first so that there are no surprises...
23505 */
23506@@ -201,8 +269,11 @@ ENTRY(startup_32)
23507 movl %eax, pa(max_pfn_mapped)
23508
23509 /* Do early initialization of the fixmap area */
23510- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
23511- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
23512+#ifdef CONFIG_COMPAT_VDSO
23513+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
23514+#else
23515+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
23516+#endif
23517 #else /* Not PAE */
23518
23519 page_pde_offset = (__PAGE_OFFSET >> 20);
23520@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
23521 movl %eax, pa(max_pfn_mapped)
23522
23523 /* Do early initialization of the fixmap area */
23524- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
23525- movl %eax,pa(initial_page_table+0xffc)
23526+#ifdef CONFIG_COMPAT_VDSO
23527+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
23528+#else
23529+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
23530+#endif
23531 #endif
23532
23533 #ifdef CONFIG_PARAVIRT
23534@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
23535 cmpl $num_subarch_entries, %eax
23536 jae bad_subarch
23537
23538- movl pa(subarch_entries)(,%eax,4), %eax
23539- subl $__PAGE_OFFSET, %eax
23540- jmp *%eax
23541+ jmp *pa(subarch_entries)(,%eax,4)
23542
23543 bad_subarch:
23544 WEAK(lguest_entry)
23545@@ -261,10 +333,10 @@ WEAK(xen_entry)
23546 __INITDATA
23547
23548 subarch_entries:
23549- .long default_entry /* normal x86/PC */
23550- .long lguest_entry /* lguest hypervisor */
23551- .long xen_entry /* Xen hypervisor */
23552- .long default_entry /* Moorestown MID */
23553+ .long ta(default_entry) /* normal x86/PC */
23554+ .long ta(lguest_entry) /* lguest hypervisor */
23555+ .long ta(xen_entry) /* Xen hypervisor */
23556+ .long ta(default_entry) /* Moorestown MID */
23557 num_subarch_entries = (. - subarch_entries) / 4
23558 .previous
23559 #else
23560@@ -354,6 +426,7 @@ default_entry:
23561 movl pa(mmu_cr4_features),%eax
23562 movl %eax,%cr4
23563
23564+#ifdef CONFIG_X86_PAE
23565 testb $X86_CR4_PAE, %al # check if PAE is enabled
23566 jz enable_paging
23567
23568@@ -382,6 +455,9 @@ default_entry:
23569 /* Make changes effective */
23570 wrmsr
23571
23572+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
23573+#endif
23574+
23575 enable_paging:
23576
23577 /*
23578@@ -449,14 +525,20 @@ is486:
23579 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
23580 movl %eax,%ss # after changing gdt.
23581
23582- movl $(__USER_DS),%eax # DS/ES contains default USER segment
23583+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
23584 movl %eax,%ds
23585 movl %eax,%es
23586
23587 movl $(__KERNEL_PERCPU), %eax
23588 movl %eax,%fs # set this cpu's percpu
23589
23590+#ifdef CONFIG_CC_STACKPROTECTOR
23591 movl $(__KERNEL_STACK_CANARY),%eax
23592+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
23593+ movl $(__USER_DS),%eax
23594+#else
23595+ xorl %eax,%eax
23596+#endif
23597 movl %eax,%gs
23598
23599 xorl %eax,%eax # Clear LDT
23600@@ -512,8 +594,11 @@ setup_once:
23601 * relocation. Manually set base address in stack canary
23602 * segment descriptor.
23603 */
23604- movl $gdt_page,%eax
23605+ movl $cpu_gdt_table,%eax
23606 movl $stack_canary,%ecx
23607+#ifdef CONFIG_SMP
23608+ addl $__per_cpu_load,%ecx
23609+#endif
23610 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
23611 shrl $16, %ecx
23612 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
23613@@ -544,7 +629,7 @@ ENDPROC(early_idt_handlers)
23614 /* This is global to keep gas from relaxing the jumps */
23615 ENTRY(early_idt_handler)
23616 cld
23617- cmpl $2,%ss:early_recursion_flag
23618+ cmpl $1,%ss:early_recursion_flag
23619 je hlt_loop
23620 incl %ss:early_recursion_flag
23621
23622@@ -582,8 +667,8 @@ ENTRY(early_idt_handler)
23623 pushl (20+6*4)(%esp) /* trapno */
23624 pushl $fault_msg
23625 call printk
23626-#endif
23627 call dump_stack
23628+#endif
23629 hlt_loop:
23630 hlt
23631 jmp hlt_loop
23632@@ -602,8 +687,11 @@ ENDPROC(early_idt_handler)
23633 /* This is the default interrupt "handler" :-) */
23634 ALIGN
23635 ignore_int:
23636- cld
23637 #ifdef CONFIG_PRINTK
23638+ cmpl $2,%ss:early_recursion_flag
23639+ je hlt_loop
23640+ incl %ss:early_recursion_flag
23641+ cld
23642 pushl %eax
23643 pushl %ecx
23644 pushl %edx
23645@@ -612,9 +700,6 @@ ignore_int:
23646 movl $(__KERNEL_DS),%eax
23647 movl %eax,%ds
23648 movl %eax,%es
23649- cmpl $2,early_recursion_flag
23650- je hlt_loop
23651- incl early_recursion_flag
23652 pushl 16(%esp)
23653 pushl 24(%esp)
23654 pushl 32(%esp)
23655@@ -648,29 +733,34 @@ ENTRY(setup_once_ref)
23656 /*
23657 * BSS section
23658 */
23659-__PAGE_ALIGNED_BSS
23660- .align PAGE_SIZE
23661 #ifdef CONFIG_X86_PAE
23662+.section .initial_pg_pmd,"a",@progbits
23663 initial_pg_pmd:
23664 .fill 1024*KPMDS,4,0
23665 #else
23666+.section .initial_page_table,"a",@progbits
23667 ENTRY(initial_page_table)
23668 .fill 1024,4,0
23669 #endif
23670+.section .initial_pg_fixmap,"a",@progbits
23671 initial_pg_fixmap:
23672 .fill 1024,4,0
23673+.section .empty_zero_page,"a",@progbits
23674 ENTRY(empty_zero_page)
23675 .fill 4096,1,0
23676+.section .swapper_pg_dir,"a",@progbits
23677 ENTRY(swapper_pg_dir)
23678+#ifdef CONFIG_X86_PAE
23679+ .fill 4,8,0
23680+#else
23681 .fill 1024,4,0
23682+#endif
23683
23684 /*
23685 * This starts the data section.
23686 */
23687 #ifdef CONFIG_X86_PAE
23688-__PAGE_ALIGNED_DATA
23689- /* Page-aligned for the benefit of paravirt? */
23690- .align PAGE_SIZE
23691+.section .initial_page_table,"a",@progbits
23692 ENTRY(initial_page_table)
23693 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
23694 # if KPMDS == 3
23695@@ -689,12 +779,20 @@ ENTRY(initial_page_table)
23696 # error "Kernel PMDs should be 1, 2 or 3"
23697 # endif
23698 .align PAGE_SIZE /* needs to be page-sized too */
23699+
23700+#ifdef CONFIG_PAX_PER_CPU_PGD
23701+ENTRY(cpu_pgd)
23702+ .rept 2*NR_CPUS
23703+ .fill 4,8,0
23704+ .endr
23705+#endif
23706+
23707 #endif
23708
23709 .data
23710 .balign 4
23711 ENTRY(stack_start)
23712- .long init_thread_union+THREAD_SIZE
23713+ .long init_thread_union+THREAD_SIZE-8
23714
23715 __INITRODATA
23716 int_msg:
23717@@ -722,7 +820,7 @@ fault_msg:
23718 * segment size, and 32-bit linear address value:
23719 */
23720
23721- .data
23722+.section .rodata,"a",@progbits
23723 .globl boot_gdt_descr
23724 .globl idt_descr
23725
23726@@ -731,7 +829,7 @@ fault_msg:
23727 .word 0 # 32 bit align gdt_desc.address
23728 boot_gdt_descr:
23729 .word __BOOT_DS+7
23730- .long boot_gdt - __PAGE_OFFSET
23731+ .long pa(boot_gdt)
23732
23733 .word 0 # 32-bit align idt_desc.address
23734 idt_descr:
23735@@ -742,7 +840,7 @@ idt_descr:
23736 .word 0 # 32 bit align gdt_desc.address
23737 ENTRY(early_gdt_descr)
23738 .word GDT_ENTRIES*8-1
23739- .long gdt_page /* Overwritten for secondary CPUs */
23740+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
23741
23742 /*
23743 * The boot_gdt must mirror the equivalent in setup.S and is
23744@@ -751,5 +849,65 @@ ENTRY(early_gdt_descr)
23745 .align L1_CACHE_BYTES
23746 ENTRY(boot_gdt)
23747 .fill GDT_ENTRY_BOOT_CS,8,0
23748- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
23749- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
23750+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
23751+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
23752+
23753+ .align PAGE_SIZE_asm
23754+ENTRY(cpu_gdt_table)
23755+ .rept NR_CPUS
23756+ .quad 0x0000000000000000 /* NULL descriptor */
23757+ .quad 0x0000000000000000 /* 0x0b reserved */
23758+ .quad 0x0000000000000000 /* 0x13 reserved */
23759+ .quad 0x0000000000000000 /* 0x1b reserved */
23760+
23761+#ifdef CONFIG_PAX_KERNEXEC
23762+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
23763+#else
23764+ .quad 0x0000000000000000 /* 0x20 unused */
23765+#endif
23766+
23767+ .quad 0x0000000000000000 /* 0x28 unused */
23768+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
23769+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
23770+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
23771+ .quad 0x0000000000000000 /* 0x4b reserved */
23772+ .quad 0x0000000000000000 /* 0x53 reserved */
23773+ .quad 0x0000000000000000 /* 0x5b reserved */
23774+
23775+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
23776+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
23777+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
23778+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
23779+
23780+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
23781+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
23782+
23783+ /*
23784+ * Segments used for calling PnP BIOS have byte granularity.
23785+ * The code segments and data segments have fixed 64k limits,
23786+ * the transfer segment sizes are set at run time.
23787+ */
23788+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
23789+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
23790+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
23791+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
23792+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
23793+
23794+ /*
23795+ * The APM segments have byte granularity and their bases
23796+ * are set at run time. All have 64k limits.
23797+ */
23798+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
23799+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
23800+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
23801+
23802+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
23803+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
23804+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
23805+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
23806+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
23807+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
23808+
23809+ /* Be sure this is zeroed to avoid false validations in Xen */
23810+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
23811+ .endr
23812diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
23813index e1aabdb..fee4fee 100644
23814--- a/arch/x86/kernel/head_64.S
23815+++ b/arch/x86/kernel/head_64.S
23816@@ -20,6 +20,8 @@
23817 #include <asm/processor-flags.h>
23818 #include <asm/percpu.h>
23819 #include <asm/nops.h>
23820+#include <asm/cpufeature.h>
23821+#include <asm/alternative-asm.h>
23822
23823 #ifdef CONFIG_PARAVIRT
23824 #include <asm/asm-offsets.h>
23825@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
23826 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
23827 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
23828 L3_START_KERNEL = pud_index(__START_KERNEL_map)
23829+L4_VMALLOC_START = pgd_index(VMALLOC_START)
23830+L3_VMALLOC_START = pud_index(VMALLOC_START)
23831+L4_VMALLOC_END = pgd_index(VMALLOC_END)
23832+L3_VMALLOC_END = pud_index(VMALLOC_END)
23833+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
23834+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
23835
23836 .text
23837 __HEAD
23838@@ -89,11 +97,24 @@ startup_64:
23839 * Fixup the physical addresses in the page table
23840 */
23841 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
23842+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
23843+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
23844+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
23845+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
23846+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
23847
23848- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
23849- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
23850+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
23851+#ifndef CONFIG_XEN
23852+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
23853+#endif
23854+
23855+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
23856+
23857+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
23858+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
23859
23860 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
23861+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
23862
23863 /*
23864 * Set up the identity mapping for the switchover. These
23865@@ -177,8 +198,8 @@ ENTRY(secondary_startup_64)
23866 movq $(init_level4_pgt - __START_KERNEL_map), %rax
23867 1:
23868
23869- /* Enable PAE mode and PGE */
23870- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
23871+ /* Enable PAE mode and PSE/PGE */
23872+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
23873 movq %rcx, %cr4
23874
23875 /* Setup early boot stage 4 level pagetables. */
23876@@ -199,10 +220,19 @@ ENTRY(secondary_startup_64)
23877 movl $MSR_EFER, %ecx
23878 rdmsr
23879 btsl $_EFER_SCE, %eax /* Enable System Call */
23880- btl $20,%edi /* No Execute supported? */
23881+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
23882 jnc 1f
23883 btsl $_EFER_NX, %eax
23884 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
23885+#ifndef CONFIG_EFI
23886+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
23887+#endif
23888+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
23889+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
23890+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
23891+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
23892+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
23893+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
23894 1: wrmsr /* Make changes effective */
23895
23896 /* Setup cr0 */
23897@@ -282,6 +312,7 @@ ENTRY(secondary_startup_64)
23898 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
23899 * address given in m16:64.
23900 */
23901+ pax_set_fptr_mask
23902 movq initial_code(%rip),%rax
23903 pushq $0 # fake return address to stop unwinder
23904 pushq $__KERNEL_CS # set correct cs
23905@@ -388,7 +419,7 @@ ENTRY(early_idt_handler)
23906 call dump_stack
23907 #ifdef CONFIG_KALLSYMS
23908 leaq early_idt_ripmsg(%rip),%rdi
23909- movq 40(%rsp),%rsi # %rip again
23910+ movq 88(%rsp),%rsi # %rip again
23911 call __print_symbol
23912 #endif
23913 #endif /* EARLY_PRINTK */
23914@@ -416,6 +447,7 @@ ENDPROC(early_idt_handler)
23915 early_recursion_flag:
23916 .long 0
23917
23918+ .section .rodata,"a",@progbits
23919 #ifdef CONFIG_EARLY_PRINTK
23920 early_idt_msg:
23921 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
23922@@ -443,29 +475,52 @@ NEXT_PAGE(early_level4_pgt)
23923 NEXT_PAGE(early_dynamic_pgts)
23924 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
23925
23926- .data
23927+ .section .rodata,"a",@progbits
23928
23929-#ifndef CONFIG_XEN
23930 NEXT_PAGE(init_level4_pgt)
23931- .fill 512,8,0
23932-#else
23933-NEXT_PAGE(init_level4_pgt)
23934- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
23935 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
23936 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
23937+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
23938+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
23939+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
23940+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
23941+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
23942+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
23943 .org init_level4_pgt + L4_START_KERNEL*8, 0
23944 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
23945 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
23946
23947+#ifdef CONFIG_PAX_PER_CPU_PGD
23948+NEXT_PAGE(cpu_pgd)
23949+ .rept 2*NR_CPUS
23950+ .fill 512,8,0
23951+ .endr
23952+#endif
23953+
23954 NEXT_PAGE(level3_ident_pgt)
23955 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
23956+#ifdef CONFIG_XEN
23957 .fill 511, 8, 0
23958+#else
23959+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
23960+ .fill 510,8,0
23961+#endif
23962+
23963+NEXT_PAGE(level3_vmalloc_start_pgt)
23964+ .fill 512,8,0
23965+
23966+NEXT_PAGE(level3_vmalloc_end_pgt)
23967+ .fill 512,8,0
23968+
23969+NEXT_PAGE(level3_vmemmap_pgt)
23970+ .fill L3_VMEMMAP_START,8,0
23971+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
23972+
23973 NEXT_PAGE(level2_ident_pgt)
23974- /* Since I easily can, map the first 1G.
23975+ /* Since I easily can, map the first 2G.
23976 * Don't set NX because code runs from these pages.
23977 */
23978- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
23979-#endif
23980+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
23981
23982 NEXT_PAGE(level3_kernel_pgt)
23983 .fill L3_START_KERNEL,8,0
23984@@ -473,6 +528,9 @@ NEXT_PAGE(level3_kernel_pgt)
23985 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
23986 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
23987
23988+NEXT_PAGE(level2_vmemmap_pgt)
23989+ .fill 512,8,0
23990+
23991 NEXT_PAGE(level2_kernel_pgt)
23992 /*
23993 * 512 MB kernel mapping. We spend a full page on this pagetable
23994@@ -490,28 +548,64 @@ NEXT_PAGE(level2_kernel_pgt)
23995 NEXT_PAGE(level2_fixmap_pgt)
23996 .fill 506,8,0
23997 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
23998- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
23999- .fill 5,8,0
24000+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24001+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24002+ .fill 4,8,0
24003
24004 NEXT_PAGE(level1_fixmap_pgt)
24005 .fill 512,8,0
24006
24007+NEXT_PAGE(level1_vsyscall_pgt)
24008+ .fill 512,8,0
24009+
24010 #undef PMDS
24011
24012- .data
24013+ .align PAGE_SIZE
24014+ENTRY(cpu_gdt_table)
24015+ .rept NR_CPUS
24016+ .quad 0x0000000000000000 /* NULL descriptor */
24017+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24018+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
24019+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
24020+ .quad 0x00cffb000000ffff /* __USER32_CS */
24021+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
24022+ .quad 0x00affb000000ffff /* __USER_CS */
24023+
24024+#ifdef CONFIG_PAX_KERNEXEC
24025+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
24026+#else
24027+ .quad 0x0 /* unused */
24028+#endif
24029+
24030+ .quad 0,0 /* TSS */
24031+ .quad 0,0 /* LDT */
24032+ .quad 0,0,0 /* three TLS descriptors */
24033+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
24034+ /* asm/segment.h:GDT_ENTRIES must match this */
24035+
24036+#ifdef CONFIG_PAX_MEMORY_UDEREF
24037+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
24038+#else
24039+ .quad 0x0 /* unused */
24040+#endif
24041+
24042+ /* zero the remaining page */
24043+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
24044+ .endr
24045+
24046 .align 16
24047 .globl early_gdt_descr
24048 early_gdt_descr:
24049 .word GDT_ENTRIES*8-1
24050 early_gdt_descr_base:
24051- .quad INIT_PER_CPU_VAR(gdt_page)
24052+ .quad cpu_gdt_table
24053
24054 ENTRY(phys_base)
24055 /* This must match the first entry in level2_kernel_pgt */
24056 .quad 0x0000000000000000
24057
24058 #include "../../x86/xen/xen-head.S"
24059-
24060- __PAGE_ALIGNED_BSS
24061+
24062+ .section .rodata,"a",@progbits
24063 NEXT_PAGE(empty_zero_page)
24064 .skip PAGE_SIZE
24065diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
24066index 0fa6912..b37438b 100644
24067--- a/arch/x86/kernel/i386_ksyms_32.c
24068+++ b/arch/x86/kernel/i386_ksyms_32.c
24069@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
24070 EXPORT_SYMBOL(cmpxchg8b_emu);
24071 #endif
24072
24073+EXPORT_SYMBOL_GPL(cpu_gdt_table);
24074+
24075 /* Networking helper routines. */
24076 EXPORT_SYMBOL(csum_partial_copy_generic);
24077+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
24078+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
24079
24080 EXPORT_SYMBOL(__get_user_1);
24081 EXPORT_SYMBOL(__get_user_2);
24082@@ -37,3 +41,11 @@ EXPORT_SYMBOL(strstr);
24083
24084 EXPORT_SYMBOL(csum_partial);
24085 EXPORT_SYMBOL(empty_zero_page);
24086+
24087+#ifdef CONFIG_PAX_KERNEXEC
24088+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
24089+#endif
24090+
24091+#ifdef CONFIG_PAX_PER_CPU_PGD
24092+EXPORT_SYMBOL(cpu_pgd);
24093+#endif
24094diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
24095index 5d576ab..1403a03 100644
24096--- a/arch/x86/kernel/i387.c
24097+++ b/arch/x86/kernel/i387.c
24098@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
24099 static inline bool interrupted_user_mode(void)
24100 {
24101 struct pt_regs *regs = get_irq_regs();
24102- return regs && user_mode_vm(regs);
24103+ return regs && user_mode(regs);
24104 }
24105
24106 /*
24107diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
24108index 9a5c460..84868423 100644
24109--- a/arch/x86/kernel/i8259.c
24110+++ b/arch/x86/kernel/i8259.c
24111@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
24112 static void make_8259A_irq(unsigned int irq)
24113 {
24114 disable_irq_nosync(irq);
24115- io_apic_irqs &= ~(1<<irq);
24116+ io_apic_irqs &= ~(1UL<<irq);
24117 irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
24118 i8259A_chip.name);
24119 enable_irq(irq);
24120@@ -209,7 +209,7 @@ spurious_8259A_irq:
24121 "spurious 8259A interrupt: IRQ%d.\n", irq);
24122 spurious_irq_mask |= irqmask;
24123 }
24124- atomic_inc(&irq_err_count);
24125+ atomic_inc_unchecked(&irq_err_count);
24126 /*
24127 * Theoretically we do not have to handle this IRQ,
24128 * but in Linux this does not cause problems and is
24129@@ -333,14 +333,16 @@ static void init_8259A(int auto_eoi)
24130 /* (slave's support for AEOI in flat mode is to be investigated) */
24131 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
24132
24133+ pax_open_kernel();
24134 if (auto_eoi)
24135 /*
24136 * In AEOI mode we just have to mask the interrupt
24137 * when acking.
24138 */
24139- i8259A_chip.irq_mask_ack = disable_8259A_irq;
24140+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
24141 else
24142- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24143+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24144+ pax_close_kernel();
24145
24146 udelay(100); /* wait for 8259A to initialize */
24147
24148diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
24149index a979b5b..1d6db75 100644
24150--- a/arch/x86/kernel/io_delay.c
24151+++ b/arch/x86/kernel/io_delay.c
24152@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
24153 * Quirk table for systems that misbehave (lock up, etc.) if port
24154 * 0x80 is used:
24155 */
24156-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
24157+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
24158 {
24159 .callback = dmi_io_delay_0xed_port,
24160 .ident = "Compaq Presario V6000",
24161diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
24162index 4ddaf66..49d5c18 100644
24163--- a/arch/x86/kernel/ioport.c
24164+++ b/arch/x86/kernel/ioport.c
24165@@ -6,6 +6,7 @@
24166 #include <linux/sched.h>
24167 #include <linux/kernel.h>
24168 #include <linux/capability.h>
24169+#include <linux/security.h>
24170 #include <linux/errno.h>
24171 #include <linux/types.h>
24172 #include <linux/ioport.h>
24173@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24174 return -EINVAL;
24175 if (turn_on && !capable(CAP_SYS_RAWIO))
24176 return -EPERM;
24177+#ifdef CONFIG_GRKERNSEC_IO
24178+ if (turn_on && grsec_disable_privio) {
24179+ gr_handle_ioperm();
24180+ return -ENODEV;
24181+ }
24182+#endif
24183
24184 /*
24185 * If it's the first ioperm() call in this thread's lifetime, set the
24186@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24187 * because the ->io_bitmap_max value must match the bitmap
24188 * contents:
24189 */
24190- tss = &per_cpu(init_tss, get_cpu());
24191+ tss = init_tss + get_cpu();
24192
24193 if (turn_on)
24194 bitmap_clear(t->io_bitmap_ptr, from, num);
24195@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
24196 if (level > old) {
24197 if (!capable(CAP_SYS_RAWIO))
24198 return -EPERM;
24199+#ifdef CONFIG_GRKERNSEC_IO
24200+ if (grsec_disable_privio) {
24201+ gr_handle_iopl();
24202+ return -ENODEV;
24203+ }
24204+#endif
24205 }
24206 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
24207 t->iopl = level << 12;
24208diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
24209index 22d0687..e07b2a5 100644
24210--- a/arch/x86/kernel/irq.c
24211+++ b/arch/x86/kernel/irq.c
24212@@ -21,7 +21,7 @@
24213 #define CREATE_TRACE_POINTS
24214 #include <asm/trace/irq_vectors.h>
24215
24216-atomic_t irq_err_count;
24217+atomic_unchecked_t irq_err_count;
24218
24219 /* Function pointer for generic interrupt vector handling */
24220 void (*x86_platform_ipi_callback)(void) = NULL;
24221@@ -125,9 +125,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
24222 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
24223 seq_printf(p, " Machine check polls\n");
24224 #endif
24225- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
24226+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
24227 #if defined(CONFIG_X86_IO_APIC)
24228- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
24229+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
24230 #endif
24231 return 0;
24232 }
24233@@ -167,7 +167,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
24234
24235 u64 arch_irq_stat(void)
24236 {
24237- u64 sum = atomic_read(&irq_err_count);
24238+ u64 sum = atomic_read_unchecked(&irq_err_count);
24239 return sum;
24240 }
24241
24242diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
24243index 4186755..784efa0 100644
24244--- a/arch/x86/kernel/irq_32.c
24245+++ b/arch/x86/kernel/irq_32.c
24246@@ -39,7 +39,7 @@ static int check_stack_overflow(void)
24247 __asm__ __volatile__("andl %%esp,%0" :
24248 "=r" (sp) : "0" (THREAD_SIZE - 1));
24249
24250- return sp < (sizeof(struct thread_info) + STACK_WARN);
24251+ return sp < STACK_WARN;
24252 }
24253
24254 static void print_stack_overflow(void)
24255@@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
24256 * per-CPU IRQ handling contexts (thread information and stack)
24257 */
24258 union irq_ctx {
24259- struct thread_info tinfo;
24260- u32 stack[THREAD_SIZE/sizeof(u32)];
24261+ unsigned long previous_esp;
24262+ u32 stack[THREAD_SIZE/sizeof(u32)];
24263 } __attribute__((aligned(THREAD_SIZE)));
24264
24265 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
24266@@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
24267 static inline int
24268 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24269 {
24270- union irq_ctx *curctx, *irqctx;
24271+ union irq_ctx *irqctx;
24272 u32 *isp, arg1, arg2;
24273
24274- curctx = (union irq_ctx *) current_thread_info();
24275 irqctx = __this_cpu_read(hardirq_ctx);
24276
24277 /*
24278@@ -92,16 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24279 * handler) we can't do that and just have to keep using the
24280 * current stack (which is the irq stack already after all)
24281 */
24282- if (unlikely(curctx == irqctx))
24283+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
24284 return 0;
24285
24286 /* build the stack frame on the IRQ stack */
24287- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
24288- irqctx->tinfo.task = curctx->tinfo.task;
24289- irqctx->tinfo.previous_esp = current_stack_pointer;
24290+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
24291+ irqctx->previous_esp = current_stack_pointer;
24292
24293- /* Copy the preempt_count so that the [soft]irq checks work. */
24294- irqctx->tinfo.preempt_count = curctx->tinfo.preempt_count;
24295+#ifdef CONFIG_PAX_MEMORY_UDEREF
24296+ __set_fs(MAKE_MM_SEG(0));
24297+#endif
24298
24299 if (unlikely(overflow))
24300 call_on_stack(print_stack_overflow, isp);
24301@@ -113,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24302 : "0" (irq), "1" (desc), "2" (isp),
24303 "D" (desc->handle_irq)
24304 : "memory", "cc", "ecx");
24305+
24306+#ifdef CONFIG_PAX_MEMORY_UDEREF
24307+ __set_fs(current_thread_info()->addr_limit);
24308+#endif
24309+
24310 return 1;
24311 }
24312
24313@@ -121,29 +125,14 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
24314 */
24315 void irq_ctx_init(int cpu)
24316 {
24317- union irq_ctx *irqctx;
24318-
24319 if (per_cpu(hardirq_ctx, cpu))
24320 return;
24321
24322- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
24323- THREADINFO_GFP,
24324- THREAD_SIZE_ORDER));
24325- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
24326- irqctx->tinfo.cpu = cpu;
24327- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
24328- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
24329+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
24330+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
24331
24332- per_cpu(hardirq_ctx, cpu) = irqctx;
24333-
24334- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
24335- THREADINFO_GFP,
24336- THREAD_SIZE_ORDER));
24337- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
24338- irqctx->tinfo.cpu = cpu;
24339- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
24340-
24341- per_cpu(softirq_ctx, cpu) = irqctx;
24342+ printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
24343+ cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
24344
24345 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
24346 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
24347@@ -152,7 +141,6 @@ void irq_ctx_init(int cpu)
24348 asmlinkage void do_softirq(void)
24349 {
24350 unsigned long flags;
24351- struct thread_info *curctx;
24352 union irq_ctx *irqctx;
24353 u32 *isp;
24354
24355@@ -162,15 +150,22 @@ asmlinkage void do_softirq(void)
24356 local_irq_save(flags);
24357
24358 if (local_softirq_pending()) {
24359- curctx = current_thread_info();
24360 irqctx = __this_cpu_read(softirq_ctx);
24361- irqctx->tinfo.task = curctx->task;
24362- irqctx->tinfo.previous_esp = current_stack_pointer;
24363+ irqctx->previous_esp = current_stack_pointer;
24364
24365 /* build the stack frame on the softirq stack */
24366- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
24367+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
24368+
24369+#ifdef CONFIG_PAX_MEMORY_UDEREF
24370+ __set_fs(MAKE_MM_SEG(0));
24371+#endif
24372
24373 call_on_stack(__do_softirq, isp);
24374+
24375+#ifdef CONFIG_PAX_MEMORY_UDEREF
24376+ __set_fs(current_thread_info()->addr_limit);
24377+#endif
24378+
24379 /*
24380 * Shouldn't happen, we returned above if in_interrupt():
24381 */
24382@@ -191,7 +186,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
24383 if (unlikely(!desc))
24384 return false;
24385
24386- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
24387+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
24388 if (unlikely(overflow))
24389 print_stack_overflow();
24390 desc->handle_irq(irq, desc);
24391diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
24392index d04d3ec..ea4b374 100644
24393--- a/arch/x86/kernel/irq_64.c
24394+++ b/arch/x86/kernel/irq_64.c
24395@@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
24396 u64 estack_top, estack_bottom;
24397 u64 curbase = (u64)task_stack_page(current);
24398
24399- if (user_mode_vm(regs))
24400+ if (user_mode(regs))
24401 return;
24402
24403 if (regs->sp >= curbase + sizeof(struct thread_info) +
24404diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
24405index ee11b7d..4df4d0c 100644
24406--- a/arch/x86/kernel/jump_label.c
24407+++ b/arch/x86/kernel/jump_label.c
24408@@ -49,7 +49,7 @@ static void __jump_label_transform(struct jump_entry *entry,
24409 * We are enabling this jump label. If it is not a nop
24410 * then something must have gone wrong.
24411 */
24412- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5) != 0))
24413+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5) != 0))
24414 bug_at((void *)entry->code, __LINE__);
24415
24416 code.jump = 0xe9;
24417@@ -64,13 +64,13 @@ static void __jump_label_transform(struct jump_entry *entry,
24418 */
24419 if (init) {
24420 const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
24421- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
24422+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
24423 bug_at((void *)entry->code, __LINE__);
24424 } else {
24425 code.jump = 0xe9;
24426 code.offset = entry->target -
24427 (entry->code + JUMP_LABEL_NOP_SIZE);
24428- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
24429+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
24430 bug_at((void *)entry->code, __LINE__);
24431 }
24432 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
24433diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
24434index 836f832..a8bda67 100644
24435--- a/arch/x86/kernel/kgdb.c
24436+++ b/arch/x86/kernel/kgdb.c
24437@@ -127,11 +127,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
24438 #ifdef CONFIG_X86_32
24439 switch (regno) {
24440 case GDB_SS:
24441- if (!user_mode_vm(regs))
24442+ if (!user_mode(regs))
24443 *(unsigned long *)mem = __KERNEL_DS;
24444 break;
24445 case GDB_SP:
24446- if (!user_mode_vm(regs))
24447+ if (!user_mode(regs))
24448 *(unsigned long *)mem = kernel_stack_pointer(regs);
24449 break;
24450 case GDB_GS:
24451@@ -229,7 +229,10 @@ static void kgdb_correct_hw_break(void)
24452 bp->attr.bp_addr = breakinfo[breakno].addr;
24453 bp->attr.bp_len = breakinfo[breakno].len;
24454 bp->attr.bp_type = breakinfo[breakno].type;
24455- info->address = breakinfo[breakno].addr;
24456+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
24457+ info->address = ktla_ktva(breakinfo[breakno].addr);
24458+ else
24459+ info->address = breakinfo[breakno].addr;
24460 info->len = breakinfo[breakno].len;
24461 info->type = breakinfo[breakno].type;
24462 val = arch_install_hw_breakpoint(bp);
24463@@ -476,12 +479,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
24464 case 'k':
24465 /* clear the trace bit */
24466 linux_regs->flags &= ~X86_EFLAGS_TF;
24467- atomic_set(&kgdb_cpu_doing_single_step, -1);
24468+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
24469
24470 /* set the trace bit if we're stepping */
24471 if (remcomInBuffer[0] == 's') {
24472 linux_regs->flags |= X86_EFLAGS_TF;
24473- atomic_set(&kgdb_cpu_doing_single_step,
24474+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
24475 raw_smp_processor_id());
24476 }
24477
24478@@ -546,7 +549,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
24479
24480 switch (cmd) {
24481 case DIE_DEBUG:
24482- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
24483+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
24484 if (user_mode(regs))
24485 return single_step_cont(regs, args);
24486 break;
24487@@ -751,11 +754,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
24488 #endif /* CONFIG_DEBUG_RODATA */
24489
24490 bpt->type = BP_BREAKPOINT;
24491- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
24492+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
24493 BREAK_INSTR_SIZE);
24494 if (err)
24495 return err;
24496- err = probe_kernel_write((char *)bpt->bpt_addr,
24497+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
24498 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
24499 #ifdef CONFIG_DEBUG_RODATA
24500 if (!err)
24501@@ -768,7 +771,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
24502 return -EBUSY;
24503 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
24504 BREAK_INSTR_SIZE);
24505- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
24506+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
24507 if (err)
24508 return err;
24509 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
24510@@ -793,13 +796,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
24511 if (mutex_is_locked(&text_mutex))
24512 goto knl_write;
24513 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
24514- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
24515+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
24516 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
24517 goto knl_write;
24518 return err;
24519 knl_write:
24520 #endif /* CONFIG_DEBUG_RODATA */
24521- return probe_kernel_write((char *)bpt->bpt_addr,
24522+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
24523 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
24524 }
24525
24526diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
24527index 79a3f96..6ba030a 100644
24528--- a/arch/x86/kernel/kprobes/core.c
24529+++ b/arch/x86/kernel/kprobes/core.c
24530@@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
24531 s32 raddr;
24532 } __packed *insn;
24533
24534- insn = (struct __arch_relative_insn *)from;
24535+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
24536+
24537+ pax_open_kernel();
24538 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
24539 insn->op = op;
24540+ pax_close_kernel();
24541 }
24542
24543 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
24544@@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
24545 kprobe_opcode_t opcode;
24546 kprobe_opcode_t *orig_opcodes = opcodes;
24547
24548- if (search_exception_tables((unsigned long)opcodes))
24549+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
24550 return 0; /* Page fault may occur on this address. */
24551
24552 retry:
24553@@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
24554 * for the first byte, we can recover the original instruction
24555 * from it and kp->opcode.
24556 */
24557- memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
24558+ memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
24559 buf[0] = kp->opcode;
24560- return (unsigned long)buf;
24561+ return ktva_ktla((unsigned long)buf);
24562 }
24563
24564 /*
24565@@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
24566 /* Another subsystem puts a breakpoint, failed to recover */
24567 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
24568 return 0;
24569+ pax_open_kernel();
24570 memcpy(dest, insn.kaddr, insn.length);
24571+ pax_close_kernel();
24572
24573 #ifdef CONFIG_X86_64
24574 if (insn_rip_relative(&insn)) {
24575@@ -359,7 +364,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
24576 return 0;
24577 }
24578 disp = (u8 *) dest + insn_offset_displacement(&insn);
24579+ pax_open_kernel();
24580 *(s32 *) disp = (s32) newdisp;
24581+ pax_close_kernel();
24582 }
24583 #endif
24584 return insn.length;
24585@@ -498,7 +505,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
24586 * nor set current_kprobe, because it doesn't use single
24587 * stepping.
24588 */
24589- regs->ip = (unsigned long)p->ainsn.insn;
24590+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
24591 preempt_enable_no_resched();
24592 return;
24593 }
24594@@ -515,9 +522,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
24595 regs->flags &= ~X86_EFLAGS_IF;
24596 /* single step inline if the instruction is an int3 */
24597 if (p->opcode == BREAKPOINT_INSTRUCTION)
24598- regs->ip = (unsigned long)p->addr;
24599+ regs->ip = ktla_ktva((unsigned long)p->addr);
24600 else
24601- regs->ip = (unsigned long)p->ainsn.insn;
24602+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
24603 }
24604
24605 /*
24606@@ -596,7 +603,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
24607 setup_singlestep(p, regs, kcb, 0);
24608 return 1;
24609 }
24610- } else if (*addr != BREAKPOINT_INSTRUCTION) {
24611+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
24612 /*
24613 * The breakpoint instruction was removed right
24614 * after we hit it. Another cpu has removed
24615@@ -642,6 +649,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
24616 " movq %rax, 152(%rsp)\n"
24617 RESTORE_REGS_STRING
24618 " popfq\n"
24619+#ifdef KERNEXEC_PLUGIN
24620+ " btsq $63,(%rsp)\n"
24621+#endif
24622 #else
24623 " pushf\n"
24624 SAVE_REGS_STRING
24625@@ -779,7 +789,7 @@ static void __kprobes
24626 resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
24627 {
24628 unsigned long *tos = stack_addr(regs);
24629- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
24630+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
24631 unsigned long orig_ip = (unsigned long)p->addr;
24632 kprobe_opcode_t *insn = p->ainsn.insn;
24633
24634@@ -961,7 +971,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
24635 struct die_args *args = data;
24636 int ret = NOTIFY_DONE;
24637
24638- if (args->regs && user_mode_vm(args->regs))
24639+ if (args->regs && user_mode(args->regs))
24640 return ret;
24641
24642 switch (val) {
24643diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
24644index 898160b..758cde8 100644
24645--- a/arch/x86/kernel/kprobes/opt.c
24646+++ b/arch/x86/kernel/kprobes/opt.c
24647@@ -79,6 +79,7 @@ found:
24648 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
24649 static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
24650 {
24651+ pax_open_kernel();
24652 #ifdef CONFIG_X86_64
24653 *addr++ = 0x48;
24654 *addr++ = 0xbf;
24655@@ -86,6 +87,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
24656 *addr++ = 0xb8;
24657 #endif
24658 *(unsigned long *)addr = val;
24659+ pax_close_kernel();
24660 }
24661
24662 asm (
24663@@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
24664 * Verify if the address gap is in 2GB range, because this uses
24665 * a relative jump.
24666 */
24667- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
24668+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
24669 if (abs(rel) > 0x7fffffff)
24670 return -ERANGE;
24671
24672@@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
24673 op->optinsn.size = ret;
24674
24675 /* Copy arch-dep-instance from template */
24676- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
24677+ pax_open_kernel();
24678+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
24679+ pax_close_kernel();
24680
24681 /* Set probe information */
24682 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
24683
24684 /* Set probe function call */
24685- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
24686+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
24687
24688 /* Set returning jmp instruction at the tail of out-of-line buffer */
24689- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
24690+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
24691 (u8 *)op->kp.addr + op->optinsn.size);
24692
24693 flush_icache_range((unsigned long) buf,
24694@@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist)
24695 WARN_ON(kprobe_disabled(&op->kp));
24696
24697 /* Backup instructions which will be replaced by jump address */
24698- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
24699+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
24700 RELATIVE_ADDR_SIZE);
24701
24702 insn_buf[0] = RELATIVEJUMP_OPCODE;
24703@@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
24704 /* This kprobe is really able to run optimized path. */
24705 op = container_of(p, struct optimized_kprobe, kp);
24706 /* Detour through copied instructions */
24707- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
24708+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
24709 if (!reenter)
24710 reset_current_kprobe();
24711 preempt_enable_no_resched();
24712diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
24713index ebc9873..1b9724b 100644
24714--- a/arch/x86/kernel/ldt.c
24715+++ b/arch/x86/kernel/ldt.c
24716@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
24717 if (reload) {
24718 #ifdef CONFIG_SMP
24719 preempt_disable();
24720- load_LDT(pc);
24721+ load_LDT_nolock(pc);
24722 if (!cpumask_equal(mm_cpumask(current->mm),
24723 cpumask_of(smp_processor_id())))
24724 smp_call_function(flush_ldt, current->mm, 1);
24725 preempt_enable();
24726 #else
24727- load_LDT(pc);
24728+ load_LDT_nolock(pc);
24729 #endif
24730 }
24731 if (oldsize) {
24732@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
24733 return err;
24734
24735 for (i = 0; i < old->size; i++)
24736- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
24737+ write_ldt_entry(new->ldt, i, old->ldt + i);
24738 return 0;
24739 }
24740
24741@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
24742 retval = copy_ldt(&mm->context, &old_mm->context);
24743 mutex_unlock(&old_mm->context.lock);
24744 }
24745+
24746+ if (tsk == current) {
24747+ mm->context.vdso = 0;
24748+
24749+#ifdef CONFIG_X86_32
24750+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24751+ mm->context.user_cs_base = 0UL;
24752+ mm->context.user_cs_limit = ~0UL;
24753+
24754+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
24755+ cpus_clear(mm->context.cpu_user_cs_mask);
24756+#endif
24757+
24758+#endif
24759+#endif
24760+
24761+ }
24762+
24763 return retval;
24764 }
24765
24766@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
24767 }
24768 }
24769
24770+#ifdef CONFIG_PAX_SEGMEXEC
24771+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
24772+ error = -EINVAL;
24773+ goto out_unlock;
24774+ }
24775+#endif
24776+
24777 fill_ldt(&ldt, &ldt_info);
24778 if (oldmode)
24779 ldt.avl = 0;
24780diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
24781index 5b19e4d..6476a76 100644
24782--- a/arch/x86/kernel/machine_kexec_32.c
24783+++ b/arch/x86/kernel/machine_kexec_32.c
24784@@ -26,7 +26,7 @@
24785 #include <asm/cacheflush.h>
24786 #include <asm/debugreg.h>
24787
24788-static void set_idt(void *newidt, __u16 limit)
24789+static void set_idt(struct desc_struct *newidt, __u16 limit)
24790 {
24791 struct desc_ptr curidt;
24792
24793@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
24794 }
24795
24796
24797-static void set_gdt(void *newgdt, __u16 limit)
24798+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
24799 {
24800 struct desc_ptr curgdt;
24801
24802@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
24803 }
24804
24805 control_page = page_address(image->control_code_page);
24806- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
24807+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
24808
24809 relocate_kernel_ptr = control_page;
24810 page_list[PA_CONTROL_PAGE] = __pa(control_page);
24811diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
24812index 15c9876..0a43909 100644
24813--- a/arch/x86/kernel/microcode_core.c
24814+++ b/arch/x86/kernel/microcode_core.c
24815@@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
24816 return NOTIFY_OK;
24817 }
24818
24819-static struct notifier_block __refdata mc_cpu_notifier = {
24820+static struct notifier_block mc_cpu_notifier = {
24821 .notifier_call = mc_cpu_callback,
24822 };
24823
24824diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
24825index 5fb2ceb..3ae90bb 100644
24826--- a/arch/x86/kernel/microcode_intel.c
24827+++ b/arch/x86/kernel/microcode_intel.c
24828@@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
24829
24830 static int get_ucode_user(void *to, const void *from, size_t n)
24831 {
24832- return copy_from_user(to, from, n);
24833+ return copy_from_user(to, (const void __force_user *)from, n);
24834 }
24835
24836 static enum ucode_state
24837 request_microcode_user(int cpu, const void __user *buf, size_t size)
24838 {
24839- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
24840+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
24841 }
24842
24843 static void microcode_fini_cpu(int cpu)
24844diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
24845index 216a4d7..228255a 100644
24846--- a/arch/x86/kernel/module.c
24847+++ b/arch/x86/kernel/module.c
24848@@ -43,15 +43,60 @@ do { \
24849 } while (0)
24850 #endif
24851
24852-void *module_alloc(unsigned long size)
24853+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
24854 {
24855- if (PAGE_ALIGN(size) > MODULES_LEN)
24856+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
24857 return NULL;
24858 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
24859- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
24860+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
24861 -1, __builtin_return_address(0));
24862 }
24863
24864+void *module_alloc(unsigned long size)
24865+{
24866+
24867+#ifdef CONFIG_PAX_KERNEXEC
24868+ return __module_alloc(size, PAGE_KERNEL);
24869+#else
24870+ return __module_alloc(size, PAGE_KERNEL_EXEC);
24871+#endif
24872+
24873+}
24874+
24875+#ifdef CONFIG_PAX_KERNEXEC
24876+#ifdef CONFIG_X86_32
24877+void *module_alloc_exec(unsigned long size)
24878+{
24879+ struct vm_struct *area;
24880+
24881+ if (size == 0)
24882+ return NULL;
24883+
24884+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
24885+ return area ? area->addr : NULL;
24886+}
24887+EXPORT_SYMBOL(module_alloc_exec);
24888+
24889+void module_free_exec(struct module *mod, void *module_region)
24890+{
24891+ vunmap(module_region);
24892+}
24893+EXPORT_SYMBOL(module_free_exec);
24894+#else
24895+void module_free_exec(struct module *mod, void *module_region)
24896+{
24897+ module_free(mod, module_region);
24898+}
24899+EXPORT_SYMBOL(module_free_exec);
24900+
24901+void *module_alloc_exec(unsigned long size)
24902+{
24903+ return __module_alloc(size, PAGE_KERNEL_RX);
24904+}
24905+EXPORT_SYMBOL(module_alloc_exec);
24906+#endif
24907+#endif
24908+
24909 #ifdef CONFIG_X86_32
24910 int apply_relocate(Elf32_Shdr *sechdrs,
24911 const char *strtab,
24912@@ -62,14 +107,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
24913 unsigned int i;
24914 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
24915 Elf32_Sym *sym;
24916- uint32_t *location;
24917+ uint32_t *plocation, location;
24918
24919 DEBUGP("Applying relocate section %u to %u\n",
24920 relsec, sechdrs[relsec].sh_info);
24921 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
24922 /* This is where to make the change */
24923- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
24924- + rel[i].r_offset;
24925+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
24926+ location = (uint32_t)plocation;
24927+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
24928+ plocation = ktla_ktva((void *)plocation);
24929 /* This is the symbol it is referring to. Note that all
24930 undefined symbols have been resolved. */
24931 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
24932@@ -78,11 +125,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
24933 switch (ELF32_R_TYPE(rel[i].r_info)) {
24934 case R_386_32:
24935 /* We add the value into the location given */
24936- *location += sym->st_value;
24937+ pax_open_kernel();
24938+ *plocation += sym->st_value;
24939+ pax_close_kernel();
24940 break;
24941 case R_386_PC32:
24942 /* Add the value, subtract its position */
24943- *location += sym->st_value - (uint32_t)location;
24944+ pax_open_kernel();
24945+ *plocation += sym->st_value - location;
24946+ pax_close_kernel();
24947 break;
24948 default:
24949 pr_err("%s: Unknown relocation: %u\n",
24950@@ -127,21 +178,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
24951 case R_X86_64_NONE:
24952 break;
24953 case R_X86_64_64:
24954+ pax_open_kernel();
24955 *(u64 *)loc = val;
24956+ pax_close_kernel();
24957 break;
24958 case R_X86_64_32:
24959+ pax_open_kernel();
24960 *(u32 *)loc = val;
24961+ pax_close_kernel();
24962 if (val != *(u32 *)loc)
24963 goto overflow;
24964 break;
24965 case R_X86_64_32S:
24966+ pax_open_kernel();
24967 *(s32 *)loc = val;
24968+ pax_close_kernel();
24969 if ((s64)val != *(s32 *)loc)
24970 goto overflow;
24971 break;
24972 case R_X86_64_PC32:
24973 val -= (u64)loc;
24974+ pax_open_kernel();
24975 *(u32 *)loc = val;
24976+ pax_close_kernel();
24977+
24978 #if 0
24979 if ((s64)val != *(s32 *)loc)
24980 goto overflow;
24981diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
24982index 88458fa..349f7a4 100644
24983--- a/arch/x86/kernel/msr.c
24984+++ b/arch/x86/kernel/msr.c
24985@@ -233,7 +233,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
24986 return notifier_from_errno(err);
24987 }
24988
24989-static struct notifier_block __refdata msr_class_cpu_notifier = {
24990+static struct notifier_block msr_class_cpu_notifier = {
24991 .notifier_call = msr_class_cpu_callback,
24992 };
24993
24994diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
24995index 6fcb49c..5b3f4ff 100644
24996--- a/arch/x86/kernel/nmi.c
24997+++ b/arch/x86/kernel/nmi.c
24998@@ -138,7 +138,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
24999 return handled;
25000 }
25001
25002-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25003+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
25004 {
25005 struct nmi_desc *desc = nmi_to_desc(type);
25006 unsigned long flags;
25007@@ -162,9 +162,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25008 * event confuses some handlers (kdump uses this flag)
25009 */
25010 if (action->flags & NMI_FLAG_FIRST)
25011- list_add_rcu(&action->list, &desc->head);
25012+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
25013 else
25014- list_add_tail_rcu(&action->list, &desc->head);
25015+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
25016
25017 spin_unlock_irqrestore(&desc->lock, flags);
25018 return 0;
25019@@ -187,7 +187,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
25020 if (!strcmp(n->name, name)) {
25021 WARN(in_nmi(),
25022 "Trying to free NMI (%s) from NMI context!\n", n->name);
25023- list_del_rcu(&n->list);
25024+ pax_list_del_rcu((struct list_head *)&n->list);
25025 break;
25026 }
25027 }
25028@@ -512,6 +512,17 @@ static inline void nmi_nesting_postprocess(void)
25029 dotraplinkage notrace __kprobes void
25030 do_nmi(struct pt_regs *regs, long error_code)
25031 {
25032+
25033+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25034+ if (!user_mode(regs)) {
25035+ unsigned long cs = regs->cs & 0xFFFF;
25036+ unsigned long ip = ktva_ktla(regs->ip);
25037+
25038+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
25039+ regs->ip = ip;
25040+ }
25041+#endif
25042+
25043 nmi_nesting_preprocess(regs);
25044
25045 nmi_enter();
25046diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
25047index 6d9582e..f746287 100644
25048--- a/arch/x86/kernel/nmi_selftest.c
25049+++ b/arch/x86/kernel/nmi_selftest.c
25050@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
25051 {
25052 /* trap all the unknown NMIs we may generate */
25053 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
25054- __initdata);
25055+ __initconst);
25056 }
25057
25058 static void __init cleanup_nmi_testsuite(void)
25059@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
25060 unsigned long timeout;
25061
25062 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
25063- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
25064+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
25065 nmi_fail = FAILURE;
25066 return;
25067 }
25068diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
25069index bbb6c73..24a58ef 100644
25070--- a/arch/x86/kernel/paravirt-spinlocks.c
25071+++ b/arch/x86/kernel/paravirt-spinlocks.c
25072@@ -8,7 +8,7 @@
25073
25074 #include <asm/paravirt.h>
25075
25076-struct pv_lock_ops pv_lock_ops = {
25077+struct pv_lock_ops pv_lock_ops __read_only = {
25078 #ifdef CONFIG_SMP
25079 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
25080 .unlock_kick = paravirt_nop,
25081diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
25082index 1b10af8..0b58cbc 100644
25083--- a/arch/x86/kernel/paravirt.c
25084+++ b/arch/x86/kernel/paravirt.c
25085@@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
25086 {
25087 return x;
25088 }
25089+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25090+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
25091+#endif
25092
25093 void __init default_banner(void)
25094 {
25095@@ -142,15 +145,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
25096 if (opfunc == NULL)
25097 /* If there's no function, patch it with a ud2a (BUG) */
25098 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
25099- else if (opfunc == _paravirt_nop)
25100+ else if (opfunc == (void *)_paravirt_nop)
25101 /* If the operation is a nop, then nop the callsite */
25102 ret = paravirt_patch_nop();
25103
25104 /* identity functions just return their single argument */
25105- else if (opfunc == _paravirt_ident_32)
25106+ else if (opfunc == (void *)_paravirt_ident_32)
25107 ret = paravirt_patch_ident_32(insnbuf, len);
25108- else if (opfunc == _paravirt_ident_64)
25109+ else if (opfunc == (void *)_paravirt_ident_64)
25110 ret = paravirt_patch_ident_64(insnbuf, len);
25111+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25112+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
25113+ ret = paravirt_patch_ident_64(insnbuf, len);
25114+#endif
25115
25116 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
25117 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
25118@@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
25119 if (insn_len > len || start == NULL)
25120 insn_len = len;
25121 else
25122- memcpy(insnbuf, start, insn_len);
25123+ memcpy(insnbuf, ktla_ktva(start), insn_len);
25124
25125 return insn_len;
25126 }
25127@@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
25128 return this_cpu_read(paravirt_lazy_mode);
25129 }
25130
25131-struct pv_info pv_info = {
25132+struct pv_info pv_info __read_only = {
25133 .name = "bare hardware",
25134 .paravirt_enabled = 0,
25135 .kernel_rpl = 0,
25136@@ -310,16 +317,16 @@ struct pv_info pv_info = {
25137 #endif
25138 };
25139
25140-struct pv_init_ops pv_init_ops = {
25141+struct pv_init_ops pv_init_ops __read_only = {
25142 .patch = native_patch,
25143 };
25144
25145-struct pv_time_ops pv_time_ops = {
25146+struct pv_time_ops pv_time_ops __read_only = {
25147 .sched_clock = native_sched_clock,
25148 .steal_clock = native_steal_clock,
25149 };
25150
25151-__visible struct pv_irq_ops pv_irq_ops = {
25152+__visible struct pv_irq_ops pv_irq_ops __read_only = {
25153 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
25154 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
25155 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
25156@@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
25157 #endif
25158 };
25159
25160-__visible struct pv_cpu_ops pv_cpu_ops = {
25161+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
25162 .cpuid = native_cpuid,
25163 .get_debugreg = native_get_debugreg,
25164 .set_debugreg = native_set_debugreg,
25165@@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = {
25166 .end_context_switch = paravirt_nop,
25167 };
25168
25169-struct pv_apic_ops pv_apic_ops = {
25170+struct pv_apic_ops pv_apic_ops __read_only= {
25171 #ifdef CONFIG_X86_LOCAL_APIC
25172 .startup_ipi_hook = paravirt_nop,
25173 #endif
25174 };
25175
25176-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
25177+#ifdef CONFIG_X86_32
25178+#ifdef CONFIG_X86_PAE
25179+/* 64-bit pagetable entries */
25180+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
25181+#else
25182 /* 32-bit pagetable entries */
25183 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
25184+#endif
25185 #else
25186 /* 64-bit pagetable entries */
25187 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
25188 #endif
25189
25190-struct pv_mmu_ops pv_mmu_ops = {
25191+struct pv_mmu_ops pv_mmu_ops __read_only = {
25192
25193 .read_cr2 = native_read_cr2,
25194 .write_cr2 = native_write_cr2,
25195@@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = {
25196 .make_pud = PTE_IDENT,
25197
25198 .set_pgd = native_set_pgd,
25199+ .set_pgd_batched = native_set_pgd_batched,
25200 #endif
25201 #endif /* PAGETABLE_LEVELS >= 3 */
25202
25203@@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = {
25204 },
25205
25206 .set_fixmap = native_set_fixmap,
25207+
25208+#ifdef CONFIG_PAX_KERNEXEC
25209+ .pax_open_kernel = native_pax_open_kernel,
25210+ .pax_close_kernel = native_pax_close_kernel,
25211+#endif
25212+
25213 };
25214
25215 EXPORT_SYMBOL_GPL(pv_time_ops);
25216diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
25217index 299d493..2ccb0ee 100644
25218--- a/arch/x86/kernel/pci-calgary_64.c
25219+++ b/arch/x86/kernel/pci-calgary_64.c
25220@@ -1339,7 +1339,7 @@ static void __init get_tce_space_from_tar(void)
25221 tce_space = be64_to_cpu(readq(target));
25222 tce_space = tce_space & TAR_SW_BITS;
25223
25224- tce_space = tce_space & (~specified_table_size);
25225+ tce_space = tce_space & (~(unsigned long)specified_table_size);
25226 info->tce_space = (u64 *)__va(tce_space);
25227 }
25228 }
25229diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
25230index 35ccf75..7a15747 100644
25231--- a/arch/x86/kernel/pci-iommu_table.c
25232+++ b/arch/x86/kernel/pci-iommu_table.c
25233@@ -2,7 +2,7 @@
25234 #include <asm/iommu_table.h>
25235 #include <linux/string.h>
25236 #include <linux/kallsyms.h>
25237-
25238+#include <linux/sched.h>
25239
25240 #define DEBUG 1
25241
25242diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
25243index 6c483ba..d10ce2f 100644
25244--- a/arch/x86/kernel/pci-swiotlb.c
25245+++ b/arch/x86/kernel/pci-swiotlb.c
25246@@ -32,7 +32,7 @@ static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
25247 void *vaddr, dma_addr_t dma_addr,
25248 struct dma_attrs *attrs)
25249 {
25250- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
25251+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
25252 }
25253
25254 static struct dma_map_ops swiotlb_dma_ops = {
25255diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
25256index 3fb8d95..254dc51 100644
25257--- a/arch/x86/kernel/process.c
25258+++ b/arch/x86/kernel/process.c
25259@@ -36,7 +36,8 @@
25260 * section. Since TSS's are completely CPU-local, we want them
25261 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
25262 */
25263-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
25264+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
25265+EXPORT_SYMBOL(init_tss);
25266
25267 #ifdef CONFIG_X86_64
25268 static DEFINE_PER_CPU(unsigned char, is_idle);
25269@@ -92,7 +93,7 @@ void arch_task_cache_init(void)
25270 task_xstate_cachep =
25271 kmem_cache_create("task_xstate", xstate_size,
25272 __alignof__(union thread_xstate),
25273- SLAB_PANIC | SLAB_NOTRACK, NULL);
25274+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
25275 }
25276
25277 /*
25278@@ -105,7 +106,7 @@ void exit_thread(void)
25279 unsigned long *bp = t->io_bitmap_ptr;
25280
25281 if (bp) {
25282- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
25283+ struct tss_struct *tss = init_tss + get_cpu();
25284
25285 t->io_bitmap_ptr = NULL;
25286 clear_thread_flag(TIF_IO_BITMAP);
25287@@ -125,6 +126,9 @@ void flush_thread(void)
25288 {
25289 struct task_struct *tsk = current;
25290
25291+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
25292+ loadsegment(gs, 0);
25293+#endif
25294 flush_ptrace_hw_breakpoint(tsk);
25295 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
25296 drop_init_fpu(tsk);
25297@@ -271,7 +275,7 @@ static void __exit_idle(void)
25298 void exit_idle(void)
25299 {
25300 /* idle loop has pid 0 */
25301- if (current->pid)
25302+ if (task_pid_nr(current))
25303 return;
25304 __exit_idle();
25305 }
25306@@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
25307 return ret;
25308 }
25309 #endif
25310-void stop_this_cpu(void *dummy)
25311+__noreturn void stop_this_cpu(void *dummy)
25312 {
25313 local_irq_disable();
25314 /*
25315@@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
25316 }
25317 early_param("idle", idle_setup);
25318
25319-unsigned long arch_align_stack(unsigned long sp)
25320+#ifdef CONFIG_PAX_RANDKSTACK
25321+void pax_randomize_kstack(struct pt_regs *regs)
25322 {
25323- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
25324- sp -= get_random_int() % 8192;
25325- return sp & ~0xf;
25326-}
25327+ struct thread_struct *thread = &current->thread;
25328+ unsigned long time;
25329
25330-unsigned long arch_randomize_brk(struct mm_struct *mm)
25331-{
25332- unsigned long range_end = mm->brk + 0x02000000;
25333- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
25334-}
25335+ if (!randomize_va_space)
25336+ return;
25337+
25338+ if (v8086_mode(regs))
25339+ return;
25340
25341+ rdtscl(time);
25342+
25343+ /* P4 seems to return a 0 LSB, ignore it */
25344+#ifdef CONFIG_MPENTIUM4
25345+ time &= 0x3EUL;
25346+ time <<= 2;
25347+#elif defined(CONFIG_X86_64)
25348+ time &= 0xFUL;
25349+ time <<= 4;
25350+#else
25351+ time &= 0x1FUL;
25352+ time <<= 3;
25353+#endif
25354+
25355+ thread->sp0 ^= time;
25356+ load_sp0(init_tss + smp_processor_id(), thread);
25357+
25358+#ifdef CONFIG_X86_64
25359+ this_cpu_write(kernel_stack, thread->sp0);
25360+#endif
25361+}
25362+#endif
25363diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
25364index 884f98f..ec23e04 100644
25365--- a/arch/x86/kernel/process_32.c
25366+++ b/arch/x86/kernel/process_32.c
25367@@ -65,6 +65,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
25368 unsigned long thread_saved_pc(struct task_struct *tsk)
25369 {
25370 return ((unsigned long *)tsk->thread.sp)[3];
25371+//XXX return tsk->thread.eip;
25372 }
25373
25374 void __show_regs(struct pt_regs *regs, int all)
25375@@ -74,19 +75,18 @@ void __show_regs(struct pt_regs *regs, int all)
25376 unsigned long sp;
25377 unsigned short ss, gs;
25378
25379- if (user_mode_vm(regs)) {
25380+ if (user_mode(regs)) {
25381 sp = regs->sp;
25382 ss = regs->ss & 0xffff;
25383- gs = get_user_gs(regs);
25384 } else {
25385 sp = kernel_stack_pointer(regs);
25386 savesegment(ss, ss);
25387- savesegment(gs, gs);
25388 }
25389+ gs = get_user_gs(regs);
25390
25391 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
25392 (u16)regs->cs, regs->ip, regs->flags,
25393- smp_processor_id());
25394+ raw_smp_processor_id());
25395 print_symbol("EIP is at %s\n", regs->ip);
25396
25397 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
25398@@ -133,20 +133,21 @@ void release_thread(struct task_struct *dead_task)
25399 int copy_thread(unsigned long clone_flags, unsigned long sp,
25400 unsigned long arg, struct task_struct *p)
25401 {
25402- struct pt_regs *childregs = task_pt_regs(p);
25403+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
25404 struct task_struct *tsk;
25405 int err;
25406
25407 p->thread.sp = (unsigned long) childregs;
25408 p->thread.sp0 = (unsigned long) (childregs+1);
25409+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
25410
25411 if (unlikely(p->flags & PF_KTHREAD)) {
25412 /* kernel thread */
25413 memset(childregs, 0, sizeof(struct pt_regs));
25414 p->thread.ip = (unsigned long) ret_from_kernel_thread;
25415- task_user_gs(p) = __KERNEL_STACK_CANARY;
25416- childregs->ds = __USER_DS;
25417- childregs->es = __USER_DS;
25418+ savesegment(gs, childregs->gs);
25419+ childregs->ds = __KERNEL_DS;
25420+ childregs->es = __KERNEL_DS;
25421 childregs->fs = __KERNEL_PERCPU;
25422 childregs->bx = sp; /* function */
25423 childregs->bp = arg;
25424@@ -253,7 +254,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25425 struct thread_struct *prev = &prev_p->thread,
25426 *next = &next_p->thread;
25427 int cpu = smp_processor_id();
25428- struct tss_struct *tss = &per_cpu(init_tss, cpu);
25429+ struct tss_struct *tss = init_tss + cpu;
25430 fpu_switch_t fpu;
25431
25432 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
25433@@ -277,6 +278,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25434 */
25435 lazy_save_gs(prev->gs);
25436
25437+#ifdef CONFIG_PAX_MEMORY_UDEREF
25438+ __set_fs(task_thread_info(next_p)->addr_limit);
25439+#endif
25440+
25441 /*
25442 * Load the per-thread Thread-Local Storage descriptor.
25443 */
25444@@ -307,6 +312,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25445 */
25446 arch_end_context_switch(next_p);
25447
25448+ this_cpu_write(current_task, next_p);
25449+ this_cpu_write(current_tinfo, &next_p->tinfo);
25450+
25451 /*
25452 * Restore %gs if needed (which is common)
25453 */
25454@@ -315,8 +323,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25455
25456 switch_fpu_finish(next_p, fpu);
25457
25458- this_cpu_write(current_task, next_p);
25459-
25460 return prev_p;
25461 }
25462
25463@@ -346,4 +352,3 @@ unsigned long get_wchan(struct task_struct *p)
25464 } while (count++ < 16);
25465 return 0;
25466 }
25467-
25468diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
25469index bb1dc51..08dda7f 100644
25470--- a/arch/x86/kernel/process_64.c
25471+++ b/arch/x86/kernel/process_64.c
25472@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
25473 struct pt_regs *childregs;
25474 struct task_struct *me = current;
25475
25476- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
25477+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
25478 childregs = task_pt_regs(p);
25479 p->thread.sp = (unsigned long) childregs;
25480 p->thread.usersp = me->thread.usersp;
25481+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
25482 set_tsk_thread_flag(p, TIF_FORK);
25483 p->fpu_counter = 0;
25484 p->thread.io_bitmap_ptr = NULL;
25485@@ -172,6 +173,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
25486 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
25487 savesegment(es, p->thread.es);
25488 savesegment(ds, p->thread.ds);
25489+ savesegment(ss, p->thread.ss);
25490+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
25491 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
25492
25493 if (unlikely(p->flags & PF_KTHREAD)) {
25494@@ -280,7 +283,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25495 struct thread_struct *prev = &prev_p->thread;
25496 struct thread_struct *next = &next_p->thread;
25497 int cpu = smp_processor_id();
25498- struct tss_struct *tss = &per_cpu(init_tss, cpu);
25499+ struct tss_struct *tss = init_tss + cpu;
25500 unsigned fsindex, gsindex;
25501 fpu_switch_t fpu;
25502
25503@@ -303,6 +306,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25504 if (unlikely(next->ds | prev->ds))
25505 loadsegment(ds, next->ds);
25506
25507+ savesegment(ss, prev->ss);
25508+ if (unlikely(next->ss != prev->ss))
25509+ loadsegment(ss, next->ss);
25510
25511 /* We must save %fs and %gs before load_TLS() because
25512 * %fs and %gs may be cleared by load_TLS().
25513@@ -362,10 +368,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
25514 prev->usersp = this_cpu_read(old_rsp);
25515 this_cpu_write(old_rsp, next->usersp);
25516 this_cpu_write(current_task, next_p);
25517+ this_cpu_write(current_tinfo, &next_p->tinfo);
25518
25519- this_cpu_write(kernel_stack,
25520- (unsigned long)task_stack_page(next_p) +
25521- THREAD_SIZE - KERNEL_STACK_OFFSET);
25522+ this_cpu_write(kernel_stack, next->sp0);
25523
25524 /*
25525 * Now maybe reload the debug registers and handle I/O bitmaps
25526@@ -434,12 +439,11 @@ unsigned long get_wchan(struct task_struct *p)
25527 if (!p || p == current || p->state == TASK_RUNNING)
25528 return 0;
25529 stack = (unsigned long)task_stack_page(p);
25530- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
25531+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
25532 return 0;
25533 fp = *(u64 *)(p->thread.sp);
25534 do {
25535- if (fp < (unsigned long)stack ||
25536- fp >= (unsigned long)stack+THREAD_SIZE)
25537+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
25538 return 0;
25539 ip = *(u64 *)(fp+8);
25540 if (!in_sched_functions(ip))
25541diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
25542index 7461f50..1334029 100644
25543--- a/arch/x86/kernel/ptrace.c
25544+++ b/arch/x86/kernel/ptrace.c
25545@@ -184,14 +184,13 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
25546 {
25547 unsigned long context = (unsigned long)regs & ~(THREAD_SIZE - 1);
25548 unsigned long sp = (unsigned long)&regs->sp;
25549- struct thread_info *tinfo;
25550
25551- if (context == (sp & ~(THREAD_SIZE - 1)))
25552+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
25553 return sp;
25554
25555- tinfo = (struct thread_info *)context;
25556- if (tinfo->previous_esp)
25557- return tinfo->previous_esp;
25558+ sp = *(unsigned long *)context;
25559+ if (sp)
25560+ return sp;
25561
25562 return (unsigned long)regs;
25563 }
25564@@ -588,7 +587,7 @@ static void ptrace_triggered(struct perf_event *bp,
25565 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
25566 {
25567 int i;
25568- int dr7 = 0;
25569+ unsigned long dr7 = 0;
25570 struct arch_hw_breakpoint *info;
25571
25572 for (i = 0; i < HBP_NUM; i++) {
25573@@ -822,7 +821,7 @@ long arch_ptrace(struct task_struct *child, long request,
25574 unsigned long addr, unsigned long data)
25575 {
25576 int ret;
25577- unsigned long __user *datap = (unsigned long __user *)data;
25578+ unsigned long __user *datap = (__force unsigned long __user *)data;
25579
25580 switch (request) {
25581 /* read the word at location addr in the USER area. */
25582@@ -907,14 +906,14 @@ long arch_ptrace(struct task_struct *child, long request,
25583 if ((int) addr < 0)
25584 return -EIO;
25585 ret = do_get_thread_area(child, addr,
25586- (struct user_desc __user *)data);
25587+ (__force struct user_desc __user *) data);
25588 break;
25589
25590 case PTRACE_SET_THREAD_AREA:
25591 if ((int) addr < 0)
25592 return -EIO;
25593 ret = do_set_thread_area(child, addr,
25594- (struct user_desc __user *)data, 0);
25595+ (__force struct user_desc __user *) data, 0);
25596 break;
25597 #endif
25598
25599@@ -1292,7 +1291,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
25600
25601 #ifdef CONFIG_X86_64
25602
25603-static struct user_regset x86_64_regsets[] __read_mostly = {
25604+static user_regset_no_const x86_64_regsets[] __read_only = {
25605 [REGSET_GENERAL] = {
25606 .core_note_type = NT_PRSTATUS,
25607 .n = sizeof(struct user_regs_struct) / sizeof(long),
25608@@ -1333,7 +1332,7 @@ static const struct user_regset_view user_x86_64_view = {
25609 #endif /* CONFIG_X86_64 */
25610
25611 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
25612-static struct user_regset x86_32_regsets[] __read_mostly = {
25613+static user_regset_no_const x86_32_regsets[] __read_only = {
25614 [REGSET_GENERAL] = {
25615 .core_note_type = NT_PRSTATUS,
25616 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
25617@@ -1386,7 +1385,7 @@ static const struct user_regset_view user_x86_32_view = {
25618 */
25619 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
25620
25621-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
25622+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
25623 {
25624 #ifdef CONFIG_X86_64
25625 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
25626@@ -1421,7 +1420,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
25627 memset(info, 0, sizeof(*info));
25628 info->si_signo = SIGTRAP;
25629 info->si_code = si_code;
25630- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
25631+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
25632 }
25633
25634 void user_single_step_siginfo(struct task_struct *tsk,
25635@@ -1450,6 +1449,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
25636 # define IS_IA32 0
25637 #endif
25638
25639+#ifdef CONFIG_GRKERNSEC_SETXID
25640+extern void gr_delayed_cred_worker(void);
25641+#endif
25642+
25643 /*
25644 * We must return the syscall number to actually look up in the table.
25645 * This can be -1L to skip running any syscall at all.
25646@@ -1460,6 +1463,11 @@ long syscall_trace_enter(struct pt_regs *regs)
25647
25648 user_exit();
25649
25650+#ifdef CONFIG_GRKERNSEC_SETXID
25651+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
25652+ gr_delayed_cred_worker();
25653+#endif
25654+
25655 /*
25656 * If we stepped into a sysenter/syscall insn, it trapped in
25657 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
25658@@ -1515,6 +1523,11 @@ void syscall_trace_leave(struct pt_regs *regs)
25659 */
25660 user_exit();
25661
25662+#ifdef CONFIG_GRKERNSEC_SETXID
25663+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
25664+ gr_delayed_cred_worker();
25665+#endif
25666+
25667 audit_syscall_exit(regs);
25668
25669 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
25670diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
25671index a16bae3..1f65f25 100644
25672--- a/arch/x86/kernel/pvclock.c
25673+++ b/arch/x86/kernel/pvclock.c
25674@@ -43,11 +43,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
25675 return pv_tsc_khz;
25676 }
25677
25678-static atomic64_t last_value = ATOMIC64_INIT(0);
25679+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
25680
25681 void pvclock_resume(void)
25682 {
25683- atomic64_set(&last_value, 0);
25684+ atomic64_set_unchecked(&last_value, 0);
25685 }
25686
25687 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
25688@@ -92,11 +92,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
25689 * updating at the same time, and one of them could be slightly behind,
25690 * making the assumption that last_value always go forward fail to hold.
25691 */
25692- last = atomic64_read(&last_value);
25693+ last = atomic64_read_unchecked(&last_value);
25694 do {
25695 if (ret < last)
25696 return last;
25697- last = atomic64_cmpxchg(&last_value, last, ret);
25698+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
25699 } while (unlikely(last != ret));
25700
25701 return ret;
25702diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
25703index 618ce26..ec7e21c 100644
25704--- a/arch/x86/kernel/reboot.c
25705+++ b/arch/x86/kernel/reboot.c
25706@@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
25707
25708 void __noreturn machine_real_restart(unsigned int type)
25709 {
25710+
25711+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
25712+ struct desc_struct *gdt;
25713+#endif
25714+
25715 local_irq_disable();
25716
25717 /*
25718@@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type)
25719
25720 /* Jump to the identity-mapped low memory code */
25721 #ifdef CONFIG_X86_32
25722- asm volatile("jmpl *%0" : :
25723+
25724+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
25725+ gdt = get_cpu_gdt_table(smp_processor_id());
25726+ pax_open_kernel();
25727+#ifdef CONFIG_PAX_MEMORY_UDEREF
25728+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
25729+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
25730+ loadsegment(ds, __KERNEL_DS);
25731+ loadsegment(es, __KERNEL_DS);
25732+ loadsegment(ss, __KERNEL_DS);
25733+#endif
25734+#ifdef CONFIG_PAX_KERNEXEC
25735+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
25736+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
25737+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
25738+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
25739+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
25740+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
25741+#endif
25742+ pax_close_kernel();
25743+#endif
25744+
25745+ asm volatile("ljmpl *%0" : :
25746 "rm" (real_mode_header->machine_real_restart_asm),
25747 "a" (type));
25748 #else
25749@@ -466,7 +493,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
25750 * try to force a triple fault and then cycle between hitting the keyboard
25751 * controller and doing that
25752 */
25753-static void native_machine_emergency_restart(void)
25754+static void __noreturn native_machine_emergency_restart(void)
25755 {
25756 int i;
25757 int attempt = 0;
25758@@ -575,13 +602,13 @@ void native_machine_shutdown(void)
25759 #endif
25760 }
25761
25762-static void __machine_emergency_restart(int emergency)
25763+static void __noreturn __machine_emergency_restart(int emergency)
25764 {
25765 reboot_emergency = emergency;
25766 machine_ops.emergency_restart();
25767 }
25768
25769-static void native_machine_restart(char *__unused)
25770+static void __noreturn native_machine_restart(char *__unused)
25771 {
25772 pr_notice("machine restart\n");
25773
25774@@ -590,7 +617,7 @@ static void native_machine_restart(char *__unused)
25775 __machine_emergency_restart(0);
25776 }
25777
25778-static void native_machine_halt(void)
25779+static void __noreturn native_machine_halt(void)
25780 {
25781 /* Stop other cpus and apics */
25782 machine_shutdown();
25783@@ -600,7 +627,7 @@ static void native_machine_halt(void)
25784 stop_this_cpu(NULL);
25785 }
25786
25787-static void native_machine_power_off(void)
25788+static void __noreturn native_machine_power_off(void)
25789 {
25790 if (pm_power_off) {
25791 if (!reboot_force)
25792@@ -609,9 +636,10 @@ static void native_machine_power_off(void)
25793 }
25794 /* A fallback in case there is no PM info available */
25795 tboot_shutdown(TB_SHUTDOWN_HALT);
25796+ unreachable();
25797 }
25798
25799-struct machine_ops machine_ops = {
25800+struct machine_ops machine_ops __read_only = {
25801 .power_off = native_machine_power_off,
25802 .shutdown = native_machine_shutdown,
25803 .emergency_restart = native_machine_emergency_restart,
25804diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
25805index c8e41e9..64049ef 100644
25806--- a/arch/x86/kernel/reboot_fixups_32.c
25807+++ b/arch/x86/kernel/reboot_fixups_32.c
25808@@ -57,7 +57,7 @@ struct device_fixup {
25809 unsigned int vendor;
25810 unsigned int device;
25811 void (*reboot_fixup)(struct pci_dev *);
25812-};
25813+} __do_const;
25814
25815 /*
25816 * PCI ids solely used for fixups_table go here
25817diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
25818index 3fd2c69..16ef367 100644
25819--- a/arch/x86/kernel/relocate_kernel_64.S
25820+++ b/arch/x86/kernel/relocate_kernel_64.S
25821@@ -11,6 +11,7 @@
25822 #include <asm/kexec.h>
25823 #include <asm/processor-flags.h>
25824 #include <asm/pgtable_types.h>
25825+#include <asm/alternative-asm.h>
25826
25827 /*
25828 * Must be relocatable PIC code callable as a C function
25829@@ -96,8 +97,7 @@ relocate_kernel:
25830
25831 /* jump to identity mapped page */
25832 addq $(identity_mapped - relocate_kernel), %r8
25833- pushq %r8
25834- ret
25835+ jmp *%r8
25836
25837 identity_mapped:
25838 /* set return address to 0 if not preserving context */
25839@@ -167,6 +167,7 @@ identity_mapped:
25840 xorl %r14d, %r14d
25841 xorl %r15d, %r15d
25842
25843+ pax_force_retaddr 0, 1
25844 ret
25845
25846 1:
25847diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
25848index f0de629..a4978a8f 100644
25849--- a/arch/x86/kernel/setup.c
25850+++ b/arch/x86/kernel/setup.c
25851@@ -110,6 +110,7 @@
25852 #include <asm/mce.h>
25853 #include <asm/alternative.h>
25854 #include <asm/prom.h>
25855+#include <asm/boot.h>
25856
25857 /*
25858 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
25859@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
25860 #endif
25861
25862
25863-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
25864-__visible unsigned long mmu_cr4_features;
25865+#ifdef CONFIG_X86_64
25866+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
25867+#elif defined(CONFIG_X86_PAE)
25868+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
25869 #else
25870-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
25871+__visible unsigned long mmu_cr4_features __read_only;
25872 #endif
25873
25874+void set_in_cr4(unsigned long mask)
25875+{
25876+ unsigned long cr4 = read_cr4();
25877+
25878+ if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
25879+ return;
25880+
25881+ pax_open_kernel();
25882+ mmu_cr4_features |= mask;
25883+ pax_close_kernel();
25884+
25885+ if (trampoline_cr4_features)
25886+ *trampoline_cr4_features = mmu_cr4_features;
25887+ cr4 |= mask;
25888+ write_cr4(cr4);
25889+}
25890+EXPORT_SYMBOL(set_in_cr4);
25891+
25892+void clear_in_cr4(unsigned long mask)
25893+{
25894+ unsigned long cr4 = read_cr4();
25895+
25896+ if (!(cr4 & mask) && cr4 == mmu_cr4_features)
25897+ return;
25898+
25899+ pax_open_kernel();
25900+ mmu_cr4_features &= ~mask;
25901+ pax_close_kernel();
25902+
25903+ if (trampoline_cr4_features)
25904+ *trampoline_cr4_features = mmu_cr4_features;
25905+ cr4 &= ~mask;
25906+ write_cr4(cr4);
25907+}
25908+EXPORT_SYMBOL(clear_in_cr4);
25909+
25910 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
25911 int bootloader_type, bootloader_version;
25912
25913@@ -768,7 +807,7 @@ static void __init trim_bios_range(void)
25914 * area (640->1Mb) as ram even though it is not.
25915 * take them out.
25916 */
25917- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
25918+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
25919
25920 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
25921 }
25922@@ -776,7 +815,7 @@ static void __init trim_bios_range(void)
25923 /* called before trim_bios_range() to spare extra sanitize */
25924 static void __init e820_add_kernel_range(void)
25925 {
25926- u64 start = __pa_symbol(_text);
25927+ u64 start = __pa_symbol(ktla_ktva(_text));
25928 u64 size = __pa_symbol(_end) - start;
25929
25930 /*
25931@@ -838,8 +877,12 @@ static void __init trim_low_memory_range(void)
25932
25933 void __init setup_arch(char **cmdline_p)
25934 {
25935+#ifdef CONFIG_X86_32
25936+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
25937+#else
25938 memblock_reserve(__pa_symbol(_text),
25939 (unsigned long)__bss_stop - (unsigned long)_text);
25940+#endif
25941
25942 early_reserve_initrd();
25943
25944@@ -931,14 +974,14 @@ void __init setup_arch(char **cmdline_p)
25945
25946 if (!boot_params.hdr.root_flags)
25947 root_mountflags &= ~MS_RDONLY;
25948- init_mm.start_code = (unsigned long) _text;
25949- init_mm.end_code = (unsigned long) _etext;
25950+ init_mm.start_code = ktla_ktva((unsigned long) _text);
25951+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
25952 init_mm.end_data = (unsigned long) _edata;
25953 init_mm.brk = _brk_end;
25954
25955- code_resource.start = __pa_symbol(_text);
25956- code_resource.end = __pa_symbol(_etext)-1;
25957- data_resource.start = __pa_symbol(_etext);
25958+ code_resource.start = __pa_symbol(ktla_ktva(_text));
25959+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
25960+ data_resource.start = __pa_symbol(_sdata);
25961 data_resource.end = __pa_symbol(_edata)-1;
25962 bss_resource.start = __pa_symbol(__bss_start);
25963 bss_resource.end = __pa_symbol(__bss_stop)-1;
25964diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
25965index 5cdff03..80fa283 100644
25966--- a/arch/x86/kernel/setup_percpu.c
25967+++ b/arch/x86/kernel/setup_percpu.c
25968@@ -21,19 +21,17 @@
25969 #include <asm/cpu.h>
25970 #include <asm/stackprotector.h>
25971
25972-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
25973+#ifdef CONFIG_SMP
25974+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
25975 EXPORT_PER_CPU_SYMBOL(cpu_number);
25976+#endif
25977
25978-#ifdef CONFIG_X86_64
25979 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
25980-#else
25981-#define BOOT_PERCPU_OFFSET 0
25982-#endif
25983
25984 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
25985 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
25986
25987-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
25988+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
25989 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
25990 };
25991 EXPORT_SYMBOL(__per_cpu_offset);
25992@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
25993 {
25994 #ifdef CONFIG_NEED_MULTIPLE_NODES
25995 pg_data_t *last = NULL;
25996- unsigned int cpu;
25997+ int cpu;
25998
25999 for_each_possible_cpu(cpu) {
26000 int node = early_cpu_to_node(cpu);
26001@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
26002 {
26003 #ifdef CONFIG_X86_32
26004 struct desc_struct gdt;
26005+ unsigned long base = per_cpu_offset(cpu);
26006
26007- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
26008- 0x2 | DESCTYPE_S, 0x8);
26009- gdt.s = 1;
26010+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
26011+ 0x83 | DESCTYPE_S, 0xC);
26012 write_gdt_entry(get_cpu_gdt_table(cpu),
26013 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
26014 #endif
26015@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
26016 /* alrighty, percpu areas up and running */
26017 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
26018 for_each_possible_cpu(cpu) {
26019+#ifdef CONFIG_CC_STACKPROTECTOR
26020+#ifdef CONFIG_X86_32
26021+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
26022+#endif
26023+#endif
26024 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
26025 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
26026 per_cpu(cpu_number, cpu) = cpu;
26027@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
26028 */
26029 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
26030 #endif
26031+#ifdef CONFIG_CC_STACKPROTECTOR
26032+#ifdef CONFIG_X86_32
26033+ if (!cpu)
26034+ per_cpu(stack_canary.canary, cpu) = canary;
26035+#endif
26036+#endif
26037 /*
26038 * Up to this point, the boot CPU has been using .init.data
26039 * area. Reload any changed state for the boot CPU.
26040diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
26041index 9e5de68..16c53cb 100644
26042--- a/arch/x86/kernel/signal.c
26043+++ b/arch/x86/kernel/signal.c
26044@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
26045 * Align the stack pointer according to the i386 ABI,
26046 * i.e. so that on function entry ((sp + 4) & 15) == 0.
26047 */
26048- sp = ((sp + 4) & -16ul) - 4;
26049+ sp = ((sp - 12) & -16ul) - 4;
26050 #else /* !CONFIG_X86_32 */
26051 sp = round_down(sp, 16) - 8;
26052 #endif
26053@@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26054 }
26055
26056 if (current->mm->context.vdso)
26057- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26058+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26059 else
26060- restorer = &frame->retcode;
26061+ restorer = (void __user *)&frame->retcode;
26062 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26063 restorer = ksig->ka.sa.sa_restorer;
26064
26065@@ -314,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26066 * reasons and because gdb uses it as a signature to notice
26067 * signal handler stack frames.
26068 */
26069- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
26070+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
26071
26072 if (err)
26073 return -EFAULT;
26074@@ -361,7 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26075 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
26076
26077 /* Set up to return from userspace. */
26078- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26079+ if (current->mm->context.vdso)
26080+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26081+ else
26082+ restorer = (void __user *)&frame->retcode;
26083 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26084 restorer = ksig->ka.sa.sa_restorer;
26085 put_user_ex(restorer, &frame->pretcode);
26086@@ -373,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26087 * reasons and because gdb uses it as a signature to notice
26088 * signal handler stack frames.
26089 */
26090- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
26091+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
26092 } put_user_catch(err);
26093
26094 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
26095@@ -609,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26096 {
26097 int usig = signr_convert(ksig->sig);
26098 sigset_t *set = sigmask_to_save();
26099- compat_sigset_t *cset = (compat_sigset_t *) set;
26100+ sigset_t sigcopy;
26101+ compat_sigset_t *cset;
26102+
26103+ sigcopy = *set;
26104+
26105+ cset = (compat_sigset_t *) &sigcopy;
26106
26107 /* Set up the stack frame */
26108 if (is_ia32_frame()) {
26109@@ -620,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26110 } else if (is_x32_frame()) {
26111 return x32_setup_rt_frame(ksig, cset, regs);
26112 } else {
26113- return __setup_rt_frame(ksig->sig, ksig, set, regs);
26114+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
26115 }
26116 }
26117
26118diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
26119index 7c3a5a6..f0a8961 100644
26120--- a/arch/x86/kernel/smp.c
26121+++ b/arch/x86/kernel/smp.c
26122@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
26123
26124 __setup("nonmi_ipi", nonmi_ipi_setup);
26125
26126-struct smp_ops smp_ops = {
26127+struct smp_ops smp_ops __read_only = {
26128 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
26129 .smp_prepare_cpus = native_smp_prepare_cpus,
26130 .smp_cpus_done = native_smp_cpus_done,
26131diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
26132index 6cacab6..750636a 100644
26133--- a/arch/x86/kernel/smpboot.c
26134+++ b/arch/x86/kernel/smpboot.c
26135@@ -251,14 +251,18 @@ static void notrace start_secondary(void *unused)
26136
26137 enable_start_cpu0 = 0;
26138
26139-#ifdef CONFIG_X86_32
26140- /* switch away from the initial page table */
26141- load_cr3(swapper_pg_dir);
26142- __flush_tlb_all();
26143-#endif
26144-
26145 /* otherwise gcc will move up smp_processor_id before the cpu_init */
26146 barrier();
26147+
26148+ /* switch away from the initial page table */
26149+#ifdef CONFIG_PAX_PER_CPU_PGD
26150+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
26151+ __flush_tlb_all();
26152+#elif defined(CONFIG_X86_32)
26153+ load_cr3(swapper_pg_dir);
26154+ __flush_tlb_all();
26155+#endif
26156+
26157 /*
26158 * Check TSC synchronization with the BP:
26159 */
26160@@ -749,6 +753,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
26161 idle->thread.sp = (unsigned long) (((struct pt_regs *)
26162 (THREAD_SIZE + task_stack_page(idle))) - 1);
26163 per_cpu(current_task, cpu) = idle;
26164+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
26165
26166 #ifdef CONFIG_X86_32
26167 /* Stack for startup_32 can be just as for start_secondary onwards */
26168@@ -756,11 +761,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
26169 #else
26170 clear_tsk_thread_flag(idle, TIF_FORK);
26171 initial_gs = per_cpu_offset(cpu);
26172- per_cpu(kernel_stack, cpu) =
26173- (unsigned long)task_stack_page(idle) -
26174- KERNEL_STACK_OFFSET + THREAD_SIZE;
26175+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
26176 #endif
26177+
26178+ pax_open_kernel();
26179 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
26180+ pax_close_kernel();
26181+
26182 initial_code = (unsigned long)start_secondary;
26183 stack_start = idle->thread.sp;
26184
26185@@ -909,6 +916,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
26186 /* the FPU context is blank, nobody can own it */
26187 __cpu_disable_lazy_restore(cpu);
26188
26189+#ifdef CONFIG_PAX_PER_CPU_PGD
26190+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
26191+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
26192+ KERNEL_PGD_PTRS);
26193+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
26194+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
26195+ KERNEL_PGD_PTRS);
26196+#endif
26197+
26198 err = do_boot_cpu(apicid, cpu, tidle);
26199 if (err) {
26200 pr_debug("do_boot_cpu failed %d\n", err);
26201diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
26202index 9b4d51d..5d28b58 100644
26203--- a/arch/x86/kernel/step.c
26204+++ b/arch/x86/kernel/step.c
26205@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
26206 struct desc_struct *desc;
26207 unsigned long base;
26208
26209- seg &= ~7UL;
26210+ seg >>= 3;
26211
26212 mutex_lock(&child->mm->context.lock);
26213- if (unlikely((seg >> 3) >= child->mm->context.size))
26214+ if (unlikely(seg >= child->mm->context.size))
26215 addr = -1L; /* bogus selector, access would fault */
26216 else {
26217 desc = child->mm->context.ldt + seg;
26218@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
26219 addr += base;
26220 }
26221 mutex_unlock(&child->mm->context.lock);
26222- }
26223+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
26224+ addr = ktla_ktva(addr);
26225
26226 return addr;
26227 }
26228@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
26229 unsigned char opcode[15];
26230 unsigned long addr = convert_ip_to_linear(child, regs);
26231
26232+ if (addr == -EINVAL)
26233+ return 0;
26234+
26235 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
26236 for (i = 0; i < copied; i++) {
26237 switch (opcode[i]) {
26238diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
26239new file mode 100644
26240index 0000000..5877189
26241--- /dev/null
26242+++ b/arch/x86/kernel/sys_i386_32.c
26243@@ -0,0 +1,189 @@
26244+/*
26245+ * This file contains various random system calls that
26246+ * have a non-standard calling sequence on the Linux/i386
26247+ * platform.
26248+ */
26249+
26250+#include <linux/errno.h>
26251+#include <linux/sched.h>
26252+#include <linux/mm.h>
26253+#include <linux/fs.h>
26254+#include <linux/smp.h>
26255+#include <linux/sem.h>
26256+#include <linux/msg.h>
26257+#include <linux/shm.h>
26258+#include <linux/stat.h>
26259+#include <linux/syscalls.h>
26260+#include <linux/mman.h>
26261+#include <linux/file.h>
26262+#include <linux/utsname.h>
26263+#include <linux/ipc.h>
26264+#include <linux/elf.h>
26265+
26266+#include <linux/uaccess.h>
26267+#include <linux/unistd.h>
26268+
26269+#include <asm/syscalls.h>
26270+
26271+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
26272+{
26273+ unsigned long pax_task_size = TASK_SIZE;
26274+
26275+#ifdef CONFIG_PAX_SEGMEXEC
26276+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
26277+ pax_task_size = SEGMEXEC_TASK_SIZE;
26278+#endif
26279+
26280+ if (flags & MAP_FIXED)
26281+ if (len > pax_task_size || addr > pax_task_size - len)
26282+ return -EINVAL;
26283+
26284+ return 0;
26285+}
26286+
26287+/*
26288+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
26289+ */
26290+static unsigned long get_align_mask(void)
26291+{
26292+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
26293+ return 0;
26294+
26295+ if (!(current->flags & PF_RANDOMIZE))
26296+ return 0;
26297+
26298+ return va_align.mask;
26299+}
26300+
26301+unsigned long
26302+arch_get_unmapped_area(struct file *filp, unsigned long addr,
26303+ unsigned long len, unsigned long pgoff, unsigned long flags)
26304+{
26305+ struct mm_struct *mm = current->mm;
26306+ struct vm_area_struct *vma;
26307+ unsigned long pax_task_size = TASK_SIZE;
26308+ struct vm_unmapped_area_info info;
26309+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26310+
26311+#ifdef CONFIG_PAX_SEGMEXEC
26312+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
26313+ pax_task_size = SEGMEXEC_TASK_SIZE;
26314+#endif
26315+
26316+ pax_task_size -= PAGE_SIZE;
26317+
26318+ if (len > pax_task_size)
26319+ return -ENOMEM;
26320+
26321+ if (flags & MAP_FIXED)
26322+ return addr;
26323+
26324+#ifdef CONFIG_PAX_RANDMMAP
26325+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26326+#endif
26327+
26328+ if (addr) {
26329+ addr = PAGE_ALIGN(addr);
26330+ if (pax_task_size - len >= addr) {
26331+ vma = find_vma(mm, addr);
26332+ if (check_heap_stack_gap(vma, addr, len, offset))
26333+ return addr;
26334+ }
26335+ }
26336+
26337+ info.flags = 0;
26338+ info.length = len;
26339+ info.align_mask = filp ? get_align_mask() : 0;
26340+ info.align_offset = pgoff << PAGE_SHIFT;
26341+ info.threadstack_offset = offset;
26342+
26343+#ifdef CONFIG_PAX_PAGEEXEC
26344+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
26345+ info.low_limit = 0x00110000UL;
26346+ info.high_limit = mm->start_code;
26347+
26348+#ifdef CONFIG_PAX_RANDMMAP
26349+ if (mm->pax_flags & MF_PAX_RANDMMAP)
26350+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
26351+#endif
26352+
26353+ if (info.low_limit < info.high_limit) {
26354+ addr = vm_unmapped_area(&info);
26355+ if (!IS_ERR_VALUE(addr))
26356+ return addr;
26357+ }
26358+ } else
26359+#endif
26360+
26361+ info.low_limit = mm->mmap_base;
26362+ info.high_limit = pax_task_size;
26363+
26364+ return vm_unmapped_area(&info);
26365+}
26366+
26367+unsigned long
26368+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
26369+ const unsigned long len, const unsigned long pgoff,
26370+ const unsigned long flags)
26371+{
26372+ struct vm_area_struct *vma;
26373+ struct mm_struct *mm = current->mm;
26374+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
26375+ struct vm_unmapped_area_info info;
26376+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26377+
26378+#ifdef CONFIG_PAX_SEGMEXEC
26379+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
26380+ pax_task_size = SEGMEXEC_TASK_SIZE;
26381+#endif
26382+
26383+ pax_task_size -= PAGE_SIZE;
26384+
26385+ /* requested length too big for entire address space */
26386+ if (len > pax_task_size)
26387+ return -ENOMEM;
26388+
26389+ if (flags & MAP_FIXED)
26390+ return addr;
26391+
26392+#ifdef CONFIG_PAX_PAGEEXEC
26393+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
26394+ goto bottomup;
26395+#endif
26396+
26397+#ifdef CONFIG_PAX_RANDMMAP
26398+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26399+#endif
26400+
26401+ /* requesting a specific address */
26402+ if (addr) {
26403+ addr = PAGE_ALIGN(addr);
26404+ if (pax_task_size - len >= addr) {
26405+ vma = find_vma(mm, addr);
26406+ if (check_heap_stack_gap(vma, addr, len, offset))
26407+ return addr;
26408+ }
26409+ }
26410+
26411+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
26412+ info.length = len;
26413+ info.low_limit = PAGE_SIZE;
26414+ info.high_limit = mm->mmap_base;
26415+ info.align_mask = filp ? get_align_mask() : 0;
26416+ info.align_offset = pgoff << PAGE_SHIFT;
26417+ info.threadstack_offset = offset;
26418+
26419+ addr = vm_unmapped_area(&info);
26420+ if (!(addr & ~PAGE_MASK))
26421+ return addr;
26422+ VM_BUG_ON(addr != -ENOMEM);
26423+
26424+bottomup:
26425+ /*
26426+ * A failed mmap() very likely causes application failure,
26427+ * so fall back to the bottom-up function here. This scenario
26428+ * can happen with large stack limits and large mmap()
26429+ * allocations.
26430+ */
26431+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
26432+}
26433diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
26434index 30277e2..5664a29 100644
26435--- a/arch/x86/kernel/sys_x86_64.c
26436+++ b/arch/x86/kernel/sys_x86_64.c
26437@@ -81,8 +81,8 @@ out:
26438 return error;
26439 }
26440
26441-static void find_start_end(unsigned long flags, unsigned long *begin,
26442- unsigned long *end)
26443+static void find_start_end(struct mm_struct *mm, unsigned long flags,
26444+ unsigned long *begin, unsigned long *end)
26445 {
26446 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
26447 unsigned long new_begin;
26448@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
26449 *begin = new_begin;
26450 }
26451 } else {
26452- *begin = current->mm->mmap_legacy_base;
26453+ *begin = mm->mmap_legacy_base;
26454 *end = TASK_SIZE;
26455 }
26456 }
26457@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
26458 struct vm_area_struct *vma;
26459 struct vm_unmapped_area_info info;
26460 unsigned long begin, end;
26461+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26462
26463 if (flags & MAP_FIXED)
26464 return addr;
26465
26466- find_start_end(flags, &begin, &end);
26467+ find_start_end(mm, flags, &begin, &end);
26468
26469 if (len > end)
26470 return -ENOMEM;
26471
26472+#ifdef CONFIG_PAX_RANDMMAP
26473+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26474+#endif
26475+
26476 if (addr) {
26477 addr = PAGE_ALIGN(addr);
26478 vma = find_vma(mm, addr);
26479- if (end - len >= addr &&
26480- (!vma || addr + len <= vma->vm_start))
26481+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
26482 return addr;
26483 }
26484
26485@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
26486 info.high_limit = end;
26487 info.align_mask = filp ? get_align_mask() : 0;
26488 info.align_offset = pgoff << PAGE_SHIFT;
26489+ info.threadstack_offset = offset;
26490 return vm_unmapped_area(&info);
26491 }
26492
26493@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
26494 struct mm_struct *mm = current->mm;
26495 unsigned long addr = addr0;
26496 struct vm_unmapped_area_info info;
26497+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
26498
26499 /* requested length too big for entire address space */
26500 if (len > TASK_SIZE)
26501@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
26502 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
26503 goto bottomup;
26504
26505+#ifdef CONFIG_PAX_RANDMMAP
26506+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26507+#endif
26508+
26509 /* requesting a specific address */
26510 if (addr) {
26511 addr = PAGE_ALIGN(addr);
26512 vma = find_vma(mm, addr);
26513- if (TASK_SIZE - len >= addr &&
26514- (!vma || addr + len <= vma->vm_start))
26515+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
26516 return addr;
26517 }
26518
26519@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
26520 info.high_limit = mm->mmap_base;
26521 info.align_mask = filp ? get_align_mask() : 0;
26522 info.align_offset = pgoff << PAGE_SHIFT;
26523+ info.threadstack_offset = offset;
26524 addr = vm_unmapped_area(&info);
26525 if (!(addr & ~PAGE_MASK))
26526 return addr;
26527diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
26528index 91a4496..1730bff 100644
26529--- a/arch/x86/kernel/tboot.c
26530+++ b/arch/x86/kernel/tboot.c
26531@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
26532
26533 void tboot_shutdown(u32 shutdown_type)
26534 {
26535- void (*shutdown)(void);
26536+ void (* __noreturn shutdown)(void);
26537
26538 if (!tboot_enabled())
26539 return;
26540@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
26541
26542 switch_to_tboot_pt();
26543
26544- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
26545+ shutdown = (void *)tboot->shutdown_entry;
26546 shutdown();
26547
26548 /* should not reach here */
26549@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
26550 return -ENODEV;
26551 }
26552
26553-static atomic_t ap_wfs_count;
26554+static atomic_unchecked_t ap_wfs_count;
26555
26556 static int tboot_wait_for_aps(int num_aps)
26557 {
26558@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
26559 {
26560 switch (action) {
26561 case CPU_DYING:
26562- atomic_inc(&ap_wfs_count);
26563+ atomic_inc_unchecked(&ap_wfs_count);
26564 if (num_online_cpus() == 1)
26565- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
26566+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
26567 return NOTIFY_BAD;
26568 break;
26569 }
26570@@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
26571
26572 tboot_create_trampoline();
26573
26574- atomic_set(&ap_wfs_count, 0);
26575+ atomic_set_unchecked(&ap_wfs_count, 0);
26576 register_hotcpu_notifier(&tboot_cpu_notifier);
26577
26578 #ifdef CONFIG_DEBUG_FS
26579diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
26580index 24d3c91..d06b473 100644
26581--- a/arch/x86/kernel/time.c
26582+++ b/arch/x86/kernel/time.c
26583@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
26584 {
26585 unsigned long pc = instruction_pointer(regs);
26586
26587- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
26588+ if (!user_mode(regs) && in_lock_functions(pc)) {
26589 #ifdef CONFIG_FRAME_POINTER
26590- return *(unsigned long *)(regs->bp + sizeof(long));
26591+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
26592 #else
26593 unsigned long *sp =
26594 (unsigned long *)kernel_stack_pointer(regs);
26595@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
26596 * or above a saved flags. Eflags has bits 22-31 zero,
26597 * kernel addresses don't.
26598 */
26599+
26600+#ifdef CONFIG_PAX_KERNEXEC
26601+ return ktla_ktva(sp[0]);
26602+#else
26603 if (sp[0] >> 22)
26604 return sp[0];
26605 if (sp[1] >> 22)
26606 return sp[1];
26607 #endif
26608+
26609+#endif
26610 }
26611 return pc;
26612 }
26613diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
26614index f7fec09..9991981 100644
26615--- a/arch/x86/kernel/tls.c
26616+++ b/arch/x86/kernel/tls.c
26617@@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
26618 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
26619 return -EINVAL;
26620
26621+#ifdef CONFIG_PAX_SEGMEXEC
26622+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
26623+ return -EINVAL;
26624+#endif
26625+
26626 set_tls_desc(p, idx, &info, 1);
26627
26628 return 0;
26629@@ -200,7 +205,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
26630
26631 if (kbuf)
26632 info = kbuf;
26633- else if (__copy_from_user(infobuf, ubuf, count))
26634+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
26635 return -EFAULT;
26636 else
26637 info = infobuf;
26638diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
26639index 1c113db..287b42e 100644
26640--- a/arch/x86/kernel/tracepoint.c
26641+++ b/arch/x86/kernel/tracepoint.c
26642@@ -9,11 +9,11 @@
26643 #include <linux/atomic.h>
26644
26645 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
26646-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
26647+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
26648 (unsigned long) trace_idt_table };
26649
26650 /* No need to be aligned, but done to keep all IDTs defined the same way. */
26651-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
26652+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
26653
26654 static int trace_irq_vector_refcount;
26655 static DEFINE_MUTEX(irq_vector_mutex);
26656diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
26657index 8c8093b..c93f581 100644
26658--- a/arch/x86/kernel/traps.c
26659+++ b/arch/x86/kernel/traps.c
26660@@ -66,7 +66,7 @@
26661 #include <asm/proto.h>
26662
26663 /* No need to be aligned, but done to keep all IDTs defined the same way. */
26664-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
26665+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
26666 #else
26667 #include <asm/processor-flags.h>
26668 #include <asm/setup.h>
26669@@ -75,7 +75,7 @@ asmlinkage int system_call(void);
26670 #endif
26671
26672 /* Must be page-aligned because the real IDT is used in a fixmap. */
26673-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
26674+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
26675
26676 DECLARE_BITMAP(used_vectors, NR_VECTORS);
26677 EXPORT_SYMBOL_GPL(used_vectors);
26678@@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
26679 }
26680
26681 static int __kprobes
26682-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
26683+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
26684 struct pt_regs *regs, long error_code)
26685 {
26686 #ifdef CONFIG_X86_32
26687- if (regs->flags & X86_VM_MASK) {
26688+ if (v8086_mode(regs)) {
26689 /*
26690 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
26691 * On nmi (interrupt 2), do_trap should not be called.
26692@@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
26693 return -1;
26694 }
26695 #endif
26696- if (!user_mode(regs)) {
26697+ if (!user_mode_novm(regs)) {
26698 if (!fixup_exception(regs)) {
26699 tsk->thread.error_code = error_code;
26700 tsk->thread.trap_nr = trapnr;
26701+
26702+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26703+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
26704+ str = "PAX: suspicious stack segment fault";
26705+#endif
26706+
26707 die(str, regs, error_code);
26708 }
26709+
26710+#ifdef CONFIG_PAX_REFCOUNT
26711+ if (trapnr == 4)
26712+ pax_report_refcount_overflow(regs);
26713+#endif
26714+
26715 return 0;
26716 }
26717
26718@@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
26719 }
26720
26721 static void __kprobes
26722-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
26723+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
26724 long error_code, siginfo_t *info)
26725 {
26726 struct task_struct *tsk = current;
26727@@ -161,7 +173,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
26728 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
26729 printk_ratelimit()) {
26730 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
26731- tsk->comm, tsk->pid, str,
26732+ tsk->comm, task_pid_nr(tsk), str,
26733 regs->ip, regs->sp, error_code);
26734 print_vma_addr(" in ", regs->ip);
26735 pr_cont("\n");
26736@@ -277,7 +289,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
26737 conditional_sti(regs);
26738
26739 #ifdef CONFIG_X86_32
26740- if (regs->flags & X86_VM_MASK) {
26741+ if (v8086_mode(regs)) {
26742 local_irq_enable();
26743 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
26744 goto exit;
26745@@ -285,18 +297,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
26746 #endif
26747
26748 tsk = current;
26749- if (!user_mode(regs)) {
26750+ if (!user_mode_novm(regs)) {
26751 if (fixup_exception(regs))
26752 goto exit;
26753
26754 tsk->thread.error_code = error_code;
26755 tsk->thread.trap_nr = X86_TRAP_GP;
26756 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
26757- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
26758+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
26759+
26760+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26761+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
26762+ die("PAX: suspicious general protection fault", regs, error_code);
26763+ else
26764+#endif
26765+
26766 die("general protection fault", regs, error_code);
26767+ }
26768 goto exit;
26769 }
26770
26771+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
26772+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
26773+ struct mm_struct *mm = tsk->mm;
26774+ unsigned long limit;
26775+
26776+ down_write(&mm->mmap_sem);
26777+ limit = mm->context.user_cs_limit;
26778+ if (limit < TASK_SIZE) {
26779+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
26780+ up_write(&mm->mmap_sem);
26781+ return;
26782+ }
26783+ up_write(&mm->mmap_sem);
26784+ }
26785+#endif
26786+
26787 tsk->thread.error_code = error_code;
26788 tsk->thread.trap_nr = X86_TRAP_GP;
26789
26790@@ -457,7 +493,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
26791 /* It's safe to allow irq's after DR6 has been saved */
26792 preempt_conditional_sti(regs);
26793
26794- if (regs->flags & X86_VM_MASK) {
26795+ if (v8086_mode(regs)) {
26796 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
26797 X86_TRAP_DB);
26798 preempt_conditional_cli(regs);
26799@@ -472,7 +508,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
26800 * We already checked v86 mode above, so we can check for kernel mode
26801 * by just checking the CPL of CS.
26802 */
26803- if ((dr6 & DR_STEP) && !user_mode(regs)) {
26804+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
26805 tsk->thread.debugreg6 &= ~DR_STEP;
26806 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
26807 regs->flags &= ~X86_EFLAGS_TF;
26808@@ -504,7 +540,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
26809 return;
26810 conditional_sti(regs);
26811
26812- if (!user_mode_vm(regs))
26813+ if (!user_mode(regs))
26814 {
26815 if (!fixup_exception(regs)) {
26816 task->thread.error_code = error_code;
26817diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
26818index 2ed8459..7cf329f 100644
26819--- a/arch/x86/kernel/uprobes.c
26820+++ b/arch/x86/kernel/uprobes.c
26821@@ -629,7 +629,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
26822 int ret = NOTIFY_DONE;
26823
26824 /* We are only interested in userspace traps */
26825- if (regs && !user_mode_vm(regs))
26826+ if (regs && !user_mode(regs))
26827 return NOTIFY_DONE;
26828
26829 switch (val) {
26830@@ -719,7 +719,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
26831
26832 if (ncopied != rasize) {
26833 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
26834- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
26835+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
26836
26837 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
26838 }
26839diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
26840index b9242ba..50c5edd 100644
26841--- a/arch/x86/kernel/verify_cpu.S
26842+++ b/arch/x86/kernel/verify_cpu.S
26843@@ -20,6 +20,7 @@
26844 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
26845 * arch/x86/kernel/trampoline_64.S: secondary processor verification
26846 * arch/x86/kernel/head_32.S: processor startup
26847+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
26848 *
26849 * verify_cpu, returns the status of longmode and SSE in register %eax.
26850 * 0: Success 1: Failure
26851diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
26852index e8edcf5..27f9344 100644
26853--- a/arch/x86/kernel/vm86_32.c
26854+++ b/arch/x86/kernel/vm86_32.c
26855@@ -44,6 +44,7 @@
26856 #include <linux/ptrace.h>
26857 #include <linux/audit.h>
26858 #include <linux/stddef.h>
26859+#include <linux/grsecurity.h>
26860
26861 #include <asm/uaccess.h>
26862 #include <asm/io.h>
26863@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
26864 do_exit(SIGSEGV);
26865 }
26866
26867- tss = &per_cpu(init_tss, get_cpu());
26868+ tss = init_tss + get_cpu();
26869 current->thread.sp0 = current->thread.saved_sp0;
26870 current->thread.sysenter_cs = __KERNEL_CS;
26871 load_sp0(tss, &current->thread);
26872@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
26873
26874 if (tsk->thread.saved_sp0)
26875 return -EPERM;
26876+
26877+#ifdef CONFIG_GRKERNSEC_VM86
26878+ if (!capable(CAP_SYS_RAWIO)) {
26879+ gr_handle_vm86();
26880+ return -EPERM;
26881+ }
26882+#endif
26883+
26884 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
26885 offsetof(struct kernel_vm86_struct, vm86plus) -
26886 sizeof(info.regs));
26887@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
26888 int tmp;
26889 struct vm86plus_struct __user *v86;
26890
26891+#ifdef CONFIG_GRKERNSEC_VM86
26892+ if (!capable(CAP_SYS_RAWIO)) {
26893+ gr_handle_vm86();
26894+ return -EPERM;
26895+ }
26896+#endif
26897+
26898 tsk = current;
26899 switch (cmd) {
26900 case VM86_REQUEST_IRQ:
26901@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
26902 tsk->thread.saved_fs = info->regs32->fs;
26903 tsk->thread.saved_gs = get_user_gs(info->regs32);
26904
26905- tss = &per_cpu(init_tss, get_cpu());
26906+ tss = init_tss + get_cpu();
26907 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
26908 if (cpu_has_sep)
26909 tsk->thread.sysenter_cs = 0;
26910@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
26911 goto cannot_handle;
26912 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
26913 goto cannot_handle;
26914- intr_ptr = (unsigned long __user *) (i << 2);
26915+ intr_ptr = (__force unsigned long __user *) (i << 2);
26916 if (get_user(segoffs, intr_ptr))
26917 goto cannot_handle;
26918 if ((segoffs >> 16) == BIOSSEG)
26919diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
26920index 10c4f30..65408b9 100644
26921--- a/arch/x86/kernel/vmlinux.lds.S
26922+++ b/arch/x86/kernel/vmlinux.lds.S
26923@@ -26,6 +26,13 @@
26924 #include <asm/page_types.h>
26925 #include <asm/cache.h>
26926 #include <asm/boot.h>
26927+#include <asm/segment.h>
26928+
26929+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26930+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
26931+#else
26932+#define __KERNEL_TEXT_OFFSET 0
26933+#endif
26934
26935 #undef i386 /* in case the preprocessor is a 32bit one */
26936
26937@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
26938
26939 PHDRS {
26940 text PT_LOAD FLAGS(5); /* R_E */
26941+#ifdef CONFIG_X86_32
26942+ module PT_LOAD FLAGS(5); /* R_E */
26943+#endif
26944+#ifdef CONFIG_XEN
26945+ rodata PT_LOAD FLAGS(5); /* R_E */
26946+#else
26947+ rodata PT_LOAD FLAGS(4); /* R__ */
26948+#endif
26949 data PT_LOAD FLAGS(6); /* RW_ */
26950-#ifdef CONFIG_X86_64
26951+ init.begin PT_LOAD FLAGS(6); /* RW_ */
26952 #ifdef CONFIG_SMP
26953 percpu PT_LOAD FLAGS(6); /* RW_ */
26954 #endif
26955+ text.init PT_LOAD FLAGS(5); /* R_E */
26956+ text.exit PT_LOAD FLAGS(5); /* R_E */
26957 init PT_LOAD FLAGS(7); /* RWE */
26958-#endif
26959 note PT_NOTE FLAGS(0); /* ___ */
26960 }
26961
26962 SECTIONS
26963 {
26964 #ifdef CONFIG_X86_32
26965- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
26966- phys_startup_32 = startup_32 - LOAD_OFFSET;
26967+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
26968 #else
26969- . = __START_KERNEL;
26970- phys_startup_64 = startup_64 - LOAD_OFFSET;
26971+ . = __START_KERNEL;
26972 #endif
26973
26974 /* Text and read-only data */
26975- .text : AT(ADDR(.text) - LOAD_OFFSET) {
26976- _text = .;
26977+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
26978 /* bootstrapping code */
26979+#ifdef CONFIG_X86_32
26980+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
26981+#else
26982+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
26983+#endif
26984+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
26985+ _text = .;
26986 HEAD_TEXT
26987 . = ALIGN(8);
26988 _stext = .;
26989@@ -104,13 +124,47 @@ SECTIONS
26990 IRQENTRY_TEXT
26991 *(.fixup)
26992 *(.gnu.warning)
26993- /* End of text section */
26994- _etext = .;
26995 } :text = 0x9090
26996
26997- NOTES :text :note
26998+ . += __KERNEL_TEXT_OFFSET;
26999
27000- EXCEPTION_TABLE(16) :text = 0x9090
27001+#ifdef CONFIG_X86_32
27002+ . = ALIGN(PAGE_SIZE);
27003+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
27004+
27005+#ifdef CONFIG_PAX_KERNEXEC
27006+ MODULES_EXEC_VADDR = .;
27007+ BYTE(0)
27008+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
27009+ . = ALIGN(HPAGE_SIZE) - 1;
27010+ MODULES_EXEC_END = .;
27011+#endif
27012+
27013+ } :module
27014+#endif
27015+
27016+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
27017+ /* End of text section */
27018+ BYTE(0)
27019+ _etext = . - __KERNEL_TEXT_OFFSET;
27020+ }
27021+
27022+#ifdef CONFIG_X86_32
27023+ . = ALIGN(PAGE_SIZE);
27024+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
27025+ . = ALIGN(PAGE_SIZE);
27026+ *(.empty_zero_page)
27027+ *(.initial_pg_fixmap)
27028+ *(.initial_pg_pmd)
27029+ *(.initial_page_table)
27030+ *(.swapper_pg_dir)
27031+ } :rodata
27032+#endif
27033+
27034+ . = ALIGN(PAGE_SIZE);
27035+ NOTES :rodata :note
27036+
27037+ EXCEPTION_TABLE(16) :rodata
27038
27039 #if defined(CONFIG_DEBUG_RODATA)
27040 /* .text should occupy whole number of pages */
27041@@ -122,16 +176,20 @@ SECTIONS
27042
27043 /* Data */
27044 .data : AT(ADDR(.data) - LOAD_OFFSET) {
27045+
27046+#ifdef CONFIG_PAX_KERNEXEC
27047+ . = ALIGN(HPAGE_SIZE);
27048+#else
27049+ . = ALIGN(PAGE_SIZE);
27050+#endif
27051+
27052 /* Start of data section */
27053 _sdata = .;
27054
27055 /* init_task */
27056 INIT_TASK_DATA(THREAD_SIZE)
27057
27058-#ifdef CONFIG_X86_32
27059- /* 32 bit has nosave before _edata */
27060 NOSAVE_DATA
27061-#endif
27062
27063 PAGE_ALIGNED_DATA(PAGE_SIZE)
27064
27065@@ -172,12 +230,19 @@ SECTIONS
27066 #endif /* CONFIG_X86_64 */
27067
27068 /* Init code and data - will be freed after init */
27069- . = ALIGN(PAGE_SIZE);
27070 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
27071+ BYTE(0)
27072+
27073+#ifdef CONFIG_PAX_KERNEXEC
27074+ . = ALIGN(HPAGE_SIZE);
27075+#else
27076+ . = ALIGN(PAGE_SIZE);
27077+#endif
27078+
27079 __init_begin = .; /* paired with __init_end */
27080- }
27081+ } :init.begin
27082
27083-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
27084+#ifdef CONFIG_SMP
27085 /*
27086 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
27087 * output PHDR, so the next output section - .init.text - should
27088@@ -186,12 +251,27 @@ SECTIONS
27089 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
27090 #endif
27091
27092- INIT_TEXT_SECTION(PAGE_SIZE)
27093-#ifdef CONFIG_X86_64
27094- :init
27095-#endif
27096+ . = ALIGN(PAGE_SIZE);
27097+ init_begin = .;
27098+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
27099+ VMLINUX_SYMBOL(_sinittext) = .;
27100+ INIT_TEXT
27101+ VMLINUX_SYMBOL(_einittext) = .;
27102+ . = ALIGN(PAGE_SIZE);
27103+ } :text.init
27104
27105- INIT_DATA_SECTION(16)
27106+ /*
27107+ * .exit.text is discard at runtime, not link time, to deal with
27108+ * references from .altinstructions and .eh_frame
27109+ */
27110+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
27111+ EXIT_TEXT
27112+ . = ALIGN(16);
27113+ } :text.exit
27114+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
27115+
27116+ . = ALIGN(PAGE_SIZE);
27117+ INIT_DATA_SECTION(16) :init
27118
27119 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
27120 __x86_cpu_dev_start = .;
27121@@ -253,19 +333,12 @@ SECTIONS
27122 }
27123
27124 . = ALIGN(8);
27125- /*
27126- * .exit.text is discard at runtime, not link time, to deal with
27127- * references from .altinstructions and .eh_frame
27128- */
27129- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
27130- EXIT_TEXT
27131- }
27132
27133 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
27134 EXIT_DATA
27135 }
27136
27137-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
27138+#ifndef CONFIG_SMP
27139 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
27140 #endif
27141
27142@@ -284,16 +357,10 @@ SECTIONS
27143 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
27144 __smp_locks = .;
27145 *(.smp_locks)
27146- . = ALIGN(PAGE_SIZE);
27147 __smp_locks_end = .;
27148+ . = ALIGN(PAGE_SIZE);
27149 }
27150
27151-#ifdef CONFIG_X86_64
27152- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
27153- NOSAVE_DATA
27154- }
27155-#endif
27156-
27157 /* BSS */
27158 . = ALIGN(PAGE_SIZE);
27159 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
27160@@ -309,6 +376,7 @@ SECTIONS
27161 __brk_base = .;
27162 . += 64 * 1024; /* 64k alignment slop space */
27163 *(.brk_reservation) /* areas brk users have reserved */
27164+ . = ALIGN(HPAGE_SIZE);
27165 __brk_limit = .;
27166 }
27167
27168@@ -335,13 +403,12 @@ SECTIONS
27169 * for the boot processor.
27170 */
27171 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
27172-INIT_PER_CPU(gdt_page);
27173 INIT_PER_CPU(irq_stack_union);
27174
27175 /*
27176 * Build-time check on the image size:
27177 */
27178-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
27179+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
27180 "kernel image bigger than KERNEL_IMAGE_SIZE");
27181
27182 #ifdef CONFIG_SMP
27183diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
27184index 1f96f93..d5c8f7a 100644
27185--- a/arch/x86/kernel/vsyscall_64.c
27186+++ b/arch/x86/kernel/vsyscall_64.c
27187@@ -56,15 +56,13 @@
27188 DEFINE_VVAR(int, vgetcpu_mode);
27189 DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
27190
27191-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
27192+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
27193
27194 static int __init vsyscall_setup(char *str)
27195 {
27196 if (str) {
27197 if (!strcmp("emulate", str))
27198 vsyscall_mode = EMULATE;
27199- else if (!strcmp("native", str))
27200- vsyscall_mode = NATIVE;
27201 else if (!strcmp("none", str))
27202 vsyscall_mode = NONE;
27203 else
27204@@ -323,8 +321,7 @@ do_ret:
27205 return true;
27206
27207 sigsegv:
27208- force_sig(SIGSEGV, current);
27209- return true;
27210+ do_group_exit(SIGKILL);
27211 }
27212
27213 /*
27214@@ -377,10 +374,7 @@ void __init map_vsyscall(void)
27215 extern char __vvar_page;
27216 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
27217
27218- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
27219- vsyscall_mode == NATIVE
27220- ? PAGE_KERNEL_VSYSCALL
27221- : PAGE_KERNEL_VVAR);
27222+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
27223 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
27224 (unsigned long)VSYSCALL_START);
27225
27226diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
27227index b014d94..e775258 100644
27228--- a/arch/x86/kernel/x8664_ksyms_64.c
27229+++ b/arch/x86/kernel/x8664_ksyms_64.c
27230@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
27231 EXPORT_SYMBOL(copy_user_generic_unrolled);
27232 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
27233 EXPORT_SYMBOL(__copy_user_nocache);
27234-EXPORT_SYMBOL(_copy_from_user);
27235-EXPORT_SYMBOL(_copy_to_user);
27236
27237 EXPORT_SYMBOL(copy_page);
27238 EXPORT_SYMBOL(clear_page);
27239@@ -66,3 +64,7 @@ EXPORT_SYMBOL(empty_zero_page);
27240 #ifndef CONFIG_PARAVIRT
27241 EXPORT_SYMBOL(native_load_gs_index);
27242 #endif
27243+
27244+#ifdef CONFIG_PAX_PER_CPU_PGD
27245+EXPORT_SYMBOL(cpu_pgd);
27246+#endif
27247diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
27248index 8ce0072..431a0e7 100644
27249--- a/arch/x86/kernel/x86_init.c
27250+++ b/arch/x86/kernel/x86_init.c
27251@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
27252 static void default_nmi_init(void) { };
27253 static int default_i8042_detect(void) { return 1; };
27254
27255-struct x86_platform_ops x86_platform = {
27256+struct x86_platform_ops x86_platform __read_only = {
27257 .calibrate_tsc = native_calibrate_tsc,
27258 .get_wallclock = mach_get_cmos_time,
27259 .set_wallclock = mach_set_rtc_mmss,
27260@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
27261 EXPORT_SYMBOL_GPL(x86_platform);
27262
27263 #if defined(CONFIG_PCI_MSI)
27264-struct x86_msi_ops x86_msi = {
27265+struct x86_msi_ops x86_msi __read_only = {
27266 .setup_msi_irqs = native_setup_msi_irqs,
27267 .compose_msi_msg = native_compose_msi_msg,
27268 .teardown_msi_irq = native_teardown_msi_irq,
27269@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev, int irq)
27270 }
27271 #endif
27272
27273-struct x86_io_apic_ops x86_io_apic_ops = {
27274+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
27275 .init = native_io_apic_init_mappings,
27276 .read = native_io_apic_read,
27277 .write = native_io_apic_write,
27278diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
27279index 422fd82..c3687ca 100644
27280--- a/arch/x86/kernel/xsave.c
27281+++ b/arch/x86/kernel/xsave.c
27282@@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
27283 {
27284 int err;
27285
27286+ buf = (struct xsave_struct __user *)____m(buf);
27287 if (use_xsave())
27288 err = xsave_user(buf);
27289 else if (use_fxsr())
27290@@ -311,6 +312,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
27291 */
27292 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
27293 {
27294+ buf = (void __user *)____m(buf);
27295 if (use_xsave()) {
27296 if ((unsigned long)buf % 64 || fx_only) {
27297 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
27298diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
27299index b110fe6..d9c19f2 100644
27300--- a/arch/x86/kvm/cpuid.c
27301+++ b/arch/x86/kvm/cpuid.c
27302@@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
27303 struct kvm_cpuid2 *cpuid,
27304 struct kvm_cpuid_entry2 __user *entries)
27305 {
27306- int r;
27307+ int r, i;
27308
27309 r = -E2BIG;
27310 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
27311 goto out;
27312 r = -EFAULT;
27313- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
27314- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
27315+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
27316 goto out;
27317+ for (i = 0; i < cpuid->nent; ++i) {
27318+ struct kvm_cpuid_entry2 cpuid_entry;
27319+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
27320+ goto out;
27321+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
27322+ }
27323 vcpu->arch.cpuid_nent = cpuid->nent;
27324 kvm_apic_set_version(vcpu);
27325 kvm_x86_ops->cpuid_update(vcpu);
27326@@ -147,15 +152,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
27327 struct kvm_cpuid2 *cpuid,
27328 struct kvm_cpuid_entry2 __user *entries)
27329 {
27330- int r;
27331+ int r, i;
27332
27333 r = -E2BIG;
27334 if (cpuid->nent < vcpu->arch.cpuid_nent)
27335 goto out;
27336 r = -EFAULT;
27337- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
27338- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
27339+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
27340 goto out;
27341+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
27342+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
27343+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
27344+ goto out;
27345+ }
27346 return 0;
27347
27348 out:
27349diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
27350index 1673940..4bce95e 100644
27351--- a/arch/x86/kvm/lapic.c
27352+++ b/arch/x86/kvm/lapic.c
27353@@ -55,7 +55,7 @@
27354 #define APIC_BUS_CYCLE_NS 1
27355
27356 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
27357-#define apic_debug(fmt, arg...)
27358+#define apic_debug(fmt, arg...) do {} while (0)
27359
27360 #define APIC_LVT_NUM 6
27361 /* 14 is the version for Xeon and Pentium 8.4.8*/
27362diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
27363index ad75d77..a679d32 100644
27364--- a/arch/x86/kvm/paging_tmpl.h
27365+++ b/arch/x86/kvm/paging_tmpl.h
27366@@ -331,7 +331,7 @@ retry_walk:
27367 if (unlikely(kvm_is_error_hva(host_addr)))
27368 goto error;
27369
27370- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
27371+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
27372 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
27373 goto error;
27374 walker->ptep_user[walker->level - 1] = ptep_user;
27375diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
27376index c0bc803..6837a50 100644
27377--- a/arch/x86/kvm/svm.c
27378+++ b/arch/x86/kvm/svm.c
27379@@ -3501,7 +3501,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
27380 int cpu = raw_smp_processor_id();
27381
27382 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
27383+
27384+ pax_open_kernel();
27385 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
27386+ pax_close_kernel();
27387+
27388 load_TR_desc();
27389 }
27390
27391@@ -3902,6 +3906,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
27392 #endif
27393 #endif
27394
27395+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
27396+ __set_fs(current_thread_info()->addr_limit);
27397+#endif
27398+
27399 reload_tss(vcpu);
27400
27401 local_irq_disable();
27402diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
27403index 6128914..8be1dd2 100644
27404--- a/arch/x86/kvm/vmx.c
27405+++ b/arch/x86/kvm/vmx.c
27406@@ -1316,12 +1316,12 @@ static void vmcs_write64(unsigned long field, u64 value)
27407 #endif
27408 }
27409
27410-static void vmcs_clear_bits(unsigned long field, u32 mask)
27411+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
27412 {
27413 vmcs_writel(field, vmcs_readl(field) & ~mask);
27414 }
27415
27416-static void vmcs_set_bits(unsigned long field, u32 mask)
27417+static void vmcs_set_bits(unsigned long field, unsigned long mask)
27418 {
27419 vmcs_writel(field, vmcs_readl(field) | mask);
27420 }
27421@@ -1522,7 +1522,11 @@ static void reload_tss(void)
27422 struct desc_struct *descs;
27423
27424 descs = (void *)gdt->address;
27425+
27426+ pax_open_kernel();
27427 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
27428+ pax_close_kernel();
27429+
27430 load_TR_desc();
27431 }
27432
27433@@ -1746,6 +1750,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
27434 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
27435 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
27436
27437+#ifdef CONFIG_PAX_PER_CPU_PGD
27438+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
27439+#endif
27440+
27441 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
27442 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
27443 vmx->loaded_vmcs->cpu = cpu;
27444@@ -2037,7 +2045,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
27445 * reads and returns guest's timestamp counter "register"
27446 * guest_tsc = host_tsc + tsc_offset -- 21.3
27447 */
27448-static u64 guest_read_tsc(void)
27449+static u64 __intentional_overflow(-1) guest_read_tsc(void)
27450 {
27451 u64 host_tsc, tsc_offset;
27452
27453@@ -2982,8 +2990,11 @@ static __init int hardware_setup(void)
27454 if (!cpu_has_vmx_flexpriority())
27455 flexpriority_enabled = 0;
27456
27457- if (!cpu_has_vmx_tpr_shadow())
27458- kvm_x86_ops->update_cr8_intercept = NULL;
27459+ if (!cpu_has_vmx_tpr_shadow()) {
27460+ pax_open_kernel();
27461+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
27462+ pax_close_kernel();
27463+ }
27464
27465 if (enable_ept && !cpu_has_vmx_ept_2m_page())
27466 kvm_disable_largepages();
27467@@ -2994,13 +3005,15 @@ static __init int hardware_setup(void)
27468 if (!cpu_has_vmx_apicv())
27469 enable_apicv = 0;
27470
27471+ pax_open_kernel();
27472 if (enable_apicv)
27473- kvm_x86_ops->update_cr8_intercept = NULL;
27474+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
27475 else {
27476- kvm_x86_ops->hwapic_irr_update = NULL;
27477- kvm_x86_ops->deliver_posted_interrupt = NULL;
27478- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
27479+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
27480+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
27481+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
27482 }
27483+ pax_close_kernel();
27484
27485 if (nested)
27486 nested_vmx_setup_ctls_msrs();
27487@@ -4127,7 +4140,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
27488
27489 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
27490 vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
27491+
27492+#ifndef CONFIG_PAX_PER_CPU_PGD
27493 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
27494+#endif
27495
27496 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
27497 #ifdef CONFIG_X86_64
27498@@ -4149,7 +4165,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
27499 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
27500 vmx->host_idt_base = dt.address;
27501
27502- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
27503+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
27504
27505 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
27506 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
27507@@ -7191,6 +7207,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
27508 "jmp 2f \n\t"
27509 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
27510 "2: "
27511+
27512+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27513+ "ljmp %[cs],$3f\n\t"
27514+ "3: "
27515+#endif
27516+
27517 /* Save guest registers, load host registers, keep flags */
27518 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
27519 "pop %0 \n\t"
27520@@ -7243,6 +7265,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
27521 #endif
27522 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
27523 [wordsize]"i"(sizeof(ulong))
27524+
27525+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27526+ ,[cs]"i"(__KERNEL_CS)
27527+#endif
27528+
27529 : "cc", "memory"
27530 #ifdef CONFIG_X86_64
27531 , "rax", "rbx", "rdi", "rsi"
27532@@ -7256,7 +7283,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
27533 if (debugctlmsr)
27534 update_debugctlmsr(debugctlmsr);
27535
27536-#ifndef CONFIG_X86_64
27537+#ifdef CONFIG_X86_32
27538 /*
27539 * The sysexit path does not restore ds/es, so we must set them to
27540 * a reasonable value ourselves.
27541@@ -7265,8 +7292,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
27542 * may be executed in interrupt context, which saves and restore segments
27543 * around it, nullifying its effect.
27544 */
27545- loadsegment(ds, __USER_DS);
27546- loadsegment(es, __USER_DS);
27547+ loadsegment(ds, __KERNEL_DS);
27548+ loadsegment(es, __KERNEL_DS);
27549+ loadsegment(ss, __KERNEL_DS);
27550+
27551+#ifdef CONFIG_PAX_KERNEXEC
27552+ loadsegment(fs, __KERNEL_PERCPU);
27553+#endif
27554+
27555+#ifdef CONFIG_PAX_MEMORY_UDEREF
27556+ __set_fs(current_thread_info()->addr_limit);
27557+#endif
27558+
27559 #endif
27560
27561 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
27562diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
27563index eb9b9c9..0f30b12 100644
27564--- a/arch/x86/kvm/x86.c
27565+++ b/arch/x86/kvm/x86.c
27566@@ -1779,8 +1779,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
27567 {
27568 struct kvm *kvm = vcpu->kvm;
27569 int lm = is_long_mode(vcpu);
27570- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
27571- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
27572+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
27573+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
27574 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
27575 : kvm->arch.xen_hvm_config.blob_size_32;
27576 u32 page_num = data & ~PAGE_MASK;
27577@@ -2663,6 +2663,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
27578 if (n < msr_list.nmsrs)
27579 goto out;
27580 r = -EFAULT;
27581+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
27582+ goto out;
27583 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
27584 num_msrs_to_save * sizeof(u32)))
27585 goto out;
27586@@ -5461,7 +5463,7 @@ static struct notifier_block pvclock_gtod_notifier = {
27587 };
27588 #endif
27589
27590-int kvm_arch_init(void *opaque)
27591+int kvm_arch_init(const void *opaque)
27592 {
27593 int r;
27594 struct kvm_x86_ops *ops = opaque;
27595diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
27596index bdf8532..f63c587 100644
27597--- a/arch/x86/lguest/boot.c
27598+++ b/arch/x86/lguest/boot.c
27599@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
27600 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
27601 * Launcher to reboot us.
27602 */
27603-static void lguest_restart(char *reason)
27604+static __noreturn void lguest_restart(char *reason)
27605 {
27606 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
27607+ BUG();
27608 }
27609
27610 /*G:050
27611diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
27612index 00933d5..3a64af9 100644
27613--- a/arch/x86/lib/atomic64_386_32.S
27614+++ b/arch/x86/lib/atomic64_386_32.S
27615@@ -48,6 +48,10 @@ BEGIN(read)
27616 movl (v), %eax
27617 movl 4(v), %edx
27618 RET_ENDP
27619+BEGIN(read_unchecked)
27620+ movl (v), %eax
27621+ movl 4(v), %edx
27622+RET_ENDP
27623 #undef v
27624
27625 #define v %esi
27626@@ -55,6 +59,10 @@ BEGIN(set)
27627 movl %ebx, (v)
27628 movl %ecx, 4(v)
27629 RET_ENDP
27630+BEGIN(set_unchecked)
27631+ movl %ebx, (v)
27632+ movl %ecx, 4(v)
27633+RET_ENDP
27634 #undef v
27635
27636 #define v %esi
27637@@ -70,6 +78,20 @@ RET_ENDP
27638 BEGIN(add)
27639 addl %eax, (v)
27640 adcl %edx, 4(v)
27641+
27642+#ifdef CONFIG_PAX_REFCOUNT
27643+ jno 0f
27644+ subl %eax, (v)
27645+ sbbl %edx, 4(v)
27646+ int $4
27647+0:
27648+ _ASM_EXTABLE(0b, 0b)
27649+#endif
27650+
27651+RET_ENDP
27652+BEGIN(add_unchecked)
27653+ addl %eax, (v)
27654+ adcl %edx, 4(v)
27655 RET_ENDP
27656 #undef v
27657
27658@@ -77,6 +99,24 @@ RET_ENDP
27659 BEGIN(add_return)
27660 addl (v), %eax
27661 adcl 4(v), %edx
27662+
27663+#ifdef CONFIG_PAX_REFCOUNT
27664+ into
27665+1234:
27666+ _ASM_EXTABLE(1234b, 2f)
27667+#endif
27668+
27669+ movl %eax, (v)
27670+ movl %edx, 4(v)
27671+
27672+#ifdef CONFIG_PAX_REFCOUNT
27673+2:
27674+#endif
27675+
27676+RET_ENDP
27677+BEGIN(add_return_unchecked)
27678+ addl (v), %eax
27679+ adcl 4(v), %edx
27680 movl %eax, (v)
27681 movl %edx, 4(v)
27682 RET_ENDP
27683@@ -86,6 +126,20 @@ RET_ENDP
27684 BEGIN(sub)
27685 subl %eax, (v)
27686 sbbl %edx, 4(v)
27687+
27688+#ifdef CONFIG_PAX_REFCOUNT
27689+ jno 0f
27690+ addl %eax, (v)
27691+ adcl %edx, 4(v)
27692+ int $4
27693+0:
27694+ _ASM_EXTABLE(0b, 0b)
27695+#endif
27696+
27697+RET_ENDP
27698+BEGIN(sub_unchecked)
27699+ subl %eax, (v)
27700+ sbbl %edx, 4(v)
27701 RET_ENDP
27702 #undef v
27703
27704@@ -96,6 +150,27 @@ BEGIN(sub_return)
27705 sbbl $0, %edx
27706 addl (v), %eax
27707 adcl 4(v), %edx
27708+
27709+#ifdef CONFIG_PAX_REFCOUNT
27710+ into
27711+1234:
27712+ _ASM_EXTABLE(1234b, 2f)
27713+#endif
27714+
27715+ movl %eax, (v)
27716+ movl %edx, 4(v)
27717+
27718+#ifdef CONFIG_PAX_REFCOUNT
27719+2:
27720+#endif
27721+
27722+RET_ENDP
27723+BEGIN(sub_return_unchecked)
27724+ negl %edx
27725+ negl %eax
27726+ sbbl $0, %edx
27727+ addl (v), %eax
27728+ adcl 4(v), %edx
27729 movl %eax, (v)
27730 movl %edx, 4(v)
27731 RET_ENDP
27732@@ -105,6 +180,20 @@ RET_ENDP
27733 BEGIN(inc)
27734 addl $1, (v)
27735 adcl $0, 4(v)
27736+
27737+#ifdef CONFIG_PAX_REFCOUNT
27738+ jno 0f
27739+ subl $1, (v)
27740+ sbbl $0, 4(v)
27741+ int $4
27742+0:
27743+ _ASM_EXTABLE(0b, 0b)
27744+#endif
27745+
27746+RET_ENDP
27747+BEGIN(inc_unchecked)
27748+ addl $1, (v)
27749+ adcl $0, 4(v)
27750 RET_ENDP
27751 #undef v
27752
27753@@ -114,6 +203,26 @@ BEGIN(inc_return)
27754 movl 4(v), %edx
27755 addl $1, %eax
27756 adcl $0, %edx
27757+
27758+#ifdef CONFIG_PAX_REFCOUNT
27759+ into
27760+1234:
27761+ _ASM_EXTABLE(1234b, 2f)
27762+#endif
27763+
27764+ movl %eax, (v)
27765+ movl %edx, 4(v)
27766+
27767+#ifdef CONFIG_PAX_REFCOUNT
27768+2:
27769+#endif
27770+
27771+RET_ENDP
27772+BEGIN(inc_return_unchecked)
27773+ movl (v), %eax
27774+ movl 4(v), %edx
27775+ addl $1, %eax
27776+ adcl $0, %edx
27777 movl %eax, (v)
27778 movl %edx, 4(v)
27779 RET_ENDP
27780@@ -123,6 +232,20 @@ RET_ENDP
27781 BEGIN(dec)
27782 subl $1, (v)
27783 sbbl $0, 4(v)
27784+
27785+#ifdef CONFIG_PAX_REFCOUNT
27786+ jno 0f
27787+ addl $1, (v)
27788+ adcl $0, 4(v)
27789+ int $4
27790+0:
27791+ _ASM_EXTABLE(0b, 0b)
27792+#endif
27793+
27794+RET_ENDP
27795+BEGIN(dec_unchecked)
27796+ subl $1, (v)
27797+ sbbl $0, 4(v)
27798 RET_ENDP
27799 #undef v
27800
27801@@ -132,6 +255,26 @@ BEGIN(dec_return)
27802 movl 4(v), %edx
27803 subl $1, %eax
27804 sbbl $0, %edx
27805+
27806+#ifdef CONFIG_PAX_REFCOUNT
27807+ into
27808+1234:
27809+ _ASM_EXTABLE(1234b, 2f)
27810+#endif
27811+
27812+ movl %eax, (v)
27813+ movl %edx, 4(v)
27814+
27815+#ifdef CONFIG_PAX_REFCOUNT
27816+2:
27817+#endif
27818+
27819+RET_ENDP
27820+BEGIN(dec_return_unchecked)
27821+ movl (v), %eax
27822+ movl 4(v), %edx
27823+ subl $1, %eax
27824+ sbbl $0, %edx
27825 movl %eax, (v)
27826 movl %edx, 4(v)
27827 RET_ENDP
27828@@ -143,6 +286,13 @@ BEGIN(add_unless)
27829 adcl %edx, %edi
27830 addl (v), %eax
27831 adcl 4(v), %edx
27832+
27833+#ifdef CONFIG_PAX_REFCOUNT
27834+ into
27835+1234:
27836+ _ASM_EXTABLE(1234b, 2f)
27837+#endif
27838+
27839 cmpl %eax, %ecx
27840 je 3f
27841 1:
27842@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
27843 1:
27844 addl $1, %eax
27845 adcl $0, %edx
27846+
27847+#ifdef CONFIG_PAX_REFCOUNT
27848+ into
27849+1234:
27850+ _ASM_EXTABLE(1234b, 2f)
27851+#endif
27852+
27853 movl %eax, (v)
27854 movl %edx, 4(v)
27855 movl $1, %eax
27856@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
27857 movl 4(v), %edx
27858 subl $1, %eax
27859 sbbl $0, %edx
27860+
27861+#ifdef CONFIG_PAX_REFCOUNT
27862+ into
27863+1234:
27864+ _ASM_EXTABLE(1234b, 1f)
27865+#endif
27866+
27867 js 1f
27868 movl %eax, (v)
27869 movl %edx, 4(v)
27870diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
27871index f5cc9eb..51fa319 100644
27872--- a/arch/x86/lib/atomic64_cx8_32.S
27873+++ b/arch/x86/lib/atomic64_cx8_32.S
27874@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
27875 CFI_STARTPROC
27876
27877 read64 %ecx
27878+ pax_force_retaddr
27879 ret
27880 CFI_ENDPROC
27881 ENDPROC(atomic64_read_cx8)
27882
27883+ENTRY(atomic64_read_unchecked_cx8)
27884+ CFI_STARTPROC
27885+
27886+ read64 %ecx
27887+ pax_force_retaddr
27888+ ret
27889+ CFI_ENDPROC
27890+ENDPROC(atomic64_read_unchecked_cx8)
27891+
27892 ENTRY(atomic64_set_cx8)
27893 CFI_STARTPROC
27894
27895@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
27896 cmpxchg8b (%esi)
27897 jne 1b
27898
27899+ pax_force_retaddr
27900 ret
27901 CFI_ENDPROC
27902 ENDPROC(atomic64_set_cx8)
27903
27904+ENTRY(atomic64_set_unchecked_cx8)
27905+ CFI_STARTPROC
27906+
27907+1:
27908+/* we don't need LOCK_PREFIX since aligned 64-bit writes
27909+ * are atomic on 586 and newer */
27910+ cmpxchg8b (%esi)
27911+ jne 1b
27912+
27913+ pax_force_retaddr
27914+ ret
27915+ CFI_ENDPROC
27916+ENDPROC(atomic64_set_unchecked_cx8)
27917+
27918 ENTRY(atomic64_xchg_cx8)
27919 CFI_STARTPROC
27920
27921@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
27922 cmpxchg8b (%esi)
27923 jne 1b
27924
27925+ pax_force_retaddr
27926 ret
27927 CFI_ENDPROC
27928 ENDPROC(atomic64_xchg_cx8)
27929
27930-.macro addsub_return func ins insc
27931-ENTRY(atomic64_\func\()_return_cx8)
27932+.macro addsub_return func ins insc unchecked=""
27933+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
27934 CFI_STARTPROC
27935 SAVE ebp
27936 SAVE ebx
27937@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
27938 movl %edx, %ecx
27939 \ins\()l %esi, %ebx
27940 \insc\()l %edi, %ecx
27941+
27942+.ifb \unchecked
27943+#ifdef CONFIG_PAX_REFCOUNT
27944+ into
27945+2:
27946+ _ASM_EXTABLE(2b, 3f)
27947+#endif
27948+.endif
27949+
27950 LOCK_PREFIX
27951 cmpxchg8b (%ebp)
27952 jne 1b
27953-
27954-10:
27955 movl %ebx, %eax
27956 movl %ecx, %edx
27957+
27958+.ifb \unchecked
27959+#ifdef CONFIG_PAX_REFCOUNT
27960+3:
27961+#endif
27962+.endif
27963+
27964 RESTORE edi
27965 RESTORE esi
27966 RESTORE ebx
27967 RESTORE ebp
27968+ pax_force_retaddr
27969 ret
27970 CFI_ENDPROC
27971-ENDPROC(atomic64_\func\()_return_cx8)
27972+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
27973 .endm
27974
27975 addsub_return add add adc
27976 addsub_return sub sub sbb
27977+addsub_return add add adc _unchecked
27978+addsub_return sub sub sbb _unchecked
27979
27980-.macro incdec_return func ins insc
27981-ENTRY(atomic64_\func\()_return_cx8)
27982+.macro incdec_return func ins insc unchecked=""
27983+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
27984 CFI_STARTPROC
27985 SAVE ebx
27986
27987@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
27988 movl %edx, %ecx
27989 \ins\()l $1, %ebx
27990 \insc\()l $0, %ecx
27991+
27992+.ifb \unchecked
27993+#ifdef CONFIG_PAX_REFCOUNT
27994+ into
27995+2:
27996+ _ASM_EXTABLE(2b, 3f)
27997+#endif
27998+.endif
27999+
28000 LOCK_PREFIX
28001 cmpxchg8b (%esi)
28002 jne 1b
28003
28004-10:
28005 movl %ebx, %eax
28006 movl %ecx, %edx
28007+
28008+.ifb \unchecked
28009+#ifdef CONFIG_PAX_REFCOUNT
28010+3:
28011+#endif
28012+.endif
28013+
28014 RESTORE ebx
28015+ pax_force_retaddr
28016 ret
28017 CFI_ENDPROC
28018-ENDPROC(atomic64_\func\()_return_cx8)
28019+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
28020 .endm
28021
28022 incdec_return inc add adc
28023 incdec_return dec sub sbb
28024+incdec_return inc add adc _unchecked
28025+incdec_return dec sub sbb _unchecked
28026
28027 ENTRY(atomic64_dec_if_positive_cx8)
28028 CFI_STARTPROC
28029@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
28030 movl %edx, %ecx
28031 subl $1, %ebx
28032 sbb $0, %ecx
28033+
28034+#ifdef CONFIG_PAX_REFCOUNT
28035+ into
28036+1234:
28037+ _ASM_EXTABLE(1234b, 2f)
28038+#endif
28039+
28040 js 2f
28041 LOCK_PREFIX
28042 cmpxchg8b (%esi)
28043@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
28044 movl %ebx, %eax
28045 movl %ecx, %edx
28046 RESTORE ebx
28047+ pax_force_retaddr
28048 ret
28049 CFI_ENDPROC
28050 ENDPROC(atomic64_dec_if_positive_cx8)
28051@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
28052 movl %edx, %ecx
28053 addl %ebp, %ebx
28054 adcl %edi, %ecx
28055+
28056+#ifdef CONFIG_PAX_REFCOUNT
28057+ into
28058+1234:
28059+ _ASM_EXTABLE(1234b, 3f)
28060+#endif
28061+
28062 LOCK_PREFIX
28063 cmpxchg8b (%esi)
28064 jne 1b
28065@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
28066 CFI_ADJUST_CFA_OFFSET -8
28067 RESTORE ebx
28068 RESTORE ebp
28069+ pax_force_retaddr
28070 ret
28071 4:
28072 cmpl %edx, 4(%esp)
28073@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
28074 xorl %ecx, %ecx
28075 addl $1, %ebx
28076 adcl %edx, %ecx
28077+
28078+#ifdef CONFIG_PAX_REFCOUNT
28079+ into
28080+1234:
28081+ _ASM_EXTABLE(1234b, 3f)
28082+#endif
28083+
28084 LOCK_PREFIX
28085 cmpxchg8b (%esi)
28086 jne 1b
28087@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
28088 movl $1, %eax
28089 3:
28090 RESTORE ebx
28091+ pax_force_retaddr
28092 ret
28093 CFI_ENDPROC
28094 ENDPROC(atomic64_inc_not_zero_cx8)
28095diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
28096index e78b8ee..7e173a8 100644
28097--- a/arch/x86/lib/checksum_32.S
28098+++ b/arch/x86/lib/checksum_32.S
28099@@ -29,7 +29,8 @@
28100 #include <asm/dwarf2.h>
28101 #include <asm/errno.h>
28102 #include <asm/asm.h>
28103-
28104+#include <asm/segment.h>
28105+
28106 /*
28107 * computes a partial checksum, e.g. for TCP/UDP fragments
28108 */
28109@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
28110
28111 #define ARGBASE 16
28112 #define FP 12
28113-
28114-ENTRY(csum_partial_copy_generic)
28115+
28116+ENTRY(csum_partial_copy_generic_to_user)
28117 CFI_STARTPROC
28118+
28119+#ifdef CONFIG_PAX_MEMORY_UDEREF
28120+ pushl_cfi %gs
28121+ popl_cfi %es
28122+ jmp csum_partial_copy_generic
28123+#endif
28124+
28125+ENTRY(csum_partial_copy_generic_from_user)
28126+
28127+#ifdef CONFIG_PAX_MEMORY_UDEREF
28128+ pushl_cfi %gs
28129+ popl_cfi %ds
28130+#endif
28131+
28132+ENTRY(csum_partial_copy_generic)
28133 subl $4,%esp
28134 CFI_ADJUST_CFA_OFFSET 4
28135 pushl_cfi %edi
28136@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
28137 jmp 4f
28138 SRC(1: movw (%esi), %bx )
28139 addl $2, %esi
28140-DST( movw %bx, (%edi) )
28141+DST( movw %bx, %es:(%edi) )
28142 addl $2, %edi
28143 addw %bx, %ax
28144 adcl $0, %eax
28145@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
28146 SRC(1: movl (%esi), %ebx )
28147 SRC( movl 4(%esi), %edx )
28148 adcl %ebx, %eax
28149-DST( movl %ebx, (%edi) )
28150+DST( movl %ebx, %es:(%edi) )
28151 adcl %edx, %eax
28152-DST( movl %edx, 4(%edi) )
28153+DST( movl %edx, %es:4(%edi) )
28154
28155 SRC( movl 8(%esi), %ebx )
28156 SRC( movl 12(%esi), %edx )
28157 adcl %ebx, %eax
28158-DST( movl %ebx, 8(%edi) )
28159+DST( movl %ebx, %es:8(%edi) )
28160 adcl %edx, %eax
28161-DST( movl %edx, 12(%edi) )
28162+DST( movl %edx, %es:12(%edi) )
28163
28164 SRC( movl 16(%esi), %ebx )
28165 SRC( movl 20(%esi), %edx )
28166 adcl %ebx, %eax
28167-DST( movl %ebx, 16(%edi) )
28168+DST( movl %ebx, %es:16(%edi) )
28169 adcl %edx, %eax
28170-DST( movl %edx, 20(%edi) )
28171+DST( movl %edx, %es:20(%edi) )
28172
28173 SRC( movl 24(%esi), %ebx )
28174 SRC( movl 28(%esi), %edx )
28175 adcl %ebx, %eax
28176-DST( movl %ebx, 24(%edi) )
28177+DST( movl %ebx, %es:24(%edi) )
28178 adcl %edx, %eax
28179-DST( movl %edx, 28(%edi) )
28180+DST( movl %edx, %es:28(%edi) )
28181
28182 lea 32(%esi), %esi
28183 lea 32(%edi), %edi
28184@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
28185 shrl $2, %edx # This clears CF
28186 SRC(3: movl (%esi), %ebx )
28187 adcl %ebx, %eax
28188-DST( movl %ebx, (%edi) )
28189+DST( movl %ebx, %es:(%edi) )
28190 lea 4(%esi), %esi
28191 lea 4(%edi), %edi
28192 dec %edx
28193@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
28194 jb 5f
28195 SRC( movw (%esi), %cx )
28196 leal 2(%esi), %esi
28197-DST( movw %cx, (%edi) )
28198+DST( movw %cx, %es:(%edi) )
28199 leal 2(%edi), %edi
28200 je 6f
28201 shll $16,%ecx
28202 SRC(5: movb (%esi), %cl )
28203-DST( movb %cl, (%edi) )
28204+DST( movb %cl, %es:(%edi) )
28205 6: addl %ecx, %eax
28206 adcl $0, %eax
28207 7:
28208@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
28209
28210 6001:
28211 movl ARGBASE+20(%esp), %ebx # src_err_ptr
28212- movl $-EFAULT, (%ebx)
28213+ movl $-EFAULT, %ss:(%ebx)
28214
28215 # zero the complete destination - computing the rest
28216 # is too much work
28217@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
28218
28219 6002:
28220 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
28221- movl $-EFAULT,(%ebx)
28222+ movl $-EFAULT,%ss:(%ebx)
28223 jmp 5000b
28224
28225 .previous
28226
28227+ pushl_cfi %ss
28228+ popl_cfi %ds
28229+ pushl_cfi %ss
28230+ popl_cfi %es
28231 popl_cfi %ebx
28232 CFI_RESTORE ebx
28233 popl_cfi %esi
28234@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
28235 popl_cfi %ecx # equivalent to addl $4,%esp
28236 ret
28237 CFI_ENDPROC
28238-ENDPROC(csum_partial_copy_generic)
28239+ENDPROC(csum_partial_copy_generic_to_user)
28240
28241 #else
28242
28243 /* Version for PentiumII/PPro */
28244
28245 #define ROUND1(x) \
28246+ nop; nop; nop; \
28247 SRC(movl x(%esi), %ebx ) ; \
28248 addl %ebx, %eax ; \
28249- DST(movl %ebx, x(%edi) ) ;
28250+ DST(movl %ebx, %es:x(%edi)) ;
28251
28252 #define ROUND(x) \
28253+ nop; nop; nop; \
28254 SRC(movl x(%esi), %ebx ) ; \
28255 adcl %ebx, %eax ; \
28256- DST(movl %ebx, x(%edi) ) ;
28257+ DST(movl %ebx, %es:x(%edi)) ;
28258
28259 #define ARGBASE 12
28260-
28261-ENTRY(csum_partial_copy_generic)
28262+
28263+ENTRY(csum_partial_copy_generic_to_user)
28264 CFI_STARTPROC
28265+
28266+#ifdef CONFIG_PAX_MEMORY_UDEREF
28267+ pushl_cfi %gs
28268+ popl_cfi %es
28269+ jmp csum_partial_copy_generic
28270+#endif
28271+
28272+ENTRY(csum_partial_copy_generic_from_user)
28273+
28274+#ifdef CONFIG_PAX_MEMORY_UDEREF
28275+ pushl_cfi %gs
28276+ popl_cfi %ds
28277+#endif
28278+
28279+ENTRY(csum_partial_copy_generic)
28280 pushl_cfi %ebx
28281 CFI_REL_OFFSET ebx, 0
28282 pushl_cfi %edi
28283@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
28284 subl %ebx, %edi
28285 lea -1(%esi),%edx
28286 andl $-32,%edx
28287- lea 3f(%ebx,%ebx), %ebx
28288+ lea 3f(%ebx,%ebx,2), %ebx
28289 testl %esi, %esi
28290 jmp *%ebx
28291 1: addl $64,%esi
28292@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
28293 jb 5f
28294 SRC( movw (%esi), %dx )
28295 leal 2(%esi), %esi
28296-DST( movw %dx, (%edi) )
28297+DST( movw %dx, %es:(%edi) )
28298 leal 2(%edi), %edi
28299 je 6f
28300 shll $16,%edx
28301 5:
28302 SRC( movb (%esi), %dl )
28303-DST( movb %dl, (%edi) )
28304+DST( movb %dl, %es:(%edi) )
28305 6: addl %edx, %eax
28306 adcl $0, %eax
28307 7:
28308 .section .fixup, "ax"
28309 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
28310- movl $-EFAULT, (%ebx)
28311+ movl $-EFAULT, %ss:(%ebx)
28312 # zero the complete destination (computing the rest is too much work)
28313 movl ARGBASE+8(%esp),%edi # dst
28314 movl ARGBASE+12(%esp),%ecx # len
28315@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
28316 rep; stosb
28317 jmp 7b
28318 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
28319- movl $-EFAULT, (%ebx)
28320+ movl $-EFAULT, %ss:(%ebx)
28321 jmp 7b
28322 .previous
28323
28324+#ifdef CONFIG_PAX_MEMORY_UDEREF
28325+ pushl_cfi %ss
28326+ popl_cfi %ds
28327+ pushl_cfi %ss
28328+ popl_cfi %es
28329+#endif
28330+
28331 popl_cfi %esi
28332 CFI_RESTORE esi
28333 popl_cfi %edi
28334@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
28335 CFI_RESTORE ebx
28336 ret
28337 CFI_ENDPROC
28338-ENDPROC(csum_partial_copy_generic)
28339+ENDPROC(csum_partial_copy_generic_to_user)
28340
28341 #undef ROUND
28342 #undef ROUND1
28343diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
28344index f2145cf..cea889d 100644
28345--- a/arch/x86/lib/clear_page_64.S
28346+++ b/arch/x86/lib/clear_page_64.S
28347@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
28348 movl $4096/8,%ecx
28349 xorl %eax,%eax
28350 rep stosq
28351+ pax_force_retaddr
28352 ret
28353 CFI_ENDPROC
28354 ENDPROC(clear_page_c)
28355@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
28356 movl $4096,%ecx
28357 xorl %eax,%eax
28358 rep stosb
28359+ pax_force_retaddr
28360 ret
28361 CFI_ENDPROC
28362 ENDPROC(clear_page_c_e)
28363@@ -43,6 +45,7 @@ ENTRY(clear_page)
28364 leaq 64(%rdi),%rdi
28365 jnz .Lloop
28366 nop
28367+ pax_force_retaddr
28368 ret
28369 CFI_ENDPROC
28370 .Lclear_page_end:
28371@@ -58,7 +61,7 @@ ENDPROC(clear_page)
28372
28373 #include <asm/cpufeature.h>
28374
28375- .section .altinstr_replacement,"ax"
28376+ .section .altinstr_replacement,"a"
28377 1: .byte 0xeb /* jmp <disp8> */
28378 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
28379 2: .byte 0xeb /* jmp <disp8> */
28380diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
28381index 1e572c5..2a162cd 100644
28382--- a/arch/x86/lib/cmpxchg16b_emu.S
28383+++ b/arch/x86/lib/cmpxchg16b_emu.S
28384@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
28385
28386 popf
28387 mov $1, %al
28388+ pax_force_retaddr
28389 ret
28390
28391 not_same:
28392 popf
28393 xor %al,%al
28394+ pax_force_retaddr
28395 ret
28396
28397 CFI_ENDPROC
28398diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
28399index 176cca6..e0d658e 100644
28400--- a/arch/x86/lib/copy_page_64.S
28401+++ b/arch/x86/lib/copy_page_64.S
28402@@ -9,6 +9,7 @@ copy_page_rep:
28403 CFI_STARTPROC
28404 movl $4096/8, %ecx
28405 rep movsq
28406+ pax_force_retaddr
28407 ret
28408 CFI_ENDPROC
28409 ENDPROC(copy_page_rep)
28410@@ -24,8 +25,8 @@ ENTRY(copy_page)
28411 CFI_ADJUST_CFA_OFFSET 2*8
28412 movq %rbx, (%rsp)
28413 CFI_REL_OFFSET rbx, 0
28414- movq %r12, 1*8(%rsp)
28415- CFI_REL_OFFSET r12, 1*8
28416+ movq %r13, 1*8(%rsp)
28417+ CFI_REL_OFFSET r13, 1*8
28418
28419 movl $(4096/64)-5, %ecx
28420 .p2align 4
28421@@ -38,7 +39,7 @@ ENTRY(copy_page)
28422 movq 0x8*4(%rsi), %r9
28423 movq 0x8*5(%rsi), %r10
28424 movq 0x8*6(%rsi), %r11
28425- movq 0x8*7(%rsi), %r12
28426+ movq 0x8*7(%rsi), %r13
28427
28428 prefetcht0 5*64(%rsi)
28429
28430@@ -49,7 +50,7 @@ ENTRY(copy_page)
28431 movq %r9, 0x8*4(%rdi)
28432 movq %r10, 0x8*5(%rdi)
28433 movq %r11, 0x8*6(%rdi)
28434- movq %r12, 0x8*7(%rdi)
28435+ movq %r13, 0x8*7(%rdi)
28436
28437 leaq 64 (%rsi), %rsi
28438 leaq 64 (%rdi), %rdi
28439@@ -68,7 +69,7 @@ ENTRY(copy_page)
28440 movq 0x8*4(%rsi), %r9
28441 movq 0x8*5(%rsi), %r10
28442 movq 0x8*6(%rsi), %r11
28443- movq 0x8*7(%rsi), %r12
28444+ movq 0x8*7(%rsi), %r13
28445
28446 movq %rax, 0x8*0(%rdi)
28447 movq %rbx, 0x8*1(%rdi)
28448@@ -77,7 +78,7 @@ ENTRY(copy_page)
28449 movq %r9, 0x8*4(%rdi)
28450 movq %r10, 0x8*5(%rdi)
28451 movq %r11, 0x8*6(%rdi)
28452- movq %r12, 0x8*7(%rdi)
28453+ movq %r13, 0x8*7(%rdi)
28454
28455 leaq 64(%rdi), %rdi
28456 leaq 64(%rsi), %rsi
28457@@ -85,10 +86,11 @@ ENTRY(copy_page)
28458
28459 movq (%rsp), %rbx
28460 CFI_RESTORE rbx
28461- movq 1*8(%rsp), %r12
28462- CFI_RESTORE r12
28463+ movq 1*8(%rsp), %r13
28464+ CFI_RESTORE r13
28465 addq $2*8, %rsp
28466 CFI_ADJUST_CFA_OFFSET -2*8
28467+ pax_force_retaddr
28468 ret
28469 .Lcopy_page_end:
28470 CFI_ENDPROC
28471@@ -99,7 +101,7 @@ ENDPROC(copy_page)
28472
28473 #include <asm/cpufeature.h>
28474
28475- .section .altinstr_replacement,"ax"
28476+ .section .altinstr_replacement,"a"
28477 1: .byte 0xeb /* jmp <disp8> */
28478 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
28479 2:
28480diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
28481index a30ca15..407412b 100644
28482--- a/arch/x86/lib/copy_user_64.S
28483+++ b/arch/x86/lib/copy_user_64.S
28484@@ -18,31 +18,7 @@
28485 #include <asm/alternative-asm.h>
28486 #include <asm/asm.h>
28487 #include <asm/smap.h>
28488-
28489-/*
28490- * By placing feature2 after feature1 in altinstructions section, we logically
28491- * implement:
28492- * If CPU has feature2, jmp to alt2 is used
28493- * else if CPU has feature1, jmp to alt1 is used
28494- * else jmp to orig is used.
28495- */
28496- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
28497-0:
28498- .byte 0xe9 /* 32bit jump */
28499- .long \orig-1f /* by default jump to orig */
28500-1:
28501- .section .altinstr_replacement,"ax"
28502-2: .byte 0xe9 /* near jump with 32bit immediate */
28503- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
28504-3: .byte 0xe9 /* near jump with 32bit immediate */
28505- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
28506- .previous
28507-
28508- .section .altinstructions,"a"
28509- altinstruction_entry 0b,2b,\feature1,5,5
28510- altinstruction_entry 0b,3b,\feature2,5,5
28511- .previous
28512- .endm
28513+#include <asm/pgtable.h>
28514
28515 .macro ALIGN_DESTINATION
28516 #ifdef FIX_ALIGNMENT
28517@@ -70,52 +46,6 @@
28518 #endif
28519 .endm
28520
28521-/* Standard copy_to_user with segment limit checking */
28522-ENTRY(_copy_to_user)
28523- CFI_STARTPROC
28524- GET_THREAD_INFO(%rax)
28525- movq %rdi,%rcx
28526- addq %rdx,%rcx
28527- jc bad_to_user
28528- cmpq TI_addr_limit(%rax),%rcx
28529- ja bad_to_user
28530- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
28531- copy_user_generic_unrolled,copy_user_generic_string, \
28532- copy_user_enhanced_fast_string
28533- CFI_ENDPROC
28534-ENDPROC(_copy_to_user)
28535-
28536-/* Standard copy_from_user with segment limit checking */
28537-ENTRY(_copy_from_user)
28538- CFI_STARTPROC
28539- GET_THREAD_INFO(%rax)
28540- movq %rsi,%rcx
28541- addq %rdx,%rcx
28542- jc bad_from_user
28543- cmpq TI_addr_limit(%rax),%rcx
28544- ja bad_from_user
28545- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
28546- copy_user_generic_unrolled,copy_user_generic_string, \
28547- copy_user_enhanced_fast_string
28548- CFI_ENDPROC
28549-ENDPROC(_copy_from_user)
28550-
28551- .section .fixup,"ax"
28552- /* must zero dest */
28553-ENTRY(bad_from_user)
28554-bad_from_user:
28555- CFI_STARTPROC
28556- movl %edx,%ecx
28557- xorl %eax,%eax
28558- rep
28559- stosb
28560-bad_to_user:
28561- movl %edx,%eax
28562- ret
28563- CFI_ENDPROC
28564-ENDPROC(bad_from_user)
28565- .previous
28566-
28567 /*
28568 * copy_user_generic_unrolled - memory copy with exception handling.
28569 * This version is for CPUs like P4 that don't have efficient micro
28570@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
28571 */
28572 ENTRY(copy_user_generic_unrolled)
28573 CFI_STARTPROC
28574+ ASM_PAX_OPEN_USERLAND
28575 ASM_STAC
28576 cmpl $8,%edx
28577 jb 20f /* less then 8 bytes, go to byte copy loop */
28578@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
28579 jnz 21b
28580 23: xor %eax,%eax
28581 ASM_CLAC
28582+ ASM_PAX_CLOSE_USERLAND
28583+ pax_force_retaddr
28584 ret
28585
28586 .section .fixup,"ax"
28587@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
28588 */
28589 ENTRY(copy_user_generic_string)
28590 CFI_STARTPROC
28591+ ASM_PAX_OPEN_USERLAND
28592 ASM_STAC
28593 andl %edx,%edx
28594 jz 4f
28595@@ -251,6 +185,8 @@ ENTRY(copy_user_generic_string)
28596 movsb
28597 4: xorl %eax,%eax
28598 ASM_CLAC
28599+ ASM_PAX_CLOSE_USERLAND
28600+ pax_force_retaddr
28601 ret
28602
28603 .section .fixup,"ax"
28604@@ -278,6 +214,7 @@ ENDPROC(copy_user_generic_string)
28605 */
28606 ENTRY(copy_user_enhanced_fast_string)
28607 CFI_STARTPROC
28608+ ASM_PAX_OPEN_USERLAND
28609 ASM_STAC
28610 andl %edx,%edx
28611 jz 2f
28612@@ -286,6 +223,8 @@ ENTRY(copy_user_enhanced_fast_string)
28613 movsb
28614 2: xorl %eax,%eax
28615 ASM_CLAC
28616+ ASM_PAX_CLOSE_USERLAND
28617+ pax_force_retaddr
28618 ret
28619
28620 .section .fixup,"ax"
28621diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
28622index 6a4f43c..c70fb52 100644
28623--- a/arch/x86/lib/copy_user_nocache_64.S
28624+++ b/arch/x86/lib/copy_user_nocache_64.S
28625@@ -8,6 +8,7 @@
28626
28627 #include <linux/linkage.h>
28628 #include <asm/dwarf2.h>
28629+#include <asm/alternative-asm.h>
28630
28631 #define FIX_ALIGNMENT 1
28632
28633@@ -16,6 +17,7 @@
28634 #include <asm/thread_info.h>
28635 #include <asm/asm.h>
28636 #include <asm/smap.h>
28637+#include <asm/pgtable.h>
28638
28639 .macro ALIGN_DESTINATION
28640 #ifdef FIX_ALIGNMENT
28641@@ -49,6 +51,16 @@
28642 */
28643 ENTRY(__copy_user_nocache)
28644 CFI_STARTPROC
28645+
28646+#ifdef CONFIG_PAX_MEMORY_UDEREF
28647+ mov pax_user_shadow_base,%rcx
28648+ cmp %rcx,%rsi
28649+ jae 1f
28650+ add %rcx,%rsi
28651+1:
28652+#endif
28653+
28654+ ASM_PAX_OPEN_USERLAND
28655 ASM_STAC
28656 cmpl $8,%edx
28657 jb 20f /* less then 8 bytes, go to byte copy loop */
28658@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
28659 jnz 21b
28660 23: xorl %eax,%eax
28661 ASM_CLAC
28662+ ASM_PAX_CLOSE_USERLAND
28663 sfence
28664+ pax_force_retaddr
28665 ret
28666
28667 .section .fixup,"ax"
28668diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
28669index 2419d5f..fe52d0e 100644
28670--- a/arch/x86/lib/csum-copy_64.S
28671+++ b/arch/x86/lib/csum-copy_64.S
28672@@ -9,6 +9,7 @@
28673 #include <asm/dwarf2.h>
28674 #include <asm/errno.h>
28675 #include <asm/asm.h>
28676+#include <asm/alternative-asm.h>
28677
28678 /*
28679 * Checksum copy with exception handling.
28680@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
28681 CFI_ADJUST_CFA_OFFSET 7*8
28682 movq %rbx, 2*8(%rsp)
28683 CFI_REL_OFFSET rbx, 2*8
28684- movq %r12, 3*8(%rsp)
28685- CFI_REL_OFFSET r12, 3*8
28686+ movq %r15, 3*8(%rsp)
28687+ CFI_REL_OFFSET r15, 3*8
28688 movq %r14, 4*8(%rsp)
28689 CFI_REL_OFFSET r14, 4*8
28690 movq %r13, 5*8(%rsp)
28691@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
28692 movl %edx, %ecx
28693
28694 xorl %r9d, %r9d
28695- movq %rcx, %r12
28696+ movq %rcx, %r15
28697
28698- shrq $6, %r12
28699+ shrq $6, %r15
28700 jz .Lhandle_tail /* < 64 */
28701
28702 clc
28703
28704 /* main loop. clear in 64 byte blocks */
28705 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
28706- /* r11: temp3, rdx: temp4, r12 loopcnt */
28707+ /* r11: temp3, rdx: temp4, r15 loopcnt */
28708 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
28709 .p2align 4
28710 .Lloop:
28711@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
28712 adcq %r14, %rax
28713 adcq %r13, %rax
28714
28715- decl %r12d
28716+ decl %r15d
28717
28718 dest
28719 movq %rbx, (%rsi)
28720@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
28721 .Lende:
28722 movq 2*8(%rsp), %rbx
28723 CFI_RESTORE rbx
28724- movq 3*8(%rsp), %r12
28725- CFI_RESTORE r12
28726+ movq 3*8(%rsp), %r15
28727+ CFI_RESTORE r15
28728 movq 4*8(%rsp), %r14
28729 CFI_RESTORE r14
28730 movq 5*8(%rsp), %r13
28731@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
28732 CFI_RESTORE rbp
28733 addq $7*8, %rsp
28734 CFI_ADJUST_CFA_OFFSET -7*8
28735+ pax_force_retaddr
28736 ret
28737 CFI_RESTORE_STATE
28738
28739diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
28740index 7609e0e..b449b98 100644
28741--- a/arch/x86/lib/csum-wrappers_64.c
28742+++ b/arch/x86/lib/csum-wrappers_64.c
28743@@ -53,10 +53,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
28744 len -= 2;
28745 }
28746 }
28747+ pax_open_userland();
28748 stac();
28749- isum = csum_partial_copy_generic((__force const void *)src,
28750+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
28751 dst, len, isum, errp, NULL);
28752 clac();
28753+ pax_close_userland();
28754 if (unlikely(*errp))
28755 goto out_err;
28756
28757@@ -110,10 +112,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
28758 }
28759
28760 *errp = 0;
28761+ pax_open_userland();
28762 stac();
28763- ret = csum_partial_copy_generic(src, (void __force *)dst,
28764+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
28765 len, isum, NULL, errp);
28766 clac();
28767+ pax_close_userland();
28768 return ret;
28769 }
28770 EXPORT_SYMBOL(csum_partial_copy_to_user);
28771diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
28772index a451235..1daa956 100644
28773--- a/arch/x86/lib/getuser.S
28774+++ b/arch/x86/lib/getuser.S
28775@@ -33,17 +33,40 @@
28776 #include <asm/thread_info.h>
28777 #include <asm/asm.h>
28778 #include <asm/smap.h>
28779+#include <asm/segment.h>
28780+#include <asm/pgtable.h>
28781+#include <asm/alternative-asm.h>
28782+
28783+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28784+#define __copyuser_seg gs;
28785+#else
28786+#define __copyuser_seg
28787+#endif
28788
28789 .text
28790 ENTRY(__get_user_1)
28791 CFI_STARTPROC
28792+
28793+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28794 GET_THREAD_INFO(%_ASM_DX)
28795 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28796 jae bad_get_user
28797 ASM_STAC
28798-1: movzbl (%_ASM_AX),%edx
28799+
28800+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28801+ mov pax_user_shadow_base,%_ASM_DX
28802+ cmp %_ASM_DX,%_ASM_AX
28803+ jae 1234f
28804+ add %_ASM_DX,%_ASM_AX
28805+1234:
28806+#endif
28807+
28808+#endif
28809+
28810+1: __copyuser_seg movzbl (%_ASM_AX),%edx
28811 xor %eax,%eax
28812 ASM_CLAC
28813+ pax_force_retaddr
28814 ret
28815 CFI_ENDPROC
28816 ENDPROC(__get_user_1)
28817@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
28818 ENTRY(__get_user_2)
28819 CFI_STARTPROC
28820 add $1,%_ASM_AX
28821+
28822+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28823 jc bad_get_user
28824 GET_THREAD_INFO(%_ASM_DX)
28825 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28826 jae bad_get_user
28827 ASM_STAC
28828-2: movzwl -1(%_ASM_AX),%edx
28829+
28830+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28831+ mov pax_user_shadow_base,%_ASM_DX
28832+ cmp %_ASM_DX,%_ASM_AX
28833+ jae 1234f
28834+ add %_ASM_DX,%_ASM_AX
28835+1234:
28836+#endif
28837+
28838+#endif
28839+
28840+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
28841 xor %eax,%eax
28842 ASM_CLAC
28843+ pax_force_retaddr
28844 ret
28845 CFI_ENDPROC
28846 ENDPROC(__get_user_2)
28847@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
28848 ENTRY(__get_user_4)
28849 CFI_STARTPROC
28850 add $3,%_ASM_AX
28851+
28852+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28853 jc bad_get_user
28854 GET_THREAD_INFO(%_ASM_DX)
28855 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28856 jae bad_get_user
28857 ASM_STAC
28858-3: movl -3(%_ASM_AX),%edx
28859+
28860+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28861+ mov pax_user_shadow_base,%_ASM_DX
28862+ cmp %_ASM_DX,%_ASM_AX
28863+ jae 1234f
28864+ add %_ASM_DX,%_ASM_AX
28865+1234:
28866+#endif
28867+
28868+#endif
28869+
28870+3: __copyuser_seg movl -3(%_ASM_AX),%edx
28871 xor %eax,%eax
28872 ASM_CLAC
28873+ pax_force_retaddr
28874 ret
28875 CFI_ENDPROC
28876 ENDPROC(__get_user_4)
28877@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
28878 GET_THREAD_INFO(%_ASM_DX)
28879 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28880 jae bad_get_user
28881+
28882+#ifdef CONFIG_PAX_MEMORY_UDEREF
28883+ mov pax_user_shadow_base,%_ASM_DX
28884+ cmp %_ASM_DX,%_ASM_AX
28885+ jae 1234f
28886+ add %_ASM_DX,%_ASM_AX
28887+1234:
28888+#endif
28889+
28890 ASM_STAC
28891 4: movq -7(%_ASM_AX),%rdx
28892 xor %eax,%eax
28893 ASM_CLAC
28894+ pax_force_retaddr
28895 ret
28896 #else
28897 add $7,%_ASM_AX
28898@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
28899 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
28900 jae bad_get_user_8
28901 ASM_STAC
28902-4: movl -7(%_ASM_AX),%edx
28903-5: movl -3(%_ASM_AX),%ecx
28904+4: __copyuser_seg movl -7(%_ASM_AX),%edx
28905+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
28906 xor %eax,%eax
28907 ASM_CLAC
28908+ pax_force_retaddr
28909 ret
28910 #endif
28911 CFI_ENDPROC
28912@@ -113,6 +175,7 @@ bad_get_user:
28913 xor %edx,%edx
28914 mov $(-EFAULT),%_ASM_AX
28915 ASM_CLAC
28916+ pax_force_retaddr
28917 ret
28918 CFI_ENDPROC
28919 END(bad_get_user)
28920@@ -124,6 +187,7 @@ bad_get_user_8:
28921 xor %ecx,%ecx
28922 mov $(-EFAULT),%_ASM_AX
28923 ASM_CLAC
28924+ pax_force_retaddr
28925 ret
28926 CFI_ENDPROC
28927 END(bad_get_user_8)
28928diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
28929index 54fcffe..7be149e 100644
28930--- a/arch/x86/lib/insn.c
28931+++ b/arch/x86/lib/insn.c
28932@@ -20,8 +20,10 @@
28933
28934 #ifdef __KERNEL__
28935 #include <linux/string.h>
28936+#include <asm/pgtable_types.h>
28937 #else
28938 #include <string.h>
28939+#define ktla_ktva(addr) addr
28940 #endif
28941 #include <asm/inat.h>
28942 #include <asm/insn.h>
28943@@ -53,8 +55,8 @@
28944 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
28945 {
28946 memset(insn, 0, sizeof(*insn));
28947- insn->kaddr = kaddr;
28948- insn->next_byte = kaddr;
28949+ insn->kaddr = ktla_ktva(kaddr);
28950+ insn->next_byte = ktla_ktva(kaddr);
28951 insn->x86_64 = x86_64 ? 1 : 0;
28952 insn->opnd_bytes = 4;
28953 if (x86_64)
28954diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
28955index 05a95e7..326f2fa 100644
28956--- a/arch/x86/lib/iomap_copy_64.S
28957+++ b/arch/x86/lib/iomap_copy_64.S
28958@@ -17,6 +17,7 @@
28959
28960 #include <linux/linkage.h>
28961 #include <asm/dwarf2.h>
28962+#include <asm/alternative-asm.h>
28963
28964 /*
28965 * override generic version in lib/iomap_copy.c
28966@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
28967 CFI_STARTPROC
28968 movl %edx,%ecx
28969 rep movsd
28970+ pax_force_retaddr
28971 ret
28972 CFI_ENDPROC
28973 ENDPROC(__iowrite32_copy)
28974diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
28975index 56313a3..0db417e 100644
28976--- a/arch/x86/lib/memcpy_64.S
28977+++ b/arch/x86/lib/memcpy_64.S
28978@@ -24,7 +24,7 @@
28979 * This gets patched over the unrolled variant (below) via the
28980 * alternative instructions framework:
28981 */
28982- .section .altinstr_replacement, "ax", @progbits
28983+ .section .altinstr_replacement, "a", @progbits
28984 .Lmemcpy_c:
28985 movq %rdi, %rax
28986 movq %rdx, %rcx
28987@@ -33,6 +33,7 @@
28988 rep movsq
28989 movl %edx, %ecx
28990 rep movsb
28991+ pax_force_retaddr
28992 ret
28993 .Lmemcpy_e:
28994 .previous
28995@@ -44,11 +45,12 @@
28996 * This gets patched over the unrolled variant (below) via the
28997 * alternative instructions framework:
28998 */
28999- .section .altinstr_replacement, "ax", @progbits
29000+ .section .altinstr_replacement, "a", @progbits
29001 .Lmemcpy_c_e:
29002 movq %rdi, %rax
29003 movq %rdx, %rcx
29004 rep movsb
29005+ pax_force_retaddr
29006 ret
29007 .Lmemcpy_e_e:
29008 .previous
29009@@ -136,6 +138,7 @@ ENTRY(memcpy)
29010 movq %r9, 1*8(%rdi)
29011 movq %r10, -2*8(%rdi, %rdx)
29012 movq %r11, -1*8(%rdi, %rdx)
29013+ pax_force_retaddr
29014 retq
29015 .p2align 4
29016 .Lless_16bytes:
29017@@ -148,6 +151,7 @@ ENTRY(memcpy)
29018 movq -1*8(%rsi, %rdx), %r9
29019 movq %r8, 0*8(%rdi)
29020 movq %r9, -1*8(%rdi, %rdx)
29021+ pax_force_retaddr
29022 retq
29023 .p2align 4
29024 .Lless_8bytes:
29025@@ -161,6 +165,7 @@ ENTRY(memcpy)
29026 movl -4(%rsi, %rdx), %r8d
29027 movl %ecx, (%rdi)
29028 movl %r8d, -4(%rdi, %rdx)
29029+ pax_force_retaddr
29030 retq
29031 .p2align 4
29032 .Lless_3bytes:
29033@@ -179,6 +184,7 @@ ENTRY(memcpy)
29034 movb %cl, (%rdi)
29035
29036 .Lend:
29037+ pax_force_retaddr
29038 retq
29039 CFI_ENDPROC
29040 ENDPROC(memcpy)
29041diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
29042index 65268a6..dd1de11 100644
29043--- a/arch/x86/lib/memmove_64.S
29044+++ b/arch/x86/lib/memmove_64.S
29045@@ -202,14 +202,16 @@ ENTRY(memmove)
29046 movb (%rsi), %r11b
29047 movb %r11b, (%rdi)
29048 13:
29049+ pax_force_retaddr
29050 retq
29051 CFI_ENDPROC
29052
29053- .section .altinstr_replacement,"ax"
29054+ .section .altinstr_replacement,"a"
29055 .Lmemmove_begin_forward_efs:
29056 /* Forward moving data. */
29057 movq %rdx, %rcx
29058 rep movsb
29059+ pax_force_retaddr
29060 retq
29061 .Lmemmove_end_forward_efs:
29062 .previous
29063diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
29064index 2dcb380..2eb79fe 100644
29065--- a/arch/x86/lib/memset_64.S
29066+++ b/arch/x86/lib/memset_64.S
29067@@ -16,7 +16,7 @@
29068 *
29069 * rax original destination
29070 */
29071- .section .altinstr_replacement, "ax", @progbits
29072+ .section .altinstr_replacement, "a", @progbits
29073 .Lmemset_c:
29074 movq %rdi,%r9
29075 movq %rdx,%rcx
29076@@ -30,6 +30,7 @@
29077 movl %edx,%ecx
29078 rep stosb
29079 movq %r9,%rax
29080+ pax_force_retaddr
29081 ret
29082 .Lmemset_e:
29083 .previous
29084@@ -45,13 +46,14 @@
29085 *
29086 * rax original destination
29087 */
29088- .section .altinstr_replacement, "ax", @progbits
29089+ .section .altinstr_replacement, "a", @progbits
29090 .Lmemset_c_e:
29091 movq %rdi,%r9
29092 movb %sil,%al
29093 movq %rdx,%rcx
29094 rep stosb
29095 movq %r9,%rax
29096+ pax_force_retaddr
29097 ret
29098 .Lmemset_e_e:
29099 .previous
29100@@ -118,6 +120,7 @@ ENTRY(__memset)
29101
29102 .Lende:
29103 movq %r10,%rax
29104+ pax_force_retaddr
29105 ret
29106
29107 CFI_RESTORE_STATE
29108diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
29109index c9f2d9b..e7fd2c0 100644
29110--- a/arch/x86/lib/mmx_32.c
29111+++ b/arch/x86/lib/mmx_32.c
29112@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
29113 {
29114 void *p;
29115 int i;
29116+ unsigned long cr0;
29117
29118 if (unlikely(in_interrupt()))
29119 return __memcpy(to, from, len);
29120@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
29121 kernel_fpu_begin();
29122
29123 __asm__ __volatile__ (
29124- "1: prefetch (%0)\n" /* This set is 28 bytes */
29125- " prefetch 64(%0)\n"
29126- " prefetch 128(%0)\n"
29127- " prefetch 192(%0)\n"
29128- " prefetch 256(%0)\n"
29129+ "1: prefetch (%1)\n" /* This set is 28 bytes */
29130+ " prefetch 64(%1)\n"
29131+ " prefetch 128(%1)\n"
29132+ " prefetch 192(%1)\n"
29133+ " prefetch 256(%1)\n"
29134 "2: \n"
29135 ".section .fixup, \"ax\"\n"
29136- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29137+ "3: \n"
29138+
29139+#ifdef CONFIG_PAX_KERNEXEC
29140+ " movl %%cr0, %0\n"
29141+ " movl %0, %%eax\n"
29142+ " andl $0xFFFEFFFF, %%eax\n"
29143+ " movl %%eax, %%cr0\n"
29144+#endif
29145+
29146+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29147+
29148+#ifdef CONFIG_PAX_KERNEXEC
29149+ " movl %0, %%cr0\n"
29150+#endif
29151+
29152 " jmp 2b\n"
29153 ".previous\n"
29154 _ASM_EXTABLE(1b, 3b)
29155- : : "r" (from));
29156+ : "=&r" (cr0) : "r" (from) : "ax");
29157
29158 for ( ; i > 5; i--) {
29159 __asm__ __volatile__ (
29160- "1: prefetch 320(%0)\n"
29161- "2: movq (%0), %%mm0\n"
29162- " movq 8(%0), %%mm1\n"
29163- " movq 16(%0), %%mm2\n"
29164- " movq 24(%0), %%mm3\n"
29165- " movq %%mm0, (%1)\n"
29166- " movq %%mm1, 8(%1)\n"
29167- " movq %%mm2, 16(%1)\n"
29168- " movq %%mm3, 24(%1)\n"
29169- " movq 32(%0), %%mm0\n"
29170- " movq 40(%0), %%mm1\n"
29171- " movq 48(%0), %%mm2\n"
29172- " movq 56(%0), %%mm3\n"
29173- " movq %%mm0, 32(%1)\n"
29174- " movq %%mm1, 40(%1)\n"
29175- " movq %%mm2, 48(%1)\n"
29176- " movq %%mm3, 56(%1)\n"
29177+ "1: prefetch 320(%1)\n"
29178+ "2: movq (%1), %%mm0\n"
29179+ " movq 8(%1), %%mm1\n"
29180+ " movq 16(%1), %%mm2\n"
29181+ " movq 24(%1), %%mm3\n"
29182+ " movq %%mm0, (%2)\n"
29183+ " movq %%mm1, 8(%2)\n"
29184+ " movq %%mm2, 16(%2)\n"
29185+ " movq %%mm3, 24(%2)\n"
29186+ " movq 32(%1), %%mm0\n"
29187+ " movq 40(%1), %%mm1\n"
29188+ " movq 48(%1), %%mm2\n"
29189+ " movq 56(%1), %%mm3\n"
29190+ " movq %%mm0, 32(%2)\n"
29191+ " movq %%mm1, 40(%2)\n"
29192+ " movq %%mm2, 48(%2)\n"
29193+ " movq %%mm3, 56(%2)\n"
29194 ".section .fixup, \"ax\"\n"
29195- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29196+ "3:\n"
29197+
29198+#ifdef CONFIG_PAX_KERNEXEC
29199+ " movl %%cr0, %0\n"
29200+ " movl %0, %%eax\n"
29201+ " andl $0xFFFEFFFF, %%eax\n"
29202+ " movl %%eax, %%cr0\n"
29203+#endif
29204+
29205+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29206+
29207+#ifdef CONFIG_PAX_KERNEXEC
29208+ " movl %0, %%cr0\n"
29209+#endif
29210+
29211 " jmp 2b\n"
29212 ".previous\n"
29213 _ASM_EXTABLE(1b, 3b)
29214- : : "r" (from), "r" (to) : "memory");
29215+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
29216
29217 from += 64;
29218 to += 64;
29219@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
29220 static void fast_copy_page(void *to, void *from)
29221 {
29222 int i;
29223+ unsigned long cr0;
29224
29225 kernel_fpu_begin();
29226
29227@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
29228 * but that is for later. -AV
29229 */
29230 __asm__ __volatile__(
29231- "1: prefetch (%0)\n"
29232- " prefetch 64(%0)\n"
29233- " prefetch 128(%0)\n"
29234- " prefetch 192(%0)\n"
29235- " prefetch 256(%0)\n"
29236+ "1: prefetch (%1)\n"
29237+ " prefetch 64(%1)\n"
29238+ " prefetch 128(%1)\n"
29239+ " prefetch 192(%1)\n"
29240+ " prefetch 256(%1)\n"
29241 "2: \n"
29242 ".section .fixup, \"ax\"\n"
29243- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29244+ "3: \n"
29245+
29246+#ifdef CONFIG_PAX_KERNEXEC
29247+ " movl %%cr0, %0\n"
29248+ " movl %0, %%eax\n"
29249+ " andl $0xFFFEFFFF, %%eax\n"
29250+ " movl %%eax, %%cr0\n"
29251+#endif
29252+
29253+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29254+
29255+#ifdef CONFIG_PAX_KERNEXEC
29256+ " movl %0, %%cr0\n"
29257+#endif
29258+
29259 " jmp 2b\n"
29260 ".previous\n"
29261- _ASM_EXTABLE(1b, 3b) : : "r" (from));
29262+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
29263
29264 for (i = 0; i < (4096-320)/64; i++) {
29265 __asm__ __volatile__ (
29266- "1: prefetch 320(%0)\n"
29267- "2: movq (%0), %%mm0\n"
29268- " movntq %%mm0, (%1)\n"
29269- " movq 8(%0), %%mm1\n"
29270- " movntq %%mm1, 8(%1)\n"
29271- " movq 16(%0), %%mm2\n"
29272- " movntq %%mm2, 16(%1)\n"
29273- " movq 24(%0), %%mm3\n"
29274- " movntq %%mm3, 24(%1)\n"
29275- " movq 32(%0), %%mm4\n"
29276- " movntq %%mm4, 32(%1)\n"
29277- " movq 40(%0), %%mm5\n"
29278- " movntq %%mm5, 40(%1)\n"
29279- " movq 48(%0), %%mm6\n"
29280- " movntq %%mm6, 48(%1)\n"
29281- " movq 56(%0), %%mm7\n"
29282- " movntq %%mm7, 56(%1)\n"
29283+ "1: prefetch 320(%1)\n"
29284+ "2: movq (%1), %%mm0\n"
29285+ " movntq %%mm0, (%2)\n"
29286+ " movq 8(%1), %%mm1\n"
29287+ " movntq %%mm1, 8(%2)\n"
29288+ " movq 16(%1), %%mm2\n"
29289+ " movntq %%mm2, 16(%2)\n"
29290+ " movq 24(%1), %%mm3\n"
29291+ " movntq %%mm3, 24(%2)\n"
29292+ " movq 32(%1), %%mm4\n"
29293+ " movntq %%mm4, 32(%2)\n"
29294+ " movq 40(%1), %%mm5\n"
29295+ " movntq %%mm5, 40(%2)\n"
29296+ " movq 48(%1), %%mm6\n"
29297+ " movntq %%mm6, 48(%2)\n"
29298+ " movq 56(%1), %%mm7\n"
29299+ " movntq %%mm7, 56(%2)\n"
29300 ".section .fixup, \"ax\"\n"
29301- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29302+ "3:\n"
29303+
29304+#ifdef CONFIG_PAX_KERNEXEC
29305+ " movl %%cr0, %0\n"
29306+ " movl %0, %%eax\n"
29307+ " andl $0xFFFEFFFF, %%eax\n"
29308+ " movl %%eax, %%cr0\n"
29309+#endif
29310+
29311+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29312+
29313+#ifdef CONFIG_PAX_KERNEXEC
29314+ " movl %0, %%cr0\n"
29315+#endif
29316+
29317 " jmp 2b\n"
29318 ".previous\n"
29319- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
29320+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
29321
29322 from += 64;
29323 to += 64;
29324@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
29325 static void fast_copy_page(void *to, void *from)
29326 {
29327 int i;
29328+ unsigned long cr0;
29329
29330 kernel_fpu_begin();
29331
29332 __asm__ __volatile__ (
29333- "1: prefetch (%0)\n"
29334- " prefetch 64(%0)\n"
29335- " prefetch 128(%0)\n"
29336- " prefetch 192(%0)\n"
29337- " prefetch 256(%0)\n"
29338+ "1: prefetch (%1)\n"
29339+ " prefetch 64(%1)\n"
29340+ " prefetch 128(%1)\n"
29341+ " prefetch 192(%1)\n"
29342+ " prefetch 256(%1)\n"
29343 "2: \n"
29344 ".section .fixup, \"ax\"\n"
29345- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29346+ "3: \n"
29347+
29348+#ifdef CONFIG_PAX_KERNEXEC
29349+ " movl %%cr0, %0\n"
29350+ " movl %0, %%eax\n"
29351+ " andl $0xFFFEFFFF, %%eax\n"
29352+ " movl %%eax, %%cr0\n"
29353+#endif
29354+
29355+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
29356+
29357+#ifdef CONFIG_PAX_KERNEXEC
29358+ " movl %0, %%cr0\n"
29359+#endif
29360+
29361 " jmp 2b\n"
29362 ".previous\n"
29363- _ASM_EXTABLE(1b, 3b) : : "r" (from));
29364+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
29365
29366 for (i = 0; i < 4096/64; i++) {
29367 __asm__ __volatile__ (
29368- "1: prefetch 320(%0)\n"
29369- "2: movq (%0), %%mm0\n"
29370- " movq 8(%0), %%mm1\n"
29371- " movq 16(%0), %%mm2\n"
29372- " movq 24(%0), %%mm3\n"
29373- " movq %%mm0, (%1)\n"
29374- " movq %%mm1, 8(%1)\n"
29375- " movq %%mm2, 16(%1)\n"
29376- " movq %%mm3, 24(%1)\n"
29377- " movq 32(%0), %%mm0\n"
29378- " movq 40(%0), %%mm1\n"
29379- " movq 48(%0), %%mm2\n"
29380- " movq 56(%0), %%mm3\n"
29381- " movq %%mm0, 32(%1)\n"
29382- " movq %%mm1, 40(%1)\n"
29383- " movq %%mm2, 48(%1)\n"
29384- " movq %%mm3, 56(%1)\n"
29385+ "1: prefetch 320(%1)\n"
29386+ "2: movq (%1), %%mm0\n"
29387+ " movq 8(%1), %%mm1\n"
29388+ " movq 16(%1), %%mm2\n"
29389+ " movq 24(%1), %%mm3\n"
29390+ " movq %%mm0, (%2)\n"
29391+ " movq %%mm1, 8(%2)\n"
29392+ " movq %%mm2, 16(%2)\n"
29393+ " movq %%mm3, 24(%2)\n"
29394+ " movq 32(%1), %%mm0\n"
29395+ " movq 40(%1), %%mm1\n"
29396+ " movq 48(%1), %%mm2\n"
29397+ " movq 56(%1), %%mm3\n"
29398+ " movq %%mm0, 32(%2)\n"
29399+ " movq %%mm1, 40(%2)\n"
29400+ " movq %%mm2, 48(%2)\n"
29401+ " movq %%mm3, 56(%2)\n"
29402 ".section .fixup, \"ax\"\n"
29403- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29404+ "3:\n"
29405+
29406+#ifdef CONFIG_PAX_KERNEXEC
29407+ " movl %%cr0, %0\n"
29408+ " movl %0, %%eax\n"
29409+ " andl $0xFFFEFFFF, %%eax\n"
29410+ " movl %%eax, %%cr0\n"
29411+#endif
29412+
29413+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
29414+
29415+#ifdef CONFIG_PAX_KERNEXEC
29416+ " movl %0, %%cr0\n"
29417+#endif
29418+
29419 " jmp 2b\n"
29420 ".previous\n"
29421 _ASM_EXTABLE(1b, 3b)
29422- : : "r" (from), "r" (to) : "memory");
29423+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
29424
29425 from += 64;
29426 to += 64;
29427diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
29428index f6d13ee..d789440 100644
29429--- a/arch/x86/lib/msr-reg.S
29430+++ b/arch/x86/lib/msr-reg.S
29431@@ -3,6 +3,7 @@
29432 #include <asm/dwarf2.h>
29433 #include <asm/asm.h>
29434 #include <asm/msr.h>
29435+#include <asm/alternative-asm.h>
29436
29437 #ifdef CONFIG_X86_64
29438 /*
29439@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
29440 movl %edi, 28(%r10)
29441 popq_cfi %rbp
29442 popq_cfi %rbx
29443+ pax_force_retaddr
29444 ret
29445 3:
29446 CFI_RESTORE_STATE
29447diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
29448index fc6ba17..d4d989d 100644
29449--- a/arch/x86/lib/putuser.S
29450+++ b/arch/x86/lib/putuser.S
29451@@ -16,7 +16,9 @@
29452 #include <asm/errno.h>
29453 #include <asm/asm.h>
29454 #include <asm/smap.h>
29455-
29456+#include <asm/segment.h>
29457+#include <asm/pgtable.h>
29458+#include <asm/alternative-asm.h>
29459
29460 /*
29461 * __put_user_X
29462@@ -30,57 +32,125 @@
29463 * as they get called from within inline assembly.
29464 */
29465
29466-#define ENTER CFI_STARTPROC ; \
29467- GET_THREAD_INFO(%_ASM_BX)
29468-#define EXIT ASM_CLAC ; \
29469- ret ; \
29470+#define ENTER CFI_STARTPROC
29471+#define EXIT ASM_CLAC ; \
29472+ pax_force_retaddr ; \
29473+ ret ; \
29474 CFI_ENDPROC
29475
29476+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29477+#define _DEST %_ASM_CX,%_ASM_BX
29478+#else
29479+#define _DEST %_ASM_CX
29480+#endif
29481+
29482+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
29483+#define __copyuser_seg gs;
29484+#else
29485+#define __copyuser_seg
29486+#endif
29487+
29488 .text
29489 ENTRY(__put_user_1)
29490 ENTER
29491+
29492+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29493+ GET_THREAD_INFO(%_ASM_BX)
29494 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
29495 jae bad_put_user
29496 ASM_STAC
29497-1: movb %al,(%_ASM_CX)
29498+
29499+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29500+ mov pax_user_shadow_base,%_ASM_BX
29501+ cmp %_ASM_BX,%_ASM_CX
29502+ jb 1234f
29503+ xor %ebx,%ebx
29504+1234:
29505+#endif
29506+
29507+#endif
29508+
29509+1: __copyuser_seg movb %al,(_DEST)
29510 xor %eax,%eax
29511 EXIT
29512 ENDPROC(__put_user_1)
29513
29514 ENTRY(__put_user_2)
29515 ENTER
29516+
29517+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29518+ GET_THREAD_INFO(%_ASM_BX)
29519 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
29520 sub $1,%_ASM_BX
29521 cmp %_ASM_BX,%_ASM_CX
29522 jae bad_put_user
29523 ASM_STAC
29524-2: movw %ax,(%_ASM_CX)
29525+
29526+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29527+ mov pax_user_shadow_base,%_ASM_BX
29528+ cmp %_ASM_BX,%_ASM_CX
29529+ jb 1234f
29530+ xor %ebx,%ebx
29531+1234:
29532+#endif
29533+
29534+#endif
29535+
29536+2: __copyuser_seg movw %ax,(_DEST)
29537 xor %eax,%eax
29538 EXIT
29539 ENDPROC(__put_user_2)
29540
29541 ENTRY(__put_user_4)
29542 ENTER
29543+
29544+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29545+ GET_THREAD_INFO(%_ASM_BX)
29546 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
29547 sub $3,%_ASM_BX
29548 cmp %_ASM_BX,%_ASM_CX
29549 jae bad_put_user
29550 ASM_STAC
29551-3: movl %eax,(%_ASM_CX)
29552+
29553+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29554+ mov pax_user_shadow_base,%_ASM_BX
29555+ cmp %_ASM_BX,%_ASM_CX
29556+ jb 1234f
29557+ xor %ebx,%ebx
29558+1234:
29559+#endif
29560+
29561+#endif
29562+
29563+3: __copyuser_seg movl %eax,(_DEST)
29564 xor %eax,%eax
29565 EXIT
29566 ENDPROC(__put_user_4)
29567
29568 ENTRY(__put_user_8)
29569 ENTER
29570+
29571+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29572+ GET_THREAD_INFO(%_ASM_BX)
29573 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
29574 sub $7,%_ASM_BX
29575 cmp %_ASM_BX,%_ASM_CX
29576 jae bad_put_user
29577 ASM_STAC
29578-4: mov %_ASM_AX,(%_ASM_CX)
29579+
29580+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29581+ mov pax_user_shadow_base,%_ASM_BX
29582+ cmp %_ASM_BX,%_ASM_CX
29583+ jb 1234f
29584+ xor %ebx,%ebx
29585+1234:
29586+#endif
29587+
29588+#endif
29589+
29590+4: __copyuser_seg mov %_ASM_AX,(_DEST)
29591 #ifdef CONFIG_X86_32
29592-5: movl %edx,4(%_ASM_CX)
29593+5: __copyuser_seg movl %edx,4(_DEST)
29594 #endif
29595 xor %eax,%eax
29596 EXIT
29597diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
29598index 1cad221..de671ee 100644
29599--- a/arch/x86/lib/rwlock.S
29600+++ b/arch/x86/lib/rwlock.S
29601@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
29602 FRAME
29603 0: LOCK_PREFIX
29604 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
29605+
29606+#ifdef CONFIG_PAX_REFCOUNT
29607+ jno 1234f
29608+ LOCK_PREFIX
29609+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
29610+ int $4
29611+1234:
29612+ _ASM_EXTABLE(1234b, 1234b)
29613+#endif
29614+
29615 1: rep; nop
29616 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
29617 jne 1b
29618 LOCK_PREFIX
29619 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
29620+
29621+#ifdef CONFIG_PAX_REFCOUNT
29622+ jno 1234f
29623+ LOCK_PREFIX
29624+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
29625+ int $4
29626+1234:
29627+ _ASM_EXTABLE(1234b, 1234b)
29628+#endif
29629+
29630 jnz 0b
29631 ENDFRAME
29632+ pax_force_retaddr
29633 ret
29634 CFI_ENDPROC
29635 END(__write_lock_failed)
29636@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
29637 FRAME
29638 0: LOCK_PREFIX
29639 READ_LOCK_SIZE(inc) (%__lock_ptr)
29640+
29641+#ifdef CONFIG_PAX_REFCOUNT
29642+ jno 1234f
29643+ LOCK_PREFIX
29644+ READ_LOCK_SIZE(dec) (%__lock_ptr)
29645+ int $4
29646+1234:
29647+ _ASM_EXTABLE(1234b, 1234b)
29648+#endif
29649+
29650 1: rep; nop
29651 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
29652 js 1b
29653 LOCK_PREFIX
29654 READ_LOCK_SIZE(dec) (%__lock_ptr)
29655+
29656+#ifdef CONFIG_PAX_REFCOUNT
29657+ jno 1234f
29658+ LOCK_PREFIX
29659+ READ_LOCK_SIZE(inc) (%__lock_ptr)
29660+ int $4
29661+1234:
29662+ _ASM_EXTABLE(1234b, 1234b)
29663+#endif
29664+
29665 js 0b
29666 ENDFRAME
29667+ pax_force_retaddr
29668 ret
29669 CFI_ENDPROC
29670 END(__read_lock_failed)
29671diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
29672index 5dff5f0..cadebf4 100644
29673--- a/arch/x86/lib/rwsem.S
29674+++ b/arch/x86/lib/rwsem.S
29675@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
29676 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
29677 CFI_RESTORE __ASM_REG(dx)
29678 restore_common_regs
29679+ pax_force_retaddr
29680 ret
29681 CFI_ENDPROC
29682 ENDPROC(call_rwsem_down_read_failed)
29683@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
29684 movq %rax,%rdi
29685 call rwsem_down_write_failed
29686 restore_common_regs
29687+ pax_force_retaddr
29688 ret
29689 CFI_ENDPROC
29690 ENDPROC(call_rwsem_down_write_failed)
29691@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
29692 movq %rax,%rdi
29693 call rwsem_wake
29694 restore_common_regs
29695-1: ret
29696+1: pax_force_retaddr
29697+ ret
29698 CFI_ENDPROC
29699 ENDPROC(call_rwsem_wake)
29700
29701@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
29702 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
29703 CFI_RESTORE __ASM_REG(dx)
29704 restore_common_regs
29705+ pax_force_retaddr
29706 ret
29707 CFI_ENDPROC
29708 ENDPROC(call_rwsem_downgrade_wake)
29709diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
29710index a63efd6..8149fbe 100644
29711--- a/arch/x86/lib/thunk_64.S
29712+++ b/arch/x86/lib/thunk_64.S
29713@@ -8,6 +8,7 @@
29714 #include <linux/linkage.h>
29715 #include <asm/dwarf2.h>
29716 #include <asm/calling.h>
29717+#include <asm/alternative-asm.h>
29718
29719 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
29720 .macro THUNK name, func, put_ret_addr_in_rdi=0
29721@@ -15,11 +16,11 @@
29722 \name:
29723 CFI_STARTPROC
29724
29725- /* this one pushes 9 elems, the next one would be %rIP */
29726- SAVE_ARGS
29727+ /* this one pushes 15+1 elems, the next one would be %rIP */
29728+ SAVE_ARGS 8
29729
29730 .if \put_ret_addr_in_rdi
29731- movq_cfi_restore 9*8, rdi
29732+ movq_cfi_restore RIP, rdi
29733 .endif
29734
29735 call \func
29736@@ -38,8 +39,9 @@
29737
29738 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
29739 CFI_STARTPROC
29740- SAVE_ARGS
29741+ SAVE_ARGS 8
29742 restore:
29743- RESTORE_ARGS
29744+ RESTORE_ARGS 1,8
29745+ pax_force_retaddr
29746 ret
29747 CFI_ENDPROC
29748diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
29749index 3eb18ac..4b22130 100644
29750--- a/arch/x86/lib/usercopy_32.c
29751+++ b/arch/x86/lib/usercopy_32.c
29752@@ -42,11 +42,13 @@ do { \
29753 int __d0; \
29754 might_fault(); \
29755 __asm__ __volatile__( \
29756+ __COPYUSER_SET_ES \
29757 ASM_STAC "\n" \
29758 "0: rep; stosl\n" \
29759 " movl %2,%0\n" \
29760 "1: rep; stosb\n" \
29761 "2: " ASM_CLAC "\n" \
29762+ __COPYUSER_RESTORE_ES \
29763 ".section .fixup,\"ax\"\n" \
29764 "3: lea 0(%2,%0,4),%0\n" \
29765 " jmp 2b\n" \
29766@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
29767
29768 #ifdef CONFIG_X86_INTEL_USERCOPY
29769 static unsigned long
29770-__copy_user_intel(void __user *to, const void *from, unsigned long size)
29771+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
29772 {
29773 int d0, d1;
29774 __asm__ __volatile__(
29775@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
29776 " .align 2,0x90\n"
29777 "3: movl 0(%4), %%eax\n"
29778 "4: movl 4(%4), %%edx\n"
29779- "5: movl %%eax, 0(%3)\n"
29780- "6: movl %%edx, 4(%3)\n"
29781+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
29782+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
29783 "7: movl 8(%4), %%eax\n"
29784 "8: movl 12(%4),%%edx\n"
29785- "9: movl %%eax, 8(%3)\n"
29786- "10: movl %%edx, 12(%3)\n"
29787+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
29788+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
29789 "11: movl 16(%4), %%eax\n"
29790 "12: movl 20(%4), %%edx\n"
29791- "13: movl %%eax, 16(%3)\n"
29792- "14: movl %%edx, 20(%3)\n"
29793+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
29794+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
29795 "15: movl 24(%4), %%eax\n"
29796 "16: movl 28(%4), %%edx\n"
29797- "17: movl %%eax, 24(%3)\n"
29798- "18: movl %%edx, 28(%3)\n"
29799+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
29800+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
29801 "19: movl 32(%4), %%eax\n"
29802 "20: movl 36(%4), %%edx\n"
29803- "21: movl %%eax, 32(%3)\n"
29804- "22: movl %%edx, 36(%3)\n"
29805+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
29806+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
29807 "23: movl 40(%4), %%eax\n"
29808 "24: movl 44(%4), %%edx\n"
29809- "25: movl %%eax, 40(%3)\n"
29810- "26: movl %%edx, 44(%3)\n"
29811+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
29812+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
29813 "27: movl 48(%4), %%eax\n"
29814 "28: movl 52(%4), %%edx\n"
29815- "29: movl %%eax, 48(%3)\n"
29816- "30: movl %%edx, 52(%3)\n"
29817+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
29818+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
29819 "31: movl 56(%4), %%eax\n"
29820 "32: movl 60(%4), %%edx\n"
29821- "33: movl %%eax, 56(%3)\n"
29822- "34: movl %%edx, 60(%3)\n"
29823+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
29824+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
29825 " addl $-64, %0\n"
29826 " addl $64, %4\n"
29827 " addl $64, %3\n"
29828@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
29829 " shrl $2, %0\n"
29830 " andl $3, %%eax\n"
29831 " cld\n"
29832+ __COPYUSER_SET_ES
29833 "99: rep; movsl\n"
29834 "36: movl %%eax, %0\n"
29835 "37: rep; movsb\n"
29836 "100:\n"
29837+ __COPYUSER_RESTORE_ES
29838+ ".section .fixup,\"ax\"\n"
29839+ "101: lea 0(%%eax,%0,4),%0\n"
29840+ " jmp 100b\n"
29841+ ".previous\n"
29842+ _ASM_EXTABLE(1b,100b)
29843+ _ASM_EXTABLE(2b,100b)
29844+ _ASM_EXTABLE(3b,100b)
29845+ _ASM_EXTABLE(4b,100b)
29846+ _ASM_EXTABLE(5b,100b)
29847+ _ASM_EXTABLE(6b,100b)
29848+ _ASM_EXTABLE(7b,100b)
29849+ _ASM_EXTABLE(8b,100b)
29850+ _ASM_EXTABLE(9b,100b)
29851+ _ASM_EXTABLE(10b,100b)
29852+ _ASM_EXTABLE(11b,100b)
29853+ _ASM_EXTABLE(12b,100b)
29854+ _ASM_EXTABLE(13b,100b)
29855+ _ASM_EXTABLE(14b,100b)
29856+ _ASM_EXTABLE(15b,100b)
29857+ _ASM_EXTABLE(16b,100b)
29858+ _ASM_EXTABLE(17b,100b)
29859+ _ASM_EXTABLE(18b,100b)
29860+ _ASM_EXTABLE(19b,100b)
29861+ _ASM_EXTABLE(20b,100b)
29862+ _ASM_EXTABLE(21b,100b)
29863+ _ASM_EXTABLE(22b,100b)
29864+ _ASM_EXTABLE(23b,100b)
29865+ _ASM_EXTABLE(24b,100b)
29866+ _ASM_EXTABLE(25b,100b)
29867+ _ASM_EXTABLE(26b,100b)
29868+ _ASM_EXTABLE(27b,100b)
29869+ _ASM_EXTABLE(28b,100b)
29870+ _ASM_EXTABLE(29b,100b)
29871+ _ASM_EXTABLE(30b,100b)
29872+ _ASM_EXTABLE(31b,100b)
29873+ _ASM_EXTABLE(32b,100b)
29874+ _ASM_EXTABLE(33b,100b)
29875+ _ASM_EXTABLE(34b,100b)
29876+ _ASM_EXTABLE(35b,100b)
29877+ _ASM_EXTABLE(36b,100b)
29878+ _ASM_EXTABLE(37b,100b)
29879+ _ASM_EXTABLE(99b,101b)
29880+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
29881+ : "1"(to), "2"(from), "0"(size)
29882+ : "eax", "edx", "memory");
29883+ return size;
29884+}
29885+
29886+static unsigned long
29887+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
29888+{
29889+ int d0, d1;
29890+ __asm__ __volatile__(
29891+ " .align 2,0x90\n"
29892+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
29893+ " cmpl $67, %0\n"
29894+ " jbe 3f\n"
29895+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
29896+ " .align 2,0x90\n"
29897+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
29898+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
29899+ "5: movl %%eax, 0(%3)\n"
29900+ "6: movl %%edx, 4(%3)\n"
29901+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
29902+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
29903+ "9: movl %%eax, 8(%3)\n"
29904+ "10: movl %%edx, 12(%3)\n"
29905+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
29906+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
29907+ "13: movl %%eax, 16(%3)\n"
29908+ "14: movl %%edx, 20(%3)\n"
29909+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
29910+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
29911+ "17: movl %%eax, 24(%3)\n"
29912+ "18: movl %%edx, 28(%3)\n"
29913+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
29914+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
29915+ "21: movl %%eax, 32(%3)\n"
29916+ "22: movl %%edx, 36(%3)\n"
29917+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
29918+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
29919+ "25: movl %%eax, 40(%3)\n"
29920+ "26: movl %%edx, 44(%3)\n"
29921+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
29922+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
29923+ "29: movl %%eax, 48(%3)\n"
29924+ "30: movl %%edx, 52(%3)\n"
29925+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
29926+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
29927+ "33: movl %%eax, 56(%3)\n"
29928+ "34: movl %%edx, 60(%3)\n"
29929+ " addl $-64, %0\n"
29930+ " addl $64, %4\n"
29931+ " addl $64, %3\n"
29932+ " cmpl $63, %0\n"
29933+ " ja 1b\n"
29934+ "35: movl %0, %%eax\n"
29935+ " shrl $2, %0\n"
29936+ " andl $3, %%eax\n"
29937+ " cld\n"
29938+ "99: rep; "__copyuser_seg" movsl\n"
29939+ "36: movl %%eax, %0\n"
29940+ "37: rep; "__copyuser_seg" movsb\n"
29941+ "100:\n"
29942 ".section .fixup,\"ax\"\n"
29943 "101: lea 0(%%eax,%0,4),%0\n"
29944 " jmp 100b\n"
29945@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
29946 int d0, d1;
29947 __asm__ __volatile__(
29948 " .align 2,0x90\n"
29949- "0: movl 32(%4), %%eax\n"
29950+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
29951 " cmpl $67, %0\n"
29952 " jbe 2f\n"
29953- "1: movl 64(%4), %%eax\n"
29954+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
29955 " .align 2,0x90\n"
29956- "2: movl 0(%4), %%eax\n"
29957- "21: movl 4(%4), %%edx\n"
29958+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
29959+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
29960 " movl %%eax, 0(%3)\n"
29961 " movl %%edx, 4(%3)\n"
29962- "3: movl 8(%4), %%eax\n"
29963- "31: movl 12(%4),%%edx\n"
29964+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
29965+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
29966 " movl %%eax, 8(%3)\n"
29967 " movl %%edx, 12(%3)\n"
29968- "4: movl 16(%4), %%eax\n"
29969- "41: movl 20(%4), %%edx\n"
29970+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
29971+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
29972 " movl %%eax, 16(%3)\n"
29973 " movl %%edx, 20(%3)\n"
29974- "10: movl 24(%4), %%eax\n"
29975- "51: movl 28(%4), %%edx\n"
29976+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
29977+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
29978 " movl %%eax, 24(%3)\n"
29979 " movl %%edx, 28(%3)\n"
29980- "11: movl 32(%4), %%eax\n"
29981- "61: movl 36(%4), %%edx\n"
29982+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
29983+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
29984 " movl %%eax, 32(%3)\n"
29985 " movl %%edx, 36(%3)\n"
29986- "12: movl 40(%4), %%eax\n"
29987- "71: movl 44(%4), %%edx\n"
29988+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
29989+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
29990 " movl %%eax, 40(%3)\n"
29991 " movl %%edx, 44(%3)\n"
29992- "13: movl 48(%4), %%eax\n"
29993- "81: movl 52(%4), %%edx\n"
29994+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
29995+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
29996 " movl %%eax, 48(%3)\n"
29997 " movl %%edx, 52(%3)\n"
29998- "14: movl 56(%4), %%eax\n"
29999- "91: movl 60(%4), %%edx\n"
30000+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30001+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30002 " movl %%eax, 56(%3)\n"
30003 " movl %%edx, 60(%3)\n"
30004 " addl $-64, %0\n"
30005@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
30006 " shrl $2, %0\n"
30007 " andl $3, %%eax\n"
30008 " cld\n"
30009- "6: rep; movsl\n"
30010+ "6: rep; "__copyuser_seg" movsl\n"
30011 " movl %%eax,%0\n"
30012- "7: rep; movsb\n"
30013+ "7: rep; "__copyuser_seg" movsb\n"
30014 "8:\n"
30015 ".section .fixup,\"ax\"\n"
30016 "9: lea 0(%%eax,%0,4),%0\n"
30017@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30018
30019 __asm__ __volatile__(
30020 " .align 2,0x90\n"
30021- "0: movl 32(%4), %%eax\n"
30022+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30023 " cmpl $67, %0\n"
30024 " jbe 2f\n"
30025- "1: movl 64(%4), %%eax\n"
30026+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30027 " .align 2,0x90\n"
30028- "2: movl 0(%4), %%eax\n"
30029- "21: movl 4(%4), %%edx\n"
30030+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30031+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30032 " movnti %%eax, 0(%3)\n"
30033 " movnti %%edx, 4(%3)\n"
30034- "3: movl 8(%4), %%eax\n"
30035- "31: movl 12(%4),%%edx\n"
30036+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30037+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30038 " movnti %%eax, 8(%3)\n"
30039 " movnti %%edx, 12(%3)\n"
30040- "4: movl 16(%4), %%eax\n"
30041- "41: movl 20(%4), %%edx\n"
30042+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30043+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30044 " movnti %%eax, 16(%3)\n"
30045 " movnti %%edx, 20(%3)\n"
30046- "10: movl 24(%4), %%eax\n"
30047- "51: movl 28(%4), %%edx\n"
30048+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30049+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30050 " movnti %%eax, 24(%3)\n"
30051 " movnti %%edx, 28(%3)\n"
30052- "11: movl 32(%4), %%eax\n"
30053- "61: movl 36(%4), %%edx\n"
30054+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30055+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30056 " movnti %%eax, 32(%3)\n"
30057 " movnti %%edx, 36(%3)\n"
30058- "12: movl 40(%4), %%eax\n"
30059- "71: movl 44(%4), %%edx\n"
30060+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30061+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30062 " movnti %%eax, 40(%3)\n"
30063 " movnti %%edx, 44(%3)\n"
30064- "13: movl 48(%4), %%eax\n"
30065- "81: movl 52(%4), %%edx\n"
30066+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30067+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30068 " movnti %%eax, 48(%3)\n"
30069 " movnti %%edx, 52(%3)\n"
30070- "14: movl 56(%4), %%eax\n"
30071- "91: movl 60(%4), %%edx\n"
30072+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30073+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30074 " movnti %%eax, 56(%3)\n"
30075 " movnti %%edx, 60(%3)\n"
30076 " addl $-64, %0\n"
30077@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30078 " shrl $2, %0\n"
30079 " andl $3, %%eax\n"
30080 " cld\n"
30081- "6: rep; movsl\n"
30082+ "6: rep; "__copyuser_seg" movsl\n"
30083 " movl %%eax,%0\n"
30084- "7: rep; movsb\n"
30085+ "7: rep; "__copyuser_seg" movsb\n"
30086 "8:\n"
30087 ".section .fixup,\"ax\"\n"
30088 "9: lea 0(%%eax,%0,4),%0\n"
30089@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
30090
30091 __asm__ __volatile__(
30092 " .align 2,0x90\n"
30093- "0: movl 32(%4), %%eax\n"
30094+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30095 " cmpl $67, %0\n"
30096 " jbe 2f\n"
30097- "1: movl 64(%4), %%eax\n"
30098+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30099 " .align 2,0x90\n"
30100- "2: movl 0(%4), %%eax\n"
30101- "21: movl 4(%4), %%edx\n"
30102+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30103+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30104 " movnti %%eax, 0(%3)\n"
30105 " movnti %%edx, 4(%3)\n"
30106- "3: movl 8(%4), %%eax\n"
30107- "31: movl 12(%4),%%edx\n"
30108+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30109+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30110 " movnti %%eax, 8(%3)\n"
30111 " movnti %%edx, 12(%3)\n"
30112- "4: movl 16(%4), %%eax\n"
30113- "41: movl 20(%4), %%edx\n"
30114+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30115+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30116 " movnti %%eax, 16(%3)\n"
30117 " movnti %%edx, 20(%3)\n"
30118- "10: movl 24(%4), %%eax\n"
30119- "51: movl 28(%4), %%edx\n"
30120+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30121+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30122 " movnti %%eax, 24(%3)\n"
30123 " movnti %%edx, 28(%3)\n"
30124- "11: movl 32(%4), %%eax\n"
30125- "61: movl 36(%4), %%edx\n"
30126+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30127+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30128 " movnti %%eax, 32(%3)\n"
30129 " movnti %%edx, 36(%3)\n"
30130- "12: movl 40(%4), %%eax\n"
30131- "71: movl 44(%4), %%edx\n"
30132+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30133+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30134 " movnti %%eax, 40(%3)\n"
30135 " movnti %%edx, 44(%3)\n"
30136- "13: movl 48(%4), %%eax\n"
30137- "81: movl 52(%4), %%edx\n"
30138+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30139+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30140 " movnti %%eax, 48(%3)\n"
30141 " movnti %%edx, 52(%3)\n"
30142- "14: movl 56(%4), %%eax\n"
30143- "91: movl 60(%4), %%edx\n"
30144+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30145+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30146 " movnti %%eax, 56(%3)\n"
30147 " movnti %%edx, 60(%3)\n"
30148 " addl $-64, %0\n"
30149@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
30150 " shrl $2, %0\n"
30151 " andl $3, %%eax\n"
30152 " cld\n"
30153- "6: rep; movsl\n"
30154+ "6: rep; "__copyuser_seg" movsl\n"
30155 " movl %%eax,%0\n"
30156- "7: rep; movsb\n"
30157+ "7: rep; "__copyuser_seg" movsb\n"
30158 "8:\n"
30159 ".section .fixup,\"ax\"\n"
30160 "9: lea 0(%%eax,%0,4),%0\n"
30161@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
30162 */
30163 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
30164 unsigned long size);
30165-unsigned long __copy_user_intel(void __user *to, const void *from,
30166+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
30167+ unsigned long size);
30168+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
30169 unsigned long size);
30170 unsigned long __copy_user_zeroing_intel_nocache(void *to,
30171 const void __user *from, unsigned long size);
30172 #endif /* CONFIG_X86_INTEL_USERCOPY */
30173
30174 /* Generic arbitrary sized copy. */
30175-#define __copy_user(to, from, size) \
30176+#define __copy_user(to, from, size, prefix, set, restore) \
30177 do { \
30178 int __d0, __d1, __d2; \
30179 __asm__ __volatile__( \
30180+ set \
30181 " cmp $7,%0\n" \
30182 " jbe 1f\n" \
30183 " movl %1,%0\n" \
30184 " negl %0\n" \
30185 " andl $7,%0\n" \
30186 " subl %0,%3\n" \
30187- "4: rep; movsb\n" \
30188+ "4: rep; "prefix"movsb\n" \
30189 " movl %3,%0\n" \
30190 " shrl $2,%0\n" \
30191 " andl $3,%3\n" \
30192 " .align 2,0x90\n" \
30193- "0: rep; movsl\n" \
30194+ "0: rep; "prefix"movsl\n" \
30195 " movl %3,%0\n" \
30196- "1: rep; movsb\n" \
30197+ "1: rep; "prefix"movsb\n" \
30198 "2:\n" \
30199+ restore \
30200 ".section .fixup,\"ax\"\n" \
30201 "5: addl %3,%0\n" \
30202 " jmp 2b\n" \
30203@@ -538,14 +650,14 @@ do { \
30204 " negl %0\n" \
30205 " andl $7,%0\n" \
30206 " subl %0,%3\n" \
30207- "4: rep; movsb\n" \
30208+ "4: rep; "__copyuser_seg"movsb\n" \
30209 " movl %3,%0\n" \
30210 " shrl $2,%0\n" \
30211 " andl $3,%3\n" \
30212 " .align 2,0x90\n" \
30213- "0: rep; movsl\n" \
30214+ "0: rep; "__copyuser_seg"movsl\n" \
30215 " movl %3,%0\n" \
30216- "1: rep; movsb\n" \
30217+ "1: rep; "__copyuser_seg"movsb\n" \
30218 "2:\n" \
30219 ".section .fixup,\"ax\"\n" \
30220 "5: addl %3,%0\n" \
30221@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
30222 {
30223 stac();
30224 if (movsl_is_ok(to, from, n))
30225- __copy_user(to, from, n);
30226+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
30227 else
30228- n = __copy_user_intel(to, from, n);
30229+ n = __generic_copy_to_user_intel(to, from, n);
30230 clac();
30231 return n;
30232 }
30233@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
30234 {
30235 stac();
30236 if (movsl_is_ok(to, from, n))
30237- __copy_user(to, from, n);
30238+ __copy_user(to, from, n, __copyuser_seg, "", "");
30239 else
30240- n = __copy_user_intel((void __user *)to,
30241- (const void *)from, n);
30242+ n = __generic_copy_from_user_intel(to, from, n);
30243 clac();
30244 return n;
30245 }
30246@@ -632,60 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
30247 if (n > 64 && cpu_has_xmm2)
30248 n = __copy_user_intel_nocache(to, from, n);
30249 else
30250- __copy_user(to, from, n);
30251+ __copy_user(to, from, n, __copyuser_seg, "", "");
30252 #else
30253- __copy_user(to, from, n);
30254+ __copy_user(to, from, n, __copyuser_seg, "", "");
30255 #endif
30256 clac();
30257 return n;
30258 }
30259 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
30260
30261-/**
30262- * copy_to_user: - Copy a block of data into user space.
30263- * @to: Destination address, in user space.
30264- * @from: Source address, in kernel space.
30265- * @n: Number of bytes to copy.
30266- *
30267- * Context: User context only. This function may sleep.
30268- *
30269- * Copy data from kernel space to user space.
30270- *
30271- * Returns number of bytes that could not be copied.
30272- * On success, this will be zero.
30273- */
30274-unsigned long
30275-copy_to_user(void __user *to, const void *from, unsigned long n)
30276+#ifdef CONFIG_PAX_MEMORY_UDEREF
30277+void __set_fs(mm_segment_t x)
30278 {
30279- if (access_ok(VERIFY_WRITE, to, n))
30280- n = __copy_to_user(to, from, n);
30281- return n;
30282+ switch (x.seg) {
30283+ case 0:
30284+ loadsegment(gs, 0);
30285+ break;
30286+ case TASK_SIZE_MAX:
30287+ loadsegment(gs, __USER_DS);
30288+ break;
30289+ case -1UL:
30290+ loadsegment(gs, __KERNEL_DS);
30291+ break;
30292+ default:
30293+ BUG();
30294+ }
30295 }
30296-EXPORT_SYMBOL(copy_to_user);
30297+EXPORT_SYMBOL(__set_fs);
30298
30299-/**
30300- * copy_from_user: - Copy a block of data from user space.
30301- * @to: Destination address, in kernel space.
30302- * @from: Source address, in user space.
30303- * @n: Number of bytes to copy.
30304- *
30305- * Context: User context only. This function may sleep.
30306- *
30307- * Copy data from user space to kernel space.
30308- *
30309- * Returns number of bytes that could not be copied.
30310- * On success, this will be zero.
30311- *
30312- * If some data could not be copied, this function will pad the copied
30313- * data to the requested size using zero bytes.
30314- */
30315-unsigned long
30316-_copy_from_user(void *to, const void __user *from, unsigned long n)
30317+void set_fs(mm_segment_t x)
30318 {
30319- if (access_ok(VERIFY_READ, from, n))
30320- n = __copy_from_user(to, from, n);
30321- else
30322- memset(to, 0, n);
30323- return n;
30324+ current_thread_info()->addr_limit = x;
30325+ __set_fs(x);
30326 }
30327-EXPORT_SYMBOL(_copy_from_user);
30328+EXPORT_SYMBOL(set_fs);
30329+#endif
30330diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
30331index c905e89..01ab928 100644
30332--- a/arch/x86/lib/usercopy_64.c
30333+++ b/arch/x86/lib/usercopy_64.c
30334@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
30335 might_fault();
30336 /* no memory constraint because it doesn't change any memory gcc knows
30337 about */
30338+ pax_open_userland();
30339 stac();
30340 asm volatile(
30341 " testq %[size8],%[size8]\n"
30342@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
30343 _ASM_EXTABLE(0b,3b)
30344 _ASM_EXTABLE(1b,2b)
30345 : [size8] "=&c"(size), [dst] "=&D" (__d0)
30346- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
30347+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
30348 [zero] "r" (0UL), [eight] "r" (8UL));
30349 clac();
30350+ pax_close_userland();
30351 return size;
30352 }
30353 EXPORT_SYMBOL(__clear_user);
30354@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
30355 }
30356 EXPORT_SYMBOL(clear_user);
30357
30358-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
30359+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
30360 {
30361- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
30362- return copy_user_generic((__force void *)to, (__force void *)from, len);
30363- }
30364- return len;
30365+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
30366+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
30367+ return len;
30368 }
30369 EXPORT_SYMBOL(copy_in_user);
30370
30371@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
30372 * it is not necessary to optimize tail handling.
30373 */
30374 __visible unsigned long
30375-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
30376+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
30377 {
30378 char c;
30379 unsigned zero_len;
30380
30381+ clac();
30382+ pax_close_userland();
30383 for (; len; --len, to++) {
30384 if (__get_user_nocheck(c, from++, sizeof(char)))
30385 break;
30386@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
30387 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
30388 if (__put_user_nocheck(c, to++, sizeof(char)))
30389 break;
30390- clac();
30391 return len;
30392 }
30393diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
30394index 23d8e5f..9ccc13a 100644
30395--- a/arch/x86/mm/Makefile
30396+++ b/arch/x86/mm/Makefile
30397@@ -28,3 +28,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
30398 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
30399
30400 obj-$(CONFIG_MEMTEST) += memtest.o
30401+
30402+quote:="
30403+obj-$(CONFIG_X86_64) += uderef_64.o
30404+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
30405diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
30406index 903ec1e..c4166b2 100644
30407--- a/arch/x86/mm/extable.c
30408+++ b/arch/x86/mm/extable.c
30409@@ -6,12 +6,24 @@
30410 static inline unsigned long
30411 ex_insn_addr(const struct exception_table_entry *x)
30412 {
30413- return (unsigned long)&x->insn + x->insn;
30414+ unsigned long reloc = 0;
30415+
30416+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
30417+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
30418+#endif
30419+
30420+ return (unsigned long)&x->insn + x->insn + reloc;
30421 }
30422 static inline unsigned long
30423 ex_fixup_addr(const struct exception_table_entry *x)
30424 {
30425- return (unsigned long)&x->fixup + x->fixup;
30426+ unsigned long reloc = 0;
30427+
30428+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
30429+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
30430+#endif
30431+
30432+ return (unsigned long)&x->fixup + x->fixup + reloc;
30433 }
30434
30435 int fixup_exception(struct pt_regs *regs)
30436@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
30437 unsigned long new_ip;
30438
30439 #ifdef CONFIG_PNPBIOS
30440- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
30441+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
30442 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
30443 extern u32 pnp_bios_is_utter_crap;
30444 pnp_bios_is_utter_crap = 1;
30445@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
30446 i += 4;
30447 p->fixup -= i;
30448 i += 4;
30449+
30450+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
30451+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
30452+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
30453+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
30454+#endif
30455+
30456 }
30457 }
30458
30459diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
30460index 3aaeffc..42ea9fb 100644
30461--- a/arch/x86/mm/fault.c
30462+++ b/arch/x86/mm/fault.c
30463@@ -14,11 +14,18 @@
30464 #include <linux/hugetlb.h> /* hstate_index_to_shift */
30465 #include <linux/prefetch.h> /* prefetchw */
30466 #include <linux/context_tracking.h> /* exception_enter(), ... */
30467+#include <linux/unistd.h>
30468+#include <linux/compiler.h>
30469
30470 #include <asm/traps.h> /* dotraplinkage, ... */
30471 #include <asm/pgalloc.h> /* pgd_*(), ... */
30472 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
30473 #include <asm/fixmap.h> /* VSYSCALL_START */
30474+#include <asm/tlbflush.h>
30475+
30476+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30477+#include <asm/stacktrace.h>
30478+#endif
30479
30480 /*
30481 * Page fault error code bits:
30482@@ -56,7 +63,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
30483 int ret = 0;
30484
30485 /* kprobe_running() needs smp_processor_id() */
30486- if (kprobes_built_in() && !user_mode_vm(regs)) {
30487+ if (kprobes_built_in() && !user_mode(regs)) {
30488 preempt_disable();
30489 if (kprobe_running() && kprobe_fault_handler(regs, 14))
30490 ret = 1;
30491@@ -117,7 +124,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
30492 return !instr_lo || (instr_lo>>1) == 1;
30493 case 0x00:
30494 /* Prefetch instruction is 0x0F0D or 0x0F18 */
30495- if (probe_kernel_address(instr, opcode))
30496+ if (user_mode(regs)) {
30497+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
30498+ return 0;
30499+ } else if (probe_kernel_address(instr, opcode))
30500 return 0;
30501
30502 *prefetch = (instr_lo == 0xF) &&
30503@@ -151,7 +161,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
30504 while (instr < max_instr) {
30505 unsigned char opcode;
30506
30507- if (probe_kernel_address(instr, opcode))
30508+ if (user_mode(regs)) {
30509+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
30510+ break;
30511+ } else if (probe_kernel_address(instr, opcode))
30512 break;
30513
30514 instr++;
30515@@ -182,6 +195,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
30516 force_sig_info(si_signo, &info, tsk);
30517 }
30518
30519+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
30520+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
30521+#endif
30522+
30523+#ifdef CONFIG_PAX_EMUTRAMP
30524+static int pax_handle_fetch_fault(struct pt_regs *regs);
30525+#endif
30526+
30527+#ifdef CONFIG_PAX_PAGEEXEC
30528+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
30529+{
30530+ pgd_t *pgd;
30531+ pud_t *pud;
30532+ pmd_t *pmd;
30533+
30534+ pgd = pgd_offset(mm, address);
30535+ if (!pgd_present(*pgd))
30536+ return NULL;
30537+ pud = pud_offset(pgd, address);
30538+ if (!pud_present(*pud))
30539+ return NULL;
30540+ pmd = pmd_offset(pud, address);
30541+ if (!pmd_present(*pmd))
30542+ return NULL;
30543+ return pmd;
30544+}
30545+#endif
30546+
30547 DEFINE_SPINLOCK(pgd_lock);
30548 LIST_HEAD(pgd_list);
30549
30550@@ -232,10 +273,27 @@ void vmalloc_sync_all(void)
30551 for (address = VMALLOC_START & PMD_MASK;
30552 address >= TASK_SIZE && address < FIXADDR_TOP;
30553 address += PMD_SIZE) {
30554+
30555+#ifdef CONFIG_PAX_PER_CPU_PGD
30556+ unsigned long cpu;
30557+#else
30558 struct page *page;
30559+#endif
30560
30561 spin_lock(&pgd_lock);
30562+
30563+#ifdef CONFIG_PAX_PER_CPU_PGD
30564+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
30565+ pgd_t *pgd = get_cpu_pgd(cpu, user);
30566+ pmd_t *ret;
30567+
30568+ ret = vmalloc_sync_one(pgd, address);
30569+ if (!ret)
30570+ break;
30571+ pgd = get_cpu_pgd(cpu, kernel);
30572+#else
30573 list_for_each_entry(page, &pgd_list, lru) {
30574+ pgd_t *pgd;
30575 spinlock_t *pgt_lock;
30576 pmd_t *ret;
30577
30578@@ -243,8 +301,14 @@ void vmalloc_sync_all(void)
30579 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
30580
30581 spin_lock(pgt_lock);
30582- ret = vmalloc_sync_one(page_address(page), address);
30583+ pgd = page_address(page);
30584+#endif
30585+
30586+ ret = vmalloc_sync_one(pgd, address);
30587+
30588+#ifndef CONFIG_PAX_PER_CPU_PGD
30589 spin_unlock(pgt_lock);
30590+#endif
30591
30592 if (!ret)
30593 break;
30594@@ -278,6 +342,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
30595 * an interrupt in the middle of a task switch..
30596 */
30597 pgd_paddr = read_cr3();
30598+
30599+#ifdef CONFIG_PAX_PER_CPU_PGD
30600+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
30601+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
30602+#endif
30603+
30604 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
30605 if (!pmd_k)
30606 return -1;
30607@@ -373,11 +443,25 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
30608 * happen within a race in page table update. In the later
30609 * case just flush:
30610 */
30611- pgd = pgd_offset(current->active_mm, address);
30612+
30613 pgd_ref = pgd_offset_k(address);
30614 if (pgd_none(*pgd_ref))
30615 return -1;
30616
30617+#ifdef CONFIG_PAX_PER_CPU_PGD
30618+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
30619+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
30620+ if (pgd_none(*pgd)) {
30621+ set_pgd(pgd, *pgd_ref);
30622+ arch_flush_lazy_mmu_mode();
30623+ } else {
30624+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
30625+ }
30626+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
30627+#else
30628+ pgd = pgd_offset(current->active_mm, address);
30629+#endif
30630+
30631 if (pgd_none(*pgd)) {
30632 set_pgd(pgd, *pgd_ref);
30633 arch_flush_lazy_mmu_mode();
30634@@ -543,7 +627,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
30635 static int is_errata100(struct pt_regs *regs, unsigned long address)
30636 {
30637 #ifdef CONFIG_X86_64
30638- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
30639+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
30640 return 1;
30641 #endif
30642 return 0;
30643@@ -570,7 +654,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
30644 }
30645
30646 static const char nx_warning[] = KERN_CRIT
30647-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
30648+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
30649
30650 static void
30651 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
30652@@ -579,15 +663,27 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
30653 if (!oops_may_print())
30654 return;
30655
30656- if (error_code & PF_INSTR) {
30657+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
30658 unsigned int level;
30659
30660 pte_t *pte = lookup_address(address, &level);
30661
30662 if (pte && pte_present(*pte) && !pte_exec(*pte))
30663- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
30664+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
30665 }
30666
30667+#ifdef CONFIG_PAX_KERNEXEC
30668+ if (init_mm.start_code <= address && address < init_mm.end_code) {
30669+ if (current->signal->curr_ip)
30670+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
30671+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
30672+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
30673+ else
30674+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
30675+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
30676+ }
30677+#endif
30678+
30679 printk(KERN_ALERT "BUG: unable to handle kernel ");
30680 if (address < PAGE_SIZE)
30681 printk(KERN_CONT "NULL pointer dereference");
30682@@ -750,6 +846,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
30683 return;
30684 }
30685 #endif
30686+
30687+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
30688+ if (pax_is_fetch_fault(regs, error_code, address)) {
30689+
30690+#ifdef CONFIG_PAX_EMUTRAMP
30691+ switch (pax_handle_fetch_fault(regs)) {
30692+ case 2:
30693+ return;
30694+ }
30695+#endif
30696+
30697+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
30698+ do_group_exit(SIGKILL);
30699+ }
30700+#endif
30701+
30702 /* Kernel addresses are always protection faults: */
30703 if (address >= TASK_SIZE)
30704 error_code |= PF_PROT;
30705@@ -835,7 +947,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
30706 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
30707 printk(KERN_ERR
30708 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
30709- tsk->comm, tsk->pid, address);
30710+ tsk->comm, task_pid_nr(tsk), address);
30711 code = BUS_MCEERR_AR;
30712 }
30713 #endif
30714@@ -889,6 +1001,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
30715 return 1;
30716 }
30717
30718+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
30719+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
30720+{
30721+ pte_t *pte;
30722+ pmd_t *pmd;
30723+ spinlock_t *ptl;
30724+ unsigned char pte_mask;
30725+
30726+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
30727+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
30728+ return 0;
30729+
30730+ /* PaX: it's our fault, let's handle it if we can */
30731+
30732+ /* PaX: take a look at read faults before acquiring any locks */
30733+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
30734+ /* instruction fetch attempt from a protected page in user mode */
30735+ up_read(&mm->mmap_sem);
30736+
30737+#ifdef CONFIG_PAX_EMUTRAMP
30738+ switch (pax_handle_fetch_fault(regs)) {
30739+ case 2:
30740+ return 1;
30741+ }
30742+#endif
30743+
30744+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
30745+ do_group_exit(SIGKILL);
30746+ }
30747+
30748+ pmd = pax_get_pmd(mm, address);
30749+ if (unlikely(!pmd))
30750+ return 0;
30751+
30752+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
30753+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
30754+ pte_unmap_unlock(pte, ptl);
30755+ return 0;
30756+ }
30757+
30758+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
30759+ /* write attempt to a protected page in user mode */
30760+ pte_unmap_unlock(pte, ptl);
30761+ return 0;
30762+ }
30763+
30764+#ifdef CONFIG_SMP
30765+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
30766+#else
30767+ if (likely(address > get_limit(regs->cs)))
30768+#endif
30769+ {
30770+ set_pte(pte, pte_mkread(*pte));
30771+ __flush_tlb_one(address);
30772+ pte_unmap_unlock(pte, ptl);
30773+ up_read(&mm->mmap_sem);
30774+ return 1;
30775+ }
30776+
30777+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
30778+
30779+ /*
30780+ * PaX: fill DTLB with user rights and retry
30781+ */
30782+ __asm__ __volatile__ (
30783+ "orb %2,(%1)\n"
30784+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
30785+/*
30786+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
30787+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
30788+ * page fault when examined during a TLB load attempt. this is true not only
30789+ * for PTEs holding a non-present entry but also present entries that will
30790+ * raise a page fault (such as those set up by PaX, or the copy-on-write
30791+ * mechanism). in effect it means that we do *not* need to flush the TLBs
30792+ * for our target pages since their PTEs are simply not in the TLBs at all.
30793+
30794+ * the best thing in omitting it is that we gain around 15-20% speed in the
30795+ * fast path of the page fault handler and can get rid of tracing since we
30796+ * can no longer flush unintended entries.
30797+ */
30798+ "invlpg (%0)\n"
30799+#endif
30800+ __copyuser_seg"testb $0,(%0)\n"
30801+ "xorb %3,(%1)\n"
30802+ :
30803+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
30804+ : "memory", "cc");
30805+ pte_unmap_unlock(pte, ptl);
30806+ up_read(&mm->mmap_sem);
30807+ return 1;
30808+}
30809+#endif
30810+
30811 /*
30812 * Handle a spurious fault caused by a stale TLB entry.
30813 *
30814@@ -955,6 +1160,9 @@ int show_unhandled_signals = 1;
30815 static inline int
30816 access_error(unsigned long error_code, struct vm_area_struct *vma)
30817 {
30818+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
30819+ return 1;
30820+
30821 if (error_code & PF_WRITE) {
30822 /* write, present and write, not present: */
30823 if (unlikely(!(vma->vm_flags & VM_WRITE)))
30824@@ -983,7 +1191,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
30825 if (error_code & PF_USER)
30826 return false;
30827
30828- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
30829+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
30830 return false;
30831
30832 return true;
30833@@ -1010,6 +1218,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
30834 /* Get the faulting address: */
30835 address = read_cr2();
30836
30837+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30838+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
30839+ if (!search_exception_tables(regs->ip)) {
30840+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
30841+ bad_area_nosemaphore(regs, error_code, address);
30842+ return;
30843+ }
30844+ if (address < pax_user_shadow_base) {
30845+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
30846+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
30847+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
30848+ } else
30849+ address -= pax_user_shadow_base;
30850+ }
30851+#endif
30852+
30853 /*
30854 * Detect and handle instructions that would cause a page fault for
30855 * both a tracked kernel page and a userspace page.
30856@@ -1069,7 +1293,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
30857 * User-mode registers count as a user access even for any
30858 * potential system fault or CPU buglet:
30859 */
30860- if (user_mode_vm(regs)) {
30861+ if (user_mode(regs)) {
30862 local_irq_enable();
30863 error_code |= PF_USER;
30864 flags |= FAULT_FLAG_USER;
30865@@ -1135,6 +1359,11 @@ retry:
30866 might_sleep();
30867 }
30868
30869+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
30870+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
30871+ return;
30872+#endif
30873+
30874 vma = find_vma(mm, address);
30875 if (unlikely(!vma)) {
30876 bad_area(regs, error_code, address);
30877@@ -1146,18 +1375,24 @@ retry:
30878 bad_area(regs, error_code, address);
30879 return;
30880 }
30881- if (error_code & PF_USER) {
30882- /*
30883- * Accessing the stack below %sp is always a bug.
30884- * The large cushion allows instructions like enter
30885- * and pusha to work. ("enter $65535, $31" pushes
30886- * 32 pointers and then decrements %sp by 65535.)
30887- */
30888- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
30889- bad_area(regs, error_code, address);
30890- return;
30891- }
30892+ /*
30893+ * Accessing the stack below %sp is always a bug.
30894+ * The large cushion allows instructions like enter
30895+ * and pusha to work. ("enter $65535, $31" pushes
30896+ * 32 pointers and then decrements %sp by 65535.)
30897+ */
30898+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
30899+ bad_area(regs, error_code, address);
30900+ return;
30901 }
30902+
30903+#ifdef CONFIG_PAX_SEGMEXEC
30904+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
30905+ bad_area(regs, error_code, address);
30906+ return;
30907+ }
30908+#endif
30909+
30910 if (unlikely(expand_stack(vma, address))) {
30911 bad_area(regs, error_code, address);
30912 return;
30913@@ -1231,3 +1466,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
30914 __do_page_fault(regs, error_code);
30915 exception_exit(prev_state);
30916 }
30917+
30918+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
30919+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
30920+{
30921+ struct mm_struct *mm = current->mm;
30922+ unsigned long ip = regs->ip;
30923+
30924+ if (v8086_mode(regs))
30925+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
30926+
30927+#ifdef CONFIG_PAX_PAGEEXEC
30928+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
30929+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
30930+ return true;
30931+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
30932+ return true;
30933+ return false;
30934+ }
30935+#endif
30936+
30937+#ifdef CONFIG_PAX_SEGMEXEC
30938+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
30939+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
30940+ return true;
30941+ return false;
30942+ }
30943+#endif
30944+
30945+ return false;
30946+}
30947+#endif
30948+
30949+#ifdef CONFIG_PAX_EMUTRAMP
30950+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
30951+{
30952+ int err;
30953+
30954+ do { /* PaX: libffi trampoline emulation */
30955+ unsigned char mov, jmp;
30956+ unsigned int addr1, addr2;
30957+
30958+#ifdef CONFIG_X86_64
30959+ if ((regs->ip + 9) >> 32)
30960+ break;
30961+#endif
30962+
30963+ err = get_user(mov, (unsigned char __user *)regs->ip);
30964+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
30965+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
30966+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
30967+
30968+ if (err)
30969+ break;
30970+
30971+ if (mov == 0xB8 && jmp == 0xE9) {
30972+ regs->ax = addr1;
30973+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
30974+ return 2;
30975+ }
30976+ } while (0);
30977+
30978+ do { /* PaX: gcc trampoline emulation #1 */
30979+ unsigned char mov1, mov2;
30980+ unsigned short jmp;
30981+ unsigned int addr1, addr2;
30982+
30983+#ifdef CONFIG_X86_64
30984+ if ((regs->ip + 11) >> 32)
30985+ break;
30986+#endif
30987+
30988+ err = get_user(mov1, (unsigned char __user *)regs->ip);
30989+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
30990+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
30991+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
30992+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
30993+
30994+ if (err)
30995+ break;
30996+
30997+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
30998+ regs->cx = addr1;
30999+ regs->ax = addr2;
31000+ regs->ip = addr2;
31001+ return 2;
31002+ }
31003+ } while (0);
31004+
31005+ do { /* PaX: gcc trampoline emulation #2 */
31006+ unsigned char mov, jmp;
31007+ unsigned int addr1, addr2;
31008+
31009+#ifdef CONFIG_X86_64
31010+ if ((regs->ip + 9) >> 32)
31011+ break;
31012+#endif
31013+
31014+ err = get_user(mov, (unsigned char __user *)regs->ip);
31015+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31016+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
31017+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31018+
31019+ if (err)
31020+ break;
31021+
31022+ if (mov == 0xB9 && jmp == 0xE9) {
31023+ regs->cx = addr1;
31024+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
31025+ return 2;
31026+ }
31027+ } while (0);
31028+
31029+ return 1; /* PaX in action */
31030+}
31031+
31032+#ifdef CONFIG_X86_64
31033+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
31034+{
31035+ int err;
31036+
31037+ do { /* PaX: libffi trampoline emulation */
31038+ unsigned short mov1, mov2, jmp1;
31039+ unsigned char stcclc, jmp2;
31040+ unsigned long addr1, addr2;
31041+
31042+ err = get_user(mov1, (unsigned short __user *)regs->ip);
31043+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
31044+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
31045+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
31046+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
31047+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
31048+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
31049+
31050+ if (err)
31051+ break;
31052+
31053+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31054+ regs->r11 = addr1;
31055+ regs->r10 = addr2;
31056+ if (stcclc == 0xF8)
31057+ regs->flags &= ~X86_EFLAGS_CF;
31058+ else
31059+ regs->flags |= X86_EFLAGS_CF;
31060+ regs->ip = addr1;
31061+ return 2;
31062+ }
31063+ } while (0);
31064+
31065+ do { /* PaX: gcc trampoline emulation #1 */
31066+ unsigned short mov1, mov2, jmp1;
31067+ unsigned char jmp2;
31068+ unsigned int addr1;
31069+ unsigned long addr2;
31070+
31071+ err = get_user(mov1, (unsigned short __user *)regs->ip);
31072+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
31073+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
31074+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
31075+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
31076+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
31077+
31078+ if (err)
31079+ break;
31080+
31081+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31082+ regs->r11 = addr1;
31083+ regs->r10 = addr2;
31084+ regs->ip = addr1;
31085+ return 2;
31086+ }
31087+ } while (0);
31088+
31089+ do { /* PaX: gcc trampoline emulation #2 */
31090+ unsigned short mov1, mov2, jmp1;
31091+ unsigned char jmp2;
31092+ unsigned long addr1, addr2;
31093+
31094+ err = get_user(mov1, (unsigned short __user *)regs->ip);
31095+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
31096+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
31097+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
31098+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
31099+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
31100+
31101+ if (err)
31102+ break;
31103+
31104+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31105+ regs->r11 = addr1;
31106+ regs->r10 = addr2;
31107+ regs->ip = addr1;
31108+ return 2;
31109+ }
31110+ } while (0);
31111+
31112+ return 1; /* PaX in action */
31113+}
31114+#endif
31115+
31116+/*
31117+ * PaX: decide what to do with offenders (regs->ip = fault address)
31118+ *
31119+ * returns 1 when task should be killed
31120+ * 2 when gcc trampoline was detected
31121+ */
31122+static int pax_handle_fetch_fault(struct pt_regs *regs)
31123+{
31124+ if (v8086_mode(regs))
31125+ return 1;
31126+
31127+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
31128+ return 1;
31129+
31130+#ifdef CONFIG_X86_32
31131+ return pax_handle_fetch_fault_32(regs);
31132+#else
31133+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
31134+ return pax_handle_fetch_fault_32(regs);
31135+ else
31136+ return pax_handle_fetch_fault_64(regs);
31137+#endif
31138+}
31139+#endif
31140+
31141+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31142+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
31143+{
31144+ long i;
31145+
31146+ printk(KERN_ERR "PAX: bytes at PC: ");
31147+ for (i = 0; i < 20; i++) {
31148+ unsigned char c;
31149+ if (get_user(c, (unsigned char __force_user *)pc+i))
31150+ printk(KERN_CONT "?? ");
31151+ else
31152+ printk(KERN_CONT "%02x ", c);
31153+ }
31154+ printk("\n");
31155+
31156+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
31157+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
31158+ unsigned long c;
31159+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
31160+#ifdef CONFIG_X86_32
31161+ printk(KERN_CONT "???????? ");
31162+#else
31163+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
31164+ printk(KERN_CONT "???????? ???????? ");
31165+ else
31166+ printk(KERN_CONT "???????????????? ");
31167+#endif
31168+ } else {
31169+#ifdef CONFIG_X86_64
31170+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
31171+ printk(KERN_CONT "%08x ", (unsigned int)c);
31172+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
31173+ } else
31174+#endif
31175+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
31176+ }
31177+ }
31178+ printk("\n");
31179+}
31180+#endif
31181+
31182+/**
31183+ * probe_kernel_write(): safely attempt to write to a location
31184+ * @dst: address to write to
31185+ * @src: pointer to the data that shall be written
31186+ * @size: size of the data chunk
31187+ *
31188+ * Safely write to address @dst from the buffer at @src. If a kernel fault
31189+ * happens, handle that and return -EFAULT.
31190+ */
31191+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
31192+{
31193+ long ret;
31194+ mm_segment_t old_fs = get_fs();
31195+
31196+ set_fs(KERNEL_DS);
31197+ pagefault_disable();
31198+ pax_open_kernel();
31199+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
31200+ pax_close_kernel();
31201+ pagefault_enable();
31202+ set_fs(old_fs);
31203+
31204+ return ret ? -EFAULT : 0;
31205+}
31206diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
31207index 0596e8e..9de0b1c 100644
31208--- a/arch/x86/mm/gup.c
31209+++ b/arch/x86/mm/gup.c
31210@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
31211 addr = start;
31212 len = (unsigned long) nr_pages << PAGE_SHIFT;
31213 end = start + len;
31214- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
31215+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
31216 (void __user *)start, len)))
31217 return 0;
31218
31219@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
31220 goto slow_irqon;
31221 #endif
31222
31223+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
31224+ (void __user *)start, len)))
31225+ return 0;
31226+
31227 /*
31228 * XXX: batch / limit 'nr', to avoid large irq off latency
31229 * needs some instrumenting to determine the common sizes used by
31230diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
31231index 4500142..53a363c 100644
31232--- a/arch/x86/mm/highmem_32.c
31233+++ b/arch/x86/mm/highmem_32.c
31234@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
31235 idx = type + KM_TYPE_NR*smp_processor_id();
31236 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
31237 BUG_ON(!pte_none(*(kmap_pte-idx)));
31238+
31239+ pax_open_kernel();
31240 set_pte(kmap_pte-idx, mk_pte(page, prot));
31241+ pax_close_kernel();
31242+
31243 arch_flush_lazy_mmu_mode();
31244
31245 return (void *)vaddr;
31246diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
31247index 9d980d8..6bbfacb 100644
31248--- a/arch/x86/mm/hugetlbpage.c
31249+++ b/arch/x86/mm/hugetlbpage.c
31250@@ -92,23 +92,30 @@ int pmd_huge_support(void)
31251 #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA
31252 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
31253 unsigned long addr, unsigned long len,
31254- unsigned long pgoff, unsigned long flags)
31255+ unsigned long pgoff, unsigned long flags, unsigned long offset)
31256 {
31257 struct hstate *h = hstate_file(file);
31258 struct vm_unmapped_area_info info;
31259-
31260+
31261 info.flags = 0;
31262 info.length = len;
31263 info.low_limit = TASK_UNMAPPED_BASE;
31264+
31265+#ifdef CONFIG_PAX_RANDMMAP
31266+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
31267+ info.low_limit += current->mm->delta_mmap;
31268+#endif
31269+
31270 info.high_limit = TASK_SIZE;
31271 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
31272 info.align_offset = 0;
31273+ info.threadstack_offset = offset;
31274 return vm_unmapped_area(&info);
31275 }
31276
31277 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
31278 unsigned long addr0, unsigned long len,
31279- unsigned long pgoff, unsigned long flags)
31280+ unsigned long pgoff, unsigned long flags, unsigned long offset)
31281 {
31282 struct hstate *h = hstate_file(file);
31283 struct vm_unmapped_area_info info;
31284@@ -120,6 +127,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
31285 info.high_limit = current->mm->mmap_base;
31286 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
31287 info.align_offset = 0;
31288+ info.threadstack_offset = offset;
31289 addr = vm_unmapped_area(&info);
31290
31291 /*
31292@@ -132,6 +140,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
31293 VM_BUG_ON(addr != -ENOMEM);
31294 info.flags = 0;
31295 info.low_limit = TASK_UNMAPPED_BASE;
31296+
31297+#ifdef CONFIG_PAX_RANDMMAP
31298+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
31299+ info.low_limit += current->mm->delta_mmap;
31300+#endif
31301+
31302 info.high_limit = TASK_SIZE;
31303 addr = vm_unmapped_area(&info);
31304 }
31305@@ -146,10 +160,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
31306 struct hstate *h = hstate_file(file);
31307 struct mm_struct *mm = current->mm;
31308 struct vm_area_struct *vma;
31309+ unsigned long pax_task_size = TASK_SIZE;
31310+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
31311
31312 if (len & ~huge_page_mask(h))
31313 return -EINVAL;
31314- if (len > TASK_SIZE)
31315+
31316+#ifdef CONFIG_PAX_SEGMEXEC
31317+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
31318+ pax_task_size = SEGMEXEC_TASK_SIZE;
31319+#endif
31320+
31321+ pax_task_size -= PAGE_SIZE;
31322+
31323+ if (len > pax_task_size)
31324 return -ENOMEM;
31325
31326 if (flags & MAP_FIXED) {
31327@@ -158,19 +182,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
31328 return addr;
31329 }
31330
31331+#ifdef CONFIG_PAX_RANDMMAP
31332+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
31333+#endif
31334+
31335 if (addr) {
31336 addr = ALIGN(addr, huge_page_size(h));
31337 vma = find_vma(mm, addr);
31338- if (TASK_SIZE - len >= addr &&
31339- (!vma || addr + len <= vma->vm_start))
31340+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
31341 return addr;
31342 }
31343 if (mm->get_unmapped_area == arch_get_unmapped_area)
31344 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
31345- pgoff, flags);
31346+ pgoff, flags, offset);
31347 else
31348 return hugetlb_get_unmapped_area_topdown(file, addr, len,
31349- pgoff, flags);
31350+ pgoff, flags, offset);
31351 }
31352
31353 #endif /*HAVE_ARCH_HUGETLB_UNMAPPED_AREA*/
31354diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
31355index 04664cd..dae6e5d 100644
31356--- a/arch/x86/mm/init.c
31357+++ b/arch/x86/mm/init.c
31358@@ -4,6 +4,7 @@
31359 #include <linux/swap.h>
31360 #include <linux/memblock.h>
31361 #include <linux/bootmem.h> /* for max_low_pfn */
31362+#include <linux/tboot.h>
31363
31364 #include <asm/cacheflush.h>
31365 #include <asm/e820.h>
31366@@ -17,6 +18,8 @@
31367 #include <asm/proto.h>
31368 #include <asm/dma.h> /* for MAX_DMA_PFN */
31369 #include <asm/microcode.h>
31370+#include <asm/desc.h>
31371+#include <asm/bios_ebda.h>
31372
31373 #include "mm_internal.h"
31374
31375@@ -465,7 +468,18 @@ void __init init_mem_mapping(void)
31376 early_ioremap_page_table_range_init();
31377 #endif
31378
31379+#ifdef CONFIG_PAX_PER_CPU_PGD
31380+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
31381+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
31382+ KERNEL_PGD_PTRS);
31383+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
31384+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
31385+ KERNEL_PGD_PTRS);
31386+ load_cr3(get_cpu_pgd(0, kernel));
31387+#else
31388 load_cr3(swapper_pg_dir);
31389+#endif
31390+
31391 __flush_tlb_all();
31392
31393 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
31394@@ -481,10 +495,40 @@ void __init init_mem_mapping(void)
31395 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
31396 * mmio resources as well as potential bios/acpi data regions.
31397 */
31398+
31399+#ifdef CONFIG_GRKERNSEC_KMEM
31400+static unsigned int ebda_start __read_only;
31401+static unsigned int ebda_end __read_only;
31402+#endif
31403+
31404 int devmem_is_allowed(unsigned long pagenr)
31405 {
31406- if (pagenr < 256)
31407+#ifdef CONFIG_GRKERNSEC_KMEM
31408+ /* allow BDA */
31409+ if (!pagenr)
31410 return 1;
31411+ /* allow EBDA */
31412+ if (pagenr >= ebda_start && pagenr < ebda_end)
31413+ return 1;
31414+ /* if tboot is in use, allow access to its hardcoded serial log range */
31415+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
31416+ return 1;
31417+#else
31418+ if (!pagenr)
31419+ return 1;
31420+#ifdef CONFIG_VM86
31421+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
31422+ return 1;
31423+#endif
31424+#endif
31425+
31426+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
31427+ return 1;
31428+#ifdef CONFIG_GRKERNSEC_KMEM
31429+ /* throw out everything else below 1MB */
31430+ if (pagenr <= 256)
31431+ return 0;
31432+#endif
31433 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
31434 return 0;
31435 if (!page_is_ram(pagenr))
31436@@ -530,8 +574,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
31437 #endif
31438 }
31439
31440+#ifdef CONFIG_GRKERNSEC_KMEM
31441+static inline void gr_init_ebda(void)
31442+{
31443+ unsigned int ebda_addr;
31444+ unsigned int ebda_size = 0;
31445+
31446+ ebda_addr = get_bios_ebda();
31447+ if (ebda_addr) {
31448+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
31449+ ebda_size <<= 10;
31450+ }
31451+ if (ebda_addr && ebda_size) {
31452+ ebda_start = ebda_addr >> PAGE_SHIFT;
31453+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
31454+ } else {
31455+ ebda_start = 0x9f000 >> PAGE_SHIFT;
31456+ ebda_end = 0xa0000 >> PAGE_SHIFT;
31457+ }
31458+}
31459+#else
31460+static inline void gr_init_ebda(void) { }
31461+#endif
31462+
31463 void free_initmem(void)
31464 {
31465+#ifdef CONFIG_PAX_KERNEXEC
31466+#ifdef CONFIG_X86_32
31467+ /* PaX: limit KERNEL_CS to actual size */
31468+ unsigned long addr, limit;
31469+ struct desc_struct d;
31470+ int cpu;
31471+#else
31472+ pgd_t *pgd;
31473+ pud_t *pud;
31474+ pmd_t *pmd;
31475+ unsigned long addr, end;
31476+#endif
31477+#endif
31478+
31479+ gr_init_ebda();
31480+
31481+#ifdef CONFIG_PAX_KERNEXEC
31482+#ifdef CONFIG_X86_32
31483+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
31484+ limit = (limit - 1UL) >> PAGE_SHIFT;
31485+
31486+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
31487+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
31488+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
31489+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
31490+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
31491+ }
31492+
31493+ /* PaX: make KERNEL_CS read-only */
31494+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
31495+ if (!paravirt_enabled())
31496+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
31497+/*
31498+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
31499+ pgd = pgd_offset_k(addr);
31500+ pud = pud_offset(pgd, addr);
31501+ pmd = pmd_offset(pud, addr);
31502+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
31503+ }
31504+*/
31505+#ifdef CONFIG_X86_PAE
31506+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
31507+/*
31508+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
31509+ pgd = pgd_offset_k(addr);
31510+ pud = pud_offset(pgd, addr);
31511+ pmd = pmd_offset(pud, addr);
31512+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
31513+ }
31514+*/
31515+#endif
31516+
31517+#ifdef CONFIG_MODULES
31518+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
31519+#endif
31520+
31521+#else
31522+ /* PaX: make kernel code/rodata read-only, rest non-executable */
31523+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
31524+ pgd = pgd_offset_k(addr);
31525+ pud = pud_offset(pgd, addr);
31526+ pmd = pmd_offset(pud, addr);
31527+ if (!pmd_present(*pmd))
31528+ continue;
31529+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
31530+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
31531+ else
31532+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
31533+ }
31534+
31535+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
31536+ end = addr + KERNEL_IMAGE_SIZE;
31537+ for (; addr < end; addr += PMD_SIZE) {
31538+ pgd = pgd_offset_k(addr);
31539+ pud = pud_offset(pgd, addr);
31540+ pmd = pmd_offset(pud, addr);
31541+ if (!pmd_present(*pmd))
31542+ continue;
31543+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
31544+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
31545+ }
31546+#endif
31547+
31548+ flush_tlb_all();
31549+#endif
31550+
31551 free_init_pages("unused kernel",
31552 (unsigned long)(&__init_begin),
31553 (unsigned long)(&__init_end));
31554diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
31555index 4287f1f..3b99c71 100644
31556--- a/arch/x86/mm/init_32.c
31557+++ b/arch/x86/mm/init_32.c
31558@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
31559 bool __read_mostly __vmalloc_start_set = false;
31560
31561 /*
31562- * Creates a middle page table and puts a pointer to it in the
31563- * given global directory entry. This only returns the gd entry
31564- * in non-PAE compilation mode, since the middle layer is folded.
31565- */
31566-static pmd_t * __init one_md_table_init(pgd_t *pgd)
31567-{
31568- pud_t *pud;
31569- pmd_t *pmd_table;
31570-
31571-#ifdef CONFIG_X86_PAE
31572- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
31573- pmd_table = (pmd_t *)alloc_low_page();
31574- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
31575- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
31576- pud = pud_offset(pgd, 0);
31577- BUG_ON(pmd_table != pmd_offset(pud, 0));
31578-
31579- return pmd_table;
31580- }
31581-#endif
31582- pud = pud_offset(pgd, 0);
31583- pmd_table = pmd_offset(pud, 0);
31584-
31585- return pmd_table;
31586-}
31587-
31588-/*
31589 * Create a page table and place a pointer to it in a middle page
31590 * directory entry:
31591 */
31592@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
31593 pte_t *page_table = (pte_t *)alloc_low_page();
31594
31595 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
31596+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31597+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
31598+#else
31599 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
31600+#endif
31601 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
31602 }
31603
31604 return pte_offset_kernel(pmd, 0);
31605 }
31606
31607+static pmd_t * __init one_md_table_init(pgd_t *pgd)
31608+{
31609+ pud_t *pud;
31610+ pmd_t *pmd_table;
31611+
31612+ pud = pud_offset(pgd, 0);
31613+ pmd_table = pmd_offset(pud, 0);
31614+
31615+ return pmd_table;
31616+}
31617+
31618 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
31619 {
31620 int pgd_idx = pgd_index(vaddr);
31621@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
31622 int pgd_idx, pmd_idx;
31623 unsigned long vaddr;
31624 pgd_t *pgd;
31625+ pud_t *pud;
31626 pmd_t *pmd;
31627 pte_t *pte = NULL;
31628 unsigned long count = page_table_range_init_count(start, end);
31629@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
31630 pgd = pgd_base + pgd_idx;
31631
31632 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
31633- pmd = one_md_table_init(pgd);
31634- pmd = pmd + pmd_index(vaddr);
31635+ pud = pud_offset(pgd, vaddr);
31636+ pmd = pmd_offset(pud, vaddr);
31637+
31638+#ifdef CONFIG_X86_PAE
31639+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
31640+#endif
31641+
31642 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
31643 pmd++, pmd_idx++) {
31644 pte = page_table_kmap_check(one_page_table_init(pmd),
31645@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
31646 }
31647 }
31648
31649-static inline int is_kernel_text(unsigned long addr)
31650+static inline int is_kernel_text(unsigned long start, unsigned long end)
31651 {
31652- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
31653- return 1;
31654- return 0;
31655+ if ((start > ktla_ktva((unsigned long)_etext) ||
31656+ end <= ktla_ktva((unsigned long)_stext)) &&
31657+ (start > ktla_ktva((unsigned long)_einittext) ||
31658+ end <= ktla_ktva((unsigned long)_sinittext)) &&
31659+
31660+#ifdef CONFIG_ACPI_SLEEP
31661+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
31662+#endif
31663+
31664+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
31665+ return 0;
31666+ return 1;
31667 }
31668
31669 /*
31670@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
31671 unsigned long last_map_addr = end;
31672 unsigned long start_pfn, end_pfn;
31673 pgd_t *pgd_base = swapper_pg_dir;
31674- int pgd_idx, pmd_idx, pte_ofs;
31675+ unsigned int pgd_idx, pmd_idx, pte_ofs;
31676 unsigned long pfn;
31677 pgd_t *pgd;
31678+ pud_t *pud;
31679 pmd_t *pmd;
31680 pte_t *pte;
31681 unsigned pages_2m, pages_4k;
31682@@ -291,8 +295,13 @@ repeat:
31683 pfn = start_pfn;
31684 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
31685 pgd = pgd_base + pgd_idx;
31686- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
31687- pmd = one_md_table_init(pgd);
31688+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
31689+ pud = pud_offset(pgd, 0);
31690+ pmd = pmd_offset(pud, 0);
31691+
31692+#ifdef CONFIG_X86_PAE
31693+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
31694+#endif
31695
31696 if (pfn >= end_pfn)
31697 continue;
31698@@ -304,14 +313,13 @@ repeat:
31699 #endif
31700 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
31701 pmd++, pmd_idx++) {
31702- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
31703+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
31704
31705 /*
31706 * Map with big pages if possible, otherwise
31707 * create normal page tables:
31708 */
31709 if (use_pse) {
31710- unsigned int addr2;
31711 pgprot_t prot = PAGE_KERNEL_LARGE;
31712 /*
31713 * first pass will use the same initial
31714@@ -322,11 +330,7 @@ repeat:
31715 _PAGE_PSE);
31716
31717 pfn &= PMD_MASK >> PAGE_SHIFT;
31718- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
31719- PAGE_OFFSET + PAGE_SIZE-1;
31720-
31721- if (is_kernel_text(addr) ||
31722- is_kernel_text(addr2))
31723+ if (is_kernel_text(address, address + PMD_SIZE))
31724 prot = PAGE_KERNEL_LARGE_EXEC;
31725
31726 pages_2m++;
31727@@ -343,7 +347,7 @@ repeat:
31728 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
31729 pte += pte_ofs;
31730 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
31731- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
31732+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
31733 pgprot_t prot = PAGE_KERNEL;
31734 /*
31735 * first pass will use the same initial
31736@@ -351,7 +355,7 @@ repeat:
31737 */
31738 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
31739
31740- if (is_kernel_text(addr))
31741+ if (is_kernel_text(address, address + PAGE_SIZE))
31742 prot = PAGE_KERNEL_EXEC;
31743
31744 pages_4k++;
31745@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
31746
31747 pud = pud_offset(pgd, va);
31748 pmd = pmd_offset(pud, va);
31749- if (!pmd_present(*pmd))
31750+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
31751 break;
31752
31753 /* should not be large page here */
31754@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
31755
31756 static void __init pagetable_init(void)
31757 {
31758- pgd_t *pgd_base = swapper_pg_dir;
31759-
31760- permanent_kmaps_init(pgd_base);
31761+ permanent_kmaps_init(swapper_pg_dir);
31762 }
31763
31764-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
31765+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
31766 EXPORT_SYMBOL_GPL(__supported_pte_mask);
31767
31768 /* user-defined highmem size */
31769@@ -787,10 +789,10 @@ void __init mem_init(void)
31770 ((unsigned long)&__init_end -
31771 (unsigned long)&__init_begin) >> 10,
31772
31773- (unsigned long)&_etext, (unsigned long)&_edata,
31774- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
31775+ (unsigned long)&_sdata, (unsigned long)&_edata,
31776+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
31777
31778- (unsigned long)&_text, (unsigned long)&_etext,
31779+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
31780 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
31781
31782 /*
31783@@ -880,6 +882,7 @@ void set_kernel_text_rw(void)
31784 if (!kernel_set_to_readonly)
31785 return;
31786
31787+ start = ktla_ktva(start);
31788 pr_debug("Set kernel text: %lx - %lx for read write\n",
31789 start, start+size);
31790
31791@@ -894,6 +897,7 @@ void set_kernel_text_ro(void)
31792 if (!kernel_set_to_readonly)
31793 return;
31794
31795+ start = ktla_ktva(start);
31796 pr_debug("Set kernel text: %lx - %lx for read only\n",
31797 start, start+size);
31798
31799@@ -922,6 +926,7 @@ void mark_rodata_ro(void)
31800 unsigned long start = PFN_ALIGN(_text);
31801 unsigned long size = PFN_ALIGN(_etext) - start;
31802
31803+ start = ktla_ktva(start);
31804 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
31805 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
31806 size >> 10);
31807diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
31808index 104d56a..62ba13f1 100644
31809--- a/arch/x86/mm/init_64.c
31810+++ b/arch/x86/mm/init_64.c
31811@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
31812 * around without checking the pgd every time.
31813 */
31814
31815-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
31816+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
31817 EXPORT_SYMBOL_GPL(__supported_pte_mask);
31818
31819 int force_personality32;
31820@@ -184,12 +184,29 @@ void sync_global_pgds(unsigned long start, unsigned long end)
31821
31822 for (address = start; address <= end; address += PGDIR_SIZE) {
31823 const pgd_t *pgd_ref = pgd_offset_k(address);
31824+
31825+#ifdef CONFIG_PAX_PER_CPU_PGD
31826+ unsigned long cpu;
31827+#else
31828 struct page *page;
31829+#endif
31830
31831 if (pgd_none(*pgd_ref))
31832 continue;
31833
31834 spin_lock(&pgd_lock);
31835+
31836+#ifdef CONFIG_PAX_PER_CPU_PGD
31837+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31838+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
31839+
31840+ if (pgd_none(*pgd))
31841+ set_pgd(pgd, *pgd_ref);
31842+ else
31843+ BUG_ON(pgd_page_vaddr(*pgd)
31844+ != pgd_page_vaddr(*pgd_ref));
31845+ pgd = pgd_offset_cpu(cpu, kernel, address);
31846+#else
31847 list_for_each_entry(page, &pgd_list, lru) {
31848 pgd_t *pgd;
31849 spinlock_t *pgt_lock;
31850@@ -198,6 +215,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
31851 /* the pgt_lock only for Xen */
31852 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31853 spin_lock(pgt_lock);
31854+#endif
31855
31856 if (pgd_none(*pgd))
31857 set_pgd(pgd, *pgd_ref);
31858@@ -205,7 +223,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
31859 BUG_ON(pgd_page_vaddr(*pgd)
31860 != pgd_page_vaddr(*pgd_ref));
31861
31862+#ifndef CONFIG_PAX_PER_CPU_PGD
31863 spin_unlock(pgt_lock);
31864+#endif
31865+
31866 }
31867 spin_unlock(&pgd_lock);
31868 }
31869@@ -238,7 +259,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
31870 {
31871 if (pgd_none(*pgd)) {
31872 pud_t *pud = (pud_t *)spp_getpage();
31873- pgd_populate(&init_mm, pgd, pud);
31874+ pgd_populate_kernel(&init_mm, pgd, pud);
31875 if (pud != pud_offset(pgd, 0))
31876 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
31877 pud, pud_offset(pgd, 0));
31878@@ -250,7 +271,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
31879 {
31880 if (pud_none(*pud)) {
31881 pmd_t *pmd = (pmd_t *) spp_getpage();
31882- pud_populate(&init_mm, pud, pmd);
31883+ pud_populate_kernel(&init_mm, pud, pmd);
31884 if (pmd != pmd_offset(pud, 0))
31885 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
31886 pmd, pmd_offset(pud, 0));
31887@@ -279,7 +300,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
31888 pmd = fill_pmd(pud, vaddr);
31889 pte = fill_pte(pmd, vaddr);
31890
31891+ pax_open_kernel();
31892 set_pte(pte, new_pte);
31893+ pax_close_kernel();
31894
31895 /*
31896 * It's enough to flush this one mapping.
31897@@ -338,14 +361,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
31898 pgd = pgd_offset_k((unsigned long)__va(phys));
31899 if (pgd_none(*pgd)) {
31900 pud = (pud_t *) spp_getpage();
31901- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
31902- _PAGE_USER));
31903+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
31904 }
31905 pud = pud_offset(pgd, (unsigned long)__va(phys));
31906 if (pud_none(*pud)) {
31907 pmd = (pmd_t *) spp_getpage();
31908- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
31909- _PAGE_USER));
31910+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
31911 }
31912 pmd = pmd_offset(pud, phys);
31913 BUG_ON(!pmd_none(*pmd));
31914@@ -586,7 +607,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
31915 prot);
31916
31917 spin_lock(&init_mm.page_table_lock);
31918- pud_populate(&init_mm, pud, pmd);
31919+ pud_populate_kernel(&init_mm, pud, pmd);
31920 spin_unlock(&init_mm.page_table_lock);
31921 }
31922 __flush_tlb_all();
31923@@ -627,7 +648,7 @@ kernel_physical_mapping_init(unsigned long start,
31924 page_size_mask);
31925
31926 spin_lock(&init_mm.page_table_lock);
31927- pgd_populate(&init_mm, pgd, pud);
31928+ pgd_populate_kernel(&init_mm, pgd, pud);
31929 spin_unlock(&init_mm.page_table_lock);
31930 pgd_changed = true;
31931 }
31932@@ -1188,8 +1209,8 @@ int kern_addr_valid(unsigned long addr)
31933 static struct vm_area_struct gate_vma = {
31934 .vm_start = VSYSCALL_START,
31935 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
31936- .vm_page_prot = PAGE_READONLY_EXEC,
31937- .vm_flags = VM_READ | VM_EXEC
31938+ .vm_page_prot = PAGE_READONLY,
31939+ .vm_flags = VM_READ
31940 };
31941
31942 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
31943@@ -1223,7 +1244,7 @@ int in_gate_area_no_mm(unsigned long addr)
31944
31945 const char *arch_vma_name(struct vm_area_struct *vma)
31946 {
31947- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
31948+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
31949 return "[vdso]";
31950 if (vma == &gate_vma)
31951 return "[vsyscall]";
31952diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
31953index 7b179b4..6bd17777 100644
31954--- a/arch/x86/mm/iomap_32.c
31955+++ b/arch/x86/mm/iomap_32.c
31956@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
31957 type = kmap_atomic_idx_push();
31958 idx = type + KM_TYPE_NR * smp_processor_id();
31959 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
31960+
31961+ pax_open_kernel();
31962 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
31963+ pax_close_kernel();
31964+
31965 arch_flush_lazy_mmu_mode();
31966
31967 return (void *)vaddr;
31968diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
31969index 799580c..72f9fe0 100644
31970--- a/arch/x86/mm/ioremap.c
31971+++ b/arch/x86/mm/ioremap.c
31972@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
31973 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
31974 int is_ram = page_is_ram(pfn);
31975
31976- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
31977+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
31978 return NULL;
31979 WARN_ON_ONCE(is_ram);
31980 }
31981@@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioremap_prot);
31982 *
31983 * Caller must ensure there is only one unmapping for the same pointer.
31984 */
31985-void iounmap(volatile void __iomem *addr)
31986+void iounmap(const volatile void __iomem *addr)
31987 {
31988 struct vm_struct *p, *o;
31989
31990@@ -310,6 +310,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
31991
31992 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
31993 if (page_is_ram(start >> PAGE_SHIFT))
31994+#ifdef CONFIG_HIGHMEM
31995+ if ((start >> PAGE_SHIFT) < max_low_pfn)
31996+#endif
31997 return __va(phys);
31998
31999 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
32000@@ -322,6 +325,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
32001 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
32002 {
32003 if (page_is_ram(phys >> PAGE_SHIFT))
32004+#ifdef CONFIG_HIGHMEM
32005+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
32006+#endif
32007 return;
32008
32009 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
32010@@ -339,7 +345,7 @@ static int __init early_ioremap_debug_setup(char *str)
32011 early_param("early_ioremap_debug", early_ioremap_debug_setup);
32012
32013 static __initdata int after_paging_init;
32014-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
32015+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
32016
32017 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
32018 {
32019@@ -376,8 +382,7 @@ void __init early_ioremap_init(void)
32020 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
32021
32022 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
32023- memset(bm_pte, 0, sizeof(bm_pte));
32024- pmd_populate_kernel(&init_mm, pmd, bm_pte);
32025+ pmd_populate_user(&init_mm, pmd, bm_pte);
32026
32027 /*
32028 * The boot-ioremap range spans multiple pmds, for which
32029diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
32030index d87dd6d..bf3fa66 100644
32031--- a/arch/x86/mm/kmemcheck/kmemcheck.c
32032+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
32033@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
32034 * memory (e.g. tracked pages)? For now, we need this to avoid
32035 * invoking kmemcheck for PnP BIOS calls.
32036 */
32037- if (regs->flags & X86_VM_MASK)
32038+ if (v8086_mode(regs))
32039 return false;
32040- if (regs->cs != __KERNEL_CS)
32041+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
32042 return false;
32043
32044 pte = kmemcheck_pte_lookup(address);
32045diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
32046index 25e7e13..1964579 100644
32047--- a/arch/x86/mm/mmap.c
32048+++ b/arch/x86/mm/mmap.c
32049@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
32050 * Leave an at least ~128 MB hole with possible stack randomization.
32051 */
32052 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
32053-#define MAX_GAP (TASK_SIZE/6*5)
32054+#define MAX_GAP (pax_task_size/6*5)
32055
32056 static int mmap_is_legacy(void)
32057 {
32058@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
32059 return rnd << PAGE_SHIFT;
32060 }
32061
32062-static unsigned long mmap_base(void)
32063+static unsigned long mmap_base(struct mm_struct *mm)
32064 {
32065 unsigned long gap = rlimit(RLIMIT_STACK);
32066+ unsigned long pax_task_size = TASK_SIZE;
32067+
32068+#ifdef CONFIG_PAX_SEGMEXEC
32069+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32070+ pax_task_size = SEGMEXEC_TASK_SIZE;
32071+#endif
32072
32073 if (gap < MIN_GAP)
32074 gap = MIN_GAP;
32075 else if (gap > MAX_GAP)
32076 gap = MAX_GAP;
32077
32078- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
32079+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
32080 }
32081
32082 /*
32083 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
32084 * does, but not when emulating X86_32
32085 */
32086-static unsigned long mmap_legacy_base(void)
32087+static unsigned long mmap_legacy_base(struct mm_struct *mm)
32088 {
32089- if (mmap_is_ia32())
32090+ if (mmap_is_ia32()) {
32091+
32092+#ifdef CONFIG_PAX_SEGMEXEC
32093+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32094+ return SEGMEXEC_TASK_UNMAPPED_BASE;
32095+ else
32096+#endif
32097+
32098 return TASK_UNMAPPED_BASE;
32099- else
32100+ } else
32101 return TASK_UNMAPPED_BASE + mmap_rnd();
32102 }
32103
32104@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
32105 */
32106 void arch_pick_mmap_layout(struct mm_struct *mm)
32107 {
32108- mm->mmap_legacy_base = mmap_legacy_base();
32109- mm->mmap_base = mmap_base();
32110+ mm->mmap_legacy_base = mmap_legacy_base(mm);
32111+ mm->mmap_base = mmap_base(mm);
32112+
32113+#ifdef CONFIG_PAX_RANDMMAP
32114+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
32115+ mm->mmap_legacy_base += mm->delta_mmap;
32116+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
32117+ }
32118+#endif
32119
32120 if (mmap_is_legacy()) {
32121 mm->mmap_base = mm->mmap_legacy_base;
32122diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
32123index 0057a7a..95c7edd 100644
32124--- a/arch/x86/mm/mmio-mod.c
32125+++ b/arch/x86/mm/mmio-mod.c
32126@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
32127 break;
32128 default:
32129 {
32130- unsigned char *ip = (unsigned char *)instptr;
32131+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
32132 my_trace->opcode = MMIO_UNKNOWN_OP;
32133 my_trace->width = 0;
32134 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
32135@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
32136 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
32137 void __iomem *addr)
32138 {
32139- static atomic_t next_id;
32140+ static atomic_unchecked_t next_id;
32141 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
32142 /* These are page-unaligned. */
32143 struct mmiotrace_map map = {
32144@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
32145 .private = trace
32146 },
32147 .phys = offset,
32148- .id = atomic_inc_return(&next_id)
32149+ .id = atomic_inc_return_unchecked(&next_id)
32150 };
32151 map.map_id = trace->id;
32152
32153@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
32154 ioremap_trace_core(offset, size, addr);
32155 }
32156
32157-static void iounmap_trace_core(volatile void __iomem *addr)
32158+static void iounmap_trace_core(const volatile void __iomem *addr)
32159 {
32160 struct mmiotrace_map map = {
32161 .phys = 0,
32162@@ -328,7 +328,7 @@ not_enabled:
32163 }
32164 }
32165
32166-void mmiotrace_iounmap(volatile void __iomem *addr)
32167+void mmiotrace_iounmap(const volatile void __iomem *addr)
32168 {
32169 might_sleep();
32170 if (is_enabled()) /* recheck and proper locking in *_core() */
32171diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
32172index 8bf93ba..dbcd670 100644
32173--- a/arch/x86/mm/numa.c
32174+++ b/arch/x86/mm/numa.c
32175@@ -474,7 +474,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
32176 return true;
32177 }
32178
32179-static int __init numa_register_memblks(struct numa_meminfo *mi)
32180+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
32181 {
32182 unsigned long uninitialized_var(pfn_align);
32183 int i, nid;
32184diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
32185index d0b1773..4c3327c 100644
32186--- a/arch/x86/mm/pageattr-test.c
32187+++ b/arch/x86/mm/pageattr-test.c
32188@@ -36,7 +36,7 @@ enum {
32189
32190 static int pte_testbit(pte_t pte)
32191 {
32192- return pte_flags(pte) & _PAGE_UNUSED1;
32193+ return pte_flags(pte) & _PAGE_CPA_TEST;
32194 }
32195
32196 struct split_state {
32197diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
32198index bb32480..75f2f5e 100644
32199--- a/arch/x86/mm/pageattr.c
32200+++ b/arch/x86/mm/pageattr.c
32201@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32202 */
32203 #ifdef CONFIG_PCI_BIOS
32204 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
32205- pgprot_val(forbidden) |= _PAGE_NX;
32206+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32207 #endif
32208
32209 /*
32210@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32211 * Does not cover __inittext since that is gone later on. On
32212 * 64bit we do not enforce !NX on the low mapping
32213 */
32214- if (within(address, (unsigned long)_text, (unsigned long)_etext))
32215- pgprot_val(forbidden) |= _PAGE_NX;
32216+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
32217+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32218
32219+#ifdef CONFIG_DEBUG_RODATA
32220 /*
32221 * The .rodata section needs to be read-only. Using the pfn
32222 * catches all aliases.
32223@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32224 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
32225 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
32226 pgprot_val(forbidden) |= _PAGE_RW;
32227+#endif
32228
32229 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
32230 /*
32231@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
32232 }
32233 #endif
32234
32235+#ifdef CONFIG_PAX_KERNEXEC
32236+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
32237+ pgprot_val(forbidden) |= _PAGE_RW;
32238+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
32239+ }
32240+#endif
32241+
32242 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
32243
32244 return prot;
32245@@ -400,23 +409,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
32246 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
32247 {
32248 /* change init_mm */
32249+ pax_open_kernel();
32250 set_pte_atomic(kpte, pte);
32251+
32252 #ifdef CONFIG_X86_32
32253 if (!SHARED_KERNEL_PMD) {
32254+
32255+#ifdef CONFIG_PAX_PER_CPU_PGD
32256+ unsigned long cpu;
32257+#else
32258 struct page *page;
32259+#endif
32260
32261+#ifdef CONFIG_PAX_PER_CPU_PGD
32262+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32263+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
32264+#else
32265 list_for_each_entry(page, &pgd_list, lru) {
32266- pgd_t *pgd;
32267+ pgd_t *pgd = (pgd_t *)page_address(page);
32268+#endif
32269+
32270 pud_t *pud;
32271 pmd_t *pmd;
32272
32273- pgd = (pgd_t *)page_address(page) + pgd_index(address);
32274+ pgd += pgd_index(address);
32275 pud = pud_offset(pgd, address);
32276 pmd = pmd_offset(pud, address);
32277 set_pte_atomic((pte_t *)pmd, pte);
32278 }
32279 }
32280 #endif
32281+ pax_close_kernel();
32282 }
32283
32284 static int
32285diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
32286index 6574388..87e9bef 100644
32287--- a/arch/x86/mm/pat.c
32288+++ b/arch/x86/mm/pat.c
32289@@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
32290
32291 if (!entry) {
32292 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
32293- current->comm, current->pid, start, end - 1);
32294+ current->comm, task_pid_nr(current), start, end - 1);
32295 return -EINVAL;
32296 }
32297
32298@@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
32299
32300 while (cursor < to) {
32301 if (!devmem_is_allowed(pfn)) {
32302- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
32303- current->comm, from, to - 1);
32304+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
32305+ current->comm, from, to - 1, cursor);
32306 return 0;
32307 }
32308 cursor += PAGE_SIZE;
32309@@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
32310 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
32311 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
32312 "for [mem %#010Lx-%#010Lx]\n",
32313- current->comm, current->pid,
32314+ current->comm, task_pid_nr(current),
32315 cattr_name(flags),
32316 base, (unsigned long long)(base + size-1));
32317 return -EINVAL;
32318@@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
32319 flags = lookup_memtype(paddr);
32320 if (want_flags != flags) {
32321 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
32322- current->comm, current->pid,
32323+ current->comm, task_pid_nr(current),
32324 cattr_name(want_flags),
32325 (unsigned long long)paddr,
32326 (unsigned long long)(paddr + size - 1),
32327@@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
32328 free_memtype(paddr, paddr + size);
32329 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
32330 " for [mem %#010Lx-%#010Lx], got %s\n",
32331- current->comm, current->pid,
32332+ current->comm, task_pid_nr(current),
32333 cattr_name(want_flags),
32334 (unsigned long long)paddr,
32335 (unsigned long long)(paddr + size - 1),
32336diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
32337index 415f6c4..d319983 100644
32338--- a/arch/x86/mm/pat_rbtree.c
32339+++ b/arch/x86/mm/pat_rbtree.c
32340@@ -160,7 +160,7 @@ success:
32341
32342 failure:
32343 printk(KERN_INFO "%s:%d conflicting memory types "
32344- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
32345+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
32346 end, cattr_name(found_type), cattr_name(match->type));
32347 return -EBUSY;
32348 }
32349diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
32350index 9f0614d..92ae64a 100644
32351--- a/arch/x86/mm/pf_in.c
32352+++ b/arch/x86/mm/pf_in.c
32353@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
32354 int i;
32355 enum reason_type rv = OTHERS;
32356
32357- p = (unsigned char *)ins_addr;
32358+ p = (unsigned char *)ktla_ktva(ins_addr);
32359 p += skip_prefix(p, &prf);
32360 p += get_opcode(p, &opcode);
32361
32362@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
32363 struct prefix_bits prf;
32364 int i;
32365
32366- p = (unsigned char *)ins_addr;
32367+ p = (unsigned char *)ktla_ktva(ins_addr);
32368 p += skip_prefix(p, &prf);
32369 p += get_opcode(p, &opcode);
32370
32371@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
32372 struct prefix_bits prf;
32373 int i;
32374
32375- p = (unsigned char *)ins_addr;
32376+ p = (unsigned char *)ktla_ktva(ins_addr);
32377 p += skip_prefix(p, &prf);
32378 p += get_opcode(p, &opcode);
32379
32380@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
32381 struct prefix_bits prf;
32382 int i;
32383
32384- p = (unsigned char *)ins_addr;
32385+ p = (unsigned char *)ktla_ktva(ins_addr);
32386 p += skip_prefix(p, &prf);
32387 p += get_opcode(p, &opcode);
32388 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
32389@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
32390 struct prefix_bits prf;
32391 int i;
32392
32393- p = (unsigned char *)ins_addr;
32394+ p = (unsigned char *)ktla_ktva(ins_addr);
32395 p += skip_prefix(p, &prf);
32396 p += get_opcode(p, &opcode);
32397 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
32398diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
32399index dfa537a..fd45c64 100644
32400--- a/arch/x86/mm/pgtable.c
32401+++ b/arch/x86/mm/pgtable.c
32402@@ -91,10 +91,67 @@ static inline void pgd_list_del(pgd_t *pgd)
32403 list_del(&page->lru);
32404 }
32405
32406-#define UNSHARED_PTRS_PER_PGD \
32407- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
32408+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32409+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
32410
32411+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
32412+{
32413+ unsigned int count = USER_PGD_PTRS;
32414
32415+ if (!pax_user_shadow_base)
32416+ return;
32417+
32418+ while (count--)
32419+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
32420+}
32421+#endif
32422+
32423+#ifdef CONFIG_PAX_PER_CPU_PGD
32424+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
32425+{
32426+ unsigned int count = USER_PGD_PTRS;
32427+
32428+ while (count--) {
32429+ pgd_t pgd;
32430+
32431+#ifdef CONFIG_X86_64
32432+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
32433+#else
32434+ pgd = *src++;
32435+#endif
32436+
32437+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32438+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
32439+#endif
32440+
32441+ *dst++ = pgd;
32442+ }
32443+
32444+}
32445+#endif
32446+
32447+#ifdef CONFIG_X86_64
32448+#define pxd_t pud_t
32449+#define pyd_t pgd_t
32450+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
32451+#define pxd_free(mm, pud) pud_free((mm), (pud))
32452+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
32453+#define pyd_offset(mm, address) pgd_offset((mm), (address))
32454+#define PYD_SIZE PGDIR_SIZE
32455+#else
32456+#define pxd_t pmd_t
32457+#define pyd_t pud_t
32458+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
32459+#define pxd_free(mm, pud) pmd_free((mm), (pud))
32460+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
32461+#define pyd_offset(mm, address) pud_offset((mm), (address))
32462+#define PYD_SIZE PUD_SIZE
32463+#endif
32464+
32465+#ifdef CONFIG_PAX_PER_CPU_PGD
32466+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
32467+static inline void pgd_dtor(pgd_t *pgd) {}
32468+#else
32469 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
32470 {
32471 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
32472@@ -135,6 +192,7 @@ static void pgd_dtor(pgd_t *pgd)
32473 pgd_list_del(pgd);
32474 spin_unlock(&pgd_lock);
32475 }
32476+#endif
32477
32478 /*
32479 * List of all pgd's needed for non-PAE so it can invalidate entries
32480@@ -147,7 +205,7 @@ static void pgd_dtor(pgd_t *pgd)
32481 * -- nyc
32482 */
32483
32484-#ifdef CONFIG_X86_PAE
32485+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
32486 /*
32487 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
32488 * updating the top-level pagetable entries to guarantee the
32489@@ -159,7 +217,7 @@ static void pgd_dtor(pgd_t *pgd)
32490 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
32491 * and initialize the kernel pmds here.
32492 */
32493-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
32494+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
32495
32496 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
32497 {
32498@@ -177,36 +235,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
32499 */
32500 flush_tlb_mm(mm);
32501 }
32502+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
32503+#define PREALLOCATED_PXDS USER_PGD_PTRS
32504 #else /* !CONFIG_X86_PAE */
32505
32506 /* No need to prepopulate any pagetable entries in non-PAE modes. */
32507-#define PREALLOCATED_PMDS 0
32508+#define PREALLOCATED_PXDS 0
32509
32510 #endif /* CONFIG_X86_PAE */
32511
32512-static void free_pmds(pmd_t *pmds[])
32513+static void free_pxds(pxd_t *pxds[])
32514 {
32515 int i;
32516
32517- for(i = 0; i < PREALLOCATED_PMDS; i++)
32518- if (pmds[i])
32519- free_page((unsigned long)pmds[i]);
32520+ for(i = 0; i < PREALLOCATED_PXDS; i++)
32521+ if (pxds[i])
32522+ free_page((unsigned long)pxds[i]);
32523 }
32524
32525-static int preallocate_pmds(pmd_t *pmds[])
32526+static int preallocate_pxds(pxd_t *pxds[])
32527 {
32528 int i;
32529 bool failed = false;
32530
32531- for(i = 0; i < PREALLOCATED_PMDS; i++) {
32532- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
32533- if (pmd == NULL)
32534+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
32535+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
32536+ if (pxd == NULL)
32537 failed = true;
32538- pmds[i] = pmd;
32539+ pxds[i] = pxd;
32540 }
32541
32542 if (failed) {
32543- free_pmds(pmds);
32544+ free_pxds(pxds);
32545 return -ENOMEM;
32546 }
32547
32548@@ -219,49 +279,52 @@ static int preallocate_pmds(pmd_t *pmds[])
32549 * preallocate which never got a corresponding vma will need to be
32550 * freed manually.
32551 */
32552-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
32553+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
32554 {
32555 int i;
32556
32557- for(i = 0; i < PREALLOCATED_PMDS; i++) {
32558+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
32559 pgd_t pgd = pgdp[i];
32560
32561 if (pgd_val(pgd) != 0) {
32562- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
32563+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
32564
32565- pgdp[i] = native_make_pgd(0);
32566+ set_pgd(pgdp + i, native_make_pgd(0));
32567
32568- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
32569- pmd_free(mm, pmd);
32570+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
32571+ pxd_free(mm, pxd);
32572 }
32573 }
32574 }
32575
32576-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
32577+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
32578 {
32579- pud_t *pud;
32580+ pyd_t *pyd;
32581 int i;
32582
32583- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
32584+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
32585 return;
32586
32587- pud = pud_offset(pgd, 0);
32588-
32589- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
32590- pmd_t *pmd = pmds[i];
32591+#ifdef CONFIG_X86_64
32592+ pyd = pyd_offset(mm, 0L);
32593+#else
32594+ pyd = pyd_offset(pgd, 0L);
32595+#endif
32596
32597+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
32598+ pxd_t *pxd = pxds[i];
32599 if (i >= KERNEL_PGD_BOUNDARY)
32600- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
32601- sizeof(pmd_t) * PTRS_PER_PMD);
32602+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
32603+ sizeof(pxd_t) * PTRS_PER_PMD);
32604
32605- pud_populate(mm, pud, pmd);
32606+ pyd_populate(mm, pyd, pxd);
32607 }
32608 }
32609
32610 pgd_t *pgd_alloc(struct mm_struct *mm)
32611 {
32612 pgd_t *pgd;
32613- pmd_t *pmds[PREALLOCATED_PMDS];
32614+ pxd_t *pxds[PREALLOCATED_PXDS];
32615
32616 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
32617
32618@@ -270,11 +333,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
32619
32620 mm->pgd = pgd;
32621
32622- if (preallocate_pmds(pmds) != 0)
32623+ if (preallocate_pxds(pxds) != 0)
32624 goto out_free_pgd;
32625
32626 if (paravirt_pgd_alloc(mm) != 0)
32627- goto out_free_pmds;
32628+ goto out_free_pxds;
32629
32630 /*
32631 * Make sure that pre-populating the pmds is atomic with
32632@@ -284,14 +347,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
32633 spin_lock(&pgd_lock);
32634
32635 pgd_ctor(mm, pgd);
32636- pgd_prepopulate_pmd(mm, pgd, pmds);
32637+ pgd_prepopulate_pxd(mm, pgd, pxds);
32638
32639 spin_unlock(&pgd_lock);
32640
32641 return pgd;
32642
32643-out_free_pmds:
32644- free_pmds(pmds);
32645+out_free_pxds:
32646+ free_pxds(pxds);
32647 out_free_pgd:
32648 free_page((unsigned long)pgd);
32649 out:
32650@@ -300,7 +363,7 @@ out:
32651
32652 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
32653 {
32654- pgd_mop_up_pmds(mm, pgd);
32655+ pgd_mop_up_pxds(mm, pgd);
32656 pgd_dtor(pgd);
32657 paravirt_pgd_free(mm, pgd);
32658 free_page((unsigned long)pgd);
32659diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
32660index a69bcb8..19068ab 100644
32661--- a/arch/x86/mm/pgtable_32.c
32662+++ b/arch/x86/mm/pgtable_32.c
32663@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
32664 return;
32665 }
32666 pte = pte_offset_kernel(pmd, vaddr);
32667+
32668+ pax_open_kernel();
32669 if (pte_val(pteval))
32670 set_pte_at(&init_mm, vaddr, pte, pteval);
32671 else
32672 pte_clear(&init_mm, vaddr, pte);
32673+ pax_close_kernel();
32674
32675 /*
32676 * It's enough to flush this one mapping.
32677diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
32678index e666cbb..61788c45 100644
32679--- a/arch/x86/mm/physaddr.c
32680+++ b/arch/x86/mm/physaddr.c
32681@@ -10,7 +10,7 @@
32682 #ifdef CONFIG_X86_64
32683
32684 #ifdef CONFIG_DEBUG_VIRTUAL
32685-unsigned long __phys_addr(unsigned long x)
32686+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
32687 {
32688 unsigned long y = x - __START_KERNEL_map;
32689
32690@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
32691 #else
32692
32693 #ifdef CONFIG_DEBUG_VIRTUAL
32694-unsigned long __phys_addr(unsigned long x)
32695+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
32696 {
32697 unsigned long phys_addr = x - PAGE_OFFSET;
32698 /* VMALLOC_* aren't constants */
32699diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
32700index 90555bf..f5f1828 100644
32701--- a/arch/x86/mm/setup_nx.c
32702+++ b/arch/x86/mm/setup_nx.c
32703@@ -5,8 +5,10 @@
32704 #include <asm/pgtable.h>
32705 #include <asm/proto.h>
32706
32707+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
32708 static int disable_nx;
32709
32710+#ifndef CONFIG_PAX_PAGEEXEC
32711 /*
32712 * noexec = on|off
32713 *
32714@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
32715 return 0;
32716 }
32717 early_param("noexec", noexec_setup);
32718+#endif
32719+
32720+#endif
32721
32722 void x86_configure_nx(void)
32723 {
32724+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
32725 if (cpu_has_nx && !disable_nx)
32726 __supported_pte_mask |= _PAGE_NX;
32727 else
32728+#endif
32729 __supported_pte_mask &= ~_PAGE_NX;
32730 }
32731
32732diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
32733index ae699b3..f1b2ad2 100644
32734--- a/arch/x86/mm/tlb.c
32735+++ b/arch/x86/mm/tlb.c
32736@@ -48,7 +48,11 @@ void leave_mm(int cpu)
32737 BUG();
32738 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
32739 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
32740+
32741+#ifndef CONFIG_PAX_PER_CPU_PGD
32742 load_cr3(swapper_pg_dir);
32743+#endif
32744+
32745 }
32746 }
32747 EXPORT_SYMBOL_GPL(leave_mm);
32748diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
32749new file mode 100644
32750index 0000000..dace51c
32751--- /dev/null
32752+++ b/arch/x86/mm/uderef_64.c
32753@@ -0,0 +1,37 @@
32754+#include <linux/mm.h>
32755+#include <asm/pgtable.h>
32756+#include <asm/uaccess.h>
32757+
32758+#ifdef CONFIG_PAX_MEMORY_UDEREF
32759+/* PaX: due to the special call convention these functions must
32760+ * - remain leaf functions under all configurations,
32761+ * - never be called directly, only dereferenced from the wrappers.
32762+ */
32763+void __pax_open_userland(void)
32764+{
32765+ unsigned int cpu;
32766+
32767+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
32768+ return;
32769+
32770+ cpu = raw_get_cpu();
32771+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
32772+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
32773+ raw_put_cpu_no_resched();
32774+}
32775+EXPORT_SYMBOL(__pax_open_userland);
32776+
32777+void __pax_close_userland(void)
32778+{
32779+ unsigned int cpu;
32780+
32781+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
32782+ return;
32783+
32784+ cpu = raw_get_cpu();
32785+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
32786+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
32787+ raw_put_cpu_no_resched();
32788+}
32789+EXPORT_SYMBOL(__pax_close_userland);
32790+#endif
32791diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
32792index 877b9a1..a8ecf42 100644
32793--- a/arch/x86/net/bpf_jit.S
32794+++ b/arch/x86/net/bpf_jit.S
32795@@ -9,6 +9,7 @@
32796 */
32797 #include <linux/linkage.h>
32798 #include <asm/dwarf2.h>
32799+#include <asm/alternative-asm.h>
32800
32801 /*
32802 * Calling convention :
32803@@ -35,6 +36,7 @@ sk_load_word_positive_offset:
32804 jle bpf_slow_path_word
32805 mov (SKBDATA,%rsi),%eax
32806 bswap %eax /* ntohl() */
32807+ pax_force_retaddr
32808 ret
32809
32810 sk_load_half:
32811@@ -52,6 +54,7 @@ sk_load_half_positive_offset:
32812 jle bpf_slow_path_half
32813 movzwl (SKBDATA,%rsi),%eax
32814 rol $8,%ax # ntohs()
32815+ pax_force_retaddr
32816 ret
32817
32818 sk_load_byte:
32819@@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
32820 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
32821 jle bpf_slow_path_byte
32822 movzbl (SKBDATA,%rsi),%eax
32823+ pax_force_retaddr
32824 ret
32825
32826 /**
32827@@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
32828 movzbl (SKBDATA,%rsi),%ebx
32829 and $15,%bl
32830 shl $2,%bl
32831+ pax_force_retaddr
32832 ret
32833
32834 /* rsi contains offset and can be scratched */
32835@@ -109,6 +114,7 @@ bpf_slow_path_word:
32836 js bpf_error
32837 mov -12(%rbp),%eax
32838 bswap %eax
32839+ pax_force_retaddr
32840 ret
32841
32842 bpf_slow_path_half:
32843@@ -117,12 +123,14 @@ bpf_slow_path_half:
32844 mov -12(%rbp),%ax
32845 rol $8,%ax
32846 movzwl %ax,%eax
32847+ pax_force_retaddr
32848 ret
32849
32850 bpf_slow_path_byte:
32851 bpf_slow_path_common(1)
32852 js bpf_error
32853 movzbl -12(%rbp),%eax
32854+ pax_force_retaddr
32855 ret
32856
32857 bpf_slow_path_byte_msh:
32858@@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
32859 and $15,%al
32860 shl $2,%al
32861 xchg %eax,%ebx
32862+ pax_force_retaddr
32863 ret
32864
32865 #define sk_negative_common(SIZE) \
32866@@ -157,6 +166,7 @@ sk_load_word_negative_offset:
32867 sk_negative_common(4)
32868 mov (%rax), %eax
32869 bswap %eax
32870+ pax_force_retaddr
32871 ret
32872
32873 bpf_slow_path_half_neg:
32874@@ -168,6 +178,7 @@ sk_load_half_negative_offset:
32875 mov (%rax),%ax
32876 rol $8,%ax
32877 movzwl %ax,%eax
32878+ pax_force_retaddr
32879 ret
32880
32881 bpf_slow_path_byte_neg:
32882@@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
32883 .globl sk_load_byte_negative_offset
32884 sk_negative_common(1)
32885 movzbl (%rax), %eax
32886+ pax_force_retaddr
32887 ret
32888
32889 bpf_slow_path_byte_msh_neg:
32890@@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
32891 and $15,%al
32892 shl $2,%al
32893 xchg %eax,%ebx
32894+ pax_force_retaddr
32895 ret
32896
32897 bpf_error:
32898@@ -197,4 +210,5 @@ bpf_error:
32899 xor %eax,%eax
32900 mov -8(%rbp),%rbx
32901 leaveq
32902+ pax_force_retaddr
32903 ret
32904diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
32905index 26328e8..5f96c25 100644
32906--- a/arch/x86/net/bpf_jit_comp.c
32907+++ b/arch/x86/net/bpf_jit_comp.c
32908@@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
32909 return ptr + len;
32910 }
32911
32912+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
32913+#define MAX_INSTR_CODE_SIZE 96
32914+#else
32915+#define MAX_INSTR_CODE_SIZE 64
32916+#endif
32917+
32918 #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
32919
32920 #define EMIT1(b1) EMIT(b1, 1)
32921 #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
32922 #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
32923 #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
32924+
32925+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
32926+/* original constant will appear in ecx */
32927+#define DILUTE_CONST_SEQUENCE(_off, _key) \
32928+do { \
32929+ /* mov ecx, randkey */ \
32930+ EMIT1(0xb9); \
32931+ EMIT(_key, 4); \
32932+ /* xor ecx, randkey ^ off */ \
32933+ EMIT2(0x81, 0xf1); \
32934+ EMIT((_key) ^ (_off), 4); \
32935+} while (0)
32936+
32937+#define EMIT1_off32(b1, _off) \
32938+do { \
32939+ switch (b1) { \
32940+ case 0x05: /* add eax, imm32 */ \
32941+ case 0x2d: /* sub eax, imm32 */ \
32942+ case 0x25: /* and eax, imm32 */ \
32943+ case 0x0d: /* or eax, imm32 */ \
32944+ case 0xb8: /* mov eax, imm32 */ \
32945+ case 0x35: /* xor eax, imm32 */ \
32946+ case 0x3d: /* cmp eax, imm32 */ \
32947+ case 0xa9: /* test eax, imm32 */ \
32948+ DILUTE_CONST_SEQUENCE(_off, randkey); \
32949+ EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
32950+ break; \
32951+ case 0xbb: /* mov ebx, imm32 */ \
32952+ DILUTE_CONST_SEQUENCE(_off, randkey); \
32953+ /* mov ebx, ecx */ \
32954+ EMIT2(0x89, 0xcb); \
32955+ break; \
32956+ case 0xbe: /* mov esi, imm32 */ \
32957+ DILUTE_CONST_SEQUENCE(_off, randkey); \
32958+ /* mov esi, ecx */ \
32959+ EMIT2(0x89, 0xce); \
32960+ break; \
32961+ case 0xe8: /* call rel imm32, always to known funcs */ \
32962+ EMIT1(b1); \
32963+ EMIT(_off, 4); \
32964+ break; \
32965+ case 0xe9: /* jmp rel imm32 */ \
32966+ EMIT1(b1); \
32967+ EMIT(_off, 4); \
32968+ /* prevent fall-through, we're not called if off = 0 */ \
32969+ EMIT(0xcccccccc, 4); \
32970+ EMIT(0xcccccccc, 4); \
32971+ break; \
32972+ default: \
32973+ BUILD_BUG(); \
32974+ } \
32975+} while (0)
32976+
32977+#define EMIT2_off32(b1, b2, _off) \
32978+do { \
32979+ if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
32980+ EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
32981+ EMIT(randkey, 4); \
32982+ EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
32983+ EMIT((_off) - randkey, 4); \
32984+ } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
32985+ DILUTE_CONST_SEQUENCE(_off, randkey); \
32986+ /* imul eax, ecx */ \
32987+ EMIT3(0x0f, 0xaf, 0xc1); \
32988+ } else { \
32989+ BUILD_BUG(); \
32990+ } \
32991+} while (0)
32992+#else
32993 #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
32994+#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
32995+#endif
32996
32997 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
32998 #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
32999@@ -91,6 +168,24 @@ do { \
33000 #define X86_JBE 0x76
33001 #define X86_JA 0x77
33002
33003+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33004+#define APPEND_FLOW_VERIFY() \
33005+do { \
33006+ /* mov ecx, randkey */ \
33007+ EMIT1(0xb9); \
33008+ EMIT(randkey, 4); \
33009+ /* cmp ecx, randkey */ \
33010+ EMIT2(0x81, 0xf9); \
33011+ EMIT(randkey, 4); \
33012+ /* jz after 8 int 3s */ \
33013+ EMIT2(0x74, 0x08); \
33014+ EMIT(0xcccccccc, 4); \
33015+ EMIT(0xcccccccc, 4); \
33016+} while (0)
33017+#else
33018+#define APPEND_FLOW_VERIFY() do { } while (0)
33019+#endif
33020+
33021 #define EMIT_COND_JMP(op, offset) \
33022 do { \
33023 if (is_near(offset)) \
33024@@ -98,6 +193,7 @@ do { \
33025 else { \
33026 EMIT2(0x0f, op + 0x10); \
33027 EMIT(offset, 4); /* jxx .+off32 */ \
33028+ APPEND_FLOW_VERIFY(); \
33029 } \
33030 } while (0)
33031
33032@@ -145,55 +241,54 @@ static int pkt_type_offset(void)
33033 return -1;
33034 }
33035
33036-struct bpf_binary_header {
33037- unsigned int pages;
33038- /* Note : for security reasons, bpf code will follow a randomly
33039- * sized amount of int3 instructions
33040- */
33041- u8 image[];
33042-};
33043-
33044-static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,
33045+/* Note : for security reasons, bpf code will follow a randomly
33046+ * sized amount of int3 instructions
33047+ */
33048+static u8 *bpf_alloc_binary(unsigned int proglen,
33049 u8 **image_ptr)
33050 {
33051 unsigned int sz, hole;
33052- struct bpf_binary_header *header;
33053+ u8 *header;
33054
33055 /* Most of BPF filters are really small,
33056 * but if some of them fill a page, allow at least
33057 * 128 extra bytes to insert a random section of int3
33058 */
33059- sz = round_up(proglen + sizeof(*header) + 128, PAGE_SIZE);
33060- header = module_alloc(sz);
33061+ sz = round_up(proglen + 128, PAGE_SIZE);
33062+ header = module_alloc_exec(sz);
33063 if (!header)
33064 return NULL;
33065
33066+ pax_open_kernel();
33067 memset(header, 0xcc, sz); /* fill whole space with int3 instructions */
33068+ pax_close_kernel();
33069
33070- header->pages = sz / PAGE_SIZE;
33071- hole = sz - (proglen + sizeof(*header));
33072+ hole = PAGE_SIZE - (proglen & ~PAGE_MASK);
33073
33074 /* insert a random number of int3 instructions before BPF code */
33075- *image_ptr = &header->image[prandom_u32() % hole];
33076+ *image_ptr = &header[prandom_u32() % hole];
33077 return header;
33078 }
33079
33080 void bpf_jit_compile(struct sk_filter *fp)
33081 {
33082- u8 temp[64];
33083+ u8 temp[MAX_INSTR_CODE_SIZE];
33084 u8 *prog;
33085 unsigned int proglen, oldproglen = 0;
33086 int ilen, i;
33087 int t_offset, f_offset;
33088 u8 t_op, f_op, seen = 0, pass;
33089 u8 *image = NULL;
33090- struct bpf_binary_header *header = NULL;
33091+ u8 *header = NULL;
33092 u8 *func;
33093 int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
33094 unsigned int cleanup_addr; /* epilogue code offset */
33095 unsigned int *addrs;
33096 const struct sock_filter *filter = fp->insns;
33097 int flen = fp->len;
33098+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33099+ unsigned int randkey;
33100+#endif
33101
33102 if (!bpf_jit_enable)
33103 return;
33104@@ -202,11 +297,15 @@ void bpf_jit_compile(struct sk_filter *fp)
33105 if (addrs == NULL)
33106 return;
33107
33108+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33109+ randkey = get_random_int();
33110+#endif
33111+
33112 /* Before first pass, make a rough estimation of addrs[]
33113- * each bpf instruction is translated to less than 64 bytes
33114+ * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
33115 */
33116 for (proglen = 0, i = 0; i < flen; i++) {
33117- proglen += 64;
33118+ proglen += MAX_INSTR_CODE_SIZE;
33119 addrs[i] = proglen;
33120 }
33121 cleanup_addr = proglen; /* epilogue address */
33122@@ -317,10 +416,8 @@ void bpf_jit_compile(struct sk_filter *fp)
33123 case BPF_S_ALU_MUL_K: /* A *= K */
33124 if (is_imm8(K))
33125 EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
33126- else {
33127- EMIT2(0x69, 0xc0); /* imul imm32,%eax */
33128- EMIT(K, 4);
33129- }
33130+ else
33131+ EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
33132 break;
33133 case BPF_S_ALU_DIV_X: /* A /= X; */
33134 seen |= SEEN_XREG;
33135@@ -360,13 +457,23 @@ void bpf_jit_compile(struct sk_filter *fp)
33136 break;
33137 case BPF_S_ALU_MOD_K: /* A %= K; */
33138 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
33139+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33140+ DILUTE_CONST_SEQUENCE(K, randkey);
33141+#else
33142 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
33143+#endif
33144 EMIT2(0xf7, 0xf1); /* div %ecx */
33145 EMIT2(0x89, 0xd0); /* mov %edx,%eax */
33146 break;
33147 case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
33148+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33149+ DILUTE_CONST_SEQUENCE(K, randkey);
33150+ // imul rax, rcx
33151+ EMIT4(0x48, 0x0f, 0xaf, 0xc1);
33152+#else
33153 EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
33154 EMIT(K, 4);
33155+#endif
33156 EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */
33157 break;
33158 case BPF_S_ALU_AND_X:
33159@@ -637,8 +744,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
33160 if (is_imm8(K)) {
33161 EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
33162 } else {
33163- EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
33164- EMIT(K, 4);
33165+ EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
33166 }
33167 } else {
33168 EMIT2(0x89,0xde); /* mov %ebx,%esi */
33169@@ -728,10 +834,12 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
33170 if (unlikely(proglen + ilen > oldproglen)) {
33171 pr_err("bpb_jit_compile fatal error\n");
33172 kfree(addrs);
33173- module_free(NULL, header);
33174+ module_free_exec(NULL, image);
33175 return;
33176 }
33177+ pax_open_kernel();
33178 memcpy(image + proglen, temp, ilen);
33179+ pax_close_kernel();
33180 }
33181 proglen += ilen;
33182 addrs[i] = proglen;
33183@@ -764,7 +872,6 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
33184
33185 if (image) {
33186 bpf_flush_icache(header, image + proglen);
33187- set_memory_ro((unsigned long)header, header->pages);
33188 fp->bpf_func = (void *)image;
33189 }
33190 out:
33191@@ -776,10 +883,9 @@ static void bpf_jit_free_deferred(struct work_struct *work)
33192 {
33193 struct sk_filter *fp = container_of(work, struct sk_filter, work);
33194 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
33195- struct bpf_binary_header *header = (void *)addr;
33196
33197- set_memory_rw(addr, header->pages);
33198- module_free(NULL, header);
33199+ set_memory_rw(addr, 1);
33200+ module_free_exec(NULL, (void *)addr);
33201 kfree(fp);
33202 }
33203
33204diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
33205index d6aa6e8..266395a 100644
33206--- a/arch/x86/oprofile/backtrace.c
33207+++ b/arch/x86/oprofile/backtrace.c
33208@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
33209 struct stack_frame_ia32 *fp;
33210 unsigned long bytes;
33211
33212- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
33213+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
33214 if (bytes != sizeof(bufhead))
33215 return NULL;
33216
33217- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
33218+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
33219
33220 oprofile_add_trace(bufhead[0].return_address);
33221
33222@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
33223 struct stack_frame bufhead[2];
33224 unsigned long bytes;
33225
33226- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
33227+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
33228 if (bytes != sizeof(bufhead))
33229 return NULL;
33230
33231@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
33232 {
33233 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
33234
33235- if (!user_mode_vm(regs)) {
33236+ if (!user_mode(regs)) {
33237 unsigned long stack = kernel_stack_pointer(regs);
33238 if (depth)
33239 dump_trace(NULL, regs, (unsigned long *)stack, 0,
33240diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
33241index 6890d84..1dad1f1 100644
33242--- a/arch/x86/oprofile/nmi_int.c
33243+++ b/arch/x86/oprofile/nmi_int.c
33244@@ -23,6 +23,7 @@
33245 #include <asm/nmi.h>
33246 #include <asm/msr.h>
33247 #include <asm/apic.h>
33248+#include <asm/pgtable.h>
33249
33250 #include "op_counter.h"
33251 #include "op_x86_model.h"
33252@@ -774,8 +775,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
33253 if (ret)
33254 return ret;
33255
33256- if (!model->num_virt_counters)
33257- model->num_virt_counters = model->num_counters;
33258+ if (!model->num_virt_counters) {
33259+ pax_open_kernel();
33260+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
33261+ pax_close_kernel();
33262+ }
33263
33264 mux_init(ops);
33265
33266diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
33267index 50d86c0..7985318 100644
33268--- a/arch/x86/oprofile/op_model_amd.c
33269+++ b/arch/x86/oprofile/op_model_amd.c
33270@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
33271 num_counters = AMD64_NUM_COUNTERS;
33272 }
33273
33274- op_amd_spec.num_counters = num_counters;
33275- op_amd_spec.num_controls = num_counters;
33276- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
33277+ pax_open_kernel();
33278+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
33279+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
33280+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
33281+ pax_close_kernel();
33282
33283 return 0;
33284 }
33285diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
33286index d90528e..0127e2b 100644
33287--- a/arch/x86/oprofile/op_model_ppro.c
33288+++ b/arch/x86/oprofile/op_model_ppro.c
33289@@ -19,6 +19,7 @@
33290 #include <asm/msr.h>
33291 #include <asm/apic.h>
33292 #include <asm/nmi.h>
33293+#include <asm/pgtable.h>
33294
33295 #include "op_x86_model.h"
33296 #include "op_counter.h"
33297@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
33298
33299 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
33300
33301- op_arch_perfmon_spec.num_counters = num_counters;
33302- op_arch_perfmon_spec.num_controls = num_counters;
33303+ pax_open_kernel();
33304+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
33305+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
33306+ pax_close_kernel();
33307 }
33308
33309 static int arch_perfmon_init(struct oprofile_operations *ignore)
33310diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
33311index 71e8a67..6a313bb 100644
33312--- a/arch/x86/oprofile/op_x86_model.h
33313+++ b/arch/x86/oprofile/op_x86_model.h
33314@@ -52,7 +52,7 @@ struct op_x86_model_spec {
33315 void (*switch_ctrl)(struct op_x86_model_spec const *model,
33316 struct op_msrs const * const msrs);
33317 #endif
33318-};
33319+} __do_const;
33320
33321 struct op_counter_config;
33322
33323diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
33324index 372e9b8..e775a6c 100644
33325--- a/arch/x86/pci/irq.c
33326+++ b/arch/x86/pci/irq.c
33327@@ -50,7 +50,7 @@ struct irq_router {
33328 struct irq_router_handler {
33329 u16 vendor;
33330 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
33331-};
33332+} __do_const;
33333
33334 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
33335 void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
33336@@ -794,7 +794,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
33337 return 0;
33338 }
33339
33340-static __initdata struct irq_router_handler pirq_routers[] = {
33341+static __initconst const struct irq_router_handler pirq_routers[] = {
33342 { PCI_VENDOR_ID_INTEL, intel_router_probe },
33343 { PCI_VENDOR_ID_AL, ali_router_probe },
33344 { PCI_VENDOR_ID_ITE, ite_router_probe },
33345@@ -821,7 +821,7 @@ static struct pci_dev *pirq_router_dev;
33346 static void __init pirq_find_router(struct irq_router *r)
33347 {
33348 struct irq_routing_table *rt = pirq_table;
33349- struct irq_router_handler *h;
33350+ const struct irq_router_handler *h;
33351
33352 #ifdef CONFIG_PCI_BIOS
33353 if (!rt->signature) {
33354@@ -1094,7 +1094,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
33355 return 0;
33356 }
33357
33358-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
33359+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
33360 {
33361 .callback = fix_broken_hp_bios_irq9,
33362 .ident = "HP Pavilion N5400 Series Laptop",
33363diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
33364index 903fded..94b0d88 100644
33365--- a/arch/x86/pci/mrst.c
33366+++ b/arch/x86/pci/mrst.c
33367@@ -241,7 +241,9 @@ int __init pci_mrst_init(void)
33368 pr_info("Intel MID platform detected, using MID PCI ops\n");
33369 pci_mmcfg_late_init();
33370 pcibios_enable_irq = mrst_pci_irq_enable;
33371- pci_root_ops = pci_mrst_ops;
33372+ pax_open_kernel();
33373+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
33374+ pax_close_kernel();
33375 pci_soc_mode = 1;
33376 /* Continue with standard init */
33377 return 1;
33378diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
33379index c77b24a..c979855 100644
33380--- a/arch/x86/pci/pcbios.c
33381+++ b/arch/x86/pci/pcbios.c
33382@@ -79,7 +79,7 @@ union bios32 {
33383 static struct {
33384 unsigned long address;
33385 unsigned short segment;
33386-} bios32_indirect = { 0, __KERNEL_CS };
33387+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
33388
33389 /*
33390 * Returns the entry point for the given service, NULL on error
33391@@ -92,37 +92,80 @@ static unsigned long bios32_service(unsigned long service)
33392 unsigned long length; /* %ecx */
33393 unsigned long entry; /* %edx */
33394 unsigned long flags;
33395+ struct desc_struct d, *gdt;
33396
33397 local_irq_save(flags);
33398- __asm__("lcall *(%%edi); cld"
33399+
33400+ gdt = get_cpu_gdt_table(smp_processor_id());
33401+
33402+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
33403+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
33404+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
33405+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
33406+
33407+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
33408 : "=a" (return_code),
33409 "=b" (address),
33410 "=c" (length),
33411 "=d" (entry)
33412 : "0" (service),
33413 "1" (0),
33414- "D" (&bios32_indirect));
33415+ "D" (&bios32_indirect),
33416+ "r"(__PCIBIOS_DS)
33417+ : "memory");
33418+
33419+ pax_open_kernel();
33420+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
33421+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
33422+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
33423+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
33424+ pax_close_kernel();
33425+
33426 local_irq_restore(flags);
33427
33428 switch (return_code) {
33429- case 0:
33430- return address + entry;
33431- case 0x80: /* Not present */
33432- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
33433- return 0;
33434- default: /* Shouldn't happen */
33435- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
33436- service, return_code);
33437+ case 0: {
33438+ int cpu;
33439+ unsigned char flags;
33440+
33441+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
33442+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
33443+ printk(KERN_WARNING "bios32_service: not valid\n");
33444 return 0;
33445+ }
33446+ address = address + PAGE_OFFSET;
33447+ length += 16UL; /* some BIOSs underreport this... */
33448+ flags = 4;
33449+ if (length >= 64*1024*1024) {
33450+ length >>= PAGE_SHIFT;
33451+ flags |= 8;
33452+ }
33453+
33454+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
33455+ gdt = get_cpu_gdt_table(cpu);
33456+ pack_descriptor(&d, address, length, 0x9b, flags);
33457+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
33458+ pack_descriptor(&d, address, length, 0x93, flags);
33459+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
33460+ }
33461+ return entry;
33462+ }
33463+ case 0x80: /* Not present */
33464+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
33465+ return 0;
33466+ default: /* Shouldn't happen */
33467+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
33468+ service, return_code);
33469+ return 0;
33470 }
33471 }
33472
33473 static struct {
33474 unsigned long address;
33475 unsigned short segment;
33476-} pci_indirect = { 0, __KERNEL_CS };
33477+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
33478
33479-static int pci_bios_present;
33480+static int pci_bios_present __read_only;
33481
33482 static int check_pcibios(void)
33483 {
33484@@ -131,11 +174,13 @@ static int check_pcibios(void)
33485 unsigned long flags, pcibios_entry;
33486
33487 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
33488- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
33489+ pci_indirect.address = pcibios_entry;
33490
33491 local_irq_save(flags);
33492- __asm__(
33493- "lcall *(%%edi); cld\n\t"
33494+ __asm__("movw %w6, %%ds\n\t"
33495+ "lcall *%%ss:(%%edi); cld\n\t"
33496+ "push %%ss\n\t"
33497+ "pop %%ds\n\t"
33498 "jc 1f\n\t"
33499 "xor %%ah, %%ah\n"
33500 "1:"
33501@@ -144,7 +189,8 @@ static int check_pcibios(void)
33502 "=b" (ebx),
33503 "=c" (ecx)
33504 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
33505- "D" (&pci_indirect)
33506+ "D" (&pci_indirect),
33507+ "r" (__PCIBIOS_DS)
33508 : "memory");
33509 local_irq_restore(flags);
33510
33511@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33512
33513 switch (len) {
33514 case 1:
33515- __asm__("lcall *(%%esi); cld\n\t"
33516+ __asm__("movw %w6, %%ds\n\t"
33517+ "lcall *%%ss:(%%esi); cld\n\t"
33518+ "push %%ss\n\t"
33519+ "pop %%ds\n\t"
33520 "jc 1f\n\t"
33521 "xor %%ah, %%ah\n"
33522 "1:"
33523@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33524 : "1" (PCIBIOS_READ_CONFIG_BYTE),
33525 "b" (bx),
33526 "D" ((long)reg),
33527- "S" (&pci_indirect));
33528+ "S" (&pci_indirect),
33529+ "r" (__PCIBIOS_DS));
33530 /*
33531 * Zero-extend the result beyond 8 bits, do not trust the
33532 * BIOS having done it:
33533@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33534 *value &= 0xff;
33535 break;
33536 case 2:
33537- __asm__("lcall *(%%esi); cld\n\t"
33538+ __asm__("movw %w6, %%ds\n\t"
33539+ "lcall *%%ss:(%%esi); cld\n\t"
33540+ "push %%ss\n\t"
33541+ "pop %%ds\n\t"
33542 "jc 1f\n\t"
33543 "xor %%ah, %%ah\n"
33544 "1:"
33545@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33546 : "1" (PCIBIOS_READ_CONFIG_WORD),
33547 "b" (bx),
33548 "D" ((long)reg),
33549- "S" (&pci_indirect));
33550+ "S" (&pci_indirect),
33551+ "r" (__PCIBIOS_DS));
33552 /*
33553 * Zero-extend the result beyond 16 bits, do not trust the
33554 * BIOS having done it:
33555@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33556 *value &= 0xffff;
33557 break;
33558 case 4:
33559- __asm__("lcall *(%%esi); cld\n\t"
33560+ __asm__("movw %w6, %%ds\n\t"
33561+ "lcall *%%ss:(%%esi); cld\n\t"
33562+ "push %%ss\n\t"
33563+ "pop %%ds\n\t"
33564 "jc 1f\n\t"
33565 "xor %%ah, %%ah\n"
33566 "1:"
33567@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
33568 : "1" (PCIBIOS_READ_CONFIG_DWORD),
33569 "b" (bx),
33570 "D" ((long)reg),
33571- "S" (&pci_indirect));
33572+ "S" (&pci_indirect),
33573+ "r" (__PCIBIOS_DS));
33574 break;
33575 }
33576
33577@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
33578
33579 switch (len) {
33580 case 1:
33581- __asm__("lcall *(%%esi); cld\n\t"
33582+ __asm__("movw %w6, %%ds\n\t"
33583+ "lcall *%%ss:(%%esi); cld\n\t"
33584+ "push %%ss\n\t"
33585+ "pop %%ds\n\t"
33586 "jc 1f\n\t"
33587 "xor %%ah, %%ah\n"
33588 "1:"
33589@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
33590 "c" (value),
33591 "b" (bx),
33592 "D" ((long)reg),
33593- "S" (&pci_indirect));
33594+ "S" (&pci_indirect),
33595+ "r" (__PCIBIOS_DS));
33596 break;
33597 case 2:
33598- __asm__("lcall *(%%esi); cld\n\t"
33599+ __asm__("movw %w6, %%ds\n\t"
33600+ "lcall *%%ss:(%%esi); cld\n\t"
33601+ "push %%ss\n\t"
33602+ "pop %%ds\n\t"
33603 "jc 1f\n\t"
33604 "xor %%ah, %%ah\n"
33605 "1:"
33606@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
33607 "c" (value),
33608 "b" (bx),
33609 "D" ((long)reg),
33610- "S" (&pci_indirect));
33611+ "S" (&pci_indirect),
33612+ "r" (__PCIBIOS_DS));
33613 break;
33614 case 4:
33615- __asm__("lcall *(%%esi); cld\n\t"
33616+ __asm__("movw %w6, %%ds\n\t"
33617+ "lcall *%%ss:(%%esi); cld\n\t"
33618+ "push %%ss\n\t"
33619+ "pop %%ds\n\t"
33620 "jc 1f\n\t"
33621 "xor %%ah, %%ah\n"
33622 "1:"
33623@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
33624 "c" (value),
33625 "b" (bx),
33626 "D" ((long)reg),
33627- "S" (&pci_indirect));
33628+ "S" (&pci_indirect),
33629+ "r" (__PCIBIOS_DS));
33630 break;
33631 }
33632
33633@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
33634
33635 DBG("PCI: Fetching IRQ routing table... ");
33636 __asm__("push %%es\n\t"
33637+ "movw %w8, %%ds\n\t"
33638 "push %%ds\n\t"
33639 "pop %%es\n\t"
33640- "lcall *(%%esi); cld\n\t"
33641+ "lcall *%%ss:(%%esi); cld\n\t"
33642 "pop %%es\n\t"
33643+ "push %%ss\n\t"
33644+ "pop %%ds\n"
33645 "jc 1f\n\t"
33646 "xor %%ah, %%ah\n"
33647 "1:"
33648@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
33649 "1" (0),
33650 "D" ((long) &opt),
33651 "S" (&pci_indirect),
33652- "m" (opt)
33653+ "m" (opt),
33654+ "r" (__PCIBIOS_DS)
33655 : "memory");
33656 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
33657 if (ret & 0xff00)
33658@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
33659 {
33660 int ret;
33661
33662- __asm__("lcall *(%%esi); cld\n\t"
33663+ __asm__("movw %w5, %%ds\n\t"
33664+ "lcall *%%ss:(%%esi); cld\n\t"
33665+ "push %%ss\n\t"
33666+ "pop %%ds\n"
33667 "jc 1f\n\t"
33668 "xor %%ah, %%ah\n"
33669 "1:"
33670@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
33671 : "0" (PCIBIOS_SET_PCI_HW_INT),
33672 "b" ((dev->bus->number << 8) | dev->devfn),
33673 "c" ((irq << 8) | (pin + 10)),
33674- "S" (&pci_indirect));
33675+ "S" (&pci_indirect),
33676+ "r" (__PCIBIOS_DS));
33677 return !(ret & 0xff00);
33678 }
33679 EXPORT_SYMBOL(pcibios_set_irq_routing);
33680diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
33681index 40e4469..d915bf9 100644
33682--- a/arch/x86/platform/efi/efi_32.c
33683+++ b/arch/x86/platform/efi/efi_32.c
33684@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
33685 {
33686 struct desc_ptr gdt_descr;
33687
33688+#ifdef CONFIG_PAX_KERNEXEC
33689+ struct desc_struct d;
33690+#endif
33691+
33692 local_irq_save(efi_rt_eflags);
33693
33694 load_cr3(initial_page_table);
33695 __flush_tlb_all();
33696
33697+#ifdef CONFIG_PAX_KERNEXEC
33698+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
33699+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
33700+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
33701+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
33702+#endif
33703+
33704 gdt_descr.address = __pa(get_cpu_gdt_table(0));
33705 gdt_descr.size = GDT_SIZE - 1;
33706 load_gdt(&gdt_descr);
33707@@ -58,11 +69,24 @@ void efi_call_phys_epilog(void)
33708 {
33709 struct desc_ptr gdt_descr;
33710
33711+#ifdef CONFIG_PAX_KERNEXEC
33712+ struct desc_struct d;
33713+
33714+ memset(&d, 0, sizeof d);
33715+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
33716+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
33717+#endif
33718+
33719 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
33720 gdt_descr.size = GDT_SIZE - 1;
33721 load_gdt(&gdt_descr);
33722
33723+#ifdef CONFIG_PAX_PER_CPU_PGD
33724+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
33725+#else
33726 load_cr3(swapper_pg_dir);
33727+#endif
33728+
33729 __flush_tlb_all();
33730
33731 local_irq_restore(efi_rt_eflags);
33732diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
33733index 39a0e7f1..872396e 100644
33734--- a/arch/x86/platform/efi/efi_64.c
33735+++ b/arch/x86/platform/efi/efi_64.c
33736@@ -76,6 +76,11 @@ void __init efi_call_phys_prelog(void)
33737 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
33738 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
33739 }
33740+
33741+#ifdef CONFIG_PAX_PER_CPU_PGD
33742+ load_cr3(swapper_pg_dir);
33743+#endif
33744+
33745 __flush_tlb_all();
33746 }
33747
33748@@ -89,6 +94,11 @@ void __init efi_call_phys_epilog(void)
33749 for (pgd = 0; pgd < n_pgds; pgd++)
33750 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
33751 kfree(save_pgd);
33752+
33753+#ifdef CONFIG_PAX_PER_CPU_PGD
33754+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
33755+#endif
33756+
33757 __flush_tlb_all();
33758 local_irq_restore(efi_flags);
33759 early_code_mapping_set_exec(0);
33760diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
33761index fbe66e6..eae5e38 100644
33762--- a/arch/x86/platform/efi/efi_stub_32.S
33763+++ b/arch/x86/platform/efi/efi_stub_32.S
33764@@ -6,7 +6,9 @@
33765 */
33766
33767 #include <linux/linkage.h>
33768+#include <linux/init.h>
33769 #include <asm/page_types.h>
33770+#include <asm/segment.h>
33771
33772 /*
33773 * efi_call_phys(void *, ...) is a function with variable parameters.
33774@@ -20,7 +22,7 @@
33775 * service functions will comply with gcc calling convention, too.
33776 */
33777
33778-.text
33779+__INIT
33780 ENTRY(efi_call_phys)
33781 /*
33782 * 0. The function can only be called in Linux kernel. So CS has been
33783@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
33784 * The mapping of lower virtual memory has been created in prelog and
33785 * epilog.
33786 */
33787- movl $1f, %edx
33788- subl $__PAGE_OFFSET, %edx
33789- jmp *%edx
33790+#ifdef CONFIG_PAX_KERNEXEC
33791+ movl $(__KERNEXEC_EFI_DS), %edx
33792+ mov %edx, %ds
33793+ mov %edx, %es
33794+ mov %edx, %ss
33795+ addl $2f,(1f)
33796+ ljmp *(1f)
33797+
33798+__INITDATA
33799+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
33800+.previous
33801+
33802+2:
33803+ subl $2b,(1b)
33804+#else
33805+ jmp 1f-__PAGE_OFFSET
33806 1:
33807+#endif
33808
33809 /*
33810 * 2. Now on the top of stack is the return
33811@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
33812 * parameter 2, ..., param n. To make things easy, we save the return
33813 * address of efi_call_phys in a global variable.
33814 */
33815- popl %edx
33816- movl %edx, saved_return_addr
33817- /* get the function pointer into ECX*/
33818- popl %ecx
33819- movl %ecx, efi_rt_function_ptr
33820- movl $2f, %edx
33821- subl $__PAGE_OFFSET, %edx
33822- pushl %edx
33823+ popl (saved_return_addr)
33824+ popl (efi_rt_function_ptr)
33825
33826 /*
33827 * 3. Clear PG bit in %CR0.
33828@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
33829 /*
33830 * 5. Call the physical function.
33831 */
33832- jmp *%ecx
33833+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
33834
33835-2:
33836 /*
33837 * 6. After EFI runtime service returns, control will return to
33838 * following instruction. We'd better readjust stack pointer first.
33839@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
33840 movl %cr0, %edx
33841 orl $0x80000000, %edx
33842 movl %edx, %cr0
33843- jmp 1f
33844-1:
33845+
33846 /*
33847 * 8. Now restore the virtual mode from flat mode by
33848 * adding EIP with PAGE_OFFSET.
33849 */
33850- movl $1f, %edx
33851- jmp *%edx
33852+#ifdef CONFIG_PAX_KERNEXEC
33853+ movl $(__KERNEL_DS), %edx
33854+ mov %edx, %ds
33855+ mov %edx, %es
33856+ mov %edx, %ss
33857+ ljmp $(__KERNEL_CS),$1f
33858+#else
33859+ jmp 1f+__PAGE_OFFSET
33860+#endif
33861 1:
33862
33863 /*
33864 * 9. Balance the stack. And because EAX contain the return value,
33865 * we'd better not clobber it.
33866 */
33867- leal efi_rt_function_ptr, %edx
33868- movl (%edx), %ecx
33869- pushl %ecx
33870+ pushl (efi_rt_function_ptr)
33871
33872 /*
33873- * 10. Push the saved return address onto the stack and return.
33874+ * 10. Return to the saved return address.
33875 */
33876- leal saved_return_addr, %edx
33877- movl (%edx), %ecx
33878- pushl %ecx
33879- ret
33880+ jmpl *(saved_return_addr)
33881 ENDPROC(efi_call_phys)
33882 .previous
33883
33884-.data
33885+__INITDATA
33886 saved_return_addr:
33887 .long 0
33888 efi_rt_function_ptr:
33889diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
33890index 4c07cca..2c8427d 100644
33891--- a/arch/x86/platform/efi/efi_stub_64.S
33892+++ b/arch/x86/platform/efi/efi_stub_64.S
33893@@ -7,6 +7,7 @@
33894 */
33895
33896 #include <linux/linkage.h>
33897+#include <asm/alternative-asm.h>
33898
33899 #define SAVE_XMM \
33900 mov %rsp, %rax; \
33901@@ -40,6 +41,7 @@ ENTRY(efi_call0)
33902 call *%rdi
33903 addq $32, %rsp
33904 RESTORE_XMM
33905+ pax_force_retaddr 0, 1
33906 ret
33907 ENDPROC(efi_call0)
33908
33909@@ -50,6 +52,7 @@ ENTRY(efi_call1)
33910 call *%rdi
33911 addq $32, %rsp
33912 RESTORE_XMM
33913+ pax_force_retaddr 0, 1
33914 ret
33915 ENDPROC(efi_call1)
33916
33917@@ -60,6 +63,7 @@ ENTRY(efi_call2)
33918 call *%rdi
33919 addq $32, %rsp
33920 RESTORE_XMM
33921+ pax_force_retaddr 0, 1
33922 ret
33923 ENDPROC(efi_call2)
33924
33925@@ -71,6 +75,7 @@ ENTRY(efi_call3)
33926 call *%rdi
33927 addq $32, %rsp
33928 RESTORE_XMM
33929+ pax_force_retaddr 0, 1
33930 ret
33931 ENDPROC(efi_call3)
33932
33933@@ -83,6 +88,7 @@ ENTRY(efi_call4)
33934 call *%rdi
33935 addq $32, %rsp
33936 RESTORE_XMM
33937+ pax_force_retaddr 0, 1
33938 ret
33939 ENDPROC(efi_call4)
33940
33941@@ -96,6 +102,7 @@ ENTRY(efi_call5)
33942 call *%rdi
33943 addq $48, %rsp
33944 RESTORE_XMM
33945+ pax_force_retaddr 0, 1
33946 ret
33947 ENDPROC(efi_call5)
33948
33949@@ -112,5 +119,6 @@ ENTRY(efi_call6)
33950 call *%rdi
33951 addq $48, %rsp
33952 RESTORE_XMM
33953+ pax_force_retaddr 0, 1
33954 ret
33955 ENDPROC(efi_call6)
33956diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
33957index 3ca5957..7909c18 100644
33958--- a/arch/x86/platform/mrst/mrst.c
33959+++ b/arch/x86/platform/mrst/mrst.c
33960@@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
33961 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
33962 int sfi_mrtc_num;
33963
33964-static void mrst_power_off(void)
33965+static __noreturn void mrst_power_off(void)
33966 {
33967+ BUG();
33968 }
33969
33970-static void mrst_reboot(void)
33971+static __noreturn void mrst_reboot(void)
33972 {
33973 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
33974+ BUG();
33975 }
33976
33977 /* parse all the mtimer info to a static mtimer array */
33978diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
33979index d6ee929..3637cb5 100644
33980--- a/arch/x86/platform/olpc/olpc_dt.c
33981+++ b/arch/x86/platform/olpc/olpc_dt.c
33982@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
33983 return res;
33984 }
33985
33986-static struct of_pdt_ops prom_olpc_ops __initdata = {
33987+static struct of_pdt_ops prom_olpc_ops __initconst = {
33988 .nextprop = olpc_dt_nextprop,
33989 .getproplen = olpc_dt_getproplen,
33990 .getproperty = olpc_dt_getproperty,
33991diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
33992index 424f4c9..f2a2988 100644
33993--- a/arch/x86/power/cpu.c
33994+++ b/arch/x86/power/cpu.c
33995@@ -137,11 +137,8 @@ static void do_fpu_end(void)
33996 static void fix_processor_context(void)
33997 {
33998 int cpu = smp_processor_id();
33999- struct tss_struct *t = &per_cpu(init_tss, cpu);
34000-#ifdef CONFIG_X86_64
34001- struct desc_struct *desc = get_cpu_gdt_table(cpu);
34002- tss_desc tss;
34003-#endif
34004+ struct tss_struct *t = init_tss + cpu;
34005+
34006 set_tss_desc(cpu, t); /*
34007 * This just modifies memory; should not be
34008 * necessary. But... This is necessary, because
34009@@ -150,10 +147,6 @@ static void fix_processor_context(void)
34010 */
34011
34012 #ifdef CONFIG_X86_64
34013- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
34014- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
34015- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
34016-
34017 syscall_init(); /* This sets MSR_*STAR and related */
34018 #endif
34019 load_TR_desc(); /* This does ltr */
34020diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
34021index a44f457..9140171 100644
34022--- a/arch/x86/realmode/init.c
34023+++ b/arch/x86/realmode/init.c
34024@@ -70,7 +70,13 @@ void __init setup_real_mode(void)
34025 __va(real_mode_header->trampoline_header);
34026
34027 #ifdef CONFIG_X86_32
34028- trampoline_header->start = __pa_symbol(startup_32_smp);
34029+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
34030+
34031+#ifdef CONFIG_PAX_KERNEXEC
34032+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
34033+#endif
34034+
34035+ trampoline_header->boot_cs = __BOOT_CS;
34036 trampoline_header->gdt_limit = __BOOT_DS + 7;
34037 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
34038 #else
34039@@ -86,7 +92,7 @@ void __init setup_real_mode(void)
34040 *trampoline_cr4_features = read_cr4();
34041
34042 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
34043- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
34044+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
34045 trampoline_pgd[511] = init_level4_pgt[511].pgd;
34046 #endif
34047 }
34048diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
34049index 9cac825..4890b25 100644
34050--- a/arch/x86/realmode/rm/Makefile
34051+++ b/arch/x86/realmode/rm/Makefile
34052@@ -79,5 +79,8 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
34053 $(call cc-option, -fno-unit-at-a-time)) \
34054 $(call cc-option, -fno-stack-protector) \
34055 $(call cc-option, -mpreferred-stack-boundary=2)
34056+ifdef CONSTIFY_PLUGIN
34057+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
34058+endif
34059 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
34060 GCOV_PROFILE := n
34061diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
34062index a28221d..93c40f1 100644
34063--- a/arch/x86/realmode/rm/header.S
34064+++ b/arch/x86/realmode/rm/header.S
34065@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
34066 #endif
34067 /* APM/BIOS reboot */
34068 .long pa_machine_real_restart_asm
34069-#ifdef CONFIG_X86_64
34070+#ifdef CONFIG_X86_32
34071+ .long __KERNEL_CS
34072+#else
34073 .long __KERNEL32_CS
34074 #endif
34075 END(real_mode_header)
34076diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
34077index c1b2791..f9e31c7 100644
34078--- a/arch/x86/realmode/rm/trampoline_32.S
34079+++ b/arch/x86/realmode/rm/trampoline_32.S
34080@@ -25,6 +25,12 @@
34081 #include <asm/page_types.h>
34082 #include "realmode.h"
34083
34084+#ifdef CONFIG_PAX_KERNEXEC
34085+#define ta(X) (X)
34086+#else
34087+#define ta(X) (pa_ ## X)
34088+#endif
34089+
34090 .text
34091 .code16
34092
34093@@ -39,8 +45,6 @@ ENTRY(trampoline_start)
34094
34095 cli # We should be safe anyway
34096
34097- movl tr_start, %eax # where we need to go
34098-
34099 movl $0xA5A5A5A5, trampoline_status
34100 # write marker for master knows we're running
34101
34102@@ -56,7 +60,7 @@ ENTRY(trampoline_start)
34103 movw $1, %dx # protected mode (PE) bit
34104 lmsw %dx # into protected mode
34105
34106- ljmpl $__BOOT_CS, $pa_startup_32
34107+ ljmpl *(trampoline_header)
34108
34109 .section ".text32","ax"
34110 .code32
34111@@ -67,7 +71,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
34112 .balign 8
34113 GLOBAL(trampoline_header)
34114 tr_start: .space 4
34115- tr_gdt_pad: .space 2
34116+ tr_boot_cs: .space 2
34117 tr_gdt: .space 6
34118 END(trampoline_header)
34119
34120diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
34121index bb360dc..d0fd8f8 100644
34122--- a/arch/x86/realmode/rm/trampoline_64.S
34123+++ b/arch/x86/realmode/rm/trampoline_64.S
34124@@ -94,6 +94,7 @@ ENTRY(startup_32)
34125 movl %edx, %gs
34126
34127 movl pa_tr_cr4, %eax
34128+ andl $~X86_CR4_PCIDE, %eax
34129 movl %eax, %cr4 # Enable PAE mode
34130
34131 # Setup trampoline 4 level pagetables
34132@@ -107,7 +108,7 @@ ENTRY(startup_32)
34133 wrmsr
34134
34135 # Enable paging and in turn activate Long Mode
34136- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
34137+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
34138 movl %eax, %cr0
34139
34140 /*
34141diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
34142index e812034..c747134 100644
34143--- a/arch/x86/tools/Makefile
34144+++ b/arch/x86/tools/Makefile
34145@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
34146
34147 $(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
34148
34149-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
34150+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
34151 hostprogs-y += relocs
34152 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
34153 relocs: $(obj)/relocs
34154diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
34155index f7bab68..b6d9886 100644
34156--- a/arch/x86/tools/relocs.c
34157+++ b/arch/x86/tools/relocs.c
34158@@ -1,5 +1,7 @@
34159 /* This is included from relocs_32/64.c */
34160
34161+#include "../../../include/generated/autoconf.h"
34162+
34163 #define ElfW(type) _ElfW(ELF_BITS, type)
34164 #define _ElfW(bits, type) __ElfW(bits, type)
34165 #define __ElfW(bits, type) Elf##bits##_##type
34166@@ -11,6 +13,7 @@
34167 #define Elf_Sym ElfW(Sym)
34168
34169 static Elf_Ehdr ehdr;
34170+static Elf_Phdr *phdr;
34171
34172 struct relocs {
34173 uint32_t *offset;
34174@@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
34175 }
34176 }
34177
34178+static void read_phdrs(FILE *fp)
34179+{
34180+ unsigned int i;
34181+
34182+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
34183+ if (!phdr) {
34184+ die("Unable to allocate %d program headers\n",
34185+ ehdr.e_phnum);
34186+ }
34187+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
34188+ die("Seek to %d failed: %s\n",
34189+ ehdr.e_phoff, strerror(errno));
34190+ }
34191+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
34192+ die("Cannot read ELF program headers: %s\n",
34193+ strerror(errno));
34194+ }
34195+ for(i = 0; i < ehdr.e_phnum; i++) {
34196+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
34197+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
34198+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
34199+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
34200+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
34201+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
34202+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
34203+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
34204+ }
34205+
34206+}
34207+
34208 static void read_shdrs(FILE *fp)
34209 {
34210- int i;
34211+ unsigned int i;
34212 Elf_Shdr shdr;
34213
34214 secs = calloc(ehdr.e_shnum, sizeof(struct section));
34215@@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
34216
34217 static void read_strtabs(FILE *fp)
34218 {
34219- int i;
34220+ unsigned int i;
34221 for (i = 0; i < ehdr.e_shnum; i++) {
34222 struct section *sec = &secs[i];
34223 if (sec->shdr.sh_type != SHT_STRTAB) {
34224@@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
34225
34226 static void read_symtabs(FILE *fp)
34227 {
34228- int i,j;
34229+ unsigned int i,j;
34230 for (i = 0; i < ehdr.e_shnum; i++) {
34231 struct section *sec = &secs[i];
34232 if (sec->shdr.sh_type != SHT_SYMTAB) {
34233@@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
34234 }
34235
34236
34237-static void read_relocs(FILE *fp)
34238+static void read_relocs(FILE *fp, int use_real_mode)
34239 {
34240- int i,j;
34241+ unsigned int i,j;
34242+ uint32_t base;
34243+
34244 for (i = 0; i < ehdr.e_shnum; i++) {
34245 struct section *sec = &secs[i];
34246 if (sec->shdr.sh_type != SHT_REL_TYPE) {
34247@@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
34248 die("Cannot read symbol table: %s\n",
34249 strerror(errno));
34250 }
34251+ base = 0;
34252+
34253+#ifdef CONFIG_X86_32
34254+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
34255+ if (phdr[j].p_type != PT_LOAD )
34256+ continue;
34257+ 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)
34258+ continue;
34259+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
34260+ break;
34261+ }
34262+#endif
34263+
34264 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
34265 Elf_Rel *rel = &sec->reltab[j];
34266- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
34267+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
34268 rel->r_info = elf_xword_to_cpu(rel->r_info);
34269 #if (SHT_REL_TYPE == SHT_RELA)
34270 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
34271@@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
34272
34273 static void print_absolute_symbols(void)
34274 {
34275- int i;
34276+ unsigned int i;
34277 const char *format;
34278
34279 if (ELF_BITS == 64)
34280@@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
34281 for (i = 0; i < ehdr.e_shnum; i++) {
34282 struct section *sec = &secs[i];
34283 char *sym_strtab;
34284- int j;
34285+ unsigned int j;
34286
34287 if (sec->shdr.sh_type != SHT_SYMTAB) {
34288 continue;
34289@@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
34290
34291 static void print_absolute_relocs(void)
34292 {
34293- int i, printed = 0;
34294+ unsigned int i, printed = 0;
34295 const char *format;
34296
34297 if (ELF_BITS == 64)
34298@@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
34299 struct section *sec_applies, *sec_symtab;
34300 char *sym_strtab;
34301 Elf_Sym *sh_symtab;
34302- int j;
34303+ unsigned int j;
34304 if (sec->shdr.sh_type != SHT_REL_TYPE) {
34305 continue;
34306 }
34307@@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
34308 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
34309 Elf_Sym *sym, const char *symname))
34310 {
34311- int i;
34312+ unsigned int i;
34313 /* Walk through the relocations */
34314 for (i = 0; i < ehdr.e_shnum; i++) {
34315 char *sym_strtab;
34316 Elf_Sym *sh_symtab;
34317 struct section *sec_applies, *sec_symtab;
34318- int j;
34319+ unsigned int j;
34320 struct section *sec = &secs[i];
34321
34322 if (sec->shdr.sh_type != SHT_REL_TYPE) {
34323@@ -812,6 +860,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
34324 {
34325 unsigned r_type = ELF32_R_TYPE(rel->r_info);
34326 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
34327+ char *sym_strtab = sec->link->link->strtab;
34328+
34329+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
34330+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
34331+ return 0;
34332+
34333+#ifdef CONFIG_PAX_KERNEXEC
34334+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
34335+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
34336+ return 0;
34337+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
34338+ return 0;
34339+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
34340+ return 0;
34341+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
34342+ return 0;
34343+#endif
34344
34345 switch (r_type) {
34346 case R_386_NONE:
34347@@ -950,7 +1015,7 @@ static int write32_as_text(uint32_t v, FILE *f)
34348
34349 static void emit_relocs(int as_text, int use_real_mode)
34350 {
34351- int i;
34352+ unsigned int i;
34353 int (*write_reloc)(uint32_t, FILE *) = write32;
34354 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
34355 const char *symname);
34356@@ -1026,10 +1091,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
34357 {
34358 regex_init(use_real_mode);
34359 read_ehdr(fp);
34360+ read_phdrs(fp);
34361 read_shdrs(fp);
34362 read_strtabs(fp);
34363 read_symtabs(fp);
34364- read_relocs(fp);
34365+ read_relocs(fp, use_real_mode);
34366 if (ELF_BITS == 64)
34367 percpu_init();
34368 if (show_absolute_syms) {
34369diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
34370index 80ffa5b..a33bd15 100644
34371--- a/arch/x86/um/tls_32.c
34372+++ b/arch/x86/um/tls_32.c
34373@@ -260,7 +260,7 @@ out:
34374 if (unlikely(task == current &&
34375 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
34376 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
34377- "without flushed TLS.", current->pid);
34378+ "without flushed TLS.", task_pid_nr(current));
34379 }
34380
34381 return 0;
34382diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
34383index fd14be1..e3c79c0 100644
34384--- a/arch/x86/vdso/Makefile
34385+++ b/arch/x86/vdso/Makefile
34386@@ -181,7 +181,7 @@ quiet_cmd_vdso = VDSO $@
34387 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
34388 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
34389
34390-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
34391+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
34392 GCOV_PROFILE := n
34393
34394 #
34395diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
34396index d6bfb87..876ee18 100644
34397--- a/arch/x86/vdso/vdso32-setup.c
34398+++ b/arch/x86/vdso/vdso32-setup.c
34399@@ -25,6 +25,7 @@
34400 #include <asm/tlbflush.h>
34401 #include <asm/vdso.h>
34402 #include <asm/proto.h>
34403+#include <asm/mman.h>
34404
34405 enum {
34406 VDSO_DISABLED = 0,
34407@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
34408 void enable_sep_cpu(void)
34409 {
34410 int cpu = get_cpu();
34411- struct tss_struct *tss = &per_cpu(init_tss, cpu);
34412+ struct tss_struct *tss = init_tss + cpu;
34413
34414 if (!boot_cpu_has(X86_FEATURE_SEP)) {
34415 put_cpu();
34416@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
34417 gate_vma.vm_start = FIXADDR_USER_START;
34418 gate_vma.vm_end = FIXADDR_USER_END;
34419 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
34420- gate_vma.vm_page_prot = __P101;
34421+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
34422
34423 return 0;
34424 }
34425@@ -330,14 +331,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
34426 if (compat)
34427 addr = VDSO_HIGH_BASE;
34428 else {
34429- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
34430+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
34431 if (IS_ERR_VALUE(addr)) {
34432 ret = addr;
34433 goto up_fail;
34434 }
34435 }
34436
34437- current->mm->context.vdso = (void *)addr;
34438+ current->mm->context.vdso = addr;
34439
34440 if (compat_uses_vma || !compat) {
34441 /*
34442@@ -353,11 +354,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
34443 }
34444
34445 current_thread_info()->sysenter_return =
34446- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
34447+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
34448
34449 up_fail:
34450 if (ret)
34451- current->mm->context.vdso = NULL;
34452+ current->mm->context.vdso = 0;
34453
34454 up_write(&mm->mmap_sem);
34455
34456@@ -404,8 +405,14 @@ __initcall(ia32_binfmt_init);
34457
34458 const char *arch_vma_name(struct vm_area_struct *vma)
34459 {
34460- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
34461+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
34462 return "[vdso]";
34463+
34464+#ifdef CONFIG_PAX_SEGMEXEC
34465+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
34466+ return "[vdso]";
34467+#endif
34468+
34469 return NULL;
34470 }
34471
34472@@ -415,7 +422,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
34473 * Check to see if the corresponding task was created in compat vdso
34474 * mode.
34475 */
34476- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
34477+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
34478 return &gate_vma;
34479 return NULL;
34480 }
34481diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
34482index 431e875..cbb23f3 100644
34483--- a/arch/x86/vdso/vma.c
34484+++ b/arch/x86/vdso/vma.c
34485@@ -16,8 +16,6 @@
34486 #include <asm/vdso.h>
34487 #include <asm/page.h>
34488
34489-unsigned int __read_mostly vdso_enabled = 1;
34490-
34491 extern char vdso_start[], vdso_end[];
34492 extern unsigned short vdso_sync_cpuid;
34493
34494@@ -141,7 +139,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
34495 * unaligned here as a result of stack start randomization.
34496 */
34497 addr = PAGE_ALIGN(addr);
34498- addr = align_vdso_addr(addr);
34499
34500 return addr;
34501 }
34502@@ -154,30 +151,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
34503 unsigned size)
34504 {
34505 struct mm_struct *mm = current->mm;
34506- unsigned long addr;
34507+ unsigned long addr = 0;
34508 int ret;
34509
34510- if (!vdso_enabled)
34511- return 0;
34512-
34513 down_write(&mm->mmap_sem);
34514+
34515+#ifdef CONFIG_PAX_RANDMMAP
34516+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
34517+#endif
34518+
34519 addr = vdso_addr(mm->start_stack, size);
34520+ addr = align_vdso_addr(addr);
34521 addr = get_unmapped_area(NULL, addr, size, 0, 0);
34522 if (IS_ERR_VALUE(addr)) {
34523 ret = addr;
34524 goto up_fail;
34525 }
34526
34527- current->mm->context.vdso = (void *)addr;
34528+ mm->context.vdso = addr;
34529
34530 ret = install_special_mapping(mm, addr, size,
34531 VM_READ|VM_EXEC|
34532 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
34533 pages);
34534- if (ret) {
34535- current->mm->context.vdso = NULL;
34536- goto up_fail;
34537- }
34538+ if (ret)
34539+ mm->context.vdso = 0;
34540
34541 up_fail:
34542 up_write(&mm->mmap_sem);
34543@@ -197,10 +195,3 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
34544 vdsox32_size);
34545 }
34546 #endif
34547-
34548-static __init int vdso_setup(char *s)
34549-{
34550- vdso_enabled = simple_strtoul(s, NULL, 0);
34551- return 0;
34552-}
34553-__setup("vdso=", vdso_setup);
34554diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
34555index fa6ade7..73da73a5 100644
34556--- a/arch/x86/xen/enlighten.c
34557+++ b/arch/x86/xen/enlighten.c
34558@@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
34559
34560 struct shared_info xen_dummy_shared_info;
34561
34562-void *xen_initial_gdt;
34563-
34564 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
34565 __read_mostly int xen_have_vector_callback;
34566 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
34567@@ -541,8 +539,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
34568 {
34569 unsigned long va = dtr->address;
34570 unsigned int size = dtr->size + 1;
34571- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
34572- unsigned long frames[pages];
34573+ unsigned long frames[65536 / PAGE_SIZE];
34574 int f;
34575
34576 /*
34577@@ -590,8 +587,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
34578 {
34579 unsigned long va = dtr->address;
34580 unsigned int size = dtr->size + 1;
34581- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
34582- unsigned long frames[pages];
34583+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
34584 int f;
34585
34586 /*
34587@@ -599,7 +595,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
34588 * 8-byte entries, or 16 4k pages..
34589 */
34590
34591- BUG_ON(size > 65536);
34592+ BUG_ON(size > GDT_SIZE);
34593 BUG_ON(va & ~PAGE_MASK);
34594
34595 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
34596@@ -988,7 +984,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
34597 return 0;
34598 }
34599
34600-static void set_xen_basic_apic_ops(void)
34601+static void __init set_xen_basic_apic_ops(void)
34602 {
34603 apic->read = xen_apic_read;
34604 apic->write = xen_apic_write;
34605@@ -1293,30 +1289,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
34606 #endif
34607 };
34608
34609-static void xen_reboot(int reason)
34610+static __noreturn void xen_reboot(int reason)
34611 {
34612 struct sched_shutdown r = { .reason = reason };
34613
34614- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
34615- BUG();
34616+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
34617+ BUG();
34618 }
34619
34620-static void xen_restart(char *msg)
34621+static __noreturn void xen_restart(char *msg)
34622 {
34623 xen_reboot(SHUTDOWN_reboot);
34624 }
34625
34626-static void xen_emergency_restart(void)
34627+static __noreturn void xen_emergency_restart(void)
34628 {
34629 xen_reboot(SHUTDOWN_reboot);
34630 }
34631
34632-static void xen_machine_halt(void)
34633+static __noreturn void xen_machine_halt(void)
34634 {
34635 xen_reboot(SHUTDOWN_poweroff);
34636 }
34637
34638-static void xen_machine_power_off(void)
34639+static __noreturn void xen_machine_power_off(void)
34640 {
34641 if (pm_power_off)
34642 pm_power_off();
34643@@ -1467,7 +1463,17 @@ asmlinkage void __init xen_start_kernel(void)
34644 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
34645
34646 /* Work out if we support NX */
34647- x86_configure_nx();
34648+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34649+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
34650+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
34651+ unsigned l, h;
34652+
34653+ __supported_pte_mask |= _PAGE_NX;
34654+ rdmsr(MSR_EFER, l, h);
34655+ l |= EFER_NX;
34656+ wrmsr(MSR_EFER, l, h);
34657+ }
34658+#endif
34659
34660 xen_setup_features();
34661
34662@@ -1498,13 +1504,6 @@ asmlinkage void __init xen_start_kernel(void)
34663
34664 machine_ops = xen_machine_ops;
34665
34666- /*
34667- * The only reliable way to retain the initial address of the
34668- * percpu gdt_page is to remember it here, so we can go and
34669- * mark it RW later, when the initial percpu area is freed.
34670- */
34671- xen_initial_gdt = &per_cpu(gdt_page, 0);
34672-
34673 xen_smp_init();
34674
34675 #ifdef CONFIG_ACPI_NUMA
34676diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
34677index fdc3ba2..23cae00 100644
34678--- a/arch/x86/xen/mmu.c
34679+++ b/arch/x86/xen/mmu.c
34680@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
34681 return val;
34682 }
34683
34684-static pteval_t pte_pfn_to_mfn(pteval_t val)
34685+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
34686 {
34687 if (val & _PAGE_PRESENT) {
34688 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
34689@@ -1894,6 +1894,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
34690 /* L3_k[510] -> level2_kernel_pgt
34691 * L3_i[511] -> level2_fixmap_pgt */
34692 convert_pfn_mfn(level3_kernel_pgt);
34693+ convert_pfn_mfn(level3_vmalloc_start_pgt);
34694+ convert_pfn_mfn(level3_vmalloc_end_pgt);
34695+ convert_pfn_mfn(level3_vmemmap_pgt);
34696
34697 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
34698 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
34699@@ -1923,8 +1926,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
34700 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
34701 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
34702 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
34703+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
34704+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
34705+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
34706 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
34707 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
34708+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
34709 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
34710 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
34711
34712@@ -2108,6 +2115,7 @@ static void __init xen_post_allocator_init(void)
34713 pv_mmu_ops.set_pud = xen_set_pud;
34714 #if PAGETABLE_LEVELS == 4
34715 pv_mmu_ops.set_pgd = xen_set_pgd;
34716+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
34717 #endif
34718
34719 /* This will work as long as patching hasn't happened yet
34720@@ -2186,6 +2194,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
34721 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
34722 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
34723 .set_pgd = xen_set_pgd_hyper,
34724+ .set_pgd_batched = xen_set_pgd_hyper,
34725
34726 .alloc_pud = xen_alloc_pmd_init,
34727 .release_pud = xen_release_pmd_init,
34728diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
34729index 31d0475..51af671 100644
34730--- a/arch/x86/xen/smp.c
34731+++ b/arch/x86/xen/smp.c
34732@@ -274,17 +274,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
34733 native_smp_prepare_boot_cpu();
34734
34735 if (xen_pv_domain()) {
34736- /* We've switched to the "real" per-cpu gdt, so make sure the
34737- old memory can be recycled */
34738- make_lowmem_page_readwrite(xen_initial_gdt);
34739-
34740 #ifdef CONFIG_X86_32
34741 /*
34742 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
34743 * expects __USER_DS
34744 */
34745- loadsegment(ds, __USER_DS);
34746- loadsegment(es, __USER_DS);
34747+ loadsegment(ds, __KERNEL_DS);
34748+ loadsegment(es, __KERNEL_DS);
34749 #endif
34750
34751 xen_filter_cpu_maps();
34752@@ -364,7 +360,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
34753 ctxt->user_regs.ss = __KERNEL_DS;
34754 #ifdef CONFIG_X86_32
34755 ctxt->user_regs.fs = __KERNEL_PERCPU;
34756- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
34757+ savesegment(gs, ctxt->user_regs.gs);
34758 #else
34759 ctxt->gs_base_kernel = per_cpu_offset(cpu);
34760 #endif
34761@@ -374,8 +370,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
34762
34763 {
34764 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
34765- ctxt->user_regs.ds = __USER_DS;
34766- ctxt->user_regs.es = __USER_DS;
34767+ ctxt->user_regs.ds = __KERNEL_DS;
34768+ ctxt->user_regs.es = __KERNEL_DS;
34769
34770 xen_copy_trap_info(ctxt->trap_ctxt);
34771
34772@@ -420,13 +416,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
34773 int rc;
34774
34775 per_cpu(current_task, cpu) = idle;
34776+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
34777 #ifdef CONFIG_X86_32
34778 irq_ctx_init(cpu);
34779 #else
34780 clear_tsk_thread_flag(idle, TIF_FORK);
34781- per_cpu(kernel_stack, cpu) =
34782- (unsigned long)task_stack_page(idle) -
34783- KERNEL_STACK_OFFSET + THREAD_SIZE;
34784+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
34785 #endif
34786 xen_setup_runstate_info(cpu);
34787 xen_setup_timer(cpu);
34788@@ -702,7 +697,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
34789
34790 void __init xen_smp_init(void)
34791 {
34792- smp_ops = xen_smp_ops;
34793+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
34794 xen_fill_possible_map();
34795 }
34796
34797diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
34798index 33ca6e4..0ded929 100644
34799--- a/arch/x86/xen/xen-asm_32.S
34800+++ b/arch/x86/xen/xen-asm_32.S
34801@@ -84,14 +84,14 @@ ENTRY(xen_iret)
34802 ESP_OFFSET=4 # bytes pushed onto stack
34803
34804 /*
34805- * Store vcpu_info pointer for easy access. Do it this way to
34806- * avoid having to reload %fs
34807+ * Store vcpu_info pointer for easy access.
34808 */
34809 #ifdef CONFIG_SMP
34810- GET_THREAD_INFO(%eax)
34811- movl %ss:TI_cpu(%eax), %eax
34812- movl %ss:__per_cpu_offset(,%eax,4), %eax
34813- mov %ss:xen_vcpu(%eax), %eax
34814+ push %fs
34815+ mov $(__KERNEL_PERCPU), %eax
34816+ mov %eax, %fs
34817+ mov PER_CPU_VAR(xen_vcpu), %eax
34818+ pop %fs
34819 #else
34820 movl %ss:xen_vcpu, %eax
34821 #endif
34822diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
34823index 7faed58..ba4427c 100644
34824--- a/arch/x86/xen/xen-head.S
34825+++ b/arch/x86/xen/xen-head.S
34826@@ -19,6 +19,17 @@ ENTRY(startup_xen)
34827 #ifdef CONFIG_X86_32
34828 mov %esi,xen_start_info
34829 mov $init_thread_union+THREAD_SIZE,%esp
34830+#ifdef CONFIG_SMP
34831+ movl $cpu_gdt_table,%edi
34832+ movl $__per_cpu_load,%eax
34833+ movw %ax,__KERNEL_PERCPU + 2(%edi)
34834+ rorl $16,%eax
34835+ movb %al,__KERNEL_PERCPU + 4(%edi)
34836+ movb %ah,__KERNEL_PERCPU + 7(%edi)
34837+ movl $__per_cpu_end - 1,%eax
34838+ subl $__per_cpu_start,%eax
34839+ movw %ax,__KERNEL_PERCPU + 0(%edi)
34840+#endif
34841 #else
34842 mov %rsi,xen_start_info
34843 mov $init_thread_union+THREAD_SIZE,%rsp
34844diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
34845index 95f8c61..611d6e8 100644
34846--- a/arch/x86/xen/xen-ops.h
34847+++ b/arch/x86/xen/xen-ops.h
34848@@ -10,8 +10,6 @@
34849 extern const char xen_hypervisor_callback[];
34850 extern const char xen_failsafe_callback[];
34851
34852-extern void *xen_initial_gdt;
34853-
34854 struct trap_info;
34855 void xen_copy_trap_info(struct trap_info *traps);
34856
34857diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
34858index 525bd3d..ef888b1 100644
34859--- a/arch/xtensa/variants/dc232b/include/variant/core.h
34860+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
34861@@ -119,9 +119,9 @@
34862 ----------------------------------------------------------------------*/
34863
34864 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
34865-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
34866 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
34867 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
34868+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
34869
34870 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
34871 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
34872diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
34873index 2f33760..835e50a 100644
34874--- a/arch/xtensa/variants/fsf/include/variant/core.h
34875+++ b/arch/xtensa/variants/fsf/include/variant/core.h
34876@@ -11,6 +11,7 @@
34877 #ifndef _XTENSA_CORE_H
34878 #define _XTENSA_CORE_H
34879
34880+#include <linux/const.h>
34881
34882 /****************************************************************************
34883 Parameters Useful for Any Code, USER or PRIVILEGED
34884@@ -112,9 +113,9 @@
34885 ----------------------------------------------------------------------*/
34886
34887 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
34888-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
34889 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
34890 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
34891+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
34892
34893 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
34894 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
34895diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
34896index af00795..2bb8105 100644
34897--- a/arch/xtensa/variants/s6000/include/variant/core.h
34898+++ b/arch/xtensa/variants/s6000/include/variant/core.h
34899@@ -11,6 +11,7 @@
34900 #ifndef _XTENSA_CORE_CONFIGURATION_H
34901 #define _XTENSA_CORE_CONFIGURATION_H
34902
34903+#include <linux/const.h>
34904
34905 /****************************************************************************
34906 Parameters Useful for Any Code, USER or PRIVILEGED
34907@@ -118,9 +119,9 @@
34908 ----------------------------------------------------------------------*/
34909
34910 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
34911-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
34912 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
34913 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
34914+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
34915
34916 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
34917 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
34918diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
34919index 4e491d9..c8e18e4 100644
34920--- a/block/blk-cgroup.c
34921+++ b/block/blk-cgroup.c
34922@@ -812,7 +812,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
34923 static struct cgroup_subsys_state *
34924 blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
34925 {
34926- static atomic64_t id_seq = ATOMIC64_INIT(0);
34927+ static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0);
34928 struct blkcg *blkcg;
34929
34930 if (!parent_css) {
34931@@ -826,7 +826,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
34932
34933 blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
34934 blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
34935- blkcg->id = atomic64_inc_return(&id_seq); /* root is 0, start from 1 */
34936+ blkcg->id = atomic64_inc_return_unchecked(&id_seq); /* root is 0, start from 1 */
34937 done:
34938 spin_lock_init(&blkcg->lock);
34939 INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
34940diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
34941index 4b8d9b54..a7178c0 100644
34942--- a/block/blk-iopoll.c
34943+++ b/block/blk-iopoll.c
34944@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
34945 }
34946 EXPORT_SYMBOL(blk_iopoll_complete);
34947
34948-static void blk_iopoll_softirq(struct softirq_action *h)
34949+static __latent_entropy void blk_iopoll_softirq(void)
34950 {
34951 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
34952 int rearm = 0, budget = blk_iopoll_budget;
34953diff --git a/block/blk-map.c b/block/blk-map.c
34954index 623e1cd..ca1e109 100644
34955--- a/block/blk-map.c
34956+++ b/block/blk-map.c
34957@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
34958 if (!len || !kbuf)
34959 return -EINVAL;
34960
34961- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
34962+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
34963 if (do_copy)
34964 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
34965 else
34966diff --git a/block/blk-softirq.c b/block/blk-softirq.c
34967index ec9e606..3f38839 100644
34968--- a/block/blk-softirq.c
34969+++ b/block/blk-softirq.c
34970@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
34971 * Softirq action handler - move entries to local list and loop over them
34972 * while passing them to the queue registered handler.
34973 */
34974-static void blk_done_softirq(struct softirq_action *h)
34975+static __latent_entropy void blk_done_softirq(void)
34976 {
34977 struct list_head *cpu_list, local_list;
34978
34979diff --git a/block/bsg.c b/block/bsg.c
34980index 420a5a9..23834aa 100644
34981--- a/block/bsg.c
34982+++ b/block/bsg.c
34983@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
34984 struct sg_io_v4 *hdr, struct bsg_device *bd,
34985 fmode_t has_write_perm)
34986 {
34987+ unsigned char tmpcmd[sizeof(rq->__cmd)];
34988+ unsigned char *cmdptr;
34989+
34990 if (hdr->request_len > BLK_MAX_CDB) {
34991 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
34992 if (!rq->cmd)
34993 return -ENOMEM;
34994- }
34995+ cmdptr = rq->cmd;
34996+ } else
34997+ cmdptr = tmpcmd;
34998
34999- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
35000+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
35001 hdr->request_len))
35002 return -EFAULT;
35003
35004+ if (cmdptr != rq->cmd)
35005+ memcpy(rq->cmd, cmdptr, hdr->request_len);
35006+
35007 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
35008 if (blk_verify_command(rq->cmd, has_write_perm))
35009 return -EPERM;
35010diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
35011index fbd5a67..5d631b5 100644
35012--- a/block/compat_ioctl.c
35013+++ b/block/compat_ioctl.c
35014@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
35015 err |= __get_user(f->spec1, &uf->spec1);
35016 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
35017 err |= __get_user(name, &uf->name);
35018- f->name = compat_ptr(name);
35019+ f->name = (void __force_kernel *)compat_ptr(name);
35020 if (err) {
35021 err = -EFAULT;
35022 goto out;
35023diff --git a/block/genhd.c b/block/genhd.c
35024index 791f419..89f21c4 100644
35025--- a/block/genhd.c
35026+++ b/block/genhd.c
35027@@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf)
35028
35029 /*
35030 * Register device numbers dev..(dev+range-1)
35031- * range must be nonzero
35032+ * Noop if @range is zero.
35033 * The hash chain is sorted on range, so that subranges can override.
35034 */
35035 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
35036 struct kobject *(*probe)(dev_t, int *, void *),
35037 int (*lock)(dev_t, void *), void *data)
35038 {
35039- kobj_map(bdev_map, devt, range, module, probe, lock, data);
35040+ if (range)
35041+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
35042 }
35043
35044 EXPORT_SYMBOL(blk_register_region);
35045
35046+/* undo blk_register_region(), noop if @range is zero */
35047 void blk_unregister_region(dev_t devt, unsigned long range)
35048 {
35049- kobj_unmap(bdev_map, devt, range);
35050+ if (range)
35051+ kobj_unmap(bdev_map, devt, range);
35052 }
35053
35054 EXPORT_SYMBOL(blk_unregister_region);
35055diff --git a/block/partitions/efi.c b/block/partitions/efi.c
35056index a8287b4..241a48e 100644
35057--- a/block/partitions/efi.c
35058+++ b/block/partitions/efi.c
35059@@ -292,14 +292,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
35060 if (!gpt)
35061 return NULL;
35062
35063+ if (!le32_to_cpu(gpt->num_partition_entries))
35064+ return NULL;
35065+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
35066+ if (!pte)
35067+ return NULL;
35068+
35069 count = le32_to_cpu(gpt->num_partition_entries) *
35070 le32_to_cpu(gpt->sizeof_partition_entry);
35071- if (!count)
35072- return NULL;
35073- pte = kmalloc(count, GFP_KERNEL);
35074- if (!pte)
35075- return NULL;
35076-
35077 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
35078 (u8 *) pte, count) < count) {
35079 kfree(pte);
35080diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
35081index a5ffcc9..e057498 100644
35082--- a/block/scsi_ioctl.c
35083+++ b/block/scsi_ioctl.c
35084@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
35085 return put_user(0, p);
35086 }
35087
35088-static int sg_get_timeout(struct request_queue *q)
35089+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
35090 {
35091 return jiffies_to_clock_t(q->sg_timeout);
35092 }
35093@@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
35094 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
35095 struct sg_io_hdr *hdr, fmode_t mode)
35096 {
35097- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
35098+ unsigned char tmpcmd[sizeof(rq->__cmd)];
35099+ unsigned char *cmdptr;
35100+
35101+ if (rq->cmd != rq->__cmd)
35102+ cmdptr = rq->cmd;
35103+ else
35104+ cmdptr = tmpcmd;
35105+
35106+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
35107 return -EFAULT;
35108+
35109+ if (cmdptr != rq->cmd)
35110+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
35111+
35112 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
35113 return -EPERM;
35114
35115@@ -434,6 +446,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
35116 int err;
35117 unsigned int in_len, out_len, bytes, opcode, cmdlen;
35118 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
35119+ unsigned char tmpcmd[sizeof(rq->__cmd)];
35120+ unsigned char *cmdptr;
35121
35122 if (!sic)
35123 return -EINVAL;
35124@@ -467,9 +481,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
35125 */
35126 err = -EFAULT;
35127 rq->cmd_len = cmdlen;
35128- if (copy_from_user(rq->cmd, sic->data, cmdlen))
35129+
35130+ if (rq->cmd != rq->__cmd)
35131+ cmdptr = rq->cmd;
35132+ else
35133+ cmdptr = tmpcmd;
35134+
35135+ if (copy_from_user(cmdptr, sic->data, cmdlen))
35136 goto error;
35137
35138+ if (rq->cmd != cmdptr)
35139+ memcpy(rq->cmd, cmdptr, cmdlen);
35140+
35141 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
35142 goto error;
35143
35144diff --git a/crypto/cryptd.c b/crypto/cryptd.c
35145index 7bdd61b..afec999 100644
35146--- a/crypto/cryptd.c
35147+++ b/crypto/cryptd.c
35148@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
35149
35150 struct cryptd_blkcipher_request_ctx {
35151 crypto_completion_t complete;
35152-};
35153+} __no_const;
35154
35155 struct cryptd_hash_ctx {
35156 struct crypto_shash *child;
35157@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
35158
35159 struct cryptd_aead_request_ctx {
35160 crypto_completion_t complete;
35161-};
35162+} __no_const;
35163
35164 static void cryptd_queue_worker(struct work_struct *work);
35165
35166diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
35167index f8c920c..ab2cb5a 100644
35168--- a/crypto/pcrypt.c
35169+++ b/crypto/pcrypt.c
35170@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
35171 int ret;
35172
35173 pinst->kobj.kset = pcrypt_kset;
35174- ret = kobject_add(&pinst->kobj, NULL, name);
35175+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
35176 if (!ret)
35177 kobject_uevent(&pinst->kobj, KOBJ_ADD);
35178
35179diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
35180index f220d64..d359ad6 100644
35181--- a/drivers/acpi/apei/apei-internal.h
35182+++ b/drivers/acpi/apei/apei-internal.h
35183@@ -20,7 +20,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
35184 struct apei_exec_ins_type {
35185 u32 flags;
35186 apei_exec_ins_func_t run;
35187-};
35188+} __do_const;
35189
35190 struct apei_exec_context {
35191 u32 ip;
35192diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
35193index 33dc6a0..4b24b47 100644
35194--- a/drivers/acpi/apei/cper.c
35195+++ b/drivers/acpi/apei/cper.c
35196@@ -39,12 +39,12 @@
35197 */
35198 u64 cper_next_record_id(void)
35199 {
35200- static atomic64_t seq;
35201+ static atomic64_unchecked_t seq;
35202
35203- if (!atomic64_read(&seq))
35204- atomic64_set(&seq, ((u64)get_seconds()) << 32);
35205+ if (!atomic64_read_unchecked(&seq))
35206+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
35207
35208- return atomic64_inc_return(&seq);
35209+ return atomic64_inc_return_unchecked(&seq);
35210 }
35211 EXPORT_SYMBOL_GPL(cper_next_record_id);
35212
35213diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
35214index 8ec37bb..b0716e5 100644
35215--- a/drivers/acpi/apei/ghes.c
35216+++ b/drivers/acpi/apei/ghes.c
35217@@ -498,7 +498,7 @@ static void __ghes_print_estatus(const char *pfx,
35218 const struct acpi_hest_generic *generic,
35219 const struct acpi_hest_generic_status *estatus)
35220 {
35221- static atomic_t seqno;
35222+ static atomic_unchecked_t seqno;
35223 unsigned int curr_seqno;
35224 char pfx_seq[64];
35225
35226@@ -509,7 +509,7 @@ static void __ghes_print_estatus(const char *pfx,
35227 else
35228 pfx = KERN_ERR;
35229 }
35230- curr_seqno = atomic_inc_return(&seqno);
35231+ curr_seqno = atomic_inc_return_unchecked(&seqno);
35232 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
35233 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
35234 pfx_seq, generic->header.source_id);
35235diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
35236index a83e3c6..c3d617f 100644
35237--- a/drivers/acpi/bgrt.c
35238+++ b/drivers/acpi/bgrt.c
35239@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
35240 if (!bgrt_image)
35241 return -ENODEV;
35242
35243- bin_attr_image.private = bgrt_image;
35244- bin_attr_image.size = bgrt_image_size;
35245+ pax_open_kernel();
35246+ *(void **)&bin_attr_image.private = bgrt_image;
35247+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
35248+ pax_close_kernel();
35249
35250 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
35251 if (!bgrt_kobj)
35252diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
35253index 9515f18..4b149c9 100644
35254--- a/drivers/acpi/blacklist.c
35255+++ b/drivers/acpi/blacklist.c
35256@@ -52,7 +52,7 @@ struct acpi_blacklist_item {
35257 u32 is_critical_error;
35258 };
35259
35260-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
35261+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
35262
35263 /*
35264 * POLICY: If *anything* doesn't work, put it on the blacklist.
35265@@ -199,7 +199,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
35266 return 0;
35267 }
35268
35269-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
35270+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
35271 {
35272 .callback = dmi_disable_osi_vista,
35273 .ident = "Fujitsu Siemens",
35274diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
35275index 12b62f2..dc2aac8 100644
35276--- a/drivers/acpi/custom_method.c
35277+++ b/drivers/acpi/custom_method.c
35278@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
35279 struct acpi_table_header table;
35280 acpi_status status;
35281
35282+#ifdef CONFIG_GRKERNSEC_KMEM
35283+ return -EPERM;
35284+#endif
35285+
35286 if (!(*ppos)) {
35287 /* parse the table header to get the table length */
35288 if (count <= sizeof(struct acpi_table_header))
35289diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
35290index c7414a5..d5afd71 100644
35291--- a/drivers/acpi/processor_idle.c
35292+++ b/drivers/acpi/processor_idle.c
35293@@ -966,7 +966,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
35294 {
35295 int i, count = CPUIDLE_DRIVER_STATE_START;
35296 struct acpi_processor_cx *cx;
35297- struct cpuidle_state *state;
35298+ cpuidle_state_no_const *state;
35299 struct cpuidle_driver *drv = &acpi_idle_driver;
35300
35301 if (!pr->flags.power_setup_done)
35302diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
35303index 05306a5..733d1f0 100644
35304--- a/drivers/acpi/sysfs.c
35305+++ b/drivers/acpi/sysfs.c
35306@@ -423,11 +423,11 @@ static u32 num_counters;
35307 static struct attribute **all_attrs;
35308 static u32 acpi_gpe_count;
35309
35310-static struct attribute_group interrupt_stats_attr_group = {
35311+static attribute_group_no_const interrupt_stats_attr_group = {
35312 .name = "interrupts",
35313 };
35314
35315-static struct kobj_attribute *counter_attrs;
35316+static kobj_attribute_no_const *counter_attrs;
35317
35318 static void delete_gpe_attr_array(void)
35319 {
35320diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
35321index cfb7447..98f2149 100644
35322--- a/drivers/ata/libahci.c
35323+++ b/drivers/ata/libahci.c
35324@@ -1239,7 +1239,7 @@ int ahci_kick_engine(struct ata_port *ap)
35325 }
35326 EXPORT_SYMBOL_GPL(ahci_kick_engine);
35327
35328-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
35329+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
35330 struct ata_taskfile *tf, int is_cmd, u16 flags,
35331 unsigned long timeout_msec)
35332 {
35333diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
35334index 2c2780a..5ebc310 100644
35335--- a/drivers/ata/libata-core.c
35336+++ b/drivers/ata/libata-core.c
35337@@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
35338 static void ata_dev_xfermask(struct ata_device *dev);
35339 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
35340
35341-atomic_t ata_print_id = ATOMIC_INIT(0);
35342+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
35343
35344 struct ata_force_param {
35345 const char *name;
35346@@ -4823,7 +4823,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
35347 struct ata_port *ap;
35348 unsigned int tag;
35349
35350- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
35351+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
35352 ap = qc->ap;
35353
35354 qc->flags = 0;
35355@@ -4839,7 +4839,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
35356 struct ata_port *ap;
35357 struct ata_link *link;
35358
35359- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
35360+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
35361 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
35362 ap = qc->ap;
35363 link = qc->dev->link;
35364@@ -5958,6 +5958,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
35365 return;
35366
35367 spin_lock(&lock);
35368+ pax_open_kernel();
35369
35370 for (cur = ops->inherits; cur; cur = cur->inherits) {
35371 void **inherit = (void **)cur;
35372@@ -5971,8 +5972,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
35373 if (IS_ERR(*pp))
35374 *pp = NULL;
35375
35376- ops->inherits = NULL;
35377+ *(struct ata_port_operations **)&ops->inherits = NULL;
35378
35379+ pax_close_kernel();
35380 spin_unlock(&lock);
35381 }
35382
35383@@ -6165,7 +6167,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
35384
35385 /* give ports names and add SCSI hosts */
35386 for (i = 0; i < host->n_ports; i++) {
35387- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
35388+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
35389 host->ports[i]->local_port_no = i + 1;
35390 }
35391
35392diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
35393index 377eb88..8591b44 100644
35394--- a/drivers/ata/libata-scsi.c
35395+++ b/drivers/ata/libata-scsi.c
35396@@ -4135,7 +4135,7 @@ int ata_sas_port_init(struct ata_port *ap)
35397
35398 if (rc)
35399 return rc;
35400- ap->print_id = atomic_inc_return(&ata_print_id);
35401+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
35402 return 0;
35403 }
35404 EXPORT_SYMBOL_GPL(ata_sas_port_init);
35405diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
35406index 45b5ab3..98446b8 100644
35407--- a/drivers/ata/libata.h
35408+++ b/drivers/ata/libata.h
35409@@ -53,7 +53,7 @@ enum {
35410 ATA_DNXFER_QUIET = (1 << 31),
35411 };
35412
35413-extern atomic_t ata_print_id;
35414+extern atomic_unchecked_t ata_print_id;
35415 extern int atapi_passthru16;
35416 extern int libata_fua;
35417 extern int libata_noacpi;
35418diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
35419index 853f610..97d24da 100644
35420--- a/drivers/ata/pata_arasan_cf.c
35421+++ b/drivers/ata/pata_arasan_cf.c
35422@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
35423 /* Handle platform specific quirks */
35424 if (quirk) {
35425 if (quirk & CF_BROKEN_PIO) {
35426- ap->ops->set_piomode = NULL;
35427+ pax_open_kernel();
35428+ *(void **)&ap->ops->set_piomode = NULL;
35429+ pax_close_kernel();
35430 ap->pio_mask = 0;
35431 }
35432 if (quirk & CF_BROKEN_MWDMA)
35433diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
35434index f9b983a..887b9d8 100644
35435--- a/drivers/atm/adummy.c
35436+++ b/drivers/atm/adummy.c
35437@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
35438 vcc->pop(vcc, skb);
35439 else
35440 dev_kfree_skb_any(skb);
35441- atomic_inc(&vcc->stats->tx);
35442+ atomic_inc_unchecked(&vcc->stats->tx);
35443
35444 return 0;
35445 }
35446diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
35447index 62a7607..cc4be104 100644
35448--- a/drivers/atm/ambassador.c
35449+++ b/drivers/atm/ambassador.c
35450@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
35451 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
35452
35453 // VC layer stats
35454- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
35455+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
35456
35457 // free the descriptor
35458 kfree (tx_descr);
35459@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
35460 dump_skb ("<<<", vc, skb);
35461
35462 // VC layer stats
35463- atomic_inc(&atm_vcc->stats->rx);
35464+ atomic_inc_unchecked(&atm_vcc->stats->rx);
35465 __net_timestamp(skb);
35466 // end of our responsibility
35467 atm_vcc->push (atm_vcc, skb);
35468@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
35469 } else {
35470 PRINTK (KERN_INFO, "dropped over-size frame");
35471 // should we count this?
35472- atomic_inc(&atm_vcc->stats->rx_drop);
35473+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
35474 }
35475
35476 } else {
35477@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
35478 }
35479
35480 if (check_area (skb->data, skb->len)) {
35481- atomic_inc(&atm_vcc->stats->tx_err);
35482+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
35483 return -ENOMEM; // ?
35484 }
35485
35486diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
35487index 0e3f8f9..765a7a5 100644
35488--- a/drivers/atm/atmtcp.c
35489+++ b/drivers/atm/atmtcp.c
35490@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
35491 if (vcc->pop) vcc->pop(vcc,skb);
35492 else dev_kfree_skb(skb);
35493 if (dev_data) return 0;
35494- atomic_inc(&vcc->stats->tx_err);
35495+ atomic_inc_unchecked(&vcc->stats->tx_err);
35496 return -ENOLINK;
35497 }
35498 size = skb->len+sizeof(struct atmtcp_hdr);
35499@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
35500 if (!new_skb) {
35501 if (vcc->pop) vcc->pop(vcc,skb);
35502 else dev_kfree_skb(skb);
35503- atomic_inc(&vcc->stats->tx_err);
35504+ atomic_inc_unchecked(&vcc->stats->tx_err);
35505 return -ENOBUFS;
35506 }
35507 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
35508@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
35509 if (vcc->pop) vcc->pop(vcc,skb);
35510 else dev_kfree_skb(skb);
35511 out_vcc->push(out_vcc,new_skb);
35512- atomic_inc(&vcc->stats->tx);
35513- atomic_inc(&out_vcc->stats->rx);
35514+ atomic_inc_unchecked(&vcc->stats->tx);
35515+ atomic_inc_unchecked(&out_vcc->stats->rx);
35516 return 0;
35517 }
35518
35519@@ -299,7 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
35520 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
35521 read_unlock(&vcc_sklist_lock);
35522 if (!out_vcc) {
35523- atomic_inc(&vcc->stats->tx_err);
35524+ atomic_inc_unchecked(&vcc->stats->tx_err);
35525 goto done;
35526 }
35527 skb_pull(skb,sizeof(struct atmtcp_hdr));
35528@@ -311,8 +311,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
35529 __net_timestamp(new_skb);
35530 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
35531 out_vcc->push(out_vcc,new_skb);
35532- atomic_inc(&vcc->stats->tx);
35533- atomic_inc(&out_vcc->stats->rx);
35534+ atomic_inc_unchecked(&vcc->stats->tx);
35535+ atomic_inc_unchecked(&out_vcc->stats->rx);
35536 done:
35537 if (vcc->pop) vcc->pop(vcc,skb);
35538 else dev_kfree_skb(skb);
35539diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
35540index b1955ba..b179940 100644
35541--- a/drivers/atm/eni.c
35542+++ b/drivers/atm/eni.c
35543@@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
35544 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
35545 vcc->dev->number);
35546 length = 0;
35547- atomic_inc(&vcc->stats->rx_err);
35548+ atomic_inc_unchecked(&vcc->stats->rx_err);
35549 }
35550 else {
35551 length = ATM_CELL_SIZE-1; /* no HEC */
35552@@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
35553 size);
35554 }
35555 eff = length = 0;
35556- atomic_inc(&vcc->stats->rx_err);
35557+ atomic_inc_unchecked(&vcc->stats->rx_err);
35558 }
35559 else {
35560 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
35561@@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
35562 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
35563 vcc->dev->number,vcc->vci,length,size << 2,descr);
35564 length = eff = 0;
35565- atomic_inc(&vcc->stats->rx_err);
35566+ atomic_inc_unchecked(&vcc->stats->rx_err);
35567 }
35568 }
35569 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
35570@@ -767,7 +767,7 @@ rx_dequeued++;
35571 vcc->push(vcc,skb);
35572 pushed++;
35573 }
35574- atomic_inc(&vcc->stats->rx);
35575+ atomic_inc_unchecked(&vcc->stats->rx);
35576 }
35577 wake_up(&eni_dev->rx_wait);
35578 }
35579@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
35580 PCI_DMA_TODEVICE);
35581 if (vcc->pop) vcc->pop(vcc,skb);
35582 else dev_kfree_skb_irq(skb);
35583- atomic_inc(&vcc->stats->tx);
35584+ atomic_inc_unchecked(&vcc->stats->tx);
35585 wake_up(&eni_dev->tx_wait);
35586 dma_complete++;
35587 }
35588diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
35589index b41c948..a002b17 100644
35590--- a/drivers/atm/firestream.c
35591+++ b/drivers/atm/firestream.c
35592@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
35593 }
35594 }
35595
35596- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
35597+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
35598
35599 fs_dprintk (FS_DEBUG_TXMEM, "i");
35600 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
35601@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
35602 #endif
35603 skb_put (skb, qe->p1 & 0xffff);
35604 ATM_SKB(skb)->vcc = atm_vcc;
35605- atomic_inc(&atm_vcc->stats->rx);
35606+ atomic_inc_unchecked(&atm_vcc->stats->rx);
35607 __net_timestamp(skb);
35608 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
35609 atm_vcc->push (atm_vcc, skb);
35610@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
35611 kfree (pe);
35612 }
35613 if (atm_vcc)
35614- atomic_inc(&atm_vcc->stats->rx_drop);
35615+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
35616 break;
35617 case 0x1f: /* Reassembly abort: no buffers. */
35618 /* Silently increment error counter. */
35619 if (atm_vcc)
35620- atomic_inc(&atm_vcc->stats->rx_drop);
35621+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
35622 break;
35623 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
35624 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
35625diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
35626index 204814e..cede831 100644
35627--- a/drivers/atm/fore200e.c
35628+++ b/drivers/atm/fore200e.c
35629@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
35630 #endif
35631 /* check error condition */
35632 if (*entry->status & STATUS_ERROR)
35633- atomic_inc(&vcc->stats->tx_err);
35634+ atomic_inc_unchecked(&vcc->stats->tx_err);
35635 else
35636- atomic_inc(&vcc->stats->tx);
35637+ atomic_inc_unchecked(&vcc->stats->tx);
35638 }
35639 }
35640
35641@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
35642 if (skb == NULL) {
35643 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
35644
35645- atomic_inc(&vcc->stats->rx_drop);
35646+ atomic_inc_unchecked(&vcc->stats->rx_drop);
35647 return -ENOMEM;
35648 }
35649
35650@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
35651
35652 dev_kfree_skb_any(skb);
35653
35654- atomic_inc(&vcc->stats->rx_drop);
35655+ atomic_inc_unchecked(&vcc->stats->rx_drop);
35656 return -ENOMEM;
35657 }
35658
35659 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
35660
35661 vcc->push(vcc, skb);
35662- atomic_inc(&vcc->stats->rx);
35663+ atomic_inc_unchecked(&vcc->stats->rx);
35664
35665 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
35666
35667@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
35668 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
35669 fore200e->atm_dev->number,
35670 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
35671- atomic_inc(&vcc->stats->rx_err);
35672+ atomic_inc_unchecked(&vcc->stats->rx_err);
35673 }
35674 }
35675
35676@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
35677 goto retry_here;
35678 }
35679
35680- atomic_inc(&vcc->stats->tx_err);
35681+ atomic_inc_unchecked(&vcc->stats->tx_err);
35682
35683 fore200e->tx_sat++;
35684 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
35685diff --git a/drivers/atm/he.c b/drivers/atm/he.c
35686index 8557adc..3fb5d55 100644
35687--- a/drivers/atm/he.c
35688+++ b/drivers/atm/he.c
35689@@ -1691,7 +1691,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
35690
35691 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
35692 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
35693- atomic_inc(&vcc->stats->rx_drop);
35694+ atomic_inc_unchecked(&vcc->stats->rx_drop);
35695 goto return_host_buffers;
35696 }
35697
35698@@ -1718,7 +1718,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
35699 RBRQ_LEN_ERR(he_dev->rbrq_head)
35700 ? "LEN_ERR" : "",
35701 vcc->vpi, vcc->vci);
35702- atomic_inc(&vcc->stats->rx_err);
35703+ atomic_inc_unchecked(&vcc->stats->rx_err);
35704 goto return_host_buffers;
35705 }
35706
35707@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
35708 vcc->push(vcc, skb);
35709 spin_lock(&he_dev->global_lock);
35710
35711- atomic_inc(&vcc->stats->rx);
35712+ atomic_inc_unchecked(&vcc->stats->rx);
35713
35714 return_host_buffers:
35715 ++pdus_assembled;
35716@@ -2096,7 +2096,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
35717 tpd->vcc->pop(tpd->vcc, tpd->skb);
35718 else
35719 dev_kfree_skb_any(tpd->skb);
35720- atomic_inc(&tpd->vcc->stats->tx_err);
35721+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
35722 }
35723 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
35724 return;
35725@@ -2508,7 +2508,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35726 vcc->pop(vcc, skb);
35727 else
35728 dev_kfree_skb_any(skb);
35729- atomic_inc(&vcc->stats->tx_err);
35730+ atomic_inc_unchecked(&vcc->stats->tx_err);
35731 return -EINVAL;
35732 }
35733
35734@@ -2519,7 +2519,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35735 vcc->pop(vcc, skb);
35736 else
35737 dev_kfree_skb_any(skb);
35738- atomic_inc(&vcc->stats->tx_err);
35739+ atomic_inc_unchecked(&vcc->stats->tx_err);
35740 return -EINVAL;
35741 }
35742 #endif
35743@@ -2531,7 +2531,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35744 vcc->pop(vcc, skb);
35745 else
35746 dev_kfree_skb_any(skb);
35747- atomic_inc(&vcc->stats->tx_err);
35748+ atomic_inc_unchecked(&vcc->stats->tx_err);
35749 spin_unlock_irqrestore(&he_dev->global_lock, flags);
35750 return -ENOMEM;
35751 }
35752@@ -2573,7 +2573,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35753 vcc->pop(vcc, skb);
35754 else
35755 dev_kfree_skb_any(skb);
35756- atomic_inc(&vcc->stats->tx_err);
35757+ atomic_inc_unchecked(&vcc->stats->tx_err);
35758 spin_unlock_irqrestore(&he_dev->global_lock, flags);
35759 return -ENOMEM;
35760 }
35761@@ -2604,7 +2604,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
35762 __enqueue_tpd(he_dev, tpd, cid);
35763 spin_unlock_irqrestore(&he_dev->global_lock, flags);
35764
35765- atomic_inc(&vcc->stats->tx);
35766+ atomic_inc_unchecked(&vcc->stats->tx);
35767
35768 return 0;
35769 }
35770diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
35771index 1dc0519..1aadaf7 100644
35772--- a/drivers/atm/horizon.c
35773+++ b/drivers/atm/horizon.c
35774@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
35775 {
35776 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
35777 // VC layer stats
35778- atomic_inc(&vcc->stats->rx);
35779+ atomic_inc_unchecked(&vcc->stats->rx);
35780 __net_timestamp(skb);
35781 // end of our responsibility
35782 vcc->push (vcc, skb);
35783@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
35784 dev->tx_iovec = NULL;
35785
35786 // VC layer stats
35787- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
35788+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
35789
35790 // free the skb
35791 hrz_kfree_skb (skb);
35792diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
35793index 1bdf104..9dc44b1 100644
35794--- a/drivers/atm/idt77252.c
35795+++ b/drivers/atm/idt77252.c
35796@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
35797 else
35798 dev_kfree_skb(skb);
35799
35800- atomic_inc(&vcc->stats->tx);
35801+ atomic_inc_unchecked(&vcc->stats->tx);
35802 }
35803
35804 atomic_dec(&scq->used);
35805@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35806 if ((sb = dev_alloc_skb(64)) == NULL) {
35807 printk("%s: Can't allocate buffers for aal0.\n",
35808 card->name);
35809- atomic_add(i, &vcc->stats->rx_drop);
35810+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
35811 break;
35812 }
35813 if (!atm_charge(vcc, sb->truesize)) {
35814 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
35815 card->name);
35816- atomic_add(i - 1, &vcc->stats->rx_drop);
35817+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
35818 dev_kfree_skb(sb);
35819 break;
35820 }
35821@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35822 ATM_SKB(sb)->vcc = vcc;
35823 __net_timestamp(sb);
35824 vcc->push(vcc, sb);
35825- atomic_inc(&vcc->stats->rx);
35826+ atomic_inc_unchecked(&vcc->stats->rx);
35827
35828 cell += ATM_CELL_PAYLOAD;
35829 }
35830@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35831 "(CDC: %08x)\n",
35832 card->name, len, rpp->len, readl(SAR_REG_CDC));
35833 recycle_rx_pool_skb(card, rpp);
35834- atomic_inc(&vcc->stats->rx_err);
35835+ atomic_inc_unchecked(&vcc->stats->rx_err);
35836 return;
35837 }
35838 if (stat & SAR_RSQE_CRC) {
35839 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
35840 recycle_rx_pool_skb(card, rpp);
35841- atomic_inc(&vcc->stats->rx_err);
35842+ atomic_inc_unchecked(&vcc->stats->rx_err);
35843 return;
35844 }
35845 if (skb_queue_len(&rpp->queue) > 1) {
35846@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35847 RXPRINTK("%s: Can't alloc RX skb.\n",
35848 card->name);
35849 recycle_rx_pool_skb(card, rpp);
35850- atomic_inc(&vcc->stats->rx_err);
35851+ atomic_inc_unchecked(&vcc->stats->rx_err);
35852 return;
35853 }
35854 if (!atm_charge(vcc, skb->truesize)) {
35855@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35856 __net_timestamp(skb);
35857
35858 vcc->push(vcc, skb);
35859- atomic_inc(&vcc->stats->rx);
35860+ atomic_inc_unchecked(&vcc->stats->rx);
35861
35862 return;
35863 }
35864@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
35865 __net_timestamp(skb);
35866
35867 vcc->push(vcc, skb);
35868- atomic_inc(&vcc->stats->rx);
35869+ atomic_inc_unchecked(&vcc->stats->rx);
35870
35871 if (skb->truesize > SAR_FB_SIZE_3)
35872 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
35873@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
35874 if (vcc->qos.aal != ATM_AAL0) {
35875 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
35876 card->name, vpi, vci);
35877- atomic_inc(&vcc->stats->rx_drop);
35878+ atomic_inc_unchecked(&vcc->stats->rx_drop);
35879 goto drop;
35880 }
35881
35882 if ((sb = dev_alloc_skb(64)) == NULL) {
35883 printk("%s: Can't allocate buffers for AAL0.\n",
35884 card->name);
35885- atomic_inc(&vcc->stats->rx_err);
35886+ atomic_inc_unchecked(&vcc->stats->rx_err);
35887 goto drop;
35888 }
35889
35890@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
35891 ATM_SKB(sb)->vcc = vcc;
35892 __net_timestamp(sb);
35893 vcc->push(vcc, sb);
35894- atomic_inc(&vcc->stats->rx);
35895+ atomic_inc_unchecked(&vcc->stats->rx);
35896
35897 drop:
35898 skb_pull(queue, 64);
35899@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
35900
35901 if (vc == NULL) {
35902 printk("%s: NULL connection in send().\n", card->name);
35903- atomic_inc(&vcc->stats->tx_err);
35904+ atomic_inc_unchecked(&vcc->stats->tx_err);
35905 dev_kfree_skb(skb);
35906 return -EINVAL;
35907 }
35908 if (!test_bit(VCF_TX, &vc->flags)) {
35909 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
35910- atomic_inc(&vcc->stats->tx_err);
35911+ atomic_inc_unchecked(&vcc->stats->tx_err);
35912 dev_kfree_skb(skb);
35913 return -EINVAL;
35914 }
35915@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
35916 break;
35917 default:
35918 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
35919- atomic_inc(&vcc->stats->tx_err);
35920+ atomic_inc_unchecked(&vcc->stats->tx_err);
35921 dev_kfree_skb(skb);
35922 return -EINVAL;
35923 }
35924
35925 if (skb_shinfo(skb)->nr_frags != 0) {
35926 printk("%s: No scatter-gather yet.\n", card->name);
35927- atomic_inc(&vcc->stats->tx_err);
35928+ atomic_inc_unchecked(&vcc->stats->tx_err);
35929 dev_kfree_skb(skb);
35930 return -EINVAL;
35931 }
35932@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
35933
35934 err = queue_skb(card, vc, skb, oam);
35935 if (err) {
35936- atomic_inc(&vcc->stats->tx_err);
35937+ atomic_inc_unchecked(&vcc->stats->tx_err);
35938 dev_kfree_skb(skb);
35939 return err;
35940 }
35941@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
35942 skb = dev_alloc_skb(64);
35943 if (!skb) {
35944 printk("%s: Out of memory in send_oam().\n", card->name);
35945- atomic_inc(&vcc->stats->tx_err);
35946+ atomic_inc_unchecked(&vcc->stats->tx_err);
35947 return -ENOMEM;
35948 }
35949 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
35950diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
35951index 4217f29..88f547a 100644
35952--- a/drivers/atm/iphase.c
35953+++ b/drivers/atm/iphase.c
35954@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
35955 status = (u_short) (buf_desc_ptr->desc_mode);
35956 if (status & (RX_CER | RX_PTE | RX_OFL))
35957 {
35958- atomic_inc(&vcc->stats->rx_err);
35959+ atomic_inc_unchecked(&vcc->stats->rx_err);
35960 IF_ERR(printk("IA: bad packet, dropping it");)
35961 if (status & RX_CER) {
35962 IF_ERR(printk(" cause: packet CRC error\n");)
35963@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
35964 len = dma_addr - buf_addr;
35965 if (len > iadev->rx_buf_sz) {
35966 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
35967- atomic_inc(&vcc->stats->rx_err);
35968+ atomic_inc_unchecked(&vcc->stats->rx_err);
35969 goto out_free_desc;
35970 }
35971
35972@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
35973 ia_vcc = INPH_IA_VCC(vcc);
35974 if (ia_vcc == NULL)
35975 {
35976- atomic_inc(&vcc->stats->rx_err);
35977+ atomic_inc_unchecked(&vcc->stats->rx_err);
35978 atm_return(vcc, skb->truesize);
35979 dev_kfree_skb_any(skb);
35980 goto INCR_DLE;
35981@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
35982 if ((length > iadev->rx_buf_sz) || (length >
35983 (skb->len - sizeof(struct cpcs_trailer))))
35984 {
35985- atomic_inc(&vcc->stats->rx_err);
35986+ atomic_inc_unchecked(&vcc->stats->rx_err);
35987 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
35988 length, skb->len);)
35989 atm_return(vcc, skb->truesize);
35990@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
35991
35992 IF_RX(printk("rx_dle_intr: skb push");)
35993 vcc->push(vcc,skb);
35994- atomic_inc(&vcc->stats->rx);
35995+ atomic_inc_unchecked(&vcc->stats->rx);
35996 iadev->rx_pkt_cnt++;
35997 }
35998 INCR_DLE:
35999@@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
36000 {
36001 struct k_sonet_stats *stats;
36002 stats = &PRIV(_ia_dev[board])->sonet_stats;
36003- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
36004- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
36005- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
36006- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
36007- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
36008- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
36009- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
36010- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
36011- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
36012+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
36013+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
36014+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
36015+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
36016+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
36017+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
36018+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
36019+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
36020+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
36021 }
36022 ia_cmds.status = 0;
36023 break;
36024@@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36025 if ((desc == 0) || (desc > iadev->num_tx_desc))
36026 {
36027 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
36028- atomic_inc(&vcc->stats->tx);
36029+ atomic_inc_unchecked(&vcc->stats->tx);
36030 if (vcc->pop)
36031 vcc->pop(vcc, skb);
36032 else
36033@@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36034 ATM_DESC(skb) = vcc->vci;
36035 skb_queue_tail(&iadev->tx_dma_q, skb);
36036
36037- atomic_inc(&vcc->stats->tx);
36038+ atomic_inc_unchecked(&vcc->stats->tx);
36039 iadev->tx_pkt_cnt++;
36040 /* Increment transaction counter */
36041 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
36042
36043 #if 0
36044 /* add flow control logic */
36045- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
36046+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
36047 if (iavcc->vc_desc_cnt > 10) {
36048 vcc->tx_quota = vcc->tx_quota * 3 / 4;
36049 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
36050diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
36051index fa7d701..1e404c7 100644
36052--- a/drivers/atm/lanai.c
36053+++ b/drivers/atm/lanai.c
36054@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
36055 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
36056 lanai_endtx(lanai, lvcc);
36057 lanai_free_skb(lvcc->tx.atmvcc, skb);
36058- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
36059+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
36060 }
36061
36062 /* Try to fill the buffer - don't call unless there is backlog */
36063@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
36064 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
36065 __net_timestamp(skb);
36066 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
36067- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
36068+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
36069 out:
36070 lvcc->rx.buf.ptr = end;
36071 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
36072@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36073 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
36074 "vcc %d\n", lanai->number, (unsigned int) s, vci);
36075 lanai->stats.service_rxnotaal5++;
36076- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36077+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36078 return 0;
36079 }
36080 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
36081@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36082 int bytes;
36083 read_unlock(&vcc_sklist_lock);
36084 DPRINTK("got trashed rx pdu on vci %d\n", vci);
36085- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36086+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36087 lvcc->stats.x.aal5.service_trash++;
36088 bytes = (SERVICE_GET_END(s) * 16) -
36089 (((unsigned long) lvcc->rx.buf.ptr) -
36090@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36091 }
36092 if (s & SERVICE_STREAM) {
36093 read_unlock(&vcc_sklist_lock);
36094- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36095+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36096 lvcc->stats.x.aal5.service_stream++;
36097 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
36098 "PDU on VCI %d!\n", lanai->number, vci);
36099@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
36100 return 0;
36101 }
36102 DPRINTK("got rx crc error on vci %d\n", vci);
36103- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
36104+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
36105 lvcc->stats.x.aal5.service_rxcrc++;
36106 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
36107 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
36108diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
36109index 5aca5f4..ce3a6b0 100644
36110--- a/drivers/atm/nicstar.c
36111+++ b/drivers/atm/nicstar.c
36112@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36113 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
36114 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
36115 card->index);
36116- atomic_inc(&vcc->stats->tx_err);
36117+ atomic_inc_unchecked(&vcc->stats->tx_err);
36118 dev_kfree_skb_any(skb);
36119 return -EINVAL;
36120 }
36121@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36122 if (!vc->tx) {
36123 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
36124 card->index);
36125- atomic_inc(&vcc->stats->tx_err);
36126+ atomic_inc_unchecked(&vcc->stats->tx_err);
36127 dev_kfree_skb_any(skb);
36128 return -EINVAL;
36129 }
36130@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36131 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
36132 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
36133 card->index);
36134- atomic_inc(&vcc->stats->tx_err);
36135+ atomic_inc_unchecked(&vcc->stats->tx_err);
36136 dev_kfree_skb_any(skb);
36137 return -EINVAL;
36138 }
36139
36140 if (skb_shinfo(skb)->nr_frags != 0) {
36141 printk("nicstar%d: No scatter-gather yet.\n", card->index);
36142- atomic_inc(&vcc->stats->tx_err);
36143+ atomic_inc_unchecked(&vcc->stats->tx_err);
36144 dev_kfree_skb_any(skb);
36145 return -EINVAL;
36146 }
36147@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
36148 }
36149
36150 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
36151- atomic_inc(&vcc->stats->tx_err);
36152+ atomic_inc_unchecked(&vcc->stats->tx_err);
36153 dev_kfree_skb_any(skb);
36154 return -EIO;
36155 }
36156- atomic_inc(&vcc->stats->tx);
36157+ atomic_inc_unchecked(&vcc->stats->tx);
36158
36159 return 0;
36160 }
36161@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36162 printk
36163 ("nicstar%d: Can't allocate buffers for aal0.\n",
36164 card->index);
36165- atomic_add(i, &vcc->stats->rx_drop);
36166+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
36167 break;
36168 }
36169 if (!atm_charge(vcc, sb->truesize)) {
36170 RXPRINTK
36171 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
36172 card->index);
36173- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
36174+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
36175 dev_kfree_skb_any(sb);
36176 break;
36177 }
36178@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36179 ATM_SKB(sb)->vcc = vcc;
36180 __net_timestamp(sb);
36181 vcc->push(vcc, sb);
36182- atomic_inc(&vcc->stats->rx);
36183+ atomic_inc_unchecked(&vcc->stats->rx);
36184 cell += ATM_CELL_PAYLOAD;
36185 }
36186
36187@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36188 if (iovb == NULL) {
36189 printk("nicstar%d: Out of iovec buffers.\n",
36190 card->index);
36191- atomic_inc(&vcc->stats->rx_drop);
36192+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36193 recycle_rx_buf(card, skb);
36194 return;
36195 }
36196@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36197 small or large buffer itself. */
36198 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
36199 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
36200- atomic_inc(&vcc->stats->rx_err);
36201+ atomic_inc_unchecked(&vcc->stats->rx_err);
36202 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36203 NS_MAX_IOVECS);
36204 NS_PRV_IOVCNT(iovb) = 0;
36205@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36206 ("nicstar%d: Expected a small buffer, and this is not one.\n",
36207 card->index);
36208 which_list(card, skb);
36209- atomic_inc(&vcc->stats->rx_err);
36210+ atomic_inc_unchecked(&vcc->stats->rx_err);
36211 recycle_rx_buf(card, skb);
36212 vc->rx_iov = NULL;
36213 recycle_iov_buf(card, iovb);
36214@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36215 ("nicstar%d: Expected a large buffer, and this is not one.\n",
36216 card->index);
36217 which_list(card, skb);
36218- atomic_inc(&vcc->stats->rx_err);
36219+ atomic_inc_unchecked(&vcc->stats->rx_err);
36220 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36221 NS_PRV_IOVCNT(iovb));
36222 vc->rx_iov = NULL;
36223@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36224 printk(" - PDU size mismatch.\n");
36225 else
36226 printk(".\n");
36227- atomic_inc(&vcc->stats->rx_err);
36228+ atomic_inc_unchecked(&vcc->stats->rx_err);
36229 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
36230 NS_PRV_IOVCNT(iovb));
36231 vc->rx_iov = NULL;
36232@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36233 /* skb points to a small buffer */
36234 if (!atm_charge(vcc, skb->truesize)) {
36235 push_rxbufs(card, skb);
36236- atomic_inc(&vcc->stats->rx_drop);
36237+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36238 } else {
36239 skb_put(skb, len);
36240 dequeue_sm_buf(card, skb);
36241@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36242 ATM_SKB(skb)->vcc = vcc;
36243 __net_timestamp(skb);
36244 vcc->push(vcc, skb);
36245- atomic_inc(&vcc->stats->rx);
36246+ atomic_inc_unchecked(&vcc->stats->rx);
36247 }
36248 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
36249 struct sk_buff *sb;
36250@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36251 if (len <= NS_SMBUFSIZE) {
36252 if (!atm_charge(vcc, sb->truesize)) {
36253 push_rxbufs(card, sb);
36254- atomic_inc(&vcc->stats->rx_drop);
36255+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36256 } else {
36257 skb_put(sb, len);
36258 dequeue_sm_buf(card, sb);
36259@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36260 ATM_SKB(sb)->vcc = vcc;
36261 __net_timestamp(sb);
36262 vcc->push(vcc, sb);
36263- atomic_inc(&vcc->stats->rx);
36264+ atomic_inc_unchecked(&vcc->stats->rx);
36265 }
36266
36267 push_rxbufs(card, skb);
36268@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36269
36270 if (!atm_charge(vcc, skb->truesize)) {
36271 push_rxbufs(card, skb);
36272- atomic_inc(&vcc->stats->rx_drop);
36273+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36274 } else {
36275 dequeue_lg_buf(card, skb);
36276 #ifdef NS_USE_DESTRUCTORS
36277@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36278 ATM_SKB(skb)->vcc = vcc;
36279 __net_timestamp(skb);
36280 vcc->push(vcc, skb);
36281- atomic_inc(&vcc->stats->rx);
36282+ atomic_inc_unchecked(&vcc->stats->rx);
36283 }
36284
36285 push_rxbufs(card, sb);
36286@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36287 printk
36288 ("nicstar%d: Out of huge buffers.\n",
36289 card->index);
36290- atomic_inc(&vcc->stats->rx_drop);
36291+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36292 recycle_iovec_rx_bufs(card,
36293 (struct iovec *)
36294 iovb->data,
36295@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36296 card->hbpool.count++;
36297 } else
36298 dev_kfree_skb_any(hb);
36299- atomic_inc(&vcc->stats->rx_drop);
36300+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36301 } else {
36302 /* Copy the small buffer to the huge buffer */
36303 sb = (struct sk_buff *)iov->iov_base;
36304@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
36305 #endif /* NS_USE_DESTRUCTORS */
36306 __net_timestamp(hb);
36307 vcc->push(vcc, hb);
36308- atomic_inc(&vcc->stats->rx);
36309+ atomic_inc_unchecked(&vcc->stats->rx);
36310 }
36311 }
36312
36313diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
36314index 32784d1..4a8434a 100644
36315--- a/drivers/atm/solos-pci.c
36316+++ b/drivers/atm/solos-pci.c
36317@@ -838,7 +838,7 @@ void solos_bh(unsigned long card_arg)
36318 }
36319 atm_charge(vcc, skb->truesize);
36320 vcc->push(vcc, skb);
36321- atomic_inc(&vcc->stats->rx);
36322+ atomic_inc_unchecked(&vcc->stats->rx);
36323 break;
36324
36325 case PKT_STATUS:
36326@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
36327 vcc = SKB_CB(oldskb)->vcc;
36328
36329 if (vcc) {
36330- atomic_inc(&vcc->stats->tx);
36331+ atomic_inc_unchecked(&vcc->stats->tx);
36332 solos_pop(vcc, oldskb);
36333 } else {
36334 dev_kfree_skb_irq(oldskb);
36335diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
36336index 0215934..ce9f5b1 100644
36337--- a/drivers/atm/suni.c
36338+++ b/drivers/atm/suni.c
36339@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
36340
36341
36342 #define ADD_LIMITED(s,v) \
36343- atomic_add((v),&stats->s); \
36344- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
36345+ atomic_add_unchecked((v),&stats->s); \
36346+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
36347
36348
36349 static void suni_hz(unsigned long from_timer)
36350diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
36351index 5120a96..e2572bd 100644
36352--- a/drivers/atm/uPD98402.c
36353+++ b/drivers/atm/uPD98402.c
36354@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
36355 struct sonet_stats tmp;
36356 int error = 0;
36357
36358- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
36359+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
36360 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
36361 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
36362 if (zero && !error) {
36363@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
36364
36365
36366 #define ADD_LIMITED(s,v) \
36367- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
36368- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
36369- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
36370+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
36371+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
36372+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
36373
36374
36375 static void stat_event(struct atm_dev *dev)
36376@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
36377 if (reason & uPD98402_INT_PFM) stat_event(dev);
36378 if (reason & uPD98402_INT_PCO) {
36379 (void) GET(PCOCR); /* clear interrupt cause */
36380- atomic_add(GET(HECCT),
36381+ atomic_add_unchecked(GET(HECCT),
36382 &PRIV(dev)->sonet_stats.uncorr_hcs);
36383 }
36384 if ((reason & uPD98402_INT_RFO) &&
36385@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
36386 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
36387 uPD98402_INT_LOS),PIMR); /* enable them */
36388 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
36389- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
36390- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
36391- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
36392+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
36393+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
36394+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
36395 return 0;
36396 }
36397
36398diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
36399index 969c3c2..9b72956 100644
36400--- a/drivers/atm/zatm.c
36401+++ b/drivers/atm/zatm.c
36402@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
36403 }
36404 if (!size) {
36405 dev_kfree_skb_irq(skb);
36406- if (vcc) atomic_inc(&vcc->stats->rx_err);
36407+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
36408 continue;
36409 }
36410 if (!atm_charge(vcc,skb->truesize)) {
36411@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
36412 skb->len = size;
36413 ATM_SKB(skb)->vcc = vcc;
36414 vcc->push(vcc,skb);
36415- atomic_inc(&vcc->stats->rx);
36416+ atomic_inc_unchecked(&vcc->stats->rx);
36417 }
36418 zout(pos & 0xffff,MTA(mbx));
36419 #if 0 /* probably a stupid idea */
36420@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
36421 skb_queue_head(&zatm_vcc->backlog,skb);
36422 break;
36423 }
36424- atomic_inc(&vcc->stats->tx);
36425+ atomic_inc_unchecked(&vcc->stats->tx);
36426 wake_up(&zatm_vcc->tx_wait);
36427 }
36428
36429diff --git a/drivers/base/bus.c b/drivers/base/bus.c
36430index 4c289ab..de1c333 100644
36431--- a/drivers/base/bus.c
36432+++ b/drivers/base/bus.c
36433@@ -1193,7 +1193,7 @@ int subsys_interface_register(struct subsys_interface *sif)
36434 return -EINVAL;
36435
36436 mutex_lock(&subsys->p->mutex);
36437- list_add_tail(&sif->node, &subsys->p->interfaces);
36438+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
36439 if (sif->add_dev) {
36440 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
36441 while ((dev = subsys_dev_iter_next(&iter)))
36442@@ -1218,7 +1218,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
36443 subsys = sif->subsys;
36444
36445 mutex_lock(&subsys->p->mutex);
36446- list_del_init(&sif->node);
36447+ pax_list_del_init((struct list_head *)&sif->node);
36448 if (sif->remove_dev) {
36449 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
36450 while ((dev = subsys_dev_iter_next(&iter)))
36451diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
36452index 7413d06..79155fa 100644
36453--- a/drivers/base/devtmpfs.c
36454+++ b/drivers/base/devtmpfs.c
36455@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
36456 if (!thread)
36457 return 0;
36458
36459- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
36460+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
36461 if (err)
36462 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
36463 else
36464@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
36465 *err = sys_unshare(CLONE_NEWNS);
36466 if (*err)
36467 goto out;
36468- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
36469+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
36470 if (*err)
36471 goto out;
36472- sys_chdir("/.."); /* will traverse into overmounted root */
36473- sys_chroot(".");
36474+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
36475+ sys_chroot((char __force_user *)".");
36476 complete(&setup_done);
36477 while (1) {
36478 spin_lock(&req_lock);
36479diff --git a/drivers/base/node.c b/drivers/base/node.c
36480index bc9f43b..29703b8 100644
36481--- a/drivers/base/node.c
36482+++ b/drivers/base/node.c
36483@@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
36484 struct node_attr {
36485 struct device_attribute attr;
36486 enum node_states state;
36487-};
36488+} __do_const;
36489
36490 static ssize_t show_node_state(struct device *dev,
36491 struct device_attribute *attr, char *buf)
36492diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
36493index bfb8955..42c9b9a 100644
36494--- a/drivers/base/power/domain.c
36495+++ b/drivers/base/power/domain.c
36496@@ -1850,7 +1850,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
36497 {
36498 struct cpuidle_driver *cpuidle_drv;
36499 struct gpd_cpu_data *cpu_data;
36500- struct cpuidle_state *idle_state;
36501+ cpuidle_state_no_const *idle_state;
36502 int ret = 0;
36503
36504 if (IS_ERR_OR_NULL(genpd) || state < 0)
36505@@ -1918,7 +1918,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
36506 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
36507 {
36508 struct gpd_cpu_data *cpu_data;
36509- struct cpuidle_state *idle_state;
36510+ cpuidle_state_no_const *idle_state;
36511 int ret = 0;
36512
36513 if (IS_ERR_OR_NULL(genpd))
36514diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
36515index 03e089a..0e9560c 100644
36516--- a/drivers/base/power/sysfs.c
36517+++ b/drivers/base/power/sysfs.c
36518@@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
36519 return -EIO;
36520 }
36521 }
36522- return sprintf(buf, p);
36523+ return sprintf(buf, "%s", p);
36524 }
36525
36526 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
36527diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
36528index 2d56f41..8830f19 100644
36529--- a/drivers/base/power/wakeup.c
36530+++ b/drivers/base/power/wakeup.c
36531@@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
36532 * They need to be modified together atomically, so it's better to use one
36533 * atomic variable to hold them both.
36534 */
36535-static atomic_t combined_event_count = ATOMIC_INIT(0);
36536+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
36537
36538 #define IN_PROGRESS_BITS (sizeof(int) * 4)
36539 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
36540
36541 static void split_counters(unsigned int *cnt, unsigned int *inpr)
36542 {
36543- unsigned int comb = atomic_read(&combined_event_count);
36544+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
36545
36546 *cnt = (comb >> IN_PROGRESS_BITS);
36547 *inpr = comb & MAX_IN_PROGRESS;
36548@@ -395,7 +395,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
36549 ws->start_prevent_time = ws->last_time;
36550
36551 /* Increment the counter of events in progress. */
36552- cec = atomic_inc_return(&combined_event_count);
36553+ cec = atomic_inc_return_unchecked(&combined_event_count);
36554
36555 trace_wakeup_source_activate(ws->name, cec);
36556 }
36557@@ -521,7 +521,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
36558 * Increment the counter of registered wakeup events and decrement the
36559 * couter of wakeup events in progress simultaneously.
36560 */
36561- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
36562+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
36563 trace_wakeup_source_deactivate(ws->name, cec);
36564
36565 split_counters(&cnt, &inpr);
36566diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
36567index e8d11b6..7b1b36f 100644
36568--- a/drivers/base/syscore.c
36569+++ b/drivers/base/syscore.c
36570@@ -21,7 +21,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
36571 void register_syscore_ops(struct syscore_ops *ops)
36572 {
36573 mutex_lock(&syscore_ops_lock);
36574- list_add_tail(&ops->node, &syscore_ops_list);
36575+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
36576 mutex_unlock(&syscore_ops_lock);
36577 }
36578 EXPORT_SYMBOL_GPL(register_syscore_ops);
36579@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
36580 void unregister_syscore_ops(struct syscore_ops *ops)
36581 {
36582 mutex_lock(&syscore_ops_lock);
36583- list_del(&ops->node);
36584+ pax_list_del((struct list_head *)&ops->node);
36585 mutex_unlock(&syscore_ops_lock);
36586 }
36587 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
36588diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
36589index edfa251..1734d4d 100644
36590--- a/drivers/block/cciss.c
36591+++ b/drivers/block/cciss.c
36592@@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h)
36593 while (!list_empty(&h->reqQ)) {
36594 c = list_entry(h->reqQ.next, CommandList_struct, list);
36595 /* can't do anything if fifo is full */
36596- if ((h->access.fifo_full(h))) {
36597+ if ((h->access->fifo_full(h))) {
36598 dev_warn(&h->pdev->dev, "fifo full\n");
36599 break;
36600 }
36601@@ -3021,7 +3021,7 @@ static void start_io(ctlr_info_t *h)
36602 h->Qdepth--;
36603
36604 /* Tell the controller execute command */
36605- h->access.submit_command(h, c);
36606+ h->access->submit_command(h, c);
36607
36608 /* Put job onto the completed Q */
36609 addQ(&h->cmpQ, c);
36610@@ -3447,17 +3447,17 @@ startio:
36611
36612 static inline unsigned long get_next_completion(ctlr_info_t *h)
36613 {
36614- return h->access.command_completed(h);
36615+ return h->access->command_completed(h);
36616 }
36617
36618 static inline int interrupt_pending(ctlr_info_t *h)
36619 {
36620- return h->access.intr_pending(h);
36621+ return h->access->intr_pending(h);
36622 }
36623
36624 static inline long interrupt_not_for_us(ctlr_info_t *h)
36625 {
36626- return ((h->access.intr_pending(h) == 0) ||
36627+ return ((h->access->intr_pending(h) == 0) ||
36628 (h->interrupts_enabled == 0));
36629 }
36630
36631@@ -3490,7 +3490,7 @@ static inline u32 next_command(ctlr_info_t *h)
36632 u32 a;
36633
36634 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
36635- return h->access.command_completed(h);
36636+ return h->access->command_completed(h);
36637
36638 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
36639 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
36640@@ -4047,7 +4047,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
36641 trans_support & CFGTBL_Trans_use_short_tags);
36642
36643 /* Change the access methods to the performant access methods */
36644- h->access = SA5_performant_access;
36645+ h->access = &SA5_performant_access;
36646 h->transMethod = CFGTBL_Trans_Performant;
36647
36648 return;
36649@@ -4327,7 +4327,7 @@ static int cciss_pci_init(ctlr_info_t *h)
36650 if (prod_index < 0)
36651 return -ENODEV;
36652 h->product_name = products[prod_index].product_name;
36653- h->access = *(products[prod_index].access);
36654+ h->access = products[prod_index].access;
36655
36656 if (cciss_board_disabled(h)) {
36657 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
36658@@ -5059,7 +5059,7 @@ reinit_after_soft_reset:
36659 }
36660
36661 /* make sure the board interrupts are off */
36662- h->access.set_intr_mask(h, CCISS_INTR_OFF);
36663+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
36664 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
36665 if (rc)
36666 goto clean2;
36667@@ -5109,7 +5109,7 @@ reinit_after_soft_reset:
36668 * fake ones to scoop up any residual completions.
36669 */
36670 spin_lock_irqsave(&h->lock, flags);
36671- h->access.set_intr_mask(h, CCISS_INTR_OFF);
36672+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
36673 spin_unlock_irqrestore(&h->lock, flags);
36674 free_irq(h->intr[h->intr_mode], h);
36675 rc = cciss_request_irq(h, cciss_msix_discard_completions,
36676@@ -5129,9 +5129,9 @@ reinit_after_soft_reset:
36677 dev_info(&h->pdev->dev, "Board READY.\n");
36678 dev_info(&h->pdev->dev,
36679 "Waiting for stale completions to drain.\n");
36680- h->access.set_intr_mask(h, CCISS_INTR_ON);
36681+ h->access->set_intr_mask(h, CCISS_INTR_ON);
36682 msleep(10000);
36683- h->access.set_intr_mask(h, CCISS_INTR_OFF);
36684+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
36685
36686 rc = controller_reset_failed(h->cfgtable);
36687 if (rc)
36688@@ -5154,7 +5154,7 @@ reinit_after_soft_reset:
36689 cciss_scsi_setup(h);
36690
36691 /* Turn the interrupts on so we can service requests */
36692- h->access.set_intr_mask(h, CCISS_INTR_ON);
36693+ h->access->set_intr_mask(h, CCISS_INTR_ON);
36694
36695 /* Get the firmware version */
36696 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
36697@@ -5226,7 +5226,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
36698 kfree(flush_buf);
36699 if (return_code != IO_OK)
36700 dev_warn(&h->pdev->dev, "Error flushing cache\n");
36701- h->access.set_intr_mask(h, CCISS_INTR_OFF);
36702+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
36703 free_irq(h->intr[h->intr_mode], h);
36704 }
36705
36706diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
36707index 7fda30e..eb5dfe0 100644
36708--- a/drivers/block/cciss.h
36709+++ b/drivers/block/cciss.h
36710@@ -101,7 +101,7 @@ struct ctlr_info
36711 /* information about each logical volume */
36712 drive_info_struct *drv[CISS_MAX_LUN];
36713
36714- struct access_method access;
36715+ struct access_method *access;
36716
36717 /* queue and queue Info */
36718 struct list_head reqQ;
36719diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
36720index 2b94403..fd6ad1f 100644
36721--- a/drivers/block/cpqarray.c
36722+++ b/drivers/block/cpqarray.c
36723@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
36724 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
36725 goto Enomem4;
36726 }
36727- hba[i]->access.set_intr_mask(hba[i], 0);
36728+ hba[i]->access->set_intr_mask(hba[i], 0);
36729 if (request_irq(hba[i]->intr, do_ida_intr,
36730 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
36731 {
36732@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
36733 add_timer(&hba[i]->timer);
36734
36735 /* Enable IRQ now that spinlock and rate limit timer are set up */
36736- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
36737+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
36738
36739 for(j=0; j<NWD; j++) {
36740 struct gendisk *disk = ida_gendisk[i][j];
36741@@ -694,7 +694,7 @@ DBGINFO(
36742 for(i=0; i<NR_PRODUCTS; i++) {
36743 if (board_id == products[i].board_id) {
36744 c->product_name = products[i].product_name;
36745- c->access = *(products[i].access);
36746+ c->access = products[i].access;
36747 break;
36748 }
36749 }
36750@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
36751 hba[ctlr]->intr = intr;
36752 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
36753 hba[ctlr]->product_name = products[j].product_name;
36754- hba[ctlr]->access = *(products[j].access);
36755+ hba[ctlr]->access = products[j].access;
36756 hba[ctlr]->ctlr = ctlr;
36757 hba[ctlr]->board_id = board_id;
36758 hba[ctlr]->pci_dev = NULL; /* not PCI */
36759@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
36760
36761 while((c = h->reqQ) != NULL) {
36762 /* Can't do anything if we're busy */
36763- if (h->access.fifo_full(h) == 0)
36764+ if (h->access->fifo_full(h) == 0)
36765 return;
36766
36767 /* Get the first entry from the request Q */
36768@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
36769 h->Qdepth--;
36770
36771 /* Tell the controller to do our bidding */
36772- h->access.submit_command(h, c);
36773+ h->access->submit_command(h, c);
36774
36775 /* Get onto the completion Q */
36776 addQ(&h->cmpQ, c);
36777@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
36778 unsigned long flags;
36779 __u32 a,a1;
36780
36781- istat = h->access.intr_pending(h);
36782+ istat = h->access->intr_pending(h);
36783 /* Is this interrupt for us? */
36784 if (istat == 0)
36785 return IRQ_NONE;
36786@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
36787 */
36788 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
36789 if (istat & FIFO_NOT_EMPTY) {
36790- while((a = h->access.command_completed(h))) {
36791+ while((a = h->access->command_completed(h))) {
36792 a1 = a; a &= ~3;
36793 if ((c = h->cmpQ) == NULL)
36794 {
36795@@ -1448,11 +1448,11 @@ static int sendcmd(
36796 /*
36797 * Disable interrupt
36798 */
36799- info_p->access.set_intr_mask(info_p, 0);
36800+ info_p->access->set_intr_mask(info_p, 0);
36801 /* Make sure there is room in the command FIFO */
36802 /* Actually it should be completely empty at this time. */
36803 for (i = 200000; i > 0; i--) {
36804- temp = info_p->access.fifo_full(info_p);
36805+ temp = info_p->access->fifo_full(info_p);
36806 if (temp != 0) {
36807 break;
36808 }
36809@@ -1465,7 +1465,7 @@ DBG(
36810 /*
36811 * Send the cmd
36812 */
36813- info_p->access.submit_command(info_p, c);
36814+ info_p->access->submit_command(info_p, c);
36815 complete = pollcomplete(ctlr);
36816
36817 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
36818@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
36819 * we check the new geometry. Then turn interrupts back on when
36820 * we're done.
36821 */
36822- host->access.set_intr_mask(host, 0);
36823+ host->access->set_intr_mask(host, 0);
36824 getgeometry(ctlr);
36825- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
36826+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
36827
36828 for(i=0; i<NWD; i++) {
36829 struct gendisk *disk = ida_gendisk[ctlr][i];
36830@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
36831 /* Wait (up to 2 seconds) for a command to complete */
36832
36833 for (i = 200000; i > 0; i--) {
36834- done = hba[ctlr]->access.command_completed(hba[ctlr]);
36835+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
36836 if (done == 0) {
36837 udelay(10); /* a short fixed delay */
36838 } else
36839diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
36840index be73e9d..7fbf140 100644
36841--- a/drivers/block/cpqarray.h
36842+++ b/drivers/block/cpqarray.h
36843@@ -99,7 +99,7 @@ struct ctlr_info {
36844 drv_info_t drv[NWD];
36845 struct proc_dir_entry *proc;
36846
36847- struct access_method access;
36848+ struct access_method *access;
36849
36850 cmdlist_t *reqQ;
36851 cmdlist_t *cmpQ;
36852diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
36853index 2d7f608..11245fe 100644
36854--- a/drivers/block/drbd/drbd_int.h
36855+++ b/drivers/block/drbd/drbd_int.h
36856@@ -582,7 +582,7 @@ struct drbd_epoch {
36857 struct drbd_tconn *tconn;
36858 struct list_head list;
36859 unsigned int barrier_nr;
36860- atomic_t epoch_size; /* increased on every request added. */
36861+ atomic_unchecked_t epoch_size; /* increased on every request added. */
36862 atomic_t active; /* increased on every req. added, and dec on every finished. */
36863 unsigned long flags;
36864 };
36865@@ -1022,7 +1022,7 @@ struct drbd_conf {
36866 unsigned int al_tr_number;
36867 int al_tr_cycle;
36868 wait_queue_head_t seq_wait;
36869- atomic_t packet_seq;
36870+ atomic_unchecked_t packet_seq;
36871 unsigned int peer_seq;
36872 spinlock_t peer_seq_lock;
36873 unsigned int minor;
36874@@ -1572,7 +1572,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
36875 char __user *uoptval;
36876 int err;
36877
36878- uoptval = (char __user __force *)optval;
36879+ uoptval = (char __force_user *)optval;
36880
36881 set_fs(KERNEL_DS);
36882 if (level == SOL_SOCKET)
36883diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
36884index 55635ed..40e837c 100644
36885--- a/drivers/block/drbd/drbd_main.c
36886+++ b/drivers/block/drbd/drbd_main.c
36887@@ -1317,7 +1317,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
36888 p->sector = sector;
36889 p->block_id = block_id;
36890 p->blksize = blksize;
36891- p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
36892+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
36893 return drbd_send_command(mdev, sock, cmd, sizeof(*p), NULL, 0);
36894 }
36895
36896@@ -1619,7 +1619,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
36897 return -EIO;
36898 p->sector = cpu_to_be64(req->i.sector);
36899 p->block_id = (unsigned long)req;
36900- p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
36901+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
36902 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
36903 if (mdev->state.conn >= C_SYNC_SOURCE &&
36904 mdev->state.conn <= C_PAUSED_SYNC_T)
36905@@ -2574,8 +2574,8 @@ void conn_destroy(struct kref *kref)
36906 {
36907 struct drbd_tconn *tconn = container_of(kref, struct drbd_tconn, kref);
36908
36909- if (atomic_read(&tconn->current_epoch->epoch_size) != 0)
36910- conn_err(tconn, "epoch_size:%d\n", atomic_read(&tconn->current_epoch->epoch_size));
36911+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size) != 0)
36912+ conn_err(tconn, "epoch_size:%d\n", atomic_read_unchecked(&tconn->current_epoch->epoch_size));
36913 kfree(tconn->current_epoch);
36914
36915 idr_destroy(&tconn->volumes);
36916diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
36917index 8cc1e64..ba7ffa9 100644
36918--- a/drivers/block/drbd/drbd_nl.c
36919+++ b/drivers/block/drbd/drbd_nl.c
36920@@ -3440,7 +3440,7 @@ out:
36921
36922 void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
36923 {
36924- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
36925+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
36926 struct sk_buff *msg;
36927 struct drbd_genlmsghdr *d_out;
36928 unsigned seq;
36929@@ -3453,7 +3453,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
36930 return;
36931 }
36932
36933- seq = atomic_inc_return(&drbd_genl_seq);
36934+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
36935 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
36936 if (!msg)
36937 goto failed;
36938diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
36939index cc29cd3..d4b058b 100644
36940--- a/drivers/block/drbd/drbd_receiver.c
36941+++ b/drivers/block/drbd/drbd_receiver.c
36942@@ -834,7 +834,7 @@ int drbd_connected(struct drbd_conf *mdev)
36943 {
36944 int err;
36945
36946- atomic_set(&mdev->packet_seq, 0);
36947+ atomic_set_unchecked(&mdev->packet_seq, 0);
36948 mdev->peer_seq = 0;
36949
36950 mdev->state_mutex = mdev->tconn->agreed_pro_version < 100 ?
36951@@ -1193,7 +1193,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
36952 do {
36953 next_epoch = NULL;
36954
36955- epoch_size = atomic_read(&epoch->epoch_size);
36956+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
36957
36958 switch (ev & ~EV_CLEANUP) {
36959 case EV_PUT:
36960@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
36961 rv = FE_DESTROYED;
36962 } else {
36963 epoch->flags = 0;
36964- atomic_set(&epoch->epoch_size, 0);
36965+ atomic_set_unchecked(&epoch->epoch_size, 0);
36966 /* atomic_set(&epoch->active, 0); is already zero */
36967 if (rv == FE_STILL_LIVE)
36968 rv = FE_RECYCLED;
36969@@ -1451,7 +1451,7 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
36970 conn_wait_active_ee_empty(tconn);
36971 drbd_flush(tconn);
36972
36973- if (atomic_read(&tconn->current_epoch->epoch_size)) {
36974+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
36975 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
36976 if (epoch)
36977 break;
36978@@ -1464,11 +1464,11 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
36979 }
36980
36981 epoch->flags = 0;
36982- atomic_set(&epoch->epoch_size, 0);
36983+ atomic_set_unchecked(&epoch->epoch_size, 0);
36984 atomic_set(&epoch->active, 0);
36985
36986 spin_lock(&tconn->epoch_lock);
36987- if (atomic_read(&tconn->current_epoch->epoch_size)) {
36988+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
36989 list_add(&epoch->list, &tconn->current_epoch->list);
36990 tconn->current_epoch = epoch;
36991 tconn->epochs++;
36992@@ -2172,7 +2172,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
36993
36994 err = wait_for_and_update_peer_seq(mdev, peer_seq);
36995 drbd_send_ack_dp(mdev, P_NEG_ACK, p, pi->size);
36996- atomic_inc(&tconn->current_epoch->epoch_size);
36997+ atomic_inc_unchecked(&tconn->current_epoch->epoch_size);
36998 err2 = drbd_drain_block(mdev, pi->size);
36999 if (!err)
37000 err = err2;
37001@@ -2206,7 +2206,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
37002
37003 spin_lock(&tconn->epoch_lock);
37004 peer_req->epoch = tconn->current_epoch;
37005- atomic_inc(&peer_req->epoch->epoch_size);
37006+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
37007 atomic_inc(&peer_req->epoch->active);
37008 spin_unlock(&tconn->epoch_lock);
37009
37010@@ -4347,7 +4347,7 @@ struct data_cmd {
37011 int expect_payload;
37012 size_t pkt_size;
37013 int (*fn)(struct drbd_tconn *, struct packet_info *);
37014-};
37015+} __do_const;
37016
37017 static struct data_cmd drbd_cmd_handler[] = {
37018 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
37019@@ -4467,7 +4467,7 @@ static void conn_disconnect(struct drbd_tconn *tconn)
37020 if (!list_empty(&tconn->current_epoch->list))
37021 conn_err(tconn, "ASSERTION FAILED: tconn->current_epoch->list not empty\n");
37022 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
37023- atomic_set(&tconn->current_epoch->epoch_size, 0);
37024+ atomic_set_unchecked(&tconn->current_epoch->epoch_size, 0);
37025 tconn->send.seen_any_write_yet = false;
37026
37027 conn_info(tconn, "Connection closed\n");
37028@@ -5223,7 +5223,7 @@ static int tconn_finish_peer_reqs(struct drbd_tconn *tconn)
37029 struct asender_cmd {
37030 size_t pkt_size;
37031 int (*fn)(struct drbd_tconn *tconn, struct packet_info *);
37032-};
37033+} __do_const;
37034
37035 static struct asender_cmd asender_tbl[] = {
37036 [P_PING] = { 0, got_Ping },
37037diff --git a/drivers/block/loop.c b/drivers/block/loop.c
37038index c8dac73..1800093 100644
37039--- a/drivers/block/loop.c
37040+++ b/drivers/block/loop.c
37041@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
37042
37043 file_start_write(file);
37044 set_fs(get_ds());
37045- bw = file->f_op->write(file, buf, len, &pos);
37046+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
37047 set_fs(old_fs);
37048 file_end_write(file);
37049 if (likely(bw == len))
37050diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
37051index 5618847..5a46f3b 100644
37052--- a/drivers/block/pktcdvd.c
37053+++ b/drivers/block/pktcdvd.c
37054@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
37055
37056 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
37057 {
37058- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
37059+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
37060 }
37061
37062 /*
37063@@ -1897,7 +1897,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
37064 return -EROFS;
37065 }
37066 pd->settings.fp = ti.fp;
37067- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
37068+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
37069
37070 if (ti.nwa_v) {
37071 pd->nwa = be32_to_cpu(ti.next_writable);
37072diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
37073index 60abf59..80789e1 100644
37074--- a/drivers/bluetooth/btwilink.c
37075+++ b/drivers/bluetooth/btwilink.c
37076@@ -293,7 +293,7 @@ static int ti_st_send_frame(struct sk_buff *skb)
37077
37078 static int bt_ti_probe(struct platform_device *pdev)
37079 {
37080- static struct ti_st *hst;
37081+ struct ti_st *hst;
37082 struct hci_dev *hdev;
37083 int err;
37084
37085diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
37086index 2009266..7be9ca2 100644
37087--- a/drivers/bus/arm-cci.c
37088+++ b/drivers/bus/arm-cci.c
37089@@ -405,7 +405,7 @@ static int __init cci_probe(void)
37090
37091 nb_cci_ports = cci_config->nb_ace + cci_config->nb_ace_lite;
37092
37093- ports = kcalloc(sizeof(*ports), nb_cci_ports, GFP_KERNEL);
37094+ ports = kcalloc(nb_cci_ports, sizeof(*ports), GFP_KERNEL);
37095 if (!ports)
37096 return -ENOMEM;
37097
37098diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
37099index 8a3aff7..d7538c2 100644
37100--- a/drivers/cdrom/cdrom.c
37101+++ b/drivers/cdrom/cdrom.c
37102@@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
37103 ENSURE(reset, CDC_RESET);
37104 ENSURE(generic_packet, CDC_GENERIC_PACKET);
37105 cdi->mc_flags = 0;
37106- cdo->n_minors = 0;
37107 cdi->options = CDO_USE_FFLAGS;
37108
37109 if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
37110@@ -436,8 +435,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
37111 else
37112 cdi->cdda_method = CDDA_OLD;
37113
37114- if (!cdo->generic_packet)
37115- cdo->generic_packet = cdrom_dummy_generic_packet;
37116+ if (!cdo->generic_packet) {
37117+ pax_open_kernel();
37118+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
37119+ pax_close_kernel();
37120+ }
37121
37122 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
37123 mutex_lock(&cdrom_mutex);
37124@@ -458,7 +460,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
37125 if (cdi->exit)
37126 cdi->exit(cdi);
37127
37128- cdi->ops->n_minors--;
37129 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
37130 }
37131
37132@@ -2107,7 +2108,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
37133 */
37134 nr = nframes;
37135 do {
37136- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
37137+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
37138 if (cgc.buffer)
37139 break;
37140
37141@@ -3429,7 +3430,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
37142 struct cdrom_device_info *cdi;
37143 int ret;
37144
37145- ret = scnprintf(info + *pos, max_size - *pos, header);
37146+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
37147 if (!ret)
37148 return 1;
37149
37150diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
37151index 5980cb9..6d7bd7e 100644
37152--- a/drivers/cdrom/gdrom.c
37153+++ b/drivers/cdrom/gdrom.c
37154@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
37155 .audio_ioctl = gdrom_audio_ioctl,
37156 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
37157 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
37158- .n_minors = 1,
37159 };
37160
37161 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
37162diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
37163index 1421997..33f5d6d 100644
37164--- a/drivers/char/Kconfig
37165+++ b/drivers/char/Kconfig
37166@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
37167
37168 config DEVKMEM
37169 bool "/dev/kmem virtual device support"
37170- default y
37171+ default n
37172+ depends on !GRKERNSEC_KMEM
37173 help
37174 Say Y here if you want to support the /dev/kmem device. The
37175 /dev/kmem device is rarely used, but can be used for certain
37176@@ -570,6 +571,7 @@ config DEVPORT
37177 bool
37178 depends on !M68K
37179 depends on ISA || PCI
37180+ depends on !GRKERNSEC_KMEM
37181 default y
37182
37183 source "drivers/s390/char/Kconfig"
37184diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
37185index a48e05b..6bac831 100644
37186--- a/drivers/char/agp/compat_ioctl.c
37187+++ b/drivers/char/agp/compat_ioctl.c
37188@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
37189 return -ENOMEM;
37190 }
37191
37192- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
37193+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
37194 sizeof(*usegment) * ureserve.seg_count)) {
37195 kfree(usegment);
37196 kfree(ksegment);
37197diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
37198index 1b19239..b87b143 100644
37199--- a/drivers/char/agp/frontend.c
37200+++ b/drivers/char/agp/frontend.c
37201@@ -819,7 +819,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
37202 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
37203 return -EFAULT;
37204
37205- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
37206+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
37207 return -EFAULT;
37208
37209 client = agp_find_client_by_pid(reserve.pid);
37210@@ -849,7 +849,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
37211 if (segment == NULL)
37212 return -ENOMEM;
37213
37214- if (copy_from_user(segment, (void __user *) reserve.seg_list,
37215+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
37216 sizeof(struct agp_segment) * reserve.seg_count)) {
37217 kfree(segment);
37218 return -EFAULT;
37219diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
37220index 4f94375..413694e 100644
37221--- a/drivers/char/genrtc.c
37222+++ b/drivers/char/genrtc.c
37223@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
37224 switch (cmd) {
37225
37226 case RTC_PLL_GET:
37227+ memset(&pll, 0, sizeof(pll));
37228 if (get_rtc_pll(&pll))
37229 return -EINVAL;
37230 else
37231diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
37232index 448ce5e..3a76625 100644
37233--- a/drivers/char/hpet.c
37234+++ b/drivers/char/hpet.c
37235@@ -559,7 +559,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
37236 }
37237
37238 static int
37239-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
37240+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
37241 struct hpet_info *info)
37242 {
37243 struct hpet_timer __iomem *timer;
37244diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
37245index 86fe45c..c0ea948 100644
37246--- a/drivers/char/hw_random/intel-rng.c
37247+++ b/drivers/char/hw_random/intel-rng.c
37248@@ -314,7 +314,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
37249
37250 if (no_fwh_detect)
37251 return -ENODEV;
37252- printk(warning);
37253+ printk("%s", warning);
37254 return -EBUSY;
37255 }
37256
37257diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
37258index ec4e10f..f2a763b 100644
37259--- a/drivers/char/ipmi/ipmi_msghandler.c
37260+++ b/drivers/char/ipmi/ipmi_msghandler.c
37261@@ -420,7 +420,7 @@ struct ipmi_smi {
37262 struct proc_dir_entry *proc_dir;
37263 char proc_dir_name[10];
37264
37265- atomic_t stats[IPMI_NUM_STATS];
37266+ atomic_unchecked_t stats[IPMI_NUM_STATS];
37267
37268 /*
37269 * run_to_completion duplicate of smb_info, smi_info
37270@@ -453,9 +453,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
37271
37272
37273 #define ipmi_inc_stat(intf, stat) \
37274- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
37275+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
37276 #define ipmi_get_stat(intf, stat) \
37277- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
37278+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
37279
37280 static int is_lan_addr(struct ipmi_addr *addr)
37281 {
37282@@ -2883,7 +2883,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
37283 INIT_LIST_HEAD(&intf->cmd_rcvrs);
37284 init_waitqueue_head(&intf->waitq);
37285 for (i = 0; i < IPMI_NUM_STATS; i++)
37286- atomic_set(&intf->stats[i], 0);
37287+ atomic_set_unchecked(&intf->stats[i], 0);
37288
37289 intf->proc_dir = NULL;
37290
37291diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
37292index 15e4a60..b046093 100644
37293--- a/drivers/char/ipmi/ipmi_si_intf.c
37294+++ b/drivers/char/ipmi/ipmi_si_intf.c
37295@@ -280,7 +280,7 @@ struct smi_info {
37296 unsigned char slave_addr;
37297
37298 /* Counters and things for the proc filesystem. */
37299- atomic_t stats[SI_NUM_STATS];
37300+ atomic_unchecked_t stats[SI_NUM_STATS];
37301
37302 struct task_struct *thread;
37303
37304@@ -289,9 +289,9 @@ struct smi_info {
37305 };
37306
37307 #define smi_inc_stat(smi, stat) \
37308- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
37309+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
37310 #define smi_get_stat(smi, stat) \
37311- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
37312+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
37313
37314 #define SI_MAX_PARMS 4
37315
37316@@ -3324,7 +3324,7 @@ static int try_smi_init(struct smi_info *new_smi)
37317 atomic_set(&new_smi->req_events, 0);
37318 new_smi->run_to_completion = 0;
37319 for (i = 0; i < SI_NUM_STATS; i++)
37320- atomic_set(&new_smi->stats[i], 0);
37321+ atomic_set_unchecked(&new_smi->stats[i], 0);
37322
37323 new_smi->interrupt_disabled = 1;
37324 atomic_set(&new_smi->stop_operation, 0);
37325diff --git a/drivers/char/mem.c b/drivers/char/mem.c
37326index f895a8c..2bc9147 100644
37327--- a/drivers/char/mem.c
37328+++ b/drivers/char/mem.c
37329@@ -18,6 +18,7 @@
37330 #include <linux/raw.h>
37331 #include <linux/tty.h>
37332 #include <linux/capability.h>
37333+#include <linux/security.h>
37334 #include <linux/ptrace.h>
37335 #include <linux/device.h>
37336 #include <linux/highmem.h>
37337@@ -37,6 +38,10 @@
37338
37339 #define DEVPORT_MINOR 4
37340
37341+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
37342+extern const struct file_operations grsec_fops;
37343+#endif
37344+
37345 static inline unsigned long size_inside_page(unsigned long start,
37346 unsigned long size)
37347 {
37348@@ -68,9 +73,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
37349
37350 while (cursor < to) {
37351 if (!devmem_is_allowed(pfn)) {
37352+#ifdef CONFIG_GRKERNSEC_KMEM
37353+ gr_handle_mem_readwrite(from, to);
37354+#else
37355 printk(KERN_INFO
37356 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
37357 current->comm, from, to);
37358+#endif
37359 return 0;
37360 }
37361 cursor += PAGE_SIZE;
37362@@ -78,6 +87,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
37363 }
37364 return 1;
37365 }
37366+#elif defined(CONFIG_GRKERNSEC_KMEM)
37367+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
37368+{
37369+ return 0;
37370+}
37371 #else
37372 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
37373 {
37374@@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
37375
37376 while (count > 0) {
37377 unsigned long remaining;
37378+ char *temp;
37379
37380 sz = size_inside_page(p, count);
37381
37382@@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
37383 if (!ptr)
37384 return -EFAULT;
37385
37386- remaining = copy_to_user(buf, ptr, sz);
37387+#ifdef CONFIG_PAX_USERCOPY
37388+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
37389+ if (!temp) {
37390+ unxlate_dev_mem_ptr(p, ptr);
37391+ return -ENOMEM;
37392+ }
37393+ memcpy(temp, ptr, sz);
37394+#else
37395+ temp = ptr;
37396+#endif
37397+
37398+ remaining = copy_to_user(buf, temp, sz);
37399+
37400+#ifdef CONFIG_PAX_USERCOPY
37401+ kfree(temp);
37402+#endif
37403+
37404 unxlate_dev_mem_ptr(p, ptr);
37405 if (remaining)
37406 return -EFAULT;
37407@@ -364,9 +395,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
37408 size_t count, loff_t *ppos)
37409 {
37410 unsigned long p = *ppos;
37411- ssize_t low_count, read, sz;
37412+ ssize_t low_count, read, sz, err = 0;
37413 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
37414- int err = 0;
37415
37416 read = 0;
37417 if (p < (unsigned long) high_memory) {
37418@@ -388,6 +418,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
37419 }
37420 #endif
37421 while (low_count > 0) {
37422+ char *temp;
37423+
37424 sz = size_inside_page(p, low_count);
37425
37426 /*
37427@@ -397,7 +429,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
37428 */
37429 kbuf = xlate_dev_kmem_ptr((char *)p);
37430
37431- if (copy_to_user(buf, kbuf, sz))
37432+#ifdef CONFIG_PAX_USERCOPY
37433+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
37434+ if (!temp)
37435+ return -ENOMEM;
37436+ memcpy(temp, kbuf, sz);
37437+#else
37438+ temp = kbuf;
37439+#endif
37440+
37441+ err = copy_to_user(buf, temp, sz);
37442+
37443+#ifdef CONFIG_PAX_USERCOPY
37444+ kfree(temp);
37445+#endif
37446+
37447+ if (err)
37448 return -EFAULT;
37449 buf += sz;
37450 p += sz;
37451@@ -822,6 +869,9 @@ static const struct memdev {
37452 #ifdef CONFIG_PRINTK
37453 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
37454 #endif
37455+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
37456+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
37457+#endif
37458 };
37459
37460 static int memory_open(struct inode *inode, struct file *filp)
37461@@ -893,7 +943,7 @@ static int __init chr_dev_init(void)
37462 continue;
37463
37464 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
37465- NULL, devlist[minor].name);
37466+ NULL, "%s", devlist[minor].name);
37467 }
37468
37469 return tty_init();
37470diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
37471index 9df78e2..01ba9ae 100644
37472--- a/drivers/char/nvram.c
37473+++ b/drivers/char/nvram.c
37474@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
37475
37476 spin_unlock_irq(&rtc_lock);
37477
37478- if (copy_to_user(buf, contents, tmp - contents))
37479+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
37480 return -EFAULT;
37481
37482 *ppos = i;
37483diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
37484index d39cca6..8c1e269 100644
37485--- a/drivers/char/pcmcia/synclink_cs.c
37486+++ b/drivers/char/pcmcia/synclink_cs.c
37487@@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
37488
37489 if (debug_level >= DEBUG_LEVEL_INFO)
37490 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
37491- __FILE__, __LINE__, info->device_name, port->count);
37492+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
37493
37494- WARN_ON(!port->count);
37495+ WARN_ON(!atomic_read(&port->count));
37496
37497 if (tty_port_close_start(port, tty, filp) == 0)
37498 goto cleanup;
37499@@ -2365,7 +2365,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
37500 cleanup:
37501 if (debug_level >= DEBUG_LEVEL_INFO)
37502 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
37503- tty->driver->name, port->count);
37504+ tty->driver->name, atomic_read(&port->count));
37505 }
37506
37507 /* Wait until the transmitter is empty.
37508@@ -2507,7 +2507,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
37509
37510 if (debug_level >= DEBUG_LEVEL_INFO)
37511 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
37512- __FILE__, __LINE__, tty->driver->name, port->count);
37513+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
37514
37515 /* If port is closing, signal caller to try again */
37516 if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
37517@@ -2527,11 +2527,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
37518 goto cleanup;
37519 }
37520 spin_lock(&port->lock);
37521- port->count++;
37522+ atomic_inc(&port->count);
37523 spin_unlock(&port->lock);
37524 spin_unlock_irqrestore(&info->netlock, flags);
37525
37526- if (port->count == 1) {
37527+ if (atomic_read(&port->count) == 1) {
37528 /* 1st open on this device, init hardware */
37529 retval = startup(info, tty);
37530 if (retval < 0)
37531@@ -3920,7 +3920,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
37532 unsigned short new_crctype;
37533
37534 /* return error if TTY interface open */
37535- if (info->port.count)
37536+ if (atomic_read(&info->port.count))
37537 return -EBUSY;
37538
37539 switch (encoding)
37540@@ -4024,7 +4024,7 @@ static int hdlcdev_open(struct net_device *dev)
37541
37542 /* arbitrate between network and tty opens */
37543 spin_lock_irqsave(&info->netlock, flags);
37544- if (info->port.count != 0 || info->netcount != 0) {
37545+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
37546 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
37547 spin_unlock_irqrestore(&info->netlock, flags);
37548 return -EBUSY;
37549@@ -4114,7 +4114,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
37550 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
37551
37552 /* return error if TTY interface open */
37553- if (info->port.count)
37554+ if (atomic_read(&info->port.count))
37555 return -EBUSY;
37556
37557 if (cmd != SIOCWANDEV)
37558diff --git a/drivers/char/random.c b/drivers/char/random.c
37559index 7a744d3..35a177ee 100644
37560--- a/drivers/char/random.c
37561+++ b/drivers/char/random.c
37562@@ -269,8 +269,13 @@
37563 /*
37564 * Configuration information
37565 */
37566+#ifdef CONFIG_GRKERNSEC_RANDNET
37567+#define INPUT_POOL_WORDS 512
37568+#define OUTPUT_POOL_WORDS 128
37569+#else
37570 #define INPUT_POOL_WORDS 128
37571 #define OUTPUT_POOL_WORDS 32
37572+#endif
37573 #define SEC_XFER_SIZE 512
37574 #define EXTRACT_SIZE 10
37575
37576@@ -310,10 +315,17 @@ static struct poolinfo {
37577 int poolwords;
37578 int tap1, tap2, tap3, tap4, tap5;
37579 } poolinfo_table[] = {
37580+#ifdef CONFIG_GRKERNSEC_RANDNET
37581+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
37582+ { 512, 411, 308, 208, 104, 1 },
37583+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
37584+ { 128, 103, 76, 51, 25, 1 },
37585+#else
37586 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
37587 { 128, 103, 76, 51, 25, 1 },
37588 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
37589 { 32, 26, 20, 14, 7, 1 },
37590+#endif
37591 #if 0
37592 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
37593 { 2048, 1638, 1231, 819, 411, 1 },
37594@@ -521,8 +533,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
37595 input_rotate += i ? 7 : 14;
37596 }
37597
37598- ACCESS_ONCE(r->input_rotate) = input_rotate;
37599- ACCESS_ONCE(r->add_ptr) = i;
37600+ ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
37601+ ACCESS_ONCE_RW(r->add_ptr) = i;
37602 smp_wmb();
37603
37604 if (out)
37605@@ -1029,7 +1041,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
37606
37607 extract_buf(r, tmp);
37608 i = min_t(int, nbytes, EXTRACT_SIZE);
37609- if (copy_to_user(buf, tmp, i)) {
37610+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
37611 ret = -EFAULT;
37612 break;
37613 }
37614@@ -1365,7 +1377,7 @@ EXPORT_SYMBOL(generate_random_uuid);
37615 #include <linux/sysctl.h>
37616
37617 static int min_read_thresh = 8, min_write_thresh;
37618-static int max_read_thresh = INPUT_POOL_WORDS * 32;
37619+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
37620 static int max_write_thresh = INPUT_POOL_WORDS * 32;
37621 static char sysctl_bootid[16];
37622
37623@@ -1381,7 +1393,7 @@ static char sysctl_bootid[16];
37624 static int proc_do_uuid(struct ctl_table *table, int write,
37625 void __user *buffer, size_t *lenp, loff_t *ppos)
37626 {
37627- struct ctl_table fake_table;
37628+ ctl_table_no_const fake_table;
37629 unsigned char buf[64], tmp_uuid[16], *uuid;
37630
37631 uuid = table->data;
37632diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
37633index 7cc1fe22..b602d6b 100644
37634--- a/drivers/char/sonypi.c
37635+++ b/drivers/char/sonypi.c
37636@@ -54,6 +54,7 @@
37637
37638 #include <asm/uaccess.h>
37639 #include <asm/io.h>
37640+#include <asm/local.h>
37641
37642 #include <linux/sonypi.h>
37643
37644@@ -490,7 +491,7 @@ static struct sonypi_device {
37645 spinlock_t fifo_lock;
37646 wait_queue_head_t fifo_proc_list;
37647 struct fasync_struct *fifo_async;
37648- int open_count;
37649+ local_t open_count;
37650 int model;
37651 struct input_dev *input_jog_dev;
37652 struct input_dev *input_key_dev;
37653@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
37654 static int sonypi_misc_release(struct inode *inode, struct file *file)
37655 {
37656 mutex_lock(&sonypi_device.lock);
37657- sonypi_device.open_count--;
37658+ local_dec(&sonypi_device.open_count);
37659 mutex_unlock(&sonypi_device.lock);
37660 return 0;
37661 }
37662@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
37663 {
37664 mutex_lock(&sonypi_device.lock);
37665 /* Flush input queue on first open */
37666- if (!sonypi_device.open_count)
37667+ if (!local_read(&sonypi_device.open_count))
37668 kfifo_reset(&sonypi_device.fifo);
37669- sonypi_device.open_count++;
37670+ local_inc(&sonypi_device.open_count);
37671 mutex_unlock(&sonypi_device.lock);
37672
37673 return 0;
37674diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
37675index 64420b3..5c40b56 100644
37676--- a/drivers/char/tpm/tpm_acpi.c
37677+++ b/drivers/char/tpm/tpm_acpi.c
37678@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
37679 virt = acpi_os_map_memory(start, len);
37680 if (!virt) {
37681 kfree(log->bios_event_log);
37682+ log->bios_event_log = NULL;
37683 printk("%s: ERROR - Unable to map memory\n", __func__);
37684 return -EIO;
37685 }
37686
37687- memcpy_fromio(log->bios_event_log, virt, len);
37688+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
37689
37690 acpi_os_unmap_memory(virt, len);
37691 return 0;
37692diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
37693index 84ddc55..1d32f1e 100644
37694--- a/drivers/char/tpm/tpm_eventlog.c
37695+++ b/drivers/char/tpm/tpm_eventlog.c
37696@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
37697 event = addr;
37698
37699 if ((event->event_type == 0 && event->event_size == 0) ||
37700- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
37701+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
37702 return NULL;
37703
37704 return addr;
37705@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
37706 return NULL;
37707
37708 if ((event->event_type == 0 && event->event_size == 0) ||
37709- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
37710+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
37711 return NULL;
37712
37713 (*pos)++;
37714@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
37715 int i;
37716
37717 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
37718- seq_putc(m, data[i]);
37719+ if (!seq_putc(m, data[i]))
37720+ return -EFAULT;
37721
37722 return 0;
37723 }
37724diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
37725index b79cf3e..de172d64f 100644
37726--- a/drivers/char/virtio_console.c
37727+++ b/drivers/char/virtio_console.c
37728@@ -682,7 +682,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
37729 if (to_user) {
37730 ssize_t ret;
37731
37732- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
37733+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
37734 if (ret)
37735 return -EFAULT;
37736 } else {
37737@@ -785,7 +785,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
37738 if (!port_has_data(port) && !port->host_connected)
37739 return 0;
37740
37741- return fill_readbuf(port, ubuf, count, true);
37742+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
37743 }
37744
37745 static int wait_port_writable(struct port *port, bool nonblock)
37746diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
37747index a33f46f..a720eed 100644
37748--- a/drivers/clk/clk-composite.c
37749+++ b/drivers/clk/clk-composite.c
37750@@ -122,7 +122,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
37751 struct clk *clk;
37752 struct clk_init_data init;
37753 struct clk_composite *composite;
37754- struct clk_ops *clk_composite_ops;
37755+ clk_ops_no_const *clk_composite_ops;
37756
37757 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
37758 if (!composite) {
37759diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
37760index 81dd31a..ef5c542 100644
37761--- a/drivers/clk/socfpga/clk.c
37762+++ b/drivers/clk/socfpga/clk.c
37763@@ -22,6 +22,7 @@
37764 #include <linux/clk-provider.h>
37765 #include <linux/io.h>
37766 #include <linux/of.h>
37767+#include <asm/pgtable.h>
37768
37769 /* Clock Manager offsets */
37770 #define CLKMGR_CTRL 0x0
37771@@ -152,8 +153,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node,
37772 streq(clk_name, "periph_pll") ||
37773 streq(clk_name, "sdram_pll")) {
37774 socfpga_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
37775- clk_pll_ops.enable = clk_gate_ops.enable;
37776- clk_pll_ops.disable = clk_gate_ops.disable;
37777+ pax_open_kernel();
37778+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
37779+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
37780+ pax_close_kernel();
37781 }
37782
37783 clk = clk_register(NULL, &socfpga_clk->hw.hw);
37784@@ -244,7 +247,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
37785 return parent_rate / div;
37786 }
37787
37788-static struct clk_ops gateclk_ops = {
37789+static clk_ops_no_const gateclk_ops __read_only = {
37790 .recalc_rate = socfpga_clk_recalc_rate,
37791 .get_parent = socfpga_clk_get_parent,
37792 .set_parent = socfpga_clk_set_parent,
37793diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
37794index 506fd23..01a593f 100644
37795--- a/drivers/cpufreq/acpi-cpufreq.c
37796+++ b/drivers/cpufreq/acpi-cpufreq.c
37797@@ -172,7 +172,7 @@ static ssize_t show_global_boost(struct kobject *kobj,
37798 return sprintf(buf, "%u\n", boost_enabled);
37799 }
37800
37801-static struct global_attr global_boost = __ATTR(boost, 0644,
37802+static global_attr_no_const global_boost = __ATTR(boost, 0644,
37803 show_global_boost,
37804 store_global_boost);
37805
37806@@ -721,8 +721,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
37807 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
37808 per_cpu(acfreq_data, cpu) = data;
37809
37810- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
37811- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
37812+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
37813+ pax_open_kernel();
37814+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
37815+ pax_close_kernel();
37816+ }
37817
37818 result = acpi_processor_register_performance(data->acpi_data, cpu);
37819 if (result)
37820@@ -850,7 +853,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
37821 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
37822 break;
37823 case ACPI_ADR_SPACE_FIXED_HARDWARE:
37824- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
37825+ pax_open_kernel();
37826+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
37827+ pax_close_kernel();
37828 policy->cur = get_cur_freq_on_cpu(cpu);
37829 break;
37830 default:
37831diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
37832index 04548f7..457a342 100644
37833--- a/drivers/cpufreq/cpufreq.c
37834+++ b/drivers/cpufreq/cpufreq.c
37835@@ -2069,7 +2069,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
37836 return NOTIFY_OK;
37837 }
37838
37839-static struct notifier_block __refdata cpufreq_cpu_notifier = {
37840+static struct notifier_block cpufreq_cpu_notifier = {
37841 .notifier_call = cpufreq_cpu_callback,
37842 };
37843
37844@@ -2101,8 +2101,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
37845
37846 pr_debug("trying to register driver %s\n", driver_data->name);
37847
37848- if (driver_data->setpolicy)
37849- driver_data->flags |= CPUFREQ_CONST_LOOPS;
37850+ if (driver_data->setpolicy) {
37851+ pax_open_kernel();
37852+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
37853+ pax_close_kernel();
37854+ }
37855
37856 write_lock_irqsave(&cpufreq_driver_lock, flags);
37857 if (cpufreq_driver) {
37858diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
37859index 0806c31..6a73276 100644
37860--- a/drivers/cpufreq/cpufreq_governor.c
37861+++ b/drivers/cpufreq/cpufreq_governor.c
37862@@ -187,7 +187,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
37863 struct dbs_data *dbs_data;
37864 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
37865 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
37866- struct od_ops *od_ops = NULL;
37867+ const struct od_ops *od_ops = NULL;
37868 struct od_dbs_tuners *od_tuners = NULL;
37869 struct cs_dbs_tuners *cs_tuners = NULL;
37870 struct cpu_dbs_common_info *cpu_cdbs;
37871@@ -253,7 +253,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
37872
37873 if ((cdata->governor == GOV_CONSERVATIVE) &&
37874 (!policy->governor->initialized)) {
37875- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
37876+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
37877
37878 cpufreq_register_notifier(cs_ops->notifier_block,
37879 CPUFREQ_TRANSITION_NOTIFIER);
37880@@ -273,7 +273,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
37881
37882 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
37883 (policy->governor->initialized == 1)) {
37884- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
37885+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
37886
37887 cpufreq_unregister_notifier(cs_ops->notifier_block,
37888 CPUFREQ_TRANSITION_NOTIFIER);
37889diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
37890index 88cd39f..87f0393 100644
37891--- a/drivers/cpufreq/cpufreq_governor.h
37892+++ b/drivers/cpufreq/cpufreq_governor.h
37893@@ -202,7 +202,7 @@ struct common_dbs_data {
37894 void (*exit)(struct dbs_data *dbs_data);
37895
37896 /* Governor specific ops, see below */
37897- void *gov_ops;
37898+ const void *gov_ops;
37899 };
37900
37901 /* Governor Per policy data */
37902@@ -222,7 +222,7 @@ struct od_ops {
37903 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
37904 unsigned int freq_next, unsigned int relation);
37905 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
37906-};
37907+} __no_const;
37908
37909 struct cs_ops {
37910 struct notifier_block *notifier_block;
37911diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
37912index 32f26f6..feb657b 100644
37913--- a/drivers/cpufreq/cpufreq_ondemand.c
37914+++ b/drivers/cpufreq/cpufreq_ondemand.c
37915@@ -522,7 +522,7 @@ static void od_exit(struct dbs_data *dbs_data)
37916
37917 define_get_cpu_dbs_routines(od_cpu_dbs_info);
37918
37919-static struct od_ops od_ops = {
37920+static struct od_ops od_ops __read_only = {
37921 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
37922 .powersave_bias_target = generic_powersave_bias_target,
37923 .freq_increase = dbs_freq_increase,
37924@@ -577,14 +577,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
37925 (struct cpufreq_policy *, unsigned int, unsigned int),
37926 unsigned int powersave_bias)
37927 {
37928- od_ops.powersave_bias_target = f;
37929+ pax_open_kernel();
37930+ *(void **)&od_ops.powersave_bias_target = f;
37931+ pax_close_kernel();
37932 od_set_powersave_bias(powersave_bias);
37933 }
37934 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
37935
37936 void od_unregister_powersave_bias_handler(void)
37937 {
37938- od_ops.powersave_bias_target = generic_powersave_bias_target;
37939+ pax_open_kernel();
37940+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
37941+ pax_close_kernel();
37942 od_set_powersave_bias(0);
37943 }
37944 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
37945diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
37946index 4cf0d28..5830372 100644
37947--- a/drivers/cpufreq/cpufreq_stats.c
37948+++ b/drivers/cpufreq/cpufreq_stats.c
37949@@ -352,7 +352,7 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
37950 }
37951
37952 /* priority=1 so this will get called before cpufreq_remove_dev */
37953-static struct notifier_block cpufreq_stat_cpu_notifier __refdata = {
37954+static struct notifier_block cpufreq_stat_cpu_notifier = {
37955 .notifier_call = cpufreq_stat_cpu_callback,
37956 .priority = 1,
37957 };
37958diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
37959index 2f0a2a6..93d728e 100644
37960--- a/drivers/cpufreq/p4-clockmod.c
37961+++ b/drivers/cpufreq/p4-clockmod.c
37962@@ -160,10 +160,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
37963 case 0x0F: /* Core Duo */
37964 case 0x16: /* Celeron Core */
37965 case 0x1C: /* Atom */
37966- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37967+ pax_open_kernel();
37968+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37969+ pax_close_kernel();
37970 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
37971 case 0x0D: /* Pentium M (Dothan) */
37972- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37973+ pax_open_kernel();
37974+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37975+ pax_close_kernel();
37976 /* fall through */
37977 case 0x09: /* Pentium M (Banias) */
37978 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
37979@@ -175,7 +179,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
37980
37981 /* on P-4s, the TSC runs with constant frequency independent whether
37982 * throttling is active or not. */
37983- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37984+ pax_open_kernel();
37985+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
37986+ pax_close_kernel();
37987
37988 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
37989 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
37990diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
37991index ac76b48..2445bc6 100644
37992--- a/drivers/cpufreq/sparc-us3-cpufreq.c
37993+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
37994@@ -18,14 +18,12 @@
37995 #include <asm/head.h>
37996 #include <asm/timer.h>
37997
37998-static struct cpufreq_driver *cpufreq_us3_driver;
37999-
38000 struct us3_freq_percpu_info {
38001 struct cpufreq_frequency_table table[4];
38002 };
38003
38004 /* Indexed by cpu number. */
38005-static struct us3_freq_percpu_info *us3_freq_table;
38006+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
38007
38008 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
38009 * in the Safari config register.
38010@@ -186,12 +184,25 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
38011
38012 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
38013 {
38014- if (cpufreq_us3_driver)
38015- us3_set_cpu_divider_index(policy, 0);
38016+ us3_set_cpu_divider_index(policy->cpu, 0);
38017
38018 return 0;
38019 }
38020
38021+static int __init us3_freq_init(void);
38022+static void __exit us3_freq_exit(void);
38023+
38024+static struct cpufreq_driver cpufreq_us3_driver = {
38025+ .init = us3_freq_cpu_init,
38026+ .verify = us3_freq_verify,
38027+ .target = us3_freq_target,
38028+ .get = us3_freq_get,
38029+ .exit = us3_freq_cpu_exit,
38030+ .owner = THIS_MODULE,
38031+ .name = "UltraSPARC-III",
38032+
38033+};
38034+
38035 static int __init us3_freq_init(void)
38036 {
38037 unsigned long manuf, impl, ver;
38038@@ -208,55 +219,15 @@ static int __init us3_freq_init(void)
38039 (impl == CHEETAH_IMPL ||
38040 impl == CHEETAH_PLUS_IMPL ||
38041 impl == JAGUAR_IMPL ||
38042- impl == PANTHER_IMPL)) {
38043- struct cpufreq_driver *driver;
38044-
38045- ret = -ENOMEM;
38046- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
38047- if (!driver)
38048- goto err_out;
38049-
38050- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
38051- GFP_KERNEL);
38052- if (!us3_freq_table)
38053- goto err_out;
38054-
38055- driver->init = us3_freq_cpu_init;
38056- driver->verify = us3_freq_verify;
38057- driver->target = us3_freq_target;
38058- driver->get = us3_freq_get;
38059- driver->exit = us3_freq_cpu_exit;
38060- strcpy(driver->name, "UltraSPARC-III");
38061-
38062- cpufreq_us3_driver = driver;
38063- ret = cpufreq_register_driver(driver);
38064- if (ret)
38065- goto err_out;
38066-
38067- return 0;
38068-
38069-err_out:
38070- if (driver) {
38071- kfree(driver);
38072- cpufreq_us3_driver = NULL;
38073- }
38074- kfree(us3_freq_table);
38075- us3_freq_table = NULL;
38076- return ret;
38077- }
38078+ impl == PANTHER_IMPL))
38079+ return cpufreq_register_driver(&cpufreq_us3_driver);
38080
38081 return -ENODEV;
38082 }
38083
38084 static void __exit us3_freq_exit(void)
38085 {
38086- if (cpufreq_us3_driver) {
38087- cpufreq_unregister_driver(cpufreq_us3_driver);
38088- kfree(cpufreq_us3_driver);
38089- cpufreq_us3_driver = NULL;
38090- kfree(us3_freq_table);
38091- us3_freq_table = NULL;
38092- }
38093+ cpufreq_unregister_driver(&cpufreq_us3_driver);
38094 }
38095
38096 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
38097diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
38098index f897d51..15da295 100644
38099--- a/drivers/cpufreq/speedstep-centrino.c
38100+++ b/drivers/cpufreq/speedstep-centrino.c
38101@@ -353,8 +353,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
38102 !cpu_has(cpu, X86_FEATURE_EST))
38103 return -ENODEV;
38104
38105- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
38106- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
38107+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
38108+ pax_open_kernel();
38109+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
38110+ pax_close_kernel();
38111+ }
38112
38113 if (policy->cpu != 0)
38114 return -ENODEV;
38115diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
38116index 22c07fb..9dff5ac 100644
38117--- a/drivers/cpuidle/cpuidle.c
38118+++ b/drivers/cpuidle/cpuidle.c
38119@@ -252,7 +252,7 @@ static int poll_idle(struct cpuidle_device *dev,
38120
38121 static void poll_idle_init(struct cpuidle_driver *drv)
38122 {
38123- struct cpuidle_state *state = &drv->states[0];
38124+ cpuidle_state_no_const *state = &drv->states[0];
38125
38126 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
38127 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
38128diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
38129index ea2f8e7..70ac501 100644
38130--- a/drivers/cpuidle/governor.c
38131+++ b/drivers/cpuidle/governor.c
38132@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
38133 mutex_lock(&cpuidle_lock);
38134 if (__cpuidle_find_governor(gov->name) == NULL) {
38135 ret = 0;
38136- list_add_tail(&gov->governor_list, &cpuidle_governors);
38137+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
38138 if (!cpuidle_curr_governor ||
38139 cpuidle_curr_governor->rating < gov->rating)
38140 cpuidle_switch_governor(gov);
38141@@ -135,7 +135,7 @@ void cpuidle_unregister_governor(struct cpuidle_governor *gov)
38142 new_gov = cpuidle_replace_governor(gov->rating);
38143 cpuidle_switch_governor(new_gov);
38144 }
38145- list_del(&gov->governor_list);
38146+ pax_list_del((struct list_head *)&gov->governor_list);
38147 mutex_unlock(&cpuidle_lock);
38148 }
38149
38150diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
38151index 8739cc0..dc859d0 100644
38152--- a/drivers/cpuidle/sysfs.c
38153+++ b/drivers/cpuidle/sysfs.c
38154@@ -134,7 +134,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
38155 NULL
38156 };
38157
38158-static struct attribute_group cpuidle_attr_group = {
38159+static attribute_group_no_const cpuidle_attr_group = {
38160 .attrs = cpuidle_default_attrs,
38161 .name = "cpuidle",
38162 };
38163diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
38164index 12fea3e..1e28f47 100644
38165--- a/drivers/crypto/hifn_795x.c
38166+++ b/drivers/crypto/hifn_795x.c
38167@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
38168 MODULE_PARM_DESC(hifn_pll_ref,
38169 "PLL reference clock (pci[freq] or ext[freq], default ext)");
38170
38171-static atomic_t hifn_dev_number;
38172+static atomic_unchecked_t hifn_dev_number;
38173
38174 #define ACRYPTO_OP_DECRYPT 0
38175 #define ACRYPTO_OP_ENCRYPT 1
38176@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
38177 goto err_out_disable_pci_device;
38178
38179 snprintf(name, sizeof(name), "hifn%d",
38180- atomic_inc_return(&hifn_dev_number)-1);
38181+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
38182
38183 err = pci_request_regions(pdev, name);
38184 if (err)
38185diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
38186index c99c00d..990a4b2 100644
38187--- a/drivers/devfreq/devfreq.c
38188+++ b/drivers/devfreq/devfreq.c
38189@@ -607,7 +607,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
38190 goto err_out;
38191 }
38192
38193- list_add(&governor->node, &devfreq_governor_list);
38194+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
38195
38196 list_for_each_entry(devfreq, &devfreq_list, node) {
38197 int ret = 0;
38198@@ -695,7 +695,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
38199 }
38200 }
38201
38202- list_del(&governor->node);
38203+ pax_list_del((struct list_head *)&governor->node);
38204 err_out:
38205 mutex_unlock(&devfreq_list_lock);
38206
38207diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
38208index 1069e88..dfcd642 100644
38209--- a/drivers/dma/sh/shdmac.c
38210+++ b/drivers/dma/sh/shdmac.c
38211@@ -511,7 +511,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
38212 return ret;
38213 }
38214
38215-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
38216+static struct notifier_block sh_dmae_nmi_notifier = {
38217 .notifier_call = sh_dmae_nmi_handler,
38218
38219 /* Run before NMI debug handler and KGDB */
38220diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
38221index 211021d..201d47f 100644
38222--- a/drivers/edac/edac_device.c
38223+++ b/drivers/edac/edac_device.c
38224@@ -474,9 +474,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
38225 */
38226 int edac_device_alloc_index(void)
38227 {
38228- static atomic_t device_indexes = ATOMIC_INIT(0);
38229+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
38230
38231- return atomic_inc_return(&device_indexes) - 1;
38232+ return atomic_inc_return_unchecked(&device_indexes) - 1;
38233 }
38234 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
38235
38236diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
38237index 9f7e0e60..348c875 100644
38238--- a/drivers/edac/edac_mc_sysfs.c
38239+++ b/drivers/edac/edac_mc_sysfs.c
38240@@ -150,7 +150,7 @@ static const char * const edac_caps[] = {
38241 struct dev_ch_attribute {
38242 struct device_attribute attr;
38243 int channel;
38244-};
38245+} __do_const;
38246
38247 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
38248 struct dev_ch_attribute dev_attr_legacy_##_name = \
38249@@ -1007,14 +1007,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
38250 }
38251
38252 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
38253+ pax_open_kernel();
38254 if (mci->get_sdram_scrub_rate) {
38255- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
38256- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
38257+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
38258+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
38259 }
38260 if (mci->set_sdram_scrub_rate) {
38261- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
38262- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
38263+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
38264+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
38265 }
38266+ pax_close_kernel();
38267 err = device_create_file(&mci->dev,
38268 &dev_attr_sdram_scrub_rate);
38269 if (err) {
38270diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
38271index dd370f9..0281629 100644
38272--- a/drivers/edac/edac_pci.c
38273+++ b/drivers/edac/edac_pci.c
38274@@ -29,7 +29,7 @@
38275
38276 static DEFINE_MUTEX(edac_pci_ctls_mutex);
38277 static LIST_HEAD(edac_pci_list);
38278-static atomic_t pci_indexes = ATOMIC_INIT(0);
38279+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
38280
38281 /*
38282 * edac_pci_alloc_ctl_info
38283@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
38284 */
38285 int edac_pci_alloc_index(void)
38286 {
38287- return atomic_inc_return(&pci_indexes) - 1;
38288+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
38289 }
38290 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
38291
38292diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
38293index e8658e4..22746d6 100644
38294--- a/drivers/edac/edac_pci_sysfs.c
38295+++ b/drivers/edac/edac_pci_sysfs.c
38296@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
38297 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
38298 static int edac_pci_poll_msec = 1000; /* one second workq period */
38299
38300-static atomic_t pci_parity_count = ATOMIC_INIT(0);
38301-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
38302+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
38303+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
38304
38305 static struct kobject *edac_pci_top_main_kobj;
38306 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
38307@@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
38308 void *value;
38309 ssize_t(*show) (void *, char *);
38310 ssize_t(*store) (void *, const char *, size_t);
38311-};
38312+} __do_const;
38313
38314 /* Set of show/store abstract level functions for PCI Parity object */
38315 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
38316@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38317 edac_printk(KERN_CRIT, EDAC_PCI,
38318 "Signaled System Error on %s\n",
38319 pci_name(dev));
38320- atomic_inc(&pci_nonparity_count);
38321+ atomic_inc_unchecked(&pci_nonparity_count);
38322 }
38323
38324 if (status & (PCI_STATUS_PARITY)) {
38325@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38326 "Master Data Parity Error on %s\n",
38327 pci_name(dev));
38328
38329- atomic_inc(&pci_parity_count);
38330+ atomic_inc_unchecked(&pci_parity_count);
38331 }
38332
38333 if (status & (PCI_STATUS_DETECTED_PARITY)) {
38334@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38335 "Detected Parity Error on %s\n",
38336 pci_name(dev));
38337
38338- atomic_inc(&pci_parity_count);
38339+ atomic_inc_unchecked(&pci_parity_count);
38340 }
38341 }
38342
38343@@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38344 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
38345 "Signaled System Error on %s\n",
38346 pci_name(dev));
38347- atomic_inc(&pci_nonparity_count);
38348+ atomic_inc_unchecked(&pci_nonparity_count);
38349 }
38350
38351 if (status & (PCI_STATUS_PARITY)) {
38352@@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38353 "Master Data Parity Error on "
38354 "%s\n", pci_name(dev));
38355
38356- atomic_inc(&pci_parity_count);
38357+ atomic_inc_unchecked(&pci_parity_count);
38358 }
38359
38360 if (status & (PCI_STATUS_DETECTED_PARITY)) {
38361@@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
38362 "Detected Parity Error on %s\n",
38363 pci_name(dev));
38364
38365- atomic_inc(&pci_parity_count);
38366+ atomic_inc_unchecked(&pci_parity_count);
38367 }
38368 }
38369 }
38370@@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
38371 if (!check_pci_errors)
38372 return;
38373
38374- before_count = atomic_read(&pci_parity_count);
38375+ before_count = atomic_read_unchecked(&pci_parity_count);
38376
38377 /* scan all PCI devices looking for a Parity Error on devices and
38378 * bridges.
38379@@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
38380 /* Only if operator has selected panic on PCI Error */
38381 if (edac_pci_get_panic_on_pe()) {
38382 /* If the count is different 'after' from 'before' */
38383- if (before_count != atomic_read(&pci_parity_count))
38384+ if (before_count != atomic_read_unchecked(&pci_parity_count))
38385 panic("EDAC: PCI Parity Error");
38386 }
38387 }
38388diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
38389index 51b7e3a..aa8a3e8 100644
38390--- a/drivers/edac/mce_amd.h
38391+++ b/drivers/edac/mce_amd.h
38392@@ -77,7 +77,7 @@ struct amd_decoder_ops {
38393 bool (*mc0_mce)(u16, u8);
38394 bool (*mc1_mce)(u16, u8);
38395 bool (*mc2_mce)(u16, u8);
38396-};
38397+} __no_const;
38398
38399 void amd_report_gart_errors(bool);
38400 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
38401diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
38402index 57ea7f4..af06b76 100644
38403--- a/drivers/firewire/core-card.c
38404+++ b/drivers/firewire/core-card.c
38405@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
38406 const struct fw_card_driver *driver,
38407 struct device *device)
38408 {
38409- static atomic_t index = ATOMIC_INIT(-1);
38410+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
38411
38412- card->index = atomic_inc_return(&index);
38413+ card->index = atomic_inc_return_unchecked(&index);
38414 card->driver = driver;
38415 card->device = device;
38416 card->current_tlabel = 0;
38417@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
38418
38419 void fw_core_remove_card(struct fw_card *card)
38420 {
38421- struct fw_card_driver dummy_driver = dummy_driver_template;
38422+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
38423
38424 card->driver->update_phy_reg(card, 4,
38425 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
38426diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
38427index de4aa40..49ab1f2 100644
38428--- a/drivers/firewire/core-device.c
38429+++ b/drivers/firewire/core-device.c
38430@@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
38431 struct config_rom_attribute {
38432 struct device_attribute attr;
38433 u32 key;
38434-};
38435+} __do_const;
38436
38437 static ssize_t show_immediate(struct device *dev,
38438 struct device_attribute *dattr, char *buf)
38439diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
38440index e5af0e3..d318058 100644
38441--- a/drivers/firewire/core-transaction.c
38442+++ b/drivers/firewire/core-transaction.c
38443@@ -38,6 +38,7 @@
38444 #include <linux/timer.h>
38445 #include <linux/types.h>
38446 #include <linux/workqueue.h>
38447+#include <linux/sched.h>
38448
38449 #include <asm/byteorder.h>
38450
38451diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
38452index 515a42c..5ecf3ba 100644
38453--- a/drivers/firewire/core.h
38454+++ b/drivers/firewire/core.h
38455@@ -111,6 +111,7 @@ struct fw_card_driver {
38456
38457 int (*stop_iso)(struct fw_iso_context *ctx);
38458 };
38459+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
38460
38461 void fw_card_initialize(struct fw_card *card,
38462 const struct fw_card_driver *driver, struct device *device);
38463diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
38464index 94a58a0..f5eba42 100644
38465--- a/drivers/firmware/dmi-id.c
38466+++ b/drivers/firmware/dmi-id.c
38467@@ -16,7 +16,7 @@
38468 struct dmi_device_attribute{
38469 struct device_attribute dev_attr;
38470 int field;
38471-};
38472+} __do_const;
38473 #define to_dmi_dev_attr(_dev_attr) \
38474 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
38475
38476diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
38477index fa0affb..aa448eb 100644
38478--- a/drivers/firmware/dmi_scan.c
38479+++ b/drivers/firmware/dmi_scan.c
38480@@ -791,7 +791,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
38481 if (buf == NULL)
38482 return -1;
38483
38484- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
38485+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
38486
38487 iounmap(buf);
38488 return 0;
38489diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
38490index 5145fa3..0d3babd 100644
38491--- a/drivers/firmware/efi/efi.c
38492+++ b/drivers/firmware/efi/efi.c
38493@@ -65,14 +65,16 @@ static struct attribute_group efi_subsys_attr_group = {
38494 };
38495
38496 static struct efivars generic_efivars;
38497-static struct efivar_operations generic_ops;
38498+static efivar_operations_no_const generic_ops __read_only;
38499
38500 static int generic_ops_register(void)
38501 {
38502- generic_ops.get_variable = efi.get_variable;
38503- generic_ops.set_variable = efi.set_variable;
38504- generic_ops.get_next_variable = efi.get_next_variable;
38505- generic_ops.query_variable_store = efi_query_variable_store;
38506+ pax_open_kernel();
38507+ *(void **)&generic_ops.get_variable = efi.get_variable;
38508+ *(void **)&generic_ops.set_variable = efi.set_variable;
38509+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
38510+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
38511+ pax_close_kernel();
38512
38513 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
38514 }
38515diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
38516index 8c5a61a..cf07bd0 100644
38517--- a/drivers/firmware/efi/efivars.c
38518+++ b/drivers/firmware/efi/efivars.c
38519@@ -456,7 +456,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
38520 static int
38521 create_efivars_bin_attributes(void)
38522 {
38523- struct bin_attribute *attr;
38524+ bin_attribute_no_const *attr;
38525 int error;
38526
38527 /* new_var */
38528diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
38529index 2a90ba6..07f3733 100644
38530--- a/drivers/firmware/google/memconsole.c
38531+++ b/drivers/firmware/google/memconsole.c
38532@@ -147,7 +147,9 @@ static int __init memconsole_init(void)
38533 if (!found_memconsole())
38534 return -ENODEV;
38535
38536- memconsole_bin_attr.size = memconsole_length;
38537+ pax_open_kernel();
38538+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
38539+ pax_close_kernel();
38540
38541 ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
38542
38543diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
38544index 814addb..0937d7f 100644
38545--- a/drivers/gpio/gpio-ich.c
38546+++ b/drivers/gpio/gpio-ich.c
38547@@ -71,7 +71,7 @@ struct ichx_desc {
38548 /* Some chipsets have quirks, let these use their own request/get */
38549 int (*request)(struct gpio_chip *chip, unsigned offset);
38550 int (*get)(struct gpio_chip *chip, unsigned offset);
38551-};
38552+} __do_const;
38553
38554 static struct {
38555 spinlock_t lock;
38556diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
38557index 9902732..64b62dd 100644
38558--- a/drivers/gpio/gpio-vr41xx.c
38559+++ b/drivers/gpio/gpio-vr41xx.c
38560@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
38561 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
38562 maskl, pendl, maskh, pendh);
38563
38564- atomic_inc(&irq_err_count);
38565+ atomic_inc_unchecked(&irq_err_count);
38566
38567 return -EINVAL;
38568 }
38569diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
38570index c722c3b..2ec6040 100644
38571--- a/drivers/gpu/drm/drm_crtc_helper.c
38572+++ b/drivers/gpu/drm/drm_crtc_helper.c
38573@@ -328,7 +328,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
38574 struct drm_crtc *tmp;
38575 int crtc_mask = 1;
38576
38577- WARN(!crtc, "checking null crtc?\n");
38578+ BUG_ON(!crtc);
38579
38580 dev = crtc->dev;
38581
38582diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
38583index fe58d08..07bc38e 100644
38584--- a/drivers/gpu/drm/drm_drv.c
38585+++ b/drivers/gpu/drm/drm_drv.c
38586@@ -186,7 +186,7 @@ static void drm_legacy_dev_reinit(struct drm_device *dev)
38587 atomic_set(&dev->vma_count, 0);
38588
38589 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
38590- atomic_set(&dev->counts[i], 0);
38591+ atomic_set_unchecked(&dev->counts[i], 0);
38592
38593 dev->sigdata.lock = NULL;
38594
38595@@ -302,7 +302,7 @@ module_exit(drm_core_exit);
38596 /**
38597 * Copy and IOCTL return string to user space
38598 */
38599-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
38600+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
38601 {
38602 int len;
38603
38604@@ -372,7 +372,7 @@ long drm_ioctl(struct file *filp,
38605 struct drm_file *file_priv = filp->private_data;
38606 struct drm_device *dev;
38607 const struct drm_ioctl_desc *ioctl = NULL;
38608- drm_ioctl_t *func;
38609+ drm_ioctl_no_const_t func;
38610 unsigned int nr = DRM_IOCTL_NR(cmd);
38611 int retcode = -EINVAL;
38612 char stack_kdata[128];
38613@@ -385,7 +385,7 @@ long drm_ioctl(struct file *filp,
38614 return -ENODEV;
38615
38616 atomic_inc(&dev->ioctl_count);
38617- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
38618+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
38619 ++file_priv->ioctl_count;
38620
38621 if ((nr >= DRM_CORE_IOCTL_COUNT) &&
38622diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
38623index 3f84277..c627c54 100644
38624--- a/drivers/gpu/drm/drm_fops.c
38625+++ b/drivers/gpu/drm/drm_fops.c
38626@@ -97,7 +97,7 @@ int drm_open(struct inode *inode, struct file *filp)
38627 if (drm_device_is_unplugged(dev))
38628 return -ENODEV;
38629
38630- if (!dev->open_count++)
38631+ if (local_inc_return(&dev->open_count) == 1)
38632 need_setup = 1;
38633 mutex_lock(&dev->struct_mutex);
38634 old_imapping = inode->i_mapping;
38635@@ -113,7 +113,7 @@ int drm_open(struct inode *inode, struct file *filp)
38636 retcode = drm_open_helper(inode, filp, dev);
38637 if (retcode)
38638 goto err_undo;
38639- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
38640+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
38641 if (need_setup) {
38642 retcode = drm_setup(dev);
38643 if (retcode)
38644@@ -128,7 +128,7 @@ err_undo:
38645 iput(container_of(dev->dev_mapping, struct inode, i_data));
38646 dev->dev_mapping = old_mapping;
38647 mutex_unlock(&dev->struct_mutex);
38648- dev->open_count--;
38649+ local_dec(&dev->open_count);
38650 return retcode;
38651 }
38652 EXPORT_SYMBOL(drm_open);
38653@@ -405,7 +405,7 @@ int drm_release(struct inode *inode, struct file *filp)
38654
38655 mutex_lock(&drm_global_mutex);
38656
38657- DRM_DEBUG("open_count = %d\n", dev->open_count);
38658+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
38659
38660 if (dev->driver->preclose)
38661 dev->driver->preclose(dev, file_priv);
38662@@ -414,10 +414,10 @@ int drm_release(struct inode *inode, struct file *filp)
38663 * Begin inline drm_release
38664 */
38665
38666- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
38667+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
38668 task_pid_nr(current),
38669 (long)old_encode_dev(file_priv->minor->device),
38670- dev->open_count);
38671+ local_read(&dev->open_count));
38672
38673 /* Release any auth tokens that might point to this file_priv,
38674 (do that under the drm_global_mutex) */
38675@@ -516,8 +516,8 @@ int drm_release(struct inode *inode, struct file *filp)
38676 * End inline drm_release
38677 */
38678
38679- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
38680- if (!--dev->open_count) {
38681+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
38682+ if (local_dec_and_test(&dev->open_count)) {
38683 if (atomic_read(&dev->ioctl_count)) {
38684 DRM_ERROR("Device busy: %d\n",
38685 atomic_read(&dev->ioctl_count));
38686diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
38687index f731116..629842c 100644
38688--- a/drivers/gpu/drm/drm_global.c
38689+++ b/drivers/gpu/drm/drm_global.c
38690@@ -36,7 +36,7 @@
38691 struct drm_global_item {
38692 struct mutex mutex;
38693 void *object;
38694- int refcount;
38695+ atomic_t refcount;
38696 };
38697
38698 static struct drm_global_item glob[DRM_GLOBAL_NUM];
38699@@ -49,7 +49,7 @@ void drm_global_init(void)
38700 struct drm_global_item *item = &glob[i];
38701 mutex_init(&item->mutex);
38702 item->object = NULL;
38703- item->refcount = 0;
38704+ atomic_set(&item->refcount, 0);
38705 }
38706 }
38707
38708@@ -59,7 +59,7 @@ void drm_global_release(void)
38709 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
38710 struct drm_global_item *item = &glob[i];
38711 BUG_ON(item->object != NULL);
38712- BUG_ON(item->refcount != 0);
38713+ BUG_ON(atomic_read(&item->refcount) != 0);
38714 }
38715 }
38716
38717@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
38718 void *object;
38719
38720 mutex_lock(&item->mutex);
38721- if (item->refcount == 0) {
38722+ if (atomic_read(&item->refcount) == 0) {
38723 item->object = kzalloc(ref->size, GFP_KERNEL);
38724 if (unlikely(item->object == NULL)) {
38725 ret = -ENOMEM;
38726@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
38727 goto out_err;
38728
38729 }
38730- ++item->refcount;
38731+ atomic_inc(&item->refcount);
38732 ref->object = item->object;
38733 object = item->object;
38734 mutex_unlock(&item->mutex);
38735@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
38736 struct drm_global_item *item = &glob[ref->global_type];
38737
38738 mutex_lock(&item->mutex);
38739- BUG_ON(item->refcount == 0);
38740+ BUG_ON(atomic_read(&item->refcount) == 0);
38741 BUG_ON(ref->object != item->object);
38742- if (--item->refcount == 0) {
38743+ if (atomic_dec_and_test(&item->refcount)) {
38744 ref->release(ref);
38745 item->object = NULL;
38746 }
38747diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
38748index 5329832..b503f49 100644
38749--- a/drivers/gpu/drm/drm_info.c
38750+++ b/drivers/gpu/drm/drm_info.c
38751@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
38752 struct drm_local_map *map;
38753 struct drm_map_list *r_list;
38754
38755- /* Hardcoded from _DRM_FRAME_BUFFER,
38756- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
38757- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
38758- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
38759+ static const char * const types[] = {
38760+ [_DRM_FRAME_BUFFER] = "FB",
38761+ [_DRM_REGISTERS] = "REG",
38762+ [_DRM_SHM] = "SHM",
38763+ [_DRM_AGP] = "AGP",
38764+ [_DRM_SCATTER_GATHER] = "SG",
38765+ [_DRM_CONSISTENT] = "PCI",
38766+ [_DRM_GEM] = "GEM" };
38767 const char *type;
38768 int i;
38769
38770@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
38771 map = r_list->map;
38772 if (!map)
38773 continue;
38774- if (map->type < 0 || map->type > 5)
38775+ if (map->type >= ARRAY_SIZE(types))
38776 type = "??";
38777 else
38778 type = types[map->type];
38779@@ -257,7 +261,11 @@ int drm_vma_info(struct seq_file *m, void *data)
38780 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
38781 vma->vm_flags & VM_LOCKED ? 'l' : '-',
38782 vma->vm_flags & VM_IO ? 'i' : '-',
38783+#ifdef CONFIG_GRKERNSEC_HIDESYM
38784+ 0);
38785+#else
38786 vma->vm_pgoff);
38787+#endif
38788
38789 #if defined(__i386__)
38790 pgprot = pgprot_val(vma->vm_page_prot);
38791diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
38792index 2f4c434..dd12cd2 100644
38793--- a/drivers/gpu/drm/drm_ioc32.c
38794+++ b/drivers/gpu/drm/drm_ioc32.c
38795@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
38796 request = compat_alloc_user_space(nbytes);
38797 if (!access_ok(VERIFY_WRITE, request, nbytes))
38798 return -EFAULT;
38799- list = (struct drm_buf_desc *) (request + 1);
38800+ list = (struct drm_buf_desc __user *) (request + 1);
38801
38802 if (__put_user(count, &request->count)
38803 || __put_user(list, &request->list))
38804@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
38805 request = compat_alloc_user_space(nbytes);
38806 if (!access_ok(VERIFY_WRITE, request, nbytes))
38807 return -EFAULT;
38808- list = (struct drm_buf_pub *) (request + 1);
38809+ list = (struct drm_buf_pub __user *) (request + 1);
38810
38811 if (__put_user(count, &request->count)
38812 || __put_user(list, &request->list))
38813@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
38814 return 0;
38815 }
38816
38817-drm_ioctl_compat_t *drm_compat_ioctls[] = {
38818+drm_ioctl_compat_t drm_compat_ioctls[] = {
38819 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
38820 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
38821 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
38822@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
38823 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
38824 {
38825 unsigned int nr = DRM_IOCTL_NR(cmd);
38826- drm_ioctl_compat_t *fn;
38827 int ret;
38828
38829 /* Assume that ioctls without an explicit compat routine will just
38830@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
38831 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
38832 return drm_ioctl(filp, cmd, arg);
38833
38834- fn = drm_compat_ioctls[nr];
38835-
38836- if (fn != NULL)
38837- ret = (*fn) (filp, cmd, arg);
38838+ if (drm_compat_ioctls[nr] != NULL)
38839+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
38840 else
38841 ret = drm_ioctl(filp, cmd, arg);
38842
38843diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
38844index d752c96..fe08455 100644
38845--- a/drivers/gpu/drm/drm_lock.c
38846+++ b/drivers/gpu/drm/drm_lock.c
38847@@ -86,7 +86,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
38848 if (drm_lock_take(&master->lock, lock->context)) {
38849 master->lock.file_priv = file_priv;
38850 master->lock.lock_time = jiffies;
38851- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
38852+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
38853 break; /* Got lock */
38854 }
38855
38856@@ -157,7 +157,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
38857 return -EINVAL;
38858 }
38859
38860- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
38861+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
38862
38863 if (drm_lock_free(&master->lock, lock->context)) {
38864 /* FIXME: Should really bail out here. */
38865diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
38866index 39d8645..59e06fa 100644
38867--- a/drivers/gpu/drm/drm_stub.c
38868+++ b/drivers/gpu/drm/drm_stub.c
38869@@ -484,7 +484,7 @@ void drm_unplug_dev(struct drm_device *dev)
38870
38871 drm_device_set_unplugged(dev);
38872
38873- if (dev->open_count == 0) {
38874+ if (local_read(&dev->open_count) == 0) {
38875 drm_put_dev(dev);
38876 }
38877 mutex_unlock(&drm_global_mutex);
38878diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
38879index 2290b3b..22056a1 100644
38880--- a/drivers/gpu/drm/drm_sysfs.c
38881+++ b/drivers/gpu/drm/drm_sysfs.c
38882@@ -524,7 +524,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event);
38883 int drm_sysfs_device_add(struct drm_minor *minor)
38884 {
38885 int err;
38886- char *minor_str;
38887+ const char *minor_str;
38888
38889 minor->kdev.parent = minor->dev->dev;
38890
38891diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
38892index ab1892eb..d7009ca 100644
38893--- a/drivers/gpu/drm/i810/i810_dma.c
38894+++ b/drivers/gpu/drm/i810/i810_dma.c
38895@@ -944,8 +944,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
38896 dma->buflist[vertex->idx],
38897 vertex->discard, vertex->used);
38898
38899- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
38900- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
38901+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
38902+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
38903 sarea_priv->last_enqueue = dev_priv->counter - 1;
38904 sarea_priv->last_dispatch = (int)hw_status[5];
38905
38906@@ -1105,8 +1105,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
38907 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
38908 mc->last_render);
38909
38910- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
38911- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
38912+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
38913+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
38914 sarea_priv->last_enqueue = dev_priv->counter - 1;
38915 sarea_priv->last_dispatch = (int)hw_status[5];
38916
38917diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
38918index d4d16ed..8fb0b51 100644
38919--- a/drivers/gpu/drm/i810/i810_drv.h
38920+++ b/drivers/gpu/drm/i810/i810_drv.h
38921@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
38922 int page_flipping;
38923
38924 wait_queue_head_t irq_queue;
38925- atomic_t irq_received;
38926- atomic_t irq_emitted;
38927+ atomic_unchecked_t irq_received;
38928+ atomic_unchecked_t irq_emitted;
38929
38930 int front_offset;
38931 } drm_i810_private_t;
38932diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
38933index a6f4cb5..6b2beb2 100644
38934--- a/drivers/gpu/drm/i915/i915_debugfs.c
38935+++ b/drivers/gpu/drm/i915/i915_debugfs.c
38936@@ -624,7 +624,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
38937 I915_READ(GTIMR));
38938 }
38939 seq_printf(m, "Interrupts received: %d\n",
38940- atomic_read(&dev_priv->irq_received));
38941+ atomic_read_unchecked(&dev_priv->irq_received));
38942 for_each_ring(ring, dev_priv, i) {
38943 if (IS_GEN6(dev) || IS_GEN7(dev)) {
38944 seq_printf(m,
38945diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
38946index 5a25f24..5af2004 100644
38947--- a/drivers/gpu/drm/i915/i915_dma.c
38948+++ b/drivers/gpu/drm/i915/i915_dma.c
38949@@ -1271,7 +1271,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
38950 bool can_switch;
38951
38952 spin_lock(&dev->count_lock);
38953- can_switch = (dev->open_count == 0);
38954+ can_switch = (local_read(&dev->open_count) == 0);
38955 spin_unlock(&dev->count_lock);
38956 return can_switch;
38957 }
38958diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
38959index ab0f2c0..53c1bda 100644
38960--- a/drivers/gpu/drm/i915/i915_drv.h
38961+++ b/drivers/gpu/drm/i915/i915_drv.h
38962@@ -1181,7 +1181,7 @@ typedef struct drm_i915_private {
38963 drm_dma_handle_t *status_page_dmah;
38964 struct resource mch_res;
38965
38966- atomic_t irq_received;
38967+ atomic_unchecked_t irq_received;
38968
38969 /* protects the irq masks */
38970 spinlock_t irq_lock;
38971diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
38972index bf34577..3fd2ffa 100644
38973--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
38974+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
38975@@ -768,9 +768,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
38976
38977 static int
38978 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
38979- int count)
38980+ unsigned int count)
38981 {
38982- int i;
38983+ unsigned int i;
38984 int relocs_total = 0;
38985 int relocs_max = INT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
38986
38987diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
38988index 3c59584..500f2e9 100644
38989--- a/drivers/gpu/drm/i915/i915_ioc32.c
38990+++ b/drivers/gpu/drm/i915/i915_ioc32.c
38991@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
38992 (unsigned long)request);
38993 }
38994
38995-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
38996+static drm_ioctl_compat_t i915_compat_ioctls[] = {
38997 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
38998 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
38999 [DRM_I915_GETPARAM] = compat_i915_getparam,
39000@@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
39001 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39002 {
39003 unsigned int nr = DRM_IOCTL_NR(cmd);
39004- drm_ioctl_compat_t *fn = NULL;
39005 int ret;
39006
39007 if (nr < DRM_COMMAND_BASE)
39008 return drm_compat_ioctl(filp, cmd, arg);
39009
39010- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
39011- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
39012-
39013- if (fn != NULL)
39014+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
39015+ drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
39016 ret = (*fn) (filp, cmd, arg);
39017- else
39018+ } else
39019 ret = drm_ioctl(filp, cmd, arg);
39020
39021 return ret;
39022diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
39023index 4b91228..590c643 100644
39024--- a/drivers/gpu/drm/i915/i915_irq.c
39025+++ b/drivers/gpu/drm/i915/i915_irq.c
39026@@ -1085,7 +1085,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
39027 int pipe;
39028 u32 pipe_stats[I915_MAX_PIPES];
39029
39030- atomic_inc(&dev_priv->irq_received);
39031+ atomic_inc_unchecked(&dev_priv->irq_received);
39032
39033 while (true) {
39034 iir = I915_READ(VLV_IIR);
39035@@ -1390,7 +1390,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
39036 irqreturn_t ret = IRQ_NONE;
39037 bool err_int_reenable = false;
39038
39039- atomic_inc(&dev_priv->irq_received);
39040+ atomic_inc_unchecked(&dev_priv->irq_received);
39041
39042 /* We get interrupts on unclaimed registers, so check for this before we
39043 * do any I915_{READ,WRITE}. */
39044@@ -2146,7 +2146,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
39045 {
39046 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39047
39048- atomic_set(&dev_priv->irq_received, 0);
39049+ atomic_set_unchecked(&dev_priv->irq_received, 0);
39050
39051 I915_WRITE(HWSTAM, 0xeffe);
39052
39053@@ -2164,7 +2164,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
39054 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39055 int pipe;
39056
39057- atomic_set(&dev_priv->irq_received, 0);
39058+ atomic_set_unchecked(&dev_priv->irq_received, 0);
39059
39060 /* VLV magic */
39061 I915_WRITE(VLV_IMR, 0);
39062@@ -2452,7 +2452,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
39063 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39064 int pipe;
39065
39066- atomic_set(&dev_priv->irq_received, 0);
39067+ atomic_set_unchecked(&dev_priv->irq_received, 0);
39068
39069 for_each_pipe(pipe)
39070 I915_WRITE(PIPESTAT(pipe), 0);
39071@@ -2530,7 +2530,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
39072 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
39073 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
39074
39075- atomic_inc(&dev_priv->irq_received);
39076+ atomic_inc_unchecked(&dev_priv->irq_received);
39077
39078 iir = I915_READ16(IIR);
39079 if (iir == 0)
39080@@ -2604,7 +2604,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
39081 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39082 int pipe;
39083
39084- atomic_set(&dev_priv->irq_received, 0);
39085+ atomic_set_unchecked(&dev_priv->irq_received, 0);
39086
39087 if (I915_HAS_HOTPLUG(dev)) {
39088 I915_WRITE(PORT_HOTPLUG_EN, 0);
39089@@ -2703,7 +2703,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
39090 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
39091 int pipe, ret = IRQ_NONE;
39092
39093- atomic_inc(&dev_priv->irq_received);
39094+ atomic_inc_unchecked(&dev_priv->irq_received);
39095
39096 iir = I915_READ(IIR);
39097 do {
39098@@ -2827,7 +2827,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
39099 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
39100 int pipe;
39101
39102- atomic_set(&dev_priv->irq_received, 0);
39103+ atomic_set_unchecked(&dev_priv->irq_received, 0);
39104
39105 I915_WRITE(PORT_HOTPLUG_EN, 0);
39106 I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
39107@@ -2941,7 +2941,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
39108 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
39109 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
39110
39111- atomic_inc(&dev_priv->irq_received);
39112+ atomic_inc_unchecked(&dev_priv->irq_received);
39113
39114 iir = I915_READ(IIR);
39115
39116diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
39117index aad6f7b..dcc91447 100644
39118--- a/drivers/gpu/drm/i915/intel_display.c
39119+++ b/drivers/gpu/drm/i915/intel_display.c
39120@@ -10019,13 +10019,13 @@ struct intel_quirk {
39121 int subsystem_vendor;
39122 int subsystem_device;
39123 void (*hook)(struct drm_device *dev);
39124-};
39125+} __do_const;
39126
39127 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
39128 struct intel_dmi_quirk {
39129 void (*hook)(struct drm_device *dev);
39130 const struct dmi_system_id (*dmi_id_list)[];
39131-};
39132+} __do_const;
39133
39134 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
39135 {
39136@@ -10033,18 +10033,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
39137 return 1;
39138 }
39139
39140-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
39141+static const struct dmi_system_id intel_dmi_quirks_table[] = {
39142 {
39143- .dmi_id_list = &(const struct dmi_system_id[]) {
39144- {
39145- .callback = intel_dmi_reverse_brightness,
39146- .ident = "NCR Corporation",
39147- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
39148- DMI_MATCH(DMI_PRODUCT_NAME, ""),
39149- },
39150- },
39151- { } /* terminating entry */
39152+ .callback = intel_dmi_reverse_brightness,
39153+ .ident = "NCR Corporation",
39154+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
39155+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
39156 },
39157+ },
39158+ { } /* terminating entry */
39159+};
39160+
39161+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
39162+ {
39163+ .dmi_id_list = &intel_dmi_quirks_table,
39164 .hook = quirk_invert_brightness,
39165 },
39166 };
39167diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
39168index ca4bc54..ee598a2 100644
39169--- a/drivers/gpu/drm/mga/mga_drv.h
39170+++ b/drivers/gpu/drm/mga/mga_drv.h
39171@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
39172 u32 clear_cmd;
39173 u32 maccess;
39174
39175- atomic_t vbl_received; /**< Number of vblanks received. */
39176+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
39177 wait_queue_head_t fence_queue;
39178- atomic_t last_fence_retired;
39179+ atomic_unchecked_t last_fence_retired;
39180 u32 next_fence_to_post;
39181
39182 unsigned int fb_cpp;
39183diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
39184index 709e90d..89a1c0d 100644
39185--- a/drivers/gpu/drm/mga/mga_ioc32.c
39186+++ b/drivers/gpu/drm/mga/mga_ioc32.c
39187@@ -189,7 +189,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
39188 return 0;
39189 }
39190
39191-drm_ioctl_compat_t *mga_compat_ioctls[] = {
39192+drm_ioctl_compat_t mga_compat_ioctls[] = {
39193 [DRM_MGA_INIT] = compat_mga_init,
39194 [DRM_MGA_GETPARAM] = compat_mga_getparam,
39195 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
39196@@ -207,18 +207,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
39197 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39198 {
39199 unsigned int nr = DRM_IOCTL_NR(cmd);
39200- drm_ioctl_compat_t *fn = NULL;
39201 int ret;
39202
39203 if (nr < DRM_COMMAND_BASE)
39204 return drm_compat_ioctl(filp, cmd, arg);
39205
39206- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls))
39207- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
39208-
39209- if (fn != NULL)
39210+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
39211+ drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
39212 ret = (*fn) (filp, cmd, arg);
39213- else
39214+ } else
39215 ret = drm_ioctl(filp, cmd, arg);
39216
39217 return ret;
39218diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
39219index 598c281..60d590e 100644
39220--- a/drivers/gpu/drm/mga/mga_irq.c
39221+++ b/drivers/gpu/drm/mga/mga_irq.c
39222@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
39223 if (crtc != 0)
39224 return 0;
39225
39226- return atomic_read(&dev_priv->vbl_received);
39227+ return atomic_read_unchecked(&dev_priv->vbl_received);
39228 }
39229
39230
39231@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
39232 /* VBLANK interrupt */
39233 if (status & MGA_VLINEPEN) {
39234 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
39235- atomic_inc(&dev_priv->vbl_received);
39236+ atomic_inc_unchecked(&dev_priv->vbl_received);
39237 drm_handle_vblank(dev, 0);
39238 handled = 1;
39239 }
39240@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
39241 if ((prim_start & ~0x03) != (prim_end & ~0x03))
39242 MGA_WRITE(MGA_PRIMEND, prim_end);
39243
39244- atomic_inc(&dev_priv->last_fence_retired);
39245+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
39246 DRM_WAKEUP(&dev_priv->fence_queue);
39247 handled = 1;
39248 }
39249@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
39250 * using fences.
39251 */
39252 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
39253- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
39254+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
39255 - *sequence) <= (1 << 23)));
39256
39257 *sequence = cur_fence;
39258diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
39259index 3e72876..d1c15ad 100644
39260--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
39261+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
39262@@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
39263 struct bit_table {
39264 const char id;
39265 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
39266-};
39267+} __no_const;
39268
39269 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
39270
39271diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
39272index 994fd6e..6e12565 100644
39273--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
39274+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
39275@@ -94,7 +94,6 @@ struct nouveau_drm {
39276 struct drm_global_reference mem_global_ref;
39277 struct ttm_bo_global_ref bo_global_ref;
39278 struct ttm_bo_device bdev;
39279- atomic_t validate_sequence;
39280 int (*move)(struct nouveau_channel *,
39281 struct ttm_buffer_object *,
39282 struct ttm_mem_reg *, struct ttm_mem_reg *);
39283diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
39284index c1a7e5a..38b8539 100644
39285--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
39286+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
39287@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
39288 unsigned long arg)
39289 {
39290 unsigned int nr = DRM_IOCTL_NR(cmd);
39291- drm_ioctl_compat_t *fn = NULL;
39292+ drm_ioctl_compat_t fn = NULL;
39293 int ret;
39294
39295 if (nr < DRM_COMMAND_BASE)
39296diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
39297index 81638d7..2e45854 100644
39298--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
39299+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
39300@@ -65,7 +65,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
39301 bool can_switch;
39302
39303 spin_lock(&dev->count_lock);
39304- can_switch = (dev->open_count == 0);
39305+ can_switch = (local_read(&dev->open_count) == 0);
39306 spin_unlock(&dev->count_lock);
39307 return can_switch;
39308 }
39309diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
39310index eb89653..613cf71 100644
39311--- a/drivers/gpu/drm/qxl/qxl_cmd.c
39312+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
39313@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
39314 int ret;
39315
39316 mutex_lock(&qdev->async_io_mutex);
39317- irq_num = atomic_read(&qdev->irq_received_io_cmd);
39318+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
39319 if (qdev->last_sent_io_cmd > irq_num) {
39320 if (intr)
39321 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
39322- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39323+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39324 else
39325 ret = wait_event_timeout(qdev->io_cmd_event,
39326- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39327+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39328 /* 0 is timeout, just bail the "hw" has gone away */
39329 if (ret <= 0)
39330 goto out;
39331- irq_num = atomic_read(&qdev->irq_received_io_cmd);
39332+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
39333 }
39334 outb(val, addr);
39335 qdev->last_sent_io_cmd = irq_num + 1;
39336 if (intr)
39337 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
39338- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39339+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39340 else
39341 ret = wait_event_timeout(qdev->io_cmd_event,
39342- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39343+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
39344 out:
39345 if (ret > 0)
39346 ret = 0;
39347diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
39348index c3c2bbd..bc3c0fb 100644
39349--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
39350+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
39351@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
39352 struct drm_info_node *node = (struct drm_info_node *) m->private;
39353 struct qxl_device *qdev = node->minor->dev->dev_private;
39354
39355- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
39356- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
39357- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
39358- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
39359+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
39360+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
39361+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
39362+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
39363 seq_printf(m, "%d\n", qdev->irq_received_error);
39364 return 0;
39365 }
39366diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
39367index f7c9add..fb971d2 100644
39368--- a/drivers/gpu/drm/qxl/qxl_drv.h
39369+++ b/drivers/gpu/drm/qxl/qxl_drv.h
39370@@ -290,10 +290,10 @@ struct qxl_device {
39371 unsigned int last_sent_io_cmd;
39372
39373 /* interrupt handling */
39374- atomic_t irq_received;
39375- atomic_t irq_received_display;
39376- atomic_t irq_received_cursor;
39377- atomic_t irq_received_io_cmd;
39378+ atomic_unchecked_t irq_received;
39379+ atomic_unchecked_t irq_received_display;
39380+ atomic_unchecked_t irq_received_cursor;
39381+ atomic_unchecked_t irq_received_io_cmd;
39382 unsigned irq_received_error;
39383 wait_queue_head_t display_event;
39384 wait_queue_head_t cursor_event;
39385diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
39386index 21393dc..329f3a9 100644
39387--- a/drivers/gpu/drm/qxl/qxl_irq.c
39388+++ b/drivers/gpu/drm/qxl/qxl_irq.c
39389@@ -33,19 +33,19 @@ irqreturn_t qxl_irq_handler(DRM_IRQ_ARGS)
39390
39391 pending = xchg(&qdev->ram_header->int_pending, 0);
39392
39393- atomic_inc(&qdev->irq_received);
39394+ atomic_inc_unchecked(&qdev->irq_received);
39395
39396 if (pending & QXL_INTERRUPT_DISPLAY) {
39397- atomic_inc(&qdev->irq_received_display);
39398+ atomic_inc_unchecked(&qdev->irq_received_display);
39399 wake_up_all(&qdev->display_event);
39400 qxl_queue_garbage_collect(qdev, false);
39401 }
39402 if (pending & QXL_INTERRUPT_CURSOR) {
39403- atomic_inc(&qdev->irq_received_cursor);
39404+ atomic_inc_unchecked(&qdev->irq_received_cursor);
39405 wake_up_all(&qdev->cursor_event);
39406 }
39407 if (pending & QXL_INTERRUPT_IO_CMD) {
39408- atomic_inc(&qdev->irq_received_io_cmd);
39409+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
39410 wake_up_all(&qdev->io_cmd_event);
39411 }
39412 if (pending & QXL_INTERRUPT_ERROR) {
39413@@ -82,10 +82,10 @@ int qxl_irq_init(struct qxl_device *qdev)
39414 init_waitqueue_head(&qdev->io_cmd_event);
39415 INIT_WORK(&qdev->client_monitors_config_work,
39416 qxl_client_monitors_config_work_func);
39417- atomic_set(&qdev->irq_received, 0);
39418- atomic_set(&qdev->irq_received_display, 0);
39419- atomic_set(&qdev->irq_received_cursor, 0);
39420- atomic_set(&qdev->irq_received_io_cmd, 0);
39421+ atomic_set_unchecked(&qdev->irq_received, 0);
39422+ atomic_set_unchecked(&qdev->irq_received_display, 0);
39423+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
39424+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
39425 qdev->irq_received_error = 0;
39426 ret = drm_irq_install(qdev->ddev);
39427 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
39428diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
39429index 037786d..2a95e33 100644
39430--- a/drivers/gpu/drm/qxl/qxl_ttm.c
39431+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
39432@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
39433 }
39434 }
39435
39436-static struct vm_operations_struct qxl_ttm_vm_ops;
39437+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
39438 static const struct vm_operations_struct *ttm_vm_ops;
39439
39440 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
39441@@ -147,8 +147,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
39442 return r;
39443 if (unlikely(ttm_vm_ops == NULL)) {
39444 ttm_vm_ops = vma->vm_ops;
39445+ pax_open_kernel();
39446 qxl_ttm_vm_ops = *ttm_vm_ops;
39447 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
39448+ pax_close_kernel();
39449 }
39450 vma->vm_ops = &qxl_ttm_vm_ops;
39451 return 0;
39452@@ -558,25 +560,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
39453 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
39454 {
39455 #if defined(CONFIG_DEBUG_FS)
39456- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
39457- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
39458- unsigned i;
39459+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
39460+ {
39461+ .name = "qxl_mem_mm",
39462+ .show = &qxl_mm_dump_table,
39463+ },
39464+ {
39465+ .name = "qxl_surf_mm",
39466+ .show = &qxl_mm_dump_table,
39467+ }
39468+ };
39469
39470- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
39471- if (i == 0)
39472- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
39473- else
39474- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
39475- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
39476- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
39477- qxl_mem_types_list[i].driver_features = 0;
39478- if (i == 0)
39479- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
39480- else
39481- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
39482+ pax_open_kernel();
39483+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
39484+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
39485+ pax_close_kernel();
39486
39487- }
39488- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
39489+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
39490 #else
39491 return 0;
39492 #endif
39493diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
39494index c451257..0ad2134 100644
39495--- a/drivers/gpu/drm/r128/r128_cce.c
39496+++ b/drivers/gpu/drm/r128/r128_cce.c
39497@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
39498
39499 /* GH: Simple idle check.
39500 */
39501- atomic_set(&dev_priv->idle_count, 0);
39502+ atomic_set_unchecked(&dev_priv->idle_count, 0);
39503
39504 /* We don't support anything other than bus-mastering ring mode,
39505 * but the ring can be in either AGP or PCI space for the ring
39506diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
39507index 56eb5e3..c4ec43d 100644
39508--- a/drivers/gpu/drm/r128/r128_drv.h
39509+++ b/drivers/gpu/drm/r128/r128_drv.h
39510@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
39511 int is_pci;
39512 unsigned long cce_buffers_offset;
39513
39514- atomic_t idle_count;
39515+ atomic_unchecked_t idle_count;
39516
39517 int page_flipping;
39518 int current_page;
39519 u32 crtc_offset;
39520 u32 crtc_offset_cntl;
39521
39522- atomic_t vbl_received;
39523+ atomic_unchecked_t vbl_received;
39524
39525 u32 color_fmt;
39526 unsigned int front_offset;
39527diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
39528index a954c54..9cc595c 100644
39529--- a/drivers/gpu/drm/r128/r128_ioc32.c
39530+++ b/drivers/gpu/drm/r128/r128_ioc32.c
39531@@ -177,7 +177,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
39532 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
39533 }
39534
39535-drm_ioctl_compat_t *r128_compat_ioctls[] = {
39536+drm_ioctl_compat_t r128_compat_ioctls[] = {
39537 [DRM_R128_INIT] = compat_r128_init,
39538 [DRM_R128_DEPTH] = compat_r128_depth,
39539 [DRM_R128_STIPPLE] = compat_r128_stipple,
39540@@ -196,18 +196,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
39541 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39542 {
39543 unsigned int nr = DRM_IOCTL_NR(cmd);
39544- drm_ioctl_compat_t *fn = NULL;
39545 int ret;
39546
39547 if (nr < DRM_COMMAND_BASE)
39548 return drm_compat_ioctl(filp, cmd, arg);
39549
39550- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls))
39551- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
39552-
39553- if (fn != NULL)
39554+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
39555+ drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
39556 ret = (*fn) (filp, cmd, arg);
39557- else
39558+ } else
39559 ret = drm_ioctl(filp, cmd, arg);
39560
39561 return ret;
39562diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
39563index 2ea4f09..d391371 100644
39564--- a/drivers/gpu/drm/r128/r128_irq.c
39565+++ b/drivers/gpu/drm/r128/r128_irq.c
39566@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
39567 if (crtc != 0)
39568 return 0;
39569
39570- return atomic_read(&dev_priv->vbl_received);
39571+ return atomic_read_unchecked(&dev_priv->vbl_received);
39572 }
39573
39574 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
39575@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
39576 /* VBLANK interrupt */
39577 if (status & R128_CRTC_VBLANK_INT) {
39578 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
39579- atomic_inc(&dev_priv->vbl_received);
39580+ atomic_inc_unchecked(&dev_priv->vbl_received);
39581 drm_handle_vblank(dev, 0);
39582 return IRQ_HANDLED;
39583 }
39584diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
39585index 01dd9ae..6352f04 100644
39586--- a/drivers/gpu/drm/r128/r128_state.c
39587+++ b/drivers/gpu/drm/r128/r128_state.c
39588@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
39589
39590 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
39591 {
39592- if (atomic_read(&dev_priv->idle_count) == 0)
39593+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
39594 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
39595 else
39596- atomic_set(&dev_priv->idle_count, 0);
39597+ atomic_set_unchecked(&dev_priv->idle_count, 0);
39598 }
39599
39600 #endif
39601diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
39602index af85299..ed9ac8d 100644
39603--- a/drivers/gpu/drm/radeon/mkregtable.c
39604+++ b/drivers/gpu/drm/radeon/mkregtable.c
39605@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
39606 regex_t mask_rex;
39607 regmatch_t match[4];
39608 char buf[1024];
39609- size_t end;
39610+ long end;
39611 int len;
39612 int done = 0;
39613 int r;
39614 unsigned o;
39615 struct offset *offset;
39616 char last_reg_s[10];
39617- int last_reg;
39618+ unsigned long last_reg;
39619
39620 if (regcomp
39621 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
39622diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
39623index 841d0e0..9eaa268 100644
39624--- a/drivers/gpu/drm/radeon/radeon_device.c
39625+++ b/drivers/gpu/drm/radeon/radeon_device.c
39626@@ -1117,7 +1117,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
39627 bool can_switch;
39628
39629 spin_lock(&dev->count_lock);
39630- can_switch = (dev->open_count == 0);
39631+ can_switch = (local_read(&dev->open_count) == 0);
39632 spin_unlock(&dev->count_lock);
39633 return can_switch;
39634 }
39635diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
39636index b369d42..8dd04eb 100644
39637--- a/drivers/gpu/drm/radeon/radeon_drv.h
39638+++ b/drivers/gpu/drm/radeon/radeon_drv.h
39639@@ -258,7 +258,7 @@ typedef struct drm_radeon_private {
39640
39641 /* SW interrupt */
39642 wait_queue_head_t swi_queue;
39643- atomic_t swi_emitted;
39644+ atomic_unchecked_t swi_emitted;
39645 int vblank_crtc;
39646 uint32_t irq_enable_reg;
39647 uint32_t r500_disp_irq_reg;
39648diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
39649index c180df8..5fd8186 100644
39650--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
39651+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
39652@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
39653 request = compat_alloc_user_space(sizeof(*request));
39654 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
39655 || __put_user(req32.param, &request->param)
39656- || __put_user((void __user *)(unsigned long)req32.value,
39657+ || __put_user((unsigned long)req32.value,
39658 &request->value))
39659 return -EFAULT;
39660
39661@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
39662 #define compat_radeon_cp_setparam NULL
39663 #endif /* X86_64 || IA64 */
39664
39665-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
39666+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
39667 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
39668 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
39669 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
39670@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
39671 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
39672 {
39673 unsigned int nr = DRM_IOCTL_NR(cmd);
39674- drm_ioctl_compat_t *fn = NULL;
39675 int ret;
39676
39677 if (nr < DRM_COMMAND_BASE)
39678 return drm_compat_ioctl(filp, cmd, arg);
39679
39680- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
39681- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
39682-
39683- if (fn != NULL)
39684+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
39685+ drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
39686 ret = (*fn) (filp, cmd, arg);
39687- else
39688+ } else
39689 ret = drm_ioctl(filp, cmd, arg);
39690
39691 return ret;
39692diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
39693index 8d68e97..9dcfed8 100644
39694--- a/drivers/gpu/drm/radeon/radeon_irq.c
39695+++ b/drivers/gpu/drm/radeon/radeon_irq.c
39696@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
39697 unsigned int ret;
39698 RING_LOCALS;
39699
39700- atomic_inc(&dev_priv->swi_emitted);
39701- ret = atomic_read(&dev_priv->swi_emitted);
39702+ atomic_inc_unchecked(&dev_priv->swi_emitted);
39703+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
39704
39705 BEGIN_RING(4);
39706 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
39707@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
39708 drm_radeon_private_t *dev_priv =
39709 (drm_radeon_private_t *) dev->dev_private;
39710
39711- atomic_set(&dev_priv->swi_emitted, 0);
39712+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
39713 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
39714
39715 dev->max_vblank_count = 0x001fffff;
39716diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
39717index 4d20910..6726b6d 100644
39718--- a/drivers/gpu/drm/radeon/radeon_state.c
39719+++ b/drivers/gpu/drm/radeon/radeon_state.c
39720@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
39721 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
39722 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
39723
39724- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
39725+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
39726 sarea_priv->nbox * sizeof(depth_boxes[0])))
39727 return -EFAULT;
39728
39729@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
39730 {
39731 drm_radeon_private_t *dev_priv = dev->dev_private;
39732 drm_radeon_getparam_t *param = data;
39733- int value;
39734+ int value = 0;
39735
39736 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
39737
39738diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
39739index 71245d6..94c556d 100644
39740--- a/drivers/gpu/drm/radeon/radeon_ttm.c
39741+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
39742@@ -784,7 +784,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
39743 man->size = size >> PAGE_SHIFT;
39744 }
39745
39746-static struct vm_operations_struct radeon_ttm_vm_ops;
39747+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
39748 static const struct vm_operations_struct *ttm_vm_ops = NULL;
39749
39750 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
39751@@ -825,8 +825,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
39752 }
39753 if (unlikely(ttm_vm_ops == NULL)) {
39754 ttm_vm_ops = vma->vm_ops;
39755+ pax_open_kernel();
39756 radeon_ttm_vm_ops = *ttm_vm_ops;
39757 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
39758+ pax_close_kernel();
39759 }
39760 vma->vm_ops = &radeon_ttm_vm_ops;
39761 return 0;
39762@@ -855,38 +857,33 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
39763 static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
39764 {
39765 #if defined(CONFIG_DEBUG_FS)
39766- static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2];
39767- static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+2][32];
39768- unsigned i;
39769+ static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2] = {
39770+ {
39771+ .name = "radeon_vram_mm",
39772+ .show = &radeon_mm_dump_table,
39773+ },
39774+ {
39775+ .name = "radeon_gtt_mm",
39776+ .show = &radeon_mm_dump_table,
39777+ },
39778+ {
39779+ .name = "ttm_page_pool",
39780+ .show = &ttm_page_alloc_debugfs,
39781+ },
39782+ {
39783+ .name = "ttm_dma_page_pool",
39784+ .show = &ttm_dma_page_alloc_debugfs,
39785+ },
39786+ };
39787+ unsigned i = RADEON_DEBUGFS_MEM_TYPES + 1;
39788
39789- for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) {
39790- if (i == 0)
39791- sprintf(radeon_mem_types_names[i], "radeon_vram_mm");
39792- else
39793- sprintf(radeon_mem_types_names[i], "radeon_gtt_mm");
39794- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
39795- radeon_mem_types_list[i].show = &radeon_mm_dump_table;
39796- radeon_mem_types_list[i].driver_features = 0;
39797- if (i == 0)
39798- radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
39799- else
39800- radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
39801-
39802- }
39803- /* Add ttm page pool to debugfs */
39804- sprintf(radeon_mem_types_names[i], "ttm_page_pool");
39805- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
39806- radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs;
39807- radeon_mem_types_list[i].driver_features = 0;
39808- radeon_mem_types_list[i++].data = NULL;
39809+ pax_open_kernel();
39810+ *(void **)&radeon_mem_types_list[0].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
39811+ *(void **)&radeon_mem_types_list[1].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
39812+ pax_close_kernel();
39813 #ifdef CONFIG_SWIOTLB
39814- if (swiotlb_nr_tbl()) {
39815- sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool");
39816- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
39817- radeon_mem_types_list[i].show = &ttm_dma_page_alloc_debugfs;
39818- radeon_mem_types_list[i].driver_features = 0;
39819- radeon_mem_types_list[i++].data = NULL;
39820- }
39821+ if (swiotlb_nr_tbl())
39822+ i++;
39823 #endif
39824 return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i);
39825
39826diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
39827index 3c38f0a..13816e3 100644
39828--- a/drivers/gpu/drm/radeon/rs690.c
39829+++ b/drivers/gpu/drm/radeon/rs690.c
39830@@ -355,9 +355,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
39831 if (max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
39832 rdev->pm.sideport_bandwidth.full)
39833 max_bandwidth = rdev->pm.sideport_bandwidth;
39834- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
39835+ read_delay_latency.full = dfixed_const(800 * 1000);
39836 read_delay_latency.full = dfixed_div(read_delay_latency,
39837 rdev->pm.igp_sideport_mclk);
39838+ a.full = dfixed_const(370);
39839+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
39840 } else {
39841 if (max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
39842 rdev->pm.k8_bandwidth.full)
39843diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
39844index dbc2def..0a9f710 100644
39845--- a/drivers/gpu/drm/ttm/ttm_memory.c
39846+++ b/drivers/gpu/drm/ttm/ttm_memory.c
39847@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
39848 zone->glob = glob;
39849 glob->zone_kernel = zone;
39850 ret = kobject_init_and_add(
39851- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
39852+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
39853 if (unlikely(ret != 0)) {
39854 kobject_put(&zone->kobj);
39855 return ret;
39856@@ -347,7 +347,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
39857 zone->glob = glob;
39858 glob->zone_dma32 = zone;
39859 ret = kobject_init_and_add(
39860- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
39861+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
39862 if (unlikely(ret != 0)) {
39863 kobject_put(&zone->kobj);
39864 return ret;
39865diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
39866index 863bef9..cba15cf 100644
39867--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
39868+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
39869@@ -391,9 +391,9 @@ out:
39870 static unsigned long
39871 ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
39872 {
39873- static atomic_t start_pool = ATOMIC_INIT(0);
39874+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
39875 unsigned i;
39876- unsigned pool_offset = atomic_add_return(1, &start_pool);
39877+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
39878 struct ttm_page_pool *pool;
39879 int shrink_pages = sc->nr_to_scan;
39880 unsigned long freed = 0;
39881diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
39882index 97e9d61..bf23c461 100644
39883--- a/drivers/gpu/drm/udl/udl_fb.c
39884+++ b/drivers/gpu/drm/udl/udl_fb.c
39885@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
39886 fb_deferred_io_cleanup(info);
39887 kfree(info->fbdefio);
39888 info->fbdefio = NULL;
39889- info->fbops->fb_mmap = udl_fb_mmap;
39890 }
39891
39892 pr_warn("released /dev/fb%d user=%d count=%d\n",
39893diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
39894index a811ef2..ff99b05 100644
39895--- a/drivers/gpu/drm/via/via_drv.h
39896+++ b/drivers/gpu/drm/via/via_drv.h
39897@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
39898 typedef uint32_t maskarray_t[5];
39899
39900 typedef struct drm_via_irq {
39901- atomic_t irq_received;
39902+ atomic_unchecked_t irq_received;
39903 uint32_t pending_mask;
39904 uint32_t enable_mask;
39905 wait_queue_head_t irq_queue;
39906@@ -75,7 +75,7 @@ typedef struct drm_via_private {
39907 struct timeval last_vblank;
39908 int last_vblank_valid;
39909 unsigned usec_per_vblank;
39910- atomic_t vbl_received;
39911+ atomic_unchecked_t vbl_received;
39912 drm_via_state_t hc_state;
39913 char pci_buf[VIA_PCI_BUF_SIZE];
39914 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
39915diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
39916index ac98964..5dbf512 100644
39917--- a/drivers/gpu/drm/via/via_irq.c
39918+++ b/drivers/gpu/drm/via/via_irq.c
39919@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
39920 if (crtc != 0)
39921 return 0;
39922
39923- return atomic_read(&dev_priv->vbl_received);
39924+ return atomic_read_unchecked(&dev_priv->vbl_received);
39925 }
39926
39927 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
39928@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
39929
39930 status = VIA_READ(VIA_REG_INTERRUPT);
39931 if (status & VIA_IRQ_VBLANK_PENDING) {
39932- atomic_inc(&dev_priv->vbl_received);
39933- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
39934+ atomic_inc_unchecked(&dev_priv->vbl_received);
39935+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
39936 do_gettimeofday(&cur_vblank);
39937 if (dev_priv->last_vblank_valid) {
39938 dev_priv->usec_per_vblank =
39939@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
39940 dev_priv->last_vblank = cur_vblank;
39941 dev_priv->last_vblank_valid = 1;
39942 }
39943- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
39944+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
39945 DRM_DEBUG("US per vblank is: %u\n",
39946 dev_priv->usec_per_vblank);
39947 }
39948@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
39949
39950 for (i = 0; i < dev_priv->num_irqs; ++i) {
39951 if (status & cur_irq->pending_mask) {
39952- atomic_inc(&cur_irq->irq_received);
39953+ atomic_inc_unchecked(&cur_irq->irq_received);
39954 DRM_WAKEUP(&cur_irq->irq_queue);
39955 handled = 1;
39956 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
39957@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
39958 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
39959 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
39960 masks[irq][4]));
39961- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
39962+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
39963 } else {
39964 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
39965 (((cur_irq_sequence =
39966- atomic_read(&cur_irq->irq_received)) -
39967+ atomic_read_unchecked(&cur_irq->irq_received)) -
39968 *sequence) <= (1 << 23)));
39969 }
39970 *sequence = cur_irq_sequence;
39971@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
39972 }
39973
39974 for (i = 0; i < dev_priv->num_irqs; ++i) {
39975- atomic_set(&cur_irq->irq_received, 0);
39976+ atomic_set_unchecked(&cur_irq->irq_received, 0);
39977 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
39978 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
39979 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
39980@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
39981 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
39982 case VIA_IRQ_RELATIVE:
39983 irqwait->request.sequence +=
39984- atomic_read(&cur_irq->irq_received);
39985+ atomic_read_unchecked(&cur_irq->irq_received);
39986 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
39987 case VIA_IRQ_ABSOLUTE:
39988 break;
39989diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
39990index 150ec64..f5165f2 100644
39991--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
39992+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
39993@@ -290,7 +290,7 @@ struct vmw_private {
39994 * Fencing and IRQs.
39995 */
39996
39997- atomic_t marker_seq;
39998+ atomic_unchecked_t marker_seq;
39999 wait_queue_head_t fence_queue;
40000 wait_queue_head_t fifo_queue;
40001 int fence_queue_waiters; /* Protected by hw_mutex */
40002diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
40003index 3eb1486..0a47ee9 100644
40004--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
40005+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
40006@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
40007 (unsigned int) min,
40008 (unsigned int) fifo->capabilities);
40009
40010- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
40011+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
40012 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
40013 vmw_marker_queue_init(&fifo->marker_queue);
40014 return vmw_fifo_send_fence(dev_priv, &dummy);
40015@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
40016 if (reserveable)
40017 iowrite32(bytes, fifo_mem +
40018 SVGA_FIFO_RESERVED);
40019- return fifo_mem + (next_cmd >> 2);
40020+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
40021 } else {
40022 need_bounce = true;
40023 }
40024@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
40025
40026 fm = vmw_fifo_reserve(dev_priv, bytes);
40027 if (unlikely(fm == NULL)) {
40028- *seqno = atomic_read(&dev_priv->marker_seq);
40029+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
40030 ret = -ENOMEM;
40031 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
40032 false, 3*HZ);
40033@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
40034 }
40035
40036 do {
40037- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
40038+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
40039 } while (*seqno == 0);
40040
40041 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
40042diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
40043index c509d40..3b640c3 100644
40044--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
40045+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
40046@@ -138,7 +138,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
40047 int ret;
40048
40049 num_clips = arg->num_clips;
40050- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
40051+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
40052
40053 if (unlikely(num_clips == 0))
40054 return 0;
40055@@ -222,7 +222,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
40056 int ret;
40057
40058 num_clips = arg->num_clips;
40059- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
40060+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
40061
40062 if (unlikely(num_clips == 0))
40063 return 0;
40064diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
40065index 4640adb..e1384ed 100644
40066--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
40067+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
40068@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
40069 * emitted. Then the fence is stale and signaled.
40070 */
40071
40072- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
40073+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
40074 > VMW_FENCE_WRAP);
40075
40076 return ret;
40077@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
40078
40079 if (fifo_idle)
40080 down_read(&fifo_state->rwsem);
40081- signal_seq = atomic_read(&dev_priv->marker_seq);
40082+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
40083 ret = 0;
40084
40085 for (;;) {
40086diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
40087index 8a8725c2..afed796 100644
40088--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
40089+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
40090@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
40091 while (!vmw_lag_lt(queue, us)) {
40092 spin_lock(&queue->lock);
40093 if (list_empty(&queue->head))
40094- seqno = atomic_read(&dev_priv->marker_seq);
40095+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
40096 else {
40097 marker = list_first_entry(&queue->head,
40098 struct vmw_marker, head);
40099diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c
40100index b1a05ad..1c9d899 100644
40101--- a/drivers/gpu/host1x/drm/dc.c
40102+++ b/drivers/gpu/host1x/drm/dc.c
40103@@ -1004,7 +1004,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
40104 }
40105
40106 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
40107- dc->debugfs_files[i].data = dc;
40108+ *(void **)&dc->debugfs_files[i].data = dc;
40109
40110 err = drm_debugfs_create_files(dc->debugfs_files,
40111 ARRAY_SIZE(debugfs_files),
40112diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
40113index ec0ae2d..dc0780b 100644
40114--- a/drivers/gpu/vga/vga_switcheroo.c
40115+++ b/drivers/gpu/vga/vga_switcheroo.c
40116@@ -643,7 +643,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
40117
40118 /* this version is for the case where the power switch is separate
40119 to the device being powered down. */
40120-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
40121+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
40122 {
40123 /* copy over all the bus versions */
40124 if (dev->bus && dev->bus->pm) {
40125@@ -688,7 +688,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
40126 return ret;
40127 }
40128
40129-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
40130+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
40131 {
40132 /* copy over all the bus versions */
40133 if (dev->bus && dev->bus->pm) {
40134diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
40135index aedfe50..1dc929b 100644
40136--- a/drivers/hid/hid-core.c
40137+++ b/drivers/hid/hid-core.c
40138@@ -2416,7 +2416,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
40139
40140 int hid_add_device(struct hid_device *hdev)
40141 {
40142- static atomic_t id = ATOMIC_INIT(0);
40143+ static atomic_unchecked_t id = ATOMIC_INIT(0);
40144 int ret;
40145
40146 if (WARN_ON(hdev->status & HID_STAT_ADDED))
40147@@ -2450,7 +2450,7 @@ int hid_add_device(struct hid_device *hdev)
40148 /* XXX hack, any other cleaner solution after the driver core
40149 * is converted to allow more than 20 bytes as the device name? */
40150 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
40151- hdev->vendor, hdev->product, atomic_inc_return(&id));
40152+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
40153
40154 hid_debug_register(hdev, dev_name(&hdev->dev));
40155 ret = device_add(&hdev->dev);
40156diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
40157index c13fb5b..55a3802 100644
40158--- a/drivers/hid/hid-wiimote-debug.c
40159+++ b/drivers/hid/hid-wiimote-debug.c
40160@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
40161 else if (size == 0)
40162 return -EIO;
40163
40164- if (copy_to_user(u, buf, size))
40165+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
40166 return -EFAULT;
40167
40168 *off += size;
40169diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
40170index cedc6da..2c3da2a 100644
40171--- a/drivers/hid/uhid.c
40172+++ b/drivers/hid/uhid.c
40173@@ -47,7 +47,7 @@ struct uhid_device {
40174 struct mutex report_lock;
40175 wait_queue_head_t report_wait;
40176 atomic_t report_done;
40177- atomic_t report_id;
40178+ atomic_unchecked_t report_id;
40179 struct uhid_event report_buf;
40180 };
40181
40182@@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
40183
40184 spin_lock_irqsave(&uhid->qlock, flags);
40185 ev->type = UHID_FEATURE;
40186- ev->u.feature.id = atomic_inc_return(&uhid->report_id);
40187+ ev->u.feature.id = atomic_inc_return_unchecked(&uhid->report_id);
40188 ev->u.feature.rnum = rnum;
40189 ev->u.feature.rtype = report_type;
40190
40191@@ -446,7 +446,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
40192 spin_lock_irqsave(&uhid->qlock, flags);
40193
40194 /* id for old report; drop it silently */
40195- if (atomic_read(&uhid->report_id) != ev->u.feature_answer.id)
40196+ if (atomic_read_unchecked(&uhid->report_id) != ev->u.feature_answer.id)
40197 goto unlock;
40198 if (atomic_read(&uhid->report_done))
40199 goto unlock;
40200diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
40201index 6de6c98..18319e9 100644
40202--- a/drivers/hv/channel.c
40203+++ b/drivers/hv/channel.c
40204@@ -406,8 +406,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
40205 int ret = 0;
40206 int t;
40207
40208- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
40209- atomic_inc(&vmbus_connection.next_gpadl_handle);
40210+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
40211+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
40212
40213 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
40214 if (ret)
40215diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
40216index 88f4096..e50452e 100644
40217--- a/drivers/hv/hv.c
40218+++ b/drivers/hv/hv.c
40219@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
40220 u64 output_address = (output) ? virt_to_phys(output) : 0;
40221 u32 output_address_hi = output_address >> 32;
40222 u32 output_address_lo = output_address & 0xFFFFFFFF;
40223- void *hypercall_page = hv_context.hypercall_page;
40224+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
40225
40226 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
40227 "=a"(hv_status_lo) : "d" (control_hi),
40228diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
40229index 7e17a54..a50a33d 100644
40230--- a/drivers/hv/hv_balloon.c
40231+++ b/drivers/hv/hv_balloon.c
40232@@ -464,7 +464,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
40233
40234 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
40235 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
40236-static atomic_t trans_id = ATOMIC_INIT(0);
40237+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
40238
40239 static int dm_ring_size = (5 * PAGE_SIZE);
40240
40241@@ -886,7 +886,7 @@ static void hot_add_req(struct work_struct *dummy)
40242 pr_info("Memory hot add failed\n");
40243
40244 dm->state = DM_INITIALIZED;
40245- resp.hdr.trans_id = atomic_inc_return(&trans_id);
40246+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40247 vmbus_sendpacket(dm->dev->channel, &resp,
40248 sizeof(struct dm_hot_add_response),
40249 (unsigned long)NULL,
40250@@ -960,7 +960,7 @@ static void post_status(struct hv_dynmem_device *dm)
40251 memset(&status, 0, sizeof(struct dm_status));
40252 status.hdr.type = DM_STATUS_REPORT;
40253 status.hdr.size = sizeof(struct dm_status);
40254- status.hdr.trans_id = atomic_inc_return(&trans_id);
40255+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40256
40257 /*
40258 * The host expects the guest to report free memory.
40259@@ -980,7 +980,7 @@ static void post_status(struct hv_dynmem_device *dm)
40260 * send the status. This can happen if we were interrupted
40261 * after we picked our transaction ID.
40262 */
40263- if (status.hdr.trans_id != atomic_read(&trans_id))
40264+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
40265 return;
40266
40267 vmbus_sendpacket(dm->dev->channel, &status,
40268@@ -1108,7 +1108,7 @@ static void balloon_up(struct work_struct *dummy)
40269 */
40270
40271 do {
40272- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
40273+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40274 ret = vmbus_sendpacket(dm_device.dev->channel,
40275 bl_resp,
40276 bl_resp->hdr.size,
40277@@ -1152,7 +1152,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
40278
40279 memset(&resp, 0, sizeof(struct dm_unballoon_response));
40280 resp.hdr.type = DM_UNBALLOON_RESPONSE;
40281- resp.hdr.trans_id = atomic_inc_return(&trans_id);
40282+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40283 resp.hdr.size = sizeof(struct dm_unballoon_response);
40284
40285 vmbus_sendpacket(dm_device.dev->channel, &resp,
40286@@ -1215,7 +1215,7 @@ static void version_resp(struct hv_dynmem_device *dm,
40287 memset(&version_req, 0, sizeof(struct dm_version_request));
40288 version_req.hdr.type = DM_VERSION_REQUEST;
40289 version_req.hdr.size = sizeof(struct dm_version_request);
40290- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
40291+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40292 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
40293 version_req.is_last_attempt = 1;
40294
40295@@ -1385,7 +1385,7 @@ static int balloon_probe(struct hv_device *dev,
40296 memset(&version_req, 0, sizeof(struct dm_version_request));
40297 version_req.hdr.type = DM_VERSION_REQUEST;
40298 version_req.hdr.size = sizeof(struct dm_version_request);
40299- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
40300+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40301 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
40302 version_req.is_last_attempt = 0;
40303
40304@@ -1416,7 +1416,7 @@ static int balloon_probe(struct hv_device *dev,
40305 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
40306 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
40307 cap_msg.hdr.size = sizeof(struct dm_capabilities);
40308- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
40309+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
40310
40311 cap_msg.caps.cap_bits.balloon = 1;
40312 cap_msg.caps.cap_bits.hot_add = 1;
40313diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
40314index d84918f..7f38f9f 100644
40315--- a/drivers/hv/hyperv_vmbus.h
40316+++ b/drivers/hv/hyperv_vmbus.h
40317@@ -595,7 +595,7 @@ enum vmbus_connect_state {
40318 struct vmbus_connection {
40319 enum vmbus_connect_state conn_state;
40320
40321- atomic_t next_gpadl_handle;
40322+ atomic_unchecked_t next_gpadl_handle;
40323
40324 /*
40325 * Represents channel interrupts. Each bit position represents a
40326diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
40327index f9fe46f..356b119 100644
40328--- a/drivers/hv/vmbus_drv.c
40329+++ b/drivers/hv/vmbus_drv.c
40330@@ -672,10 +672,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
40331 {
40332 int ret = 0;
40333
40334- static atomic_t device_num = ATOMIC_INIT(0);
40335+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
40336
40337 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
40338- atomic_inc_return(&device_num));
40339+ atomic_inc_return_unchecked(&device_num));
40340
40341 child_device_obj->device.bus = &hv_bus;
40342 child_device_obj->device.parent = &hv_acpi_dev->dev;
40343diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
40344index a9e3d01..9dd246e 100644
40345--- a/drivers/hwmon/acpi_power_meter.c
40346+++ b/drivers/hwmon/acpi_power_meter.c
40347@@ -117,7 +117,7 @@ struct sensor_template {
40348 struct device_attribute *devattr,
40349 const char *buf, size_t count);
40350 int index;
40351-};
40352+} __do_const;
40353
40354 /* Averaging interval */
40355 static int update_avg_interval(struct acpi_power_meter_resource *resource)
40356@@ -629,7 +629,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
40357 struct sensor_template *attrs)
40358 {
40359 struct device *dev = &resource->acpi_dev->dev;
40360- struct sensor_device_attribute *sensors =
40361+ sensor_device_attribute_no_const *sensors =
40362 &resource->sensors[resource->num_sensors];
40363 int res = 0;
40364
40365diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
40366index 3288f13..71cfb4e 100644
40367--- a/drivers/hwmon/applesmc.c
40368+++ b/drivers/hwmon/applesmc.c
40369@@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
40370 {
40371 struct applesmc_node_group *grp;
40372 struct applesmc_dev_attr *node;
40373- struct attribute *attr;
40374+ attribute_no_const *attr;
40375 int ret, i;
40376
40377 for (grp = groups; grp->format; grp++) {
40378diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
40379index b25c643..a13460d 100644
40380--- a/drivers/hwmon/asus_atk0110.c
40381+++ b/drivers/hwmon/asus_atk0110.c
40382@@ -152,10 +152,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
40383 struct atk_sensor_data {
40384 struct list_head list;
40385 struct atk_data *data;
40386- struct device_attribute label_attr;
40387- struct device_attribute input_attr;
40388- struct device_attribute limit1_attr;
40389- struct device_attribute limit2_attr;
40390+ device_attribute_no_const label_attr;
40391+ device_attribute_no_const input_attr;
40392+ device_attribute_no_const limit1_attr;
40393+ device_attribute_no_const limit2_attr;
40394 char label_attr_name[ATTR_NAME_SIZE];
40395 char input_attr_name[ATTR_NAME_SIZE];
40396 char limit1_attr_name[ATTR_NAME_SIZE];
40397@@ -275,7 +275,7 @@ static ssize_t atk_name_show(struct device *dev,
40398 static struct device_attribute atk_name_attr =
40399 __ATTR(name, 0444, atk_name_show, NULL);
40400
40401-static void atk_init_attribute(struct device_attribute *attr, char *name,
40402+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
40403 sysfs_show_func show)
40404 {
40405 sysfs_attr_init(&attr->attr);
40406diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
40407index 78be661..4dd032f 100644
40408--- a/drivers/hwmon/coretemp.c
40409+++ b/drivers/hwmon/coretemp.c
40410@@ -797,7 +797,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
40411 return NOTIFY_OK;
40412 }
40413
40414-static struct notifier_block coretemp_cpu_notifier __refdata = {
40415+static struct notifier_block coretemp_cpu_notifier = {
40416 .notifier_call = coretemp_cpu_callback,
40417 };
40418
40419diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
40420index 632f1dc..57e6a58 100644
40421--- a/drivers/hwmon/ibmaem.c
40422+++ b/drivers/hwmon/ibmaem.c
40423@@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
40424 struct aem_rw_sensor_template *rw)
40425 {
40426 struct device *dev = &data->pdev->dev;
40427- struct sensor_device_attribute *sensors = data->sensors;
40428+ sensor_device_attribute_no_const *sensors = data->sensors;
40429 int err;
40430
40431 /* Set up read-only sensors */
40432diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
40433index 708081b..fe2d4ab 100644
40434--- a/drivers/hwmon/iio_hwmon.c
40435+++ b/drivers/hwmon/iio_hwmon.c
40436@@ -73,7 +73,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
40437 {
40438 struct device *dev = &pdev->dev;
40439 struct iio_hwmon_state *st;
40440- struct sensor_device_attribute *a;
40441+ sensor_device_attribute_no_const *a;
40442 int ret, i;
40443 int in_i = 1, temp_i = 1, curr_i = 1;
40444 enum iio_chan_type type;
40445diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
40446index 6eb03ce..bea7e3e 100644
40447--- a/drivers/hwmon/nct6775.c
40448+++ b/drivers/hwmon/nct6775.c
40449@@ -936,10 +936,10 @@ static struct attribute_group *
40450 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
40451 int repeat)
40452 {
40453- struct attribute_group *group;
40454+ attribute_group_no_const *group;
40455 struct sensor_device_attr_u *su;
40456- struct sensor_device_attribute *a;
40457- struct sensor_device_attribute_2 *a2;
40458+ sensor_device_attribute_no_const *a;
40459+ sensor_device_attribute_2_no_const *a2;
40460 struct attribute **attrs;
40461 struct sensor_device_template **t;
40462 int err, i, j, count;
40463diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
40464index 9319fcf..189ff45 100644
40465--- a/drivers/hwmon/pmbus/pmbus_core.c
40466+++ b/drivers/hwmon/pmbus/pmbus_core.c
40467@@ -781,7 +781,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
40468 return 0;
40469 }
40470
40471-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
40472+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
40473 const char *name,
40474 umode_t mode,
40475 ssize_t (*show)(struct device *dev,
40476@@ -798,7 +798,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
40477 dev_attr->store = store;
40478 }
40479
40480-static void pmbus_attr_init(struct sensor_device_attribute *a,
40481+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
40482 const char *name,
40483 umode_t mode,
40484 ssize_t (*show)(struct device *dev,
40485@@ -820,7 +820,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
40486 u16 reg, u8 mask)
40487 {
40488 struct pmbus_boolean *boolean;
40489- struct sensor_device_attribute *a;
40490+ sensor_device_attribute_no_const *a;
40491
40492 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
40493 if (!boolean)
40494@@ -845,7 +845,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
40495 bool update, bool readonly)
40496 {
40497 struct pmbus_sensor *sensor;
40498- struct device_attribute *a;
40499+ device_attribute_no_const *a;
40500
40501 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
40502 if (!sensor)
40503@@ -876,7 +876,7 @@ static int pmbus_add_label(struct pmbus_data *data,
40504 const char *lstring, int index)
40505 {
40506 struct pmbus_label *label;
40507- struct device_attribute *a;
40508+ device_attribute_no_const *a;
40509
40510 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
40511 if (!label)
40512diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
40513index 97cd45a..ac54d8b 100644
40514--- a/drivers/hwmon/sht15.c
40515+++ b/drivers/hwmon/sht15.c
40516@@ -169,7 +169,7 @@ struct sht15_data {
40517 int supply_uv;
40518 bool supply_uv_valid;
40519 struct work_struct update_supply_work;
40520- atomic_t interrupt_handled;
40521+ atomic_unchecked_t interrupt_handled;
40522 };
40523
40524 /**
40525@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
40526 ret = gpio_direction_input(data->pdata->gpio_data);
40527 if (ret)
40528 return ret;
40529- atomic_set(&data->interrupt_handled, 0);
40530+ atomic_set_unchecked(&data->interrupt_handled, 0);
40531
40532 enable_irq(gpio_to_irq(data->pdata->gpio_data));
40533 if (gpio_get_value(data->pdata->gpio_data) == 0) {
40534 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
40535 /* Only relevant if the interrupt hasn't occurred. */
40536- if (!atomic_read(&data->interrupt_handled))
40537+ if (!atomic_read_unchecked(&data->interrupt_handled))
40538 schedule_work(&data->read_work);
40539 }
40540 ret = wait_event_timeout(data->wait_queue,
40541@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
40542
40543 /* First disable the interrupt */
40544 disable_irq_nosync(irq);
40545- atomic_inc(&data->interrupt_handled);
40546+ atomic_inc_unchecked(&data->interrupt_handled);
40547 /* Then schedule a reading work struct */
40548 if (data->state != SHT15_READING_NOTHING)
40549 schedule_work(&data->read_work);
40550@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
40551 * If not, then start the interrupt again - care here as could
40552 * have gone low in meantime so verify it hasn't!
40553 */
40554- atomic_set(&data->interrupt_handled, 0);
40555+ atomic_set_unchecked(&data->interrupt_handled, 0);
40556 enable_irq(gpio_to_irq(data->pdata->gpio_data));
40557 /* If still not occurred or another handler was scheduled */
40558 if (gpio_get_value(data->pdata->gpio_data)
40559- || atomic_read(&data->interrupt_handled))
40560+ || atomic_read_unchecked(&data->interrupt_handled))
40561 return;
40562 }
40563
40564diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
40565index 38944e9..ae9e5ed 100644
40566--- a/drivers/hwmon/via-cputemp.c
40567+++ b/drivers/hwmon/via-cputemp.c
40568@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
40569 return NOTIFY_OK;
40570 }
40571
40572-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
40573+static struct notifier_block via_cputemp_cpu_notifier = {
40574 .notifier_call = via_cputemp_cpu_callback,
40575 };
40576
40577diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
40578index 07f01ac..d79ad3d 100644
40579--- a/drivers/i2c/busses/i2c-amd756-s4882.c
40580+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
40581@@ -43,7 +43,7 @@
40582 extern struct i2c_adapter amd756_smbus;
40583
40584 static struct i2c_adapter *s4882_adapter;
40585-static struct i2c_algorithm *s4882_algo;
40586+static i2c_algorithm_no_const *s4882_algo;
40587
40588 /* Wrapper access functions for multiplexed SMBus */
40589 static DEFINE_MUTEX(amd756_lock);
40590diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
40591index dae3ddf..26e21d1 100644
40592--- a/drivers/i2c/busses/i2c-diolan-u2c.c
40593+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
40594@@ -99,7 +99,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
40595 /* usb layer */
40596
40597 /* Send command to device, and get response. */
40598-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
40599+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
40600 {
40601 int ret = 0;
40602 int actual;
40603diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
40604index 2ca268d..c6acbdf 100644
40605--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
40606+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
40607@@ -41,7 +41,7 @@
40608 extern struct i2c_adapter *nforce2_smbus;
40609
40610 static struct i2c_adapter *s4985_adapter;
40611-static struct i2c_algorithm *s4985_algo;
40612+static i2c_algorithm_no_const *s4985_algo;
40613
40614 /* Wrapper access functions for multiplexed SMBus */
40615 static DEFINE_MUTEX(nforce2_lock);
40616diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
40617index c3ccdea..5b3dc1a 100644
40618--- a/drivers/i2c/i2c-dev.c
40619+++ b/drivers/i2c/i2c-dev.c
40620@@ -271,7 +271,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
40621 break;
40622 }
40623
40624- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
40625+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
40626 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
40627 if (IS_ERR(rdwr_pa[i].buf)) {
40628 res = PTR_ERR(rdwr_pa[i].buf);
40629diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
40630index 0b510ba..4fbb5085 100644
40631--- a/drivers/ide/ide-cd.c
40632+++ b/drivers/ide/ide-cd.c
40633@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
40634 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
40635 if ((unsigned long)buf & alignment
40636 || blk_rq_bytes(rq) & q->dma_pad_mask
40637- || object_is_on_stack(buf))
40638+ || object_starts_on_stack(buf))
40639 drive->dma = 0;
40640 }
40641 }
40642diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
40643index f95c697..0a1b05c 100644
40644--- a/drivers/iio/industrialio-core.c
40645+++ b/drivers/iio/industrialio-core.c
40646@@ -506,7 +506,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
40647 }
40648
40649 static
40650-int __iio_device_attr_init(struct device_attribute *dev_attr,
40651+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
40652 const char *postfix,
40653 struct iio_chan_spec const *chan,
40654 ssize_t (*readfunc)(struct device *dev,
40655diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
40656index 784b97c..c9ceadf 100644
40657--- a/drivers/infiniband/core/cm.c
40658+++ b/drivers/infiniband/core/cm.c
40659@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
40660
40661 struct cm_counter_group {
40662 struct kobject obj;
40663- atomic_long_t counter[CM_ATTR_COUNT];
40664+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
40665 };
40666
40667 struct cm_counter_attribute {
40668@@ -1395,7 +1395,7 @@ static void cm_dup_req_handler(struct cm_work *work,
40669 struct ib_mad_send_buf *msg = NULL;
40670 int ret;
40671
40672- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40673+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40674 counter[CM_REQ_COUNTER]);
40675
40676 /* Quick state check to discard duplicate REQs. */
40677@@ -1779,7 +1779,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
40678 if (!cm_id_priv)
40679 return;
40680
40681- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40682+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40683 counter[CM_REP_COUNTER]);
40684 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
40685 if (ret)
40686@@ -1946,7 +1946,7 @@ static int cm_rtu_handler(struct cm_work *work)
40687 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
40688 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
40689 spin_unlock_irq(&cm_id_priv->lock);
40690- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40691+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40692 counter[CM_RTU_COUNTER]);
40693 goto out;
40694 }
40695@@ -2129,7 +2129,7 @@ static int cm_dreq_handler(struct cm_work *work)
40696 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
40697 dreq_msg->local_comm_id);
40698 if (!cm_id_priv) {
40699- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40700+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40701 counter[CM_DREQ_COUNTER]);
40702 cm_issue_drep(work->port, work->mad_recv_wc);
40703 return -EINVAL;
40704@@ -2154,7 +2154,7 @@ static int cm_dreq_handler(struct cm_work *work)
40705 case IB_CM_MRA_REP_RCVD:
40706 break;
40707 case IB_CM_TIMEWAIT:
40708- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40709+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40710 counter[CM_DREQ_COUNTER]);
40711 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
40712 goto unlock;
40713@@ -2168,7 +2168,7 @@ static int cm_dreq_handler(struct cm_work *work)
40714 cm_free_msg(msg);
40715 goto deref;
40716 case IB_CM_DREQ_RCVD:
40717- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40718+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40719 counter[CM_DREQ_COUNTER]);
40720 goto unlock;
40721 default:
40722@@ -2535,7 +2535,7 @@ static int cm_mra_handler(struct cm_work *work)
40723 ib_modify_mad(cm_id_priv->av.port->mad_agent,
40724 cm_id_priv->msg, timeout)) {
40725 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
40726- atomic_long_inc(&work->port->
40727+ atomic_long_inc_unchecked(&work->port->
40728 counter_group[CM_RECV_DUPLICATES].
40729 counter[CM_MRA_COUNTER]);
40730 goto out;
40731@@ -2544,7 +2544,7 @@ static int cm_mra_handler(struct cm_work *work)
40732 break;
40733 case IB_CM_MRA_REQ_RCVD:
40734 case IB_CM_MRA_REP_RCVD:
40735- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40736+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40737 counter[CM_MRA_COUNTER]);
40738 /* fall through */
40739 default:
40740@@ -2706,7 +2706,7 @@ static int cm_lap_handler(struct cm_work *work)
40741 case IB_CM_LAP_IDLE:
40742 break;
40743 case IB_CM_MRA_LAP_SENT:
40744- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40745+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40746 counter[CM_LAP_COUNTER]);
40747 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
40748 goto unlock;
40749@@ -2722,7 +2722,7 @@ static int cm_lap_handler(struct cm_work *work)
40750 cm_free_msg(msg);
40751 goto deref;
40752 case IB_CM_LAP_RCVD:
40753- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40754+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40755 counter[CM_LAP_COUNTER]);
40756 goto unlock;
40757 default:
40758@@ -3006,7 +3006,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
40759 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
40760 if (cur_cm_id_priv) {
40761 spin_unlock_irq(&cm.lock);
40762- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
40763+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
40764 counter[CM_SIDR_REQ_COUNTER]);
40765 goto out; /* Duplicate message. */
40766 }
40767@@ -3218,10 +3218,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
40768 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
40769 msg->retries = 1;
40770
40771- atomic_long_add(1 + msg->retries,
40772+ atomic_long_add_unchecked(1 + msg->retries,
40773 &port->counter_group[CM_XMIT].counter[attr_index]);
40774 if (msg->retries)
40775- atomic_long_add(msg->retries,
40776+ atomic_long_add_unchecked(msg->retries,
40777 &port->counter_group[CM_XMIT_RETRIES].
40778 counter[attr_index]);
40779
40780@@ -3431,7 +3431,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
40781 }
40782
40783 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
40784- atomic_long_inc(&port->counter_group[CM_RECV].
40785+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
40786 counter[attr_id - CM_ATTR_ID_OFFSET]);
40787
40788 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
40789@@ -3636,7 +3636,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
40790 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
40791
40792 return sprintf(buf, "%ld\n",
40793- atomic_long_read(&group->counter[cm_attr->index]));
40794+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
40795 }
40796
40797 static const struct sysfs_ops cm_counter_ops = {
40798diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
40799index 9f5ad7c..588cd84 100644
40800--- a/drivers/infiniband/core/fmr_pool.c
40801+++ b/drivers/infiniband/core/fmr_pool.c
40802@@ -98,8 +98,8 @@ struct ib_fmr_pool {
40803
40804 struct task_struct *thread;
40805
40806- atomic_t req_ser;
40807- atomic_t flush_ser;
40808+ atomic_unchecked_t req_ser;
40809+ atomic_unchecked_t flush_ser;
40810
40811 wait_queue_head_t force_wait;
40812 };
40813@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
40814 struct ib_fmr_pool *pool = pool_ptr;
40815
40816 do {
40817- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
40818+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
40819 ib_fmr_batch_release(pool);
40820
40821- atomic_inc(&pool->flush_ser);
40822+ atomic_inc_unchecked(&pool->flush_ser);
40823 wake_up_interruptible(&pool->force_wait);
40824
40825 if (pool->flush_function)
40826@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
40827 }
40828
40829 set_current_state(TASK_INTERRUPTIBLE);
40830- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
40831+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
40832 !kthread_should_stop())
40833 schedule();
40834 __set_current_state(TASK_RUNNING);
40835@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
40836 pool->dirty_watermark = params->dirty_watermark;
40837 pool->dirty_len = 0;
40838 spin_lock_init(&pool->pool_lock);
40839- atomic_set(&pool->req_ser, 0);
40840- atomic_set(&pool->flush_ser, 0);
40841+ atomic_set_unchecked(&pool->req_ser, 0);
40842+ atomic_set_unchecked(&pool->flush_ser, 0);
40843 init_waitqueue_head(&pool->force_wait);
40844
40845 pool->thread = kthread_run(ib_fmr_cleanup_thread,
40846@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
40847 }
40848 spin_unlock_irq(&pool->pool_lock);
40849
40850- serial = atomic_inc_return(&pool->req_ser);
40851+ serial = atomic_inc_return_unchecked(&pool->req_ser);
40852 wake_up_process(pool->thread);
40853
40854 if (wait_event_interruptible(pool->force_wait,
40855- atomic_read(&pool->flush_ser) - serial >= 0))
40856+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
40857 return -EINTR;
40858
40859 return 0;
40860@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
40861 } else {
40862 list_add_tail(&fmr->list, &pool->dirty_list);
40863 if (++pool->dirty_len >= pool->dirty_watermark) {
40864- atomic_inc(&pool->req_ser);
40865+ atomic_inc_unchecked(&pool->req_ser);
40866 wake_up_process(pool->thread);
40867 }
40868 }
40869diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
40870index 4cb8eb2..146bf60 100644
40871--- a/drivers/infiniband/hw/cxgb4/mem.c
40872+++ b/drivers/infiniband/hw/cxgb4/mem.c
40873@@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
40874 int err;
40875 struct fw_ri_tpte tpt;
40876 u32 stag_idx;
40877- static atomic_t key;
40878+ static atomic_unchecked_t key;
40879
40880 if (c4iw_fatal_error(rdev))
40881 return -EIO;
40882@@ -266,7 +266,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
40883 if (rdev->stats.stag.cur > rdev->stats.stag.max)
40884 rdev->stats.stag.max = rdev->stats.stag.cur;
40885 mutex_unlock(&rdev->stats.lock);
40886- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
40887+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
40888 }
40889 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
40890 __func__, stag_state, type, pdid, stag_idx);
40891diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
40892index 79b3dbc..96e5fcc 100644
40893--- a/drivers/infiniband/hw/ipath/ipath_rc.c
40894+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
40895@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
40896 struct ib_atomic_eth *ateth;
40897 struct ipath_ack_entry *e;
40898 u64 vaddr;
40899- atomic64_t *maddr;
40900+ atomic64_unchecked_t *maddr;
40901 u64 sdata;
40902 u32 rkey;
40903 u8 next;
40904@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
40905 IB_ACCESS_REMOTE_ATOMIC)))
40906 goto nack_acc_unlck;
40907 /* Perform atomic OP and save result. */
40908- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
40909+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
40910 sdata = be64_to_cpu(ateth->swap_data);
40911 e = &qp->s_ack_queue[qp->r_head_ack_queue];
40912 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
40913- (u64) atomic64_add_return(sdata, maddr) - sdata :
40914+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
40915 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
40916 be64_to_cpu(ateth->compare_data),
40917 sdata);
40918diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
40919index 1f95bba..9530f87 100644
40920--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
40921+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
40922@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
40923 unsigned long flags;
40924 struct ib_wc wc;
40925 u64 sdata;
40926- atomic64_t *maddr;
40927+ atomic64_unchecked_t *maddr;
40928 enum ib_wc_status send_status;
40929
40930 /*
40931@@ -382,11 +382,11 @@ again:
40932 IB_ACCESS_REMOTE_ATOMIC)))
40933 goto acc_err;
40934 /* Perform atomic OP and save result. */
40935- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
40936+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
40937 sdata = wqe->wr.wr.atomic.compare_add;
40938 *(u64 *) sqp->s_sge.sge.vaddr =
40939 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
40940- (u64) atomic64_add_return(sdata, maddr) - sdata :
40941+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
40942 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
40943 sdata, wqe->wr.wr.atomic.swap);
40944 goto send_comp;
40945diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
40946index f2a3f48..673ec79 100644
40947--- a/drivers/infiniband/hw/mlx4/mad.c
40948+++ b/drivers/infiniband/hw/mlx4/mad.c
40949@@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
40950
40951 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
40952 {
40953- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
40954+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
40955 cpu_to_be64(0xff00000000000000LL);
40956 }
40957
40958diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
40959index 25b2cdf..099ff97 100644
40960--- a/drivers/infiniband/hw/mlx4/mcg.c
40961+++ b/drivers/infiniband/hw/mlx4/mcg.c
40962@@ -1040,7 +1040,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
40963 {
40964 char name[20];
40965
40966- atomic_set(&ctx->tid, 0);
40967+ atomic_set_unchecked(&ctx->tid, 0);
40968 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
40969 ctx->mcg_wq = create_singlethread_workqueue(name);
40970 if (!ctx->mcg_wq)
40971diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
40972index 036b663..c9a8c73 100644
40973--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
40974+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
40975@@ -404,7 +404,7 @@ struct mlx4_ib_demux_ctx {
40976 struct list_head mcg_mgid0_list;
40977 struct workqueue_struct *mcg_wq;
40978 struct mlx4_ib_demux_pv_ctx **tun;
40979- atomic_t tid;
40980+ atomic_unchecked_t tid;
40981 int flushing; /* flushing the work queue */
40982 };
40983
40984diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
40985index 9d3e5c1..6f166df 100644
40986--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
40987+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
40988@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
40989 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
40990 }
40991
40992-int mthca_QUERY_FW(struct mthca_dev *dev)
40993+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
40994 {
40995 struct mthca_mailbox *mailbox;
40996 u32 *outbox;
40997@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
40998 CMD_TIME_CLASS_B);
40999 }
41000
41001-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
41002+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
41003 int num_mtt)
41004 {
41005 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
41006@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
41007 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
41008 }
41009
41010-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
41011+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
41012 int eq_num)
41013 {
41014 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
41015@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
41016 CMD_TIME_CLASS_B);
41017 }
41018
41019-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
41020+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
41021 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
41022 void *in_mad, void *response_mad)
41023 {
41024diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
41025index 87897b9..7e79542 100644
41026--- a/drivers/infiniband/hw/mthca/mthca_main.c
41027+++ b/drivers/infiniband/hw/mthca/mthca_main.c
41028@@ -692,7 +692,7 @@ err_close:
41029 return err;
41030 }
41031
41032-static int mthca_setup_hca(struct mthca_dev *dev)
41033+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
41034 {
41035 int err;
41036
41037diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
41038index ed9a989..6aa5dc2 100644
41039--- a/drivers/infiniband/hw/mthca/mthca_mr.c
41040+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
41041@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
41042 * through the bitmaps)
41043 */
41044
41045-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
41046+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
41047 {
41048 int o;
41049 int m;
41050@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
41051 return key;
41052 }
41053
41054-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
41055+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
41056 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
41057 {
41058 struct mthca_mailbox *mailbox;
41059@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
41060 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
41061 }
41062
41063-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
41064+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
41065 u64 *buffer_list, int buffer_size_shift,
41066 int list_len, u64 iova, u64 total_size,
41067 u32 access, struct mthca_mr *mr)
41068diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
41069index 5b71d43..35a9e14 100644
41070--- a/drivers/infiniband/hw/mthca/mthca_provider.c
41071+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
41072@@ -763,7 +763,7 @@ unlock:
41073 return 0;
41074 }
41075
41076-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
41077+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
41078 {
41079 struct mthca_dev *dev = to_mdev(ibcq->device);
41080 struct mthca_cq *cq = to_mcq(ibcq);
41081diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
41082index 4291410..d2ab1fb 100644
41083--- a/drivers/infiniband/hw/nes/nes.c
41084+++ b/drivers/infiniband/hw/nes/nes.c
41085@@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
41086 LIST_HEAD(nes_adapter_list);
41087 static LIST_HEAD(nes_dev_list);
41088
41089-atomic_t qps_destroyed;
41090+atomic_unchecked_t qps_destroyed;
41091
41092 static unsigned int ee_flsh_adapter;
41093 static unsigned int sysfs_nonidx_addr;
41094@@ -269,7 +269,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
41095 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
41096 struct nes_adapter *nesadapter = nesdev->nesadapter;
41097
41098- atomic_inc(&qps_destroyed);
41099+ atomic_inc_unchecked(&qps_destroyed);
41100
41101 /* Free the control structures */
41102
41103diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
41104index 33cc589..3bd6538 100644
41105--- a/drivers/infiniband/hw/nes/nes.h
41106+++ b/drivers/infiniband/hw/nes/nes.h
41107@@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
41108 extern unsigned int wqm_quanta;
41109 extern struct list_head nes_adapter_list;
41110
41111-extern atomic_t cm_connects;
41112-extern atomic_t cm_accepts;
41113-extern atomic_t cm_disconnects;
41114-extern atomic_t cm_closes;
41115-extern atomic_t cm_connecteds;
41116-extern atomic_t cm_connect_reqs;
41117-extern atomic_t cm_rejects;
41118-extern atomic_t mod_qp_timouts;
41119-extern atomic_t qps_created;
41120-extern atomic_t qps_destroyed;
41121-extern atomic_t sw_qps_destroyed;
41122+extern atomic_unchecked_t cm_connects;
41123+extern atomic_unchecked_t cm_accepts;
41124+extern atomic_unchecked_t cm_disconnects;
41125+extern atomic_unchecked_t cm_closes;
41126+extern atomic_unchecked_t cm_connecteds;
41127+extern atomic_unchecked_t cm_connect_reqs;
41128+extern atomic_unchecked_t cm_rejects;
41129+extern atomic_unchecked_t mod_qp_timouts;
41130+extern atomic_unchecked_t qps_created;
41131+extern atomic_unchecked_t qps_destroyed;
41132+extern atomic_unchecked_t sw_qps_destroyed;
41133 extern u32 mh_detected;
41134 extern u32 mh_pauses_sent;
41135 extern u32 cm_packets_sent;
41136@@ -196,16 +196,16 @@ extern u32 cm_packets_created;
41137 extern u32 cm_packets_received;
41138 extern u32 cm_packets_dropped;
41139 extern u32 cm_packets_retrans;
41140-extern atomic_t cm_listens_created;
41141-extern atomic_t cm_listens_destroyed;
41142+extern atomic_unchecked_t cm_listens_created;
41143+extern atomic_unchecked_t cm_listens_destroyed;
41144 extern u32 cm_backlog_drops;
41145-extern atomic_t cm_loopbacks;
41146-extern atomic_t cm_nodes_created;
41147-extern atomic_t cm_nodes_destroyed;
41148-extern atomic_t cm_accel_dropped_pkts;
41149-extern atomic_t cm_resets_recvd;
41150-extern atomic_t pau_qps_created;
41151-extern atomic_t pau_qps_destroyed;
41152+extern atomic_unchecked_t cm_loopbacks;
41153+extern atomic_unchecked_t cm_nodes_created;
41154+extern atomic_unchecked_t cm_nodes_destroyed;
41155+extern atomic_unchecked_t cm_accel_dropped_pkts;
41156+extern atomic_unchecked_t cm_resets_recvd;
41157+extern atomic_unchecked_t pau_qps_created;
41158+extern atomic_unchecked_t pau_qps_destroyed;
41159
41160 extern u32 int_mod_timer_init;
41161 extern u32 int_mod_cq_depth_256;
41162diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
41163index 6b29249..57081dd 100644
41164--- a/drivers/infiniband/hw/nes/nes_cm.c
41165+++ b/drivers/infiniband/hw/nes/nes_cm.c
41166@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
41167 u32 cm_packets_retrans;
41168 u32 cm_packets_created;
41169 u32 cm_packets_received;
41170-atomic_t cm_listens_created;
41171-atomic_t cm_listens_destroyed;
41172+atomic_unchecked_t cm_listens_created;
41173+atomic_unchecked_t cm_listens_destroyed;
41174 u32 cm_backlog_drops;
41175-atomic_t cm_loopbacks;
41176-atomic_t cm_nodes_created;
41177-atomic_t cm_nodes_destroyed;
41178-atomic_t cm_accel_dropped_pkts;
41179-atomic_t cm_resets_recvd;
41180+atomic_unchecked_t cm_loopbacks;
41181+atomic_unchecked_t cm_nodes_created;
41182+atomic_unchecked_t cm_nodes_destroyed;
41183+atomic_unchecked_t cm_accel_dropped_pkts;
41184+atomic_unchecked_t cm_resets_recvd;
41185
41186 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
41187 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
41188@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
41189
41190 static struct nes_cm_core *g_cm_core;
41191
41192-atomic_t cm_connects;
41193-atomic_t cm_accepts;
41194-atomic_t cm_disconnects;
41195-atomic_t cm_closes;
41196-atomic_t cm_connecteds;
41197-atomic_t cm_connect_reqs;
41198-atomic_t cm_rejects;
41199+atomic_unchecked_t cm_connects;
41200+atomic_unchecked_t cm_accepts;
41201+atomic_unchecked_t cm_disconnects;
41202+atomic_unchecked_t cm_closes;
41203+atomic_unchecked_t cm_connecteds;
41204+atomic_unchecked_t cm_connect_reqs;
41205+atomic_unchecked_t cm_rejects;
41206
41207 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
41208 {
41209@@ -1272,7 +1272,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
41210 kfree(listener);
41211 listener = NULL;
41212 ret = 0;
41213- atomic_inc(&cm_listens_destroyed);
41214+ atomic_inc_unchecked(&cm_listens_destroyed);
41215 } else {
41216 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
41217 }
41218@@ -1466,7 +1466,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
41219 cm_node->rem_mac);
41220
41221 add_hte_node(cm_core, cm_node);
41222- atomic_inc(&cm_nodes_created);
41223+ atomic_inc_unchecked(&cm_nodes_created);
41224
41225 return cm_node;
41226 }
41227@@ -1524,7 +1524,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
41228 }
41229
41230 atomic_dec(&cm_core->node_cnt);
41231- atomic_inc(&cm_nodes_destroyed);
41232+ atomic_inc_unchecked(&cm_nodes_destroyed);
41233 nesqp = cm_node->nesqp;
41234 if (nesqp) {
41235 nesqp->cm_node = NULL;
41236@@ -1588,7 +1588,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
41237
41238 static void drop_packet(struct sk_buff *skb)
41239 {
41240- atomic_inc(&cm_accel_dropped_pkts);
41241+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
41242 dev_kfree_skb_any(skb);
41243 }
41244
41245@@ -1651,7 +1651,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
41246 {
41247
41248 int reset = 0; /* whether to send reset in case of err.. */
41249- atomic_inc(&cm_resets_recvd);
41250+ atomic_inc_unchecked(&cm_resets_recvd);
41251 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
41252 " refcnt=%d\n", cm_node, cm_node->state,
41253 atomic_read(&cm_node->ref_count));
41254@@ -2292,7 +2292,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
41255 rem_ref_cm_node(cm_node->cm_core, cm_node);
41256 return NULL;
41257 }
41258- atomic_inc(&cm_loopbacks);
41259+ atomic_inc_unchecked(&cm_loopbacks);
41260 loopbackremotenode->loopbackpartner = cm_node;
41261 loopbackremotenode->tcp_cntxt.rcv_wscale =
41262 NES_CM_DEFAULT_RCV_WND_SCALE;
41263@@ -2567,7 +2567,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
41264 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
41265 else {
41266 rem_ref_cm_node(cm_core, cm_node);
41267- atomic_inc(&cm_accel_dropped_pkts);
41268+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
41269 dev_kfree_skb_any(skb);
41270 }
41271 break;
41272@@ -2875,7 +2875,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
41273
41274 if ((cm_id) && (cm_id->event_handler)) {
41275 if (issue_disconn) {
41276- atomic_inc(&cm_disconnects);
41277+ atomic_inc_unchecked(&cm_disconnects);
41278 cm_event.event = IW_CM_EVENT_DISCONNECT;
41279 cm_event.status = disconn_status;
41280 cm_event.local_addr = cm_id->local_addr;
41281@@ -2897,7 +2897,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
41282 }
41283
41284 if (issue_close) {
41285- atomic_inc(&cm_closes);
41286+ atomic_inc_unchecked(&cm_closes);
41287 nes_disconnect(nesqp, 1);
41288
41289 cm_id->provider_data = nesqp;
41290@@ -3035,7 +3035,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
41291
41292 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
41293 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
41294- atomic_inc(&cm_accepts);
41295+ atomic_inc_unchecked(&cm_accepts);
41296
41297 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
41298 netdev_refcnt_read(nesvnic->netdev));
41299@@ -3224,7 +3224,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
41300 struct nes_cm_core *cm_core;
41301 u8 *start_buff;
41302
41303- atomic_inc(&cm_rejects);
41304+ atomic_inc_unchecked(&cm_rejects);
41305 cm_node = (struct nes_cm_node *)cm_id->provider_data;
41306 loopback = cm_node->loopbackpartner;
41307 cm_core = cm_node->cm_core;
41308@@ -3286,7 +3286,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
41309 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
41310 ntohs(laddr->sin_port));
41311
41312- atomic_inc(&cm_connects);
41313+ atomic_inc_unchecked(&cm_connects);
41314 nesqp->active_conn = 1;
41315
41316 /* cache the cm_id in the qp */
41317@@ -3398,7 +3398,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
41318 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
41319 return err;
41320 }
41321- atomic_inc(&cm_listens_created);
41322+ atomic_inc_unchecked(&cm_listens_created);
41323 }
41324
41325 cm_id->add_ref(cm_id);
41326@@ -3505,7 +3505,7 @@ static void cm_event_connected(struct nes_cm_event *event)
41327
41328 if (nesqp->destroyed)
41329 return;
41330- atomic_inc(&cm_connecteds);
41331+ atomic_inc_unchecked(&cm_connecteds);
41332 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
41333 " local port 0x%04X. jiffies = %lu.\n",
41334 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
41335@@ -3686,7 +3686,7 @@ static void cm_event_reset(struct nes_cm_event *event)
41336
41337 cm_id->add_ref(cm_id);
41338 ret = cm_id->event_handler(cm_id, &cm_event);
41339- atomic_inc(&cm_closes);
41340+ atomic_inc_unchecked(&cm_closes);
41341 cm_event.event = IW_CM_EVENT_CLOSE;
41342 cm_event.status = 0;
41343 cm_event.provider_data = cm_id->provider_data;
41344@@ -3726,7 +3726,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
41345 return;
41346 cm_id = cm_node->cm_id;
41347
41348- atomic_inc(&cm_connect_reqs);
41349+ atomic_inc_unchecked(&cm_connect_reqs);
41350 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
41351 cm_node, cm_id, jiffies);
41352
41353@@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
41354 return;
41355 cm_id = cm_node->cm_id;
41356
41357- atomic_inc(&cm_connect_reqs);
41358+ atomic_inc_unchecked(&cm_connect_reqs);
41359 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
41360 cm_node, cm_id, jiffies);
41361
41362diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
41363index 4166452..fc952c3 100644
41364--- a/drivers/infiniband/hw/nes/nes_mgt.c
41365+++ b/drivers/infiniband/hw/nes/nes_mgt.c
41366@@ -40,8 +40,8 @@
41367 #include "nes.h"
41368 #include "nes_mgt.h"
41369
41370-atomic_t pau_qps_created;
41371-atomic_t pau_qps_destroyed;
41372+atomic_unchecked_t pau_qps_created;
41373+atomic_unchecked_t pau_qps_destroyed;
41374
41375 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
41376 {
41377@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
41378 {
41379 struct sk_buff *skb;
41380 unsigned long flags;
41381- atomic_inc(&pau_qps_destroyed);
41382+ atomic_inc_unchecked(&pau_qps_destroyed);
41383
41384 /* Free packets that have not yet been forwarded */
41385 /* Lock is acquired by skb_dequeue when removing the skb */
41386@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
41387 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
41388 skb_queue_head_init(&nesqp->pau_list);
41389 spin_lock_init(&nesqp->pau_lock);
41390- atomic_inc(&pau_qps_created);
41391+ atomic_inc_unchecked(&pau_qps_created);
41392 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
41393 }
41394
41395diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
41396index 49eb511..a774366 100644
41397--- a/drivers/infiniband/hw/nes/nes_nic.c
41398+++ b/drivers/infiniband/hw/nes/nes_nic.c
41399@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
41400 target_stat_values[++index] = mh_detected;
41401 target_stat_values[++index] = mh_pauses_sent;
41402 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
41403- target_stat_values[++index] = atomic_read(&cm_connects);
41404- target_stat_values[++index] = atomic_read(&cm_accepts);
41405- target_stat_values[++index] = atomic_read(&cm_disconnects);
41406- target_stat_values[++index] = atomic_read(&cm_connecteds);
41407- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
41408- target_stat_values[++index] = atomic_read(&cm_rejects);
41409- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
41410- target_stat_values[++index] = atomic_read(&qps_created);
41411- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
41412- target_stat_values[++index] = atomic_read(&qps_destroyed);
41413- target_stat_values[++index] = atomic_read(&cm_closes);
41414+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
41415+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
41416+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
41417+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
41418+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
41419+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
41420+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
41421+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
41422+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
41423+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
41424+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
41425 target_stat_values[++index] = cm_packets_sent;
41426 target_stat_values[++index] = cm_packets_bounced;
41427 target_stat_values[++index] = cm_packets_created;
41428 target_stat_values[++index] = cm_packets_received;
41429 target_stat_values[++index] = cm_packets_dropped;
41430 target_stat_values[++index] = cm_packets_retrans;
41431- target_stat_values[++index] = atomic_read(&cm_listens_created);
41432- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
41433+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
41434+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
41435 target_stat_values[++index] = cm_backlog_drops;
41436- target_stat_values[++index] = atomic_read(&cm_loopbacks);
41437- target_stat_values[++index] = atomic_read(&cm_nodes_created);
41438- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
41439- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
41440- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
41441+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
41442+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
41443+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
41444+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
41445+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
41446 target_stat_values[++index] = nesadapter->free_4kpbl;
41447 target_stat_values[++index] = nesadapter->free_256pbl;
41448 target_stat_values[++index] = int_mod_timer_init;
41449 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
41450 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
41451 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
41452- target_stat_values[++index] = atomic_read(&pau_qps_created);
41453- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
41454+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
41455+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
41456 }
41457
41458 /**
41459diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
41460index 5b53ca5..443da3c 100644
41461--- a/drivers/infiniband/hw/nes/nes_verbs.c
41462+++ b/drivers/infiniband/hw/nes/nes_verbs.c
41463@@ -46,9 +46,9 @@
41464
41465 #include <rdma/ib_umem.h>
41466
41467-atomic_t mod_qp_timouts;
41468-atomic_t qps_created;
41469-atomic_t sw_qps_destroyed;
41470+atomic_unchecked_t mod_qp_timouts;
41471+atomic_unchecked_t qps_created;
41472+atomic_unchecked_t sw_qps_destroyed;
41473
41474 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
41475
41476@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
41477 if (init_attr->create_flags)
41478 return ERR_PTR(-EINVAL);
41479
41480- atomic_inc(&qps_created);
41481+ atomic_inc_unchecked(&qps_created);
41482 switch (init_attr->qp_type) {
41483 case IB_QPT_RC:
41484 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
41485@@ -1466,7 +1466,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
41486 struct iw_cm_event cm_event;
41487 int ret = 0;
41488
41489- atomic_inc(&sw_qps_destroyed);
41490+ atomic_inc_unchecked(&sw_qps_destroyed);
41491 nesqp->destroyed = 1;
41492
41493 /* Blow away the connection if it exists. */
41494diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
41495index 1946101..09766d2 100644
41496--- a/drivers/infiniband/hw/qib/qib.h
41497+++ b/drivers/infiniband/hw/qib/qib.h
41498@@ -52,6 +52,7 @@
41499 #include <linux/kref.h>
41500 #include <linux/sched.h>
41501 #include <linux/kthread.h>
41502+#include <linux/slab.h>
41503
41504 #include "qib_common.h"
41505 #include "qib_verbs.h"
41506diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
41507index 922a7fe..bb035db 100644
41508--- a/drivers/input/gameport/gameport.c
41509+++ b/drivers/input/gameport/gameport.c
41510@@ -487,14 +487,14 @@ EXPORT_SYMBOL(gameport_set_phys);
41511 */
41512 static void gameport_init_port(struct gameport *gameport)
41513 {
41514- static atomic_t gameport_no = ATOMIC_INIT(0);
41515+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
41516
41517 __module_get(THIS_MODULE);
41518
41519 mutex_init(&gameport->drv_mutex);
41520 device_initialize(&gameport->dev);
41521 dev_set_name(&gameport->dev, "gameport%lu",
41522- (unsigned long)atomic_inc_return(&gameport_no) - 1);
41523+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
41524 gameport->dev.bus = &gameport_bus;
41525 gameport->dev.release = gameport_release_port;
41526 if (gameport->parent)
41527diff --git a/drivers/input/input.c b/drivers/input/input.c
41528index 74f4798..d9f7168 100644
41529--- a/drivers/input/input.c
41530+++ b/drivers/input/input.c
41531@@ -1734,7 +1734,7 @@ EXPORT_SYMBOL_GPL(input_class);
41532 */
41533 struct input_dev *input_allocate_device(void)
41534 {
41535- static atomic_t input_no = ATOMIC_INIT(0);
41536+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
41537 struct input_dev *dev;
41538
41539 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
41540@@ -1749,7 +1749,7 @@ struct input_dev *input_allocate_device(void)
41541 INIT_LIST_HEAD(&dev->node);
41542
41543 dev_set_name(&dev->dev, "input%ld",
41544- (unsigned long) atomic_inc_return(&input_no) - 1);
41545+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
41546
41547 __module_get(THIS_MODULE);
41548 }
41549diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
41550index 04c69af..5f92d00 100644
41551--- a/drivers/input/joystick/sidewinder.c
41552+++ b/drivers/input/joystick/sidewinder.c
41553@@ -30,6 +30,7 @@
41554 #include <linux/kernel.h>
41555 #include <linux/module.h>
41556 #include <linux/slab.h>
41557+#include <linux/sched.h>
41558 #include <linux/init.h>
41559 #include <linux/input.h>
41560 #include <linux/gameport.h>
41561diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
41562index 75e3b10..fb390fd 100644
41563--- a/drivers/input/joystick/xpad.c
41564+++ b/drivers/input/joystick/xpad.c
41565@@ -736,7 +736,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
41566
41567 static int xpad_led_probe(struct usb_xpad *xpad)
41568 {
41569- static atomic_t led_seq = ATOMIC_INIT(0);
41570+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
41571 long led_no;
41572 struct xpad_led *led;
41573 struct led_classdev *led_cdev;
41574@@ -749,7 +749,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
41575 if (!led)
41576 return -ENOMEM;
41577
41578- led_no = (long)atomic_inc_return(&led_seq) - 1;
41579+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
41580
41581 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
41582 led->xpad = xpad;
41583diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
41584index e204f26..8459f15 100644
41585--- a/drivers/input/misc/ims-pcu.c
41586+++ b/drivers/input/misc/ims-pcu.c
41587@@ -1621,7 +1621,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
41588
41589 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
41590 {
41591- static atomic_t device_no = ATOMIC_INIT(0);
41592+ static atomic_unchecked_t device_no = ATOMIC_INIT(0);
41593
41594 const struct ims_pcu_device_info *info;
41595 u8 device_id;
41596@@ -1653,7 +1653,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
41597 }
41598
41599 /* Device appears to be operable, complete initialization */
41600- pcu->device_no = atomic_inc_return(&device_no) - 1;
41601+ pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
41602
41603 error = ims_pcu_setup_backlight(pcu);
41604 if (error)
41605diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
41606index 2f0b39d..7370f13 100644
41607--- a/drivers/input/mouse/psmouse.h
41608+++ b/drivers/input/mouse/psmouse.h
41609@@ -116,7 +116,7 @@ struct psmouse_attribute {
41610 ssize_t (*set)(struct psmouse *psmouse, void *data,
41611 const char *buf, size_t count);
41612 bool protect;
41613-};
41614+} __do_const;
41615 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
41616
41617 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
41618diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
41619index 4c842c3..590b0bf 100644
41620--- a/drivers/input/mousedev.c
41621+++ b/drivers/input/mousedev.c
41622@@ -738,7 +738,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
41623
41624 spin_unlock_irq(&client->packet_lock);
41625
41626- if (copy_to_user(buffer, data, count))
41627+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
41628 return -EFAULT;
41629
41630 return count;
41631diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
41632index 2b56855..5a55837 100644
41633--- a/drivers/input/serio/serio.c
41634+++ b/drivers/input/serio/serio.c
41635@@ -496,7 +496,7 @@ static void serio_release_port(struct device *dev)
41636 */
41637 static void serio_init_port(struct serio *serio)
41638 {
41639- static atomic_t serio_no = ATOMIC_INIT(0);
41640+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
41641
41642 __module_get(THIS_MODULE);
41643
41644@@ -507,7 +507,7 @@ static void serio_init_port(struct serio *serio)
41645 mutex_init(&serio->drv_mutex);
41646 device_initialize(&serio->dev);
41647 dev_set_name(&serio->dev, "serio%ld",
41648- (long)atomic_inc_return(&serio_no) - 1);
41649+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
41650 serio->dev.bus = &serio_bus;
41651 serio->dev.release = serio_release_port;
41652 serio->dev.groups = serio_device_attr_groups;
41653diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
41654index 59df2e7..8f1cafb 100644
41655--- a/drivers/input/serio/serio_raw.c
41656+++ b/drivers/input/serio/serio_raw.c
41657@@ -293,7 +293,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
41658
41659 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
41660 {
41661- static atomic_t serio_raw_no = ATOMIC_INIT(0);
41662+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
41663 struct serio_raw *serio_raw;
41664 int err;
41665
41666@@ -304,7 +304,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
41667 }
41668
41669 snprintf(serio_raw->name, sizeof(serio_raw->name),
41670- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
41671+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
41672 kref_init(&serio_raw->kref);
41673 INIT_LIST_HEAD(&serio_raw->client_list);
41674 init_waitqueue_head(&serio_raw->wait);
41675diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
41676index fbe9ca7..dbee61d 100644
41677--- a/drivers/iommu/iommu.c
41678+++ b/drivers/iommu/iommu.c
41679@@ -583,7 +583,7 @@ static struct notifier_block iommu_bus_nb = {
41680 static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
41681 {
41682 bus_register_notifier(bus, &iommu_bus_nb);
41683- bus_for_each_dev(bus, NULL, ops, add_iommu_group);
41684+ bus_for_each_dev(bus, NULL, (void *)ops, add_iommu_group);
41685 }
41686
41687 /**
41688diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
41689index 39f81ae..2660096 100644
41690--- a/drivers/iommu/irq_remapping.c
41691+++ b/drivers/iommu/irq_remapping.c
41692@@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
41693 void panic_if_irq_remap(const char *msg)
41694 {
41695 if (irq_remapping_enabled)
41696- panic(msg);
41697+ panic("%s", msg);
41698 }
41699
41700 static void ir_ack_apic_edge(struct irq_data *data)
41701@@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
41702
41703 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
41704 {
41705- chip->irq_print_chip = ir_print_prefix;
41706- chip->irq_ack = ir_ack_apic_edge;
41707- chip->irq_eoi = ir_ack_apic_level;
41708- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
41709+ pax_open_kernel();
41710+ *(void **)&chip->irq_print_chip = ir_print_prefix;
41711+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
41712+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
41713+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
41714+ pax_close_kernel();
41715 }
41716
41717 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
41718diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
41719index d0e9480..d2b6340 100644
41720--- a/drivers/irqchip/irq-gic.c
41721+++ b/drivers/irqchip/irq-gic.c
41722@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
41723 * Supported arch specific GIC irq extension.
41724 * Default make them NULL.
41725 */
41726-struct irq_chip gic_arch_extn = {
41727+irq_chip_no_const gic_arch_extn = {
41728 .irq_eoi = NULL,
41729 .irq_mask = NULL,
41730 .irq_unmask = NULL,
41731@@ -333,7 +333,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
41732 chained_irq_exit(chip, desc);
41733 }
41734
41735-static struct irq_chip gic_chip = {
41736+static irq_chip_no_const gic_chip __read_only = {
41737 .name = "GIC",
41738 .irq_mask = gic_mask_irq,
41739 .irq_unmask = gic_unmask_irq,
41740diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
41741index ac6f72b..81150f2 100644
41742--- a/drivers/isdn/capi/capi.c
41743+++ b/drivers/isdn/capi/capi.c
41744@@ -81,8 +81,8 @@ struct capiminor {
41745
41746 struct capi20_appl *ap;
41747 u32 ncci;
41748- atomic_t datahandle;
41749- atomic_t msgid;
41750+ atomic_unchecked_t datahandle;
41751+ atomic_unchecked_t msgid;
41752
41753 struct tty_port port;
41754 int ttyinstop;
41755@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
41756 capimsg_setu16(s, 2, mp->ap->applid);
41757 capimsg_setu8 (s, 4, CAPI_DATA_B3);
41758 capimsg_setu8 (s, 5, CAPI_RESP);
41759- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
41760+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
41761 capimsg_setu32(s, 8, mp->ncci);
41762 capimsg_setu16(s, 12, datahandle);
41763 }
41764@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
41765 mp->outbytes -= len;
41766 spin_unlock_bh(&mp->outlock);
41767
41768- datahandle = atomic_inc_return(&mp->datahandle);
41769+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
41770 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
41771 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
41772 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
41773 capimsg_setu16(skb->data, 2, mp->ap->applid);
41774 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
41775 capimsg_setu8 (skb->data, 5, CAPI_REQ);
41776- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
41777+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
41778 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
41779 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
41780 capimsg_setu16(skb->data, 16, len); /* Data length */
41781diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
41782index 600c79b..3752bab 100644
41783--- a/drivers/isdn/gigaset/interface.c
41784+++ b/drivers/isdn/gigaset/interface.c
41785@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
41786 }
41787 tty->driver_data = cs;
41788
41789- ++cs->port.count;
41790+ atomic_inc(&cs->port.count);
41791
41792- if (cs->port.count == 1) {
41793+ if (atomic_read(&cs->port.count) == 1) {
41794 tty_port_tty_set(&cs->port, tty);
41795 cs->port.low_latency = 1;
41796 }
41797@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
41798
41799 if (!cs->connected)
41800 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
41801- else if (!cs->port.count)
41802+ else if (!atomic_read(&cs->port.count))
41803 dev_warn(cs->dev, "%s: device not opened\n", __func__);
41804- else if (!--cs->port.count)
41805+ else if (!atomic_dec_return(&cs->port.count))
41806 tty_port_tty_set(&cs->port, NULL);
41807
41808 mutex_unlock(&cs->mutex);
41809diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
41810index d0a41cb..f0cdb8c 100644
41811--- a/drivers/isdn/gigaset/usb-gigaset.c
41812+++ b/drivers/isdn/gigaset/usb-gigaset.c
41813@@ -547,7 +547,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
41814 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
41815 memcpy(cs->hw.usb->bchars, buf, 6);
41816 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
41817- 0, 0, &buf, 6, 2000);
41818+ 0, 0, buf, 6, 2000);
41819 }
41820
41821 static void gigaset_freebcshw(struct bc_state *bcs)
41822diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
41823index 4d9b195..455075c 100644
41824--- a/drivers/isdn/hardware/avm/b1.c
41825+++ b/drivers/isdn/hardware/avm/b1.c
41826@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
41827 }
41828 if (left) {
41829 if (t4file->user) {
41830- if (copy_from_user(buf, dp, left))
41831+ if (left > sizeof buf || copy_from_user(buf, dp, left))
41832 return -EFAULT;
41833 } else {
41834 memcpy(buf, dp, left);
41835@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
41836 }
41837 if (left) {
41838 if (config->user) {
41839- if (copy_from_user(buf, dp, left))
41840+ if (left > sizeof buf || copy_from_user(buf, dp, left))
41841 return -EFAULT;
41842 } else {
41843 memcpy(buf, dp, left);
41844diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
41845index 9bb12ba..d4262f7 100644
41846--- a/drivers/isdn/i4l/isdn_common.c
41847+++ b/drivers/isdn/i4l/isdn_common.c
41848@@ -1651,6 +1651,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
41849 } else
41850 return -EINVAL;
41851 case IIOCDBGVAR:
41852+ if (!capable(CAP_SYS_RAWIO))
41853+ return -EPERM;
41854 if (arg) {
41855 if (copy_to_user(argp, &dev, sizeof(ulong)))
41856 return -EFAULT;
41857diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
41858index 3c5f249..5fac4d0 100644
41859--- a/drivers/isdn/i4l/isdn_tty.c
41860+++ b/drivers/isdn/i4l/isdn_tty.c
41861@@ -1508,9 +1508,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
41862
41863 #ifdef ISDN_DEBUG_MODEM_OPEN
41864 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
41865- port->count);
41866+ atomic_read(&port->count));
41867 #endif
41868- port->count++;
41869+ atomic_inc(&port->count);
41870 port->tty = tty;
41871 /*
41872 * Start up serial port
41873@@ -1554,7 +1554,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
41874 #endif
41875 return;
41876 }
41877- if ((tty->count == 1) && (port->count != 1)) {
41878+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
41879 /*
41880 * Uh, oh. tty->count is 1, which means that the tty
41881 * structure will be freed. Info->count should always
41882@@ -1563,15 +1563,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
41883 * serial port won't be shutdown.
41884 */
41885 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
41886- "info->count is %d\n", port->count);
41887- port->count = 1;
41888+ "info->count is %d\n", atomic_read(&port->count));
41889+ atomic_set(&port->count, 1);
41890 }
41891- if (--port->count < 0) {
41892+ if (atomic_dec_return(&port->count) < 0) {
41893 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
41894- info->line, port->count);
41895- port->count = 0;
41896+ info->line, atomic_read(&port->count));
41897+ atomic_set(&port->count, 0);
41898 }
41899- if (port->count) {
41900+ if (atomic_read(&port->count)) {
41901 #ifdef ISDN_DEBUG_MODEM_OPEN
41902 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
41903 #endif
41904@@ -1625,7 +1625,7 @@ isdn_tty_hangup(struct tty_struct *tty)
41905 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
41906 return;
41907 isdn_tty_shutdown(info);
41908- port->count = 0;
41909+ atomic_set(&port->count, 0);
41910 port->flags &= ~ASYNC_NORMAL_ACTIVE;
41911 port->tty = NULL;
41912 wake_up_interruptible(&port->open_wait);
41913@@ -1970,7 +1970,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
41914 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
41915 modem_info *info = &dev->mdm.info[i];
41916
41917- if (info->port.count == 0)
41918+ if (atomic_read(&info->port.count) == 0)
41919 continue;
41920 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
41921 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
41922diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
41923index e74df7c..03a03ba 100644
41924--- a/drivers/isdn/icn/icn.c
41925+++ b/drivers/isdn/icn/icn.c
41926@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
41927 if (count > len)
41928 count = len;
41929 if (user) {
41930- if (copy_from_user(msg, buf, count))
41931+ if (count > sizeof msg || copy_from_user(msg, buf, count))
41932 return -EFAULT;
41933 } else
41934 memcpy(msg, buf, count);
41935diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
41936index a4f05c5..1433bc5 100644
41937--- a/drivers/isdn/mISDN/dsp_cmx.c
41938+++ b/drivers/isdn/mISDN/dsp_cmx.c
41939@@ -1628,7 +1628,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
41940 static u16 dsp_count; /* last sample count */
41941 static int dsp_count_valid; /* if we have last sample count */
41942
41943-void
41944+void __intentional_overflow(-1)
41945 dsp_cmx_send(void *arg)
41946 {
41947 struct dsp_conf *conf;
41948diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
41949index d93e245..e7ece6b 100644
41950--- a/drivers/leds/leds-clevo-mail.c
41951+++ b/drivers/leds/leds-clevo-mail.c
41952@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
41953 * detected as working, but in reality it is not) as low as
41954 * possible.
41955 */
41956-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
41957+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
41958 {
41959 .callback = clevo_mail_led_dmi_callback,
41960 .ident = "Clevo D410J",
41961diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
41962index 5b8f938..b73d657 100644
41963--- a/drivers/leds/leds-ss4200.c
41964+++ b/drivers/leds/leds-ss4200.c
41965@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
41966 * detected as working, but in reality it is not) as low as
41967 * possible.
41968 */
41969-static struct dmi_system_id nas_led_whitelist[] __initdata = {
41970+static struct dmi_system_id nas_led_whitelist[] __initconst = {
41971 {
41972 .callback = ss4200_led_dmi_callback,
41973 .ident = "Intel SS4200-E",
41974diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
41975index 0bf1e4e..b4bf44e 100644
41976--- a/drivers/lguest/core.c
41977+++ b/drivers/lguest/core.c
41978@@ -97,9 +97,17 @@ static __init int map_switcher(void)
41979 * The end address needs +1 because __get_vm_area allocates an
41980 * extra guard page, so we need space for that.
41981 */
41982+
41983+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
41984+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
41985+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
41986+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
41987+#else
41988 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
41989 VM_ALLOC, switcher_addr, switcher_addr
41990 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
41991+#endif
41992+
41993 if (!switcher_vma) {
41994 err = -ENOMEM;
41995 printk("lguest: could not map switcher pages high\n");
41996@@ -124,7 +132,7 @@ static __init int map_switcher(void)
41997 * Now the Switcher is mapped at the right address, we can't fail!
41998 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
41999 */
42000- memcpy(switcher_vma->addr, start_switcher_text,
42001+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
42002 end_switcher_text - start_switcher_text);
42003
42004 printk(KERN_INFO "lguest: mapped switcher at %p\n",
42005diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
42006index bfb39bb..08a603b 100644
42007--- a/drivers/lguest/page_tables.c
42008+++ b/drivers/lguest/page_tables.c
42009@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
42010 /*:*/
42011
42012 #ifdef CONFIG_X86_PAE
42013-static void release_pmd(pmd_t *spmd)
42014+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
42015 {
42016 /* If the entry's not present, there's nothing to release. */
42017 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
42018diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
42019index 5169239..47cb4db 100644
42020--- a/drivers/lguest/x86/core.c
42021+++ b/drivers/lguest/x86/core.c
42022@@ -59,7 +59,7 @@ static struct {
42023 /* Offset from where switcher.S was compiled to where we've copied it */
42024 static unsigned long switcher_offset(void)
42025 {
42026- return switcher_addr - (unsigned long)start_switcher_text;
42027+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
42028 }
42029
42030 /* This cpu's struct lguest_pages (after the Switcher text page) */
42031@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
42032 * These copies are pretty cheap, so we do them unconditionally: */
42033 /* Save the current Host top-level page directory.
42034 */
42035+
42036+#ifdef CONFIG_PAX_PER_CPU_PGD
42037+ pages->state.host_cr3 = read_cr3();
42038+#else
42039 pages->state.host_cr3 = __pa(current->mm->pgd);
42040+#endif
42041+
42042 /*
42043 * Set up the Guest's page tables to see this CPU's pages (and no
42044 * other CPU's pages).
42045@@ -475,7 +481,7 @@ void __init lguest_arch_host_init(void)
42046 * compiled-in switcher code and the high-mapped copy we just made.
42047 */
42048 for (i = 0; i < IDT_ENTRIES; i++)
42049- default_idt_entries[i] += switcher_offset();
42050+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
42051
42052 /*
42053 * Set up the Switcher's per-cpu areas.
42054@@ -558,7 +564,7 @@ void __init lguest_arch_host_init(void)
42055 * it will be undisturbed when we switch. To change %cs and jump we
42056 * need this structure to feed to Intel's "lcall" instruction.
42057 */
42058- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
42059+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
42060 lguest_entry.segment = LGUEST_CS;
42061
42062 /*
42063diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
42064index 40634b0..4f5855e 100644
42065--- a/drivers/lguest/x86/switcher_32.S
42066+++ b/drivers/lguest/x86/switcher_32.S
42067@@ -87,6 +87,7 @@
42068 #include <asm/page.h>
42069 #include <asm/segment.h>
42070 #include <asm/lguest.h>
42071+#include <asm/processor-flags.h>
42072
42073 // We mark the start of the code to copy
42074 // It's placed in .text tho it's never run here
42075@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
42076 // Changes type when we load it: damn Intel!
42077 // For after we switch over our page tables
42078 // That entry will be read-only: we'd crash.
42079+
42080+#ifdef CONFIG_PAX_KERNEXEC
42081+ mov %cr0, %edx
42082+ xor $X86_CR0_WP, %edx
42083+ mov %edx, %cr0
42084+#endif
42085+
42086 movl $(GDT_ENTRY_TSS*8), %edx
42087 ltr %dx
42088
42089@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
42090 // Let's clear it again for our return.
42091 // The GDT descriptor of the Host
42092 // Points to the table after two "size" bytes
42093- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
42094+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
42095 // Clear "used" from type field (byte 5, bit 2)
42096- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
42097+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
42098+
42099+#ifdef CONFIG_PAX_KERNEXEC
42100+ mov %cr0, %eax
42101+ xor $X86_CR0_WP, %eax
42102+ mov %eax, %cr0
42103+#endif
42104
42105 // Once our page table's switched, the Guest is live!
42106 // The Host fades as we run this final step.
42107@@ -295,13 +309,12 @@ deliver_to_host:
42108 // I consulted gcc, and it gave
42109 // These instructions, which I gladly credit:
42110 leal (%edx,%ebx,8), %eax
42111- movzwl (%eax),%edx
42112- movl 4(%eax), %eax
42113- xorw %ax, %ax
42114- orl %eax, %edx
42115+ movl 4(%eax), %edx
42116+ movw (%eax), %dx
42117 // Now the address of the handler's in %edx
42118 // We call it now: its "iret" drops us home.
42119- jmp *%edx
42120+ ljmp $__KERNEL_CS, $1f
42121+1: jmp *%edx
42122
42123 // Every interrupt can come to us here
42124 // But we must truly tell each apart.
42125diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
42126index 0003992..854bbce 100644
42127--- a/drivers/md/bcache/closure.h
42128+++ b/drivers/md/bcache/closure.h
42129@@ -622,7 +622,7 @@ static inline void closure_wake_up(struct closure_waitlist *list)
42130 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
42131 struct workqueue_struct *wq)
42132 {
42133- BUG_ON(object_is_on_stack(cl));
42134+ BUG_ON(object_starts_on_stack(cl));
42135 closure_set_ip(cl);
42136 cl->fn = fn;
42137 cl->wq = wq;
42138diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
42139index 547c4c5..5be1de4 100644
42140--- a/drivers/md/bcache/super.c
42141+++ b/drivers/md/bcache/super.c
42142@@ -1644,7 +1644,7 @@ err_unlock_gc:
42143 err:
42144 closure_sync(&op.cl);
42145 /* XXX: test this, it's broken */
42146- bch_cache_set_error(c, err);
42147+ bch_cache_set_error(c, "%s", err);
42148 }
42149
42150 static bool can_attach_cache(struct cache *ca, struct cache_set *c)
42151diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
42152index a7fd821..9dcf6c3 100644
42153--- a/drivers/md/bitmap.c
42154+++ b/drivers/md/bitmap.c
42155@@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
42156 chunk_kb ? "KB" : "B");
42157 if (bitmap->storage.file) {
42158 seq_printf(seq, ", file: ");
42159- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
42160+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
42161 }
42162
42163 seq_printf(seq, "\n");
42164diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
42165index afe0814..8cf3794 100644
42166--- a/drivers/md/dm-ioctl.c
42167+++ b/drivers/md/dm-ioctl.c
42168@@ -1745,7 +1745,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
42169 cmd == DM_LIST_VERSIONS_CMD)
42170 return 0;
42171
42172- if ((cmd == DM_DEV_CREATE_CMD)) {
42173+ if (cmd == DM_DEV_CREATE_CMD) {
42174 if (!*param->name) {
42175 DMWARN("name not supplied when creating device");
42176 return -EINVAL;
42177diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
42178index 9584443..9fc9ac9 100644
42179--- a/drivers/md/dm-raid1.c
42180+++ b/drivers/md/dm-raid1.c
42181@@ -40,7 +40,7 @@ enum dm_raid1_error {
42182
42183 struct mirror {
42184 struct mirror_set *ms;
42185- atomic_t error_count;
42186+ atomic_unchecked_t error_count;
42187 unsigned long error_type;
42188 struct dm_dev *dev;
42189 sector_t offset;
42190@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
42191 struct mirror *m;
42192
42193 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
42194- if (!atomic_read(&m->error_count))
42195+ if (!atomic_read_unchecked(&m->error_count))
42196 return m;
42197
42198 return NULL;
42199@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
42200 * simple way to tell if a device has encountered
42201 * errors.
42202 */
42203- atomic_inc(&m->error_count);
42204+ atomic_inc_unchecked(&m->error_count);
42205
42206 if (test_and_set_bit(error_type, &m->error_type))
42207 return;
42208@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
42209 struct mirror *m = get_default_mirror(ms);
42210
42211 do {
42212- if (likely(!atomic_read(&m->error_count)))
42213+ if (likely(!atomic_read_unchecked(&m->error_count)))
42214 return m;
42215
42216 if (m-- == ms->mirror)
42217@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
42218 {
42219 struct mirror *default_mirror = get_default_mirror(m->ms);
42220
42221- return !atomic_read(&default_mirror->error_count);
42222+ return !atomic_read_unchecked(&default_mirror->error_count);
42223 }
42224
42225 static int mirror_available(struct mirror_set *ms, struct bio *bio)
42226@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
42227 */
42228 if (likely(region_in_sync(ms, region, 1)))
42229 m = choose_mirror(ms, bio->bi_sector);
42230- else if (m && atomic_read(&m->error_count))
42231+ else if (m && atomic_read_unchecked(&m->error_count))
42232 m = NULL;
42233
42234 if (likely(m))
42235@@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
42236 }
42237
42238 ms->mirror[mirror].ms = ms;
42239- atomic_set(&(ms->mirror[mirror].error_count), 0);
42240+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
42241 ms->mirror[mirror].error_type = 0;
42242 ms->mirror[mirror].offset = offset;
42243
42244@@ -1339,7 +1339,7 @@ static void mirror_resume(struct dm_target *ti)
42245 */
42246 static char device_status_char(struct mirror *m)
42247 {
42248- if (!atomic_read(&(m->error_count)))
42249+ if (!atomic_read_unchecked(&(m->error_count)))
42250 return 'A';
42251
42252 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
42253diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
42254index 28a9012..9c0f6a5 100644
42255--- a/drivers/md/dm-stats.c
42256+++ b/drivers/md/dm-stats.c
42257@@ -382,7 +382,7 @@ do_sync_free:
42258 synchronize_rcu_expedited();
42259 dm_stat_free(&s->rcu_head);
42260 } else {
42261- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
42262+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
42263 call_rcu(&s->rcu_head, dm_stat_free);
42264 }
42265 return 0;
42266@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
42267 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
42268 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
42269 ));
42270- ACCESS_ONCE(last->last_sector) = end_sector;
42271- ACCESS_ONCE(last->last_rw) = bi_rw;
42272+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
42273+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
42274 }
42275
42276 rcu_read_lock();
42277diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
42278index 73c1712..7347292 100644
42279--- a/drivers/md/dm-stripe.c
42280+++ b/drivers/md/dm-stripe.c
42281@@ -21,7 +21,7 @@ struct stripe {
42282 struct dm_dev *dev;
42283 sector_t physical_start;
42284
42285- atomic_t error_count;
42286+ atomic_unchecked_t error_count;
42287 };
42288
42289 struct stripe_c {
42290@@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
42291 kfree(sc);
42292 return r;
42293 }
42294- atomic_set(&(sc->stripe[i].error_count), 0);
42295+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
42296 }
42297
42298 ti->private = sc;
42299@@ -327,7 +327,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
42300 DMEMIT("%d ", sc->stripes);
42301 for (i = 0; i < sc->stripes; i++) {
42302 DMEMIT("%s ", sc->stripe[i].dev->name);
42303- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
42304+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
42305 'D' : 'A';
42306 }
42307 buffer[i] = '\0';
42308@@ -372,8 +372,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
42309 */
42310 for (i = 0; i < sc->stripes; i++)
42311 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
42312- atomic_inc(&(sc->stripe[i].error_count));
42313- if (atomic_read(&(sc->stripe[i].error_count)) <
42314+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
42315+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
42316 DM_IO_ERROR_THRESHOLD)
42317 schedule_work(&sc->trigger_event);
42318 }
42319diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
42320index 20a8cc0..5447b11 100644
42321--- a/drivers/md/dm-table.c
42322+++ b/drivers/md/dm-table.c
42323@@ -291,7 +291,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
42324 static int open_dev(struct dm_dev_internal *d, dev_t dev,
42325 struct mapped_device *md)
42326 {
42327- static char *_claim_ptr = "I belong to device-mapper";
42328+ static char _claim_ptr[] = "I belong to device-mapper";
42329 struct block_device *bdev;
42330
42331 int r;
42332@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
42333 if (!dev_size)
42334 return 0;
42335
42336- if ((start >= dev_size) || (start + len > dev_size)) {
42337+ if ((start >= dev_size) || (len > dev_size - start)) {
42338 DMWARN("%s: %s too small for target: "
42339 "start=%llu, len=%llu, dev_size=%llu",
42340 dm_device_name(ti->table->md), bdevname(bdev, b),
42341diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
42342index 8a30ad5..72792d3 100644
42343--- a/drivers/md/dm-thin-metadata.c
42344+++ b/drivers/md/dm-thin-metadata.c
42345@@ -397,7 +397,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
42346 {
42347 pmd->info.tm = pmd->tm;
42348 pmd->info.levels = 2;
42349- pmd->info.value_type.context = pmd->data_sm;
42350+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
42351 pmd->info.value_type.size = sizeof(__le64);
42352 pmd->info.value_type.inc = data_block_inc;
42353 pmd->info.value_type.dec = data_block_dec;
42354@@ -416,7 +416,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
42355
42356 pmd->bl_info.tm = pmd->tm;
42357 pmd->bl_info.levels = 1;
42358- pmd->bl_info.value_type.context = pmd->data_sm;
42359+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
42360 pmd->bl_info.value_type.size = sizeof(__le64);
42361 pmd->bl_info.value_type.inc = data_block_inc;
42362 pmd->bl_info.value_type.dec = data_block_dec;
42363diff --git a/drivers/md/dm.c b/drivers/md/dm.c
42364index b3e26c7..1efca94 100644
42365--- a/drivers/md/dm.c
42366+++ b/drivers/md/dm.c
42367@@ -179,9 +179,9 @@ struct mapped_device {
42368 /*
42369 * Event handling.
42370 */
42371- atomic_t event_nr;
42372+ atomic_unchecked_t event_nr;
42373 wait_queue_head_t eventq;
42374- atomic_t uevent_seq;
42375+ atomic_unchecked_t uevent_seq;
42376 struct list_head uevent_list;
42377 spinlock_t uevent_lock; /* Protect access to uevent_list */
42378
42379@@ -1985,8 +1985,8 @@ static struct mapped_device *alloc_dev(int minor)
42380 spin_lock_init(&md->deferred_lock);
42381 atomic_set(&md->holders, 1);
42382 atomic_set(&md->open_count, 0);
42383- atomic_set(&md->event_nr, 0);
42384- atomic_set(&md->uevent_seq, 0);
42385+ atomic_set_unchecked(&md->event_nr, 0);
42386+ atomic_set_unchecked(&md->uevent_seq, 0);
42387 INIT_LIST_HEAD(&md->uevent_list);
42388 spin_lock_init(&md->uevent_lock);
42389
42390@@ -2139,7 +2139,7 @@ static void event_callback(void *context)
42391
42392 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
42393
42394- atomic_inc(&md->event_nr);
42395+ atomic_inc_unchecked(&md->event_nr);
42396 wake_up(&md->eventq);
42397 }
42398
42399@@ -2832,18 +2832,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
42400
42401 uint32_t dm_next_uevent_seq(struct mapped_device *md)
42402 {
42403- return atomic_add_return(1, &md->uevent_seq);
42404+ return atomic_add_return_unchecked(1, &md->uevent_seq);
42405 }
42406
42407 uint32_t dm_get_event_nr(struct mapped_device *md)
42408 {
42409- return atomic_read(&md->event_nr);
42410+ return atomic_read_unchecked(&md->event_nr);
42411 }
42412
42413 int dm_wait_event(struct mapped_device *md, int event_nr)
42414 {
42415 return wait_event_interruptible(md->eventq,
42416- (event_nr != atomic_read(&md->event_nr)));
42417+ (event_nr != atomic_read_unchecked(&md->event_nr)));
42418 }
42419
42420 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
42421diff --git a/drivers/md/md.c b/drivers/md/md.c
42422index ba46d97..f8f5019 100644
42423--- a/drivers/md/md.c
42424+++ b/drivers/md/md.c
42425@@ -234,10 +234,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
42426 * start build, activate spare
42427 */
42428 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
42429-static atomic_t md_event_count;
42430+static atomic_unchecked_t md_event_count;
42431 void md_new_event(struct mddev *mddev)
42432 {
42433- atomic_inc(&md_event_count);
42434+ atomic_inc_unchecked(&md_event_count);
42435 wake_up(&md_event_waiters);
42436 }
42437 EXPORT_SYMBOL_GPL(md_new_event);
42438@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
42439 */
42440 static void md_new_event_inintr(struct mddev *mddev)
42441 {
42442- atomic_inc(&md_event_count);
42443+ atomic_inc_unchecked(&md_event_count);
42444 wake_up(&md_event_waiters);
42445 }
42446
42447@@ -1502,7 +1502,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
42448 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
42449 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
42450 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
42451- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
42452+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
42453
42454 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
42455 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
42456@@ -1746,7 +1746,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
42457 else
42458 sb->resync_offset = cpu_to_le64(0);
42459
42460- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
42461+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
42462
42463 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
42464 sb->size = cpu_to_le64(mddev->dev_sectors);
42465@@ -2751,7 +2751,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
42466 static ssize_t
42467 errors_show(struct md_rdev *rdev, char *page)
42468 {
42469- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
42470+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
42471 }
42472
42473 static ssize_t
42474@@ -2760,7 +2760,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
42475 char *e;
42476 unsigned long n = simple_strtoul(buf, &e, 10);
42477 if (*buf && (*e == 0 || *e == '\n')) {
42478- atomic_set(&rdev->corrected_errors, n);
42479+ atomic_set_unchecked(&rdev->corrected_errors, n);
42480 return len;
42481 }
42482 return -EINVAL;
42483@@ -3208,8 +3208,8 @@ int md_rdev_init(struct md_rdev *rdev)
42484 rdev->sb_loaded = 0;
42485 rdev->bb_page = NULL;
42486 atomic_set(&rdev->nr_pending, 0);
42487- atomic_set(&rdev->read_errors, 0);
42488- atomic_set(&rdev->corrected_errors, 0);
42489+ atomic_set_unchecked(&rdev->read_errors, 0);
42490+ atomic_set_unchecked(&rdev->corrected_errors, 0);
42491
42492 INIT_LIST_HEAD(&rdev->same_set);
42493 init_waitqueue_head(&rdev->blocked_wait);
42494@@ -7043,7 +7043,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
42495
42496 spin_unlock(&pers_lock);
42497 seq_printf(seq, "\n");
42498- seq->poll_event = atomic_read(&md_event_count);
42499+ seq->poll_event = atomic_read_unchecked(&md_event_count);
42500 return 0;
42501 }
42502 if (v == (void*)2) {
42503@@ -7146,7 +7146,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
42504 return error;
42505
42506 seq = file->private_data;
42507- seq->poll_event = atomic_read(&md_event_count);
42508+ seq->poll_event = atomic_read_unchecked(&md_event_count);
42509 return error;
42510 }
42511
42512@@ -7160,7 +7160,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
42513 /* always allow read */
42514 mask = POLLIN | POLLRDNORM;
42515
42516- if (seq->poll_event != atomic_read(&md_event_count))
42517+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
42518 mask |= POLLERR | POLLPRI;
42519 return mask;
42520 }
42521@@ -7204,7 +7204,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
42522 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
42523 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
42524 (int)part_stat_read(&disk->part0, sectors[1]) -
42525- atomic_read(&disk->sync_io);
42526+ atomic_read_unchecked(&disk->sync_io);
42527 /* sync IO will cause sync_io to increase before the disk_stats
42528 * as sync_io is counted when a request starts, and
42529 * disk_stats is counted when it completes.
42530diff --git a/drivers/md/md.h b/drivers/md/md.h
42531index 608050c..6e77db5d 100644
42532--- a/drivers/md/md.h
42533+++ b/drivers/md/md.h
42534@@ -94,13 +94,13 @@ struct md_rdev {
42535 * only maintained for arrays that
42536 * support hot removal
42537 */
42538- atomic_t read_errors; /* number of consecutive read errors that
42539+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
42540 * we have tried to ignore.
42541 */
42542 struct timespec last_read_error; /* monotonic time since our
42543 * last read error
42544 */
42545- atomic_t corrected_errors; /* number of corrected read errors,
42546+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
42547 * for reporting to userspace and storing
42548 * in superblock.
42549 */
42550@@ -446,7 +446,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
42551
42552 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
42553 {
42554- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
42555+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
42556 }
42557
42558 struct md_personality
42559diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
42560index 3e6d115..ffecdeb 100644
42561--- a/drivers/md/persistent-data/dm-space-map.h
42562+++ b/drivers/md/persistent-data/dm-space-map.h
42563@@ -71,6 +71,7 @@ struct dm_space_map {
42564 dm_sm_threshold_fn fn,
42565 void *context);
42566 };
42567+typedef struct dm_space_map __no_const dm_space_map_no_const;
42568
42569 /*----------------------------------------------------------------*/
42570
42571diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
42572index aacf6bf..67d63f2 100644
42573--- a/drivers/md/raid1.c
42574+++ b/drivers/md/raid1.c
42575@@ -1824,7 +1824,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
42576 if (r1_sync_page_io(rdev, sect, s,
42577 bio->bi_io_vec[idx].bv_page,
42578 READ) != 0)
42579- atomic_add(s, &rdev->corrected_errors);
42580+ atomic_add_unchecked(s, &rdev->corrected_errors);
42581 }
42582 sectors -= s;
42583 sect += s;
42584@@ -2051,7 +2051,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
42585 test_bit(In_sync, &rdev->flags)) {
42586 if (r1_sync_page_io(rdev, sect, s,
42587 conf->tmppage, READ)) {
42588- atomic_add(s, &rdev->corrected_errors);
42589+ atomic_add_unchecked(s, &rdev->corrected_errors);
42590 printk(KERN_INFO
42591 "md/raid1:%s: read error corrected "
42592 "(%d sectors at %llu on %s)\n",
42593diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
42594index 73dc8a3..bdd515a 100644
42595--- a/drivers/md/raid10.c
42596+++ b/drivers/md/raid10.c
42597@@ -1963,7 +1963,7 @@ static void end_sync_read(struct bio *bio, int error)
42598 /* The write handler will notice the lack of
42599 * R10BIO_Uptodate and record any errors etc
42600 */
42601- atomic_add(r10_bio->sectors,
42602+ atomic_add_unchecked(r10_bio->sectors,
42603 &conf->mirrors[d].rdev->corrected_errors);
42604
42605 /* for reconstruct, we always reschedule after a read.
42606@@ -2321,7 +2321,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
42607 {
42608 struct timespec cur_time_mon;
42609 unsigned long hours_since_last;
42610- unsigned int read_errors = atomic_read(&rdev->read_errors);
42611+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
42612
42613 ktime_get_ts(&cur_time_mon);
42614
42615@@ -2343,9 +2343,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
42616 * overflowing the shift of read_errors by hours_since_last.
42617 */
42618 if (hours_since_last >= 8 * sizeof(read_errors))
42619- atomic_set(&rdev->read_errors, 0);
42620+ atomic_set_unchecked(&rdev->read_errors, 0);
42621 else
42622- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
42623+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
42624 }
42625
42626 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
42627@@ -2399,8 +2399,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
42628 return;
42629
42630 check_decay_read_errors(mddev, rdev);
42631- atomic_inc(&rdev->read_errors);
42632- if (atomic_read(&rdev->read_errors) > max_read_errors) {
42633+ atomic_inc_unchecked(&rdev->read_errors);
42634+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
42635 char b[BDEVNAME_SIZE];
42636 bdevname(rdev->bdev, b);
42637
42638@@ -2408,7 +2408,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
42639 "md/raid10:%s: %s: Raid device exceeded "
42640 "read_error threshold [cur %d:max %d]\n",
42641 mdname(mddev), b,
42642- atomic_read(&rdev->read_errors), max_read_errors);
42643+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
42644 printk(KERN_NOTICE
42645 "md/raid10:%s: %s: Failing raid device\n",
42646 mdname(mddev), b);
42647@@ -2563,7 +2563,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
42648 sect +
42649 choose_data_offset(r10_bio, rdev)),
42650 bdevname(rdev->bdev, b));
42651- atomic_add(s, &rdev->corrected_errors);
42652+ atomic_add_unchecked(s, &rdev->corrected_errors);
42653 }
42654
42655 rdev_dec_pending(rdev, mddev);
42656diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
42657index 8a0665d..984c46d 100644
42658--- a/drivers/md/raid5.c
42659+++ b/drivers/md/raid5.c
42660@@ -1887,21 +1887,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
42661 mdname(conf->mddev), STRIPE_SECTORS,
42662 (unsigned long long)s,
42663 bdevname(rdev->bdev, b));
42664- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
42665+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
42666 clear_bit(R5_ReadError, &sh->dev[i].flags);
42667 clear_bit(R5_ReWrite, &sh->dev[i].flags);
42668 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
42669 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
42670
42671- if (atomic_read(&rdev->read_errors))
42672- atomic_set(&rdev->read_errors, 0);
42673+ if (atomic_read_unchecked(&rdev->read_errors))
42674+ atomic_set_unchecked(&rdev->read_errors, 0);
42675 } else {
42676 const char *bdn = bdevname(rdev->bdev, b);
42677 int retry = 0;
42678 int set_bad = 0;
42679
42680 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
42681- atomic_inc(&rdev->read_errors);
42682+ atomic_inc_unchecked(&rdev->read_errors);
42683 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
42684 printk_ratelimited(
42685 KERN_WARNING
42686@@ -1929,7 +1929,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
42687 mdname(conf->mddev),
42688 (unsigned long long)s,
42689 bdn);
42690- } else if (atomic_read(&rdev->read_errors)
42691+ } else if (atomic_read_unchecked(&rdev->read_errors)
42692 > conf->max_nr_stripes)
42693 printk(KERN_WARNING
42694 "md/raid:%s: Too many read errors, failing device %s.\n",
42695diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
42696index 401ef64..836e563 100644
42697--- a/drivers/media/dvb-core/dvbdev.c
42698+++ b/drivers/media/dvb-core/dvbdev.c
42699@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
42700 const struct dvb_device *template, void *priv, int type)
42701 {
42702 struct dvb_device *dvbdev;
42703- struct file_operations *dvbdevfops;
42704+ file_operations_no_const *dvbdevfops;
42705 struct device *clsdev;
42706 int minor;
42707 int id;
42708diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
42709index 9b6c3bb..baeb5c7 100644
42710--- a/drivers/media/dvb-frontends/dib3000.h
42711+++ b/drivers/media/dvb-frontends/dib3000.h
42712@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
42713 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
42714 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
42715 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
42716-};
42717+} __no_const;
42718
42719 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
42720 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
42721diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
42722index ecf21d9..b992428d 100644
42723--- a/drivers/media/pci/cx88/cx88-video.c
42724+++ b/drivers/media/pci/cx88/cx88-video.c
42725@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
42726
42727 /* ------------------------------------------------------------------ */
42728
42729-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42730-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42731-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42732+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42733+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42734+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
42735
42736 module_param_array(video_nr, int, NULL, 0444);
42737 module_param_array(vbi_nr, int, NULL, 0444);
42738diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
42739index c08ae3e..eb59af1 100644
42740--- a/drivers/media/pci/ivtv/ivtv-driver.c
42741+++ b/drivers/media/pci/ivtv/ivtv-driver.c
42742@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
42743 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
42744
42745 /* ivtv instance counter */
42746-static atomic_t ivtv_instance = ATOMIC_INIT(0);
42747+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
42748
42749 /* Parameter declarations */
42750 static int cardtype[IVTV_MAX_CARDS];
42751diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
42752index dfd0a21..6bbb465 100644
42753--- a/drivers/media/platform/omap/omap_vout.c
42754+++ b/drivers/media/platform/omap/omap_vout.c
42755@@ -63,7 +63,6 @@ enum omap_vout_channels {
42756 OMAP_VIDEO2,
42757 };
42758
42759-static struct videobuf_queue_ops video_vbq_ops;
42760 /* Variables configurable through module params*/
42761 static u32 video1_numbuffers = 3;
42762 static u32 video2_numbuffers = 3;
42763@@ -1014,6 +1013,12 @@ static int omap_vout_open(struct file *file)
42764 {
42765 struct videobuf_queue *q;
42766 struct omap_vout_device *vout = NULL;
42767+ static struct videobuf_queue_ops video_vbq_ops = {
42768+ .buf_setup = omap_vout_buffer_setup,
42769+ .buf_prepare = omap_vout_buffer_prepare,
42770+ .buf_release = omap_vout_buffer_release,
42771+ .buf_queue = omap_vout_buffer_queue,
42772+ };
42773
42774 vout = video_drvdata(file);
42775 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
42776@@ -1031,10 +1036,6 @@ static int omap_vout_open(struct file *file)
42777 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
42778
42779 q = &vout->vbq;
42780- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
42781- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
42782- video_vbq_ops.buf_release = omap_vout_buffer_release;
42783- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
42784 spin_lock_init(&vout->vbq_lock);
42785
42786 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
42787diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
42788index 04e6490..2df65bf 100644
42789--- a/drivers/media/platform/s5p-tv/mixer.h
42790+++ b/drivers/media/platform/s5p-tv/mixer.h
42791@@ -156,7 +156,7 @@ struct mxr_layer {
42792 /** layer index (unique identifier) */
42793 int idx;
42794 /** callbacks for layer methods */
42795- struct mxr_layer_ops ops;
42796+ struct mxr_layer_ops *ops;
42797 /** format array */
42798 const struct mxr_format **fmt_array;
42799 /** size of format array */
42800diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
42801index b93a21f..2535195 100644
42802--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
42803+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
42804@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
42805 {
42806 struct mxr_layer *layer;
42807 int ret;
42808- struct mxr_layer_ops ops = {
42809+ static struct mxr_layer_ops ops = {
42810 .release = mxr_graph_layer_release,
42811 .buffer_set = mxr_graph_buffer_set,
42812 .stream_set = mxr_graph_stream_set,
42813diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
42814index b713403..53cb5ad 100644
42815--- a/drivers/media/platform/s5p-tv/mixer_reg.c
42816+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
42817@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
42818 layer->update_buf = next;
42819 }
42820
42821- layer->ops.buffer_set(layer, layer->update_buf);
42822+ layer->ops->buffer_set(layer, layer->update_buf);
42823
42824 if (done && done != layer->shadow_buf)
42825 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
42826diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
42827index 641b1f0..49cff30 100644
42828--- a/drivers/media/platform/s5p-tv/mixer_video.c
42829+++ b/drivers/media/platform/s5p-tv/mixer_video.c
42830@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
42831 layer->geo.src.height = layer->geo.src.full_height;
42832
42833 mxr_geometry_dump(mdev, &layer->geo);
42834- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
42835+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
42836 mxr_geometry_dump(mdev, &layer->geo);
42837 }
42838
42839@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
42840 layer->geo.dst.full_width = mbus_fmt.width;
42841 layer->geo.dst.full_height = mbus_fmt.height;
42842 layer->geo.dst.field = mbus_fmt.field;
42843- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
42844+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
42845
42846 mxr_geometry_dump(mdev, &layer->geo);
42847 }
42848@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
42849 /* set source size to highest accepted value */
42850 geo->src.full_width = max(geo->dst.full_width, pix->width);
42851 geo->src.full_height = max(geo->dst.full_height, pix->height);
42852- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
42853+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
42854 mxr_geometry_dump(mdev, &layer->geo);
42855 /* set cropping to total visible screen */
42856 geo->src.width = pix->width;
42857@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
42858 geo->src.x_offset = 0;
42859 geo->src.y_offset = 0;
42860 /* assure consistency of geometry */
42861- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
42862+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
42863 mxr_geometry_dump(mdev, &layer->geo);
42864 /* set full size to lowest possible value */
42865 geo->src.full_width = 0;
42866 geo->src.full_height = 0;
42867- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
42868+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
42869 mxr_geometry_dump(mdev, &layer->geo);
42870
42871 /* returning results */
42872@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
42873 target->width = s->r.width;
42874 target->height = s->r.height;
42875
42876- layer->ops.fix_geometry(layer, stage, s->flags);
42877+ layer->ops->fix_geometry(layer, stage, s->flags);
42878
42879 /* retrieve update selection rectangle */
42880 res.left = target->x_offset;
42881@@ -955,13 +955,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
42882 mxr_output_get(mdev);
42883
42884 mxr_layer_update_output(layer);
42885- layer->ops.format_set(layer);
42886+ layer->ops->format_set(layer);
42887 /* enabling layer in hardware */
42888 spin_lock_irqsave(&layer->enq_slock, flags);
42889 layer->state = MXR_LAYER_STREAMING;
42890 spin_unlock_irqrestore(&layer->enq_slock, flags);
42891
42892- layer->ops.stream_set(layer, MXR_ENABLE);
42893+ layer->ops->stream_set(layer, MXR_ENABLE);
42894 mxr_streamer_get(mdev);
42895
42896 return 0;
42897@@ -1031,7 +1031,7 @@ static int stop_streaming(struct vb2_queue *vq)
42898 spin_unlock_irqrestore(&layer->enq_slock, flags);
42899
42900 /* disabling layer in hardware */
42901- layer->ops.stream_set(layer, MXR_DISABLE);
42902+ layer->ops->stream_set(layer, MXR_DISABLE);
42903 /* remove one streamer */
42904 mxr_streamer_put(mdev);
42905 /* allow changes in output configuration */
42906@@ -1070,8 +1070,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
42907
42908 void mxr_layer_release(struct mxr_layer *layer)
42909 {
42910- if (layer->ops.release)
42911- layer->ops.release(layer);
42912+ if (layer->ops->release)
42913+ layer->ops->release(layer);
42914 }
42915
42916 void mxr_base_layer_release(struct mxr_layer *layer)
42917@@ -1097,7 +1097,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
42918
42919 layer->mdev = mdev;
42920 layer->idx = idx;
42921- layer->ops = *ops;
42922+ layer->ops = ops;
42923
42924 spin_lock_init(&layer->enq_slock);
42925 INIT_LIST_HEAD(&layer->enq_list);
42926diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
42927index 3d13a63..da31bf1 100644
42928--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
42929+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
42930@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
42931 {
42932 struct mxr_layer *layer;
42933 int ret;
42934- struct mxr_layer_ops ops = {
42935+ static struct mxr_layer_ops ops = {
42936 .release = mxr_vp_layer_release,
42937 .buffer_set = mxr_vp_buffer_set,
42938 .stream_set = mxr_vp_stream_set,
42939diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
42940index 1d3f119..75f40bb 100644
42941--- a/drivers/media/platform/vivi.c
42942+++ b/drivers/media/platform/vivi.c
42943@@ -58,8 +58,8 @@ MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
42944 MODULE_LICENSE("Dual BSD/GPL");
42945 MODULE_VERSION(VIVI_VERSION);
42946
42947-static unsigned video_nr = -1;
42948-module_param(video_nr, uint, 0644);
42949+static int video_nr = -1;
42950+module_param(video_nr, int, 0644);
42951 MODULE_PARM_DESC(video_nr, "videoX start number, -1 is autodetect");
42952
42953 static unsigned n_devs = 1;
42954diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
42955index 545c04c..a14bded 100644
42956--- a/drivers/media/radio/radio-cadet.c
42957+++ b/drivers/media/radio/radio-cadet.c
42958@@ -324,6 +324,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
42959 unsigned char readbuf[RDS_BUFFER];
42960 int i = 0;
42961
42962+ if (count > RDS_BUFFER)
42963+ return -EFAULT;
42964 mutex_lock(&dev->lock);
42965 if (dev->rdsstat == 0)
42966 cadet_start_rds(dev);
42967@@ -339,7 +341,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
42968 while (i < count && dev->rdsin != dev->rdsout)
42969 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
42970
42971- if (i && copy_to_user(data, readbuf, i))
42972+ if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
42973 i = -EFAULT;
42974 unlock:
42975 mutex_unlock(&dev->lock);
42976diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
42977index 5236035..c622c74 100644
42978--- a/drivers/media/radio/radio-maxiradio.c
42979+++ b/drivers/media/radio/radio-maxiradio.c
42980@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
42981 /* TEA5757 pin mappings */
42982 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
42983
42984-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
42985+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
42986
42987 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
42988 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
42989diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
42990index b914772..7ddbf9b 100644
42991--- a/drivers/media/radio/radio-shark.c
42992+++ b/drivers/media/radio/radio-shark.c
42993@@ -79,7 +79,7 @@ struct shark_device {
42994 u32 last_val;
42995 };
42996
42997-static atomic_t shark_instance = ATOMIC_INIT(0);
42998+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
42999
43000 static void shark_write_val(struct snd_tea575x *tea, u32 val)
43001 {
43002diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
43003index 9fb6697..f167415 100644
43004--- a/drivers/media/radio/radio-shark2.c
43005+++ b/drivers/media/radio/radio-shark2.c
43006@@ -74,7 +74,7 @@ struct shark_device {
43007 u8 *transfer_buffer;
43008 };
43009
43010-static atomic_t shark_instance = ATOMIC_INIT(0);
43011+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
43012
43013 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
43014 {
43015diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
43016index 9c9084c..a9e8dfb 100644
43017--- a/drivers/media/radio/radio-si476x.c
43018+++ b/drivers/media/radio/radio-si476x.c
43019@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
43020 struct si476x_radio *radio;
43021 struct v4l2_ctrl *ctrl;
43022
43023- static atomic_t instance = ATOMIC_INIT(0);
43024+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
43025
43026 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
43027 if (!radio)
43028diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
43029index 46da365..3ba4206 100644
43030--- a/drivers/media/rc/rc-main.c
43031+++ b/drivers/media/rc/rc-main.c
43032@@ -1065,7 +1065,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
43033 int rc_register_device(struct rc_dev *dev)
43034 {
43035 static bool raw_init = false; /* raw decoders loaded? */
43036- static atomic_t devno = ATOMIC_INIT(0);
43037+ static atomic_unchecked_t devno = ATOMIC_INIT(0);
43038 struct rc_map *rc_map;
43039 const char *path;
43040 int rc;
43041@@ -1096,7 +1096,7 @@ int rc_register_device(struct rc_dev *dev)
43042 */
43043 mutex_lock(&dev->lock);
43044
43045- dev->devno = (unsigned long)(atomic_inc_return(&devno) - 1);
43046+ dev->devno = (unsigned long)(atomic_inc_return_unchecked(&devno) - 1);
43047 dev_set_name(&dev->dev, "rc%ld", dev->devno);
43048 dev_set_drvdata(&dev->dev, dev);
43049 rc = device_add(&dev->dev);
43050diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
43051index 20e345d..da56fe4 100644
43052--- a/drivers/media/usb/dvb-usb/cxusb.c
43053+++ b/drivers/media/usb/dvb-usb/cxusb.c
43054@@ -1101,7 +1101,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
43055
43056 struct dib0700_adapter_state {
43057 int (*set_param_save) (struct dvb_frontend *);
43058-};
43059+} __no_const;
43060
43061 static int dib7070_set_param_override(struct dvb_frontend *fe)
43062 {
43063diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
43064index 71b22f5..a63b33f 100644
43065--- a/drivers/media/usb/dvb-usb/dw2102.c
43066+++ b/drivers/media/usb/dvb-usb/dw2102.c
43067@@ -121,7 +121,7 @@ struct su3000_state {
43068
43069 struct s6x0_state {
43070 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
43071-};
43072+} __no_const;
43073
43074 /* debug */
43075 static int dvb_usb_dw2102_debug;
43076diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43077index 8f7a6a4..59502dd 100644
43078--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43079+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43080@@ -326,7 +326,7 @@ struct v4l2_buffer32 {
43081 __u32 reserved;
43082 };
43083
43084-static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43085+static int get_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
43086 enum v4l2_memory memory)
43087 {
43088 void __user *up_pln;
43089@@ -355,7 +355,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43090 return 0;
43091 }
43092
43093-static int put_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43094+static int put_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
43095 enum v4l2_memory memory)
43096 {
43097 if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
43098@@ -772,7 +772,7 @@ static int put_v4l2_subdev_edid32(struct v4l2_subdev_edid *kp, struct v4l2_subde
43099 put_user(kp->start_block, &up->start_block) ||
43100 put_user(kp->blocks, &up->blocks) ||
43101 put_user(tmp, &up->edid) ||
43102- copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
43103+ copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
43104 return -EFAULT;
43105 return 0;
43106 }
43107diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
43108index 02d1b63..5fd6b16 100644
43109--- a/drivers/media/v4l2-core/v4l2-device.c
43110+++ b/drivers/media/v4l2-core/v4l2-device.c
43111@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
43112 EXPORT_SYMBOL_GPL(v4l2_device_put);
43113
43114 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
43115- atomic_t *instance)
43116+ atomic_unchecked_t *instance)
43117 {
43118- int num = atomic_inc_return(instance) - 1;
43119+ int num = atomic_inc_return_unchecked(instance) - 1;
43120 int len = strlen(basename);
43121
43122 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
43123diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
43124index 68e6b5e..d8b923e 100644
43125--- a/drivers/media/v4l2-core/v4l2-ioctl.c
43126+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
43127@@ -1939,7 +1939,8 @@ struct v4l2_ioctl_info {
43128 struct file *file, void *fh, void *p);
43129 } u;
43130 void (*debug)(const void *arg, bool write_only);
43131-};
43132+} __do_const;
43133+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
43134
43135 /* This control needs a priority check */
43136 #define INFO_FL_PRIO (1 << 0)
43137@@ -2120,7 +2121,7 @@ static long __video_do_ioctl(struct file *file,
43138 struct video_device *vfd = video_devdata(file);
43139 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
43140 bool write_only = false;
43141- struct v4l2_ioctl_info default_info;
43142+ v4l2_ioctl_info_no_const default_info;
43143 const struct v4l2_ioctl_info *info;
43144 void *fh = file->private_data;
43145 struct v4l2_fh *vfh = NULL;
43146@@ -2194,7 +2195,7 @@ done:
43147 }
43148
43149 static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43150- void * __user *user_ptr, void ***kernel_ptr)
43151+ void __user **user_ptr, void ***kernel_ptr)
43152 {
43153 int ret = 0;
43154
43155@@ -2210,7 +2211,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43156 ret = -EINVAL;
43157 break;
43158 }
43159- *user_ptr = (void __user *)buf->m.planes;
43160+ *user_ptr = (void __force_user *)buf->m.planes;
43161 *kernel_ptr = (void *)&buf->m.planes;
43162 *array_size = sizeof(struct v4l2_plane) * buf->length;
43163 ret = 1;
43164@@ -2245,7 +2246,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43165 ret = -EINVAL;
43166 break;
43167 }
43168- *user_ptr = (void __user *)ctrls->controls;
43169+ *user_ptr = (void __force_user *)ctrls->controls;
43170 *kernel_ptr = (void *)&ctrls->controls;
43171 *array_size = sizeof(struct v4l2_ext_control)
43172 * ctrls->count;
43173diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
43174index 767ff4d..c69d259 100644
43175--- a/drivers/message/fusion/mptbase.c
43176+++ b/drivers/message/fusion/mptbase.c
43177@@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
43178 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
43179 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
43180
43181+#ifdef CONFIG_GRKERNSEC_HIDESYM
43182+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
43183+#else
43184 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
43185 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
43186+#endif
43187+
43188 /*
43189 * Rounding UP to nearest 4-kB boundary here...
43190 */
43191@@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
43192 ioc->facts.GlobalCredits);
43193
43194 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
43195+#ifdef CONFIG_GRKERNSEC_HIDESYM
43196+ NULL, NULL);
43197+#else
43198 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
43199+#endif
43200 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
43201 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
43202 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
43203diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
43204index dd239bd..689c4f7 100644
43205--- a/drivers/message/fusion/mptsas.c
43206+++ b/drivers/message/fusion/mptsas.c
43207@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
43208 return 0;
43209 }
43210
43211+static inline void
43212+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
43213+{
43214+ if (phy_info->port_details) {
43215+ phy_info->port_details->rphy = rphy;
43216+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
43217+ ioc->name, rphy));
43218+ }
43219+
43220+ if (rphy) {
43221+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
43222+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
43223+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
43224+ ioc->name, rphy, rphy->dev.release));
43225+ }
43226+}
43227+
43228 /* no mutex */
43229 static void
43230 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
43231@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
43232 return NULL;
43233 }
43234
43235-static inline void
43236-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
43237-{
43238- if (phy_info->port_details) {
43239- phy_info->port_details->rphy = rphy;
43240- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
43241- ioc->name, rphy));
43242- }
43243-
43244- if (rphy) {
43245- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
43246- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
43247- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
43248- ioc->name, rphy, rphy->dev.release));
43249- }
43250-}
43251-
43252 static inline struct sas_port *
43253 mptsas_get_port(struct mptsas_phyinfo *phy_info)
43254 {
43255diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
43256index 727819c..ad74694 100644
43257--- a/drivers/message/fusion/mptscsih.c
43258+++ b/drivers/message/fusion/mptscsih.c
43259@@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
43260
43261 h = shost_priv(SChost);
43262
43263- if (h) {
43264- if (h->info_kbuf == NULL)
43265- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
43266- return h->info_kbuf;
43267- h->info_kbuf[0] = '\0';
43268+ if (!h)
43269+ return NULL;
43270
43271- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
43272- h->info_kbuf[size-1] = '\0';
43273- }
43274+ if (h->info_kbuf == NULL)
43275+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
43276+ return h->info_kbuf;
43277+ h->info_kbuf[0] = '\0';
43278+
43279+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
43280+ h->info_kbuf[size-1] = '\0';
43281
43282 return h->info_kbuf;
43283 }
43284diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
43285index b7d87cd..3fb36da 100644
43286--- a/drivers/message/i2o/i2o_proc.c
43287+++ b/drivers/message/i2o/i2o_proc.c
43288@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
43289 "Array Controller Device"
43290 };
43291
43292-static char *chtostr(char *tmp, u8 *chars, int n)
43293-{
43294- tmp[0] = 0;
43295- return strncat(tmp, (char *)chars, n);
43296-}
43297-
43298 static int i2o_report_query_status(struct seq_file *seq, int block_status,
43299 char *group)
43300 {
43301@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
43302 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
43303 {
43304 struct i2o_controller *c = (struct i2o_controller *)seq->private;
43305- static u32 work32[5];
43306- static u8 *work8 = (u8 *) work32;
43307- static u16 *work16 = (u16 *) work32;
43308+ u32 work32[5];
43309+ u8 *work8 = (u8 *) work32;
43310+ u16 *work16 = (u16 *) work32;
43311 int token;
43312 u32 hwcap;
43313
43314@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
43315 } *result;
43316
43317 i2o_exec_execute_ddm_table ddm_table;
43318- char tmp[28 + 1];
43319
43320 result = kmalloc(sizeof(*result), GFP_KERNEL);
43321 if (!result)
43322@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
43323
43324 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
43325 seq_printf(seq, "%-#8x", ddm_table.module_id);
43326- seq_printf(seq, "%-29s",
43327- chtostr(tmp, ddm_table.module_name_version, 28));
43328+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
43329 seq_printf(seq, "%9d ", ddm_table.data_size);
43330 seq_printf(seq, "%8d", ddm_table.code_size);
43331
43332@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
43333
43334 i2o_driver_result_table *result;
43335 i2o_driver_store_table *dst;
43336- char tmp[28 + 1];
43337
43338 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
43339 if (result == NULL)
43340@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
43341
43342 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
43343 seq_printf(seq, "%-#8x", dst->module_id);
43344- seq_printf(seq, "%-29s",
43345- chtostr(tmp, dst->module_name_version, 28));
43346- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
43347+ seq_printf(seq, "%-.28s", dst->module_name_version);
43348+ seq_printf(seq, "%-.8s", dst->date);
43349 seq_printf(seq, "%8d ", dst->module_size);
43350 seq_printf(seq, "%8d ", dst->mpb_size);
43351 seq_printf(seq, "0x%04x", dst->module_flags);
43352@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
43353 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
43354 {
43355 struct i2o_device *d = (struct i2o_device *)seq->private;
43356- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
43357+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
43358 // == (allow) 512d bytes (max)
43359- static u16 *work16 = (u16 *) work32;
43360+ u16 *work16 = (u16 *) work32;
43361 int token;
43362- char tmp[16 + 1];
43363
43364 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
43365
43366@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
43367 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
43368 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
43369 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
43370- seq_printf(seq, "Vendor info : %s\n",
43371- chtostr(tmp, (u8 *) (work32 + 2), 16));
43372- seq_printf(seq, "Product info : %s\n",
43373- chtostr(tmp, (u8 *) (work32 + 6), 16));
43374- seq_printf(seq, "Description : %s\n",
43375- chtostr(tmp, (u8 *) (work32 + 10), 16));
43376- seq_printf(seq, "Product rev. : %s\n",
43377- chtostr(tmp, (u8 *) (work32 + 14), 8));
43378+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
43379+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
43380+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
43381+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
43382
43383 seq_printf(seq, "Serial number : ");
43384 print_serial_number(seq, (u8 *) (work32 + 16),
43385@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
43386 u8 pad[256]; // allow up to 256 byte (max) serial number
43387 } result;
43388
43389- char tmp[24 + 1];
43390-
43391 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
43392
43393 if (token < 0) {
43394@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
43395 }
43396
43397 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
43398- seq_printf(seq, "Module name : %s\n",
43399- chtostr(tmp, result.module_name, 24));
43400- seq_printf(seq, "Module revision : %s\n",
43401- chtostr(tmp, result.module_rev, 8));
43402+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
43403+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
43404
43405 seq_printf(seq, "Serial number : ");
43406 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
43407@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43408 u8 instance_number[4];
43409 } result;
43410
43411- char tmp[64 + 1];
43412-
43413 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
43414
43415 if (token < 0) {
43416@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43417 return 0;
43418 }
43419
43420- seq_printf(seq, "Device name : %s\n",
43421- chtostr(tmp, result.device_name, 64));
43422- seq_printf(seq, "Service name : %s\n",
43423- chtostr(tmp, result.service_name, 64));
43424- seq_printf(seq, "Physical name : %s\n",
43425- chtostr(tmp, result.physical_location, 64));
43426- seq_printf(seq, "Instance number : %s\n",
43427- chtostr(tmp, result.instance_number, 4));
43428+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
43429+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
43430+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
43431+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
43432
43433 return 0;
43434 }
43435@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43436 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
43437 {
43438 struct i2o_device *d = (struct i2o_device *)seq->private;
43439- static u32 work32[12];
43440- static u16 *work16 = (u16 *) work32;
43441- static u8 *work8 = (u8 *) work32;
43442+ u32 work32[12];
43443+ u16 *work16 = (u16 *) work32;
43444+ u8 *work8 = (u8 *) work32;
43445 int token;
43446
43447 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
43448diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
43449index a8c08f3..155fe3d 100644
43450--- a/drivers/message/i2o/iop.c
43451+++ b/drivers/message/i2o/iop.c
43452@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
43453
43454 spin_lock_irqsave(&c->context_list_lock, flags);
43455
43456- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
43457- atomic_inc(&c->context_list_counter);
43458+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
43459+ atomic_inc_unchecked(&c->context_list_counter);
43460
43461- entry->context = atomic_read(&c->context_list_counter);
43462+ entry->context = atomic_read_unchecked(&c->context_list_counter);
43463
43464 list_add(&entry->list, &c->context_list);
43465
43466@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
43467
43468 #if BITS_PER_LONG == 64
43469 spin_lock_init(&c->context_list_lock);
43470- atomic_set(&c->context_list_counter, 0);
43471+ atomic_set_unchecked(&c->context_list_counter, 0);
43472 INIT_LIST_HEAD(&c->context_list);
43473 #endif
43474
43475diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
43476index fcbb2e9..2635e11 100644
43477--- a/drivers/mfd/janz-cmodio.c
43478+++ b/drivers/mfd/janz-cmodio.c
43479@@ -13,6 +13,7 @@
43480
43481 #include <linux/kernel.h>
43482 #include <linux/module.h>
43483+#include <linux/slab.h>
43484 #include <linux/init.h>
43485 #include <linux/pci.h>
43486 #include <linux/interrupt.h>
43487diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
43488index de7fb80..7c1b931 100644
43489--- a/drivers/mfd/max8925-i2c.c
43490+++ b/drivers/mfd/max8925-i2c.c
43491@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
43492 const struct i2c_device_id *id)
43493 {
43494 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
43495- static struct max8925_chip *chip;
43496+ struct max8925_chip *chip;
43497 struct device_node *node = client->dev.of_node;
43498
43499 if (node && !pdata) {
43500diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
43501index d792772..cd73ba3 100644
43502--- a/drivers/mfd/tps65910.c
43503+++ b/drivers/mfd/tps65910.c
43504@@ -229,7 +229,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
43505 struct tps65910_platform_data *pdata)
43506 {
43507 int ret = 0;
43508- static struct regmap_irq_chip *tps6591x_irqs_chip;
43509+ struct regmap_irq_chip *tps6591x_irqs_chip;
43510
43511 if (!irq) {
43512 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
43513diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
43514index 9aa6d1e..1631bfc 100644
43515--- a/drivers/mfd/twl4030-irq.c
43516+++ b/drivers/mfd/twl4030-irq.c
43517@@ -35,6 +35,7 @@
43518 #include <linux/of.h>
43519 #include <linux/irqdomain.h>
43520 #include <linux/i2c/twl.h>
43521+#include <asm/pgtable.h>
43522
43523 #include "twl-core.h"
43524
43525@@ -726,10 +727,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
43526 * Install an irq handler for each of the SIH modules;
43527 * clone dummy irq_chip since PIH can't *do* anything
43528 */
43529- twl4030_irq_chip = dummy_irq_chip;
43530- twl4030_irq_chip.name = "twl4030";
43531+ pax_open_kernel();
43532+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
43533+ *(const char **)&twl4030_irq_chip.name = "twl4030";
43534
43535- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
43536+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
43537+ pax_close_kernel();
43538
43539 for (i = irq_base; i < irq_end; i++) {
43540 irq_set_chip_and_handler(i, &twl4030_irq_chip,
43541diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
43542index 464419b..64bae8d 100644
43543--- a/drivers/misc/c2port/core.c
43544+++ b/drivers/misc/c2port/core.c
43545@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
43546 goto error_idr_alloc;
43547 c2dev->id = ret;
43548
43549- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
43550+ pax_open_kernel();
43551+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
43552+ pax_close_kernel();
43553
43554 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
43555 "c2port%d", c2dev->id);
43556diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
43557index 36f5d52..32311c3 100644
43558--- a/drivers/misc/kgdbts.c
43559+++ b/drivers/misc/kgdbts.c
43560@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
43561 char before[BREAK_INSTR_SIZE];
43562 char after[BREAK_INSTR_SIZE];
43563
43564- probe_kernel_read(before, (char *)kgdbts_break_test,
43565+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
43566 BREAK_INSTR_SIZE);
43567 init_simple_test();
43568 ts.tst = plant_and_detach_test;
43569@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
43570 /* Activate test with initial breakpoint */
43571 if (!is_early)
43572 kgdb_breakpoint();
43573- probe_kernel_read(after, (char *)kgdbts_break_test,
43574+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
43575 BREAK_INSTR_SIZE);
43576 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
43577 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
43578diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
43579index 036effe..b3a6336 100644
43580--- a/drivers/misc/lis3lv02d/lis3lv02d.c
43581+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
43582@@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
43583 * the lid is closed. This leads to interrupts as soon as a little move
43584 * is done.
43585 */
43586- atomic_inc(&lis3->count);
43587+ atomic_inc_unchecked(&lis3->count);
43588
43589 wake_up_interruptible(&lis3->misc_wait);
43590 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
43591@@ -584,7 +584,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
43592 if (lis3->pm_dev)
43593 pm_runtime_get_sync(lis3->pm_dev);
43594
43595- atomic_set(&lis3->count, 0);
43596+ atomic_set_unchecked(&lis3->count, 0);
43597 return 0;
43598 }
43599
43600@@ -616,7 +616,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
43601 add_wait_queue(&lis3->misc_wait, &wait);
43602 while (true) {
43603 set_current_state(TASK_INTERRUPTIBLE);
43604- data = atomic_xchg(&lis3->count, 0);
43605+ data = atomic_xchg_unchecked(&lis3->count, 0);
43606 if (data)
43607 break;
43608
43609@@ -657,7 +657,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
43610 struct lis3lv02d, miscdev);
43611
43612 poll_wait(file, &lis3->misc_wait, wait);
43613- if (atomic_read(&lis3->count))
43614+ if (atomic_read_unchecked(&lis3->count))
43615 return POLLIN | POLLRDNORM;
43616 return 0;
43617 }
43618diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
43619index c439c82..1f20f57 100644
43620--- a/drivers/misc/lis3lv02d/lis3lv02d.h
43621+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
43622@@ -297,7 +297,7 @@ struct lis3lv02d {
43623 struct input_polled_dev *idev; /* input device */
43624 struct platform_device *pdev; /* platform device */
43625 struct regulator_bulk_data regulators[2];
43626- atomic_t count; /* interrupt count after last read */
43627+ atomic_unchecked_t count; /* interrupt count after last read */
43628 union axis_conversion ac; /* hw -> logical axis */
43629 int mapped_btns[3];
43630
43631diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
43632index 2f30bad..c4c13d0 100644
43633--- a/drivers/misc/sgi-gru/gruhandles.c
43634+++ b/drivers/misc/sgi-gru/gruhandles.c
43635@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
43636 unsigned long nsec;
43637
43638 nsec = CLKS2NSEC(clks);
43639- atomic_long_inc(&mcs_op_statistics[op].count);
43640- atomic_long_add(nsec, &mcs_op_statistics[op].total);
43641+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
43642+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
43643 if (mcs_op_statistics[op].max < nsec)
43644 mcs_op_statistics[op].max = nsec;
43645 }
43646diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
43647index 4f76359..cdfcb2e 100644
43648--- a/drivers/misc/sgi-gru/gruprocfs.c
43649+++ b/drivers/misc/sgi-gru/gruprocfs.c
43650@@ -32,9 +32,9 @@
43651
43652 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
43653
43654-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
43655+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
43656 {
43657- unsigned long val = atomic_long_read(v);
43658+ unsigned long val = atomic_long_read_unchecked(v);
43659
43660 seq_printf(s, "%16lu %s\n", val, id);
43661 }
43662@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
43663
43664 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
43665 for (op = 0; op < mcsop_last; op++) {
43666- count = atomic_long_read(&mcs_op_statistics[op].count);
43667- total = atomic_long_read(&mcs_op_statistics[op].total);
43668+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
43669+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
43670 max = mcs_op_statistics[op].max;
43671 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
43672 count ? total / count : 0, max);
43673diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
43674index 5c3ce24..4915ccb 100644
43675--- a/drivers/misc/sgi-gru/grutables.h
43676+++ b/drivers/misc/sgi-gru/grutables.h
43677@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
43678 * GRU statistics.
43679 */
43680 struct gru_stats_s {
43681- atomic_long_t vdata_alloc;
43682- atomic_long_t vdata_free;
43683- atomic_long_t gts_alloc;
43684- atomic_long_t gts_free;
43685- atomic_long_t gms_alloc;
43686- atomic_long_t gms_free;
43687- atomic_long_t gts_double_allocate;
43688- atomic_long_t assign_context;
43689- atomic_long_t assign_context_failed;
43690- atomic_long_t free_context;
43691- atomic_long_t load_user_context;
43692- atomic_long_t load_kernel_context;
43693- atomic_long_t lock_kernel_context;
43694- atomic_long_t unlock_kernel_context;
43695- atomic_long_t steal_user_context;
43696- atomic_long_t steal_kernel_context;
43697- atomic_long_t steal_context_failed;
43698- atomic_long_t nopfn;
43699- atomic_long_t asid_new;
43700- atomic_long_t asid_next;
43701- atomic_long_t asid_wrap;
43702- atomic_long_t asid_reuse;
43703- atomic_long_t intr;
43704- atomic_long_t intr_cbr;
43705- atomic_long_t intr_tfh;
43706- atomic_long_t intr_spurious;
43707- atomic_long_t intr_mm_lock_failed;
43708- atomic_long_t call_os;
43709- atomic_long_t call_os_wait_queue;
43710- atomic_long_t user_flush_tlb;
43711- atomic_long_t user_unload_context;
43712- atomic_long_t user_exception;
43713- atomic_long_t set_context_option;
43714- atomic_long_t check_context_retarget_intr;
43715- atomic_long_t check_context_unload;
43716- atomic_long_t tlb_dropin;
43717- atomic_long_t tlb_preload_page;
43718- atomic_long_t tlb_dropin_fail_no_asid;
43719- atomic_long_t tlb_dropin_fail_upm;
43720- atomic_long_t tlb_dropin_fail_invalid;
43721- atomic_long_t tlb_dropin_fail_range_active;
43722- atomic_long_t tlb_dropin_fail_idle;
43723- atomic_long_t tlb_dropin_fail_fmm;
43724- atomic_long_t tlb_dropin_fail_no_exception;
43725- atomic_long_t tfh_stale_on_fault;
43726- atomic_long_t mmu_invalidate_range;
43727- atomic_long_t mmu_invalidate_page;
43728- atomic_long_t flush_tlb;
43729- atomic_long_t flush_tlb_gru;
43730- atomic_long_t flush_tlb_gru_tgh;
43731- atomic_long_t flush_tlb_gru_zero_asid;
43732+ atomic_long_unchecked_t vdata_alloc;
43733+ atomic_long_unchecked_t vdata_free;
43734+ atomic_long_unchecked_t gts_alloc;
43735+ atomic_long_unchecked_t gts_free;
43736+ atomic_long_unchecked_t gms_alloc;
43737+ atomic_long_unchecked_t gms_free;
43738+ atomic_long_unchecked_t gts_double_allocate;
43739+ atomic_long_unchecked_t assign_context;
43740+ atomic_long_unchecked_t assign_context_failed;
43741+ atomic_long_unchecked_t free_context;
43742+ atomic_long_unchecked_t load_user_context;
43743+ atomic_long_unchecked_t load_kernel_context;
43744+ atomic_long_unchecked_t lock_kernel_context;
43745+ atomic_long_unchecked_t unlock_kernel_context;
43746+ atomic_long_unchecked_t steal_user_context;
43747+ atomic_long_unchecked_t steal_kernel_context;
43748+ atomic_long_unchecked_t steal_context_failed;
43749+ atomic_long_unchecked_t nopfn;
43750+ atomic_long_unchecked_t asid_new;
43751+ atomic_long_unchecked_t asid_next;
43752+ atomic_long_unchecked_t asid_wrap;
43753+ atomic_long_unchecked_t asid_reuse;
43754+ atomic_long_unchecked_t intr;
43755+ atomic_long_unchecked_t intr_cbr;
43756+ atomic_long_unchecked_t intr_tfh;
43757+ atomic_long_unchecked_t intr_spurious;
43758+ atomic_long_unchecked_t intr_mm_lock_failed;
43759+ atomic_long_unchecked_t call_os;
43760+ atomic_long_unchecked_t call_os_wait_queue;
43761+ atomic_long_unchecked_t user_flush_tlb;
43762+ atomic_long_unchecked_t user_unload_context;
43763+ atomic_long_unchecked_t user_exception;
43764+ atomic_long_unchecked_t set_context_option;
43765+ atomic_long_unchecked_t check_context_retarget_intr;
43766+ atomic_long_unchecked_t check_context_unload;
43767+ atomic_long_unchecked_t tlb_dropin;
43768+ atomic_long_unchecked_t tlb_preload_page;
43769+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
43770+ atomic_long_unchecked_t tlb_dropin_fail_upm;
43771+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
43772+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
43773+ atomic_long_unchecked_t tlb_dropin_fail_idle;
43774+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
43775+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
43776+ atomic_long_unchecked_t tfh_stale_on_fault;
43777+ atomic_long_unchecked_t mmu_invalidate_range;
43778+ atomic_long_unchecked_t mmu_invalidate_page;
43779+ atomic_long_unchecked_t flush_tlb;
43780+ atomic_long_unchecked_t flush_tlb_gru;
43781+ atomic_long_unchecked_t flush_tlb_gru_tgh;
43782+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
43783
43784- atomic_long_t copy_gpa;
43785- atomic_long_t read_gpa;
43786+ atomic_long_unchecked_t copy_gpa;
43787+ atomic_long_unchecked_t read_gpa;
43788
43789- atomic_long_t mesq_receive;
43790- atomic_long_t mesq_receive_none;
43791- atomic_long_t mesq_send;
43792- atomic_long_t mesq_send_failed;
43793- atomic_long_t mesq_noop;
43794- atomic_long_t mesq_send_unexpected_error;
43795- atomic_long_t mesq_send_lb_overflow;
43796- atomic_long_t mesq_send_qlimit_reached;
43797- atomic_long_t mesq_send_amo_nacked;
43798- atomic_long_t mesq_send_put_nacked;
43799- atomic_long_t mesq_page_overflow;
43800- atomic_long_t mesq_qf_locked;
43801- atomic_long_t mesq_qf_noop_not_full;
43802- atomic_long_t mesq_qf_switch_head_failed;
43803- atomic_long_t mesq_qf_unexpected_error;
43804- atomic_long_t mesq_noop_unexpected_error;
43805- atomic_long_t mesq_noop_lb_overflow;
43806- atomic_long_t mesq_noop_qlimit_reached;
43807- atomic_long_t mesq_noop_amo_nacked;
43808- atomic_long_t mesq_noop_put_nacked;
43809- atomic_long_t mesq_noop_page_overflow;
43810+ atomic_long_unchecked_t mesq_receive;
43811+ atomic_long_unchecked_t mesq_receive_none;
43812+ atomic_long_unchecked_t mesq_send;
43813+ atomic_long_unchecked_t mesq_send_failed;
43814+ atomic_long_unchecked_t mesq_noop;
43815+ atomic_long_unchecked_t mesq_send_unexpected_error;
43816+ atomic_long_unchecked_t mesq_send_lb_overflow;
43817+ atomic_long_unchecked_t mesq_send_qlimit_reached;
43818+ atomic_long_unchecked_t mesq_send_amo_nacked;
43819+ atomic_long_unchecked_t mesq_send_put_nacked;
43820+ atomic_long_unchecked_t mesq_page_overflow;
43821+ atomic_long_unchecked_t mesq_qf_locked;
43822+ atomic_long_unchecked_t mesq_qf_noop_not_full;
43823+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
43824+ atomic_long_unchecked_t mesq_qf_unexpected_error;
43825+ atomic_long_unchecked_t mesq_noop_unexpected_error;
43826+ atomic_long_unchecked_t mesq_noop_lb_overflow;
43827+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
43828+ atomic_long_unchecked_t mesq_noop_amo_nacked;
43829+ atomic_long_unchecked_t mesq_noop_put_nacked;
43830+ atomic_long_unchecked_t mesq_noop_page_overflow;
43831
43832 };
43833
43834@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
43835 tghop_invalidate, mcsop_last};
43836
43837 struct mcs_op_statistic {
43838- atomic_long_t count;
43839- atomic_long_t total;
43840+ atomic_long_unchecked_t count;
43841+ atomic_long_unchecked_t total;
43842 unsigned long max;
43843 };
43844
43845@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
43846
43847 #define STAT(id) do { \
43848 if (gru_options & OPT_STATS) \
43849- atomic_long_inc(&gru_stats.id); \
43850+ atomic_long_inc_unchecked(&gru_stats.id); \
43851 } while (0)
43852
43853 #ifdef CONFIG_SGI_GRU_DEBUG
43854diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
43855index c862cd4..0d176fe 100644
43856--- a/drivers/misc/sgi-xp/xp.h
43857+++ b/drivers/misc/sgi-xp/xp.h
43858@@ -288,7 +288,7 @@ struct xpc_interface {
43859 xpc_notify_func, void *);
43860 void (*received) (short, int, void *);
43861 enum xp_retval (*partid_to_nasids) (short, void *);
43862-};
43863+} __no_const;
43864
43865 extern struct xpc_interface xpc_interface;
43866
43867diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
43868index b94d5f7..7f494c5 100644
43869--- a/drivers/misc/sgi-xp/xpc.h
43870+++ b/drivers/misc/sgi-xp/xpc.h
43871@@ -835,6 +835,7 @@ struct xpc_arch_operations {
43872 void (*received_payload) (struct xpc_channel *, void *);
43873 void (*notify_senders_of_disconnect) (struct xpc_channel *);
43874 };
43875+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
43876
43877 /* struct xpc_partition act_state values (for XPC HB) */
43878
43879@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
43880 /* found in xpc_main.c */
43881 extern struct device *xpc_part;
43882 extern struct device *xpc_chan;
43883-extern struct xpc_arch_operations xpc_arch_ops;
43884+extern xpc_arch_operations_no_const xpc_arch_ops;
43885 extern int xpc_disengage_timelimit;
43886 extern int xpc_disengage_timedout;
43887 extern int xpc_activate_IRQ_rcvd;
43888diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
43889index 82dc574..8539ab2 100644
43890--- a/drivers/misc/sgi-xp/xpc_main.c
43891+++ b/drivers/misc/sgi-xp/xpc_main.c
43892@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
43893 .notifier_call = xpc_system_die,
43894 };
43895
43896-struct xpc_arch_operations xpc_arch_ops;
43897+xpc_arch_operations_no_const xpc_arch_ops;
43898
43899 /*
43900 * Timer function to enforce the timelimit on the partition disengage.
43901@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
43902
43903 if (((die_args->trapnr == X86_TRAP_MF) ||
43904 (die_args->trapnr == X86_TRAP_XF)) &&
43905- !user_mode_vm(die_args->regs))
43906+ !user_mode(die_args->regs))
43907 xpc_die_deactivate();
43908
43909 break;
43910diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
43911index ef18348..1b53cf0 100644
43912--- a/drivers/mmc/core/mmc_ops.c
43913+++ b/drivers/mmc/core/mmc_ops.c
43914@@ -213,7 +213,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
43915 void *data_buf;
43916 int is_on_stack;
43917
43918- is_on_stack = object_is_on_stack(buf);
43919+ is_on_stack = object_starts_on_stack(buf);
43920 if (is_on_stack) {
43921 /*
43922 * dma onto stack is unsafe/nonportable, but callers to this
43923diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
43924index 81b2994..dce857e 100644
43925--- a/drivers/mmc/host/dw_mmc.h
43926+++ b/drivers/mmc/host/dw_mmc.h
43927@@ -203,5 +203,5 @@ struct dw_mci_drv_data {
43928 void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
43929 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
43930 int (*parse_dt)(struct dw_mci *host);
43931-};
43932+} __do_const;
43933 #endif /* _DW_MMC_H_ */
43934diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
43935index c3785ed..1984c44 100644
43936--- a/drivers/mmc/host/mmci.c
43937+++ b/drivers/mmc/host/mmci.c
43938@@ -1482,7 +1482,9 @@ static int mmci_probe(struct amba_device *dev,
43939 }
43940
43941 if (variant->busy_detect) {
43942- mmci_ops.card_busy = mmci_card_busy;
43943+ pax_open_kernel();
43944+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
43945+ pax_close_kernel();
43946 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
43947 }
43948
43949diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
43950index 6debda9..2ba7427 100644
43951--- a/drivers/mmc/host/sdhci-s3c.c
43952+++ b/drivers/mmc/host/sdhci-s3c.c
43953@@ -668,9 +668,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
43954 * we can use overriding functions instead of default.
43955 */
43956 if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
43957- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
43958- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
43959- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
43960+ pax_open_kernel();
43961+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
43962+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
43963+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
43964+ pax_close_kernel();
43965 }
43966
43967 /* It supports additional host capabilities if needed */
43968diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
43969index 096993f..f02c23b 100644
43970--- a/drivers/mtd/chips/cfi_cmdset_0020.c
43971+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
43972@@ -669,7 +669,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
43973 size_t totlen = 0, thislen;
43974 int ret = 0;
43975 size_t buflen = 0;
43976- static char *buffer;
43977+ char *buffer;
43978
43979 if (!ECCBUF_SIZE) {
43980 /* We should fall back to a general writev implementation.
43981diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
43982index 2ed2bb3..2d0b82e 100644
43983--- a/drivers/mtd/nand/denali.c
43984+++ b/drivers/mtd/nand/denali.c
43985@@ -24,6 +24,7 @@
43986 #include <linux/slab.h>
43987 #include <linux/mtd/mtd.h>
43988 #include <linux/module.h>
43989+#include <linux/slab.h>
43990
43991 #include "denali.h"
43992
43993diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
43994index 51b9d6a..52af9a7 100644
43995--- a/drivers/mtd/nftlmount.c
43996+++ b/drivers/mtd/nftlmount.c
43997@@ -24,6 +24,7 @@
43998 #include <asm/errno.h>
43999 #include <linux/delay.h>
44000 #include <linux/slab.h>
44001+#include <linux/sched.h>
44002 #include <linux/mtd/mtd.h>
44003 #include <linux/mtd/nand.h>
44004 #include <linux/mtd/nftl.h>
44005diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
44006index 4b8e895..6b3c498 100644
44007--- a/drivers/mtd/sm_ftl.c
44008+++ b/drivers/mtd/sm_ftl.c
44009@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
44010 #define SM_CIS_VENDOR_OFFSET 0x59
44011 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
44012 {
44013- struct attribute_group *attr_group;
44014+ attribute_group_no_const *attr_group;
44015 struct attribute **attributes;
44016 struct sm_sysfs_attribute *vendor_attribute;
44017
44018diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
44019index dd8057d..22aaf36 100644
44020--- a/drivers/net/bonding/bond_main.c
44021+++ b/drivers/net/bonding/bond_main.c
44022@@ -4511,7 +4511,7 @@ static unsigned int bond_get_num_tx_queues(void)
44023 return tx_queues;
44024 }
44025
44026-static struct rtnl_link_ops bond_link_ops __read_mostly = {
44027+static struct rtnl_link_ops bond_link_ops = {
44028 .kind = "bond",
44029 .priv_size = sizeof(struct bonding),
44030 .setup = bond_setup,
44031@@ -4636,8 +4636,8 @@ static void __exit bonding_exit(void)
44032
44033 bond_destroy_debugfs();
44034
44035- rtnl_link_unregister(&bond_link_ops);
44036 unregister_pernet_subsys(&bond_net_ops);
44037+ rtnl_link_unregister(&bond_link_ops);
44038
44039 #ifdef CONFIG_NET_POLL_CONTROLLER
44040 /*
44041diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
44042index f92f001..0b2f9bf 100644
44043--- a/drivers/net/ethernet/8390/ax88796.c
44044+++ b/drivers/net/ethernet/8390/ax88796.c
44045@@ -872,9 +872,11 @@ static int ax_probe(struct platform_device *pdev)
44046 if (ax->plat->reg_offsets)
44047 ei_local->reg_offset = ax->plat->reg_offsets;
44048 else {
44049+ resource_size_t _mem_size = mem_size;
44050+ do_div(_mem_size, 0x18);
44051 ei_local->reg_offset = ax->reg_offsets;
44052 for (ret = 0; ret < 0x18; ret++)
44053- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
44054+ ax->reg_offsets[ret] = _mem_size * ret;
44055 }
44056
44057 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
44058diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44059index da8fcaa..f4b5d3b 100644
44060--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44061+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44062@@ -1138,7 +1138,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
44063 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
44064 {
44065 /* RX_MODE controlling object */
44066- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
44067+ bnx2x_init_rx_mode_obj(bp);
44068
44069 /* multicast configuration controlling object */
44070 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
44071diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44072index 9fbeee5..5e3e37a 100644
44073--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44074+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44075@@ -2590,15 +2590,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
44076 return rc;
44077 }
44078
44079-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
44080- struct bnx2x_rx_mode_obj *o)
44081+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
44082 {
44083 if (CHIP_IS_E1x(bp)) {
44084- o->wait_comp = bnx2x_empty_rx_mode_wait;
44085- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
44086+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
44087+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
44088 } else {
44089- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
44090- o->config_rx_mode = bnx2x_set_rx_mode_e2;
44091+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
44092+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
44093 }
44094 }
44095
44096diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44097index 658f4e3..15074a6 100644
44098--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44099+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44100@@ -1325,8 +1325,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
44101
44102 /********************* RX MODE ****************/
44103
44104-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
44105- struct bnx2x_rx_mode_obj *o);
44106+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
44107
44108 /**
44109 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
44110diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
44111index 7025780..e55a71c 100644
44112--- a/drivers/net/ethernet/broadcom/tg3.h
44113+++ b/drivers/net/ethernet/broadcom/tg3.h
44114@@ -147,6 +147,7 @@
44115 #define CHIPREV_ID_5750_A0 0x4000
44116 #define CHIPREV_ID_5750_A1 0x4001
44117 #define CHIPREV_ID_5750_A3 0x4003
44118+#define CHIPREV_ID_5750_C1 0x4201
44119 #define CHIPREV_ID_5750_C2 0x4202
44120 #define CHIPREV_ID_5752_A0_HW 0x5000
44121 #define CHIPREV_ID_5752_A0 0x6000
44122diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44123index 8cffcdf..aadf043 100644
44124--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44125+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44126@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
44127 */
44128 struct l2t_skb_cb {
44129 arp_failure_handler_func arp_failure_handler;
44130-};
44131+} __no_const;
44132
44133 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
44134
44135diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44136index c73cabd..cd278b1 100644
44137--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44138+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44139@@ -2186,7 +2186,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
44140
44141 int i;
44142 struct adapter *ap = netdev2adap(dev);
44143- static const unsigned int *reg_ranges;
44144+ const unsigned int *reg_ranges;
44145 int arr_size = 0, buf_size = 0;
44146
44147 if (is_t4(ap->chip)) {
44148diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
44149index 263b92c..f05134b 100644
44150--- a/drivers/net/ethernet/dec/tulip/de4x5.c
44151+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
44152@@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
44153 for (i=0; i<ETH_ALEN; i++) {
44154 tmp.addr[i] = dev->dev_addr[i];
44155 }
44156- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
44157+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
44158 break;
44159
44160 case DE4X5_SET_HWADDR: /* Set the hardware address */
44161@@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
44162 spin_lock_irqsave(&lp->lock, flags);
44163 memcpy(&statbuf, &lp->pktStats, ioc->len);
44164 spin_unlock_irqrestore(&lp->lock, flags);
44165- if (copy_to_user(ioc->data, &statbuf, ioc->len))
44166+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
44167 return -EFAULT;
44168 break;
44169 }
44170diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
44171index 2c38cc4..0323f6e 100644
44172--- a/drivers/net/ethernet/emulex/benet/be_main.c
44173+++ b/drivers/net/ethernet/emulex/benet/be_main.c
44174@@ -470,7 +470,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
44175
44176 if (wrapped)
44177 newacc += 65536;
44178- ACCESS_ONCE(*acc) = newacc;
44179+ ACCESS_ONCE_RW(*acc) = newacc;
44180 }
44181
44182 static void populate_erx_stats(struct be_adapter *adapter,
44183diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
44184index 212f44b..fb69959 100644
44185--- a/drivers/net/ethernet/faraday/ftgmac100.c
44186+++ b/drivers/net/ethernet/faraday/ftgmac100.c
44187@@ -31,6 +31,8 @@
44188 #include <linux/netdevice.h>
44189 #include <linux/phy.h>
44190 #include <linux/platform_device.h>
44191+#include <linux/interrupt.h>
44192+#include <linux/irqreturn.h>
44193 #include <net/ip.h>
44194
44195 #include "ftgmac100.h"
44196diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
44197index 8be5b40..081bc1b 100644
44198--- a/drivers/net/ethernet/faraday/ftmac100.c
44199+++ b/drivers/net/ethernet/faraday/ftmac100.c
44200@@ -31,6 +31,8 @@
44201 #include <linux/module.h>
44202 #include <linux/netdevice.h>
44203 #include <linux/platform_device.h>
44204+#include <linux/interrupt.h>
44205+#include <linux/irqreturn.h>
44206
44207 #include "ftmac100.h"
44208
44209diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44210index 5184e2a..acb28c3 100644
44211--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44212+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44213@@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
44214 }
44215
44216 /* update the base incval used to calculate frequency adjustment */
44217- ACCESS_ONCE(adapter->base_incval) = incval;
44218+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
44219 smp_mb();
44220
44221 /* need lock to prevent incorrect read while modifying cyclecounter */
44222diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
44223index fbe5363..266b4e3 100644
44224--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
44225+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
44226@@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
44227 struct __vxge_hw_fifo *fifo;
44228 struct vxge_hw_fifo_config *config;
44229 u32 txdl_size, txdl_per_memblock;
44230- struct vxge_hw_mempool_cbs fifo_mp_callback;
44231+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
44232+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
44233+ };
44234+
44235 struct __vxge_hw_virtualpath *vpath;
44236
44237 if ((vp == NULL) || (attr == NULL)) {
44238@@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
44239 goto exit;
44240 }
44241
44242- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
44243-
44244 fifo->mempool =
44245 __vxge_hw_mempool_create(vpath->hldev,
44246 fifo->config->memblock_size,
44247diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44248index f09e787..f3916a8 100644
44249--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44250+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44251@@ -2055,7 +2055,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
44252
44253 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
44254 ahw->nic_mode = QLC_83XX_DEFAULT_MODE;
44255- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
44256+ pax_open_kernel();
44257+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
44258+ pax_close_kernel();
44259 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44260 } else {
44261 return -EIO;
44262diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44263index 0248a4c..9648d96 100644
44264--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44265+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44266@@ -191,17 +191,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
44267 case QLCNIC_NON_PRIV_FUNC:
44268 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
44269 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44270- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
44271+ pax_open_kernel();
44272+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
44273+ pax_close_kernel();
44274 break;
44275 case QLCNIC_PRIV_FUNC:
44276 ahw->op_mode = QLCNIC_PRIV_FUNC;
44277 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
44278- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
44279+ pax_open_kernel();
44280+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
44281+ pax_close_kernel();
44282 break;
44283 case QLCNIC_MGMT_FUNC:
44284 ahw->op_mode = QLCNIC_MGMT_FUNC;
44285 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44286- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
44287+ pax_open_kernel();
44288+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
44289+ pax_close_kernel();
44290 break;
44291 default:
44292 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
44293diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44294index 1551360..ed6510f 100644
44295--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44296+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44297@@ -1108,7 +1108,7 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
44298 struct qlcnic_dump_entry *entry;
44299 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
44300 struct qlcnic_dump_template_hdr *tmpl_hdr = fw_dump->tmpl_hdr;
44301- static const struct qlcnic_dump_operations *fw_dump_ops;
44302+ const struct qlcnic_dump_operations *fw_dump_ops;
44303 struct device *dev = &adapter->pdev->dev;
44304 struct qlcnic_hardware_context *ahw;
44305 void *temp_buffer;
44306diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
44307index fb3f8dc..9d2ff38 100644
44308--- a/drivers/net/ethernet/realtek/r8169.c
44309+++ b/drivers/net/ethernet/realtek/r8169.c
44310@@ -759,22 +759,22 @@ struct rtl8169_private {
44311 struct mdio_ops {
44312 void (*write)(struct rtl8169_private *, int, int);
44313 int (*read)(struct rtl8169_private *, int);
44314- } mdio_ops;
44315+ } __no_const mdio_ops;
44316
44317 struct pll_power_ops {
44318 void (*down)(struct rtl8169_private *);
44319 void (*up)(struct rtl8169_private *);
44320- } pll_power_ops;
44321+ } __no_const pll_power_ops;
44322
44323 struct jumbo_ops {
44324 void (*enable)(struct rtl8169_private *);
44325 void (*disable)(struct rtl8169_private *);
44326- } jumbo_ops;
44327+ } __no_const jumbo_ops;
44328
44329 struct csi_ops {
44330 void (*write)(struct rtl8169_private *, int, int);
44331 u32 (*read)(struct rtl8169_private *, int);
44332- } csi_ops;
44333+ } __no_const csi_ops;
44334
44335 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
44336 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
44337diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
44338index 03acf57..e1251ff 100644
44339--- a/drivers/net/ethernet/sfc/ptp.c
44340+++ b/drivers/net/ethernet/sfc/ptp.c
44341@@ -539,7 +539,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
44342 ptp->start.dma_addr);
44343
44344 /* Clear flag that signals MC ready */
44345- ACCESS_ONCE(*start) = 0;
44346+ ACCESS_ONCE_RW(*start) = 0;
44347 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
44348 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
44349 EFX_BUG_ON_PARANOID(rc);
44350diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44351index 50617c5..b13724c 100644
44352--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44353+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44354@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
44355
44356 writel(value, ioaddr + MMC_CNTRL);
44357
44358- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
44359- MMC_CNTRL, value);
44360+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
44361+// MMC_CNTRL, value);
44362 }
44363
44364 /* To mask all all interrupts.*/
44365diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
44366index 3169252..5d78c1d 100644
44367--- a/drivers/net/hamradio/hdlcdrv.c
44368+++ b/drivers/net/hamradio/hdlcdrv.c
44369@@ -571,6 +571,8 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44370 case HDLCDRVCTL_CALIBRATE:
44371 if(!capable(CAP_SYS_RAWIO))
44372 return -EPERM;
44373+ if (bi.data.calibrate > INT_MAX / s->par.bitrate)
44374+ return -EINVAL;
44375 s->hdlctx.calibrate = bi.data.calibrate * s->par.bitrate / 16;
44376 return 0;
44377
44378diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
44379index e6fe0d8..2b7d752 100644
44380--- a/drivers/net/hyperv/hyperv_net.h
44381+++ b/drivers/net/hyperv/hyperv_net.h
44382@@ -101,7 +101,7 @@ struct rndis_device {
44383
44384 enum rndis_device_state state;
44385 bool link_state;
44386- atomic_t new_req_id;
44387+ atomic_unchecked_t new_req_id;
44388
44389 spinlock_t request_lock;
44390 struct list_head req_list;
44391diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
44392index 0775f0a..d4fb316 100644
44393--- a/drivers/net/hyperv/rndis_filter.c
44394+++ b/drivers/net/hyperv/rndis_filter.c
44395@@ -104,7 +104,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
44396 * template
44397 */
44398 set = &rndis_msg->msg.set_req;
44399- set->req_id = atomic_inc_return(&dev->new_req_id);
44400+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
44401
44402 /* Add to the request list */
44403 spin_lock_irqsave(&dev->request_lock, flags);
44404@@ -752,7 +752,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
44405
44406 /* Setup the rndis set */
44407 halt = &request->request_msg.msg.halt_req;
44408- halt->req_id = atomic_inc_return(&dev->new_req_id);
44409+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
44410
44411 /* Ignore return since this msg is optional. */
44412 rndis_filter_send_request(dev, request);
44413diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
44414index bf0d55e..82bcfbd1 100644
44415--- a/drivers/net/ieee802154/fakehard.c
44416+++ b/drivers/net/ieee802154/fakehard.c
44417@@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
44418 phy->transmit_power = 0xbf;
44419
44420 dev->netdev_ops = &fake_ops;
44421- dev->ml_priv = &fake_mlme;
44422+ dev->ml_priv = (void *)&fake_mlme;
44423
44424 priv = netdev_priv(dev);
44425 priv->phy = phy;
44426diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
44427index 9bf46bd..bfdaa84 100644
44428--- a/drivers/net/macvlan.c
44429+++ b/drivers/net/macvlan.c
44430@@ -939,13 +939,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
44431 int macvlan_link_register(struct rtnl_link_ops *ops)
44432 {
44433 /* common fields */
44434- ops->priv_size = sizeof(struct macvlan_dev);
44435- ops->validate = macvlan_validate;
44436- ops->maxtype = IFLA_MACVLAN_MAX;
44437- ops->policy = macvlan_policy;
44438- ops->changelink = macvlan_changelink;
44439- ops->get_size = macvlan_get_size;
44440- ops->fill_info = macvlan_fill_info;
44441+ pax_open_kernel();
44442+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
44443+ *(void **)&ops->validate = macvlan_validate;
44444+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
44445+ *(const void **)&ops->policy = macvlan_policy;
44446+ *(void **)&ops->changelink = macvlan_changelink;
44447+ *(void **)&ops->get_size = macvlan_get_size;
44448+ *(void **)&ops->fill_info = macvlan_fill_info;
44449+ pax_close_kernel();
44450
44451 return rtnl_link_register(ops);
44452 };
44453@@ -1001,7 +1003,7 @@ static int macvlan_device_event(struct notifier_block *unused,
44454 return NOTIFY_DONE;
44455 }
44456
44457-static struct notifier_block macvlan_notifier_block __read_mostly = {
44458+static struct notifier_block macvlan_notifier_block = {
44459 .notifier_call = macvlan_device_event,
44460 };
44461
44462diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
44463index dc76670..e18f39c 100644
44464--- a/drivers/net/macvtap.c
44465+++ b/drivers/net/macvtap.c
44466@@ -1189,7 +1189,7 @@ static int macvtap_device_event(struct notifier_block *unused,
44467 return NOTIFY_DONE;
44468 }
44469
44470-static struct notifier_block macvtap_notifier_block __read_mostly = {
44471+static struct notifier_block macvtap_notifier_block = {
44472 .notifier_call = macvtap_device_event,
44473 };
44474
44475diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
44476index daec9b0..6428fcb 100644
44477--- a/drivers/net/phy/mdio-bitbang.c
44478+++ b/drivers/net/phy/mdio-bitbang.c
44479@@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
44480 struct mdiobb_ctrl *ctrl = bus->priv;
44481
44482 module_put(ctrl->ops->owner);
44483+ mdiobus_unregister(bus);
44484 mdiobus_free(bus);
44485 }
44486 EXPORT_SYMBOL(free_mdio_bitbang);
44487diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
44488index 72ff14b..11d442d 100644
44489--- a/drivers/net/ppp/ppp_generic.c
44490+++ b/drivers/net/ppp/ppp_generic.c
44491@@ -999,7 +999,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44492 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
44493 struct ppp_stats stats;
44494 struct ppp_comp_stats cstats;
44495- char *vers;
44496
44497 switch (cmd) {
44498 case SIOCGPPPSTATS:
44499@@ -1021,8 +1020,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44500 break;
44501
44502 case SIOCGPPPVER:
44503- vers = PPP_VERSION;
44504- if (copy_to_user(addr, vers, strlen(vers) + 1))
44505+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
44506 break;
44507 err = 0;
44508 break;
44509diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
44510index 1252d9c..80e660b 100644
44511--- a/drivers/net/slip/slhc.c
44512+++ b/drivers/net/slip/slhc.c
44513@@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
44514 register struct tcphdr *thp;
44515 register struct iphdr *ip;
44516 register struct cstate *cs;
44517- int len, hdrlen;
44518+ long len, hdrlen;
44519 unsigned char *cp = icp;
44520
44521 /* We've got a compressed packet; read the change byte */
44522diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
44523index 6327df2..e6e1ebe 100644
44524--- a/drivers/net/team/team.c
44525+++ b/drivers/net/team/team.c
44526@@ -2873,7 +2873,7 @@ static int team_device_event(struct notifier_block *unused,
44527 return NOTIFY_DONE;
44528 }
44529
44530-static struct notifier_block team_notifier_block __read_mostly = {
44531+static struct notifier_block team_notifier_block = {
44532 .notifier_call = team_device_event,
44533 };
44534
44535diff --git a/drivers/net/tun.c b/drivers/net/tun.c
44536index 782e38b..d076fdc 100644
44537--- a/drivers/net/tun.c
44538+++ b/drivers/net/tun.c
44539@@ -1834,7 +1834,7 @@ unlock:
44540 }
44541
44542 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
44543- unsigned long arg, int ifreq_len)
44544+ unsigned long arg, size_t ifreq_len)
44545 {
44546 struct tun_file *tfile = file->private_data;
44547 struct tun_struct *tun;
44548@@ -1847,6 +1847,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
44549 unsigned int ifindex;
44550 int ret;
44551
44552+ if (ifreq_len > sizeof ifr)
44553+ return -EFAULT;
44554+
44555 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
44556 if (copy_from_user(&ifr, argp, ifreq_len))
44557 return -EFAULT;
44558diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
44559index 86292e6..8d34433 100644
44560--- a/drivers/net/usb/hso.c
44561+++ b/drivers/net/usb/hso.c
44562@@ -71,7 +71,7 @@
44563 #include <asm/byteorder.h>
44564 #include <linux/serial_core.h>
44565 #include <linux/serial.h>
44566-
44567+#include <asm/local.h>
44568
44569 #define MOD_AUTHOR "Option Wireless"
44570 #define MOD_DESCRIPTION "USB High Speed Option driver"
44571@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
44572 struct urb *urb;
44573
44574 urb = serial->rx_urb[0];
44575- if (serial->port.count > 0) {
44576+ if (atomic_read(&serial->port.count) > 0) {
44577 count = put_rxbuf_data(urb, serial);
44578 if (count == -1)
44579 return;
44580@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
44581 DUMP1(urb->transfer_buffer, urb->actual_length);
44582
44583 /* Anyone listening? */
44584- if (serial->port.count == 0)
44585+ if (atomic_read(&serial->port.count) == 0)
44586 return;
44587
44588 if (status == 0) {
44589@@ -1298,8 +1298,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
44590 tty_port_tty_set(&serial->port, tty);
44591
44592 /* check for port already opened, if not set the termios */
44593- serial->port.count++;
44594- if (serial->port.count == 1) {
44595+ if (atomic_inc_return(&serial->port.count) == 1) {
44596 serial->rx_state = RX_IDLE;
44597 /* Force default termio settings */
44598 _hso_serial_set_termios(tty, NULL);
44599@@ -1311,7 +1310,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
44600 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
44601 if (result) {
44602 hso_stop_serial_device(serial->parent);
44603- serial->port.count--;
44604+ atomic_dec(&serial->port.count);
44605 kref_put(&serial->parent->ref, hso_serial_ref_free);
44606 }
44607 } else {
44608@@ -1348,10 +1347,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
44609
44610 /* reset the rts and dtr */
44611 /* do the actual close */
44612- serial->port.count--;
44613+ atomic_dec(&serial->port.count);
44614
44615- if (serial->port.count <= 0) {
44616- serial->port.count = 0;
44617+ if (atomic_read(&serial->port.count) <= 0) {
44618+ atomic_set(&serial->port.count, 0);
44619 tty_port_tty_set(&serial->port, NULL);
44620 if (!usb_gone)
44621 hso_stop_serial_device(serial->parent);
44622@@ -1427,7 +1426,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
44623
44624 /* the actual setup */
44625 spin_lock_irqsave(&serial->serial_lock, flags);
44626- if (serial->port.count)
44627+ if (atomic_read(&serial->port.count))
44628 _hso_serial_set_termios(tty, old);
44629 else
44630 tty->termios = *old;
44631@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
44632 D1("Pending read interrupt on port %d\n", i);
44633 spin_lock(&serial->serial_lock);
44634 if (serial->rx_state == RX_IDLE &&
44635- serial->port.count > 0) {
44636+ atomic_read(&serial->port.count) > 0) {
44637 /* Setup and send a ctrl req read on
44638 * port i */
44639 if (!serial->rx_urb_filled[0]) {
44640@@ -3062,7 +3061,7 @@ static int hso_resume(struct usb_interface *iface)
44641 /* Start all serial ports */
44642 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
44643 if (serial_table[i] && (serial_table[i]->interface == iface)) {
44644- if (dev2ser(serial_table[i])->port.count) {
44645+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
44646 result =
44647 hso_start_serial_device(serial_table[i], GFP_NOIO);
44648 hso_kick_transmit(dev2ser(serial_table[i]));
44649diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
44650index a79e9d3..78cd4fa 100644
44651--- a/drivers/net/usb/sierra_net.c
44652+++ b/drivers/net/usb/sierra_net.c
44653@@ -52,7 +52,7 @@ static const char driver_name[] = "sierra_net";
44654 /* atomic counter partially included in MAC address to make sure 2 devices
44655 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
44656 */
44657-static atomic_t iface_counter = ATOMIC_INIT(0);
44658+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
44659
44660 /*
44661 * SYNC Timer Delay definition used to set the expiry time
44662@@ -698,7 +698,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
44663 dev->net->netdev_ops = &sierra_net_device_ops;
44664
44665 /* change MAC addr to include, ifacenum, and to be unique */
44666- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
44667+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
44668 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
44669
44670 /* we will have to manufacture ethernet headers, prepare template */
44671diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
44672index 2ef5b62..6fa0ec3 100644
44673--- a/drivers/net/vxlan.c
44674+++ b/drivers/net/vxlan.c
44675@@ -2615,7 +2615,7 @@ nla_put_failure:
44676 return -EMSGSIZE;
44677 }
44678
44679-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
44680+static struct rtnl_link_ops vxlan_link_ops = {
44681 .kind = "vxlan",
44682 .maxtype = IFLA_VXLAN_MAX,
44683 .policy = vxlan_policy,
44684diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
44685index 0b60295..b8bfa5b 100644
44686--- a/drivers/net/wimax/i2400m/rx.c
44687+++ b/drivers/net/wimax/i2400m/rx.c
44688@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
44689 if (i2400m->rx_roq == NULL)
44690 goto error_roq_alloc;
44691
44692- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
44693+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
44694 GFP_KERNEL);
44695 if (rd == NULL) {
44696 result = -ENOMEM;
44697diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
44698index 7fe1964..7016de0 100644
44699--- a/drivers/net/wireless/airo.c
44700+++ b/drivers/net/wireless/airo.c
44701@@ -7844,7 +7844,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
44702 struct airo_info *ai = dev->ml_priv;
44703 int ridcode;
44704 int enabled;
44705- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
44706+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
44707 unsigned char *iobuf;
44708
44709 /* Only super-user can write RIDs */
44710diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
44711index 34c8a33..3261fdc 100644
44712--- a/drivers/net/wireless/at76c50x-usb.c
44713+++ b/drivers/net/wireless/at76c50x-usb.c
44714@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
44715 }
44716
44717 /* Convert timeout from the DFU status to jiffies */
44718-static inline unsigned long at76_get_timeout(struct dfu_status *s)
44719+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
44720 {
44721 return msecs_to_jiffies((s->poll_timeout[2] << 16)
44722 | (s->poll_timeout[1] << 8)
44723diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
44724index ef3329e..c28ff5d 100644
44725--- a/drivers/net/wireless/ath/ath10k/htc.c
44726+++ b/drivers/net/wireless/ath/ath10k/htc.c
44727@@ -963,7 +963,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
44728 /* registered target arrival callback from the HIF layer */
44729 int ath10k_htc_init(struct ath10k *ar)
44730 {
44731- struct ath10k_hif_cb htc_callbacks;
44732+ static struct ath10k_hif_cb htc_callbacks = {
44733+ .rx_completion = ath10k_htc_rx_completion_handler,
44734+ .tx_completion = ath10k_htc_tx_completion_handler,
44735+ };
44736 struct ath10k_htc_ep *ep = NULL;
44737 struct ath10k_htc *htc = &ar->htc;
44738
44739@@ -973,8 +976,6 @@ int ath10k_htc_init(struct ath10k *ar)
44740 ath10k_htc_reset_endpoint_states(htc);
44741
44742 /* setup HIF layer callbacks */
44743- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
44744- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
44745 htc->ar = ar;
44746
44747 /* Get HIF default pipe for HTC message exchange */
44748diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
44749index e1dd8c7..9f91b3f 100644
44750--- a/drivers/net/wireless/ath/ath10k/htc.h
44751+++ b/drivers/net/wireless/ath/ath10k/htc.h
44752@@ -271,12 +271,12 @@ enum ath10k_htc_ep_id {
44753
44754 struct ath10k_htc_ops {
44755 void (*target_send_suspend_complete)(struct ath10k *ar);
44756-};
44757+} __no_const;
44758
44759 struct ath10k_htc_ep_ops {
44760 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
44761 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
44762-};
44763+} __no_const;
44764
44765 /* service connection information */
44766 struct ath10k_htc_svc_conn_req {
44767diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44768index a366d6b..b6f28f8 100644
44769--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44770+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44771@@ -218,8 +218,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44772 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
44773 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
44774
44775- ACCESS_ONCE(ads->ds_link) = i->link;
44776- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
44777+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
44778+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
44779
44780 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
44781 ctl6 = SM(i->keytype, AR_EncrType);
44782@@ -233,26 +233,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44783
44784 if ((i->is_first || i->is_last) &&
44785 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
44786- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
44787+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
44788 | set11nTries(i->rates, 1)
44789 | set11nTries(i->rates, 2)
44790 | set11nTries(i->rates, 3)
44791 | (i->dur_update ? AR_DurUpdateEna : 0)
44792 | SM(0, AR_BurstDur);
44793
44794- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
44795+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
44796 | set11nRate(i->rates, 1)
44797 | set11nRate(i->rates, 2)
44798 | set11nRate(i->rates, 3);
44799 } else {
44800- ACCESS_ONCE(ads->ds_ctl2) = 0;
44801- ACCESS_ONCE(ads->ds_ctl3) = 0;
44802+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
44803+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
44804 }
44805
44806 if (!i->is_first) {
44807- ACCESS_ONCE(ads->ds_ctl0) = 0;
44808- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
44809- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
44810+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
44811+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
44812+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
44813 return;
44814 }
44815
44816@@ -277,7 +277,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44817 break;
44818 }
44819
44820- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
44821+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
44822 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
44823 | SM(i->txpower, AR_XmitPower)
44824 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
44825@@ -287,19 +287,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44826 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
44827 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
44828
44829- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
44830- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
44831+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
44832+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
44833
44834 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
44835 return;
44836
44837- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
44838+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
44839 | set11nPktDurRTSCTS(i->rates, 1);
44840
44841- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
44842+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
44843 | set11nPktDurRTSCTS(i->rates, 3);
44844
44845- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
44846+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
44847 | set11nRateFlags(i->rates, 1)
44848 | set11nRateFlags(i->rates, 2)
44849 | set11nRateFlags(i->rates, 3)
44850diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44851index f6c5c1b..6058354 100644
44852--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44853+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44854@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44855 (i->qcu << AR_TxQcuNum_S) | desc_len;
44856
44857 checksum += val;
44858- ACCESS_ONCE(ads->info) = val;
44859+ ACCESS_ONCE_RW(ads->info) = val;
44860
44861 checksum += i->link;
44862- ACCESS_ONCE(ads->link) = i->link;
44863+ ACCESS_ONCE_RW(ads->link) = i->link;
44864
44865 checksum += i->buf_addr[0];
44866- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
44867+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
44868 checksum += i->buf_addr[1];
44869- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
44870+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
44871 checksum += i->buf_addr[2];
44872- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
44873+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
44874 checksum += i->buf_addr[3];
44875- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
44876+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
44877
44878 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
44879- ACCESS_ONCE(ads->ctl3) = val;
44880+ ACCESS_ONCE_RW(ads->ctl3) = val;
44881 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
44882- ACCESS_ONCE(ads->ctl5) = val;
44883+ ACCESS_ONCE_RW(ads->ctl5) = val;
44884 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
44885- ACCESS_ONCE(ads->ctl7) = val;
44886+ ACCESS_ONCE_RW(ads->ctl7) = val;
44887 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
44888- ACCESS_ONCE(ads->ctl9) = val;
44889+ ACCESS_ONCE_RW(ads->ctl9) = val;
44890
44891 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
44892- ACCESS_ONCE(ads->ctl10) = checksum;
44893+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
44894
44895 if (i->is_first || i->is_last) {
44896- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
44897+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
44898 | set11nTries(i->rates, 1)
44899 | set11nTries(i->rates, 2)
44900 | set11nTries(i->rates, 3)
44901 | (i->dur_update ? AR_DurUpdateEna : 0)
44902 | SM(0, AR_BurstDur);
44903
44904- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
44905+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
44906 | set11nRate(i->rates, 1)
44907 | set11nRate(i->rates, 2)
44908 | set11nRate(i->rates, 3);
44909 } else {
44910- ACCESS_ONCE(ads->ctl13) = 0;
44911- ACCESS_ONCE(ads->ctl14) = 0;
44912+ ACCESS_ONCE_RW(ads->ctl13) = 0;
44913+ ACCESS_ONCE_RW(ads->ctl14) = 0;
44914 }
44915
44916 ads->ctl20 = 0;
44917@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44918
44919 ctl17 = SM(i->keytype, AR_EncrType);
44920 if (!i->is_first) {
44921- ACCESS_ONCE(ads->ctl11) = 0;
44922- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
44923- ACCESS_ONCE(ads->ctl15) = 0;
44924- ACCESS_ONCE(ads->ctl16) = 0;
44925- ACCESS_ONCE(ads->ctl17) = ctl17;
44926- ACCESS_ONCE(ads->ctl18) = 0;
44927- ACCESS_ONCE(ads->ctl19) = 0;
44928+ ACCESS_ONCE_RW(ads->ctl11) = 0;
44929+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
44930+ ACCESS_ONCE_RW(ads->ctl15) = 0;
44931+ ACCESS_ONCE_RW(ads->ctl16) = 0;
44932+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
44933+ ACCESS_ONCE_RW(ads->ctl18) = 0;
44934+ ACCESS_ONCE_RW(ads->ctl19) = 0;
44935 return;
44936 }
44937
44938- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
44939+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
44940 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
44941 | SM(i->txpower, AR_XmitPower)
44942 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
44943@@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44944 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
44945 ctl12 |= SM(val, AR_PAPRDChainMask);
44946
44947- ACCESS_ONCE(ads->ctl12) = ctl12;
44948- ACCESS_ONCE(ads->ctl17) = ctl17;
44949+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
44950+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
44951
44952- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
44953+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
44954 | set11nPktDurRTSCTS(i->rates, 1);
44955
44956- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
44957+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
44958 | set11nPktDurRTSCTS(i->rates, 3);
44959
44960- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
44961+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
44962 | set11nRateFlags(i->rates, 1)
44963 | set11nRateFlags(i->rates, 2)
44964 | set11nRateFlags(i->rates, 3)
44965 | SM(i->rtscts_rate, AR_RTSCTSRate);
44966
44967- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
44968+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
44969 }
44970
44971 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
44972diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
44973index 69a907b..91e071c 100644
44974--- a/drivers/net/wireless/ath/ath9k/hw.h
44975+++ b/drivers/net/wireless/ath/ath9k/hw.h
44976@@ -657,7 +657,7 @@ struct ath_hw_private_ops {
44977
44978 /* ANI */
44979 void (*ani_cache_ini_regs)(struct ath_hw *ah);
44980-};
44981+} __no_const;
44982
44983 /**
44984 * struct ath_spec_scan - parameters for Atheros spectral scan
44985@@ -729,7 +729,7 @@ struct ath_hw_ops {
44986 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
44987 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
44988 #endif
44989-};
44990+} __no_const;
44991
44992 struct ath_nf_limits {
44993 s16 max;
44994diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
44995index 92190da..f3a4c4c 100644
44996--- a/drivers/net/wireless/b43/phy_lp.c
44997+++ b/drivers/net/wireless/b43/phy_lp.c
44998@@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
44999 {
45000 struct ssb_bus *bus = dev->dev->sdev->bus;
45001
45002- static const struct b206x_channel *chandata = NULL;
45003+ const struct b206x_channel *chandata = NULL;
45004 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
45005 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
45006 u16 old_comm15, scale;
45007diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
45008index 9581d07..84f6a76 100644
45009--- a/drivers/net/wireless/iwlegacy/3945-mac.c
45010+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
45011@@ -3639,7 +3639,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
45012 */
45013 if (il3945_mod_params.disable_hw_scan) {
45014 D_INFO("Disabling hw_scan\n");
45015- il3945_mac_ops.hw_scan = NULL;
45016+ pax_open_kernel();
45017+ *(void **)&il3945_mac_ops.hw_scan = NULL;
45018+ pax_close_kernel();
45019 }
45020
45021 D_INFO("*** LOAD DRIVER ***\n");
45022diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
45023index d94f8ab..5b568c8 100644
45024--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
45025+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
45026@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
45027 {
45028 struct iwl_priv *priv = file->private_data;
45029 char buf[64];
45030- int buf_size;
45031+ size_t buf_size;
45032 u32 offset, len;
45033
45034 memset(buf, 0, sizeof(buf));
45035@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
45036 struct iwl_priv *priv = file->private_data;
45037
45038 char buf[8];
45039- int buf_size;
45040+ size_t buf_size;
45041 u32 reset_flag;
45042
45043 memset(buf, 0, sizeof(buf));
45044@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
45045 {
45046 struct iwl_priv *priv = file->private_data;
45047 char buf[8];
45048- int buf_size;
45049+ size_t buf_size;
45050 int ht40;
45051
45052 memset(buf, 0, sizeof(buf));
45053@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
45054 {
45055 struct iwl_priv *priv = file->private_data;
45056 char buf[8];
45057- int buf_size;
45058+ size_t buf_size;
45059 int value;
45060
45061 memset(buf, 0, sizeof(buf));
45062@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
45063 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
45064 DEBUGFS_READ_FILE_OPS(current_sleep_command);
45065
45066-static const char *fmt_value = " %-30s %10u\n";
45067-static const char *fmt_hex = " %-30s 0x%02X\n";
45068-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
45069-static const char *fmt_header =
45070+static const char fmt_value[] = " %-30s %10u\n";
45071+static const char fmt_hex[] = " %-30s 0x%02X\n";
45072+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
45073+static const char fmt_header[] =
45074 "%-32s current cumulative delta max\n";
45075
45076 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
45077@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
45078 {
45079 struct iwl_priv *priv = file->private_data;
45080 char buf[8];
45081- int buf_size;
45082+ size_t buf_size;
45083 int clear;
45084
45085 memset(buf, 0, sizeof(buf));
45086@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
45087 {
45088 struct iwl_priv *priv = file->private_data;
45089 char buf[8];
45090- int buf_size;
45091+ size_t buf_size;
45092 int trace;
45093
45094 memset(buf, 0, sizeof(buf));
45095@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
45096 {
45097 struct iwl_priv *priv = file->private_data;
45098 char buf[8];
45099- int buf_size;
45100+ size_t buf_size;
45101 int missed;
45102
45103 memset(buf, 0, sizeof(buf));
45104@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
45105
45106 struct iwl_priv *priv = file->private_data;
45107 char buf[8];
45108- int buf_size;
45109+ size_t buf_size;
45110 int plcp;
45111
45112 memset(buf, 0, sizeof(buf));
45113@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
45114
45115 struct iwl_priv *priv = file->private_data;
45116 char buf[8];
45117- int buf_size;
45118+ size_t buf_size;
45119 int flush;
45120
45121 memset(buf, 0, sizeof(buf));
45122@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
45123
45124 struct iwl_priv *priv = file->private_data;
45125 char buf[8];
45126- int buf_size;
45127+ size_t buf_size;
45128 int rts;
45129
45130 if (!priv->cfg->ht_params)
45131@@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
45132 {
45133 struct iwl_priv *priv = file->private_data;
45134 char buf[8];
45135- int buf_size;
45136+ size_t buf_size;
45137
45138 memset(buf, 0, sizeof(buf));
45139 buf_size = min(count, sizeof(buf) - 1);
45140@@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
45141 struct iwl_priv *priv = file->private_data;
45142 u32 event_log_flag;
45143 char buf[8];
45144- int buf_size;
45145+ size_t buf_size;
45146
45147 /* check that the interface is up */
45148 if (!iwl_is_ready(priv))
45149@@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
45150 struct iwl_priv *priv = file->private_data;
45151 char buf[8];
45152 u32 calib_disabled;
45153- int buf_size;
45154+ size_t buf_size;
45155
45156 memset(buf, 0, sizeof(buf));
45157 buf_size = min(count, sizeof(buf) - 1);
45158diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
45159index 7aad766..06addb4 100644
45160--- a/drivers/net/wireless/iwlwifi/dvm/main.c
45161+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
45162@@ -1123,7 +1123,7 @@ static void iwl_option_config(struct iwl_priv *priv)
45163 static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
45164 {
45165 struct iwl_nvm_data *data = priv->nvm_data;
45166- char *debug_msg;
45167+ static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
45168
45169 if (data->sku_cap_11n_enable &&
45170 !priv->cfg->ht_params) {
45171@@ -1137,7 +1137,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
45172 return -EINVAL;
45173 }
45174
45175- debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
45176 IWL_DEBUG_INFO(priv, debug_msg,
45177 data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
45178 data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
45179diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
45180index 6bc3100..dd1b80d 100644
45181--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
45182+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
45183@@ -1249,7 +1249,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
45184 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
45185
45186 char buf[8];
45187- int buf_size;
45188+ size_t buf_size;
45189 u32 reset_flag;
45190
45191 memset(buf, 0, sizeof(buf));
45192@@ -1270,7 +1270,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
45193 {
45194 struct iwl_trans *trans = file->private_data;
45195 char buf[8];
45196- int buf_size;
45197+ size_t buf_size;
45198 int csr;
45199
45200 memset(buf, 0, sizeof(buf));
45201diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
45202index 2cd3f54..e936f90 100644
45203--- a/drivers/net/wireless/mac80211_hwsim.c
45204+++ b/drivers/net/wireless/mac80211_hwsim.c
45205@@ -2196,25 +2196,19 @@ static int __init init_mac80211_hwsim(void)
45206
45207 if (channels > 1) {
45208 hwsim_if_comb.num_different_channels = channels;
45209- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
45210- mac80211_hwsim_ops.cancel_hw_scan =
45211- mac80211_hwsim_cancel_hw_scan;
45212- mac80211_hwsim_ops.sw_scan_start = NULL;
45213- mac80211_hwsim_ops.sw_scan_complete = NULL;
45214- mac80211_hwsim_ops.remain_on_channel =
45215- mac80211_hwsim_roc;
45216- mac80211_hwsim_ops.cancel_remain_on_channel =
45217- mac80211_hwsim_croc;
45218- mac80211_hwsim_ops.add_chanctx =
45219- mac80211_hwsim_add_chanctx;
45220- mac80211_hwsim_ops.remove_chanctx =
45221- mac80211_hwsim_remove_chanctx;
45222- mac80211_hwsim_ops.change_chanctx =
45223- mac80211_hwsim_change_chanctx;
45224- mac80211_hwsim_ops.assign_vif_chanctx =
45225- mac80211_hwsim_assign_vif_chanctx;
45226- mac80211_hwsim_ops.unassign_vif_chanctx =
45227- mac80211_hwsim_unassign_vif_chanctx;
45228+ pax_open_kernel();
45229+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
45230+ *(void **)&mac80211_hwsim_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
45231+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
45232+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
45233+ *(void **)&mac80211_hwsim_ops.remain_on_channel = mac80211_hwsim_roc;
45234+ *(void **)&mac80211_hwsim_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
45235+ *(void **)&mac80211_hwsim_ops.add_chanctx = mac80211_hwsim_add_chanctx;
45236+ *(void **)&mac80211_hwsim_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
45237+ *(void **)&mac80211_hwsim_ops.change_chanctx = mac80211_hwsim_change_chanctx;
45238+ *(void **)&mac80211_hwsim_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
45239+ *(void **)&mac80211_hwsim_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
45240+ pax_close_kernel();
45241 }
45242
45243 spin_lock_init(&hwsim_radio_lock);
45244diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
45245index 8169a85..7fa3b47 100644
45246--- a/drivers/net/wireless/rndis_wlan.c
45247+++ b/drivers/net/wireless/rndis_wlan.c
45248@@ -1238,7 +1238,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
45249
45250 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
45251
45252- if (rts_threshold < 0 || rts_threshold > 2347)
45253+ if (rts_threshold > 2347)
45254 rts_threshold = 2347;
45255
45256 tmp = cpu_to_le32(rts_threshold);
45257diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
45258index fe4c572..99dedfa 100644
45259--- a/drivers/net/wireless/rt2x00/rt2x00.h
45260+++ b/drivers/net/wireless/rt2x00/rt2x00.h
45261@@ -387,7 +387,7 @@ struct rt2x00_intf {
45262 * for hardware which doesn't support hardware
45263 * sequence counting.
45264 */
45265- atomic_t seqno;
45266+ atomic_unchecked_t seqno;
45267 };
45268
45269 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
45270diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
45271index 66a2db8..70cad04 100644
45272--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
45273+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
45274@@ -252,9 +252,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
45275 * sequence counter given by mac80211.
45276 */
45277 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
45278- seqno = atomic_add_return(0x10, &intf->seqno);
45279+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
45280 else
45281- seqno = atomic_read(&intf->seqno);
45282+ seqno = atomic_read_unchecked(&intf->seqno);
45283
45284 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
45285 hdr->seq_ctrl |= cpu_to_le16(seqno);
45286diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
45287index e2b3d9c..67a5184 100644
45288--- a/drivers/net/wireless/ti/wl1251/sdio.c
45289+++ b/drivers/net/wireless/ti/wl1251/sdio.c
45290@@ -271,13 +271,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
45291
45292 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
45293
45294- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
45295- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
45296+ pax_open_kernel();
45297+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
45298+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
45299+ pax_close_kernel();
45300
45301 wl1251_info("using dedicated interrupt line");
45302 } else {
45303- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
45304- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
45305+ pax_open_kernel();
45306+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
45307+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
45308+ pax_close_kernel();
45309
45310 wl1251_info("using SDIO interrupt");
45311 }
45312diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
45313index 1c627da..69f7d17 100644
45314--- a/drivers/net/wireless/ti/wl12xx/main.c
45315+++ b/drivers/net/wireless/ti/wl12xx/main.c
45316@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
45317 sizeof(wl->conf.mem));
45318
45319 /* read data preparation is only needed by wl127x */
45320- wl->ops->prepare_read = wl127x_prepare_read;
45321+ pax_open_kernel();
45322+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
45323+ pax_close_kernel();
45324
45325 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
45326 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
45327@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
45328 sizeof(wl->conf.mem));
45329
45330 /* read data preparation is only needed by wl127x */
45331- wl->ops->prepare_read = wl127x_prepare_read;
45332+ pax_open_kernel();
45333+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
45334+ pax_close_kernel();
45335
45336 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
45337 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
45338diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
45339index 7aa0eb8..5a9ef38 100644
45340--- a/drivers/net/wireless/ti/wl18xx/main.c
45341+++ b/drivers/net/wireless/ti/wl18xx/main.c
45342@@ -1730,8 +1730,10 @@ static int wl18xx_setup(struct wl1271 *wl)
45343 }
45344
45345 if (!checksum_param) {
45346- wl18xx_ops.set_rx_csum = NULL;
45347- wl18xx_ops.init_vif = NULL;
45348+ pax_open_kernel();
45349+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
45350+ *(void **)&wl18xx_ops.init_vif = NULL;
45351+ pax_close_kernel();
45352 }
45353
45354 /* Enable 11a Band only if we have 5G antennas */
45355diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
45356index 7ef0b4a..ff65c28 100644
45357--- a/drivers/net/wireless/zd1211rw/zd_usb.c
45358+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
45359@@ -386,7 +386,7 @@ static inline void handle_regs_int(struct urb *urb)
45360 {
45361 struct zd_usb *usb = urb->context;
45362 struct zd_usb_interrupt *intr = &usb->intr;
45363- int len;
45364+ unsigned int len;
45365 u16 int_num;
45366
45367 ZD_ASSERT(in_interrupt());
45368diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
45369index 59f95d8..53e0e7f 100644
45370--- a/drivers/nfc/nfcwilink.c
45371+++ b/drivers/nfc/nfcwilink.c
45372@@ -513,7 +513,7 @@ static struct nci_ops nfcwilink_ops = {
45373
45374 static int nfcwilink_probe(struct platform_device *pdev)
45375 {
45376- static struct nfcwilink *drv;
45377+ struct nfcwilink *drv;
45378 int rc;
45379 __u32 protocols;
45380
45381diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
45382index d93b2b6..ae50401 100644
45383--- a/drivers/oprofile/buffer_sync.c
45384+++ b/drivers/oprofile/buffer_sync.c
45385@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
45386 if (cookie == NO_COOKIE)
45387 offset = pc;
45388 if (cookie == INVALID_COOKIE) {
45389- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
45390+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
45391 offset = pc;
45392 }
45393 if (cookie != last_cookie) {
45394@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
45395 /* add userspace sample */
45396
45397 if (!mm) {
45398- atomic_inc(&oprofile_stats.sample_lost_no_mm);
45399+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
45400 return 0;
45401 }
45402
45403 cookie = lookup_dcookie(mm, s->eip, &offset);
45404
45405 if (cookie == INVALID_COOKIE) {
45406- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
45407+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
45408 return 0;
45409 }
45410
45411@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
45412 /* ignore backtraces if failed to add a sample */
45413 if (state == sb_bt_start) {
45414 state = sb_bt_ignore;
45415- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
45416+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
45417 }
45418 }
45419 release_mm(mm);
45420diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
45421index c0cc4e7..44d4e54 100644
45422--- a/drivers/oprofile/event_buffer.c
45423+++ b/drivers/oprofile/event_buffer.c
45424@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
45425 }
45426
45427 if (buffer_pos == buffer_size) {
45428- atomic_inc(&oprofile_stats.event_lost_overflow);
45429+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
45430 return;
45431 }
45432
45433diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
45434index ed2c3ec..deda85a 100644
45435--- a/drivers/oprofile/oprof.c
45436+++ b/drivers/oprofile/oprof.c
45437@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
45438 if (oprofile_ops.switch_events())
45439 return;
45440
45441- atomic_inc(&oprofile_stats.multiplex_counter);
45442+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
45443 start_switch_worker();
45444 }
45445
45446diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
45447index ee2cfce..7f8f699 100644
45448--- a/drivers/oprofile/oprofile_files.c
45449+++ b/drivers/oprofile/oprofile_files.c
45450@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
45451
45452 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
45453
45454-static ssize_t timeout_read(struct file *file, char __user *buf,
45455+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
45456 size_t count, loff_t *offset)
45457 {
45458 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
45459diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
45460index 59659ce..6c860a0 100644
45461--- a/drivers/oprofile/oprofile_stats.c
45462+++ b/drivers/oprofile/oprofile_stats.c
45463@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
45464 cpu_buf->sample_invalid_eip = 0;
45465 }
45466
45467- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
45468- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
45469- atomic_set(&oprofile_stats.event_lost_overflow, 0);
45470- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
45471- atomic_set(&oprofile_stats.multiplex_counter, 0);
45472+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
45473+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
45474+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
45475+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
45476+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
45477 }
45478
45479
45480diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
45481index 1fc622b..8c48fc3 100644
45482--- a/drivers/oprofile/oprofile_stats.h
45483+++ b/drivers/oprofile/oprofile_stats.h
45484@@ -13,11 +13,11 @@
45485 #include <linux/atomic.h>
45486
45487 struct oprofile_stat_struct {
45488- atomic_t sample_lost_no_mm;
45489- atomic_t sample_lost_no_mapping;
45490- atomic_t bt_lost_no_mapping;
45491- atomic_t event_lost_overflow;
45492- atomic_t multiplex_counter;
45493+ atomic_unchecked_t sample_lost_no_mm;
45494+ atomic_unchecked_t sample_lost_no_mapping;
45495+ atomic_unchecked_t bt_lost_no_mapping;
45496+ atomic_unchecked_t event_lost_overflow;
45497+ atomic_unchecked_t multiplex_counter;
45498 };
45499
45500 extern struct oprofile_stat_struct oprofile_stats;
45501diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
45502index 3f49345..c750d0b 100644
45503--- a/drivers/oprofile/oprofilefs.c
45504+++ b/drivers/oprofile/oprofilefs.c
45505@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
45506
45507 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
45508 {
45509- atomic_t *val = file->private_data;
45510- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
45511+ atomic_unchecked_t *val = file->private_data;
45512+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
45513 }
45514
45515
45516@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
45517
45518
45519 int oprofilefs_create_ro_atomic(struct dentry *root,
45520- char const *name, atomic_t *val)
45521+ char const *name, atomic_unchecked_t *val)
45522 {
45523 return __oprofilefs_create_file(root, name,
45524 &atomic_ro_fops, 0444, val);
45525diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
45526index 61be1d9..dec05d7 100644
45527--- a/drivers/oprofile/timer_int.c
45528+++ b/drivers/oprofile/timer_int.c
45529@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
45530 return NOTIFY_OK;
45531 }
45532
45533-static struct notifier_block __refdata oprofile_cpu_notifier = {
45534+static struct notifier_block oprofile_cpu_notifier = {
45535 .notifier_call = oprofile_cpu_notify,
45536 };
45537
45538diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
45539index 92ed045..62d39bd7 100644
45540--- a/drivers/parport/procfs.c
45541+++ b/drivers/parport/procfs.c
45542@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
45543
45544 *ppos += len;
45545
45546- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
45547+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
45548 }
45549
45550 #ifdef CONFIG_PARPORT_1284
45551@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
45552
45553 *ppos += len;
45554
45555- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
45556+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
45557 }
45558 #endif /* IEEE1284.3 support. */
45559
45560diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
45561index 2f5786c..61ab4d1 100644
45562--- a/drivers/pci/hotplug/acpiphp_ibm.c
45563+++ b/drivers/pci/hotplug/acpiphp_ibm.c
45564@@ -463,7 +463,9 @@ static int __init ibm_acpiphp_init(void)
45565 goto init_cleanup;
45566 }
45567
45568- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
45569+ pax_open_kernel();
45570+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
45571+ pax_close_kernel();
45572 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
45573
45574 return retval;
45575diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
45576index a6a71c4..c91097b 100644
45577--- a/drivers/pci/hotplug/cpcihp_generic.c
45578+++ b/drivers/pci/hotplug/cpcihp_generic.c
45579@@ -73,7 +73,6 @@ static u16 port;
45580 static unsigned int enum_bit;
45581 static u8 enum_mask;
45582
45583-static struct cpci_hp_controller_ops generic_hpc_ops;
45584 static struct cpci_hp_controller generic_hpc;
45585
45586 static int __init validate_parameters(void)
45587@@ -139,6 +138,10 @@ static int query_enum(void)
45588 return ((value & enum_mask) == enum_mask);
45589 }
45590
45591+static struct cpci_hp_controller_ops generic_hpc_ops = {
45592+ .query_enum = query_enum,
45593+};
45594+
45595 static int __init cpcihp_generic_init(void)
45596 {
45597 int status;
45598@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
45599 pci_dev_put(dev);
45600
45601 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
45602- generic_hpc_ops.query_enum = query_enum;
45603 generic_hpc.ops = &generic_hpc_ops;
45604
45605 status = cpci_hp_register_controller(&generic_hpc);
45606diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
45607index 449b4bb..257e2e8 100644
45608--- a/drivers/pci/hotplug/cpcihp_zt5550.c
45609+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
45610@@ -59,7 +59,6 @@
45611 /* local variables */
45612 static bool debug;
45613 static bool poll;
45614-static struct cpci_hp_controller_ops zt5550_hpc_ops;
45615 static struct cpci_hp_controller zt5550_hpc;
45616
45617 /* Primary cPCI bus bridge device */
45618@@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
45619 return 0;
45620 }
45621
45622+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
45623+ .query_enum = zt5550_hc_query_enum,
45624+};
45625+
45626 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
45627 {
45628 int status;
45629@@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
45630 dbg("returned from zt5550_hc_config");
45631
45632 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
45633- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
45634 zt5550_hpc.ops = &zt5550_hpc_ops;
45635 if(!poll) {
45636 zt5550_hpc.irq = hc_dev->irq;
45637 zt5550_hpc.irq_flags = IRQF_SHARED;
45638 zt5550_hpc.dev_id = hc_dev;
45639
45640- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
45641- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
45642- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
45643+ pax_open_kernel();
45644+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
45645+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
45646+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
45647+ pax_open_kernel();
45648 } else {
45649 info("using ENUM# polling mode");
45650 }
45651diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
45652index 76ba8a1..20ca857 100644
45653--- a/drivers/pci/hotplug/cpqphp_nvram.c
45654+++ b/drivers/pci/hotplug/cpqphp_nvram.c
45655@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
45656
45657 void compaq_nvram_init (void __iomem *rom_start)
45658 {
45659+
45660+#ifndef CONFIG_PAX_KERNEXEC
45661 if (rom_start) {
45662 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
45663 }
45664+#endif
45665+
45666 dbg("int15 entry = %p\n", compaq_int15_entry_point);
45667
45668 /* initialize our int15 lock */
45669diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
45670index ec20f74..c1d961e 100644
45671--- a/drivers/pci/hotplug/pci_hotplug_core.c
45672+++ b/drivers/pci/hotplug/pci_hotplug_core.c
45673@@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
45674 return -EINVAL;
45675 }
45676
45677- slot->ops->owner = owner;
45678- slot->ops->mod_name = mod_name;
45679+ pax_open_kernel();
45680+ *(struct module **)&slot->ops->owner = owner;
45681+ *(const char **)&slot->ops->mod_name = mod_name;
45682+ pax_close_kernel();
45683
45684 mutex_lock(&pci_hp_mutex);
45685 /*
45686diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
45687index f4a18f5..ff2463c 100644
45688--- a/drivers/pci/hotplug/pciehp_core.c
45689+++ b/drivers/pci/hotplug/pciehp_core.c
45690@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
45691 struct slot *slot = ctrl->slot;
45692 struct hotplug_slot *hotplug = NULL;
45693 struct hotplug_slot_info *info = NULL;
45694- struct hotplug_slot_ops *ops = NULL;
45695+ hotplug_slot_ops_no_const *ops = NULL;
45696 char name[SLOT_NAME_SIZE];
45697 int retval = -ENOMEM;
45698
45699diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
45700index 7128cfd..a0640d6 100644
45701--- a/drivers/pci/pci-sysfs.c
45702+++ b/drivers/pci/pci-sysfs.c
45703@@ -1083,7 +1083,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
45704 {
45705 /* allocate attribute structure, piggyback attribute name */
45706 int name_len = write_combine ? 13 : 10;
45707- struct bin_attribute *res_attr;
45708+ bin_attribute_no_const *res_attr;
45709 int retval;
45710
45711 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
45712@@ -1268,7 +1268,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
45713 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
45714 {
45715 int retval;
45716- struct bin_attribute *attr;
45717+ bin_attribute_no_const *attr;
45718
45719 /* If the device has VPD, try to expose it in sysfs. */
45720 if (dev->vpd) {
45721@@ -1315,7 +1315,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
45722 {
45723 int retval;
45724 int rom_size = 0;
45725- struct bin_attribute *attr;
45726+ bin_attribute_no_const *attr;
45727
45728 if (!sysfs_initialized)
45729 return -EACCES;
45730diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
45731index 8a00c06..18a9715 100644
45732--- a/drivers/pci/pci.h
45733+++ b/drivers/pci/pci.h
45734@@ -95,7 +95,7 @@ struct pci_vpd_ops {
45735 struct pci_vpd {
45736 unsigned int len;
45737 const struct pci_vpd_ops *ops;
45738- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
45739+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
45740 };
45741
45742 int pci_vpd_pci22_init(struct pci_dev *dev);
45743diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
45744index 403a443..034e050 100644
45745--- a/drivers/pci/pcie/aspm.c
45746+++ b/drivers/pci/pcie/aspm.c
45747@@ -27,9 +27,9 @@
45748 #define MODULE_PARAM_PREFIX "pcie_aspm."
45749
45750 /* Note: those are not register definitions */
45751-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
45752-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
45753-#define ASPM_STATE_L1 (4) /* L1 state */
45754+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
45755+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
45756+#define ASPM_STATE_L1 (4U) /* L1 state */
45757 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
45758 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
45759
45760diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
45761index 7ef0f86..17b710f 100644
45762--- a/drivers/pci/probe.c
45763+++ b/drivers/pci/probe.c
45764@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
45765 struct pci_bus_region region, inverted_region;
45766 bool bar_too_big = false, bar_disabled = false;
45767
45768- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
45769+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
45770
45771 /* No printks while decoding is disabled! */
45772 if (!dev->mmio_always_on) {
45773diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
45774index cdc7836..528635c 100644
45775--- a/drivers/pci/proc.c
45776+++ b/drivers/pci/proc.c
45777@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
45778 static int __init pci_proc_init(void)
45779 {
45780 struct pci_dev *dev = NULL;
45781+
45782+#ifdef CONFIG_GRKERNSEC_PROC_ADD
45783+#ifdef CONFIG_GRKERNSEC_PROC_USER
45784+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
45785+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45786+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
45787+#endif
45788+#else
45789 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
45790+#endif
45791 proc_create("devices", 0, proc_bus_pci_dir,
45792 &proc_bus_pci_dev_operations);
45793 proc_initialized = 1;
45794diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
45795index 19c313b..ed28b38 100644
45796--- a/drivers/platform/x86/asus-wmi.c
45797+++ b/drivers/platform/x86/asus-wmi.c
45798@@ -1618,6 +1618,10 @@ static int show_dsts(struct seq_file *m, void *data)
45799 int err;
45800 u32 retval = -1;
45801
45802+#ifdef CONFIG_GRKERNSEC_KMEM
45803+ return -EPERM;
45804+#endif
45805+
45806 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
45807
45808 if (err < 0)
45809@@ -1634,6 +1638,10 @@ static int show_devs(struct seq_file *m, void *data)
45810 int err;
45811 u32 retval = -1;
45812
45813+#ifdef CONFIG_GRKERNSEC_KMEM
45814+ return -EPERM;
45815+#endif
45816+
45817 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
45818 &retval);
45819
45820@@ -1658,6 +1666,10 @@ static int show_call(struct seq_file *m, void *data)
45821 union acpi_object *obj;
45822 acpi_status status;
45823
45824+#ifdef CONFIG_GRKERNSEC_KMEM
45825+ return -EPERM;
45826+#endif
45827+
45828 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
45829 1, asus->debug.method_id,
45830 &input, &output);
45831diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
45832index 3e5b4497..dcdfb70 100644
45833--- a/drivers/platform/x86/chromeos_laptop.c
45834+++ b/drivers/platform/x86/chromeos_laptop.c
45835@@ -301,7 +301,7 @@ static int __init setup_tsl2563_als(const struct dmi_system_id *id)
45836 return 0;
45837 }
45838
45839-static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
45840+static struct dmi_system_id __initconst chromeos_laptop_dmi_table[] = {
45841 {
45842 .ident = "Samsung Series 5 550 - Touchpad",
45843 .matches = {
45844diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
45845index 62f8030..c7f2a45 100644
45846--- a/drivers/platform/x86/msi-laptop.c
45847+++ b/drivers/platform/x86/msi-laptop.c
45848@@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
45849
45850 if (!quirks->ec_read_only) {
45851 /* allow userland write sysfs file */
45852- dev_attr_bluetooth.store = store_bluetooth;
45853- dev_attr_wlan.store = store_wlan;
45854- dev_attr_threeg.store = store_threeg;
45855- dev_attr_bluetooth.attr.mode |= S_IWUSR;
45856- dev_attr_wlan.attr.mode |= S_IWUSR;
45857- dev_attr_threeg.attr.mode |= S_IWUSR;
45858+ pax_open_kernel();
45859+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
45860+ *(void **)&dev_attr_wlan.store = store_wlan;
45861+ *(void **)&dev_attr_threeg.store = store_threeg;
45862+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
45863+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
45864+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
45865+ pax_close_kernel();
45866 }
45867
45868 /* disable hardware control by fn key */
45869diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
45870index 70222f2..8c8ce66 100644
45871--- a/drivers/platform/x86/msi-wmi.c
45872+++ b/drivers/platform/x86/msi-wmi.c
45873@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
45874 static void msi_wmi_notify(u32 value, void *context)
45875 {
45876 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
45877- static struct key_entry *key;
45878+ struct key_entry *key;
45879 union acpi_object *obj;
45880 acpi_status status;
45881
45882diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
45883index 3484dd2..13ee730 100644
45884--- a/drivers/platform/x86/sony-laptop.c
45885+++ b/drivers/platform/x86/sony-laptop.c
45886@@ -2448,7 +2448,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
45887 }
45888
45889 /* High speed charging function */
45890-static struct device_attribute *hsc_handle;
45891+static device_attribute_no_const *hsc_handle;
45892
45893 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
45894 struct device_attribute *attr,
45895diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
45896index 4e86e97..04d50d1 100644
45897--- a/drivers/platform/x86/thinkpad_acpi.c
45898+++ b/drivers/platform/x86/thinkpad_acpi.c
45899@@ -2091,7 +2091,7 @@ static int hotkey_mask_get(void)
45900 return 0;
45901 }
45902
45903-void static hotkey_mask_warn_incomplete_mask(void)
45904+static void hotkey_mask_warn_incomplete_mask(void)
45905 {
45906 /* log only what the user can fix... */
45907 const u32 wantedmask = hotkey_driver_mask &
45908@@ -2318,11 +2318,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
45909 }
45910 }
45911
45912-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45913- struct tp_nvram_state *newn,
45914- const u32 event_mask)
45915-{
45916-
45917 #define TPACPI_COMPARE_KEY(__scancode, __member) \
45918 do { \
45919 if ((event_mask & (1 << __scancode)) && \
45920@@ -2336,36 +2331,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45921 tpacpi_hotkey_send_key(__scancode); \
45922 } while (0)
45923
45924- void issue_volchange(const unsigned int oldvol,
45925- const unsigned int newvol)
45926- {
45927- unsigned int i = oldvol;
45928+static void issue_volchange(const unsigned int oldvol,
45929+ const unsigned int newvol,
45930+ const u32 event_mask)
45931+{
45932+ unsigned int i = oldvol;
45933
45934- while (i > newvol) {
45935- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
45936- i--;
45937- }
45938- while (i < newvol) {
45939- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
45940- i++;
45941- }
45942+ while (i > newvol) {
45943+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
45944+ i--;
45945 }
45946+ while (i < newvol) {
45947+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
45948+ i++;
45949+ }
45950+}
45951
45952- void issue_brightnesschange(const unsigned int oldbrt,
45953- const unsigned int newbrt)
45954- {
45955- unsigned int i = oldbrt;
45956+static void issue_brightnesschange(const unsigned int oldbrt,
45957+ const unsigned int newbrt,
45958+ const u32 event_mask)
45959+{
45960+ unsigned int i = oldbrt;
45961
45962- while (i > newbrt) {
45963- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
45964- i--;
45965- }
45966- while (i < newbrt) {
45967- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
45968- i++;
45969- }
45970+ while (i > newbrt) {
45971+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
45972+ i--;
45973+ }
45974+ while (i < newbrt) {
45975+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
45976+ i++;
45977 }
45978+}
45979
45980+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45981+ struct tp_nvram_state *newn,
45982+ const u32 event_mask)
45983+{
45984 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
45985 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
45986 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
45987@@ -2399,7 +2400,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45988 oldn->volume_level != newn->volume_level) {
45989 /* recently muted, or repeated mute keypress, or
45990 * multiple presses ending in mute */
45991- issue_volchange(oldn->volume_level, newn->volume_level);
45992+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
45993 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
45994 }
45995 } else {
45996@@ -2409,7 +2410,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45997 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
45998 }
45999 if (oldn->volume_level != newn->volume_level) {
46000- issue_volchange(oldn->volume_level, newn->volume_level);
46001+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
46002 } else if (oldn->volume_toggle != newn->volume_toggle) {
46003 /* repeated vol up/down keypress at end of scale ? */
46004 if (newn->volume_level == 0)
46005@@ -2422,7 +2423,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
46006 /* handle brightness */
46007 if (oldn->brightness_level != newn->brightness_level) {
46008 issue_brightnesschange(oldn->brightness_level,
46009- newn->brightness_level);
46010+ newn->brightness_level,
46011+ event_mask);
46012 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
46013 /* repeated key presses that didn't change state */
46014 if (newn->brightness_level == 0)
46015@@ -2431,10 +2433,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
46016 && !tp_features.bright_unkfw)
46017 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
46018 }
46019+}
46020
46021 #undef TPACPI_COMPARE_KEY
46022 #undef TPACPI_MAY_SEND_KEY
46023-}
46024
46025 /*
46026 * Polling driver
46027diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
46028index 769d265..a3a05ca 100644
46029--- a/drivers/pnp/pnpbios/bioscalls.c
46030+++ b/drivers/pnp/pnpbios/bioscalls.c
46031@@ -58,7 +58,7 @@ do { \
46032 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
46033 } while(0)
46034
46035-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
46036+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
46037 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
46038
46039 /*
46040@@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
46041
46042 cpu = get_cpu();
46043 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
46044+
46045+ pax_open_kernel();
46046 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
46047+ pax_close_kernel();
46048
46049 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
46050 spin_lock_irqsave(&pnp_bios_lock, flags);
46051@@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
46052 :"memory");
46053 spin_unlock_irqrestore(&pnp_bios_lock, flags);
46054
46055+ pax_open_kernel();
46056 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
46057+ pax_close_kernel();
46058+
46059 put_cpu();
46060
46061 /* If we get here and this is set then the PnP BIOS faulted on us. */
46062@@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
46063 return status;
46064 }
46065
46066-void pnpbios_calls_init(union pnp_bios_install_struct *header)
46067+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
46068 {
46069 int i;
46070
46071@@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
46072 pnp_bios_callpoint.offset = header->fields.pm16offset;
46073 pnp_bios_callpoint.segment = PNP_CS16;
46074
46075+ pax_open_kernel();
46076+
46077 for_each_possible_cpu(i) {
46078 struct desc_struct *gdt = get_cpu_gdt_table(i);
46079 if (!gdt)
46080@@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
46081 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
46082 (unsigned long)__va(header->fields.pm16dseg));
46083 }
46084+
46085+ pax_close_kernel();
46086 }
46087diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
46088index d95e101..67f0c3f 100644
46089--- a/drivers/pnp/resource.c
46090+++ b/drivers/pnp/resource.c
46091@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
46092 return 1;
46093
46094 /* check if the resource is valid */
46095- if (*irq < 0 || *irq > 15)
46096+ if (*irq > 15)
46097 return 0;
46098
46099 /* check if the resource is reserved */
46100@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
46101 return 1;
46102
46103 /* check if the resource is valid */
46104- if (*dma < 0 || *dma == 4 || *dma > 7)
46105+ if (*dma == 4 || *dma > 7)
46106 return 0;
46107
46108 /* check if the resource is reserved */
46109diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
46110index 0c52e2a..3421ab7 100644
46111--- a/drivers/power/pda_power.c
46112+++ b/drivers/power/pda_power.c
46113@@ -37,7 +37,11 @@ static int polling;
46114
46115 #if IS_ENABLED(CONFIG_USB_PHY)
46116 static struct usb_phy *transceiver;
46117-static struct notifier_block otg_nb;
46118+static int otg_handle_notification(struct notifier_block *nb,
46119+ unsigned long event, void *unused);
46120+static struct notifier_block otg_nb = {
46121+ .notifier_call = otg_handle_notification
46122+};
46123 #endif
46124
46125 static struct regulator *ac_draw;
46126@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
46127
46128 #if IS_ENABLED(CONFIG_USB_PHY)
46129 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
46130- otg_nb.notifier_call = otg_handle_notification;
46131 ret = usb_register_notifier(transceiver, &otg_nb);
46132 if (ret) {
46133 dev_err(dev, "failure to register otg notifier\n");
46134diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
46135index cc439fd..8fa30df 100644
46136--- a/drivers/power/power_supply.h
46137+++ b/drivers/power/power_supply.h
46138@@ -16,12 +16,12 @@ struct power_supply;
46139
46140 #ifdef CONFIG_SYSFS
46141
46142-extern void power_supply_init_attrs(struct device_type *dev_type);
46143+extern void power_supply_init_attrs(void);
46144 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
46145
46146 #else
46147
46148-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
46149+static inline void power_supply_init_attrs(void) {}
46150 #define power_supply_uevent NULL
46151
46152 #endif /* CONFIG_SYSFS */
46153diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
46154index 557af94..84dc1fe 100644
46155--- a/drivers/power/power_supply_core.c
46156+++ b/drivers/power/power_supply_core.c
46157@@ -24,7 +24,10 @@
46158 struct class *power_supply_class;
46159 EXPORT_SYMBOL_GPL(power_supply_class);
46160
46161-static struct device_type power_supply_dev_type;
46162+extern const struct attribute_group *power_supply_attr_groups[];
46163+static struct device_type power_supply_dev_type = {
46164+ .groups = power_supply_attr_groups,
46165+};
46166
46167 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
46168 struct power_supply *supply)
46169@@ -584,7 +587,7 @@ static int __init power_supply_class_init(void)
46170 return PTR_ERR(power_supply_class);
46171
46172 power_supply_class->dev_uevent = power_supply_uevent;
46173- power_supply_init_attrs(&power_supply_dev_type);
46174+ power_supply_init_attrs();
46175
46176 return 0;
46177 }
46178diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
46179index 44420d1..967126e 100644
46180--- a/drivers/power/power_supply_sysfs.c
46181+++ b/drivers/power/power_supply_sysfs.c
46182@@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
46183 .is_visible = power_supply_attr_is_visible,
46184 };
46185
46186-static const struct attribute_group *power_supply_attr_groups[] = {
46187+const struct attribute_group *power_supply_attr_groups[] = {
46188 &power_supply_attr_group,
46189 NULL,
46190 };
46191
46192-void power_supply_init_attrs(struct device_type *dev_type)
46193+void power_supply_init_attrs(void)
46194 {
46195 int i;
46196
46197- dev_type->groups = power_supply_attr_groups;
46198-
46199 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
46200 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
46201 }
46202diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
46203index a01b8b3..37c2afe 100644
46204--- a/drivers/regulator/core.c
46205+++ b/drivers/regulator/core.c
46206@@ -3307,7 +3307,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
46207 {
46208 const struct regulation_constraints *constraints = NULL;
46209 const struct regulator_init_data *init_data;
46210- static atomic_t regulator_no = ATOMIC_INIT(0);
46211+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
46212 struct regulator_dev *rdev;
46213 struct device *dev;
46214 int ret, i;
46215@@ -3377,7 +3377,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
46216 rdev->dev.of_node = config->of_node;
46217 rdev->dev.parent = dev;
46218 dev_set_name(&rdev->dev, "regulator.%d",
46219- atomic_inc_return(&regulator_no) - 1);
46220+ atomic_inc_return_unchecked(&regulator_no) - 1);
46221 ret = device_register(&rdev->dev);
46222 if (ret != 0) {
46223 put_device(&rdev->dev);
46224diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
46225index 144bcac..d20e7db 100644
46226--- a/drivers/regulator/max8660.c
46227+++ b/drivers/regulator/max8660.c
46228@@ -420,8 +420,10 @@ static int max8660_probe(struct i2c_client *client,
46229 max8660->shadow_regs[MAX8660_OVER1] = 5;
46230 } else {
46231 /* Otherwise devices can be toggled via software */
46232- max8660_dcdc_ops.enable = max8660_dcdc_enable;
46233- max8660_dcdc_ops.disable = max8660_dcdc_disable;
46234+ pax_open_kernel();
46235+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
46236+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
46237+ pax_close_kernel();
46238 }
46239
46240 /*
46241diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
46242index 5b77ab7..a62f061 100644
46243--- a/drivers/regulator/max8973-regulator.c
46244+++ b/drivers/regulator/max8973-regulator.c
46245@@ -406,9 +406,11 @@ static int max8973_probe(struct i2c_client *client,
46246 if (!pdata || !pdata->enable_ext_control) {
46247 max->desc.enable_reg = MAX8973_VOUT;
46248 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
46249- max->ops.enable = regulator_enable_regmap;
46250- max->ops.disable = regulator_disable_regmap;
46251- max->ops.is_enabled = regulator_is_enabled_regmap;
46252+ pax_open_kernel();
46253+ *(void **)&max->ops.enable = regulator_enable_regmap;
46254+ *(void **)&max->ops.disable = regulator_disable_regmap;
46255+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
46256+ pax_close_kernel();
46257 }
46258
46259 if (pdata) {
46260diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
46261index 1037e07..e64dea1 100644
46262--- a/drivers/regulator/mc13892-regulator.c
46263+++ b/drivers/regulator/mc13892-regulator.c
46264@@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
46265 }
46266 mc13xxx_unlock(mc13892);
46267
46268- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
46269+ pax_open_kernel();
46270+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
46271 = mc13892_vcam_set_mode;
46272- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
46273+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
46274 = mc13892_vcam_get_mode;
46275+ pax_close_kernel();
46276
46277 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
46278 ARRAY_SIZE(mc13892_regulators));
46279diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
46280index 24e733c..bfbaa3e 100644
46281--- a/drivers/rtc/rtc-cmos.c
46282+++ b/drivers/rtc/rtc-cmos.c
46283@@ -731,7 +731,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
46284 hpet_rtc_timer_init();
46285
46286 /* export at least the first block of NVRAM */
46287- nvram.size = address_space - NVRAM_OFFSET;
46288+ pax_open_kernel();
46289+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
46290+ pax_close_kernel();
46291 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
46292 if (retval < 0) {
46293 dev_dbg(dev, "can't create nvram file? %d\n", retval);
46294diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
46295index d049393..bb20be0 100644
46296--- a/drivers/rtc/rtc-dev.c
46297+++ b/drivers/rtc/rtc-dev.c
46298@@ -16,6 +16,7 @@
46299 #include <linux/module.h>
46300 #include <linux/rtc.h>
46301 #include <linux/sched.h>
46302+#include <linux/grsecurity.h>
46303 #include "rtc-core.h"
46304
46305 static dev_t rtc_devt;
46306@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
46307 if (copy_from_user(&tm, uarg, sizeof(tm)))
46308 return -EFAULT;
46309
46310+ gr_log_timechange();
46311+
46312 return rtc_set_time(rtc, &tm);
46313
46314 case RTC_PIE_ON:
46315diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
46316index ca18fd1..055e42d 100644
46317--- a/drivers/rtc/rtc-ds1307.c
46318+++ b/drivers/rtc/rtc-ds1307.c
46319@@ -107,7 +107,7 @@ struct ds1307 {
46320 u8 offset; /* register's offset */
46321 u8 regs[11];
46322 u16 nvram_offset;
46323- struct bin_attribute *nvram;
46324+ bin_attribute_no_const *nvram;
46325 enum ds_type type;
46326 unsigned long flags;
46327 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
46328diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
46329index fcb0329..d77b7f2 100644
46330--- a/drivers/rtc/rtc-m48t59.c
46331+++ b/drivers/rtc/rtc-m48t59.c
46332@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
46333 if (IS_ERR(m48t59->rtc))
46334 return PTR_ERR(m48t59->rtc);
46335
46336- m48t59_nvram_attr.size = pdata->offset;
46337+ pax_open_kernel();
46338+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
46339+ pax_close_kernel();
46340
46341 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
46342 if (ret)
46343diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
46344index 14b5f8d..cc9bd26 100644
46345--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
46346+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
46347@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
46348 for (bit = 0; bit < 8; bit++) {
46349
46350 if ((pci_status[i] & (0x1 << bit)) != 0) {
46351- static const char *s;
46352+ const char *s;
46353
46354 s = pci_status_strings[bit];
46355 if (i == 7/*TARG*/ && bit == 3)
46356@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
46357
46358 for (bit = 0; bit < 8; bit++) {
46359
46360- if ((split_status[i] & (0x1 << bit)) != 0) {
46361- static const char *s;
46362-
46363- s = split_status_strings[bit];
46364- printk(s, ahd_name(ahd),
46365+ if ((split_status[i] & (0x1 << bit)) != 0)
46366+ printk(split_status_strings[bit], ahd_name(ahd),
46367 split_status_source[i]);
46368- }
46369
46370 if (i > 1)
46371 continue;
46372
46373- if ((sg_split_status[i] & (0x1 << bit)) != 0) {
46374- static const char *s;
46375-
46376- s = split_status_strings[bit];
46377- printk(s, ahd_name(ahd), "SG");
46378- }
46379+ if ((sg_split_status[i] & (0x1 << bit)) != 0)
46380+ printk(split_status_strings[bit], ahd_name(ahd), "SG");
46381 }
46382 }
46383 /*
46384diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
46385index e693af6..2e525b6 100644
46386--- a/drivers/scsi/bfa/bfa_fcpim.h
46387+++ b/drivers/scsi/bfa/bfa_fcpim.h
46388@@ -36,7 +36,7 @@ struct bfa_iotag_s {
46389
46390 struct bfa_itn_s {
46391 bfa_isr_func_t isr;
46392-};
46393+} __no_const;
46394
46395 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
46396 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
46397diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
46398index 90814fe..4384138 100644
46399--- a/drivers/scsi/bfa/bfa_ioc.h
46400+++ b/drivers/scsi/bfa/bfa_ioc.h
46401@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
46402 bfa_ioc_disable_cbfn_t disable_cbfn;
46403 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
46404 bfa_ioc_reset_cbfn_t reset_cbfn;
46405-};
46406+} __no_const;
46407
46408 /*
46409 * IOC event notification mechanism.
46410@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
46411 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
46412 enum bfi_ioc_state fwstate);
46413 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
46414-};
46415+} __no_const;
46416
46417 /*
46418 * Queue element to wait for room in request queue. FIFO order is
46419diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
46420index c9382d6..6619864 100644
46421--- a/drivers/scsi/fcoe/fcoe_sysfs.c
46422+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
46423@@ -33,8 +33,8 @@
46424 */
46425 #include "libfcoe.h"
46426
46427-static atomic_t ctlr_num;
46428-static atomic_t fcf_num;
46429+static atomic_unchecked_t ctlr_num;
46430+static atomic_unchecked_t fcf_num;
46431
46432 /*
46433 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
46434@@ -681,7 +681,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
46435 if (!ctlr)
46436 goto out;
46437
46438- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
46439+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
46440 ctlr->f = f;
46441 ctlr->mode = FIP_CONN_TYPE_FABRIC;
46442 INIT_LIST_HEAD(&ctlr->fcfs);
46443@@ -898,7 +898,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
46444 fcf->dev.parent = &ctlr->dev;
46445 fcf->dev.bus = &fcoe_bus_type;
46446 fcf->dev.type = &fcoe_fcf_device_type;
46447- fcf->id = atomic_inc_return(&fcf_num) - 1;
46448+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
46449 fcf->state = FCOE_FCF_STATE_UNKNOWN;
46450
46451 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
46452@@ -934,8 +934,8 @@ int __init fcoe_sysfs_setup(void)
46453 {
46454 int error;
46455
46456- atomic_set(&ctlr_num, 0);
46457- atomic_set(&fcf_num, 0);
46458+ atomic_set_unchecked(&ctlr_num, 0);
46459+ atomic_set_unchecked(&fcf_num, 0);
46460
46461 error = bus_register(&fcoe_bus_type);
46462 if (error)
46463diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
46464index 3cafe0d..f1e87f8 100644
46465--- a/drivers/scsi/hosts.c
46466+++ b/drivers/scsi/hosts.c
46467@@ -42,7 +42,7 @@
46468 #include "scsi_logging.h"
46469
46470
46471-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
46472+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
46473
46474
46475 static void scsi_host_cls_release(struct device *dev)
46476@@ -361,7 +361,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
46477 * subtract one because we increment first then return, but we need to
46478 * know what the next host number was before increment
46479 */
46480- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
46481+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
46482 shost->dma_channel = 0xff;
46483
46484 /* These three are default values which can be overridden */
46485diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
46486index 0eb0940..3ca9b79 100644
46487--- a/drivers/scsi/hpsa.c
46488+++ b/drivers/scsi/hpsa.c
46489@@ -579,7 +579,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
46490 unsigned long flags;
46491
46492 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
46493- return h->access.command_completed(h, q);
46494+ return h->access->command_completed(h, q);
46495
46496 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
46497 a = rq->head[rq->current_entry];
46498@@ -3445,7 +3445,7 @@ static void start_io(struct ctlr_info *h)
46499 while (!list_empty(&h->reqQ)) {
46500 c = list_entry(h->reqQ.next, struct CommandList, list);
46501 /* can't do anything if fifo is full */
46502- if ((h->access.fifo_full(h))) {
46503+ if ((h->access->fifo_full(h))) {
46504 dev_warn(&h->pdev->dev, "fifo full\n");
46505 break;
46506 }
46507@@ -3467,7 +3467,7 @@ static void start_io(struct ctlr_info *h)
46508
46509 /* Tell the controller execute command */
46510 spin_unlock_irqrestore(&h->lock, flags);
46511- h->access.submit_command(h, c);
46512+ h->access->submit_command(h, c);
46513 spin_lock_irqsave(&h->lock, flags);
46514 }
46515 spin_unlock_irqrestore(&h->lock, flags);
46516@@ -3475,17 +3475,17 @@ static void start_io(struct ctlr_info *h)
46517
46518 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
46519 {
46520- return h->access.command_completed(h, q);
46521+ return h->access->command_completed(h, q);
46522 }
46523
46524 static inline bool interrupt_pending(struct ctlr_info *h)
46525 {
46526- return h->access.intr_pending(h);
46527+ return h->access->intr_pending(h);
46528 }
46529
46530 static inline long interrupt_not_for_us(struct ctlr_info *h)
46531 {
46532- return (h->access.intr_pending(h) == 0) ||
46533+ return (h->access->intr_pending(h) == 0) ||
46534 (h->interrupts_enabled == 0);
46535 }
46536
46537@@ -4387,7 +4387,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
46538 if (prod_index < 0)
46539 return -ENODEV;
46540 h->product_name = products[prod_index].product_name;
46541- h->access = *(products[prod_index].access);
46542+ h->access = products[prod_index].access;
46543
46544 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
46545 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
46546@@ -4669,7 +4669,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
46547
46548 assert_spin_locked(&lockup_detector_lock);
46549 remove_ctlr_from_lockup_detector_list(h);
46550- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46551+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46552 spin_lock_irqsave(&h->lock, flags);
46553 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
46554 spin_unlock_irqrestore(&h->lock, flags);
46555@@ -4846,7 +4846,7 @@ reinit_after_soft_reset:
46556 }
46557
46558 /* make sure the board interrupts are off */
46559- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46560+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46561
46562 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
46563 goto clean2;
46564@@ -4880,7 +4880,7 @@ reinit_after_soft_reset:
46565 * fake ones to scoop up any residual completions.
46566 */
46567 spin_lock_irqsave(&h->lock, flags);
46568- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46569+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46570 spin_unlock_irqrestore(&h->lock, flags);
46571 free_irqs(h);
46572 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
46573@@ -4899,9 +4899,9 @@ reinit_after_soft_reset:
46574 dev_info(&h->pdev->dev, "Board READY.\n");
46575 dev_info(&h->pdev->dev,
46576 "Waiting for stale completions to drain.\n");
46577- h->access.set_intr_mask(h, HPSA_INTR_ON);
46578+ h->access->set_intr_mask(h, HPSA_INTR_ON);
46579 msleep(10000);
46580- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46581+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46582
46583 rc = controller_reset_failed(h->cfgtable);
46584 if (rc)
46585@@ -4922,7 +4922,7 @@ reinit_after_soft_reset:
46586 }
46587
46588 /* Turn the interrupts on so we can service requests */
46589- h->access.set_intr_mask(h, HPSA_INTR_ON);
46590+ h->access->set_intr_mask(h, HPSA_INTR_ON);
46591
46592 hpsa_hba_inquiry(h);
46593 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
46594@@ -4977,7 +4977,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
46595 * To write all data in the battery backed cache to disks
46596 */
46597 hpsa_flush_cache(h);
46598- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46599+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46600 hpsa_free_irqs_and_disable_msix(h);
46601 }
46602
46603@@ -5145,7 +5145,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
46604 return;
46605 }
46606 /* Change the access methods to the performant access methods */
46607- h->access = SA5_performant_access;
46608+ h->access = &SA5_performant_access;
46609 h->transMethod = CFGTBL_Trans_Performant;
46610 }
46611
46612diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
46613index bc85e72..ae04a39 100644
46614--- a/drivers/scsi/hpsa.h
46615+++ b/drivers/scsi/hpsa.h
46616@@ -79,7 +79,7 @@ struct ctlr_info {
46617 unsigned int msix_vector;
46618 unsigned int msi_vector;
46619 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
46620- struct access_method access;
46621+ struct access_method *access;
46622
46623 /* queue and queue Info */
46624 struct list_head reqQ;
46625diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
46626index 5879929..32b241d 100644
46627--- a/drivers/scsi/libfc/fc_exch.c
46628+++ b/drivers/scsi/libfc/fc_exch.c
46629@@ -100,12 +100,12 @@ struct fc_exch_mgr {
46630 u16 pool_max_index;
46631
46632 struct {
46633- atomic_t no_free_exch;
46634- atomic_t no_free_exch_xid;
46635- atomic_t xid_not_found;
46636- atomic_t xid_busy;
46637- atomic_t seq_not_found;
46638- atomic_t non_bls_resp;
46639+ atomic_unchecked_t no_free_exch;
46640+ atomic_unchecked_t no_free_exch_xid;
46641+ atomic_unchecked_t xid_not_found;
46642+ atomic_unchecked_t xid_busy;
46643+ atomic_unchecked_t seq_not_found;
46644+ atomic_unchecked_t non_bls_resp;
46645 } stats;
46646 };
46647
46648@@ -736,7 +736,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
46649 /* allocate memory for exchange */
46650 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
46651 if (!ep) {
46652- atomic_inc(&mp->stats.no_free_exch);
46653+ atomic_inc_unchecked(&mp->stats.no_free_exch);
46654 goto out;
46655 }
46656 memset(ep, 0, sizeof(*ep));
46657@@ -797,7 +797,7 @@ out:
46658 return ep;
46659 err:
46660 spin_unlock_bh(&pool->lock);
46661- atomic_inc(&mp->stats.no_free_exch_xid);
46662+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
46663 mempool_free(ep, mp->ep_pool);
46664 return NULL;
46665 }
46666@@ -940,7 +940,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46667 xid = ntohs(fh->fh_ox_id); /* we originated exch */
46668 ep = fc_exch_find(mp, xid);
46669 if (!ep) {
46670- atomic_inc(&mp->stats.xid_not_found);
46671+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46672 reject = FC_RJT_OX_ID;
46673 goto out;
46674 }
46675@@ -970,7 +970,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46676 ep = fc_exch_find(mp, xid);
46677 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
46678 if (ep) {
46679- atomic_inc(&mp->stats.xid_busy);
46680+ atomic_inc_unchecked(&mp->stats.xid_busy);
46681 reject = FC_RJT_RX_ID;
46682 goto rel;
46683 }
46684@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46685 }
46686 xid = ep->xid; /* get our XID */
46687 } else if (!ep) {
46688- atomic_inc(&mp->stats.xid_not_found);
46689+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46690 reject = FC_RJT_RX_ID; /* XID not found */
46691 goto out;
46692 }
46693@@ -998,7 +998,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46694 } else {
46695 sp = &ep->seq;
46696 if (sp->id != fh->fh_seq_id) {
46697- atomic_inc(&mp->stats.seq_not_found);
46698+ atomic_inc_unchecked(&mp->stats.seq_not_found);
46699 if (f_ctl & FC_FC_END_SEQ) {
46700 /*
46701 * Update sequence_id based on incoming last
46702@@ -1448,22 +1448,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46703
46704 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
46705 if (!ep) {
46706- atomic_inc(&mp->stats.xid_not_found);
46707+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46708 goto out;
46709 }
46710 if (ep->esb_stat & ESB_ST_COMPLETE) {
46711- atomic_inc(&mp->stats.xid_not_found);
46712+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46713 goto rel;
46714 }
46715 if (ep->rxid == FC_XID_UNKNOWN)
46716 ep->rxid = ntohs(fh->fh_rx_id);
46717 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
46718- atomic_inc(&mp->stats.xid_not_found);
46719+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46720 goto rel;
46721 }
46722 if (ep->did != ntoh24(fh->fh_s_id) &&
46723 ep->did != FC_FID_FLOGI) {
46724- atomic_inc(&mp->stats.xid_not_found);
46725+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46726 goto rel;
46727 }
46728 sof = fr_sof(fp);
46729@@ -1472,7 +1472,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46730 sp->ssb_stat |= SSB_ST_RESP;
46731 sp->id = fh->fh_seq_id;
46732 } else if (sp->id != fh->fh_seq_id) {
46733- atomic_inc(&mp->stats.seq_not_found);
46734+ atomic_inc_unchecked(&mp->stats.seq_not_found);
46735 goto rel;
46736 }
46737
46738@@ -1536,9 +1536,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46739 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
46740
46741 if (!sp)
46742- atomic_inc(&mp->stats.xid_not_found);
46743+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46744 else
46745- atomic_inc(&mp->stats.non_bls_resp);
46746+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
46747
46748 fc_frame_free(fp);
46749 }
46750@@ -2185,13 +2185,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
46751
46752 list_for_each_entry(ema, &lport->ema_list, ema_list) {
46753 mp = ema->mp;
46754- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
46755+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
46756 st->fc_no_free_exch_xid +=
46757- atomic_read(&mp->stats.no_free_exch_xid);
46758- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
46759- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
46760- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
46761- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
46762+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
46763+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
46764+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
46765+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
46766+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
46767 }
46768 }
46769 EXPORT_SYMBOL(fc_exch_update_stats);
46770diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
46771index d289583..b745eec 100644
46772--- a/drivers/scsi/libsas/sas_ata.c
46773+++ b/drivers/scsi/libsas/sas_ata.c
46774@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
46775 .postreset = ata_std_postreset,
46776 .error_handler = ata_std_error_handler,
46777 .post_internal_cmd = sas_ata_post_internal,
46778- .qc_defer = ata_std_qc_defer,
46779+ .qc_defer = ata_std_qc_defer,
46780 .qc_prep = ata_noop_qc_prep,
46781 .qc_issue = sas_ata_qc_issue,
46782 .qc_fill_rtf = sas_ata_qc_fill_rtf,
46783diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
46784index 4e1b75c..0bbdfa9 100644
46785--- a/drivers/scsi/lpfc/lpfc.h
46786+++ b/drivers/scsi/lpfc/lpfc.h
46787@@ -432,7 +432,7 @@ struct lpfc_vport {
46788 struct dentry *debug_nodelist;
46789 struct dentry *vport_debugfs_root;
46790 struct lpfc_debugfs_trc *disc_trc;
46791- atomic_t disc_trc_cnt;
46792+ atomic_unchecked_t disc_trc_cnt;
46793 #endif
46794 uint8_t stat_data_enabled;
46795 uint8_t stat_data_blocked;
46796@@ -865,8 +865,8 @@ struct lpfc_hba {
46797 struct timer_list fabric_block_timer;
46798 unsigned long bit_flags;
46799 #define FABRIC_COMANDS_BLOCKED 0
46800- atomic_t num_rsrc_err;
46801- atomic_t num_cmd_success;
46802+ atomic_unchecked_t num_rsrc_err;
46803+ atomic_unchecked_t num_cmd_success;
46804 unsigned long last_rsrc_error_time;
46805 unsigned long last_ramp_down_time;
46806 unsigned long last_ramp_up_time;
46807@@ -902,7 +902,7 @@ struct lpfc_hba {
46808
46809 struct dentry *debug_slow_ring_trc;
46810 struct lpfc_debugfs_trc *slow_ring_trc;
46811- atomic_t slow_ring_trc_cnt;
46812+ atomic_unchecked_t slow_ring_trc_cnt;
46813 /* iDiag debugfs sub-directory */
46814 struct dentry *idiag_root;
46815 struct dentry *idiag_pci_cfg;
46816diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
46817index 60084e6..0e2e700 100644
46818--- a/drivers/scsi/lpfc/lpfc_debugfs.c
46819+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
46820@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
46821
46822 #include <linux/debugfs.h>
46823
46824-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
46825+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
46826 static unsigned long lpfc_debugfs_start_time = 0L;
46827
46828 /* iDiag */
46829@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
46830 lpfc_debugfs_enable = 0;
46831
46832 len = 0;
46833- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
46834+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
46835 (lpfc_debugfs_max_disc_trc - 1);
46836 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
46837 dtp = vport->disc_trc + i;
46838@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
46839 lpfc_debugfs_enable = 0;
46840
46841 len = 0;
46842- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
46843+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
46844 (lpfc_debugfs_max_slow_ring_trc - 1);
46845 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
46846 dtp = phba->slow_ring_trc + i;
46847@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
46848 !vport || !vport->disc_trc)
46849 return;
46850
46851- index = atomic_inc_return(&vport->disc_trc_cnt) &
46852+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
46853 (lpfc_debugfs_max_disc_trc - 1);
46854 dtp = vport->disc_trc + index;
46855 dtp->fmt = fmt;
46856 dtp->data1 = data1;
46857 dtp->data2 = data2;
46858 dtp->data3 = data3;
46859- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
46860+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
46861 dtp->jif = jiffies;
46862 #endif
46863 return;
46864@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
46865 !phba || !phba->slow_ring_trc)
46866 return;
46867
46868- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
46869+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
46870 (lpfc_debugfs_max_slow_ring_trc - 1);
46871 dtp = phba->slow_ring_trc + index;
46872 dtp->fmt = fmt;
46873 dtp->data1 = data1;
46874 dtp->data2 = data2;
46875 dtp->data3 = data3;
46876- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
46877+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
46878 dtp->jif = jiffies;
46879 #endif
46880 return;
46881@@ -4168,7 +4168,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
46882 "slow_ring buffer\n");
46883 goto debug_failed;
46884 }
46885- atomic_set(&phba->slow_ring_trc_cnt, 0);
46886+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
46887 memset(phba->slow_ring_trc, 0,
46888 (sizeof(struct lpfc_debugfs_trc) *
46889 lpfc_debugfs_max_slow_ring_trc));
46890@@ -4214,7 +4214,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
46891 "buffer\n");
46892 goto debug_failed;
46893 }
46894- atomic_set(&vport->disc_trc_cnt, 0);
46895+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
46896
46897 snprintf(name, sizeof(name), "discovery_trace");
46898 vport->debug_disc_trc =
46899diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
46900index 647f5bf..d0068b9 100644
46901--- a/drivers/scsi/lpfc/lpfc_init.c
46902+++ b/drivers/scsi/lpfc/lpfc_init.c
46903@@ -10952,8 +10952,10 @@ lpfc_init(void)
46904 "misc_register returned with status %d", error);
46905
46906 if (lpfc_enable_npiv) {
46907- lpfc_transport_functions.vport_create = lpfc_vport_create;
46908- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
46909+ pax_open_kernel();
46910+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
46911+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
46912+ pax_close_kernel();
46913 }
46914 lpfc_transport_template =
46915 fc_attach_transport(&lpfc_transport_functions);
46916diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
46917index c913e8c..d34a119 100644
46918--- a/drivers/scsi/lpfc/lpfc_scsi.c
46919+++ b/drivers/scsi/lpfc/lpfc_scsi.c
46920@@ -353,7 +353,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
46921 uint32_t evt_posted;
46922
46923 spin_lock_irqsave(&phba->hbalock, flags);
46924- atomic_inc(&phba->num_rsrc_err);
46925+ atomic_inc_unchecked(&phba->num_rsrc_err);
46926 phba->last_rsrc_error_time = jiffies;
46927
46928 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
46929@@ -394,7 +394,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
46930 unsigned long flags;
46931 struct lpfc_hba *phba = vport->phba;
46932 uint32_t evt_posted;
46933- atomic_inc(&phba->num_cmd_success);
46934+ atomic_inc_unchecked(&phba->num_cmd_success);
46935
46936 if (vport->cfg_lun_queue_depth <= queue_depth)
46937 return;
46938@@ -438,8 +438,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
46939 unsigned long num_rsrc_err, num_cmd_success;
46940 int i;
46941
46942- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
46943- num_cmd_success = atomic_read(&phba->num_cmd_success);
46944+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
46945+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
46946
46947 /*
46948 * The error and success command counters are global per
46949@@ -467,8 +467,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
46950 }
46951 }
46952 lpfc_destroy_vport_work_array(phba, vports);
46953- atomic_set(&phba->num_rsrc_err, 0);
46954- atomic_set(&phba->num_cmd_success, 0);
46955+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
46956+ atomic_set_unchecked(&phba->num_cmd_success, 0);
46957 }
46958
46959 /**
46960@@ -502,8 +502,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
46961 }
46962 }
46963 lpfc_destroy_vport_work_array(phba, vports);
46964- atomic_set(&phba->num_rsrc_err, 0);
46965- atomic_set(&phba->num_cmd_success, 0);
46966+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
46967+ atomic_set_unchecked(&phba->num_cmd_success, 0);
46968 }
46969
46970 /**
46971diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
46972index 7f0af4f..193ac3e 100644
46973--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
46974+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
46975@@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
46976 {
46977 struct scsi_device *sdev = to_scsi_device(dev);
46978 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
46979- static struct _raid_device *raid_device;
46980+ struct _raid_device *raid_device;
46981 unsigned long flags;
46982 Mpi2RaidVolPage0_t vol_pg0;
46983 Mpi2ConfigReply_t mpi_reply;
46984@@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
46985 {
46986 struct scsi_device *sdev = to_scsi_device(dev);
46987 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
46988- static struct _raid_device *raid_device;
46989+ struct _raid_device *raid_device;
46990 unsigned long flags;
46991 Mpi2RaidVolPage0_t vol_pg0;
46992 Mpi2ConfigReply_t mpi_reply;
46993@@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
46994 struct fw_event_work *fw_event)
46995 {
46996 Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
46997- static struct _raid_device *raid_device;
46998+ struct _raid_device *raid_device;
46999 unsigned long flags;
47000 u16 handle;
47001
47002@@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
47003 u64 sas_address;
47004 struct _sas_device *sas_device;
47005 struct _sas_node *expander_device;
47006- static struct _raid_device *raid_device;
47007+ struct _raid_device *raid_device;
47008 u8 retry_count;
47009 unsigned long flags;
47010
47011diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
47012index a38f71b..f3bc572 100644
47013--- a/drivers/scsi/pmcraid.c
47014+++ b/drivers/scsi/pmcraid.c
47015@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
47016 res->scsi_dev = scsi_dev;
47017 scsi_dev->hostdata = res;
47018 res->change_detected = 0;
47019- atomic_set(&res->read_failures, 0);
47020- atomic_set(&res->write_failures, 0);
47021+ atomic_set_unchecked(&res->read_failures, 0);
47022+ atomic_set_unchecked(&res->write_failures, 0);
47023 rc = 0;
47024 }
47025 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
47026@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
47027
47028 /* If this was a SCSI read/write command keep count of errors */
47029 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
47030- atomic_inc(&res->read_failures);
47031+ atomic_inc_unchecked(&res->read_failures);
47032 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
47033- atomic_inc(&res->write_failures);
47034+ atomic_inc_unchecked(&res->write_failures);
47035
47036 if (!RES_IS_GSCSI(res->cfg_entry) &&
47037 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
47038@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
47039 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
47040 * hrrq_id assigned here in queuecommand
47041 */
47042- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
47043+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
47044 pinstance->num_hrrq;
47045 cmd->cmd_done = pmcraid_io_done;
47046
47047@@ -3846,7 +3846,7 @@ static long pmcraid_ioctl_passthrough(
47048 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
47049 * hrrq_id assigned here in queuecommand
47050 */
47051- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
47052+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
47053 pinstance->num_hrrq;
47054
47055 if (request_size) {
47056@@ -4484,7 +4484,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
47057
47058 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
47059 /* add resources only after host is added into system */
47060- if (!atomic_read(&pinstance->expose_resources))
47061+ if (!atomic_read_unchecked(&pinstance->expose_resources))
47062 return;
47063
47064 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
47065@@ -5311,8 +5311,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
47066 init_waitqueue_head(&pinstance->reset_wait_q);
47067
47068 atomic_set(&pinstance->outstanding_cmds, 0);
47069- atomic_set(&pinstance->last_message_id, 0);
47070- atomic_set(&pinstance->expose_resources, 0);
47071+ atomic_set_unchecked(&pinstance->last_message_id, 0);
47072+ atomic_set_unchecked(&pinstance->expose_resources, 0);
47073
47074 INIT_LIST_HEAD(&pinstance->free_res_q);
47075 INIT_LIST_HEAD(&pinstance->used_res_q);
47076@@ -6025,7 +6025,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
47077 /* Schedule worker thread to handle CCN and take care of adding and
47078 * removing devices to OS
47079 */
47080- atomic_set(&pinstance->expose_resources, 1);
47081+ atomic_set_unchecked(&pinstance->expose_resources, 1);
47082 schedule_work(&pinstance->worker_q);
47083 return rc;
47084
47085diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
47086index e1d150f..6c6df44 100644
47087--- a/drivers/scsi/pmcraid.h
47088+++ b/drivers/scsi/pmcraid.h
47089@@ -748,7 +748,7 @@ struct pmcraid_instance {
47090 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
47091
47092 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
47093- atomic_t last_message_id;
47094+ atomic_unchecked_t last_message_id;
47095
47096 /* configuration table */
47097 struct pmcraid_config_table *cfg_table;
47098@@ -777,7 +777,7 @@ struct pmcraid_instance {
47099 atomic_t outstanding_cmds;
47100
47101 /* should add/delete resources to mid-layer now ?*/
47102- atomic_t expose_resources;
47103+ atomic_unchecked_t expose_resources;
47104
47105
47106
47107@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
47108 struct pmcraid_config_table_entry_ext cfg_entry_ext;
47109 };
47110 struct scsi_device *scsi_dev; /* Link scsi_device structure */
47111- atomic_t read_failures; /* count of failed READ commands */
47112- atomic_t write_failures; /* count of failed WRITE commands */
47113+ atomic_unchecked_t read_failures; /* count of failed READ commands */
47114+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
47115
47116 /* To indicate add/delete/modify during CCN */
47117 u8 change_detected;
47118diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
47119index 5f174b8..98d32b0 100644
47120--- a/drivers/scsi/qla2xxx/qla_attr.c
47121+++ b/drivers/scsi/qla2xxx/qla_attr.c
47122@@ -2040,7 +2040,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
47123 return 0;
47124 }
47125
47126-struct fc_function_template qla2xxx_transport_functions = {
47127+fc_function_template_no_const qla2xxx_transport_functions = {
47128
47129 .show_host_node_name = 1,
47130 .show_host_port_name = 1,
47131@@ -2088,7 +2088,7 @@ struct fc_function_template qla2xxx_transport_functions = {
47132 .bsg_timeout = qla24xx_bsg_timeout,
47133 };
47134
47135-struct fc_function_template qla2xxx_transport_vport_functions = {
47136+fc_function_template_no_const qla2xxx_transport_vport_functions = {
47137
47138 .show_host_node_name = 1,
47139 .show_host_port_name = 1,
47140diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
47141index 4446bf5..9a3574d 100644
47142--- a/drivers/scsi/qla2xxx/qla_gbl.h
47143+++ b/drivers/scsi/qla2xxx/qla_gbl.h
47144@@ -538,8 +538,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
47145 struct device_attribute;
47146 extern struct device_attribute *qla2x00_host_attrs[];
47147 struct fc_function_template;
47148-extern struct fc_function_template qla2xxx_transport_functions;
47149-extern struct fc_function_template qla2xxx_transport_vport_functions;
47150+extern fc_function_template_no_const qla2xxx_transport_functions;
47151+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
47152 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
47153 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
47154 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
47155diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
47156index 9f01bbb..5e1dcee 100644
47157--- a/drivers/scsi/qla2xxx/qla_os.c
47158+++ b/drivers/scsi/qla2xxx/qla_os.c
47159@@ -1572,8 +1572,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
47160 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
47161 /* Ok, a 64bit DMA mask is applicable. */
47162 ha->flags.enable_64bit_addressing = 1;
47163- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
47164- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
47165+ pax_open_kernel();
47166+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
47167+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
47168+ pax_close_kernel();
47169 return;
47170 }
47171 }
47172diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
47173index 41327d4..feb03d479 100644
47174--- a/drivers/scsi/qla4xxx/ql4_def.h
47175+++ b/drivers/scsi/qla4xxx/ql4_def.h
47176@@ -296,7 +296,7 @@ struct ddb_entry {
47177 * (4000 only) */
47178 atomic_t relogin_timer; /* Max Time to wait for
47179 * relogin to complete */
47180- atomic_t relogin_retry_count; /* Num of times relogin has been
47181+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
47182 * retried */
47183 uint32_t default_time2wait; /* Default Min time between
47184 * relogins (+aens) */
47185diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
47186index f8a0a26..ec03cee 100644
47187--- a/drivers/scsi/qla4xxx/ql4_os.c
47188+++ b/drivers/scsi/qla4xxx/ql4_os.c
47189@@ -3066,12 +3066,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
47190 */
47191 if (!iscsi_is_session_online(cls_sess)) {
47192 /* Reset retry relogin timer */
47193- atomic_inc(&ddb_entry->relogin_retry_count);
47194+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
47195 DEBUG2(ql4_printk(KERN_INFO, ha,
47196 "%s: index[%d] relogin timed out-retrying"
47197 " relogin (%d), retry (%d)\n", __func__,
47198 ddb_entry->fw_ddb_index,
47199- atomic_read(&ddb_entry->relogin_retry_count),
47200+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
47201 ddb_entry->default_time2wait + 4));
47202 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
47203 atomic_set(&ddb_entry->retry_relogin_timer,
47204@@ -5209,7 +5209,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
47205
47206 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
47207 atomic_set(&ddb_entry->relogin_timer, 0);
47208- atomic_set(&ddb_entry->relogin_retry_count, 0);
47209+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
47210 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
47211 ddb_entry->default_relogin_timeout =
47212 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
47213diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
47214index eaa808e..95f8841 100644
47215--- a/drivers/scsi/scsi.c
47216+++ b/drivers/scsi/scsi.c
47217@@ -661,7 +661,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
47218 unsigned long timeout;
47219 int rtn = 0;
47220
47221- atomic_inc(&cmd->device->iorequest_cnt);
47222+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
47223
47224 /* check if the device is still usable */
47225 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
47226diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
47227index d1549b7..2f60767 100644
47228--- a/drivers/scsi/scsi_lib.c
47229+++ b/drivers/scsi/scsi_lib.c
47230@@ -1474,7 +1474,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
47231 shost = sdev->host;
47232 scsi_init_cmd_errh(cmd);
47233 cmd->result = DID_NO_CONNECT << 16;
47234- atomic_inc(&cmd->device->iorequest_cnt);
47235+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
47236
47237 /*
47238 * SCSI request completion path will do scsi_device_unbusy(),
47239@@ -1500,9 +1500,9 @@ static void scsi_softirq_done(struct request *rq)
47240
47241 INIT_LIST_HEAD(&cmd->eh_entry);
47242
47243- atomic_inc(&cmd->device->iodone_cnt);
47244+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
47245 if (cmd->result)
47246- atomic_inc(&cmd->device->ioerr_cnt);
47247+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
47248
47249 disposition = scsi_decide_disposition(cmd);
47250 if (disposition != SUCCESS &&
47251diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
47252index 40c6394..62356c2 100644
47253--- a/drivers/scsi/scsi_sysfs.c
47254+++ b/drivers/scsi/scsi_sysfs.c
47255@@ -687,7 +687,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
47256 char *buf) \
47257 { \
47258 struct scsi_device *sdev = to_scsi_device(dev); \
47259- unsigned long long count = atomic_read(&sdev->field); \
47260+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
47261 return snprintf(buf, 20, "0x%llx\n", count); \
47262 } \
47263 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
47264diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
47265index 84a1fdf..693b0d6 100644
47266--- a/drivers/scsi/scsi_tgt_lib.c
47267+++ b/drivers/scsi/scsi_tgt_lib.c
47268@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
47269 int err;
47270
47271 dprintk("%lx %u\n", uaddr, len);
47272- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
47273+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
47274 if (err) {
47275 /*
47276 * TODO: need to fixup sg_tablesize, max_segment_size,
47277diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
47278index 4628fd5..a94a1c2 100644
47279--- a/drivers/scsi/scsi_transport_fc.c
47280+++ b/drivers/scsi/scsi_transport_fc.c
47281@@ -497,7 +497,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
47282 * Netlink Infrastructure
47283 */
47284
47285-static atomic_t fc_event_seq;
47286+static atomic_unchecked_t fc_event_seq;
47287
47288 /**
47289 * fc_get_event_number - Obtain the next sequential FC event number
47290@@ -510,7 +510,7 @@ static atomic_t fc_event_seq;
47291 u32
47292 fc_get_event_number(void)
47293 {
47294- return atomic_add_return(1, &fc_event_seq);
47295+ return atomic_add_return_unchecked(1, &fc_event_seq);
47296 }
47297 EXPORT_SYMBOL(fc_get_event_number);
47298
47299@@ -654,7 +654,7 @@ static __init int fc_transport_init(void)
47300 {
47301 int error;
47302
47303- atomic_set(&fc_event_seq, 0);
47304+ atomic_set_unchecked(&fc_event_seq, 0);
47305
47306 error = transport_class_register(&fc_host_class);
47307 if (error)
47308@@ -844,7 +844,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
47309 char *cp;
47310
47311 *val = simple_strtoul(buf, &cp, 0);
47312- if ((*cp && (*cp != '\n')) || (*val < 0))
47313+ if (*cp && (*cp != '\n'))
47314 return -EINVAL;
47315 /*
47316 * Check for overflow; dev_loss_tmo is u32
47317diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
47318index e4a989f..293090c 100644
47319--- a/drivers/scsi/scsi_transport_iscsi.c
47320+++ b/drivers/scsi/scsi_transport_iscsi.c
47321@@ -79,7 +79,7 @@ struct iscsi_internal {
47322 struct transport_container session_cont;
47323 };
47324
47325-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
47326+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
47327 static struct workqueue_struct *iscsi_eh_timer_workq;
47328
47329 static DEFINE_IDA(iscsi_sess_ida);
47330@@ -1737,7 +1737,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
47331 int err;
47332
47333 ihost = shost->shost_data;
47334- session->sid = atomic_add_return(1, &iscsi_session_nr);
47335+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
47336
47337 if (target_id == ISCSI_MAX_TARGET) {
47338 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
47339@@ -4077,7 +4077,7 @@ static __init int iscsi_transport_init(void)
47340 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
47341 ISCSI_TRANSPORT_VERSION);
47342
47343- atomic_set(&iscsi_session_nr, 0);
47344+ atomic_set_unchecked(&iscsi_session_nr, 0);
47345
47346 err = class_register(&iscsi_transport_class);
47347 if (err)
47348diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
47349index f379c7f..e8fc69c 100644
47350--- a/drivers/scsi/scsi_transport_srp.c
47351+++ b/drivers/scsi/scsi_transport_srp.c
47352@@ -33,7 +33,7 @@
47353 #include "scsi_transport_srp_internal.h"
47354
47355 struct srp_host_attrs {
47356- atomic_t next_port_id;
47357+ atomic_unchecked_t next_port_id;
47358 };
47359 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
47360
47361@@ -61,7 +61,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
47362 struct Scsi_Host *shost = dev_to_shost(dev);
47363 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
47364
47365- atomic_set(&srp_host->next_port_id, 0);
47366+ atomic_set_unchecked(&srp_host->next_port_id, 0);
47367 return 0;
47368 }
47369
47370@@ -210,7 +210,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
47371 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
47372 rport->roles = ids->roles;
47373
47374- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
47375+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
47376 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
47377
47378 transport_setup_device(&rport->dev);
47379diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
47380index 2634d69..fcf7a81 100644
47381--- a/drivers/scsi/sd.c
47382+++ b/drivers/scsi/sd.c
47383@@ -2940,7 +2940,7 @@ static int sd_probe(struct device *dev)
47384 sdkp->disk = gd;
47385 sdkp->index = index;
47386 atomic_set(&sdkp->openers, 0);
47387- atomic_set(&sdkp->device->ioerr_cnt, 0);
47388+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
47389
47390 if (!sdp->request_queue->rq_timeout) {
47391 if (sdp->type != TYPE_MOD)
47392diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
47393index df5e961..df6b97f 100644
47394--- a/drivers/scsi/sg.c
47395+++ b/drivers/scsi/sg.c
47396@@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
47397 sdp->disk->disk_name,
47398 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
47399 NULL,
47400- (char *)arg);
47401+ (char __user *)arg);
47402 case BLKTRACESTART:
47403 return blk_trace_startstop(sdp->device->request_queue, 1);
47404 case BLKTRACESTOP:
47405diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
47406index 9e039c6..ae9e800 100644
47407--- a/drivers/spi/spi.c
47408+++ b/drivers/spi/spi.c
47409@@ -1762,7 +1762,7 @@ int spi_bus_unlock(struct spi_master *master)
47410 EXPORT_SYMBOL_GPL(spi_bus_unlock);
47411
47412 /* portable code must never pass more than 32 bytes */
47413-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
47414+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
47415
47416 static u8 *buf;
47417
47418diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
47419index 2c61783..4d49e4e 100644
47420--- a/drivers/staging/android/timed_output.c
47421+++ b/drivers/staging/android/timed_output.c
47422@@ -25,7 +25,7 @@
47423 #include "timed_output.h"
47424
47425 static struct class *timed_output_class;
47426-static atomic_t device_count;
47427+static atomic_unchecked_t device_count;
47428
47429 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
47430 char *buf)
47431@@ -63,7 +63,7 @@ static int create_timed_output_class(void)
47432 timed_output_class = class_create(THIS_MODULE, "timed_output");
47433 if (IS_ERR(timed_output_class))
47434 return PTR_ERR(timed_output_class);
47435- atomic_set(&device_count, 0);
47436+ atomic_set_unchecked(&device_count, 0);
47437 timed_output_class->dev_groups = timed_output_groups;
47438 }
47439
47440@@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
47441 if (ret < 0)
47442 return ret;
47443
47444- tdev->index = atomic_inc_return(&device_count);
47445+ tdev->index = atomic_inc_return_unchecked(&device_count);
47446 tdev->dev = device_create(timed_output_class, NULL,
47447 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
47448 if (IS_ERR(tdev->dev))
47449diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
47450index 0247a20..cb9595c 100644
47451--- a/drivers/staging/gdm724x/gdm_tty.c
47452+++ b/drivers/staging/gdm724x/gdm_tty.c
47453@@ -45,7 +45,7 @@
47454 #define gdm_tty_send_control(n, r, v, d, l) (\
47455 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
47456
47457-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
47458+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
47459
47460 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
47461 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
47462diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
47463index ef5064e..fce01db 100644
47464--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
47465+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
47466@@ -478,13 +478,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
47467 return 0;
47468 }
47469
47470-sfw_test_client_ops_t brw_test_client;
47471-void brw_init_test_client(void)
47472-{
47473- brw_test_client.tso_init = brw_client_init;
47474- brw_test_client.tso_fini = brw_client_fini;
47475- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
47476- brw_test_client.tso_done_rpc = brw_client_done_rpc;
47477+sfw_test_client_ops_t brw_test_client = {
47478+ .tso_init = brw_client_init,
47479+ .tso_fini = brw_client_fini,
47480+ .tso_prep_rpc = brw_client_prep_rpc,
47481+ .tso_done_rpc = brw_client_done_rpc,
47482 };
47483
47484 srpc_service_t brw_test_service;
47485diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
47486index 483c785..e1a2a7b 100644
47487--- a/drivers/staging/lustre/lnet/selftest/framework.c
47488+++ b/drivers/staging/lustre/lnet/selftest/framework.c
47489@@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
47490
47491 extern sfw_test_client_ops_t ping_test_client;
47492 extern srpc_service_t ping_test_service;
47493-extern void ping_init_test_client(void);
47494 extern void ping_init_test_service(void);
47495
47496 extern sfw_test_client_ops_t brw_test_client;
47497 extern srpc_service_t brw_test_service;
47498-extern void brw_init_test_client(void);
47499 extern void brw_init_test_service(void);
47500
47501
47502@@ -1684,12 +1682,10 @@ sfw_startup (void)
47503 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
47504 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
47505
47506- brw_init_test_client();
47507 brw_init_test_service();
47508 rc = sfw_register_test(&brw_test_service, &brw_test_client);
47509 LASSERT (rc == 0);
47510
47511- ping_init_test_client();
47512 ping_init_test_service();
47513 rc = sfw_register_test(&ping_test_service, &ping_test_client);
47514 LASSERT (rc == 0);
47515diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
47516index f0f9194..b589047 100644
47517--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
47518+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
47519@@ -210,14 +210,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
47520 return 0;
47521 }
47522
47523-sfw_test_client_ops_t ping_test_client;
47524-void ping_init_test_client(void)
47525-{
47526- ping_test_client.tso_init = ping_client_init;
47527- ping_test_client.tso_fini = ping_client_fini;
47528- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
47529- ping_test_client.tso_done_rpc = ping_client_done_rpc;
47530-}
47531+sfw_test_client_ops_t ping_test_client = {
47532+ .tso_init = ping_client_init,
47533+ .tso_fini = ping_client_fini,
47534+ .tso_prep_rpc = ping_client_prep_rpc,
47535+ .tso_done_rpc = ping_client_done_rpc,
47536+};
47537
47538 srpc_service_t ping_test_service;
47539 void ping_init_test_service(void)
47540diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
47541index 7020d9c..0d3b580 100644
47542--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
47543+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
47544@@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
47545 ldlm_completion_callback lcs_completion;
47546 ldlm_blocking_callback lcs_blocking;
47547 ldlm_glimpse_callback lcs_glimpse;
47548-};
47549+} __no_const;
47550
47551 /* ldlm_lockd.c */
47552 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
47553diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
47554index a612255..9a9e2dd 100644
47555--- a/drivers/staging/lustre/lustre/include/obd.h
47556+++ b/drivers/staging/lustre/lustre/include/obd.h
47557@@ -1417,7 +1417,7 @@ struct md_ops {
47558 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
47559 * wrapper function in include/linux/obd_class.h.
47560 */
47561-};
47562+} __no_const;
47563
47564 struct lsm_operations {
47565 void (*lsm_free)(struct lov_stripe_md *);
47566diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47567index fc6c977..df1f956 100644
47568--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47569+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47570@@ -219,7 +219,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
47571 int LL_PROC_PROTO(proc_console_max_delay_cs)
47572 {
47573 int rc, max_delay_cs;
47574- ctl_table_t dummy = *table;
47575+ ctl_table_no_const dummy = *table;
47576 cfs_duration_t d;
47577
47578 dummy.data = &max_delay_cs;
47579@@ -250,7 +250,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
47580 int LL_PROC_PROTO(proc_console_min_delay_cs)
47581 {
47582 int rc, min_delay_cs;
47583- ctl_table_t dummy = *table;
47584+ ctl_table_no_const dummy = *table;
47585 cfs_duration_t d;
47586
47587 dummy.data = &min_delay_cs;
47588@@ -281,7 +281,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
47589 int LL_PROC_PROTO(proc_console_backoff)
47590 {
47591 int rc, backoff;
47592- ctl_table_t dummy = *table;
47593+ ctl_table_no_const dummy = *table;
47594
47595 dummy.data = &backoff;
47596 dummy.proc_handler = &proc_dointvec;
47597diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
47598index 3675020..e80d92c 100644
47599--- a/drivers/staging/media/solo6x10/solo6x10-core.c
47600+++ b/drivers/staging/media/solo6x10/solo6x10-core.c
47601@@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
47602
47603 static int solo_sysfs_init(struct solo_dev *solo_dev)
47604 {
47605- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
47606+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
47607 struct device *dev = &solo_dev->dev;
47608 const char *driver;
47609 int i;
47610diff --git a/drivers/staging/media/solo6x10/solo6x10-p2m.c b/drivers/staging/media/solo6x10/solo6x10-p2m.c
47611index 3335941..2b26186 100644
47612--- a/drivers/staging/media/solo6x10/solo6x10-p2m.c
47613+++ b/drivers/staging/media/solo6x10/solo6x10-p2m.c
47614@@ -77,7 +77,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
47615
47616 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
47617 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
47618- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
47619+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
47620 if (p2m_id < 0)
47621 p2m_id = -p2m_id;
47622 }
47623diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
47624index 6f91d2e..3f011d2 100644
47625--- a/drivers/staging/media/solo6x10/solo6x10.h
47626+++ b/drivers/staging/media/solo6x10/solo6x10.h
47627@@ -238,7 +238,7 @@ struct solo_dev {
47628
47629 /* P2M DMA Engine */
47630 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
47631- atomic_t p2m_count;
47632+ atomic_unchecked_t p2m_count;
47633 int p2m_jiffies;
47634 unsigned int p2m_timeouts;
47635
47636diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
47637index e14a1bb..9cb9bbe 100644
47638--- a/drivers/staging/octeon/ethernet-rx.c
47639+++ b/drivers/staging/octeon/ethernet-rx.c
47640@@ -419,11 +419,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
47641 /* Increment RX stats for virtual ports */
47642 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
47643 #ifdef CONFIG_64BIT
47644- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
47645- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
47646+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
47647+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
47648 #else
47649- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
47650- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
47651+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
47652+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
47653 #endif
47654 }
47655 netif_receive_skb(skb);
47656@@ -434,9 +434,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
47657 dev->name);
47658 */
47659 #ifdef CONFIG_64BIT
47660- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
47661+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
47662 #else
47663- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
47664+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
47665 #endif
47666 dev_kfree_skb_irq(skb);
47667 }
47668diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
47669index c3a90e7..023619a 100644
47670--- a/drivers/staging/octeon/ethernet.c
47671+++ b/drivers/staging/octeon/ethernet.c
47672@@ -252,11 +252,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
47673 * since the RX tasklet also increments it.
47674 */
47675 #ifdef CONFIG_64BIT
47676- atomic64_add(rx_status.dropped_packets,
47677- (atomic64_t *)&priv->stats.rx_dropped);
47678+ atomic64_add_unchecked(rx_status.dropped_packets,
47679+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
47680 #else
47681- atomic_add(rx_status.dropped_packets,
47682- (atomic_t *)&priv->stats.rx_dropped);
47683+ atomic_add_unchecked(rx_status.dropped_packets,
47684+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
47685 #endif
47686 }
47687
47688diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
47689index 439c3c9..2d74293 100644
47690--- a/drivers/staging/rtl8188eu/include/hal_intf.h
47691+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
47692@@ -271,7 +271,7 @@ struct hal_ops {
47693 s32 (*c2h_handler)(struct adapter *padapter,
47694 struct c2h_evt_hdr *c2h_evt);
47695 c2h_id_filter c2h_id_filter_ccx;
47696-};
47697+} __no_const;
47698
47699 enum rt_eeprom_type {
47700 EEPROM_93C46,
47701diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
47702index eb6f0e5..e6a0958 100644
47703--- a/drivers/staging/rtl8188eu/include/rtw_io.h
47704+++ b/drivers/staging/rtl8188eu/include/rtw_io.h
47705@@ -126,7 +126,7 @@ struct _io_ops {
47706 u32 (*_write_scsi)(struct intf_hdl *pintfhdl,u32 cnt, u8 *pmem);
47707 void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
47708 void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
47709-};
47710+} __no_const;
47711
47712 struct io_req {
47713 struct list_head list;
47714diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
47715index dc23395..cf7e9b1 100644
47716--- a/drivers/staging/rtl8712/rtl871x_io.h
47717+++ b/drivers/staging/rtl8712/rtl871x_io.h
47718@@ -108,7 +108,7 @@ struct _io_ops {
47719 u8 *pmem);
47720 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
47721 u8 *pmem);
47722-};
47723+} __no_const;
47724
47725 struct io_req {
47726 struct list_head list;
47727diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
47728index 1f5088b..0e59820 100644
47729--- a/drivers/staging/sbe-2t3e3/netdev.c
47730+++ b/drivers/staging/sbe-2t3e3/netdev.c
47731@@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
47732 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
47733
47734 if (rlen)
47735- if (copy_to_user(data, &resp, rlen))
47736+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
47737 return -EFAULT;
47738
47739 return 0;
47740diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
47741index a863a98..d272795 100644
47742--- a/drivers/staging/usbip/vhci.h
47743+++ b/drivers/staging/usbip/vhci.h
47744@@ -83,7 +83,7 @@ struct vhci_hcd {
47745 unsigned resuming:1;
47746 unsigned long re_timeout;
47747
47748- atomic_t seqnum;
47749+ atomic_unchecked_t seqnum;
47750
47751 /*
47752 * NOTE:
47753diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
47754index d7974cb..d78076b 100644
47755--- a/drivers/staging/usbip/vhci_hcd.c
47756+++ b/drivers/staging/usbip/vhci_hcd.c
47757@@ -441,7 +441,7 @@ static void vhci_tx_urb(struct urb *urb)
47758
47759 spin_lock(&vdev->priv_lock);
47760
47761- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
47762+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
47763 if (priv->seqnum == 0xffff)
47764 dev_info(&urb->dev->dev, "seqnum max\n");
47765
47766@@ -687,7 +687,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
47767 return -ENOMEM;
47768 }
47769
47770- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
47771+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
47772 if (unlink->seqnum == 0xffff)
47773 pr_info("seqnum max\n");
47774
47775@@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
47776 vdev->rhport = rhport;
47777 }
47778
47779- atomic_set(&vhci->seqnum, 0);
47780+ atomic_set_unchecked(&vhci->seqnum, 0);
47781 spin_lock_init(&vhci->lock);
47782
47783 hcd->power_budget = 0; /* no limit */
47784diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
47785index d07fcb5..358e1e1 100644
47786--- a/drivers/staging/usbip/vhci_rx.c
47787+++ b/drivers/staging/usbip/vhci_rx.c
47788@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
47789 if (!urb) {
47790 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
47791 pr_info("max seqnum %d\n",
47792- atomic_read(&the_controller->seqnum));
47793+ atomic_read_unchecked(&the_controller->seqnum));
47794 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
47795 return;
47796 }
47797diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
47798index 8acff44..bdb2fca 100644
47799--- a/drivers/staging/vt6655/hostap.c
47800+++ b/drivers/staging/vt6655/hostap.c
47801@@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
47802 *
47803 */
47804
47805+static net_device_ops_no_const apdev_netdev_ops;
47806+
47807 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
47808 {
47809 PSDevice apdev_priv;
47810 struct net_device *dev = pDevice->dev;
47811 int ret;
47812- const struct net_device_ops apdev_netdev_ops = {
47813- .ndo_start_xmit = pDevice->tx_80211,
47814- };
47815
47816 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
47817
47818@@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
47819 *apdev_priv = *pDevice;
47820 eth_hw_addr_inherit(pDevice->apdev, dev);
47821
47822+ /* only half broken now */
47823+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
47824 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
47825
47826 pDevice->apdev->type = ARPHRD_IEEE80211;
47827diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
47828index c699a30..b90a5fd 100644
47829--- a/drivers/staging/vt6656/hostap.c
47830+++ b/drivers/staging/vt6656/hostap.c
47831@@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
47832 *
47833 */
47834
47835+static net_device_ops_no_const apdev_netdev_ops;
47836+
47837 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
47838 {
47839 struct vnt_private *apdev_priv;
47840 struct net_device *dev = pDevice->dev;
47841 int ret;
47842- const struct net_device_ops apdev_netdev_ops = {
47843- .ndo_start_xmit = pDevice->tx_80211,
47844- };
47845
47846 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
47847
47848@@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
47849 *apdev_priv = *pDevice;
47850 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
47851
47852+ /* only half broken now */
47853+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
47854 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
47855
47856 pDevice->apdev->type = ARPHRD_IEEE80211;
47857diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
47858index e51b09a..5ebac31 100644
47859--- a/drivers/target/sbp/sbp_target.c
47860+++ b/drivers/target/sbp/sbp_target.c
47861@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
47862
47863 #define SESSION_MAINTENANCE_INTERVAL HZ
47864
47865-static atomic_t login_id = ATOMIC_INIT(0);
47866+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
47867
47868 static void session_maintenance_work(struct work_struct *);
47869 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
47870@@ -444,7 +444,7 @@ static void sbp_management_request_login(
47871 login->lun = se_lun;
47872 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
47873 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
47874- login->login_id = atomic_inc_return(&login_id);
47875+ login->login_id = atomic_inc_return_unchecked(&login_id);
47876
47877 login->tgt_agt = sbp_target_agent_register(login);
47878 if (IS_ERR(login->tgt_agt)) {
47879diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
47880index e5e3965..a7b487c 100644
47881--- a/drivers/target/target_core_device.c
47882+++ b/drivers/target/target_core_device.c
47883@@ -1436,7 +1436,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
47884 spin_lock_init(&dev->se_tmr_lock);
47885 spin_lock_init(&dev->qf_cmd_lock);
47886 sema_init(&dev->caw_sem, 1);
47887- atomic_set(&dev->dev_ordered_id, 0);
47888+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
47889 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
47890 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
47891 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
47892diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
47893index 0b0009b..215e88e 100644
47894--- a/drivers/target/target_core_transport.c
47895+++ b/drivers/target/target_core_transport.c
47896@@ -1137,7 +1137,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
47897 * Used to determine when ORDERED commands should go from
47898 * Dormant to Active status.
47899 */
47900- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
47901+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
47902 smp_mb__after_atomic_inc();
47903 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
47904 cmd->se_ordered_id, cmd->sam_task_attr,
47905diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
47906index 33f83fe..d80f8e1 100644
47907--- a/drivers/tty/cyclades.c
47908+++ b/drivers/tty/cyclades.c
47909@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
47910 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
47911 info->port.count);
47912 #endif
47913- info->port.count++;
47914+ atomic_inc(&info->port.count);
47915 #ifdef CY_DEBUG_COUNT
47916 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
47917- current->pid, info->port.count);
47918+ current->pid, atomic_read(&info->port.count));
47919 #endif
47920
47921 /*
47922@@ -3972,7 +3972,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
47923 for (j = 0; j < cy_card[i].nports; j++) {
47924 info = &cy_card[i].ports[j];
47925
47926- if (info->port.count) {
47927+ if (atomic_read(&info->port.count)) {
47928 /* XXX is the ldisc num worth this? */
47929 struct tty_struct *tty;
47930 struct tty_ldisc *ld;
47931diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
47932index 9eba119..5070303 100644
47933--- a/drivers/tty/hvc/hvc_console.c
47934+++ b/drivers/tty/hvc/hvc_console.c
47935@@ -338,7 +338,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
47936
47937 spin_lock_irqsave(&hp->port.lock, flags);
47938 /* Check and then increment for fast path open. */
47939- if (hp->port.count++ > 0) {
47940+ if (atomic_inc_return(&hp->port.count) > 1) {
47941 spin_unlock_irqrestore(&hp->port.lock, flags);
47942 hvc_kick();
47943 return 0;
47944@@ -393,7 +393,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
47945
47946 spin_lock_irqsave(&hp->port.lock, flags);
47947
47948- if (--hp->port.count == 0) {
47949+ if (atomic_dec_return(&hp->port.count) == 0) {
47950 spin_unlock_irqrestore(&hp->port.lock, flags);
47951 /* We are done with the tty pointer now. */
47952 tty_port_tty_set(&hp->port, NULL);
47953@@ -415,9 +415,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
47954 */
47955 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
47956 } else {
47957- if (hp->port.count < 0)
47958+ if (atomic_read(&hp->port.count) < 0)
47959 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
47960- hp->vtermno, hp->port.count);
47961+ hp->vtermno, atomic_read(&hp->port.count));
47962 spin_unlock_irqrestore(&hp->port.lock, flags);
47963 }
47964 }
47965@@ -447,12 +447,12 @@ static void hvc_hangup(struct tty_struct *tty)
47966 * open->hangup case this can be called after the final close so prevent
47967 * that from happening for now.
47968 */
47969- if (hp->port.count <= 0) {
47970+ if (atomic_read(&hp->port.count) <= 0) {
47971 spin_unlock_irqrestore(&hp->port.lock, flags);
47972 return;
47973 }
47974
47975- hp->port.count = 0;
47976+ atomic_set(&hp->port.count, 0);
47977 spin_unlock_irqrestore(&hp->port.lock, flags);
47978 tty_port_tty_set(&hp->port, NULL);
47979
47980@@ -500,7 +500,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
47981 return -EPIPE;
47982
47983 /* FIXME what's this (unprotected) check for? */
47984- if (hp->port.count <= 0)
47985+ if (atomic_read(&hp->port.count) <= 0)
47986 return -EIO;
47987
47988 spin_lock_irqsave(&hp->lock, flags);
47989diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
47990index 81e939e..95ead10 100644
47991--- a/drivers/tty/hvc/hvcs.c
47992+++ b/drivers/tty/hvc/hvcs.c
47993@@ -83,6 +83,7 @@
47994 #include <asm/hvcserver.h>
47995 #include <asm/uaccess.h>
47996 #include <asm/vio.h>
47997+#include <asm/local.h>
47998
47999 /*
48000 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
48001@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
48002
48003 spin_lock_irqsave(&hvcsd->lock, flags);
48004
48005- if (hvcsd->port.count > 0) {
48006+ if (atomic_read(&hvcsd->port.count) > 0) {
48007 spin_unlock_irqrestore(&hvcsd->lock, flags);
48008 printk(KERN_INFO "HVCS: vterm state unchanged. "
48009 "The hvcs device node is still in use.\n");
48010@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
48011 }
48012 }
48013
48014- hvcsd->port.count = 0;
48015+ atomic_set(&hvcsd->port.count, 0);
48016 hvcsd->port.tty = tty;
48017 tty->driver_data = hvcsd;
48018
48019@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
48020 unsigned long flags;
48021
48022 spin_lock_irqsave(&hvcsd->lock, flags);
48023- hvcsd->port.count++;
48024+ atomic_inc(&hvcsd->port.count);
48025 hvcsd->todo_mask |= HVCS_SCHED_READ;
48026 spin_unlock_irqrestore(&hvcsd->lock, flags);
48027
48028@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
48029 hvcsd = tty->driver_data;
48030
48031 spin_lock_irqsave(&hvcsd->lock, flags);
48032- if (--hvcsd->port.count == 0) {
48033+ if (atomic_dec_and_test(&hvcsd->port.count)) {
48034
48035 vio_disable_interrupts(hvcsd->vdev);
48036
48037@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
48038
48039 free_irq(irq, hvcsd);
48040 return;
48041- } else if (hvcsd->port.count < 0) {
48042+ } else if (atomic_read(&hvcsd->port.count) < 0) {
48043 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
48044 " is missmanaged.\n",
48045- hvcsd->vdev->unit_address, hvcsd->port.count);
48046+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
48047 }
48048
48049 spin_unlock_irqrestore(&hvcsd->lock, flags);
48050@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
48051
48052 spin_lock_irqsave(&hvcsd->lock, flags);
48053 /* Preserve this so that we know how many kref refs to put */
48054- temp_open_count = hvcsd->port.count;
48055+ temp_open_count = atomic_read(&hvcsd->port.count);
48056
48057 /*
48058 * Don't kref put inside the spinlock because the destruction
48059@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
48060 tty->driver_data = NULL;
48061 hvcsd->port.tty = NULL;
48062
48063- hvcsd->port.count = 0;
48064+ atomic_set(&hvcsd->port.count, 0);
48065
48066 /* This will drop any buffered data on the floor which is OK in a hangup
48067 * scenario. */
48068@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
48069 * the middle of a write operation? This is a crummy place to do this
48070 * but we want to keep it all in the spinlock.
48071 */
48072- if (hvcsd->port.count <= 0) {
48073+ if (atomic_read(&hvcsd->port.count) <= 0) {
48074 spin_unlock_irqrestore(&hvcsd->lock, flags);
48075 return -ENODEV;
48076 }
48077@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
48078 {
48079 struct hvcs_struct *hvcsd = tty->driver_data;
48080
48081- if (!hvcsd || hvcsd->port.count <= 0)
48082+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
48083 return 0;
48084
48085 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
48086diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
48087index 4190199..48f2920 100644
48088--- a/drivers/tty/hvc/hvsi.c
48089+++ b/drivers/tty/hvc/hvsi.c
48090@@ -85,7 +85,7 @@ struct hvsi_struct {
48091 int n_outbuf;
48092 uint32_t vtermno;
48093 uint32_t virq;
48094- atomic_t seqno; /* HVSI packet sequence number */
48095+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
48096 uint16_t mctrl;
48097 uint8_t state; /* HVSI protocol state */
48098 uint8_t flags;
48099@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
48100
48101 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
48102 packet.hdr.len = sizeof(struct hvsi_query_response);
48103- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48104+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48105 packet.verb = VSV_SEND_VERSION_NUMBER;
48106 packet.u.version = HVSI_VERSION;
48107 packet.query_seqno = query_seqno+1;
48108@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
48109
48110 packet.hdr.type = VS_QUERY_PACKET_HEADER;
48111 packet.hdr.len = sizeof(struct hvsi_query);
48112- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48113+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48114 packet.verb = verb;
48115
48116 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
48117@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
48118 int wrote;
48119
48120 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
48121- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48122+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48123 packet.hdr.len = sizeof(struct hvsi_control);
48124 packet.verb = VSV_SET_MODEM_CTL;
48125 packet.mask = HVSI_TSDTR;
48126@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
48127 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
48128
48129 packet.hdr.type = VS_DATA_PACKET_HEADER;
48130- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48131+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48132 packet.hdr.len = count + sizeof(struct hvsi_header);
48133 memcpy(&packet.data, buf, count);
48134
48135@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
48136 struct hvsi_control packet __ALIGNED__;
48137
48138 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
48139- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48140+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48141 packet.hdr.len = 6;
48142 packet.verb = VSV_CLOSE_PROTOCOL;
48143
48144diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
48145index ac27671..0f627ee 100644
48146--- a/drivers/tty/hvc/hvsi_lib.c
48147+++ b/drivers/tty/hvc/hvsi_lib.c
48148@@ -9,7 +9,7 @@
48149
48150 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
48151 {
48152- packet->seqno = atomic_inc_return(&pv->seqno);
48153+ packet->seqno = atomic_inc_return_unchecked(&pv->seqno);
48154
48155 /* Assumes that always succeeds, works in practice */
48156 return pv->put_chars(pv->termno, (char *)packet, packet->len);
48157@@ -21,7 +21,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
48158
48159 /* Reset state */
48160 pv->established = 0;
48161- atomic_set(&pv->seqno, 0);
48162+ atomic_set_unchecked(&pv->seqno, 0);
48163
48164 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
48165
48166@@ -265,7 +265,7 @@ int hvsilib_read_mctrl(struct hvsi_priv *pv)
48167 pv->mctrl_update = 0;
48168 q.hdr.type = VS_QUERY_PACKET_HEADER;
48169 q.hdr.len = sizeof(struct hvsi_query);
48170- q.hdr.seqno = atomic_inc_return(&pv->seqno);
48171+ q.hdr.seqno = atomic_inc_return_unchecked(&pv->seqno);
48172 q.verb = VSV_SEND_MODEM_CTL_STATUS;
48173 rc = hvsi_send_packet(pv, &q.hdr);
48174 if (rc <= 0) {
48175diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
48176index 8fd72ff..34a0bed 100644
48177--- a/drivers/tty/ipwireless/tty.c
48178+++ b/drivers/tty/ipwireless/tty.c
48179@@ -29,6 +29,7 @@
48180 #include <linux/tty_driver.h>
48181 #include <linux/tty_flip.h>
48182 #include <linux/uaccess.h>
48183+#include <asm/local.h>
48184
48185 #include "tty.h"
48186 #include "network.h"
48187@@ -99,10 +100,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
48188 mutex_unlock(&tty->ipw_tty_mutex);
48189 return -ENODEV;
48190 }
48191- if (tty->port.count == 0)
48192+ if (atomic_read(&tty->port.count) == 0)
48193 tty->tx_bytes_queued = 0;
48194
48195- tty->port.count++;
48196+ atomic_inc(&tty->port.count);
48197
48198 tty->port.tty = linux_tty;
48199 linux_tty->driver_data = tty;
48200@@ -118,9 +119,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
48201
48202 static void do_ipw_close(struct ipw_tty *tty)
48203 {
48204- tty->port.count--;
48205-
48206- if (tty->port.count == 0) {
48207+ if (atomic_dec_return(&tty->port.count) == 0) {
48208 struct tty_struct *linux_tty = tty->port.tty;
48209
48210 if (linux_tty != NULL) {
48211@@ -141,7 +140,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
48212 return;
48213
48214 mutex_lock(&tty->ipw_tty_mutex);
48215- if (tty->port.count == 0) {
48216+ if (atomic_read(&tty->port.count) == 0) {
48217 mutex_unlock(&tty->ipw_tty_mutex);
48218 return;
48219 }
48220@@ -164,7 +163,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
48221
48222 mutex_lock(&tty->ipw_tty_mutex);
48223
48224- if (!tty->port.count) {
48225+ if (!atomic_read(&tty->port.count)) {
48226 mutex_unlock(&tty->ipw_tty_mutex);
48227 return;
48228 }
48229@@ -206,7 +205,7 @@ static int ipw_write(struct tty_struct *linux_tty,
48230 return -ENODEV;
48231
48232 mutex_lock(&tty->ipw_tty_mutex);
48233- if (!tty->port.count) {
48234+ if (!atomic_read(&tty->port.count)) {
48235 mutex_unlock(&tty->ipw_tty_mutex);
48236 return -EINVAL;
48237 }
48238@@ -246,7 +245,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
48239 if (!tty)
48240 return -ENODEV;
48241
48242- if (!tty->port.count)
48243+ if (!atomic_read(&tty->port.count))
48244 return -EINVAL;
48245
48246 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
48247@@ -288,7 +287,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
48248 if (!tty)
48249 return 0;
48250
48251- if (!tty->port.count)
48252+ if (!atomic_read(&tty->port.count))
48253 return 0;
48254
48255 return tty->tx_bytes_queued;
48256@@ -369,7 +368,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
48257 if (!tty)
48258 return -ENODEV;
48259
48260- if (!tty->port.count)
48261+ if (!atomic_read(&tty->port.count))
48262 return -EINVAL;
48263
48264 return get_control_lines(tty);
48265@@ -385,7 +384,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
48266 if (!tty)
48267 return -ENODEV;
48268
48269- if (!tty->port.count)
48270+ if (!atomic_read(&tty->port.count))
48271 return -EINVAL;
48272
48273 return set_control_lines(tty, set, clear);
48274@@ -399,7 +398,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
48275 if (!tty)
48276 return -ENODEV;
48277
48278- if (!tty->port.count)
48279+ if (!atomic_read(&tty->port.count))
48280 return -EINVAL;
48281
48282 /* FIXME: Exactly how is the tty object locked here .. */
48283@@ -555,7 +554,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
48284 * are gone */
48285 mutex_lock(&ttyj->ipw_tty_mutex);
48286 }
48287- while (ttyj->port.count)
48288+ while (atomic_read(&ttyj->port.count))
48289 do_ipw_close(ttyj);
48290 ipwireless_disassociate_network_ttys(network,
48291 ttyj->channel_idx);
48292diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
48293index 1deaca4..c8582d4 100644
48294--- a/drivers/tty/moxa.c
48295+++ b/drivers/tty/moxa.c
48296@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
48297 }
48298
48299 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
48300- ch->port.count++;
48301+ atomic_inc(&ch->port.count);
48302 tty->driver_data = ch;
48303 tty_port_tty_set(&ch->port, tty);
48304 mutex_lock(&ch->port.mutex);
48305diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
48306index c0f76da..d974c32 100644
48307--- a/drivers/tty/n_gsm.c
48308+++ b/drivers/tty/n_gsm.c
48309@@ -1632,7 +1632,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
48310 spin_lock_init(&dlci->lock);
48311 mutex_init(&dlci->mutex);
48312 dlci->fifo = &dlci->_fifo;
48313- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
48314+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
48315 kfree(dlci);
48316 return NULL;
48317 }
48318@@ -2935,7 +2935,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
48319 struct gsm_dlci *dlci = tty->driver_data;
48320 struct tty_port *port = &dlci->port;
48321
48322- port->count++;
48323+ atomic_inc(&port->count);
48324 dlci_get(dlci);
48325 dlci_get(dlci->gsm->dlci[0]);
48326 mux_get(dlci->gsm);
48327diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
48328index d4a89db..dbe8d8c 100644
48329--- a/drivers/tty/n_tty.c
48330+++ b/drivers/tty/n_tty.c
48331@@ -114,7 +114,7 @@ struct n_tty_data {
48332 int minimum_to_wake;
48333
48334 /* consumer-published */
48335- size_t read_tail;
48336+ size_t read_tail __intentional_overflow(-1);
48337 size_t line_start;
48338
48339 /* protected by output lock */
48340@@ -2509,6 +2509,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
48341 {
48342 *ops = tty_ldisc_N_TTY;
48343 ops->owner = NULL;
48344- ops->refcount = ops->flags = 0;
48345+ atomic_set(&ops->refcount, 0);
48346+ ops->flags = 0;
48347 }
48348 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
48349diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
48350index 25c9bc7..24077b7 100644
48351--- a/drivers/tty/pty.c
48352+++ b/drivers/tty/pty.c
48353@@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
48354 panic("Couldn't register Unix98 pts driver");
48355
48356 /* Now create the /dev/ptmx special device */
48357+ pax_open_kernel();
48358 tty_default_fops(&ptmx_fops);
48359- ptmx_fops.open = ptmx_open;
48360+ *(void **)&ptmx_fops.open = ptmx_open;
48361+ pax_close_kernel();
48362
48363 cdev_init(&ptmx_cdev, &ptmx_fops);
48364 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
48365diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
48366index 354564e..fe50d9a 100644
48367--- a/drivers/tty/rocket.c
48368+++ b/drivers/tty/rocket.c
48369@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
48370 tty->driver_data = info;
48371 tty_port_tty_set(port, tty);
48372
48373- if (port->count++ == 0) {
48374+ if (atomic_inc_return(&port->count) == 1) {
48375 atomic_inc(&rp_num_ports_open);
48376
48377 #ifdef ROCKET_DEBUG_OPEN
48378@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
48379 #endif
48380 }
48381 #ifdef ROCKET_DEBUG_OPEN
48382- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
48383+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
48384 #endif
48385
48386 /*
48387@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
48388 spin_unlock_irqrestore(&info->port.lock, flags);
48389 return;
48390 }
48391- if (info->port.count)
48392+ if (atomic_read(&info->port.count))
48393 atomic_dec(&rp_num_ports_open);
48394 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
48395 spin_unlock_irqrestore(&info->port.lock, flags);
48396diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
48397index 1274499..f541382 100644
48398--- a/drivers/tty/serial/ioc4_serial.c
48399+++ b/drivers/tty/serial/ioc4_serial.c
48400@@ -437,7 +437,7 @@ struct ioc4_soft {
48401 } is_intr_info[MAX_IOC4_INTR_ENTS];
48402
48403 /* Number of entries active in the above array */
48404- atomic_t is_num_intrs;
48405+ atomic_unchecked_t is_num_intrs;
48406 } is_intr_type[IOC4_NUM_INTR_TYPES];
48407
48408 /* is_ir_lock must be held while
48409@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
48410 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
48411 || (type == IOC4_OTHER_INTR_TYPE)));
48412
48413- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
48414+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
48415 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
48416
48417 /* Save off the lower level interrupt handler */
48418@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
48419
48420 soft = arg;
48421 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
48422- num_intrs = (int)atomic_read(
48423+ num_intrs = (int)atomic_read_unchecked(
48424 &soft->is_intr_type[intr_type].is_num_intrs);
48425
48426 this_mir = this_ir = pending_intrs(soft, intr_type);
48427diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
48428index a260cde..6b2b5ce 100644
48429--- a/drivers/tty/serial/kgdboc.c
48430+++ b/drivers/tty/serial/kgdboc.c
48431@@ -24,8 +24,9 @@
48432 #define MAX_CONFIG_LEN 40
48433
48434 static struct kgdb_io kgdboc_io_ops;
48435+static struct kgdb_io kgdboc_io_ops_console;
48436
48437-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
48438+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
48439 static int configured = -1;
48440
48441 static char config[MAX_CONFIG_LEN];
48442@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
48443 kgdboc_unregister_kbd();
48444 if (configured == 1)
48445 kgdb_unregister_io_module(&kgdboc_io_ops);
48446+ else if (configured == 2)
48447+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
48448 }
48449
48450 static int configure_kgdboc(void)
48451@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
48452 int err;
48453 char *cptr = config;
48454 struct console *cons;
48455+ int is_console = 0;
48456
48457 err = kgdboc_option_setup(config);
48458 if (err || !strlen(config) || isspace(config[0]))
48459 goto noconfig;
48460
48461 err = -ENODEV;
48462- kgdboc_io_ops.is_console = 0;
48463 kgdb_tty_driver = NULL;
48464
48465 kgdboc_use_kms = 0;
48466@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
48467 int idx;
48468 if (cons->device && cons->device(cons, &idx) == p &&
48469 idx == tty_line) {
48470- kgdboc_io_ops.is_console = 1;
48471+ is_console = 1;
48472 break;
48473 }
48474 cons = cons->next;
48475@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
48476 kgdb_tty_line = tty_line;
48477
48478 do_register:
48479- err = kgdb_register_io_module(&kgdboc_io_ops);
48480+ if (is_console) {
48481+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
48482+ configured = 2;
48483+ } else {
48484+ err = kgdb_register_io_module(&kgdboc_io_ops);
48485+ configured = 1;
48486+ }
48487 if (err)
48488 goto noconfig;
48489
48490@@ -205,8 +214,6 @@ do_register:
48491 if (err)
48492 goto nmi_con_failed;
48493
48494- configured = 1;
48495-
48496 return 0;
48497
48498 nmi_con_failed:
48499@@ -223,7 +230,7 @@ noconfig:
48500 static int __init init_kgdboc(void)
48501 {
48502 /* Already configured? */
48503- if (configured == 1)
48504+ if (configured >= 1)
48505 return 0;
48506
48507 return configure_kgdboc();
48508@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
48509 if (config[len - 1] == '\n')
48510 config[len - 1] = '\0';
48511
48512- if (configured == 1)
48513+ if (configured >= 1)
48514 cleanup_kgdboc();
48515
48516 /* Go and configure with the new params. */
48517@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
48518 .post_exception = kgdboc_post_exp_handler,
48519 };
48520
48521+static struct kgdb_io kgdboc_io_ops_console = {
48522+ .name = "kgdboc",
48523+ .read_char = kgdboc_get_char,
48524+ .write_char = kgdboc_put_char,
48525+ .pre_exception = kgdboc_pre_exp_handler,
48526+ .post_exception = kgdboc_post_exp_handler,
48527+ .is_console = 1
48528+};
48529+
48530 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
48531 /* This is only available if kgdboc is a built in for early debugging */
48532 static int __init kgdboc_early_init(char *opt)
48533diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
48534index b5d779c..3622cfe 100644
48535--- a/drivers/tty/serial/msm_serial.c
48536+++ b/drivers/tty/serial/msm_serial.c
48537@@ -897,7 +897,7 @@ static struct uart_driver msm_uart_driver = {
48538 .cons = MSM_CONSOLE,
48539 };
48540
48541-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
48542+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
48543
48544 static const struct of_device_id msm_uartdm_table[] = {
48545 { .compatible = "qcom,msm-uartdm" },
48546@@ -912,7 +912,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
48547 int irq;
48548
48549 if (pdev->id == -1)
48550- pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
48551+ pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
48552
48553 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
48554 return -ENXIO;
48555diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
48556index f3dfa19..342f2ff 100644
48557--- a/drivers/tty/serial/samsung.c
48558+++ b/drivers/tty/serial/samsung.c
48559@@ -456,11 +456,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
48560 }
48561 }
48562
48563+static int s3c64xx_serial_startup(struct uart_port *port);
48564 static int s3c24xx_serial_startup(struct uart_port *port)
48565 {
48566 struct s3c24xx_uart_port *ourport = to_ourport(port);
48567 int ret;
48568
48569+ /* Startup sequence is different for s3c64xx and higher SoC's */
48570+ if (s3c24xx_serial_has_interrupt_mask(port))
48571+ return s3c64xx_serial_startup(port);
48572+
48573 dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
48574 port->mapbase, port->membase);
48575
48576@@ -1127,10 +1132,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
48577 /* setup info for port */
48578 port->dev = &platdev->dev;
48579
48580- /* Startup sequence is different for s3c64xx and higher SoC's */
48581- if (s3c24xx_serial_has_interrupt_mask(port))
48582- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
48583-
48584 port->uartclk = 1;
48585
48586 if (cfg->uart_flags & UPF_CONS_FLOW) {
48587diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
48588index 0f02351..07c59c5 100644
48589--- a/drivers/tty/serial/serial_core.c
48590+++ b/drivers/tty/serial/serial_core.c
48591@@ -1448,7 +1448,7 @@ static void uart_hangup(struct tty_struct *tty)
48592 uart_flush_buffer(tty);
48593 uart_shutdown(tty, state);
48594 spin_lock_irqsave(&port->lock, flags);
48595- port->count = 0;
48596+ atomic_set(&port->count, 0);
48597 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
48598 spin_unlock_irqrestore(&port->lock, flags);
48599 tty_port_tty_set(port, NULL);
48600@@ -1544,7 +1544,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48601 goto end;
48602 }
48603
48604- port->count++;
48605+ atomic_inc(&port->count);
48606 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
48607 retval = -ENXIO;
48608 goto err_dec_count;
48609@@ -1572,7 +1572,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48610 /*
48611 * Make sure the device is in D0 state.
48612 */
48613- if (port->count == 1)
48614+ if (atomic_read(&port->count) == 1)
48615 uart_change_pm(state, UART_PM_STATE_ON);
48616
48617 /*
48618@@ -1590,7 +1590,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48619 end:
48620 return retval;
48621 err_dec_count:
48622- port->count--;
48623+ atomic_inc(&port->count);
48624 mutex_unlock(&port->mutex);
48625 goto end;
48626 }
48627diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
48628index e1ce141..6d4ed80 100644
48629--- a/drivers/tty/synclink.c
48630+++ b/drivers/tty/synclink.c
48631@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
48632
48633 if (debug_level >= DEBUG_LEVEL_INFO)
48634 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
48635- __FILE__,__LINE__, info->device_name, info->port.count);
48636+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
48637
48638 if (tty_port_close_start(&info->port, tty, filp) == 0)
48639 goto cleanup;
48640@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
48641 cleanup:
48642 if (debug_level >= DEBUG_LEVEL_INFO)
48643 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
48644- tty->driver->name, info->port.count);
48645+ tty->driver->name, atomic_read(&info->port.count));
48646
48647 } /* end of mgsl_close() */
48648
48649@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
48650
48651 mgsl_flush_buffer(tty);
48652 shutdown(info);
48653-
48654- info->port.count = 0;
48655+
48656+ atomic_set(&info->port.count, 0);
48657 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48658 info->port.tty = NULL;
48659
48660@@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
48661
48662 if (debug_level >= DEBUG_LEVEL_INFO)
48663 printk("%s(%d):block_til_ready before block on %s count=%d\n",
48664- __FILE__,__LINE__, tty->driver->name, port->count );
48665+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48666
48667 spin_lock_irqsave(&info->irq_spinlock, flags);
48668 if (!tty_hung_up_p(filp)) {
48669 extra_count = true;
48670- port->count--;
48671+ atomic_dec(&port->count);
48672 }
48673 spin_unlock_irqrestore(&info->irq_spinlock, flags);
48674 port->blocked_open++;
48675@@ -3331,7 +3331,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
48676
48677 if (debug_level >= DEBUG_LEVEL_INFO)
48678 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
48679- __FILE__,__LINE__, tty->driver->name, port->count );
48680+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48681
48682 tty_unlock(tty);
48683 schedule();
48684@@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
48685
48686 /* FIXME: Racy on hangup during close wait */
48687 if (extra_count)
48688- port->count++;
48689+ atomic_inc(&port->count);
48690 port->blocked_open--;
48691
48692 if (debug_level >= DEBUG_LEVEL_INFO)
48693 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
48694- __FILE__,__LINE__, tty->driver->name, port->count );
48695+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48696
48697 if (!retval)
48698 port->flags |= ASYNC_NORMAL_ACTIVE;
48699@@ -3400,7 +3400,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
48700
48701 if (debug_level >= DEBUG_LEVEL_INFO)
48702 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
48703- __FILE__,__LINE__,tty->driver->name, info->port.count);
48704+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
48705
48706 /* If port is closing, signal caller to try again */
48707 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48708@@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
48709 spin_unlock_irqrestore(&info->netlock, flags);
48710 goto cleanup;
48711 }
48712- info->port.count++;
48713+ atomic_inc(&info->port.count);
48714 spin_unlock_irqrestore(&info->netlock, flags);
48715
48716- if (info->port.count == 1) {
48717+ if (atomic_read(&info->port.count) == 1) {
48718 /* 1st open on this device, init hardware */
48719 retval = startup(info);
48720 if (retval < 0)
48721@@ -3446,8 +3446,8 @@ cleanup:
48722 if (retval) {
48723 if (tty->count == 1)
48724 info->port.tty = NULL; /* tty layer will release tty struct */
48725- if(info->port.count)
48726- info->port.count--;
48727+ if (atomic_read(&info->port.count))
48728+ atomic_dec(&info->port.count);
48729 }
48730
48731 return retval;
48732@@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48733 unsigned short new_crctype;
48734
48735 /* return error if TTY interface open */
48736- if (info->port.count)
48737+ if (atomic_read(&info->port.count))
48738 return -EBUSY;
48739
48740 switch (encoding)
48741@@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
48742
48743 /* arbitrate between network and tty opens */
48744 spin_lock_irqsave(&info->netlock, flags);
48745- if (info->port.count != 0 || info->netcount != 0) {
48746+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
48747 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
48748 spin_unlock_irqrestore(&info->netlock, flags);
48749 return -EBUSY;
48750@@ -7846,7 +7846,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48751 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
48752
48753 /* return error if TTY interface open */
48754- if (info->port.count)
48755+ if (atomic_read(&info->port.count))
48756 return -EBUSY;
48757
48758 if (cmd != SIOCWANDEV)
48759diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
48760index 1abf946..1ee34fc 100644
48761--- a/drivers/tty/synclink_gt.c
48762+++ b/drivers/tty/synclink_gt.c
48763@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
48764 tty->driver_data = info;
48765 info->port.tty = tty;
48766
48767- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
48768+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
48769
48770 /* If port is closing, signal caller to try again */
48771 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48772@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
48773 mutex_unlock(&info->port.mutex);
48774 goto cleanup;
48775 }
48776- info->port.count++;
48777+ atomic_inc(&info->port.count);
48778 spin_unlock_irqrestore(&info->netlock, flags);
48779
48780- if (info->port.count == 1) {
48781+ if (atomic_read(&info->port.count) == 1) {
48782 /* 1st open on this device, init hardware */
48783 retval = startup(info);
48784 if (retval < 0) {
48785@@ -715,8 +715,8 @@ cleanup:
48786 if (retval) {
48787 if (tty->count == 1)
48788 info->port.tty = NULL; /* tty layer will release tty struct */
48789- if(info->port.count)
48790- info->port.count--;
48791+ if(atomic_read(&info->port.count))
48792+ atomic_dec(&info->port.count);
48793 }
48794
48795 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
48796@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48797
48798 if (sanity_check(info, tty->name, "close"))
48799 return;
48800- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
48801+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
48802
48803 if (tty_port_close_start(&info->port, tty, filp) == 0)
48804 goto cleanup;
48805@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48806 tty_port_close_end(&info->port, tty);
48807 info->port.tty = NULL;
48808 cleanup:
48809- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
48810+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
48811 }
48812
48813 static void hangup(struct tty_struct *tty)
48814@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
48815 shutdown(info);
48816
48817 spin_lock_irqsave(&info->port.lock, flags);
48818- info->port.count = 0;
48819+ atomic_set(&info->port.count, 0);
48820 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48821 info->port.tty = NULL;
48822 spin_unlock_irqrestore(&info->port.lock, flags);
48823@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48824 unsigned short new_crctype;
48825
48826 /* return error if TTY interface open */
48827- if (info->port.count)
48828+ if (atomic_read(&info->port.count))
48829 return -EBUSY;
48830
48831 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
48832@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
48833
48834 /* arbitrate between network and tty opens */
48835 spin_lock_irqsave(&info->netlock, flags);
48836- if (info->port.count != 0 || info->netcount != 0) {
48837+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
48838 DBGINFO(("%s hdlc_open busy\n", dev->name));
48839 spin_unlock_irqrestore(&info->netlock, flags);
48840 return -EBUSY;
48841@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48842 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
48843
48844 /* return error if TTY interface open */
48845- if (info->port.count)
48846+ if (atomic_read(&info->port.count))
48847 return -EBUSY;
48848
48849 if (cmd != SIOCWANDEV)
48850@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
48851 if (port == NULL)
48852 continue;
48853 spin_lock(&port->lock);
48854- if ((port->port.count || port->netcount) &&
48855+ if ((atomic_read(&port->port.count) || port->netcount) &&
48856 port->pending_bh && !port->bh_running &&
48857 !port->bh_requested) {
48858 DBGISR(("%s bh queued\n", port->device_name));
48859@@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48860 spin_lock_irqsave(&info->lock, flags);
48861 if (!tty_hung_up_p(filp)) {
48862 extra_count = true;
48863- port->count--;
48864+ atomic_dec(&port->count);
48865 }
48866 spin_unlock_irqrestore(&info->lock, flags);
48867 port->blocked_open++;
48868@@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48869 remove_wait_queue(&port->open_wait, &wait);
48870
48871 if (extra_count)
48872- port->count++;
48873+ atomic_inc(&port->count);
48874 port->blocked_open--;
48875
48876 if (!retval)
48877diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
48878index dc6e969..5dc8786 100644
48879--- a/drivers/tty/synclinkmp.c
48880+++ b/drivers/tty/synclinkmp.c
48881@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
48882
48883 if (debug_level >= DEBUG_LEVEL_INFO)
48884 printk("%s(%d):%s open(), old ref count = %d\n",
48885- __FILE__,__LINE__,tty->driver->name, info->port.count);
48886+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
48887
48888 /* If port is closing, signal caller to try again */
48889 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48890@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
48891 spin_unlock_irqrestore(&info->netlock, flags);
48892 goto cleanup;
48893 }
48894- info->port.count++;
48895+ atomic_inc(&info->port.count);
48896 spin_unlock_irqrestore(&info->netlock, flags);
48897
48898- if (info->port.count == 1) {
48899+ if (atomic_read(&info->port.count) == 1) {
48900 /* 1st open on this device, init hardware */
48901 retval = startup(info);
48902 if (retval < 0)
48903@@ -796,8 +796,8 @@ cleanup:
48904 if (retval) {
48905 if (tty->count == 1)
48906 info->port.tty = NULL; /* tty layer will release tty struct */
48907- if(info->port.count)
48908- info->port.count--;
48909+ if(atomic_read(&info->port.count))
48910+ atomic_dec(&info->port.count);
48911 }
48912
48913 return retval;
48914@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48915
48916 if (debug_level >= DEBUG_LEVEL_INFO)
48917 printk("%s(%d):%s close() entry, count=%d\n",
48918- __FILE__,__LINE__, info->device_name, info->port.count);
48919+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
48920
48921 if (tty_port_close_start(&info->port, tty, filp) == 0)
48922 goto cleanup;
48923@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48924 cleanup:
48925 if (debug_level >= DEBUG_LEVEL_INFO)
48926 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
48927- tty->driver->name, info->port.count);
48928+ tty->driver->name, atomic_read(&info->port.count));
48929 }
48930
48931 /* Called by tty_hangup() when a hangup is signaled.
48932@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
48933 shutdown(info);
48934
48935 spin_lock_irqsave(&info->port.lock, flags);
48936- info->port.count = 0;
48937+ atomic_set(&info->port.count, 0);
48938 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48939 info->port.tty = NULL;
48940 spin_unlock_irqrestore(&info->port.lock, flags);
48941@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48942 unsigned short new_crctype;
48943
48944 /* return error if TTY interface open */
48945- if (info->port.count)
48946+ if (atomic_read(&info->port.count))
48947 return -EBUSY;
48948
48949 switch (encoding)
48950@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
48951
48952 /* arbitrate between network and tty opens */
48953 spin_lock_irqsave(&info->netlock, flags);
48954- if (info->port.count != 0 || info->netcount != 0) {
48955+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
48956 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
48957 spin_unlock_irqrestore(&info->netlock, flags);
48958 return -EBUSY;
48959@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48960 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
48961
48962 /* return error if TTY interface open */
48963- if (info->port.count)
48964+ if (atomic_read(&info->port.count))
48965 return -EBUSY;
48966
48967 if (cmd != SIOCWANDEV)
48968@@ -2620,7 +2620,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
48969 * do not request bottom half processing if the
48970 * device is not open in a normal mode.
48971 */
48972- if ( port && (port->port.count || port->netcount) &&
48973+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
48974 port->pending_bh && !port->bh_running &&
48975 !port->bh_requested ) {
48976 if ( debug_level >= DEBUG_LEVEL_ISR )
48977@@ -3318,12 +3318,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48978
48979 if (debug_level >= DEBUG_LEVEL_INFO)
48980 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
48981- __FILE__,__LINE__, tty->driver->name, port->count );
48982+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48983
48984 spin_lock_irqsave(&info->lock, flags);
48985 if (!tty_hung_up_p(filp)) {
48986 extra_count = true;
48987- port->count--;
48988+ atomic_dec(&port->count);
48989 }
48990 spin_unlock_irqrestore(&info->lock, flags);
48991 port->blocked_open++;
48992@@ -3352,7 +3352,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48993
48994 if (debug_level >= DEBUG_LEVEL_INFO)
48995 printk("%s(%d):%s block_til_ready() count=%d\n",
48996- __FILE__,__LINE__, tty->driver->name, port->count );
48997+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48998
48999 tty_unlock(tty);
49000 schedule();
49001@@ -3363,12 +3363,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
49002 remove_wait_queue(&port->open_wait, &wait);
49003
49004 if (extra_count)
49005- port->count++;
49006+ atomic_inc(&port->count);
49007 port->blocked_open--;
49008
49009 if (debug_level >= DEBUG_LEVEL_INFO)
49010 printk("%s(%d):%s block_til_ready() after, count=%d\n",
49011- __FILE__,__LINE__, tty->driver->name, port->count );
49012+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
49013
49014 if (!retval)
49015 port->flags |= ASYNC_NORMAL_ACTIVE;
49016diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
49017index 40a9fe9..a3f10cc 100644
49018--- a/drivers/tty/sysrq.c
49019+++ b/drivers/tty/sysrq.c
49020@@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
49021 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
49022 size_t count, loff_t *ppos)
49023 {
49024- if (count) {
49025+ if (count && capable(CAP_SYS_ADMIN)) {
49026 char c;
49027
49028 if (get_user(c, buf))
49029diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
49030index c74a00a..02cf211a 100644
49031--- a/drivers/tty/tty_io.c
49032+++ b/drivers/tty/tty_io.c
49033@@ -3474,7 +3474,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
49034
49035 void tty_default_fops(struct file_operations *fops)
49036 {
49037- *fops = tty_fops;
49038+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
49039 }
49040
49041 /*
49042diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
49043index 6458e11..6cfc218 100644
49044--- a/drivers/tty/tty_ldisc.c
49045+++ b/drivers/tty/tty_ldisc.c
49046@@ -72,7 +72,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
49047 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49048 tty_ldiscs[disc] = new_ldisc;
49049 new_ldisc->num = disc;
49050- new_ldisc->refcount = 0;
49051+ atomic_set(&new_ldisc->refcount, 0);
49052 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
49053
49054 return ret;
49055@@ -100,7 +100,7 @@ int tty_unregister_ldisc(int disc)
49056 return -EINVAL;
49057
49058 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49059- if (tty_ldiscs[disc]->refcount)
49060+ if (atomic_read(&tty_ldiscs[disc]->refcount))
49061 ret = -EBUSY;
49062 else
49063 tty_ldiscs[disc] = NULL;
49064@@ -121,7 +121,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
49065 if (ldops) {
49066 ret = ERR_PTR(-EAGAIN);
49067 if (try_module_get(ldops->owner)) {
49068- ldops->refcount++;
49069+ atomic_inc(&ldops->refcount);
49070 ret = ldops;
49071 }
49072 }
49073@@ -134,7 +134,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
49074 unsigned long flags;
49075
49076 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49077- ldops->refcount--;
49078+ atomic_dec(&ldops->refcount);
49079 module_put(ldops->owner);
49080 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
49081 }
49082diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
49083index f597e88..b7f68ed 100644
49084--- a/drivers/tty/tty_port.c
49085+++ b/drivers/tty/tty_port.c
49086@@ -232,7 +232,7 @@ void tty_port_hangup(struct tty_port *port)
49087 unsigned long flags;
49088
49089 spin_lock_irqsave(&port->lock, flags);
49090- port->count = 0;
49091+ atomic_set(&port->count, 0);
49092 port->flags &= ~ASYNC_NORMAL_ACTIVE;
49093 tty = port->tty;
49094 if (tty)
49095@@ -390,7 +390,7 @@ int tty_port_block_til_ready(struct tty_port *port,
49096 /* The port lock protects the port counts */
49097 spin_lock_irqsave(&port->lock, flags);
49098 if (!tty_hung_up_p(filp))
49099- port->count--;
49100+ atomic_dec(&port->count);
49101 port->blocked_open++;
49102 spin_unlock_irqrestore(&port->lock, flags);
49103
49104@@ -432,7 +432,7 @@ int tty_port_block_til_ready(struct tty_port *port,
49105 we must not mess that up further */
49106 spin_lock_irqsave(&port->lock, flags);
49107 if (!tty_hung_up_p(filp))
49108- port->count++;
49109+ atomic_inc(&port->count);
49110 port->blocked_open--;
49111 if (retval == 0)
49112 port->flags |= ASYNC_NORMAL_ACTIVE;
49113@@ -466,19 +466,19 @@ int tty_port_close_start(struct tty_port *port,
49114 return 0;
49115 }
49116
49117- if (tty->count == 1 && port->count != 1) {
49118+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
49119 printk(KERN_WARNING
49120 "tty_port_close_start: tty->count = 1 port count = %d.\n",
49121- port->count);
49122- port->count = 1;
49123+ atomic_read(&port->count));
49124+ atomic_set(&port->count, 1);
49125 }
49126- if (--port->count < 0) {
49127+ if (atomic_dec_return(&port->count) < 0) {
49128 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
49129- port->count);
49130- port->count = 0;
49131+ atomic_read(&port->count));
49132+ atomic_set(&port->count, 0);
49133 }
49134
49135- if (port->count) {
49136+ if (atomic_read(&port->count)) {
49137 spin_unlock_irqrestore(&port->lock, flags);
49138 if (port->ops->drop)
49139 port->ops->drop(port);
49140@@ -564,7 +564,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
49141 {
49142 spin_lock_irq(&port->lock);
49143 if (!tty_hung_up_p(filp))
49144- ++port->count;
49145+ atomic_inc(&port->count);
49146 spin_unlock_irq(&port->lock);
49147 tty_port_tty_set(port, tty);
49148
49149diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
49150index d0e3a44..5f8b754 100644
49151--- a/drivers/tty/vt/keyboard.c
49152+++ b/drivers/tty/vt/keyboard.c
49153@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
49154 kbd->kbdmode == VC_OFF) &&
49155 value != KVAL(K_SAK))
49156 return; /* SAK is allowed even in raw mode */
49157+
49158+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
49159+ {
49160+ void *func = fn_handler[value];
49161+ if (func == fn_show_state || func == fn_show_ptregs ||
49162+ func == fn_show_mem)
49163+ return;
49164+ }
49165+#endif
49166+
49167 fn_handler[value](vc);
49168 }
49169
49170@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
49171 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
49172 return -EFAULT;
49173
49174- if (!capable(CAP_SYS_TTY_CONFIG))
49175- perm = 0;
49176-
49177 switch (cmd) {
49178 case KDGKBENT:
49179 /* Ensure another thread doesn't free it under us */
49180@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
49181 spin_unlock_irqrestore(&kbd_event_lock, flags);
49182 return put_user(val, &user_kbe->kb_value);
49183 case KDSKBENT:
49184+ if (!capable(CAP_SYS_TTY_CONFIG))
49185+ perm = 0;
49186+
49187 if (!perm)
49188 return -EPERM;
49189 if (!i && v == K_NOSUCHMAP) {
49190@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
49191 int i, j, k;
49192 int ret;
49193
49194- if (!capable(CAP_SYS_TTY_CONFIG))
49195- perm = 0;
49196-
49197 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
49198 if (!kbs) {
49199 ret = -ENOMEM;
49200@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
49201 kfree(kbs);
49202 return ((p && *p) ? -EOVERFLOW : 0);
49203 case KDSKBSENT:
49204+ if (!capable(CAP_SYS_TTY_CONFIG))
49205+ perm = 0;
49206+
49207 if (!perm) {
49208 ret = -EPERM;
49209 goto reterr;
49210diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
49211index 0e808cf..d7d274b 100644
49212--- a/drivers/uio/uio.c
49213+++ b/drivers/uio/uio.c
49214@@ -25,6 +25,7 @@
49215 #include <linux/kobject.h>
49216 #include <linux/cdev.h>
49217 #include <linux/uio_driver.h>
49218+#include <asm/local.h>
49219
49220 #define UIO_MAX_DEVICES (1U << MINORBITS)
49221
49222@@ -32,7 +33,7 @@ struct uio_device {
49223 struct module *owner;
49224 struct device *dev;
49225 int minor;
49226- atomic_t event;
49227+ atomic_unchecked_t event;
49228 struct fasync_struct *async_queue;
49229 wait_queue_head_t wait;
49230 struct uio_info *info;
49231@@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
49232 struct device_attribute *attr, char *buf)
49233 {
49234 struct uio_device *idev = dev_get_drvdata(dev);
49235- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
49236+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
49237 }
49238 static DEVICE_ATTR_RO(event);
49239
49240@@ -401,7 +402,7 @@ void uio_event_notify(struct uio_info *info)
49241 {
49242 struct uio_device *idev = info->uio_dev;
49243
49244- atomic_inc(&idev->event);
49245+ atomic_inc_unchecked(&idev->event);
49246 wake_up_interruptible(&idev->wait);
49247 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
49248 }
49249@@ -454,7 +455,7 @@ static int uio_open(struct inode *inode, struct file *filep)
49250 }
49251
49252 listener->dev = idev;
49253- listener->event_count = atomic_read(&idev->event);
49254+ listener->event_count = atomic_read_unchecked(&idev->event);
49255 filep->private_data = listener;
49256
49257 if (idev->info->open) {
49258@@ -505,7 +506,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
49259 return -EIO;
49260
49261 poll_wait(filep, &idev->wait, wait);
49262- if (listener->event_count != atomic_read(&idev->event))
49263+ if (listener->event_count != atomic_read_unchecked(&idev->event))
49264 return POLLIN | POLLRDNORM;
49265 return 0;
49266 }
49267@@ -530,7 +531,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
49268 do {
49269 set_current_state(TASK_INTERRUPTIBLE);
49270
49271- event_count = atomic_read(&idev->event);
49272+ event_count = atomic_read_unchecked(&idev->event);
49273 if (event_count != listener->event_count) {
49274 if (copy_to_user(buf, &event_count, count))
49275 retval = -EFAULT;
49276@@ -587,9 +588,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
49277 static int uio_find_mem_index(struct vm_area_struct *vma)
49278 {
49279 struct uio_device *idev = vma->vm_private_data;
49280+ unsigned long size;
49281
49282 if (vma->vm_pgoff < MAX_UIO_MAPS) {
49283- if (idev->info->mem[vma->vm_pgoff].size == 0)
49284+ size = idev->info->mem[vma->vm_pgoff].size;
49285+ if (size == 0)
49286+ return -1;
49287+ if (vma->vm_end - vma->vm_start > size)
49288 return -1;
49289 return (int)vma->vm_pgoff;
49290 }
49291@@ -647,6 +652,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
49292 return -EINVAL;
49293 mem = idev->info->mem + mi;
49294
49295+ if (mem->addr & ~PAGE_MASK)
49296+ return -ENODEV;
49297 if (vma->vm_end - vma->vm_start > mem->size)
49298 return -EINVAL;
49299
49300@@ -818,7 +825,7 @@ int __uio_register_device(struct module *owner,
49301 idev->owner = owner;
49302 idev->info = info;
49303 init_waitqueue_head(&idev->wait);
49304- atomic_set(&idev->event, 0);
49305+ atomic_set_unchecked(&idev->event, 0);
49306
49307 ret = uio_get_minor(idev);
49308 if (ret)
49309diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
49310index 8a7eb77..c00402f 100644
49311--- a/drivers/usb/atm/cxacru.c
49312+++ b/drivers/usb/atm/cxacru.c
49313@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
49314 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
49315 if (ret < 2)
49316 return -EINVAL;
49317- if (index < 0 || index > 0x7f)
49318+ if (index > 0x7f)
49319 return -EINVAL;
49320 pos += tmp;
49321
49322diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
49323index 25a7bfc..57f3cf5 100644
49324--- a/drivers/usb/atm/usbatm.c
49325+++ b/drivers/usb/atm/usbatm.c
49326@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49327 if (printk_ratelimit())
49328 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
49329 __func__, vpi, vci);
49330- atomic_inc(&vcc->stats->rx_err);
49331+ atomic_inc_unchecked(&vcc->stats->rx_err);
49332 return;
49333 }
49334
49335@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49336 if (length > ATM_MAX_AAL5_PDU) {
49337 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
49338 __func__, length, vcc);
49339- atomic_inc(&vcc->stats->rx_err);
49340+ atomic_inc_unchecked(&vcc->stats->rx_err);
49341 goto out;
49342 }
49343
49344@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49345 if (sarb->len < pdu_length) {
49346 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
49347 __func__, pdu_length, sarb->len, vcc);
49348- atomic_inc(&vcc->stats->rx_err);
49349+ atomic_inc_unchecked(&vcc->stats->rx_err);
49350 goto out;
49351 }
49352
49353 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
49354 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
49355 __func__, vcc);
49356- atomic_inc(&vcc->stats->rx_err);
49357+ atomic_inc_unchecked(&vcc->stats->rx_err);
49358 goto out;
49359 }
49360
49361@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49362 if (printk_ratelimit())
49363 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
49364 __func__, length);
49365- atomic_inc(&vcc->stats->rx_drop);
49366+ atomic_inc_unchecked(&vcc->stats->rx_drop);
49367 goto out;
49368 }
49369
49370@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49371
49372 vcc->push(vcc, skb);
49373
49374- atomic_inc(&vcc->stats->rx);
49375+ atomic_inc_unchecked(&vcc->stats->rx);
49376 out:
49377 skb_trim(sarb, 0);
49378 }
49379@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
49380 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
49381
49382 usbatm_pop(vcc, skb);
49383- atomic_inc(&vcc->stats->tx);
49384+ atomic_inc_unchecked(&vcc->stats->tx);
49385
49386 skb = skb_dequeue(&instance->sndqueue);
49387 }
49388@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
49389 if (!left--)
49390 return sprintf(page,
49391 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
49392- atomic_read(&atm_dev->stats.aal5.tx),
49393- atomic_read(&atm_dev->stats.aal5.tx_err),
49394- atomic_read(&atm_dev->stats.aal5.rx),
49395- atomic_read(&atm_dev->stats.aal5.rx_err),
49396- atomic_read(&atm_dev->stats.aal5.rx_drop));
49397+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
49398+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
49399+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
49400+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
49401+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
49402
49403 if (!left--) {
49404 if (instance->disconnected)
49405diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
49406index 2a3bbdf..91d72cf 100644
49407--- a/drivers/usb/core/devices.c
49408+++ b/drivers/usb/core/devices.c
49409@@ -126,7 +126,7 @@ static const char format_endpt[] =
49410 * time it gets called.
49411 */
49412 static struct device_connect_event {
49413- atomic_t count;
49414+ atomic_unchecked_t count;
49415 wait_queue_head_t wait;
49416 } device_event = {
49417 .count = ATOMIC_INIT(1),
49418@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
49419
49420 void usbfs_conn_disc_event(void)
49421 {
49422- atomic_add(2, &device_event.count);
49423+ atomic_add_unchecked(2, &device_event.count);
49424 wake_up(&device_event.wait);
49425 }
49426
49427@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
49428
49429 poll_wait(file, &device_event.wait, wait);
49430
49431- event_count = atomic_read(&device_event.count);
49432+ event_count = atomic_read_unchecked(&device_event.count);
49433 if (file->f_version != event_count) {
49434 file->f_version = event_count;
49435 return POLLIN | POLLRDNORM;
49436diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
49437index 71dc5d7..d4c488f 100644
49438--- a/drivers/usb/core/devio.c
49439+++ b/drivers/usb/core/devio.c
49440@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
49441 struct dev_state *ps = file->private_data;
49442 struct usb_device *dev = ps->dev;
49443 ssize_t ret = 0;
49444- unsigned len;
49445+ size_t len;
49446 loff_t pos;
49447 int i;
49448
49449@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
49450 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
49451 struct usb_config_descriptor *config =
49452 (struct usb_config_descriptor *)dev->rawdescriptors[i];
49453- unsigned int length = le16_to_cpu(config->wTotalLength);
49454+ size_t length = le16_to_cpu(config->wTotalLength);
49455
49456 if (*ppos < pos + length) {
49457
49458 /* The descriptor may claim to be longer than it
49459 * really is. Here is the actual allocated length. */
49460- unsigned alloclen =
49461+ size_t alloclen =
49462 le16_to_cpu(dev->config[i].desc.wTotalLength);
49463
49464- len = length - (*ppos - pos);
49465+ len = length + pos - *ppos;
49466 if (len > nbytes)
49467 len = nbytes;
49468
49469 /* Simply don't write (skip over) unallocated parts */
49470 if (alloclen > (*ppos - pos)) {
49471- alloclen -= (*ppos - pos);
49472+ alloclen = alloclen + pos - *ppos;
49473 if (copy_to_user(buf,
49474 dev->rawdescriptors[i] + (*ppos - pos),
49475 min(len, alloclen))) {
49476diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
49477index f20a044..d1059aa 100644
49478--- a/drivers/usb/core/hcd.c
49479+++ b/drivers/usb/core/hcd.c
49480@@ -1552,7 +1552,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
49481 */
49482 usb_get_urb(urb);
49483 atomic_inc(&urb->use_count);
49484- atomic_inc(&urb->dev->urbnum);
49485+ atomic_inc_unchecked(&urb->dev->urbnum);
49486 usbmon_urb_submit(&hcd->self, urb);
49487
49488 /* NOTE requirements on root-hub callers (usbfs and the hub
49489@@ -1579,7 +1579,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
49490 urb->hcpriv = NULL;
49491 INIT_LIST_HEAD(&urb->urb_list);
49492 atomic_dec(&urb->use_count);
49493- atomic_dec(&urb->dev->urbnum);
49494+ atomic_dec_unchecked(&urb->dev->urbnum);
49495 if (atomic_read(&urb->reject))
49496 wake_up(&usb_kill_urb_queue);
49497 usb_put_urb(urb);
49498diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
49499index c5c3667..e54e5cd 100644
49500--- a/drivers/usb/core/hub.c
49501+++ b/drivers/usb/core/hub.c
49502@@ -27,6 +27,7 @@
49503 #include <linux/freezer.h>
49504 #include <linux/random.h>
49505 #include <linux/pm_qos.h>
49506+#include <linux/grsecurity.h>
49507
49508 #include <asm/uaccess.h>
49509 #include <asm/byteorder.h>
49510@@ -4467,6 +4468,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
49511 goto done;
49512 return;
49513 }
49514+
49515+ if (gr_handle_new_usb())
49516+ goto done;
49517+
49518 if (hub_is_superspeed(hub->hdev))
49519 unit_load = 150;
49520 else
49521diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
49522index 82927e1..4993dbf 100644
49523--- a/drivers/usb/core/message.c
49524+++ b/drivers/usb/core/message.c
49525@@ -129,7 +129,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
49526 * Return: If successful, the number of bytes transferred. Otherwise, a negative
49527 * error number.
49528 */
49529-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
49530+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
49531 __u8 requesttype, __u16 value, __u16 index, void *data,
49532 __u16 size, int timeout)
49533 {
49534@@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
49535 * If successful, 0. Otherwise a negative error number. The number of actual
49536 * bytes transferred will be stored in the @actual_length paramater.
49537 */
49538-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
49539+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
49540 void *data, int len, int *actual_length, int timeout)
49541 {
49542 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
49543@@ -221,7 +221,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
49544 * bytes transferred will be stored in the @actual_length paramater.
49545 *
49546 */
49547-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
49548+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
49549 void *data, int len, int *actual_length, int timeout)
49550 {
49551 struct urb *urb;
49552diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
49553index ca516ac..6c36ee4 100644
49554--- a/drivers/usb/core/sysfs.c
49555+++ b/drivers/usb/core/sysfs.c
49556@@ -236,7 +236,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
49557 struct usb_device *udev;
49558
49559 udev = to_usb_device(dev);
49560- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
49561+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
49562 }
49563 static DEVICE_ATTR_RO(urbnum);
49564
49565diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
49566index 0a6ee2e..6f8d7e8 100644
49567--- a/drivers/usb/core/usb.c
49568+++ b/drivers/usb/core/usb.c
49569@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
49570 set_dev_node(&dev->dev, dev_to_node(bus->controller));
49571 dev->state = USB_STATE_ATTACHED;
49572 dev->lpm_disable_count = 1;
49573- atomic_set(&dev->urbnum, 0);
49574+ atomic_set_unchecked(&dev->urbnum, 0);
49575
49576 INIT_LIST_HEAD(&dev->ep0.urb_list);
49577 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
49578diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
49579index 02e44fc..3c4fe64 100644
49580--- a/drivers/usb/dwc3/gadget.c
49581+++ b/drivers/usb/dwc3/gadget.c
49582@@ -532,8 +532,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
49583 if (!usb_endpoint_xfer_isoc(desc))
49584 return 0;
49585
49586- memset(&trb_link, 0, sizeof(trb_link));
49587-
49588 /* Link TRB for ISOC. The HWO bit is never reset */
49589 trb_st_hw = &dep->trb_pool[0];
49590
49591diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
49592index 5e29dde..eca992f 100644
49593--- a/drivers/usb/early/ehci-dbgp.c
49594+++ b/drivers/usb/early/ehci-dbgp.c
49595@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
49596
49597 #ifdef CONFIG_KGDB
49598 static struct kgdb_io kgdbdbgp_io_ops;
49599-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
49600+static struct kgdb_io kgdbdbgp_io_ops_console;
49601+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
49602 #else
49603 #define dbgp_kgdb_mode (0)
49604 #endif
49605@@ -1047,6 +1048,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
49606 .write_char = kgdbdbgp_write_char,
49607 };
49608
49609+static struct kgdb_io kgdbdbgp_io_ops_console = {
49610+ .name = "kgdbdbgp",
49611+ .read_char = kgdbdbgp_read_char,
49612+ .write_char = kgdbdbgp_write_char,
49613+ .is_console = 1
49614+};
49615+
49616 static int kgdbdbgp_wait_time;
49617
49618 static int __init kgdbdbgp_parse_config(char *str)
49619@@ -1062,8 +1070,10 @@ static int __init kgdbdbgp_parse_config(char *str)
49620 ptr++;
49621 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
49622 }
49623- kgdb_register_io_module(&kgdbdbgp_io_ops);
49624- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
49625+ if (early_dbgp_console.index != -1)
49626+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
49627+ else
49628+ kgdb_register_io_module(&kgdbdbgp_io_ops);
49629
49630 return 0;
49631 }
49632diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
49633index b369292..9f3ba40 100644
49634--- a/drivers/usb/gadget/u_serial.c
49635+++ b/drivers/usb/gadget/u_serial.c
49636@@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
49637 spin_lock_irq(&port->port_lock);
49638
49639 /* already open? Great. */
49640- if (port->port.count) {
49641+ if (atomic_read(&port->port.count)) {
49642 status = 0;
49643- port->port.count++;
49644+ atomic_inc(&port->port.count);
49645
49646 /* currently opening/closing? wait ... */
49647 } else if (port->openclose) {
49648@@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
49649 tty->driver_data = port;
49650 port->port.tty = tty;
49651
49652- port->port.count = 1;
49653+ atomic_set(&port->port.count, 1);
49654 port->openclose = false;
49655
49656 /* if connected, start the I/O stream */
49657@@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
49658
49659 spin_lock_irq(&port->port_lock);
49660
49661- if (port->port.count != 1) {
49662- if (port->port.count == 0)
49663+ if (atomic_read(&port->port.count) != 1) {
49664+ if (atomic_read(&port->port.count) == 0)
49665 WARN_ON(1);
49666 else
49667- --port->port.count;
49668+ atomic_dec(&port->port.count);
49669 goto exit;
49670 }
49671
49672@@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
49673 * and sleep if necessary
49674 */
49675 port->openclose = true;
49676- port->port.count = 0;
49677+ atomic_set(&port->port.count, 0);
49678
49679 gser = port->port_usb;
49680 if (gser && gser->disconnect)
49681@@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
49682 int cond;
49683
49684 spin_lock_irq(&port->port_lock);
49685- cond = (port->port.count == 0) && !port->openclose;
49686+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
49687 spin_unlock_irq(&port->port_lock);
49688 return cond;
49689 }
49690@@ -1209,7 +1209,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
49691 /* if it's already open, start I/O ... and notify the serial
49692 * protocol about open/close status (connect/disconnect).
49693 */
49694- if (port->port.count) {
49695+ if (atomic_read(&port->port.count)) {
49696 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
49697 gs_start_io(port);
49698 if (gser->connect)
49699@@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
49700
49701 port->port_usb = NULL;
49702 gser->ioport = NULL;
49703- if (port->port.count > 0 || port->openclose) {
49704+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
49705 wake_up_interruptible(&port->drain_wait);
49706 if (port->port.tty)
49707 tty_hangup(port->port.tty);
49708@@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
49709
49710 /* finally, free any unused/unusable I/O buffers */
49711 spin_lock_irqsave(&port->port_lock, flags);
49712- if (port->port.count == 0 && !port->openclose)
49713+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
49714 gs_buf_free(&port->port_write_buf);
49715 gs_free_requests(gser->out, &port->read_pool, NULL);
49716 gs_free_requests(gser->out, &port->read_queue, NULL);
49717diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
49718index 835fc08..f8b22bf 100644
49719--- a/drivers/usb/host/ehci-hub.c
49720+++ b/drivers/usb/host/ehci-hub.c
49721@@ -762,7 +762,7 @@ static struct urb *request_single_step_set_feature_urb(
49722 urb->transfer_flags = URB_DIR_IN;
49723 usb_get_urb(urb);
49724 atomic_inc(&urb->use_count);
49725- atomic_inc(&urb->dev->urbnum);
49726+ atomic_inc_unchecked(&urb->dev->urbnum);
49727 urb->setup_dma = dma_map_single(
49728 hcd->self.controller,
49729 urb->setup_packet,
49730@@ -829,7 +829,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
49731 urb->status = -EINPROGRESS;
49732 usb_get_urb(urb);
49733 atomic_inc(&urb->use_count);
49734- atomic_inc(&urb->dev->urbnum);
49735+ atomic_inc_unchecked(&urb->dev->urbnum);
49736 retval = submit_single_step_set_feature(hcd, urb, 0);
49737 if (!retval && !wait_for_completion_timeout(&done,
49738 msecs_to_jiffies(2000))) {
49739diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
49740index ba6a5d6..f88f7f3 100644
49741--- a/drivers/usb/misc/appledisplay.c
49742+++ b/drivers/usb/misc/appledisplay.c
49743@@ -83,7 +83,7 @@ struct appledisplay {
49744 spinlock_t lock;
49745 };
49746
49747-static atomic_t count_displays = ATOMIC_INIT(0);
49748+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
49749 static struct workqueue_struct *wq;
49750
49751 static void appledisplay_complete(struct urb *urb)
49752@@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,
49753
49754 /* Register backlight device */
49755 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
49756- atomic_inc_return(&count_displays) - 1);
49757+ atomic_inc_return_unchecked(&count_displays) - 1);
49758 memset(&props, 0, sizeof(struct backlight_properties));
49759 props.type = BACKLIGHT_RAW;
49760 props.max_brightness = 0xff;
49761diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
49762index c69bb50..215ef37 100644
49763--- a/drivers/usb/serial/console.c
49764+++ b/drivers/usb/serial/console.c
49765@@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options)
49766
49767 info->port = port;
49768
49769- ++port->port.count;
49770+ atomic_inc(&port->port.count);
49771 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
49772 if (serial->type->set_termios) {
49773 /*
49774@@ -170,7 +170,7 @@ static int usb_console_setup(struct console *co, char *options)
49775 }
49776 /* Now that any required fake tty operations are completed restore
49777 * the tty port count */
49778- --port->port.count;
49779+ atomic_dec(&port->port.count);
49780 /* The console is special in terms of closing the device so
49781 * indicate this port is now acting as a system console. */
49782 port->port.console = 1;
49783@@ -183,7 +183,7 @@ static int usb_console_setup(struct console *co, char *options)
49784 free_tty:
49785 kfree(tty);
49786 reset_open_count:
49787- port->port.count = 0;
49788+ atomic_set(&port->port.count, 0);
49789 usb_autopm_put_interface(serial->interface);
49790 error_get_interface:
49791 usb_serial_put(serial);
49792@@ -194,7 +194,7 @@ static int usb_console_setup(struct console *co, char *options)
49793 static void usb_console_write(struct console *co,
49794 const char *buf, unsigned count)
49795 {
49796- static struct usbcons_info *info = &usbcons_info;
49797+ struct usbcons_info *info = &usbcons_info;
49798 struct usb_serial_port *port = info->port;
49799 struct usb_serial *serial;
49800 int retval = -ENODEV;
49801diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
49802index 75f70f0..d467e1a 100644
49803--- a/drivers/usb/storage/usb.h
49804+++ b/drivers/usb/storage/usb.h
49805@@ -63,7 +63,7 @@ struct us_unusual_dev {
49806 __u8 useProtocol;
49807 __u8 useTransport;
49808 int (*initFunction)(struct us_data *);
49809-};
49810+} __do_const;
49811
49812
49813 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
49814diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
49815index cf250c2..ad9d904 100644
49816--- a/drivers/usb/wusbcore/wa-hc.h
49817+++ b/drivers/usb/wusbcore/wa-hc.h
49818@@ -199,7 +199,7 @@ struct wahc {
49819 spinlock_t xfer_list_lock;
49820 struct work_struct xfer_enqueue_work;
49821 struct work_struct xfer_error_work;
49822- atomic_t xfer_id_count;
49823+ atomic_unchecked_t xfer_id_count;
49824 };
49825
49826
49827@@ -255,7 +255,7 @@ static inline void wa_init(struct wahc *wa)
49828 spin_lock_init(&wa->xfer_list_lock);
49829 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
49830 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
49831- atomic_set(&wa->xfer_id_count, 1);
49832+ atomic_set_unchecked(&wa->xfer_id_count, 1);
49833 }
49834
49835 /**
49836diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
49837index 3dcf66f..8faaf6e 100644
49838--- a/drivers/usb/wusbcore/wa-xfer.c
49839+++ b/drivers/usb/wusbcore/wa-xfer.c
49840@@ -300,7 +300,7 @@ out:
49841 */
49842 static void wa_xfer_id_init(struct wa_xfer *xfer)
49843 {
49844- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
49845+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
49846 }
49847
49848 /*
49849diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
49850index 1eab4ac..e21efc9 100644
49851--- a/drivers/vfio/vfio.c
49852+++ b/drivers/vfio/vfio.c
49853@@ -488,7 +488,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
49854 return 0;
49855
49856 /* TODO Prevent device auto probing */
49857- WARN("Device %s added to live group %d!\n", dev_name(dev),
49858+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
49859 iommu_group_id(group->iommu_group));
49860
49861 return 0;
49862diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
49863index 5174eba..86e764a 100644
49864--- a/drivers/vhost/vringh.c
49865+++ b/drivers/vhost/vringh.c
49866@@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
49867
49868 static inline int putu16_kern(u16 *p, u16 val)
49869 {
49870- ACCESS_ONCE(*p) = val;
49871+ ACCESS_ONCE_RW(*p) = val;
49872 return 0;
49873 }
49874
49875diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
49876index e43401a..dd49b3f 100644
49877--- a/drivers/video/arcfb.c
49878+++ b/drivers/video/arcfb.c
49879@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
49880 return -ENOSPC;
49881
49882 err = 0;
49883- if ((count + p) > fbmemlength) {
49884+ if (count > (fbmemlength - p)) {
49885 count = fbmemlength - p;
49886 err = -ENOSPC;
49887 }
49888diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
49889index a4dfe8c..297ddd9 100644
49890--- a/drivers/video/aty/aty128fb.c
49891+++ b/drivers/video/aty/aty128fb.c
49892@@ -149,7 +149,7 @@ enum {
49893 };
49894
49895 /* Must match above enum */
49896-static char * const r128_family[] = {
49897+static const char * const r128_family[] = {
49898 "AGP",
49899 "PCI",
49900 "PRO AGP",
49901diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
49902index 9b0f12c..024673d 100644
49903--- a/drivers/video/aty/atyfb_base.c
49904+++ b/drivers/video/aty/atyfb_base.c
49905@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
49906 par->accel_flags = var->accel_flags; /* hack */
49907
49908 if (var->accel_flags) {
49909- info->fbops->fb_sync = atyfb_sync;
49910+ pax_open_kernel();
49911+ *(void **)&info->fbops->fb_sync = atyfb_sync;
49912+ pax_close_kernel();
49913 info->flags &= ~FBINFO_HWACCEL_DISABLED;
49914 } else {
49915- info->fbops->fb_sync = NULL;
49916+ pax_open_kernel();
49917+ *(void **)&info->fbops->fb_sync = NULL;
49918+ pax_close_kernel();
49919 info->flags |= FBINFO_HWACCEL_DISABLED;
49920 }
49921
49922diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
49923index 95ec042..e6affdd 100644
49924--- a/drivers/video/aty/mach64_cursor.c
49925+++ b/drivers/video/aty/mach64_cursor.c
49926@@ -7,6 +7,7 @@
49927 #include <linux/string.h>
49928
49929 #include <asm/io.h>
49930+#include <asm/pgtable.h>
49931
49932 #ifdef __sparc__
49933 #include <asm/fbio.h>
49934@@ -208,7 +209,9 @@ int aty_init_cursor(struct fb_info *info)
49935 info->sprite.buf_align = 16; /* and 64 lines tall. */
49936 info->sprite.flags = FB_PIXMAP_IO;
49937
49938- info->fbops->fb_cursor = atyfb_cursor;
49939+ pax_open_kernel();
49940+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
49941+ pax_close_kernel();
49942
49943 return 0;
49944 }
49945diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
49946index bca6ccc..252107e 100644
49947--- a/drivers/video/backlight/kb3886_bl.c
49948+++ b/drivers/video/backlight/kb3886_bl.c
49949@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
49950 static unsigned long kb3886bl_flags;
49951 #define KB3886BL_SUSPENDED 0x01
49952
49953-static struct dmi_system_id __initdata kb3886bl_device_table[] = {
49954+static const struct dmi_system_id __initconst kb3886bl_device_table[] = {
49955 {
49956 .ident = "Sahara Touch-iT",
49957 .matches = {
49958diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
49959index 900aa4e..6d49418 100644
49960--- a/drivers/video/fb_defio.c
49961+++ b/drivers/video/fb_defio.c
49962@@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
49963
49964 BUG_ON(!fbdefio);
49965 mutex_init(&fbdefio->lock);
49966- info->fbops->fb_mmap = fb_deferred_io_mmap;
49967+ pax_open_kernel();
49968+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
49969+ pax_close_kernel();
49970 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
49971 INIT_LIST_HEAD(&fbdefio->pagelist);
49972 if (fbdefio->delay == 0) /* set a default of 1 s */
49973@@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
49974 page->mapping = NULL;
49975 }
49976
49977- info->fbops->fb_mmap = NULL;
49978+ *(void **)&info->fbops->fb_mmap = NULL;
49979 mutex_destroy(&fbdefio->lock);
49980 }
49981 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
49982diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
49983index dacaf74..8478a46 100644
49984--- a/drivers/video/fbmem.c
49985+++ b/drivers/video/fbmem.c
49986@@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
49987 image->dx += image->width + 8;
49988 }
49989 } else if (rotate == FB_ROTATE_UD) {
49990- for (x = 0; x < num && image->dx >= 0; x++) {
49991+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
49992 info->fbops->fb_imageblit(info, image);
49993 image->dx -= image->width + 8;
49994 }
49995@@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
49996 image->dy += image->height + 8;
49997 }
49998 } else if (rotate == FB_ROTATE_CCW) {
49999- for (x = 0; x < num && image->dy >= 0; x++) {
50000+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
50001 info->fbops->fb_imageblit(info, image);
50002 image->dy -= image->height + 8;
50003 }
50004@@ -1175,7 +1175,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
50005 return -EFAULT;
50006 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
50007 return -EINVAL;
50008- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
50009+ if (con2fb.framebuffer >= FB_MAX)
50010 return -EINVAL;
50011 if (!registered_fb[con2fb.framebuffer])
50012 request_module("fb%d", con2fb.framebuffer);
50013diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c
50014index 8d456dc..b4fa44b 100644
50015--- a/drivers/video/hyperv_fb.c
50016+++ b/drivers/video/hyperv_fb.c
50017@@ -233,7 +233,7 @@ static uint screen_fb_size;
50018 static inline int synthvid_send(struct hv_device *hdev,
50019 struct synthvid_msg *msg)
50020 {
50021- static atomic64_t request_id = ATOMIC64_INIT(0);
50022+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
50023 int ret;
50024
50025 msg->pipe_hdr.type = PIPE_MSG_DATA;
50026@@ -241,7 +241,7 @@ static inline int synthvid_send(struct hv_device *hdev,
50027
50028 ret = vmbus_sendpacket(hdev->channel, msg,
50029 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
50030- atomic64_inc_return(&request_id),
50031+ atomic64_inc_return_unchecked(&request_id),
50032 VM_PKT_DATA_INBAND, 0);
50033
50034 if (ret)
50035diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
50036index 7672d2e..b56437f 100644
50037--- a/drivers/video/i810/i810_accel.c
50038+++ b/drivers/video/i810/i810_accel.c
50039@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
50040 }
50041 }
50042 printk("ringbuffer lockup!!!\n");
50043+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
50044 i810_report_error(mmio);
50045 par->dev_flags |= LOCKUP;
50046 info->pixmap.scan_align = 1;
50047diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
50048index 3c14e43..2630570 100644
50049--- a/drivers/video/logo/logo_linux_clut224.ppm
50050+++ b/drivers/video/logo/logo_linux_clut224.ppm
50051@@ -2,1603 +2,1123 @@ P3
50052 # Standard 224-color Linux logo
50053 80 80
50054 255
50055- 0 0 0 0 0 0 0 0 0 0 0 0
50056- 0 0 0 0 0 0 0 0 0 0 0 0
50057- 0 0 0 0 0 0 0 0 0 0 0 0
50058- 0 0 0 0 0 0 0 0 0 0 0 0
50059- 0 0 0 0 0 0 0 0 0 0 0 0
50060- 0 0 0 0 0 0 0 0 0 0 0 0
50061- 0 0 0 0 0 0 0 0 0 0 0 0
50062- 0 0 0 0 0 0 0 0 0 0 0 0
50063- 0 0 0 0 0 0 0 0 0 0 0 0
50064- 6 6 6 6 6 6 10 10 10 10 10 10
50065- 10 10 10 6 6 6 6 6 6 6 6 6
50066- 0 0 0 0 0 0 0 0 0 0 0 0
50067- 0 0 0 0 0 0 0 0 0 0 0 0
50068- 0 0 0 0 0 0 0 0 0 0 0 0
50069- 0 0 0 0 0 0 0 0 0 0 0 0
50070- 0 0 0 0 0 0 0 0 0 0 0 0
50071- 0 0 0 0 0 0 0 0 0 0 0 0
50072- 0 0 0 0 0 0 0 0 0 0 0 0
50073- 0 0 0 0 0 0 0 0 0 0 0 0
50074- 0 0 0 0 0 0 0 0 0 0 0 0
50075- 0 0 0 0 0 0 0 0 0 0 0 0
50076- 0 0 0 0 0 0 0 0 0 0 0 0
50077- 0 0 0 0 0 0 0 0 0 0 0 0
50078- 0 0 0 0 0 0 0 0 0 0 0 0
50079- 0 0 0 0 0 0 0 0 0 0 0 0
50080- 0 0 0 0 0 0 0 0 0 0 0 0
50081- 0 0 0 0 0 0 0 0 0 0 0 0
50082- 0 0 0 0 0 0 0 0 0 0 0 0
50083- 0 0 0 6 6 6 10 10 10 14 14 14
50084- 22 22 22 26 26 26 30 30 30 34 34 34
50085- 30 30 30 30 30 30 26 26 26 18 18 18
50086- 14 14 14 10 10 10 6 6 6 0 0 0
50087- 0 0 0 0 0 0 0 0 0 0 0 0
50088- 0 0 0 0 0 0 0 0 0 0 0 0
50089- 0 0 0 0 0 0 0 0 0 0 0 0
50090- 0 0 0 0 0 0 0 0 0 0 0 0
50091- 0 0 0 0 0 0 0 0 0 0 0 0
50092- 0 0 0 0 0 0 0 0 0 0 0 0
50093- 0 0 0 0 0 0 0 0 0 0 0 0
50094- 0 0 0 0 0 0 0 0 0 0 0 0
50095- 0 0 0 0 0 0 0 0 0 0 0 0
50096- 0 0 0 0 0 1 0 0 1 0 0 0
50097- 0 0 0 0 0 0 0 0 0 0 0 0
50098- 0 0 0 0 0 0 0 0 0 0 0 0
50099- 0 0 0 0 0 0 0 0 0 0 0 0
50100- 0 0 0 0 0 0 0 0 0 0 0 0
50101- 0 0 0 0 0 0 0 0 0 0 0 0
50102- 0 0 0 0 0 0 0 0 0 0 0 0
50103- 6 6 6 14 14 14 26 26 26 42 42 42
50104- 54 54 54 66 66 66 78 78 78 78 78 78
50105- 78 78 78 74 74 74 66 66 66 54 54 54
50106- 42 42 42 26 26 26 18 18 18 10 10 10
50107- 6 6 6 0 0 0 0 0 0 0 0 0
50108- 0 0 0 0 0 0 0 0 0 0 0 0
50109- 0 0 0 0 0 0 0 0 0 0 0 0
50110- 0 0 0 0 0 0 0 0 0 0 0 0
50111- 0 0 0 0 0 0 0 0 0 0 0 0
50112- 0 0 0 0 0 0 0 0 0 0 0 0
50113- 0 0 0 0 0 0 0 0 0 0 0 0
50114- 0 0 0 0 0 0 0 0 0 0 0 0
50115- 0 0 0 0 0 0 0 0 0 0 0 0
50116- 0 0 1 0 0 0 0 0 0 0 0 0
50117- 0 0 0 0 0 0 0 0 0 0 0 0
50118- 0 0 0 0 0 0 0 0 0 0 0 0
50119- 0 0 0 0 0 0 0 0 0 0 0 0
50120- 0 0 0 0 0 0 0 0 0 0 0 0
50121- 0 0 0 0 0 0 0 0 0 0 0 0
50122- 0 0 0 0 0 0 0 0 0 10 10 10
50123- 22 22 22 42 42 42 66 66 66 86 86 86
50124- 66 66 66 38 38 38 38 38 38 22 22 22
50125- 26 26 26 34 34 34 54 54 54 66 66 66
50126- 86 86 86 70 70 70 46 46 46 26 26 26
50127- 14 14 14 6 6 6 0 0 0 0 0 0
50128- 0 0 0 0 0 0 0 0 0 0 0 0
50129- 0 0 0 0 0 0 0 0 0 0 0 0
50130- 0 0 0 0 0 0 0 0 0 0 0 0
50131- 0 0 0 0 0 0 0 0 0 0 0 0
50132- 0 0 0 0 0 0 0 0 0 0 0 0
50133- 0 0 0 0 0 0 0 0 0 0 0 0
50134- 0 0 0 0 0 0 0 0 0 0 0 0
50135- 0 0 0 0 0 0 0 0 0 0 0 0
50136- 0 0 1 0 0 1 0 0 1 0 0 0
50137- 0 0 0 0 0 0 0 0 0 0 0 0
50138- 0 0 0 0 0 0 0 0 0 0 0 0
50139- 0 0 0 0 0 0 0 0 0 0 0 0
50140- 0 0 0 0 0 0 0 0 0 0 0 0
50141- 0 0 0 0 0 0 0 0 0 0 0 0
50142- 0 0 0 0 0 0 10 10 10 26 26 26
50143- 50 50 50 82 82 82 58 58 58 6 6 6
50144- 2 2 6 2 2 6 2 2 6 2 2 6
50145- 2 2 6 2 2 6 2 2 6 2 2 6
50146- 6 6 6 54 54 54 86 86 86 66 66 66
50147- 38 38 38 18 18 18 6 6 6 0 0 0
50148- 0 0 0 0 0 0 0 0 0 0 0 0
50149- 0 0 0 0 0 0 0 0 0 0 0 0
50150- 0 0 0 0 0 0 0 0 0 0 0 0
50151- 0 0 0 0 0 0 0 0 0 0 0 0
50152- 0 0 0 0 0 0 0 0 0 0 0 0
50153- 0 0 0 0 0 0 0 0 0 0 0 0
50154- 0 0 0 0 0 0 0 0 0 0 0 0
50155- 0 0 0 0 0 0 0 0 0 0 0 0
50156- 0 0 0 0 0 0 0 0 0 0 0 0
50157- 0 0 0 0 0 0 0 0 0 0 0 0
50158- 0 0 0 0 0 0 0 0 0 0 0 0
50159- 0 0 0 0 0 0 0 0 0 0 0 0
50160- 0 0 0 0 0 0 0 0 0 0 0 0
50161- 0 0 0 0 0 0 0 0 0 0 0 0
50162- 0 0 0 6 6 6 22 22 22 50 50 50
50163- 78 78 78 34 34 34 2 2 6 2 2 6
50164- 2 2 6 2 2 6 2 2 6 2 2 6
50165- 2 2 6 2 2 6 2 2 6 2 2 6
50166- 2 2 6 2 2 6 6 6 6 70 70 70
50167- 78 78 78 46 46 46 22 22 22 6 6 6
50168- 0 0 0 0 0 0 0 0 0 0 0 0
50169- 0 0 0 0 0 0 0 0 0 0 0 0
50170- 0 0 0 0 0 0 0 0 0 0 0 0
50171- 0 0 0 0 0 0 0 0 0 0 0 0
50172- 0 0 0 0 0 0 0 0 0 0 0 0
50173- 0 0 0 0 0 0 0 0 0 0 0 0
50174- 0 0 0 0 0 0 0 0 0 0 0 0
50175- 0 0 0 0 0 0 0 0 0 0 0 0
50176- 0 0 1 0 0 1 0 0 1 0 0 0
50177- 0 0 0 0 0 0 0 0 0 0 0 0
50178- 0 0 0 0 0 0 0 0 0 0 0 0
50179- 0 0 0 0 0 0 0 0 0 0 0 0
50180- 0 0 0 0 0 0 0 0 0 0 0 0
50181- 0 0 0 0 0 0 0 0 0 0 0 0
50182- 6 6 6 18 18 18 42 42 42 82 82 82
50183- 26 26 26 2 2 6 2 2 6 2 2 6
50184- 2 2 6 2 2 6 2 2 6 2 2 6
50185- 2 2 6 2 2 6 2 2 6 14 14 14
50186- 46 46 46 34 34 34 6 6 6 2 2 6
50187- 42 42 42 78 78 78 42 42 42 18 18 18
50188- 6 6 6 0 0 0 0 0 0 0 0 0
50189- 0 0 0 0 0 0 0 0 0 0 0 0
50190- 0 0 0 0 0 0 0 0 0 0 0 0
50191- 0 0 0 0 0 0 0 0 0 0 0 0
50192- 0 0 0 0 0 0 0 0 0 0 0 0
50193- 0 0 0 0 0 0 0 0 0 0 0 0
50194- 0 0 0 0 0 0 0 0 0 0 0 0
50195- 0 0 0 0 0 0 0 0 0 0 0 0
50196- 0 0 1 0 0 0 0 0 1 0 0 0
50197- 0 0 0 0 0 0 0 0 0 0 0 0
50198- 0 0 0 0 0 0 0 0 0 0 0 0
50199- 0 0 0 0 0 0 0 0 0 0 0 0
50200- 0 0 0 0 0 0 0 0 0 0 0 0
50201- 0 0 0 0 0 0 0 0 0 0 0 0
50202- 10 10 10 30 30 30 66 66 66 58 58 58
50203- 2 2 6 2 2 6 2 2 6 2 2 6
50204- 2 2 6 2 2 6 2 2 6 2 2 6
50205- 2 2 6 2 2 6 2 2 6 26 26 26
50206- 86 86 86 101 101 101 46 46 46 10 10 10
50207- 2 2 6 58 58 58 70 70 70 34 34 34
50208- 10 10 10 0 0 0 0 0 0 0 0 0
50209- 0 0 0 0 0 0 0 0 0 0 0 0
50210- 0 0 0 0 0 0 0 0 0 0 0 0
50211- 0 0 0 0 0 0 0 0 0 0 0 0
50212- 0 0 0 0 0 0 0 0 0 0 0 0
50213- 0 0 0 0 0 0 0 0 0 0 0 0
50214- 0 0 0 0 0 0 0 0 0 0 0 0
50215- 0 0 0 0 0 0 0 0 0 0 0 0
50216- 0 0 1 0 0 1 0 0 1 0 0 0
50217- 0 0 0 0 0 0 0 0 0 0 0 0
50218- 0 0 0 0 0 0 0 0 0 0 0 0
50219- 0 0 0 0 0 0 0 0 0 0 0 0
50220- 0 0 0 0 0 0 0 0 0 0 0 0
50221- 0 0 0 0 0 0 0 0 0 0 0 0
50222- 14 14 14 42 42 42 86 86 86 10 10 10
50223- 2 2 6 2 2 6 2 2 6 2 2 6
50224- 2 2 6 2 2 6 2 2 6 2 2 6
50225- 2 2 6 2 2 6 2 2 6 30 30 30
50226- 94 94 94 94 94 94 58 58 58 26 26 26
50227- 2 2 6 6 6 6 78 78 78 54 54 54
50228- 22 22 22 6 6 6 0 0 0 0 0 0
50229- 0 0 0 0 0 0 0 0 0 0 0 0
50230- 0 0 0 0 0 0 0 0 0 0 0 0
50231- 0 0 0 0 0 0 0 0 0 0 0 0
50232- 0 0 0 0 0 0 0 0 0 0 0 0
50233- 0 0 0 0 0 0 0 0 0 0 0 0
50234- 0 0 0 0 0 0 0 0 0 0 0 0
50235- 0 0 0 0 0 0 0 0 0 0 0 0
50236- 0 0 0 0 0 0 0 0 0 0 0 0
50237- 0 0 0 0 0 0 0 0 0 0 0 0
50238- 0 0 0 0 0 0 0 0 0 0 0 0
50239- 0 0 0 0 0 0 0 0 0 0 0 0
50240- 0 0 0 0 0 0 0 0 0 0 0 0
50241- 0 0 0 0 0 0 0 0 0 6 6 6
50242- 22 22 22 62 62 62 62 62 62 2 2 6
50243- 2 2 6 2 2 6 2 2 6 2 2 6
50244- 2 2 6 2 2 6 2 2 6 2 2 6
50245- 2 2 6 2 2 6 2 2 6 26 26 26
50246- 54 54 54 38 38 38 18 18 18 10 10 10
50247- 2 2 6 2 2 6 34 34 34 82 82 82
50248- 38 38 38 14 14 14 0 0 0 0 0 0
50249- 0 0 0 0 0 0 0 0 0 0 0 0
50250- 0 0 0 0 0 0 0 0 0 0 0 0
50251- 0 0 0 0 0 0 0 0 0 0 0 0
50252- 0 0 0 0 0 0 0 0 0 0 0 0
50253- 0 0 0 0 0 0 0 0 0 0 0 0
50254- 0 0 0 0 0 0 0 0 0 0 0 0
50255- 0 0 0 0 0 0 0 0 0 0 0 0
50256- 0 0 0 0 0 1 0 0 1 0 0 0
50257- 0 0 0 0 0 0 0 0 0 0 0 0
50258- 0 0 0 0 0 0 0 0 0 0 0 0
50259- 0 0 0 0 0 0 0 0 0 0 0 0
50260- 0 0 0 0 0 0 0 0 0 0 0 0
50261- 0 0 0 0 0 0 0 0 0 6 6 6
50262- 30 30 30 78 78 78 30 30 30 2 2 6
50263- 2 2 6 2 2 6 2 2 6 2 2 6
50264- 2 2 6 2 2 6 2 2 6 2 2 6
50265- 2 2 6 2 2 6 2 2 6 10 10 10
50266- 10 10 10 2 2 6 2 2 6 2 2 6
50267- 2 2 6 2 2 6 2 2 6 78 78 78
50268- 50 50 50 18 18 18 6 6 6 0 0 0
50269- 0 0 0 0 0 0 0 0 0 0 0 0
50270- 0 0 0 0 0 0 0 0 0 0 0 0
50271- 0 0 0 0 0 0 0 0 0 0 0 0
50272- 0 0 0 0 0 0 0 0 0 0 0 0
50273- 0 0 0 0 0 0 0 0 0 0 0 0
50274- 0 0 0 0 0 0 0 0 0 0 0 0
50275- 0 0 0 0 0 0 0 0 0 0 0 0
50276- 0 0 1 0 0 0 0 0 0 0 0 0
50277- 0 0 0 0 0 0 0 0 0 0 0 0
50278- 0 0 0 0 0 0 0 0 0 0 0 0
50279- 0 0 0 0 0 0 0 0 0 0 0 0
50280- 0 0 0 0 0 0 0 0 0 0 0 0
50281- 0 0 0 0 0 0 0 0 0 10 10 10
50282- 38 38 38 86 86 86 14 14 14 2 2 6
50283- 2 2 6 2 2 6 2 2 6 2 2 6
50284- 2 2 6 2 2 6 2 2 6 2 2 6
50285- 2 2 6 2 2 6 2 2 6 2 2 6
50286- 2 2 6 2 2 6 2 2 6 2 2 6
50287- 2 2 6 2 2 6 2 2 6 54 54 54
50288- 66 66 66 26 26 26 6 6 6 0 0 0
50289- 0 0 0 0 0 0 0 0 0 0 0 0
50290- 0 0 0 0 0 0 0 0 0 0 0 0
50291- 0 0 0 0 0 0 0 0 0 0 0 0
50292- 0 0 0 0 0 0 0 0 0 0 0 0
50293- 0 0 0 0 0 0 0 0 0 0 0 0
50294- 0 0 0 0 0 0 0 0 0 0 0 0
50295- 0 0 0 0 0 0 0 0 0 0 0 0
50296- 0 0 0 0 0 1 0 0 1 0 0 0
50297- 0 0 0 0 0 0 0 0 0 0 0 0
50298- 0 0 0 0 0 0 0 0 0 0 0 0
50299- 0 0 0 0 0 0 0 0 0 0 0 0
50300- 0 0 0 0 0 0 0 0 0 0 0 0
50301- 0 0 0 0 0 0 0 0 0 14 14 14
50302- 42 42 42 82 82 82 2 2 6 2 2 6
50303- 2 2 6 6 6 6 10 10 10 2 2 6
50304- 2 2 6 2 2 6 2 2 6 2 2 6
50305- 2 2 6 2 2 6 2 2 6 6 6 6
50306- 14 14 14 10 10 10 2 2 6 2 2 6
50307- 2 2 6 2 2 6 2 2 6 18 18 18
50308- 82 82 82 34 34 34 10 10 10 0 0 0
50309- 0 0 0 0 0 0 0 0 0 0 0 0
50310- 0 0 0 0 0 0 0 0 0 0 0 0
50311- 0 0 0 0 0 0 0 0 0 0 0 0
50312- 0 0 0 0 0 0 0 0 0 0 0 0
50313- 0 0 0 0 0 0 0 0 0 0 0 0
50314- 0 0 0 0 0 0 0 0 0 0 0 0
50315- 0 0 0 0 0 0 0 0 0 0 0 0
50316- 0 0 1 0 0 0 0 0 0 0 0 0
50317- 0 0 0 0 0 0 0 0 0 0 0 0
50318- 0 0 0 0 0 0 0 0 0 0 0 0
50319- 0 0 0 0 0 0 0 0 0 0 0 0
50320- 0 0 0 0 0 0 0 0 0 0 0 0
50321- 0 0 0 0 0 0 0 0 0 14 14 14
50322- 46 46 46 86 86 86 2 2 6 2 2 6
50323- 6 6 6 6 6 6 22 22 22 34 34 34
50324- 6 6 6 2 2 6 2 2 6 2 2 6
50325- 2 2 6 2 2 6 18 18 18 34 34 34
50326- 10 10 10 50 50 50 22 22 22 2 2 6
50327- 2 2 6 2 2 6 2 2 6 10 10 10
50328- 86 86 86 42 42 42 14 14 14 0 0 0
50329- 0 0 0 0 0 0 0 0 0 0 0 0
50330- 0 0 0 0 0 0 0 0 0 0 0 0
50331- 0 0 0 0 0 0 0 0 0 0 0 0
50332- 0 0 0 0 0 0 0 0 0 0 0 0
50333- 0 0 0 0 0 0 0 0 0 0 0 0
50334- 0 0 0 0 0 0 0 0 0 0 0 0
50335- 0 0 0 0 0 0 0 0 0 0 0 0
50336- 0 0 1 0 0 1 0 0 1 0 0 0
50337- 0 0 0 0 0 0 0 0 0 0 0 0
50338- 0 0 0 0 0 0 0 0 0 0 0 0
50339- 0 0 0 0 0 0 0 0 0 0 0 0
50340- 0 0 0 0 0 0 0 0 0 0 0 0
50341- 0 0 0 0 0 0 0 0 0 14 14 14
50342- 46 46 46 86 86 86 2 2 6 2 2 6
50343- 38 38 38 116 116 116 94 94 94 22 22 22
50344- 22 22 22 2 2 6 2 2 6 2 2 6
50345- 14 14 14 86 86 86 138 138 138 162 162 162
50346-154 154 154 38 38 38 26 26 26 6 6 6
50347- 2 2 6 2 2 6 2 2 6 2 2 6
50348- 86 86 86 46 46 46 14 14 14 0 0 0
50349- 0 0 0 0 0 0 0 0 0 0 0 0
50350- 0 0 0 0 0 0 0 0 0 0 0 0
50351- 0 0 0 0 0 0 0 0 0 0 0 0
50352- 0 0 0 0 0 0 0 0 0 0 0 0
50353- 0 0 0 0 0 0 0 0 0 0 0 0
50354- 0 0 0 0 0 0 0 0 0 0 0 0
50355- 0 0 0 0 0 0 0 0 0 0 0 0
50356- 0 0 0 0 0 0 0 0 0 0 0 0
50357- 0 0 0 0 0 0 0 0 0 0 0 0
50358- 0 0 0 0 0 0 0 0 0 0 0 0
50359- 0 0 0 0 0 0 0 0 0 0 0 0
50360- 0 0 0 0 0 0 0 0 0 0 0 0
50361- 0 0 0 0 0 0 0 0 0 14 14 14
50362- 46 46 46 86 86 86 2 2 6 14 14 14
50363-134 134 134 198 198 198 195 195 195 116 116 116
50364- 10 10 10 2 2 6 2 2 6 6 6 6
50365-101 98 89 187 187 187 210 210 210 218 218 218
50366-214 214 214 134 134 134 14 14 14 6 6 6
50367- 2 2 6 2 2 6 2 2 6 2 2 6
50368- 86 86 86 50 50 50 18 18 18 6 6 6
50369- 0 0 0 0 0 0 0 0 0 0 0 0
50370- 0 0 0 0 0 0 0 0 0 0 0 0
50371- 0 0 0 0 0 0 0 0 0 0 0 0
50372- 0 0 0 0 0 0 0 0 0 0 0 0
50373- 0 0 0 0 0 0 0 0 0 0 0 0
50374- 0 0 0 0 0 0 0 0 0 0 0 0
50375- 0 0 0 0 0 0 0 0 1 0 0 0
50376- 0 0 1 0 0 1 0 0 1 0 0 0
50377- 0 0 0 0 0 0 0 0 0 0 0 0
50378- 0 0 0 0 0 0 0 0 0 0 0 0
50379- 0 0 0 0 0 0 0 0 0 0 0 0
50380- 0 0 0 0 0 0 0 0 0 0 0 0
50381- 0 0 0 0 0 0 0 0 0 14 14 14
50382- 46 46 46 86 86 86 2 2 6 54 54 54
50383-218 218 218 195 195 195 226 226 226 246 246 246
50384- 58 58 58 2 2 6 2 2 6 30 30 30
50385-210 210 210 253 253 253 174 174 174 123 123 123
50386-221 221 221 234 234 234 74 74 74 2 2 6
50387- 2 2 6 2 2 6 2 2 6 2 2 6
50388- 70 70 70 58 58 58 22 22 22 6 6 6
50389- 0 0 0 0 0 0 0 0 0 0 0 0
50390- 0 0 0 0 0 0 0 0 0 0 0 0
50391- 0 0 0 0 0 0 0 0 0 0 0 0
50392- 0 0 0 0 0 0 0 0 0 0 0 0
50393- 0 0 0 0 0 0 0 0 0 0 0 0
50394- 0 0 0 0 0 0 0 0 0 0 0 0
50395- 0 0 0 0 0 0 0 0 0 0 0 0
50396- 0 0 0 0 0 0 0 0 0 0 0 0
50397- 0 0 0 0 0 0 0 0 0 0 0 0
50398- 0 0 0 0 0 0 0 0 0 0 0 0
50399- 0 0 0 0 0 0 0 0 0 0 0 0
50400- 0 0 0 0 0 0 0 0 0 0 0 0
50401- 0 0 0 0 0 0 0 0 0 14 14 14
50402- 46 46 46 82 82 82 2 2 6 106 106 106
50403-170 170 170 26 26 26 86 86 86 226 226 226
50404-123 123 123 10 10 10 14 14 14 46 46 46
50405-231 231 231 190 190 190 6 6 6 70 70 70
50406- 90 90 90 238 238 238 158 158 158 2 2 6
50407- 2 2 6 2 2 6 2 2 6 2 2 6
50408- 70 70 70 58 58 58 22 22 22 6 6 6
50409- 0 0 0 0 0 0 0 0 0 0 0 0
50410- 0 0 0 0 0 0 0 0 0 0 0 0
50411- 0 0 0 0 0 0 0 0 0 0 0 0
50412- 0 0 0 0 0 0 0 0 0 0 0 0
50413- 0 0 0 0 0 0 0 0 0 0 0 0
50414- 0 0 0 0 0 0 0 0 0 0 0 0
50415- 0 0 0 0 0 0 0 0 1 0 0 0
50416- 0 0 1 0 0 1 0 0 1 0 0 0
50417- 0 0 0 0 0 0 0 0 0 0 0 0
50418- 0 0 0 0 0 0 0 0 0 0 0 0
50419- 0 0 0 0 0 0 0 0 0 0 0 0
50420- 0 0 0 0 0 0 0 0 0 0 0 0
50421- 0 0 0 0 0 0 0 0 0 14 14 14
50422- 42 42 42 86 86 86 6 6 6 116 116 116
50423-106 106 106 6 6 6 70 70 70 149 149 149
50424-128 128 128 18 18 18 38 38 38 54 54 54
50425-221 221 221 106 106 106 2 2 6 14 14 14
50426- 46 46 46 190 190 190 198 198 198 2 2 6
50427- 2 2 6 2 2 6 2 2 6 2 2 6
50428- 74 74 74 62 62 62 22 22 22 6 6 6
50429- 0 0 0 0 0 0 0 0 0 0 0 0
50430- 0 0 0 0 0 0 0 0 0 0 0 0
50431- 0 0 0 0 0 0 0 0 0 0 0 0
50432- 0 0 0 0 0 0 0 0 0 0 0 0
50433- 0 0 0 0 0 0 0 0 0 0 0 0
50434- 0 0 0 0 0 0 0 0 0 0 0 0
50435- 0 0 0 0 0 0 0 0 1 0 0 0
50436- 0 0 1 0 0 0 0 0 1 0 0 0
50437- 0 0 0 0 0 0 0 0 0 0 0 0
50438- 0 0 0 0 0 0 0 0 0 0 0 0
50439- 0 0 0 0 0 0 0 0 0 0 0 0
50440- 0 0 0 0 0 0 0 0 0 0 0 0
50441- 0 0 0 0 0 0 0 0 0 14 14 14
50442- 42 42 42 94 94 94 14 14 14 101 101 101
50443-128 128 128 2 2 6 18 18 18 116 116 116
50444-118 98 46 121 92 8 121 92 8 98 78 10
50445-162 162 162 106 106 106 2 2 6 2 2 6
50446- 2 2 6 195 195 195 195 195 195 6 6 6
50447- 2 2 6 2 2 6 2 2 6 2 2 6
50448- 74 74 74 62 62 62 22 22 22 6 6 6
50449- 0 0 0 0 0 0 0 0 0 0 0 0
50450- 0 0 0 0 0 0 0 0 0 0 0 0
50451- 0 0 0 0 0 0 0 0 0 0 0 0
50452- 0 0 0 0 0 0 0 0 0 0 0 0
50453- 0 0 0 0 0 0 0 0 0 0 0 0
50454- 0 0 0 0 0 0 0 0 0 0 0 0
50455- 0 0 0 0 0 0 0 0 1 0 0 1
50456- 0 0 1 0 0 0 0 0 1 0 0 0
50457- 0 0 0 0 0 0 0 0 0 0 0 0
50458- 0 0 0 0 0 0 0 0 0 0 0 0
50459- 0 0 0 0 0 0 0 0 0 0 0 0
50460- 0 0 0 0 0 0 0 0 0 0 0 0
50461- 0 0 0 0 0 0 0 0 0 10 10 10
50462- 38 38 38 90 90 90 14 14 14 58 58 58
50463-210 210 210 26 26 26 54 38 6 154 114 10
50464-226 170 11 236 186 11 225 175 15 184 144 12
50465-215 174 15 175 146 61 37 26 9 2 2 6
50466- 70 70 70 246 246 246 138 138 138 2 2 6
50467- 2 2 6 2 2 6 2 2 6 2 2 6
50468- 70 70 70 66 66 66 26 26 26 6 6 6
50469- 0 0 0 0 0 0 0 0 0 0 0 0
50470- 0 0 0 0 0 0 0 0 0 0 0 0
50471- 0 0 0 0 0 0 0 0 0 0 0 0
50472- 0 0 0 0 0 0 0 0 0 0 0 0
50473- 0 0 0 0 0 0 0 0 0 0 0 0
50474- 0 0 0 0 0 0 0 0 0 0 0 0
50475- 0 0 0 0 0 0 0 0 0 0 0 0
50476- 0 0 0 0 0 0 0 0 0 0 0 0
50477- 0 0 0 0 0 0 0 0 0 0 0 0
50478- 0 0 0 0 0 0 0 0 0 0 0 0
50479- 0 0 0 0 0 0 0 0 0 0 0 0
50480- 0 0 0 0 0 0 0 0 0 0 0 0
50481- 0 0 0 0 0 0 0 0 0 10 10 10
50482- 38 38 38 86 86 86 14 14 14 10 10 10
50483-195 195 195 188 164 115 192 133 9 225 175 15
50484-239 182 13 234 190 10 232 195 16 232 200 30
50485-245 207 45 241 208 19 232 195 16 184 144 12
50486-218 194 134 211 206 186 42 42 42 2 2 6
50487- 2 2 6 2 2 6 2 2 6 2 2 6
50488- 50 50 50 74 74 74 30 30 30 6 6 6
50489- 0 0 0 0 0 0 0 0 0 0 0 0
50490- 0 0 0 0 0 0 0 0 0 0 0 0
50491- 0 0 0 0 0 0 0 0 0 0 0 0
50492- 0 0 0 0 0 0 0 0 0 0 0 0
50493- 0 0 0 0 0 0 0 0 0 0 0 0
50494- 0 0 0 0 0 0 0 0 0 0 0 0
50495- 0 0 0 0 0 0 0 0 0 0 0 0
50496- 0 0 0 0 0 0 0 0 0 0 0 0
50497- 0 0 0 0 0 0 0 0 0 0 0 0
50498- 0 0 0 0 0 0 0 0 0 0 0 0
50499- 0 0 0 0 0 0 0 0 0 0 0 0
50500- 0 0 0 0 0 0 0 0 0 0 0 0
50501- 0 0 0 0 0 0 0 0 0 10 10 10
50502- 34 34 34 86 86 86 14 14 14 2 2 6
50503-121 87 25 192 133 9 219 162 10 239 182 13
50504-236 186 11 232 195 16 241 208 19 244 214 54
50505-246 218 60 246 218 38 246 215 20 241 208 19
50506-241 208 19 226 184 13 121 87 25 2 2 6
50507- 2 2 6 2 2 6 2 2 6 2 2 6
50508- 50 50 50 82 82 82 34 34 34 10 10 10
50509- 0 0 0 0 0 0 0 0 0 0 0 0
50510- 0 0 0 0 0 0 0 0 0 0 0 0
50511- 0 0 0 0 0 0 0 0 0 0 0 0
50512- 0 0 0 0 0 0 0 0 0 0 0 0
50513- 0 0 0 0 0 0 0 0 0 0 0 0
50514- 0 0 0 0 0 0 0 0 0 0 0 0
50515- 0 0 0 0 0 0 0 0 0 0 0 0
50516- 0 0 0 0 0 0 0 0 0 0 0 0
50517- 0 0 0 0 0 0 0 0 0 0 0 0
50518- 0 0 0 0 0 0 0 0 0 0 0 0
50519- 0 0 0 0 0 0 0 0 0 0 0 0
50520- 0 0 0 0 0 0 0 0 0 0 0 0
50521- 0 0 0 0 0 0 0 0 0 10 10 10
50522- 34 34 34 82 82 82 30 30 30 61 42 6
50523-180 123 7 206 145 10 230 174 11 239 182 13
50524-234 190 10 238 202 15 241 208 19 246 218 74
50525-246 218 38 246 215 20 246 215 20 246 215 20
50526-226 184 13 215 174 15 184 144 12 6 6 6
50527- 2 2 6 2 2 6 2 2 6 2 2 6
50528- 26 26 26 94 94 94 42 42 42 14 14 14
50529- 0 0 0 0 0 0 0 0 0 0 0 0
50530- 0 0 0 0 0 0 0 0 0 0 0 0
50531- 0 0 0 0 0 0 0 0 0 0 0 0
50532- 0 0 0 0 0 0 0 0 0 0 0 0
50533- 0 0 0 0 0 0 0 0 0 0 0 0
50534- 0 0 0 0 0 0 0 0 0 0 0 0
50535- 0 0 0 0 0 0 0 0 0 0 0 0
50536- 0 0 0 0 0 0 0 0 0 0 0 0
50537- 0 0 0 0 0 0 0 0 0 0 0 0
50538- 0 0 0 0 0 0 0 0 0 0 0 0
50539- 0 0 0 0 0 0 0 0 0 0 0 0
50540- 0 0 0 0 0 0 0 0 0 0 0 0
50541- 0 0 0 0 0 0 0 0 0 10 10 10
50542- 30 30 30 78 78 78 50 50 50 104 69 6
50543-192 133 9 216 158 10 236 178 12 236 186 11
50544-232 195 16 241 208 19 244 214 54 245 215 43
50545-246 215 20 246 215 20 241 208 19 198 155 10
50546-200 144 11 216 158 10 156 118 10 2 2 6
50547- 2 2 6 2 2 6 2 2 6 2 2 6
50548- 6 6 6 90 90 90 54 54 54 18 18 18
50549- 6 6 6 0 0 0 0 0 0 0 0 0
50550- 0 0 0 0 0 0 0 0 0 0 0 0
50551- 0 0 0 0 0 0 0 0 0 0 0 0
50552- 0 0 0 0 0 0 0 0 0 0 0 0
50553- 0 0 0 0 0 0 0 0 0 0 0 0
50554- 0 0 0 0 0 0 0 0 0 0 0 0
50555- 0 0 0 0 0 0 0 0 0 0 0 0
50556- 0 0 0 0 0 0 0 0 0 0 0 0
50557- 0 0 0 0 0 0 0 0 0 0 0 0
50558- 0 0 0 0 0 0 0 0 0 0 0 0
50559- 0 0 0 0 0 0 0 0 0 0 0 0
50560- 0 0 0 0 0 0 0 0 0 0 0 0
50561- 0 0 0 0 0 0 0 0 0 10 10 10
50562- 30 30 30 78 78 78 46 46 46 22 22 22
50563-137 92 6 210 162 10 239 182 13 238 190 10
50564-238 202 15 241 208 19 246 215 20 246 215 20
50565-241 208 19 203 166 17 185 133 11 210 150 10
50566-216 158 10 210 150 10 102 78 10 2 2 6
50567- 6 6 6 54 54 54 14 14 14 2 2 6
50568- 2 2 6 62 62 62 74 74 74 30 30 30
50569- 10 10 10 0 0 0 0 0 0 0 0 0
50570- 0 0 0 0 0 0 0 0 0 0 0 0
50571- 0 0 0 0 0 0 0 0 0 0 0 0
50572- 0 0 0 0 0 0 0 0 0 0 0 0
50573- 0 0 0 0 0 0 0 0 0 0 0 0
50574- 0 0 0 0 0 0 0 0 0 0 0 0
50575- 0 0 0 0 0 0 0 0 0 0 0 0
50576- 0 0 0 0 0 0 0 0 0 0 0 0
50577- 0 0 0 0 0 0 0 0 0 0 0 0
50578- 0 0 0 0 0 0 0 0 0 0 0 0
50579- 0 0 0 0 0 0 0 0 0 0 0 0
50580- 0 0 0 0 0 0 0 0 0 0 0 0
50581- 0 0 0 0 0 0 0 0 0 10 10 10
50582- 34 34 34 78 78 78 50 50 50 6 6 6
50583- 94 70 30 139 102 15 190 146 13 226 184 13
50584-232 200 30 232 195 16 215 174 15 190 146 13
50585-168 122 10 192 133 9 210 150 10 213 154 11
50586-202 150 34 182 157 106 101 98 89 2 2 6
50587- 2 2 6 78 78 78 116 116 116 58 58 58
50588- 2 2 6 22 22 22 90 90 90 46 46 46
50589- 18 18 18 6 6 6 0 0 0 0 0 0
50590- 0 0 0 0 0 0 0 0 0 0 0 0
50591- 0 0 0 0 0 0 0 0 0 0 0 0
50592- 0 0 0 0 0 0 0 0 0 0 0 0
50593- 0 0 0 0 0 0 0 0 0 0 0 0
50594- 0 0 0 0 0 0 0 0 0 0 0 0
50595- 0 0 0 0 0 0 0 0 0 0 0 0
50596- 0 0 0 0 0 0 0 0 0 0 0 0
50597- 0 0 0 0 0 0 0 0 0 0 0 0
50598- 0 0 0 0 0 0 0 0 0 0 0 0
50599- 0 0 0 0 0 0 0 0 0 0 0 0
50600- 0 0 0 0 0 0 0 0 0 0 0 0
50601- 0 0 0 0 0 0 0 0 0 10 10 10
50602- 38 38 38 86 86 86 50 50 50 6 6 6
50603-128 128 128 174 154 114 156 107 11 168 122 10
50604-198 155 10 184 144 12 197 138 11 200 144 11
50605-206 145 10 206 145 10 197 138 11 188 164 115
50606-195 195 195 198 198 198 174 174 174 14 14 14
50607- 2 2 6 22 22 22 116 116 116 116 116 116
50608- 22 22 22 2 2 6 74 74 74 70 70 70
50609- 30 30 30 10 10 10 0 0 0 0 0 0
50610- 0 0 0 0 0 0 0 0 0 0 0 0
50611- 0 0 0 0 0 0 0 0 0 0 0 0
50612- 0 0 0 0 0 0 0 0 0 0 0 0
50613- 0 0 0 0 0 0 0 0 0 0 0 0
50614- 0 0 0 0 0 0 0 0 0 0 0 0
50615- 0 0 0 0 0 0 0 0 0 0 0 0
50616- 0 0 0 0 0 0 0 0 0 0 0 0
50617- 0 0 0 0 0 0 0 0 0 0 0 0
50618- 0 0 0 0 0 0 0 0 0 0 0 0
50619- 0 0 0 0 0 0 0 0 0 0 0 0
50620- 0 0 0 0 0 0 0 0 0 0 0 0
50621- 0 0 0 0 0 0 6 6 6 18 18 18
50622- 50 50 50 101 101 101 26 26 26 10 10 10
50623-138 138 138 190 190 190 174 154 114 156 107 11
50624-197 138 11 200 144 11 197 138 11 192 133 9
50625-180 123 7 190 142 34 190 178 144 187 187 187
50626-202 202 202 221 221 221 214 214 214 66 66 66
50627- 2 2 6 2 2 6 50 50 50 62 62 62
50628- 6 6 6 2 2 6 10 10 10 90 90 90
50629- 50 50 50 18 18 18 6 6 6 0 0 0
50630- 0 0 0 0 0 0 0 0 0 0 0 0
50631- 0 0 0 0 0 0 0 0 0 0 0 0
50632- 0 0 0 0 0 0 0 0 0 0 0 0
50633- 0 0 0 0 0 0 0 0 0 0 0 0
50634- 0 0 0 0 0 0 0 0 0 0 0 0
50635- 0 0 0 0 0 0 0 0 0 0 0 0
50636- 0 0 0 0 0 0 0 0 0 0 0 0
50637- 0 0 0 0 0 0 0 0 0 0 0 0
50638- 0 0 0 0 0 0 0 0 0 0 0 0
50639- 0 0 0 0 0 0 0 0 0 0 0 0
50640- 0 0 0 0 0 0 0 0 0 0 0 0
50641- 0 0 0 0 0 0 10 10 10 34 34 34
50642- 74 74 74 74 74 74 2 2 6 6 6 6
50643-144 144 144 198 198 198 190 190 190 178 166 146
50644-154 121 60 156 107 11 156 107 11 168 124 44
50645-174 154 114 187 187 187 190 190 190 210 210 210
50646-246 246 246 253 253 253 253 253 253 182 182 182
50647- 6 6 6 2 2 6 2 2 6 2 2 6
50648- 2 2 6 2 2 6 2 2 6 62 62 62
50649- 74 74 74 34 34 34 14 14 14 0 0 0
50650- 0 0 0 0 0 0 0 0 0 0 0 0
50651- 0 0 0 0 0 0 0 0 0 0 0 0
50652- 0 0 0 0 0 0 0 0 0 0 0 0
50653- 0 0 0 0 0 0 0 0 0 0 0 0
50654- 0 0 0 0 0 0 0 0 0 0 0 0
50655- 0 0 0 0 0 0 0 0 0 0 0 0
50656- 0 0 0 0 0 0 0 0 0 0 0 0
50657- 0 0 0 0 0 0 0 0 0 0 0 0
50658- 0 0 0 0 0 0 0 0 0 0 0 0
50659- 0 0 0 0 0 0 0 0 0 0 0 0
50660- 0 0 0 0 0 0 0 0 0 0 0 0
50661- 0 0 0 10 10 10 22 22 22 54 54 54
50662- 94 94 94 18 18 18 2 2 6 46 46 46
50663-234 234 234 221 221 221 190 190 190 190 190 190
50664-190 190 190 187 187 187 187 187 187 190 190 190
50665-190 190 190 195 195 195 214 214 214 242 242 242
50666-253 253 253 253 253 253 253 253 253 253 253 253
50667- 82 82 82 2 2 6 2 2 6 2 2 6
50668- 2 2 6 2 2 6 2 2 6 14 14 14
50669- 86 86 86 54 54 54 22 22 22 6 6 6
50670- 0 0 0 0 0 0 0 0 0 0 0 0
50671- 0 0 0 0 0 0 0 0 0 0 0 0
50672- 0 0 0 0 0 0 0 0 0 0 0 0
50673- 0 0 0 0 0 0 0 0 0 0 0 0
50674- 0 0 0 0 0 0 0 0 0 0 0 0
50675- 0 0 0 0 0 0 0 0 0 0 0 0
50676- 0 0 0 0 0 0 0 0 0 0 0 0
50677- 0 0 0 0 0 0 0 0 0 0 0 0
50678- 0 0 0 0 0 0 0 0 0 0 0 0
50679- 0 0 0 0 0 0 0 0 0 0 0 0
50680- 0 0 0 0 0 0 0 0 0 0 0 0
50681- 6 6 6 18 18 18 46 46 46 90 90 90
50682- 46 46 46 18 18 18 6 6 6 182 182 182
50683-253 253 253 246 246 246 206 206 206 190 190 190
50684-190 190 190 190 190 190 190 190 190 190 190 190
50685-206 206 206 231 231 231 250 250 250 253 253 253
50686-253 253 253 253 253 253 253 253 253 253 253 253
50687-202 202 202 14 14 14 2 2 6 2 2 6
50688- 2 2 6 2 2 6 2 2 6 2 2 6
50689- 42 42 42 86 86 86 42 42 42 18 18 18
50690- 6 6 6 0 0 0 0 0 0 0 0 0
50691- 0 0 0 0 0 0 0 0 0 0 0 0
50692- 0 0 0 0 0 0 0 0 0 0 0 0
50693- 0 0 0 0 0 0 0 0 0 0 0 0
50694- 0 0 0 0 0 0 0 0 0 0 0 0
50695- 0 0 0 0 0 0 0 0 0 0 0 0
50696- 0 0 0 0 0 0 0 0 0 0 0 0
50697- 0 0 0 0 0 0 0 0 0 0 0 0
50698- 0 0 0 0 0 0 0 0 0 0 0 0
50699- 0 0 0 0 0 0 0 0 0 0 0 0
50700- 0 0 0 0 0 0 0 0 0 6 6 6
50701- 14 14 14 38 38 38 74 74 74 66 66 66
50702- 2 2 6 6 6 6 90 90 90 250 250 250
50703-253 253 253 253 253 253 238 238 238 198 198 198
50704-190 190 190 190 190 190 195 195 195 221 221 221
50705-246 246 246 253 253 253 253 253 253 253 253 253
50706-253 253 253 253 253 253 253 253 253 253 253 253
50707-253 253 253 82 82 82 2 2 6 2 2 6
50708- 2 2 6 2 2 6 2 2 6 2 2 6
50709- 2 2 6 78 78 78 70 70 70 34 34 34
50710- 14 14 14 6 6 6 0 0 0 0 0 0
50711- 0 0 0 0 0 0 0 0 0 0 0 0
50712- 0 0 0 0 0 0 0 0 0 0 0 0
50713- 0 0 0 0 0 0 0 0 0 0 0 0
50714- 0 0 0 0 0 0 0 0 0 0 0 0
50715- 0 0 0 0 0 0 0 0 0 0 0 0
50716- 0 0 0 0 0 0 0 0 0 0 0 0
50717- 0 0 0 0 0 0 0 0 0 0 0 0
50718- 0 0 0 0 0 0 0 0 0 0 0 0
50719- 0 0 0 0 0 0 0 0 0 0 0 0
50720- 0 0 0 0 0 0 0 0 0 14 14 14
50721- 34 34 34 66 66 66 78 78 78 6 6 6
50722- 2 2 6 18 18 18 218 218 218 253 253 253
50723-253 253 253 253 253 253 253 253 253 246 246 246
50724-226 226 226 231 231 231 246 246 246 253 253 253
50725-253 253 253 253 253 253 253 253 253 253 253 253
50726-253 253 253 253 253 253 253 253 253 253 253 253
50727-253 253 253 178 178 178 2 2 6 2 2 6
50728- 2 2 6 2 2 6 2 2 6 2 2 6
50729- 2 2 6 18 18 18 90 90 90 62 62 62
50730- 30 30 30 10 10 10 0 0 0 0 0 0
50731- 0 0 0 0 0 0 0 0 0 0 0 0
50732- 0 0 0 0 0 0 0 0 0 0 0 0
50733- 0 0 0 0 0 0 0 0 0 0 0 0
50734- 0 0 0 0 0 0 0 0 0 0 0 0
50735- 0 0 0 0 0 0 0 0 0 0 0 0
50736- 0 0 0 0 0 0 0 0 0 0 0 0
50737- 0 0 0 0 0 0 0 0 0 0 0 0
50738- 0 0 0 0 0 0 0 0 0 0 0 0
50739- 0 0 0 0 0 0 0 0 0 0 0 0
50740- 0 0 0 0 0 0 10 10 10 26 26 26
50741- 58 58 58 90 90 90 18 18 18 2 2 6
50742- 2 2 6 110 110 110 253 253 253 253 253 253
50743-253 253 253 253 253 253 253 253 253 253 253 253
50744-250 250 250 253 253 253 253 253 253 253 253 253
50745-253 253 253 253 253 253 253 253 253 253 253 253
50746-253 253 253 253 253 253 253 253 253 253 253 253
50747-253 253 253 231 231 231 18 18 18 2 2 6
50748- 2 2 6 2 2 6 2 2 6 2 2 6
50749- 2 2 6 2 2 6 18 18 18 94 94 94
50750- 54 54 54 26 26 26 10 10 10 0 0 0
50751- 0 0 0 0 0 0 0 0 0 0 0 0
50752- 0 0 0 0 0 0 0 0 0 0 0 0
50753- 0 0 0 0 0 0 0 0 0 0 0 0
50754- 0 0 0 0 0 0 0 0 0 0 0 0
50755- 0 0 0 0 0 0 0 0 0 0 0 0
50756- 0 0 0 0 0 0 0 0 0 0 0 0
50757- 0 0 0 0 0 0 0 0 0 0 0 0
50758- 0 0 0 0 0 0 0 0 0 0 0 0
50759- 0 0 0 0 0 0 0 0 0 0 0 0
50760- 0 0 0 6 6 6 22 22 22 50 50 50
50761- 90 90 90 26 26 26 2 2 6 2 2 6
50762- 14 14 14 195 195 195 250 250 250 253 253 253
50763-253 253 253 253 253 253 253 253 253 253 253 253
50764-253 253 253 253 253 253 253 253 253 253 253 253
50765-253 253 253 253 253 253 253 253 253 253 253 253
50766-253 253 253 253 253 253 253 253 253 253 253 253
50767-250 250 250 242 242 242 54 54 54 2 2 6
50768- 2 2 6 2 2 6 2 2 6 2 2 6
50769- 2 2 6 2 2 6 2 2 6 38 38 38
50770- 86 86 86 50 50 50 22 22 22 6 6 6
50771- 0 0 0 0 0 0 0 0 0 0 0 0
50772- 0 0 0 0 0 0 0 0 0 0 0 0
50773- 0 0 0 0 0 0 0 0 0 0 0 0
50774- 0 0 0 0 0 0 0 0 0 0 0 0
50775- 0 0 0 0 0 0 0 0 0 0 0 0
50776- 0 0 0 0 0 0 0 0 0 0 0 0
50777- 0 0 0 0 0 0 0 0 0 0 0 0
50778- 0 0 0 0 0 0 0 0 0 0 0 0
50779- 0 0 0 0 0 0 0 0 0 0 0 0
50780- 6 6 6 14 14 14 38 38 38 82 82 82
50781- 34 34 34 2 2 6 2 2 6 2 2 6
50782- 42 42 42 195 195 195 246 246 246 253 253 253
50783-253 253 253 253 253 253 253 253 253 250 250 250
50784-242 242 242 242 242 242 250 250 250 253 253 253
50785-253 253 253 253 253 253 253 253 253 253 253 253
50786-253 253 253 250 250 250 246 246 246 238 238 238
50787-226 226 226 231 231 231 101 101 101 6 6 6
50788- 2 2 6 2 2 6 2 2 6 2 2 6
50789- 2 2 6 2 2 6 2 2 6 2 2 6
50790- 38 38 38 82 82 82 42 42 42 14 14 14
50791- 6 6 6 0 0 0 0 0 0 0 0 0
50792- 0 0 0 0 0 0 0 0 0 0 0 0
50793- 0 0 0 0 0 0 0 0 0 0 0 0
50794- 0 0 0 0 0 0 0 0 0 0 0 0
50795- 0 0 0 0 0 0 0 0 0 0 0 0
50796- 0 0 0 0 0 0 0 0 0 0 0 0
50797- 0 0 0 0 0 0 0 0 0 0 0 0
50798- 0 0 0 0 0 0 0 0 0 0 0 0
50799- 0 0 0 0 0 0 0 0 0 0 0 0
50800- 10 10 10 26 26 26 62 62 62 66 66 66
50801- 2 2 6 2 2 6 2 2 6 6 6 6
50802- 70 70 70 170 170 170 206 206 206 234 234 234
50803-246 246 246 250 250 250 250 250 250 238 238 238
50804-226 226 226 231 231 231 238 238 238 250 250 250
50805-250 250 250 250 250 250 246 246 246 231 231 231
50806-214 214 214 206 206 206 202 202 202 202 202 202
50807-198 198 198 202 202 202 182 182 182 18 18 18
50808- 2 2 6 2 2 6 2 2 6 2 2 6
50809- 2 2 6 2 2 6 2 2 6 2 2 6
50810- 2 2 6 62 62 62 66 66 66 30 30 30
50811- 10 10 10 0 0 0 0 0 0 0 0 0
50812- 0 0 0 0 0 0 0 0 0 0 0 0
50813- 0 0 0 0 0 0 0 0 0 0 0 0
50814- 0 0 0 0 0 0 0 0 0 0 0 0
50815- 0 0 0 0 0 0 0 0 0 0 0 0
50816- 0 0 0 0 0 0 0 0 0 0 0 0
50817- 0 0 0 0 0 0 0 0 0 0 0 0
50818- 0 0 0 0 0 0 0 0 0 0 0 0
50819- 0 0 0 0 0 0 0 0 0 0 0 0
50820- 14 14 14 42 42 42 82 82 82 18 18 18
50821- 2 2 6 2 2 6 2 2 6 10 10 10
50822- 94 94 94 182 182 182 218 218 218 242 242 242
50823-250 250 250 253 253 253 253 253 253 250 250 250
50824-234 234 234 253 253 253 253 253 253 253 253 253
50825-253 253 253 253 253 253 253 253 253 246 246 246
50826-238 238 238 226 226 226 210 210 210 202 202 202
50827-195 195 195 195 195 195 210 210 210 158 158 158
50828- 6 6 6 14 14 14 50 50 50 14 14 14
50829- 2 2 6 2 2 6 2 2 6 2 2 6
50830- 2 2 6 6 6 6 86 86 86 46 46 46
50831- 18 18 18 6 6 6 0 0 0 0 0 0
50832- 0 0 0 0 0 0 0 0 0 0 0 0
50833- 0 0 0 0 0 0 0 0 0 0 0 0
50834- 0 0 0 0 0 0 0 0 0 0 0 0
50835- 0 0 0 0 0 0 0 0 0 0 0 0
50836- 0 0 0 0 0 0 0 0 0 0 0 0
50837- 0 0 0 0 0 0 0 0 0 0 0 0
50838- 0 0 0 0 0 0 0 0 0 0 0 0
50839- 0 0 0 0 0 0 0 0 0 6 6 6
50840- 22 22 22 54 54 54 70 70 70 2 2 6
50841- 2 2 6 10 10 10 2 2 6 22 22 22
50842-166 166 166 231 231 231 250 250 250 253 253 253
50843-253 253 253 253 253 253 253 253 253 250 250 250
50844-242 242 242 253 253 253 253 253 253 253 253 253
50845-253 253 253 253 253 253 253 253 253 253 253 253
50846-253 253 253 253 253 253 253 253 253 246 246 246
50847-231 231 231 206 206 206 198 198 198 226 226 226
50848- 94 94 94 2 2 6 6 6 6 38 38 38
50849- 30 30 30 2 2 6 2 2 6 2 2 6
50850- 2 2 6 2 2 6 62 62 62 66 66 66
50851- 26 26 26 10 10 10 0 0 0 0 0 0
50852- 0 0 0 0 0 0 0 0 0 0 0 0
50853- 0 0 0 0 0 0 0 0 0 0 0 0
50854- 0 0 0 0 0 0 0 0 0 0 0 0
50855- 0 0 0 0 0 0 0 0 0 0 0 0
50856- 0 0 0 0 0 0 0 0 0 0 0 0
50857- 0 0 0 0 0 0 0 0 0 0 0 0
50858- 0 0 0 0 0 0 0 0 0 0 0 0
50859- 0 0 0 0 0 0 0 0 0 10 10 10
50860- 30 30 30 74 74 74 50 50 50 2 2 6
50861- 26 26 26 26 26 26 2 2 6 106 106 106
50862-238 238 238 253 253 253 253 253 253 253 253 253
50863-253 253 253 253 253 253 253 253 253 253 253 253
50864-253 253 253 253 253 253 253 253 253 253 253 253
50865-253 253 253 253 253 253 253 253 253 253 253 253
50866-253 253 253 253 253 253 253 253 253 253 253 253
50867-253 253 253 246 246 246 218 218 218 202 202 202
50868-210 210 210 14 14 14 2 2 6 2 2 6
50869- 30 30 30 22 22 22 2 2 6 2 2 6
50870- 2 2 6 2 2 6 18 18 18 86 86 86
50871- 42 42 42 14 14 14 0 0 0 0 0 0
50872- 0 0 0 0 0 0 0 0 0 0 0 0
50873- 0 0 0 0 0 0 0 0 0 0 0 0
50874- 0 0 0 0 0 0 0 0 0 0 0 0
50875- 0 0 0 0 0 0 0 0 0 0 0 0
50876- 0 0 0 0 0 0 0 0 0 0 0 0
50877- 0 0 0 0 0 0 0 0 0 0 0 0
50878- 0 0 0 0 0 0 0 0 0 0 0 0
50879- 0 0 0 0 0 0 0 0 0 14 14 14
50880- 42 42 42 90 90 90 22 22 22 2 2 6
50881- 42 42 42 2 2 6 18 18 18 218 218 218
50882-253 253 253 253 253 253 253 253 253 253 253 253
50883-253 253 253 253 253 253 253 253 253 253 253 253
50884-253 253 253 253 253 253 253 253 253 253 253 253
50885-253 253 253 253 253 253 253 253 253 253 253 253
50886-253 253 253 253 253 253 253 253 253 253 253 253
50887-253 253 253 253 253 253 250 250 250 221 221 221
50888-218 218 218 101 101 101 2 2 6 14 14 14
50889- 18 18 18 38 38 38 10 10 10 2 2 6
50890- 2 2 6 2 2 6 2 2 6 78 78 78
50891- 58 58 58 22 22 22 6 6 6 0 0 0
50892- 0 0 0 0 0 0 0 0 0 0 0 0
50893- 0 0 0 0 0 0 0 0 0 0 0 0
50894- 0 0 0 0 0 0 0 0 0 0 0 0
50895- 0 0 0 0 0 0 0 0 0 0 0 0
50896- 0 0 0 0 0 0 0 0 0 0 0 0
50897- 0 0 0 0 0 0 0 0 0 0 0 0
50898- 0 0 0 0 0 0 0 0 0 0 0 0
50899- 0 0 0 0 0 0 6 6 6 18 18 18
50900- 54 54 54 82 82 82 2 2 6 26 26 26
50901- 22 22 22 2 2 6 123 123 123 253 253 253
50902-253 253 253 253 253 253 253 253 253 253 253 253
50903-253 253 253 253 253 253 253 253 253 253 253 253
50904-253 253 253 253 253 253 253 253 253 253 253 253
50905-253 253 253 253 253 253 253 253 253 253 253 253
50906-253 253 253 253 253 253 253 253 253 253 253 253
50907-253 253 253 253 253 253 253 253 253 250 250 250
50908-238 238 238 198 198 198 6 6 6 38 38 38
50909- 58 58 58 26 26 26 38 38 38 2 2 6
50910- 2 2 6 2 2 6 2 2 6 46 46 46
50911- 78 78 78 30 30 30 10 10 10 0 0 0
50912- 0 0 0 0 0 0 0 0 0 0 0 0
50913- 0 0 0 0 0 0 0 0 0 0 0 0
50914- 0 0 0 0 0 0 0 0 0 0 0 0
50915- 0 0 0 0 0 0 0 0 0 0 0 0
50916- 0 0 0 0 0 0 0 0 0 0 0 0
50917- 0 0 0 0 0 0 0 0 0 0 0 0
50918- 0 0 0 0 0 0 0 0 0 0 0 0
50919- 0 0 0 0 0 0 10 10 10 30 30 30
50920- 74 74 74 58 58 58 2 2 6 42 42 42
50921- 2 2 6 22 22 22 231 231 231 253 253 253
50922-253 253 253 253 253 253 253 253 253 253 253 253
50923-253 253 253 253 253 253 253 253 253 250 250 250
50924-253 253 253 253 253 253 253 253 253 253 253 253
50925-253 253 253 253 253 253 253 253 253 253 253 253
50926-253 253 253 253 253 253 253 253 253 253 253 253
50927-253 253 253 253 253 253 253 253 253 253 253 253
50928-253 253 253 246 246 246 46 46 46 38 38 38
50929- 42 42 42 14 14 14 38 38 38 14 14 14
50930- 2 2 6 2 2 6 2 2 6 6 6 6
50931- 86 86 86 46 46 46 14 14 14 0 0 0
50932- 0 0 0 0 0 0 0 0 0 0 0 0
50933- 0 0 0 0 0 0 0 0 0 0 0 0
50934- 0 0 0 0 0 0 0 0 0 0 0 0
50935- 0 0 0 0 0 0 0 0 0 0 0 0
50936- 0 0 0 0 0 0 0 0 0 0 0 0
50937- 0 0 0 0 0 0 0 0 0 0 0 0
50938- 0 0 0 0 0 0 0 0 0 0 0 0
50939- 0 0 0 6 6 6 14 14 14 42 42 42
50940- 90 90 90 18 18 18 18 18 18 26 26 26
50941- 2 2 6 116 116 116 253 253 253 253 253 253
50942-253 253 253 253 253 253 253 253 253 253 253 253
50943-253 253 253 253 253 253 250 250 250 238 238 238
50944-253 253 253 253 253 253 253 253 253 253 253 253
50945-253 253 253 253 253 253 253 253 253 253 253 253
50946-253 253 253 253 253 253 253 253 253 253 253 253
50947-253 253 253 253 253 253 253 253 253 253 253 253
50948-253 253 253 253 253 253 94 94 94 6 6 6
50949- 2 2 6 2 2 6 10 10 10 34 34 34
50950- 2 2 6 2 2 6 2 2 6 2 2 6
50951- 74 74 74 58 58 58 22 22 22 6 6 6
50952- 0 0 0 0 0 0 0 0 0 0 0 0
50953- 0 0 0 0 0 0 0 0 0 0 0 0
50954- 0 0 0 0 0 0 0 0 0 0 0 0
50955- 0 0 0 0 0 0 0 0 0 0 0 0
50956- 0 0 0 0 0 0 0 0 0 0 0 0
50957- 0 0 0 0 0 0 0 0 0 0 0 0
50958- 0 0 0 0 0 0 0 0 0 0 0 0
50959- 0 0 0 10 10 10 26 26 26 66 66 66
50960- 82 82 82 2 2 6 38 38 38 6 6 6
50961- 14 14 14 210 210 210 253 253 253 253 253 253
50962-253 253 253 253 253 253 253 253 253 253 253 253
50963-253 253 253 253 253 253 246 246 246 242 242 242
50964-253 253 253 253 253 253 253 253 253 253 253 253
50965-253 253 253 253 253 253 253 253 253 253 253 253
50966-253 253 253 253 253 253 253 253 253 253 253 253
50967-253 253 253 253 253 253 253 253 253 253 253 253
50968-253 253 253 253 253 253 144 144 144 2 2 6
50969- 2 2 6 2 2 6 2 2 6 46 46 46
50970- 2 2 6 2 2 6 2 2 6 2 2 6
50971- 42 42 42 74 74 74 30 30 30 10 10 10
50972- 0 0 0 0 0 0 0 0 0 0 0 0
50973- 0 0 0 0 0 0 0 0 0 0 0 0
50974- 0 0 0 0 0 0 0 0 0 0 0 0
50975- 0 0 0 0 0 0 0 0 0 0 0 0
50976- 0 0 0 0 0 0 0 0 0 0 0 0
50977- 0 0 0 0 0 0 0 0 0 0 0 0
50978- 0 0 0 0 0 0 0 0 0 0 0 0
50979- 6 6 6 14 14 14 42 42 42 90 90 90
50980- 26 26 26 6 6 6 42 42 42 2 2 6
50981- 74 74 74 250 250 250 253 253 253 253 253 253
50982-253 253 253 253 253 253 253 253 253 253 253 253
50983-253 253 253 253 253 253 242 242 242 242 242 242
50984-253 253 253 253 253 253 253 253 253 253 253 253
50985-253 253 253 253 253 253 253 253 253 253 253 253
50986-253 253 253 253 253 253 253 253 253 253 253 253
50987-253 253 253 253 253 253 253 253 253 253 253 253
50988-253 253 253 253 253 253 182 182 182 2 2 6
50989- 2 2 6 2 2 6 2 2 6 46 46 46
50990- 2 2 6 2 2 6 2 2 6 2 2 6
50991- 10 10 10 86 86 86 38 38 38 10 10 10
50992- 0 0 0 0 0 0 0 0 0 0 0 0
50993- 0 0 0 0 0 0 0 0 0 0 0 0
50994- 0 0 0 0 0 0 0 0 0 0 0 0
50995- 0 0 0 0 0 0 0 0 0 0 0 0
50996- 0 0 0 0 0 0 0 0 0 0 0 0
50997- 0 0 0 0 0 0 0 0 0 0 0 0
50998- 0 0 0 0 0 0 0 0 0 0 0 0
50999- 10 10 10 26 26 26 66 66 66 82 82 82
51000- 2 2 6 22 22 22 18 18 18 2 2 6
51001-149 149 149 253 253 253 253 253 253 253 253 253
51002-253 253 253 253 253 253 253 253 253 253 253 253
51003-253 253 253 253 253 253 234 234 234 242 242 242
51004-253 253 253 253 253 253 253 253 253 253 253 253
51005-253 253 253 253 253 253 253 253 253 253 253 253
51006-253 253 253 253 253 253 253 253 253 253 253 253
51007-253 253 253 253 253 253 253 253 253 253 253 253
51008-253 253 253 253 253 253 206 206 206 2 2 6
51009- 2 2 6 2 2 6 2 2 6 38 38 38
51010- 2 2 6 2 2 6 2 2 6 2 2 6
51011- 6 6 6 86 86 86 46 46 46 14 14 14
51012- 0 0 0 0 0 0 0 0 0 0 0 0
51013- 0 0 0 0 0 0 0 0 0 0 0 0
51014- 0 0 0 0 0 0 0 0 0 0 0 0
51015- 0 0 0 0 0 0 0 0 0 0 0 0
51016- 0 0 0 0 0 0 0 0 0 0 0 0
51017- 0 0 0 0 0 0 0 0 0 0 0 0
51018- 0 0 0 0 0 0 0 0 0 6 6 6
51019- 18 18 18 46 46 46 86 86 86 18 18 18
51020- 2 2 6 34 34 34 10 10 10 6 6 6
51021-210 210 210 253 253 253 253 253 253 253 253 253
51022-253 253 253 253 253 253 253 253 253 253 253 253
51023-253 253 253 253 253 253 234 234 234 242 242 242
51024-253 253 253 253 253 253 253 253 253 253 253 253
51025-253 253 253 253 253 253 253 253 253 253 253 253
51026-253 253 253 253 253 253 253 253 253 253 253 253
51027-253 253 253 253 253 253 253 253 253 253 253 253
51028-253 253 253 253 253 253 221 221 221 6 6 6
51029- 2 2 6 2 2 6 6 6 6 30 30 30
51030- 2 2 6 2 2 6 2 2 6 2 2 6
51031- 2 2 6 82 82 82 54 54 54 18 18 18
51032- 6 6 6 0 0 0 0 0 0 0 0 0
51033- 0 0 0 0 0 0 0 0 0 0 0 0
51034- 0 0 0 0 0 0 0 0 0 0 0 0
51035- 0 0 0 0 0 0 0 0 0 0 0 0
51036- 0 0 0 0 0 0 0 0 0 0 0 0
51037- 0 0 0 0 0 0 0 0 0 0 0 0
51038- 0 0 0 0 0 0 0 0 0 10 10 10
51039- 26 26 26 66 66 66 62 62 62 2 2 6
51040- 2 2 6 38 38 38 10 10 10 26 26 26
51041-238 238 238 253 253 253 253 253 253 253 253 253
51042-253 253 253 253 253 253 253 253 253 253 253 253
51043-253 253 253 253 253 253 231 231 231 238 238 238
51044-253 253 253 253 253 253 253 253 253 253 253 253
51045-253 253 253 253 253 253 253 253 253 253 253 253
51046-253 253 253 253 253 253 253 253 253 253 253 253
51047-253 253 253 253 253 253 253 253 253 253 253 253
51048-253 253 253 253 253 253 231 231 231 6 6 6
51049- 2 2 6 2 2 6 10 10 10 30 30 30
51050- 2 2 6 2 2 6 2 2 6 2 2 6
51051- 2 2 6 66 66 66 58 58 58 22 22 22
51052- 6 6 6 0 0 0 0 0 0 0 0 0
51053- 0 0 0 0 0 0 0 0 0 0 0 0
51054- 0 0 0 0 0 0 0 0 0 0 0 0
51055- 0 0 0 0 0 0 0 0 0 0 0 0
51056- 0 0 0 0 0 0 0 0 0 0 0 0
51057- 0 0 0 0 0 0 0 0 0 0 0 0
51058- 0 0 0 0 0 0 0 0 0 10 10 10
51059- 38 38 38 78 78 78 6 6 6 2 2 6
51060- 2 2 6 46 46 46 14 14 14 42 42 42
51061-246 246 246 253 253 253 253 253 253 253 253 253
51062-253 253 253 253 253 253 253 253 253 253 253 253
51063-253 253 253 253 253 253 231 231 231 242 242 242
51064-253 253 253 253 253 253 253 253 253 253 253 253
51065-253 253 253 253 253 253 253 253 253 253 253 253
51066-253 253 253 253 253 253 253 253 253 253 253 253
51067-253 253 253 253 253 253 253 253 253 253 253 253
51068-253 253 253 253 253 253 234 234 234 10 10 10
51069- 2 2 6 2 2 6 22 22 22 14 14 14
51070- 2 2 6 2 2 6 2 2 6 2 2 6
51071- 2 2 6 66 66 66 62 62 62 22 22 22
51072- 6 6 6 0 0 0 0 0 0 0 0 0
51073- 0 0 0 0 0 0 0 0 0 0 0 0
51074- 0 0 0 0 0 0 0 0 0 0 0 0
51075- 0 0 0 0 0 0 0 0 0 0 0 0
51076- 0 0 0 0 0 0 0 0 0 0 0 0
51077- 0 0 0 0 0 0 0 0 0 0 0 0
51078- 0 0 0 0 0 0 6 6 6 18 18 18
51079- 50 50 50 74 74 74 2 2 6 2 2 6
51080- 14 14 14 70 70 70 34 34 34 62 62 62
51081-250 250 250 253 253 253 253 253 253 253 253 253
51082-253 253 253 253 253 253 253 253 253 253 253 253
51083-253 253 253 253 253 253 231 231 231 246 246 246
51084-253 253 253 253 253 253 253 253 253 253 253 253
51085-253 253 253 253 253 253 253 253 253 253 253 253
51086-253 253 253 253 253 253 253 253 253 253 253 253
51087-253 253 253 253 253 253 253 253 253 253 253 253
51088-253 253 253 253 253 253 234 234 234 14 14 14
51089- 2 2 6 2 2 6 30 30 30 2 2 6
51090- 2 2 6 2 2 6 2 2 6 2 2 6
51091- 2 2 6 66 66 66 62 62 62 22 22 22
51092- 6 6 6 0 0 0 0 0 0 0 0 0
51093- 0 0 0 0 0 0 0 0 0 0 0 0
51094- 0 0 0 0 0 0 0 0 0 0 0 0
51095- 0 0 0 0 0 0 0 0 0 0 0 0
51096- 0 0 0 0 0 0 0 0 0 0 0 0
51097- 0 0 0 0 0 0 0 0 0 0 0 0
51098- 0 0 0 0 0 0 6 6 6 18 18 18
51099- 54 54 54 62 62 62 2 2 6 2 2 6
51100- 2 2 6 30 30 30 46 46 46 70 70 70
51101-250 250 250 253 253 253 253 253 253 253 253 253
51102-253 253 253 253 253 253 253 253 253 253 253 253
51103-253 253 253 253 253 253 231 231 231 246 246 246
51104-253 253 253 253 253 253 253 253 253 253 253 253
51105-253 253 253 253 253 253 253 253 253 253 253 253
51106-253 253 253 253 253 253 253 253 253 253 253 253
51107-253 253 253 253 253 253 253 253 253 253 253 253
51108-253 253 253 253 253 253 226 226 226 10 10 10
51109- 2 2 6 6 6 6 30 30 30 2 2 6
51110- 2 2 6 2 2 6 2 2 6 2 2 6
51111- 2 2 6 66 66 66 58 58 58 22 22 22
51112- 6 6 6 0 0 0 0 0 0 0 0 0
51113- 0 0 0 0 0 0 0 0 0 0 0 0
51114- 0 0 0 0 0 0 0 0 0 0 0 0
51115- 0 0 0 0 0 0 0 0 0 0 0 0
51116- 0 0 0 0 0 0 0 0 0 0 0 0
51117- 0 0 0 0 0 0 0 0 0 0 0 0
51118- 0 0 0 0 0 0 6 6 6 22 22 22
51119- 58 58 58 62 62 62 2 2 6 2 2 6
51120- 2 2 6 2 2 6 30 30 30 78 78 78
51121-250 250 250 253 253 253 253 253 253 253 253 253
51122-253 253 253 253 253 253 253 253 253 253 253 253
51123-253 253 253 253 253 253 231 231 231 246 246 246
51124-253 253 253 253 253 253 253 253 253 253 253 253
51125-253 253 253 253 253 253 253 253 253 253 253 253
51126-253 253 253 253 253 253 253 253 253 253 253 253
51127-253 253 253 253 253 253 253 253 253 253 253 253
51128-253 253 253 253 253 253 206 206 206 2 2 6
51129- 22 22 22 34 34 34 18 14 6 22 22 22
51130- 26 26 26 18 18 18 6 6 6 2 2 6
51131- 2 2 6 82 82 82 54 54 54 18 18 18
51132- 6 6 6 0 0 0 0 0 0 0 0 0
51133- 0 0 0 0 0 0 0 0 0 0 0 0
51134- 0 0 0 0 0 0 0 0 0 0 0 0
51135- 0 0 0 0 0 0 0 0 0 0 0 0
51136- 0 0 0 0 0 0 0 0 0 0 0 0
51137- 0 0 0 0 0 0 0 0 0 0 0 0
51138- 0 0 0 0 0 0 6 6 6 26 26 26
51139- 62 62 62 106 106 106 74 54 14 185 133 11
51140-210 162 10 121 92 8 6 6 6 62 62 62
51141-238 238 238 253 253 253 253 253 253 253 253 253
51142-253 253 253 253 253 253 253 253 253 253 253 253
51143-253 253 253 253 253 253 231 231 231 246 246 246
51144-253 253 253 253 253 253 253 253 253 253 253 253
51145-253 253 253 253 253 253 253 253 253 253 253 253
51146-253 253 253 253 253 253 253 253 253 253 253 253
51147-253 253 253 253 253 253 253 253 253 253 253 253
51148-253 253 253 253 253 253 158 158 158 18 18 18
51149- 14 14 14 2 2 6 2 2 6 2 2 6
51150- 6 6 6 18 18 18 66 66 66 38 38 38
51151- 6 6 6 94 94 94 50 50 50 18 18 18
51152- 6 6 6 0 0 0 0 0 0 0 0 0
51153- 0 0 0 0 0 0 0 0 0 0 0 0
51154- 0 0 0 0 0 0 0 0 0 0 0 0
51155- 0 0 0 0 0 0 0 0 0 0 0 0
51156- 0 0 0 0 0 0 0 0 0 0 0 0
51157- 0 0 0 0 0 0 0 0 0 6 6 6
51158- 10 10 10 10 10 10 18 18 18 38 38 38
51159- 78 78 78 142 134 106 216 158 10 242 186 14
51160-246 190 14 246 190 14 156 118 10 10 10 10
51161- 90 90 90 238 238 238 253 253 253 253 253 253
51162-253 253 253 253 253 253 253 253 253 253 253 253
51163-253 253 253 253 253 253 231 231 231 250 250 250
51164-253 253 253 253 253 253 253 253 253 253 253 253
51165-253 253 253 253 253 253 253 253 253 253 253 253
51166-253 253 253 253 253 253 253 253 253 253 253 253
51167-253 253 253 253 253 253 253 253 253 246 230 190
51168-238 204 91 238 204 91 181 142 44 37 26 9
51169- 2 2 6 2 2 6 2 2 6 2 2 6
51170- 2 2 6 2 2 6 38 38 38 46 46 46
51171- 26 26 26 106 106 106 54 54 54 18 18 18
51172- 6 6 6 0 0 0 0 0 0 0 0 0
51173- 0 0 0 0 0 0 0 0 0 0 0 0
51174- 0 0 0 0 0 0 0 0 0 0 0 0
51175- 0 0 0 0 0 0 0 0 0 0 0 0
51176- 0 0 0 0 0 0 0 0 0 0 0 0
51177- 0 0 0 6 6 6 14 14 14 22 22 22
51178- 30 30 30 38 38 38 50 50 50 70 70 70
51179-106 106 106 190 142 34 226 170 11 242 186 14
51180-246 190 14 246 190 14 246 190 14 154 114 10
51181- 6 6 6 74 74 74 226 226 226 253 253 253
51182-253 253 253 253 253 253 253 253 253 253 253 253
51183-253 253 253 253 253 253 231 231 231 250 250 250
51184-253 253 253 253 253 253 253 253 253 253 253 253
51185-253 253 253 253 253 253 253 253 253 253 253 253
51186-253 253 253 253 253 253 253 253 253 253 253 253
51187-253 253 253 253 253 253 253 253 253 228 184 62
51188-241 196 14 241 208 19 232 195 16 38 30 10
51189- 2 2 6 2 2 6 2 2 6 2 2 6
51190- 2 2 6 6 6 6 30 30 30 26 26 26
51191-203 166 17 154 142 90 66 66 66 26 26 26
51192- 6 6 6 0 0 0 0 0 0 0 0 0
51193- 0 0 0 0 0 0 0 0 0 0 0 0
51194- 0 0 0 0 0 0 0 0 0 0 0 0
51195- 0 0 0 0 0 0 0 0 0 0 0 0
51196- 0 0 0 0 0 0 0 0 0 0 0 0
51197- 6 6 6 18 18 18 38 38 38 58 58 58
51198- 78 78 78 86 86 86 101 101 101 123 123 123
51199-175 146 61 210 150 10 234 174 13 246 186 14
51200-246 190 14 246 190 14 246 190 14 238 190 10
51201-102 78 10 2 2 6 46 46 46 198 198 198
51202-253 253 253 253 253 253 253 253 253 253 253 253
51203-253 253 253 253 253 253 234 234 234 242 242 242
51204-253 253 253 253 253 253 253 253 253 253 253 253
51205-253 253 253 253 253 253 253 253 253 253 253 253
51206-253 253 253 253 253 253 253 253 253 253 253 253
51207-253 253 253 253 253 253 253 253 253 224 178 62
51208-242 186 14 241 196 14 210 166 10 22 18 6
51209- 2 2 6 2 2 6 2 2 6 2 2 6
51210- 2 2 6 2 2 6 6 6 6 121 92 8
51211-238 202 15 232 195 16 82 82 82 34 34 34
51212- 10 10 10 0 0 0 0 0 0 0 0 0
51213- 0 0 0 0 0 0 0 0 0 0 0 0
51214- 0 0 0 0 0 0 0 0 0 0 0 0
51215- 0 0 0 0 0 0 0 0 0 0 0 0
51216- 0 0 0 0 0 0 0 0 0 0 0 0
51217- 14 14 14 38 38 38 70 70 70 154 122 46
51218-190 142 34 200 144 11 197 138 11 197 138 11
51219-213 154 11 226 170 11 242 186 14 246 190 14
51220-246 190 14 246 190 14 246 190 14 246 190 14
51221-225 175 15 46 32 6 2 2 6 22 22 22
51222-158 158 158 250 250 250 253 253 253 253 253 253
51223-253 253 253 253 253 253 253 253 253 253 253 253
51224-253 253 253 253 253 253 253 253 253 253 253 253
51225-253 253 253 253 253 253 253 253 253 253 253 253
51226-253 253 253 253 253 253 253 253 253 253 253 253
51227-253 253 253 250 250 250 242 242 242 224 178 62
51228-239 182 13 236 186 11 213 154 11 46 32 6
51229- 2 2 6 2 2 6 2 2 6 2 2 6
51230- 2 2 6 2 2 6 61 42 6 225 175 15
51231-238 190 10 236 186 11 112 100 78 42 42 42
51232- 14 14 14 0 0 0 0 0 0 0 0 0
51233- 0 0 0 0 0 0 0 0 0 0 0 0
51234- 0 0 0 0 0 0 0 0 0 0 0 0
51235- 0 0 0 0 0 0 0 0 0 0 0 0
51236- 0 0 0 0 0 0 0 0 0 6 6 6
51237- 22 22 22 54 54 54 154 122 46 213 154 11
51238-226 170 11 230 174 11 226 170 11 226 170 11
51239-236 178 12 242 186 14 246 190 14 246 190 14
51240-246 190 14 246 190 14 246 190 14 246 190 14
51241-241 196 14 184 144 12 10 10 10 2 2 6
51242- 6 6 6 116 116 116 242 242 242 253 253 253
51243-253 253 253 253 253 253 253 253 253 253 253 253
51244-253 253 253 253 253 253 253 253 253 253 253 253
51245-253 253 253 253 253 253 253 253 253 253 253 253
51246-253 253 253 253 253 253 253 253 253 253 253 253
51247-253 253 253 231 231 231 198 198 198 214 170 54
51248-236 178 12 236 178 12 210 150 10 137 92 6
51249- 18 14 6 2 2 6 2 2 6 2 2 6
51250- 6 6 6 70 47 6 200 144 11 236 178 12
51251-239 182 13 239 182 13 124 112 88 58 58 58
51252- 22 22 22 6 6 6 0 0 0 0 0 0
51253- 0 0 0 0 0 0 0 0 0 0 0 0
51254- 0 0 0 0 0 0 0 0 0 0 0 0
51255- 0 0 0 0 0 0 0 0 0 0 0 0
51256- 0 0 0 0 0 0 0 0 0 10 10 10
51257- 30 30 30 70 70 70 180 133 36 226 170 11
51258-239 182 13 242 186 14 242 186 14 246 186 14
51259-246 190 14 246 190 14 246 190 14 246 190 14
51260-246 190 14 246 190 14 246 190 14 246 190 14
51261-246 190 14 232 195 16 98 70 6 2 2 6
51262- 2 2 6 2 2 6 66 66 66 221 221 221
51263-253 253 253 253 253 253 253 253 253 253 253 253
51264-253 253 253 253 253 253 253 253 253 253 253 253
51265-253 253 253 253 253 253 253 253 253 253 253 253
51266-253 253 253 253 253 253 253 253 253 253 253 253
51267-253 253 253 206 206 206 198 198 198 214 166 58
51268-230 174 11 230 174 11 216 158 10 192 133 9
51269-163 110 8 116 81 8 102 78 10 116 81 8
51270-167 114 7 197 138 11 226 170 11 239 182 13
51271-242 186 14 242 186 14 162 146 94 78 78 78
51272- 34 34 34 14 14 14 6 6 6 0 0 0
51273- 0 0 0 0 0 0 0 0 0 0 0 0
51274- 0 0 0 0 0 0 0 0 0 0 0 0
51275- 0 0 0 0 0 0 0 0 0 0 0 0
51276- 0 0 0 0 0 0 0 0 0 6 6 6
51277- 30 30 30 78 78 78 190 142 34 226 170 11
51278-239 182 13 246 190 14 246 190 14 246 190 14
51279-246 190 14 246 190 14 246 190 14 246 190 14
51280-246 190 14 246 190 14 246 190 14 246 190 14
51281-246 190 14 241 196 14 203 166 17 22 18 6
51282- 2 2 6 2 2 6 2 2 6 38 38 38
51283-218 218 218 253 253 253 253 253 253 253 253 253
51284-253 253 253 253 253 253 253 253 253 253 253 253
51285-253 253 253 253 253 253 253 253 253 253 253 253
51286-253 253 253 253 253 253 253 253 253 253 253 253
51287-250 250 250 206 206 206 198 198 198 202 162 69
51288-226 170 11 236 178 12 224 166 10 210 150 10
51289-200 144 11 197 138 11 192 133 9 197 138 11
51290-210 150 10 226 170 11 242 186 14 246 190 14
51291-246 190 14 246 186 14 225 175 15 124 112 88
51292- 62 62 62 30 30 30 14 14 14 6 6 6
51293- 0 0 0 0 0 0 0 0 0 0 0 0
51294- 0 0 0 0 0 0 0 0 0 0 0 0
51295- 0 0 0 0 0 0 0 0 0 0 0 0
51296- 0 0 0 0 0 0 0 0 0 10 10 10
51297- 30 30 30 78 78 78 174 135 50 224 166 10
51298-239 182 13 246 190 14 246 190 14 246 190 14
51299-246 190 14 246 190 14 246 190 14 246 190 14
51300-246 190 14 246 190 14 246 190 14 246 190 14
51301-246 190 14 246 190 14 241 196 14 139 102 15
51302- 2 2 6 2 2 6 2 2 6 2 2 6
51303- 78 78 78 250 250 250 253 253 253 253 253 253
51304-253 253 253 253 253 253 253 253 253 253 253 253
51305-253 253 253 253 253 253 253 253 253 253 253 253
51306-253 253 253 253 253 253 253 253 253 253 253 253
51307-250 250 250 214 214 214 198 198 198 190 150 46
51308-219 162 10 236 178 12 234 174 13 224 166 10
51309-216 158 10 213 154 11 213 154 11 216 158 10
51310-226 170 11 239 182 13 246 190 14 246 190 14
51311-246 190 14 246 190 14 242 186 14 206 162 42
51312-101 101 101 58 58 58 30 30 30 14 14 14
51313- 6 6 6 0 0 0 0 0 0 0 0 0
51314- 0 0 0 0 0 0 0 0 0 0 0 0
51315- 0 0 0 0 0 0 0 0 0 0 0 0
51316- 0 0 0 0 0 0 0 0 0 10 10 10
51317- 30 30 30 74 74 74 174 135 50 216 158 10
51318-236 178 12 246 190 14 246 190 14 246 190 14
51319-246 190 14 246 190 14 246 190 14 246 190 14
51320-246 190 14 246 190 14 246 190 14 246 190 14
51321-246 190 14 246 190 14 241 196 14 226 184 13
51322- 61 42 6 2 2 6 2 2 6 2 2 6
51323- 22 22 22 238 238 238 253 253 253 253 253 253
51324-253 253 253 253 253 253 253 253 253 253 253 253
51325-253 253 253 253 253 253 253 253 253 253 253 253
51326-253 253 253 253 253 253 253 253 253 253 253 253
51327-253 253 253 226 226 226 187 187 187 180 133 36
51328-216 158 10 236 178 12 239 182 13 236 178 12
51329-230 174 11 226 170 11 226 170 11 230 174 11
51330-236 178 12 242 186 14 246 190 14 246 190 14
51331-246 190 14 246 190 14 246 186 14 239 182 13
51332-206 162 42 106 106 106 66 66 66 34 34 34
51333- 14 14 14 6 6 6 0 0 0 0 0 0
51334- 0 0 0 0 0 0 0 0 0 0 0 0
51335- 0 0 0 0 0 0 0 0 0 0 0 0
51336- 0 0 0 0 0 0 0 0 0 6 6 6
51337- 26 26 26 70 70 70 163 133 67 213 154 11
51338-236 178 12 246 190 14 246 190 14 246 190 14
51339-246 190 14 246 190 14 246 190 14 246 190 14
51340-246 190 14 246 190 14 246 190 14 246 190 14
51341-246 190 14 246 190 14 246 190 14 241 196 14
51342-190 146 13 18 14 6 2 2 6 2 2 6
51343- 46 46 46 246 246 246 253 253 253 253 253 253
51344-253 253 253 253 253 253 253 253 253 253 253 253
51345-253 253 253 253 253 253 253 253 253 253 253 253
51346-253 253 253 253 253 253 253 253 253 253 253 253
51347-253 253 253 221 221 221 86 86 86 156 107 11
51348-216 158 10 236 178 12 242 186 14 246 186 14
51349-242 186 14 239 182 13 239 182 13 242 186 14
51350-242 186 14 246 186 14 246 190 14 246 190 14
51351-246 190 14 246 190 14 246 190 14 246 190 14
51352-242 186 14 225 175 15 142 122 72 66 66 66
51353- 30 30 30 10 10 10 0 0 0 0 0 0
51354- 0 0 0 0 0 0 0 0 0 0 0 0
51355- 0 0 0 0 0 0 0 0 0 0 0 0
51356- 0 0 0 0 0 0 0 0 0 6 6 6
51357- 26 26 26 70 70 70 163 133 67 210 150 10
51358-236 178 12 246 190 14 246 190 14 246 190 14
51359-246 190 14 246 190 14 246 190 14 246 190 14
51360-246 190 14 246 190 14 246 190 14 246 190 14
51361-246 190 14 246 190 14 246 190 14 246 190 14
51362-232 195 16 121 92 8 34 34 34 106 106 106
51363-221 221 221 253 253 253 253 253 253 253 253 253
51364-253 253 253 253 253 253 253 253 253 253 253 253
51365-253 253 253 253 253 253 253 253 253 253 253 253
51366-253 253 253 253 253 253 253 253 253 253 253 253
51367-242 242 242 82 82 82 18 14 6 163 110 8
51368-216 158 10 236 178 12 242 186 14 246 190 14
51369-246 190 14 246 190 14 246 190 14 246 190 14
51370-246 190 14 246 190 14 246 190 14 246 190 14
51371-246 190 14 246 190 14 246 190 14 246 190 14
51372-246 190 14 246 190 14 242 186 14 163 133 67
51373- 46 46 46 18 18 18 6 6 6 0 0 0
51374- 0 0 0 0 0 0 0 0 0 0 0 0
51375- 0 0 0 0 0 0 0 0 0 0 0 0
51376- 0 0 0 0 0 0 0 0 0 10 10 10
51377- 30 30 30 78 78 78 163 133 67 210 150 10
51378-236 178 12 246 186 14 246 190 14 246 190 14
51379-246 190 14 246 190 14 246 190 14 246 190 14
51380-246 190 14 246 190 14 246 190 14 246 190 14
51381-246 190 14 246 190 14 246 190 14 246 190 14
51382-241 196 14 215 174 15 190 178 144 253 253 253
51383-253 253 253 253 253 253 253 253 253 253 253 253
51384-253 253 253 253 253 253 253 253 253 253 253 253
51385-253 253 253 253 253 253 253 253 253 253 253 253
51386-253 253 253 253 253 253 253 253 253 218 218 218
51387- 58 58 58 2 2 6 22 18 6 167 114 7
51388-216 158 10 236 178 12 246 186 14 246 190 14
51389-246 190 14 246 190 14 246 190 14 246 190 14
51390-246 190 14 246 190 14 246 190 14 246 190 14
51391-246 190 14 246 190 14 246 190 14 246 190 14
51392-246 190 14 246 186 14 242 186 14 190 150 46
51393- 54 54 54 22 22 22 6 6 6 0 0 0
51394- 0 0 0 0 0 0 0 0 0 0 0 0
51395- 0 0 0 0 0 0 0 0 0 0 0 0
51396- 0 0 0 0 0 0 0 0 0 14 14 14
51397- 38 38 38 86 86 86 180 133 36 213 154 11
51398-236 178 12 246 186 14 246 190 14 246 190 14
51399-246 190 14 246 190 14 246 190 14 246 190 14
51400-246 190 14 246 190 14 246 190 14 246 190 14
51401-246 190 14 246 190 14 246 190 14 246 190 14
51402-246 190 14 232 195 16 190 146 13 214 214 214
51403-253 253 253 253 253 253 253 253 253 253 253 253
51404-253 253 253 253 253 253 253 253 253 253 253 253
51405-253 253 253 253 253 253 253 253 253 253 253 253
51406-253 253 253 250 250 250 170 170 170 26 26 26
51407- 2 2 6 2 2 6 37 26 9 163 110 8
51408-219 162 10 239 182 13 246 186 14 246 190 14
51409-246 190 14 246 190 14 246 190 14 246 190 14
51410-246 190 14 246 190 14 246 190 14 246 190 14
51411-246 190 14 246 190 14 246 190 14 246 190 14
51412-246 186 14 236 178 12 224 166 10 142 122 72
51413- 46 46 46 18 18 18 6 6 6 0 0 0
51414- 0 0 0 0 0 0 0 0 0 0 0 0
51415- 0 0 0 0 0 0 0 0 0 0 0 0
51416- 0 0 0 0 0 0 6 6 6 18 18 18
51417- 50 50 50 109 106 95 192 133 9 224 166 10
51418-242 186 14 246 190 14 246 190 14 246 190 14
51419-246 190 14 246 190 14 246 190 14 246 190 14
51420-246 190 14 246 190 14 246 190 14 246 190 14
51421-246 190 14 246 190 14 246 190 14 246 190 14
51422-242 186 14 226 184 13 210 162 10 142 110 46
51423-226 226 226 253 253 253 253 253 253 253 253 253
51424-253 253 253 253 253 253 253 253 253 253 253 253
51425-253 253 253 253 253 253 253 253 253 253 253 253
51426-198 198 198 66 66 66 2 2 6 2 2 6
51427- 2 2 6 2 2 6 50 34 6 156 107 11
51428-219 162 10 239 182 13 246 186 14 246 190 14
51429-246 190 14 246 190 14 246 190 14 246 190 14
51430-246 190 14 246 190 14 246 190 14 246 190 14
51431-246 190 14 246 190 14 246 190 14 242 186 14
51432-234 174 13 213 154 11 154 122 46 66 66 66
51433- 30 30 30 10 10 10 0 0 0 0 0 0
51434- 0 0 0 0 0 0 0 0 0 0 0 0
51435- 0 0 0 0 0 0 0 0 0 0 0 0
51436- 0 0 0 0 0 0 6 6 6 22 22 22
51437- 58 58 58 154 121 60 206 145 10 234 174 13
51438-242 186 14 246 186 14 246 190 14 246 190 14
51439-246 190 14 246 190 14 246 190 14 246 190 14
51440-246 190 14 246 190 14 246 190 14 246 190 14
51441-246 190 14 246 190 14 246 190 14 246 190 14
51442-246 186 14 236 178 12 210 162 10 163 110 8
51443- 61 42 6 138 138 138 218 218 218 250 250 250
51444-253 253 253 253 253 253 253 253 253 250 250 250
51445-242 242 242 210 210 210 144 144 144 66 66 66
51446- 6 6 6 2 2 6 2 2 6 2 2 6
51447- 2 2 6 2 2 6 61 42 6 163 110 8
51448-216 158 10 236 178 12 246 190 14 246 190 14
51449-246 190 14 246 190 14 246 190 14 246 190 14
51450-246 190 14 246 190 14 246 190 14 246 190 14
51451-246 190 14 239 182 13 230 174 11 216 158 10
51452-190 142 34 124 112 88 70 70 70 38 38 38
51453- 18 18 18 6 6 6 0 0 0 0 0 0
51454- 0 0 0 0 0 0 0 0 0 0 0 0
51455- 0 0 0 0 0 0 0 0 0 0 0 0
51456- 0 0 0 0 0 0 6 6 6 22 22 22
51457- 62 62 62 168 124 44 206 145 10 224 166 10
51458-236 178 12 239 182 13 242 186 14 242 186 14
51459-246 186 14 246 190 14 246 190 14 246 190 14
51460-246 190 14 246 190 14 246 190 14 246 190 14
51461-246 190 14 246 190 14 246 190 14 246 190 14
51462-246 190 14 236 178 12 216 158 10 175 118 6
51463- 80 54 7 2 2 6 6 6 6 30 30 30
51464- 54 54 54 62 62 62 50 50 50 38 38 38
51465- 14 14 14 2 2 6 2 2 6 2 2 6
51466- 2 2 6 2 2 6 2 2 6 2 2 6
51467- 2 2 6 6 6 6 80 54 7 167 114 7
51468-213 154 11 236 178 12 246 190 14 246 190 14
51469-246 190 14 246 190 14 246 190 14 246 190 14
51470-246 190 14 242 186 14 239 182 13 239 182 13
51471-230 174 11 210 150 10 174 135 50 124 112 88
51472- 82 82 82 54 54 54 34 34 34 18 18 18
51473- 6 6 6 0 0 0 0 0 0 0 0 0
51474- 0 0 0 0 0 0 0 0 0 0 0 0
51475- 0 0 0 0 0 0 0 0 0 0 0 0
51476- 0 0 0 0 0 0 6 6 6 18 18 18
51477- 50 50 50 158 118 36 192 133 9 200 144 11
51478-216 158 10 219 162 10 224 166 10 226 170 11
51479-230 174 11 236 178 12 239 182 13 239 182 13
51480-242 186 14 246 186 14 246 190 14 246 190 14
51481-246 190 14 246 190 14 246 190 14 246 190 14
51482-246 186 14 230 174 11 210 150 10 163 110 8
51483-104 69 6 10 10 10 2 2 6 2 2 6
51484- 2 2 6 2 2 6 2 2 6 2 2 6
51485- 2 2 6 2 2 6 2 2 6 2 2 6
51486- 2 2 6 2 2 6 2 2 6 2 2 6
51487- 2 2 6 6 6 6 91 60 6 167 114 7
51488-206 145 10 230 174 11 242 186 14 246 190 14
51489-246 190 14 246 190 14 246 186 14 242 186 14
51490-239 182 13 230 174 11 224 166 10 213 154 11
51491-180 133 36 124 112 88 86 86 86 58 58 58
51492- 38 38 38 22 22 22 10 10 10 6 6 6
51493- 0 0 0 0 0 0 0 0 0 0 0 0
51494- 0 0 0 0 0 0 0 0 0 0 0 0
51495- 0 0 0 0 0 0 0 0 0 0 0 0
51496- 0 0 0 0 0 0 0 0 0 14 14 14
51497- 34 34 34 70 70 70 138 110 50 158 118 36
51498-167 114 7 180 123 7 192 133 9 197 138 11
51499-200 144 11 206 145 10 213 154 11 219 162 10
51500-224 166 10 230 174 11 239 182 13 242 186 14
51501-246 186 14 246 186 14 246 186 14 246 186 14
51502-239 182 13 216 158 10 185 133 11 152 99 6
51503-104 69 6 18 14 6 2 2 6 2 2 6
51504- 2 2 6 2 2 6 2 2 6 2 2 6
51505- 2 2 6 2 2 6 2 2 6 2 2 6
51506- 2 2 6 2 2 6 2 2 6 2 2 6
51507- 2 2 6 6 6 6 80 54 7 152 99 6
51508-192 133 9 219 162 10 236 178 12 239 182 13
51509-246 186 14 242 186 14 239 182 13 236 178 12
51510-224 166 10 206 145 10 192 133 9 154 121 60
51511- 94 94 94 62 62 62 42 42 42 22 22 22
51512- 14 14 14 6 6 6 0 0 0 0 0 0
51513- 0 0 0 0 0 0 0 0 0 0 0 0
51514- 0 0 0 0 0 0 0 0 0 0 0 0
51515- 0 0 0 0 0 0 0 0 0 0 0 0
51516- 0 0 0 0 0 0 0 0 0 6 6 6
51517- 18 18 18 34 34 34 58 58 58 78 78 78
51518-101 98 89 124 112 88 142 110 46 156 107 11
51519-163 110 8 167 114 7 175 118 6 180 123 7
51520-185 133 11 197 138 11 210 150 10 219 162 10
51521-226 170 11 236 178 12 236 178 12 234 174 13
51522-219 162 10 197 138 11 163 110 8 130 83 6
51523- 91 60 6 10 10 10 2 2 6 2 2 6
51524- 18 18 18 38 38 38 38 38 38 38 38 38
51525- 38 38 38 38 38 38 38 38 38 38 38 38
51526- 38 38 38 38 38 38 26 26 26 2 2 6
51527- 2 2 6 6 6 6 70 47 6 137 92 6
51528-175 118 6 200 144 11 219 162 10 230 174 11
51529-234 174 13 230 174 11 219 162 10 210 150 10
51530-192 133 9 163 110 8 124 112 88 82 82 82
51531- 50 50 50 30 30 30 14 14 14 6 6 6
51532- 0 0 0 0 0 0 0 0 0 0 0 0
51533- 0 0 0 0 0 0 0 0 0 0 0 0
51534- 0 0 0 0 0 0 0 0 0 0 0 0
51535- 0 0 0 0 0 0 0 0 0 0 0 0
51536- 0 0 0 0 0 0 0 0 0 0 0 0
51537- 6 6 6 14 14 14 22 22 22 34 34 34
51538- 42 42 42 58 58 58 74 74 74 86 86 86
51539-101 98 89 122 102 70 130 98 46 121 87 25
51540-137 92 6 152 99 6 163 110 8 180 123 7
51541-185 133 11 197 138 11 206 145 10 200 144 11
51542-180 123 7 156 107 11 130 83 6 104 69 6
51543- 50 34 6 54 54 54 110 110 110 101 98 89
51544- 86 86 86 82 82 82 78 78 78 78 78 78
51545- 78 78 78 78 78 78 78 78 78 78 78 78
51546- 78 78 78 82 82 82 86 86 86 94 94 94
51547-106 106 106 101 101 101 86 66 34 124 80 6
51548-156 107 11 180 123 7 192 133 9 200 144 11
51549-206 145 10 200 144 11 192 133 9 175 118 6
51550-139 102 15 109 106 95 70 70 70 42 42 42
51551- 22 22 22 10 10 10 0 0 0 0 0 0
51552- 0 0 0 0 0 0 0 0 0 0 0 0
51553- 0 0 0 0 0 0 0 0 0 0 0 0
51554- 0 0 0 0 0 0 0 0 0 0 0 0
51555- 0 0 0 0 0 0 0 0 0 0 0 0
51556- 0 0 0 0 0 0 0 0 0 0 0 0
51557- 0 0 0 0 0 0 6 6 6 10 10 10
51558- 14 14 14 22 22 22 30 30 30 38 38 38
51559- 50 50 50 62 62 62 74 74 74 90 90 90
51560-101 98 89 112 100 78 121 87 25 124 80 6
51561-137 92 6 152 99 6 152 99 6 152 99 6
51562-138 86 6 124 80 6 98 70 6 86 66 30
51563-101 98 89 82 82 82 58 58 58 46 46 46
51564- 38 38 38 34 34 34 34 34 34 34 34 34
51565- 34 34 34 34 34 34 34 34 34 34 34 34
51566- 34 34 34 34 34 34 38 38 38 42 42 42
51567- 54 54 54 82 82 82 94 86 76 91 60 6
51568-134 86 6 156 107 11 167 114 7 175 118 6
51569-175 118 6 167 114 7 152 99 6 121 87 25
51570-101 98 89 62 62 62 34 34 34 18 18 18
51571- 6 6 6 0 0 0 0 0 0 0 0 0
51572- 0 0 0 0 0 0 0 0 0 0 0 0
51573- 0 0 0 0 0 0 0 0 0 0 0 0
51574- 0 0 0 0 0 0 0 0 0 0 0 0
51575- 0 0 0 0 0 0 0 0 0 0 0 0
51576- 0 0 0 0 0 0 0 0 0 0 0 0
51577- 0 0 0 0 0 0 0 0 0 0 0 0
51578- 0 0 0 6 6 6 6 6 6 10 10 10
51579- 18 18 18 22 22 22 30 30 30 42 42 42
51580- 50 50 50 66 66 66 86 86 86 101 98 89
51581-106 86 58 98 70 6 104 69 6 104 69 6
51582-104 69 6 91 60 6 82 62 34 90 90 90
51583- 62 62 62 38 38 38 22 22 22 14 14 14
51584- 10 10 10 10 10 10 10 10 10 10 10 10
51585- 10 10 10 10 10 10 6 6 6 10 10 10
51586- 10 10 10 10 10 10 10 10 10 14 14 14
51587- 22 22 22 42 42 42 70 70 70 89 81 66
51588- 80 54 7 104 69 6 124 80 6 137 92 6
51589-134 86 6 116 81 8 100 82 52 86 86 86
51590- 58 58 58 30 30 30 14 14 14 6 6 6
51591- 0 0 0 0 0 0 0 0 0 0 0 0
51592- 0 0 0 0 0 0 0 0 0 0 0 0
51593- 0 0 0 0 0 0 0 0 0 0 0 0
51594- 0 0 0 0 0 0 0 0 0 0 0 0
51595- 0 0 0 0 0 0 0 0 0 0 0 0
51596- 0 0 0 0 0 0 0 0 0 0 0 0
51597- 0 0 0 0 0 0 0 0 0 0 0 0
51598- 0 0 0 0 0 0 0 0 0 0 0 0
51599- 0 0 0 6 6 6 10 10 10 14 14 14
51600- 18 18 18 26 26 26 38 38 38 54 54 54
51601- 70 70 70 86 86 86 94 86 76 89 81 66
51602- 89 81 66 86 86 86 74 74 74 50 50 50
51603- 30 30 30 14 14 14 6 6 6 0 0 0
51604- 0 0 0 0 0 0 0 0 0 0 0 0
51605- 0 0 0 0 0 0 0 0 0 0 0 0
51606- 0 0 0 0 0 0 0 0 0 0 0 0
51607- 6 6 6 18 18 18 34 34 34 58 58 58
51608- 82 82 82 89 81 66 89 81 66 89 81 66
51609- 94 86 66 94 86 76 74 74 74 50 50 50
51610- 26 26 26 14 14 14 6 6 6 0 0 0
51611- 0 0 0 0 0 0 0 0 0 0 0 0
51612- 0 0 0 0 0 0 0 0 0 0 0 0
51613- 0 0 0 0 0 0 0 0 0 0 0 0
51614- 0 0 0 0 0 0 0 0 0 0 0 0
51615- 0 0 0 0 0 0 0 0 0 0 0 0
51616- 0 0 0 0 0 0 0 0 0 0 0 0
51617- 0 0 0 0 0 0 0 0 0 0 0 0
51618- 0 0 0 0 0 0 0 0 0 0 0 0
51619- 0 0 0 0 0 0 0 0 0 0 0 0
51620- 6 6 6 6 6 6 14 14 14 18 18 18
51621- 30 30 30 38 38 38 46 46 46 54 54 54
51622- 50 50 50 42 42 42 30 30 30 18 18 18
51623- 10 10 10 0 0 0 0 0 0 0 0 0
51624- 0 0 0 0 0 0 0 0 0 0 0 0
51625- 0 0 0 0 0 0 0 0 0 0 0 0
51626- 0 0 0 0 0 0 0 0 0 0 0 0
51627- 0 0 0 6 6 6 14 14 14 26 26 26
51628- 38 38 38 50 50 50 58 58 58 58 58 58
51629- 54 54 54 42 42 42 30 30 30 18 18 18
51630- 10 10 10 0 0 0 0 0 0 0 0 0
51631- 0 0 0 0 0 0 0 0 0 0 0 0
51632- 0 0 0 0 0 0 0 0 0 0 0 0
51633- 0 0 0 0 0 0 0 0 0 0 0 0
51634- 0 0 0 0 0 0 0 0 0 0 0 0
51635- 0 0 0 0 0 0 0 0 0 0 0 0
51636- 0 0 0 0 0 0 0 0 0 0 0 0
51637- 0 0 0 0 0 0 0 0 0 0 0 0
51638- 0 0 0 0 0 0 0 0 0 0 0 0
51639- 0 0 0 0 0 0 0 0 0 0 0 0
51640- 0 0 0 0 0 0 0 0 0 6 6 6
51641- 6 6 6 10 10 10 14 14 14 18 18 18
51642- 18 18 18 14 14 14 10 10 10 6 6 6
51643- 0 0 0 0 0 0 0 0 0 0 0 0
51644- 0 0 0 0 0 0 0 0 0 0 0 0
51645- 0 0 0 0 0 0 0 0 0 0 0 0
51646- 0 0 0 0 0 0 0 0 0 0 0 0
51647- 0 0 0 0 0 0 0 0 0 6 6 6
51648- 14 14 14 18 18 18 22 22 22 22 22 22
51649- 18 18 18 14 14 14 10 10 10 6 6 6
51650- 0 0 0 0 0 0 0 0 0 0 0 0
51651- 0 0 0 0 0 0 0 0 0 0 0 0
51652- 0 0 0 0 0 0 0 0 0 0 0 0
51653- 0 0 0 0 0 0 0 0 0 0 0 0
51654- 0 0 0 0 0 0 0 0 0 0 0 0
51655+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51661+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51662+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51663+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51664+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51665+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51666+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51667+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51668+4 4 4 4 4 4
51669+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51675+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51676+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51677+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51678+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51679+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51680+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51682+4 4 4 4 4 4
51683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51689+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51690+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51691+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51692+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51696+4 4 4 4 4 4
51697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51703+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51704+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51709+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51710+4 4 4 4 4 4
51711+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51717+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51718+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51724+4 4 4 4 4 4
51725+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51731+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51736+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51738+4 4 4 4 4 4
51739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51743+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
51744+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
51745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51748+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
51749+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51750+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
51751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51752+4 4 4 4 4 4
51753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51757+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
51758+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
51759+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51762+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
51763+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
51764+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
51765+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51766+4 4 4 4 4 4
51767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51771+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
51772+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
51773+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51776+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
51777+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
51778+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
51779+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
51780+4 4 4 4 4 4
51781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51784+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
51785+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
51786+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
51787+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
51788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51789+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
51790+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
51791+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
51792+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
51793+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
51794+4 4 4 4 4 4
51795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51798+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
51799+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
51800+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
51801+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
51802+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
51803+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
51804+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
51805+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
51806+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
51807+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
51808+4 4 4 4 4 4
51809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
51812+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
51813+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
51814+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
51815+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
51816+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
51817+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
51818+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
51819+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
51820+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
51821+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
51822+4 4 4 4 4 4
51823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51825+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
51826+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
51827+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
51828+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
51829+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
51830+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
51831+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
51832+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
51833+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
51834+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
51835+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
51836+4 4 4 4 4 4
51837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51839+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
51840+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
51841+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
51842+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
51843+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
51844+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
51845+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
51846+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
51847+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
51848+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
51849+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
51850+4 4 4 4 4 4
51851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51853+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
51854+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
51855+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
51856+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
51857+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
51858+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
51859+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
51860+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
51861+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
51862+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
51863+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51864+4 4 4 4 4 4
51865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51867+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
51868+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
51869+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
51870+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
51871+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
51872+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
51873+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
51874+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
51875+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
51876+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
51877+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
51878+4 4 4 4 4 4
51879+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51880+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
51881+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
51882+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
51883+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
51884+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
51885+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
51886+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
51887+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
51888+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
51889+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
51890+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
51891+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
51892+4 4 4 4 4 4
51893+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51894+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
51895+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
51896+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
51897+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
51898+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
51899+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
51900+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
51901+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
51902+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
51903+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
51904+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
51905+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
51906+0 0 0 4 4 4
51907+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
51908+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
51909+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
51910+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
51911+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
51912+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
51913+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
51914+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
51915+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
51916+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
51917+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
51918+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
51919+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
51920+2 0 0 0 0 0
51921+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
51922+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
51923+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
51924+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
51925+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
51926+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
51927+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
51928+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
51929+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
51930+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
51931+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
51932+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
51933+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
51934+37 38 37 0 0 0
51935+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
51936+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
51937+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
51938+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
51939+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
51940+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
51941+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
51942+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
51943+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
51944+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
51945+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
51946+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
51947+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
51948+85 115 134 4 0 0
51949+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
51950+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
51951+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
51952+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
51953+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
51954+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
51955+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
51956+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
51957+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
51958+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
51959+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
51960+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
51961+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
51962+60 73 81 4 0 0
51963+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
51964+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
51965+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
51966+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
51967+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
51968+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
51969+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
51970+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
51971+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
51972+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
51973+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
51974+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
51975+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
51976+16 19 21 4 0 0
51977+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
51978+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
51979+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
51980+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
51981+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
51982+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
51983+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
51984+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
51985+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
51986+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
51987+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
51988+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
51989+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
51990+4 0 0 4 3 3
51991+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
51992+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
51993+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
51994+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
51995+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
51996+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
51997+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
51998+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
51999+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
52000+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
52001+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
52002+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
52003+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
52004+3 2 2 4 4 4
52005+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
52006+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
52007+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
52008+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
52009+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
52010+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
52011+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
52012+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
52013+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
52014+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
52015+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
52016+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
52017+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
52018+4 4 4 4 4 4
52019+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
52020+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
52021+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
52022+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
52023+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
52024+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
52025+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
52026+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
52027+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
52028+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
52029+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
52030+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
52031+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
52032+4 4 4 4 4 4
52033+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
52034+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
52035+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
52036+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
52037+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
52038+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
52039+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
52040+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
52041+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
52042+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
52043+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
52044+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
52045+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
52046+5 5 5 5 5 5
52047+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
52048+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
52049+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
52050+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
52051+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
52052+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52053+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
52054+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
52055+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
52056+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
52057+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
52058+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
52059+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
52060+5 5 5 4 4 4
52061+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
52062+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
52063+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
52064+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
52065+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52066+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
52067+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
52068+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
52069+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
52070+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
52071+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
52072+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
52073+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52074+4 4 4 4 4 4
52075+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
52076+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
52077+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
52078+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
52079+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
52080+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52081+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52082+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
52083+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
52084+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
52085+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
52086+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
52087+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52088+4 4 4 4 4 4
52089+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
52090+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
52091+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
52092+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
52093+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52094+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
52095+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
52096+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
52097+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
52098+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
52099+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
52100+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52101+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52102+4 4 4 4 4 4
52103+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
52104+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
52105+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
52106+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
52107+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52108+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52109+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52110+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
52111+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
52112+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
52113+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
52114+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52115+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52116+4 4 4 4 4 4
52117+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
52118+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
52119+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
52120+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
52121+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52122+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
52123+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
52124+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
52125+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
52126+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
52127+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52128+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52129+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52130+4 4 4 4 4 4
52131+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
52132+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
52133+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
52134+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
52135+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52136+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
52137+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
52138+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
52139+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
52140+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
52141+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
52142+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52143+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52144+4 4 4 4 4 4
52145+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
52146+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
52147+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
52148+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
52149+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52150+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
52151+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
52152+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
52153+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
52154+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
52155+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
52156+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52157+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52158+4 4 4 4 4 4
52159+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
52160+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
52161+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
52162+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
52163+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
52164+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
52165+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
52166+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
52167+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
52168+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
52169+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52170+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52171+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52172+4 4 4 4 4 4
52173+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
52174+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
52175+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
52176+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
52177+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52178+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
52179+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
52180+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
52181+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
52182+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
52183+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52184+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52185+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52186+4 4 4 4 4 4
52187+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
52188+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
52189+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
52190+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
52191+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52192+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
52193+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
52194+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
52195+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
52196+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
52197+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52198+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52199+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52200+4 4 4 4 4 4
52201+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
52202+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
52203+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
52204+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
52205+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52206+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
52207+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
52208+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
52209+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
52210+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52211+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52212+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52213+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52214+4 4 4 4 4 4
52215+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
52216+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
52217+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
52218+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
52219+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
52220+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
52221+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
52222+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
52223+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52224+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52225+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52226+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52227+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52228+4 4 4 4 4 4
52229+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
52230+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
52231+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
52232+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
52233+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52234+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
52235+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
52236+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
52237+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52238+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52239+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52240+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52241+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52242+4 4 4 4 4 4
52243+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
52244+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
52245+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
52246+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
52247+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
52248+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
52249+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
52250+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
52251+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52252+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52253+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52254+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52255+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52256+4 4 4 4 4 4
52257+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
52258+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
52259+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52260+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
52261+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
52262+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
52263+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
52264+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
52265+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
52266+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52267+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52268+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52269+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52270+4 4 4 4 4 4
52271+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
52272+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
52273+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
52274+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
52275+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
52276+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
52277+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
52278+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
52279+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52280+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52281+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52282+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52283+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52284+4 4 4 4 4 4
52285+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
52286+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
52287+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52288+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
52289+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
52290+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
52291+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
52292+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
52293+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
52294+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52295+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52296+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52297+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52298+4 4 4 4 4 4
52299+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
52300+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
52301+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
52302+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
52303+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
52304+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
52305+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
52306+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
52307+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52308+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52309+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52310+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52311+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52312+4 4 4 4 4 4
52313+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52314+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
52315+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52316+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
52317+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
52318+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
52319+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
52320+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
52321+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52322+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52323+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52324+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52325+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52326+4 4 4 4 4 4
52327+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
52328+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
52329+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
52330+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
52331+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
52332+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
52333+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52334+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
52335+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52336+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52337+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52338+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52339+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52340+4 4 4 4 4 4
52341+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52342+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
52343+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
52344+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
52345+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
52346+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
52347+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52348+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
52349+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52350+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52351+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52352+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52353+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52354+4 4 4 4 4 4
52355+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
52356+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
52357+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
52358+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
52359+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
52360+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
52361+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
52362+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
52363+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
52364+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52365+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52366+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52367+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52368+4 4 4 4 4 4
52369+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52370+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
52371+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
52372+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
52373+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
52374+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
52375+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
52376+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
52377+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
52378+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52379+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52380+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52381+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52382+4 4 4 4 4 4
52383+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
52384+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
52385+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
52386+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
52387+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
52388+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
52389+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
52390+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
52391+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
52392+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52393+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52394+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52395+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52396+4 4 4 4 4 4
52397+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52398+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
52399+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
52400+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
52401+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
52402+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
52403+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
52404+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
52405+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
52406+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52407+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52409+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52410+4 4 4 4 4 4
52411+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
52412+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
52413+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
52414+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
52415+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
52416+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
52417+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
52418+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
52419+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
52420+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
52421+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52424+4 4 4 4 4 4
52425+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
52426+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
52427+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
52428+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
52429+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
52430+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
52431+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
52432+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
52433+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
52434+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
52435+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52438+4 4 4 4 4 4
52439+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
52440+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
52441+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
52442+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
52443+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
52444+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
52445+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52446+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
52447+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
52448+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
52449+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52452+4 4 4 4 4 4
52453+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
52454+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
52455+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
52456+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
52457+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
52458+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
52459+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
52460+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
52461+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
52462+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
52463+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52466+4 4 4 4 4 4
52467+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
52468+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
52469+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
52470+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
52471+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
52472+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
52473+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
52474+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
52475+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
52476+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
52477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52480+4 4 4 4 4 4
52481+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52482+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
52483+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
52484+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
52485+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
52486+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
52487+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
52488+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
52489+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
52490+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
52491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52494+4 4 4 4 4 4
52495+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
52496+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
52497+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
52498+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
52499+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
52500+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
52501+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
52502+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
52503+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
52504+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
52505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52508+4 4 4 4 4 4
52509+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
52510+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
52511+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
52512+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
52513+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
52514+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
52515+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
52516+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
52517+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
52518+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52522+4 4 4 4 4 4
52523+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
52524+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52525+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
52526+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
52527+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
52528+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
52529+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
52530+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
52531+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
52532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52536+4 4 4 4 4 4
52537+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
52538+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
52539+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
52540+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
52541+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
52542+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
52543+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
52544+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
52545+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
52546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52550+4 4 4 4 4 4
52551+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
52552+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
52553+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
52554+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
52555+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
52556+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
52557+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
52558+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
52559+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52564+4 4 4 4 4 4
52565+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
52566+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
52567+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
52568+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
52569+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
52570+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
52571+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
52572+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
52573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52577+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52578+4 4 4 4 4 4
52579+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
52580+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
52581+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
52582+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
52583+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
52584+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
52585+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
52586+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
52587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52591+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52592+4 4 4 4 4 4
52593+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
52594+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
52595+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52596+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
52597+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
52598+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
52599+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
52600+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
52601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52604+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52606+4 4 4 4 4 4
52607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52608+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
52609+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
52610+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
52611+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
52612+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
52613+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
52614+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
52615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52618+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52619+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52620+4 4 4 4 4 4
52621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52622+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
52623+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
52624+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
52625+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
52626+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
52627+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
52628+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52632+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52633+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52634+4 4 4 4 4 4
52635+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52636+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52637+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
52638+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
52639+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
52640+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
52641+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
52642+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52643+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52646+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52647+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52648+4 4 4 4 4 4
52649+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52650+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52651+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
52652+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52653+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
52654+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
52655+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
52656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52661+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52662+4 4 4 4 4 4
52663+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52664+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52665+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52666+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
52667+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
52668+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
52669+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
52670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52675+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52676+4 4 4 4 4 4
52677+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52678+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52679+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52680+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
52681+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52682+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
52683+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
52684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52689+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52690+4 4 4 4 4 4
52691+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52692+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52694+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
52695+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
52696+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
52697+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
52698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52703+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52704+4 4 4 4 4 4
52705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
52709+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
52710+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52711+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52717+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52718+4 4 4 4 4 4
52719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52723+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
52724+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
52725+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
52726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52731+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52732+4 4 4 4 4 4
52733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52736+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52737+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
52738+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
52739+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52746+4 4 4 4 4 4
52747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52750+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52751+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
52752+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
52753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52760+4 4 4 4 4 4
52761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52764+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52765+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
52766+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
52767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52773+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52774+4 4 4 4 4 4
52775diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
52776index fe92eed..106e085 100644
52777--- a/drivers/video/mb862xx/mb862xxfb_accel.c
52778+++ b/drivers/video/mb862xx/mb862xxfb_accel.c
52779@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
52780 struct mb862xxfb_par *par = info->par;
52781
52782 if (info->var.bits_per_pixel == 32) {
52783- info->fbops->fb_fillrect = cfb_fillrect;
52784- info->fbops->fb_copyarea = cfb_copyarea;
52785- info->fbops->fb_imageblit = cfb_imageblit;
52786+ pax_open_kernel();
52787+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52788+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52789+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52790+ pax_close_kernel();
52791 } else {
52792 outreg(disp, GC_L0EM, 3);
52793- info->fbops->fb_fillrect = mb86290fb_fillrect;
52794- info->fbops->fb_copyarea = mb86290fb_copyarea;
52795- info->fbops->fb_imageblit = mb86290fb_imageblit;
52796+ pax_open_kernel();
52797+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
52798+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
52799+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
52800+ pax_close_kernel();
52801 }
52802 outreg(draw, GDC_REG_DRAW_BASE, 0);
52803 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
52804diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
52805index ff22871..b129bed 100644
52806--- a/drivers/video/nvidia/nvidia.c
52807+++ b/drivers/video/nvidia/nvidia.c
52808@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
52809 info->fix.line_length = (info->var.xres_virtual *
52810 info->var.bits_per_pixel) >> 3;
52811 if (info->var.accel_flags) {
52812- info->fbops->fb_imageblit = nvidiafb_imageblit;
52813- info->fbops->fb_fillrect = nvidiafb_fillrect;
52814- info->fbops->fb_copyarea = nvidiafb_copyarea;
52815- info->fbops->fb_sync = nvidiafb_sync;
52816+ pax_open_kernel();
52817+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
52818+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
52819+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
52820+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
52821+ pax_close_kernel();
52822 info->pixmap.scan_align = 4;
52823 info->flags &= ~FBINFO_HWACCEL_DISABLED;
52824 info->flags |= FBINFO_READS_FAST;
52825 NVResetGraphics(info);
52826 } else {
52827- info->fbops->fb_imageblit = cfb_imageblit;
52828- info->fbops->fb_fillrect = cfb_fillrect;
52829- info->fbops->fb_copyarea = cfb_copyarea;
52830- info->fbops->fb_sync = NULL;
52831+ pax_open_kernel();
52832+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52833+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52834+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52835+ *(void **)&info->fbops->fb_sync = NULL;
52836+ pax_close_kernel();
52837 info->pixmap.scan_align = 1;
52838 info->flags |= FBINFO_HWACCEL_DISABLED;
52839 info->flags &= ~FBINFO_READS_FAST;
52840@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
52841 info->pixmap.size = 8 * 1024;
52842 info->pixmap.flags = FB_PIXMAP_SYSTEM;
52843
52844- if (!hwcur)
52845- info->fbops->fb_cursor = NULL;
52846+ if (!hwcur) {
52847+ pax_open_kernel();
52848+ *(void **)&info->fbops->fb_cursor = NULL;
52849+ pax_close_kernel();
52850+ }
52851
52852 info->var.accel_flags = (!noaccel);
52853
52854diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
52855index fafe7c9..93197b9 100644
52856--- a/drivers/video/omap2/dss/display.c
52857+++ b/drivers/video/omap2/dss/display.c
52858@@ -137,12 +137,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
52859 snprintf(dssdev->alias, sizeof(dssdev->alias),
52860 "display%d", disp_num_counter++);
52861
52862+ pax_open_kernel();
52863 if (drv && drv->get_resolution == NULL)
52864- drv->get_resolution = omapdss_default_get_resolution;
52865+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
52866 if (drv && drv->get_recommended_bpp == NULL)
52867- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52868+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52869 if (drv && drv->get_timings == NULL)
52870- drv->get_timings = omapdss_default_get_timings;
52871+ *(void **)&drv->get_timings = omapdss_default_get_timings;
52872+ pax_close_kernel();
52873
52874 mutex_lock(&panel_list_mutex);
52875 list_add_tail(&dssdev->panel_list, &panel_list);
52876diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
52877index 05c2dc3..ea1f391 100644
52878--- a/drivers/video/s1d13xxxfb.c
52879+++ b/drivers/video/s1d13xxxfb.c
52880@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
52881
52882 switch(prod_id) {
52883 case S1D13506_PROD_ID: /* activate acceleration */
52884- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52885- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52886+ pax_open_kernel();
52887+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52888+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52889+ pax_close_kernel();
52890 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
52891 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
52892 break;
52893diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
52894index e188ada..aac63c8 100644
52895--- a/drivers/video/smscufx.c
52896+++ b/drivers/video/smscufx.c
52897@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
52898 fb_deferred_io_cleanup(info);
52899 kfree(info->fbdefio);
52900 info->fbdefio = NULL;
52901- info->fbops->fb_mmap = ufx_ops_mmap;
52902+ pax_open_kernel();
52903+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
52904+ pax_close_kernel();
52905 }
52906
52907 pr_debug("released /dev/fb%d user=%d count=%d",
52908diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
52909index d2e5bc3..4cb05d1 100644
52910--- a/drivers/video/udlfb.c
52911+++ b/drivers/video/udlfb.c
52912@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
52913 dlfb_urb_completion(urb);
52914
52915 error:
52916- atomic_add(bytes_sent, &dev->bytes_sent);
52917- atomic_add(bytes_identical, &dev->bytes_identical);
52918- atomic_add(width*height*2, &dev->bytes_rendered);
52919+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52920+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52921+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
52922 end_cycles = get_cycles();
52923- atomic_add(((unsigned int) ((end_cycles - start_cycles)
52924+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52925 >> 10)), /* Kcycles */
52926 &dev->cpu_kcycles_used);
52927
52928@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
52929 dlfb_urb_completion(urb);
52930
52931 error:
52932- atomic_add(bytes_sent, &dev->bytes_sent);
52933- atomic_add(bytes_identical, &dev->bytes_identical);
52934- atomic_add(bytes_rendered, &dev->bytes_rendered);
52935+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52936+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52937+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
52938 end_cycles = get_cycles();
52939- atomic_add(((unsigned int) ((end_cycles - start_cycles)
52940+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52941 >> 10)), /* Kcycles */
52942 &dev->cpu_kcycles_used);
52943 }
52944@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
52945 fb_deferred_io_cleanup(info);
52946 kfree(info->fbdefio);
52947 info->fbdefio = NULL;
52948- info->fbops->fb_mmap = dlfb_ops_mmap;
52949+ pax_open_kernel();
52950+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
52951+ pax_close_kernel();
52952 }
52953
52954 pr_warn("released /dev/fb%d user=%d count=%d\n",
52955@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
52956 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52957 struct dlfb_data *dev = fb_info->par;
52958 return snprintf(buf, PAGE_SIZE, "%u\n",
52959- atomic_read(&dev->bytes_rendered));
52960+ atomic_read_unchecked(&dev->bytes_rendered));
52961 }
52962
52963 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
52964@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
52965 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52966 struct dlfb_data *dev = fb_info->par;
52967 return snprintf(buf, PAGE_SIZE, "%u\n",
52968- atomic_read(&dev->bytes_identical));
52969+ atomic_read_unchecked(&dev->bytes_identical));
52970 }
52971
52972 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
52973@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
52974 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52975 struct dlfb_data *dev = fb_info->par;
52976 return snprintf(buf, PAGE_SIZE, "%u\n",
52977- atomic_read(&dev->bytes_sent));
52978+ atomic_read_unchecked(&dev->bytes_sent));
52979 }
52980
52981 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
52982@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
52983 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52984 struct dlfb_data *dev = fb_info->par;
52985 return snprintf(buf, PAGE_SIZE, "%u\n",
52986- atomic_read(&dev->cpu_kcycles_used));
52987+ atomic_read_unchecked(&dev->cpu_kcycles_used));
52988 }
52989
52990 static ssize_t edid_show(
52991@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
52992 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52993 struct dlfb_data *dev = fb_info->par;
52994
52995- atomic_set(&dev->bytes_rendered, 0);
52996- atomic_set(&dev->bytes_identical, 0);
52997- atomic_set(&dev->bytes_sent, 0);
52998- atomic_set(&dev->cpu_kcycles_used, 0);
52999+ atomic_set_unchecked(&dev->bytes_rendered, 0);
53000+ atomic_set_unchecked(&dev->bytes_identical, 0);
53001+ atomic_set_unchecked(&dev->bytes_sent, 0);
53002+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
53003
53004 return count;
53005 }
53006diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
53007index 7aec6f3..e3b2d55 100644
53008--- a/drivers/video/uvesafb.c
53009+++ b/drivers/video/uvesafb.c
53010@@ -19,6 +19,7 @@
53011 #include <linux/io.h>
53012 #include <linux/mutex.h>
53013 #include <linux/slab.h>
53014+#include <linux/moduleloader.h>
53015 #include <video/edid.h>
53016 #include <video/uvesafb.h>
53017 #ifdef CONFIG_X86
53018@@ -566,10 +567,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
53019 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
53020 par->pmi_setpal = par->ypan = 0;
53021 } else {
53022+
53023+#ifdef CONFIG_PAX_KERNEXEC
53024+#ifdef CONFIG_MODULES
53025+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
53026+#endif
53027+ if (!par->pmi_code) {
53028+ par->pmi_setpal = par->ypan = 0;
53029+ return 0;
53030+ }
53031+#endif
53032+
53033 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
53034 + task->t.regs.edi);
53035+
53036+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53037+ pax_open_kernel();
53038+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
53039+ pax_close_kernel();
53040+
53041+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
53042+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
53043+#else
53044 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
53045 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
53046+#endif
53047+
53048 printk(KERN_INFO "uvesafb: protected mode interface info at "
53049 "%04x:%04x\n",
53050 (u16)task->t.regs.es, (u16)task->t.regs.edi);
53051@@ -814,13 +837,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
53052 par->ypan = ypan;
53053
53054 if (par->pmi_setpal || par->ypan) {
53055+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
53056 if (__supported_pte_mask & _PAGE_NX) {
53057 par->pmi_setpal = par->ypan = 0;
53058 printk(KERN_WARNING "uvesafb: NX protection is active, "
53059 "better not use the PMI.\n");
53060- } else {
53061+ } else
53062+#endif
53063 uvesafb_vbe_getpmi(task, par);
53064- }
53065 }
53066 #else
53067 /* The protected mode interface is not available on non-x86. */
53068@@ -1454,8 +1478,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
53069 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
53070
53071 /* Disable blanking if the user requested so. */
53072- if (!blank)
53073- info->fbops->fb_blank = NULL;
53074+ if (!blank) {
53075+ pax_open_kernel();
53076+ *(void **)&info->fbops->fb_blank = NULL;
53077+ pax_close_kernel();
53078+ }
53079
53080 /*
53081 * Find out how much IO memory is required for the mode with
53082@@ -1531,8 +1558,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
53083 info->flags = FBINFO_FLAG_DEFAULT |
53084 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
53085
53086- if (!par->ypan)
53087- info->fbops->fb_pan_display = NULL;
53088+ if (!par->ypan) {
53089+ pax_open_kernel();
53090+ *(void **)&info->fbops->fb_pan_display = NULL;
53091+ pax_close_kernel();
53092+ }
53093 }
53094
53095 static void uvesafb_init_mtrr(struct fb_info *info)
53096@@ -1796,6 +1826,11 @@ out:
53097 if (par->vbe_modes)
53098 kfree(par->vbe_modes);
53099
53100+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53101+ if (par->pmi_code)
53102+ module_free_exec(NULL, par->pmi_code);
53103+#endif
53104+
53105 framebuffer_release(info);
53106 return err;
53107 }
53108@@ -1823,6 +1858,12 @@ static int uvesafb_remove(struct platform_device *dev)
53109 kfree(par->vbe_state_orig);
53110 if (par->vbe_state_saved)
53111 kfree(par->vbe_state_saved);
53112+
53113+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53114+ if (par->pmi_code)
53115+ module_free_exec(NULL, par->pmi_code);
53116+#endif
53117+
53118 }
53119
53120 framebuffer_release(info);
53121diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
53122index bd83233..7d8a5aa 100644
53123--- a/drivers/video/vesafb.c
53124+++ b/drivers/video/vesafb.c
53125@@ -9,6 +9,7 @@
53126 */
53127
53128 #include <linux/module.h>
53129+#include <linux/moduleloader.h>
53130 #include <linux/kernel.h>
53131 #include <linux/errno.h>
53132 #include <linux/string.h>
53133@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
53134 static int vram_total; /* Set total amount of memory */
53135 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
53136 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
53137-static void (*pmi_start)(void) __read_mostly;
53138-static void (*pmi_pal) (void) __read_mostly;
53139+static void (*pmi_start)(void) __read_only;
53140+static void (*pmi_pal) (void) __read_only;
53141 static int depth __read_mostly;
53142 static int vga_compat __read_mostly;
53143 /* --------------------------------------------------------------------- */
53144@@ -234,6 +235,7 @@ static int vesafb_probe(struct platform_device *dev)
53145 unsigned int size_remap;
53146 unsigned int size_total;
53147 char *option = NULL;
53148+ void *pmi_code = NULL;
53149
53150 /* ignore error return of fb_get_options */
53151 fb_get_options("vesafb", &option);
53152@@ -280,10 +282,6 @@ static int vesafb_probe(struct platform_device *dev)
53153 size_remap = size_total;
53154 vesafb_fix.smem_len = size_remap;
53155
53156-#ifndef __i386__
53157- screen_info.vesapm_seg = 0;
53158-#endif
53159-
53160 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
53161 printk(KERN_WARNING
53162 "vesafb: cannot reserve video memory at 0x%lx\n",
53163@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
53164 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
53165 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
53166
53167+#ifdef __i386__
53168+
53169+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53170+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
53171+ if (!pmi_code)
53172+#elif !defined(CONFIG_PAX_KERNEXEC)
53173+ if (0)
53174+#endif
53175+
53176+#endif
53177+ screen_info.vesapm_seg = 0;
53178+
53179 if (screen_info.vesapm_seg) {
53180- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
53181- screen_info.vesapm_seg,screen_info.vesapm_off);
53182+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
53183+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
53184 }
53185
53186 if (screen_info.vesapm_seg < 0xc000)
53187@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
53188
53189 if (ypan || pmi_setpal) {
53190 unsigned short *pmi_base;
53191+
53192 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
53193- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
53194- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
53195+
53196+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53197+ pax_open_kernel();
53198+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
53199+#else
53200+ pmi_code = pmi_base;
53201+#endif
53202+
53203+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
53204+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
53205+
53206+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53207+ pmi_start = ktva_ktla(pmi_start);
53208+ pmi_pal = ktva_ktla(pmi_pal);
53209+ pax_close_kernel();
53210+#endif
53211+
53212 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
53213 if (pmi_base[3]) {
53214 printk(KERN_INFO "vesafb: pmi: ports = ");
53215@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
53216 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
53217 (ypan ? FBINFO_HWACCEL_YPAN : 0);
53218
53219- if (!ypan)
53220- info->fbops->fb_pan_display = NULL;
53221+ if (!ypan) {
53222+ pax_open_kernel();
53223+ *(void **)&info->fbops->fb_pan_display = NULL;
53224+ pax_close_kernel();
53225+ }
53226
53227 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
53228 err = -ENOMEM;
53229@@ -493,6 +522,11 @@ static int vesafb_probe(struct platform_device *dev)
53230 info->node, info->fix.id);
53231 return 0;
53232 err:
53233+
53234+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53235+ module_free_exec(NULL, pmi_code);
53236+#endif
53237+
53238 if (info->screen_base)
53239 iounmap(info->screen_base);
53240 framebuffer_release(info);
53241diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
53242index 88714ae..16c2e11 100644
53243--- a/drivers/video/via/via_clock.h
53244+++ b/drivers/video/via/via_clock.h
53245@@ -56,7 +56,7 @@ struct via_clock {
53246
53247 void (*set_engine_pll_state)(u8 state);
53248 void (*set_engine_pll)(struct via_pll_config config);
53249-};
53250+} __no_const;
53251
53252
53253 static inline u32 get_pll_internal_frequency(u32 ref_freq,
53254diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
53255index fef20db..d28b1ab 100644
53256--- a/drivers/xen/xenfs/xenstored.c
53257+++ b/drivers/xen/xenfs/xenstored.c
53258@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
53259 static int xsd_kva_open(struct inode *inode, struct file *file)
53260 {
53261 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
53262+#ifdef CONFIG_GRKERNSEC_HIDESYM
53263+ NULL);
53264+#else
53265 xen_store_interface);
53266+#endif
53267+
53268 if (!file->private_data)
53269 return -ENOMEM;
53270 return 0;
53271diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
53272index 9ff073f..05cef23 100644
53273--- a/fs/9p/vfs_addr.c
53274+++ b/fs/9p/vfs_addr.c
53275@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
53276
53277 retval = v9fs_file_write_internal(inode,
53278 v9inode->writeback_fid,
53279- (__force const char __user *)buffer,
53280+ (const char __force_user *)buffer,
53281 len, &offset, 0);
53282 if (retval > 0)
53283 retval = 0;
53284diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
53285index 94de6d1..8d81256 100644
53286--- a/fs/9p/vfs_inode.c
53287+++ b/fs/9p/vfs_inode.c
53288@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
53289 void
53290 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
53291 {
53292- char *s = nd_get_link(nd);
53293+ const char *s = nd_get_link(nd);
53294
53295 p9_debug(P9_DEBUG_VFS, " %s %s\n",
53296 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
53297diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
53298index 370b24c..ff0be7b 100644
53299--- a/fs/Kconfig.binfmt
53300+++ b/fs/Kconfig.binfmt
53301@@ -103,7 +103,7 @@ config HAVE_AOUT
53302
53303 config BINFMT_AOUT
53304 tristate "Kernel support for a.out and ECOFF binaries"
53305- depends on HAVE_AOUT
53306+ depends on HAVE_AOUT && BROKEN
53307 ---help---
53308 A.out (Assembler.OUTput) is a set of formats for libraries and
53309 executables used in the earliest versions of UNIX. Linux used
53310diff --git a/fs/afs/inode.c b/fs/afs/inode.c
53311index 789bc25..fafaeea 100644
53312--- a/fs/afs/inode.c
53313+++ b/fs/afs/inode.c
53314@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
53315 struct afs_vnode *vnode;
53316 struct super_block *sb;
53317 struct inode *inode;
53318- static atomic_t afs_autocell_ino;
53319+ static atomic_unchecked_t afs_autocell_ino;
53320
53321 _enter("{%x:%u},%*.*s,",
53322 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
53323@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
53324 data.fid.unique = 0;
53325 data.fid.vnode = 0;
53326
53327- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
53328+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
53329 afs_iget5_autocell_test, afs_iget5_set,
53330 &data);
53331 if (!inode) {
53332diff --git a/fs/aio.c b/fs/aio.c
53333index 062a5f6..e5618e0 100644
53334--- a/fs/aio.c
53335+++ b/fs/aio.c
53336@@ -374,7 +374,7 @@ static int aio_setup_ring(struct kioctx *ctx)
53337 size += sizeof(struct io_event) * nr_events;
53338
53339 nr_pages = PFN_UP(size);
53340- if (nr_pages < 0)
53341+ if (nr_pages <= 0)
53342 return -EINVAL;
53343
53344 file = aio_private_file(ctx, nr_pages);
53345diff --git a/fs/attr.c b/fs/attr.c
53346index 1449adb..a2038c2 100644
53347--- a/fs/attr.c
53348+++ b/fs/attr.c
53349@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
53350 unsigned long limit;
53351
53352 limit = rlimit(RLIMIT_FSIZE);
53353+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
53354 if (limit != RLIM_INFINITY && offset > limit)
53355 goto out_sig;
53356 if (offset > inode->i_sb->s_maxbytes)
53357diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
53358index 689e40d..515cac5 100644
53359--- a/fs/autofs4/waitq.c
53360+++ b/fs/autofs4/waitq.c
53361@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
53362 {
53363 unsigned long sigpipe, flags;
53364 mm_segment_t fs;
53365- const char *data = (const char *)addr;
53366+ const char __user *data = (const char __force_user *)addr;
53367 ssize_t wr = 0;
53368
53369 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
53370@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
53371 return 1;
53372 }
53373
53374+#ifdef CONFIG_GRKERNSEC_HIDESYM
53375+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
53376+#endif
53377+
53378 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
53379 enum autofs_notify notify)
53380 {
53381@@ -373,7 +377,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
53382
53383 /* If this is a direct mount request create a dummy name */
53384 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
53385+#ifdef CONFIG_GRKERNSEC_HIDESYM
53386+ /* this name does get written to userland via autofs4_write() */
53387+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
53388+#else
53389 qstr.len = sprintf(name, "%p", dentry);
53390+#endif
53391 else {
53392 qstr.len = autofs4_getpath(sbi, dentry, &name);
53393 if (!qstr.len) {
53394diff --git a/fs/befs/endian.h b/fs/befs/endian.h
53395index 2722387..56059b5 100644
53396--- a/fs/befs/endian.h
53397+++ b/fs/befs/endian.h
53398@@ -11,7 +11,7 @@
53399
53400 #include <asm/byteorder.h>
53401
53402-static inline u64
53403+static inline u64 __intentional_overflow(-1)
53404 fs64_to_cpu(const struct super_block *sb, fs64 n)
53405 {
53406 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53407@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
53408 return (__force fs64)cpu_to_be64(n);
53409 }
53410
53411-static inline u32
53412+static inline u32 __intentional_overflow(-1)
53413 fs32_to_cpu(const struct super_block *sb, fs32 n)
53414 {
53415 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53416@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
53417 return (__force fs32)cpu_to_be32(n);
53418 }
53419
53420-static inline u16
53421+static inline u16 __intentional_overflow(-1)
53422 fs16_to_cpu(const struct super_block *sb, fs16 n)
53423 {
53424 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53425diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
53426index e9c75e2..1baece1 100644
53427--- a/fs/befs/linuxvfs.c
53428+++ b/fs/befs/linuxvfs.c
53429@@ -514,7 +514,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
53430 {
53431 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
53432 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
53433- char *link = nd_get_link(nd);
53434+ const char *link = nd_get_link(nd);
53435 if (!IS_ERR(link))
53436 kfree(link);
53437 }
53438diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
53439index 89dec7f..361b0d75 100644
53440--- a/fs/binfmt_aout.c
53441+++ b/fs/binfmt_aout.c
53442@@ -16,6 +16,7 @@
53443 #include <linux/string.h>
53444 #include <linux/fs.h>
53445 #include <linux/file.h>
53446+#include <linux/security.h>
53447 #include <linux/stat.h>
53448 #include <linux/fcntl.h>
53449 #include <linux/ptrace.h>
53450@@ -59,6 +60,8 @@ static int aout_core_dump(struct coredump_params *cprm)
53451 #endif
53452 # define START_STACK(u) ((void __user *)u.start_stack)
53453
53454+ memset(&dump, 0, sizeof(dump));
53455+
53456 fs = get_fs();
53457 set_fs(KERNEL_DS);
53458 has_dumped = 1;
53459@@ -69,10 +72,12 @@ static int aout_core_dump(struct coredump_params *cprm)
53460
53461 /* If the size of the dump file exceeds the rlimit, then see what would happen
53462 if we wrote the stack, but not the data area. */
53463+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
53464 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
53465 dump.u_dsize = 0;
53466
53467 /* Make sure we have enough room to write the stack and data areas. */
53468+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
53469 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
53470 dump.u_ssize = 0;
53471
53472@@ -233,6 +238,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
53473 rlim = rlimit(RLIMIT_DATA);
53474 if (rlim >= RLIM_INFINITY)
53475 rlim = ~0;
53476+
53477+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
53478 if (ex.a_data + ex.a_bss > rlim)
53479 return -ENOMEM;
53480
53481@@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
53482
53483 install_exec_creds(bprm);
53484
53485+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
53486+ current->mm->pax_flags = 0UL;
53487+#endif
53488+
53489+#ifdef CONFIG_PAX_PAGEEXEC
53490+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
53491+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
53492+
53493+#ifdef CONFIG_PAX_EMUTRAMP
53494+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
53495+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
53496+#endif
53497+
53498+#ifdef CONFIG_PAX_MPROTECT
53499+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
53500+ current->mm->pax_flags |= MF_PAX_MPROTECT;
53501+#endif
53502+
53503+ }
53504+#endif
53505+
53506 if (N_MAGIC(ex) == OMAGIC) {
53507 unsigned long text_addr, map_size;
53508 loff_t pos;
53509@@ -322,7 +350,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
53510 }
53511
53512 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
53513- PROT_READ | PROT_WRITE | PROT_EXEC,
53514+ PROT_READ | PROT_WRITE,
53515 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
53516 fd_offset + ex.a_text);
53517 if (error != N_DATADDR(ex)) {
53518diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
53519index 4c94a79..2610454 100644
53520--- a/fs/binfmt_elf.c
53521+++ b/fs/binfmt_elf.c
53522@@ -34,6 +34,7 @@
53523 #include <linux/utsname.h>
53524 #include <linux/coredump.h>
53525 #include <linux/sched.h>
53526+#include <linux/xattr.h>
53527 #include <asm/uaccess.h>
53528 #include <asm/param.h>
53529 #include <asm/page.h>
53530@@ -60,6 +61,14 @@ static int elf_core_dump(struct coredump_params *cprm);
53531 #define elf_core_dump NULL
53532 #endif
53533
53534+#ifdef CONFIG_PAX_MPROTECT
53535+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
53536+#endif
53537+
53538+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
53539+static void elf_handle_mmap(struct file *file);
53540+#endif
53541+
53542 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
53543 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
53544 #else
53545@@ -79,6 +88,15 @@ static struct linux_binfmt elf_format = {
53546 .load_binary = load_elf_binary,
53547 .load_shlib = load_elf_library,
53548 .core_dump = elf_core_dump,
53549+
53550+#ifdef CONFIG_PAX_MPROTECT
53551+ .handle_mprotect= elf_handle_mprotect,
53552+#endif
53553+
53554+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
53555+ .handle_mmap = elf_handle_mmap,
53556+#endif
53557+
53558 .min_coredump = ELF_EXEC_PAGESIZE,
53559 };
53560
53561@@ -86,6 +104,8 @@ static struct linux_binfmt elf_format = {
53562
53563 static int set_brk(unsigned long start, unsigned long end)
53564 {
53565+ unsigned long e = end;
53566+
53567 start = ELF_PAGEALIGN(start);
53568 end = ELF_PAGEALIGN(end);
53569 if (end > start) {
53570@@ -94,7 +114,7 @@ static int set_brk(unsigned long start, unsigned long end)
53571 if (BAD_ADDR(addr))
53572 return addr;
53573 }
53574- current->mm->start_brk = current->mm->brk = end;
53575+ current->mm->start_brk = current->mm->brk = e;
53576 return 0;
53577 }
53578
53579@@ -155,12 +175,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53580 elf_addr_t __user *u_rand_bytes;
53581 const char *k_platform = ELF_PLATFORM;
53582 const char *k_base_platform = ELF_BASE_PLATFORM;
53583- unsigned char k_rand_bytes[16];
53584+ u32 k_rand_bytes[4];
53585 int items;
53586 elf_addr_t *elf_info;
53587 int ei_index = 0;
53588 const struct cred *cred = current_cred();
53589 struct vm_area_struct *vma;
53590+ unsigned long saved_auxv[AT_VECTOR_SIZE];
53591
53592 /*
53593 * In some cases (e.g. Hyper-Threading), we want to avoid L1
53594@@ -202,8 +223,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53595 * Generate 16 random bytes for userspace PRNG seeding.
53596 */
53597 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
53598- u_rand_bytes = (elf_addr_t __user *)
53599- STACK_ALLOC(p, sizeof(k_rand_bytes));
53600+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
53601+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
53602+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
53603+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
53604+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
53605+ u_rand_bytes = (elf_addr_t __user *) p;
53606 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
53607 return -EFAULT;
53608
53609@@ -318,9 +343,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53610 return -EFAULT;
53611 current->mm->env_end = p;
53612
53613+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
53614+
53615 /* Put the elf_info on the stack in the right place. */
53616 sp = (elf_addr_t __user *)envp + 1;
53617- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
53618+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
53619 return -EFAULT;
53620 return 0;
53621 }
53622@@ -388,15 +415,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
53623 an ELF header */
53624
53625 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53626- struct file *interpreter, unsigned long *interp_map_addr,
53627- unsigned long no_base)
53628+ struct file *interpreter, unsigned long no_base)
53629 {
53630 struct elf_phdr *elf_phdata;
53631 struct elf_phdr *eppnt;
53632- unsigned long load_addr = 0;
53633+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
53634 int load_addr_set = 0;
53635 unsigned long last_bss = 0, elf_bss = 0;
53636- unsigned long error = ~0UL;
53637+ unsigned long error = -EINVAL;
53638 unsigned long total_size;
53639 int retval, i, size;
53640
53641@@ -442,6 +468,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53642 goto out_close;
53643 }
53644
53645+#ifdef CONFIG_PAX_SEGMEXEC
53646+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
53647+ pax_task_size = SEGMEXEC_TASK_SIZE;
53648+#endif
53649+
53650 eppnt = elf_phdata;
53651 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
53652 if (eppnt->p_type == PT_LOAD) {
53653@@ -465,8 +496,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53654 map_addr = elf_map(interpreter, load_addr + vaddr,
53655 eppnt, elf_prot, elf_type, total_size);
53656 total_size = 0;
53657- if (!*interp_map_addr)
53658- *interp_map_addr = map_addr;
53659 error = map_addr;
53660 if (BAD_ADDR(map_addr))
53661 goto out_close;
53662@@ -485,8 +514,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53663 k = load_addr + eppnt->p_vaddr;
53664 if (BAD_ADDR(k) ||
53665 eppnt->p_filesz > eppnt->p_memsz ||
53666- eppnt->p_memsz > TASK_SIZE ||
53667- TASK_SIZE - eppnt->p_memsz < k) {
53668+ eppnt->p_memsz > pax_task_size ||
53669+ pax_task_size - eppnt->p_memsz < k) {
53670 error = -ENOMEM;
53671 goto out_close;
53672 }
53673@@ -525,9 +554,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53674 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
53675
53676 /* Map the last of the bss segment */
53677- error = vm_brk(elf_bss, last_bss - elf_bss);
53678- if (BAD_ADDR(error))
53679- goto out_close;
53680+ if (last_bss > elf_bss) {
53681+ error = vm_brk(elf_bss, last_bss - elf_bss);
53682+ if (BAD_ADDR(error))
53683+ goto out_close;
53684+ }
53685 }
53686
53687 error = load_addr;
53688@@ -538,6 +569,315 @@ out:
53689 return error;
53690 }
53691
53692+#ifdef CONFIG_PAX_PT_PAX_FLAGS
53693+#ifdef CONFIG_PAX_SOFTMODE
53694+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
53695+{
53696+ unsigned long pax_flags = 0UL;
53697+
53698+#ifdef CONFIG_PAX_PAGEEXEC
53699+ if (elf_phdata->p_flags & PF_PAGEEXEC)
53700+ pax_flags |= MF_PAX_PAGEEXEC;
53701+#endif
53702+
53703+#ifdef CONFIG_PAX_SEGMEXEC
53704+ if (elf_phdata->p_flags & PF_SEGMEXEC)
53705+ pax_flags |= MF_PAX_SEGMEXEC;
53706+#endif
53707+
53708+#ifdef CONFIG_PAX_EMUTRAMP
53709+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
53710+ pax_flags |= MF_PAX_EMUTRAMP;
53711+#endif
53712+
53713+#ifdef CONFIG_PAX_MPROTECT
53714+ if (elf_phdata->p_flags & PF_MPROTECT)
53715+ pax_flags |= MF_PAX_MPROTECT;
53716+#endif
53717+
53718+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53719+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
53720+ pax_flags |= MF_PAX_RANDMMAP;
53721+#endif
53722+
53723+ return pax_flags;
53724+}
53725+#endif
53726+
53727+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
53728+{
53729+ unsigned long pax_flags = 0UL;
53730+
53731+#ifdef CONFIG_PAX_PAGEEXEC
53732+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
53733+ pax_flags |= MF_PAX_PAGEEXEC;
53734+#endif
53735+
53736+#ifdef CONFIG_PAX_SEGMEXEC
53737+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
53738+ pax_flags |= MF_PAX_SEGMEXEC;
53739+#endif
53740+
53741+#ifdef CONFIG_PAX_EMUTRAMP
53742+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
53743+ pax_flags |= MF_PAX_EMUTRAMP;
53744+#endif
53745+
53746+#ifdef CONFIG_PAX_MPROTECT
53747+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
53748+ pax_flags |= MF_PAX_MPROTECT;
53749+#endif
53750+
53751+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53752+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
53753+ pax_flags |= MF_PAX_RANDMMAP;
53754+#endif
53755+
53756+ return pax_flags;
53757+}
53758+#endif
53759+
53760+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
53761+#ifdef CONFIG_PAX_SOFTMODE
53762+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
53763+{
53764+ unsigned long pax_flags = 0UL;
53765+
53766+#ifdef CONFIG_PAX_PAGEEXEC
53767+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
53768+ pax_flags |= MF_PAX_PAGEEXEC;
53769+#endif
53770+
53771+#ifdef CONFIG_PAX_SEGMEXEC
53772+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
53773+ pax_flags |= MF_PAX_SEGMEXEC;
53774+#endif
53775+
53776+#ifdef CONFIG_PAX_EMUTRAMP
53777+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
53778+ pax_flags |= MF_PAX_EMUTRAMP;
53779+#endif
53780+
53781+#ifdef CONFIG_PAX_MPROTECT
53782+ if (pax_flags_softmode & MF_PAX_MPROTECT)
53783+ pax_flags |= MF_PAX_MPROTECT;
53784+#endif
53785+
53786+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53787+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
53788+ pax_flags |= MF_PAX_RANDMMAP;
53789+#endif
53790+
53791+ return pax_flags;
53792+}
53793+#endif
53794+
53795+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
53796+{
53797+ unsigned long pax_flags = 0UL;
53798+
53799+#ifdef CONFIG_PAX_PAGEEXEC
53800+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
53801+ pax_flags |= MF_PAX_PAGEEXEC;
53802+#endif
53803+
53804+#ifdef CONFIG_PAX_SEGMEXEC
53805+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
53806+ pax_flags |= MF_PAX_SEGMEXEC;
53807+#endif
53808+
53809+#ifdef CONFIG_PAX_EMUTRAMP
53810+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
53811+ pax_flags |= MF_PAX_EMUTRAMP;
53812+#endif
53813+
53814+#ifdef CONFIG_PAX_MPROTECT
53815+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
53816+ pax_flags |= MF_PAX_MPROTECT;
53817+#endif
53818+
53819+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53820+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
53821+ pax_flags |= MF_PAX_RANDMMAP;
53822+#endif
53823+
53824+ return pax_flags;
53825+}
53826+#endif
53827+
53828+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
53829+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
53830+{
53831+ unsigned long pax_flags = 0UL;
53832+
53833+#ifdef CONFIG_PAX_EI_PAX
53834+
53835+#ifdef CONFIG_PAX_PAGEEXEC
53836+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
53837+ pax_flags |= MF_PAX_PAGEEXEC;
53838+#endif
53839+
53840+#ifdef CONFIG_PAX_SEGMEXEC
53841+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
53842+ pax_flags |= MF_PAX_SEGMEXEC;
53843+#endif
53844+
53845+#ifdef CONFIG_PAX_EMUTRAMP
53846+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
53847+ pax_flags |= MF_PAX_EMUTRAMP;
53848+#endif
53849+
53850+#ifdef CONFIG_PAX_MPROTECT
53851+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
53852+ pax_flags |= MF_PAX_MPROTECT;
53853+#endif
53854+
53855+#ifdef CONFIG_PAX_ASLR
53856+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
53857+ pax_flags |= MF_PAX_RANDMMAP;
53858+#endif
53859+
53860+#else
53861+
53862+#ifdef CONFIG_PAX_PAGEEXEC
53863+ pax_flags |= MF_PAX_PAGEEXEC;
53864+#endif
53865+
53866+#ifdef CONFIG_PAX_SEGMEXEC
53867+ pax_flags |= MF_PAX_SEGMEXEC;
53868+#endif
53869+
53870+#ifdef CONFIG_PAX_MPROTECT
53871+ pax_flags |= MF_PAX_MPROTECT;
53872+#endif
53873+
53874+#ifdef CONFIG_PAX_RANDMMAP
53875+ if (randomize_va_space)
53876+ pax_flags |= MF_PAX_RANDMMAP;
53877+#endif
53878+
53879+#endif
53880+
53881+ return pax_flags;
53882+}
53883+
53884+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
53885+{
53886+
53887+#ifdef CONFIG_PAX_PT_PAX_FLAGS
53888+ unsigned long i;
53889+
53890+ for (i = 0UL; i < elf_ex->e_phnum; i++)
53891+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
53892+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
53893+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
53894+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
53895+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
53896+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
53897+ return ~0UL;
53898+
53899+#ifdef CONFIG_PAX_SOFTMODE
53900+ if (pax_softmode)
53901+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
53902+ else
53903+#endif
53904+
53905+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
53906+ break;
53907+ }
53908+#endif
53909+
53910+ return ~0UL;
53911+}
53912+
53913+static unsigned long pax_parse_xattr_pax(struct file * const file)
53914+{
53915+
53916+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
53917+ ssize_t xattr_size, i;
53918+ unsigned char xattr_value[sizeof("pemrs") - 1];
53919+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
53920+
53921+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
53922+ if (xattr_size <= 0 || xattr_size > sizeof xattr_value)
53923+ return ~0UL;
53924+
53925+ for (i = 0; i < xattr_size; i++)
53926+ switch (xattr_value[i]) {
53927+ default:
53928+ return ~0UL;
53929+
53930+#define parse_flag(option1, option2, flag) \
53931+ case option1: \
53932+ if (pax_flags_hardmode & MF_PAX_##flag) \
53933+ return ~0UL; \
53934+ pax_flags_hardmode |= MF_PAX_##flag; \
53935+ break; \
53936+ case option2: \
53937+ if (pax_flags_softmode & MF_PAX_##flag) \
53938+ return ~0UL; \
53939+ pax_flags_softmode |= MF_PAX_##flag; \
53940+ break;
53941+
53942+ parse_flag('p', 'P', PAGEEXEC);
53943+ parse_flag('e', 'E', EMUTRAMP);
53944+ parse_flag('m', 'M', MPROTECT);
53945+ parse_flag('r', 'R', RANDMMAP);
53946+ parse_flag('s', 'S', SEGMEXEC);
53947+
53948+#undef parse_flag
53949+ }
53950+
53951+ if (pax_flags_hardmode & pax_flags_softmode)
53952+ return ~0UL;
53953+
53954+#ifdef CONFIG_PAX_SOFTMODE
53955+ if (pax_softmode)
53956+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
53957+ else
53958+#endif
53959+
53960+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
53961+#else
53962+ return ~0UL;
53963+#endif
53964+
53965+}
53966+
53967+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
53968+{
53969+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
53970+
53971+ pax_flags = pax_parse_ei_pax(elf_ex);
53972+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
53973+ xattr_pax_flags = pax_parse_xattr_pax(file);
53974+
53975+ if (pt_pax_flags == ~0UL)
53976+ pt_pax_flags = xattr_pax_flags;
53977+ else if (xattr_pax_flags == ~0UL)
53978+ xattr_pax_flags = pt_pax_flags;
53979+ if (pt_pax_flags != xattr_pax_flags)
53980+ return -EINVAL;
53981+ if (pt_pax_flags != ~0UL)
53982+ pax_flags = pt_pax_flags;
53983+
53984+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
53985+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
53986+ if ((__supported_pte_mask & _PAGE_NX))
53987+ pax_flags &= ~MF_PAX_SEGMEXEC;
53988+ else
53989+ pax_flags &= ~MF_PAX_PAGEEXEC;
53990+ }
53991+#endif
53992+
53993+ if (0 > pax_check_flags(&pax_flags))
53994+ return -EINVAL;
53995+
53996+ current->mm->pax_flags = pax_flags;
53997+ return 0;
53998+}
53999+#endif
54000+
54001 /*
54002 * These are the functions used to load ELF style executables and shared
54003 * libraries. There is no binary dependent code anywhere else.
54004@@ -554,6 +894,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
54005 {
54006 unsigned int random_variable = 0;
54007
54008+#ifdef CONFIG_PAX_RANDUSTACK
54009+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
54010+ return stack_top - current->mm->delta_stack;
54011+#endif
54012+
54013 if ((current->flags & PF_RANDOMIZE) &&
54014 !(current->personality & ADDR_NO_RANDOMIZE)) {
54015 random_variable = get_random_int() & STACK_RND_MASK;
54016@@ -572,7 +917,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
54017 unsigned long load_addr = 0, load_bias = 0;
54018 int load_addr_set = 0;
54019 char * elf_interpreter = NULL;
54020- unsigned long error;
54021+ unsigned long error = 0;
54022 struct elf_phdr *elf_ppnt, *elf_phdata;
54023 unsigned long elf_bss, elf_brk;
54024 int retval, i;
54025@@ -582,12 +927,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
54026 unsigned long start_code, end_code, start_data, end_data;
54027 unsigned long reloc_func_desc __maybe_unused = 0;
54028 int executable_stack = EXSTACK_DEFAULT;
54029- unsigned long def_flags = 0;
54030 struct pt_regs *regs = current_pt_regs();
54031 struct {
54032 struct elfhdr elf_ex;
54033 struct elfhdr interp_elf_ex;
54034 } *loc;
54035+ unsigned long pax_task_size;
54036
54037 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
54038 if (!loc) {
54039@@ -723,11 +1068,82 @@ static int load_elf_binary(struct linux_binprm *bprm)
54040 goto out_free_dentry;
54041
54042 /* OK, This is the point of no return */
54043- current->mm->def_flags = def_flags;
54044+ current->mm->def_flags = 0;
54045
54046 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
54047 may depend on the personality. */
54048 SET_PERSONALITY(loc->elf_ex);
54049+
54050+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
54051+ current->mm->pax_flags = 0UL;
54052+#endif
54053+
54054+#ifdef CONFIG_PAX_DLRESOLVE
54055+ current->mm->call_dl_resolve = 0UL;
54056+#endif
54057+
54058+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
54059+ current->mm->call_syscall = 0UL;
54060+#endif
54061+
54062+#ifdef CONFIG_PAX_ASLR
54063+ current->mm->delta_mmap = 0UL;
54064+ current->mm->delta_stack = 0UL;
54065+#endif
54066+
54067+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
54068+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
54069+ send_sig(SIGKILL, current, 0);
54070+ goto out_free_dentry;
54071+ }
54072+#endif
54073+
54074+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
54075+ pax_set_initial_flags(bprm);
54076+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
54077+ if (pax_set_initial_flags_func)
54078+ (pax_set_initial_flags_func)(bprm);
54079+#endif
54080+
54081+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
54082+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
54083+ current->mm->context.user_cs_limit = PAGE_SIZE;
54084+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
54085+ }
54086+#endif
54087+
54088+#ifdef CONFIG_PAX_SEGMEXEC
54089+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
54090+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
54091+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
54092+ pax_task_size = SEGMEXEC_TASK_SIZE;
54093+ current->mm->def_flags |= VM_NOHUGEPAGE;
54094+ } else
54095+#endif
54096+
54097+ pax_task_size = TASK_SIZE;
54098+
54099+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
54100+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
54101+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
54102+ put_cpu();
54103+ }
54104+#endif
54105+
54106+#ifdef CONFIG_PAX_ASLR
54107+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
54108+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
54109+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
54110+ }
54111+#endif
54112+
54113+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
54114+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
54115+ executable_stack = EXSTACK_DISABLE_X;
54116+ current->personality &= ~READ_IMPLIES_EXEC;
54117+ } else
54118+#endif
54119+
54120 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
54121 current->personality |= READ_IMPLIES_EXEC;
54122
54123@@ -817,6 +1233,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
54124 #else
54125 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
54126 #endif
54127+
54128+#ifdef CONFIG_PAX_RANDMMAP
54129+ /* PaX: randomize base address at the default exe base if requested */
54130+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
54131+#ifdef CONFIG_SPARC64
54132+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
54133+#else
54134+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
54135+#endif
54136+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
54137+ elf_flags |= MAP_FIXED;
54138+ }
54139+#endif
54140+
54141 }
54142
54143 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
54144@@ -849,9 +1279,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
54145 * allowed task size. Note that p_filesz must always be
54146 * <= p_memsz so it is only necessary to check p_memsz.
54147 */
54148- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
54149- elf_ppnt->p_memsz > TASK_SIZE ||
54150- TASK_SIZE - elf_ppnt->p_memsz < k) {
54151+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
54152+ elf_ppnt->p_memsz > pax_task_size ||
54153+ pax_task_size - elf_ppnt->p_memsz < k) {
54154 /* set_brk can never work. Avoid overflows. */
54155 send_sig(SIGKILL, current, 0);
54156 retval = -EINVAL;
54157@@ -890,17 +1320,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
54158 goto out_free_dentry;
54159 }
54160 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
54161- send_sig(SIGSEGV, current, 0);
54162- retval = -EFAULT; /* Nobody gets to see this, but.. */
54163- goto out_free_dentry;
54164+ /*
54165+ * This bss-zeroing can fail if the ELF
54166+ * file specifies odd protections. So
54167+ * we don't check the return value
54168+ */
54169 }
54170
54171+#ifdef CONFIG_PAX_RANDMMAP
54172+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
54173+ unsigned long start, size, flags;
54174+ vm_flags_t vm_flags;
54175+
54176+ start = ELF_PAGEALIGN(elf_brk);
54177+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
54178+ flags = MAP_FIXED | MAP_PRIVATE;
54179+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
54180+
54181+ down_write(&current->mm->mmap_sem);
54182+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
54183+ retval = -ENOMEM;
54184+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
54185+// if (current->personality & ADDR_NO_RANDOMIZE)
54186+// vm_flags |= VM_READ | VM_MAYREAD;
54187+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
54188+ retval = IS_ERR_VALUE(start) ? start : 0;
54189+ }
54190+ up_write(&current->mm->mmap_sem);
54191+ if (retval == 0)
54192+ retval = set_brk(start + size, start + size + PAGE_SIZE);
54193+ if (retval < 0) {
54194+ send_sig(SIGKILL, current, 0);
54195+ goto out_free_dentry;
54196+ }
54197+ }
54198+#endif
54199+
54200 if (elf_interpreter) {
54201- unsigned long interp_map_addr = 0;
54202-
54203 elf_entry = load_elf_interp(&loc->interp_elf_ex,
54204 interpreter,
54205- &interp_map_addr,
54206 load_bias);
54207 if (!IS_ERR((void *)elf_entry)) {
54208 /*
54209@@ -1122,7 +1580,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
54210 * Decide what to dump of a segment, part, all or none.
54211 */
54212 static unsigned long vma_dump_size(struct vm_area_struct *vma,
54213- unsigned long mm_flags)
54214+ unsigned long mm_flags, long signr)
54215 {
54216 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
54217
54218@@ -1160,7 +1618,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
54219 if (vma->vm_file == NULL)
54220 return 0;
54221
54222- if (FILTER(MAPPED_PRIVATE))
54223+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
54224 goto whole;
54225
54226 /*
54227@@ -1385,9 +1843,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
54228 {
54229 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
54230 int i = 0;
54231- do
54232+ do {
54233 i += 2;
54234- while (auxv[i - 2] != AT_NULL);
54235+ } while (auxv[i - 2] != AT_NULL);
54236 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
54237 }
54238
54239@@ -1396,7 +1854,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
54240 {
54241 mm_segment_t old_fs = get_fs();
54242 set_fs(KERNEL_DS);
54243- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
54244+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
54245 set_fs(old_fs);
54246 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
54247 }
54248@@ -2023,14 +2481,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
54249 }
54250
54251 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
54252- unsigned long mm_flags)
54253+ struct coredump_params *cprm)
54254 {
54255 struct vm_area_struct *vma;
54256 size_t size = 0;
54257
54258 for (vma = first_vma(current, gate_vma); vma != NULL;
54259 vma = next_vma(vma, gate_vma))
54260- size += vma_dump_size(vma, mm_flags);
54261+ size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54262 return size;
54263 }
54264
54265@@ -2123,7 +2581,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54266
54267 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
54268
54269- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
54270+ offset += elf_core_vma_data_size(gate_vma, cprm);
54271 offset += elf_core_extra_data_size();
54272 e_shoff = offset;
54273
54274@@ -2137,10 +2595,12 @@ static int elf_core_dump(struct coredump_params *cprm)
54275 offset = dataoff;
54276
54277 size += sizeof(*elf);
54278+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
54279 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
54280 goto end_coredump;
54281
54282 size += sizeof(*phdr4note);
54283+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
54284 if (size > cprm->limit
54285 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
54286 goto end_coredump;
54287@@ -2154,7 +2614,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54288 phdr.p_offset = offset;
54289 phdr.p_vaddr = vma->vm_start;
54290 phdr.p_paddr = 0;
54291- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
54292+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54293 phdr.p_memsz = vma->vm_end - vma->vm_start;
54294 offset += phdr.p_filesz;
54295 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
54296@@ -2165,6 +2625,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54297 phdr.p_align = ELF_EXEC_PAGESIZE;
54298
54299 size += sizeof(phdr);
54300+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
54301 if (size > cprm->limit
54302 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
54303 goto end_coredump;
54304@@ -2189,7 +2650,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54305 unsigned long addr;
54306 unsigned long end;
54307
54308- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
54309+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54310
54311 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
54312 struct page *page;
54313@@ -2198,6 +2659,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54314 page = get_dump_page(addr);
54315 if (page) {
54316 void *kaddr = kmap(page);
54317+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
54318 stop = ((size += PAGE_SIZE) > cprm->limit) ||
54319 !dump_write(cprm->file, kaddr,
54320 PAGE_SIZE);
54321@@ -2215,6 +2677,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54322
54323 if (e_phnum == PN_XNUM) {
54324 size += sizeof(*shdr4extnum);
54325+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
54326 if (size > cprm->limit
54327 || !dump_write(cprm->file, shdr4extnum,
54328 sizeof(*shdr4extnum)))
54329@@ -2235,6 +2698,167 @@ out:
54330
54331 #endif /* CONFIG_ELF_CORE */
54332
54333+#ifdef CONFIG_PAX_MPROTECT
54334+/* PaX: non-PIC ELF libraries need relocations on their executable segments
54335+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
54336+ * we'll remove VM_MAYWRITE for good on RELRO segments.
54337+ *
54338+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
54339+ * basis because we want to allow the common case and not the special ones.
54340+ */
54341+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
54342+{
54343+ struct elfhdr elf_h;
54344+ struct elf_phdr elf_p;
54345+ unsigned long i;
54346+ unsigned long oldflags;
54347+ bool is_textrel_rw, is_textrel_rx, is_relro;
54348+
54349+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
54350+ return;
54351+
54352+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
54353+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
54354+
54355+#ifdef CONFIG_PAX_ELFRELOCS
54356+ /* possible TEXTREL */
54357+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
54358+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
54359+#else
54360+ is_textrel_rw = false;
54361+ is_textrel_rx = false;
54362+#endif
54363+
54364+ /* possible RELRO */
54365+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
54366+
54367+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
54368+ return;
54369+
54370+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
54371+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
54372+
54373+#ifdef CONFIG_PAX_ETEXECRELOCS
54374+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
54375+#else
54376+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
54377+#endif
54378+
54379+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
54380+ !elf_check_arch(&elf_h) ||
54381+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
54382+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
54383+ return;
54384+
54385+ for (i = 0UL; i < elf_h.e_phnum; i++) {
54386+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
54387+ return;
54388+ switch (elf_p.p_type) {
54389+ case PT_DYNAMIC:
54390+ if (!is_textrel_rw && !is_textrel_rx)
54391+ continue;
54392+ i = 0UL;
54393+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
54394+ elf_dyn dyn;
54395+
54396+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
54397+ break;
54398+ if (dyn.d_tag == DT_NULL)
54399+ break;
54400+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
54401+ gr_log_textrel(vma);
54402+ if (is_textrel_rw)
54403+ vma->vm_flags |= VM_MAYWRITE;
54404+ else
54405+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
54406+ vma->vm_flags &= ~VM_MAYWRITE;
54407+ break;
54408+ }
54409+ i++;
54410+ }
54411+ is_textrel_rw = false;
54412+ is_textrel_rx = false;
54413+ continue;
54414+
54415+ case PT_GNU_RELRO:
54416+ if (!is_relro)
54417+ continue;
54418+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
54419+ vma->vm_flags &= ~VM_MAYWRITE;
54420+ is_relro = false;
54421+ continue;
54422+
54423+#ifdef CONFIG_PAX_PT_PAX_FLAGS
54424+ case PT_PAX_FLAGS: {
54425+ const char *msg_mprotect = "", *msg_emutramp = "";
54426+ char *buffer_lib, *buffer_exe;
54427+
54428+ if (elf_p.p_flags & PF_NOMPROTECT)
54429+ msg_mprotect = "MPROTECT disabled";
54430+
54431+#ifdef CONFIG_PAX_EMUTRAMP
54432+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
54433+ msg_emutramp = "EMUTRAMP enabled";
54434+#endif
54435+
54436+ if (!msg_mprotect[0] && !msg_emutramp[0])
54437+ continue;
54438+
54439+ if (!printk_ratelimit())
54440+ continue;
54441+
54442+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
54443+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
54444+ if (buffer_lib && buffer_exe) {
54445+ char *path_lib, *path_exe;
54446+
54447+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
54448+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
54449+
54450+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
54451+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
54452+
54453+ }
54454+ free_page((unsigned long)buffer_exe);
54455+ free_page((unsigned long)buffer_lib);
54456+ continue;
54457+ }
54458+#endif
54459+
54460+ }
54461+ }
54462+}
54463+#endif
54464+
54465+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
54466+
54467+extern int grsec_enable_log_rwxmaps;
54468+
54469+static void elf_handle_mmap(struct file *file)
54470+{
54471+ struct elfhdr elf_h;
54472+ struct elf_phdr elf_p;
54473+ unsigned long i;
54474+
54475+ if (!grsec_enable_log_rwxmaps)
54476+ return;
54477+
54478+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
54479+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
54480+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
54481+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
54482+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
54483+ return;
54484+
54485+ for (i = 0UL; i < elf_h.e_phnum; i++) {
54486+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
54487+ return;
54488+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
54489+ gr_log_ptgnustack(file);
54490+ }
54491+}
54492+#endif
54493+
54494 static int __init init_elf_binfmt(void)
54495 {
54496 register_binfmt(&elf_format);
54497diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
54498index d50bbe5..af3b649 100644
54499--- a/fs/binfmt_flat.c
54500+++ b/fs/binfmt_flat.c
54501@@ -566,7 +566,9 @@ static int load_flat_file(struct linux_binprm * bprm,
54502 realdatastart = (unsigned long) -ENOMEM;
54503 printk("Unable to allocate RAM for process data, errno %d\n",
54504 (int)-realdatastart);
54505+ down_write(&current->mm->mmap_sem);
54506 vm_munmap(textpos, text_len);
54507+ up_write(&current->mm->mmap_sem);
54508 ret = realdatastart;
54509 goto err;
54510 }
54511@@ -590,8 +592,10 @@ static int load_flat_file(struct linux_binprm * bprm,
54512 }
54513 if (IS_ERR_VALUE(result)) {
54514 printk("Unable to read data+bss, errno %d\n", (int)-result);
54515+ down_write(&current->mm->mmap_sem);
54516 vm_munmap(textpos, text_len);
54517 vm_munmap(realdatastart, len);
54518+ up_write(&current->mm->mmap_sem);
54519 ret = result;
54520 goto err;
54521 }
54522@@ -653,8 +657,10 @@ static int load_flat_file(struct linux_binprm * bprm,
54523 }
54524 if (IS_ERR_VALUE(result)) {
54525 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
54526+ down_write(&current->mm->mmap_sem);
54527 vm_munmap(textpos, text_len + data_len + extra +
54528 MAX_SHARED_LIBS * sizeof(unsigned long));
54529+ up_write(&current->mm->mmap_sem);
54530 ret = result;
54531 goto err;
54532 }
54533diff --git a/fs/bio.c b/fs/bio.c
54534index ea5035d..a2932eb 100644
54535--- a/fs/bio.c
54536+++ b/fs/bio.c
54537@@ -1106,7 +1106,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
54538 /*
54539 * Overflow, abort
54540 */
54541- if (end < start)
54542+ if (end < start || end - start > INT_MAX - nr_pages)
54543 return ERR_PTR(-EINVAL);
54544
54545 nr_pages += end - start;
54546@@ -1240,7 +1240,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
54547 /*
54548 * Overflow, abort
54549 */
54550- if (end < start)
54551+ if (end < start || end - start > INT_MAX - nr_pages)
54552 return ERR_PTR(-EINVAL);
54553
54554 nr_pages += end - start;
54555@@ -1502,7 +1502,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
54556 const int read = bio_data_dir(bio) == READ;
54557 struct bio_map_data *bmd = bio->bi_private;
54558 int i;
54559- char *p = bmd->sgvecs[0].iov_base;
54560+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
54561
54562 bio_for_each_segment_all(bvec, bio, i) {
54563 char *addr = page_address(bvec->bv_page);
54564diff --git a/fs/block_dev.c b/fs/block_dev.c
54565index 1e86823..8e34695 100644
54566--- a/fs/block_dev.c
54567+++ b/fs/block_dev.c
54568@@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
54569 else if (bdev->bd_contains == bdev)
54570 return true; /* is a whole device which isn't held */
54571
54572- else if (whole->bd_holder == bd_may_claim)
54573+ else if (whole->bd_holder == (void *)bd_may_claim)
54574 return true; /* is a partition of a device that is being partitioned */
54575 else if (whole->bd_holder != NULL)
54576 return false; /* is a partition of a held device */
54577diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
54578index b544a44..f3fb987 100644
54579--- a/fs/btrfs/ctree.c
54580+++ b/fs/btrfs/ctree.c
54581@@ -1028,9 +1028,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
54582 free_extent_buffer(buf);
54583 add_root_to_dirty_list(root);
54584 } else {
54585- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
54586- parent_start = parent->start;
54587- else
54588+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
54589+ if (parent)
54590+ parent_start = parent->start;
54591+ else
54592+ parent_start = 0;
54593+ } else
54594 parent_start = 0;
54595
54596 WARN_ON(trans->transid != btrfs_header_generation(parent));
54597diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
54598index cbd9523..5cca781 100644
54599--- a/fs/btrfs/delayed-inode.c
54600+++ b/fs/btrfs/delayed-inode.c
54601@@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
54602
54603 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
54604 {
54605- int seq = atomic_inc_return(&delayed_root->items_seq);
54606+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
54607 if ((atomic_dec_return(&delayed_root->items) <
54608 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
54609 waitqueue_active(&delayed_root->wait))
54610@@ -1378,7 +1378,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
54611 static int refs_newer(struct btrfs_delayed_root *delayed_root,
54612 int seq, int count)
54613 {
54614- int val = atomic_read(&delayed_root->items_seq);
54615+ int val = atomic_read_unchecked(&delayed_root->items_seq);
54616
54617 if (val < seq || val >= seq + count)
54618 return 1;
54619@@ -1395,7 +1395,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
54620 if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND)
54621 return;
54622
54623- seq = atomic_read(&delayed_root->items_seq);
54624+ seq = atomic_read_unchecked(&delayed_root->items_seq);
54625
54626 if (atomic_read(&delayed_root->items) >= BTRFS_DELAYED_WRITEBACK) {
54627 int ret;
54628diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
54629index a4b38f9..f86a509 100644
54630--- a/fs/btrfs/delayed-inode.h
54631+++ b/fs/btrfs/delayed-inode.h
54632@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
54633 */
54634 struct list_head prepare_list;
54635 atomic_t items; /* for delayed items */
54636- atomic_t items_seq; /* for delayed items */
54637+ atomic_unchecked_t items_seq; /* for delayed items */
54638 int nodes; /* for delayed nodes */
54639 wait_queue_head_t wait;
54640 };
54641@@ -87,7 +87,7 @@ static inline void btrfs_init_delayed_root(
54642 struct btrfs_delayed_root *delayed_root)
54643 {
54644 atomic_set(&delayed_root->items, 0);
54645- atomic_set(&delayed_root->items_seq, 0);
54646+ atomic_set_unchecked(&delayed_root->items_seq, 0);
54647 delayed_root->nodes = 0;
54648 spin_lock_init(&delayed_root->lock);
54649 init_waitqueue_head(&delayed_root->wait);
54650diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
54651index 8747feb..ad1655c 100644
54652--- a/fs/btrfs/ioctl.c
54653+++ b/fs/btrfs/ioctl.c
54654@@ -3465,9 +3465,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
54655 for (i = 0; i < num_types; i++) {
54656 struct btrfs_space_info *tmp;
54657
54658+ /* Don't copy in more than we allocated */
54659 if (!slot_count)
54660 break;
54661
54662+ slot_count--;
54663+
54664 info = NULL;
54665 rcu_read_lock();
54666 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
54667@@ -3489,10 +3492,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
54668 memcpy(dest, &space, sizeof(space));
54669 dest++;
54670 space_args.total_spaces++;
54671- slot_count--;
54672 }
54673- if (!slot_count)
54674- break;
54675 }
54676 up_read(&info->groups_sem);
54677 }
54678diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
54679index e913328..a34fb36 100644
54680--- a/fs/btrfs/super.c
54681+++ b/fs/btrfs/super.c
54682@@ -266,7 +266,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
54683 function, line, errstr);
54684 return;
54685 }
54686- ACCESS_ONCE(trans->transaction->aborted) = errno;
54687+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
54688 /* Wake up anybody who may be waiting on this transaction */
54689 wake_up(&root->fs_info->transaction_wait);
54690 wake_up(&root->fs_info->transaction_blocked_wait);
54691diff --git a/fs/buffer.c b/fs/buffer.c
54692index 6024877..7bd000a 100644
54693--- a/fs/buffer.c
54694+++ b/fs/buffer.c
54695@@ -3426,7 +3426,7 @@ void __init buffer_init(void)
54696 bh_cachep = kmem_cache_create("buffer_head",
54697 sizeof(struct buffer_head), 0,
54698 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
54699- SLAB_MEM_SPREAD),
54700+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
54701 NULL);
54702
54703 /*
54704diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
54705index 622f469..e8d2d55 100644
54706--- a/fs/cachefiles/bind.c
54707+++ b/fs/cachefiles/bind.c
54708@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
54709 args);
54710
54711 /* start by checking things over */
54712- ASSERT(cache->fstop_percent >= 0 &&
54713- cache->fstop_percent < cache->fcull_percent &&
54714+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
54715 cache->fcull_percent < cache->frun_percent &&
54716 cache->frun_percent < 100);
54717
54718- ASSERT(cache->bstop_percent >= 0 &&
54719- cache->bstop_percent < cache->bcull_percent &&
54720+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
54721 cache->bcull_percent < cache->brun_percent &&
54722 cache->brun_percent < 100);
54723
54724diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
54725index 0a1467b..6a53245 100644
54726--- a/fs/cachefiles/daemon.c
54727+++ b/fs/cachefiles/daemon.c
54728@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
54729 if (n > buflen)
54730 return -EMSGSIZE;
54731
54732- if (copy_to_user(_buffer, buffer, n) != 0)
54733+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
54734 return -EFAULT;
54735
54736 return n;
54737@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
54738 if (test_bit(CACHEFILES_DEAD, &cache->flags))
54739 return -EIO;
54740
54741- if (datalen < 0 || datalen > PAGE_SIZE - 1)
54742+ if (datalen > PAGE_SIZE - 1)
54743 return -EOPNOTSUPP;
54744
54745 /* drag the command string into the kernel so we can parse it */
54746@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
54747 if (args[0] != '%' || args[1] != '\0')
54748 return -EINVAL;
54749
54750- if (fstop < 0 || fstop >= cache->fcull_percent)
54751+ if (fstop >= cache->fcull_percent)
54752 return cachefiles_daemon_range_error(cache, args);
54753
54754 cache->fstop_percent = fstop;
54755@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
54756 if (args[0] != '%' || args[1] != '\0')
54757 return -EINVAL;
54758
54759- if (bstop < 0 || bstop >= cache->bcull_percent)
54760+ if (bstop >= cache->bcull_percent)
54761 return cachefiles_daemon_range_error(cache, args);
54762
54763 cache->bstop_percent = bstop;
54764diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
54765index 5349473..d6c0b93 100644
54766--- a/fs/cachefiles/internal.h
54767+++ b/fs/cachefiles/internal.h
54768@@ -59,7 +59,7 @@ struct cachefiles_cache {
54769 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
54770 struct rb_root active_nodes; /* active nodes (can't be culled) */
54771 rwlock_t active_lock; /* lock for active_nodes */
54772- atomic_t gravecounter; /* graveyard uniquifier */
54773+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
54774 unsigned frun_percent; /* when to stop culling (% files) */
54775 unsigned fcull_percent; /* when to start culling (% files) */
54776 unsigned fstop_percent; /* when to stop allocating (% files) */
54777@@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
54778 * proc.c
54779 */
54780 #ifdef CONFIG_CACHEFILES_HISTOGRAM
54781-extern atomic_t cachefiles_lookup_histogram[HZ];
54782-extern atomic_t cachefiles_mkdir_histogram[HZ];
54783-extern atomic_t cachefiles_create_histogram[HZ];
54784+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
54785+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
54786+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
54787
54788 extern int __init cachefiles_proc_init(void);
54789 extern void cachefiles_proc_cleanup(void);
54790 static inline
54791-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
54792+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
54793 {
54794 unsigned long jif = jiffies - start_jif;
54795 if (jif >= HZ)
54796 jif = HZ - 1;
54797- atomic_inc(&histogram[jif]);
54798+ atomic_inc_unchecked(&histogram[jif]);
54799 }
54800
54801 #else
54802diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
54803index f4a08d7..5aa4599 100644
54804--- a/fs/cachefiles/namei.c
54805+++ b/fs/cachefiles/namei.c
54806@@ -317,7 +317,7 @@ try_again:
54807 /* first step is to make up a grave dentry in the graveyard */
54808 sprintf(nbuffer, "%08x%08x",
54809 (uint32_t) get_seconds(),
54810- (uint32_t) atomic_inc_return(&cache->gravecounter));
54811+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
54812
54813 /* do the multiway lock magic */
54814 trap = lock_rename(cache->graveyard, dir);
54815diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
54816index eccd339..4c1d995 100644
54817--- a/fs/cachefiles/proc.c
54818+++ b/fs/cachefiles/proc.c
54819@@ -14,9 +14,9 @@
54820 #include <linux/seq_file.h>
54821 #include "internal.h"
54822
54823-atomic_t cachefiles_lookup_histogram[HZ];
54824-atomic_t cachefiles_mkdir_histogram[HZ];
54825-atomic_t cachefiles_create_histogram[HZ];
54826+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
54827+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
54828+atomic_unchecked_t cachefiles_create_histogram[HZ];
54829
54830 /*
54831 * display the latency histogram
54832@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
54833 return 0;
54834 default:
54835 index = (unsigned long) v - 3;
54836- x = atomic_read(&cachefiles_lookup_histogram[index]);
54837- y = atomic_read(&cachefiles_mkdir_histogram[index]);
54838- z = atomic_read(&cachefiles_create_histogram[index]);
54839+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
54840+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
54841+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
54842 if (x == 0 && y == 0 && z == 0)
54843 return 0;
54844
54845diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
54846index ebaff36..7e3ea26 100644
54847--- a/fs/cachefiles/rdwr.c
54848+++ b/fs/cachefiles/rdwr.c
54849@@ -950,7 +950,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
54850 old_fs = get_fs();
54851 set_fs(KERNEL_DS);
54852 ret = file->f_op->write(
54853- file, (const void __user *) data, len, &pos);
54854+ file, (const void __force_user *) data, len, &pos);
54855 set_fs(old_fs);
54856 kunmap(page);
54857 file_end_write(file);
54858diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
54859index 868b61d..58835a5 100644
54860--- a/fs/ceph/dir.c
54861+++ b/fs/ceph/dir.c
54862@@ -240,7 +240,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
54863 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
54864 struct ceph_mds_client *mdsc = fsc->mdsc;
54865 unsigned frag = fpos_frag(ctx->pos);
54866- int off = fpos_off(ctx->pos);
54867+ unsigned int off = fpos_off(ctx->pos);
54868 int err;
54869 u32 ftype;
54870 struct ceph_mds_reply_info_parsed *rinfo;
54871diff --git a/fs/ceph/super.c b/fs/ceph/super.c
54872index 6a0951e..03fac6d 100644
54873--- a/fs/ceph/super.c
54874+++ b/fs/ceph/super.c
54875@@ -870,7 +870,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
54876 /*
54877 * construct our own bdi so we can control readahead, etc.
54878 */
54879-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
54880+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
54881
54882 static int ceph_register_bdi(struct super_block *sb,
54883 struct ceph_fs_client *fsc)
54884@@ -887,7 +887,7 @@ static int ceph_register_bdi(struct super_block *sb,
54885 default_backing_dev_info.ra_pages;
54886
54887 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
54888- atomic_long_inc_return(&bdi_seq));
54889+ atomic_long_inc_return_unchecked(&bdi_seq));
54890 if (!err)
54891 sb->s_bdi = &fsc->backing_dev_info;
54892 return err;
54893diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
54894index f3ac415..3d2420c 100644
54895--- a/fs/cifs/cifs_debug.c
54896+++ b/fs/cifs/cifs_debug.c
54897@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
54898
54899 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
54900 #ifdef CONFIG_CIFS_STATS2
54901- atomic_set(&totBufAllocCount, 0);
54902- atomic_set(&totSmBufAllocCount, 0);
54903+ atomic_set_unchecked(&totBufAllocCount, 0);
54904+ atomic_set_unchecked(&totSmBufAllocCount, 0);
54905 #endif /* CONFIG_CIFS_STATS2 */
54906 spin_lock(&cifs_tcp_ses_lock);
54907 list_for_each(tmp1, &cifs_tcp_ses_list) {
54908@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
54909 tcon = list_entry(tmp3,
54910 struct cifs_tcon,
54911 tcon_list);
54912- atomic_set(&tcon->num_smbs_sent, 0);
54913+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
54914 if (server->ops->clear_stats)
54915 server->ops->clear_stats(tcon);
54916 }
54917@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
54918 smBufAllocCount.counter, cifs_min_small);
54919 #ifdef CONFIG_CIFS_STATS2
54920 seq_printf(m, "Total Large %d Small %d Allocations\n",
54921- atomic_read(&totBufAllocCount),
54922- atomic_read(&totSmBufAllocCount));
54923+ atomic_read_unchecked(&totBufAllocCount),
54924+ atomic_read_unchecked(&totSmBufAllocCount));
54925 #endif /* CONFIG_CIFS_STATS2 */
54926
54927 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
54928@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
54929 if (tcon->need_reconnect)
54930 seq_puts(m, "\tDISCONNECTED ");
54931 seq_printf(m, "\nSMBs: %d",
54932- atomic_read(&tcon->num_smbs_sent));
54933+ atomic_read_unchecked(&tcon->num_smbs_sent));
54934 if (server->ops->print_stats)
54935 server->ops->print_stats(m, tcon);
54936 }
54937diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
54938index 77fc5e1..e3d13e6 100644
54939--- a/fs/cifs/cifsfs.c
54940+++ b/fs/cifs/cifsfs.c
54941@@ -1056,7 +1056,7 @@ cifs_init_request_bufs(void)
54942 */
54943 cifs_req_cachep = kmem_cache_create("cifs_request",
54944 CIFSMaxBufSize + max_hdr_size, 0,
54945- SLAB_HWCACHE_ALIGN, NULL);
54946+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
54947 if (cifs_req_cachep == NULL)
54948 return -ENOMEM;
54949
54950@@ -1083,7 +1083,7 @@ cifs_init_request_bufs(void)
54951 efficient to alloc 1 per page off the slab compared to 17K (5page)
54952 alloc of large cifs buffers even when page debugging is on */
54953 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
54954- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
54955+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
54956 NULL);
54957 if (cifs_sm_req_cachep == NULL) {
54958 mempool_destroy(cifs_req_poolp);
54959@@ -1168,8 +1168,8 @@ init_cifs(void)
54960 atomic_set(&bufAllocCount, 0);
54961 atomic_set(&smBufAllocCount, 0);
54962 #ifdef CONFIG_CIFS_STATS2
54963- atomic_set(&totBufAllocCount, 0);
54964- atomic_set(&totSmBufAllocCount, 0);
54965+ atomic_set_unchecked(&totBufAllocCount, 0);
54966+ atomic_set_unchecked(&totSmBufAllocCount, 0);
54967 #endif /* CONFIG_CIFS_STATS2 */
54968
54969 atomic_set(&midCount, 0);
54970diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
54971index c8e03f8..75362f6 100644
54972--- a/fs/cifs/cifsglob.h
54973+++ b/fs/cifs/cifsglob.h
54974@@ -758,35 +758,35 @@ struct cifs_tcon {
54975 __u16 Flags; /* optional support bits */
54976 enum statusEnum tidStatus;
54977 #ifdef CONFIG_CIFS_STATS
54978- atomic_t num_smbs_sent;
54979+ atomic_unchecked_t num_smbs_sent;
54980 union {
54981 struct {
54982- atomic_t num_writes;
54983- atomic_t num_reads;
54984- atomic_t num_flushes;
54985- atomic_t num_oplock_brks;
54986- atomic_t num_opens;
54987- atomic_t num_closes;
54988- atomic_t num_deletes;
54989- atomic_t num_mkdirs;
54990- atomic_t num_posixopens;
54991- atomic_t num_posixmkdirs;
54992- atomic_t num_rmdirs;
54993- atomic_t num_renames;
54994- atomic_t num_t2renames;
54995- atomic_t num_ffirst;
54996- atomic_t num_fnext;
54997- atomic_t num_fclose;
54998- atomic_t num_hardlinks;
54999- atomic_t num_symlinks;
55000- atomic_t num_locks;
55001- atomic_t num_acl_get;
55002- atomic_t num_acl_set;
55003+ atomic_unchecked_t num_writes;
55004+ atomic_unchecked_t num_reads;
55005+ atomic_unchecked_t num_flushes;
55006+ atomic_unchecked_t num_oplock_brks;
55007+ atomic_unchecked_t num_opens;
55008+ atomic_unchecked_t num_closes;
55009+ atomic_unchecked_t num_deletes;
55010+ atomic_unchecked_t num_mkdirs;
55011+ atomic_unchecked_t num_posixopens;
55012+ atomic_unchecked_t num_posixmkdirs;
55013+ atomic_unchecked_t num_rmdirs;
55014+ atomic_unchecked_t num_renames;
55015+ atomic_unchecked_t num_t2renames;
55016+ atomic_unchecked_t num_ffirst;
55017+ atomic_unchecked_t num_fnext;
55018+ atomic_unchecked_t num_fclose;
55019+ atomic_unchecked_t num_hardlinks;
55020+ atomic_unchecked_t num_symlinks;
55021+ atomic_unchecked_t num_locks;
55022+ atomic_unchecked_t num_acl_get;
55023+ atomic_unchecked_t num_acl_set;
55024 } cifs_stats;
55025 #ifdef CONFIG_CIFS_SMB2
55026 struct {
55027- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
55028- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
55029+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
55030+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
55031 } smb2_stats;
55032 #endif /* CONFIG_CIFS_SMB2 */
55033 } stats;
55034@@ -1111,7 +1111,7 @@ convert_delimiter(char *path, char delim)
55035 }
55036
55037 #ifdef CONFIG_CIFS_STATS
55038-#define cifs_stats_inc atomic_inc
55039+#define cifs_stats_inc atomic_inc_unchecked
55040
55041 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
55042 unsigned int bytes)
55043@@ -1477,8 +1477,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
55044 /* Various Debug counters */
55045 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
55046 #ifdef CONFIG_CIFS_STATS2
55047-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
55048-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
55049+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
55050+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
55051 #endif
55052 GLOBAL_EXTERN atomic_t smBufAllocCount;
55053 GLOBAL_EXTERN atomic_t midCount;
55054diff --git a/fs/cifs/file.c b/fs/cifs/file.c
55055index 7ddddf2..2e12dbc 100644
55056--- a/fs/cifs/file.c
55057+++ b/fs/cifs/file.c
55058@@ -1900,10 +1900,14 @@ static int cifs_writepages(struct address_space *mapping,
55059 index = mapping->writeback_index; /* Start from prev offset */
55060 end = -1;
55061 } else {
55062- index = wbc->range_start >> PAGE_CACHE_SHIFT;
55063- end = wbc->range_end >> PAGE_CACHE_SHIFT;
55064- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
55065+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
55066 range_whole = true;
55067+ index = 0;
55068+ end = ULONG_MAX;
55069+ } else {
55070+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
55071+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
55072+ }
55073 scanned = true;
55074 }
55075 retry:
55076diff --git a/fs/cifs/link.c b/fs/cifs/link.c
55077index 477e53b..7a32216 100644
55078--- a/fs/cifs/link.c
55079+++ b/fs/cifs/link.c
55080@@ -620,7 +620,7 @@ symlink_exit:
55081
55082 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
55083 {
55084- char *p = nd_get_link(nd);
55085+ const char *p = nd_get_link(nd);
55086 if (!IS_ERR(p))
55087 kfree(p);
55088 }
55089diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
55090index 138a011..cf9e13a 100644
55091--- a/fs/cifs/misc.c
55092+++ b/fs/cifs/misc.c
55093@@ -170,7 +170,7 @@ cifs_buf_get(void)
55094 memset(ret_buf, 0, buf_size + 3);
55095 atomic_inc(&bufAllocCount);
55096 #ifdef CONFIG_CIFS_STATS2
55097- atomic_inc(&totBufAllocCount);
55098+ atomic_inc_unchecked(&totBufAllocCount);
55099 #endif /* CONFIG_CIFS_STATS2 */
55100 }
55101
55102@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
55103 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
55104 atomic_inc(&smBufAllocCount);
55105 #ifdef CONFIG_CIFS_STATS2
55106- atomic_inc(&totSmBufAllocCount);
55107+ atomic_inc_unchecked(&totSmBufAllocCount);
55108 #endif /* CONFIG_CIFS_STATS2 */
55109
55110 }
55111diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
55112index e50554b..c011413 100644
55113--- a/fs/cifs/smb1ops.c
55114+++ b/fs/cifs/smb1ops.c
55115@@ -609,27 +609,27 @@ static void
55116 cifs_clear_stats(struct cifs_tcon *tcon)
55117 {
55118 #ifdef CONFIG_CIFS_STATS
55119- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
55120- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
55121- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
55122- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
55123- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
55124- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
55125- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
55126- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
55127- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
55128- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
55129- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
55130- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
55131- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
55132- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
55133- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
55134- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
55135- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
55136- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
55137- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
55138- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
55139- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
55140+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
55141+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
55142+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
55143+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
55144+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
55145+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
55146+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
55147+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
55148+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
55149+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
55150+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
55151+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
55152+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
55153+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
55154+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
55155+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
55156+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
55157+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
55158+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
55159+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
55160+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
55161 #endif
55162 }
55163
55164@@ -638,36 +638,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
55165 {
55166 #ifdef CONFIG_CIFS_STATS
55167 seq_printf(m, " Oplocks breaks: %d",
55168- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
55169+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
55170 seq_printf(m, "\nReads: %d Bytes: %llu",
55171- atomic_read(&tcon->stats.cifs_stats.num_reads),
55172+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
55173 (long long)(tcon->bytes_read));
55174 seq_printf(m, "\nWrites: %d Bytes: %llu",
55175- atomic_read(&tcon->stats.cifs_stats.num_writes),
55176+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
55177 (long long)(tcon->bytes_written));
55178 seq_printf(m, "\nFlushes: %d",
55179- atomic_read(&tcon->stats.cifs_stats.num_flushes));
55180+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
55181 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
55182- atomic_read(&tcon->stats.cifs_stats.num_locks),
55183- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
55184- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
55185+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
55186+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
55187+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
55188 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
55189- atomic_read(&tcon->stats.cifs_stats.num_opens),
55190- atomic_read(&tcon->stats.cifs_stats.num_closes),
55191- atomic_read(&tcon->stats.cifs_stats.num_deletes));
55192+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
55193+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
55194+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
55195 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
55196- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
55197- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
55198+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
55199+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
55200 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
55201- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
55202- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
55203+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
55204+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
55205 seq_printf(m, "\nRenames: %d T2 Renames %d",
55206- atomic_read(&tcon->stats.cifs_stats.num_renames),
55207- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
55208+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
55209+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
55210 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
55211- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
55212- atomic_read(&tcon->stats.cifs_stats.num_fnext),
55213- atomic_read(&tcon->stats.cifs_stats.num_fclose));
55214+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
55215+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
55216+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
55217 #endif
55218 }
55219
55220diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
55221index 861b332..5506392 100644
55222--- a/fs/cifs/smb2ops.c
55223+++ b/fs/cifs/smb2ops.c
55224@@ -282,8 +282,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
55225 #ifdef CONFIG_CIFS_STATS
55226 int i;
55227 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
55228- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
55229- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
55230+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
55231+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
55232 }
55233 #endif
55234 }
55235@@ -311,65 +311,65 @@ static void
55236 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
55237 {
55238 #ifdef CONFIG_CIFS_STATS
55239- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
55240- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
55241+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
55242+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
55243 seq_printf(m, "\nNegotiates: %d sent %d failed",
55244- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
55245- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
55246+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
55247+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
55248 seq_printf(m, "\nSessionSetups: %d sent %d failed",
55249- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
55250- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
55251+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
55252+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
55253 seq_printf(m, "\nLogoffs: %d sent %d failed",
55254- atomic_read(&sent[SMB2_LOGOFF_HE]),
55255- atomic_read(&failed[SMB2_LOGOFF_HE]));
55256+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
55257+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
55258 seq_printf(m, "\nTreeConnects: %d sent %d failed",
55259- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
55260- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
55261+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
55262+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
55263 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
55264- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
55265- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
55266+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
55267+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
55268 seq_printf(m, "\nCreates: %d sent %d failed",
55269- atomic_read(&sent[SMB2_CREATE_HE]),
55270- atomic_read(&failed[SMB2_CREATE_HE]));
55271+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
55272+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
55273 seq_printf(m, "\nCloses: %d sent %d failed",
55274- atomic_read(&sent[SMB2_CLOSE_HE]),
55275- atomic_read(&failed[SMB2_CLOSE_HE]));
55276+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
55277+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
55278 seq_printf(m, "\nFlushes: %d sent %d failed",
55279- atomic_read(&sent[SMB2_FLUSH_HE]),
55280- atomic_read(&failed[SMB2_FLUSH_HE]));
55281+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
55282+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
55283 seq_printf(m, "\nReads: %d sent %d failed",
55284- atomic_read(&sent[SMB2_READ_HE]),
55285- atomic_read(&failed[SMB2_READ_HE]));
55286+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
55287+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
55288 seq_printf(m, "\nWrites: %d sent %d failed",
55289- atomic_read(&sent[SMB2_WRITE_HE]),
55290- atomic_read(&failed[SMB2_WRITE_HE]));
55291+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
55292+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
55293 seq_printf(m, "\nLocks: %d sent %d failed",
55294- atomic_read(&sent[SMB2_LOCK_HE]),
55295- atomic_read(&failed[SMB2_LOCK_HE]));
55296+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
55297+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
55298 seq_printf(m, "\nIOCTLs: %d sent %d failed",
55299- atomic_read(&sent[SMB2_IOCTL_HE]),
55300- atomic_read(&failed[SMB2_IOCTL_HE]));
55301+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
55302+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
55303 seq_printf(m, "\nCancels: %d sent %d failed",
55304- atomic_read(&sent[SMB2_CANCEL_HE]),
55305- atomic_read(&failed[SMB2_CANCEL_HE]));
55306+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
55307+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
55308 seq_printf(m, "\nEchos: %d sent %d failed",
55309- atomic_read(&sent[SMB2_ECHO_HE]),
55310- atomic_read(&failed[SMB2_ECHO_HE]));
55311+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
55312+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
55313 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
55314- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
55315- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
55316+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
55317+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
55318 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
55319- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
55320- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
55321+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
55322+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
55323 seq_printf(m, "\nQueryInfos: %d sent %d failed",
55324- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
55325- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
55326+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
55327+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
55328 seq_printf(m, "\nSetInfos: %d sent %d failed",
55329- atomic_read(&sent[SMB2_SET_INFO_HE]),
55330- atomic_read(&failed[SMB2_SET_INFO_HE]));
55331+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
55332+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
55333 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
55334- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
55335- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
55336+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
55337+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
55338 #endif
55339 }
55340
55341diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
55342index edccb52..16bc6db 100644
55343--- a/fs/cifs/smb2pdu.c
55344+++ b/fs/cifs/smb2pdu.c
55345@@ -1957,8 +1957,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
55346 default:
55347 cifs_dbg(VFS, "info level %u isn't supported\n",
55348 srch_inf->info_level);
55349- rc = -EINVAL;
55350- goto qdir_exit;
55351+ return -EINVAL;
55352 }
55353
55354 req->FileIndex = cpu_to_le32(index);
55355diff --git a/fs/coda/cache.c b/fs/coda/cache.c
55356index 1da168c..8bc7ff6 100644
55357--- a/fs/coda/cache.c
55358+++ b/fs/coda/cache.c
55359@@ -24,7 +24,7 @@
55360 #include "coda_linux.h"
55361 #include "coda_cache.h"
55362
55363-static atomic_t permission_epoch = ATOMIC_INIT(0);
55364+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
55365
55366 /* replace or extend an acl cache hit */
55367 void coda_cache_enter(struct inode *inode, int mask)
55368@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
55369 struct coda_inode_info *cii = ITOC(inode);
55370
55371 spin_lock(&cii->c_lock);
55372- cii->c_cached_epoch = atomic_read(&permission_epoch);
55373+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
55374 if (!uid_eq(cii->c_uid, current_fsuid())) {
55375 cii->c_uid = current_fsuid();
55376 cii->c_cached_perm = mask;
55377@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
55378 {
55379 struct coda_inode_info *cii = ITOC(inode);
55380 spin_lock(&cii->c_lock);
55381- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
55382+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
55383 spin_unlock(&cii->c_lock);
55384 }
55385
55386 /* remove all acl caches */
55387 void coda_cache_clear_all(struct super_block *sb)
55388 {
55389- atomic_inc(&permission_epoch);
55390+ atomic_inc_unchecked(&permission_epoch);
55391 }
55392
55393
55394@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
55395 spin_lock(&cii->c_lock);
55396 hit = (mask & cii->c_cached_perm) == mask &&
55397 uid_eq(cii->c_uid, current_fsuid()) &&
55398- cii->c_cached_epoch == atomic_read(&permission_epoch);
55399+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
55400 spin_unlock(&cii->c_lock);
55401
55402 return hit;
55403diff --git a/fs/compat.c b/fs/compat.c
55404index 6af20de..fec3fbb 100644
55405--- a/fs/compat.c
55406+++ b/fs/compat.c
55407@@ -54,7 +54,7 @@
55408 #include <asm/ioctls.h>
55409 #include "internal.h"
55410
55411-int compat_log = 1;
55412+int compat_log = 0;
55413
55414 int compat_printk(const char *fmt, ...)
55415 {
55416@@ -488,7 +488,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
55417
55418 set_fs(KERNEL_DS);
55419 /* The __user pointer cast is valid because of the set_fs() */
55420- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
55421+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
55422 set_fs(oldfs);
55423 /* truncating is ok because it's a user address */
55424 if (!ret)
55425@@ -546,7 +546,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
55426 goto out;
55427
55428 ret = -EINVAL;
55429- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
55430+ if (nr_segs > UIO_MAXIOV)
55431 goto out;
55432 if (nr_segs > fast_segs) {
55433 ret = -ENOMEM;
55434@@ -834,6 +834,7 @@ struct compat_old_linux_dirent {
55435 struct compat_readdir_callback {
55436 struct dir_context ctx;
55437 struct compat_old_linux_dirent __user *dirent;
55438+ struct file * file;
55439 int result;
55440 };
55441
55442@@ -851,6 +852,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
55443 buf->result = -EOVERFLOW;
55444 return -EOVERFLOW;
55445 }
55446+
55447+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55448+ return 0;
55449+
55450 buf->result++;
55451 dirent = buf->dirent;
55452 if (!access_ok(VERIFY_WRITE, dirent,
55453@@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
55454 if (!f.file)
55455 return -EBADF;
55456
55457+ buf.file = f.file;
55458 error = iterate_dir(f.file, &buf.ctx);
55459 if (buf.result)
55460 error = buf.result;
55461@@ -901,6 +907,7 @@ struct compat_getdents_callback {
55462 struct dir_context ctx;
55463 struct compat_linux_dirent __user *current_dir;
55464 struct compat_linux_dirent __user *previous;
55465+ struct file * file;
55466 int count;
55467 int error;
55468 };
55469@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
55470 buf->error = -EOVERFLOW;
55471 return -EOVERFLOW;
55472 }
55473+
55474+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55475+ return 0;
55476+
55477 dirent = buf->previous;
55478 if (dirent) {
55479 if (__put_user(offset, &dirent->d_off))
55480@@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
55481 if (!f.file)
55482 return -EBADF;
55483
55484+ buf.file = f.file;
55485 error = iterate_dir(f.file, &buf.ctx);
55486 if (error >= 0)
55487 error = buf.error;
55488@@ -987,6 +999,7 @@ struct compat_getdents_callback64 {
55489 struct dir_context ctx;
55490 struct linux_dirent64 __user *current_dir;
55491 struct linux_dirent64 __user *previous;
55492+ struct file * file;
55493 int count;
55494 int error;
55495 };
55496@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
55497 buf->error = -EINVAL; /* only used if we fail.. */
55498 if (reclen > buf->count)
55499 return -EINVAL;
55500+
55501+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55502+ return 0;
55503+
55504 dirent = buf->previous;
55505
55506 if (dirent) {
55507@@ -1052,6 +1069,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
55508 if (!f.file)
55509 return -EBADF;
55510
55511+ buf.file = f.file;
55512 error = iterate_dir(f.file, &buf.ctx);
55513 if (error >= 0)
55514 error = buf.error;
55515diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
55516index a81147e..20bf2b5 100644
55517--- a/fs/compat_binfmt_elf.c
55518+++ b/fs/compat_binfmt_elf.c
55519@@ -30,11 +30,13 @@
55520 #undef elf_phdr
55521 #undef elf_shdr
55522 #undef elf_note
55523+#undef elf_dyn
55524 #undef elf_addr_t
55525 #define elfhdr elf32_hdr
55526 #define elf_phdr elf32_phdr
55527 #define elf_shdr elf32_shdr
55528 #define elf_note elf32_note
55529+#define elf_dyn Elf32_Dyn
55530 #define elf_addr_t Elf32_Addr
55531
55532 /*
55533diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
55534index 5d19acf..9ab093b 100644
55535--- a/fs/compat_ioctl.c
55536+++ b/fs/compat_ioctl.c
55537@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
55538 return -EFAULT;
55539 if (__get_user(udata, &ss32->iomem_base))
55540 return -EFAULT;
55541- ss.iomem_base = compat_ptr(udata);
55542+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
55543 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
55544 __get_user(ss.port_high, &ss32->port_high))
55545 return -EFAULT;
55546@@ -702,8 +702,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
55547 for (i = 0; i < nmsgs; i++) {
55548 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
55549 return -EFAULT;
55550- if (get_user(datap, &umsgs[i].buf) ||
55551- put_user(compat_ptr(datap), &tmsgs[i].buf))
55552+ if (get_user(datap, (u8 __user * __user *)&umsgs[i].buf) ||
55553+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
55554 return -EFAULT;
55555 }
55556 return sys_ioctl(fd, cmd, (unsigned long)tdata);
55557@@ -796,7 +796,7 @@ static int compat_ioctl_preallocate(struct file *file,
55558 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
55559 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
55560 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
55561- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
55562+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
55563 return -EFAULT;
55564
55565 return ioctl_preallocate(file, p);
55566@@ -1616,8 +1616,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
55567 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
55568 {
55569 unsigned int a, b;
55570- a = *(unsigned int *)p;
55571- b = *(unsigned int *)q;
55572+ a = *(const unsigned int *)p;
55573+ b = *(const unsigned int *)q;
55574 if (a > b)
55575 return 1;
55576 if (a < b)
55577diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
55578index 511d415..319d0e5 100644
55579--- a/fs/configfs/dir.c
55580+++ b/fs/configfs/dir.c
55581@@ -1558,7 +1558,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
55582 }
55583 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
55584 struct configfs_dirent *next;
55585- const char *name;
55586+ const unsigned char * name;
55587+ char d_name[sizeof(next->s_dentry->d_iname)];
55588 int len;
55589 struct inode *inode = NULL;
55590
55591@@ -1567,7 +1568,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
55592 continue;
55593
55594 name = configfs_get_name(next);
55595- len = strlen(name);
55596+ if (next->s_dentry && name == next->s_dentry->d_iname) {
55597+ len = next->s_dentry->d_name.len;
55598+ memcpy(d_name, name, len);
55599+ name = d_name;
55600+ } else
55601+ len = strlen(name);
55602
55603 /*
55604 * We'll have a dentry and an inode for
55605diff --git a/fs/coredump.c b/fs/coredump.c
55606index 9bdeca1..2a9b08d 100644
55607--- a/fs/coredump.c
55608+++ b/fs/coredump.c
55609@@ -438,8 +438,8 @@ static void wait_for_dump_helpers(struct file *file)
55610 struct pipe_inode_info *pipe = file->private_data;
55611
55612 pipe_lock(pipe);
55613- pipe->readers++;
55614- pipe->writers--;
55615+ atomic_inc(&pipe->readers);
55616+ atomic_dec(&pipe->writers);
55617 wake_up_interruptible_sync(&pipe->wait);
55618 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
55619 pipe_unlock(pipe);
55620@@ -448,11 +448,11 @@ static void wait_for_dump_helpers(struct file *file)
55621 * We actually want wait_event_freezable() but then we need
55622 * to clear TIF_SIGPENDING and improve dump_interrupted().
55623 */
55624- wait_event_interruptible(pipe->wait, pipe->readers == 1);
55625+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
55626
55627 pipe_lock(pipe);
55628- pipe->readers--;
55629- pipe->writers++;
55630+ atomic_dec(&pipe->readers);
55631+ atomic_inc(&pipe->writers);
55632 pipe_unlock(pipe);
55633 }
55634
55635@@ -499,7 +499,9 @@ void do_coredump(siginfo_t *siginfo)
55636 struct files_struct *displaced;
55637 bool need_nonrelative = false;
55638 bool core_dumped = false;
55639- static atomic_t core_dump_count = ATOMIC_INIT(0);
55640+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
55641+ long signr = siginfo->si_signo;
55642+ int dumpable;
55643 struct coredump_params cprm = {
55644 .siginfo = siginfo,
55645 .regs = signal_pt_regs(),
55646@@ -512,12 +514,17 @@ void do_coredump(siginfo_t *siginfo)
55647 .mm_flags = mm->flags,
55648 };
55649
55650- audit_core_dumps(siginfo->si_signo);
55651+ audit_core_dumps(signr);
55652+
55653+ dumpable = __get_dumpable(cprm.mm_flags);
55654+
55655+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
55656+ gr_handle_brute_attach(dumpable);
55657
55658 binfmt = mm->binfmt;
55659 if (!binfmt || !binfmt->core_dump)
55660 goto fail;
55661- if (!__get_dumpable(cprm.mm_flags))
55662+ if (!dumpable)
55663 goto fail;
55664
55665 cred = prepare_creds();
55666@@ -536,7 +543,7 @@ void do_coredump(siginfo_t *siginfo)
55667 need_nonrelative = true;
55668 }
55669
55670- retval = coredump_wait(siginfo->si_signo, &core_state);
55671+ retval = coredump_wait(signr, &core_state);
55672 if (retval < 0)
55673 goto fail_creds;
55674
55675@@ -579,7 +586,7 @@ void do_coredump(siginfo_t *siginfo)
55676 }
55677 cprm.limit = RLIM_INFINITY;
55678
55679- dump_count = atomic_inc_return(&core_dump_count);
55680+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
55681 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
55682 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
55683 task_tgid_vnr(current), current->comm);
55684@@ -611,6 +618,8 @@ void do_coredump(siginfo_t *siginfo)
55685 } else {
55686 struct inode *inode;
55687
55688+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
55689+
55690 if (cprm.limit < binfmt->min_coredump)
55691 goto fail_unlock;
55692
55693@@ -669,7 +678,7 @@ close_fail:
55694 filp_close(cprm.file, NULL);
55695 fail_dropcount:
55696 if (ispipe)
55697- atomic_dec(&core_dump_count);
55698+ atomic_dec_unchecked(&core_dump_count);
55699 fail_unlock:
55700 kfree(cn.corename);
55701 coredump_finish(mm, core_dumped);
55702@@ -689,7 +698,7 @@ int dump_write(struct file *file, const void *addr, int nr)
55703 {
55704 return !dump_interrupted() &&
55705 access_ok(VERIFY_READ, addr, nr) &&
55706- file->f_op->write(file, addr, nr, &file->f_pos) == nr;
55707+ file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
55708 }
55709 EXPORT_SYMBOL(dump_write);
55710
55711diff --git a/fs/dcache.c b/fs/dcache.c
55712index 89f9671..d2dce57 100644
55713--- a/fs/dcache.c
55714+++ b/fs/dcache.c
55715@@ -1570,7 +1570,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
55716 */
55717 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
55718 if (name->len > DNAME_INLINE_LEN-1) {
55719- dname = kmalloc(name->len + 1, GFP_KERNEL);
55720+ dname = kmalloc(round_up(name->len + 1, sizeof(unsigned long)), GFP_KERNEL);
55721 if (!dname) {
55722 kmem_cache_free(dentry_cache, dentry);
55723 return NULL;
55724@@ -2893,6 +2893,7 @@ static int prepend_path(const struct path *path,
55725 restart:
55726 bptr = *buffer;
55727 blen = *buflen;
55728+ error = 0;
55729 dentry = path->dentry;
55730 vfsmnt = path->mnt;
55731 mnt = real_mount(vfsmnt);
55732@@ -3432,7 +3433,8 @@ void __init vfs_caches_init(unsigned long mempages)
55733 mempages -= reserve;
55734
55735 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
55736- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
55737+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
55738+ SLAB_NO_SANITIZE, NULL);
55739
55740 dcache_init();
55741 inode_init();
55742diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
55743index c7c83ff..bda9461 100644
55744--- a/fs/debugfs/inode.c
55745+++ b/fs/debugfs/inode.c
55746@@ -415,7 +415,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
55747 */
55748 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
55749 {
55750+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
55751+ return __create_file(name, S_IFDIR | S_IRWXU,
55752+#else
55753 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
55754+#endif
55755 parent, NULL, NULL);
55756 }
55757 EXPORT_SYMBOL_GPL(debugfs_create_dir);
55758diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
55759index 67e9b63..a9adb68 100644
55760--- a/fs/ecryptfs/inode.c
55761+++ b/fs/ecryptfs/inode.c
55762@@ -674,7 +674,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
55763 old_fs = get_fs();
55764 set_fs(get_ds());
55765 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
55766- (char __user *)lower_buf,
55767+ (char __force_user *)lower_buf,
55768 PATH_MAX);
55769 set_fs(old_fs);
55770 if (rc < 0)
55771@@ -706,7 +706,7 @@ out:
55772 static void
55773 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
55774 {
55775- char *buf = nd_get_link(nd);
55776+ const char *buf = nd_get_link(nd);
55777 if (!IS_ERR(buf)) {
55778 /* Free the char* */
55779 kfree(buf);
55780diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
55781index e4141f2..d8263e8 100644
55782--- a/fs/ecryptfs/miscdev.c
55783+++ b/fs/ecryptfs/miscdev.c
55784@@ -304,7 +304,7 @@ check_list:
55785 goto out_unlock_msg_ctx;
55786 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
55787 if (msg_ctx->msg) {
55788- if (copy_to_user(&buf[i], packet_length, packet_length_size))
55789+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
55790 goto out_unlock_msg_ctx;
55791 i += packet_length_size;
55792 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
55793diff --git a/fs/exec.c b/fs/exec.c
55794index bb8afc1..2f5087e 100644
55795--- a/fs/exec.c
55796+++ b/fs/exec.c
55797@@ -55,8 +55,20 @@
55798 #include <linux/pipe_fs_i.h>
55799 #include <linux/oom.h>
55800 #include <linux/compat.h>
55801+#include <linux/random.h>
55802+#include <linux/seq_file.h>
55803+#include <linux/coredump.h>
55804+#include <linux/mman.h>
55805+
55806+#ifdef CONFIG_PAX_REFCOUNT
55807+#include <linux/kallsyms.h>
55808+#include <linux/kdebug.h>
55809+#endif
55810+
55811+#include <trace/events/fs.h>
55812
55813 #include <asm/uaccess.h>
55814+#include <asm/sections.h>
55815 #include <asm/mmu_context.h>
55816 #include <asm/tlb.h>
55817
55818@@ -66,19 +78,34 @@
55819
55820 #include <trace/events/sched.h>
55821
55822+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
55823+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
55824+{
55825+ 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");
55826+}
55827+#endif
55828+
55829+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
55830+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
55831+EXPORT_SYMBOL(pax_set_initial_flags_func);
55832+#endif
55833+
55834 int suid_dumpable = 0;
55835
55836 static LIST_HEAD(formats);
55837 static DEFINE_RWLOCK(binfmt_lock);
55838
55839+extern int gr_process_kernel_exec_ban(void);
55840+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
55841+
55842 void __register_binfmt(struct linux_binfmt * fmt, int insert)
55843 {
55844 BUG_ON(!fmt);
55845 if (WARN_ON(!fmt->load_binary))
55846 return;
55847 write_lock(&binfmt_lock);
55848- insert ? list_add(&fmt->lh, &formats) :
55849- list_add_tail(&fmt->lh, &formats);
55850+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
55851+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
55852 write_unlock(&binfmt_lock);
55853 }
55854
55855@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
55856 void unregister_binfmt(struct linux_binfmt * fmt)
55857 {
55858 write_lock(&binfmt_lock);
55859- list_del(&fmt->lh);
55860+ pax_list_del((struct list_head *)&fmt->lh);
55861 write_unlock(&binfmt_lock);
55862 }
55863
55864@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
55865 int write)
55866 {
55867 struct page *page;
55868- int ret;
55869
55870-#ifdef CONFIG_STACK_GROWSUP
55871- if (write) {
55872- ret = expand_downwards(bprm->vma, pos);
55873- if (ret < 0)
55874- return NULL;
55875- }
55876-#endif
55877- ret = get_user_pages(current, bprm->mm, pos,
55878- 1, write, 1, &page, NULL);
55879- if (ret <= 0)
55880+ if (0 > expand_downwards(bprm->vma, pos))
55881+ return NULL;
55882+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
55883 return NULL;
55884
55885 if (write) {
55886@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
55887 if (size <= ARG_MAX)
55888 return page;
55889
55890+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
55891+ // only allow 512KB for argv+env on suid/sgid binaries
55892+ // to prevent easy ASLR exhaustion
55893+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
55894+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
55895+ (size > (512 * 1024))) {
55896+ put_page(page);
55897+ return NULL;
55898+ }
55899+#endif
55900+
55901 /*
55902 * Limit to 1/4-th the stack size for the argv+env strings.
55903 * This ensures that:
55904@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
55905 vma->vm_end = STACK_TOP_MAX;
55906 vma->vm_start = vma->vm_end - PAGE_SIZE;
55907 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
55908+
55909+#ifdef CONFIG_PAX_SEGMEXEC
55910+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
55911+#endif
55912+
55913 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
55914 INIT_LIST_HEAD(&vma->anon_vma_chain);
55915
55916@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
55917 mm->stack_vm = mm->total_vm = 1;
55918 up_write(&mm->mmap_sem);
55919 bprm->p = vma->vm_end - sizeof(void *);
55920+
55921+#ifdef CONFIG_PAX_RANDUSTACK
55922+ if (randomize_va_space)
55923+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
55924+#endif
55925+
55926 return 0;
55927 err:
55928 up_write(&mm->mmap_sem);
55929@@ -399,7 +440,7 @@ struct user_arg_ptr {
55930 } ptr;
55931 };
55932
55933-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55934+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55935 {
55936 const char __user *native;
55937
55938@@ -408,14 +449,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55939 compat_uptr_t compat;
55940
55941 if (get_user(compat, argv.ptr.compat + nr))
55942- return ERR_PTR(-EFAULT);
55943+ return (const char __force_user *)ERR_PTR(-EFAULT);
55944
55945 return compat_ptr(compat);
55946 }
55947 #endif
55948
55949 if (get_user(native, argv.ptr.native + nr))
55950- return ERR_PTR(-EFAULT);
55951+ return (const char __force_user *)ERR_PTR(-EFAULT);
55952
55953 return native;
55954 }
55955@@ -434,7 +475,7 @@ static int count(struct user_arg_ptr argv, int max)
55956 if (!p)
55957 break;
55958
55959- if (IS_ERR(p))
55960+ if (IS_ERR((const char __force_kernel *)p))
55961 return -EFAULT;
55962
55963 if (i >= max)
55964@@ -469,7 +510,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
55965
55966 ret = -EFAULT;
55967 str = get_user_arg_ptr(argv, argc);
55968- if (IS_ERR(str))
55969+ if (IS_ERR((const char __force_kernel *)str))
55970 goto out;
55971
55972 len = strnlen_user(str, MAX_ARG_STRLEN);
55973@@ -551,7 +592,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
55974 int r;
55975 mm_segment_t oldfs = get_fs();
55976 struct user_arg_ptr argv = {
55977- .ptr.native = (const char __user *const __user *)__argv,
55978+ .ptr.native = (const char __force_user * const __force_user *)__argv,
55979 };
55980
55981 set_fs(KERNEL_DS);
55982@@ -586,7 +627,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
55983 unsigned long new_end = old_end - shift;
55984 struct mmu_gather tlb;
55985
55986- BUG_ON(new_start > new_end);
55987+ if (new_start >= new_end || new_start < mmap_min_addr)
55988+ return -ENOMEM;
55989
55990 /*
55991 * ensure there are no vmas between where we want to go
55992@@ -595,6 +637,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
55993 if (vma != find_vma(mm, new_start))
55994 return -EFAULT;
55995
55996+#ifdef CONFIG_PAX_SEGMEXEC
55997+ BUG_ON(pax_find_mirror_vma(vma));
55998+#endif
55999+
56000 /*
56001 * cover the whole range: [new_start, old_end)
56002 */
56003@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
56004 stack_top = arch_align_stack(stack_top);
56005 stack_top = PAGE_ALIGN(stack_top);
56006
56007- if (unlikely(stack_top < mmap_min_addr) ||
56008- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
56009- return -ENOMEM;
56010-
56011 stack_shift = vma->vm_end - stack_top;
56012
56013 bprm->p -= stack_shift;
56014@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
56015 bprm->exec -= stack_shift;
56016
56017 down_write(&mm->mmap_sem);
56018+
56019+ /* Move stack pages down in memory. */
56020+ if (stack_shift) {
56021+ ret = shift_arg_pages(vma, stack_shift);
56022+ if (ret)
56023+ goto out_unlock;
56024+ }
56025+
56026 vm_flags = VM_STACK_FLAGS;
56027
56028+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56029+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56030+ vm_flags &= ~VM_EXEC;
56031+
56032+#ifdef CONFIG_PAX_MPROTECT
56033+ if (mm->pax_flags & MF_PAX_MPROTECT)
56034+ vm_flags &= ~VM_MAYEXEC;
56035+#endif
56036+
56037+ }
56038+#endif
56039+
56040 /*
56041 * Adjust stack execute permissions; explicitly enable for
56042 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
56043@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
56044 goto out_unlock;
56045 BUG_ON(prev != vma);
56046
56047- /* Move stack pages down in memory. */
56048- if (stack_shift) {
56049- ret = shift_arg_pages(vma, stack_shift);
56050- if (ret)
56051- goto out_unlock;
56052- }
56053-
56054 /* mprotect_fixup is overkill to remove the temporary stack flags */
56055 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
56056
56057@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
56058 #endif
56059 current->mm->start_stack = bprm->p;
56060 ret = expand_stack(vma, stack_base);
56061+
56062+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
56063+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
56064+ unsigned long size;
56065+ vm_flags_t vm_flags;
56066+
56067+ size = STACK_TOP - vma->vm_end;
56068+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
56069+
56070+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
56071+
56072+#ifdef CONFIG_X86
56073+ if (!ret) {
56074+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
56075+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
56076+ }
56077+#endif
56078+
56079+ }
56080+#endif
56081+
56082 if (ret)
56083 ret = -EFAULT;
56084
56085@@ -776,6 +852,8 @@ struct file *open_exec(const char *name)
56086
56087 fsnotify_open(file);
56088
56089+ trace_open_exec(name);
56090+
56091 err = deny_write_access(file);
56092 if (err)
56093 goto exit;
56094@@ -799,7 +877,7 @@ int kernel_read(struct file *file, loff_t offset,
56095 old_fs = get_fs();
56096 set_fs(get_ds());
56097 /* The cast to a user pointer is valid due to the set_fs() */
56098- result = vfs_read(file, (void __user *)addr, count, &pos);
56099+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
56100 set_fs(old_fs);
56101 return result;
56102 }
56103@@ -1255,7 +1333,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
56104 }
56105 rcu_read_unlock();
56106
56107- if (p->fs->users > n_fs) {
56108+ if (atomic_read(&p->fs->users) > n_fs) {
56109 bprm->unsafe |= LSM_UNSAFE_SHARE;
56110 } else {
56111 res = -EAGAIN;
56112@@ -1451,6 +1529,31 @@ static int exec_binprm(struct linux_binprm *bprm)
56113 return ret;
56114 }
56115
56116+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
56117+static DEFINE_PER_CPU(u64, exec_counter);
56118+static int __init init_exec_counters(void)
56119+{
56120+ unsigned int cpu;
56121+
56122+ for_each_possible_cpu(cpu) {
56123+ per_cpu(exec_counter, cpu) = (u64)cpu;
56124+ }
56125+
56126+ return 0;
56127+}
56128+early_initcall(init_exec_counters);
56129+static inline void increment_exec_counter(void)
56130+{
56131+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
56132+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
56133+}
56134+#else
56135+static inline void increment_exec_counter(void) {}
56136+#endif
56137+
56138+extern void gr_handle_exec_args(struct linux_binprm *bprm,
56139+ struct user_arg_ptr argv);
56140+
56141 /*
56142 * sys_execve() executes a new program.
56143 */
56144@@ -1458,12 +1561,19 @@ static int do_execve_common(const char *filename,
56145 struct user_arg_ptr argv,
56146 struct user_arg_ptr envp)
56147 {
56148+#ifdef CONFIG_GRKERNSEC
56149+ struct file *old_exec_file;
56150+ struct acl_subject_label *old_acl;
56151+ struct rlimit old_rlim[RLIM_NLIMITS];
56152+#endif
56153 struct linux_binprm *bprm;
56154 struct file *file;
56155 struct files_struct *displaced;
56156 bool clear_in_exec;
56157 int retval;
56158
56159+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
56160+
56161 /*
56162 * We move the actual failure in case of RLIMIT_NPROC excess from
56163 * set*uid() to execve() because too many poorly written programs
56164@@ -1504,12 +1614,22 @@ static int do_execve_common(const char *filename,
56165 if (IS_ERR(file))
56166 goto out_unmark;
56167
56168+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
56169+ retval = -EPERM;
56170+ goto out_file;
56171+ }
56172+
56173 sched_exec();
56174
56175 bprm->file = file;
56176 bprm->filename = filename;
56177 bprm->interp = filename;
56178
56179+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
56180+ retval = -EACCES;
56181+ goto out_file;
56182+ }
56183+
56184 retval = bprm_mm_init(bprm);
56185 if (retval)
56186 goto out_file;
56187@@ -1526,24 +1646,70 @@ static int do_execve_common(const char *filename,
56188 if (retval < 0)
56189 goto out;
56190
56191+#ifdef CONFIG_GRKERNSEC
56192+ old_acl = current->acl;
56193+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
56194+ old_exec_file = current->exec_file;
56195+ get_file(file);
56196+ current->exec_file = file;
56197+#endif
56198+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
56199+ /* limit suid stack to 8MB
56200+ * we saved the old limits above and will restore them if this exec fails
56201+ */
56202+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
56203+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
56204+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
56205+#endif
56206+
56207+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
56208+ retval = -EPERM;
56209+ goto out_fail;
56210+ }
56211+
56212+ if (!gr_tpe_allow(file)) {
56213+ retval = -EACCES;
56214+ goto out_fail;
56215+ }
56216+
56217+ if (gr_check_crash_exec(file)) {
56218+ retval = -EACCES;
56219+ goto out_fail;
56220+ }
56221+
56222+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
56223+ bprm->unsafe);
56224+ if (retval < 0)
56225+ goto out_fail;
56226+
56227 retval = copy_strings_kernel(1, &bprm->filename, bprm);
56228 if (retval < 0)
56229- goto out;
56230+ goto out_fail;
56231
56232 bprm->exec = bprm->p;
56233 retval = copy_strings(bprm->envc, envp, bprm);
56234 if (retval < 0)
56235- goto out;
56236+ goto out_fail;
56237
56238 retval = copy_strings(bprm->argc, argv, bprm);
56239 if (retval < 0)
56240- goto out;
56241+ goto out_fail;
56242+
56243+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
56244+
56245+ gr_handle_exec_args(bprm, argv);
56246
56247 retval = exec_binprm(bprm);
56248 if (retval < 0)
56249- goto out;
56250+ goto out_fail;
56251+#ifdef CONFIG_GRKERNSEC
56252+ if (old_exec_file)
56253+ fput(old_exec_file);
56254+#endif
56255
56256 /* execve succeeded */
56257+
56258+ increment_exec_counter();
56259 current->fs->in_exec = 0;
56260 current->in_execve = 0;
56261 acct_update_integrals(current);
56262@@ -1552,6 +1718,14 @@ static int do_execve_common(const char *filename,
56263 put_files_struct(displaced);
56264 return retval;
56265
56266+out_fail:
56267+#ifdef CONFIG_GRKERNSEC
56268+ current->acl = old_acl;
56269+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
56270+ fput(current->exec_file);
56271+ current->exec_file = old_exec_file;
56272+#endif
56273+
56274 out:
56275 if (bprm->mm) {
56276 acct_arg_size(bprm, 0);
56277@@ -1706,3 +1880,295 @@ asmlinkage long compat_sys_execve(const char __user * filename,
56278 return error;
56279 }
56280 #endif
56281+
56282+int pax_check_flags(unsigned long *flags)
56283+{
56284+ int retval = 0;
56285+
56286+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
56287+ if (*flags & MF_PAX_SEGMEXEC)
56288+ {
56289+ *flags &= ~MF_PAX_SEGMEXEC;
56290+ retval = -EINVAL;
56291+ }
56292+#endif
56293+
56294+ if ((*flags & MF_PAX_PAGEEXEC)
56295+
56296+#ifdef CONFIG_PAX_PAGEEXEC
56297+ && (*flags & MF_PAX_SEGMEXEC)
56298+#endif
56299+
56300+ )
56301+ {
56302+ *flags &= ~MF_PAX_PAGEEXEC;
56303+ retval = -EINVAL;
56304+ }
56305+
56306+ if ((*flags & MF_PAX_MPROTECT)
56307+
56308+#ifdef CONFIG_PAX_MPROTECT
56309+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
56310+#endif
56311+
56312+ )
56313+ {
56314+ *flags &= ~MF_PAX_MPROTECT;
56315+ retval = -EINVAL;
56316+ }
56317+
56318+ if ((*flags & MF_PAX_EMUTRAMP)
56319+
56320+#ifdef CONFIG_PAX_EMUTRAMP
56321+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
56322+#endif
56323+
56324+ )
56325+ {
56326+ *flags &= ~MF_PAX_EMUTRAMP;
56327+ retval = -EINVAL;
56328+ }
56329+
56330+ return retval;
56331+}
56332+
56333+EXPORT_SYMBOL(pax_check_flags);
56334+
56335+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56336+char *pax_get_path(const struct path *path, char *buf, int buflen)
56337+{
56338+ char *pathname = d_path(path, buf, buflen);
56339+
56340+ if (IS_ERR(pathname))
56341+ goto toolong;
56342+
56343+ pathname = mangle_path(buf, pathname, "\t\n\\");
56344+ if (!pathname)
56345+ goto toolong;
56346+
56347+ *pathname = 0;
56348+ return buf;
56349+
56350+toolong:
56351+ return "<path too long>";
56352+}
56353+EXPORT_SYMBOL(pax_get_path);
56354+
56355+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
56356+{
56357+ struct task_struct *tsk = current;
56358+ struct mm_struct *mm = current->mm;
56359+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
56360+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
56361+ char *path_exec = NULL;
56362+ char *path_fault = NULL;
56363+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
56364+ siginfo_t info = { };
56365+
56366+ if (buffer_exec && buffer_fault) {
56367+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
56368+
56369+ down_read(&mm->mmap_sem);
56370+ vma = mm->mmap;
56371+ while (vma && (!vma_exec || !vma_fault)) {
56372+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
56373+ vma_exec = vma;
56374+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
56375+ vma_fault = vma;
56376+ vma = vma->vm_next;
56377+ }
56378+ if (vma_exec)
56379+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
56380+ if (vma_fault) {
56381+ start = vma_fault->vm_start;
56382+ end = vma_fault->vm_end;
56383+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
56384+ if (vma_fault->vm_file)
56385+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
56386+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
56387+ path_fault = "<heap>";
56388+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
56389+ path_fault = "<stack>";
56390+ else
56391+ path_fault = "<anonymous mapping>";
56392+ }
56393+ up_read(&mm->mmap_sem);
56394+ }
56395+ if (tsk->signal->curr_ip)
56396+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
56397+ else
56398+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
56399+ 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),
56400+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
56401+ free_page((unsigned long)buffer_exec);
56402+ free_page((unsigned long)buffer_fault);
56403+ pax_report_insns(regs, pc, sp);
56404+ info.si_signo = SIGKILL;
56405+ info.si_errno = 0;
56406+ info.si_code = SI_KERNEL;
56407+ info.si_pid = 0;
56408+ info.si_uid = 0;
56409+ do_coredump(&info);
56410+}
56411+#endif
56412+
56413+#ifdef CONFIG_PAX_REFCOUNT
56414+void pax_report_refcount_overflow(struct pt_regs *regs)
56415+{
56416+ if (current->signal->curr_ip)
56417+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
56418+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
56419+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
56420+ else
56421+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
56422+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
56423+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
56424+ preempt_disable();
56425+ show_regs(regs);
56426+ preempt_enable();
56427+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
56428+}
56429+#endif
56430+
56431+#ifdef CONFIG_PAX_USERCOPY
56432+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
56433+static noinline int check_stack_object(const void *obj, unsigned long len)
56434+{
56435+ const void * const stack = task_stack_page(current);
56436+ const void * const stackend = stack + THREAD_SIZE;
56437+
56438+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
56439+ const void *frame = NULL;
56440+ const void *oldframe;
56441+#endif
56442+
56443+ if (obj + len < obj)
56444+ return -1;
56445+
56446+ if (obj + len <= stack || stackend <= obj)
56447+ return 0;
56448+
56449+ if (obj < stack || stackend < obj + len)
56450+ return -1;
56451+
56452+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
56453+ oldframe = __builtin_frame_address(1);
56454+ if (oldframe)
56455+ frame = __builtin_frame_address(2);
56456+ /*
56457+ low ----------------------------------------------> high
56458+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
56459+ ^----------------^
56460+ allow copies only within here
56461+ */
56462+ while (stack <= frame && frame < stackend) {
56463+ /* if obj + len extends past the last frame, this
56464+ check won't pass and the next frame will be 0,
56465+ causing us to bail out and correctly report
56466+ the copy as invalid
56467+ */
56468+ if (obj + len <= frame)
56469+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
56470+ oldframe = frame;
56471+ frame = *(const void * const *)frame;
56472+ }
56473+ return -1;
56474+#else
56475+ return 1;
56476+#endif
56477+}
56478+
56479+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
56480+{
56481+ if (current->signal->curr_ip)
56482+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
56483+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
56484+ else
56485+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
56486+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
56487+ dump_stack();
56488+ gr_handle_kernel_exploit();
56489+ do_group_exit(SIGKILL);
56490+}
56491+#endif
56492+
56493+#ifdef CONFIG_PAX_USERCOPY
56494+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
56495+{
56496+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
56497+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
56498+#ifdef CONFIG_MODULES
56499+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
56500+#else
56501+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
56502+#endif
56503+
56504+#else
56505+ unsigned long textlow = (unsigned long)_stext;
56506+ unsigned long texthigh = (unsigned long)_etext;
56507+
56508+#ifdef CONFIG_X86_64
56509+ /* check against linear mapping as well */
56510+ if (high > (unsigned long)__va(__pa(textlow)) &&
56511+ low <= (unsigned long)__va(__pa(texthigh)))
56512+ return true;
56513+#endif
56514+
56515+#endif
56516+
56517+ if (high <= textlow || low > texthigh)
56518+ return false;
56519+ else
56520+ return true;
56521+}
56522+#endif
56523+
56524+void __check_object_size(const void *ptr, unsigned long n, bool to_user)
56525+{
56526+
56527+#ifdef CONFIG_PAX_USERCOPY
56528+ const char *type;
56529+
56530+ if (!n)
56531+ return;
56532+
56533+ type = check_heap_object(ptr, n);
56534+ if (!type) {
56535+ int ret = check_stack_object(ptr, n);
56536+ if (ret == 1 || ret == 2)
56537+ return;
56538+ if (ret == 0) {
56539+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
56540+ type = "<kernel text>";
56541+ else
56542+ return;
56543+ } else
56544+ type = "<process stack>";
56545+ }
56546+
56547+ pax_report_usercopy(ptr, n, to_user, type);
56548+#endif
56549+
56550+}
56551+EXPORT_SYMBOL(__check_object_size);
56552+
56553+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
56554+void pax_track_stack(void)
56555+{
56556+ unsigned long sp = (unsigned long)&sp;
56557+ if (sp < current_thread_info()->lowest_stack &&
56558+ sp > (unsigned long)task_stack_page(current))
56559+ current_thread_info()->lowest_stack = sp;
56560+}
56561+EXPORT_SYMBOL(pax_track_stack);
56562+#endif
56563+
56564+#ifdef CONFIG_PAX_SIZE_OVERFLOW
56565+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
56566+{
56567+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
56568+ dump_stack();
56569+ do_group_exit(SIGKILL);
56570+}
56571+EXPORT_SYMBOL(report_size_overflow);
56572+#endif
56573diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
56574index 9f9992b..8b59411 100644
56575--- a/fs/ext2/balloc.c
56576+++ b/fs/ext2/balloc.c
56577@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
56578
56579 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
56580 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
56581- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
56582+ if (free_blocks < root_blocks + 1 &&
56583 !uid_eq(sbi->s_resuid, current_fsuid()) &&
56584 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
56585- !in_group_p (sbi->s_resgid))) {
56586+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
56587 return 0;
56588 }
56589 return 1;
56590diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
56591index 2d7557d..14e38f94 100644
56592--- a/fs/ext2/xattr.c
56593+++ b/fs/ext2/xattr.c
56594@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
56595 struct buffer_head *bh = NULL;
56596 struct ext2_xattr_entry *entry;
56597 char *end;
56598- size_t rest = buffer_size;
56599+ size_t rest = buffer_size, total_size = 0;
56600 int error;
56601
56602 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
56603@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
56604 buffer += size;
56605 }
56606 rest -= size;
56607+ total_size += size;
56608 }
56609 }
56610- error = buffer_size - rest; /* total size */
56611+ error = total_size;
56612
56613 cleanup:
56614 brelse(bh);
56615diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
56616index 22548f5..41521d8 100644
56617--- a/fs/ext3/balloc.c
56618+++ b/fs/ext3/balloc.c
56619@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
56620
56621 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
56622 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
56623- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
56624+ if (free_blocks < root_blocks + 1 &&
56625 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
56626 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
56627- !in_group_p (sbi->s_resgid))) {
56628+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
56629 return 0;
56630 }
56631 return 1;
56632diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
56633index b1fc963..881228c 100644
56634--- a/fs/ext3/xattr.c
56635+++ b/fs/ext3/xattr.c
56636@@ -330,7 +330,7 @@ static int
56637 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
56638 char *buffer, size_t buffer_size)
56639 {
56640- size_t rest = buffer_size;
56641+ size_t rest = buffer_size, total_size = 0;
56642
56643 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
56644 const struct xattr_handler *handler =
56645@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
56646 buffer += size;
56647 }
56648 rest -= size;
56649+ total_size += size;
56650 }
56651 }
56652- return buffer_size - rest;
56653+ return total_size;
56654 }
56655
56656 static int
56657diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
56658index dc5d572..4c21f8e 100644
56659--- a/fs/ext4/balloc.c
56660+++ b/fs/ext4/balloc.c
56661@@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
56662 /* Hm, nope. Are (enough) root reserved clusters available? */
56663 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
56664 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
56665- capable(CAP_SYS_RESOURCE) ||
56666- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
56667+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
56668+ capable_nolog(CAP_SYS_RESOURCE)) {
56669
56670 if (free_clusters >= (nclusters + dirty_clusters +
56671 resv_clusters))
56672diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
56673index 745faaa..a072816 100644
56674--- a/fs/ext4/ext4.h
56675+++ b/fs/ext4/ext4.h
56676@@ -1266,19 +1266,19 @@ struct ext4_sb_info {
56677 unsigned long s_mb_last_start;
56678
56679 /* stats for buddy allocator */
56680- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
56681- atomic_t s_bal_success; /* we found long enough chunks */
56682- atomic_t s_bal_allocated; /* in blocks */
56683- atomic_t s_bal_ex_scanned; /* total extents scanned */
56684- atomic_t s_bal_goals; /* goal hits */
56685- atomic_t s_bal_breaks; /* too long searches */
56686- atomic_t s_bal_2orders; /* 2^order hits */
56687+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
56688+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
56689+ atomic_unchecked_t s_bal_allocated; /* in blocks */
56690+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
56691+ atomic_unchecked_t s_bal_goals; /* goal hits */
56692+ atomic_unchecked_t s_bal_breaks; /* too long searches */
56693+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
56694 spinlock_t s_bal_lock;
56695 unsigned long s_mb_buddies_generated;
56696 unsigned long long s_mb_generation_time;
56697- atomic_t s_mb_lost_chunks;
56698- atomic_t s_mb_preallocated;
56699- atomic_t s_mb_discarded;
56700+ atomic_unchecked_t s_mb_lost_chunks;
56701+ atomic_unchecked_t s_mb_preallocated;
56702+ atomic_unchecked_t s_mb_discarded;
56703 atomic_t s_lock_busy;
56704
56705 /* locality groups */
56706diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
56707index 04a5c75..09894fa 100644
56708--- a/fs/ext4/mballoc.c
56709+++ b/fs/ext4/mballoc.c
56710@@ -1880,7 +1880,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
56711 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
56712
56713 if (EXT4_SB(sb)->s_mb_stats)
56714- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
56715+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
56716
56717 break;
56718 }
56719@@ -2189,7 +2189,7 @@ repeat:
56720 ac->ac_status = AC_STATUS_CONTINUE;
56721 ac->ac_flags |= EXT4_MB_HINT_FIRST;
56722 cr = 3;
56723- atomic_inc(&sbi->s_mb_lost_chunks);
56724+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
56725 goto repeat;
56726 }
56727 }
56728@@ -2697,25 +2697,25 @@ int ext4_mb_release(struct super_block *sb)
56729 if (sbi->s_mb_stats) {
56730 ext4_msg(sb, KERN_INFO,
56731 "mballoc: %u blocks %u reqs (%u success)",
56732- atomic_read(&sbi->s_bal_allocated),
56733- atomic_read(&sbi->s_bal_reqs),
56734- atomic_read(&sbi->s_bal_success));
56735+ atomic_read_unchecked(&sbi->s_bal_allocated),
56736+ atomic_read_unchecked(&sbi->s_bal_reqs),
56737+ atomic_read_unchecked(&sbi->s_bal_success));
56738 ext4_msg(sb, KERN_INFO,
56739 "mballoc: %u extents scanned, %u goal hits, "
56740 "%u 2^N hits, %u breaks, %u lost",
56741- atomic_read(&sbi->s_bal_ex_scanned),
56742- atomic_read(&sbi->s_bal_goals),
56743- atomic_read(&sbi->s_bal_2orders),
56744- atomic_read(&sbi->s_bal_breaks),
56745- atomic_read(&sbi->s_mb_lost_chunks));
56746+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
56747+ atomic_read_unchecked(&sbi->s_bal_goals),
56748+ atomic_read_unchecked(&sbi->s_bal_2orders),
56749+ atomic_read_unchecked(&sbi->s_bal_breaks),
56750+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
56751 ext4_msg(sb, KERN_INFO,
56752 "mballoc: %lu generated and it took %Lu",
56753 sbi->s_mb_buddies_generated,
56754 sbi->s_mb_generation_time);
56755 ext4_msg(sb, KERN_INFO,
56756 "mballoc: %u preallocated, %u discarded",
56757- atomic_read(&sbi->s_mb_preallocated),
56758- atomic_read(&sbi->s_mb_discarded));
56759+ atomic_read_unchecked(&sbi->s_mb_preallocated),
56760+ atomic_read_unchecked(&sbi->s_mb_discarded));
56761 }
56762
56763 free_percpu(sbi->s_locality_groups);
56764@@ -3169,16 +3169,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
56765 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
56766
56767 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
56768- atomic_inc(&sbi->s_bal_reqs);
56769- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
56770+ atomic_inc_unchecked(&sbi->s_bal_reqs);
56771+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
56772 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
56773- atomic_inc(&sbi->s_bal_success);
56774- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
56775+ atomic_inc_unchecked(&sbi->s_bal_success);
56776+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
56777 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
56778 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
56779- atomic_inc(&sbi->s_bal_goals);
56780+ atomic_inc_unchecked(&sbi->s_bal_goals);
56781 if (ac->ac_found > sbi->s_mb_max_to_scan)
56782- atomic_inc(&sbi->s_bal_breaks);
56783+ atomic_inc_unchecked(&sbi->s_bal_breaks);
56784 }
56785
56786 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
56787@@ -3583,7 +3583,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
56788 trace_ext4_mb_new_inode_pa(ac, pa);
56789
56790 ext4_mb_use_inode_pa(ac, pa);
56791- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
56792+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
56793
56794 ei = EXT4_I(ac->ac_inode);
56795 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
56796@@ -3643,7 +3643,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
56797 trace_ext4_mb_new_group_pa(ac, pa);
56798
56799 ext4_mb_use_group_pa(ac, pa);
56800- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
56801+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
56802
56803 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
56804 lg = ac->ac_lg;
56805@@ -3732,7 +3732,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
56806 * from the bitmap and continue.
56807 */
56808 }
56809- atomic_add(free, &sbi->s_mb_discarded);
56810+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
56811
56812 return err;
56813 }
56814@@ -3750,7 +3750,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
56815 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
56816 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
56817 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
56818- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
56819+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
56820 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
56821
56822 return 0;
56823diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
56824index 214461e..3614c89 100644
56825--- a/fs/ext4/mmp.c
56826+++ b/fs/ext4/mmp.c
56827@@ -113,7 +113,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
56828 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
56829 const char *function, unsigned int line, const char *msg)
56830 {
56831- __ext4_warning(sb, function, line, msg);
56832+ __ext4_warning(sb, function, line, "%s", msg);
56833 __ext4_warning(sb, function, line,
56834 "MMP failure info: last update time: %llu, last update "
56835 "node: %s, last update device: %s\n",
56836diff --git a/fs/ext4/super.c b/fs/ext4/super.c
56837index b947e0a..c102e3b 100644
56838--- a/fs/ext4/super.c
56839+++ b/fs/ext4/super.c
56840@@ -1251,7 +1251,7 @@ static ext4_fsblk_t get_sb_block(void **data)
56841 }
56842
56843 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
56844-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
56845+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
56846 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
56847
56848 #ifdef CONFIG_QUOTA
56849@@ -2431,7 +2431,7 @@ struct ext4_attr {
56850 int offset;
56851 int deprecated_val;
56852 } u;
56853-};
56854+} __do_const;
56855
56856 static int parse_strtoull(const char *buf,
56857 unsigned long long max, unsigned long long *value)
56858diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
56859index 1423c48..9c0c6dc 100644
56860--- a/fs/ext4/xattr.c
56861+++ b/fs/ext4/xattr.c
56862@@ -381,7 +381,7 @@ static int
56863 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
56864 char *buffer, size_t buffer_size)
56865 {
56866- size_t rest = buffer_size;
56867+ size_t rest = buffer_size, total_size = 0;
56868
56869 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
56870 const struct xattr_handler *handler =
56871@@ -398,9 +398,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
56872 buffer += size;
56873 }
56874 rest -= size;
56875+ total_size += size;
56876 }
56877 }
56878- return buffer_size - rest;
56879+ return total_size;
56880 }
56881
56882 static int
56883diff --git a/fs/fcntl.c b/fs/fcntl.c
56884index 65343c3..9969dcf 100644
56885--- a/fs/fcntl.c
56886+++ b/fs/fcntl.c
56887@@ -107,6 +107,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
56888 if (err)
56889 return err;
56890
56891+ if (gr_handle_chroot_fowner(pid, type))
56892+ return -ENOENT;
56893+ if (gr_check_protected_task_fowner(pid, type))
56894+ return -EACCES;
56895+
56896 f_modown(filp, pid, type, force);
56897 return 0;
56898 }
56899diff --git a/fs/fhandle.c b/fs/fhandle.c
56900index 999ff5c..41f4109 100644
56901--- a/fs/fhandle.c
56902+++ b/fs/fhandle.c
56903@@ -67,8 +67,7 @@ static long do_sys_name_to_handle(struct path *path,
56904 } else
56905 retval = 0;
56906 /* copy the mount id */
56907- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
56908- sizeof(*mnt_id)) ||
56909+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
56910 copy_to_user(ufh, handle,
56911 sizeof(struct file_handle) + handle_bytes))
56912 retval = -EFAULT;
56913diff --git a/fs/file.c b/fs/file.c
56914index 4a78f98..f9a6d25 100644
56915--- a/fs/file.c
56916+++ b/fs/file.c
56917@@ -16,6 +16,7 @@
56918 #include <linux/slab.h>
56919 #include <linux/vmalloc.h>
56920 #include <linux/file.h>
56921+#include <linux/security.h>
56922 #include <linux/fdtable.h>
56923 #include <linux/bitops.h>
56924 #include <linux/interrupt.h>
56925@@ -141,7 +142,7 @@ out:
56926 * Return <0 error code on error; 1 on successful completion.
56927 * The files->file_lock should be held on entry, and will be held on exit.
56928 */
56929-static int expand_fdtable(struct files_struct *files, int nr)
56930+static int expand_fdtable(struct files_struct *files, unsigned int nr)
56931 __releases(files->file_lock)
56932 __acquires(files->file_lock)
56933 {
56934@@ -186,7 +187,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
56935 * expanded and execution may have blocked.
56936 * The files->file_lock should be held on entry, and will be held on exit.
56937 */
56938-static int expand_files(struct files_struct *files, int nr)
56939+static int expand_files(struct files_struct *files, unsigned int nr)
56940 {
56941 struct fdtable *fdt;
56942
56943@@ -828,6 +829,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
56944 if (!file)
56945 return __close_fd(files, fd);
56946
56947+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
56948 if (fd >= rlimit(RLIMIT_NOFILE))
56949 return -EBADF;
56950
56951@@ -854,6 +856,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
56952 if (unlikely(oldfd == newfd))
56953 return -EINVAL;
56954
56955+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
56956 if (newfd >= rlimit(RLIMIT_NOFILE))
56957 return -EBADF;
56958
56959@@ -909,6 +912,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
56960 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
56961 {
56962 int err;
56963+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
56964 if (from >= rlimit(RLIMIT_NOFILE))
56965 return -EINVAL;
56966 err = alloc_fd(from, flags);
56967diff --git a/fs/filesystems.c b/fs/filesystems.c
56968index 92567d9..fcd8cbf 100644
56969--- a/fs/filesystems.c
56970+++ b/fs/filesystems.c
56971@@ -273,7 +273,11 @@ struct file_system_type *get_fs_type(const char *name)
56972 int len = dot ? dot - name : strlen(name);
56973
56974 fs = __get_fs_type(name, len);
56975+#ifdef CONFIG_GRKERNSEC_MODHARDEN
56976+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
56977+#else
56978 if (!fs && (request_module("fs-%.*s", len, name) == 0))
56979+#endif
56980 fs = __get_fs_type(name, len);
56981
56982 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
56983diff --git a/fs/fs_struct.c b/fs/fs_struct.c
56984index d8ac61d..79a36f0 100644
56985--- a/fs/fs_struct.c
56986+++ b/fs/fs_struct.c
56987@@ -4,6 +4,7 @@
56988 #include <linux/path.h>
56989 #include <linux/slab.h>
56990 #include <linux/fs_struct.h>
56991+#include <linux/grsecurity.h>
56992 #include "internal.h"
56993
56994 /*
56995@@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
56996 write_seqcount_begin(&fs->seq);
56997 old_root = fs->root;
56998 fs->root = *path;
56999+ gr_set_chroot_entries(current, path);
57000 write_seqcount_end(&fs->seq);
57001 spin_unlock(&fs->lock);
57002 if (old_root.dentry)
57003@@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
57004 int hits = 0;
57005 spin_lock(&fs->lock);
57006 write_seqcount_begin(&fs->seq);
57007+ /* this root replacement is only done by pivot_root,
57008+ leave grsec's chroot tagging alone for this task
57009+ so that a pivoted root isn't treated as a chroot
57010+ */
57011 hits += replace_path(&fs->root, old_root, new_root);
57012 hits += replace_path(&fs->pwd, old_root, new_root);
57013 write_seqcount_end(&fs->seq);
57014@@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
57015 task_lock(tsk);
57016 spin_lock(&fs->lock);
57017 tsk->fs = NULL;
57018- kill = !--fs->users;
57019+ gr_clear_chroot_entries(tsk);
57020+ kill = !atomic_dec_return(&fs->users);
57021 spin_unlock(&fs->lock);
57022 task_unlock(tsk);
57023 if (kill)
57024@@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
57025 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
57026 /* We don't need to lock fs - think why ;-) */
57027 if (fs) {
57028- fs->users = 1;
57029+ atomic_set(&fs->users, 1);
57030 fs->in_exec = 0;
57031 spin_lock_init(&fs->lock);
57032 seqcount_init(&fs->seq);
57033@@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
57034 spin_lock(&old->lock);
57035 fs->root = old->root;
57036 path_get(&fs->root);
57037+ /* instead of calling gr_set_chroot_entries here,
57038+ we call it from every caller of this function
57039+ */
57040 fs->pwd = old->pwd;
57041 path_get(&fs->pwd);
57042 spin_unlock(&old->lock);
57043@@ -139,8 +149,9 @@ int unshare_fs_struct(void)
57044
57045 task_lock(current);
57046 spin_lock(&fs->lock);
57047- kill = !--fs->users;
57048+ kill = !atomic_dec_return(&fs->users);
57049 current->fs = new_fs;
57050+ gr_set_chroot_entries(current, &new_fs->root);
57051 spin_unlock(&fs->lock);
57052 task_unlock(current);
57053
57054@@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
57055
57056 int current_umask(void)
57057 {
57058- return current->fs->umask;
57059+ return current->fs->umask | gr_acl_umask();
57060 }
57061 EXPORT_SYMBOL(current_umask);
57062
57063 /* to be mentioned only in INIT_TASK */
57064 struct fs_struct init_fs = {
57065- .users = 1,
57066+ .users = ATOMIC_INIT(1),
57067 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
57068 .seq = SEQCNT_ZERO,
57069 .umask = 0022,
57070diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
57071index b2a86e3..37f425a 100644
57072--- a/fs/fscache/cookie.c
57073+++ b/fs/fscache/cookie.c
57074@@ -19,7 +19,7 @@
57075
57076 struct kmem_cache *fscache_cookie_jar;
57077
57078-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
57079+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
57080
57081 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
57082 static int fscache_alloc_object(struct fscache_cache *cache,
57083@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
57084 parent ? (char *) parent->def->name : "<no-parent>",
57085 def->name, netfs_data);
57086
57087- fscache_stat(&fscache_n_acquires);
57088+ fscache_stat_unchecked(&fscache_n_acquires);
57089
57090 /* if there's no parent cookie, then we don't create one here either */
57091 if (!parent) {
57092- fscache_stat(&fscache_n_acquires_null);
57093+ fscache_stat_unchecked(&fscache_n_acquires_null);
57094 _leave(" [no parent]");
57095 return NULL;
57096 }
57097@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
57098 /* allocate and initialise a cookie */
57099 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
57100 if (!cookie) {
57101- fscache_stat(&fscache_n_acquires_oom);
57102+ fscache_stat_unchecked(&fscache_n_acquires_oom);
57103 _leave(" [ENOMEM]");
57104 return NULL;
57105 }
57106@@ -114,13 +114,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
57107
57108 switch (cookie->def->type) {
57109 case FSCACHE_COOKIE_TYPE_INDEX:
57110- fscache_stat(&fscache_n_cookie_index);
57111+ fscache_stat_unchecked(&fscache_n_cookie_index);
57112 break;
57113 case FSCACHE_COOKIE_TYPE_DATAFILE:
57114- fscache_stat(&fscache_n_cookie_data);
57115+ fscache_stat_unchecked(&fscache_n_cookie_data);
57116 break;
57117 default:
57118- fscache_stat(&fscache_n_cookie_special);
57119+ fscache_stat_unchecked(&fscache_n_cookie_special);
57120 break;
57121 }
57122
57123@@ -131,13 +131,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
57124 if (fscache_acquire_non_index_cookie(cookie) < 0) {
57125 atomic_dec(&parent->n_children);
57126 __fscache_cookie_put(cookie);
57127- fscache_stat(&fscache_n_acquires_nobufs);
57128+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
57129 _leave(" = NULL");
57130 return NULL;
57131 }
57132 }
57133
57134- fscache_stat(&fscache_n_acquires_ok);
57135+ fscache_stat_unchecked(&fscache_n_acquires_ok);
57136 _leave(" = %p", cookie);
57137 return cookie;
57138 }
57139@@ -173,7 +173,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
57140 cache = fscache_select_cache_for_object(cookie->parent);
57141 if (!cache) {
57142 up_read(&fscache_addremove_sem);
57143- fscache_stat(&fscache_n_acquires_no_cache);
57144+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
57145 _leave(" = -ENOMEDIUM [no cache]");
57146 return -ENOMEDIUM;
57147 }
57148@@ -259,14 +259,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
57149 object = cache->ops->alloc_object(cache, cookie);
57150 fscache_stat_d(&fscache_n_cop_alloc_object);
57151 if (IS_ERR(object)) {
57152- fscache_stat(&fscache_n_object_no_alloc);
57153+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
57154 ret = PTR_ERR(object);
57155 goto error;
57156 }
57157
57158- fscache_stat(&fscache_n_object_alloc);
57159+ fscache_stat_unchecked(&fscache_n_object_alloc);
57160
57161- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
57162+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
57163
57164 _debug("ALLOC OBJ%x: %s {%lx}",
57165 object->debug_id, cookie->def->name, object->events);
57166@@ -380,7 +380,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
57167
57168 _enter("{%s}", cookie->def->name);
57169
57170- fscache_stat(&fscache_n_invalidates);
57171+ fscache_stat_unchecked(&fscache_n_invalidates);
57172
57173 /* Only permit invalidation of data files. Invalidating an index will
57174 * require the caller to release all its attachments to the tree rooted
57175@@ -438,10 +438,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
57176 {
57177 struct fscache_object *object;
57178
57179- fscache_stat(&fscache_n_updates);
57180+ fscache_stat_unchecked(&fscache_n_updates);
57181
57182 if (!cookie) {
57183- fscache_stat(&fscache_n_updates_null);
57184+ fscache_stat_unchecked(&fscache_n_updates_null);
57185 _leave(" [no cookie]");
57186 return;
57187 }
57188@@ -473,12 +473,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
57189 {
57190 struct fscache_object *object;
57191
57192- fscache_stat(&fscache_n_relinquishes);
57193+ fscache_stat_unchecked(&fscache_n_relinquishes);
57194 if (retire)
57195- fscache_stat(&fscache_n_relinquishes_retire);
57196+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
57197
57198 if (!cookie) {
57199- fscache_stat(&fscache_n_relinquishes_null);
57200+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
57201 _leave(" [no cookie]");
57202 return;
57203 }
57204@@ -598,7 +598,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
57205 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
57206 goto inconsistent;
57207
57208- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
57209+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
57210
57211 atomic_inc(&cookie->n_active);
57212 if (fscache_submit_op(object, op) < 0)
57213diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
57214index 4226f66..0fb3f45 100644
57215--- a/fs/fscache/internal.h
57216+++ b/fs/fscache/internal.h
57217@@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
57218 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
57219 extern int fscache_wait_for_operation_activation(struct fscache_object *,
57220 struct fscache_operation *,
57221- atomic_t *,
57222- atomic_t *,
57223+ atomic_unchecked_t *,
57224+ atomic_unchecked_t *,
57225 void (*)(struct fscache_operation *));
57226 extern void fscache_invalidate_writes(struct fscache_cookie *);
57227
57228@@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
57229 * stats.c
57230 */
57231 #ifdef CONFIG_FSCACHE_STATS
57232-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
57233-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
57234+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
57235+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
57236
57237-extern atomic_t fscache_n_op_pend;
57238-extern atomic_t fscache_n_op_run;
57239-extern atomic_t fscache_n_op_enqueue;
57240-extern atomic_t fscache_n_op_deferred_release;
57241-extern atomic_t fscache_n_op_release;
57242-extern atomic_t fscache_n_op_gc;
57243-extern atomic_t fscache_n_op_cancelled;
57244-extern atomic_t fscache_n_op_rejected;
57245+extern atomic_unchecked_t fscache_n_op_pend;
57246+extern atomic_unchecked_t fscache_n_op_run;
57247+extern atomic_unchecked_t fscache_n_op_enqueue;
57248+extern atomic_unchecked_t fscache_n_op_deferred_release;
57249+extern atomic_unchecked_t fscache_n_op_release;
57250+extern atomic_unchecked_t fscache_n_op_gc;
57251+extern atomic_unchecked_t fscache_n_op_cancelled;
57252+extern atomic_unchecked_t fscache_n_op_rejected;
57253
57254-extern atomic_t fscache_n_attr_changed;
57255-extern atomic_t fscache_n_attr_changed_ok;
57256-extern atomic_t fscache_n_attr_changed_nobufs;
57257-extern atomic_t fscache_n_attr_changed_nomem;
57258-extern atomic_t fscache_n_attr_changed_calls;
57259+extern atomic_unchecked_t fscache_n_attr_changed;
57260+extern atomic_unchecked_t fscache_n_attr_changed_ok;
57261+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
57262+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
57263+extern atomic_unchecked_t fscache_n_attr_changed_calls;
57264
57265-extern atomic_t fscache_n_allocs;
57266-extern atomic_t fscache_n_allocs_ok;
57267-extern atomic_t fscache_n_allocs_wait;
57268-extern atomic_t fscache_n_allocs_nobufs;
57269-extern atomic_t fscache_n_allocs_intr;
57270-extern atomic_t fscache_n_allocs_object_dead;
57271-extern atomic_t fscache_n_alloc_ops;
57272-extern atomic_t fscache_n_alloc_op_waits;
57273+extern atomic_unchecked_t fscache_n_allocs;
57274+extern atomic_unchecked_t fscache_n_allocs_ok;
57275+extern atomic_unchecked_t fscache_n_allocs_wait;
57276+extern atomic_unchecked_t fscache_n_allocs_nobufs;
57277+extern atomic_unchecked_t fscache_n_allocs_intr;
57278+extern atomic_unchecked_t fscache_n_allocs_object_dead;
57279+extern atomic_unchecked_t fscache_n_alloc_ops;
57280+extern atomic_unchecked_t fscache_n_alloc_op_waits;
57281
57282-extern atomic_t fscache_n_retrievals;
57283-extern atomic_t fscache_n_retrievals_ok;
57284-extern atomic_t fscache_n_retrievals_wait;
57285-extern atomic_t fscache_n_retrievals_nodata;
57286-extern atomic_t fscache_n_retrievals_nobufs;
57287-extern atomic_t fscache_n_retrievals_intr;
57288-extern atomic_t fscache_n_retrievals_nomem;
57289-extern atomic_t fscache_n_retrievals_object_dead;
57290-extern atomic_t fscache_n_retrieval_ops;
57291-extern atomic_t fscache_n_retrieval_op_waits;
57292+extern atomic_unchecked_t fscache_n_retrievals;
57293+extern atomic_unchecked_t fscache_n_retrievals_ok;
57294+extern atomic_unchecked_t fscache_n_retrievals_wait;
57295+extern atomic_unchecked_t fscache_n_retrievals_nodata;
57296+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
57297+extern atomic_unchecked_t fscache_n_retrievals_intr;
57298+extern atomic_unchecked_t fscache_n_retrievals_nomem;
57299+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
57300+extern atomic_unchecked_t fscache_n_retrieval_ops;
57301+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
57302
57303-extern atomic_t fscache_n_stores;
57304-extern atomic_t fscache_n_stores_ok;
57305-extern atomic_t fscache_n_stores_again;
57306-extern atomic_t fscache_n_stores_nobufs;
57307-extern atomic_t fscache_n_stores_oom;
57308-extern atomic_t fscache_n_store_ops;
57309-extern atomic_t fscache_n_store_calls;
57310-extern atomic_t fscache_n_store_pages;
57311-extern atomic_t fscache_n_store_radix_deletes;
57312-extern atomic_t fscache_n_store_pages_over_limit;
57313+extern atomic_unchecked_t fscache_n_stores;
57314+extern atomic_unchecked_t fscache_n_stores_ok;
57315+extern atomic_unchecked_t fscache_n_stores_again;
57316+extern atomic_unchecked_t fscache_n_stores_nobufs;
57317+extern atomic_unchecked_t fscache_n_stores_oom;
57318+extern atomic_unchecked_t fscache_n_store_ops;
57319+extern atomic_unchecked_t fscache_n_store_calls;
57320+extern atomic_unchecked_t fscache_n_store_pages;
57321+extern atomic_unchecked_t fscache_n_store_radix_deletes;
57322+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
57323
57324-extern atomic_t fscache_n_store_vmscan_not_storing;
57325-extern atomic_t fscache_n_store_vmscan_gone;
57326-extern atomic_t fscache_n_store_vmscan_busy;
57327-extern atomic_t fscache_n_store_vmscan_cancelled;
57328-extern atomic_t fscache_n_store_vmscan_wait;
57329+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
57330+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
57331+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
57332+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
57333+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
57334
57335-extern atomic_t fscache_n_marks;
57336-extern atomic_t fscache_n_uncaches;
57337+extern atomic_unchecked_t fscache_n_marks;
57338+extern atomic_unchecked_t fscache_n_uncaches;
57339
57340-extern atomic_t fscache_n_acquires;
57341-extern atomic_t fscache_n_acquires_null;
57342-extern atomic_t fscache_n_acquires_no_cache;
57343-extern atomic_t fscache_n_acquires_ok;
57344-extern atomic_t fscache_n_acquires_nobufs;
57345-extern atomic_t fscache_n_acquires_oom;
57346+extern atomic_unchecked_t fscache_n_acquires;
57347+extern atomic_unchecked_t fscache_n_acquires_null;
57348+extern atomic_unchecked_t fscache_n_acquires_no_cache;
57349+extern atomic_unchecked_t fscache_n_acquires_ok;
57350+extern atomic_unchecked_t fscache_n_acquires_nobufs;
57351+extern atomic_unchecked_t fscache_n_acquires_oom;
57352
57353-extern atomic_t fscache_n_invalidates;
57354-extern atomic_t fscache_n_invalidates_run;
57355+extern atomic_unchecked_t fscache_n_invalidates;
57356+extern atomic_unchecked_t fscache_n_invalidates_run;
57357
57358-extern atomic_t fscache_n_updates;
57359-extern atomic_t fscache_n_updates_null;
57360-extern atomic_t fscache_n_updates_run;
57361+extern atomic_unchecked_t fscache_n_updates;
57362+extern atomic_unchecked_t fscache_n_updates_null;
57363+extern atomic_unchecked_t fscache_n_updates_run;
57364
57365-extern atomic_t fscache_n_relinquishes;
57366-extern atomic_t fscache_n_relinquishes_null;
57367-extern atomic_t fscache_n_relinquishes_waitcrt;
57368-extern atomic_t fscache_n_relinquishes_retire;
57369+extern atomic_unchecked_t fscache_n_relinquishes;
57370+extern atomic_unchecked_t fscache_n_relinquishes_null;
57371+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
57372+extern atomic_unchecked_t fscache_n_relinquishes_retire;
57373
57374-extern atomic_t fscache_n_cookie_index;
57375-extern atomic_t fscache_n_cookie_data;
57376-extern atomic_t fscache_n_cookie_special;
57377+extern atomic_unchecked_t fscache_n_cookie_index;
57378+extern atomic_unchecked_t fscache_n_cookie_data;
57379+extern atomic_unchecked_t fscache_n_cookie_special;
57380
57381-extern atomic_t fscache_n_object_alloc;
57382-extern atomic_t fscache_n_object_no_alloc;
57383-extern atomic_t fscache_n_object_lookups;
57384-extern atomic_t fscache_n_object_lookups_negative;
57385-extern atomic_t fscache_n_object_lookups_positive;
57386-extern atomic_t fscache_n_object_lookups_timed_out;
57387-extern atomic_t fscache_n_object_created;
57388-extern atomic_t fscache_n_object_avail;
57389-extern atomic_t fscache_n_object_dead;
57390+extern atomic_unchecked_t fscache_n_object_alloc;
57391+extern atomic_unchecked_t fscache_n_object_no_alloc;
57392+extern atomic_unchecked_t fscache_n_object_lookups;
57393+extern atomic_unchecked_t fscache_n_object_lookups_negative;
57394+extern atomic_unchecked_t fscache_n_object_lookups_positive;
57395+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
57396+extern atomic_unchecked_t fscache_n_object_created;
57397+extern atomic_unchecked_t fscache_n_object_avail;
57398+extern atomic_unchecked_t fscache_n_object_dead;
57399
57400-extern atomic_t fscache_n_checkaux_none;
57401-extern atomic_t fscache_n_checkaux_okay;
57402-extern atomic_t fscache_n_checkaux_update;
57403-extern atomic_t fscache_n_checkaux_obsolete;
57404+extern atomic_unchecked_t fscache_n_checkaux_none;
57405+extern atomic_unchecked_t fscache_n_checkaux_okay;
57406+extern atomic_unchecked_t fscache_n_checkaux_update;
57407+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
57408
57409 extern atomic_t fscache_n_cop_alloc_object;
57410 extern atomic_t fscache_n_cop_lookup_object;
57411@@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
57412 atomic_inc(stat);
57413 }
57414
57415+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
57416+{
57417+ atomic_inc_unchecked(stat);
57418+}
57419+
57420 static inline void fscache_stat_d(atomic_t *stat)
57421 {
57422 atomic_dec(stat);
57423@@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
57424
57425 #define __fscache_stat(stat) (NULL)
57426 #define fscache_stat(stat) do {} while (0)
57427+#define fscache_stat_unchecked(stat) do {} while (0)
57428 #define fscache_stat_d(stat) do {} while (0)
57429 #endif
57430
57431diff --git a/fs/fscache/object.c b/fs/fscache/object.c
57432index 86d75a6..5f3d7a0 100644
57433--- a/fs/fscache/object.c
57434+++ b/fs/fscache/object.c
57435@@ -451,7 +451,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
57436 _debug("LOOKUP \"%s\" in \"%s\"",
57437 cookie->def->name, object->cache->tag->name);
57438
57439- fscache_stat(&fscache_n_object_lookups);
57440+ fscache_stat_unchecked(&fscache_n_object_lookups);
57441 fscache_stat(&fscache_n_cop_lookup_object);
57442 ret = object->cache->ops->lookup_object(object);
57443 fscache_stat_d(&fscache_n_cop_lookup_object);
57444@@ -461,7 +461,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
57445 if (ret == -ETIMEDOUT) {
57446 /* probably stuck behind another object, so move this one to
57447 * the back of the queue */
57448- fscache_stat(&fscache_n_object_lookups_timed_out);
57449+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
57450 _leave(" [timeout]");
57451 return NO_TRANSIT;
57452 }
57453@@ -489,7 +489,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
57454 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
57455
57456 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
57457- fscache_stat(&fscache_n_object_lookups_negative);
57458+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
57459
57460 /* Allow write requests to begin stacking up and read requests to begin
57461 * returning ENODATA.
57462@@ -523,7 +523,7 @@ void fscache_obtained_object(struct fscache_object *object)
57463 /* if we were still looking up, then we must have a positive lookup
57464 * result, in which case there may be data available */
57465 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
57466- fscache_stat(&fscache_n_object_lookups_positive);
57467+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
57468
57469 /* We do (presumably) have data */
57470 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
57471@@ -534,7 +534,7 @@ void fscache_obtained_object(struct fscache_object *object)
57472 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
57473 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
57474 } else {
57475- fscache_stat(&fscache_n_object_created);
57476+ fscache_stat_unchecked(&fscache_n_object_created);
57477 }
57478
57479 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
57480@@ -570,7 +570,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
57481 fscache_stat_d(&fscache_n_cop_lookup_complete);
57482
57483 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
57484- fscache_stat(&fscache_n_object_avail);
57485+ fscache_stat_unchecked(&fscache_n_object_avail);
57486
57487 _leave("");
57488 return transit_to(JUMPSTART_DEPS);
57489@@ -716,7 +716,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
57490
57491 /* this just shifts the object release to the work processor */
57492 fscache_put_object(object);
57493- fscache_stat(&fscache_n_object_dead);
57494+ fscache_stat_unchecked(&fscache_n_object_dead);
57495
57496 _leave("");
57497 return transit_to(OBJECT_DEAD);
57498@@ -881,7 +881,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
57499 enum fscache_checkaux result;
57500
57501 if (!object->cookie->def->check_aux) {
57502- fscache_stat(&fscache_n_checkaux_none);
57503+ fscache_stat_unchecked(&fscache_n_checkaux_none);
57504 return FSCACHE_CHECKAUX_OKAY;
57505 }
57506
57507@@ -890,17 +890,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
57508 switch (result) {
57509 /* entry okay as is */
57510 case FSCACHE_CHECKAUX_OKAY:
57511- fscache_stat(&fscache_n_checkaux_okay);
57512+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
57513 break;
57514
57515 /* entry requires update */
57516 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
57517- fscache_stat(&fscache_n_checkaux_update);
57518+ fscache_stat_unchecked(&fscache_n_checkaux_update);
57519 break;
57520
57521 /* entry requires deletion */
57522 case FSCACHE_CHECKAUX_OBSOLETE:
57523- fscache_stat(&fscache_n_checkaux_obsolete);
57524+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
57525 break;
57526
57527 default:
57528@@ -986,7 +986,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
57529 {
57530 const struct fscache_state *s;
57531
57532- fscache_stat(&fscache_n_invalidates_run);
57533+ fscache_stat_unchecked(&fscache_n_invalidates_run);
57534 fscache_stat(&fscache_n_cop_invalidate_object);
57535 s = _fscache_invalidate_object(object, event);
57536 fscache_stat_d(&fscache_n_cop_invalidate_object);
57537@@ -1001,7 +1001,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
57538 {
57539 _enter("{OBJ%x},%d", object->debug_id, event);
57540
57541- fscache_stat(&fscache_n_updates_run);
57542+ fscache_stat_unchecked(&fscache_n_updates_run);
57543 fscache_stat(&fscache_n_cop_update_object);
57544 object->cache->ops->update_object(object);
57545 fscache_stat_d(&fscache_n_cop_update_object);
57546diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
57547index 318071a..379938b 100644
57548--- a/fs/fscache/operation.c
57549+++ b/fs/fscache/operation.c
57550@@ -17,7 +17,7 @@
57551 #include <linux/slab.h>
57552 #include "internal.h"
57553
57554-atomic_t fscache_op_debug_id;
57555+atomic_unchecked_t fscache_op_debug_id;
57556 EXPORT_SYMBOL(fscache_op_debug_id);
57557
57558 /**
57559@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
57560 ASSERTCMP(atomic_read(&op->usage), >, 0);
57561 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
57562
57563- fscache_stat(&fscache_n_op_enqueue);
57564+ fscache_stat_unchecked(&fscache_n_op_enqueue);
57565 switch (op->flags & FSCACHE_OP_TYPE) {
57566 case FSCACHE_OP_ASYNC:
57567 _debug("queue async");
57568@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
57569 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
57570 if (op->processor)
57571 fscache_enqueue_operation(op);
57572- fscache_stat(&fscache_n_op_run);
57573+ fscache_stat_unchecked(&fscache_n_op_run);
57574 }
57575
57576 /*
57577@@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
57578 if (object->n_in_progress > 0) {
57579 atomic_inc(&op->usage);
57580 list_add_tail(&op->pend_link, &object->pending_ops);
57581- fscache_stat(&fscache_n_op_pend);
57582+ fscache_stat_unchecked(&fscache_n_op_pend);
57583 } else if (!list_empty(&object->pending_ops)) {
57584 atomic_inc(&op->usage);
57585 list_add_tail(&op->pend_link, &object->pending_ops);
57586- fscache_stat(&fscache_n_op_pend);
57587+ fscache_stat_unchecked(&fscache_n_op_pend);
57588 fscache_start_operations(object);
57589 } else {
57590 ASSERTCMP(object->n_in_progress, ==, 0);
57591@@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
57592 object->n_exclusive++; /* reads and writes must wait */
57593 atomic_inc(&op->usage);
57594 list_add_tail(&op->pend_link, &object->pending_ops);
57595- fscache_stat(&fscache_n_op_pend);
57596+ fscache_stat_unchecked(&fscache_n_op_pend);
57597 ret = 0;
57598 } else {
57599 /* If we're in any other state, there must have been an I/O
57600@@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
57601 if (object->n_exclusive > 0) {
57602 atomic_inc(&op->usage);
57603 list_add_tail(&op->pend_link, &object->pending_ops);
57604- fscache_stat(&fscache_n_op_pend);
57605+ fscache_stat_unchecked(&fscache_n_op_pend);
57606 } else if (!list_empty(&object->pending_ops)) {
57607 atomic_inc(&op->usage);
57608 list_add_tail(&op->pend_link, &object->pending_ops);
57609- fscache_stat(&fscache_n_op_pend);
57610+ fscache_stat_unchecked(&fscache_n_op_pend);
57611 fscache_start_operations(object);
57612 } else {
57613 ASSERTCMP(object->n_exclusive, ==, 0);
57614@@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
57615 object->n_ops++;
57616 atomic_inc(&op->usage);
57617 list_add_tail(&op->pend_link, &object->pending_ops);
57618- fscache_stat(&fscache_n_op_pend);
57619+ fscache_stat_unchecked(&fscache_n_op_pend);
57620 ret = 0;
57621 } else if (fscache_object_is_dying(object)) {
57622- fscache_stat(&fscache_n_op_rejected);
57623+ fscache_stat_unchecked(&fscache_n_op_rejected);
57624 op->state = FSCACHE_OP_ST_CANCELLED;
57625 ret = -ENOBUFS;
57626 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
57627@@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
57628 ret = -EBUSY;
57629 if (op->state == FSCACHE_OP_ST_PENDING) {
57630 ASSERT(!list_empty(&op->pend_link));
57631- fscache_stat(&fscache_n_op_cancelled);
57632+ fscache_stat_unchecked(&fscache_n_op_cancelled);
57633 list_del_init(&op->pend_link);
57634 if (do_cancel)
57635 do_cancel(op);
57636@@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
57637 while (!list_empty(&object->pending_ops)) {
57638 op = list_entry(object->pending_ops.next,
57639 struct fscache_operation, pend_link);
57640- fscache_stat(&fscache_n_op_cancelled);
57641+ fscache_stat_unchecked(&fscache_n_op_cancelled);
57642 list_del_init(&op->pend_link);
57643
57644 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
57645@@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
57646 op->state, ==, FSCACHE_OP_ST_CANCELLED);
57647 op->state = FSCACHE_OP_ST_DEAD;
57648
57649- fscache_stat(&fscache_n_op_release);
57650+ fscache_stat_unchecked(&fscache_n_op_release);
57651
57652 if (op->release) {
57653 op->release(op);
57654@@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
57655 * lock, and defer it otherwise */
57656 if (!spin_trylock(&object->lock)) {
57657 _debug("defer put");
57658- fscache_stat(&fscache_n_op_deferred_release);
57659+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
57660
57661 cache = object->cache;
57662 spin_lock(&cache->op_gc_list_lock);
57663@@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
57664
57665 _debug("GC DEFERRED REL OBJ%x OP%x",
57666 object->debug_id, op->debug_id);
57667- fscache_stat(&fscache_n_op_gc);
57668+ fscache_stat_unchecked(&fscache_n_op_gc);
57669
57670 ASSERTCMP(atomic_read(&op->usage), ==, 0);
57671 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
57672diff --git a/fs/fscache/page.c b/fs/fscache/page.c
57673index 73899c1..ae40c58 100644
57674--- a/fs/fscache/page.c
57675+++ b/fs/fscache/page.c
57676@@ -61,7 +61,7 @@ try_again:
57677 val = radix_tree_lookup(&cookie->stores, page->index);
57678 if (!val) {
57679 rcu_read_unlock();
57680- fscache_stat(&fscache_n_store_vmscan_not_storing);
57681+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
57682 __fscache_uncache_page(cookie, page);
57683 return true;
57684 }
57685@@ -91,11 +91,11 @@ try_again:
57686 spin_unlock(&cookie->stores_lock);
57687
57688 if (xpage) {
57689- fscache_stat(&fscache_n_store_vmscan_cancelled);
57690- fscache_stat(&fscache_n_store_radix_deletes);
57691+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
57692+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
57693 ASSERTCMP(xpage, ==, page);
57694 } else {
57695- fscache_stat(&fscache_n_store_vmscan_gone);
57696+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
57697 }
57698
57699 wake_up_bit(&cookie->flags, 0);
57700@@ -110,11 +110,11 @@ page_busy:
57701 * sleeping on memory allocation, so we may need to impose a timeout
57702 * too. */
57703 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
57704- fscache_stat(&fscache_n_store_vmscan_busy);
57705+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
57706 return false;
57707 }
57708
57709- fscache_stat(&fscache_n_store_vmscan_wait);
57710+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
57711 __fscache_wait_on_page_write(cookie, page);
57712 gfp &= ~__GFP_WAIT;
57713 goto try_again;
57714@@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
57715 FSCACHE_COOKIE_STORING_TAG);
57716 if (!radix_tree_tag_get(&cookie->stores, page->index,
57717 FSCACHE_COOKIE_PENDING_TAG)) {
57718- fscache_stat(&fscache_n_store_radix_deletes);
57719+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
57720 xpage = radix_tree_delete(&cookie->stores, page->index);
57721 }
57722 spin_unlock(&cookie->stores_lock);
57723@@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
57724
57725 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
57726
57727- fscache_stat(&fscache_n_attr_changed_calls);
57728+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
57729
57730 if (fscache_object_is_active(object) &&
57731 fscache_use_cookie(object)) {
57732@@ -189,11 +189,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57733
57734 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
57735
57736- fscache_stat(&fscache_n_attr_changed);
57737+ fscache_stat_unchecked(&fscache_n_attr_changed);
57738
57739 op = kzalloc(sizeof(*op), GFP_KERNEL);
57740 if (!op) {
57741- fscache_stat(&fscache_n_attr_changed_nomem);
57742+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
57743 _leave(" = -ENOMEM");
57744 return -ENOMEM;
57745 }
57746@@ -211,7 +211,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57747 if (fscache_submit_exclusive_op(object, op) < 0)
57748 goto nobufs;
57749 spin_unlock(&cookie->lock);
57750- fscache_stat(&fscache_n_attr_changed_ok);
57751+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
57752 fscache_put_operation(op);
57753 _leave(" = 0");
57754 return 0;
57755@@ -219,7 +219,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57756 nobufs:
57757 spin_unlock(&cookie->lock);
57758 kfree(op);
57759- fscache_stat(&fscache_n_attr_changed_nobufs);
57760+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
57761 _leave(" = %d", -ENOBUFS);
57762 return -ENOBUFS;
57763 }
57764@@ -258,7 +258,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
57765 /* allocate a retrieval operation and attempt to submit it */
57766 op = kzalloc(sizeof(*op), GFP_NOIO);
57767 if (!op) {
57768- fscache_stat(&fscache_n_retrievals_nomem);
57769+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57770 return NULL;
57771 }
57772
57773@@ -289,13 +289,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
57774 return 0;
57775 }
57776
57777- fscache_stat(&fscache_n_retrievals_wait);
57778+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
57779
57780 jif = jiffies;
57781 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
57782 fscache_wait_bit_interruptible,
57783 TASK_INTERRUPTIBLE) != 0) {
57784- fscache_stat(&fscache_n_retrievals_intr);
57785+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
57786 _leave(" = -ERESTARTSYS");
57787 return -ERESTARTSYS;
57788 }
57789@@ -324,8 +324,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
57790 */
57791 int fscache_wait_for_operation_activation(struct fscache_object *object,
57792 struct fscache_operation *op,
57793- atomic_t *stat_op_waits,
57794- atomic_t *stat_object_dead,
57795+ atomic_unchecked_t *stat_op_waits,
57796+ atomic_unchecked_t *stat_object_dead,
57797 void (*do_cancel)(struct fscache_operation *))
57798 {
57799 int ret;
57800@@ -335,7 +335,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
57801
57802 _debug(">>> WT");
57803 if (stat_op_waits)
57804- fscache_stat(stat_op_waits);
57805+ fscache_stat_unchecked(stat_op_waits);
57806 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
57807 fscache_wait_bit_interruptible,
57808 TASK_INTERRUPTIBLE) != 0) {
57809@@ -353,7 +353,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
57810 check_if_dead:
57811 if (op->state == FSCACHE_OP_ST_CANCELLED) {
57812 if (stat_object_dead)
57813- fscache_stat(stat_object_dead);
57814+ fscache_stat_unchecked(stat_object_dead);
57815 _leave(" = -ENOBUFS [cancelled]");
57816 return -ENOBUFS;
57817 }
57818@@ -361,7 +361,7 @@ check_if_dead:
57819 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
57820 fscache_cancel_op(op, do_cancel);
57821 if (stat_object_dead)
57822- fscache_stat(stat_object_dead);
57823+ fscache_stat_unchecked(stat_object_dead);
57824 return -ENOBUFS;
57825 }
57826 return 0;
57827@@ -388,7 +388,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57828
57829 _enter("%p,%p,,,", cookie, page);
57830
57831- fscache_stat(&fscache_n_retrievals);
57832+ fscache_stat_unchecked(&fscache_n_retrievals);
57833
57834 if (hlist_empty(&cookie->backing_objects))
57835 goto nobufs;
57836@@ -428,7 +428,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57837 goto nobufs_unlock_dec;
57838 spin_unlock(&cookie->lock);
57839
57840- fscache_stat(&fscache_n_retrieval_ops);
57841+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
57842
57843 /* pin the netfs read context in case we need to do the actual netfs
57844 * read because we've encountered a cache read failure */
57845@@ -459,15 +459,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57846
57847 error:
57848 if (ret == -ENOMEM)
57849- fscache_stat(&fscache_n_retrievals_nomem);
57850+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57851 else if (ret == -ERESTARTSYS)
57852- fscache_stat(&fscache_n_retrievals_intr);
57853+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
57854 else if (ret == -ENODATA)
57855- fscache_stat(&fscache_n_retrievals_nodata);
57856+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
57857 else if (ret < 0)
57858- fscache_stat(&fscache_n_retrievals_nobufs);
57859+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57860 else
57861- fscache_stat(&fscache_n_retrievals_ok);
57862+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
57863
57864 fscache_put_retrieval(op);
57865 _leave(" = %d", ret);
57866@@ -480,7 +480,7 @@ nobufs_unlock:
57867 atomic_dec(&cookie->n_active);
57868 kfree(op);
57869 nobufs:
57870- fscache_stat(&fscache_n_retrievals_nobufs);
57871+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57872 _leave(" = -ENOBUFS");
57873 return -ENOBUFS;
57874 }
57875@@ -518,7 +518,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57876
57877 _enter("%p,,%d,,,", cookie, *nr_pages);
57878
57879- fscache_stat(&fscache_n_retrievals);
57880+ fscache_stat_unchecked(&fscache_n_retrievals);
57881
57882 if (hlist_empty(&cookie->backing_objects))
57883 goto nobufs;
57884@@ -554,7 +554,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57885 goto nobufs_unlock_dec;
57886 spin_unlock(&cookie->lock);
57887
57888- fscache_stat(&fscache_n_retrieval_ops);
57889+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
57890
57891 /* pin the netfs read context in case we need to do the actual netfs
57892 * read because we've encountered a cache read failure */
57893@@ -585,15 +585,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57894
57895 error:
57896 if (ret == -ENOMEM)
57897- fscache_stat(&fscache_n_retrievals_nomem);
57898+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57899 else if (ret == -ERESTARTSYS)
57900- fscache_stat(&fscache_n_retrievals_intr);
57901+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
57902 else if (ret == -ENODATA)
57903- fscache_stat(&fscache_n_retrievals_nodata);
57904+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
57905 else if (ret < 0)
57906- fscache_stat(&fscache_n_retrievals_nobufs);
57907+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57908 else
57909- fscache_stat(&fscache_n_retrievals_ok);
57910+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
57911
57912 fscache_put_retrieval(op);
57913 _leave(" = %d", ret);
57914@@ -606,7 +606,7 @@ nobufs_unlock:
57915 atomic_dec(&cookie->n_active);
57916 kfree(op);
57917 nobufs:
57918- fscache_stat(&fscache_n_retrievals_nobufs);
57919+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57920 _leave(" = -ENOBUFS");
57921 return -ENOBUFS;
57922 }
57923@@ -630,7 +630,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57924
57925 _enter("%p,%p,,,", cookie, page);
57926
57927- fscache_stat(&fscache_n_allocs);
57928+ fscache_stat_unchecked(&fscache_n_allocs);
57929
57930 if (hlist_empty(&cookie->backing_objects))
57931 goto nobufs;
57932@@ -662,7 +662,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57933 goto nobufs_unlock;
57934 spin_unlock(&cookie->lock);
57935
57936- fscache_stat(&fscache_n_alloc_ops);
57937+ fscache_stat_unchecked(&fscache_n_alloc_ops);
57938
57939 ret = fscache_wait_for_operation_activation(
57940 object, &op->op,
57941@@ -679,11 +679,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57942
57943 error:
57944 if (ret == -ERESTARTSYS)
57945- fscache_stat(&fscache_n_allocs_intr);
57946+ fscache_stat_unchecked(&fscache_n_allocs_intr);
57947 else if (ret < 0)
57948- fscache_stat(&fscache_n_allocs_nobufs);
57949+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
57950 else
57951- fscache_stat(&fscache_n_allocs_ok);
57952+ fscache_stat_unchecked(&fscache_n_allocs_ok);
57953
57954 fscache_put_retrieval(op);
57955 _leave(" = %d", ret);
57956@@ -694,7 +694,7 @@ nobufs_unlock:
57957 atomic_dec(&cookie->n_active);
57958 kfree(op);
57959 nobufs:
57960- fscache_stat(&fscache_n_allocs_nobufs);
57961+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
57962 _leave(" = -ENOBUFS");
57963 return -ENOBUFS;
57964 }
57965@@ -770,7 +770,7 @@ static void fscache_write_op(struct fscache_operation *_op)
57966
57967 spin_lock(&cookie->stores_lock);
57968
57969- fscache_stat(&fscache_n_store_calls);
57970+ fscache_stat_unchecked(&fscache_n_store_calls);
57971
57972 /* find a page to store */
57973 page = NULL;
57974@@ -781,7 +781,7 @@ static void fscache_write_op(struct fscache_operation *_op)
57975 page = results[0];
57976 _debug("gang %d [%lx]", n, page->index);
57977 if (page->index > op->store_limit) {
57978- fscache_stat(&fscache_n_store_pages_over_limit);
57979+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
57980 goto superseded;
57981 }
57982
57983@@ -793,7 +793,7 @@ static void fscache_write_op(struct fscache_operation *_op)
57984 spin_unlock(&cookie->stores_lock);
57985 spin_unlock(&object->lock);
57986
57987- fscache_stat(&fscache_n_store_pages);
57988+ fscache_stat_unchecked(&fscache_n_store_pages);
57989 fscache_stat(&fscache_n_cop_write_page);
57990 ret = object->cache->ops->write_page(op, page);
57991 fscache_stat_d(&fscache_n_cop_write_page);
57992@@ -896,7 +896,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
57993 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
57994 ASSERT(PageFsCache(page));
57995
57996- fscache_stat(&fscache_n_stores);
57997+ fscache_stat_unchecked(&fscache_n_stores);
57998
57999 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
58000 _leave(" = -ENOBUFS [invalidating]");
58001@@ -954,7 +954,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58002 spin_unlock(&cookie->stores_lock);
58003 spin_unlock(&object->lock);
58004
58005- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
58006+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
58007 op->store_limit = object->store_limit;
58008
58009 atomic_inc(&cookie->n_active);
58010@@ -963,8 +963,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58011
58012 spin_unlock(&cookie->lock);
58013 radix_tree_preload_end();
58014- fscache_stat(&fscache_n_store_ops);
58015- fscache_stat(&fscache_n_stores_ok);
58016+ fscache_stat_unchecked(&fscache_n_store_ops);
58017+ fscache_stat_unchecked(&fscache_n_stores_ok);
58018
58019 /* the work queue now carries its own ref on the object */
58020 fscache_put_operation(&op->op);
58021@@ -972,14 +972,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58022 return 0;
58023
58024 already_queued:
58025- fscache_stat(&fscache_n_stores_again);
58026+ fscache_stat_unchecked(&fscache_n_stores_again);
58027 already_pending:
58028 spin_unlock(&cookie->stores_lock);
58029 spin_unlock(&object->lock);
58030 spin_unlock(&cookie->lock);
58031 radix_tree_preload_end();
58032 kfree(op);
58033- fscache_stat(&fscache_n_stores_ok);
58034+ fscache_stat_unchecked(&fscache_n_stores_ok);
58035 _leave(" = 0");
58036 return 0;
58037
58038@@ -999,14 +999,14 @@ nobufs:
58039 spin_unlock(&cookie->lock);
58040 radix_tree_preload_end();
58041 kfree(op);
58042- fscache_stat(&fscache_n_stores_nobufs);
58043+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
58044 _leave(" = -ENOBUFS");
58045 return -ENOBUFS;
58046
58047 nomem_free:
58048 kfree(op);
58049 nomem:
58050- fscache_stat(&fscache_n_stores_oom);
58051+ fscache_stat_unchecked(&fscache_n_stores_oom);
58052 _leave(" = -ENOMEM");
58053 return -ENOMEM;
58054 }
58055@@ -1024,7 +1024,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
58056 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
58057 ASSERTCMP(page, !=, NULL);
58058
58059- fscache_stat(&fscache_n_uncaches);
58060+ fscache_stat_unchecked(&fscache_n_uncaches);
58061
58062 /* cache withdrawal may beat us to it */
58063 if (!PageFsCache(page))
58064@@ -1075,7 +1075,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
58065 struct fscache_cookie *cookie = op->op.object->cookie;
58066
58067 #ifdef CONFIG_FSCACHE_STATS
58068- atomic_inc(&fscache_n_marks);
58069+ atomic_inc_unchecked(&fscache_n_marks);
58070 #endif
58071
58072 _debug("- mark %p{%lx}", page, page->index);
58073diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
58074index 40d13c7..ddf52b9 100644
58075--- a/fs/fscache/stats.c
58076+++ b/fs/fscache/stats.c
58077@@ -18,99 +18,99 @@
58078 /*
58079 * operation counters
58080 */
58081-atomic_t fscache_n_op_pend;
58082-atomic_t fscache_n_op_run;
58083-atomic_t fscache_n_op_enqueue;
58084-atomic_t fscache_n_op_requeue;
58085-atomic_t fscache_n_op_deferred_release;
58086-atomic_t fscache_n_op_release;
58087-atomic_t fscache_n_op_gc;
58088-atomic_t fscache_n_op_cancelled;
58089-atomic_t fscache_n_op_rejected;
58090+atomic_unchecked_t fscache_n_op_pend;
58091+atomic_unchecked_t fscache_n_op_run;
58092+atomic_unchecked_t fscache_n_op_enqueue;
58093+atomic_unchecked_t fscache_n_op_requeue;
58094+atomic_unchecked_t fscache_n_op_deferred_release;
58095+atomic_unchecked_t fscache_n_op_release;
58096+atomic_unchecked_t fscache_n_op_gc;
58097+atomic_unchecked_t fscache_n_op_cancelled;
58098+atomic_unchecked_t fscache_n_op_rejected;
58099
58100-atomic_t fscache_n_attr_changed;
58101-atomic_t fscache_n_attr_changed_ok;
58102-atomic_t fscache_n_attr_changed_nobufs;
58103-atomic_t fscache_n_attr_changed_nomem;
58104-atomic_t fscache_n_attr_changed_calls;
58105+atomic_unchecked_t fscache_n_attr_changed;
58106+atomic_unchecked_t fscache_n_attr_changed_ok;
58107+atomic_unchecked_t fscache_n_attr_changed_nobufs;
58108+atomic_unchecked_t fscache_n_attr_changed_nomem;
58109+atomic_unchecked_t fscache_n_attr_changed_calls;
58110
58111-atomic_t fscache_n_allocs;
58112-atomic_t fscache_n_allocs_ok;
58113-atomic_t fscache_n_allocs_wait;
58114-atomic_t fscache_n_allocs_nobufs;
58115-atomic_t fscache_n_allocs_intr;
58116-atomic_t fscache_n_allocs_object_dead;
58117-atomic_t fscache_n_alloc_ops;
58118-atomic_t fscache_n_alloc_op_waits;
58119+atomic_unchecked_t fscache_n_allocs;
58120+atomic_unchecked_t fscache_n_allocs_ok;
58121+atomic_unchecked_t fscache_n_allocs_wait;
58122+atomic_unchecked_t fscache_n_allocs_nobufs;
58123+atomic_unchecked_t fscache_n_allocs_intr;
58124+atomic_unchecked_t fscache_n_allocs_object_dead;
58125+atomic_unchecked_t fscache_n_alloc_ops;
58126+atomic_unchecked_t fscache_n_alloc_op_waits;
58127
58128-atomic_t fscache_n_retrievals;
58129-atomic_t fscache_n_retrievals_ok;
58130-atomic_t fscache_n_retrievals_wait;
58131-atomic_t fscache_n_retrievals_nodata;
58132-atomic_t fscache_n_retrievals_nobufs;
58133-atomic_t fscache_n_retrievals_intr;
58134-atomic_t fscache_n_retrievals_nomem;
58135-atomic_t fscache_n_retrievals_object_dead;
58136-atomic_t fscache_n_retrieval_ops;
58137-atomic_t fscache_n_retrieval_op_waits;
58138+atomic_unchecked_t fscache_n_retrievals;
58139+atomic_unchecked_t fscache_n_retrievals_ok;
58140+atomic_unchecked_t fscache_n_retrievals_wait;
58141+atomic_unchecked_t fscache_n_retrievals_nodata;
58142+atomic_unchecked_t fscache_n_retrievals_nobufs;
58143+atomic_unchecked_t fscache_n_retrievals_intr;
58144+atomic_unchecked_t fscache_n_retrievals_nomem;
58145+atomic_unchecked_t fscache_n_retrievals_object_dead;
58146+atomic_unchecked_t fscache_n_retrieval_ops;
58147+atomic_unchecked_t fscache_n_retrieval_op_waits;
58148
58149-atomic_t fscache_n_stores;
58150-atomic_t fscache_n_stores_ok;
58151-atomic_t fscache_n_stores_again;
58152-atomic_t fscache_n_stores_nobufs;
58153-atomic_t fscache_n_stores_oom;
58154-atomic_t fscache_n_store_ops;
58155-atomic_t fscache_n_store_calls;
58156-atomic_t fscache_n_store_pages;
58157-atomic_t fscache_n_store_radix_deletes;
58158-atomic_t fscache_n_store_pages_over_limit;
58159+atomic_unchecked_t fscache_n_stores;
58160+atomic_unchecked_t fscache_n_stores_ok;
58161+atomic_unchecked_t fscache_n_stores_again;
58162+atomic_unchecked_t fscache_n_stores_nobufs;
58163+atomic_unchecked_t fscache_n_stores_oom;
58164+atomic_unchecked_t fscache_n_store_ops;
58165+atomic_unchecked_t fscache_n_store_calls;
58166+atomic_unchecked_t fscache_n_store_pages;
58167+atomic_unchecked_t fscache_n_store_radix_deletes;
58168+atomic_unchecked_t fscache_n_store_pages_over_limit;
58169
58170-atomic_t fscache_n_store_vmscan_not_storing;
58171-atomic_t fscache_n_store_vmscan_gone;
58172-atomic_t fscache_n_store_vmscan_busy;
58173-atomic_t fscache_n_store_vmscan_cancelled;
58174-atomic_t fscache_n_store_vmscan_wait;
58175+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
58176+atomic_unchecked_t fscache_n_store_vmscan_gone;
58177+atomic_unchecked_t fscache_n_store_vmscan_busy;
58178+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
58179+atomic_unchecked_t fscache_n_store_vmscan_wait;
58180
58181-atomic_t fscache_n_marks;
58182-atomic_t fscache_n_uncaches;
58183+atomic_unchecked_t fscache_n_marks;
58184+atomic_unchecked_t fscache_n_uncaches;
58185
58186-atomic_t fscache_n_acquires;
58187-atomic_t fscache_n_acquires_null;
58188-atomic_t fscache_n_acquires_no_cache;
58189-atomic_t fscache_n_acquires_ok;
58190-atomic_t fscache_n_acquires_nobufs;
58191-atomic_t fscache_n_acquires_oom;
58192+atomic_unchecked_t fscache_n_acquires;
58193+atomic_unchecked_t fscache_n_acquires_null;
58194+atomic_unchecked_t fscache_n_acquires_no_cache;
58195+atomic_unchecked_t fscache_n_acquires_ok;
58196+atomic_unchecked_t fscache_n_acquires_nobufs;
58197+atomic_unchecked_t fscache_n_acquires_oom;
58198
58199-atomic_t fscache_n_invalidates;
58200-atomic_t fscache_n_invalidates_run;
58201+atomic_unchecked_t fscache_n_invalidates;
58202+atomic_unchecked_t fscache_n_invalidates_run;
58203
58204-atomic_t fscache_n_updates;
58205-atomic_t fscache_n_updates_null;
58206-atomic_t fscache_n_updates_run;
58207+atomic_unchecked_t fscache_n_updates;
58208+atomic_unchecked_t fscache_n_updates_null;
58209+atomic_unchecked_t fscache_n_updates_run;
58210
58211-atomic_t fscache_n_relinquishes;
58212-atomic_t fscache_n_relinquishes_null;
58213-atomic_t fscache_n_relinquishes_waitcrt;
58214-atomic_t fscache_n_relinquishes_retire;
58215+atomic_unchecked_t fscache_n_relinquishes;
58216+atomic_unchecked_t fscache_n_relinquishes_null;
58217+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
58218+atomic_unchecked_t fscache_n_relinquishes_retire;
58219
58220-atomic_t fscache_n_cookie_index;
58221-atomic_t fscache_n_cookie_data;
58222-atomic_t fscache_n_cookie_special;
58223+atomic_unchecked_t fscache_n_cookie_index;
58224+atomic_unchecked_t fscache_n_cookie_data;
58225+atomic_unchecked_t fscache_n_cookie_special;
58226
58227-atomic_t fscache_n_object_alloc;
58228-atomic_t fscache_n_object_no_alloc;
58229-atomic_t fscache_n_object_lookups;
58230-atomic_t fscache_n_object_lookups_negative;
58231-atomic_t fscache_n_object_lookups_positive;
58232-atomic_t fscache_n_object_lookups_timed_out;
58233-atomic_t fscache_n_object_created;
58234-atomic_t fscache_n_object_avail;
58235-atomic_t fscache_n_object_dead;
58236+atomic_unchecked_t fscache_n_object_alloc;
58237+atomic_unchecked_t fscache_n_object_no_alloc;
58238+atomic_unchecked_t fscache_n_object_lookups;
58239+atomic_unchecked_t fscache_n_object_lookups_negative;
58240+atomic_unchecked_t fscache_n_object_lookups_positive;
58241+atomic_unchecked_t fscache_n_object_lookups_timed_out;
58242+atomic_unchecked_t fscache_n_object_created;
58243+atomic_unchecked_t fscache_n_object_avail;
58244+atomic_unchecked_t fscache_n_object_dead;
58245
58246-atomic_t fscache_n_checkaux_none;
58247-atomic_t fscache_n_checkaux_okay;
58248-atomic_t fscache_n_checkaux_update;
58249-atomic_t fscache_n_checkaux_obsolete;
58250+atomic_unchecked_t fscache_n_checkaux_none;
58251+atomic_unchecked_t fscache_n_checkaux_okay;
58252+atomic_unchecked_t fscache_n_checkaux_update;
58253+atomic_unchecked_t fscache_n_checkaux_obsolete;
58254
58255 atomic_t fscache_n_cop_alloc_object;
58256 atomic_t fscache_n_cop_lookup_object;
58257@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
58258 seq_puts(m, "FS-Cache statistics\n");
58259
58260 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
58261- atomic_read(&fscache_n_cookie_index),
58262- atomic_read(&fscache_n_cookie_data),
58263- atomic_read(&fscache_n_cookie_special));
58264+ atomic_read_unchecked(&fscache_n_cookie_index),
58265+ atomic_read_unchecked(&fscache_n_cookie_data),
58266+ atomic_read_unchecked(&fscache_n_cookie_special));
58267
58268 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
58269- atomic_read(&fscache_n_object_alloc),
58270- atomic_read(&fscache_n_object_no_alloc),
58271- atomic_read(&fscache_n_object_avail),
58272- atomic_read(&fscache_n_object_dead));
58273+ atomic_read_unchecked(&fscache_n_object_alloc),
58274+ atomic_read_unchecked(&fscache_n_object_no_alloc),
58275+ atomic_read_unchecked(&fscache_n_object_avail),
58276+ atomic_read_unchecked(&fscache_n_object_dead));
58277 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
58278- atomic_read(&fscache_n_checkaux_none),
58279- atomic_read(&fscache_n_checkaux_okay),
58280- atomic_read(&fscache_n_checkaux_update),
58281- atomic_read(&fscache_n_checkaux_obsolete));
58282+ atomic_read_unchecked(&fscache_n_checkaux_none),
58283+ atomic_read_unchecked(&fscache_n_checkaux_okay),
58284+ atomic_read_unchecked(&fscache_n_checkaux_update),
58285+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
58286
58287 seq_printf(m, "Pages : mrk=%u unc=%u\n",
58288- atomic_read(&fscache_n_marks),
58289- atomic_read(&fscache_n_uncaches));
58290+ atomic_read_unchecked(&fscache_n_marks),
58291+ atomic_read_unchecked(&fscache_n_uncaches));
58292
58293 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
58294 " oom=%u\n",
58295- atomic_read(&fscache_n_acquires),
58296- atomic_read(&fscache_n_acquires_null),
58297- atomic_read(&fscache_n_acquires_no_cache),
58298- atomic_read(&fscache_n_acquires_ok),
58299- atomic_read(&fscache_n_acquires_nobufs),
58300- atomic_read(&fscache_n_acquires_oom));
58301+ atomic_read_unchecked(&fscache_n_acquires),
58302+ atomic_read_unchecked(&fscache_n_acquires_null),
58303+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
58304+ atomic_read_unchecked(&fscache_n_acquires_ok),
58305+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
58306+ atomic_read_unchecked(&fscache_n_acquires_oom));
58307
58308 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
58309- atomic_read(&fscache_n_object_lookups),
58310- atomic_read(&fscache_n_object_lookups_negative),
58311- atomic_read(&fscache_n_object_lookups_positive),
58312- atomic_read(&fscache_n_object_created),
58313- atomic_read(&fscache_n_object_lookups_timed_out));
58314+ atomic_read_unchecked(&fscache_n_object_lookups),
58315+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
58316+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
58317+ atomic_read_unchecked(&fscache_n_object_created),
58318+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
58319
58320 seq_printf(m, "Invals : n=%u run=%u\n",
58321- atomic_read(&fscache_n_invalidates),
58322- atomic_read(&fscache_n_invalidates_run));
58323+ atomic_read_unchecked(&fscache_n_invalidates),
58324+ atomic_read_unchecked(&fscache_n_invalidates_run));
58325
58326 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
58327- atomic_read(&fscache_n_updates),
58328- atomic_read(&fscache_n_updates_null),
58329- atomic_read(&fscache_n_updates_run));
58330+ atomic_read_unchecked(&fscache_n_updates),
58331+ atomic_read_unchecked(&fscache_n_updates_null),
58332+ atomic_read_unchecked(&fscache_n_updates_run));
58333
58334 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
58335- atomic_read(&fscache_n_relinquishes),
58336- atomic_read(&fscache_n_relinquishes_null),
58337- atomic_read(&fscache_n_relinquishes_waitcrt),
58338- atomic_read(&fscache_n_relinquishes_retire));
58339+ atomic_read_unchecked(&fscache_n_relinquishes),
58340+ atomic_read_unchecked(&fscache_n_relinquishes_null),
58341+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
58342+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
58343
58344 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
58345- atomic_read(&fscache_n_attr_changed),
58346- atomic_read(&fscache_n_attr_changed_ok),
58347- atomic_read(&fscache_n_attr_changed_nobufs),
58348- atomic_read(&fscache_n_attr_changed_nomem),
58349- atomic_read(&fscache_n_attr_changed_calls));
58350+ atomic_read_unchecked(&fscache_n_attr_changed),
58351+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
58352+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
58353+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
58354+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
58355
58356 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
58357- atomic_read(&fscache_n_allocs),
58358- atomic_read(&fscache_n_allocs_ok),
58359- atomic_read(&fscache_n_allocs_wait),
58360- atomic_read(&fscache_n_allocs_nobufs),
58361- atomic_read(&fscache_n_allocs_intr));
58362+ atomic_read_unchecked(&fscache_n_allocs),
58363+ atomic_read_unchecked(&fscache_n_allocs_ok),
58364+ atomic_read_unchecked(&fscache_n_allocs_wait),
58365+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
58366+ atomic_read_unchecked(&fscache_n_allocs_intr));
58367 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
58368- atomic_read(&fscache_n_alloc_ops),
58369- atomic_read(&fscache_n_alloc_op_waits),
58370- atomic_read(&fscache_n_allocs_object_dead));
58371+ atomic_read_unchecked(&fscache_n_alloc_ops),
58372+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
58373+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
58374
58375 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
58376 " int=%u oom=%u\n",
58377- atomic_read(&fscache_n_retrievals),
58378- atomic_read(&fscache_n_retrievals_ok),
58379- atomic_read(&fscache_n_retrievals_wait),
58380- atomic_read(&fscache_n_retrievals_nodata),
58381- atomic_read(&fscache_n_retrievals_nobufs),
58382- atomic_read(&fscache_n_retrievals_intr),
58383- atomic_read(&fscache_n_retrievals_nomem));
58384+ atomic_read_unchecked(&fscache_n_retrievals),
58385+ atomic_read_unchecked(&fscache_n_retrievals_ok),
58386+ atomic_read_unchecked(&fscache_n_retrievals_wait),
58387+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
58388+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
58389+ atomic_read_unchecked(&fscache_n_retrievals_intr),
58390+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
58391 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
58392- atomic_read(&fscache_n_retrieval_ops),
58393- atomic_read(&fscache_n_retrieval_op_waits),
58394- atomic_read(&fscache_n_retrievals_object_dead));
58395+ atomic_read_unchecked(&fscache_n_retrieval_ops),
58396+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
58397+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
58398
58399 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
58400- atomic_read(&fscache_n_stores),
58401- atomic_read(&fscache_n_stores_ok),
58402- atomic_read(&fscache_n_stores_again),
58403- atomic_read(&fscache_n_stores_nobufs),
58404- atomic_read(&fscache_n_stores_oom));
58405+ atomic_read_unchecked(&fscache_n_stores),
58406+ atomic_read_unchecked(&fscache_n_stores_ok),
58407+ atomic_read_unchecked(&fscache_n_stores_again),
58408+ atomic_read_unchecked(&fscache_n_stores_nobufs),
58409+ atomic_read_unchecked(&fscache_n_stores_oom));
58410 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
58411- atomic_read(&fscache_n_store_ops),
58412- atomic_read(&fscache_n_store_calls),
58413- atomic_read(&fscache_n_store_pages),
58414- atomic_read(&fscache_n_store_radix_deletes),
58415- atomic_read(&fscache_n_store_pages_over_limit));
58416+ atomic_read_unchecked(&fscache_n_store_ops),
58417+ atomic_read_unchecked(&fscache_n_store_calls),
58418+ atomic_read_unchecked(&fscache_n_store_pages),
58419+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
58420+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
58421
58422 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
58423- atomic_read(&fscache_n_store_vmscan_not_storing),
58424- atomic_read(&fscache_n_store_vmscan_gone),
58425- atomic_read(&fscache_n_store_vmscan_busy),
58426- atomic_read(&fscache_n_store_vmscan_cancelled),
58427- atomic_read(&fscache_n_store_vmscan_wait));
58428+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
58429+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
58430+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
58431+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
58432+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
58433
58434 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
58435- atomic_read(&fscache_n_op_pend),
58436- atomic_read(&fscache_n_op_run),
58437- atomic_read(&fscache_n_op_enqueue),
58438- atomic_read(&fscache_n_op_cancelled),
58439- atomic_read(&fscache_n_op_rejected));
58440+ atomic_read_unchecked(&fscache_n_op_pend),
58441+ atomic_read_unchecked(&fscache_n_op_run),
58442+ atomic_read_unchecked(&fscache_n_op_enqueue),
58443+ atomic_read_unchecked(&fscache_n_op_cancelled),
58444+ atomic_read_unchecked(&fscache_n_op_rejected));
58445 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
58446- atomic_read(&fscache_n_op_deferred_release),
58447- atomic_read(&fscache_n_op_release),
58448- atomic_read(&fscache_n_op_gc));
58449+ atomic_read_unchecked(&fscache_n_op_deferred_release),
58450+ atomic_read_unchecked(&fscache_n_op_release),
58451+ atomic_read_unchecked(&fscache_n_op_gc));
58452
58453 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
58454 atomic_read(&fscache_n_cop_alloc_object),
58455diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
58456index adbfd66..4b25822 100644
58457--- a/fs/fuse/cuse.c
58458+++ b/fs/fuse/cuse.c
58459@@ -603,10 +603,12 @@ static int __init cuse_init(void)
58460 INIT_LIST_HEAD(&cuse_conntbl[i]);
58461
58462 /* inherit and extend fuse_dev_operations */
58463- cuse_channel_fops = fuse_dev_operations;
58464- cuse_channel_fops.owner = THIS_MODULE;
58465- cuse_channel_fops.open = cuse_channel_open;
58466- cuse_channel_fops.release = cuse_channel_release;
58467+ pax_open_kernel();
58468+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
58469+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
58470+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
58471+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
58472+ pax_close_kernel();
58473
58474 cuse_class = class_create(THIS_MODULE, "cuse");
58475 if (IS_ERR(cuse_class))
58476diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
58477index ef74ad5..c9ac759e 100644
58478--- a/fs/fuse/dev.c
58479+++ b/fs/fuse/dev.c
58480@@ -1339,7 +1339,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
58481 ret = 0;
58482 pipe_lock(pipe);
58483
58484- if (!pipe->readers) {
58485+ if (!atomic_read(&pipe->readers)) {
58486 send_sig(SIGPIPE, current, 0);
58487 if (!ret)
58488 ret = -EPIPE;
58489@@ -1364,7 +1364,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
58490 page_nr++;
58491 ret += buf->len;
58492
58493- if (pipe->files)
58494+ if (atomic_read(&pipe->files))
58495 do_wakeup = 1;
58496 }
58497
58498diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
58499index b7989f2..1f72ec4 100644
58500--- a/fs/fuse/dir.c
58501+++ b/fs/fuse/dir.c
58502@@ -1438,7 +1438,7 @@ static char *read_link(struct dentry *dentry)
58503 return link;
58504 }
58505
58506-static void free_link(char *link)
58507+static void free_link(const char *link)
58508 {
58509 if (!IS_ERR(link))
58510 free_page((unsigned long) link);
58511diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
58512index 1298766..c964c60 100644
58513--- a/fs/gfs2/inode.c
58514+++ b/fs/gfs2/inode.c
58515@@ -1515,7 +1515,7 @@ out:
58516
58517 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58518 {
58519- char *s = nd_get_link(nd);
58520+ const char *s = nd_get_link(nd);
58521 if (!IS_ERR(s))
58522 kfree(s);
58523 }
58524diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
58525index 2543728..14d7bd4 100644
58526--- a/fs/hostfs/hostfs_kern.c
58527+++ b/fs/hostfs/hostfs_kern.c
58528@@ -904,7 +904,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58529
58530 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
58531 {
58532- char *s = nd_get_link(nd);
58533+ const char *s = nd_get_link(nd);
58534 if (!IS_ERR(s))
58535 __putname(s);
58536 }
58537diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
58538index d19b30a..ef89c36 100644
58539--- a/fs/hugetlbfs/inode.c
58540+++ b/fs/hugetlbfs/inode.c
58541@@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
58542 struct mm_struct *mm = current->mm;
58543 struct vm_area_struct *vma;
58544 struct hstate *h = hstate_file(file);
58545+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
58546 struct vm_unmapped_area_info info;
58547
58548 if (len & ~huge_page_mask(h))
58549@@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
58550 return addr;
58551 }
58552
58553+#ifdef CONFIG_PAX_RANDMMAP
58554+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
58555+#endif
58556+
58557 if (addr) {
58558 addr = ALIGN(addr, huge_page_size(h));
58559 vma = find_vma(mm, addr);
58560- if (TASK_SIZE - len >= addr &&
58561- (!vma || addr + len <= vma->vm_start))
58562+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
58563 return addr;
58564 }
58565
58566 info.flags = 0;
58567 info.length = len;
58568 info.low_limit = TASK_UNMAPPED_BASE;
58569+
58570+#ifdef CONFIG_PAX_RANDMMAP
58571+ if (mm->pax_flags & MF_PAX_RANDMMAP)
58572+ info.low_limit += mm->delta_mmap;
58573+#endif
58574+
58575 info.high_limit = TASK_SIZE;
58576 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
58577 info.align_offset = 0;
58578@@ -908,7 +918,7 @@ static struct file_system_type hugetlbfs_fs_type = {
58579 };
58580 MODULE_ALIAS_FS("hugetlbfs");
58581
58582-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
58583+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
58584
58585 static int can_do_hugetlb_shm(void)
58586 {
58587diff --git a/fs/inode.c b/fs/inode.c
58588index b33ba8e..3c79a47 100644
58589--- a/fs/inode.c
58590+++ b/fs/inode.c
58591@@ -849,8 +849,8 @@ unsigned int get_next_ino(void)
58592
58593 #ifdef CONFIG_SMP
58594 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
58595- static atomic_t shared_last_ino;
58596- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
58597+ static atomic_unchecked_t shared_last_ino;
58598+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
58599
58600 res = next - LAST_INO_BATCH;
58601 }
58602diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
58603index 4a6cf28..d3a29d3 100644
58604--- a/fs/jffs2/erase.c
58605+++ b/fs/jffs2/erase.c
58606@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
58607 struct jffs2_unknown_node marker = {
58608 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
58609 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
58610- .totlen = cpu_to_je32(c->cleanmarker_size)
58611+ .totlen = cpu_to_je32(c->cleanmarker_size),
58612+ .hdr_crc = cpu_to_je32(0)
58613 };
58614
58615 jffs2_prealloc_raw_node_refs(c, jeb, 1);
58616diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
58617index a6597d6..41b30ec 100644
58618--- a/fs/jffs2/wbuf.c
58619+++ b/fs/jffs2/wbuf.c
58620@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
58621 {
58622 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
58623 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
58624- .totlen = constant_cpu_to_je32(8)
58625+ .totlen = constant_cpu_to_je32(8),
58626+ .hdr_crc = constant_cpu_to_je32(0)
58627 };
58628
58629 /*
58630diff --git a/fs/jfs/super.c b/fs/jfs/super.c
58631index 6669aa2..36b033d 100644
58632--- a/fs/jfs/super.c
58633+++ b/fs/jfs/super.c
58634@@ -882,7 +882,7 @@ static int __init init_jfs_fs(void)
58635
58636 jfs_inode_cachep =
58637 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
58638- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
58639+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
58640 init_once);
58641 if (jfs_inode_cachep == NULL)
58642 return -ENOMEM;
58643diff --git a/fs/libfs.c b/fs/libfs.c
58644index 193e0c2..7404665 100644
58645--- a/fs/libfs.c
58646+++ b/fs/libfs.c
58647@@ -150,6 +150,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
58648
58649 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
58650 struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
58651+ char d_name[sizeof(next->d_iname)];
58652+ const unsigned char *name;
58653+
58654 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
58655 if (!simple_positive(next)) {
58656 spin_unlock(&next->d_lock);
58657@@ -158,7 +161,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
58658
58659 spin_unlock(&next->d_lock);
58660 spin_unlock(&dentry->d_lock);
58661- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
58662+ name = next->d_name.name;
58663+ if (name == next->d_iname) {
58664+ memcpy(d_name, name, next->d_name.len);
58665+ name = d_name;
58666+ }
58667+ if (!dir_emit(ctx, name, next->d_name.len,
58668 next->d_inode->i_ino, dt_type(next->d_inode)))
58669 return 0;
58670 spin_lock(&dentry->d_lock);
58671diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
58672index acd3947..1f896e2 100644
58673--- a/fs/lockd/clntproc.c
58674+++ b/fs/lockd/clntproc.c
58675@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
58676 /*
58677 * Cookie counter for NLM requests
58678 */
58679-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
58680+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
58681
58682 void nlmclnt_next_cookie(struct nlm_cookie *c)
58683 {
58684- u32 cookie = atomic_inc_return(&nlm_cookie);
58685+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
58686
58687 memcpy(c->data, &cookie, 4);
58688 c->len=4;
58689diff --git a/fs/locks.c b/fs/locks.c
58690index b27a300..4156d0b 100644
58691--- a/fs/locks.c
58692+++ b/fs/locks.c
58693@@ -2183,16 +2183,16 @@ void locks_remove_flock(struct file *filp)
58694 return;
58695
58696 if (filp->f_op && filp->f_op->flock) {
58697- struct file_lock fl = {
58698+ struct file_lock flock = {
58699 .fl_pid = current->tgid,
58700 .fl_file = filp,
58701 .fl_flags = FL_FLOCK,
58702 .fl_type = F_UNLCK,
58703 .fl_end = OFFSET_MAX,
58704 };
58705- filp->f_op->flock(filp, F_SETLKW, &fl);
58706- if (fl.fl_ops && fl.fl_ops->fl_release_private)
58707- fl.fl_ops->fl_release_private(&fl);
58708+ filp->f_op->flock(filp, F_SETLKW, &flock);
58709+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
58710+ flock.fl_ops->fl_release_private(&flock);
58711 }
58712
58713 spin_lock(&inode->i_lock);
58714diff --git a/fs/namei.c b/fs/namei.c
58715index 23ac50f..c6757a5 100644
58716--- a/fs/namei.c
58717+++ b/fs/namei.c
58718@@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask)
58719 if (ret != -EACCES)
58720 return ret;
58721
58722+#ifdef CONFIG_GRKERNSEC
58723+ /* we'll block if we have to log due to a denied capability use */
58724+ if (mask & MAY_NOT_BLOCK)
58725+ return -ECHILD;
58726+#endif
58727+
58728 if (S_ISDIR(inode->i_mode)) {
58729 /* DACs are overridable for directories */
58730- if (inode_capable(inode, CAP_DAC_OVERRIDE))
58731- return 0;
58732 if (!(mask & MAY_WRITE))
58733- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
58734+ if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
58735+ inode_capable(inode, CAP_DAC_READ_SEARCH))
58736 return 0;
58737+ if (inode_capable(inode, CAP_DAC_OVERRIDE))
58738+ return 0;
58739 return -EACCES;
58740 }
58741 /*
58742+ * Searching includes executable on directories, else just read.
58743+ */
58744+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
58745+ if (mask == MAY_READ)
58746+ if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
58747+ inode_capable(inode, CAP_DAC_READ_SEARCH))
58748+ return 0;
58749+
58750+ /*
58751 * Read/write DACs are always overridable.
58752 * Executable DACs are overridable when there is
58753 * at least one exec bit set.
58754@@ -337,14 +353,6 @@ int generic_permission(struct inode *inode, int mask)
58755 if (inode_capable(inode, CAP_DAC_OVERRIDE))
58756 return 0;
58757
58758- /*
58759- * Searching includes executable on directories, else just read.
58760- */
58761- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
58762- if (mask == MAY_READ)
58763- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
58764- return 0;
58765-
58766 return -EACCES;
58767 }
58768
58769@@ -821,7 +829,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
58770 {
58771 struct dentry *dentry = link->dentry;
58772 int error;
58773- char *s;
58774+ const char *s;
58775
58776 BUG_ON(nd->flags & LOOKUP_RCU);
58777
58778@@ -842,6 +850,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
58779 if (error)
58780 goto out_put_nd_path;
58781
58782+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
58783+ dentry->d_inode, dentry, nd->path.mnt)) {
58784+ error = -EACCES;
58785+ goto out_put_nd_path;
58786+ }
58787+
58788 nd->last_type = LAST_BIND;
58789 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
58790 error = PTR_ERR(*p);
58791@@ -1602,6 +1616,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
58792 if (res)
58793 break;
58794 res = walk_component(nd, path, LOOKUP_FOLLOW);
58795+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
58796+ res = -EACCES;
58797 put_link(nd, &link, cookie);
58798 } while (res > 0);
58799
58800@@ -1700,7 +1716,7 @@ EXPORT_SYMBOL(full_name_hash);
58801 static inline unsigned long hash_name(const char *name, unsigned int *hashp)
58802 {
58803 unsigned long a, b, adata, bdata, mask, hash, len;
58804- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
58805+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
58806
58807 hash = a = 0;
58808 len = -sizeof(unsigned long);
58809@@ -1981,6 +1997,8 @@ static int path_lookupat(int dfd, const char *name,
58810 if (err)
58811 break;
58812 err = lookup_last(nd, &path);
58813+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
58814+ err = -EACCES;
58815 put_link(nd, &link, cookie);
58816 }
58817 }
58818@@ -1988,6 +2006,13 @@ static int path_lookupat(int dfd, const char *name,
58819 if (!err)
58820 err = complete_walk(nd);
58821
58822+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
58823+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
58824+ path_put(&nd->path);
58825+ err = -ENOENT;
58826+ }
58827+ }
58828+
58829 if (!err && nd->flags & LOOKUP_DIRECTORY) {
58830 if (!can_lookup(nd->inode)) {
58831 path_put(&nd->path);
58832@@ -2015,8 +2040,15 @@ static int filename_lookup(int dfd, struct filename *name,
58833 retval = path_lookupat(dfd, name->name,
58834 flags | LOOKUP_REVAL, nd);
58835
58836- if (likely(!retval))
58837+ if (likely(!retval)) {
58838 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
58839+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
58840+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
58841+ path_put(&nd->path);
58842+ return -ENOENT;
58843+ }
58844+ }
58845+ }
58846 return retval;
58847 }
58848
58849@@ -2587,6 +2619,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
58850 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
58851 return -EPERM;
58852
58853+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
58854+ return -EPERM;
58855+ if (gr_handle_rawio(inode))
58856+ return -EPERM;
58857+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
58858+ return -EACCES;
58859+
58860 return 0;
58861 }
58862
58863@@ -2818,7 +2857,7 @@ looked_up:
58864 * cleared otherwise prior to returning.
58865 */
58866 static int lookup_open(struct nameidata *nd, struct path *path,
58867- struct file *file,
58868+ struct path *link, struct file *file,
58869 const struct open_flags *op,
58870 bool got_write, int *opened)
58871 {
58872@@ -2853,6 +2892,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
58873 /* Negative dentry, just create the file */
58874 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
58875 umode_t mode = op->mode;
58876+
58877+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
58878+ error = -EACCES;
58879+ goto out_dput;
58880+ }
58881+
58882+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
58883+ error = -EACCES;
58884+ goto out_dput;
58885+ }
58886+
58887 if (!IS_POSIXACL(dir->d_inode))
58888 mode &= ~current_umask();
58889 /*
58890@@ -2874,6 +2924,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
58891 nd->flags & LOOKUP_EXCL);
58892 if (error)
58893 goto out_dput;
58894+ else
58895+ gr_handle_create(dentry, nd->path.mnt);
58896 }
58897 out_no_open:
58898 path->dentry = dentry;
58899@@ -2888,7 +2940,7 @@ out_dput:
58900 /*
58901 * Handle the last step of open()
58902 */
58903-static int do_last(struct nameidata *nd, struct path *path,
58904+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
58905 struct file *file, const struct open_flags *op,
58906 int *opened, struct filename *name)
58907 {
58908@@ -2938,6 +2990,15 @@ static int do_last(struct nameidata *nd, struct path *path,
58909 if (error)
58910 return error;
58911
58912+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
58913+ error = -ENOENT;
58914+ goto out;
58915+ }
58916+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
58917+ error = -EACCES;
58918+ goto out;
58919+ }
58920+
58921 audit_inode(name, dir, LOOKUP_PARENT);
58922 error = -EISDIR;
58923 /* trailing slashes? */
58924@@ -2957,7 +3018,7 @@ retry_lookup:
58925 */
58926 }
58927 mutex_lock(&dir->d_inode->i_mutex);
58928- error = lookup_open(nd, path, file, op, got_write, opened);
58929+ error = lookup_open(nd, path, link, file, op, got_write, opened);
58930 mutex_unlock(&dir->d_inode->i_mutex);
58931
58932 if (error <= 0) {
58933@@ -2981,11 +3042,28 @@ retry_lookup:
58934 goto finish_open_created;
58935 }
58936
58937+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
58938+ error = -ENOENT;
58939+ goto exit_dput;
58940+ }
58941+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
58942+ error = -EACCES;
58943+ goto exit_dput;
58944+ }
58945+
58946 /*
58947 * create/update audit record if it already exists.
58948 */
58949- if (path->dentry->d_inode)
58950+ if (path->dentry->d_inode) {
58951+ /* only check if O_CREAT is specified, all other checks need to go
58952+ into may_open */
58953+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
58954+ error = -EACCES;
58955+ goto exit_dput;
58956+ }
58957+
58958 audit_inode(name, path->dentry, 0);
58959+ }
58960
58961 /*
58962 * If atomic_open() acquired write access it is dropped now due to
58963@@ -3026,6 +3104,11 @@ finish_lookup:
58964 }
58965 }
58966 BUG_ON(inode != path->dentry->d_inode);
58967+ /* if we're resolving a symlink to another symlink */
58968+ if (link && gr_handle_symlink_owner(link, inode)) {
58969+ error = -EACCES;
58970+ goto out;
58971+ }
58972 return 1;
58973 }
58974
58975@@ -3035,7 +3118,6 @@ finish_lookup:
58976 save_parent.dentry = nd->path.dentry;
58977 save_parent.mnt = mntget(path->mnt);
58978 nd->path.dentry = path->dentry;
58979-
58980 }
58981 nd->inode = inode;
58982 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
58983@@ -3045,7 +3127,18 @@ finish_open:
58984 path_put(&save_parent);
58985 return error;
58986 }
58987+
58988+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
58989+ error = -ENOENT;
58990+ goto out;
58991+ }
58992+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
58993+ error = -EACCES;
58994+ goto out;
58995+ }
58996+
58997 audit_inode(name, nd->path.dentry, 0);
58998+
58999 error = -EISDIR;
59000 if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
59001 goto out;
59002@@ -3208,7 +3301,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
59003 if (unlikely(error))
59004 goto out;
59005
59006- error = do_last(nd, &path, file, op, &opened, pathname);
59007+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
59008 while (unlikely(error > 0)) { /* trailing symlink */
59009 struct path link = path;
59010 void *cookie;
59011@@ -3226,7 +3319,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
59012 error = follow_link(&link, nd, &cookie);
59013 if (unlikely(error))
59014 break;
59015- error = do_last(nd, &path, file, op, &opened, pathname);
59016+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
59017 put_link(nd, &link, cookie);
59018 }
59019 out:
59020@@ -3326,8 +3419,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
59021 goto unlock;
59022
59023 error = -EEXIST;
59024- if (dentry->d_inode)
59025+ if (dentry->d_inode) {
59026+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
59027+ error = -ENOENT;
59028+ }
59029 goto fail;
59030+ }
59031 /*
59032 * Special case - lookup gave negative, but... we had foo/bar/
59033 * From the vfs_mknod() POV we just have a negative dentry -
59034@@ -3379,6 +3476,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
59035 }
59036 EXPORT_SYMBOL(user_path_create);
59037
59038+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
59039+{
59040+ struct filename *tmp = getname(pathname);
59041+ struct dentry *res;
59042+ if (IS_ERR(tmp))
59043+ return ERR_CAST(tmp);
59044+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
59045+ if (IS_ERR(res))
59046+ putname(tmp);
59047+ else
59048+ *to = tmp;
59049+ return res;
59050+}
59051+
59052 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
59053 {
59054 int error = may_create(dir, dentry);
59055@@ -3441,6 +3552,17 @@ retry:
59056
59057 if (!IS_POSIXACL(path.dentry->d_inode))
59058 mode &= ~current_umask();
59059+
59060+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
59061+ error = -EPERM;
59062+ goto out;
59063+ }
59064+
59065+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
59066+ error = -EACCES;
59067+ goto out;
59068+ }
59069+
59070 error = security_path_mknod(&path, dentry, mode, dev);
59071 if (error)
59072 goto out;
59073@@ -3457,6 +3579,8 @@ retry:
59074 break;
59075 }
59076 out:
59077+ if (!error)
59078+ gr_handle_create(dentry, path.mnt);
59079 done_path_create(&path, dentry);
59080 if (retry_estale(error, lookup_flags)) {
59081 lookup_flags |= LOOKUP_REVAL;
59082@@ -3509,9 +3633,16 @@ retry:
59083
59084 if (!IS_POSIXACL(path.dentry->d_inode))
59085 mode &= ~current_umask();
59086+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
59087+ error = -EACCES;
59088+ goto out;
59089+ }
59090 error = security_path_mkdir(&path, dentry, mode);
59091 if (!error)
59092 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
59093+ if (!error)
59094+ gr_handle_create(dentry, path.mnt);
59095+out:
59096 done_path_create(&path, dentry);
59097 if (retry_estale(error, lookup_flags)) {
59098 lookup_flags |= LOOKUP_REVAL;
59099@@ -3592,6 +3723,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
59100 struct filename *name;
59101 struct dentry *dentry;
59102 struct nameidata nd;
59103+ ino_t saved_ino = 0;
59104+ dev_t saved_dev = 0;
59105 unsigned int lookup_flags = 0;
59106 retry:
59107 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
59108@@ -3624,10 +3757,21 @@ retry:
59109 error = -ENOENT;
59110 goto exit3;
59111 }
59112+
59113+ saved_ino = dentry->d_inode->i_ino;
59114+ saved_dev = gr_get_dev_from_dentry(dentry);
59115+
59116+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
59117+ error = -EACCES;
59118+ goto exit3;
59119+ }
59120+
59121 error = security_path_rmdir(&nd.path, dentry);
59122 if (error)
59123 goto exit3;
59124 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
59125+ if (!error && (saved_dev || saved_ino))
59126+ gr_handle_delete(saved_ino, saved_dev);
59127 exit3:
59128 dput(dentry);
59129 exit2:
59130@@ -3693,6 +3837,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
59131 struct dentry *dentry;
59132 struct nameidata nd;
59133 struct inode *inode = NULL;
59134+ ino_t saved_ino = 0;
59135+ dev_t saved_dev = 0;
59136 unsigned int lookup_flags = 0;
59137 retry:
59138 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
59139@@ -3719,10 +3865,22 @@ retry:
59140 if (!inode)
59141 goto slashes;
59142 ihold(inode);
59143+
59144+ if (inode->i_nlink <= 1) {
59145+ saved_ino = inode->i_ino;
59146+ saved_dev = gr_get_dev_from_dentry(dentry);
59147+ }
59148+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
59149+ error = -EACCES;
59150+ goto exit2;
59151+ }
59152+
59153 error = security_path_unlink(&nd.path, dentry);
59154 if (error)
59155 goto exit2;
59156 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
59157+ if (!error && (saved_ino || saved_dev))
59158+ gr_handle_delete(saved_ino, saved_dev);
59159 exit2:
59160 dput(dentry);
59161 }
59162@@ -3800,9 +3958,17 @@ retry:
59163 if (IS_ERR(dentry))
59164 goto out_putname;
59165
59166+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
59167+ error = -EACCES;
59168+ goto out;
59169+ }
59170+
59171 error = security_path_symlink(&path, dentry, from->name);
59172 if (!error)
59173 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
59174+ if (!error)
59175+ gr_handle_create(dentry, path.mnt);
59176+out:
59177 done_path_create(&path, dentry);
59178 if (retry_estale(error, lookup_flags)) {
59179 lookup_flags |= LOOKUP_REVAL;
59180@@ -3882,6 +4048,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
59181 {
59182 struct dentry *new_dentry;
59183 struct path old_path, new_path;
59184+ struct filename *to = NULL;
59185 int how = 0;
59186 int error;
59187
59188@@ -3905,7 +4072,7 @@ retry:
59189 if (error)
59190 return error;
59191
59192- new_dentry = user_path_create(newdfd, newname, &new_path,
59193+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
59194 (how & LOOKUP_REVAL));
59195 error = PTR_ERR(new_dentry);
59196 if (IS_ERR(new_dentry))
59197@@ -3917,11 +4084,28 @@ retry:
59198 error = may_linkat(&old_path);
59199 if (unlikely(error))
59200 goto out_dput;
59201+
59202+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
59203+ old_path.dentry->d_inode,
59204+ old_path.dentry->d_inode->i_mode, to)) {
59205+ error = -EACCES;
59206+ goto out_dput;
59207+ }
59208+
59209+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
59210+ old_path.dentry, old_path.mnt, to)) {
59211+ error = -EACCES;
59212+ goto out_dput;
59213+ }
59214+
59215 error = security_path_link(old_path.dentry, &new_path, new_dentry);
59216 if (error)
59217 goto out_dput;
59218 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
59219+ if (!error)
59220+ gr_handle_create(new_dentry, new_path.mnt);
59221 out_dput:
59222+ putname(to);
59223 done_path_create(&new_path, new_dentry);
59224 if (retry_estale(error, how)) {
59225 how |= LOOKUP_REVAL;
59226@@ -4167,12 +4351,21 @@ retry:
59227 if (new_dentry == trap)
59228 goto exit5;
59229
59230+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
59231+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
59232+ to);
59233+ if (error)
59234+ goto exit5;
59235+
59236 error = security_path_rename(&oldnd.path, old_dentry,
59237 &newnd.path, new_dentry);
59238 if (error)
59239 goto exit5;
59240 error = vfs_rename(old_dir->d_inode, old_dentry,
59241 new_dir->d_inode, new_dentry);
59242+ if (!error)
59243+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
59244+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
59245 exit5:
59246 dput(new_dentry);
59247 exit4:
59248@@ -4204,6 +4397,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
59249
59250 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
59251 {
59252+ char tmpbuf[64];
59253+ const char *newlink;
59254 int len;
59255
59256 len = PTR_ERR(link);
59257@@ -4213,7 +4408,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
59258 len = strlen(link);
59259 if (len > (unsigned) buflen)
59260 len = buflen;
59261- if (copy_to_user(buffer, link, len))
59262+
59263+ if (len < sizeof(tmpbuf)) {
59264+ memcpy(tmpbuf, link, len);
59265+ newlink = tmpbuf;
59266+ } else
59267+ newlink = link;
59268+
59269+ if (copy_to_user(buffer, newlink, len))
59270 len = -EFAULT;
59271 out:
59272 return len;
59273diff --git a/fs/namespace.c b/fs/namespace.c
59274index da5c494..a755a54 100644
59275--- a/fs/namespace.c
59276+++ b/fs/namespace.c
59277@@ -1268,6 +1268,9 @@ static int do_umount(struct mount *mnt, int flags)
59278 if (!(sb->s_flags & MS_RDONLY))
59279 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
59280 up_write(&sb->s_umount);
59281+
59282+ gr_log_remount(mnt->mnt_devname, retval);
59283+
59284 return retval;
59285 }
59286
59287@@ -1286,6 +1289,9 @@ static int do_umount(struct mount *mnt, int flags)
59288 }
59289 br_write_unlock(&vfsmount_lock);
59290 namespace_unlock();
59291+
59292+ gr_log_unmount(mnt->mnt_devname, retval);
59293+
59294 return retval;
59295 }
59296
59297@@ -1305,7 +1311,7 @@ static inline bool may_mount(void)
59298 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
59299 */
59300
59301-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
59302+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
59303 {
59304 struct path path;
59305 struct mount *mnt;
59306@@ -1347,7 +1353,7 @@ out:
59307 /*
59308 * The 2.0 compatible umount. No flags.
59309 */
59310-SYSCALL_DEFINE1(oldumount, char __user *, name)
59311+SYSCALL_DEFINE1(oldumount, const char __user *, name)
59312 {
59313 return sys_umount(name, 0);
59314 }
59315@@ -2358,6 +2364,16 @@ long do_mount(const char *dev_name, const char *dir_name,
59316 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
59317 MS_STRICTATIME);
59318
59319+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
59320+ retval = -EPERM;
59321+ goto dput_out;
59322+ }
59323+
59324+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
59325+ retval = -EPERM;
59326+ goto dput_out;
59327+ }
59328+
59329 if (flags & MS_REMOUNT)
59330 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
59331 data_page);
59332@@ -2372,6 +2388,9 @@ long do_mount(const char *dev_name, const char *dir_name,
59333 dev_name, data_page);
59334 dput_out:
59335 path_put(&path);
59336+
59337+ gr_log_mount(dev_name, dir_name, retval);
59338+
59339 return retval;
59340 }
59341
59342@@ -2389,7 +2408,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
59343 * number incrementing at 10Ghz will take 12,427 years to wrap which
59344 * is effectively never, so we can ignore the possibility.
59345 */
59346-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
59347+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
59348
59349 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59350 {
59351@@ -2404,7 +2423,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59352 kfree(new_ns);
59353 return ERR_PTR(ret);
59354 }
59355- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
59356+ new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
59357 atomic_set(&new_ns->count, 1);
59358 new_ns->root = NULL;
59359 INIT_LIST_HEAD(&new_ns->list);
59360@@ -2418,7 +2437,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59361 * Allocate a new namespace structure and populate it with contents
59362 * copied from the namespace of the passed in task structure.
59363 */
59364-static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
59365+static __latent_entropy struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
59366 struct user_namespace *user_ns, struct fs_struct *fs)
59367 {
59368 struct mnt_namespace *new_ns;
59369@@ -2549,8 +2568,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
59370 }
59371 EXPORT_SYMBOL(mount_subtree);
59372
59373-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
59374- char __user *, type, unsigned long, flags, void __user *, data)
59375+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
59376+ const char __user *, type, unsigned long, flags, void __user *, data)
59377 {
59378 int ret;
59379 char *kernel_type;
59380@@ -2663,6 +2682,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
59381 if (error)
59382 goto out2;
59383
59384+ if (gr_handle_chroot_pivot()) {
59385+ error = -EPERM;
59386+ goto out2;
59387+ }
59388+
59389 get_fs_root(current->fs, &root);
59390 old_mp = lock_mount(&old);
59391 error = PTR_ERR(old_mp);
59392@@ -2932,7 +2956,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
59393 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
59394 return -EPERM;
59395
59396- if (fs->users != 1)
59397+ if (atomic_read(&fs->users) != 1)
59398 return -EINVAL;
59399
59400 get_mnt_ns(mnt_ns);
59401diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
59402index f4ccfe6..a5cf064 100644
59403--- a/fs/nfs/callback_xdr.c
59404+++ b/fs/nfs/callback_xdr.c
59405@@ -51,7 +51,7 @@ struct callback_op {
59406 callback_decode_arg_t decode_args;
59407 callback_encode_res_t encode_res;
59408 long res_maxsize;
59409-};
59410+} __do_const;
59411
59412 static struct callback_op callback_ops[];
59413
59414diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
59415index eda8879..bfc6837 100644
59416--- a/fs/nfs/inode.c
59417+++ b/fs/nfs/inode.c
59418@@ -1150,16 +1150,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
59419 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
59420 }
59421
59422-static atomic_long_t nfs_attr_generation_counter;
59423+static atomic_long_unchecked_t nfs_attr_generation_counter;
59424
59425 static unsigned long nfs_read_attr_generation_counter(void)
59426 {
59427- return atomic_long_read(&nfs_attr_generation_counter);
59428+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
59429 }
59430
59431 unsigned long nfs_inc_attr_generation_counter(void)
59432 {
59433- return atomic_long_inc_return(&nfs_attr_generation_counter);
59434+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
59435 }
59436
59437 void nfs_fattr_init(struct nfs_fattr *fattr)
59438diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
59439index 419572f..5414a23 100644
59440--- a/fs/nfsd/nfs4proc.c
59441+++ b/fs/nfsd/nfs4proc.c
59442@@ -1168,7 +1168,7 @@ struct nfsd4_operation {
59443 nfsd4op_rsize op_rsize_bop;
59444 stateid_getter op_get_currentstateid;
59445 stateid_setter op_set_currentstateid;
59446-};
59447+} __do_const;
59448
59449 static struct nfsd4_operation nfsd4_ops[];
59450
59451diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
59452index ecc735e..79b2d31 100644
59453--- a/fs/nfsd/nfs4xdr.c
59454+++ b/fs/nfsd/nfs4xdr.c
59455@@ -1500,7 +1500,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
59456
59457 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
59458
59459-static nfsd4_dec nfsd4_dec_ops[] = {
59460+static const nfsd4_dec nfsd4_dec_ops[] = {
59461 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
59462 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
59463 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
59464@@ -1540,7 +1540,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
59465 [OP_RELEASE_LOCKOWNER] = (nfsd4_dec)nfsd4_decode_release_lockowner,
59466 };
59467
59468-static nfsd4_dec nfsd41_dec_ops[] = {
59469+static const nfsd4_dec nfsd41_dec_ops[] = {
59470 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
59471 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
59472 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
59473@@ -1602,7 +1602,7 @@ static nfsd4_dec nfsd41_dec_ops[] = {
59474 };
59475
59476 struct nfsd4_minorversion_ops {
59477- nfsd4_dec *decoders;
59478+ const nfsd4_dec *decoders;
59479 int nops;
59480 };
59481
59482diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
59483index b6af150..f6ec5e3 100644
59484--- a/fs/nfsd/nfscache.c
59485+++ b/fs/nfsd/nfscache.c
59486@@ -547,14 +547,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
59487 {
59488 struct svc_cacherep *rp = rqstp->rq_cacherep;
59489 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
59490- int len;
59491+ long len;
59492 size_t bufsize = 0;
59493
59494 if (!rp)
59495 return;
59496
59497- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
59498- len >>= 2;
59499+ if (statp) {
59500+ len = (char*)statp - (char*)resv->iov_base;
59501+ len = resv->iov_len - len;
59502+ len >>= 2;
59503+ }
59504
59505 /* Don't cache excessive amounts of data and XDR failures */
59506 if (!statp || len > (256 >> 2)) {
59507diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
59508index 72cb28e..5b5f87d 100644
59509--- a/fs/nfsd/vfs.c
59510+++ b/fs/nfsd/vfs.c
59511@@ -993,7 +993,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
59512 } else {
59513 oldfs = get_fs();
59514 set_fs(KERNEL_DS);
59515- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
59516+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
59517 set_fs(oldfs);
59518 }
59519
59520@@ -1080,7 +1080,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
59521
59522 /* Write the data. */
59523 oldfs = get_fs(); set_fs(KERNEL_DS);
59524- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
59525+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
59526 set_fs(oldfs);
59527 if (host_err < 0)
59528 goto out_nfserr;
59529@@ -1626,7 +1626,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
59530 */
59531
59532 oldfs = get_fs(); set_fs(KERNEL_DS);
59533- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
59534+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
59535 set_fs(oldfs);
59536
59537 if (host_err < 0)
59538diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
59539index fea6bd5..8ee9d81 100644
59540--- a/fs/nls/nls_base.c
59541+++ b/fs/nls/nls_base.c
59542@@ -234,20 +234,22 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
59543
59544 int register_nls(struct nls_table * nls)
59545 {
59546- struct nls_table ** tmp = &tables;
59547+ struct nls_table *tmp = tables;
59548
59549 if (nls->next)
59550 return -EBUSY;
59551
59552 spin_lock(&nls_lock);
59553- while (*tmp) {
59554- if (nls == *tmp) {
59555+ while (tmp) {
59556+ if (nls == tmp) {
59557 spin_unlock(&nls_lock);
59558 return -EBUSY;
59559 }
59560- tmp = &(*tmp)->next;
59561+ tmp = tmp->next;
59562 }
59563- nls->next = tables;
59564+ pax_open_kernel();
59565+ *(struct nls_table **)&nls->next = tables;
59566+ pax_close_kernel();
59567 tables = nls;
59568 spin_unlock(&nls_lock);
59569 return 0;
59570@@ -255,12 +257,14 @@ int register_nls(struct nls_table * nls)
59571
59572 int unregister_nls(struct nls_table * nls)
59573 {
59574- struct nls_table ** tmp = &tables;
59575+ struct nls_table * const * tmp = &tables;
59576
59577 spin_lock(&nls_lock);
59578 while (*tmp) {
59579 if (nls == *tmp) {
59580- *tmp = nls->next;
59581+ pax_open_kernel();
59582+ *(struct nls_table **)tmp = nls->next;
59583+ pax_close_kernel();
59584 spin_unlock(&nls_lock);
59585 return 0;
59586 }
59587diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
59588index 7424929..35f6be5 100644
59589--- a/fs/nls/nls_euc-jp.c
59590+++ b/fs/nls/nls_euc-jp.c
59591@@ -561,8 +561,10 @@ static int __init init_nls_euc_jp(void)
59592 p_nls = load_nls("cp932");
59593
59594 if (p_nls) {
59595- table.charset2upper = p_nls->charset2upper;
59596- table.charset2lower = p_nls->charset2lower;
59597+ pax_open_kernel();
59598+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
59599+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
59600+ pax_close_kernel();
59601 return register_nls(&table);
59602 }
59603
59604diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
59605index e7bc1d7..06bd4bb 100644
59606--- a/fs/nls/nls_koi8-ru.c
59607+++ b/fs/nls/nls_koi8-ru.c
59608@@ -63,8 +63,10 @@ static int __init init_nls_koi8_ru(void)
59609 p_nls = load_nls("koi8-u");
59610
59611 if (p_nls) {
59612- table.charset2upper = p_nls->charset2upper;
59613- table.charset2lower = p_nls->charset2lower;
59614+ pax_open_kernel();
59615+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
59616+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
59617+ pax_close_kernel();
59618 return register_nls(&table);
59619 }
59620
59621diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
59622index e44cb64..4807084 100644
59623--- a/fs/notify/fanotify/fanotify_user.c
59624+++ b/fs/notify/fanotify/fanotify_user.c
59625@@ -253,8 +253,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
59626
59627 fd = fanotify_event_metadata.fd;
59628 ret = -EFAULT;
59629- if (copy_to_user(buf, &fanotify_event_metadata,
59630- fanotify_event_metadata.event_len))
59631+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
59632+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
59633 goto out_close_fd;
59634
59635 ret = prepare_for_access_response(group, event, fd);
59636diff --git a/fs/notify/notification.c b/fs/notify/notification.c
59637index 7b51b05..5ea5ef6 100644
59638--- a/fs/notify/notification.c
59639+++ b/fs/notify/notification.c
59640@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
59641 * get set to 0 so it will never get 'freed'
59642 */
59643 static struct fsnotify_event *q_overflow_event;
59644-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59645+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59646
59647 /**
59648 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
59649@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59650 */
59651 u32 fsnotify_get_cookie(void)
59652 {
59653- return atomic_inc_return(&fsnotify_sync_cookie);
59654+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
59655 }
59656 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
59657
59658diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
59659index 9e38daf..5727cae 100644
59660--- a/fs/ntfs/dir.c
59661+++ b/fs/ntfs/dir.c
59662@@ -1310,7 +1310,7 @@ find_next_index_buffer:
59663 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
59664 ~(s64)(ndir->itype.index.block_size - 1)));
59665 /* Bounds checks. */
59666- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
59667+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
59668 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
59669 "inode 0x%lx or driver bug.", vdir->i_ino);
59670 goto err_out;
59671diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
59672index ea4ba9d..1e13d34 100644
59673--- a/fs/ntfs/file.c
59674+++ b/fs/ntfs/file.c
59675@@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
59676 char *addr;
59677 size_t total = 0;
59678 unsigned len;
59679- int left;
59680+ unsigned left;
59681
59682 do {
59683 len = PAGE_CACHE_SIZE - ofs;
59684diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
59685index 82650d5..db37dcf 100644
59686--- a/fs/ntfs/super.c
59687+++ b/fs/ntfs/super.c
59688@@ -685,7 +685,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59689 if (!silent)
59690 ntfs_error(sb, "Primary boot sector is invalid.");
59691 } else if (!silent)
59692- ntfs_error(sb, read_err_str, "primary");
59693+ ntfs_error(sb, read_err_str, "%s", "primary");
59694 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
59695 if (bh_primary)
59696 brelse(bh_primary);
59697@@ -701,7 +701,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59698 goto hotfix_primary_boot_sector;
59699 brelse(bh_backup);
59700 } else if (!silent)
59701- ntfs_error(sb, read_err_str, "backup");
59702+ ntfs_error(sb, read_err_str, "%s", "backup");
59703 /* Try to read NT3.51- backup boot sector. */
59704 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
59705 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
59706@@ -712,7 +712,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59707 "sector.");
59708 brelse(bh_backup);
59709 } else if (!silent)
59710- ntfs_error(sb, read_err_str, "backup");
59711+ ntfs_error(sb, read_err_str, "%s", "backup");
59712 /* We failed. Cleanup and return. */
59713 if (bh_primary)
59714 brelse(bh_primary);
59715diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
59716index cd5496b..26a1055 100644
59717--- a/fs/ocfs2/localalloc.c
59718+++ b/fs/ocfs2/localalloc.c
59719@@ -1278,7 +1278,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
59720 goto bail;
59721 }
59722
59723- atomic_inc(&osb->alloc_stats.moves);
59724+ atomic_inc_unchecked(&osb->alloc_stats.moves);
59725
59726 bail:
59727 if (handle)
59728diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
59729index 3a90347..c40bef8 100644
59730--- a/fs/ocfs2/ocfs2.h
59731+++ b/fs/ocfs2/ocfs2.h
59732@@ -235,11 +235,11 @@ enum ocfs2_vol_state
59733
59734 struct ocfs2_alloc_stats
59735 {
59736- atomic_t moves;
59737- atomic_t local_data;
59738- atomic_t bitmap_data;
59739- atomic_t bg_allocs;
59740- atomic_t bg_extends;
59741+ atomic_unchecked_t moves;
59742+ atomic_unchecked_t local_data;
59743+ atomic_unchecked_t bitmap_data;
59744+ atomic_unchecked_t bg_allocs;
59745+ atomic_unchecked_t bg_extends;
59746 };
59747
59748 enum ocfs2_local_alloc_state
59749diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
59750index 5397c07..54afc55 100644
59751--- a/fs/ocfs2/suballoc.c
59752+++ b/fs/ocfs2/suballoc.c
59753@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
59754 mlog_errno(status);
59755 goto bail;
59756 }
59757- atomic_inc(&osb->alloc_stats.bg_extends);
59758+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
59759
59760 /* You should never ask for this much metadata */
59761 BUG_ON(bits_wanted >
59762@@ -2000,7 +2000,7 @@ int ocfs2_claim_metadata(handle_t *handle,
59763 mlog_errno(status);
59764 goto bail;
59765 }
59766- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59767+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59768
59769 *suballoc_loc = res.sr_bg_blkno;
59770 *suballoc_bit_start = res.sr_bit_offset;
59771@@ -2164,7 +2164,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
59772 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
59773 res->sr_bits);
59774
59775- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59776+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59777
59778 BUG_ON(res->sr_bits != 1);
59779
59780@@ -2206,7 +2206,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
59781 mlog_errno(status);
59782 goto bail;
59783 }
59784- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59785+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59786
59787 BUG_ON(res.sr_bits != 1);
59788
59789@@ -2310,7 +2310,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
59790 cluster_start,
59791 num_clusters);
59792 if (!status)
59793- atomic_inc(&osb->alloc_stats.local_data);
59794+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
59795 } else {
59796 if (min_clusters > (osb->bitmap_cpg - 1)) {
59797 /* The only paths asking for contiguousness
59798@@ -2336,7 +2336,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
59799 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
59800 res.sr_bg_blkno,
59801 res.sr_bit_offset);
59802- atomic_inc(&osb->alloc_stats.bitmap_data);
59803+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
59804 *num_clusters = res.sr_bits;
59805 }
59806 }
59807diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
59808index d4e81e4..ad89f5f 100644
59809--- a/fs/ocfs2/super.c
59810+++ b/fs/ocfs2/super.c
59811@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
59812 "%10s => GlobalAllocs: %d LocalAllocs: %d "
59813 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
59814 "Stats",
59815- atomic_read(&osb->alloc_stats.bitmap_data),
59816- atomic_read(&osb->alloc_stats.local_data),
59817- atomic_read(&osb->alloc_stats.bg_allocs),
59818- atomic_read(&osb->alloc_stats.moves),
59819- atomic_read(&osb->alloc_stats.bg_extends));
59820+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
59821+ atomic_read_unchecked(&osb->alloc_stats.local_data),
59822+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
59823+ atomic_read_unchecked(&osb->alloc_stats.moves),
59824+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
59825
59826 out += snprintf(buf + out, len - out,
59827 "%10s => State: %u Descriptor: %llu Size: %u bits "
59828@@ -2121,11 +2121,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
59829 spin_lock_init(&osb->osb_xattr_lock);
59830 ocfs2_init_steal_slots(osb);
59831
59832- atomic_set(&osb->alloc_stats.moves, 0);
59833- atomic_set(&osb->alloc_stats.local_data, 0);
59834- atomic_set(&osb->alloc_stats.bitmap_data, 0);
59835- atomic_set(&osb->alloc_stats.bg_allocs, 0);
59836- atomic_set(&osb->alloc_stats.bg_extends, 0);
59837+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
59838+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
59839+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
59840+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
59841+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
59842
59843 /* Copy the blockcheck stats from the superblock probe */
59844 osb->osb_ecc_stats = *stats;
59845diff --git a/fs/open.c b/fs/open.c
59846index d420331..2dbb3fd 100644
59847--- a/fs/open.c
59848+++ b/fs/open.c
59849@@ -32,6 +32,8 @@
59850 #include <linux/dnotify.h>
59851 #include <linux/compat.h>
59852
59853+#define CREATE_TRACE_POINTS
59854+#include <trace/events/fs.h>
59855 #include "internal.h"
59856
59857 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
59858@@ -102,6 +104,8 @@ long vfs_truncate(struct path *path, loff_t length)
59859 error = locks_verify_truncate(inode, NULL, length);
59860 if (!error)
59861 error = security_path_truncate(path);
59862+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
59863+ error = -EACCES;
59864 if (!error)
59865 error = do_truncate(path->dentry, length, 0, NULL);
59866
59867@@ -186,6 +190,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
59868 error = locks_verify_truncate(inode, f.file, length);
59869 if (!error)
59870 error = security_path_truncate(&f.file->f_path);
59871+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
59872+ error = -EACCES;
59873 if (!error)
59874 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
59875 sb_end_write(inode->i_sb);
59876@@ -360,6 +366,9 @@ retry:
59877 if (__mnt_is_readonly(path.mnt))
59878 res = -EROFS;
59879
59880+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
59881+ res = -EACCES;
59882+
59883 out_path_release:
59884 path_put(&path);
59885 if (retry_estale(res, lookup_flags)) {
59886@@ -391,6 +400,8 @@ retry:
59887 if (error)
59888 goto dput_and_out;
59889
59890+ gr_log_chdir(path.dentry, path.mnt);
59891+
59892 set_fs_pwd(current->fs, &path);
59893
59894 dput_and_out:
59895@@ -420,6 +431,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
59896 goto out_putf;
59897
59898 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
59899+
59900+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
59901+ error = -EPERM;
59902+
59903+ if (!error)
59904+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
59905+
59906 if (!error)
59907 set_fs_pwd(current->fs, &f.file->f_path);
59908 out_putf:
59909@@ -449,7 +467,13 @@ retry:
59910 if (error)
59911 goto dput_and_out;
59912
59913+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
59914+ goto dput_and_out;
59915+
59916 set_fs_root(current->fs, &path);
59917+
59918+ gr_handle_chroot_chdir(&path);
59919+
59920 error = 0;
59921 dput_and_out:
59922 path_put(&path);
59923@@ -471,6 +495,16 @@ static int chmod_common(struct path *path, umode_t mode)
59924 if (error)
59925 return error;
59926 mutex_lock(&inode->i_mutex);
59927+
59928+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
59929+ error = -EACCES;
59930+ goto out_unlock;
59931+ }
59932+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
59933+ error = -EACCES;
59934+ goto out_unlock;
59935+ }
59936+
59937 error = security_path_chmod(path, mode);
59938 if (error)
59939 goto out_unlock;
59940@@ -530,6 +564,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
59941 uid = make_kuid(current_user_ns(), user);
59942 gid = make_kgid(current_user_ns(), group);
59943
59944+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
59945+ return -EACCES;
59946+
59947 newattrs.ia_valid = ATTR_CTIME;
59948 if (user != (uid_t) -1) {
59949 if (!uid_valid(uid))
59950@@ -974,6 +1011,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
59951 } else {
59952 fsnotify_open(f);
59953 fd_install(fd, f);
59954+ trace_do_sys_open(tmp->name, flags, mode);
59955 }
59956 }
59957 putname(tmp);
59958diff --git a/fs/pipe.c b/fs/pipe.c
59959index 0e0752e..7cfdd50 100644
59960--- a/fs/pipe.c
59961+++ b/fs/pipe.c
59962@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
59963
59964 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
59965 {
59966- if (pipe->files)
59967+ if (atomic_read(&pipe->files))
59968 mutex_lock_nested(&pipe->mutex, subclass);
59969 }
59970
59971@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
59972
59973 void pipe_unlock(struct pipe_inode_info *pipe)
59974 {
59975- if (pipe->files)
59976+ if (atomic_read(&pipe->files))
59977 mutex_unlock(&pipe->mutex);
59978 }
59979 EXPORT_SYMBOL(pipe_unlock);
59980@@ -449,9 +449,9 @@ redo:
59981 }
59982 if (bufs) /* More to do? */
59983 continue;
59984- if (!pipe->writers)
59985+ if (!atomic_read(&pipe->writers))
59986 break;
59987- if (!pipe->waiting_writers) {
59988+ if (!atomic_read(&pipe->waiting_writers)) {
59989 /* syscall merging: Usually we must not sleep
59990 * if O_NONBLOCK is set, or if we got some data.
59991 * But if a writer sleeps in kernel space, then
59992@@ -513,7 +513,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
59993 ret = 0;
59994 __pipe_lock(pipe);
59995
59996- if (!pipe->readers) {
59997+ if (!atomic_read(&pipe->readers)) {
59998 send_sig(SIGPIPE, current, 0);
59999 ret = -EPIPE;
60000 goto out;
60001@@ -562,7 +562,7 @@ redo1:
60002 for (;;) {
60003 int bufs;
60004
60005- if (!pipe->readers) {
60006+ if (!atomic_read(&pipe->readers)) {
60007 send_sig(SIGPIPE, current, 0);
60008 if (!ret)
60009 ret = -EPIPE;
60010@@ -653,9 +653,9 @@ redo2:
60011 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60012 do_wakeup = 0;
60013 }
60014- pipe->waiting_writers++;
60015+ atomic_inc(&pipe->waiting_writers);
60016 pipe_wait(pipe);
60017- pipe->waiting_writers--;
60018+ atomic_dec(&pipe->waiting_writers);
60019 }
60020 out:
60021 __pipe_unlock(pipe);
60022@@ -709,7 +709,7 @@ pipe_poll(struct file *filp, poll_table *wait)
60023 mask = 0;
60024 if (filp->f_mode & FMODE_READ) {
60025 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
60026- if (!pipe->writers && filp->f_version != pipe->w_counter)
60027+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
60028 mask |= POLLHUP;
60029 }
60030
60031@@ -719,7 +719,7 @@ pipe_poll(struct file *filp, poll_table *wait)
60032 * Most Unices do not set POLLERR for FIFOs but on Linux they
60033 * behave exactly like pipes for poll().
60034 */
60035- if (!pipe->readers)
60036+ if (!atomic_read(&pipe->readers))
60037 mask |= POLLERR;
60038 }
60039
60040@@ -731,7 +731,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
60041 int kill = 0;
60042
60043 spin_lock(&inode->i_lock);
60044- if (!--pipe->files) {
60045+ if (atomic_dec_and_test(&pipe->files)) {
60046 inode->i_pipe = NULL;
60047 kill = 1;
60048 }
60049@@ -748,11 +748,11 @@ pipe_release(struct inode *inode, struct file *file)
60050
60051 __pipe_lock(pipe);
60052 if (file->f_mode & FMODE_READ)
60053- pipe->readers--;
60054+ atomic_dec(&pipe->readers);
60055 if (file->f_mode & FMODE_WRITE)
60056- pipe->writers--;
60057+ atomic_dec(&pipe->writers);
60058
60059- if (pipe->readers || pipe->writers) {
60060+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
60061 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
60062 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60063 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
60064@@ -817,7 +817,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
60065 kfree(pipe);
60066 }
60067
60068-static struct vfsmount *pipe_mnt __read_mostly;
60069+struct vfsmount *pipe_mnt __read_mostly;
60070
60071 /*
60072 * pipefs_dname() is called from d_path().
60073@@ -847,8 +847,9 @@ static struct inode * get_pipe_inode(void)
60074 goto fail_iput;
60075
60076 inode->i_pipe = pipe;
60077- pipe->files = 2;
60078- pipe->readers = pipe->writers = 1;
60079+ atomic_set(&pipe->files, 2);
60080+ atomic_set(&pipe->readers, 1);
60081+ atomic_set(&pipe->writers, 1);
60082 inode->i_fop = &pipefifo_fops;
60083
60084 /*
60085@@ -1027,17 +1028,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
60086 spin_lock(&inode->i_lock);
60087 if (inode->i_pipe) {
60088 pipe = inode->i_pipe;
60089- pipe->files++;
60090+ atomic_inc(&pipe->files);
60091 spin_unlock(&inode->i_lock);
60092 } else {
60093 spin_unlock(&inode->i_lock);
60094 pipe = alloc_pipe_info();
60095 if (!pipe)
60096 return -ENOMEM;
60097- pipe->files = 1;
60098+ atomic_set(&pipe->files, 1);
60099 spin_lock(&inode->i_lock);
60100 if (unlikely(inode->i_pipe)) {
60101- inode->i_pipe->files++;
60102+ atomic_inc(&inode->i_pipe->files);
60103 spin_unlock(&inode->i_lock);
60104 free_pipe_info(pipe);
60105 pipe = inode->i_pipe;
60106@@ -1062,10 +1063,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
60107 * opened, even when there is no process writing the FIFO.
60108 */
60109 pipe->r_counter++;
60110- if (pipe->readers++ == 0)
60111+ if (atomic_inc_return(&pipe->readers) == 1)
60112 wake_up_partner(pipe);
60113
60114- if (!is_pipe && !pipe->writers) {
60115+ if (!is_pipe && !atomic_read(&pipe->writers)) {
60116 if ((filp->f_flags & O_NONBLOCK)) {
60117 /* suppress POLLHUP until we have
60118 * seen a writer */
60119@@ -1084,14 +1085,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
60120 * errno=ENXIO when there is no process reading the FIFO.
60121 */
60122 ret = -ENXIO;
60123- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
60124+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
60125 goto err;
60126
60127 pipe->w_counter++;
60128- if (!pipe->writers++)
60129+ if (atomic_inc_return(&pipe->writers) == 1)
60130 wake_up_partner(pipe);
60131
60132- if (!is_pipe && !pipe->readers) {
60133+ if (!is_pipe && !atomic_read(&pipe->readers)) {
60134 if (wait_for_partner(pipe, &pipe->r_counter))
60135 goto err_wr;
60136 }
60137@@ -1105,11 +1106,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
60138 * the process can at least talk to itself.
60139 */
60140
60141- pipe->readers++;
60142- pipe->writers++;
60143+ atomic_inc(&pipe->readers);
60144+ atomic_inc(&pipe->writers);
60145 pipe->r_counter++;
60146 pipe->w_counter++;
60147- if (pipe->readers == 1 || pipe->writers == 1)
60148+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
60149 wake_up_partner(pipe);
60150 break;
60151
60152@@ -1123,13 +1124,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
60153 return 0;
60154
60155 err_rd:
60156- if (!--pipe->readers)
60157+ if (atomic_dec_and_test(&pipe->readers))
60158 wake_up_interruptible(&pipe->wait);
60159 ret = -ERESTARTSYS;
60160 goto err;
60161
60162 err_wr:
60163- if (!--pipe->writers)
60164+ if (atomic_dec_and_test(&pipe->writers))
60165 wake_up_interruptible(&pipe->wait);
60166 ret = -ERESTARTSYS;
60167 goto err;
60168diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
60169index 15af622..0e9f4467 100644
60170--- a/fs/proc/Kconfig
60171+++ b/fs/proc/Kconfig
60172@@ -30,12 +30,12 @@ config PROC_FS
60173
60174 config PROC_KCORE
60175 bool "/proc/kcore support" if !ARM
60176- depends on PROC_FS && MMU
60177+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
60178
60179 config PROC_VMCORE
60180 bool "/proc/vmcore support"
60181- depends on PROC_FS && CRASH_DUMP
60182- default y
60183+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
60184+ default n
60185 help
60186 Exports the dump image of crashed kernel in ELF format.
60187
60188@@ -59,8 +59,8 @@ config PROC_SYSCTL
60189 limited in memory.
60190
60191 config PROC_PAGE_MONITOR
60192- default y
60193- depends on PROC_FS && MMU
60194+ default n
60195+ depends on PROC_FS && MMU && !GRKERNSEC
60196 bool "Enable /proc page monitoring" if EXPERT
60197 help
60198 Various /proc files exist to monitor process memory utilization:
60199diff --git a/fs/proc/array.c b/fs/proc/array.c
60200index cbd0f1b..adec3f0 100644
60201--- a/fs/proc/array.c
60202+++ b/fs/proc/array.c
60203@@ -60,6 +60,7 @@
60204 #include <linux/tty.h>
60205 #include <linux/string.h>
60206 #include <linux/mman.h>
60207+#include <linux/grsecurity.h>
60208 #include <linux/proc_fs.h>
60209 #include <linux/ioport.h>
60210 #include <linux/uaccess.h>
60211@@ -363,6 +364,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
60212 seq_putc(m, '\n');
60213 }
60214
60215+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
60216+static inline void task_pax(struct seq_file *m, struct task_struct *p)
60217+{
60218+ if (p->mm)
60219+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
60220+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
60221+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
60222+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
60223+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
60224+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
60225+ else
60226+ seq_printf(m, "PaX:\t-----\n");
60227+}
60228+#endif
60229+
60230 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
60231 struct pid *pid, struct task_struct *task)
60232 {
60233@@ -381,9 +397,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
60234 task_cpus_allowed(m, task);
60235 cpuset_task_status_allowed(m, task);
60236 task_context_switch_counts(m, task);
60237+
60238+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
60239+ task_pax(m, task);
60240+#endif
60241+
60242+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
60243+ task_grsec_rbac(m, task);
60244+#endif
60245+
60246 return 0;
60247 }
60248
60249+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60250+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
60251+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
60252+ _mm->pax_flags & MF_PAX_SEGMEXEC))
60253+#endif
60254+
60255 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60256 struct pid *pid, struct task_struct *task, int whole)
60257 {
60258@@ -405,6 +436,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60259 char tcomm[sizeof(task->comm)];
60260 unsigned long flags;
60261
60262+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60263+ if (current->exec_id != m->exec_id) {
60264+ gr_log_badprocpid("stat");
60265+ return 0;
60266+ }
60267+#endif
60268+
60269 state = *get_task_state(task);
60270 vsize = eip = esp = 0;
60271 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
60272@@ -476,6 +514,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60273 gtime = task_gtime(task);
60274 }
60275
60276+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60277+ if (PAX_RAND_FLAGS(mm)) {
60278+ eip = 0;
60279+ esp = 0;
60280+ wchan = 0;
60281+ }
60282+#endif
60283+#ifdef CONFIG_GRKERNSEC_HIDESYM
60284+ wchan = 0;
60285+ eip =0;
60286+ esp =0;
60287+#endif
60288+
60289 /* scale priority and nice values from timeslices to -20..20 */
60290 /* to make it look like a "normal" Unix priority/nice value */
60291 priority = task_prio(task);
60292@@ -512,9 +563,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60293 seq_put_decimal_ull(m, ' ', vsize);
60294 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
60295 seq_put_decimal_ull(m, ' ', rsslim);
60296+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60297+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
60298+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
60299+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
60300+#else
60301 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
60302 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
60303 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
60304+#endif
60305 seq_put_decimal_ull(m, ' ', esp);
60306 seq_put_decimal_ull(m, ' ', eip);
60307 /* The signal information here is obsolete.
60308@@ -536,7 +593,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60309 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
60310 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
60311
60312- if (mm && permitted) {
60313+ if (mm && permitted
60314+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60315+ && !PAX_RAND_FLAGS(mm)
60316+#endif
60317+ ) {
60318 seq_put_decimal_ull(m, ' ', mm->start_data);
60319 seq_put_decimal_ull(m, ' ', mm->end_data);
60320 seq_put_decimal_ull(m, ' ', mm->start_brk);
60321@@ -574,8 +635,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
60322 struct pid *pid, struct task_struct *task)
60323 {
60324 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
60325- struct mm_struct *mm = get_task_mm(task);
60326+ struct mm_struct *mm;
60327
60328+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60329+ if (current->exec_id != m->exec_id) {
60330+ gr_log_badprocpid("statm");
60331+ return 0;
60332+ }
60333+#endif
60334+ mm = get_task_mm(task);
60335 if (mm) {
60336 size = task_statm(mm, &shared, &text, &data, &resident);
60337 mmput(mm);
60338@@ -598,6 +666,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
60339 return 0;
60340 }
60341
60342+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60343+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
60344+{
60345+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
60346+}
60347+#endif
60348+
60349 #ifdef CONFIG_CHECKPOINT_RESTORE
60350 static struct pid *
60351 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
60352diff --git a/fs/proc/base.c b/fs/proc/base.c
60353index 1485e38..8ad4236 100644
60354--- a/fs/proc/base.c
60355+++ b/fs/proc/base.c
60356@@ -113,6 +113,14 @@ struct pid_entry {
60357 union proc_op op;
60358 };
60359
60360+struct getdents_callback {
60361+ struct linux_dirent __user * current_dir;
60362+ struct linux_dirent __user * previous;
60363+ struct file * file;
60364+ int count;
60365+ int error;
60366+};
60367+
60368 #define NOD(NAME, MODE, IOP, FOP, OP) { \
60369 .name = (NAME), \
60370 .len = sizeof(NAME) - 1, \
60371@@ -210,6 +218,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
60372 if (!mm->arg_end)
60373 goto out_mm; /* Shh! No looking before we're done */
60374
60375+ if (gr_acl_handle_procpidmem(task))
60376+ goto out_mm;
60377+
60378 len = mm->arg_end - mm->arg_start;
60379
60380 if (len > PAGE_SIZE)
60381@@ -237,12 +248,28 @@ out:
60382 return res;
60383 }
60384
60385+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60386+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
60387+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
60388+ _mm->pax_flags & MF_PAX_SEGMEXEC))
60389+#endif
60390+
60391 static int proc_pid_auxv(struct task_struct *task, char *buffer)
60392 {
60393 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
60394 int res = PTR_ERR(mm);
60395 if (mm && !IS_ERR(mm)) {
60396 unsigned int nwords = 0;
60397+
60398+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60399+ /* allow if we're currently ptracing this task */
60400+ if (PAX_RAND_FLAGS(mm) &&
60401+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
60402+ mmput(mm);
60403+ return 0;
60404+ }
60405+#endif
60406+
60407 do {
60408 nwords += 2;
60409 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
60410@@ -256,7 +283,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
60411 }
60412
60413
60414-#ifdef CONFIG_KALLSYMS
60415+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60416 /*
60417 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
60418 * Returns the resolved symbol. If that fails, simply return the address.
60419@@ -295,7 +322,7 @@ static void unlock_trace(struct task_struct *task)
60420 mutex_unlock(&task->signal->cred_guard_mutex);
60421 }
60422
60423-#ifdef CONFIG_STACKTRACE
60424+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60425
60426 #define MAX_STACK_TRACE_DEPTH 64
60427
60428@@ -518,7 +545,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
60429 return count;
60430 }
60431
60432-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60433+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60434 static int proc_pid_syscall(struct task_struct *task, char *buffer)
60435 {
60436 long nr;
60437@@ -547,7 +574,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
60438 /************************************************************************/
60439
60440 /* permission checks */
60441-static int proc_fd_access_allowed(struct inode *inode)
60442+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
60443 {
60444 struct task_struct *task;
60445 int allowed = 0;
60446@@ -557,7 +584,10 @@ static int proc_fd_access_allowed(struct inode *inode)
60447 */
60448 task = get_proc_task(inode);
60449 if (task) {
60450- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
60451+ if (log)
60452+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
60453+ else
60454+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
60455 put_task_struct(task);
60456 }
60457 return allowed;
60458@@ -588,10 +618,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
60459 struct task_struct *task,
60460 int hide_pid_min)
60461 {
60462+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60463+ return false;
60464+
60465+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60466+ rcu_read_lock();
60467+ {
60468+ const struct cred *tmpcred = current_cred();
60469+ const struct cred *cred = __task_cred(task);
60470+
60471+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
60472+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60473+ || in_group_p(grsec_proc_gid)
60474+#endif
60475+ ) {
60476+ rcu_read_unlock();
60477+ return true;
60478+ }
60479+ }
60480+ rcu_read_unlock();
60481+
60482+ if (!pid->hide_pid)
60483+ return false;
60484+#endif
60485+
60486 if (pid->hide_pid < hide_pid_min)
60487 return true;
60488 if (in_group_p(pid->pid_gid))
60489 return true;
60490+
60491 return ptrace_may_access(task, PTRACE_MODE_READ);
60492 }
60493
60494@@ -609,7 +664,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
60495 put_task_struct(task);
60496
60497 if (!has_perms) {
60498+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60499+ {
60500+#else
60501 if (pid->hide_pid == 2) {
60502+#endif
60503 /*
60504 * Let's make getdents(), stat(), and open()
60505 * consistent with each other. If a process
60506@@ -707,6 +766,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
60507 if (!task)
60508 return -ESRCH;
60509
60510+ if (gr_acl_handle_procpidmem(task)) {
60511+ put_task_struct(task);
60512+ return -EPERM;
60513+ }
60514+
60515 mm = mm_access(task, mode);
60516 put_task_struct(task);
60517
60518@@ -722,6 +786,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
60519
60520 file->private_data = mm;
60521
60522+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60523+ file->f_version = current->exec_id;
60524+#endif
60525+
60526 return 0;
60527 }
60528
60529@@ -743,6 +811,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
60530 ssize_t copied;
60531 char *page;
60532
60533+#ifdef CONFIG_GRKERNSEC
60534+ if (write)
60535+ return -EPERM;
60536+#endif
60537+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60538+ if (file->f_version != current->exec_id) {
60539+ gr_log_badprocpid("mem");
60540+ return 0;
60541+ }
60542+#endif
60543+
60544 if (!mm)
60545 return 0;
60546
60547@@ -755,7 +834,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
60548 goto free;
60549
60550 while (count > 0) {
60551- int this_len = min_t(int, count, PAGE_SIZE);
60552+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
60553
60554 if (write && copy_from_user(page, buf, this_len)) {
60555 copied = -EFAULT;
60556@@ -847,6 +926,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
60557 if (!mm)
60558 return 0;
60559
60560+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60561+ if (file->f_version != current->exec_id) {
60562+ gr_log_badprocpid("environ");
60563+ return 0;
60564+ }
60565+#endif
60566+
60567 page = (char *)__get_free_page(GFP_TEMPORARY);
60568 if (!page)
60569 return -ENOMEM;
60570@@ -856,7 +942,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
60571 goto free;
60572 while (count > 0) {
60573 size_t this_len, max_len;
60574- int retval;
60575+ ssize_t retval;
60576
60577 if (src >= (mm->env_end - mm->env_start))
60578 break;
60579@@ -1461,7 +1547,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
60580 int error = -EACCES;
60581
60582 /* Are we allowed to snoop on the tasks file descriptors? */
60583- if (!proc_fd_access_allowed(inode))
60584+ if (!proc_fd_access_allowed(inode, 0))
60585 goto out;
60586
60587 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
60588@@ -1505,8 +1591,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
60589 struct path path;
60590
60591 /* Are we allowed to snoop on the tasks file descriptors? */
60592- if (!proc_fd_access_allowed(inode))
60593- goto out;
60594+ /* logging this is needed for learning on chromium to work properly,
60595+ but we don't want to flood the logs from 'ps' which does a readlink
60596+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
60597+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
60598+ */
60599+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
60600+ if (!proc_fd_access_allowed(inode,0))
60601+ goto out;
60602+ } else {
60603+ if (!proc_fd_access_allowed(inode,1))
60604+ goto out;
60605+ }
60606
60607 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
60608 if (error)
60609@@ -1556,7 +1652,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
60610 rcu_read_lock();
60611 cred = __task_cred(task);
60612 inode->i_uid = cred->euid;
60613+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60614+ inode->i_gid = grsec_proc_gid;
60615+#else
60616 inode->i_gid = cred->egid;
60617+#endif
60618 rcu_read_unlock();
60619 }
60620 security_task_to_inode(task, inode);
60621@@ -1592,10 +1692,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
60622 return -ENOENT;
60623 }
60624 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
60625+#ifdef CONFIG_GRKERNSEC_PROC_USER
60626+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
60627+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60628+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
60629+#endif
60630 task_dumpable(task)) {
60631 cred = __task_cred(task);
60632 stat->uid = cred->euid;
60633+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60634+ stat->gid = grsec_proc_gid;
60635+#else
60636 stat->gid = cred->egid;
60637+#endif
60638 }
60639 }
60640 rcu_read_unlock();
60641@@ -1633,11 +1742,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
60642
60643 if (task) {
60644 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
60645+#ifdef CONFIG_GRKERNSEC_PROC_USER
60646+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
60647+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60648+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
60649+#endif
60650 task_dumpable(task)) {
60651 rcu_read_lock();
60652 cred = __task_cred(task);
60653 inode->i_uid = cred->euid;
60654+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60655+ inode->i_gid = grsec_proc_gid;
60656+#else
60657 inode->i_gid = cred->egid;
60658+#endif
60659 rcu_read_unlock();
60660 } else {
60661 inode->i_uid = GLOBAL_ROOT_UID;
60662@@ -2166,6 +2284,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
60663 if (!task)
60664 goto out_no_task;
60665
60666+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60667+ goto out;
60668+
60669 /*
60670 * Yes, it does not scale. And it should not. Don't add
60671 * new entries into /proc/<tgid>/ without very good reasons.
60672@@ -2196,6 +2317,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
60673 if (!task)
60674 return -ENOENT;
60675
60676+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60677+ goto out;
60678+
60679 if (!dir_emit_dots(file, ctx))
60680 goto out;
60681
60682@@ -2585,7 +2709,7 @@ static const struct pid_entry tgid_base_stuff[] = {
60683 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
60684 #endif
60685 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
60686-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60687+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60688 INF("syscall", S_IRUGO, proc_pid_syscall),
60689 #endif
60690 INF("cmdline", S_IRUGO, proc_pid_cmdline),
60691@@ -2610,10 +2734,10 @@ static const struct pid_entry tgid_base_stuff[] = {
60692 #ifdef CONFIG_SECURITY
60693 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
60694 #endif
60695-#ifdef CONFIG_KALLSYMS
60696+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60697 INF("wchan", S_IRUGO, proc_pid_wchan),
60698 #endif
60699-#ifdef CONFIG_STACKTRACE
60700+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60701 ONE("stack", S_IRUGO, proc_pid_stack),
60702 #endif
60703 #ifdef CONFIG_SCHEDSTATS
60704@@ -2647,6 +2771,9 @@ static const struct pid_entry tgid_base_stuff[] = {
60705 #ifdef CONFIG_HARDWALL
60706 INF("hardwall", S_IRUGO, proc_pid_hardwall),
60707 #endif
60708+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60709+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
60710+#endif
60711 #ifdef CONFIG_USER_NS
60712 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
60713 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
60714@@ -2777,7 +2904,14 @@ static int proc_pid_instantiate(struct inode *dir,
60715 if (!inode)
60716 goto out;
60717
60718+#ifdef CONFIG_GRKERNSEC_PROC_USER
60719+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
60720+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60721+ inode->i_gid = grsec_proc_gid;
60722+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
60723+#else
60724 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
60725+#endif
60726 inode->i_op = &proc_tgid_base_inode_operations;
60727 inode->i_fop = &proc_tgid_base_operations;
60728 inode->i_flags|=S_IMMUTABLE;
60729@@ -2815,7 +2949,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
60730 if (!task)
60731 goto out;
60732
60733+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60734+ goto out_put_task;
60735+
60736 result = proc_pid_instantiate(dir, dentry, task, NULL);
60737+out_put_task:
60738 put_task_struct(task);
60739 out:
60740 return ERR_PTR(result);
60741@@ -2921,7 +3059,7 @@ static const struct pid_entry tid_base_stuff[] = {
60742 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
60743 #endif
60744 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
60745-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60746+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60747 INF("syscall", S_IRUGO, proc_pid_syscall),
60748 #endif
60749 INF("cmdline", S_IRUGO, proc_pid_cmdline),
60750@@ -2948,10 +3086,10 @@ static const struct pid_entry tid_base_stuff[] = {
60751 #ifdef CONFIG_SECURITY
60752 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
60753 #endif
60754-#ifdef CONFIG_KALLSYMS
60755+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60756 INF("wchan", S_IRUGO, proc_pid_wchan),
60757 #endif
60758-#ifdef CONFIG_STACKTRACE
60759+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60760 ONE("stack", S_IRUGO, proc_pid_stack),
60761 #endif
60762 #ifdef CONFIG_SCHEDSTATS
60763diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
60764index 82676e3..5f8518a 100644
60765--- a/fs/proc/cmdline.c
60766+++ b/fs/proc/cmdline.c
60767@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
60768
60769 static int __init proc_cmdline_init(void)
60770 {
60771+#ifdef CONFIG_GRKERNSEC_PROC_ADD
60772+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
60773+#else
60774 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
60775+#endif
60776 return 0;
60777 }
60778 module_init(proc_cmdline_init);
60779diff --git a/fs/proc/devices.c b/fs/proc/devices.c
60780index b143471..bb105e5 100644
60781--- a/fs/proc/devices.c
60782+++ b/fs/proc/devices.c
60783@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
60784
60785 static int __init proc_devices_init(void)
60786 {
60787+#ifdef CONFIG_GRKERNSEC_PROC_ADD
60788+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
60789+#else
60790 proc_create("devices", 0, NULL, &proc_devinfo_operations);
60791+#endif
60792 return 0;
60793 }
60794 module_init(proc_devices_init);
60795diff --git a/fs/proc/fd.c b/fs/proc/fd.c
60796index 985ea88..d118a0a 100644
60797--- a/fs/proc/fd.c
60798+++ b/fs/proc/fd.c
60799@@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v)
60800 if (!task)
60801 return -ENOENT;
60802
60803- files = get_files_struct(task);
60804+ if (!gr_acl_handle_procpidmem(task))
60805+ files = get_files_struct(task);
60806 put_task_struct(task);
60807
60808 if (files) {
60809@@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
60810 */
60811 int proc_fd_permission(struct inode *inode, int mask)
60812 {
60813+ struct task_struct *task;
60814 int rv = generic_permission(inode, mask);
60815- if (rv == 0)
60816- return 0;
60817+
60818 if (task_tgid(current) == proc_pid(inode))
60819 rv = 0;
60820+
60821+ task = get_proc_task(inode);
60822+ if (task == NULL)
60823+ return rv;
60824+
60825+ if (gr_acl_handle_procpidmem(task))
60826+ rv = -EACCES;
60827+
60828+ put_task_struct(task);
60829+
60830 return rv;
60831 }
60832
60833diff --git a/fs/proc/inode.c b/fs/proc/inode.c
60834index 8eaa1ba..cc6ff42 100644
60835--- a/fs/proc/inode.c
60836+++ b/fs/proc/inode.c
60837@@ -23,11 +23,17 @@
60838 #include <linux/slab.h>
60839 #include <linux/mount.h>
60840 #include <linux/magic.h>
60841+#include <linux/grsecurity.h>
60842
60843 #include <asm/uaccess.h>
60844
60845 #include "internal.h"
60846
60847+#ifdef CONFIG_PROC_SYSCTL
60848+extern const struct inode_operations proc_sys_inode_operations;
60849+extern const struct inode_operations proc_sys_dir_operations;
60850+#endif
60851+
60852 static void proc_evict_inode(struct inode *inode)
60853 {
60854 struct proc_dir_entry *de;
60855@@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
60856 ns = PROC_I(inode)->ns.ns;
60857 if (ns_ops && ns)
60858 ns_ops->put(ns);
60859+
60860+#ifdef CONFIG_PROC_SYSCTL
60861+ if (inode->i_op == &proc_sys_inode_operations ||
60862+ inode->i_op == &proc_sys_dir_operations)
60863+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
60864+#endif
60865+
60866 }
60867
60868 static struct kmem_cache * proc_inode_cachep;
60869@@ -405,7 +418,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
60870 if (de->mode) {
60871 inode->i_mode = de->mode;
60872 inode->i_uid = de->uid;
60873+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60874+ inode->i_gid = grsec_proc_gid;
60875+#else
60876 inode->i_gid = de->gid;
60877+#endif
60878 }
60879 if (de->size)
60880 inode->i_size = de->size;
60881diff --git a/fs/proc/internal.h b/fs/proc/internal.h
60882index 651d09a..60c73ae 100644
60883--- a/fs/proc/internal.h
60884+++ b/fs/proc/internal.h
60885@@ -155,6 +155,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
60886 struct pid *, struct task_struct *);
60887 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
60888 struct pid *, struct task_struct *);
60889+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60890+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
60891+#endif
60892
60893 /*
60894 * base.c
60895diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
60896index 05029c0..7ea1987 100644
60897--- a/fs/proc/interrupts.c
60898+++ b/fs/proc/interrupts.c
60899@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
60900
60901 static int __init proc_interrupts_init(void)
60902 {
60903+#ifdef CONFIG_GRKERNSEC_PROC_ADD
60904+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
60905+#else
60906 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
60907+#endif
60908 return 0;
60909 }
60910 module_init(proc_interrupts_init);
60911diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
60912index 06ea155..9a798c7 100644
60913--- a/fs/proc/kcore.c
60914+++ b/fs/proc/kcore.c
60915@@ -484,9 +484,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
60916 * the addresses in the elf_phdr on our list.
60917 */
60918 start = kc_offset_to_vaddr(*fpos - elf_buflen);
60919- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
60920+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
60921+ if (tsz > buflen)
60922 tsz = buflen;
60923-
60924+
60925 while (buflen) {
60926 struct kcore_list *m;
60927
60928@@ -515,20 +516,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
60929 kfree(elf_buf);
60930 } else {
60931 if (kern_addr_valid(start)) {
60932- unsigned long n;
60933+ char *elf_buf;
60934+ mm_segment_t oldfs;
60935
60936- n = copy_to_user(buffer, (char *)start, tsz);
60937- /*
60938- * We cannot distinguish between fault on source
60939- * and fault on destination. When this happens
60940- * we clear too and hope it will trigger the
60941- * EFAULT again.
60942- */
60943- if (n) {
60944- if (clear_user(buffer + tsz - n,
60945- n))
60946+ elf_buf = kmalloc(tsz, GFP_KERNEL);
60947+ if (!elf_buf)
60948+ return -ENOMEM;
60949+ oldfs = get_fs();
60950+ set_fs(KERNEL_DS);
60951+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
60952+ set_fs(oldfs);
60953+ if (copy_to_user(buffer, elf_buf, tsz)) {
60954+ kfree(elf_buf);
60955 return -EFAULT;
60956+ }
60957 }
60958+ set_fs(oldfs);
60959+ kfree(elf_buf);
60960 } else {
60961 if (clear_user(buffer, tsz))
60962 return -EFAULT;
60963@@ -548,6 +552,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
60964
60965 static int open_kcore(struct inode *inode, struct file *filp)
60966 {
60967+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
60968+ return -EPERM;
60969+#endif
60970 if (!capable(CAP_SYS_RAWIO))
60971 return -EPERM;
60972 if (kcore_need_update)
60973diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
60974index 59d85d6..ac6fc05 100644
60975--- a/fs/proc/meminfo.c
60976+++ b/fs/proc/meminfo.c
60977@@ -153,7 +153,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
60978 vmi.used >> 10,
60979 vmi.largest_chunk >> 10
60980 #ifdef CONFIG_MEMORY_FAILURE
60981- ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
60982+ ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
60983 #endif
60984 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
60985 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
60986diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
60987index ccfd99b..1b7e255 100644
60988--- a/fs/proc/nommu.c
60989+++ b/fs/proc/nommu.c
60990@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
60991 if (len < 1)
60992 len = 1;
60993 seq_printf(m, "%*c", len, ' ');
60994- seq_path(m, &file->f_path, "");
60995+ seq_path(m, &file->f_path, "\n\\");
60996 }
60997
60998 seq_putc(m, '\n');
60999diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
61000index 4677bb7..408e936 100644
61001--- a/fs/proc/proc_net.c
61002+++ b/fs/proc/proc_net.c
61003@@ -23,6 +23,7 @@
61004 #include <linux/nsproxy.h>
61005 #include <net/net_namespace.h>
61006 #include <linux/seq_file.h>
61007+#include <linux/grsecurity.h>
61008
61009 #include "internal.h"
61010
61011@@ -109,6 +110,17 @@ static struct net *get_proc_task_net(struct inode *dir)
61012 struct task_struct *task;
61013 struct nsproxy *ns;
61014 struct net *net = NULL;
61015+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61016+ const struct cred *cred = current_cred();
61017+#endif
61018+
61019+#ifdef CONFIG_GRKERNSEC_PROC_USER
61020+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
61021+ return net;
61022+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61023+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
61024+ return net;
61025+#endif
61026
61027 rcu_read_lock();
61028 task = pid_task(proc_pid(dir), PIDTYPE_PID);
61029diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
61030index 7129046..6914844 100644
61031--- a/fs/proc/proc_sysctl.c
61032+++ b/fs/proc/proc_sysctl.c
61033@@ -11,13 +11,21 @@
61034 #include <linux/namei.h>
61035 #include <linux/mm.h>
61036 #include <linux/module.h>
61037+#include <linux/nsproxy.h>
61038+#ifdef CONFIG_GRKERNSEC
61039+#include <net/net_namespace.h>
61040+#endif
61041 #include "internal.h"
61042
61043+extern int gr_handle_chroot_sysctl(const int op);
61044+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
61045+ const int op);
61046+
61047 static const struct dentry_operations proc_sys_dentry_operations;
61048 static const struct file_operations proc_sys_file_operations;
61049-static const struct inode_operations proc_sys_inode_operations;
61050+const struct inode_operations proc_sys_inode_operations;
61051 static const struct file_operations proc_sys_dir_file_operations;
61052-static const struct inode_operations proc_sys_dir_operations;
61053+const struct inode_operations proc_sys_dir_operations;
61054
61055 void proc_sys_poll_notify(struct ctl_table_poll *poll)
61056 {
61057@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
61058
61059 err = NULL;
61060 d_set_d_op(dentry, &proc_sys_dentry_operations);
61061+
61062+ gr_handle_proc_create(dentry, inode);
61063+
61064 d_add(dentry, inode);
61065
61066 out:
61067@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61068 struct inode *inode = file_inode(filp);
61069 struct ctl_table_header *head = grab_header(inode);
61070 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
61071+ int op = write ? MAY_WRITE : MAY_READ;
61072 ssize_t error;
61073 size_t res;
61074
61075@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61076 * and won't be until we finish.
61077 */
61078 error = -EPERM;
61079- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
61080+ if (sysctl_perm(head, table, op))
61081 goto out;
61082
61083 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
61084@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61085 if (!table->proc_handler)
61086 goto out;
61087
61088+#ifdef CONFIG_GRKERNSEC
61089+ error = -EPERM;
61090+ if (gr_handle_chroot_sysctl(op))
61091+ goto out;
61092+ dget(filp->f_path.dentry);
61093+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
61094+ dput(filp->f_path.dentry);
61095+ goto out;
61096+ }
61097+ dput(filp->f_path.dentry);
61098+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
61099+ goto out;
61100+ if (write) {
61101+ if (current->nsproxy->net_ns != table->extra2) {
61102+ if (!capable(CAP_SYS_ADMIN))
61103+ goto out;
61104+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
61105+ goto out;
61106+ }
61107+#endif
61108+
61109 /* careful: calling conventions are nasty here */
61110 res = count;
61111 error = table->proc_handler(table, write, buf, &res, ppos);
61112@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
61113 return false;
61114 } else {
61115 d_set_d_op(child, &proc_sys_dentry_operations);
61116+
61117+ gr_handle_proc_create(child, inode);
61118+
61119 d_add(child, inode);
61120 }
61121 } else {
61122@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
61123 if ((*pos)++ < ctx->pos)
61124 return true;
61125
61126+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
61127+ return 0;
61128+
61129 if (unlikely(S_ISLNK(table->mode)))
61130 res = proc_sys_link_fill_cache(file, ctx, head, table);
61131 else
61132@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
61133 if (IS_ERR(head))
61134 return PTR_ERR(head);
61135
61136+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
61137+ return -ENOENT;
61138+
61139 generic_fillattr(inode, stat);
61140 if (table)
61141 stat->mode = (stat->mode & S_IFMT) | table->mode;
61142@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
61143 .llseek = generic_file_llseek,
61144 };
61145
61146-static const struct inode_operations proc_sys_inode_operations = {
61147+const struct inode_operations proc_sys_inode_operations = {
61148 .permission = proc_sys_permission,
61149 .setattr = proc_sys_setattr,
61150 .getattr = proc_sys_getattr,
61151 };
61152
61153-static const struct inode_operations proc_sys_dir_operations = {
61154+const struct inode_operations proc_sys_dir_operations = {
61155 .lookup = proc_sys_lookup,
61156 .permission = proc_sys_permission,
61157 .setattr = proc_sys_setattr,
61158@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
61159 static struct ctl_dir *new_dir(struct ctl_table_set *set,
61160 const char *name, int namelen)
61161 {
61162- struct ctl_table *table;
61163+ ctl_table_no_const *table;
61164 struct ctl_dir *new;
61165 struct ctl_node *node;
61166 char *new_name;
61167@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
61168 return NULL;
61169
61170 node = (struct ctl_node *)(new + 1);
61171- table = (struct ctl_table *)(node + 1);
61172+ table = (ctl_table_no_const *)(node + 1);
61173 new_name = (char *)(table + 2);
61174 memcpy(new_name, name, namelen);
61175 new_name[namelen] = '\0';
61176@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
61177 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
61178 struct ctl_table_root *link_root)
61179 {
61180- struct ctl_table *link_table, *entry, *link;
61181+ ctl_table_no_const *link_table, *link;
61182+ struct ctl_table *entry;
61183 struct ctl_table_header *links;
61184 struct ctl_node *node;
61185 char *link_name;
61186@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
61187 return NULL;
61188
61189 node = (struct ctl_node *)(links + 1);
61190- link_table = (struct ctl_table *)(node + nr_entries);
61191+ link_table = (ctl_table_no_const *)(node + nr_entries);
61192 link_name = (char *)&link_table[nr_entries + 1];
61193
61194 for (link = link_table, entry = table; entry->procname; link++, entry++) {
61195@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61196 struct ctl_table_header ***subheader, struct ctl_table_set *set,
61197 struct ctl_table *table)
61198 {
61199- struct ctl_table *ctl_table_arg = NULL;
61200- struct ctl_table *entry, *files;
61201+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
61202+ struct ctl_table *entry;
61203 int nr_files = 0;
61204 int nr_dirs = 0;
61205 int err = -ENOMEM;
61206@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61207 nr_files++;
61208 }
61209
61210- files = table;
61211 /* If there are mixed files and directories we need a new table */
61212 if (nr_dirs && nr_files) {
61213- struct ctl_table *new;
61214+ ctl_table_no_const *new;
61215 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
61216 GFP_KERNEL);
61217 if (!files)
61218@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61219 /* Register everything except a directory full of subdirectories */
61220 if (nr_files || !nr_dirs) {
61221 struct ctl_table_header *header;
61222- header = __register_sysctl_table(set, path, files);
61223+ header = __register_sysctl_table(set, path, files ? files : table);
61224 if (!header) {
61225 kfree(ctl_table_arg);
61226 goto out;
61227diff --git a/fs/proc/root.c b/fs/proc/root.c
61228index 87dbcbe..55e1b4d 100644
61229--- a/fs/proc/root.c
61230+++ b/fs/proc/root.c
61231@@ -186,7 +186,15 @@ void __init proc_root_init(void)
61232 #ifdef CONFIG_PROC_DEVICETREE
61233 proc_device_tree_init();
61234 #endif
61235+#ifdef CONFIG_GRKERNSEC_PROC_ADD
61236+#ifdef CONFIG_GRKERNSEC_PROC_USER
61237+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
61238+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61239+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
61240+#endif
61241+#else
61242 proc_mkdir("bus", NULL);
61243+#endif
61244 proc_sys_init();
61245 }
61246
61247diff --git a/fs/proc/self.c b/fs/proc/self.c
61248index 6b6a993..807cccc 100644
61249--- a/fs/proc/self.c
61250+++ b/fs/proc/self.c
61251@@ -39,7 +39,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
61252 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
61253 void *cookie)
61254 {
61255- char *s = nd_get_link(nd);
61256+ const char *s = nd_get_link(nd);
61257 if (!IS_ERR(s))
61258 kfree(s);
61259 }
61260diff --git a/fs/proc/stat.c b/fs/proc/stat.c
61261index 1cf86c0..0ee1ca5 100644
61262--- a/fs/proc/stat.c
61263+++ b/fs/proc/stat.c
61264@@ -11,6 +11,7 @@
61265 #include <linux/irqnr.h>
61266 #include <asm/cputime.h>
61267 #include <linux/tick.h>
61268+#include <linux/grsecurity.h>
61269
61270 #ifndef arch_irq_stat_cpu
61271 #define arch_irq_stat_cpu(cpu) 0
61272@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
61273 u64 sum_softirq = 0;
61274 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
61275 struct timespec boottime;
61276+ int unrestricted = 1;
61277+
61278+#ifdef CONFIG_GRKERNSEC_PROC_ADD
61279+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61280+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
61281+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
61282+ && !in_group_p(grsec_proc_gid)
61283+#endif
61284+ )
61285+ unrestricted = 0;
61286+#endif
61287+#endif
61288
61289 user = nice = system = idle = iowait =
61290 irq = softirq = steal = 0;
61291@@ -94,6 +107,7 @@ static int show_stat(struct seq_file *p, void *v)
61292 getboottime(&boottime);
61293 jif = boottime.tv_sec;
61294
61295+ if (unrestricted) {
61296 for_each_possible_cpu(i) {
61297 user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
61298 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
61299@@ -116,6 +130,7 @@ static int show_stat(struct seq_file *p, void *v)
61300 }
61301 }
61302 sum += arch_irq_stat();
61303+ }
61304
61305 seq_puts(p, "cpu ");
61306 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
61307@@ -131,6 +146,7 @@ static int show_stat(struct seq_file *p, void *v)
61308 seq_putc(p, '\n');
61309
61310 for_each_online_cpu(i) {
61311+ if (unrestricted) {
61312 /* Copy values here to work around gcc-2.95.3, gcc-2.96 */
61313 user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
61314 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
61315@@ -142,6 +158,7 @@ static int show_stat(struct seq_file *p, void *v)
61316 steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
61317 guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
61318 guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
61319+ }
61320 seq_printf(p, "cpu%d", i);
61321 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
61322 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
61323@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
61324
61325 /* sum again ? it could be updated? */
61326 for_each_irq_nr(j)
61327- seq_put_decimal_ull(p, ' ', kstat_irqs(j));
61328+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
61329
61330 seq_printf(p,
61331 "\nctxt %llu\n"
61332@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
61333 "processes %lu\n"
61334 "procs_running %lu\n"
61335 "procs_blocked %lu\n",
61336- nr_context_switches(),
61337+ unrestricted ? nr_context_switches() : 0ULL,
61338 (unsigned long)jif,
61339- total_forks,
61340- nr_running(),
61341- nr_iowait());
61342+ unrestricted ? total_forks : 0UL,
61343+ unrestricted ? nr_running() : 0UL,
61344+ unrestricted ? nr_iowait() : 0UL);
61345
61346 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
61347
61348diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
61349index 390bdab..83c1e8a 100644
61350--- a/fs/proc/task_mmu.c
61351+++ b/fs/proc/task_mmu.c
61352@@ -12,12 +12,19 @@
61353 #include <linux/swap.h>
61354 #include <linux/swapops.h>
61355 #include <linux/mmu_notifier.h>
61356+#include <linux/grsecurity.h>
61357
61358 #include <asm/elf.h>
61359 #include <asm/uaccess.h>
61360 #include <asm/tlbflush.h>
61361 #include "internal.h"
61362
61363+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61364+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
61365+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
61366+ _mm->pax_flags & MF_PAX_SEGMEXEC))
61367+#endif
61368+
61369 void task_mem(struct seq_file *m, struct mm_struct *mm)
61370 {
61371 unsigned long data, text, lib, swap;
61372@@ -53,8 +60,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61373 "VmExe:\t%8lu kB\n"
61374 "VmLib:\t%8lu kB\n"
61375 "VmPTE:\t%8lu kB\n"
61376- "VmSwap:\t%8lu kB\n",
61377- hiwater_vm << (PAGE_SHIFT-10),
61378+ "VmSwap:\t%8lu kB\n"
61379+
61380+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
61381+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
61382+#endif
61383+
61384+ ,hiwater_vm << (PAGE_SHIFT-10),
61385 total_vm << (PAGE_SHIFT-10),
61386 mm->locked_vm << (PAGE_SHIFT-10),
61387 mm->pinned_vm << (PAGE_SHIFT-10),
61388@@ -63,7 +75,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61389 data << (PAGE_SHIFT-10),
61390 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
61391 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
61392- swap << (PAGE_SHIFT-10));
61393+ swap << (PAGE_SHIFT-10)
61394+
61395+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
61396+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61397+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
61398+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
61399+#else
61400+ , mm->context.user_cs_base
61401+ , mm->context.user_cs_limit
61402+#endif
61403+#endif
61404+
61405+ );
61406 }
61407
61408 unsigned long task_vsize(struct mm_struct *mm)
61409@@ -278,13 +302,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61410 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
61411 }
61412
61413- /* We don't show the stack guard page in /proc/maps */
61414+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61415+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
61416+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
61417+#else
61418 start = vma->vm_start;
61419- if (stack_guard_page_start(vma, start))
61420- start += PAGE_SIZE;
61421 end = vma->vm_end;
61422- if (stack_guard_page_end(vma, end))
61423- end -= PAGE_SIZE;
61424+#endif
61425
61426 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
61427 start,
61428@@ -293,7 +317,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61429 flags & VM_WRITE ? 'w' : '-',
61430 flags & VM_EXEC ? 'x' : '-',
61431 flags & VM_MAYSHARE ? 's' : 'p',
61432+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61433+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
61434+#else
61435 pgoff,
61436+#endif
61437 MAJOR(dev), MINOR(dev), ino, &len);
61438
61439 /*
61440@@ -302,7 +330,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61441 */
61442 if (file) {
61443 pad_len_spaces(m, len);
61444- seq_path(m, &file->f_path, "\n");
61445+ seq_path(m, &file->f_path, "\n\\");
61446 goto done;
61447 }
61448
61449@@ -328,8 +356,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61450 * Thread stack in /proc/PID/task/TID/maps or
61451 * the main process stack.
61452 */
61453- if (!is_pid || (vma->vm_start <= mm->start_stack &&
61454- vma->vm_end >= mm->start_stack)) {
61455+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
61456+ (vma->vm_start <= mm->start_stack &&
61457+ vma->vm_end >= mm->start_stack)) {
61458 name = "[stack]";
61459 } else {
61460 /* Thread stack in /proc/PID/maps */
61461@@ -353,6 +382,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
61462 struct proc_maps_private *priv = m->private;
61463 struct task_struct *task = priv->task;
61464
61465+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61466+ if (current->exec_id != m->exec_id) {
61467+ gr_log_badprocpid("maps");
61468+ return 0;
61469+ }
61470+#endif
61471+
61472 show_map_vma(m, vma, is_pid);
61473
61474 if (m->count < m->size) /* vma is copied successfully */
61475@@ -590,12 +626,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
61476 .private = &mss,
61477 };
61478
61479+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61480+ if (current->exec_id != m->exec_id) {
61481+ gr_log_badprocpid("smaps");
61482+ return 0;
61483+ }
61484+#endif
61485 memset(&mss, 0, sizeof mss);
61486- mss.vma = vma;
61487- /* mmap_sem is held in m_start */
61488- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
61489- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
61490-
61491+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61492+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
61493+#endif
61494+ mss.vma = vma;
61495+ /* mmap_sem is held in m_start */
61496+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
61497+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
61498+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61499+ }
61500+#endif
61501 show_map_vma(m, vma, is_pid);
61502
61503 seq_printf(m,
61504@@ -613,7 +660,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
61505 "KernelPageSize: %8lu kB\n"
61506 "MMUPageSize: %8lu kB\n"
61507 "Locked: %8lu kB\n",
61508+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61509+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
61510+#else
61511 (vma->vm_end - vma->vm_start) >> 10,
61512+#endif
61513 mss.resident >> 10,
61514 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
61515 mss.shared_clean >> 10,
61516@@ -1390,6 +1441,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
61517 int n;
61518 char buffer[50];
61519
61520+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61521+ if (current->exec_id != m->exec_id) {
61522+ gr_log_badprocpid("numa_maps");
61523+ return 0;
61524+ }
61525+#endif
61526+
61527 if (!mm)
61528 return 0;
61529
61530@@ -1409,11 +1467,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
61531 if (n < 0)
61532 return n;
61533
61534+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61535+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
61536+#else
61537 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
61538+#endif
61539
61540 if (file) {
61541 seq_printf(m, " file=");
61542- seq_path(m, &file->f_path, "\n\t= ");
61543+ seq_path(m, &file->f_path, "\n\t\\= ");
61544 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
61545 seq_printf(m, " heap");
61546 } else {
61547diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
61548index 56123a6..5a2f6ec 100644
61549--- a/fs/proc/task_nommu.c
61550+++ b/fs/proc/task_nommu.c
61551@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61552 else
61553 bytes += kobjsize(mm);
61554
61555- if (current->fs && current->fs->users > 1)
61556+ if (current->fs && atomic_read(&current->fs->users) > 1)
61557 sbytes += kobjsize(current->fs);
61558 else
61559 bytes += kobjsize(current->fs);
61560@@ -168,7 +168,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
61561
61562 if (file) {
61563 pad_len_spaces(m, len);
61564- seq_path(m, &file->f_path, "");
61565+ seq_path(m, &file->f_path, "\n\\");
61566 } else if (mm) {
61567 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
61568
61569diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
61570index 9100d69..f1f9fc9 100644
61571--- a/fs/proc/vmcore.c
61572+++ b/fs/proc/vmcore.c
61573@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
61574 nr_bytes = count;
61575
61576 /* If pfn is not ram, return zeros for sparse dump files */
61577- if (pfn_is_ram(pfn) == 0)
61578- memset(buf, 0, nr_bytes);
61579- else {
61580+ if (pfn_is_ram(pfn) == 0) {
61581+ if (userbuf) {
61582+ if (clear_user((char __force_user *)buf, nr_bytes))
61583+ return -EFAULT;
61584+ } else
61585+ memset(buf, 0, nr_bytes);
61586+ } else {
61587 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
61588 offset, userbuf);
61589 if (tmp < 0)
61590@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
61591 if (*fpos < m->offset + m->size) {
61592 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
61593 start = m->paddr + *fpos - m->offset;
61594- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
61595+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
61596 if (tmp < 0)
61597 return tmp;
61598 buflen -= tsz;
61599diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
61600index b00fcc9..e0c6381 100644
61601--- a/fs/qnx6/qnx6.h
61602+++ b/fs/qnx6/qnx6.h
61603@@ -74,7 +74,7 @@ enum {
61604 BYTESEX_BE,
61605 };
61606
61607-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
61608+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
61609 {
61610 if (sbi->s_bytesex == BYTESEX_LE)
61611 return le64_to_cpu((__force __le64)n);
61612@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
61613 return (__force __fs64)cpu_to_be64(n);
61614 }
61615
61616-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
61617+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
61618 {
61619 if (sbi->s_bytesex == BYTESEX_LE)
61620 return le32_to_cpu((__force __le32)n);
61621diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
61622index 16e8abb..2dcf914 100644
61623--- a/fs/quota/netlink.c
61624+++ b/fs/quota/netlink.c
61625@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
61626 void quota_send_warning(struct kqid qid, dev_t dev,
61627 const char warntype)
61628 {
61629- static atomic_t seq;
61630+ static atomic_unchecked_t seq;
61631 struct sk_buff *skb;
61632 void *msg_head;
61633 int ret;
61634@@ -49,7 +49,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
61635 "VFS: Not enough memory to send quota warning.\n");
61636 return;
61637 }
61638- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
61639+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
61640 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
61641 if (!msg_head) {
61642 printk(KERN_ERR
61643diff --git a/fs/read_write.c b/fs/read_write.c
61644index e3cd280..a378473 100644
61645--- a/fs/read_write.c
61646+++ b/fs/read_write.c
61647@@ -438,7 +438,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
61648
61649 old_fs = get_fs();
61650 set_fs(get_ds());
61651- p = (__force const char __user *)buf;
61652+ p = (const char __force_user *)buf;
61653 if (count > MAX_RW_COUNT)
61654 count = MAX_RW_COUNT;
61655 if (file->f_op->write)
61656diff --git a/fs/readdir.c b/fs/readdir.c
61657index 93d71e5..6a14be8 100644
61658--- a/fs/readdir.c
61659+++ b/fs/readdir.c
61660@@ -17,6 +17,7 @@
61661 #include <linux/security.h>
61662 #include <linux/syscalls.h>
61663 #include <linux/unistd.h>
61664+#include <linux/namei.h>
61665
61666 #include <asm/uaccess.h>
61667
61668@@ -69,6 +70,7 @@ struct old_linux_dirent {
61669 struct readdir_callback {
61670 struct dir_context ctx;
61671 struct old_linux_dirent __user * dirent;
61672+ struct file * file;
61673 int result;
61674 };
61675
61676@@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
61677 buf->result = -EOVERFLOW;
61678 return -EOVERFLOW;
61679 }
61680+
61681+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61682+ return 0;
61683+
61684 buf->result++;
61685 dirent = buf->dirent;
61686 if (!access_ok(VERIFY_WRITE, dirent,
61687@@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
61688 if (!f.file)
61689 return -EBADF;
61690
61691+ buf.file = f.file;
61692 error = iterate_dir(f.file, &buf.ctx);
61693 if (buf.result)
61694 error = buf.result;
61695@@ -142,6 +149,7 @@ struct getdents_callback {
61696 struct dir_context ctx;
61697 struct linux_dirent __user * current_dir;
61698 struct linux_dirent __user * previous;
61699+ struct file * file;
61700 int count;
61701 int error;
61702 };
61703@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
61704 buf->error = -EOVERFLOW;
61705 return -EOVERFLOW;
61706 }
61707+
61708+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61709+ return 0;
61710+
61711 dirent = buf->previous;
61712 if (dirent) {
61713 if (__put_user(offset, &dirent->d_off))
61714@@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
61715 if (!f.file)
61716 return -EBADF;
61717
61718+ buf.file = f.file;
61719 error = iterate_dir(f.file, &buf.ctx);
61720 if (error >= 0)
61721 error = buf.error;
61722@@ -226,6 +239,7 @@ struct getdents_callback64 {
61723 struct dir_context ctx;
61724 struct linux_dirent64 __user * current_dir;
61725 struct linux_dirent64 __user * previous;
61726+ struct file *file;
61727 int count;
61728 int error;
61729 };
61730@@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
61731 buf->error = -EINVAL; /* only used if we fail.. */
61732 if (reclen > buf->count)
61733 return -EINVAL;
61734+
61735+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61736+ return 0;
61737+
61738 dirent = buf->previous;
61739 if (dirent) {
61740 if (__put_user(offset, &dirent->d_off))
61741@@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
61742 if (!f.file)
61743 return -EBADF;
61744
61745+ buf.file = f.file;
61746 error = iterate_dir(f.file, &buf.ctx);
61747 if (error >= 0)
61748 error = buf.error;
61749diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
61750index 2b7882b..1c5ef48 100644
61751--- a/fs/reiserfs/do_balan.c
61752+++ b/fs/reiserfs/do_balan.c
61753@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
61754 return;
61755 }
61756
61757- atomic_inc(&(fs_generation(tb->tb_sb)));
61758+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
61759 do_balance_starts(tb);
61760
61761 /* balance leaf returns 0 except if combining L R and S into
61762diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
61763index a958444..42b2323 100644
61764--- a/fs/reiserfs/procfs.c
61765+++ b/fs/reiserfs/procfs.c
61766@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
61767 "SMALL_TAILS " : "NO_TAILS ",
61768 replay_only(sb) ? "REPLAY_ONLY " : "",
61769 convert_reiserfs(sb) ? "CONV " : "",
61770- atomic_read(&r->s_generation_counter),
61771+ atomic_read_unchecked(&r->s_generation_counter),
61772 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
61773 SF(s_do_balance), SF(s_unneeded_left_neighbor),
61774 SF(s_good_search_by_key_reada), SF(s_bmaps),
61775diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
61776index f8adaee..0eeeeca 100644
61777--- a/fs/reiserfs/reiserfs.h
61778+++ b/fs/reiserfs/reiserfs.h
61779@@ -453,7 +453,7 @@ struct reiserfs_sb_info {
61780 /* Comment? -Hans */
61781 wait_queue_head_t s_wait;
61782 /* To be obsoleted soon by per buffer seals.. -Hans */
61783- atomic_t s_generation_counter; // increased by one every time the
61784+ atomic_unchecked_t s_generation_counter; // increased by one every time the
61785 // tree gets re-balanced
61786 unsigned long s_properties; /* File system properties. Currently holds
61787 on-disk FS format */
61788@@ -1982,7 +1982,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
61789 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
61790
61791 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
61792-#define get_generation(s) atomic_read (&fs_generation(s))
61793+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
61794 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
61795 #define __fs_changed(gen,s) (gen != get_generation (s))
61796 #define fs_changed(gen,s) \
61797diff --git a/fs/select.c b/fs/select.c
61798index dfd5cb1..1754d57 100644
61799--- a/fs/select.c
61800+++ b/fs/select.c
61801@@ -20,6 +20,7 @@
61802 #include <linux/export.h>
61803 #include <linux/slab.h>
61804 #include <linux/poll.h>
61805+#include <linux/security.h>
61806 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
61807 #include <linux/file.h>
61808 #include <linux/fdtable.h>
61809@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
61810 struct poll_list *walk = head;
61811 unsigned long todo = nfds;
61812
61813+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
61814 if (nfds > rlimit(RLIMIT_NOFILE))
61815 return -EINVAL;
61816
61817diff --git a/fs/seq_file.c b/fs/seq_file.c
61818index a290157..ec3211a 100644
61819--- a/fs/seq_file.c
61820+++ b/fs/seq_file.c
61821@@ -10,6 +10,7 @@
61822 #include <linux/seq_file.h>
61823 #include <linux/slab.h>
61824 #include <linux/cred.h>
61825+#include <linux/sched.h>
61826
61827 #include <asm/uaccess.h>
61828 #include <asm/page.h>
61829@@ -60,6 +61,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
61830 #ifdef CONFIG_USER_NS
61831 p->user_ns = file->f_cred->user_ns;
61832 #endif
61833+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61834+ p->exec_id = current->exec_id;
61835+#endif
61836
61837 /*
61838 * Wrappers around seq_open(e.g. swaps_open) need to be
61839@@ -96,7 +100,7 @@ static int traverse(struct seq_file *m, loff_t offset)
61840 return 0;
61841 }
61842 if (!m->buf) {
61843- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
61844+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
61845 if (!m->buf)
61846 return -ENOMEM;
61847 }
61848@@ -136,7 +140,7 @@ static int traverse(struct seq_file *m, loff_t offset)
61849 Eoverflow:
61850 m->op->stop(m, p);
61851 kfree(m->buf);
61852- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
61853+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
61854 return !m->buf ? -ENOMEM : -EAGAIN;
61855 }
61856
61857@@ -152,7 +156,7 @@ Eoverflow:
61858 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61859 {
61860 struct seq_file *m = file->private_data;
61861- size_t copied = 0;
61862+ ssize_t copied = 0;
61863 loff_t pos;
61864 size_t n;
61865 void *p;
61866@@ -191,7 +195,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61867
61868 /* grab buffer if we didn't have one */
61869 if (!m->buf) {
61870- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
61871+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
61872 if (!m->buf)
61873 goto Enomem;
61874 }
61875@@ -232,7 +236,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61876 goto Fill;
61877 m->op->stop(m, p);
61878 kfree(m->buf);
61879- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
61880+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
61881 if (!m->buf)
61882 goto Enomem;
61883 m->count = 0;
61884@@ -583,7 +587,7 @@ static void single_stop(struct seq_file *p, void *v)
61885 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
61886 void *data)
61887 {
61888- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
61889+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
61890 int res = -ENOMEM;
61891
61892 if (op) {
61893diff --git a/fs/splice.c b/fs/splice.c
61894index 3b7ee65..87fc2e4 100644
61895--- a/fs/splice.c
61896+++ b/fs/splice.c
61897@@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61898 pipe_lock(pipe);
61899
61900 for (;;) {
61901- if (!pipe->readers) {
61902+ if (!atomic_read(&pipe->readers)) {
61903 send_sig(SIGPIPE, current, 0);
61904 if (!ret)
61905 ret = -EPIPE;
61906@@ -219,7 +219,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61907 page_nr++;
61908 ret += buf->len;
61909
61910- if (pipe->files)
61911+ if (atomic_read(&pipe->files))
61912 do_wakeup = 1;
61913
61914 if (!--spd->nr_pages)
61915@@ -250,9 +250,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61916 do_wakeup = 0;
61917 }
61918
61919- pipe->waiting_writers++;
61920+ atomic_inc(&pipe->waiting_writers);
61921 pipe_wait(pipe);
61922- pipe->waiting_writers--;
61923+ atomic_dec(&pipe->waiting_writers);
61924 }
61925
61926 pipe_unlock(pipe);
61927@@ -565,7 +565,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
61928 old_fs = get_fs();
61929 set_fs(get_ds());
61930 /* The cast to a user pointer is valid due to the set_fs() */
61931- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
61932+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
61933 set_fs(old_fs);
61934
61935 return res;
61936@@ -580,7 +580,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
61937 old_fs = get_fs();
61938 set_fs(get_ds());
61939 /* The cast to a user pointer is valid due to the set_fs() */
61940- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
61941+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
61942 set_fs(old_fs);
61943
61944 return res;
61945@@ -633,7 +633,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
61946 goto err;
61947
61948 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
61949- vec[i].iov_base = (void __user *) page_address(page);
61950+ vec[i].iov_base = (void __force_user *) page_address(page);
61951 vec[i].iov_len = this_len;
61952 spd.pages[i] = page;
61953 spd.nr_pages++;
61954@@ -829,7 +829,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
61955 ops->release(pipe, buf);
61956 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
61957 pipe->nrbufs--;
61958- if (pipe->files)
61959+ if (atomic_read(&pipe->files))
61960 sd->need_wakeup = true;
61961 }
61962
61963@@ -854,10 +854,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
61964 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
61965 {
61966 while (!pipe->nrbufs) {
61967- if (!pipe->writers)
61968+ if (!atomic_read(&pipe->writers))
61969 return 0;
61970
61971- if (!pipe->waiting_writers && sd->num_spliced)
61972+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
61973 return 0;
61974
61975 if (sd->flags & SPLICE_F_NONBLOCK)
61976@@ -1179,7 +1179,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
61977 * out of the pipe right after the splice_to_pipe(). So set
61978 * PIPE_READERS appropriately.
61979 */
61980- pipe->readers = 1;
61981+ atomic_set(&pipe->readers, 1);
61982
61983 current->splice_pipe = pipe;
61984 }
61985@@ -1475,6 +1475,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
61986
61987 partial[buffers].offset = off;
61988 partial[buffers].len = plen;
61989+ partial[buffers].private = 0;
61990
61991 off = 0;
61992 len -= plen;
61993@@ -1777,9 +1778,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
61994 ret = -ERESTARTSYS;
61995 break;
61996 }
61997- if (!pipe->writers)
61998+ if (!atomic_read(&pipe->writers))
61999 break;
62000- if (!pipe->waiting_writers) {
62001+ if (!atomic_read(&pipe->waiting_writers)) {
62002 if (flags & SPLICE_F_NONBLOCK) {
62003 ret = -EAGAIN;
62004 break;
62005@@ -1811,7 +1812,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
62006 pipe_lock(pipe);
62007
62008 while (pipe->nrbufs >= pipe->buffers) {
62009- if (!pipe->readers) {
62010+ if (!atomic_read(&pipe->readers)) {
62011 send_sig(SIGPIPE, current, 0);
62012 ret = -EPIPE;
62013 break;
62014@@ -1824,9 +1825,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
62015 ret = -ERESTARTSYS;
62016 break;
62017 }
62018- pipe->waiting_writers++;
62019+ atomic_inc(&pipe->waiting_writers);
62020 pipe_wait(pipe);
62021- pipe->waiting_writers--;
62022+ atomic_dec(&pipe->waiting_writers);
62023 }
62024
62025 pipe_unlock(pipe);
62026@@ -1862,14 +1863,14 @@ retry:
62027 pipe_double_lock(ipipe, opipe);
62028
62029 do {
62030- if (!opipe->readers) {
62031+ if (!atomic_read(&opipe->readers)) {
62032 send_sig(SIGPIPE, current, 0);
62033 if (!ret)
62034 ret = -EPIPE;
62035 break;
62036 }
62037
62038- if (!ipipe->nrbufs && !ipipe->writers)
62039+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
62040 break;
62041
62042 /*
62043@@ -1966,7 +1967,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
62044 pipe_double_lock(ipipe, opipe);
62045
62046 do {
62047- if (!opipe->readers) {
62048+ if (!atomic_read(&opipe->readers)) {
62049 send_sig(SIGPIPE, current, 0);
62050 if (!ret)
62051 ret = -EPIPE;
62052@@ -2011,7 +2012,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
62053 * return EAGAIN if we have the potential of some data in the
62054 * future, otherwise just return 0
62055 */
62056- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
62057+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
62058 ret = -EAGAIN;
62059
62060 pipe_unlock(ipipe);
62061diff --git a/fs/stat.c b/fs/stat.c
62062index ae0c3ce..9ee641c 100644
62063--- a/fs/stat.c
62064+++ b/fs/stat.c
62065@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
62066 stat->gid = inode->i_gid;
62067 stat->rdev = inode->i_rdev;
62068 stat->size = i_size_read(inode);
62069- stat->atime = inode->i_atime;
62070- stat->mtime = inode->i_mtime;
62071+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
62072+ stat->atime = inode->i_ctime;
62073+ stat->mtime = inode->i_ctime;
62074+ } else {
62075+ stat->atime = inode->i_atime;
62076+ stat->mtime = inode->i_mtime;
62077+ }
62078 stat->ctime = inode->i_ctime;
62079 stat->blksize = (1 << inode->i_blkbits);
62080 stat->blocks = inode->i_blocks;
62081@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
62082 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
62083 {
62084 struct inode *inode = path->dentry->d_inode;
62085+ int retval;
62086
62087- if (inode->i_op->getattr)
62088- return inode->i_op->getattr(path->mnt, path->dentry, stat);
62089+ if (inode->i_op->getattr) {
62090+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
62091+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
62092+ stat->atime = stat->ctime;
62093+ stat->mtime = stat->ctime;
62094+ }
62095+ return retval;
62096+ }
62097
62098 generic_fillattr(inode, stat);
62099 return 0;
62100diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
62101index c590cab..6dfd6fc 100644
62102--- a/fs/sysfs/bin.c
62103+++ b/fs/sysfs/bin.c
62104@@ -234,13 +234,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
62105 return ret;
62106 }
62107
62108-static int bin_access(struct vm_area_struct *vma, unsigned long addr,
62109- void *buf, int len, int write)
62110+static ssize_t bin_access(struct vm_area_struct *vma, unsigned long addr,
62111+ void *buf, size_t len, int write)
62112 {
62113 struct file *file = vma->vm_file;
62114 struct bin_buffer *bb = file->private_data;
62115 struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
62116- int ret;
62117+ ssize_t ret;
62118
62119 if (!bb->vm_ops)
62120 return -EINVAL;
62121diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
62122index 4d83ced..049dc45 100644
62123--- a/fs/sysfs/dir.c
62124+++ b/fs/sysfs/dir.c
62125@@ -40,7 +40,7 @@ static DEFINE_IDA(sysfs_ino_ida);
62126 *
62127 * Returns 31 bit hash of ns + name (so it fits in an off_t )
62128 */
62129-static unsigned int sysfs_name_hash(const void *ns, const char *name)
62130+static unsigned int sysfs_name_hash(const void *ns, const unsigned char *name)
62131 {
62132 unsigned long hash = init_name_hash();
62133 unsigned int len = strlen(name);
62134@@ -675,6 +675,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
62135 struct sysfs_dirent *sd;
62136 int rc;
62137
62138+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
62139+ const char *parent_name = parent_sd->s_name;
62140+
62141+ mode = S_IFDIR | S_IRWXU;
62142+
62143+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
62144+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
62145+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
62146+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
62147+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
62148+#endif
62149+
62150 /* allocate */
62151 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
62152 if (!sd)
62153diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
62154index 15ef5eb..e474372 100644
62155--- a/fs/sysfs/file.c
62156+++ b/fs/sysfs/file.c
62157@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
62158
62159 struct sysfs_open_dirent {
62160 atomic_t refcnt;
62161- atomic_t event;
62162+ atomic_unchecked_t event;
62163 wait_queue_head_t poll;
62164 struct list_head buffers; /* goes through sysfs_buffer.list */
62165 };
62166@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry *dentry, struct sysfs_buffer *buffer)
62167 if (!sysfs_get_active(attr_sd))
62168 return -ENODEV;
62169
62170- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
62171+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
62172 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
62173
62174 sysfs_put_active(attr_sd);
62175@@ -284,7 +284,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
62176 return -ENOMEM;
62177
62178 atomic_set(&new_od->refcnt, 0);
62179- atomic_set(&new_od->event, 1);
62180+ atomic_set_unchecked(&new_od->event, 1);
62181 init_waitqueue_head(&new_od->poll);
62182 INIT_LIST_HEAD(&new_od->buffers);
62183 goto retry;
62184@@ -430,7 +430,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
62185
62186 sysfs_put_active(attr_sd);
62187
62188- if (buffer->event != atomic_read(&od->event))
62189+ if (buffer->event != atomic_read_unchecked(&od->event))
62190 goto trigger;
62191
62192 return DEFAULT_POLLMASK;
62193@@ -450,7 +450,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
62194 if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) {
62195 od = sd->s_attr.open;
62196 if (od) {
62197- atomic_inc(&od->event);
62198+ atomic_inc_unchecked(&od->event);
62199 wake_up_interruptible(&od->poll);
62200 }
62201 }
62202diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
62203index 2dd4507..62a215a 100644
62204--- a/fs/sysfs/symlink.c
62205+++ b/fs/sysfs/symlink.c
62206@@ -308,7 +308,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
62207 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd,
62208 void *cookie)
62209 {
62210- char *page = nd_get_link(nd);
62211+ const char *page = nd_get_link(nd);
62212 if (!IS_ERR(page))
62213 free_page((unsigned long)page);
62214 }
62215diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
62216index 69d4889..a810bd4 100644
62217--- a/fs/sysv/sysv.h
62218+++ b/fs/sysv/sysv.h
62219@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
62220 #endif
62221 }
62222
62223-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
62224+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
62225 {
62226 if (sbi->s_bytesex == BYTESEX_PDP)
62227 return PDP_swab((__force __u32)n);
62228diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
62229index e18b988..f1d4ad0f 100644
62230--- a/fs/ubifs/io.c
62231+++ b/fs/ubifs/io.c
62232@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
62233 return err;
62234 }
62235
62236-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
62237+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
62238 {
62239 int err;
62240
62241diff --git a/fs/udf/misc.c b/fs/udf/misc.c
62242index c175b4d..8f36a16 100644
62243--- a/fs/udf/misc.c
62244+++ b/fs/udf/misc.c
62245@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
62246
62247 u8 udf_tag_checksum(const struct tag *t)
62248 {
62249- u8 *data = (u8 *)t;
62250+ const u8 *data = (const u8 *)t;
62251 u8 checksum = 0;
62252 int i;
62253 for (i = 0; i < sizeof(struct tag); ++i)
62254diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
62255index 8d974c4..b82f6ec 100644
62256--- a/fs/ufs/swab.h
62257+++ b/fs/ufs/swab.h
62258@@ -22,7 +22,7 @@ enum {
62259 BYTESEX_BE
62260 };
62261
62262-static inline u64
62263+static inline u64 __intentional_overflow(-1)
62264 fs64_to_cpu(struct super_block *sbp, __fs64 n)
62265 {
62266 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
62267@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
62268 return (__force __fs64)cpu_to_be64(n);
62269 }
62270
62271-static inline u32
62272+static inline u32 __intentional_overflow(-1)
62273 fs32_to_cpu(struct super_block *sbp, __fs32 n)
62274 {
62275 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
62276diff --git a/fs/utimes.c b/fs/utimes.c
62277index f4fb7ec..3fe03c0 100644
62278--- a/fs/utimes.c
62279+++ b/fs/utimes.c
62280@@ -1,6 +1,7 @@
62281 #include <linux/compiler.h>
62282 #include <linux/file.h>
62283 #include <linux/fs.h>
62284+#include <linux/security.h>
62285 #include <linux/linkage.h>
62286 #include <linux/mount.h>
62287 #include <linux/namei.h>
62288@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
62289 goto mnt_drop_write_and_out;
62290 }
62291 }
62292+
62293+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
62294+ error = -EACCES;
62295+ goto mnt_drop_write_and_out;
62296+ }
62297+
62298 mutex_lock(&inode->i_mutex);
62299 error = notify_change(path->dentry, &newattrs);
62300 mutex_unlock(&inode->i_mutex);
62301diff --git a/fs/xattr.c b/fs/xattr.c
62302index 3377dff..f394815 100644
62303--- a/fs/xattr.c
62304+++ b/fs/xattr.c
62305@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
62306 return rc;
62307 }
62308
62309+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
62310+ssize_t
62311+pax_getxattr(struct dentry *dentry, void *value, size_t size)
62312+{
62313+ struct inode *inode = dentry->d_inode;
62314+ ssize_t error;
62315+
62316+ error = inode_permission(inode, MAY_EXEC);
62317+ if (error)
62318+ return error;
62319+
62320+ if (inode->i_op->getxattr)
62321+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
62322+ else
62323+ error = -EOPNOTSUPP;
62324+
62325+ return error;
62326+}
62327+EXPORT_SYMBOL(pax_getxattr);
62328+#endif
62329+
62330 ssize_t
62331 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
62332 {
62333@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
62334 * Extended attribute SET operations
62335 */
62336 static long
62337-setxattr(struct dentry *d, const char __user *name, const void __user *value,
62338+setxattr(struct path *path, const char __user *name, const void __user *value,
62339 size_t size, int flags)
62340 {
62341 int error;
62342@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
62343 posix_acl_fix_xattr_from_user(kvalue, size);
62344 }
62345
62346- error = vfs_setxattr(d, kname, kvalue, size, flags);
62347+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
62348+ error = -EACCES;
62349+ goto out;
62350+ }
62351+
62352+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
62353 out:
62354 if (vvalue)
62355 vfree(vvalue);
62356@@ -377,7 +403,7 @@ retry:
62357 return error;
62358 error = mnt_want_write(path.mnt);
62359 if (!error) {
62360- error = setxattr(path.dentry, name, value, size, flags);
62361+ error = setxattr(&path, name, value, size, flags);
62362 mnt_drop_write(path.mnt);
62363 }
62364 path_put(&path);
62365@@ -401,7 +427,7 @@ retry:
62366 return error;
62367 error = mnt_want_write(path.mnt);
62368 if (!error) {
62369- error = setxattr(path.dentry, name, value, size, flags);
62370+ error = setxattr(&path, name, value, size, flags);
62371 mnt_drop_write(path.mnt);
62372 }
62373 path_put(&path);
62374@@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
62375 const void __user *,value, size_t, size, int, flags)
62376 {
62377 struct fd f = fdget(fd);
62378- struct dentry *dentry;
62379 int error = -EBADF;
62380
62381 if (!f.file)
62382 return error;
62383- dentry = f.file->f_path.dentry;
62384- audit_inode(NULL, dentry, 0);
62385+ audit_inode(NULL, f.file->f_path.dentry, 0);
62386 error = mnt_want_write_file(f.file);
62387 if (!error) {
62388- error = setxattr(dentry, name, value, size, flags);
62389+ error = setxattr(&f.file->f_path, name, value, size, flags);
62390 mnt_drop_write_file(f.file);
62391 }
62392 fdput(f);
62393@@ -626,7 +650,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
62394 * Extended attribute REMOVE operations
62395 */
62396 static long
62397-removexattr(struct dentry *d, const char __user *name)
62398+removexattr(struct path *path, const char __user *name)
62399 {
62400 int error;
62401 char kname[XATTR_NAME_MAX + 1];
62402@@ -637,7 +661,10 @@ removexattr(struct dentry *d, const char __user *name)
62403 if (error < 0)
62404 return error;
62405
62406- return vfs_removexattr(d, kname);
62407+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
62408+ return -EACCES;
62409+
62410+ return vfs_removexattr(path->dentry, kname);
62411 }
62412
62413 SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
62414@@ -652,7 +679,7 @@ retry:
62415 return error;
62416 error = mnt_want_write(path.mnt);
62417 if (!error) {
62418- error = removexattr(path.dentry, name);
62419+ error = removexattr(&path, name);
62420 mnt_drop_write(path.mnt);
62421 }
62422 path_put(&path);
62423@@ -675,7 +702,7 @@ retry:
62424 return error;
62425 error = mnt_want_write(path.mnt);
62426 if (!error) {
62427- error = removexattr(path.dentry, name);
62428+ error = removexattr(&path, name);
62429 mnt_drop_write(path.mnt);
62430 }
62431 path_put(&path);
62432@@ -689,16 +716,16 @@ retry:
62433 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
62434 {
62435 struct fd f = fdget(fd);
62436- struct dentry *dentry;
62437+ struct path *path;
62438 int error = -EBADF;
62439
62440 if (!f.file)
62441 return error;
62442- dentry = f.file->f_path.dentry;
62443- audit_inode(NULL, dentry, 0);
62444+ path = &f.file->f_path;
62445+ audit_inode(NULL, path->dentry, 0);
62446 error = mnt_want_write_file(f.file);
62447 if (!error) {
62448- error = removexattr(dentry, name);
62449+ error = removexattr(path, name);
62450 mnt_drop_write_file(f.file);
62451 }
62452 fdput(f);
62453diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
62454index 9fbea87..6b19972 100644
62455--- a/fs/xattr_acl.c
62456+++ b/fs/xattr_acl.c
62457@@ -76,8 +76,8 @@ struct posix_acl *
62458 posix_acl_from_xattr(struct user_namespace *user_ns,
62459 const void *value, size_t size)
62460 {
62461- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
62462- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
62463+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
62464+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
62465 int count;
62466 struct posix_acl *acl;
62467 struct posix_acl_entry *acl_e;
62468diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
62469index f47e65c..e7125d9 100644
62470--- a/fs/xfs/xfs_bmap.c
62471+++ b/fs/xfs/xfs_bmap.c
62472@@ -586,7 +586,7 @@ xfs_bmap_validate_ret(
62473
62474 #else
62475 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
62476-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
62477+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
62478 #endif /* DEBUG */
62479
62480 /*
62481diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
62482index 8f84153..7ce60d0 100644
62483--- a/fs/xfs/xfs_dir2_readdir.c
62484+++ b/fs/xfs/xfs_dir2_readdir.c
62485@@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
62486 ino = xfs_dir3_sfe_get_ino(mp, sfp, sfep);
62487 filetype = xfs_dir3_sfe_get_ftype(mp, sfp, sfep);
62488 ctx->pos = off & 0x7fffffff;
62489- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
62490+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
62491+ char name[sfep->namelen];
62492+ memcpy(name, sfep->name, sfep->namelen);
62493+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
62494+ return 0;
62495+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
62496 xfs_dir3_get_dtype(mp, filetype)))
62497 return 0;
62498 sfep = xfs_dir3_sf_nextentry(mp, sfp, sfep);
62499diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
62500index 8c8ef24..689f742 100644
62501--- a/fs/xfs/xfs_ioctl.c
62502+++ b/fs/xfs/xfs_ioctl.c
62503@@ -127,7 +127,7 @@ xfs_find_handle(
62504 }
62505
62506 error = -EFAULT;
62507- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
62508+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
62509 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
62510 goto out_put;
62511
62512diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
62513index 2b8952d..a60c6be 100644
62514--- a/fs/xfs/xfs_iops.c
62515+++ b/fs/xfs/xfs_iops.c
62516@@ -401,7 +401,7 @@ xfs_vn_put_link(
62517 struct nameidata *nd,
62518 void *p)
62519 {
62520- char *s = nd_get_link(nd);
62521+ const char *s = nd_get_link(nd);
62522
62523 if (!IS_ERR(s))
62524 kfree(s);
62525diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
62526new file mode 100644
62527index 0000000..5b2538b
62528--- /dev/null
62529+++ b/grsecurity/Kconfig
62530@@ -0,0 +1,1116 @@
62531+#
62532+# grecurity configuration
62533+#
62534+menu "Memory Protections"
62535+depends on GRKERNSEC
62536+
62537+config GRKERNSEC_KMEM
62538+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
62539+ default y if GRKERNSEC_CONFIG_AUTO
62540+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
62541+ help
62542+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
62543+ be written to or read from to modify or leak the contents of the running
62544+ kernel. /dev/port will also not be allowed to be opened, and support
62545+ for /dev/cpu/*/msr and kexec will be removed. If you have module
62546+ support disabled, enabling this will close up six ways that are
62547+ currently used to insert malicious code into the running kernel.
62548+
62549+ Even with this feature enabled, we still highly recommend that
62550+ you use the RBAC system, as it is still possible for an attacker to
62551+ modify the running kernel through other more obscure methods.
62552+
62553+ Enabling this feature will prevent the "cpupower" and "powertop" tools
62554+ from working.
62555+
62556+ It is highly recommended that you say Y here if you meet all the
62557+ conditions above.
62558+
62559+config GRKERNSEC_VM86
62560+ bool "Restrict VM86 mode"
62561+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62562+ depends on X86_32
62563+
62564+ help
62565+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
62566+ make use of a special execution mode on 32bit x86 processors called
62567+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
62568+ video cards and will still work with this option enabled. The purpose
62569+ of the option is to prevent exploitation of emulation errors in
62570+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
62571+ Nearly all users should be able to enable this option.
62572+
62573+config GRKERNSEC_IO
62574+ bool "Disable privileged I/O"
62575+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62576+ depends on X86
62577+ select RTC_CLASS
62578+ select RTC_INTF_DEV
62579+ select RTC_DRV_CMOS
62580+
62581+ help
62582+ If you say Y here, all ioperm and iopl calls will return an error.
62583+ Ioperm and iopl can be used to modify the running kernel.
62584+ Unfortunately, some programs need this access to operate properly,
62585+ the most notable of which are XFree86 and hwclock. hwclock can be
62586+ remedied by having RTC support in the kernel, so real-time
62587+ clock support is enabled if this option is enabled, to ensure
62588+ that hwclock operates correctly.
62589+
62590+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
62591+ you may not be able to boot into a graphical environment with this
62592+ option enabled. In this case, you should use the RBAC system instead.
62593+
62594+config GRKERNSEC_JIT_HARDEN
62595+ bool "Harden BPF JIT against spray attacks"
62596+ default y if GRKERNSEC_CONFIG_AUTO
62597+ depends on BPF_JIT
62598+ help
62599+ If you say Y here, the native code generated by the kernel's Berkeley
62600+ Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
62601+ attacks that attempt to fit attacker-beneficial instructions in
62602+ 32bit immediate fields of JIT-generated native instructions. The
62603+ attacker will generally aim to cause an unintended instruction sequence
62604+ of JIT-generated native code to execute by jumping into the middle of
62605+ a generated instruction. This feature effectively randomizes the 32bit
62606+ immediate constants present in the generated code to thwart such attacks.
62607+
62608+ If you're using KERNEXEC, it's recommended that you enable this option
62609+ to supplement the hardening of the kernel.
62610+
62611+config GRKERNSEC_PERF_HARDEN
62612+ bool "Disable unprivileged PERF_EVENTS usage by default"
62613+ default y if GRKERNSEC_CONFIG_AUTO
62614+ depends on PERF_EVENTS
62615+ help
62616+ If you say Y here, the range of acceptable values for the
62617+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
62618+ default to a new value: 3. When the sysctl is set to this value, no
62619+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
62620+
62621+ Though PERF_EVENTS can be used legitimately for performance monitoring
62622+ and low-level application profiling, it is forced on regardless of
62623+ configuration, has been at fault for several vulnerabilities, and
62624+ creates new opportunities for side channels and other information leaks.
62625+
62626+ This feature puts PERF_EVENTS into a secure default state and permits
62627+ the administrator to change out of it temporarily if unprivileged
62628+ application profiling is needed.
62629+
62630+config GRKERNSEC_RAND_THREADSTACK
62631+ bool "Insert random gaps between thread stacks"
62632+ default y if GRKERNSEC_CONFIG_AUTO
62633+ depends on PAX_RANDMMAP && !PPC
62634+ help
62635+ If you say Y here, a random-sized gap will be enforced between allocated
62636+ thread stacks. Glibc's NPTL and other threading libraries that
62637+ pass MAP_STACK to the kernel for thread stack allocation are supported.
62638+ The implementation currently provides 8 bits of entropy for the gap.
62639+
62640+ Many distributions do not compile threaded remote services with the
62641+ -fstack-check argument to GCC, causing the variable-sized stack-based
62642+ allocator, alloca(), to not probe the stack on allocation. This
62643+ permits an unbounded alloca() to skip over any guard page and potentially
62644+ modify another thread's stack reliably. An enforced random gap
62645+ reduces the reliability of such an attack and increases the chance
62646+ that such a read/write to another thread's stack instead lands in
62647+ an unmapped area, causing a crash and triggering grsecurity's
62648+ anti-bruteforcing logic.
62649+
62650+config GRKERNSEC_PROC_MEMMAP
62651+ bool "Harden ASLR against information leaks and entropy reduction"
62652+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
62653+ depends on PAX_NOEXEC || PAX_ASLR
62654+ help
62655+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
62656+ give no information about the addresses of its mappings if
62657+ PaX features that rely on random addresses are enabled on the task.
62658+ In addition to sanitizing this information and disabling other
62659+ dangerous sources of information, this option causes reads of sensitive
62660+ /proc/<pid> entries where the file descriptor was opened in a different
62661+ task than the one performing the read. Such attempts are logged.
62662+ This option also limits argv/env strings for suid/sgid binaries
62663+ to 512KB to prevent a complete exhaustion of the stack entropy provided
62664+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
62665+ binaries to prevent alternative mmap layouts from being abused.
62666+
62667+ If you use PaX it is essential that you say Y here as it closes up
62668+ several holes that make full ASLR useless locally.
62669+
62670+config GRKERNSEC_BRUTE
62671+ bool "Deter exploit bruteforcing"
62672+ default y if GRKERNSEC_CONFIG_AUTO
62673+ help
62674+ If you say Y here, attempts to bruteforce exploits against forking
62675+ daemons such as apache or sshd, as well as against suid/sgid binaries
62676+ will be deterred. When a child of a forking daemon is killed by PaX
62677+ or crashes due to an illegal instruction or other suspicious signal,
62678+ the parent process will be delayed 30 seconds upon every subsequent
62679+ fork until the administrator is able to assess the situation and
62680+ restart the daemon.
62681+ In the suid/sgid case, the attempt is logged, the user has all their
62682+ existing instances of the suid/sgid binary terminated and will
62683+ be unable to execute any suid/sgid binaries for 15 minutes.
62684+
62685+ It is recommended that you also enable signal logging in the auditing
62686+ section so that logs are generated when a process triggers a suspicious
62687+ signal.
62688+ If the sysctl option is enabled, a sysctl option with name
62689+ "deter_bruteforce" is created.
62690+
62691+
62692+config GRKERNSEC_MODHARDEN
62693+ bool "Harden module auto-loading"
62694+ default y if GRKERNSEC_CONFIG_AUTO
62695+ depends on MODULES
62696+ help
62697+ If you say Y here, module auto-loading in response to use of some
62698+ feature implemented by an unloaded module will be restricted to
62699+ root users. Enabling this option helps defend against attacks
62700+ by unprivileged users who abuse the auto-loading behavior to
62701+ cause a vulnerable module to load that is then exploited.
62702+
62703+ If this option prevents a legitimate use of auto-loading for a
62704+ non-root user, the administrator can execute modprobe manually
62705+ with the exact name of the module mentioned in the alert log.
62706+ Alternatively, the administrator can add the module to the list
62707+ of modules loaded at boot by modifying init scripts.
62708+
62709+ Modification of init scripts will most likely be needed on
62710+ Ubuntu servers with encrypted home directory support enabled,
62711+ as the first non-root user logging in will cause the ecb(aes),
62712+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
62713+
62714+config GRKERNSEC_HIDESYM
62715+ bool "Hide kernel symbols"
62716+ default y if GRKERNSEC_CONFIG_AUTO
62717+ select PAX_USERCOPY_SLABS
62718+ help
62719+ If you say Y here, getting information on loaded modules, and
62720+ displaying all kernel symbols through a syscall will be restricted
62721+ to users with CAP_SYS_MODULE. For software compatibility reasons,
62722+ /proc/kallsyms will be restricted to the root user. The RBAC
62723+ system can hide that entry even from root.
62724+
62725+ This option also prevents leaking of kernel addresses through
62726+ several /proc entries.
62727+
62728+ Note that this option is only effective provided the following
62729+ conditions are met:
62730+ 1) The kernel using grsecurity is not precompiled by some distribution
62731+ 2) You have also enabled GRKERNSEC_DMESG
62732+ 3) You are using the RBAC system and hiding other files such as your
62733+ kernel image and System.map. Alternatively, enabling this option
62734+ causes the permissions on /boot, /lib/modules, and the kernel
62735+ source directory to change at compile time to prevent
62736+ reading by non-root users.
62737+ If the above conditions are met, this option will aid in providing a
62738+ useful protection against local kernel exploitation of overflows
62739+ and arbitrary read/write vulnerabilities.
62740+
62741+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
62742+ in addition to this feature.
62743+
62744+config GRKERNSEC_KERN_LOCKOUT
62745+ bool "Active kernel exploit response"
62746+ default y if GRKERNSEC_CONFIG_AUTO
62747+ depends on X86 || ARM || PPC || SPARC
62748+ help
62749+ If you say Y here, when a PaX alert is triggered due to suspicious
62750+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
62751+ or an OOPS occurs due to bad memory accesses, instead of just
62752+ terminating the offending process (and potentially allowing
62753+ a subsequent exploit from the same user), we will take one of two
62754+ actions:
62755+ If the user was root, we will panic the system
62756+ If the user was non-root, we will log the attempt, terminate
62757+ all processes owned by the user, then prevent them from creating
62758+ any new processes until the system is restarted
62759+ This deters repeated kernel exploitation/bruteforcing attempts
62760+ and is useful for later forensics.
62761+
62762+config GRKERNSEC_OLD_ARM_USERLAND
62763+ bool "Old ARM userland compatibility"
62764+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
62765+ help
62766+ If you say Y here, stubs of executable code to perform such operations
62767+ as "compare-exchange" will be placed at fixed locations in the ARM vector
62768+ table. This is unfortunately needed for old ARM userland meant to run
62769+ across a wide range of processors. Without this option enabled,
62770+ the get_tls and data memory barrier stubs will be emulated by the kernel,
62771+ which is enough for Linaro userlands or other userlands designed for v6
62772+ and newer ARM CPUs. It's recommended that you try without this option enabled
62773+ first, and only enable it if your userland does not boot (it will likely fail
62774+ at init time).
62775+
62776+endmenu
62777+menu "Role Based Access Control Options"
62778+depends on GRKERNSEC
62779+
62780+config GRKERNSEC_RBAC_DEBUG
62781+ bool
62782+
62783+config GRKERNSEC_NO_RBAC
62784+ bool "Disable RBAC system"
62785+ help
62786+ If you say Y here, the /dev/grsec device will be removed from the kernel,
62787+ preventing the RBAC system from being enabled. You should only say Y
62788+ here if you have no intention of using the RBAC system, so as to prevent
62789+ an attacker with root access from misusing the RBAC system to hide files
62790+ and processes when loadable module support and /dev/[k]mem have been
62791+ locked down.
62792+
62793+config GRKERNSEC_ACL_HIDEKERN
62794+ bool "Hide kernel processes"
62795+ help
62796+ If you say Y here, all kernel threads will be hidden to all
62797+ processes but those whose subject has the "view hidden processes"
62798+ flag.
62799+
62800+config GRKERNSEC_ACL_MAXTRIES
62801+ int "Maximum tries before password lockout"
62802+ default 3
62803+ help
62804+ This option enforces the maximum number of times a user can attempt
62805+ to authorize themselves with the grsecurity RBAC system before being
62806+ denied the ability to attempt authorization again for a specified time.
62807+ The lower the number, the harder it will be to brute-force a password.
62808+
62809+config GRKERNSEC_ACL_TIMEOUT
62810+ int "Time to wait after max password tries, in seconds"
62811+ default 30
62812+ help
62813+ This option specifies the time the user must wait after attempting to
62814+ authorize to the RBAC system with the maximum number of invalid
62815+ passwords. The higher the number, the harder it will be to brute-force
62816+ a password.
62817+
62818+endmenu
62819+menu "Filesystem Protections"
62820+depends on GRKERNSEC
62821+
62822+config GRKERNSEC_PROC
62823+ bool "Proc restrictions"
62824+ default y if GRKERNSEC_CONFIG_AUTO
62825+ help
62826+ If you say Y here, the permissions of the /proc filesystem
62827+ will be altered to enhance system security and privacy. You MUST
62828+ choose either a user only restriction or a user and group restriction.
62829+ Depending upon the option you choose, you can either restrict users to
62830+ see only the processes they themselves run, or choose a group that can
62831+ view all processes and files normally restricted to root if you choose
62832+ the "restrict to user only" option. NOTE: If you're running identd or
62833+ ntpd as a non-root user, you will have to run it as the group you
62834+ specify here.
62835+
62836+config GRKERNSEC_PROC_USER
62837+ bool "Restrict /proc to user only"
62838+ depends on GRKERNSEC_PROC
62839+ help
62840+ If you say Y here, non-root users will only be able to view their own
62841+ processes, and restricts them from viewing network-related information,
62842+ and viewing kernel symbol and module information.
62843+
62844+config GRKERNSEC_PROC_USERGROUP
62845+ bool "Allow special group"
62846+ default y if GRKERNSEC_CONFIG_AUTO
62847+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
62848+ help
62849+ If you say Y here, you will be able to select a group that will be
62850+ able to view all processes and network-related information. If you've
62851+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
62852+ remain hidden. This option is useful if you want to run identd as
62853+ a non-root user. The group you select may also be chosen at boot time
62854+ via "grsec_proc_gid=" on the kernel commandline.
62855+
62856+config GRKERNSEC_PROC_GID
62857+ int "GID for special group"
62858+ depends on GRKERNSEC_PROC_USERGROUP
62859+ default 1001
62860+
62861+config GRKERNSEC_PROC_ADD
62862+ bool "Additional restrictions"
62863+ default y if GRKERNSEC_CONFIG_AUTO
62864+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
62865+ help
62866+ If you say Y here, additional restrictions will be placed on
62867+ /proc that keep normal users from viewing device information and
62868+ slabinfo information that could be useful for exploits.
62869+
62870+config GRKERNSEC_LINK
62871+ bool "Linking restrictions"
62872+ default y if GRKERNSEC_CONFIG_AUTO
62873+ help
62874+ If you say Y here, /tmp race exploits will be prevented, since users
62875+ will no longer be able to follow symlinks owned by other users in
62876+ world-writable +t directories (e.g. /tmp), unless the owner of the
62877+ symlink is the owner of the directory. users will also not be
62878+ able to hardlink to files they do not own. If the sysctl option is
62879+ enabled, a sysctl option with name "linking_restrictions" is created.
62880+
62881+config GRKERNSEC_SYMLINKOWN
62882+ bool "Kernel-enforced SymlinksIfOwnerMatch"
62883+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
62884+ help
62885+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
62886+ that prevents it from being used as a security feature. As Apache
62887+ verifies the symlink by performing a stat() against the target of
62888+ the symlink before it is followed, an attacker can setup a symlink
62889+ to point to a same-owned file, then replace the symlink with one
62890+ that targets another user's file just after Apache "validates" the
62891+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
62892+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
62893+ will be in place for the group you specify. If the sysctl option
62894+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
62895+ created.
62896+
62897+config GRKERNSEC_SYMLINKOWN_GID
62898+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
62899+ depends on GRKERNSEC_SYMLINKOWN
62900+ default 1006
62901+ help
62902+ Setting this GID determines what group kernel-enforced
62903+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
62904+ is enabled, a sysctl option with name "symlinkown_gid" is created.
62905+
62906+config GRKERNSEC_FIFO
62907+ bool "FIFO restrictions"
62908+ default y if GRKERNSEC_CONFIG_AUTO
62909+ help
62910+ If you say Y here, users will not be able to write to FIFOs they don't
62911+ own in world-writable +t directories (e.g. /tmp), unless the owner of
62912+ the FIFO is the same owner of the directory it's held in. If the sysctl
62913+ option is enabled, a sysctl option with name "fifo_restrictions" is
62914+ created.
62915+
62916+config GRKERNSEC_SYSFS_RESTRICT
62917+ bool "Sysfs/debugfs restriction"
62918+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62919+ depends on SYSFS
62920+ help
62921+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
62922+ any filesystem normally mounted under it (e.g. debugfs) will be
62923+ mostly accessible only by root. These filesystems generally provide access
62924+ to hardware and debug information that isn't appropriate for unprivileged
62925+ users of the system. Sysfs and debugfs have also become a large source
62926+ of new vulnerabilities, ranging from infoleaks to local compromise.
62927+ There has been very little oversight with an eye toward security involved
62928+ in adding new exporters of information to these filesystems, so their
62929+ use is discouraged.
62930+ For reasons of compatibility, a few directories have been whitelisted
62931+ for access by non-root users:
62932+ /sys/fs/selinux
62933+ /sys/fs/fuse
62934+ /sys/devices/system/cpu
62935+
62936+config GRKERNSEC_ROFS
62937+ bool "Runtime read-only mount protection"
62938+ depends on SYSCTL
62939+ help
62940+ If you say Y here, a sysctl option with name "romount_protect" will
62941+ be created. By setting this option to 1 at runtime, filesystems
62942+ will be protected in the following ways:
62943+ * No new writable mounts will be allowed
62944+ * Existing read-only mounts won't be able to be remounted read/write
62945+ * Write operations will be denied on all block devices
62946+ This option acts independently of grsec_lock: once it is set to 1,
62947+ it cannot be turned off. Therefore, please be mindful of the resulting
62948+ behavior if this option is enabled in an init script on a read-only
62949+ filesystem.
62950+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
62951+ and GRKERNSEC_IO should be enabled and module loading disabled via
62952+ config or at runtime.
62953+ This feature is mainly intended for secure embedded systems.
62954+
62955+
62956+config GRKERNSEC_DEVICE_SIDECHANNEL
62957+ bool "Eliminate stat/notify-based device sidechannels"
62958+ default y if GRKERNSEC_CONFIG_AUTO
62959+ help
62960+ If you say Y here, timing analyses on block or character
62961+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
62962+ will be thwarted for unprivileged users. If a process without
62963+ CAP_MKNOD stats such a device, the last access and last modify times
62964+ will match the device's create time. No access or modify events
62965+ will be triggered through inotify/dnotify/fanotify for such devices.
62966+ This feature will prevent attacks that may at a minimum
62967+ allow an attacker to determine the administrator's password length.
62968+
62969+config GRKERNSEC_CHROOT
62970+ bool "Chroot jail restrictions"
62971+ default y if GRKERNSEC_CONFIG_AUTO
62972+ help
62973+ If you say Y here, you will be able to choose several options that will
62974+ make breaking out of a chrooted jail much more difficult. If you
62975+ encounter no software incompatibilities with the following options, it
62976+ is recommended that you enable each one.
62977+
62978+config GRKERNSEC_CHROOT_MOUNT
62979+ bool "Deny mounts"
62980+ default y if GRKERNSEC_CONFIG_AUTO
62981+ depends on GRKERNSEC_CHROOT
62982+ help
62983+ If you say Y here, processes inside a chroot will not be able to
62984+ mount or remount filesystems. If the sysctl option is enabled, a
62985+ sysctl option with name "chroot_deny_mount" is created.
62986+
62987+config GRKERNSEC_CHROOT_DOUBLE
62988+ bool "Deny double-chroots"
62989+ default y if GRKERNSEC_CONFIG_AUTO
62990+ depends on GRKERNSEC_CHROOT
62991+ help
62992+ If you say Y here, processes inside a chroot will not be able to chroot
62993+ again outside the chroot. This is a widely used method of breaking
62994+ out of a chroot jail and should not be allowed. If the sysctl
62995+ option is enabled, a sysctl option with name
62996+ "chroot_deny_chroot" is created.
62997+
62998+config GRKERNSEC_CHROOT_PIVOT
62999+ bool "Deny pivot_root in chroot"
63000+ default y if GRKERNSEC_CONFIG_AUTO
63001+ depends on GRKERNSEC_CHROOT
63002+ help
63003+ If you say Y here, processes inside a chroot will not be able to use
63004+ a function called pivot_root() that was introduced in Linux 2.3.41. It
63005+ works similar to chroot in that it changes the root filesystem. This
63006+ function could be misused in a chrooted process to attempt to break out
63007+ of the chroot, and therefore should not be allowed. If the sysctl
63008+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
63009+ created.
63010+
63011+config GRKERNSEC_CHROOT_CHDIR
63012+ bool "Enforce chdir(\"/\") on all chroots"
63013+ default y if GRKERNSEC_CONFIG_AUTO
63014+ depends on GRKERNSEC_CHROOT
63015+ help
63016+ If you say Y here, the current working directory of all newly-chrooted
63017+ applications will be set to the the root directory of the chroot.
63018+ The man page on chroot(2) states:
63019+ Note that this call does not change the current working
63020+ directory, so that `.' can be outside the tree rooted at
63021+ `/'. In particular, the super-user can escape from a
63022+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
63023+
63024+ It is recommended that you say Y here, since it's not known to break
63025+ any software. If the sysctl option is enabled, a sysctl option with
63026+ name "chroot_enforce_chdir" is created.
63027+
63028+config GRKERNSEC_CHROOT_CHMOD
63029+ bool "Deny (f)chmod +s"
63030+ default y if GRKERNSEC_CONFIG_AUTO
63031+ depends on GRKERNSEC_CHROOT
63032+ help
63033+ If you say Y here, processes inside a chroot will not be able to chmod
63034+ or fchmod files to make them have suid or sgid bits. This protects
63035+ against another published method of breaking a chroot. If the sysctl
63036+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
63037+ created.
63038+
63039+config GRKERNSEC_CHROOT_FCHDIR
63040+ bool "Deny fchdir out of chroot"
63041+ default y if GRKERNSEC_CONFIG_AUTO
63042+ depends on GRKERNSEC_CHROOT
63043+ help
63044+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
63045+ to a file descriptor of the chrooting process that points to a directory
63046+ outside the filesystem will be stopped. If the sysctl option
63047+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
63048+
63049+config GRKERNSEC_CHROOT_MKNOD
63050+ bool "Deny mknod"
63051+ default y if GRKERNSEC_CONFIG_AUTO
63052+ depends on GRKERNSEC_CHROOT
63053+ help
63054+ If you say Y here, processes inside a chroot will not be allowed to
63055+ mknod. The problem with using mknod inside a chroot is that it
63056+ would allow an attacker to create a device entry that is the same
63057+ as one on the physical root of your system, which could range from
63058+ anything from the console device to a device for your harddrive (which
63059+ they could then use to wipe the drive or steal data). It is recommended
63060+ that you say Y here, unless you run into software incompatibilities.
63061+ If the sysctl option is enabled, a sysctl option with name
63062+ "chroot_deny_mknod" is created.
63063+
63064+config GRKERNSEC_CHROOT_SHMAT
63065+ bool "Deny shmat() out of chroot"
63066+ default y if GRKERNSEC_CONFIG_AUTO
63067+ depends on GRKERNSEC_CHROOT
63068+ help
63069+ If you say Y here, processes inside a chroot will not be able to attach
63070+ to shared memory segments that were created outside of the chroot jail.
63071+ It is recommended that you say Y here. If the sysctl option is enabled,
63072+ a sysctl option with name "chroot_deny_shmat" is created.
63073+
63074+config GRKERNSEC_CHROOT_UNIX
63075+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
63076+ default y if GRKERNSEC_CONFIG_AUTO
63077+ depends on GRKERNSEC_CHROOT
63078+ help
63079+ If you say Y here, processes inside a chroot will not be able to
63080+ connect to abstract (meaning not belonging to a filesystem) Unix
63081+ domain sockets that were bound outside of a chroot. It is recommended
63082+ that you say Y here. If the sysctl option is enabled, a sysctl option
63083+ with name "chroot_deny_unix" is created.
63084+
63085+config GRKERNSEC_CHROOT_FINDTASK
63086+ bool "Protect outside processes"
63087+ default y if GRKERNSEC_CONFIG_AUTO
63088+ depends on GRKERNSEC_CHROOT
63089+ help
63090+ If you say Y here, processes inside a chroot will not be able to
63091+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
63092+ getsid, or view any process outside of the chroot. If the sysctl
63093+ option is enabled, a sysctl option with name "chroot_findtask" is
63094+ created.
63095+
63096+config GRKERNSEC_CHROOT_NICE
63097+ bool "Restrict priority changes"
63098+ default y if GRKERNSEC_CONFIG_AUTO
63099+ depends on GRKERNSEC_CHROOT
63100+ help
63101+ If you say Y here, processes inside a chroot will not be able to raise
63102+ the priority of processes in the chroot, or alter the priority of
63103+ processes outside the chroot. This provides more security than simply
63104+ removing CAP_SYS_NICE from the process' capability set. If the
63105+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
63106+ is created.
63107+
63108+config GRKERNSEC_CHROOT_SYSCTL
63109+ bool "Deny sysctl writes"
63110+ default y if GRKERNSEC_CONFIG_AUTO
63111+ depends on GRKERNSEC_CHROOT
63112+ help
63113+ If you say Y here, an attacker in a chroot will not be able to
63114+ write to sysctl entries, either by sysctl(2) or through a /proc
63115+ interface. It is strongly recommended that you say Y here. If the
63116+ sysctl option is enabled, a sysctl option with name
63117+ "chroot_deny_sysctl" is created.
63118+
63119+config GRKERNSEC_CHROOT_CAPS
63120+ bool "Capability restrictions"
63121+ default y if GRKERNSEC_CONFIG_AUTO
63122+ depends on GRKERNSEC_CHROOT
63123+ help
63124+ If you say Y here, the capabilities on all processes within a
63125+ chroot jail will be lowered to stop module insertion, raw i/o,
63126+ system and net admin tasks, rebooting the system, modifying immutable
63127+ files, modifying IPC owned by another, and changing the system time.
63128+ This is left an option because it can break some apps. Disable this
63129+ if your chrooted apps are having problems performing those kinds of
63130+ tasks. If the sysctl option is enabled, a sysctl option with
63131+ name "chroot_caps" is created.
63132+
63133+config GRKERNSEC_CHROOT_INITRD
63134+ bool "Exempt initrd tasks from restrictions"
63135+ default y if GRKERNSEC_CONFIG_AUTO
63136+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
63137+ help
63138+ If you say Y here, tasks started prior to init will be exempted from
63139+ grsecurity's chroot restrictions. This option is mainly meant to
63140+ resolve Plymouth's performing privileged operations unnecessarily
63141+ in a chroot.
63142+
63143+endmenu
63144+menu "Kernel Auditing"
63145+depends on GRKERNSEC
63146+
63147+config GRKERNSEC_AUDIT_GROUP
63148+ bool "Single group for auditing"
63149+ help
63150+ If you say Y here, the exec and chdir logging features will only operate
63151+ on a group you specify. This option is recommended if you only want to
63152+ watch certain users instead of having a large amount of logs from the
63153+ entire system. If the sysctl option is enabled, a sysctl option with
63154+ name "audit_group" is created.
63155+
63156+config GRKERNSEC_AUDIT_GID
63157+ int "GID for auditing"
63158+ depends on GRKERNSEC_AUDIT_GROUP
63159+ default 1007
63160+
63161+config GRKERNSEC_EXECLOG
63162+ bool "Exec logging"
63163+ help
63164+ If you say Y here, all execve() calls will be logged (since the
63165+ other exec*() calls are frontends to execve(), all execution
63166+ will be logged). Useful for shell-servers that like to keep track
63167+ of their users. If the sysctl option is enabled, a sysctl option with
63168+ name "exec_logging" is created.
63169+ WARNING: This option when enabled will produce a LOT of logs, especially
63170+ on an active system.
63171+
63172+config GRKERNSEC_RESLOG
63173+ bool "Resource logging"
63174+ default y if GRKERNSEC_CONFIG_AUTO
63175+ help
63176+ If you say Y here, all attempts to overstep resource limits will
63177+ be logged with the resource name, the requested size, and the current
63178+ limit. It is highly recommended that you say Y here. If the sysctl
63179+ option is enabled, a sysctl option with name "resource_logging" is
63180+ created. If the RBAC system is enabled, the sysctl value is ignored.
63181+
63182+config GRKERNSEC_CHROOT_EXECLOG
63183+ bool "Log execs within chroot"
63184+ help
63185+ If you say Y here, all executions inside a chroot jail will be logged
63186+ to syslog. This can cause a large amount of logs if certain
63187+ applications (eg. djb's daemontools) are installed on the system, and
63188+ is therefore left as an option. If the sysctl option is enabled, a
63189+ sysctl option with name "chroot_execlog" is created.
63190+
63191+config GRKERNSEC_AUDIT_PTRACE
63192+ bool "Ptrace logging"
63193+ help
63194+ If you say Y here, all attempts to attach to a process via ptrace
63195+ will be logged. If the sysctl option is enabled, a sysctl option
63196+ with name "audit_ptrace" is created.
63197+
63198+config GRKERNSEC_AUDIT_CHDIR
63199+ bool "Chdir logging"
63200+ help
63201+ If you say Y here, all chdir() calls will be logged. If the sysctl
63202+ option is enabled, a sysctl option with name "audit_chdir" is created.
63203+
63204+config GRKERNSEC_AUDIT_MOUNT
63205+ bool "(Un)Mount logging"
63206+ help
63207+ If you say Y here, all mounts and unmounts will be logged. If the
63208+ sysctl option is enabled, a sysctl option with name "audit_mount" is
63209+ created.
63210+
63211+config GRKERNSEC_SIGNAL
63212+ bool "Signal logging"
63213+ default y if GRKERNSEC_CONFIG_AUTO
63214+ help
63215+ If you say Y here, certain important signals will be logged, such as
63216+ SIGSEGV, which will as a result inform you of when a error in a program
63217+ occurred, which in some cases could mean a possible exploit attempt.
63218+ If the sysctl option is enabled, a sysctl option with name
63219+ "signal_logging" is created.
63220+
63221+config GRKERNSEC_FORKFAIL
63222+ bool "Fork failure logging"
63223+ help
63224+ If you say Y here, all failed fork() attempts will be logged.
63225+ This could suggest a fork bomb, or someone attempting to overstep
63226+ their process limit. If the sysctl option is enabled, a sysctl option
63227+ with name "forkfail_logging" is created.
63228+
63229+config GRKERNSEC_TIME
63230+ bool "Time change logging"
63231+ default y if GRKERNSEC_CONFIG_AUTO
63232+ help
63233+ If you say Y here, any changes of the system clock will be logged.
63234+ If the sysctl option is enabled, a sysctl option with name
63235+ "timechange_logging" is created.
63236+
63237+config GRKERNSEC_PROC_IPADDR
63238+ bool "/proc/<pid>/ipaddr support"
63239+ default y if GRKERNSEC_CONFIG_AUTO
63240+ help
63241+ If you say Y here, a new entry will be added to each /proc/<pid>
63242+ directory that contains the IP address of the person using the task.
63243+ The IP is carried across local TCP and AF_UNIX stream sockets.
63244+ This information can be useful for IDS/IPSes to perform remote response
63245+ to a local attack. The entry is readable by only the owner of the
63246+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
63247+ the RBAC system), and thus does not create privacy concerns.
63248+
63249+config GRKERNSEC_RWXMAP_LOG
63250+ bool 'Denied RWX mmap/mprotect logging'
63251+ default y if GRKERNSEC_CONFIG_AUTO
63252+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
63253+ help
63254+ If you say Y here, calls to mmap() and mprotect() with explicit
63255+ usage of PROT_WRITE and PROT_EXEC together will be logged when
63256+ denied by the PAX_MPROTECT feature. This feature will also
63257+ log other problematic scenarios that can occur when PAX_MPROTECT
63258+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
63259+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
63260+ is created.
63261+
63262+endmenu
63263+
63264+menu "Executable Protections"
63265+depends on GRKERNSEC
63266+
63267+config GRKERNSEC_DMESG
63268+ bool "Dmesg(8) restriction"
63269+ default y if GRKERNSEC_CONFIG_AUTO
63270+ help
63271+ If you say Y here, non-root users will not be able to use dmesg(8)
63272+ to view the contents of the kernel's circular log buffer.
63273+ The kernel's log buffer often contains kernel addresses and other
63274+ identifying information useful to an attacker in fingerprinting a
63275+ system for a targeted exploit.
63276+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
63277+ created.
63278+
63279+config GRKERNSEC_HARDEN_PTRACE
63280+ bool "Deter ptrace-based process snooping"
63281+ default y if GRKERNSEC_CONFIG_AUTO
63282+ help
63283+ If you say Y here, TTY sniffers and other malicious monitoring
63284+ programs implemented through ptrace will be defeated. If you
63285+ have been using the RBAC system, this option has already been
63286+ enabled for several years for all users, with the ability to make
63287+ fine-grained exceptions.
63288+
63289+ This option only affects the ability of non-root users to ptrace
63290+ processes that are not a descendent of the ptracing process.
63291+ This means that strace ./binary and gdb ./binary will still work,
63292+ but attaching to arbitrary processes will not. If the sysctl
63293+ option is enabled, a sysctl option with name "harden_ptrace" is
63294+ created.
63295+
63296+config GRKERNSEC_PTRACE_READEXEC
63297+ bool "Require read access to ptrace sensitive binaries"
63298+ default y if GRKERNSEC_CONFIG_AUTO
63299+ help
63300+ If you say Y here, unprivileged users will not be able to ptrace unreadable
63301+ binaries. This option is useful in environments that
63302+ remove the read bits (e.g. file mode 4711) from suid binaries to
63303+ prevent infoleaking of their contents. This option adds
63304+ consistency to the use of that file mode, as the binary could normally
63305+ be read out when run without privileges while ptracing.
63306+
63307+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
63308+ is created.
63309+
63310+config GRKERNSEC_SETXID
63311+ bool "Enforce consistent multithreaded privileges"
63312+ default y if GRKERNSEC_CONFIG_AUTO
63313+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
63314+ help
63315+ If you say Y here, a change from a root uid to a non-root uid
63316+ in a multithreaded application will cause the resulting uids,
63317+ gids, supplementary groups, and capabilities in that thread
63318+ to be propagated to the other threads of the process. In most
63319+ cases this is unnecessary, as glibc will emulate this behavior
63320+ on behalf of the application. Other libcs do not act in the
63321+ same way, allowing the other threads of the process to continue
63322+ running with root privileges. If the sysctl option is enabled,
63323+ a sysctl option with name "consistent_setxid" is created.
63324+
63325+config GRKERNSEC_HARDEN_IPC
63326+ bool "Disallow access to overly-permissive IPC objects"
63327+ default y if GRKERNSEC_CONFIG_AUTO
63328+ depends on SYSVIPC
63329+ help
63330+ If you say Y here, access to overly-permissive IPC objects (shared
63331+ memory, message queues, and semaphores) will be denied for processes
63332+ given the following criteria beyond normal permission checks:
63333+ 1) If the IPC object is world-accessible and the euid doesn't match
63334+ that of the creator or current uid for the IPC object
63335+ 2) If the IPC object is group-accessible and the egid doesn't
63336+ match that of the creator or current gid for the IPC object
63337+ It's a common error to grant too much permission to these objects,
63338+ with impact ranging from denial of service and information leaking to
63339+ privilege escalation. This feature was developed in response to
63340+ research by Tim Brown:
63341+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
63342+ who found hundreds of such insecure usages. Processes with
63343+ CAP_IPC_OWNER are still permitted to access these IPC objects.
63344+ If the sysctl option is enabled, a sysctl option with name
63345+ "harden_ipc" is created.
63346+
63347+config GRKERNSEC_TPE
63348+ bool "Trusted Path Execution (TPE)"
63349+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
63350+ help
63351+ If you say Y here, you will be able to choose a gid to add to the
63352+ supplementary groups of users you want to mark as "untrusted."
63353+ These users will not be able to execute any files that are not in
63354+ root-owned directories writable only by root. If the sysctl option
63355+ is enabled, a sysctl option with name "tpe" is created.
63356+
63357+config GRKERNSEC_TPE_ALL
63358+ bool "Partially restrict all non-root users"
63359+ depends on GRKERNSEC_TPE
63360+ help
63361+ If you say Y here, all non-root users will be covered under
63362+ a weaker TPE restriction. This is separate from, and in addition to,
63363+ the main TPE options that you have selected elsewhere. Thus, if a
63364+ "trusted" GID is chosen, this restriction applies to even that GID.
63365+ Under this restriction, all non-root users will only be allowed to
63366+ execute files in directories they own that are not group or
63367+ world-writable, or in directories owned by root and writable only by
63368+ root. If the sysctl option is enabled, a sysctl option with name
63369+ "tpe_restrict_all" is created.
63370+
63371+config GRKERNSEC_TPE_INVERT
63372+ bool "Invert GID option"
63373+ depends on GRKERNSEC_TPE
63374+ help
63375+ If you say Y here, the group you specify in the TPE configuration will
63376+ decide what group TPE restrictions will be *disabled* for. This
63377+ option is useful if you want TPE restrictions to be applied to most
63378+ users on the system. If the sysctl option is enabled, a sysctl option
63379+ with name "tpe_invert" is created. Unlike other sysctl options, this
63380+ entry will default to on for backward-compatibility.
63381+
63382+config GRKERNSEC_TPE_GID
63383+ int
63384+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
63385+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
63386+
63387+config GRKERNSEC_TPE_UNTRUSTED_GID
63388+ int "GID for TPE-untrusted users"
63389+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
63390+ default 1005
63391+ help
63392+ Setting this GID determines what group TPE restrictions will be
63393+ *enabled* for. If the sysctl option is enabled, a sysctl option
63394+ with name "tpe_gid" is created.
63395+
63396+config GRKERNSEC_TPE_TRUSTED_GID
63397+ int "GID for TPE-trusted users"
63398+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
63399+ default 1005
63400+ help
63401+ Setting this GID determines what group TPE restrictions will be
63402+ *disabled* for. If the sysctl option is enabled, a sysctl option
63403+ with name "tpe_gid" is created.
63404+
63405+endmenu
63406+menu "Network Protections"
63407+depends on GRKERNSEC
63408+
63409+config GRKERNSEC_RANDNET
63410+ bool "Larger entropy pools"
63411+ default y if GRKERNSEC_CONFIG_AUTO
63412+ help
63413+ If you say Y here, the entropy pools used for many features of Linux
63414+ and grsecurity will be doubled in size. Since several grsecurity
63415+ features use additional randomness, it is recommended that you say Y
63416+ here. Saying Y here has a similar effect as modifying
63417+ /proc/sys/kernel/random/poolsize.
63418+
63419+config GRKERNSEC_BLACKHOLE
63420+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
63421+ default y if GRKERNSEC_CONFIG_AUTO
63422+ depends on NET
63423+ help
63424+ If you say Y here, neither TCP resets nor ICMP
63425+ destination-unreachable packets will be sent in response to packets
63426+ sent to ports for which no associated listening process exists.
63427+ This feature supports both IPV4 and IPV6 and exempts the
63428+ loopback interface from blackholing. Enabling this feature
63429+ makes a host more resilient to DoS attacks and reduces network
63430+ visibility against scanners.
63431+
63432+ The blackhole feature as-implemented is equivalent to the FreeBSD
63433+ blackhole feature, as it prevents RST responses to all packets, not
63434+ just SYNs. Under most application behavior this causes no
63435+ problems, but applications (like haproxy) may not close certain
63436+ connections in a way that cleanly terminates them on the remote
63437+ end, leaving the remote host in LAST_ACK state. Because of this
63438+ side-effect and to prevent intentional LAST_ACK DoSes, this
63439+ feature also adds automatic mitigation against such attacks.
63440+ The mitigation drastically reduces the amount of time a socket
63441+ can spend in LAST_ACK state. If you're using haproxy and not
63442+ all servers it connects to have this option enabled, consider
63443+ disabling this feature on the haproxy host.
63444+
63445+ If the sysctl option is enabled, two sysctl options with names
63446+ "ip_blackhole" and "lastack_retries" will be created.
63447+ While "ip_blackhole" takes the standard zero/non-zero on/off
63448+ toggle, "lastack_retries" uses the same kinds of values as
63449+ "tcp_retries1" and "tcp_retries2". The default value of 4
63450+ prevents a socket from lasting more than 45 seconds in LAST_ACK
63451+ state.
63452+
63453+config GRKERNSEC_NO_SIMULT_CONNECT
63454+ bool "Disable TCP Simultaneous Connect"
63455+ default y if GRKERNSEC_CONFIG_AUTO
63456+ depends on NET
63457+ help
63458+ If you say Y here, a feature by Willy Tarreau will be enabled that
63459+ removes a weakness in Linux's strict implementation of TCP that
63460+ allows two clients to connect to each other without either entering
63461+ a listening state. The weakness allows an attacker to easily prevent
63462+ a client from connecting to a known server provided the source port
63463+ for the connection is guessed correctly.
63464+
63465+ As the weakness could be used to prevent an antivirus or IPS from
63466+ fetching updates, or prevent an SSL gateway from fetching a CRL,
63467+ it should be eliminated by enabling this option. Though Linux is
63468+ one of few operating systems supporting simultaneous connect, it
63469+ has no legitimate use in practice and is rarely supported by firewalls.
63470+
63471+config GRKERNSEC_SOCKET
63472+ bool "Socket restrictions"
63473+ depends on NET
63474+ help
63475+ If you say Y here, you will be able to choose from several options.
63476+ If you assign a GID on your system and add it to the supplementary
63477+ groups of users you want to restrict socket access to, this patch
63478+ will perform up to three things, based on the option(s) you choose.
63479+
63480+config GRKERNSEC_SOCKET_ALL
63481+ bool "Deny any sockets to group"
63482+ depends on GRKERNSEC_SOCKET
63483+ help
63484+ If you say Y here, you will be able to choose a GID of whose users will
63485+ be unable to connect to other hosts from your machine or run server
63486+ applications from your machine. If the sysctl option is enabled, a
63487+ sysctl option with name "socket_all" is created.
63488+
63489+config GRKERNSEC_SOCKET_ALL_GID
63490+ int "GID to deny all sockets for"
63491+ depends on GRKERNSEC_SOCKET_ALL
63492+ default 1004
63493+ help
63494+ Here you can choose the GID to disable socket access for. Remember to
63495+ add the users you want socket access disabled for to the GID
63496+ specified here. If the sysctl option is enabled, a sysctl option
63497+ with name "socket_all_gid" is created.
63498+
63499+config GRKERNSEC_SOCKET_CLIENT
63500+ bool "Deny client sockets to group"
63501+ depends on GRKERNSEC_SOCKET
63502+ help
63503+ If you say Y here, you will be able to choose a GID of whose users will
63504+ be unable to connect to other hosts from your machine, but will be
63505+ able to run servers. If this option is enabled, all users in the group
63506+ you specify will have to use passive mode when initiating ftp transfers
63507+ from the shell on your machine. If the sysctl option is enabled, a
63508+ sysctl option with name "socket_client" is created.
63509+
63510+config GRKERNSEC_SOCKET_CLIENT_GID
63511+ int "GID to deny client sockets for"
63512+ depends on GRKERNSEC_SOCKET_CLIENT
63513+ default 1003
63514+ help
63515+ Here you can choose the GID to disable client socket access for.
63516+ Remember to add the users you want client socket access disabled for to
63517+ the GID specified here. If the sysctl option is enabled, a sysctl
63518+ option with name "socket_client_gid" is created.
63519+
63520+config GRKERNSEC_SOCKET_SERVER
63521+ bool "Deny server sockets to group"
63522+ depends on GRKERNSEC_SOCKET
63523+ help
63524+ If you say Y here, you will be able to choose a GID of whose users will
63525+ be unable to run server applications from your machine. If the sysctl
63526+ option is enabled, a sysctl option with name "socket_server" is created.
63527+
63528+config GRKERNSEC_SOCKET_SERVER_GID
63529+ int "GID to deny server sockets for"
63530+ depends on GRKERNSEC_SOCKET_SERVER
63531+ default 1002
63532+ help
63533+ Here you can choose the GID to disable server socket access for.
63534+ Remember to add the users you want server socket access disabled for to
63535+ the GID specified here. If the sysctl option is enabled, a sysctl
63536+ option with name "socket_server_gid" is created.
63537+
63538+endmenu
63539+
63540+menu "Physical Protections"
63541+depends on GRKERNSEC
63542+
63543+config GRKERNSEC_DENYUSB
63544+ bool "Deny new USB connections after toggle"
63545+ default y if GRKERNSEC_CONFIG_AUTO
63546+ depends on SYSCTL && USB_SUPPORT
63547+ help
63548+ If you say Y here, a new sysctl option with name "deny_new_usb"
63549+ will be created. Setting its value to 1 will prevent any new
63550+ USB devices from being recognized by the OS. Any attempted USB
63551+ device insertion will be logged. This option is intended to be
63552+ used against custom USB devices designed to exploit vulnerabilities
63553+ in various USB device drivers.
63554+
63555+ For greatest effectiveness, this sysctl should be set after any
63556+ relevant init scripts. This option is safe to enable in distros
63557+ as each user can choose whether or not to toggle the sysctl.
63558+
63559+config GRKERNSEC_DENYUSB_FORCE
63560+ bool "Reject all USB devices not connected at boot"
63561+ select USB
63562+ depends on GRKERNSEC_DENYUSB
63563+ help
63564+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
63565+ that doesn't involve a sysctl entry. This option should only be
63566+ enabled if you're sure you want to deny all new USB connections
63567+ at runtime and don't want to modify init scripts. This should not
63568+ be enabled by distros. It forces the core USB code to be built
63569+ into the kernel image so that all devices connected at boot time
63570+ can be recognized and new USB device connections can be prevented
63571+ prior to init running.
63572+
63573+endmenu
63574+
63575+menu "Sysctl Support"
63576+depends on GRKERNSEC && SYSCTL
63577+
63578+config GRKERNSEC_SYSCTL
63579+ bool "Sysctl support"
63580+ default y if GRKERNSEC_CONFIG_AUTO
63581+ help
63582+ If you say Y here, you will be able to change the options that
63583+ grsecurity runs with at bootup, without having to recompile your
63584+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
63585+ to enable (1) or disable (0) various features. All the sysctl entries
63586+ are mutable until the "grsec_lock" entry is set to a non-zero value.
63587+ All features enabled in the kernel configuration are disabled at boot
63588+ if you do not say Y to the "Turn on features by default" option.
63589+ All options should be set at startup, and the grsec_lock entry should
63590+ be set to a non-zero value after all the options are set.
63591+ *THIS IS EXTREMELY IMPORTANT*
63592+
63593+config GRKERNSEC_SYSCTL_DISTRO
63594+ bool "Extra sysctl support for distro makers (READ HELP)"
63595+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
63596+ help
63597+ If you say Y here, additional sysctl options will be created
63598+ for features that affect processes running as root. Therefore,
63599+ it is critical when using this option that the grsec_lock entry be
63600+ enabled after boot. Only distros with prebuilt kernel packages
63601+ with this option enabled that can ensure grsec_lock is enabled
63602+ after boot should use this option.
63603+ *Failure to set grsec_lock after boot makes all grsec features
63604+ this option covers useless*
63605+
63606+ Currently this option creates the following sysctl entries:
63607+ "Disable Privileged I/O": "disable_priv_io"
63608+
63609+config GRKERNSEC_SYSCTL_ON
63610+ bool "Turn on features by default"
63611+ default y if GRKERNSEC_CONFIG_AUTO
63612+ depends on GRKERNSEC_SYSCTL
63613+ help
63614+ If you say Y here, instead of having all features enabled in the
63615+ kernel configuration disabled at boot time, the features will be
63616+ enabled at boot time. It is recommended you say Y here unless
63617+ there is some reason you would want all sysctl-tunable features to
63618+ be disabled by default. As mentioned elsewhere, it is important
63619+ to enable the grsec_lock entry once you have finished modifying
63620+ the sysctl entries.
63621+
63622+endmenu
63623+menu "Logging Options"
63624+depends on GRKERNSEC
63625+
63626+config GRKERNSEC_FLOODTIME
63627+ int "Seconds in between log messages (minimum)"
63628+ default 10
63629+ help
63630+ This option allows you to enforce the number of seconds between
63631+ grsecurity log messages. The default should be suitable for most
63632+ people, however, if you choose to change it, choose a value small enough
63633+ to allow informative logs to be produced, but large enough to
63634+ prevent flooding.
63635+
63636+config GRKERNSEC_FLOODBURST
63637+ int "Number of messages in a burst (maximum)"
63638+ default 6
63639+ help
63640+ This option allows you to choose the maximum number of messages allowed
63641+ within the flood time interval you chose in a separate option. The
63642+ default should be suitable for most people, however if you find that
63643+ many of your logs are being interpreted as flooding, you may want to
63644+ raise this value.
63645+
63646+endmenu
63647diff --git a/grsecurity/Makefile b/grsecurity/Makefile
63648new file mode 100644
63649index 0000000..85beb79
63650--- /dev/null
63651+++ b/grsecurity/Makefile
63652@@ -0,0 +1,43 @@
63653+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
63654+# during 2001-2009 it has been completely redesigned by Brad Spengler
63655+# into an RBAC system
63656+#
63657+# All code in this directory and various hooks inserted throughout the kernel
63658+# are copyright Brad Spengler - Open Source Security, Inc., and released
63659+# under the GPL v2 or higher
63660+
63661+KBUILD_CFLAGS += -Werror
63662+
63663+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
63664+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
63665+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
63666+ grsec_usb.o grsec_ipc.o
63667+
63668+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
63669+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
63670+ gracl_learn.o grsec_log.o gracl_policy.o
63671+ifdef CONFIG_COMPAT
63672+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
63673+endif
63674+
63675+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
63676+
63677+ifdef CONFIG_NET
63678+obj-y += grsec_sock.o
63679+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
63680+endif
63681+
63682+ifndef CONFIG_GRKERNSEC
63683+obj-y += grsec_disabled.o
63684+endif
63685+
63686+ifdef CONFIG_GRKERNSEC_HIDESYM
63687+extra-y := grsec_hidesym.o
63688+$(obj)/grsec_hidesym.o:
63689+ @-chmod -f 500 /boot
63690+ @-chmod -f 500 /lib/modules
63691+ @-chmod -f 500 /lib64/modules
63692+ @-chmod -f 500 /lib32/modules
63693+ @-chmod -f 700 .
63694+ @echo ' grsec: protected kernel image paths'
63695+endif
63696diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
63697new file mode 100644
63698index 0000000..90f71ce
63699--- /dev/null
63700+++ b/grsecurity/gracl.c
63701@@ -0,0 +1,2679 @@
63702+#include <linux/kernel.h>
63703+#include <linux/module.h>
63704+#include <linux/sched.h>
63705+#include <linux/mm.h>
63706+#include <linux/file.h>
63707+#include <linux/fs.h>
63708+#include <linux/namei.h>
63709+#include <linux/mount.h>
63710+#include <linux/tty.h>
63711+#include <linux/proc_fs.h>
63712+#include <linux/lglock.h>
63713+#include <linux/slab.h>
63714+#include <linux/vmalloc.h>
63715+#include <linux/types.h>
63716+#include <linux/sysctl.h>
63717+#include <linux/netdevice.h>
63718+#include <linux/ptrace.h>
63719+#include <linux/gracl.h>
63720+#include <linux/gralloc.h>
63721+#include <linux/security.h>
63722+#include <linux/grinternal.h>
63723+#include <linux/pid_namespace.h>
63724+#include <linux/stop_machine.h>
63725+#include <linux/fdtable.h>
63726+#include <linux/percpu.h>
63727+#include <linux/lglock.h>
63728+#include <linux/hugetlb.h>
63729+#include <linux/posix-timers.h>
63730+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
63731+#include <linux/magic.h>
63732+#include <linux/pagemap.h>
63733+#include "../fs/btrfs/async-thread.h"
63734+#include "../fs/btrfs/ctree.h"
63735+#include "../fs/btrfs/btrfs_inode.h"
63736+#endif
63737+#include "../fs/mount.h"
63738+
63739+#include <asm/uaccess.h>
63740+#include <asm/errno.h>
63741+#include <asm/mman.h>
63742+
63743+#define FOR_EACH_ROLE_START(role) \
63744+ role = running_polstate.role_list; \
63745+ while (role) {
63746+
63747+#define FOR_EACH_ROLE_END(role) \
63748+ role = role->prev; \
63749+ }
63750+
63751+extern struct lglock vfsmount_lock;
63752+
63753+extern struct path gr_real_root;
63754+
63755+static struct gr_policy_state running_polstate;
63756+struct gr_policy_state *polstate = &running_polstate;
63757+extern struct gr_alloc_state *current_alloc_state;
63758+
63759+extern char *gr_shared_page[4];
63760+DEFINE_RWLOCK(gr_inode_lock);
63761+
63762+static unsigned int gr_status __read_only = GR_STATUS_INIT;
63763+
63764+#ifdef CONFIG_NET
63765+extern struct vfsmount *sock_mnt;
63766+#endif
63767+
63768+extern struct vfsmount *pipe_mnt;
63769+extern struct vfsmount *shm_mnt;
63770+
63771+#ifdef CONFIG_HUGETLBFS
63772+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63773+#endif
63774+
63775+extern u16 acl_sp_role_value;
63776+extern struct acl_object_label *fakefs_obj_rw;
63777+extern struct acl_object_label *fakefs_obj_rwx;
63778+
63779+int gr_acl_is_enabled(void)
63780+{
63781+ return (gr_status & GR_READY);
63782+}
63783+
63784+void gr_enable_rbac_system(void)
63785+{
63786+ pax_open_kernel();
63787+ gr_status |= GR_READY;
63788+ pax_close_kernel();
63789+}
63790+
63791+int gr_rbac_disable(void *unused)
63792+{
63793+ pax_open_kernel();
63794+ gr_status &= ~GR_READY;
63795+ pax_close_kernel();
63796+
63797+ return 0;
63798+}
63799+
63800+static inline dev_t __get_dev(const struct dentry *dentry)
63801+{
63802+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
63803+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
63804+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
63805+ else
63806+#endif
63807+ return dentry->d_sb->s_dev;
63808+}
63809+
63810+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
63811+{
63812+ return __get_dev(dentry);
63813+}
63814+
63815+static char gr_task_roletype_to_char(struct task_struct *task)
63816+{
63817+ switch (task->role->roletype &
63818+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
63819+ GR_ROLE_SPECIAL)) {
63820+ case GR_ROLE_DEFAULT:
63821+ return 'D';
63822+ case GR_ROLE_USER:
63823+ return 'U';
63824+ case GR_ROLE_GROUP:
63825+ return 'G';
63826+ case GR_ROLE_SPECIAL:
63827+ return 'S';
63828+ }
63829+
63830+ return 'X';
63831+}
63832+
63833+char gr_roletype_to_char(void)
63834+{
63835+ return gr_task_roletype_to_char(current);
63836+}
63837+
63838+__inline__ int
63839+gr_acl_tpe_check(void)
63840+{
63841+ if (unlikely(!(gr_status & GR_READY)))
63842+ return 0;
63843+ if (current->role->roletype & GR_ROLE_TPE)
63844+ return 1;
63845+ else
63846+ return 0;
63847+}
63848+
63849+int
63850+gr_handle_rawio(const struct inode *inode)
63851+{
63852+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
63853+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
63854+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
63855+ !capable(CAP_SYS_RAWIO))
63856+ return 1;
63857+#endif
63858+ return 0;
63859+}
63860+
63861+int
63862+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
63863+{
63864+ if (likely(lena != lenb))
63865+ return 0;
63866+
63867+ return !memcmp(a, b, lena);
63868+}
63869+
63870+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
63871+{
63872+ *buflen -= namelen;
63873+ if (*buflen < 0)
63874+ return -ENAMETOOLONG;
63875+ *buffer -= namelen;
63876+ memcpy(*buffer, str, namelen);
63877+ return 0;
63878+}
63879+
63880+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
63881+{
63882+ return prepend(buffer, buflen, name->name, name->len);
63883+}
63884+
63885+static int prepend_path(const struct path *path, struct path *root,
63886+ char **buffer, int *buflen)
63887+{
63888+ struct dentry *dentry = path->dentry;
63889+ struct vfsmount *vfsmnt = path->mnt;
63890+ struct mount *mnt = real_mount(vfsmnt);
63891+ bool slash = false;
63892+ int error = 0;
63893+
63894+ while (dentry != root->dentry || vfsmnt != root->mnt) {
63895+ struct dentry * parent;
63896+
63897+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
63898+ /* Global root? */
63899+ if (!mnt_has_parent(mnt)) {
63900+ goto out;
63901+ }
63902+ dentry = mnt->mnt_mountpoint;
63903+ mnt = mnt->mnt_parent;
63904+ vfsmnt = &mnt->mnt;
63905+ continue;
63906+ }
63907+ parent = dentry->d_parent;
63908+ prefetch(parent);
63909+ spin_lock(&dentry->d_lock);
63910+ error = prepend_name(buffer, buflen, &dentry->d_name);
63911+ spin_unlock(&dentry->d_lock);
63912+ if (!error)
63913+ error = prepend(buffer, buflen, "/", 1);
63914+ if (error)
63915+ break;
63916+
63917+ slash = true;
63918+ dentry = parent;
63919+ }
63920+
63921+out:
63922+ if (!error && !slash)
63923+ error = prepend(buffer, buflen, "/", 1);
63924+
63925+ return error;
63926+}
63927+
63928+/* this must be called with vfsmount_lock and rename_lock held */
63929+
63930+static char *__our_d_path(const struct path *path, struct path *root,
63931+ char *buf, int buflen)
63932+{
63933+ char *res = buf + buflen;
63934+ int error;
63935+
63936+ prepend(&res, &buflen, "\0", 1);
63937+ error = prepend_path(path, root, &res, &buflen);
63938+ if (error)
63939+ return ERR_PTR(error);
63940+
63941+ return res;
63942+}
63943+
63944+static char *
63945+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
63946+{
63947+ char *retval;
63948+
63949+ retval = __our_d_path(path, root, buf, buflen);
63950+ if (unlikely(IS_ERR(retval)))
63951+ retval = strcpy(buf, "<path too long>");
63952+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
63953+ retval[1] = '\0';
63954+
63955+ return retval;
63956+}
63957+
63958+static char *
63959+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
63960+ char *buf, int buflen)
63961+{
63962+ struct path path;
63963+ char *res;
63964+
63965+ path.dentry = (struct dentry *)dentry;
63966+ path.mnt = (struct vfsmount *)vfsmnt;
63967+
63968+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
63969+ by the RBAC system */
63970+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
63971+
63972+ return res;
63973+}
63974+
63975+static char *
63976+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
63977+ char *buf, int buflen)
63978+{
63979+ char *res;
63980+ struct path path;
63981+ struct path root;
63982+ struct task_struct *reaper = init_pid_ns.child_reaper;
63983+
63984+ path.dentry = (struct dentry *)dentry;
63985+ path.mnt = (struct vfsmount *)vfsmnt;
63986+
63987+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
63988+ get_fs_root(reaper->fs, &root);
63989+
63990+ br_read_lock(&vfsmount_lock);
63991+ write_seqlock(&rename_lock);
63992+ res = gen_full_path(&path, &root, buf, buflen);
63993+ write_sequnlock(&rename_lock);
63994+ br_read_unlock(&vfsmount_lock);
63995+
63996+ path_put(&root);
63997+ return res;
63998+}
63999+
64000+char *
64001+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
64002+{
64003+ char *ret;
64004+ br_read_lock(&vfsmount_lock);
64005+ write_seqlock(&rename_lock);
64006+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
64007+ PAGE_SIZE);
64008+ write_sequnlock(&rename_lock);
64009+ br_read_unlock(&vfsmount_lock);
64010+ return ret;
64011+}
64012+
64013+static char *
64014+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
64015+{
64016+ char *ret;
64017+ char *buf;
64018+ int buflen;
64019+
64020+ br_read_lock(&vfsmount_lock);
64021+ write_seqlock(&rename_lock);
64022+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
64023+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
64024+ buflen = (int)(ret - buf);
64025+ if (buflen >= 5)
64026+ prepend(&ret, &buflen, "/proc", 5);
64027+ else
64028+ ret = strcpy(buf, "<path too long>");
64029+ write_sequnlock(&rename_lock);
64030+ br_read_unlock(&vfsmount_lock);
64031+ return ret;
64032+}
64033+
64034+char *
64035+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
64036+{
64037+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
64038+ PAGE_SIZE);
64039+}
64040+
64041+char *
64042+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
64043+{
64044+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
64045+ PAGE_SIZE);
64046+}
64047+
64048+char *
64049+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
64050+{
64051+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
64052+ PAGE_SIZE);
64053+}
64054+
64055+char *
64056+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
64057+{
64058+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
64059+ PAGE_SIZE);
64060+}
64061+
64062+char *
64063+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
64064+{
64065+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
64066+ PAGE_SIZE);
64067+}
64068+
64069+__inline__ __u32
64070+to_gr_audit(const __u32 reqmode)
64071+{
64072+ /* masks off auditable permission flags, then shifts them to create
64073+ auditing flags, and adds the special case of append auditing if
64074+ we're requesting write */
64075+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
64076+}
64077+
64078+struct acl_role_label *
64079+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
64080+ const gid_t gid)
64081+{
64082+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
64083+ struct acl_role_label *match;
64084+ struct role_allowed_ip *ipp;
64085+ unsigned int x;
64086+ u32 curr_ip = task->signal->saved_ip;
64087+
64088+ match = state->acl_role_set.r_hash[index];
64089+
64090+ while (match) {
64091+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
64092+ for (x = 0; x < match->domain_child_num; x++) {
64093+ if (match->domain_children[x] == uid)
64094+ goto found;
64095+ }
64096+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
64097+ break;
64098+ match = match->next;
64099+ }
64100+found:
64101+ if (match == NULL) {
64102+ try_group:
64103+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
64104+ match = state->acl_role_set.r_hash[index];
64105+
64106+ while (match) {
64107+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
64108+ for (x = 0; x < match->domain_child_num; x++) {
64109+ if (match->domain_children[x] == gid)
64110+ goto found2;
64111+ }
64112+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
64113+ break;
64114+ match = match->next;
64115+ }
64116+found2:
64117+ if (match == NULL)
64118+ match = state->default_role;
64119+ if (match->allowed_ips == NULL)
64120+ return match;
64121+ else {
64122+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
64123+ if (likely
64124+ ((ntohl(curr_ip) & ipp->netmask) ==
64125+ (ntohl(ipp->addr) & ipp->netmask)))
64126+ return match;
64127+ }
64128+ match = state->default_role;
64129+ }
64130+ } else if (match->allowed_ips == NULL) {
64131+ return match;
64132+ } else {
64133+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
64134+ if (likely
64135+ ((ntohl(curr_ip) & ipp->netmask) ==
64136+ (ntohl(ipp->addr) & ipp->netmask)))
64137+ return match;
64138+ }
64139+ goto try_group;
64140+ }
64141+
64142+ return match;
64143+}
64144+
64145+static struct acl_role_label *
64146+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
64147+ const gid_t gid)
64148+{
64149+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
64150+}
64151+
64152+struct acl_subject_label *
64153+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
64154+ const struct acl_role_label *role)
64155+{
64156+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
64157+ struct acl_subject_label *match;
64158+
64159+ match = role->subj_hash[index];
64160+
64161+ while (match && (match->inode != ino || match->device != dev ||
64162+ (match->mode & GR_DELETED))) {
64163+ match = match->next;
64164+ }
64165+
64166+ if (match && !(match->mode & GR_DELETED))
64167+ return match;
64168+ else
64169+ return NULL;
64170+}
64171+
64172+struct acl_subject_label *
64173+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
64174+ const struct acl_role_label *role)
64175+{
64176+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
64177+ struct acl_subject_label *match;
64178+
64179+ match = role->subj_hash[index];
64180+
64181+ while (match && (match->inode != ino || match->device != dev ||
64182+ !(match->mode & GR_DELETED))) {
64183+ match = match->next;
64184+ }
64185+
64186+ if (match && (match->mode & GR_DELETED))
64187+ return match;
64188+ else
64189+ return NULL;
64190+}
64191+
64192+static struct acl_object_label *
64193+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
64194+ const struct acl_subject_label *subj)
64195+{
64196+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
64197+ struct acl_object_label *match;
64198+
64199+ match = subj->obj_hash[index];
64200+
64201+ while (match && (match->inode != ino || match->device != dev ||
64202+ (match->mode & GR_DELETED))) {
64203+ match = match->next;
64204+ }
64205+
64206+ if (match && !(match->mode & GR_DELETED))
64207+ return match;
64208+ else
64209+ return NULL;
64210+}
64211+
64212+static struct acl_object_label *
64213+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
64214+ const struct acl_subject_label *subj)
64215+{
64216+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
64217+ struct acl_object_label *match;
64218+
64219+ match = subj->obj_hash[index];
64220+
64221+ while (match && (match->inode != ino || match->device != dev ||
64222+ !(match->mode & GR_DELETED))) {
64223+ match = match->next;
64224+ }
64225+
64226+ if (match && (match->mode & GR_DELETED))
64227+ return match;
64228+
64229+ match = subj->obj_hash[index];
64230+
64231+ while (match && (match->inode != ino || match->device != dev ||
64232+ (match->mode & GR_DELETED))) {
64233+ match = match->next;
64234+ }
64235+
64236+ if (match && !(match->mode & GR_DELETED))
64237+ return match;
64238+ else
64239+ return NULL;
64240+}
64241+
64242+struct name_entry *
64243+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
64244+{
64245+ unsigned int len = strlen(name);
64246+ unsigned int key = full_name_hash(name, len);
64247+ unsigned int index = key % state->name_set.n_size;
64248+ struct name_entry *match;
64249+
64250+ match = state->name_set.n_hash[index];
64251+
64252+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
64253+ match = match->next;
64254+
64255+ return match;
64256+}
64257+
64258+static struct name_entry *
64259+lookup_name_entry(const char *name)
64260+{
64261+ return __lookup_name_entry(&running_polstate, name);
64262+}
64263+
64264+static struct name_entry *
64265+lookup_name_entry_create(const char *name)
64266+{
64267+ unsigned int len = strlen(name);
64268+ unsigned int key = full_name_hash(name, len);
64269+ unsigned int index = key % running_polstate.name_set.n_size;
64270+ struct name_entry *match;
64271+
64272+ match = running_polstate.name_set.n_hash[index];
64273+
64274+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
64275+ !match->deleted))
64276+ match = match->next;
64277+
64278+ if (match && match->deleted)
64279+ return match;
64280+
64281+ match = running_polstate.name_set.n_hash[index];
64282+
64283+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
64284+ match->deleted))
64285+ match = match->next;
64286+
64287+ if (match && !match->deleted)
64288+ return match;
64289+ else
64290+ return NULL;
64291+}
64292+
64293+static struct inodev_entry *
64294+lookup_inodev_entry(const ino_t ino, const dev_t dev)
64295+{
64296+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
64297+ struct inodev_entry *match;
64298+
64299+ match = running_polstate.inodev_set.i_hash[index];
64300+
64301+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
64302+ match = match->next;
64303+
64304+ return match;
64305+}
64306+
64307+void
64308+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
64309+{
64310+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
64311+ state->inodev_set.i_size);
64312+ struct inodev_entry **curr;
64313+
64314+ entry->prev = NULL;
64315+
64316+ curr = &state->inodev_set.i_hash[index];
64317+ if (*curr != NULL)
64318+ (*curr)->prev = entry;
64319+
64320+ entry->next = *curr;
64321+ *curr = entry;
64322+
64323+ return;
64324+}
64325+
64326+static void
64327+insert_inodev_entry(struct inodev_entry *entry)
64328+{
64329+ __insert_inodev_entry(&running_polstate, entry);
64330+}
64331+
64332+void
64333+insert_acl_obj_label(struct acl_object_label *obj,
64334+ struct acl_subject_label *subj)
64335+{
64336+ unsigned int index =
64337+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
64338+ struct acl_object_label **curr;
64339+
64340+ obj->prev = NULL;
64341+
64342+ curr = &subj->obj_hash[index];
64343+ if (*curr != NULL)
64344+ (*curr)->prev = obj;
64345+
64346+ obj->next = *curr;
64347+ *curr = obj;
64348+
64349+ return;
64350+}
64351+
64352+void
64353+insert_acl_subj_label(struct acl_subject_label *obj,
64354+ struct acl_role_label *role)
64355+{
64356+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
64357+ struct acl_subject_label **curr;
64358+
64359+ obj->prev = NULL;
64360+
64361+ curr = &role->subj_hash[index];
64362+ if (*curr != NULL)
64363+ (*curr)->prev = obj;
64364+
64365+ obj->next = *curr;
64366+ *curr = obj;
64367+
64368+ return;
64369+}
64370+
64371+/* derived from glibc fnmatch() 0: match, 1: no match*/
64372+
64373+static int
64374+glob_match(const char *p, const char *n)
64375+{
64376+ char c;
64377+
64378+ while ((c = *p++) != '\0') {
64379+ switch (c) {
64380+ case '?':
64381+ if (*n == '\0')
64382+ return 1;
64383+ else if (*n == '/')
64384+ return 1;
64385+ break;
64386+ case '\\':
64387+ if (*n != c)
64388+ return 1;
64389+ break;
64390+ case '*':
64391+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
64392+ if (*n == '/')
64393+ return 1;
64394+ else if (c == '?') {
64395+ if (*n == '\0')
64396+ return 1;
64397+ else
64398+ ++n;
64399+ }
64400+ }
64401+ if (c == '\0') {
64402+ return 0;
64403+ } else {
64404+ const char *endp;
64405+
64406+ if ((endp = strchr(n, '/')) == NULL)
64407+ endp = n + strlen(n);
64408+
64409+ if (c == '[') {
64410+ for (--p; n < endp; ++n)
64411+ if (!glob_match(p, n))
64412+ return 0;
64413+ } else if (c == '/') {
64414+ while (*n != '\0' && *n != '/')
64415+ ++n;
64416+ if (*n == '/' && !glob_match(p, n + 1))
64417+ return 0;
64418+ } else {
64419+ for (--p; n < endp; ++n)
64420+ if (*n == c && !glob_match(p, n))
64421+ return 0;
64422+ }
64423+
64424+ return 1;
64425+ }
64426+ case '[':
64427+ {
64428+ int not;
64429+ char cold;
64430+
64431+ if (*n == '\0' || *n == '/')
64432+ return 1;
64433+
64434+ not = (*p == '!' || *p == '^');
64435+ if (not)
64436+ ++p;
64437+
64438+ c = *p++;
64439+ for (;;) {
64440+ unsigned char fn = (unsigned char)*n;
64441+
64442+ if (c == '\0')
64443+ return 1;
64444+ else {
64445+ if (c == fn)
64446+ goto matched;
64447+ cold = c;
64448+ c = *p++;
64449+
64450+ if (c == '-' && *p != ']') {
64451+ unsigned char cend = *p++;
64452+
64453+ if (cend == '\0')
64454+ return 1;
64455+
64456+ if (cold <= fn && fn <= cend)
64457+ goto matched;
64458+
64459+ c = *p++;
64460+ }
64461+ }
64462+
64463+ if (c == ']')
64464+ break;
64465+ }
64466+ if (!not)
64467+ return 1;
64468+ break;
64469+ matched:
64470+ while (c != ']') {
64471+ if (c == '\0')
64472+ return 1;
64473+
64474+ c = *p++;
64475+ }
64476+ if (not)
64477+ return 1;
64478+ }
64479+ break;
64480+ default:
64481+ if (c != *n)
64482+ return 1;
64483+ }
64484+
64485+ ++n;
64486+ }
64487+
64488+ if (*n == '\0')
64489+ return 0;
64490+
64491+ if (*n == '/')
64492+ return 0;
64493+
64494+ return 1;
64495+}
64496+
64497+static struct acl_object_label *
64498+chk_glob_label(struct acl_object_label *globbed,
64499+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
64500+{
64501+ struct acl_object_label *tmp;
64502+
64503+ if (*path == NULL)
64504+ *path = gr_to_filename_nolock(dentry, mnt);
64505+
64506+ tmp = globbed;
64507+
64508+ while (tmp) {
64509+ if (!glob_match(tmp->filename, *path))
64510+ return tmp;
64511+ tmp = tmp->next;
64512+ }
64513+
64514+ return NULL;
64515+}
64516+
64517+static struct acl_object_label *
64518+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
64519+ const ino_t curr_ino, const dev_t curr_dev,
64520+ const struct acl_subject_label *subj, char **path, const int checkglob)
64521+{
64522+ struct acl_subject_label *tmpsubj;
64523+ struct acl_object_label *retval;
64524+ struct acl_object_label *retval2;
64525+
64526+ tmpsubj = (struct acl_subject_label *) subj;
64527+ read_lock(&gr_inode_lock);
64528+ do {
64529+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
64530+ if (retval) {
64531+ if (checkglob && retval->globbed) {
64532+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
64533+ if (retval2)
64534+ retval = retval2;
64535+ }
64536+ break;
64537+ }
64538+ } while ((tmpsubj = tmpsubj->parent_subject));
64539+ read_unlock(&gr_inode_lock);
64540+
64541+ return retval;
64542+}
64543+
64544+static __inline__ struct acl_object_label *
64545+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
64546+ struct dentry *curr_dentry,
64547+ const struct acl_subject_label *subj, char **path, const int checkglob)
64548+{
64549+ int newglob = checkglob;
64550+ ino_t inode;
64551+ dev_t device;
64552+
64553+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
64554+ as we don't want a / * rule to match instead of the / object
64555+ don't do this for create lookups that call this function though, since they're looking up
64556+ on the parent and thus need globbing checks on all paths
64557+ */
64558+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
64559+ newglob = GR_NO_GLOB;
64560+
64561+ spin_lock(&curr_dentry->d_lock);
64562+ inode = curr_dentry->d_inode->i_ino;
64563+ device = __get_dev(curr_dentry);
64564+ spin_unlock(&curr_dentry->d_lock);
64565+
64566+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
64567+}
64568+
64569+#ifdef CONFIG_HUGETLBFS
64570+static inline bool
64571+is_hugetlbfs_mnt(const struct vfsmount *mnt)
64572+{
64573+ int i;
64574+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
64575+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
64576+ return true;
64577+ }
64578+
64579+ return false;
64580+}
64581+#endif
64582+
64583+static struct acl_object_label *
64584+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64585+ const struct acl_subject_label *subj, char *path, const int checkglob)
64586+{
64587+ struct dentry *dentry = (struct dentry *) l_dentry;
64588+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
64589+ struct mount *real_mnt = real_mount(mnt);
64590+ struct acl_object_label *retval;
64591+ struct dentry *parent;
64592+
64593+ br_read_lock(&vfsmount_lock);
64594+ write_seqlock(&rename_lock);
64595+
64596+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
64597+#ifdef CONFIG_NET
64598+ mnt == sock_mnt ||
64599+#endif
64600+#ifdef CONFIG_HUGETLBFS
64601+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
64602+#endif
64603+ /* ignore Eric Biederman */
64604+ IS_PRIVATE(l_dentry->d_inode))) {
64605+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
64606+ goto out;
64607+ }
64608+
64609+ for (;;) {
64610+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
64611+ break;
64612+
64613+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
64614+ if (!mnt_has_parent(real_mnt))
64615+ break;
64616+
64617+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64618+ if (retval != NULL)
64619+ goto out;
64620+
64621+ dentry = real_mnt->mnt_mountpoint;
64622+ real_mnt = real_mnt->mnt_parent;
64623+ mnt = &real_mnt->mnt;
64624+ continue;
64625+ }
64626+
64627+ parent = dentry->d_parent;
64628+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64629+ if (retval != NULL)
64630+ goto out;
64631+
64632+ dentry = parent;
64633+ }
64634+
64635+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64636+
64637+ /* gr_real_root is pinned so we don't have to hold a reference */
64638+ if (retval == NULL)
64639+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
64640+out:
64641+ write_sequnlock(&rename_lock);
64642+ br_read_unlock(&vfsmount_lock);
64643+
64644+ BUG_ON(retval == NULL);
64645+
64646+ return retval;
64647+}
64648+
64649+static __inline__ struct acl_object_label *
64650+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64651+ const struct acl_subject_label *subj)
64652+{
64653+ char *path = NULL;
64654+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
64655+}
64656+
64657+static __inline__ struct acl_object_label *
64658+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64659+ const struct acl_subject_label *subj)
64660+{
64661+ char *path = NULL;
64662+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
64663+}
64664+
64665+static __inline__ struct acl_object_label *
64666+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64667+ const struct acl_subject_label *subj, char *path)
64668+{
64669+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
64670+}
64671+
64672+struct acl_subject_label *
64673+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64674+ const struct acl_role_label *role)
64675+{
64676+ struct dentry *dentry = (struct dentry *) l_dentry;
64677+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
64678+ struct mount *real_mnt = real_mount(mnt);
64679+ struct acl_subject_label *retval;
64680+ struct dentry *parent;
64681+
64682+ br_read_lock(&vfsmount_lock);
64683+ write_seqlock(&rename_lock);
64684+
64685+ for (;;) {
64686+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
64687+ break;
64688+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
64689+ if (!mnt_has_parent(real_mnt))
64690+ break;
64691+
64692+ spin_lock(&dentry->d_lock);
64693+ read_lock(&gr_inode_lock);
64694+ retval =
64695+ lookup_acl_subj_label(dentry->d_inode->i_ino,
64696+ __get_dev(dentry), role);
64697+ read_unlock(&gr_inode_lock);
64698+ spin_unlock(&dentry->d_lock);
64699+ if (retval != NULL)
64700+ goto out;
64701+
64702+ dentry = real_mnt->mnt_mountpoint;
64703+ real_mnt = real_mnt->mnt_parent;
64704+ mnt = &real_mnt->mnt;
64705+ continue;
64706+ }
64707+
64708+ spin_lock(&dentry->d_lock);
64709+ read_lock(&gr_inode_lock);
64710+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
64711+ __get_dev(dentry), role);
64712+ read_unlock(&gr_inode_lock);
64713+ parent = dentry->d_parent;
64714+ spin_unlock(&dentry->d_lock);
64715+
64716+ if (retval != NULL)
64717+ goto out;
64718+
64719+ dentry = parent;
64720+ }
64721+
64722+ spin_lock(&dentry->d_lock);
64723+ read_lock(&gr_inode_lock);
64724+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
64725+ __get_dev(dentry), role);
64726+ read_unlock(&gr_inode_lock);
64727+ spin_unlock(&dentry->d_lock);
64728+
64729+ if (unlikely(retval == NULL)) {
64730+ /* gr_real_root is pinned, we don't need to hold a reference */
64731+ read_lock(&gr_inode_lock);
64732+ retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
64733+ __get_dev(gr_real_root.dentry), role);
64734+ read_unlock(&gr_inode_lock);
64735+ }
64736+out:
64737+ write_sequnlock(&rename_lock);
64738+ br_read_unlock(&vfsmount_lock);
64739+
64740+ BUG_ON(retval == NULL);
64741+
64742+ return retval;
64743+}
64744+
64745+void
64746+assign_special_role(const char *rolename)
64747+{
64748+ struct acl_object_label *obj;
64749+ struct acl_role_label *r;
64750+ struct acl_role_label *assigned = NULL;
64751+ struct task_struct *tsk;
64752+ struct file *filp;
64753+
64754+ FOR_EACH_ROLE_START(r)
64755+ if (!strcmp(rolename, r->rolename) &&
64756+ (r->roletype & GR_ROLE_SPECIAL)) {
64757+ assigned = r;
64758+ break;
64759+ }
64760+ FOR_EACH_ROLE_END(r)
64761+
64762+ if (!assigned)
64763+ return;
64764+
64765+ read_lock(&tasklist_lock);
64766+ read_lock(&grsec_exec_file_lock);
64767+
64768+ tsk = current->real_parent;
64769+ if (tsk == NULL)
64770+ goto out_unlock;
64771+
64772+ filp = tsk->exec_file;
64773+ if (filp == NULL)
64774+ goto out_unlock;
64775+
64776+ tsk->is_writable = 0;
64777+ tsk->inherited = 0;
64778+
64779+ tsk->acl_sp_role = 1;
64780+ tsk->acl_role_id = ++acl_sp_role_value;
64781+ tsk->role = assigned;
64782+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
64783+
64784+ /* ignore additional mmap checks for processes that are writable
64785+ by the default ACL */
64786+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
64787+ if (unlikely(obj->mode & GR_WRITE))
64788+ tsk->is_writable = 1;
64789+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
64790+ if (unlikely(obj->mode & GR_WRITE))
64791+ tsk->is_writable = 1;
64792+
64793+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
64794+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
64795+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
64796+#endif
64797+
64798+out_unlock:
64799+ read_unlock(&grsec_exec_file_lock);
64800+ read_unlock(&tasklist_lock);
64801+ return;
64802+}
64803+
64804+
64805+static void
64806+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
64807+{
64808+ struct task_struct *task = current;
64809+ const struct cred *cred = current_cred();
64810+
64811+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
64812+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64813+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64814+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
64815+
64816+ return;
64817+}
64818+
64819+static void
64820+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
64821+{
64822+ struct task_struct *task = current;
64823+ const struct cred *cred = current_cred();
64824+
64825+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
64826+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64827+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64828+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
64829+
64830+ return;
64831+}
64832+
64833+static void
64834+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
64835+{
64836+ struct task_struct *task = current;
64837+ const struct cred *cred = current_cred();
64838+
64839+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
64840+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64841+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64842+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
64843+
64844+ return;
64845+}
64846+
64847+static void
64848+gr_set_proc_res(struct task_struct *task)
64849+{
64850+ struct acl_subject_label *proc;
64851+ unsigned short i;
64852+
64853+ proc = task->acl;
64854+
64855+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
64856+ return;
64857+
64858+ for (i = 0; i < RLIM_NLIMITS; i++) {
64859+ if (!(proc->resmask & (1U << i)))
64860+ continue;
64861+
64862+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
64863+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
64864+
64865+ if (i == RLIMIT_CPU)
64866+ update_rlimit_cpu(task, proc->res[i].rlim_cur);
64867+ }
64868+
64869+ return;
64870+}
64871+
64872+/* both of the below must be called with
64873+ rcu_read_lock();
64874+ read_lock(&tasklist_lock);
64875+ read_lock(&grsec_exec_file_lock);
64876+*/
64877+
64878+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
64879+{
64880+ char *tmpname;
64881+ struct acl_subject_label *tmpsubj;
64882+ struct file *filp;
64883+ struct name_entry *nmatch;
64884+
64885+ filp = task->exec_file;
64886+ if (filp == NULL)
64887+ return NULL;
64888+
64889+ /* the following is to apply the correct subject
64890+ on binaries running when the RBAC system
64891+ is enabled, when the binaries have been
64892+ replaced or deleted since their execution
64893+ -----
64894+ when the RBAC system starts, the inode/dev
64895+ from exec_file will be one the RBAC system
64896+ is unaware of. It only knows the inode/dev
64897+ of the present file on disk, or the absence
64898+ of it.
64899+ */
64900+
64901+ if (filename)
64902+ nmatch = __lookup_name_entry(state, filename);
64903+ else {
64904+ preempt_disable();
64905+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
64906+
64907+ nmatch = __lookup_name_entry(state, tmpname);
64908+ preempt_enable();
64909+ }
64910+ tmpsubj = NULL;
64911+ if (nmatch) {
64912+ if (nmatch->deleted)
64913+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
64914+ else
64915+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
64916+ }
64917+ /* this also works for the reload case -- if we don't match a potentially inherited subject
64918+ then we fall back to a normal lookup based on the binary's ino/dev
64919+ */
64920+ if (tmpsubj == NULL)
64921+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
64922+
64923+ return tmpsubj;
64924+}
64925+
64926+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
64927+{
64928+ return __gr_get_subject_for_task(&running_polstate, task, filename);
64929+}
64930+
64931+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
64932+{
64933+ struct acl_object_label *obj;
64934+ struct file *filp;
64935+
64936+ filp = task->exec_file;
64937+
64938+ task->acl = subj;
64939+ task->is_writable = 0;
64940+ /* ignore additional mmap checks for processes that are writable
64941+ by the default ACL */
64942+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
64943+ if (unlikely(obj->mode & GR_WRITE))
64944+ task->is_writable = 1;
64945+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
64946+ if (unlikely(obj->mode & GR_WRITE))
64947+ task->is_writable = 1;
64948+
64949+ gr_set_proc_res(task);
64950+
64951+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
64952+ 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);
64953+#endif
64954+}
64955+
64956+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
64957+{
64958+ __gr_apply_subject_to_task(&running_polstate, task, subj);
64959+}
64960+
64961+__u32
64962+gr_search_file(const struct dentry * dentry, const __u32 mode,
64963+ const struct vfsmount * mnt)
64964+{
64965+ __u32 retval = mode;
64966+ struct acl_subject_label *curracl;
64967+ struct acl_object_label *currobj;
64968+
64969+ if (unlikely(!(gr_status & GR_READY)))
64970+ return (mode & ~GR_AUDITS);
64971+
64972+ curracl = current->acl;
64973+
64974+ currobj = chk_obj_label(dentry, mnt, curracl);
64975+ retval = currobj->mode & mode;
64976+
64977+ /* if we're opening a specified transfer file for writing
64978+ (e.g. /dev/initctl), then transfer our role to init
64979+ */
64980+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
64981+ current->role->roletype & GR_ROLE_PERSIST)) {
64982+ struct task_struct *task = init_pid_ns.child_reaper;
64983+
64984+ if (task->role != current->role) {
64985+ struct acl_subject_label *subj;
64986+
64987+ task->acl_sp_role = 0;
64988+ task->acl_role_id = current->acl_role_id;
64989+ task->role = current->role;
64990+ rcu_read_lock();
64991+ read_lock(&grsec_exec_file_lock);
64992+ subj = gr_get_subject_for_task(task, NULL);
64993+ gr_apply_subject_to_task(task, subj);
64994+ read_unlock(&grsec_exec_file_lock);
64995+ rcu_read_unlock();
64996+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
64997+ }
64998+ }
64999+
65000+ if (unlikely
65001+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
65002+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
65003+ __u32 new_mode = mode;
65004+
65005+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
65006+
65007+ retval = new_mode;
65008+
65009+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
65010+ new_mode |= GR_INHERIT;
65011+
65012+ if (!(mode & GR_NOLEARN))
65013+ gr_log_learn(dentry, mnt, new_mode);
65014+ }
65015+
65016+ return retval;
65017+}
65018+
65019+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
65020+ const struct dentry *parent,
65021+ const struct vfsmount *mnt)
65022+{
65023+ struct name_entry *match;
65024+ struct acl_object_label *matchpo;
65025+ struct acl_subject_label *curracl;
65026+ char *path;
65027+
65028+ if (unlikely(!(gr_status & GR_READY)))
65029+ return NULL;
65030+
65031+ preempt_disable();
65032+ path = gr_to_filename_rbac(new_dentry, mnt);
65033+ match = lookup_name_entry_create(path);
65034+
65035+ curracl = current->acl;
65036+
65037+ if (match) {
65038+ read_lock(&gr_inode_lock);
65039+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
65040+ read_unlock(&gr_inode_lock);
65041+
65042+ if (matchpo) {
65043+ preempt_enable();
65044+ return matchpo;
65045+ }
65046+ }
65047+
65048+ // lookup parent
65049+
65050+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
65051+
65052+ preempt_enable();
65053+ return matchpo;
65054+}
65055+
65056+__u32
65057+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
65058+ const struct vfsmount * mnt, const __u32 mode)
65059+{
65060+ struct acl_object_label *matchpo;
65061+ __u32 retval;
65062+
65063+ if (unlikely(!(gr_status & GR_READY)))
65064+ return (mode & ~GR_AUDITS);
65065+
65066+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
65067+
65068+ retval = matchpo->mode & mode;
65069+
65070+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
65071+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
65072+ __u32 new_mode = mode;
65073+
65074+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
65075+
65076+ gr_log_learn(new_dentry, mnt, new_mode);
65077+ return new_mode;
65078+ }
65079+
65080+ return retval;
65081+}
65082+
65083+__u32
65084+gr_check_link(const struct dentry * new_dentry,
65085+ const struct dentry * parent_dentry,
65086+ const struct vfsmount * parent_mnt,
65087+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
65088+{
65089+ struct acl_object_label *obj;
65090+ __u32 oldmode, newmode;
65091+ __u32 needmode;
65092+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
65093+ GR_DELETE | GR_INHERIT;
65094+
65095+ if (unlikely(!(gr_status & GR_READY)))
65096+ return (GR_CREATE | GR_LINK);
65097+
65098+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
65099+ oldmode = obj->mode;
65100+
65101+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
65102+ newmode = obj->mode;
65103+
65104+ needmode = newmode & checkmodes;
65105+
65106+ // old name for hardlink must have at least the permissions of the new name
65107+ if ((oldmode & needmode) != needmode)
65108+ goto bad;
65109+
65110+ // if old name had restrictions/auditing, make sure the new name does as well
65111+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
65112+
65113+ // don't allow hardlinking of suid/sgid/fcapped files without permission
65114+ if (is_privileged_binary(old_dentry))
65115+ needmode |= GR_SETID;
65116+
65117+ if ((newmode & needmode) != needmode)
65118+ goto bad;
65119+
65120+ // enforce minimum permissions
65121+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
65122+ return newmode;
65123+bad:
65124+ needmode = oldmode;
65125+ if (is_privileged_binary(old_dentry))
65126+ needmode |= GR_SETID;
65127+
65128+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
65129+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
65130+ return (GR_CREATE | GR_LINK);
65131+ } else if (newmode & GR_SUPPRESS)
65132+ return GR_SUPPRESS;
65133+ else
65134+ return 0;
65135+}
65136+
65137+int
65138+gr_check_hidden_task(const struct task_struct *task)
65139+{
65140+ if (unlikely(!(gr_status & GR_READY)))
65141+ return 0;
65142+
65143+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
65144+ return 1;
65145+
65146+ return 0;
65147+}
65148+
65149+int
65150+gr_check_protected_task(const struct task_struct *task)
65151+{
65152+ if (unlikely(!(gr_status & GR_READY) || !task))
65153+ return 0;
65154+
65155+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
65156+ task->acl != current->acl)
65157+ return 1;
65158+
65159+ return 0;
65160+}
65161+
65162+int
65163+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
65164+{
65165+ struct task_struct *p;
65166+ int ret = 0;
65167+
65168+ if (unlikely(!(gr_status & GR_READY) || !pid))
65169+ return ret;
65170+
65171+ read_lock(&tasklist_lock);
65172+ do_each_pid_task(pid, type, p) {
65173+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
65174+ p->acl != current->acl) {
65175+ ret = 1;
65176+ goto out;
65177+ }
65178+ } while_each_pid_task(pid, type, p);
65179+out:
65180+ read_unlock(&tasklist_lock);
65181+
65182+ return ret;
65183+}
65184+
65185+void
65186+gr_copy_label(struct task_struct *tsk)
65187+{
65188+ struct task_struct *p = current;
65189+
65190+ tsk->inherited = p->inherited;
65191+ tsk->acl_sp_role = 0;
65192+ tsk->acl_role_id = p->acl_role_id;
65193+ tsk->acl = p->acl;
65194+ tsk->role = p->role;
65195+ tsk->signal->used_accept = 0;
65196+ tsk->signal->curr_ip = p->signal->curr_ip;
65197+ tsk->signal->saved_ip = p->signal->saved_ip;
65198+ if (p->exec_file)
65199+ get_file(p->exec_file);
65200+ tsk->exec_file = p->exec_file;
65201+ tsk->is_writable = p->is_writable;
65202+ if (unlikely(p->signal->used_accept)) {
65203+ p->signal->curr_ip = 0;
65204+ p->signal->saved_ip = 0;
65205+ }
65206+
65207+ return;
65208+}
65209+
65210+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
65211+
65212+int
65213+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
65214+{
65215+ unsigned int i;
65216+ __u16 num;
65217+ uid_t *uidlist;
65218+ uid_t curuid;
65219+ int realok = 0;
65220+ int effectiveok = 0;
65221+ int fsok = 0;
65222+ uid_t globalreal, globaleffective, globalfs;
65223+
65224+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
65225+ struct user_struct *user;
65226+
65227+ if (!uid_valid(real))
65228+ goto skipit;
65229+
65230+ /* find user based on global namespace */
65231+
65232+ globalreal = GR_GLOBAL_UID(real);
65233+
65234+ user = find_user(make_kuid(&init_user_ns, globalreal));
65235+ if (user == NULL)
65236+ goto skipit;
65237+
65238+ if (gr_process_kernel_setuid_ban(user)) {
65239+ /* for find_user */
65240+ free_uid(user);
65241+ return 1;
65242+ }
65243+
65244+ /* for find_user */
65245+ free_uid(user);
65246+
65247+skipit:
65248+#endif
65249+
65250+ if (unlikely(!(gr_status & GR_READY)))
65251+ return 0;
65252+
65253+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
65254+ gr_log_learn_uid_change(real, effective, fs);
65255+
65256+ num = current->acl->user_trans_num;
65257+ uidlist = current->acl->user_transitions;
65258+
65259+ if (uidlist == NULL)
65260+ return 0;
65261+
65262+ if (!uid_valid(real)) {
65263+ realok = 1;
65264+ globalreal = (uid_t)-1;
65265+ } else {
65266+ globalreal = GR_GLOBAL_UID(real);
65267+ }
65268+ if (!uid_valid(effective)) {
65269+ effectiveok = 1;
65270+ globaleffective = (uid_t)-1;
65271+ } else {
65272+ globaleffective = GR_GLOBAL_UID(effective);
65273+ }
65274+ if (!uid_valid(fs)) {
65275+ fsok = 1;
65276+ globalfs = (uid_t)-1;
65277+ } else {
65278+ globalfs = GR_GLOBAL_UID(fs);
65279+ }
65280+
65281+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
65282+ for (i = 0; i < num; i++) {
65283+ curuid = uidlist[i];
65284+ if (globalreal == curuid)
65285+ realok = 1;
65286+ if (globaleffective == curuid)
65287+ effectiveok = 1;
65288+ if (globalfs == curuid)
65289+ fsok = 1;
65290+ }
65291+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
65292+ for (i = 0; i < num; i++) {
65293+ curuid = uidlist[i];
65294+ if (globalreal == curuid)
65295+ break;
65296+ if (globaleffective == curuid)
65297+ break;
65298+ if (globalfs == curuid)
65299+ break;
65300+ }
65301+ /* not in deny list */
65302+ if (i == num) {
65303+ realok = 1;
65304+ effectiveok = 1;
65305+ fsok = 1;
65306+ }
65307+ }
65308+
65309+ if (realok && effectiveok && fsok)
65310+ return 0;
65311+ else {
65312+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
65313+ return 1;
65314+ }
65315+}
65316+
65317+int
65318+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
65319+{
65320+ unsigned int i;
65321+ __u16 num;
65322+ gid_t *gidlist;
65323+ gid_t curgid;
65324+ int realok = 0;
65325+ int effectiveok = 0;
65326+ int fsok = 0;
65327+ gid_t globalreal, globaleffective, globalfs;
65328+
65329+ if (unlikely(!(gr_status & GR_READY)))
65330+ return 0;
65331+
65332+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
65333+ gr_log_learn_gid_change(real, effective, fs);
65334+
65335+ num = current->acl->group_trans_num;
65336+ gidlist = current->acl->group_transitions;
65337+
65338+ if (gidlist == NULL)
65339+ return 0;
65340+
65341+ if (!gid_valid(real)) {
65342+ realok = 1;
65343+ globalreal = (gid_t)-1;
65344+ } else {
65345+ globalreal = GR_GLOBAL_GID(real);
65346+ }
65347+ if (!gid_valid(effective)) {
65348+ effectiveok = 1;
65349+ globaleffective = (gid_t)-1;
65350+ } else {
65351+ globaleffective = GR_GLOBAL_GID(effective);
65352+ }
65353+ if (!gid_valid(fs)) {
65354+ fsok = 1;
65355+ globalfs = (gid_t)-1;
65356+ } else {
65357+ globalfs = GR_GLOBAL_GID(fs);
65358+ }
65359+
65360+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
65361+ for (i = 0; i < num; i++) {
65362+ curgid = gidlist[i];
65363+ if (globalreal == curgid)
65364+ realok = 1;
65365+ if (globaleffective == curgid)
65366+ effectiveok = 1;
65367+ if (globalfs == curgid)
65368+ fsok = 1;
65369+ }
65370+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
65371+ for (i = 0; i < num; i++) {
65372+ curgid = gidlist[i];
65373+ if (globalreal == curgid)
65374+ break;
65375+ if (globaleffective == curgid)
65376+ break;
65377+ if (globalfs == curgid)
65378+ break;
65379+ }
65380+ /* not in deny list */
65381+ if (i == num) {
65382+ realok = 1;
65383+ effectiveok = 1;
65384+ fsok = 1;
65385+ }
65386+ }
65387+
65388+ if (realok && effectiveok && fsok)
65389+ return 0;
65390+ else {
65391+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
65392+ return 1;
65393+ }
65394+}
65395+
65396+extern int gr_acl_is_capable(const int cap);
65397+
65398+void
65399+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
65400+{
65401+ struct acl_role_label *role = task->role;
65402+ struct acl_subject_label *subj = NULL;
65403+ struct acl_object_label *obj;
65404+ struct file *filp;
65405+ uid_t uid;
65406+ gid_t gid;
65407+
65408+ if (unlikely(!(gr_status & GR_READY)))
65409+ return;
65410+
65411+ uid = GR_GLOBAL_UID(kuid);
65412+ gid = GR_GLOBAL_GID(kgid);
65413+
65414+ filp = task->exec_file;
65415+
65416+ /* kernel process, we'll give them the kernel role */
65417+ if (unlikely(!filp)) {
65418+ task->role = running_polstate.kernel_role;
65419+ task->acl = running_polstate.kernel_role->root_label;
65420+ return;
65421+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
65422+ /* save the current ip at time of role lookup so that the proper
65423+ IP will be learned for role_allowed_ip */
65424+ task->signal->saved_ip = task->signal->curr_ip;
65425+ role = lookup_acl_role_label(task, uid, gid);
65426+ }
65427+
65428+ /* don't change the role if we're not a privileged process */
65429+ if (role && task->role != role &&
65430+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
65431+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
65432+ return;
65433+
65434+ /* perform subject lookup in possibly new role
65435+ we can use this result below in the case where role == task->role
65436+ */
65437+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
65438+
65439+ /* if we changed uid/gid, but result in the same role
65440+ and are using inheritance, don't lose the inherited subject
65441+ if current subject is other than what normal lookup
65442+ would result in, we arrived via inheritance, don't
65443+ lose subject
65444+ */
65445+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
65446+ (subj == task->acl)))
65447+ task->acl = subj;
65448+
65449+ /* leave task->inherited unaffected */
65450+
65451+ task->role = role;
65452+
65453+ task->is_writable = 0;
65454+
65455+ /* ignore additional mmap checks for processes that are writable
65456+ by the default ACL */
65457+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
65458+ if (unlikely(obj->mode & GR_WRITE))
65459+ task->is_writable = 1;
65460+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
65461+ if (unlikely(obj->mode & GR_WRITE))
65462+ task->is_writable = 1;
65463+
65464+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
65465+ 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);
65466+#endif
65467+
65468+ gr_set_proc_res(task);
65469+
65470+ return;
65471+}
65472+
65473+int
65474+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
65475+ const int unsafe_flags)
65476+{
65477+ struct task_struct *task = current;
65478+ struct acl_subject_label *newacl;
65479+ struct acl_object_label *obj;
65480+ __u32 retmode;
65481+
65482+ if (unlikely(!(gr_status & GR_READY)))
65483+ return 0;
65484+
65485+ newacl = chk_subj_label(dentry, mnt, task->role);
65486+
65487+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
65488+ did an exec
65489+ */
65490+ rcu_read_lock();
65491+ read_lock(&tasklist_lock);
65492+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
65493+ (task->parent->acl->mode & GR_POVERRIDE))) {
65494+ read_unlock(&tasklist_lock);
65495+ rcu_read_unlock();
65496+ goto skip_check;
65497+ }
65498+ read_unlock(&tasklist_lock);
65499+ rcu_read_unlock();
65500+
65501+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
65502+ !(task->role->roletype & GR_ROLE_GOD) &&
65503+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
65504+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
65505+ if (unsafe_flags & LSM_UNSAFE_SHARE)
65506+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
65507+ else
65508+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
65509+ return -EACCES;
65510+ }
65511+
65512+skip_check:
65513+
65514+ obj = chk_obj_label(dentry, mnt, task->acl);
65515+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
65516+
65517+ if (!(task->acl->mode & GR_INHERITLEARN) &&
65518+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
65519+ if (obj->nested)
65520+ task->acl = obj->nested;
65521+ else
65522+ task->acl = newacl;
65523+ task->inherited = 0;
65524+ } else {
65525+ task->inherited = 1;
65526+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
65527+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
65528+ }
65529+
65530+ task->is_writable = 0;
65531+
65532+ /* ignore additional mmap checks for processes that are writable
65533+ by the default ACL */
65534+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
65535+ if (unlikely(obj->mode & GR_WRITE))
65536+ task->is_writable = 1;
65537+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
65538+ if (unlikely(obj->mode & GR_WRITE))
65539+ task->is_writable = 1;
65540+
65541+ gr_set_proc_res(task);
65542+
65543+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
65544+ 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);
65545+#endif
65546+ return 0;
65547+}
65548+
65549+/* always called with valid inodev ptr */
65550+static void
65551+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
65552+{
65553+ struct acl_object_label *matchpo;
65554+ struct acl_subject_label *matchps;
65555+ struct acl_subject_label *subj;
65556+ struct acl_role_label *role;
65557+ unsigned int x;
65558+
65559+ FOR_EACH_ROLE_START(role)
65560+ FOR_EACH_SUBJECT_START(role, subj, x)
65561+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
65562+ matchpo->mode |= GR_DELETED;
65563+ FOR_EACH_SUBJECT_END(subj,x)
65564+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
65565+ /* nested subjects aren't in the role's subj_hash table */
65566+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
65567+ matchpo->mode |= GR_DELETED;
65568+ FOR_EACH_NESTED_SUBJECT_END(subj)
65569+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
65570+ matchps->mode |= GR_DELETED;
65571+ FOR_EACH_ROLE_END(role)
65572+
65573+ inodev->nentry->deleted = 1;
65574+
65575+ return;
65576+}
65577+
65578+void
65579+gr_handle_delete(const ino_t ino, const dev_t dev)
65580+{
65581+ struct inodev_entry *inodev;
65582+
65583+ if (unlikely(!(gr_status & GR_READY)))
65584+ return;
65585+
65586+ write_lock(&gr_inode_lock);
65587+ inodev = lookup_inodev_entry(ino, dev);
65588+ if (inodev != NULL)
65589+ do_handle_delete(inodev, ino, dev);
65590+ write_unlock(&gr_inode_lock);
65591+
65592+ return;
65593+}
65594+
65595+static void
65596+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
65597+ const ino_t newinode, const dev_t newdevice,
65598+ struct acl_subject_label *subj)
65599+{
65600+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
65601+ struct acl_object_label *match;
65602+
65603+ match = subj->obj_hash[index];
65604+
65605+ while (match && (match->inode != oldinode ||
65606+ match->device != olddevice ||
65607+ !(match->mode & GR_DELETED)))
65608+ match = match->next;
65609+
65610+ if (match && (match->inode == oldinode)
65611+ && (match->device == olddevice)
65612+ && (match->mode & GR_DELETED)) {
65613+ if (match->prev == NULL) {
65614+ subj->obj_hash[index] = match->next;
65615+ if (match->next != NULL)
65616+ match->next->prev = NULL;
65617+ } else {
65618+ match->prev->next = match->next;
65619+ if (match->next != NULL)
65620+ match->next->prev = match->prev;
65621+ }
65622+ match->prev = NULL;
65623+ match->next = NULL;
65624+ match->inode = newinode;
65625+ match->device = newdevice;
65626+ match->mode &= ~GR_DELETED;
65627+
65628+ insert_acl_obj_label(match, subj);
65629+ }
65630+
65631+ return;
65632+}
65633+
65634+static void
65635+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
65636+ const ino_t newinode, const dev_t newdevice,
65637+ struct acl_role_label *role)
65638+{
65639+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
65640+ struct acl_subject_label *match;
65641+
65642+ match = role->subj_hash[index];
65643+
65644+ while (match && (match->inode != oldinode ||
65645+ match->device != olddevice ||
65646+ !(match->mode & GR_DELETED)))
65647+ match = match->next;
65648+
65649+ if (match && (match->inode == oldinode)
65650+ && (match->device == olddevice)
65651+ && (match->mode & GR_DELETED)) {
65652+ if (match->prev == NULL) {
65653+ role->subj_hash[index] = match->next;
65654+ if (match->next != NULL)
65655+ match->next->prev = NULL;
65656+ } else {
65657+ match->prev->next = match->next;
65658+ if (match->next != NULL)
65659+ match->next->prev = match->prev;
65660+ }
65661+ match->prev = NULL;
65662+ match->next = NULL;
65663+ match->inode = newinode;
65664+ match->device = newdevice;
65665+ match->mode &= ~GR_DELETED;
65666+
65667+ insert_acl_subj_label(match, role);
65668+ }
65669+
65670+ return;
65671+}
65672+
65673+static void
65674+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
65675+ const ino_t newinode, const dev_t newdevice)
65676+{
65677+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
65678+ struct inodev_entry *match;
65679+
65680+ match = running_polstate.inodev_set.i_hash[index];
65681+
65682+ while (match && (match->nentry->inode != oldinode ||
65683+ match->nentry->device != olddevice || !match->nentry->deleted))
65684+ match = match->next;
65685+
65686+ if (match && (match->nentry->inode == oldinode)
65687+ && (match->nentry->device == olddevice) &&
65688+ match->nentry->deleted) {
65689+ if (match->prev == NULL) {
65690+ running_polstate.inodev_set.i_hash[index] = match->next;
65691+ if (match->next != NULL)
65692+ match->next->prev = NULL;
65693+ } else {
65694+ match->prev->next = match->next;
65695+ if (match->next != NULL)
65696+ match->next->prev = match->prev;
65697+ }
65698+ match->prev = NULL;
65699+ match->next = NULL;
65700+ match->nentry->inode = newinode;
65701+ match->nentry->device = newdevice;
65702+ match->nentry->deleted = 0;
65703+
65704+ insert_inodev_entry(match);
65705+ }
65706+
65707+ return;
65708+}
65709+
65710+static void
65711+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
65712+{
65713+ struct acl_subject_label *subj;
65714+ struct acl_role_label *role;
65715+ unsigned int x;
65716+
65717+ FOR_EACH_ROLE_START(role)
65718+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
65719+
65720+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
65721+ if ((subj->inode == ino) && (subj->device == dev)) {
65722+ subj->inode = ino;
65723+ subj->device = dev;
65724+ }
65725+ /* nested subjects aren't in the role's subj_hash table */
65726+ update_acl_obj_label(matchn->inode, matchn->device,
65727+ ino, dev, subj);
65728+ FOR_EACH_NESTED_SUBJECT_END(subj)
65729+ FOR_EACH_SUBJECT_START(role, subj, x)
65730+ update_acl_obj_label(matchn->inode, matchn->device,
65731+ ino, dev, subj);
65732+ FOR_EACH_SUBJECT_END(subj,x)
65733+ FOR_EACH_ROLE_END(role)
65734+
65735+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
65736+
65737+ return;
65738+}
65739+
65740+static void
65741+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
65742+ const struct vfsmount *mnt)
65743+{
65744+ ino_t ino = dentry->d_inode->i_ino;
65745+ dev_t dev = __get_dev(dentry);
65746+
65747+ __do_handle_create(matchn, ino, dev);
65748+
65749+ return;
65750+}
65751+
65752+void
65753+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
65754+{
65755+ struct name_entry *matchn;
65756+
65757+ if (unlikely(!(gr_status & GR_READY)))
65758+ return;
65759+
65760+ preempt_disable();
65761+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
65762+
65763+ if (unlikely((unsigned long)matchn)) {
65764+ write_lock(&gr_inode_lock);
65765+ do_handle_create(matchn, dentry, mnt);
65766+ write_unlock(&gr_inode_lock);
65767+ }
65768+ preempt_enable();
65769+
65770+ return;
65771+}
65772+
65773+void
65774+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
65775+{
65776+ struct name_entry *matchn;
65777+
65778+ if (unlikely(!(gr_status & GR_READY)))
65779+ return;
65780+
65781+ preempt_disable();
65782+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
65783+
65784+ if (unlikely((unsigned long)matchn)) {
65785+ write_lock(&gr_inode_lock);
65786+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
65787+ write_unlock(&gr_inode_lock);
65788+ }
65789+ preempt_enable();
65790+
65791+ return;
65792+}
65793+
65794+void
65795+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
65796+ struct dentry *old_dentry,
65797+ struct dentry *new_dentry,
65798+ struct vfsmount *mnt, const __u8 replace)
65799+{
65800+ struct name_entry *matchn;
65801+ struct inodev_entry *inodev;
65802+ struct inode *inode = new_dentry->d_inode;
65803+ ino_t old_ino = old_dentry->d_inode->i_ino;
65804+ dev_t old_dev = __get_dev(old_dentry);
65805+
65806+ /* vfs_rename swaps the name and parent link for old_dentry and
65807+ new_dentry
65808+ at this point, old_dentry has the new name, parent link, and inode
65809+ for the renamed file
65810+ if a file is being replaced by a rename, new_dentry has the inode
65811+ and name for the replaced file
65812+ */
65813+
65814+ if (unlikely(!(gr_status & GR_READY)))
65815+ return;
65816+
65817+ preempt_disable();
65818+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
65819+
65820+ /* we wouldn't have to check d_inode if it weren't for
65821+ NFS silly-renaming
65822+ */
65823+
65824+ write_lock(&gr_inode_lock);
65825+ if (unlikely(replace && inode)) {
65826+ ino_t new_ino = inode->i_ino;
65827+ dev_t new_dev = __get_dev(new_dentry);
65828+
65829+ inodev = lookup_inodev_entry(new_ino, new_dev);
65830+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
65831+ do_handle_delete(inodev, new_ino, new_dev);
65832+ }
65833+
65834+ inodev = lookup_inodev_entry(old_ino, old_dev);
65835+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
65836+ do_handle_delete(inodev, old_ino, old_dev);
65837+
65838+ if (unlikely((unsigned long)matchn))
65839+ do_handle_create(matchn, old_dentry, mnt);
65840+
65841+ write_unlock(&gr_inode_lock);
65842+ preempt_enable();
65843+
65844+ return;
65845+}
65846+
65847+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
65848+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
65849+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
65850+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
65851+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
65852+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
65853+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
65854+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
65855+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
65856+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
65857+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
65858+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
65859+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
65860+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
65861+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
65862+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
65863+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
65864+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
65865+};
65866+
65867+void
65868+gr_learn_resource(const struct task_struct *task,
65869+ const int res, const unsigned long wanted, const int gt)
65870+{
65871+ struct acl_subject_label *acl;
65872+ const struct cred *cred;
65873+
65874+ if (unlikely((gr_status & GR_READY) &&
65875+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
65876+ goto skip_reslog;
65877+
65878+ gr_log_resource(task, res, wanted, gt);
65879+skip_reslog:
65880+
65881+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
65882+ return;
65883+
65884+ acl = task->acl;
65885+
65886+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
65887+ !(acl->resmask & (1U << (unsigned short) res))))
65888+ return;
65889+
65890+ if (wanted >= acl->res[res].rlim_cur) {
65891+ unsigned long res_add;
65892+
65893+ res_add = wanted + res_learn_bumps[res];
65894+
65895+ acl->res[res].rlim_cur = res_add;
65896+
65897+ if (wanted > acl->res[res].rlim_max)
65898+ acl->res[res].rlim_max = res_add;
65899+
65900+ /* only log the subject filename, since resource logging is supported for
65901+ single-subject learning only */
65902+ rcu_read_lock();
65903+ cred = __task_cred(task);
65904+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
65905+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
65906+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
65907+ "", (unsigned long) res, &task->signal->saved_ip);
65908+ rcu_read_unlock();
65909+ }
65910+
65911+ return;
65912+}
65913+EXPORT_SYMBOL(gr_learn_resource);
65914+#endif
65915+
65916+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
65917+void
65918+pax_set_initial_flags(struct linux_binprm *bprm)
65919+{
65920+ struct task_struct *task = current;
65921+ struct acl_subject_label *proc;
65922+ unsigned long flags;
65923+
65924+ if (unlikely(!(gr_status & GR_READY)))
65925+ return;
65926+
65927+ flags = pax_get_flags(task);
65928+
65929+ proc = task->acl;
65930+
65931+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
65932+ flags &= ~MF_PAX_PAGEEXEC;
65933+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
65934+ flags &= ~MF_PAX_SEGMEXEC;
65935+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
65936+ flags &= ~MF_PAX_RANDMMAP;
65937+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
65938+ flags &= ~MF_PAX_EMUTRAMP;
65939+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
65940+ flags &= ~MF_PAX_MPROTECT;
65941+
65942+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
65943+ flags |= MF_PAX_PAGEEXEC;
65944+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
65945+ flags |= MF_PAX_SEGMEXEC;
65946+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
65947+ flags |= MF_PAX_RANDMMAP;
65948+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
65949+ flags |= MF_PAX_EMUTRAMP;
65950+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
65951+ flags |= MF_PAX_MPROTECT;
65952+
65953+ pax_set_flags(task, flags);
65954+
65955+ return;
65956+}
65957+#endif
65958+
65959+int
65960+gr_handle_proc_ptrace(struct task_struct *task)
65961+{
65962+ struct file *filp;
65963+ struct task_struct *tmp = task;
65964+ struct task_struct *curtemp = current;
65965+ __u32 retmode;
65966+
65967+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
65968+ if (unlikely(!(gr_status & GR_READY)))
65969+ return 0;
65970+#endif
65971+
65972+ read_lock(&tasklist_lock);
65973+ read_lock(&grsec_exec_file_lock);
65974+ filp = task->exec_file;
65975+
65976+ while (task_pid_nr(tmp) > 0) {
65977+ if (tmp == curtemp)
65978+ break;
65979+ tmp = tmp->real_parent;
65980+ }
65981+
65982+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
65983+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
65984+ read_unlock(&grsec_exec_file_lock);
65985+ read_unlock(&tasklist_lock);
65986+ return 1;
65987+ }
65988+
65989+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
65990+ if (!(gr_status & GR_READY)) {
65991+ read_unlock(&grsec_exec_file_lock);
65992+ read_unlock(&tasklist_lock);
65993+ return 0;
65994+ }
65995+#endif
65996+
65997+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
65998+ read_unlock(&grsec_exec_file_lock);
65999+ read_unlock(&tasklist_lock);
66000+
66001+ if (retmode & GR_NOPTRACE)
66002+ return 1;
66003+
66004+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
66005+ && (current->acl != task->acl || (current->acl != current->role->root_label
66006+ && task_pid_nr(current) != task_pid_nr(task))))
66007+ return 1;
66008+
66009+ return 0;
66010+}
66011+
66012+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
66013+{
66014+ if (unlikely(!(gr_status & GR_READY)))
66015+ return;
66016+
66017+ if (!(current->role->roletype & GR_ROLE_GOD))
66018+ return;
66019+
66020+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
66021+ p->role->rolename, gr_task_roletype_to_char(p),
66022+ p->acl->filename);
66023+}
66024+
66025+int
66026+gr_handle_ptrace(struct task_struct *task, const long request)
66027+{
66028+ struct task_struct *tmp = task;
66029+ struct task_struct *curtemp = current;
66030+ __u32 retmode;
66031+
66032+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
66033+ if (unlikely(!(gr_status & GR_READY)))
66034+ return 0;
66035+#endif
66036+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
66037+ read_lock(&tasklist_lock);
66038+ while (task_pid_nr(tmp) > 0) {
66039+ if (tmp == curtemp)
66040+ break;
66041+ tmp = tmp->real_parent;
66042+ }
66043+
66044+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
66045+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
66046+ read_unlock(&tasklist_lock);
66047+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66048+ return 1;
66049+ }
66050+ read_unlock(&tasklist_lock);
66051+ }
66052+
66053+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
66054+ if (!(gr_status & GR_READY))
66055+ return 0;
66056+#endif
66057+
66058+ read_lock(&grsec_exec_file_lock);
66059+ if (unlikely(!task->exec_file)) {
66060+ read_unlock(&grsec_exec_file_lock);
66061+ return 0;
66062+ }
66063+
66064+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
66065+ read_unlock(&grsec_exec_file_lock);
66066+
66067+ if (retmode & GR_NOPTRACE) {
66068+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66069+ return 1;
66070+ }
66071+
66072+ if (retmode & GR_PTRACERD) {
66073+ switch (request) {
66074+ case PTRACE_SEIZE:
66075+ case PTRACE_POKETEXT:
66076+ case PTRACE_POKEDATA:
66077+ case PTRACE_POKEUSR:
66078+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
66079+ case PTRACE_SETREGS:
66080+ case PTRACE_SETFPREGS:
66081+#endif
66082+#ifdef CONFIG_X86
66083+ case PTRACE_SETFPXREGS:
66084+#endif
66085+#ifdef CONFIG_ALTIVEC
66086+ case PTRACE_SETVRREGS:
66087+#endif
66088+ return 1;
66089+ default:
66090+ return 0;
66091+ }
66092+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
66093+ !(current->role->roletype & GR_ROLE_GOD) &&
66094+ (current->acl != task->acl)) {
66095+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66096+ return 1;
66097+ }
66098+
66099+ return 0;
66100+}
66101+
66102+static int is_writable_mmap(const struct file *filp)
66103+{
66104+ struct task_struct *task = current;
66105+ struct acl_object_label *obj, *obj2;
66106+
66107+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
66108+ !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))) {
66109+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
66110+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
66111+ task->role->root_label);
66112+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
66113+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
66114+ return 1;
66115+ }
66116+ }
66117+ return 0;
66118+}
66119+
66120+int
66121+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
66122+{
66123+ __u32 mode;
66124+
66125+ if (unlikely(!file || !(prot & PROT_EXEC)))
66126+ return 1;
66127+
66128+ if (is_writable_mmap(file))
66129+ return 0;
66130+
66131+ mode =
66132+ gr_search_file(file->f_path.dentry,
66133+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
66134+ file->f_path.mnt);
66135+
66136+ if (!gr_tpe_allow(file))
66137+ return 0;
66138+
66139+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
66140+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66141+ return 0;
66142+ } else if (unlikely(!(mode & GR_EXEC))) {
66143+ return 0;
66144+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
66145+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66146+ return 1;
66147+ }
66148+
66149+ return 1;
66150+}
66151+
66152+int
66153+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
66154+{
66155+ __u32 mode;
66156+
66157+ if (unlikely(!file || !(prot & PROT_EXEC)))
66158+ return 1;
66159+
66160+ if (is_writable_mmap(file))
66161+ return 0;
66162+
66163+ mode =
66164+ gr_search_file(file->f_path.dentry,
66165+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
66166+ file->f_path.mnt);
66167+
66168+ if (!gr_tpe_allow(file))
66169+ return 0;
66170+
66171+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
66172+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66173+ return 0;
66174+ } else if (unlikely(!(mode & GR_EXEC))) {
66175+ return 0;
66176+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
66177+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66178+ return 1;
66179+ }
66180+
66181+ return 1;
66182+}
66183+
66184+void
66185+gr_acl_handle_psacct(struct task_struct *task, const long code)
66186+{
66187+ unsigned long runtime;
66188+ unsigned long cputime;
66189+ unsigned int wday, cday;
66190+ __u8 whr, chr;
66191+ __u8 wmin, cmin;
66192+ __u8 wsec, csec;
66193+ struct timespec timeval;
66194+
66195+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
66196+ !(task->acl->mode & GR_PROCACCT)))
66197+ return;
66198+
66199+ do_posix_clock_monotonic_gettime(&timeval);
66200+ runtime = timeval.tv_sec - task->start_time.tv_sec;
66201+ wday = runtime / (3600 * 24);
66202+ runtime -= wday * (3600 * 24);
66203+ whr = runtime / 3600;
66204+ runtime -= whr * 3600;
66205+ wmin = runtime / 60;
66206+ runtime -= wmin * 60;
66207+ wsec = runtime;
66208+
66209+ cputime = (task->utime + task->stime) / HZ;
66210+ cday = cputime / (3600 * 24);
66211+ cputime -= cday * (3600 * 24);
66212+ chr = cputime / 3600;
66213+ cputime -= chr * 3600;
66214+ cmin = cputime / 60;
66215+ cputime -= cmin * 60;
66216+ csec = cputime;
66217+
66218+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
66219+
66220+ return;
66221+}
66222+
66223+#ifdef CONFIG_TASKSTATS
66224+int gr_is_taskstats_denied(int pid)
66225+{
66226+ struct task_struct *task;
66227+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66228+ const struct cred *cred;
66229+#endif
66230+ int ret = 0;
66231+
66232+ /* restrict taskstats viewing to un-chrooted root users
66233+ who have the 'view' subject flag if the RBAC system is enabled
66234+ */
66235+
66236+ rcu_read_lock();
66237+ read_lock(&tasklist_lock);
66238+ task = find_task_by_vpid(pid);
66239+ if (task) {
66240+#ifdef CONFIG_GRKERNSEC_CHROOT
66241+ if (proc_is_chrooted(task))
66242+ ret = -EACCES;
66243+#endif
66244+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66245+ cred = __task_cred(task);
66246+#ifdef CONFIG_GRKERNSEC_PROC_USER
66247+ if (gr_is_global_nonroot(cred->uid))
66248+ ret = -EACCES;
66249+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66250+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
66251+ ret = -EACCES;
66252+#endif
66253+#endif
66254+ if (gr_status & GR_READY) {
66255+ if (!(task->acl->mode & GR_VIEW))
66256+ ret = -EACCES;
66257+ }
66258+ } else
66259+ ret = -ENOENT;
66260+
66261+ read_unlock(&tasklist_lock);
66262+ rcu_read_unlock();
66263+
66264+ return ret;
66265+}
66266+#endif
66267+
66268+/* AUXV entries are filled via a descendant of search_binary_handler
66269+ after we've already applied the subject for the target
66270+*/
66271+int gr_acl_enable_at_secure(void)
66272+{
66273+ if (unlikely(!(gr_status & GR_READY)))
66274+ return 0;
66275+
66276+ if (current->acl->mode & GR_ATSECURE)
66277+ return 1;
66278+
66279+ return 0;
66280+}
66281+
66282+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
66283+{
66284+ struct task_struct *task = current;
66285+ struct dentry *dentry = file->f_path.dentry;
66286+ struct vfsmount *mnt = file->f_path.mnt;
66287+ struct acl_object_label *obj, *tmp;
66288+ struct acl_subject_label *subj;
66289+ unsigned int bufsize;
66290+ int is_not_root;
66291+ char *path;
66292+ dev_t dev = __get_dev(dentry);
66293+
66294+ if (unlikely(!(gr_status & GR_READY)))
66295+ return 1;
66296+
66297+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
66298+ return 1;
66299+
66300+ /* ignore Eric Biederman */
66301+ if (IS_PRIVATE(dentry->d_inode))
66302+ return 1;
66303+
66304+ subj = task->acl;
66305+ read_lock(&gr_inode_lock);
66306+ do {
66307+ obj = lookup_acl_obj_label(ino, dev, subj);
66308+ if (obj != NULL) {
66309+ read_unlock(&gr_inode_lock);
66310+ return (obj->mode & GR_FIND) ? 1 : 0;
66311+ }
66312+ } while ((subj = subj->parent_subject));
66313+ read_unlock(&gr_inode_lock);
66314+
66315+ /* this is purely an optimization since we're looking for an object
66316+ for the directory we're doing a readdir on
66317+ if it's possible for any globbed object to match the entry we're
66318+ filling into the directory, then the object we find here will be
66319+ an anchor point with attached globbed objects
66320+ */
66321+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
66322+ if (obj->globbed == NULL)
66323+ return (obj->mode & GR_FIND) ? 1 : 0;
66324+
66325+ is_not_root = ((obj->filename[0] == '/') &&
66326+ (obj->filename[1] == '\0')) ? 0 : 1;
66327+ bufsize = PAGE_SIZE - namelen - is_not_root;
66328+
66329+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
66330+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
66331+ return 1;
66332+
66333+ preempt_disable();
66334+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
66335+ bufsize);
66336+
66337+ bufsize = strlen(path);
66338+
66339+ /* if base is "/", don't append an additional slash */
66340+ if (is_not_root)
66341+ *(path + bufsize) = '/';
66342+ memcpy(path + bufsize + is_not_root, name, namelen);
66343+ *(path + bufsize + namelen + is_not_root) = '\0';
66344+
66345+ tmp = obj->globbed;
66346+ while (tmp) {
66347+ if (!glob_match(tmp->filename, path)) {
66348+ preempt_enable();
66349+ return (tmp->mode & GR_FIND) ? 1 : 0;
66350+ }
66351+ tmp = tmp->next;
66352+ }
66353+ preempt_enable();
66354+ return (obj->mode & GR_FIND) ? 1 : 0;
66355+}
66356+
66357+void gr_put_exec_file(struct task_struct *task)
66358+{
66359+ struct file *filp;
66360+
66361+ write_lock(&grsec_exec_file_lock);
66362+ filp = task->exec_file;
66363+ task->exec_file = NULL;
66364+ write_unlock(&grsec_exec_file_lock);
66365+
66366+ if (filp)
66367+ fput(filp);
66368+
66369+ return;
66370+}
66371+
66372+
66373+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
66374+EXPORT_SYMBOL(gr_acl_is_enabled);
66375+#endif
66376+#ifdef CONFIG_SECURITY
66377+EXPORT_SYMBOL(gr_check_user_change);
66378+EXPORT_SYMBOL(gr_check_group_change);
66379+#endif
66380+
66381diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
66382new file mode 100644
66383index 0000000..18ffbbd
66384--- /dev/null
66385+++ b/grsecurity/gracl_alloc.c
66386@@ -0,0 +1,105 @@
66387+#include <linux/kernel.h>
66388+#include <linux/mm.h>
66389+#include <linux/slab.h>
66390+#include <linux/vmalloc.h>
66391+#include <linux/gracl.h>
66392+#include <linux/grsecurity.h>
66393+
66394+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
66395+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
66396+
66397+static __inline__ int
66398+alloc_pop(void)
66399+{
66400+ if (current_alloc_state->alloc_stack_next == 1)
66401+ return 0;
66402+
66403+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
66404+
66405+ current_alloc_state->alloc_stack_next--;
66406+
66407+ return 1;
66408+}
66409+
66410+static __inline__ int
66411+alloc_push(void *buf)
66412+{
66413+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
66414+ return 1;
66415+
66416+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
66417+
66418+ current_alloc_state->alloc_stack_next++;
66419+
66420+ return 0;
66421+}
66422+
66423+void *
66424+acl_alloc(unsigned long len)
66425+{
66426+ void *ret = NULL;
66427+
66428+ if (!len || len > PAGE_SIZE)
66429+ goto out;
66430+
66431+ ret = kmalloc(len, GFP_KERNEL);
66432+
66433+ if (ret) {
66434+ if (alloc_push(ret)) {
66435+ kfree(ret);
66436+ ret = NULL;
66437+ }
66438+ }
66439+
66440+out:
66441+ return ret;
66442+}
66443+
66444+void *
66445+acl_alloc_num(unsigned long num, unsigned long len)
66446+{
66447+ if (!len || (num > (PAGE_SIZE / len)))
66448+ return NULL;
66449+
66450+ return acl_alloc(num * len);
66451+}
66452+
66453+void
66454+acl_free_all(void)
66455+{
66456+ if (!current_alloc_state->alloc_stack)
66457+ return;
66458+
66459+ while (alloc_pop()) ;
66460+
66461+ if (current_alloc_state->alloc_stack) {
66462+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
66463+ kfree(current_alloc_state->alloc_stack);
66464+ else
66465+ vfree(current_alloc_state->alloc_stack);
66466+ }
66467+
66468+ current_alloc_state->alloc_stack = NULL;
66469+ current_alloc_state->alloc_stack_size = 1;
66470+ current_alloc_state->alloc_stack_next = 1;
66471+
66472+ return;
66473+}
66474+
66475+int
66476+acl_alloc_stack_init(unsigned long size)
66477+{
66478+ if ((size * sizeof (void *)) <= PAGE_SIZE)
66479+ current_alloc_state->alloc_stack =
66480+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
66481+ else
66482+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
66483+
66484+ current_alloc_state->alloc_stack_size = size;
66485+ current_alloc_state->alloc_stack_next = 1;
66486+
66487+ if (!current_alloc_state->alloc_stack)
66488+ return 0;
66489+ else
66490+ return 1;
66491+}
66492diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
66493new file mode 100644
66494index 0000000..bdd51ea
66495--- /dev/null
66496+++ b/grsecurity/gracl_cap.c
66497@@ -0,0 +1,110 @@
66498+#include <linux/kernel.h>
66499+#include <linux/module.h>
66500+#include <linux/sched.h>
66501+#include <linux/gracl.h>
66502+#include <linux/grsecurity.h>
66503+#include <linux/grinternal.h>
66504+
66505+extern const char *captab_log[];
66506+extern int captab_log_entries;
66507+
66508+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
66509+{
66510+ struct acl_subject_label *curracl;
66511+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
66512+ kernel_cap_t cap_audit = __cap_empty_set;
66513+
66514+ if (!gr_acl_is_enabled())
66515+ return 1;
66516+
66517+ curracl = task->acl;
66518+
66519+ cap_drop = curracl->cap_lower;
66520+ cap_mask = curracl->cap_mask;
66521+ cap_audit = curracl->cap_invert_audit;
66522+
66523+ while ((curracl = curracl->parent_subject)) {
66524+ /* if the cap isn't specified in the current computed mask but is specified in the
66525+ current level subject, and is lowered in the current level subject, then add
66526+ it to the set of dropped capabilities
66527+ otherwise, add the current level subject's mask to the current computed mask
66528+ */
66529+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
66530+ cap_raise(cap_mask, cap);
66531+ if (cap_raised(curracl->cap_lower, cap))
66532+ cap_raise(cap_drop, cap);
66533+ if (cap_raised(curracl->cap_invert_audit, cap))
66534+ cap_raise(cap_audit, cap);
66535+ }
66536+ }
66537+
66538+ if (!cap_raised(cap_drop, cap)) {
66539+ if (cap_raised(cap_audit, cap))
66540+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
66541+ return 1;
66542+ }
66543+
66544+ curracl = task->acl;
66545+
66546+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
66547+ && cap_raised(cred->cap_effective, cap)) {
66548+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
66549+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
66550+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
66551+ gr_to_filename(task->exec_file->f_path.dentry,
66552+ task->exec_file->f_path.mnt) : curracl->filename,
66553+ curracl->filename, 0UL,
66554+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
66555+ return 1;
66556+ }
66557+
66558+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
66559+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
66560+
66561+ return 0;
66562+}
66563+
66564+int
66565+gr_acl_is_capable(const int cap)
66566+{
66567+ return gr_task_acl_is_capable(current, current_cred(), cap);
66568+}
66569+
66570+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
66571+{
66572+ struct acl_subject_label *curracl;
66573+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
66574+
66575+ if (!gr_acl_is_enabled())
66576+ return 1;
66577+
66578+ curracl = task->acl;
66579+
66580+ cap_drop = curracl->cap_lower;
66581+ cap_mask = curracl->cap_mask;
66582+
66583+ while ((curracl = curracl->parent_subject)) {
66584+ /* if the cap isn't specified in the current computed mask but is specified in the
66585+ current level subject, and is lowered in the current level subject, then add
66586+ it to the set of dropped capabilities
66587+ otherwise, add the current level subject's mask to the current computed mask
66588+ */
66589+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
66590+ cap_raise(cap_mask, cap);
66591+ if (cap_raised(curracl->cap_lower, cap))
66592+ cap_raise(cap_drop, cap);
66593+ }
66594+ }
66595+
66596+ if (!cap_raised(cap_drop, cap))
66597+ return 1;
66598+
66599+ return 0;
66600+}
66601+
66602+int
66603+gr_acl_is_capable_nolog(const int cap)
66604+{
66605+ return gr_task_acl_is_capable_nolog(current, cap);
66606+}
66607+
66608diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
66609new file mode 100644
66610index 0000000..ca25605
66611--- /dev/null
66612+++ b/grsecurity/gracl_compat.c
66613@@ -0,0 +1,270 @@
66614+#include <linux/kernel.h>
66615+#include <linux/gracl.h>
66616+#include <linux/compat.h>
66617+#include <linux/gracl_compat.h>
66618+
66619+#include <asm/uaccess.h>
66620+
66621+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
66622+{
66623+ struct gr_arg_wrapper_compat uwrapcompat;
66624+
66625+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
66626+ return -EFAULT;
66627+
66628+ if (((uwrapcompat.version != GRSECURITY_VERSION) &&
66629+ (uwrapcompat.version != 0x2901)) ||
66630+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
66631+ return -EINVAL;
66632+
66633+ uwrap->arg = compat_ptr(uwrapcompat.arg);
66634+ uwrap->version = uwrapcompat.version;
66635+ uwrap->size = sizeof(struct gr_arg);
66636+
66637+ return 0;
66638+}
66639+
66640+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
66641+{
66642+ struct gr_arg_compat argcompat;
66643+
66644+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
66645+ return -EFAULT;
66646+
66647+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
66648+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
66649+ arg->role_db.num_roles = argcompat.role_db.num_roles;
66650+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
66651+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
66652+ arg->role_db.num_objects = argcompat.role_db.num_objects;
66653+
66654+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
66655+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
66656+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
66657+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
66658+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
66659+ arg->segv_device = argcompat.segv_device;
66660+ arg->segv_inode = argcompat.segv_inode;
66661+ arg->segv_uid = argcompat.segv_uid;
66662+ arg->num_sprole_pws = argcompat.num_sprole_pws;
66663+ arg->mode = argcompat.mode;
66664+
66665+ return 0;
66666+}
66667+
66668+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
66669+{
66670+ struct acl_object_label_compat objcompat;
66671+
66672+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
66673+ return -EFAULT;
66674+
66675+ obj->filename = compat_ptr(objcompat.filename);
66676+ obj->inode = objcompat.inode;
66677+ obj->device = objcompat.device;
66678+ obj->mode = objcompat.mode;
66679+
66680+ obj->nested = compat_ptr(objcompat.nested);
66681+ obj->globbed = compat_ptr(objcompat.globbed);
66682+
66683+ obj->prev = compat_ptr(objcompat.prev);
66684+ obj->next = compat_ptr(objcompat.next);
66685+
66686+ return 0;
66687+}
66688+
66689+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
66690+{
66691+ unsigned int i;
66692+ struct acl_subject_label_compat subjcompat;
66693+
66694+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
66695+ return -EFAULT;
66696+
66697+ subj->filename = compat_ptr(subjcompat.filename);
66698+ subj->inode = subjcompat.inode;
66699+ subj->device = subjcompat.device;
66700+ subj->mode = subjcompat.mode;
66701+ subj->cap_mask = subjcompat.cap_mask;
66702+ subj->cap_lower = subjcompat.cap_lower;
66703+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
66704+
66705+ for (i = 0; i < GR_NLIMITS; i++) {
66706+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
66707+ subj->res[i].rlim_cur = RLIM_INFINITY;
66708+ else
66709+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
66710+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
66711+ subj->res[i].rlim_max = RLIM_INFINITY;
66712+ else
66713+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
66714+ }
66715+ subj->resmask = subjcompat.resmask;
66716+
66717+ subj->user_trans_type = subjcompat.user_trans_type;
66718+ subj->group_trans_type = subjcompat.group_trans_type;
66719+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
66720+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
66721+ subj->user_trans_num = subjcompat.user_trans_num;
66722+ subj->group_trans_num = subjcompat.group_trans_num;
66723+
66724+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
66725+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
66726+ subj->ip_type = subjcompat.ip_type;
66727+ subj->ips = compat_ptr(subjcompat.ips);
66728+ subj->ip_num = subjcompat.ip_num;
66729+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
66730+
66731+ subj->crashes = subjcompat.crashes;
66732+ subj->expires = subjcompat.expires;
66733+
66734+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
66735+ subj->hash = compat_ptr(subjcompat.hash);
66736+ subj->prev = compat_ptr(subjcompat.prev);
66737+ subj->next = compat_ptr(subjcompat.next);
66738+
66739+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
66740+ subj->obj_hash_size = subjcompat.obj_hash_size;
66741+ subj->pax_flags = subjcompat.pax_flags;
66742+
66743+ return 0;
66744+}
66745+
66746+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
66747+{
66748+ struct acl_role_label_compat rolecompat;
66749+
66750+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
66751+ return -EFAULT;
66752+
66753+ role->rolename = compat_ptr(rolecompat.rolename);
66754+ role->uidgid = rolecompat.uidgid;
66755+ role->roletype = rolecompat.roletype;
66756+
66757+ role->auth_attempts = rolecompat.auth_attempts;
66758+ role->expires = rolecompat.expires;
66759+
66760+ role->root_label = compat_ptr(rolecompat.root_label);
66761+ role->hash = compat_ptr(rolecompat.hash);
66762+
66763+ role->prev = compat_ptr(rolecompat.prev);
66764+ role->next = compat_ptr(rolecompat.next);
66765+
66766+ role->transitions = compat_ptr(rolecompat.transitions);
66767+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
66768+ role->domain_children = compat_ptr(rolecompat.domain_children);
66769+ role->domain_child_num = rolecompat.domain_child_num;
66770+
66771+ role->umask = rolecompat.umask;
66772+
66773+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
66774+ role->subj_hash_size = rolecompat.subj_hash_size;
66775+
66776+ return 0;
66777+}
66778+
66779+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
66780+{
66781+ struct role_allowed_ip_compat roleip_compat;
66782+
66783+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
66784+ return -EFAULT;
66785+
66786+ roleip->addr = roleip_compat.addr;
66787+ roleip->netmask = roleip_compat.netmask;
66788+
66789+ roleip->prev = compat_ptr(roleip_compat.prev);
66790+ roleip->next = compat_ptr(roleip_compat.next);
66791+
66792+ return 0;
66793+}
66794+
66795+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
66796+{
66797+ struct role_transition_compat trans_compat;
66798+
66799+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
66800+ return -EFAULT;
66801+
66802+ trans->rolename = compat_ptr(trans_compat.rolename);
66803+
66804+ trans->prev = compat_ptr(trans_compat.prev);
66805+ trans->next = compat_ptr(trans_compat.next);
66806+
66807+ return 0;
66808+
66809+}
66810+
66811+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
66812+{
66813+ struct gr_hash_struct_compat hash_compat;
66814+
66815+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
66816+ return -EFAULT;
66817+
66818+ hash->table = compat_ptr(hash_compat.table);
66819+ hash->nametable = compat_ptr(hash_compat.nametable);
66820+ hash->first = compat_ptr(hash_compat.first);
66821+
66822+ hash->table_size = hash_compat.table_size;
66823+ hash->used_size = hash_compat.used_size;
66824+
66825+ hash->type = hash_compat.type;
66826+
66827+ return 0;
66828+}
66829+
66830+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
66831+{
66832+ compat_uptr_t ptrcompat;
66833+
66834+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
66835+ return -EFAULT;
66836+
66837+ *(void **)ptr = compat_ptr(ptrcompat);
66838+
66839+ return 0;
66840+}
66841+
66842+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
66843+{
66844+ struct acl_ip_label_compat ip_compat;
66845+
66846+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
66847+ return -EFAULT;
66848+
66849+ ip->iface = compat_ptr(ip_compat.iface);
66850+ ip->addr = ip_compat.addr;
66851+ ip->netmask = ip_compat.netmask;
66852+ ip->low = ip_compat.low;
66853+ ip->high = ip_compat.high;
66854+ ip->mode = ip_compat.mode;
66855+ ip->type = ip_compat.type;
66856+
66857+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
66858+
66859+ ip->prev = compat_ptr(ip_compat.prev);
66860+ ip->next = compat_ptr(ip_compat.next);
66861+
66862+ return 0;
66863+}
66864+
66865+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
66866+{
66867+ struct sprole_pw_compat pw_compat;
66868+
66869+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
66870+ return -EFAULT;
66871+
66872+ pw->rolename = compat_ptr(pw_compat.rolename);
66873+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
66874+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
66875+
66876+ return 0;
66877+}
66878+
66879+size_t get_gr_arg_wrapper_size_compat(void)
66880+{
66881+ return sizeof(struct gr_arg_wrapper_compat);
66882+}
66883+
66884diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
66885new file mode 100644
66886index 0000000..deb6f3b
66887--- /dev/null
66888+++ b/grsecurity/gracl_fs.c
66889@@ -0,0 +1,437 @@
66890+#include <linux/kernel.h>
66891+#include <linux/sched.h>
66892+#include <linux/types.h>
66893+#include <linux/fs.h>
66894+#include <linux/file.h>
66895+#include <linux/stat.h>
66896+#include <linux/grsecurity.h>
66897+#include <linux/grinternal.h>
66898+#include <linux/gracl.h>
66899+
66900+umode_t
66901+gr_acl_umask(void)
66902+{
66903+ if (unlikely(!gr_acl_is_enabled()))
66904+ return 0;
66905+
66906+ return current->role->umask;
66907+}
66908+
66909+__u32
66910+gr_acl_handle_hidden_file(const struct dentry * dentry,
66911+ const struct vfsmount * mnt)
66912+{
66913+ __u32 mode;
66914+
66915+ if (unlikely(!dentry->d_inode))
66916+ return GR_FIND;
66917+
66918+ mode =
66919+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
66920+
66921+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
66922+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
66923+ return mode;
66924+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
66925+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
66926+ return 0;
66927+ } else if (unlikely(!(mode & GR_FIND)))
66928+ return 0;
66929+
66930+ return GR_FIND;
66931+}
66932+
66933+__u32
66934+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
66935+ int acc_mode)
66936+{
66937+ __u32 reqmode = GR_FIND;
66938+ __u32 mode;
66939+
66940+ if (unlikely(!dentry->d_inode))
66941+ return reqmode;
66942+
66943+ if (acc_mode & MAY_APPEND)
66944+ reqmode |= GR_APPEND;
66945+ else if (acc_mode & MAY_WRITE)
66946+ reqmode |= GR_WRITE;
66947+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
66948+ reqmode |= GR_READ;
66949+
66950+ mode =
66951+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
66952+ mnt);
66953+
66954+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
66955+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
66956+ reqmode & GR_READ ? " reading" : "",
66957+ reqmode & GR_WRITE ? " writing" : reqmode &
66958+ GR_APPEND ? " appending" : "");
66959+ return reqmode;
66960+ } else
66961+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
66962+ {
66963+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
66964+ reqmode & GR_READ ? " reading" : "",
66965+ reqmode & GR_WRITE ? " writing" : reqmode &
66966+ GR_APPEND ? " appending" : "");
66967+ return 0;
66968+ } else if (unlikely((mode & reqmode) != reqmode))
66969+ return 0;
66970+
66971+ return reqmode;
66972+}
66973+
66974+__u32
66975+gr_acl_handle_creat(const struct dentry * dentry,
66976+ const struct dentry * p_dentry,
66977+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
66978+ const int imode)
66979+{
66980+ __u32 reqmode = GR_WRITE | GR_CREATE;
66981+ __u32 mode;
66982+
66983+ if (acc_mode & MAY_APPEND)
66984+ reqmode |= GR_APPEND;
66985+ // if a directory was required or the directory already exists, then
66986+ // don't count this open as a read
66987+ if ((acc_mode & MAY_READ) &&
66988+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
66989+ reqmode |= GR_READ;
66990+ if ((open_flags & O_CREAT) &&
66991+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
66992+ reqmode |= GR_SETID;
66993+
66994+ mode =
66995+ gr_check_create(dentry, p_dentry, p_mnt,
66996+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
66997+
66998+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
66999+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
67000+ reqmode & GR_READ ? " reading" : "",
67001+ reqmode & GR_WRITE ? " writing" : reqmode &
67002+ GR_APPEND ? " appending" : "");
67003+ return reqmode;
67004+ } else
67005+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
67006+ {
67007+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
67008+ reqmode & GR_READ ? " reading" : "",
67009+ reqmode & GR_WRITE ? " writing" : reqmode &
67010+ GR_APPEND ? " appending" : "");
67011+ return 0;
67012+ } else if (unlikely((mode & reqmode) != reqmode))
67013+ return 0;
67014+
67015+ return reqmode;
67016+}
67017+
67018+__u32
67019+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
67020+ const int fmode)
67021+{
67022+ __u32 mode, reqmode = GR_FIND;
67023+
67024+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
67025+ reqmode |= GR_EXEC;
67026+ if (fmode & S_IWOTH)
67027+ reqmode |= GR_WRITE;
67028+ if (fmode & S_IROTH)
67029+ reqmode |= GR_READ;
67030+
67031+ mode =
67032+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
67033+ mnt);
67034+
67035+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
67036+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
67037+ reqmode & GR_READ ? " reading" : "",
67038+ reqmode & GR_WRITE ? " writing" : "",
67039+ reqmode & GR_EXEC ? " executing" : "");
67040+ return reqmode;
67041+ } else
67042+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
67043+ {
67044+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
67045+ reqmode & GR_READ ? " reading" : "",
67046+ reqmode & GR_WRITE ? " writing" : "",
67047+ reqmode & GR_EXEC ? " executing" : "");
67048+ return 0;
67049+ } else if (unlikely((mode & reqmode) != reqmode))
67050+ return 0;
67051+
67052+ return reqmode;
67053+}
67054+
67055+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
67056+{
67057+ __u32 mode;
67058+
67059+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
67060+
67061+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
67062+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
67063+ return mode;
67064+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
67065+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
67066+ return 0;
67067+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
67068+ return 0;
67069+
67070+ return (reqmode);
67071+}
67072+
67073+__u32
67074+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
67075+{
67076+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
67077+}
67078+
67079+__u32
67080+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
67081+{
67082+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
67083+}
67084+
67085+__u32
67086+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
67087+{
67088+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
67089+}
67090+
67091+__u32
67092+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
67093+{
67094+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
67095+}
67096+
67097+__u32
67098+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
67099+ umode_t *modeptr)
67100+{
67101+ umode_t mode;
67102+
67103+ *modeptr &= ~gr_acl_umask();
67104+ mode = *modeptr;
67105+
67106+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
67107+ return 1;
67108+
67109+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
67110+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
67111+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
67112+ GR_CHMOD_ACL_MSG);
67113+ } else {
67114+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
67115+ }
67116+}
67117+
67118+__u32
67119+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
67120+{
67121+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
67122+}
67123+
67124+__u32
67125+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
67126+{
67127+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
67128+}
67129+
67130+__u32
67131+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
67132+{
67133+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
67134+}
67135+
67136+__u32
67137+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
67138+{
67139+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
67140+}
67141+
67142+__u32
67143+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
67144+{
67145+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
67146+ GR_UNIXCONNECT_ACL_MSG);
67147+}
67148+
67149+/* hardlinks require at minimum create and link permission,
67150+ any additional privilege required is based on the
67151+ privilege of the file being linked to
67152+*/
67153+__u32
67154+gr_acl_handle_link(const struct dentry * new_dentry,
67155+ const struct dentry * parent_dentry,
67156+ const struct vfsmount * parent_mnt,
67157+ const struct dentry * old_dentry,
67158+ const struct vfsmount * old_mnt, const struct filename *to)
67159+{
67160+ __u32 mode;
67161+ __u32 needmode = GR_CREATE | GR_LINK;
67162+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
67163+
67164+ mode =
67165+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
67166+ old_mnt);
67167+
67168+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
67169+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
67170+ return mode;
67171+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
67172+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
67173+ return 0;
67174+ } else if (unlikely((mode & needmode) != needmode))
67175+ return 0;
67176+
67177+ return 1;
67178+}
67179+
67180+__u32
67181+gr_acl_handle_symlink(const struct dentry * new_dentry,
67182+ const struct dentry * parent_dentry,
67183+ const struct vfsmount * parent_mnt, const struct filename *from)
67184+{
67185+ __u32 needmode = GR_WRITE | GR_CREATE;
67186+ __u32 mode;
67187+
67188+ mode =
67189+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
67190+ GR_CREATE | GR_AUDIT_CREATE |
67191+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
67192+
67193+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
67194+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
67195+ return mode;
67196+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
67197+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
67198+ return 0;
67199+ } else if (unlikely((mode & needmode) != needmode))
67200+ return 0;
67201+
67202+ return (GR_WRITE | GR_CREATE);
67203+}
67204+
67205+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)
67206+{
67207+ __u32 mode;
67208+
67209+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
67210+
67211+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
67212+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
67213+ return mode;
67214+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
67215+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
67216+ return 0;
67217+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
67218+ return 0;
67219+
67220+ return (reqmode);
67221+}
67222+
67223+__u32
67224+gr_acl_handle_mknod(const struct dentry * new_dentry,
67225+ const struct dentry * parent_dentry,
67226+ const struct vfsmount * parent_mnt,
67227+ const int mode)
67228+{
67229+ __u32 reqmode = GR_WRITE | GR_CREATE;
67230+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
67231+ reqmode |= GR_SETID;
67232+
67233+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
67234+ reqmode, GR_MKNOD_ACL_MSG);
67235+}
67236+
67237+__u32
67238+gr_acl_handle_mkdir(const struct dentry *new_dentry,
67239+ const struct dentry *parent_dentry,
67240+ const struct vfsmount *parent_mnt)
67241+{
67242+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
67243+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
67244+}
67245+
67246+#define RENAME_CHECK_SUCCESS(old, new) \
67247+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
67248+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
67249+
67250+int
67251+gr_acl_handle_rename(struct dentry *new_dentry,
67252+ struct dentry *parent_dentry,
67253+ const struct vfsmount *parent_mnt,
67254+ struct dentry *old_dentry,
67255+ struct inode *old_parent_inode,
67256+ struct vfsmount *old_mnt, const struct filename *newname)
67257+{
67258+ __u32 comp1, comp2;
67259+ int error = 0;
67260+
67261+ if (unlikely(!gr_acl_is_enabled()))
67262+ return 0;
67263+
67264+ if (!new_dentry->d_inode) {
67265+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
67266+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
67267+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
67268+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
67269+ GR_DELETE | GR_AUDIT_DELETE |
67270+ GR_AUDIT_READ | GR_AUDIT_WRITE |
67271+ GR_SUPPRESS, old_mnt);
67272+ } else {
67273+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
67274+ GR_CREATE | GR_DELETE |
67275+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
67276+ GR_AUDIT_READ | GR_AUDIT_WRITE |
67277+ GR_SUPPRESS, parent_mnt);
67278+ comp2 =
67279+ gr_search_file(old_dentry,
67280+ GR_READ | GR_WRITE | GR_AUDIT_READ |
67281+ GR_DELETE | GR_AUDIT_DELETE |
67282+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
67283+ }
67284+
67285+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
67286+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
67287+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
67288+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
67289+ && !(comp2 & GR_SUPPRESS)) {
67290+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
67291+ error = -EACCES;
67292+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
67293+ error = -EACCES;
67294+
67295+ return error;
67296+}
67297+
67298+void
67299+gr_acl_handle_exit(void)
67300+{
67301+ u16 id;
67302+ char *rolename;
67303+
67304+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
67305+ !(current->role->roletype & GR_ROLE_PERSIST))) {
67306+ id = current->acl_role_id;
67307+ rolename = current->role->rolename;
67308+ gr_set_acls(1);
67309+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
67310+ }
67311+
67312+ gr_put_exec_file(current);
67313+ return;
67314+}
67315+
67316+int
67317+gr_acl_handle_procpidmem(const struct task_struct *task)
67318+{
67319+ if (unlikely(!gr_acl_is_enabled()))
67320+ return 0;
67321+
67322+ if (task != current && task->acl->mode & GR_PROTPROCFD)
67323+ return -EACCES;
67324+
67325+ return 0;
67326+}
67327diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
67328new file mode 100644
67329index 0000000..f056b81
67330--- /dev/null
67331+++ b/grsecurity/gracl_ip.c
67332@@ -0,0 +1,386 @@
67333+#include <linux/kernel.h>
67334+#include <asm/uaccess.h>
67335+#include <asm/errno.h>
67336+#include <net/sock.h>
67337+#include <linux/file.h>
67338+#include <linux/fs.h>
67339+#include <linux/net.h>
67340+#include <linux/in.h>
67341+#include <linux/skbuff.h>
67342+#include <linux/ip.h>
67343+#include <linux/udp.h>
67344+#include <linux/types.h>
67345+#include <linux/sched.h>
67346+#include <linux/netdevice.h>
67347+#include <linux/inetdevice.h>
67348+#include <linux/gracl.h>
67349+#include <linux/grsecurity.h>
67350+#include <linux/grinternal.h>
67351+
67352+#define GR_BIND 0x01
67353+#define GR_CONNECT 0x02
67354+#define GR_INVERT 0x04
67355+#define GR_BINDOVERRIDE 0x08
67356+#define GR_CONNECTOVERRIDE 0x10
67357+#define GR_SOCK_FAMILY 0x20
67358+
67359+static const char * gr_protocols[IPPROTO_MAX] = {
67360+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
67361+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
67362+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
67363+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
67364+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
67365+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
67366+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
67367+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
67368+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
67369+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
67370+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
67371+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
67372+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
67373+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
67374+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
67375+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
67376+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
67377+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
67378+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
67379+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
67380+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
67381+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
67382+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
67383+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
67384+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
67385+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
67386+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
67387+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
67388+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
67389+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
67390+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
67391+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
67392+ };
67393+
67394+static const char * gr_socktypes[SOCK_MAX] = {
67395+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
67396+ "unknown:7", "unknown:8", "unknown:9", "packet"
67397+ };
67398+
67399+static const char * gr_sockfamilies[AF_MAX+1] = {
67400+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
67401+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
67402+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
67403+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
67404+ };
67405+
67406+const char *
67407+gr_proto_to_name(unsigned char proto)
67408+{
67409+ return gr_protocols[proto];
67410+}
67411+
67412+const char *
67413+gr_socktype_to_name(unsigned char type)
67414+{
67415+ return gr_socktypes[type];
67416+}
67417+
67418+const char *
67419+gr_sockfamily_to_name(unsigned char family)
67420+{
67421+ return gr_sockfamilies[family];
67422+}
67423+
67424+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
67425+
67426+int
67427+gr_search_socket(const int domain, const int type, const int protocol)
67428+{
67429+ struct acl_subject_label *curr;
67430+ const struct cred *cred = current_cred();
67431+
67432+ if (unlikely(!gr_acl_is_enabled()))
67433+ goto exit;
67434+
67435+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
67436+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
67437+ goto exit; // let the kernel handle it
67438+
67439+ curr = current->acl;
67440+
67441+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
67442+ /* the family is allowed, if this is PF_INET allow it only if
67443+ the extra sock type/protocol checks pass */
67444+ if (domain == PF_INET)
67445+ goto inet_check;
67446+ goto exit;
67447+ } else {
67448+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67449+ __u32 fakeip = 0;
67450+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67451+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
67452+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
67453+ gr_to_filename(current->exec_file->f_path.dentry,
67454+ current->exec_file->f_path.mnt) :
67455+ curr->filename, curr->filename,
67456+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
67457+ &current->signal->saved_ip);
67458+ goto exit;
67459+ }
67460+ goto exit_fail;
67461+ }
67462+
67463+inet_check:
67464+ /* the rest of this checking is for IPv4 only */
67465+ if (!curr->ips)
67466+ goto exit;
67467+
67468+ if ((curr->ip_type & (1U << type)) &&
67469+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
67470+ goto exit;
67471+
67472+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67473+ /* we don't place acls on raw sockets , and sometimes
67474+ dgram/ip sockets are opened for ioctl and not
67475+ bind/connect, so we'll fake a bind learn log */
67476+ if (type == SOCK_RAW || type == SOCK_PACKET) {
67477+ __u32 fakeip = 0;
67478+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67479+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
67480+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
67481+ gr_to_filename(current->exec_file->f_path.dentry,
67482+ current->exec_file->f_path.mnt) :
67483+ curr->filename, curr->filename,
67484+ &fakeip, 0, type,
67485+ protocol, GR_CONNECT, &current->signal->saved_ip);
67486+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
67487+ __u32 fakeip = 0;
67488+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67489+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
67490+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
67491+ gr_to_filename(current->exec_file->f_path.dentry,
67492+ current->exec_file->f_path.mnt) :
67493+ curr->filename, curr->filename,
67494+ &fakeip, 0, type,
67495+ protocol, GR_BIND, &current->signal->saved_ip);
67496+ }
67497+ /* we'll log when they use connect or bind */
67498+ goto exit;
67499+ }
67500+
67501+exit_fail:
67502+ if (domain == PF_INET)
67503+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
67504+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
67505+ else if (rcu_access_pointer(net_families[domain]) != NULL)
67506+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
67507+ gr_socktype_to_name(type), protocol);
67508+
67509+ return 0;
67510+exit:
67511+ return 1;
67512+}
67513+
67514+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)
67515+{
67516+ if ((ip->mode & mode) &&
67517+ (ip_port >= ip->low) &&
67518+ (ip_port <= ip->high) &&
67519+ ((ntohl(ip_addr) & our_netmask) ==
67520+ (ntohl(our_addr) & our_netmask))
67521+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
67522+ && (ip->type & (1U << type))) {
67523+ if (ip->mode & GR_INVERT)
67524+ return 2; // specifically denied
67525+ else
67526+ return 1; // allowed
67527+ }
67528+
67529+ return 0; // not specifically allowed, may continue parsing
67530+}
67531+
67532+static int
67533+gr_search_connectbind(const int full_mode, struct sock *sk,
67534+ struct sockaddr_in *addr, const int type)
67535+{
67536+ char iface[IFNAMSIZ] = {0};
67537+ struct acl_subject_label *curr;
67538+ struct acl_ip_label *ip;
67539+ struct inet_sock *isk;
67540+ struct net_device *dev;
67541+ struct in_device *idev;
67542+ unsigned long i;
67543+ int ret;
67544+ int mode = full_mode & (GR_BIND | GR_CONNECT);
67545+ __u32 ip_addr = 0;
67546+ __u32 our_addr;
67547+ __u32 our_netmask;
67548+ char *p;
67549+ __u16 ip_port = 0;
67550+ const struct cred *cred = current_cred();
67551+
67552+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
67553+ return 0;
67554+
67555+ curr = current->acl;
67556+ isk = inet_sk(sk);
67557+
67558+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
67559+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
67560+ addr->sin_addr.s_addr = curr->inaddr_any_override;
67561+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
67562+ struct sockaddr_in saddr;
67563+ int err;
67564+
67565+ saddr.sin_family = AF_INET;
67566+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
67567+ saddr.sin_port = isk->inet_sport;
67568+
67569+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
67570+ if (err)
67571+ return err;
67572+
67573+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
67574+ if (err)
67575+ return err;
67576+ }
67577+
67578+ if (!curr->ips)
67579+ return 0;
67580+
67581+ ip_addr = addr->sin_addr.s_addr;
67582+ ip_port = ntohs(addr->sin_port);
67583+
67584+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67585+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67586+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
67587+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
67588+ gr_to_filename(current->exec_file->f_path.dentry,
67589+ current->exec_file->f_path.mnt) :
67590+ curr->filename, curr->filename,
67591+ &ip_addr, ip_port, type,
67592+ sk->sk_protocol, mode, &current->signal->saved_ip);
67593+ return 0;
67594+ }
67595+
67596+ for (i = 0; i < curr->ip_num; i++) {
67597+ ip = *(curr->ips + i);
67598+ if (ip->iface != NULL) {
67599+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
67600+ p = strchr(iface, ':');
67601+ if (p != NULL)
67602+ *p = '\0';
67603+ dev = dev_get_by_name(sock_net(sk), iface);
67604+ if (dev == NULL)
67605+ continue;
67606+ idev = in_dev_get(dev);
67607+ if (idev == NULL) {
67608+ dev_put(dev);
67609+ continue;
67610+ }
67611+ rcu_read_lock();
67612+ for_ifa(idev) {
67613+ if (!strcmp(ip->iface, ifa->ifa_label)) {
67614+ our_addr = ifa->ifa_address;
67615+ our_netmask = 0xffffffff;
67616+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
67617+ if (ret == 1) {
67618+ rcu_read_unlock();
67619+ in_dev_put(idev);
67620+ dev_put(dev);
67621+ return 0;
67622+ } else if (ret == 2) {
67623+ rcu_read_unlock();
67624+ in_dev_put(idev);
67625+ dev_put(dev);
67626+ goto denied;
67627+ }
67628+ }
67629+ } endfor_ifa(idev);
67630+ rcu_read_unlock();
67631+ in_dev_put(idev);
67632+ dev_put(dev);
67633+ } else {
67634+ our_addr = ip->addr;
67635+ our_netmask = ip->netmask;
67636+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
67637+ if (ret == 1)
67638+ return 0;
67639+ else if (ret == 2)
67640+ goto denied;
67641+ }
67642+ }
67643+
67644+denied:
67645+ if (mode == GR_BIND)
67646+ 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));
67647+ else if (mode == GR_CONNECT)
67648+ 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));
67649+
67650+ return -EACCES;
67651+}
67652+
67653+int
67654+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
67655+{
67656+ /* always allow disconnection of dgram sockets with connect */
67657+ if (addr->sin_family == AF_UNSPEC)
67658+ return 0;
67659+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
67660+}
67661+
67662+int
67663+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
67664+{
67665+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
67666+}
67667+
67668+int gr_search_listen(struct socket *sock)
67669+{
67670+ struct sock *sk = sock->sk;
67671+ struct sockaddr_in addr;
67672+
67673+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
67674+ addr.sin_port = inet_sk(sk)->inet_sport;
67675+
67676+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
67677+}
67678+
67679+int gr_search_accept(struct socket *sock)
67680+{
67681+ struct sock *sk = sock->sk;
67682+ struct sockaddr_in addr;
67683+
67684+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
67685+ addr.sin_port = inet_sk(sk)->inet_sport;
67686+
67687+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
67688+}
67689+
67690+int
67691+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
67692+{
67693+ if (addr)
67694+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
67695+ else {
67696+ struct sockaddr_in sin;
67697+ const struct inet_sock *inet = inet_sk(sk);
67698+
67699+ sin.sin_addr.s_addr = inet->inet_daddr;
67700+ sin.sin_port = inet->inet_dport;
67701+
67702+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
67703+ }
67704+}
67705+
67706+int
67707+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
67708+{
67709+ struct sockaddr_in sin;
67710+
67711+ if (unlikely(skb->len < sizeof (struct udphdr)))
67712+ return 0; // skip this packet
67713+
67714+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
67715+ sin.sin_port = udp_hdr(skb)->source;
67716+
67717+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
67718+}
67719diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
67720new file mode 100644
67721index 0000000..25f54ef
67722--- /dev/null
67723+++ b/grsecurity/gracl_learn.c
67724@@ -0,0 +1,207 @@
67725+#include <linux/kernel.h>
67726+#include <linux/mm.h>
67727+#include <linux/sched.h>
67728+#include <linux/poll.h>
67729+#include <linux/string.h>
67730+#include <linux/file.h>
67731+#include <linux/types.h>
67732+#include <linux/vmalloc.h>
67733+#include <linux/grinternal.h>
67734+
67735+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
67736+ size_t count, loff_t *ppos);
67737+extern int gr_acl_is_enabled(void);
67738+
67739+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
67740+static int gr_learn_attached;
67741+
67742+/* use a 512k buffer */
67743+#define LEARN_BUFFER_SIZE (512 * 1024)
67744+
67745+static DEFINE_SPINLOCK(gr_learn_lock);
67746+static DEFINE_MUTEX(gr_learn_user_mutex);
67747+
67748+/* we need to maintain two buffers, so that the kernel context of grlearn
67749+ uses a semaphore around the userspace copying, and the other kernel contexts
67750+ use a spinlock when copying into the buffer, since they cannot sleep
67751+*/
67752+static char *learn_buffer;
67753+static char *learn_buffer_user;
67754+static int learn_buffer_len;
67755+static int learn_buffer_user_len;
67756+
67757+static ssize_t
67758+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
67759+{
67760+ DECLARE_WAITQUEUE(wait, current);
67761+ ssize_t retval = 0;
67762+
67763+ add_wait_queue(&learn_wait, &wait);
67764+ set_current_state(TASK_INTERRUPTIBLE);
67765+ do {
67766+ mutex_lock(&gr_learn_user_mutex);
67767+ spin_lock(&gr_learn_lock);
67768+ if (learn_buffer_len)
67769+ break;
67770+ spin_unlock(&gr_learn_lock);
67771+ mutex_unlock(&gr_learn_user_mutex);
67772+ if (file->f_flags & O_NONBLOCK) {
67773+ retval = -EAGAIN;
67774+ goto out;
67775+ }
67776+ if (signal_pending(current)) {
67777+ retval = -ERESTARTSYS;
67778+ goto out;
67779+ }
67780+
67781+ schedule();
67782+ } while (1);
67783+
67784+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
67785+ learn_buffer_user_len = learn_buffer_len;
67786+ retval = learn_buffer_len;
67787+ learn_buffer_len = 0;
67788+
67789+ spin_unlock(&gr_learn_lock);
67790+
67791+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
67792+ retval = -EFAULT;
67793+
67794+ mutex_unlock(&gr_learn_user_mutex);
67795+out:
67796+ set_current_state(TASK_RUNNING);
67797+ remove_wait_queue(&learn_wait, &wait);
67798+ return retval;
67799+}
67800+
67801+static unsigned int
67802+poll_learn(struct file * file, poll_table * wait)
67803+{
67804+ poll_wait(file, &learn_wait, wait);
67805+
67806+ if (learn_buffer_len)
67807+ return (POLLIN | POLLRDNORM);
67808+
67809+ return 0;
67810+}
67811+
67812+void
67813+gr_clear_learn_entries(void)
67814+{
67815+ char *tmp;
67816+
67817+ mutex_lock(&gr_learn_user_mutex);
67818+ spin_lock(&gr_learn_lock);
67819+ tmp = learn_buffer;
67820+ learn_buffer = NULL;
67821+ spin_unlock(&gr_learn_lock);
67822+ if (tmp)
67823+ vfree(tmp);
67824+ if (learn_buffer_user != NULL) {
67825+ vfree(learn_buffer_user);
67826+ learn_buffer_user = NULL;
67827+ }
67828+ learn_buffer_len = 0;
67829+ mutex_unlock(&gr_learn_user_mutex);
67830+
67831+ return;
67832+}
67833+
67834+void
67835+gr_add_learn_entry(const char *fmt, ...)
67836+{
67837+ va_list args;
67838+ unsigned int len;
67839+
67840+ if (!gr_learn_attached)
67841+ return;
67842+
67843+ spin_lock(&gr_learn_lock);
67844+
67845+ /* leave a gap at the end so we know when it's "full" but don't have to
67846+ compute the exact length of the string we're trying to append
67847+ */
67848+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
67849+ spin_unlock(&gr_learn_lock);
67850+ wake_up_interruptible(&learn_wait);
67851+ return;
67852+ }
67853+ if (learn_buffer == NULL) {
67854+ spin_unlock(&gr_learn_lock);
67855+ return;
67856+ }
67857+
67858+ va_start(args, fmt);
67859+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
67860+ va_end(args);
67861+
67862+ learn_buffer_len += len + 1;
67863+
67864+ spin_unlock(&gr_learn_lock);
67865+ wake_up_interruptible(&learn_wait);
67866+
67867+ return;
67868+}
67869+
67870+static int
67871+open_learn(struct inode *inode, struct file *file)
67872+{
67873+ if (file->f_mode & FMODE_READ && gr_learn_attached)
67874+ return -EBUSY;
67875+ if (file->f_mode & FMODE_READ) {
67876+ int retval = 0;
67877+ mutex_lock(&gr_learn_user_mutex);
67878+ if (learn_buffer == NULL)
67879+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
67880+ if (learn_buffer_user == NULL)
67881+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
67882+ if (learn_buffer == NULL) {
67883+ retval = -ENOMEM;
67884+ goto out_error;
67885+ }
67886+ if (learn_buffer_user == NULL) {
67887+ retval = -ENOMEM;
67888+ goto out_error;
67889+ }
67890+ learn_buffer_len = 0;
67891+ learn_buffer_user_len = 0;
67892+ gr_learn_attached = 1;
67893+out_error:
67894+ mutex_unlock(&gr_learn_user_mutex);
67895+ return retval;
67896+ }
67897+ return 0;
67898+}
67899+
67900+static int
67901+close_learn(struct inode *inode, struct file *file)
67902+{
67903+ if (file->f_mode & FMODE_READ) {
67904+ char *tmp = NULL;
67905+ mutex_lock(&gr_learn_user_mutex);
67906+ spin_lock(&gr_learn_lock);
67907+ tmp = learn_buffer;
67908+ learn_buffer = NULL;
67909+ spin_unlock(&gr_learn_lock);
67910+ if (tmp)
67911+ vfree(tmp);
67912+ if (learn_buffer_user != NULL) {
67913+ vfree(learn_buffer_user);
67914+ learn_buffer_user = NULL;
67915+ }
67916+ learn_buffer_len = 0;
67917+ learn_buffer_user_len = 0;
67918+ gr_learn_attached = 0;
67919+ mutex_unlock(&gr_learn_user_mutex);
67920+ }
67921+
67922+ return 0;
67923+}
67924+
67925+const struct file_operations grsec_fops = {
67926+ .read = read_learn,
67927+ .write = write_grsec_handler,
67928+ .open = open_learn,
67929+ .release = close_learn,
67930+ .poll = poll_learn,
67931+};
67932diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
67933new file mode 100644
67934index 0000000..361a099
67935--- /dev/null
67936+++ b/grsecurity/gracl_policy.c
67937@@ -0,0 +1,1782 @@
67938+#include <linux/kernel.h>
67939+#include <linux/module.h>
67940+#include <linux/sched.h>
67941+#include <linux/mm.h>
67942+#include <linux/file.h>
67943+#include <linux/fs.h>
67944+#include <linux/namei.h>
67945+#include <linux/mount.h>
67946+#include <linux/tty.h>
67947+#include <linux/proc_fs.h>
67948+#include <linux/lglock.h>
67949+#include <linux/slab.h>
67950+#include <linux/vmalloc.h>
67951+#include <linux/types.h>
67952+#include <linux/sysctl.h>
67953+#include <linux/netdevice.h>
67954+#include <linux/ptrace.h>
67955+#include <linux/gracl.h>
67956+#include <linux/gralloc.h>
67957+#include <linux/security.h>
67958+#include <linux/grinternal.h>
67959+#include <linux/pid_namespace.h>
67960+#include <linux/stop_machine.h>
67961+#include <linux/fdtable.h>
67962+#include <linux/percpu.h>
67963+#include <linux/lglock.h>
67964+#include <linux/hugetlb.h>
67965+#include <linux/posix-timers.h>
67966+#include "../fs/mount.h"
67967+
67968+#include <asm/uaccess.h>
67969+#include <asm/errno.h>
67970+#include <asm/mman.h>
67971+
67972+extern struct gr_policy_state *polstate;
67973+
67974+#define FOR_EACH_ROLE_START(role) \
67975+ role = polstate->role_list; \
67976+ while (role) {
67977+
67978+#define FOR_EACH_ROLE_END(role) \
67979+ role = role->prev; \
67980+ }
67981+
67982+struct path gr_real_root;
67983+
67984+extern struct gr_alloc_state *current_alloc_state;
67985+
67986+u16 acl_sp_role_value;
67987+
67988+static DEFINE_MUTEX(gr_dev_mutex);
67989+
67990+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
67991+extern void gr_clear_learn_entries(void);
67992+
67993+static struct gr_arg gr_usermode;
67994+static unsigned char gr_system_salt[GR_SALT_LEN];
67995+static unsigned char gr_system_sum[GR_SHA_LEN];
67996+
67997+static unsigned int gr_auth_attempts = 0;
67998+static unsigned long gr_auth_expires = 0UL;
67999+
68000+struct acl_object_label *fakefs_obj_rw;
68001+struct acl_object_label *fakefs_obj_rwx;
68002+
68003+extern int gr_init_uidset(void);
68004+extern void gr_free_uidset(void);
68005+extern void gr_remove_uid(uid_t uid);
68006+extern int gr_find_uid(uid_t uid);
68007+
68008+extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
68009+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
68010+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
68011+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
68012+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);
68013+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
68014+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
68015+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
68016+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
68017+extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
68018+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
68019+extern void assign_special_role(const char *rolename);
68020+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
68021+extern int gr_rbac_disable(void *unused);
68022+extern void gr_enable_rbac_system(void);
68023+
68024+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
68025+{
68026+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
68027+ return -EFAULT;
68028+
68029+ return 0;
68030+}
68031+
68032+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
68033+{
68034+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
68035+ return -EFAULT;
68036+
68037+ return 0;
68038+}
68039+
68040+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
68041+{
68042+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
68043+ return -EFAULT;
68044+
68045+ return 0;
68046+}
68047+
68048+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
68049+{
68050+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
68051+ return -EFAULT;
68052+
68053+ return 0;
68054+}
68055+
68056+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
68057+{
68058+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
68059+ return -EFAULT;
68060+
68061+ return 0;
68062+}
68063+
68064+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
68065+{
68066+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
68067+ return -EFAULT;
68068+
68069+ return 0;
68070+}
68071+
68072+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
68073+{
68074+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
68075+ return -EFAULT;
68076+
68077+ return 0;
68078+}
68079+
68080+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
68081+{
68082+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
68083+ return -EFAULT;
68084+
68085+ return 0;
68086+}
68087+
68088+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
68089+{
68090+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
68091+ return -EFAULT;
68092+
68093+ return 0;
68094+}
68095+
68096+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
68097+{
68098+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
68099+ return -EFAULT;
68100+
68101+ if (((uwrap->version != GRSECURITY_VERSION) &&
68102+ (uwrap->version != 0x2901)) ||
68103+ (uwrap->size != sizeof(struct gr_arg)))
68104+ return -EINVAL;
68105+
68106+ return 0;
68107+}
68108+
68109+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
68110+{
68111+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
68112+ return -EFAULT;
68113+
68114+ return 0;
68115+}
68116+
68117+static size_t get_gr_arg_wrapper_size_normal(void)
68118+{
68119+ return sizeof(struct gr_arg_wrapper);
68120+}
68121+
68122+#ifdef CONFIG_COMPAT
68123+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
68124+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
68125+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
68126+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
68127+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
68128+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
68129+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
68130+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
68131+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
68132+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
68133+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
68134+extern size_t get_gr_arg_wrapper_size_compat(void);
68135+
68136+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
68137+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
68138+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
68139+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
68140+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
68141+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
68142+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
68143+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
68144+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
68145+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
68146+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
68147+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
68148+
68149+#else
68150+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
68151+#define copy_gr_arg copy_gr_arg_normal
68152+#define copy_gr_hash_struct copy_gr_hash_struct_normal
68153+#define copy_acl_object_label copy_acl_object_label_normal
68154+#define copy_acl_subject_label copy_acl_subject_label_normal
68155+#define copy_acl_role_label copy_acl_role_label_normal
68156+#define copy_acl_ip_label copy_acl_ip_label_normal
68157+#define copy_pointer_from_array copy_pointer_from_array_normal
68158+#define copy_sprole_pw copy_sprole_pw_normal
68159+#define copy_role_transition copy_role_transition_normal
68160+#define copy_role_allowed_ip copy_role_allowed_ip_normal
68161+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
68162+#endif
68163+
68164+static struct acl_subject_label *
68165+lookup_subject_map(const struct acl_subject_label *userp)
68166+{
68167+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
68168+ struct subject_map *match;
68169+
68170+ match = polstate->subj_map_set.s_hash[index];
68171+
68172+ while (match && match->user != userp)
68173+ match = match->next;
68174+
68175+ if (match != NULL)
68176+ return match->kernel;
68177+ else
68178+ return NULL;
68179+}
68180+
68181+static void
68182+insert_subj_map_entry(struct subject_map *subjmap)
68183+{
68184+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
68185+ struct subject_map **curr;
68186+
68187+ subjmap->prev = NULL;
68188+
68189+ curr = &polstate->subj_map_set.s_hash[index];
68190+ if (*curr != NULL)
68191+ (*curr)->prev = subjmap;
68192+
68193+ subjmap->next = *curr;
68194+ *curr = subjmap;
68195+
68196+ return;
68197+}
68198+
68199+static void
68200+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
68201+{
68202+ unsigned int index =
68203+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
68204+ struct acl_role_label **curr;
68205+ struct acl_role_label *tmp, *tmp2;
68206+
68207+ curr = &polstate->acl_role_set.r_hash[index];
68208+
68209+ /* simple case, slot is empty, just set it to our role */
68210+ if (*curr == NULL) {
68211+ *curr = role;
68212+ } else {
68213+ /* example:
68214+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
68215+ 2 -> 3
68216+ */
68217+ /* first check to see if we can already be reached via this slot */
68218+ tmp = *curr;
68219+ while (tmp && tmp != role)
68220+ tmp = tmp->next;
68221+ if (tmp == role) {
68222+ /* we don't need to add ourselves to this slot's chain */
68223+ return;
68224+ }
68225+ /* we need to add ourselves to this chain, two cases */
68226+ if (role->next == NULL) {
68227+ /* simple case, append the current chain to our role */
68228+ role->next = *curr;
68229+ *curr = role;
68230+ } else {
68231+ /* 1 -> 2 -> 3 -> 4
68232+ 2 -> 3 -> 4
68233+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
68234+ */
68235+ /* trickier case: walk our role's chain until we find
68236+ the role for the start of the current slot's chain */
68237+ tmp = role;
68238+ tmp2 = *curr;
68239+ while (tmp->next && tmp->next != tmp2)
68240+ tmp = tmp->next;
68241+ if (tmp->next == tmp2) {
68242+ /* from example above, we found 3, so just
68243+ replace this slot's chain with ours */
68244+ *curr = role;
68245+ } else {
68246+ /* we didn't find a subset of our role's chain
68247+ in the current slot's chain, so append their
68248+ chain to ours, and set us as the first role in
68249+ the slot's chain
68250+
68251+ we could fold this case with the case above,
68252+ but making it explicit for clarity
68253+ */
68254+ tmp->next = tmp2;
68255+ *curr = role;
68256+ }
68257+ }
68258+ }
68259+
68260+ return;
68261+}
68262+
68263+static void
68264+insert_acl_role_label(struct acl_role_label *role)
68265+{
68266+ int i;
68267+
68268+ if (polstate->role_list == NULL) {
68269+ polstate->role_list = role;
68270+ role->prev = NULL;
68271+ } else {
68272+ role->prev = polstate->role_list;
68273+ polstate->role_list = role;
68274+ }
68275+
68276+ /* used for hash chains */
68277+ role->next = NULL;
68278+
68279+ if (role->roletype & GR_ROLE_DOMAIN) {
68280+ for (i = 0; i < role->domain_child_num; i++)
68281+ __insert_acl_role_label(role, role->domain_children[i]);
68282+ } else
68283+ __insert_acl_role_label(role, role->uidgid);
68284+}
68285+
68286+static int
68287+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
68288+{
68289+ struct name_entry **curr, *nentry;
68290+ struct inodev_entry *ientry;
68291+ unsigned int len = strlen(name);
68292+ unsigned int key = full_name_hash(name, len);
68293+ unsigned int index = key % polstate->name_set.n_size;
68294+
68295+ curr = &polstate->name_set.n_hash[index];
68296+
68297+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
68298+ curr = &((*curr)->next);
68299+
68300+ if (*curr != NULL)
68301+ return 1;
68302+
68303+ nentry = acl_alloc(sizeof (struct name_entry));
68304+ if (nentry == NULL)
68305+ return 0;
68306+ ientry = acl_alloc(sizeof (struct inodev_entry));
68307+ if (ientry == NULL)
68308+ return 0;
68309+ ientry->nentry = nentry;
68310+
68311+ nentry->key = key;
68312+ nentry->name = name;
68313+ nentry->inode = inode;
68314+ nentry->device = device;
68315+ nentry->len = len;
68316+ nentry->deleted = deleted;
68317+
68318+ nentry->prev = NULL;
68319+ curr = &polstate->name_set.n_hash[index];
68320+ if (*curr != NULL)
68321+ (*curr)->prev = nentry;
68322+ nentry->next = *curr;
68323+ *curr = nentry;
68324+
68325+ /* insert us into the table searchable by inode/dev */
68326+ __insert_inodev_entry(polstate, ientry);
68327+
68328+ return 1;
68329+}
68330+
68331+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
68332+
68333+static void *
68334+create_table(__u32 * len, int elementsize)
68335+{
68336+ unsigned int table_sizes[] = {
68337+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
68338+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
68339+ 4194301, 8388593, 16777213, 33554393, 67108859
68340+ };
68341+ void *newtable = NULL;
68342+ unsigned int pwr = 0;
68343+
68344+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
68345+ table_sizes[pwr] <= *len)
68346+ pwr++;
68347+
68348+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
68349+ return newtable;
68350+
68351+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
68352+ newtable =
68353+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
68354+ else
68355+ newtable = vmalloc(table_sizes[pwr] * elementsize);
68356+
68357+ *len = table_sizes[pwr];
68358+
68359+ return newtable;
68360+}
68361+
68362+static int
68363+init_variables(const struct gr_arg *arg, bool reload)
68364+{
68365+ struct task_struct *reaper = init_pid_ns.child_reaper;
68366+ unsigned int stacksize;
68367+
68368+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
68369+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
68370+ polstate->name_set.n_size = arg->role_db.num_objects;
68371+ polstate->inodev_set.i_size = arg->role_db.num_objects;
68372+
68373+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
68374+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
68375+ return 1;
68376+
68377+ if (!reload) {
68378+ if (!gr_init_uidset())
68379+ return 1;
68380+ }
68381+
68382+ /* set up the stack that holds allocation info */
68383+
68384+ stacksize = arg->role_db.num_pointers + 5;
68385+
68386+ if (!acl_alloc_stack_init(stacksize))
68387+ return 1;
68388+
68389+ if (!reload) {
68390+ /* grab reference for the real root dentry and vfsmount */
68391+ get_fs_root(reaper->fs, &gr_real_root);
68392+
68393+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68394+ 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);
68395+#endif
68396+
68397+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
68398+ if (fakefs_obj_rw == NULL)
68399+ return 1;
68400+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
68401+
68402+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
68403+ if (fakefs_obj_rwx == NULL)
68404+ return 1;
68405+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
68406+ }
68407+
68408+ polstate->subj_map_set.s_hash =
68409+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
68410+ polstate->acl_role_set.r_hash =
68411+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
68412+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
68413+ polstate->inodev_set.i_hash =
68414+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
68415+
68416+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
68417+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
68418+ return 1;
68419+
68420+ memset(polstate->subj_map_set.s_hash, 0,
68421+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
68422+ memset(polstate->acl_role_set.r_hash, 0,
68423+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
68424+ memset(polstate->name_set.n_hash, 0,
68425+ sizeof (struct name_entry *) * polstate->name_set.n_size);
68426+ memset(polstate->inodev_set.i_hash, 0,
68427+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
68428+
68429+ return 0;
68430+}
68431+
68432+/* free information not needed after startup
68433+ currently contains user->kernel pointer mappings for subjects
68434+*/
68435+
68436+static void
68437+free_init_variables(void)
68438+{
68439+ __u32 i;
68440+
68441+ if (polstate->subj_map_set.s_hash) {
68442+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
68443+ if (polstate->subj_map_set.s_hash[i]) {
68444+ kfree(polstate->subj_map_set.s_hash[i]);
68445+ polstate->subj_map_set.s_hash[i] = NULL;
68446+ }
68447+ }
68448+
68449+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
68450+ PAGE_SIZE)
68451+ kfree(polstate->subj_map_set.s_hash);
68452+ else
68453+ vfree(polstate->subj_map_set.s_hash);
68454+ }
68455+
68456+ return;
68457+}
68458+
68459+static void
68460+free_variables(bool reload)
68461+{
68462+ struct acl_subject_label *s;
68463+ struct acl_role_label *r;
68464+ struct task_struct *task, *task2;
68465+ unsigned int x;
68466+
68467+ if (!reload) {
68468+ gr_clear_learn_entries();
68469+
68470+ read_lock(&tasklist_lock);
68471+ do_each_thread(task2, task) {
68472+ task->acl_sp_role = 0;
68473+ task->acl_role_id = 0;
68474+ task->inherited = 0;
68475+ task->acl = NULL;
68476+ task->role = NULL;
68477+ } while_each_thread(task2, task);
68478+ read_unlock(&tasklist_lock);
68479+
68480+ kfree(fakefs_obj_rw);
68481+ fakefs_obj_rw = NULL;
68482+ kfree(fakefs_obj_rwx);
68483+ fakefs_obj_rwx = NULL;
68484+
68485+ /* release the reference to the real root dentry and vfsmount */
68486+ path_put(&gr_real_root);
68487+ memset(&gr_real_root, 0, sizeof(gr_real_root));
68488+ }
68489+
68490+ /* free all object hash tables */
68491+
68492+ FOR_EACH_ROLE_START(r)
68493+ if (r->subj_hash == NULL)
68494+ goto next_role;
68495+ FOR_EACH_SUBJECT_START(r, s, x)
68496+ if (s->obj_hash == NULL)
68497+ break;
68498+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
68499+ kfree(s->obj_hash);
68500+ else
68501+ vfree(s->obj_hash);
68502+ FOR_EACH_SUBJECT_END(s, x)
68503+ FOR_EACH_NESTED_SUBJECT_START(r, s)
68504+ if (s->obj_hash == NULL)
68505+ break;
68506+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
68507+ kfree(s->obj_hash);
68508+ else
68509+ vfree(s->obj_hash);
68510+ FOR_EACH_NESTED_SUBJECT_END(s)
68511+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
68512+ kfree(r->subj_hash);
68513+ else
68514+ vfree(r->subj_hash);
68515+ r->subj_hash = NULL;
68516+next_role:
68517+ FOR_EACH_ROLE_END(r)
68518+
68519+ acl_free_all();
68520+
68521+ if (polstate->acl_role_set.r_hash) {
68522+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
68523+ PAGE_SIZE)
68524+ kfree(polstate->acl_role_set.r_hash);
68525+ else
68526+ vfree(polstate->acl_role_set.r_hash);
68527+ }
68528+ if (polstate->name_set.n_hash) {
68529+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
68530+ PAGE_SIZE)
68531+ kfree(polstate->name_set.n_hash);
68532+ else
68533+ vfree(polstate->name_set.n_hash);
68534+ }
68535+
68536+ if (polstate->inodev_set.i_hash) {
68537+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
68538+ PAGE_SIZE)
68539+ kfree(polstate->inodev_set.i_hash);
68540+ else
68541+ vfree(polstate->inodev_set.i_hash);
68542+ }
68543+
68544+ if (!reload)
68545+ gr_free_uidset();
68546+
68547+ memset(&polstate->name_set, 0, sizeof (struct name_db));
68548+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
68549+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
68550+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
68551+
68552+ polstate->default_role = NULL;
68553+ polstate->kernel_role = NULL;
68554+ polstate->role_list = NULL;
68555+
68556+ return;
68557+}
68558+
68559+static struct acl_subject_label *
68560+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
68561+
68562+static int alloc_and_copy_string(char **name, unsigned int maxlen)
68563+{
68564+ unsigned int len = strnlen_user(*name, maxlen);
68565+ char *tmp;
68566+
68567+ if (!len || len >= maxlen)
68568+ return -EINVAL;
68569+
68570+ if ((tmp = (char *) acl_alloc(len)) == NULL)
68571+ return -ENOMEM;
68572+
68573+ if (copy_from_user(tmp, *name, len))
68574+ return -EFAULT;
68575+
68576+ tmp[len-1] = '\0';
68577+ *name = tmp;
68578+
68579+ return 0;
68580+}
68581+
68582+static int
68583+copy_user_glob(struct acl_object_label *obj)
68584+{
68585+ struct acl_object_label *g_tmp, **guser;
68586+ int error;
68587+
68588+ if (obj->globbed == NULL)
68589+ return 0;
68590+
68591+ guser = &obj->globbed;
68592+ while (*guser) {
68593+ g_tmp = (struct acl_object_label *)
68594+ acl_alloc(sizeof (struct acl_object_label));
68595+ if (g_tmp == NULL)
68596+ return -ENOMEM;
68597+
68598+ if (copy_acl_object_label(g_tmp, *guser))
68599+ return -EFAULT;
68600+
68601+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
68602+ if (error)
68603+ return error;
68604+
68605+ *guser = g_tmp;
68606+ guser = &(g_tmp->next);
68607+ }
68608+
68609+ return 0;
68610+}
68611+
68612+static int
68613+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
68614+ struct acl_role_label *role)
68615+{
68616+ struct acl_object_label *o_tmp;
68617+ int ret;
68618+
68619+ while (userp) {
68620+ if ((o_tmp = (struct acl_object_label *)
68621+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
68622+ return -ENOMEM;
68623+
68624+ if (copy_acl_object_label(o_tmp, userp))
68625+ return -EFAULT;
68626+
68627+ userp = o_tmp->prev;
68628+
68629+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
68630+ if (ret)
68631+ return ret;
68632+
68633+ insert_acl_obj_label(o_tmp, subj);
68634+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
68635+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
68636+ return -ENOMEM;
68637+
68638+ ret = copy_user_glob(o_tmp);
68639+ if (ret)
68640+ return ret;
68641+
68642+ if (o_tmp->nested) {
68643+ int already_copied;
68644+
68645+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
68646+ if (IS_ERR(o_tmp->nested))
68647+ return PTR_ERR(o_tmp->nested);
68648+
68649+ /* insert into nested subject list if we haven't copied this one yet
68650+ to prevent duplicate entries */
68651+ if (!already_copied) {
68652+ o_tmp->nested->next = role->hash->first;
68653+ role->hash->first = o_tmp->nested;
68654+ }
68655+ }
68656+ }
68657+
68658+ return 0;
68659+}
68660+
68661+static __u32
68662+count_user_subjs(struct acl_subject_label *userp)
68663+{
68664+ struct acl_subject_label s_tmp;
68665+ __u32 num = 0;
68666+
68667+ while (userp) {
68668+ if (copy_acl_subject_label(&s_tmp, userp))
68669+ break;
68670+
68671+ userp = s_tmp.prev;
68672+ }
68673+
68674+ return num;
68675+}
68676+
68677+static int
68678+copy_user_allowedips(struct acl_role_label *rolep)
68679+{
68680+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
68681+
68682+ ruserip = rolep->allowed_ips;
68683+
68684+ while (ruserip) {
68685+ rlast = rtmp;
68686+
68687+ if ((rtmp = (struct role_allowed_ip *)
68688+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
68689+ return -ENOMEM;
68690+
68691+ if (copy_role_allowed_ip(rtmp, ruserip))
68692+ return -EFAULT;
68693+
68694+ ruserip = rtmp->prev;
68695+
68696+ if (!rlast) {
68697+ rtmp->prev = NULL;
68698+ rolep->allowed_ips = rtmp;
68699+ } else {
68700+ rlast->next = rtmp;
68701+ rtmp->prev = rlast;
68702+ }
68703+
68704+ if (!ruserip)
68705+ rtmp->next = NULL;
68706+ }
68707+
68708+ return 0;
68709+}
68710+
68711+static int
68712+copy_user_transitions(struct acl_role_label *rolep)
68713+{
68714+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
68715+ int error;
68716+
68717+ rusertp = rolep->transitions;
68718+
68719+ while (rusertp) {
68720+ rlast = rtmp;
68721+
68722+ if ((rtmp = (struct role_transition *)
68723+ acl_alloc(sizeof (struct role_transition))) == NULL)
68724+ return -ENOMEM;
68725+
68726+ if (copy_role_transition(rtmp, rusertp))
68727+ return -EFAULT;
68728+
68729+ rusertp = rtmp->prev;
68730+
68731+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
68732+ if (error)
68733+ return error;
68734+
68735+ if (!rlast) {
68736+ rtmp->prev = NULL;
68737+ rolep->transitions = rtmp;
68738+ } else {
68739+ rlast->next = rtmp;
68740+ rtmp->prev = rlast;
68741+ }
68742+
68743+ if (!rusertp)
68744+ rtmp->next = NULL;
68745+ }
68746+
68747+ return 0;
68748+}
68749+
68750+static __u32 count_user_objs(const struct acl_object_label __user *userp)
68751+{
68752+ struct acl_object_label o_tmp;
68753+ __u32 num = 0;
68754+
68755+ while (userp) {
68756+ if (copy_acl_object_label(&o_tmp, userp))
68757+ break;
68758+
68759+ userp = o_tmp.prev;
68760+ num++;
68761+ }
68762+
68763+ return num;
68764+}
68765+
68766+static struct acl_subject_label *
68767+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
68768+{
68769+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
68770+ __u32 num_objs;
68771+ struct acl_ip_label **i_tmp, *i_utmp2;
68772+ struct gr_hash_struct ghash;
68773+ struct subject_map *subjmap;
68774+ unsigned int i_num;
68775+ int err;
68776+
68777+ if (already_copied != NULL)
68778+ *already_copied = 0;
68779+
68780+ s_tmp = lookup_subject_map(userp);
68781+
68782+ /* we've already copied this subject into the kernel, just return
68783+ the reference to it, and don't copy it over again
68784+ */
68785+ if (s_tmp) {
68786+ if (already_copied != NULL)
68787+ *already_copied = 1;
68788+ return(s_tmp);
68789+ }
68790+
68791+ if ((s_tmp = (struct acl_subject_label *)
68792+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
68793+ return ERR_PTR(-ENOMEM);
68794+
68795+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
68796+ if (subjmap == NULL)
68797+ return ERR_PTR(-ENOMEM);
68798+
68799+ subjmap->user = userp;
68800+ subjmap->kernel = s_tmp;
68801+ insert_subj_map_entry(subjmap);
68802+
68803+ if (copy_acl_subject_label(s_tmp, userp))
68804+ return ERR_PTR(-EFAULT);
68805+
68806+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
68807+ if (err)
68808+ return ERR_PTR(err);
68809+
68810+ if (!strcmp(s_tmp->filename, "/"))
68811+ role->root_label = s_tmp;
68812+
68813+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
68814+ return ERR_PTR(-EFAULT);
68815+
68816+ /* copy user and group transition tables */
68817+
68818+ if (s_tmp->user_trans_num) {
68819+ uid_t *uidlist;
68820+
68821+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
68822+ if (uidlist == NULL)
68823+ return ERR_PTR(-ENOMEM);
68824+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
68825+ return ERR_PTR(-EFAULT);
68826+
68827+ s_tmp->user_transitions = uidlist;
68828+ }
68829+
68830+ if (s_tmp->group_trans_num) {
68831+ gid_t *gidlist;
68832+
68833+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
68834+ if (gidlist == NULL)
68835+ return ERR_PTR(-ENOMEM);
68836+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
68837+ return ERR_PTR(-EFAULT);
68838+
68839+ s_tmp->group_transitions = gidlist;
68840+ }
68841+
68842+ /* set up object hash table */
68843+ num_objs = count_user_objs(ghash.first);
68844+
68845+ s_tmp->obj_hash_size = num_objs;
68846+ s_tmp->obj_hash =
68847+ (struct acl_object_label **)
68848+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
68849+
68850+ if (!s_tmp->obj_hash)
68851+ return ERR_PTR(-ENOMEM);
68852+
68853+ memset(s_tmp->obj_hash, 0,
68854+ s_tmp->obj_hash_size *
68855+ sizeof (struct acl_object_label *));
68856+
68857+ /* add in objects */
68858+ err = copy_user_objs(ghash.first, s_tmp, role);
68859+
68860+ if (err)
68861+ return ERR_PTR(err);
68862+
68863+ /* set pointer for parent subject */
68864+ if (s_tmp->parent_subject) {
68865+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
68866+
68867+ if (IS_ERR(s_tmp2))
68868+ return s_tmp2;
68869+
68870+ s_tmp->parent_subject = s_tmp2;
68871+ }
68872+
68873+ /* add in ip acls */
68874+
68875+ if (!s_tmp->ip_num) {
68876+ s_tmp->ips = NULL;
68877+ goto insert;
68878+ }
68879+
68880+ i_tmp =
68881+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
68882+ sizeof (struct acl_ip_label *));
68883+
68884+ if (!i_tmp)
68885+ return ERR_PTR(-ENOMEM);
68886+
68887+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
68888+ *(i_tmp + i_num) =
68889+ (struct acl_ip_label *)
68890+ acl_alloc(sizeof (struct acl_ip_label));
68891+ if (!*(i_tmp + i_num))
68892+ return ERR_PTR(-ENOMEM);
68893+
68894+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
68895+ return ERR_PTR(-EFAULT);
68896+
68897+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
68898+ return ERR_PTR(-EFAULT);
68899+
68900+ if ((*(i_tmp + i_num))->iface == NULL)
68901+ continue;
68902+
68903+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
68904+ if (err)
68905+ return ERR_PTR(err);
68906+ }
68907+
68908+ s_tmp->ips = i_tmp;
68909+
68910+insert:
68911+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
68912+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
68913+ return ERR_PTR(-ENOMEM);
68914+
68915+ return s_tmp;
68916+}
68917+
68918+static int
68919+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
68920+{
68921+ struct acl_subject_label s_pre;
68922+ struct acl_subject_label * ret;
68923+ int err;
68924+
68925+ while (userp) {
68926+ if (copy_acl_subject_label(&s_pre, userp))
68927+ return -EFAULT;
68928+
68929+ ret = do_copy_user_subj(userp, role, NULL);
68930+
68931+ err = PTR_ERR(ret);
68932+ if (IS_ERR(ret))
68933+ return err;
68934+
68935+ insert_acl_subj_label(ret, role);
68936+
68937+ userp = s_pre.prev;
68938+ }
68939+
68940+ return 0;
68941+}
68942+
68943+static int
68944+copy_user_acl(struct gr_arg *arg)
68945+{
68946+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
68947+ struct acl_subject_label *subj_list;
68948+ struct sprole_pw *sptmp;
68949+ struct gr_hash_struct *ghash;
68950+ uid_t *domainlist;
68951+ unsigned int r_num;
68952+ int err = 0;
68953+ __u16 i;
68954+ __u32 num_subjs;
68955+
68956+ /* we need a default and kernel role */
68957+ if (arg->role_db.num_roles < 2)
68958+ return -EINVAL;
68959+
68960+ /* copy special role authentication info from userspace */
68961+
68962+ polstate->num_sprole_pws = arg->num_sprole_pws;
68963+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
68964+
68965+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
68966+ return -ENOMEM;
68967+
68968+ for (i = 0; i < polstate->num_sprole_pws; i++) {
68969+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
68970+ if (!sptmp)
68971+ return -ENOMEM;
68972+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
68973+ return -EFAULT;
68974+
68975+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
68976+ if (err)
68977+ return err;
68978+
68979+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68980+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
68981+#endif
68982+
68983+ polstate->acl_special_roles[i] = sptmp;
68984+ }
68985+
68986+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
68987+
68988+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
68989+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
68990+
68991+ if (!r_tmp)
68992+ return -ENOMEM;
68993+
68994+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
68995+ return -EFAULT;
68996+
68997+ if (copy_acl_role_label(r_tmp, r_utmp2))
68998+ return -EFAULT;
68999+
69000+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
69001+ if (err)
69002+ return err;
69003+
69004+ if (!strcmp(r_tmp->rolename, "default")
69005+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
69006+ polstate->default_role = r_tmp;
69007+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
69008+ polstate->kernel_role = r_tmp;
69009+ }
69010+
69011+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
69012+ return -ENOMEM;
69013+
69014+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
69015+ return -EFAULT;
69016+
69017+ r_tmp->hash = ghash;
69018+
69019+ num_subjs = count_user_subjs(r_tmp->hash->first);
69020+
69021+ r_tmp->subj_hash_size = num_subjs;
69022+ r_tmp->subj_hash =
69023+ (struct acl_subject_label **)
69024+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
69025+
69026+ if (!r_tmp->subj_hash)
69027+ return -ENOMEM;
69028+
69029+ err = copy_user_allowedips(r_tmp);
69030+ if (err)
69031+ return err;
69032+
69033+ /* copy domain info */
69034+ if (r_tmp->domain_children != NULL) {
69035+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
69036+ if (domainlist == NULL)
69037+ return -ENOMEM;
69038+
69039+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
69040+ return -EFAULT;
69041+
69042+ r_tmp->domain_children = domainlist;
69043+ }
69044+
69045+ err = copy_user_transitions(r_tmp);
69046+ if (err)
69047+ return err;
69048+
69049+ memset(r_tmp->subj_hash, 0,
69050+ r_tmp->subj_hash_size *
69051+ sizeof (struct acl_subject_label *));
69052+
69053+ /* acquire the list of subjects, then NULL out
69054+ the list prior to parsing the subjects for this role,
69055+ as during this parsing the list is replaced with a list
69056+ of *nested* subjects for the role
69057+ */
69058+ subj_list = r_tmp->hash->first;
69059+
69060+ /* set nested subject list to null */
69061+ r_tmp->hash->first = NULL;
69062+
69063+ err = copy_user_subjs(subj_list, r_tmp);
69064+
69065+ if (err)
69066+ return err;
69067+
69068+ insert_acl_role_label(r_tmp);
69069+ }
69070+
69071+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
69072+ return -EINVAL;
69073+
69074+ return err;
69075+}
69076+
69077+static int gracl_reload_apply_policies(void *reload)
69078+{
69079+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
69080+ struct task_struct *task, *task2;
69081+ struct acl_role_label *role, *rtmp;
69082+ struct acl_subject_label *subj;
69083+ const struct cred *cred;
69084+ int role_applied;
69085+ int ret = 0;
69086+
69087+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
69088+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
69089+
69090+ /* first make sure we'll be able to apply the new policy cleanly */
69091+ do_each_thread(task2, task) {
69092+ if (task->exec_file == NULL)
69093+ continue;
69094+ role_applied = 0;
69095+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
69096+ /* preserve special roles */
69097+ FOR_EACH_ROLE_START(role)
69098+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
69099+ rtmp = task->role;
69100+ task->role = role;
69101+ role_applied = 1;
69102+ break;
69103+ }
69104+ FOR_EACH_ROLE_END(role)
69105+ }
69106+ if (!role_applied) {
69107+ cred = __task_cred(task);
69108+ rtmp = task->role;
69109+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69110+ }
69111+ /* this handles non-nested inherited subjects, nested subjects will still
69112+ be dropped currently */
69113+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
69114+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
69115+ /* change the role back so that we've made no modifications to the policy */
69116+ task->role = rtmp;
69117+
69118+ if (subj == NULL || task->tmpacl == NULL) {
69119+ ret = -EINVAL;
69120+ goto out;
69121+ }
69122+ } while_each_thread(task2, task);
69123+
69124+ /* now actually apply the policy */
69125+
69126+ do_each_thread(task2, task) {
69127+ if (task->exec_file) {
69128+ role_applied = 0;
69129+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
69130+ /* preserve special roles */
69131+ FOR_EACH_ROLE_START(role)
69132+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
69133+ task->role = role;
69134+ role_applied = 1;
69135+ break;
69136+ }
69137+ FOR_EACH_ROLE_END(role)
69138+ }
69139+ if (!role_applied) {
69140+ cred = __task_cred(task);
69141+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69142+ }
69143+ /* this handles non-nested inherited subjects, nested subjects will still
69144+ be dropped currently */
69145+ if (!reload_state->oldmode && task->inherited)
69146+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
69147+ else {
69148+ /* looked up and tagged to the task previously */
69149+ subj = task->tmpacl;
69150+ }
69151+ /* subj will be non-null */
69152+ __gr_apply_subject_to_task(polstate, task, subj);
69153+ if (reload_state->oldmode) {
69154+ task->acl_role_id = 0;
69155+ task->acl_sp_role = 0;
69156+ task->inherited = 0;
69157+ }
69158+ } else {
69159+ // it's a kernel process
69160+ task->role = polstate->kernel_role;
69161+ task->acl = polstate->kernel_role->root_label;
69162+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
69163+ task->acl->mode &= ~GR_PROCFIND;
69164+#endif
69165+ }
69166+ } while_each_thread(task2, task);
69167+
69168+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
69169+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
69170+
69171+out:
69172+
69173+ return ret;
69174+}
69175+
69176+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
69177+{
69178+ struct gr_reload_state new_reload_state = { };
69179+ int err;
69180+
69181+ new_reload_state.oldpolicy_ptr = polstate;
69182+ new_reload_state.oldalloc_ptr = current_alloc_state;
69183+ new_reload_state.oldmode = oldmode;
69184+
69185+ current_alloc_state = &new_reload_state.newalloc;
69186+ polstate = &new_reload_state.newpolicy;
69187+
69188+ /* everything relevant is now saved off, copy in the new policy */
69189+ if (init_variables(args, true)) {
69190+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
69191+ err = -ENOMEM;
69192+ goto error;
69193+ }
69194+
69195+ err = copy_user_acl(args);
69196+ free_init_variables();
69197+ if (err)
69198+ goto error;
69199+ /* the new policy is copied in, with the old policy available via saved_state
69200+ first go through applying roles, making sure to preserve special roles
69201+ then apply new subjects, making sure to preserve inherited and nested subjects,
69202+ though currently only inherited subjects will be preserved
69203+ */
69204+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
69205+ if (err)
69206+ goto error;
69207+
69208+ /* we've now applied the new policy, so restore the old policy state to free it */
69209+ polstate = &new_reload_state.oldpolicy;
69210+ current_alloc_state = &new_reload_state.oldalloc;
69211+ free_variables(true);
69212+
69213+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
69214+ to running_polstate/current_alloc_state inside stop_machine
69215+ */
69216+ err = 0;
69217+ goto out;
69218+error:
69219+ /* on error of loading the new policy, we'll just keep the previous
69220+ policy set around
69221+ */
69222+ free_variables(true);
69223+
69224+ /* doesn't affect runtime, but maintains consistent state */
69225+out:
69226+ polstate = new_reload_state.oldpolicy_ptr;
69227+ current_alloc_state = new_reload_state.oldalloc_ptr;
69228+
69229+ return err;
69230+}
69231+
69232+static int
69233+gracl_init(struct gr_arg *args)
69234+{
69235+ int error = 0;
69236+
69237+ memcpy(&gr_system_salt, args->salt, sizeof(gr_system_salt));
69238+ memcpy(&gr_system_sum, args->sum, sizeof(gr_system_sum));
69239+
69240+ if (init_variables(args, false)) {
69241+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
69242+ error = -ENOMEM;
69243+ goto out;
69244+ }
69245+
69246+ error = copy_user_acl(args);
69247+ free_init_variables();
69248+ if (error)
69249+ goto out;
69250+
69251+ error = gr_set_acls(0);
69252+ if (error)
69253+ goto out;
69254+
69255+ gr_enable_rbac_system();
69256+
69257+ return 0;
69258+
69259+out:
69260+ free_variables(false);
69261+ return error;
69262+}
69263+
69264+static int
69265+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
69266+ unsigned char **sum)
69267+{
69268+ struct acl_role_label *r;
69269+ struct role_allowed_ip *ipp;
69270+ struct role_transition *trans;
69271+ unsigned int i;
69272+ int found = 0;
69273+ u32 curr_ip = current->signal->curr_ip;
69274+
69275+ current->signal->saved_ip = curr_ip;
69276+
69277+ /* check transition table */
69278+
69279+ for (trans = current->role->transitions; trans; trans = trans->next) {
69280+ if (!strcmp(rolename, trans->rolename)) {
69281+ found = 1;
69282+ break;
69283+ }
69284+ }
69285+
69286+ if (!found)
69287+ return 0;
69288+
69289+ /* handle special roles that do not require authentication
69290+ and check ip */
69291+
69292+ FOR_EACH_ROLE_START(r)
69293+ if (!strcmp(rolename, r->rolename) &&
69294+ (r->roletype & GR_ROLE_SPECIAL)) {
69295+ found = 0;
69296+ if (r->allowed_ips != NULL) {
69297+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
69298+ if ((ntohl(curr_ip) & ipp->netmask) ==
69299+ (ntohl(ipp->addr) & ipp->netmask))
69300+ found = 1;
69301+ }
69302+ } else
69303+ found = 2;
69304+ if (!found)
69305+ return 0;
69306+
69307+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
69308+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
69309+ *salt = NULL;
69310+ *sum = NULL;
69311+ return 1;
69312+ }
69313+ }
69314+ FOR_EACH_ROLE_END(r)
69315+
69316+ for (i = 0; i < polstate->num_sprole_pws; i++) {
69317+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
69318+ *salt = polstate->acl_special_roles[i]->salt;
69319+ *sum = polstate->acl_special_roles[i]->sum;
69320+ return 1;
69321+ }
69322+ }
69323+
69324+ return 0;
69325+}
69326+
69327+int gr_check_secure_terminal(struct task_struct *task)
69328+{
69329+ struct task_struct *p, *p2, *p3;
69330+ struct files_struct *files;
69331+ struct fdtable *fdt;
69332+ struct file *our_file = NULL, *file;
69333+ int i;
69334+
69335+ if (task->signal->tty == NULL)
69336+ return 1;
69337+
69338+ files = get_files_struct(task);
69339+ if (files != NULL) {
69340+ rcu_read_lock();
69341+ fdt = files_fdtable(files);
69342+ for (i=0; i < fdt->max_fds; i++) {
69343+ file = fcheck_files(files, i);
69344+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
69345+ get_file(file);
69346+ our_file = file;
69347+ }
69348+ }
69349+ rcu_read_unlock();
69350+ put_files_struct(files);
69351+ }
69352+
69353+ if (our_file == NULL)
69354+ return 1;
69355+
69356+ read_lock(&tasklist_lock);
69357+ do_each_thread(p2, p) {
69358+ files = get_files_struct(p);
69359+ if (files == NULL ||
69360+ (p->signal && p->signal->tty == task->signal->tty)) {
69361+ if (files != NULL)
69362+ put_files_struct(files);
69363+ continue;
69364+ }
69365+ rcu_read_lock();
69366+ fdt = files_fdtable(files);
69367+ for (i=0; i < fdt->max_fds; i++) {
69368+ file = fcheck_files(files, i);
69369+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
69370+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
69371+ p3 = task;
69372+ while (task_pid_nr(p3) > 0) {
69373+ if (p3 == p)
69374+ break;
69375+ p3 = p3->real_parent;
69376+ }
69377+ if (p3 == p)
69378+ break;
69379+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
69380+ gr_handle_alertkill(p);
69381+ rcu_read_unlock();
69382+ put_files_struct(files);
69383+ read_unlock(&tasklist_lock);
69384+ fput(our_file);
69385+ return 0;
69386+ }
69387+ }
69388+ rcu_read_unlock();
69389+ put_files_struct(files);
69390+ } while_each_thread(p2, p);
69391+ read_unlock(&tasklist_lock);
69392+
69393+ fput(our_file);
69394+ return 1;
69395+}
69396+
69397+ssize_t
69398+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
69399+{
69400+ struct gr_arg_wrapper uwrap;
69401+ unsigned char *sprole_salt = NULL;
69402+ unsigned char *sprole_sum = NULL;
69403+ int error = 0;
69404+ int error2 = 0;
69405+ size_t req_count = 0;
69406+ unsigned char oldmode = 0;
69407+
69408+ mutex_lock(&gr_dev_mutex);
69409+
69410+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
69411+ error = -EPERM;
69412+ goto out;
69413+ }
69414+
69415+#ifdef CONFIG_COMPAT
69416+ pax_open_kernel();
69417+ if (is_compat_task()) {
69418+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
69419+ copy_gr_arg = &copy_gr_arg_compat;
69420+ copy_acl_object_label = &copy_acl_object_label_compat;
69421+ copy_acl_subject_label = &copy_acl_subject_label_compat;
69422+ copy_acl_role_label = &copy_acl_role_label_compat;
69423+ copy_acl_ip_label = &copy_acl_ip_label_compat;
69424+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
69425+ copy_role_transition = &copy_role_transition_compat;
69426+ copy_sprole_pw = &copy_sprole_pw_compat;
69427+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
69428+ copy_pointer_from_array = &copy_pointer_from_array_compat;
69429+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
69430+ } else {
69431+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
69432+ copy_gr_arg = &copy_gr_arg_normal;
69433+ copy_acl_object_label = &copy_acl_object_label_normal;
69434+ copy_acl_subject_label = &copy_acl_subject_label_normal;
69435+ copy_acl_role_label = &copy_acl_role_label_normal;
69436+ copy_acl_ip_label = &copy_acl_ip_label_normal;
69437+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
69438+ copy_role_transition = &copy_role_transition_normal;
69439+ copy_sprole_pw = &copy_sprole_pw_normal;
69440+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
69441+ copy_pointer_from_array = &copy_pointer_from_array_normal;
69442+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
69443+ }
69444+ pax_close_kernel();
69445+#endif
69446+
69447+ req_count = get_gr_arg_wrapper_size();
69448+
69449+ if (count != req_count) {
69450+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
69451+ error = -EINVAL;
69452+ goto out;
69453+ }
69454+
69455+
69456+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
69457+ gr_auth_expires = 0;
69458+ gr_auth_attempts = 0;
69459+ }
69460+
69461+ error = copy_gr_arg_wrapper(buf, &uwrap);
69462+ if (error)
69463+ goto out;
69464+
69465+ error = copy_gr_arg(uwrap.arg, &gr_usermode);
69466+ if (error)
69467+ goto out;
69468+
69469+ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_SPROLEPAM &&
69470+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
69471+ time_after(gr_auth_expires, get_seconds())) {
69472+ error = -EBUSY;
69473+ goto out;
69474+ }
69475+
69476+ /* if non-root trying to do anything other than use a special role,
69477+ do not attempt authentication, do not count towards authentication
69478+ locking
69479+ */
69480+
69481+ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS &&
69482+ gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM &&
69483+ gr_is_global_nonroot(current_uid())) {
69484+ error = -EPERM;
69485+ goto out;
69486+ }
69487+
69488+ /* ensure pw and special role name are null terminated */
69489+
69490+ gr_usermode.pw[GR_PW_LEN - 1] = '\0';
69491+ gr_usermode.sp_role[GR_SPROLE_LEN - 1] = '\0';
69492+
69493+ /* Okay.
69494+ * We have our enough of the argument structure..(we have yet
69495+ * to copy_from_user the tables themselves) . Copy the tables
69496+ * only if we need them, i.e. for loading operations. */
69497+
69498+ switch (gr_usermode.mode) {
69499+ case GR_STATUS:
69500+ if (gr_acl_is_enabled()) {
69501+ error = 1;
69502+ if (!gr_check_secure_terminal(current))
69503+ error = 3;
69504+ } else
69505+ error = 2;
69506+ goto out;
69507+ case GR_SHUTDOWN:
69508+ if (gr_acl_is_enabled() && !(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69509+ stop_machine(gr_rbac_disable, NULL, NULL);
69510+ free_variables(false);
69511+ memset(&gr_usermode, 0, sizeof(gr_usermode));
69512+ memset(&gr_system_salt, 0, sizeof(gr_system_salt));
69513+ memset(&gr_system_sum, 0, sizeof(gr_system_sum));
69514+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
69515+ } else if (gr_acl_is_enabled()) {
69516+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
69517+ error = -EPERM;
69518+ } else {
69519+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
69520+ error = -EAGAIN;
69521+ }
69522+ break;
69523+ case GR_ENABLE:
69524+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(&gr_usermode)))
69525+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
69526+ else {
69527+ if (gr_acl_is_enabled())
69528+ error = -EAGAIN;
69529+ else
69530+ error = error2;
69531+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
69532+ }
69533+ break;
69534+ case GR_OLDRELOAD:
69535+ oldmode = 1;
69536+ case GR_RELOAD:
69537+ if (!gr_acl_is_enabled()) {
69538+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
69539+ error = -EAGAIN;
69540+ } else if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69541+ error2 = gracl_reload(&gr_usermode, oldmode);
69542+ if (!error2)
69543+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
69544+ else {
69545+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
69546+ error = error2;
69547+ }
69548+ } else {
69549+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
69550+ error = -EPERM;
69551+ }
69552+ break;
69553+ case GR_SEGVMOD:
69554+ if (unlikely(!gr_acl_is_enabled())) {
69555+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
69556+ error = -EAGAIN;
69557+ break;
69558+ }
69559+
69560+ if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69561+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
69562+ if (gr_usermode.segv_device && gr_usermode.segv_inode) {
69563+ struct acl_subject_label *segvacl;
69564+ segvacl =
69565+ lookup_acl_subj_label(gr_usermode.segv_inode,
69566+ gr_usermode.segv_device,
69567+ current->role);
69568+ if (segvacl) {
69569+ segvacl->crashes = 0;
69570+ segvacl->expires = 0;
69571+ }
69572+ } else if (gr_find_uid(gr_usermode.segv_uid) >= 0) {
69573+ gr_remove_uid(gr_usermode.segv_uid);
69574+ }
69575+ } else {
69576+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
69577+ error = -EPERM;
69578+ }
69579+ break;
69580+ case GR_SPROLE:
69581+ case GR_SPROLEPAM:
69582+ if (unlikely(!gr_acl_is_enabled())) {
69583+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
69584+ error = -EAGAIN;
69585+ break;
69586+ }
69587+
69588+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
69589+ current->role->expires = 0;
69590+ current->role->auth_attempts = 0;
69591+ }
69592+
69593+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
69594+ time_after(current->role->expires, get_seconds())) {
69595+ error = -EBUSY;
69596+ goto out;
69597+ }
69598+
69599+ if (lookup_special_role_auth
69600+ (gr_usermode.mode, gr_usermode.sp_role, &sprole_salt, &sprole_sum)
69601+ && ((!sprole_salt && !sprole_sum)
69602+ || !(chkpw(&gr_usermode, sprole_salt, sprole_sum)))) {
69603+ char *p = "";
69604+ assign_special_role(gr_usermode.sp_role);
69605+ read_lock(&tasklist_lock);
69606+ if (current->real_parent)
69607+ p = current->real_parent->role->rolename;
69608+ read_unlock(&tasklist_lock);
69609+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
69610+ p, acl_sp_role_value);
69611+ } else {
69612+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode.sp_role);
69613+ error = -EPERM;
69614+ if(!(current->role->auth_attempts++))
69615+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
69616+
69617+ goto out;
69618+ }
69619+ break;
69620+ case GR_UNSPROLE:
69621+ if (unlikely(!gr_acl_is_enabled())) {
69622+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
69623+ error = -EAGAIN;
69624+ break;
69625+ }
69626+
69627+ if (current->role->roletype & GR_ROLE_SPECIAL) {
69628+ char *p = "";
69629+ int i = 0;
69630+
69631+ read_lock(&tasklist_lock);
69632+ if (current->real_parent) {
69633+ p = current->real_parent->role->rolename;
69634+ i = current->real_parent->acl_role_id;
69635+ }
69636+ read_unlock(&tasklist_lock);
69637+
69638+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
69639+ gr_set_acls(1);
69640+ } else {
69641+ error = -EPERM;
69642+ goto out;
69643+ }
69644+ break;
69645+ default:
69646+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode.mode);
69647+ error = -EINVAL;
69648+ break;
69649+ }
69650+
69651+ if (error != -EPERM)
69652+ goto out;
69653+
69654+ if(!(gr_auth_attempts++))
69655+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
69656+
69657+ out:
69658+ mutex_unlock(&gr_dev_mutex);
69659+
69660+ if (!error)
69661+ error = req_count;
69662+
69663+ return error;
69664+}
69665+
69666+int
69667+gr_set_acls(const int type)
69668+{
69669+ struct task_struct *task, *task2;
69670+ struct acl_role_label *role = current->role;
69671+ struct acl_subject_label *subj;
69672+ __u16 acl_role_id = current->acl_role_id;
69673+ const struct cred *cred;
69674+ int ret;
69675+
69676+ rcu_read_lock();
69677+ read_lock(&tasklist_lock);
69678+ read_lock(&grsec_exec_file_lock);
69679+ do_each_thread(task2, task) {
69680+ /* check to see if we're called from the exit handler,
69681+ if so, only replace ACLs that have inherited the admin
69682+ ACL */
69683+
69684+ if (type && (task->role != role ||
69685+ task->acl_role_id != acl_role_id))
69686+ continue;
69687+
69688+ task->acl_role_id = 0;
69689+ task->acl_sp_role = 0;
69690+ task->inherited = 0;
69691+
69692+ if (task->exec_file) {
69693+ cred = __task_cred(task);
69694+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69695+ subj = __gr_get_subject_for_task(polstate, task, NULL);
69696+ if (subj == NULL) {
69697+ ret = -EINVAL;
69698+ read_unlock(&grsec_exec_file_lock);
69699+ read_unlock(&tasklist_lock);
69700+ rcu_read_unlock();
69701+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
69702+ return ret;
69703+ }
69704+ __gr_apply_subject_to_task(polstate, task, subj);
69705+ } else {
69706+ // it's a kernel process
69707+ task->role = polstate->kernel_role;
69708+ task->acl = polstate->kernel_role->root_label;
69709+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
69710+ task->acl->mode &= ~GR_PROCFIND;
69711+#endif
69712+ }
69713+ } while_each_thread(task2, task);
69714+ read_unlock(&grsec_exec_file_lock);
69715+ read_unlock(&tasklist_lock);
69716+ rcu_read_unlock();
69717+
69718+ return 0;
69719+}
69720diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
69721new file mode 100644
69722index 0000000..39645c9
69723--- /dev/null
69724+++ b/grsecurity/gracl_res.c
69725@@ -0,0 +1,68 @@
69726+#include <linux/kernel.h>
69727+#include <linux/sched.h>
69728+#include <linux/gracl.h>
69729+#include <linux/grinternal.h>
69730+
69731+static const char *restab_log[] = {
69732+ [RLIMIT_CPU] = "RLIMIT_CPU",
69733+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
69734+ [RLIMIT_DATA] = "RLIMIT_DATA",
69735+ [RLIMIT_STACK] = "RLIMIT_STACK",
69736+ [RLIMIT_CORE] = "RLIMIT_CORE",
69737+ [RLIMIT_RSS] = "RLIMIT_RSS",
69738+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
69739+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
69740+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
69741+ [RLIMIT_AS] = "RLIMIT_AS",
69742+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
69743+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
69744+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
69745+ [RLIMIT_NICE] = "RLIMIT_NICE",
69746+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
69747+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
69748+ [GR_CRASH_RES] = "RLIMIT_CRASH"
69749+};
69750+
69751+void
69752+gr_log_resource(const struct task_struct *task,
69753+ const int res, const unsigned long wanted, const int gt)
69754+{
69755+ const struct cred *cred;
69756+ unsigned long rlim;
69757+
69758+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
69759+ return;
69760+
69761+ // not yet supported resource
69762+ if (unlikely(!restab_log[res]))
69763+ return;
69764+
69765+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
69766+ rlim = task_rlimit_max(task, res);
69767+ else
69768+ rlim = task_rlimit(task, res);
69769+
69770+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
69771+ return;
69772+
69773+ rcu_read_lock();
69774+ cred = __task_cred(task);
69775+
69776+ if (res == RLIMIT_NPROC &&
69777+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
69778+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
69779+ goto out_rcu_unlock;
69780+ else if (res == RLIMIT_MEMLOCK &&
69781+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
69782+ goto out_rcu_unlock;
69783+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
69784+ goto out_rcu_unlock;
69785+ rcu_read_unlock();
69786+
69787+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
69788+
69789+ return;
69790+out_rcu_unlock:
69791+ rcu_read_unlock();
69792+ return;
69793+}
69794diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
69795new file mode 100644
69796index 0000000..2040e61
69797--- /dev/null
69798+++ b/grsecurity/gracl_segv.c
69799@@ -0,0 +1,313 @@
69800+#include <linux/kernel.h>
69801+#include <linux/mm.h>
69802+#include <asm/uaccess.h>
69803+#include <asm/errno.h>
69804+#include <asm/mman.h>
69805+#include <net/sock.h>
69806+#include <linux/file.h>
69807+#include <linux/fs.h>
69808+#include <linux/net.h>
69809+#include <linux/in.h>
69810+#include <linux/slab.h>
69811+#include <linux/types.h>
69812+#include <linux/sched.h>
69813+#include <linux/timer.h>
69814+#include <linux/gracl.h>
69815+#include <linux/grsecurity.h>
69816+#include <linux/grinternal.h>
69817+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69818+#include <linux/magic.h>
69819+#include <linux/pagemap.h>
69820+#include "../fs/btrfs/async-thread.h"
69821+#include "../fs/btrfs/ctree.h"
69822+#include "../fs/btrfs/btrfs_inode.h"
69823+#endif
69824+
69825+static struct crash_uid *uid_set;
69826+static unsigned short uid_used;
69827+static DEFINE_SPINLOCK(gr_uid_lock);
69828+extern rwlock_t gr_inode_lock;
69829+extern struct acl_subject_label *
69830+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
69831+ struct acl_role_label *role);
69832+
69833+static inline dev_t __get_dev(const struct dentry *dentry)
69834+{
69835+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69836+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69837+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
69838+ else
69839+#endif
69840+ return dentry->d_sb->s_dev;
69841+}
69842+
69843+int
69844+gr_init_uidset(void)
69845+{
69846+ uid_set =
69847+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
69848+ uid_used = 0;
69849+
69850+ return uid_set ? 1 : 0;
69851+}
69852+
69853+void
69854+gr_free_uidset(void)
69855+{
69856+ if (uid_set) {
69857+ struct crash_uid *tmpset;
69858+ spin_lock(&gr_uid_lock);
69859+ tmpset = uid_set;
69860+ uid_set = NULL;
69861+ uid_used = 0;
69862+ spin_unlock(&gr_uid_lock);
69863+ if (tmpset)
69864+ kfree(tmpset);
69865+ }
69866+
69867+ return;
69868+}
69869+
69870+int
69871+gr_find_uid(const uid_t uid)
69872+{
69873+ struct crash_uid *tmp = uid_set;
69874+ uid_t buid;
69875+ int low = 0, high = uid_used - 1, mid;
69876+
69877+ while (high >= low) {
69878+ mid = (low + high) >> 1;
69879+ buid = tmp[mid].uid;
69880+ if (buid == uid)
69881+ return mid;
69882+ if (buid > uid)
69883+ high = mid - 1;
69884+ if (buid < uid)
69885+ low = mid + 1;
69886+ }
69887+
69888+ return -1;
69889+}
69890+
69891+static __inline__ void
69892+gr_insertsort(void)
69893+{
69894+ unsigned short i, j;
69895+ struct crash_uid index;
69896+
69897+ for (i = 1; i < uid_used; i++) {
69898+ index = uid_set[i];
69899+ j = i;
69900+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
69901+ uid_set[j] = uid_set[j - 1];
69902+ j--;
69903+ }
69904+ uid_set[j] = index;
69905+ }
69906+
69907+ return;
69908+}
69909+
69910+static __inline__ void
69911+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
69912+{
69913+ int loc;
69914+ uid_t uid = GR_GLOBAL_UID(kuid);
69915+
69916+ if (uid_used == GR_UIDTABLE_MAX)
69917+ return;
69918+
69919+ loc = gr_find_uid(uid);
69920+
69921+ if (loc >= 0) {
69922+ uid_set[loc].expires = expires;
69923+ return;
69924+ }
69925+
69926+ uid_set[uid_used].uid = uid;
69927+ uid_set[uid_used].expires = expires;
69928+ uid_used++;
69929+
69930+ gr_insertsort();
69931+
69932+ return;
69933+}
69934+
69935+void
69936+gr_remove_uid(const unsigned short loc)
69937+{
69938+ unsigned short i;
69939+
69940+ for (i = loc + 1; i < uid_used; i++)
69941+ uid_set[i - 1] = uid_set[i];
69942+
69943+ uid_used--;
69944+
69945+ return;
69946+}
69947+
69948+int
69949+gr_check_crash_uid(const kuid_t kuid)
69950+{
69951+ int loc;
69952+ int ret = 0;
69953+ uid_t uid;
69954+
69955+ if (unlikely(!gr_acl_is_enabled()))
69956+ return 0;
69957+
69958+ uid = GR_GLOBAL_UID(kuid);
69959+
69960+ spin_lock(&gr_uid_lock);
69961+ loc = gr_find_uid(uid);
69962+
69963+ if (loc < 0)
69964+ goto out_unlock;
69965+
69966+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
69967+ gr_remove_uid(loc);
69968+ else
69969+ ret = 1;
69970+
69971+out_unlock:
69972+ spin_unlock(&gr_uid_lock);
69973+ return ret;
69974+}
69975+
69976+static __inline__ int
69977+proc_is_setxid(const struct cred *cred)
69978+{
69979+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
69980+ !uid_eq(cred->uid, cred->fsuid))
69981+ return 1;
69982+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
69983+ !gid_eq(cred->gid, cred->fsgid))
69984+ return 1;
69985+
69986+ return 0;
69987+}
69988+
69989+extern int gr_fake_force_sig(int sig, struct task_struct *t);
69990+
69991+void
69992+gr_handle_crash(struct task_struct *task, const int sig)
69993+{
69994+ struct acl_subject_label *curr;
69995+ struct task_struct *tsk, *tsk2;
69996+ const struct cred *cred;
69997+ const struct cred *cred2;
69998+
69999+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
70000+ return;
70001+
70002+ if (unlikely(!gr_acl_is_enabled()))
70003+ return;
70004+
70005+ curr = task->acl;
70006+
70007+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
70008+ return;
70009+
70010+ if (time_before_eq(curr->expires, get_seconds())) {
70011+ curr->expires = 0;
70012+ curr->crashes = 0;
70013+ }
70014+
70015+ curr->crashes++;
70016+
70017+ if (!curr->expires)
70018+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
70019+
70020+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
70021+ time_after(curr->expires, get_seconds())) {
70022+ rcu_read_lock();
70023+ cred = __task_cred(task);
70024+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
70025+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
70026+ spin_lock(&gr_uid_lock);
70027+ gr_insert_uid(cred->uid, curr->expires);
70028+ spin_unlock(&gr_uid_lock);
70029+ curr->expires = 0;
70030+ curr->crashes = 0;
70031+ read_lock(&tasklist_lock);
70032+ do_each_thread(tsk2, tsk) {
70033+ cred2 = __task_cred(tsk);
70034+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
70035+ gr_fake_force_sig(SIGKILL, tsk);
70036+ } while_each_thread(tsk2, tsk);
70037+ read_unlock(&tasklist_lock);
70038+ } else {
70039+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
70040+ read_lock(&tasklist_lock);
70041+ read_lock(&grsec_exec_file_lock);
70042+ do_each_thread(tsk2, tsk) {
70043+ if (likely(tsk != task)) {
70044+ // if this thread has the same subject as the one that triggered
70045+ // RES_CRASH and it's the same binary, kill it
70046+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
70047+ gr_fake_force_sig(SIGKILL, tsk);
70048+ }
70049+ } while_each_thread(tsk2, tsk);
70050+ read_unlock(&grsec_exec_file_lock);
70051+ read_unlock(&tasklist_lock);
70052+ }
70053+ rcu_read_unlock();
70054+ }
70055+
70056+ return;
70057+}
70058+
70059+int
70060+gr_check_crash_exec(const struct file *filp)
70061+{
70062+ struct acl_subject_label *curr;
70063+
70064+ if (unlikely(!gr_acl_is_enabled()))
70065+ return 0;
70066+
70067+ read_lock(&gr_inode_lock);
70068+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
70069+ __get_dev(filp->f_path.dentry),
70070+ current->role);
70071+ read_unlock(&gr_inode_lock);
70072+
70073+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
70074+ (!curr->crashes && !curr->expires))
70075+ return 0;
70076+
70077+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
70078+ time_after(curr->expires, get_seconds()))
70079+ return 1;
70080+ else if (time_before_eq(curr->expires, get_seconds())) {
70081+ curr->crashes = 0;
70082+ curr->expires = 0;
70083+ }
70084+
70085+ return 0;
70086+}
70087+
70088+void
70089+gr_handle_alertkill(struct task_struct *task)
70090+{
70091+ struct acl_subject_label *curracl;
70092+ __u32 curr_ip;
70093+ struct task_struct *p, *p2;
70094+
70095+ if (unlikely(!gr_acl_is_enabled()))
70096+ return;
70097+
70098+ curracl = task->acl;
70099+ curr_ip = task->signal->curr_ip;
70100+
70101+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
70102+ read_lock(&tasklist_lock);
70103+ do_each_thread(p2, p) {
70104+ if (p->signal->curr_ip == curr_ip)
70105+ gr_fake_force_sig(SIGKILL, p);
70106+ } while_each_thread(p2, p);
70107+ read_unlock(&tasklist_lock);
70108+ } else if (curracl->mode & GR_KILLPROC)
70109+ gr_fake_force_sig(SIGKILL, task);
70110+
70111+ return;
70112+}
70113diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
70114new file mode 100644
70115index 0000000..98011b0
70116--- /dev/null
70117+++ b/grsecurity/gracl_shm.c
70118@@ -0,0 +1,40 @@
70119+#include <linux/kernel.h>
70120+#include <linux/mm.h>
70121+#include <linux/sched.h>
70122+#include <linux/file.h>
70123+#include <linux/ipc.h>
70124+#include <linux/gracl.h>
70125+#include <linux/grsecurity.h>
70126+#include <linux/grinternal.h>
70127+
70128+int
70129+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70130+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
70131+{
70132+ struct task_struct *task;
70133+
70134+ if (!gr_acl_is_enabled())
70135+ return 1;
70136+
70137+ rcu_read_lock();
70138+ read_lock(&tasklist_lock);
70139+
70140+ task = find_task_by_vpid(shm_cprid);
70141+
70142+ if (unlikely(!task))
70143+ task = find_task_by_vpid(shm_lapid);
70144+
70145+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
70146+ (task_pid_nr(task) == shm_lapid)) &&
70147+ (task->acl->mode & GR_PROTSHM) &&
70148+ (task->acl != current->acl))) {
70149+ read_unlock(&tasklist_lock);
70150+ rcu_read_unlock();
70151+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
70152+ return 0;
70153+ }
70154+ read_unlock(&tasklist_lock);
70155+ rcu_read_unlock();
70156+
70157+ return 1;
70158+}
70159diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
70160new file mode 100644
70161index 0000000..bc0be01
70162--- /dev/null
70163+++ b/grsecurity/grsec_chdir.c
70164@@ -0,0 +1,19 @@
70165+#include <linux/kernel.h>
70166+#include <linux/sched.h>
70167+#include <linux/fs.h>
70168+#include <linux/file.h>
70169+#include <linux/grsecurity.h>
70170+#include <linux/grinternal.h>
70171+
70172+void
70173+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
70174+{
70175+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
70176+ if ((grsec_enable_chdir && grsec_enable_group &&
70177+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
70178+ !grsec_enable_group)) {
70179+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
70180+ }
70181+#endif
70182+ return;
70183+}
70184diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
70185new file mode 100644
70186index 0000000..e10b319
70187--- /dev/null
70188+++ b/grsecurity/grsec_chroot.c
70189@@ -0,0 +1,370 @@
70190+#include <linux/kernel.h>
70191+#include <linux/module.h>
70192+#include <linux/sched.h>
70193+#include <linux/file.h>
70194+#include <linux/fs.h>
70195+#include <linux/mount.h>
70196+#include <linux/types.h>
70197+#include "../fs/mount.h"
70198+#include <linux/grsecurity.h>
70199+#include <linux/grinternal.h>
70200+
70201+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70202+int gr_init_ran;
70203+#endif
70204+
70205+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
70206+{
70207+#ifdef CONFIG_GRKERNSEC
70208+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
70209+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
70210+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70211+ && gr_init_ran
70212+#endif
70213+ )
70214+ task->gr_is_chrooted = 1;
70215+ else {
70216+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70217+ if (task_pid_nr(task) == 1 && !gr_init_ran)
70218+ gr_init_ran = 1;
70219+#endif
70220+ task->gr_is_chrooted = 0;
70221+ }
70222+
70223+ task->gr_chroot_dentry = path->dentry;
70224+#endif
70225+ return;
70226+}
70227+
70228+void gr_clear_chroot_entries(struct task_struct *task)
70229+{
70230+#ifdef CONFIG_GRKERNSEC
70231+ task->gr_is_chrooted = 0;
70232+ task->gr_chroot_dentry = NULL;
70233+#endif
70234+ return;
70235+}
70236+
70237+int
70238+gr_handle_chroot_unix(const pid_t pid)
70239+{
70240+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
70241+ struct task_struct *p;
70242+
70243+ if (unlikely(!grsec_enable_chroot_unix))
70244+ return 1;
70245+
70246+ if (likely(!proc_is_chrooted(current)))
70247+ return 1;
70248+
70249+ rcu_read_lock();
70250+ read_lock(&tasklist_lock);
70251+ p = find_task_by_vpid_unrestricted(pid);
70252+ if (unlikely(p && !have_same_root(current, p))) {
70253+ read_unlock(&tasklist_lock);
70254+ rcu_read_unlock();
70255+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
70256+ return 0;
70257+ }
70258+ read_unlock(&tasklist_lock);
70259+ rcu_read_unlock();
70260+#endif
70261+ return 1;
70262+}
70263+
70264+int
70265+gr_handle_chroot_nice(void)
70266+{
70267+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
70268+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
70269+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
70270+ return -EPERM;
70271+ }
70272+#endif
70273+ return 0;
70274+}
70275+
70276+int
70277+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
70278+{
70279+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
70280+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
70281+ && proc_is_chrooted(current)) {
70282+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
70283+ return -EACCES;
70284+ }
70285+#endif
70286+ return 0;
70287+}
70288+
70289+int
70290+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
70291+{
70292+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
70293+ struct task_struct *p;
70294+ int ret = 0;
70295+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
70296+ return ret;
70297+
70298+ read_lock(&tasklist_lock);
70299+ do_each_pid_task(pid, type, p) {
70300+ if (!have_same_root(current, p)) {
70301+ ret = 1;
70302+ goto out;
70303+ }
70304+ } while_each_pid_task(pid, type, p);
70305+out:
70306+ read_unlock(&tasklist_lock);
70307+ return ret;
70308+#endif
70309+ return 0;
70310+}
70311+
70312+int
70313+gr_pid_is_chrooted(struct task_struct *p)
70314+{
70315+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
70316+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
70317+ return 0;
70318+
70319+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
70320+ !have_same_root(current, p)) {
70321+ return 1;
70322+ }
70323+#endif
70324+ return 0;
70325+}
70326+
70327+EXPORT_SYMBOL(gr_pid_is_chrooted);
70328+
70329+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
70330+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
70331+{
70332+ struct path path, currentroot;
70333+ int ret = 0;
70334+
70335+ path.dentry = (struct dentry *)u_dentry;
70336+ path.mnt = (struct vfsmount *)u_mnt;
70337+ get_fs_root(current->fs, &currentroot);
70338+ if (path_is_under(&path, &currentroot))
70339+ ret = 1;
70340+ path_put(&currentroot);
70341+
70342+ return ret;
70343+}
70344+#endif
70345+
70346+int
70347+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
70348+{
70349+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
70350+ if (!grsec_enable_chroot_fchdir)
70351+ return 1;
70352+
70353+ if (!proc_is_chrooted(current))
70354+ return 1;
70355+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
70356+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
70357+ return 0;
70358+ }
70359+#endif
70360+ return 1;
70361+}
70362+
70363+int
70364+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70365+ const time_t shm_createtime)
70366+{
70367+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
70368+ struct task_struct *p;
70369+ time_t starttime;
70370+
70371+ if (unlikely(!grsec_enable_chroot_shmat))
70372+ return 1;
70373+
70374+ if (likely(!proc_is_chrooted(current)))
70375+ return 1;
70376+
70377+ rcu_read_lock();
70378+ read_lock(&tasklist_lock);
70379+
70380+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
70381+ starttime = p->start_time.tv_sec;
70382+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
70383+ if (have_same_root(current, p)) {
70384+ goto allow;
70385+ } else {
70386+ read_unlock(&tasklist_lock);
70387+ rcu_read_unlock();
70388+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
70389+ return 0;
70390+ }
70391+ }
70392+ /* creator exited, pid reuse, fall through to next check */
70393+ }
70394+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
70395+ if (unlikely(!have_same_root(current, p))) {
70396+ read_unlock(&tasklist_lock);
70397+ rcu_read_unlock();
70398+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
70399+ return 0;
70400+ }
70401+ }
70402+
70403+allow:
70404+ read_unlock(&tasklist_lock);
70405+ rcu_read_unlock();
70406+#endif
70407+ return 1;
70408+}
70409+
70410+void
70411+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
70412+{
70413+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
70414+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
70415+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
70416+#endif
70417+ return;
70418+}
70419+
70420+int
70421+gr_handle_chroot_mknod(const struct dentry *dentry,
70422+ const struct vfsmount *mnt, const int mode)
70423+{
70424+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
70425+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
70426+ proc_is_chrooted(current)) {
70427+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
70428+ return -EPERM;
70429+ }
70430+#endif
70431+ return 0;
70432+}
70433+
70434+int
70435+gr_handle_chroot_mount(const struct dentry *dentry,
70436+ const struct vfsmount *mnt, const char *dev_name)
70437+{
70438+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
70439+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
70440+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
70441+ return -EPERM;
70442+ }
70443+#endif
70444+ return 0;
70445+}
70446+
70447+int
70448+gr_handle_chroot_pivot(void)
70449+{
70450+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
70451+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
70452+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
70453+ return -EPERM;
70454+ }
70455+#endif
70456+ return 0;
70457+}
70458+
70459+int
70460+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
70461+{
70462+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
70463+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
70464+ !gr_is_outside_chroot(dentry, mnt)) {
70465+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
70466+ return -EPERM;
70467+ }
70468+#endif
70469+ return 0;
70470+}
70471+
70472+extern const char *captab_log[];
70473+extern int captab_log_entries;
70474+
70475+int
70476+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
70477+{
70478+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70479+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
70480+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
70481+ if (cap_raised(chroot_caps, cap)) {
70482+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
70483+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
70484+ }
70485+ return 0;
70486+ }
70487+ }
70488+#endif
70489+ return 1;
70490+}
70491+
70492+int
70493+gr_chroot_is_capable(const int cap)
70494+{
70495+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70496+ return gr_task_chroot_is_capable(current, current_cred(), cap);
70497+#endif
70498+ return 1;
70499+}
70500+
70501+int
70502+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
70503+{
70504+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70505+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
70506+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
70507+ if (cap_raised(chroot_caps, cap)) {
70508+ return 0;
70509+ }
70510+ }
70511+#endif
70512+ return 1;
70513+}
70514+
70515+int
70516+gr_chroot_is_capable_nolog(const int cap)
70517+{
70518+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70519+ return gr_task_chroot_is_capable_nolog(current, cap);
70520+#endif
70521+ return 1;
70522+}
70523+
70524+int
70525+gr_handle_chroot_sysctl(const int op)
70526+{
70527+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
70528+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
70529+ proc_is_chrooted(current))
70530+ return -EACCES;
70531+#endif
70532+ return 0;
70533+}
70534+
70535+void
70536+gr_handle_chroot_chdir(const struct path *path)
70537+{
70538+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
70539+ if (grsec_enable_chroot_chdir)
70540+ set_fs_pwd(current->fs, path);
70541+#endif
70542+ return;
70543+}
70544+
70545+int
70546+gr_handle_chroot_chmod(const struct dentry *dentry,
70547+ const struct vfsmount *mnt, const int mode)
70548+{
70549+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
70550+ /* allow chmod +s on directories, but not files */
70551+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
70552+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
70553+ proc_is_chrooted(current)) {
70554+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
70555+ return -EPERM;
70556+ }
70557+#endif
70558+ return 0;
70559+}
70560diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
70561new file mode 100644
70562index 0000000..52b3e30
70563--- /dev/null
70564+++ b/grsecurity/grsec_disabled.c
70565@@ -0,0 +1,433 @@
70566+#include <linux/kernel.h>
70567+#include <linux/module.h>
70568+#include <linux/sched.h>
70569+#include <linux/file.h>
70570+#include <linux/fs.h>
70571+#include <linux/kdev_t.h>
70572+#include <linux/net.h>
70573+#include <linux/in.h>
70574+#include <linux/ip.h>
70575+#include <linux/skbuff.h>
70576+#include <linux/sysctl.h>
70577+
70578+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
70579+void
70580+pax_set_initial_flags(struct linux_binprm *bprm)
70581+{
70582+ return;
70583+}
70584+#endif
70585+
70586+#ifdef CONFIG_SYSCTL
70587+__u32
70588+gr_handle_sysctl(const struct ctl_table * table, const int op)
70589+{
70590+ return 0;
70591+}
70592+#endif
70593+
70594+#ifdef CONFIG_TASKSTATS
70595+int gr_is_taskstats_denied(int pid)
70596+{
70597+ return 0;
70598+}
70599+#endif
70600+
70601+int
70602+gr_acl_is_enabled(void)
70603+{
70604+ return 0;
70605+}
70606+
70607+void
70608+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
70609+{
70610+ return;
70611+}
70612+
70613+int
70614+gr_handle_rawio(const struct inode *inode)
70615+{
70616+ return 0;
70617+}
70618+
70619+void
70620+gr_acl_handle_psacct(struct task_struct *task, const long code)
70621+{
70622+ return;
70623+}
70624+
70625+int
70626+gr_handle_ptrace(struct task_struct *task, const long request)
70627+{
70628+ return 0;
70629+}
70630+
70631+int
70632+gr_handle_proc_ptrace(struct task_struct *task)
70633+{
70634+ return 0;
70635+}
70636+
70637+int
70638+gr_set_acls(const int type)
70639+{
70640+ return 0;
70641+}
70642+
70643+int
70644+gr_check_hidden_task(const struct task_struct *tsk)
70645+{
70646+ return 0;
70647+}
70648+
70649+int
70650+gr_check_protected_task(const struct task_struct *task)
70651+{
70652+ return 0;
70653+}
70654+
70655+int
70656+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70657+{
70658+ return 0;
70659+}
70660+
70661+void
70662+gr_copy_label(struct task_struct *tsk)
70663+{
70664+ return;
70665+}
70666+
70667+void
70668+gr_set_pax_flags(struct task_struct *task)
70669+{
70670+ return;
70671+}
70672+
70673+int
70674+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
70675+ const int unsafe_share)
70676+{
70677+ return 0;
70678+}
70679+
70680+void
70681+gr_handle_delete(const ino_t ino, const dev_t dev)
70682+{
70683+ return;
70684+}
70685+
70686+void
70687+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
70688+{
70689+ return;
70690+}
70691+
70692+void
70693+gr_handle_crash(struct task_struct *task, const int sig)
70694+{
70695+ return;
70696+}
70697+
70698+int
70699+gr_check_crash_exec(const struct file *filp)
70700+{
70701+ return 0;
70702+}
70703+
70704+int
70705+gr_check_crash_uid(const kuid_t uid)
70706+{
70707+ return 0;
70708+}
70709+
70710+void
70711+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
70712+ struct dentry *old_dentry,
70713+ struct dentry *new_dentry,
70714+ struct vfsmount *mnt, const __u8 replace)
70715+{
70716+ return;
70717+}
70718+
70719+int
70720+gr_search_socket(const int family, const int type, const int protocol)
70721+{
70722+ return 1;
70723+}
70724+
70725+int
70726+gr_search_connectbind(const int mode, const struct socket *sock,
70727+ const struct sockaddr_in *addr)
70728+{
70729+ return 0;
70730+}
70731+
70732+void
70733+gr_handle_alertkill(struct task_struct *task)
70734+{
70735+ return;
70736+}
70737+
70738+__u32
70739+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
70740+{
70741+ return 1;
70742+}
70743+
70744+__u32
70745+gr_acl_handle_hidden_file(const struct dentry * dentry,
70746+ const struct vfsmount * mnt)
70747+{
70748+ return 1;
70749+}
70750+
70751+__u32
70752+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
70753+ int acc_mode)
70754+{
70755+ return 1;
70756+}
70757+
70758+__u32
70759+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
70760+{
70761+ return 1;
70762+}
70763+
70764+__u32
70765+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
70766+{
70767+ return 1;
70768+}
70769+
70770+int
70771+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
70772+ unsigned int *vm_flags)
70773+{
70774+ return 1;
70775+}
70776+
70777+__u32
70778+gr_acl_handle_truncate(const struct dentry * dentry,
70779+ const struct vfsmount * mnt)
70780+{
70781+ return 1;
70782+}
70783+
70784+__u32
70785+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
70786+{
70787+ return 1;
70788+}
70789+
70790+__u32
70791+gr_acl_handle_access(const struct dentry * dentry,
70792+ const struct vfsmount * mnt, const int fmode)
70793+{
70794+ return 1;
70795+}
70796+
70797+__u32
70798+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
70799+ umode_t *mode)
70800+{
70801+ return 1;
70802+}
70803+
70804+__u32
70805+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
70806+{
70807+ return 1;
70808+}
70809+
70810+__u32
70811+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
70812+{
70813+ return 1;
70814+}
70815+
70816+__u32
70817+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
70818+{
70819+ return 1;
70820+}
70821+
70822+void
70823+grsecurity_init(void)
70824+{
70825+ return;
70826+}
70827+
70828+umode_t gr_acl_umask(void)
70829+{
70830+ return 0;
70831+}
70832+
70833+__u32
70834+gr_acl_handle_mknod(const struct dentry * new_dentry,
70835+ const struct dentry * parent_dentry,
70836+ const struct vfsmount * parent_mnt,
70837+ const int mode)
70838+{
70839+ return 1;
70840+}
70841+
70842+__u32
70843+gr_acl_handle_mkdir(const struct dentry * new_dentry,
70844+ const struct dentry * parent_dentry,
70845+ const struct vfsmount * parent_mnt)
70846+{
70847+ return 1;
70848+}
70849+
70850+__u32
70851+gr_acl_handle_symlink(const struct dentry * new_dentry,
70852+ const struct dentry * parent_dentry,
70853+ const struct vfsmount * parent_mnt, const struct filename *from)
70854+{
70855+ return 1;
70856+}
70857+
70858+__u32
70859+gr_acl_handle_link(const struct dentry * new_dentry,
70860+ const struct dentry * parent_dentry,
70861+ const struct vfsmount * parent_mnt,
70862+ const struct dentry * old_dentry,
70863+ const struct vfsmount * old_mnt, const struct filename *to)
70864+{
70865+ return 1;
70866+}
70867+
70868+int
70869+gr_acl_handle_rename(const struct dentry *new_dentry,
70870+ const struct dentry *parent_dentry,
70871+ const struct vfsmount *parent_mnt,
70872+ const struct dentry *old_dentry,
70873+ const struct inode *old_parent_inode,
70874+ const struct vfsmount *old_mnt, const struct filename *newname)
70875+{
70876+ return 0;
70877+}
70878+
70879+int
70880+gr_acl_handle_filldir(const struct file *file, const char *name,
70881+ const int namelen, const ino_t ino)
70882+{
70883+ return 1;
70884+}
70885+
70886+int
70887+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70888+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
70889+{
70890+ return 1;
70891+}
70892+
70893+int
70894+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
70895+{
70896+ return 0;
70897+}
70898+
70899+int
70900+gr_search_accept(const struct socket *sock)
70901+{
70902+ return 0;
70903+}
70904+
70905+int
70906+gr_search_listen(const struct socket *sock)
70907+{
70908+ return 0;
70909+}
70910+
70911+int
70912+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
70913+{
70914+ return 0;
70915+}
70916+
70917+__u32
70918+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
70919+{
70920+ return 1;
70921+}
70922+
70923+__u32
70924+gr_acl_handle_creat(const struct dentry * dentry,
70925+ const struct dentry * p_dentry,
70926+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
70927+ const int imode)
70928+{
70929+ return 1;
70930+}
70931+
70932+void
70933+gr_acl_handle_exit(void)
70934+{
70935+ return;
70936+}
70937+
70938+int
70939+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
70940+{
70941+ return 1;
70942+}
70943+
70944+void
70945+gr_set_role_label(const kuid_t uid, const kgid_t gid)
70946+{
70947+ return;
70948+}
70949+
70950+int
70951+gr_acl_handle_procpidmem(const struct task_struct *task)
70952+{
70953+ return 0;
70954+}
70955+
70956+int
70957+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
70958+{
70959+ return 0;
70960+}
70961+
70962+int
70963+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
70964+{
70965+ return 0;
70966+}
70967+
70968+int
70969+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70970+{
70971+ return 0;
70972+}
70973+
70974+int
70975+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70976+{
70977+ return 0;
70978+}
70979+
70980+int gr_acl_enable_at_secure(void)
70981+{
70982+ return 0;
70983+}
70984+
70985+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
70986+{
70987+ return dentry->d_sb->s_dev;
70988+}
70989+
70990+void gr_put_exec_file(struct task_struct *task)
70991+{
70992+ return;
70993+}
70994+
70995+#ifdef CONFIG_SECURITY
70996+EXPORT_SYMBOL(gr_check_user_change);
70997+EXPORT_SYMBOL(gr_check_group_change);
70998+#endif
70999diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
71000new file mode 100644
71001index 0000000..387032b
71002--- /dev/null
71003+++ b/grsecurity/grsec_exec.c
71004@@ -0,0 +1,187 @@
71005+#include <linux/kernel.h>
71006+#include <linux/sched.h>
71007+#include <linux/file.h>
71008+#include <linux/binfmts.h>
71009+#include <linux/fs.h>
71010+#include <linux/types.h>
71011+#include <linux/grdefs.h>
71012+#include <linux/grsecurity.h>
71013+#include <linux/grinternal.h>
71014+#include <linux/capability.h>
71015+#include <linux/module.h>
71016+#include <linux/compat.h>
71017+
71018+#include <asm/uaccess.h>
71019+
71020+#ifdef CONFIG_GRKERNSEC_EXECLOG
71021+static char gr_exec_arg_buf[132];
71022+static DEFINE_MUTEX(gr_exec_arg_mutex);
71023+#endif
71024+
71025+struct user_arg_ptr {
71026+#ifdef CONFIG_COMPAT
71027+ bool is_compat;
71028+#endif
71029+ union {
71030+ const char __user *const __user *native;
71031+#ifdef CONFIG_COMPAT
71032+ const compat_uptr_t __user *compat;
71033+#endif
71034+ } ptr;
71035+};
71036+
71037+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
71038+
71039+void
71040+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
71041+{
71042+#ifdef CONFIG_GRKERNSEC_EXECLOG
71043+ char *grarg = gr_exec_arg_buf;
71044+ unsigned int i, x, execlen = 0;
71045+ char c;
71046+
71047+ if (!((grsec_enable_execlog && grsec_enable_group &&
71048+ in_group_p(grsec_audit_gid))
71049+ || (grsec_enable_execlog && !grsec_enable_group)))
71050+ return;
71051+
71052+ mutex_lock(&gr_exec_arg_mutex);
71053+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
71054+
71055+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
71056+ const char __user *p;
71057+ unsigned int len;
71058+
71059+ p = get_user_arg_ptr(argv, i);
71060+ if (IS_ERR(p))
71061+ goto log;
71062+
71063+ len = strnlen_user(p, 128 - execlen);
71064+ if (len > 128 - execlen)
71065+ len = 128 - execlen;
71066+ else if (len > 0)
71067+ len--;
71068+ if (copy_from_user(grarg + execlen, p, len))
71069+ goto log;
71070+
71071+ /* rewrite unprintable characters */
71072+ for (x = 0; x < len; x++) {
71073+ c = *(grarg + execlen + x);
71074+ if (c < 32 || c > 126)
71075+ *(grarg + execlen + x) = ' ';
71076+ }
71077+
71078+ execlen += len;
71079+ *(grarg + execlen) = ' ';
71080+ *(grarg + execlen + 1) = '\0';
71081+ execlen++;
71082+ }
71083+
71084+ log:
71085+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
71086+ bprm->file->f_path.mnt, grarg);
71087+ mutex_unlock(&gr_exec_arg_mutex);
71088+#endif
71089+ return;
71090+}
71091+
71092+#ifdef CONFIG_GRKERNSEC
71093+extern int gr_acl_is_capable(const int cap);
71094+extern int gr_acl_is_capable_nolog(const int cap);
71095+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
71096+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
71097+extern int gr_chroot_is_capable(const int cap);
71098+extern int gr_chroot_is_capable_nolog(const int cap);
71099+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
71100+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
71101+#endif
71102+
71103+const char *captab_log[] = {
71104+ "CAP_CHOWN",
71105+ "CAP_DAC_OVERRIDE",
71106+ "CAP_DAC_READ_SEARCH",
71107+ "CAP_FOWNER",
71108+ "CAP_FSETID",
71109+ "CAP_KILL",
71110+ "CAP_SETGID",
71111+ "CAP_SETUID",
71112+ "CAP_SETPCAP",
71113+ "CAP_LINUX_IMMUTABLE",
71114+ "CAP_NET_BIND_SERVICE",
71115+ "CAP_NET_BROADCAST",
71116+ "CAP_NET_ADMIN",
71117+ "CAP_NET_RAW",
71118+ "CAP_IPC_LOCK",
71119+ "CAP_IPC_OWNER",
71120+ "CAP_SYS_MODULE",
71121+ "CAP_SYS_RAWIO",
71122+ "CAP_SYS_CHROOT",
71123+ "CAP_SYS_PTRACE",
71124+ "CAP_SYS_PACCT",
71125+ "CAP_SYS_ADMIN",
71126+ "CAP_SYS_BOOT",
71127+ "CAP_SYS_NICE",
71128+ "CAP_SYS_RESOURCE",
71129+ "CAP_SYS_TIME",
71130+ "CAP_SYS_TTY_CONFIG",
71131+ "CAP_MKNOD",
71132+ "CAP_LEASE",
71133+ "CAP_AUDIT_WRITE",
71134+ "CAP_AUDIT_CONTROL",
71135+ "CAP_SETFCAP",
71136+ "CAP_MAC_OVERRIDE",
71137+ "CAP_MAC_ADMIN",
71138+ "CAP_SYSLOG",
71139+ "CAP_WAKE_ALARM"
71140+};
71141+
71142+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
71143+
71144+int gr_is_capable(const int cap)
71145+{
71146+#ifdef CONFIG_GRKERNSEC
71147+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
71148+ return 1;
71149+ return 0;
71150+#else
71151+ return 1;
71152+#endif
71153+}
71154+
71155+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
71156+{
71157+#ifdef CONFIG_GRKERNSEC
71158+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
71159+ return 1;
71160+ return 0;
71161+#else
71162+ return 1;
71163+#endif
71164+}
71165+
71166+int gr_is_capable_nolog(const int cap)
71167+{
71168+#ifdef CONFIG_GRKERNSEC
71169+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
71170+ return 1;
71171+ return 0;
71172+#else
71173+ return 1;
71174+#endif
71175+}
71176+
71177+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
71178+{
71179+#ifdef CONFIG_GRKERNSEC
71180+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
71181+ return 1;
71182+ return 0;
71183+#else
71184+ return 1;
71185+#endif
71186+}
71187+
71188+EXPORT_SYMBOL(gr_is_capable);
71189+EXPORT_SYMBOL(gr_is_capable_nolog);
71190+EXPORT_SYMBOL(gr_task_is_capable);
71191+EXPORT_SYMBOL(gr_task_is_capable_nolog);
71192diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
71193new file mode 100644
71194index 0000000..06cc6ea
71195--- /dev/null
71196+++ b/grsecurity/grsec_fifo.c
71197@@ -0,0 +1,24 @@
71198+#include <linux/kernel.h>
71199+#include <linux/sched.h>
71200+#include <linux/fs.h>
71201+#include <linux/file.h>
71202+#include <linux/grinternal.h>
71203+
71204+int
71205+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
71206+ const struct dentry *dir, const int flag, const int acc_mode)
71207+{
71208+#ifdef CONFIG_GRKERNSEC_FIFO
71209+ const struct cred *cred = current_cred();
71210+
71211+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
71212+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
71213+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
71214+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
71215+ if (!inode_permission(dentry->d_inode, acc_mode))
71216+ 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));
71217+ return -EACCES;
71218+ }
71219+#endif
71220+ return 0;
71221+}
71222diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
71223new file mode 100644
71224index 0000000..8ca18bf
71225--- /dev/null
71226+++ b/grsecurity/grsec_fork.c
71227@@ -0,0 +1,23 @@
71228+#include <linux/kernel.h>
71229+#include <linux/sched.h>
71230+#include <linux/grsecurity.h>
71231+#include <linux/grinternal.h>
71232+#include <linux/errno.h>
71233+
71234+void
71235+gr_log_forkfail(const int retval)
71236+{
71237+#ifdef CONFIG_GRKERNSEC_FORKFAIL
71238+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
71239+ switch (retval) {
71240+ case -EAGAIN:
71241+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
71242+ break;
71243+ case -ENOMEM:
71244+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
71245+ break;
71246+ }
71247+ }
71248+#endif
71249+ return;
71250+}
71251diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
71252new file mode 100644
71253index 0000000..a88e901
71254--- /dev/null
71255+++ b/grsecurity/grsec_init.c
71256@@ -0,0 +1,272 @@
71257+#include <linux/kernel.h>
71258+#include <linux/sched.h>
71259+#include <linux/mm.h>
71260+#include <linux/gracl.h>
71261+#include <linux/slab.h>
71262+#include <linux/vmalloc.h>
71263+#include <linux/percpu.h>
71264+#include <linux/module.h>
71265+
71266+int grsec_enable_ptrace_readexec;
71267+int grsec_enable_setxid;
71268+int grsec_enable_symlinkown;
71269+kgid_t grsec_symlinkown_gid;
71270+int grsec_enable_brute;
71271+int grsec_enable_link;
71272+int grsec_enable_dmesg;
71273+int grsec_enable_harden_ptrace;
71274+int grsec_enable_harden_ipc;
71275+int grsec_enable_fifo;
71276+int grsec_enable_execlog;
71277+int grsec_enable_signal;
71278+int grsec_enable_forkfail;
71279+int grsec_enable_audit_ptrace;
71280+int grsec_enable_time;
71281+int grsec_enable_group;
71282+kgid_t grsec_audit_gid;
71283+int grsec_enable_chdir;
71284+int grsec_enable_mount;
71285+int grsec_enable_rofs;
71286+int grsec_deny_new_usb;
71287+int grsec_enable_chroot_findtask;
71288+int grsec_enable_chroot_mount;
71289+int grsec_enable_chroot_shmat;
71290+int grsec_enable_chroot_fchdir;
71291+int grsec_enable_chroot_double;
71292+int grsec_enable_chroot_pivot;
71293+int grsec_enable_chroot_chdir;
71294+int grsec_enable_chroot_chmod;
71295+int grsec_enable_chroot_mknod;
71296+int grsec_enable_chroot_nice;
71297+int grsec_enable_chroot_execlog;
71298+int grsec_enable_chroot_caps;
71299+int grsec_enable_chroot_sysctl;
71300+int grsec_enable_chroot_unix;
71301+int grsec_enable_tpe;
71302+kgid_t grsec_tpe_gid;
71303+int grsec_enable_blackhole;
71304+#ifdef CONFIG_IPV6_MODULE
71305+EXPORT_SYMBOL(grsec_enable_blackhole);
71306+#endif
71307+int grsec_lastack_retries;
71308+int grsec_enable_tpe_all;
71309+int grsec_enable_tpe_invert;
71310+int grsec_enable_socket_all;
71311+kgid_t grsec_socket_all_gid;
71312+int grsec_enable_socket_client;
71313+kgid_t grsec_socket_client_gid;
71314+int grsec_enable_socket_server;
71315+kgid_t grsec_socket_server_gid;
71316+int grsec_resource_logging;
71317+int grsec_disable_privio;
71318+int grsec_enable_log_rwxmaps;
71319+int grsec_lock;
71320+
71321+DEFINE_SPINLOCK(grsec_alert_lock);
71322+unsigned long grsec_alert_wtime = 0;
71323+unsigned long grsec_alert_fyet = 0;
71324+
71325+DEFINE_SPINLOCK(grsec_audit_lock);
71326+
71327+DEFINE_RWLOCK(grsec_exec_file_lock);
71328+
71329+char *gr_shared_page[4];
71330+
71331+char *gr_alert_log_fmt;
71332+char *gr_audit_log_fmt;
71333+char *gr_alert_log_buf;
71334+char *gr_audit_log_buf;
71335+
71336+void __init
71337+grsecurity_init(void)
71338+{
71339+ int j;
71340+ /* create the per-cpu shared pages */
71341+
71342+#ifdef CONFIG_X86
71343+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
71344+#endif
71345+
71346+ for (j = 0; j < 4; j++) {
71347+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
71348+ if (gr_shared_page[j] == NULL) {
71349+ panic("Unable to allocate grsecurity shared page");
71350+ return;
71351+ }
71352+ }
71353+
71354+ /* allocate log buffers */
71355+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
71356+ if (!gr_alert_log_fmt) {
71357+ panic("Unable to allocate grsecurity alert log format buffer");
71358+ return;
71359+ }
71360+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
71361+ if (!gr_audit_log_fmt) {
71362+ panic("Unable to allocate grsecurity audit log format buffer");
71363+ return;
71364+ }
71365+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
71366+ if (!gr_alert_log_buf) {
71367+ panic("Unable to allocate grsecurity alert log buffer");
71368+ return;
71369+ }
71370+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
71371+ if (!gr_audit_log_buf) {
71372+ panic("Unable to allocate grsecurity audit log buffer");
71373+ return;
71374+ }
71375+
71376+#ifdef CONFIG_GRKERNSEC_IO
71377+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
71378+ grsec_disable_privio = 1;
71379+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
71380+ grsec_disable_privio = 1;
71381+#else
71382+ grsec_disable_privio = 0;
71383+#endif
71384+#endif
71385+
71386+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
71387+ /* for backward compatibility, tpe_invert always defaults to on if
71388+ enabled in the kernel
71389+ */
71390+ grsec_enable_tpe_invert = 1;
71391+#endif
71392+
71393+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
71394+#ifndef CONFIG_GRKERNSEC_SYSCTL
71395+ grsec_lock = 1;
71396+#endif
71397+
71398+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
71399+ grsec_enable_log_rwxmaps = 1;
71400+#endif
71401+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
71402+ grsec_enable_group = 1;
71403+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
71404+#endif
71405+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
71406+ grsec_enable_ptrace_readexec = 1;
71407+#endif
71408+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
71409+ grsec_enable_chdir = 1;
71410+#endif
71411+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71412+ grsec_enable_harden_ptrace = 1;
71413+#endif
71414+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
71415+ grsec_enable_harden_ipc = 1;
71416+#endif
71417+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
71418+ grsec_enable_mount = 1;
71419+#endif
71420+#ifdef CONFIG_GRKERNSEC_LINK
71421+ grsec_enable_link = 1;
71422+#endif
71423+#ifdef CONFIG_GRKERNSEC_BRUTE
71424+ grsec_enable_brute = 1;
71425+#endif
71426+#ifdef CONFIG_GRKERNSEC_DMESG
71427+ grsec_enable_dmesg = 1;
71428+#endif
71429+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
71430+ grsec_enable_blackhole = 1;
71431+ grsec_lastack_retries = 4;
71432+#endif
71433+#ifdef CONFIG_GRKERNSEC_FIFO
71434+ grsec_enable_fifo = 1;
71435+#endif
71436+#ifdef CONFIG_GRKERNSEC_EXECLOG
71437+ grsec_enable_execlog = 1;
71438+#endif
71439+#ifdef CONFIG_GRKERNSEC_SETXID
71440+ grsec_enable_setxid = 1;
71441+#endif
71442+#ifdef CONFIG_GRKERNSEC_SIGNAL
71443+ grsec_enable_signal = 1;
71444+#endif
71445+#ifdef CONFIG_GRKERNSEC_FORKFAIL
71446+ grsec_enable_forkfail = 1;
71447+#endif
71448+#ifdef CONFIG_GRKERNSEC_TIME
71449+ grsec_enable_time = 1;
71450+#endif
71451+#ifdef CONFIG_GRKERNSEC_RESLOG
71452+ grsec_resource_logging = 1;
71453+#endif
71454+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
71455+ grsec_enable_chroot_findtask = 1;
71456+#endif
71457+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
71458+ grsec_enable_chroot_unix = 1;
71459+#endif
71460+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
71461+ grsec_enable_chroot_mount = 1;
71462+#endif
71463+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
71464+ grsec_enable_chroot_fchdir = 1;
71465+#endif
71466+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
71467+ grsec_enable_chroot_shmat = 1;
71468+#endif
71469+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
71470+ grsec_enable_audit_ptrace = 1;
71471+#endif
71472+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
71473+ grsec_enable_chroot_double = 1;
71474+#endif
71475+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
71476+ grsec_enable_chroot_pivot = 1;
71477+#endif
71478+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
71479+ grsec_enable_chroot_chdir = 1;
71480+#endif
71481+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
71482+ grsec_enable_chroot_chmod = 1;
71483+#endif
71484+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
71485+ grsec_enable_chroot_mknod = 1;
71486+#endif
71487+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
71488+ grsec_enable_chroot_nice = 1;
71489+#endif
71490+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
71491+ grsec_enable_chroot_execlog = 1;
71492+#endif
71493+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
71494+ grsec_enable_chroot_caps = 1;
71495+#endif
71496+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
71497+ grsec_enable_chroot_sysctl = 1;
71498+#endif
71499+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
71500+ grsec_enable_symlinkown = 1;
71501+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
71502+#endif
71503+#ifdef CONFIG_GRKERNSEC_TPE
71504+ grsec_enable_tpe = 1;
71505+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
71506+#ifdef CONFIG_GRKERNSEC_TPE_ALL
71507+ grsec_enable_tpe_all = 1;
71508+#endif
71509+#endif
71510+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
71511+ grsec_enable_socket_all = 1;
71512+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
71513+#endif
71514+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
71515+ grsec_enable_socket_client = 1;
71516+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
71517+#endif
71518+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
71519+ grsec_enable_socket_server = 1;
71520+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
71521+#endif
71522+#endif
71523+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
71524+ grsec_deny_new_usb = 1;
71525+#endif
71526+
71527+ return;
71528+}
71529diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
71530new file mode 100644
71531index 0000000..78d1680
71532--- /dev/null
71533+++ b/grsecurity/grsec_ipc.c
71534@@ -0,0 +1,48 @@
71535+#include <linux/kernel.h>
71536+#include <linux/mm.h>
71537+#include <linux/sched.h>
71538+#include <linux/file.h>
71539+#include <linux/ipc.h>
71540+#include <linux/ipc_namespace.h>
71541+#include <linux/grsecurity.h>
71542+#include <linux/grinternal.h>
71543+
71544+int
71545+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
71546+{
71547+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
71548+ int write;
71549+ int orig_granted_mode;
71550+ kuid_t euid;
71551+ kgid_t egid;
71552+
71553+ if (!grsec_enable_harden_ipc)
71554+ return 0;
71555+
71556+ euid = current_euid();
71557+ egid = current_egid();
71558+
71559+ write = requested_mode & 00002;
71560+ orig_granted_mode = ipcp->mode;
71561+
71562+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
71563+ orig_granted_mode >>= 6;
71564+ else {
71565+ /* if likely wrong permissions, lock to user */
71566+ if (orig_granted_mode & 0007)
71567+ orig_granted_mode = 0;
71568+ /* otherwise do a egid-only check */
71569+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
71570+ orig_granted_mode >>= 3;
71571+ /* otherwise, no access */
71572+ else
71573+ orig_granted_mode = 0;
71574+ }
71575+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
71576+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
71577+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
71578+ return 0;
71579+ }
71580+#endif
71581+ return 1;
71582+}
71583diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
71584new file mode 100644
71585index 0000000..5e05e20
71586--- /dev/null
71587+++ b/grsecurity/grsec_link.c
71588@@ -0,0 +1,58 @@
71589+#include <linux/kernel.h>
71590+#include <linux/sched.h>
71591+#include <linux/fs.h>
71592+#include <linux/file.h>
71593+#include <linux/grinternal.h>
71594+
71595+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
71596+{
71597+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
71598+ const struct inode *link_inode = link->dentry->d_inode;
71599+
71600+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
71601+ /* ignore root-owned links, e.g. /proc/self */
71602+ gr_is_global_nonroot(link_inode->i_uid) && target &&
71603+ !uid_eq(link_inode->i_uid, target->i_uid)) {
71604+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
71605+ return 1;
71606+ }
71607+#endif
71608+ return 0;
71609+}
71610+
71611+int
71612+gr_handle_follow_link(const struct inode *parent,
71613+ const struct inode *inode,
71614+ const struct dentry *dentry, const struct vfsmount *mnt)
71615+{
71616+#ifdef CONFIG_GRKERNSEC_LINK
71617+ const struct cred *cred = current_cred();
71618+
71619+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
71620+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
71621+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
71622+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
71623+ return -EACCES;
71624+ }
71625+#endif
71626+ return 0;
71627+}
71628+
71629+int
71630+gr_handle_hardlink(const struct dentry *dentry,
71631+ const struct vfsmount *mnt,
71632+ struct inode *inode, const int mode, const struct filename *to)
71633+{
71634+#ifdef CONFIG_GRKERNSEC_LINK
71635+ const struct cred *cred = current_cred();
71636+
71637+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
71638+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
71639+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
71640+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
71641+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
71642+ return -EPERM;
71643+ }
71644+#endif
71645+ return 0;
71646+}
71647diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
71648new file mode 100644
71649index 0000000..dbe0a6b
71650--- /dev/null
71651+++ b/grsecurity/grsec_log.c
71652@@ -0,0 +1,341 @@
71653+#include <linux/kernel.h>
71654+#include <linux/sched.h>
71655+#include <linux/file.h>
71656+#include <linux/tty.h>
71657+#include <linux/fs.h>
71658+#include <linux/mm.h>
71659+#include <linux/grinternal.h>
71660+
71661+#ifdef CONFIG_TREE_PREEMPT_RCU
71662+#define DISABLE_PREEMPT() preempt_disable()
71663+#define ENABLE_PREEMPT() preempt_enable()
71664+#else
71665+#define DISABLE_PREEMPT()
71666+#define ENABLE_PREEMPT()
71667+#endif
71668+
71669+#define BEGIN_LOCKS(x) \
71670+ DISABLE_PREEMPT(); \
71671+ rcu_read_lock(); \
71672+ read_lock(&tasklist_lock); \
71673+ read_lock(&grsec_exec_file_lock); \
71674+ if (x != GR_DO_AUDIT) \
71675+ spin_lock(&grsec_alert_lock); \
71676+ else \
71677+ spin_lock(&grsec_audit_lock)
71678+
71679+#define END_LOCKS(x) \
71680+ if (x != GR_DO_AUDIT) \
71681+ spin_unlock(&grsec_alert_lock); \
71682+ else \
71683+ spin_unlock(&grsec_audit_lock); \
71684+ read_unlock(&grsec_exec_file_lock); \
71685+ read_unlock(&tasklist_lock); \
71686+ rcu_read_unlock(); \
71687+ ENABLE_PREEMPT(); \
71688+ if (x == GR_DONT_AUDIT) \
71689+ gr_handle_alertkill(current)
71690+
71691+enum {
71692+ FLOODING,
71693+ NO_FLOODING
71694+};
71695+
71696+extern char *gr_alert_log_fmt;
71697+extern char *gr_audit_log_fmt;
71698+extern char *gr_alert_log_buf;
71699+extern char *gr_audit_log_buf;
71700+
71701+static int gr_log_start(int audit)
71702+{
71703+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
71704+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
71705+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71706+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
71707+ unsigned long curr_secs = get_seconds();
71708+
71709+ if (audit == GR_DO_AUDIT)
71710+ goto set_fmt;
71711+
71712+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
71713+ grsec_alert_wtime = curr_secs;
71714+ grsec_alert_fyet = 0;
71715+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
71716+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
71717+ grsec_alert_fyet++;
71718+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
71719+ grsec_alert_wtime = curr_secs;
71720+ grsec_alert_fyet++;
71721+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
71722+ return FLOODING;
71723+ }
71724+ else return FLOODING;
71725+
71726+set_fmt:
71727+#endif
71728+ memset(buf, 0, PAGE_SIZE);
71729+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
71730+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
71731+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
71732+ } else if (current->signal->curr_ip) {
71733+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
71734+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
71735+ } else if (gr_acl_is_enabled()) {
71736+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
71737+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
71738+ } else {
71739+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
71740+ strcpy(buf, fmt);
71741+ }
71742+
71743+ return NO_FLOODING;
71744+}
71745+
71746+static void gr_log_middle(int audit, const char *msg, va_list ap)
71747+ __attribute__ ((format (printf, 2, 0)));
71748+
71749+static void gr_log_middle(int audit, const char *msg, va_list ap)
71750+{
71751+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71752+ unsigned int len = strlen(buf);
71753+
71754+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
71755+
71756+ return;
71757+}
71758+
71759+static void gr_log_middle_varargs(int audit, const char *msg, ...)
71760+ __attribute__ ((format (printf, 2, 3)));
71761+
71762+static void gr_log_middle_varargs(int audit, const char *msg, ...)
71763+{
71764+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71765+ unsigned int len = strlen(buf);
71766+ va_list ap;
71767+
71768+ va_start(ap, msg);
71769+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
71770+ va_end(ap);
71771+
71772+ return;
71773+}
71774+
71775+static void gr_log_end(int audit, int append_default)
71776+{
71777+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71778+ if (append_default) {
71779+ struct task_struct *task = current;
71780+ struct task_struct *parent = task->real_parent;
71781+ const struct cred *cred = __task_cred(task);
71782+ const struct cred *pcred = __task_cred(parent);
71783+ unsigned int len = strlen(buf);
71784+
71785+ 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));
71786+ }
71787+
71788+ printk("%s\n", buf);
71789+
71790+ return;
71791+}
71792+
71793+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
71794+{
71795+ int logtype;
71796+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
71797+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
71798+ void *voidptr = NULL;
71799+ int num1 = 0, num2 = 0;
71800+ unsigned long ulong1 = 0, ulong2 = 0;
71801+ struct dentry *dentry = NULL;
71802+ struct vfsmount *mnt = NULL;
71803+ struct file *file = NULL;
71804+ struct task_struct *task = NULL;
71805+ struct vm_area_struct *vma = NULL;
71806+ const struct cred *cred, *pcred;
71807+ va_list ap;
71808+
71809+ BEGIN_LOCKS(audit);
71810+ logtype = gr_log_start(audit);
71811+ if (logtype == FLOODING) {
71812+ END_LOCKS(audit);
71813+ return;
71814+ }
71815+ va_start(ap, argtypes);
71816+ switch (argtypes) {
71817+ case GR_TTYSNIFF:
71818+ task = va_arg(ap, struct task_struct *);
71819+ 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));
71820+ break;
71821+ case GR_SYSCTL_HIDDEN:
71822+ str1 = va_arg(ap, char *);
71823+ gr_log_middle_varargs(audit, msg, result, str1);
71824+ break;
71825+ case GR_RBAC:
71826+ dentry = va_arg(ap, struct dentry *);
71827+ mnt = va_arg(ap, struct vfsmount *);
71828+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
71829+ break;
71830+ case GR_RBAC_STR:
71831+ dentry = va_arg(ap, struct dentry *);
71832+ mnt = va_arg(ap, struct vfsmount *);
71833+ str1 = va_arg(ap, char *);
71834+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
71835+ break;
71836+ case GR_STR_RBAC:
71837+ str1 = va_arg(ap, char *);
71838+ dentry = va_arg(ap, struct dentry *);
71839+ mnt = va_arg(ap, struct vfsmount *);
71840+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
71841+ break;
71842+ case GR_RBAC_MODE2:
71843+ dentry = va_arg(ap, struct dentry *);
71844+ mnt = va_arg(ap, struct vfsmount *);
71845+ str1 = va_arg(ap, char *);
71846+ str2 = va_arg(ap, char *);
71847+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
71848+ break;
71849+ case GR_RBAC_MODE3:
71850+ dentry = va_arg(ap, struct dentry *);
71851+ mnt = va_arg(ap, struct vfsmount *);
71852+ str1 = va_arg(ap, char *);
71853+ str2 = va_arg(ap, char *);
71854+ str3 = va_arg(ap, char *);
71855+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
71856+ break;
71857+ case GR_FILENAME:
71858+ dentry = va_arg(ap, struct dentry *);
71859+ mnt = va_arg(ap, struct vfsmount *);
71860+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
71861+ break;
71862+ case GR_STR_FILENAME:
71863+ str1 = va_arg(ap, char *);
71864+ dentry = va_arg(ap, struct dentry *);
71865+ mnt = va_arg(ap, struct vfsmount *);
71866+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
71867+ break;
71868+ case GR_FILENAME_STR:
71869+ dentry = va_arg(ap, struct dentry *);
71870+ mnt = va_arg(ap, struct vfsmount *);
71871+ str1 = va_arg(ap, char *);
71872+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
71873+ break;
71874+ case GR_FILENAME_TWO_INT:
71875+ dentry = va_arg(ap, struct dentry *);
71876+ mnt = va_arg(ap, struct vfsmount *);
71877+ num1 = va_arg(ap, int);
71878+ num2 = va_arg(ap, int);
71879+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
71880+ break;
71881+ case GR_FILENAME_TWO_INT_STR:
71882+ dentry = va_arg(ap, struct dentry *);
71883+ mnt = va_arg(ap, struct vfsmount *);
71884+ num1 = va_arg(ap, int);
71885+ num2 = va_arg(ap, int);
71886+ str1 = va_arg(ap, char *);
71887+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
71888+ break;
71889+ case GR_TEXTREL:
71890+ file = va_arg(ap, struct file *);
71891+ ulong1 = va_arg(ap, unsigned long);
71892+ ulong2 = va_arg(ap, unsigned long);
71893+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
71894+ break;
71895+ case GR_PTRACE:
71896+ task = va_arg(ap, struct task_struct *);
71897+ 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));
71898+ break;
71899+ case GR_RESOURCE:
71900+ task = va_arg(ap, struct task_struct *);
71901+ cred = __task_cred(task);
71902+ pcred = __task_cred(task->real_parent);
71903+ ulong1 = va_arg(ap, unsigned long);
71904+ str1 = va_arg(ap, char *);
71905+ ulong2 = va_arg(ap, unsigned long);
71906+ 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));
71907+ break;
71908+ case GR_CAP:
71909+ task = va_arg(ap, struct task_struct *);
71910+ cred = __task_cred(task);
71911+ pcred = __task_cred(task->real_parent);
71912+ str1 = va_arg(ap, char *);
71913+ 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));
71914+ break;
71915+ case GR_SIG:
71916+ str1 = va_arg(ap, char *);
71917+ voidptr = va_arg(ap, void *);
71918+ gr_log_middle_varargs(audit, msg, str1, voidptr);
71919+ break;
71920+ case GR_SIG2:
71921+ task = va_arg(ap, struct task_struct *);
71922+ cred = __task_cred(task);
71923+ pcred = __task_cred(task->real_parent);
71924+ num1 = va_arg(ap, int);
71925+ 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));
71926+ break;
71927+ case GR_CRASH1:
71928+ task = va_arg(ap, struct task_struct *);
71929+ cred = __task_cred(task);
71930+ pcred = __task_cred(task->real_parent);
71931+ ulong1 = va_arg(ap, unsigned long);
71932+ 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);
71933+ break;
71934+ case GR_CRASH2:
71935+ task = va_arg(ap, struct task_struct *);
71936+ cred = __task_cred(task);
71937+ pcred = __task_cred(task->real_parent);
71938+ ulong1 = va_arg(ap, unsigned long);
71939+ 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);
71940+ break;
71941+ case GR_RWXMAP:
71942+ file = va_arg(ap, struct file *);
71943+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
71944+ break;
71945+ case GR_RWXMAPVMA:
71946+ vma = va_arg(ap, struct vm_area_struct *);
71947+ if (vma->vm_file)
71948+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
71949+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
71950+ str1 = "<stack>";
71951+ else if (vma->vm_start <= current->mm->brk &&
71952+ vma->vm_end >= current->mm->start_brk)
71953+ str1 = "<heap>";
71954+ else
71955+ str1 = "<anonymous mapping>";
71956+ gr_log_middle_varargs(audit, msg, str1);
71957+ break;
71958+ case GR_PSACCT:
71959+ {
71960+ unsigned int wday, cday;
71961+ __u8 whr, chr;
71962+ __u8 wmin, cmin;
71963+ __u8 wsec, csec;
71964+ char cur_tty[64] = { 0 };
71965+ char parent_tty[64] = { 0 };
71966+
71967+ task = va_arg(ap, struct task_struct *);
71968+ wday = va_arg(ap, unsigned int);
71969+ cday = va_arg(ap, unsigned int);
71970+ whr = va_arg(ap, int);
71971+ chr = va_arg(ap, int);
71972+ wmin = va_arg(ap, int);
71973+ cmin = va_arg(ap, int);
71974+ wsec = va_arg(ap, int);
71975+ csec = va_arg(ap, int);
71976+ ulong1 = va_arg(ap, unsigned long);
71977+ cred = __task_cred(task);
71978+ pcred = __task_cred(task->real_parent);
71979+
71980+ 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));
71981+ }
71982+ break;
71983+ default:
71984+ gr_log_middle(audit, msg, ap);
71985+ }
71986+ va_end(ap);
71987+ // these don't need DEFAULTSECARGS printed on the end
71988+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
71989+ gr_log_end(audit, 0);
71990+ else
71991+ gr_log_end(audit, 1);
71992+ END_LOCKS(audit);
71993+}
71994diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
71995new file mode 100644
71996index 0000000..f536303
71997--- /dev/null
71998+++ b/grsecurity/grsec_mem.c
71999@@ -0,0 +1,40 @@
72000+#include <linux/kernel.h>
72001+#include <linux/sched.h>
72002+#include <linux/mm.h>
72003+#include <linux/mman.h>
72004+#include <linux/grinternal.h>
72005+
72006+void
72007+gr_handle_ioperm(void)
72008+{
72009+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
72010+ return;
72011+}
72012+
72013+void
72014+gr_handle_iopl(void)
72015+{
72016+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
72017+ return;
72018+}
72019+
72020+void
72021+gr_handle_mem_readwrite(u64 from, u64 to)
72022+{
72023+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
72024+ return;
72025+}
72026+
72027+void
72028+gr_handle_vm86(void)
72029+{
72030+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
72031+ return;
72032+}
72033+
72034+void
72035+gr_log_badprocpid(const char *entry)
72036+{
72037+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
72038+ return;
72039+}
72040diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
72041new file mode 100644
72042index 0000000..cd9e124
72043--- /dev/null
72044+++ b/grsecurity/grsec_mount.c
72045@@ -0,0 +1,65 @@
72046+#include <linux/kernel.h>
72047+#include <linux/sched.h>
72048+#include <linux/mount.h>
72049+#include <linux/major.h>
72050+#include <linux/grsecurity.h>
72051+#include <linux/grinternal.h>
72052+
72053+void
72054+gr_log_remount(const char *devname, const int retval)
72055+{
72056+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72057+ if (grsec_enable_mount && (retval >= 0))
72058+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
72059+#endif
72060+ return;
72061+}
72062+
72063+void
72064+gr_log_unmount(const char *devname, const int retval)
72065+{
72066+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72067+ if (grsec_enable_mount && (retval >= 0))
72068+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
72069+#endif
72070+ return;
72071+}
72072+
72073+void
72074+gr_log_mount(const char *from, const char *to, const int retval)
72075+{
72076+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72077+ if (grsec_enable_mount && (retval >= 0))
72078+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
72079+#endif
72080+ return;
72081+}
72082+
72083+int
72084+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
72085+{
72086+#ifdef CONFIG_GRKERNSEC_ROFS
72087+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
72088+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
72089+ return -EPERM;
72090+ } else
72091+ return 0;
72092+#endif
72093+ return 0;
72094+}
72095+
72096+int
72097+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
72098+{
72099+#ifdef CONFIG_GRKERNSEC_ROFS
72100+ struct inode *inode = dentry->d_inode;
72101+
72102+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
72103+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
72104+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
72105+ return -EPERM;
72106+ } else
72107+ return 0;
72108+#endif
72109+ return 0;
72110+}
72111diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
72112new file mode 100644
72113index 0000000..6ee9d50
72114--- /dev/null
72115+++ b/grsecurity/grsec_pax.c
72116@@ -0,0 +1,45 @@
72117+#include <linux/kernel.h>
72118+#include <linux/sched.h>
72119+#include <linux/mm.h>
72120+#include <linux/file.h>
72121+#include <linux/grinternal.h>
72122+#include <linux/grsecurity.h>
72123+
72124+void
72125+gr_log_textrel(struct vm_area_struct * vma)
72126+{
72127+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72128+ if (grsec_enable_log_rwxmaps)
72129+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
72130+#endif
72131+ return;
72132+}
72133+
72134+void gr_log_ptgnustack(struct file *file)
72135+{
72136+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72137+ if (grsec_enable_log_rwxmaps)
72138+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
72139+#endif
72140+ return;
72141+}
72142+
72143+void
72144+gr_log_rwxmmap(struct file *file)
72145+{
72146+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72147+ if (grsec_enable_log_rwxmaps)
72148+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
72149+#endif
72150+ return;
72151+}
72152+
72153+void
72154+gr_log_rwxmprotect(struct vm_area_struct *vma)
72155+{
72156+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72157+ if (grsec_enable_log_rwxmaps)
72158+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
72159+#endif
72160+ return;
72161+}
72162diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
72163new file mode 100644
72164index 0000000..f7f29aa
72165--- /dev/null
72166+++ b/grsecurity/grsec_ptrace.c
72167@@ -0,0 +1,30 @@
72168+#include <linux/kernel.h>
72169+#include <linux/sched.h>
72170+#include <linux/grinternal.h>
72171+#include <linux/security.h>
72172+
72173+void
72174+gr_audit_ptrace(struct task_struct *task)
72175+{
72176+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
72177+ if (grsec_enable_audit_ptrace)
72178+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
72179+#endif
72180+ return;
72181+}
72182+
72183+int
72184+gr_ptrace_readexec(struct file *file, int unsafe_flags)
72185+{
72186+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
72187+ const struct dentry *dentry = file->f_path.dentry;
72188+ const struct vfsmount *mnt = file->f_path.mnt;
72189+
72190+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
72191+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
72192+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
72193+ return -EACCES;
72194+ }
72195+#endif
72196+ return 0;
72197+}
72198diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
72199new file mode 100644
72200index 0000000..3860c7e
72201--- /dev/null
72202+++ b/grsecurity/grsec_sig.c
72203@@ -0,0 +1,236 @@
72204+#include <linux/kernel.h>
72205+#include <linux/sched.h>
72206+#include <linux/fs.h>
72207+#include <linux/delay.h>
72208+#include <linux/grsecurity.h>
72209+#include <linux/grinternal.h>
72210+#include <linux/hardirq.h>
72211+
72212+char *signames[] = {
72213+ [SIGSEGV] = "Segmentation fault",
72214+ [SIGILL] = "Illegal instruction",
72215+ [SIGABRT] = "Abort",
72216+ [SIGBUS] = "Invalid alignment/Bus error"
72217+};
72218+
72219+void
72220+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
72221+{
72222+#ifdef CONFIG_GRKERNSEC_SIGNAL
72223+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
72224+ (sig == SIGABRT) || (sig == SIGBUS))) {
72225+ if (task_pid_nr(t) == task_pid_nr(current)) {
72226+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
72227+ } else {
72228+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
72229+ }
72230+ }
72231+#endif
72232+ return;
72233+}
72234+
72235+int
72236+gr_handle_signal(const struct task_struct *p, const int sig)
72237+{
72238+#ifdef CONFIG_GRKERNSEC
72239+ /* ignore the 0 signal for protected task checks */
72240+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
72241+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
72242+ return -EPERM;
72243+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
72244+ return -EPERM;
72245+ }
72246+#endif
72247+ return 0;
72248+}
72249+
72250+#ifdef CONFIG_GRKERNSEC
72251+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
72252+
72253+int gr_fake_force_sig(int sig, struct task_struct *t)
72254+{
72255+ unsigned long int flags;
72256+ int ret, blocked, ignored;
72257+ struct k_sigaction *action;
72258+
72259+ spin_lock_irqsave(&t->sighand->siglock, flags);
72260+ action = &t->sighand->action[sig-1];
72261+ ignored = action->sa.sa_handler == SIG_IGN;
72262+ blocked = sigismember(&t->blocked, sig);
72263+ if (blocked || ignored) {
72264+ action->sa.sa_handler = SIG_DFL;
72265+ if (blocked) {
72266+ sigdelset(&t->blocked, sig);
72267+ recalc_sigpending_and_wake(t);
72268+ }
72269+ }
72270+ if (action->sa.sa_handler == SIG_DFL)
72271+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
72272+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
72273+
72274+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
72275+
72276+ return ret;
72277+}
72278+#endif
72279+
72280+#define GR_USER_BAN_TIME (15 * 60)
72281+#define GR_DAEMON_BRUTE_TIME (30 * 60)
72282+
72283+void gr_handle_brute_attach(int dumpable)
72284+{
72285+#ifdef CONFIG_GRKERNSEC_BRUTE
72286+ struct task_struct *p = current;
72287+ kuid_t uid = GLOBAL_ROOT_UID;
72288+ int daemon = 0;
72289+
72290+ if (!grsec_enable_brute)
72291+ return;
72292+
72293+ rcu_read_lock();
72294+ read_lock(&tasklist_lock);
72295+ read_lock(&grsec_exec_file_lock);
72296+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
72297+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
72298+ p->real_parent->brute = 1;
72299+ daemon = 1;
72300+ } else {
72301+ const struct cred *cred = __task_cred(p), *cred2;
72302+ struct task_struct *tsk, *tsk2;
72303+
72304+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
72305+ struct user_struct *user;
72306+
72307+ uid = cred->uid;
72308+
72309+ /* this is put upon execution past expiration */
72310+ user = find_user(uid);
72311+ if (user == NULL)
72312+ goto unlock;
72313+ user->suid_banned = 1;
72314+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
72315+ if (user->suid_ban_expires == ~0UL)
72316+ user->suid_ban_expires--;
72317+
72318+ /* only kill other threads of the same binary, from the same user */
72319+ do_each_thread(tsk2, tsk) {
72320+ cred2 = __task_cred(tsk);
72321+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
72322+ gr_fake_force_sig(SIGKILL, tsk);
72323+ } while_each_thread(tsk2, tsk);
72324+ }
72325+ }
72326+unlock:
72327+ read_unlock(&grsec_exec_file_lock);
72328+ read_unlock(&tasklist_lock);
72329+ rcu_read_unlock();
72330+
72331+ if (gr_is_global_nonroot(uid))
72332+ 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);
72333+ else if (daemon)
72334+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
72335+
72336+#endif
72337+ return;
72338+}
72339+
72340+void gr_handle_brute_check(void)
72341+{
72342+#ifdef CONFIG_GRKERNSEC_BRUTE
72343+ struct task_struct *p = current;
72344+
72345+ if (unlikely(p->brute)) {
72346+ if (!grsec_enable_brute)
72347+ p->brute = 0;
72348+ else if (time_before(get_seconds(), p->brute_expires))
72349+ msleep(30 * 1000);
72350+ }
72351+#endif
72352+ return;
72353+}
72354+
72355+void gr_handle_kernel_exploit(void)
72356+{
72357+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72358+ const struct cred *cred;
72359+ struct task_struct *tsk, *tsk2;
72360+ struct user_struct *user;
72361+ kuid_t uid;
72362+
72363+ if (in_irq() || in_serving_softirq() || in_nmi())
72364+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
72365+
72366+ uid = current_uid();
72367+
72368+ if (gr_is_global_root(uid))
72369+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
72370+ else {
72371+ /* kill all the processes of this user, hold a reference
72372+ to their creds struct, and prevent them from creating
72373+ another process until system reset
72374+ */
72375+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
72376+ GR_GLOBAL_UID(uid));
72377+ /* we intentionally leak this ref */
72378+ user = get_uid(current->cred->user);
72379+ if (user)
72380+ user->kernel_banned = 1;
72381+
72382+ /* kill all processes of this user */
72383+ read_lock(&tasklist_lock);
72384+ do_each_thread(tsk2, tsk) {
72385+ cred = __task_cred(tsk);
72386+ if (uid_eq(cred->uid, uid))
72387+ gr_fake_force_sig(SIGKILL, tsk);
72388+ } while_each_thread(tsk2, tsk);
72389+ read_unlock(&tasklist_lock);
72390+ }
72391+#endif
72392+}
72393+
72394+#ifdef CONFIG_GRKERNSEC_BRUTE
72395+static bool suid_ban_expired(struct user_struct *user)
72396+{
72397+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
72398+ user->suid_banned = 0;
72399+ user->suid_ban_expires = 0;
72400+ free_uid(user);
72401+ return true;
72402+ }
72403+
72404+ return false;
72405+}
72406+#endif
72407+
72408+int gr_process_kernel_exec_ban(void)
72409+{
72410+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72411+ if (unlikely(current->cred->user->kernel_banned))
72412+ return -EPERM;
72413+#endif
72414+ return 0;
72415+}
72416+
72417+int gr_process_kernel_setuid_ban(struct user_struct *user)
72418+{
72419+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72420+ if (unlikely(user->kernel_banned))
72421+ gr_fake_force_sig(SIGKILL, current);
72422+#endif
72423+ return 0;
72424+}
72425+
72426+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
72427+{
72428+#ifdef CONFIG_GRKERNSEC_BRUTE
72429+ struct user_struct *user = current->cred->user;
72430+ if (unlikely(user->suid_banned)) {
72431+ if (suid_ban_expired(user))
72432+ return 0;
72433+ /* disallow execution of suid binaries only */
72434+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
72435+ return -EPERM;
72436+ }
72437+#endif
72438+ return 0;
72439+}
72440diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
72441new file mode 100644
72442index 0000000..4030d57
72443--- /dev/null
72444+++ b/grsecurity/grsec_sock.c
72445@@ -0,0 +1,244 @@
72446+#include <linux/kernel.h>
72447+#include <linux/module.h>
72448+#include <linux/sched.h>
72449+#include <linux/file.h>
72450+#include <linux/net.h>
72451+#include <linux/in.h>
72452+#include <linux/ip.h>
72453+#include <net/sock.h>
72454+#include <net/inet_sock.h>
72455+#include <linux/grsecurity.h>
72456+#include <linux/grinternal.h>
72457+#include <linux/gracl.h>
72458+
72459+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
72460+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
72461+
72462+EXPORT_SYMBOL(gr_search_udp_recvmsg);
72463+EXPORT_SYMBOL(gr_search_udp_sendmsg);
72464+
72465+#ifdef CONFIG_UNIX_MODULE
72466+EXPORT_SYMBOL(gr_acl_handle_unix);
72467+EXPORT_SYMBOL(gr_acl_handle_mknod);
72468+EXPORT_SYMBOL(gr_handle_chroot_unix);
72469+EXPORT_SYMBOL(gr_handle_create);
72470+#endif
72471+
72472+#ifdef CONFIG_GRKERNSEC
72473+#define gr_conn_table_size 32749
72474+struct conn_table_entry {
72475+ struct conn_table_entry *next;
72476+ struct signal_struct *sig;
72477+};
72478+
72479+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
72480+DEFINE_SPINLOCK(gr_conn_table_lock);
72481+
72482+extern const char * gr_socktype_to_name(unsigned char type);
72483+extern const char * gr_proto_to_name(unsigned char proto);
72484+extern const char * gr_sockfamily_to_name(unsigned char family);
72485+
72486+static __inline__ int
72487+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
72488+{
72489+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
72490+}
72491+
72492+static __inline__ int
72493+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
72494+ __u16 sport, __u16 dport)
72495+{
72496+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
72497+ sig->gr_sport == sport && sig->gr_dport == dport))
72498+ return 1;
72499+ else
72500+ return 0;
72501+}
72502+
72503+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
72504+{
72505+ struct conn_table_entry **match;
72506+ unsigned int index;
72507+
72508+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
72509+ sig->gr_sport, sig->gr_dport,
72510+ gr_conn_table_size);
72511+
72512+ newent->sig = sig;
72513+
72514+ match = &gr_conn_table[index];
72515+ newent->next = *match;
72516+ *match = newent;
72517+
72518+ return;
72519+}
72520+
72521+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
72522+{
72523+ struct conn_table_entry *match, *last = NULL;
72524+ unsigned int index;
72525+
72526+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
72527+ sig->gr_sport, sig->gr_dport,
72528+ gr_conn_table_size);
72529+
72530+ match = gr_conn_table[index];
72531+ while (match && !conn_match(match->sig,
72532+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
72533+ sig->gr_dport)) {
72534+ last = match;
72535+ match = match->next;
72536+ }
72537+
72538+ if (match) {
72539+ if (last)
72540+ last->next = match->next;
72541+ else
72542+ gr_conn_table[index] = NULL;
72543+ kfree(match);
72544+ }
72545+
72546+ return;
72547+}
72548+
72549+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
72550+ __u16 sport, __u16 dport)
72551+{
72552+ struct conn_table_entry *match;
72553+ unsigned int index;
72554+
72555+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
72556+
72557+ match = gr_conn_table[index];
72558+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
72559+ match = match->next;
72560+
72561+ if (match)
72562+ return match->sig;
72563+ else
72564+ return NULL;
72565+}
72566+
72567+#endif
72568+
72569+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
72570+{
72571+#ifdef CONFIG_GRKERNSEC
72572+ struct signal_struct *sig = task->signal;
72573+ struct conn_table_entry *newent;
72574+
72575+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
72576+ if (newent == NULL)
72577+ return;
72578+ /* no bh lock needed since we are called with bh disabled */
72579+ spin_lock(&gr_conn_table_lock);
72580+ gr_del_task_from_ip_table_nolock(sig);
72581+ sig->gr_saddr = inet->inet_rcv_saddr;
72582+ sig->gr_daddr = inet->inet_daddr;
72583+ sig->gr_sport = inet->inet_sport;
72584+ sig->gr_dport = inet->inet_dport;
72585+ gr_add_to_task_ip_table_nolock(sig, newent);
72586+ spin_unlock(&gr_conn_table_lock);
72587+#endif
72588+ return;
72589+}
72590+
72591+void gr_del_task_from_ip_table(struct task_struct *task)
72592+{
72593+#ifdef CONFIG_GRKERNSEC
72594+ spin_lock_bh(&gr_conn_table_lock);
72595+ gr_del_task_from_ip_table_nolock(task->signal);
72596+ spin_unlock_bh(&gr_conn_table_lock);
72597+#endif
72598+ return;
72599+}
72600+
72601+void
72602+gr_attach_curr_ip(const struct sock *sk)
72603+{
72604+#ifdef CONFIG_GRKERNSEC
72605+ struct signal_struct *p, *set;
72606+ const struct inet_sock *inet = inet_sk(sk);
72607+
72608+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
72609+ return;
72610+
72611+ set = current->signal;
72612+
72613+ spin_lock_bh(&gr_conn_table_lock);
72614+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
72615+ inet->inet_dport, inet->inet_sport);
72616+ if (unlikely(p != NULL)) {
72617+ set->curr_ip = p->curr_ip;
72618+ set->used_accept = 1;
72619+ gr_del_task_from_ip_table_nolock(p);
72620+ spin_unlock_bh(&gr_conn_table_lock);
72621+ return;
72622+ }
72623+ spin_unlock_bh(&gr_conn_table_lock);
72624+
72625+ set->curr_ip = inet->inet_daddr;
72626+ set->used_accept = 1;
72627+#endif
72628+ return;
72629+}
72630+
72631+int
72632+gr_handle_sock_all(const int family, const int type, const int protocol)
72633+{
72634+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
72635+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
72636+ (family != AF_UNIX)) {
72637+ if (family == AF_INET)
72638+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
72639+ else
72640+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
72641+ return -EACCES;
72642+ }
72643+#endif
72644+ return 0;
72645+}
72646+
72647+int
72648+gr_handle_sock_server(const struct sockaddr *sck)
72649+{
72650+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
72651+ if (grsec_enable_socket_server &&
72652+ in_group_p(grsec_socket_server_gid) &&
72653+ sck && (sck->sa_family != AF_UNIX) &&
72654+ (sck->sa_family != AF_LOCAL)) {
72655+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
72656+ return -EACCES;
72657+ }
72658+#endif
72659+ return 0;
72660+}
72661+
72662+int
72663+gr_handle_sock_server_other(const struct sock *sck)
72664+{
72665+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
72666+ if (grsec_enable_socket_server &&
72667+ in_group_p(grsec_socket_server_gid) &&
72668+ sck && (sck->sk_family != AF_UNIX) &&
72669+ (sck->sk_family != AF_LOCAL)) {
72670+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
72671+ return -EACCES;
72672+ }
72673+#endif
72674+ return 0;
72675+}
72676+
72677+int
72678+gr_handle_sock_client(const struct sockaddr *sck)
72679+{
72680+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
72681+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
72682+ sck && (sck->sa_family != AF_UNIX) &&
72683+ (sck->sa_family != AF_LOCAL)) {
72684+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
72685+ return -EACCES;
72686+ }
72687+#endif
72688+ return 0;
72689+}
72690diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
72691new file mode 100644
72692index 0000000..8159888
72693--- /dev/null
72694+++ b/grsecurity/grsec_sysctl.c
72695@@ -0,0 +1,479 @@
72696+#include <linux/kernel.h>
72697+#include <linux/sched.h>
72698+#include <linux/sysctl.h>
72699+#include <linux/grsecurity.h>
72700+#include <linux/grinternal.h>
72701+
72702+int
72703+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
72704+{
72705+#ifdef CONFIG_GRKERNSEC_SYSCTL
72706+ if (dirname == NULL || name == NULL)
72707+ return 0;
72708+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
72709+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
72710+ return -EACCES;
72711+ }
72712+#endif
72713+ return 0;
72714+}
72715+
72716+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
72717+static int __maybe_unused __read_only one = 1;
72718+#endif
72719+
72720+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
72721+ defined(CONFIG_GRKERNSEC_DENYUSB)
72722+struct ctl_table grsecurity_table[] = {
72723+#ifdef CONFIG_GRKERNSEC_SYSCTL
72724+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
72725+#ifdef CONFIG_GRKERNSEC_IO
72726+ {
72727+ .procname = "disable_priv_io",
72728+ .data = &grsec_disable_privio,
72729+ .maxlen = sizeof(int),
72730+ .mode = 0600,
72731+ .proc_handler = &proc_dointvec,
72732+ },
72733+#endif
72734+#endif
72735+#ifdef CONFIG_GRKERNSEC_LINK
72736+ {
72737+ .procname = "linking_restrictions",
72738+ .data = &grsec_enable_link,
72739+ .maxlen = sizeof(int),
72740+ .mode = 0600,
72741+ .proc_handler = &proc_dointvec,
72742+ },
72743+#endif
72744+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
72745+ {
72746+ .procname = "enforce_symlinksifowner",
72747+ .data = &grsec_enable_symlinkown,
72748+ .maxlen = sizeof(int),
72749+ .mode = 0600,
72750+ .proc_handler = &proc_dointvec,
72751+ },
72752+ {
72753+ .procname = "symlinkown_gid",
72754+ .data = &grsec_symlinkown_gid,
72755+ .maxlen = sizeof(int),
72756+ .mode = 0600,
72757+ .proc_handler = &proc_dointvec,
72758+ },
72759+#endif
72760+#ifdef CONFIG_GRKERNSEC_BRUTE
72761+ {
72762+ .procname = "deter_bruteforce",
72763+ .data = &grsec_enable_brute,
72764+ .maxlen = sizeof(int),
72765+ .mode = 0600,
72766+ .proc_handler = &proc_dointvec,
72767+ },
72768+#endif
72769+#ifdef CONFIG_GRKERNSEC_FIFO
72770+ {
72771+ .procname = "fifo_restrictions",
72772+ .data = &grsec_enable_fifo,
72773+ .maxlen = sizeof(int),
72774+ .mode = 0600,
72775+ .proc_handler = &proc_dointvec,
72776+ },
72777+#endif
72778+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
72779+ {
72780+ .procname = "ptrace_readexec",
72781+ .data = &grsec_enable_ptrace_readexec,
72782+ .maxlen = sizeof(int),
72783+ .mode = 0600,
72784+ .proc_handler = &proc_dointvec,
72785+ },
72786+#endif
72787+#ifdef CONFIG_GRKERNSEC_SETXID
72788+ {
72789+ .procname = "consistent_setxid",
72790+ .data = &grsec_enable_setxid,
72791+ .maxlen = sizeof(int),
72792+ .mode = 0600,
72793+ .proc_handler = &proc_dointvec,
72794+ },
72795+#endif
72796+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
72797+ {
72798+ .procname = "ip_blackhole",
72799+ .data = &grsec_enable_blackhole,
72800+ .maxlen = sizeof(int),
72801+ .mode = 0600,
72802+ .proc_handler = &proc_dointvec,
72803+ },
72804+ {
72805+ .procname = "lastack_retries",
72806+ .data = &grsec_lastack_retries,
72807+ .maxlen = sizeof(int),
72808+ .mode = 0600,
72809+ .proc_handler = &proc_dointvec,
72810+ },
72811+#endif
72812+#ifdef CONFIG_GRKERNSEC_EXECLOG
72813+ {
72814+ .procname = "exec_logging",
72815+ .data = &grsec_enable_execlog,
72816+ .maxlen = sizeof(int),
72817+ .mode = 0600,
72818+ .proc_handler = &proc_dointvec,
72819+ },
72820+#endif
72821+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72822+ {
72823+ .procname = "rwxmap_logging",
72824+ .data = &grsec_enable_log_rwxmaps,
72825+ .maxlen = sizeof(int),
72826+ .mode = 0600,
72827+ .proc_handler = &proc_dointvec,
72828+ },
72829+#endif
72830+#ifdef CONFIG_GRKERNSEC_SIGNAL
72831+ {
72832+ .procname = "signal_logging",
72833+ .data = &grsec_enable_signal,
72834+ .maxlen = sizeof(int),
72835+ .mode = 0600,
72836+ .proc_handler = &proc_dointvec,
72837+ },
72838+#endif
72839+#ifdef CONFIG_GRKERNSEC_FORKFAIL
72840+ {
72841+ .procname = "forkfail_logging",
72842+ .data = &grsec_enable_forkfail,
72843+ .maxlen = sizeof(int),
72844+ .mode = 0600,
72845+ .proc_handler = &proc_dointvec,
72846+ },
72847+#endif
72848+#ifdef CONFIG_GRKERNSEC_TIME
72849+ {
72850+ .procname = "timechange_logging",
72851+ .data = &grsec_enable_time,
72852+ .maxlen = sizeof(int),
72853+ .mode = 0600,
72854+ .proc_handler = &proc_dointvec,
72855+ },
72856+#endif
72857+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
72858+ {
72859+ .procname = "chroot_deny_shmat",
72860+ .data = &grsec_enable_chroot_shmat,
72861+ .maxlen = sizeof(int),
72862+ .mode = 0600,
72863+ .proc_handler = &proc_dointvec,
72864+ },
72865+#endif
72866+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
72867+ {
72868+ .procname = "chroot_deny_unix",
72869+ .data = &grsec_enable_chroot_unix,
72870+ .maxlen = sizeof(int),
72871+ .mode = 0600,
72872+ .proc_handler = &proc_dointvec,
72873+ },
72874+#endif
72875+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
72876+ {
72877+ .procname = "chroot_deny_mount",
72878+ .data = &grsec_enable_chroot_mount,
72879+ .maxlen = sizeof(int),
72880+ .mode = 0600,
72881+ .proc_handler = &proc_dointvec,
72882+ },
72883+#endif
72884+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
72885+ {
72886+ .procname = "chroot_deny_fchdir",
72887+ .data = &grsec_enable_chroot_fchdir,
72888+ .maxlen = sizeof(int),
72889+ .mode = 0600,
72890+ .proc_handler = &proc_dointvec,
72891+ },
72892+#endif
72893+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
72894+ {
72895+ .procname = "chroot_deny_chroot",
72896+ .data = &grsec_enable_chroot_double,
72897+ .maxlen = sizeof(int),
72898+ .mode = 0600,
72899+ .proc_handler = &proc_dointvec,
72900+ },
72901+#endif
72902+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
72903+ {
72904+ .procname = "chroot_deny_pivot",
72905+ .data = &grsec_enable_chroot_pivot,
72906+ .maxlen = sizeof(int),
72907+ .mode = 0600,
72908+ .proc_handler = &proc_dointvec,
72909+ },
72910+#endif
72911+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
72912+ {
72913+ .procname = "chroot_enforce_chdir",
72914+ .data = &grsec_enable_chroot_chdir,
72915+ .maxlen = sizeof(int),
72916+ .mode = 0600,
72917+ .proc_handler = &proc_dointvec,
72918+ },
72919+#endif
72920+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
72921+ {
72922+ .procname = "chroot_deny_chmod",
72923+ .data = &grsec_enable_chroot_chmod,
72924+ .maxlen = sizeof(int),
72925+ .mode = 0600,
72926+ .proc_handler = &proc_dointvec,
72927+ },
72928+#endif
72929+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
72930+ {
72931+ .procname = "chroot_deny_mknod",
72932+ .data = &grsec_enable_chroot_mknod,
72933+ .maxlen = sizeof(int),
72934+ .mode = 0600,
72935+ .proc_handler = &proc_dointvec,
72936+ },
72937+#endif
72938+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
72939+ {
72940+ .procname = "chroot_restrict_nice",
72941+ .data = &grsec_enable_chroot_nice,
72942+ .maxlen = sizeof(int),
72943+ .mode = 0600,
72944+ .proc_handler = &proc_dointvec,
72945+ },
72946+#endif
72947+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
72948+ {
72949+ .procname = "chroot_execlog",
72950+ .data = &grsec_enable_chroot_execlog,
72951+ .maxlen = sizeof(int),
72952+ .mode = 0600,
72953+ .proc_handler = &proc_dointvec,
72954+ },
72955+#endif
72956+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
72957+ {
72958+ .procname = "chroot_caps",
72959+ .data = &grsec_enable_chroot_caps,
72960+ .maxlen = sizeof(int),
72961+ .mode = 0600,
72962+ .proc_handler = &proc_dointvec,
72963+ },
72964+#endif
72965+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
72966+ {
72967+ .procname = "chroot_deny_sysctl",
72968+ .data = &grsec_enable_chroot_sysctl,
72969+ .maxlen = sizeof(int),
72970+ .mode = 0600,
72971+ .proc_handler = &proc_dointvec,
72972+ },
72973+#endif
72974+#ifdef CONFIG_GRKERNSEC_TPE
72975+ {
72976+ .procname = "tpe",
72977+ .data = &grsec_enable_tpe,
72978+ .maxlen = sizeof(int),
72979+ .mode = 0600,
72980+ .proc_handler = &proc_dointvec,
72981+ },
72982+ {
72983+ .procname = "tpe_gid",
72984+ .data = &grsec_tpe_gid,
72985+ .maxlen = sizeof(int),
72986+ .mode = 0600,
72987+ .proc_handler = &proc_dointvec,
72988+ },
72989+#endif
72990+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
72991+ {
72992+ .procname = "tpe_invert",
72993+ .data = &grsec_enable_tpe_invert,
72994+ .maxlen = sizeof(int),
72995+ .mode = 0600,
72996+ .proc_handler = &proc_dointvec,
72997+ },
72998+#endif
72999+#ifdef CONFIG_GRKERNSEC_TPE_ALL
73000+ {
73001+ .procname = "tpe_restrict_all",
73002+ .data = &grsec_enable_tpe_all,
73003+ .maxlen = sizeof(int),
73004+ .mode = 0600,
73005+ .proc_handler = &proc_dointvec,
73006+ },
73007+#endif
73008+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
73009+ {
73010+ .procname = "socket_all",
73011+ .data = &grsec_enable_socket_all,
73012+ .maxlen = sizeof(int),
73013+ .mode = 0600,
73014+ .proc_handler = &proc_dointvec,
73015+ },
73016+ {
73017+ .procname = "socket_all_gid",
73018+ .data = &grsec_socket_all_gid,
73019+ .maxlen = sizeof(int),
73020+ .mode = 0600,
73021+ .proc_handler = &proc_dointvec,
73022+ },
73023+#endif
73024+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
73025+ {
73026+ .procname = "socket_client",
73027+ .data = &grsec_enable_socket_client,
73028+ .maxlen = sizeof(int),
73029+ .mode = 0600,
73030+ .proc_handler = &proc_dointvec,
73031+ },
73032+ {
73033+ .procname = "socket_client_gid",
73034+ .data = &grsec_socket_client_gid,
73035+ .maxlen = sizeof(int),
73036+ .mode = 0600,
73037+ .proc_handler = &proc_dointvec,
73038+ },
73039+#endif
73040+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
73041+ {
73042+ .procname = "socket_server",
73043+ .data = &grsec_enable_socket_server,
73044+ .maxlen = sizeof(int),
73045+ .mode = 0600,
73046+ .proc_handler = &proc_dointvec,
73047+ },
73048+ {
73049+ .procname = "socket_server_gid",
73050+ .data = &grsec_socket_server_gid,
73051+ .maxlen = sizeof(int),
73052+ .mode = 0600,
73053+ .proc_handler = &proc_dointvec,
73054+ },
73055+#endif
73056+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
73057+ {
73058+ .procname = "audit_group",
73059+ .data = &grsec_enable_group,
73060+ .maxlen = sizeof(int),
73061+ .mode = 0600,
73062+ .proc_handler = &proc_dointvec,
73063+ },
73064+ {
73065+ .procname = "audit_gid",
73066+ .data = &grsec_audit_gid,
73067+ .maxlen = sizeof(int),
73068+ .mode = 0600,
73069+ .proc_handler = &proc_dointvec,
73070+ },
73071+#endif
73072+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
73073+ {
73074+ .procname = "audit_chdir",
73075+ .data = &grsec_enable_chdir,
73076+ .maxlen = sizeof(int),
73077+ .mode = 0600,
73078+ .proc_handler = &proc_dointvec,
73079+ },
73080+#endif
73081+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
73082+ {
73083+ .procname = "audit_mount",
73084+ .data = &grsec_enable_mount,
73085+ .maxlen = sizeof(int),
73086+ .mode = 0600,
73087+ .proc_handler = &proc_dointvec,
73088+ },
73089+#endif
73090+#ifdef CONFIG_GRKERNSEC_DMESG
73091+ {
73092+ .procname = "dmesg",
73093+ .data = &grsec_enable_dmesg,
73094+ .maxlen = sizeof(int),
73095+ .mode = 0600,
73096+ .proc_handler = &proc_dointvec,
73097+ },
73098+#endif
73099+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73100+ {
73101+ .procname = "chroot_findtask",
73102+ .data = &grsec_enable_chroot_findtask,
73103+ .maxlen = sizeof(int),
73104+ .mode = 0600,
73105+ .proc_handler = &proc_dointvec,
73106+ },
73107+#endif
73108+#ifdef CONFIG_GRKERNSEC_RESLOG
73109+ {
73110+ .procname = "resource_logging",
73111+ .data = &grsec_resource_logging,
73112+ .maxlen = sizeof(int),
73113+ .mode = 0600,
73114+ .proc_handler = &proc_dointvec,
73115+ },
73116+#endif
73117+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
73118+ {
73119+ .procname = "audit_ptrace",
73120+ .data = &grsec_enable_audit_ptrace,
73121+ .maxlen = sizeof(int),
73122+ .mode = 0600,
73123+ .proc_handler = &proc_dointvec,
73124+ },
73125+#endif
73126+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
73127+ {
73128+ .procname = "harden_ptrace",
73129+ .data = &grsec_enable_harden_ptrace,
73130+ .maxlen = sizeof(int),
73131+ .mode = 0600,
73132+ .proc_handler = &proc_dointvec,
73133+ },
73134+#endif
73135+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
73136+ {
73137+ .procname = "harden_ipc",
73138+ .data = &grsec_enable_harden_ipc,
73139+ .maxlen = sizeof(int),
73140+ .mode = 0600,
73141+ .proc_handler = &proc_dointvec,
73142+ },
73143+#endif
73144+ {
73145+ .procname = "grsec_lock",
73146+ .data = &grsec_lock,
73147+ .maxlen = sizeof(int),
73148+ .mode = 0600,
73149+ .proc_handler = &proc_dointvec,
73150+ },
73151+#endif
73152+#ifdef CONFIG_GRKERNSEC_ROFS
73153+ {
73154+ .procname = "romount_protect",
73155+ .data = &grsec_enable_rofs,
73156+ .maxlen = sizeof(int),
73157+ .mode = 0600,
73158+ .proc_handler = &proc_dointvec_minmax,
73159+ .extra1 = &one,
73160+ .extra2 = &one,
73161+ },
73162+#endif
73163+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
73164+ {
73165+ .procname = "deny_new_usb",
73166+ .data = &grsec_deny_new_usb,
73167+ .maxlen = sizeof(int),
73168+ .mode = 0600,
73169+ .proc_handler = &proc_dointvec,
73170+ },
73171+#endif
73172+ { }
73173+};
73174+#endif
73175diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
73176new file mode 100644
73177index 0000000..0dc13c3
73178--- /dev/null
73179+++ b/grsecurity/grsec_time.c
73180@@ -0,0 +1,16 @@
73181+#include <linux/kernel.h>
73182+#include <linux/sched.h>
73183+#include <linux/grinternal.h>
73184+#include <linux/module.h>
73185+
73186+void
73187+gr_log_timechange(void)
73188+{
73189+#ifdef CONFIG_GRKERNSEC_TIME
73190+ if (grsec_enable_time)
73191+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
73192+#endif
73193+ return;
73194+}
73195+
73196+EXPORT_SYMBOL(gr_log_timechange);
73197diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
73198new file mode 100644
73199index 0000000..ee57dcf
73200--- /dev/null
73201+++ b/grsecurity/grsec_tpe.c
73202@@ -0,0 +1,73 @@
73203+#include <linux/kernel.h>
73204+#include <linux/sched.h>
73205+#include <linux/file.h>
73206+#include <linux/fs.h>
73207+#include <linux/grinternal.h>
73208+
73209+extern int gr_acl_tpe_check(void);
73210+
73211+int
73212+gr_tpe_allow(const struct file *file)
73213+{
73214+#ifdef CONFIG_GRKERNSEC
73215+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
73216+ const struct cred *cred = current_cred();
73217+ char *msg = NULL;
73218+ char *msg2 = NULL;
73219+
73220+ // never restrict root
73221+ if (gr_is_global_root(cred->uid))
73222+ return 1;
73223+
73224+ if (grsec_enable_tpe) {
73225+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
73226+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
73227+ msg = "not being in trusted group";
73228+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
73229+ msg = "being in untrusted group";
73230+#else
73231+ if (in_group_p(grsec_tpe_gid))
73232+ msg = "being in untrusted group";
73233+#endif
73234+ }
73235+ if (!msg && gr_acl_tpe_check())
73236+ msg = "being in untrusted role";
73237+
73238+ // not in any affected group/role
73239+ if (!msg)
73240+ goto next_check;
73241+
73242+ if (gr_is_global_nonroot(inode->i_uid))
73243+ msg2 = "file in non-root-owned directory";
73244+ else if (inode->i_mode & S_IWOTH)
73245+ msg2 = "file in world-writable directory";
73246+ else if (inode->i_mode & S_IWGRP)
73247+ msg2 = "file in group-writable directory";
73248+
73249+ if (msg && msg2) {
73250+ char fullmsg[70] = {0};
73251+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
73252+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
73253+ return 0;
73254+ }
73255+ msg = NULL;
73256+next_check:
73257+#ifdef CONFIG_GRKERNSEC_TPE_ALL
73258+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
73259+ return 1;
73260+
73261+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
73262+ msg = "directory not owned by user";
73263+ else if (inode->i_mode & S_IWOTH)
73264+ msg = "file in world-writable directory";
73265+ else if (inode->i_mode & S_IWGRP)
73266+ msg = "file in group-writable directory";
73267+
73268+ if (msg) {
73269+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
73270+ return 0;
73271+ }
73272+#endif
73273+#endif
73274+ return 1;
73275+}
73276diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
73277new file mode 100644
73278index 0000000..ae02d8e
73279--- /dev/null
73280+++ b/grsecurity/grsec_usb.c
73281@@ -0,0 +1,15 @@
73282+#include <linux/kernel.h>
73283+#include <linux/grinternal.h>
73284+#include <linux/module.h>
73285+
73286+int gr_handle_new_usb(void)
73287+{
73288+#ifdef CONFIG_GRKERNSEC_DENYUSB
73289+ if (grsec_deny_new_usb) {
73290+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
73291+ return 1;
73292+ }
73293+#endif
73294+ return 0;
73295+}
73296+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
73297diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
73298new file mode 100644
73299index 0000000..9f7b1ac
73300--- /dev/null
73301+++ b/grsecurity/grsum.c
73302@@ -0,0 +1,61 @@
73303+#include <linux/err.h>
73304+#include <linux/kernel.h>
73305+#include <linux/sched.h>
73306+#include <linux/mm.h>
73307+#include <linux/scatterlist.h>
73308+#include <linux/crypto.h>
73309+#include <linux/gracl.h>
73310+
73311+
73312+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
73313+#error "crypto and sha256 must be built into the kernel"
73314+#endif
73315+
73316+int
73317+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
73318+{
73319+ char *p;
73320+ struct crypto_hash *tfm;
73321+ struct hash_desc desc;
73322+ struct scatterlist sg;
73323+ unsigned char temp_sum[GR_SHA_LEN];
73324+ volatile int retval = 0;
73325+ volatile int dummy = 0;
73326+ unsigned int i;
73327+
73328+ sg_init_table(&sg, 1);
73329+
73330+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
73331+ if (IS_ERR(tfm)) {
73332+ /* should never happen, since sha256 should be built in */
73333+ return 1;
73334+ }
73335+
73336+ desc.tfm = tfm;
73337+ desc.flags = 0;
73338+
73339+ crypto_hash_init(&desc);
73340+
73341+ p = salt;
73342+ sg_set_buf(&sg, p, GR_SALT_LEN);
73343+ crypto_hash_update(&desc, &sg, sg.length);
73344+
73345+ p = entry->pw;
73346+ sg_set_buf(&sg, p, strlen(p));
73347+
73348+ crypto_hash_update(&desc, &sg, sg.length);
73349+
73350+ crypto_hash_final(&desc, temp_sum);
73351+
73352+ memset(entry->pw, 0, GR_PW_LEN);
73353+
73354+ for (i = 0; i < GR_SHA_LEN; i++)
73355+ if (sum[i] != temp_sum[i])
73356+ retval = 1;
73357+ else
73358+ dummy = 1; // waste a cycle
73359+
73360+ crypto_free_hash(tfm);
73361+
73362+ return retval;
73363+}
73364diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
73365index 77ff547..181834f 100644
73366--- a/include/asm-generic/4level-fixup.h
73367+++ b/include/asm-generic/4level-fixup.h
73368@@ -13,8 +13,10 @@
73369 #define pmd_alloc(mm, pud, address) \
73370 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
73371 NULL: pmd_offset(pud, address))
73372+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
73373
73374 #define pud_alloc(mm, pgd, address) (pgd)
73375+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
73376 #define pud_offset(pgd, start) (pgd)
73377 #define pud_none(pud) 0
73378 #define pud_bad(pud) 0
73379diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
73380index b7babf0..97f4c4f 100644
73381--- a/include/asm-generic/atomic-long.h
73382+++ b/include/asm-generic/atomic-long.h
73383@@ -22,6 +22,12 @@
73384
73385 typedef atomic64_t atomic_long_t;
73386
73387+#ifdef CONFIG_PAX_REFCOUNT
73388+typedef atomic64_unchecked_t atomic_long_unchecked_t;
73389+#else
73390+typedef atomic64_t atomic_long_unchecked_t;
73391+#endif
73392+
73393 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
73394
73395 static inline long atomic_long_read(atomic_long_t *l)
73396@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
73397 return (long)atomic64_read(v);
73398 }
73399
73400+#ifdef CONFIG_PAX_REFCOUNT
73401+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
73402+{
73403+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73404+
73405+ return (long)atomic64_read_unchecked(v);
73406+}
73407+#endif
73408+
73409 static inline void atomic_long_set(atomic_long_t *l, long i)
73410 {
73411 atomic64_t *v = (atomic64_t *)l;
73412@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
73413 atomic64_set(v, i);
73414 }
73415
73416+#ifdef CONFIG_PAX_REFCOUNT
73417+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
73418+{
73419+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73420+
73421+ atomic64_set_unchecked(v, i);
73422+}
73423+#endif
73424+
73425 static inline void atomic_long_inc(atomic_long_t *l)
73426 {
73427 atomic64_t *v = (atomic64_t *)l;
73428@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
73429 atomic64_inc(v);
73430 }
73431
73432+#ifdef CONFIG_PAX_REFCOUNT
73433+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
73434+{
73435+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73436+
73437+ atomic64_inc_unchecked(v);
73438+}
73439+#endif
73440+
73441 static inline void atomic_long_dec(atomic_long_t *l)
73442 {
73443 atomic64_t *v = (atomic64_t *)l;
73444@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
73445 atomic64_dec(v);
73446 }
73447
73448+#ifdef CONFIG_PAX_REFCOUNT
73449+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
73450+{
73451+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73452+
73453+ atomic64_dec_unchecked(v);
73454+}
73455+#endif
73456+
73457 static inline void atomic_long_add(long i, atomic_long_t *l)
73458 {
73459 atomic64_t *v = (atomic64_t *)l;
73460@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
73461 atomic64_add(i, v);
73462 }
73463
73464+#ifdef CONFIG_PAX_REFCOUNT
73465+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
73466+{
73467+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73468+
73469+ atomic64_add_unchecked(i, v);
73470+}
73471+#endif
73472+
73473 static inline void atomic_long_sub(long i, atomic_long_t *l)
73474 {
73475 atomic64_t *v = (atomic64_t *)l;
73476@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
73477 atomic64_sub(i, v);
73478 }
73479
73480+#ifdef CONFIG_PAX_REFCOUNT
73481+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
73482+{
73483+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73484+
73485+ atomic64_sub_unchecked(i, v);
73486+}
73487+#endif
73488+
73489 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
73490 {
73491 atomic64_t *v = (atomic64_t *)l;
73492@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
73493 return atomic64_add_negative(i, v);
73494 }
73495
73496-static inline long atomic_long_add_return(long i, atomic_long_t *l)
73497+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
73498 {
73499 atomic64_t *v = (atomic64_t *)l;
73500
73501 return (long)atomic64_add_return(i, v);
73502 }
73503
73504+#ifdef CONFIG_PAX_REFCOUNT
73505+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
73506+{
73507+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73508+
73509+ return (long)atomic64_add_return_unchecked(i, v);
73510+}
73511+#endif
73512+
73513 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
73514 {
73515 atomic64_t *v = (atomic64_t *)l;
73516@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
73517 return (long)atomic64_inc_return(v);
73518 }
73519
73520+#ifdef CONFIG_PAX_REFCOUNT
73521+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
73522+{
73523+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73524+
73525+ return (long)atomic64_inc_return_unchecked(v);
73526+}
73527+#endif
73528+
73529 static inline long atomic_long_dec_return(atomic_long_t *l)
73530 {
73531 atomic64_t *v = (atomic64_t *)l;
73532@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
73533
73534 typedef atomic_t atomic_long_t;
73535
73536+#ifdef CONFIG_PAX_REFCOUNT
73537+typedef atomic_unchecked_t atomic_long_unchecked_t;
73538+#else
73539+typedef atomic_t atomic_long_unchecked_t;
73540+#endif
73541+
73542 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
73543 static inline long atomic_long_read(atomic_long_t *l)
73544 {
73545@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
73546 return (long)atomic_read(v);
73547 }
73548
73549+#ifdef CONFIG_PAX_REFCOUNT
73550+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
73551+{
73552+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73553+
73554+ return (long)atomic_read_unchecked(v);
73555+}
73556+#endif
73557+
73558 static inline void atomic_long_set(atomic_long_t *l, long i)
73559 {
73560 atomic_t *v = (atomic_t *)l;
73561@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
73562 atomic_set(v, i);
73563 }
73564
73565+#ifdef CONFIG_PAX_REFCOUNT
73566+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
73567+{
73568+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73569+
73570+ atomic_set_unchecked(v, i);
73571+}
73572+#endif
73573+
73574 static inline void atomic_long_inc(atomic_long_t *l)
73575 {
73576 atomic_t *v = (atomic_t *)l;
73577@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
73578 atomic_inc(v);
73579 }
73580
73581+#ifdef CONFIG_PAX_REFCOUNT
73582+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
73583+{
73584+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73585+
73586+ atomic_inc_unchecked(v);
73587+}
73588+#endif
73589+
73590 static inline void atomic_long_dec(atomic_long_t *l)
73591 {
73592 atomic_t *v = (atomic_t *)l;
73593@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
73594 atomic_dec(v);
73595 }
73596
73597+#ifdef CONFIG_PAX_REFCOUNT
73598+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
73599+{
73600+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73601+
73602+ atomic_dec_unchecked(v);
73603+}
73604+#endif
73605+
73606 static inline void atomic_long_add(long i, atomic_long_t *l)
73607 {
73608 atomic_t *v = (atomic_t *)l;
73609@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
73610 atomic_add(i, v);
73611 }
73612
73613+#ifdef CONFIG_PAX_REFCOUNT
73614+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
73615+{
73616+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73617+
73618+ atomic_add_unchecked(i, v);
73619+}
73620+#endif
73621+
73622 static inline void atomic_long_sub(long i, atomic_long_t *l)
73623 {
73624 atomic_t *v = (atomic_t *)l;
73625@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
73626 atomic_sub(i, v);
73627 }
73628
73629+#ifdef CONFIG_PAX_REFCOUNT
73630+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
73631+{
73632+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73633+
73634+ atomic_sub_unchecked(i, v);
73635+}
73636+#endif
73637+
73638 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
73639 {
73640 atomic_t *v = (atomic_t *)l;
73641@@ -218,6 +356,16 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
73642 return (long)atomic_add_return(i, v);
73643 }
73644
73645+#ifdef CONFIG_PAX_REFCOUNT
73646+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
73647+{
73648+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73649+
73650+ return (long)atomic_add_return_unchecked(i, v);
73651+}
73652+
73653+#endif
73654+
73655 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
73656 {
73657 atomic_t *v = (atomic_t *)l;
73658@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
73659 return (long)atomic_inc_return(v);
73660 }
73661
73662+#ifdef CONFIG_PAX_REFCOUNT
73663+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
73664+{
73665+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73666+
73667+ return (long)atomic_inc_return_unchecked(v);
73668+}
73669+#endif
73670+
73671 static inline long atomic_long_dec_return(atomic_long_t *l)
73672 {
73673 atomic_t *v = (atomic_t *)l;
73674@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
73675
73676 #endif /* BITS_PER_LONG == 64 */
73677
73678+#ifdef CONFIG_PAX_REFCOUNT
73679+static inline void pax_refcount_needs_these_functions(void)
73680+{
73681+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
73682+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
73683+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
73684+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
73685+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
73686+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
73687+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
73688+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
73689+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
73690+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
73691+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
73692+#ifdef CONFIG_X86
73693+ atomic_clear_mask_unchecked(0, NULL);
73694+ atomic_set_mask_unchecked(0, NULL);
73695+#endif
73696+
73697+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
73698+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
73699+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
73700+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
73701+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
73702+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
73703+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
73704+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
73705+}
73706+#else
73707+#define atomic_read_unchecked(v) atomic_read(v)
73708+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
73709+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
73710+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
73711+#define atomic_inc_unchecked(v) atomic_inc(v)
73712+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
73713+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
73714+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
73715+#define atomic_dec_unchecked(v) atomic_dec(v)
73716+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
73717+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
73718+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
73719+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
73720+
73721+#define atomic_long_read_unchecked(v) atomic_long_read(v)
73722+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
73723+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
73724+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
73725+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
73726+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
73727+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
73728+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
73729+#endif
73730+
73731 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
73732diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
73733index 33bd2de..f31bff97 100644
73734--- a/include/asm-generic/atomic.h
73735+++ b/include/asm-generic/atomic.h
73736@@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
73737 * Atomically clears the bits set in @mask from @v
73738 */
73739 #ifndef atomic_clear_mask
73740-static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
73741+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
73742 {
73743 unsigned long flags;
73744
73745diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
73746index b18ce4f..2ee2843 100644
73747--- a/include/asm-generic/atomic64.h
73748+++ b/include/asm-generic/atomic64.h
73749@@ -16,6 +16,8 @@ typedef struct {
73750 long long counter;
73751 } atomic64_t;
73752
73753+typedef atomic64_t atomic64_unchecked_t;
73754+
73755 #define ATOMIC64_INIT(i) { (i) }
73756
73757 extern long long atomic64_read(const atomic64_t *v);
73758@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
73759 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
73760 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
73761
73762+#define atomic64_read_unchecked(v) atomic64_read(v)
73763+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
73764+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
73765+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
73766+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
73767+#define atomic64_inc_unchecked(v) atomic64_inc(v)
73768+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
73769+#define atomic64_dec_unchecked(v) atomic64_dec(v)
73770+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
73771+
73772 #endif /* _ASM_GENERIC_ATOMIC64_H */
73773diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
73774index a60a7cc..0fe12f2 100644
73775--- a/include/asm-generic/bitops/__fls.h
73776+++ b/include/asm-generic/bitops/__fls.h
73777@@ -9,7 +9,7 @@
73778 *
73779 * Undefined if no set bit exists, so code should check against 0 first.
73780 */
73781-static __always_inline unsigned long __fls(unsigned long word)
73782+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
73783 {
73784 int num = BITS_PER_LONG - 1;
73785
73786diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
73787index 0576d1f..dad6c71 100644
73788--- a/include/asm-generic/bitops/fls.h
73789+++ b/include/asm-generic/bitops/fls.h
73790@@ -9,7 +9,7 @@
73791 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
73792 */
73793
73794-static __always_inline int fls(int x)
73795+static __always_inline int __intentional_overflow(-1) fls(int x)
73796 {
73797 int r = 32;
73798
73799diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
73800index b097cf8..3d40e14 100644
73801--- a/include/asm-generic/bitops/fls64.h
73802+++ b/include/asm-generic/bitops/fls64.h
73803@@ -15,7 +15,7 @@
73804 * at position 64.
73805 */
73806 #if BITS_PER_LONG == 32
73807-static __always_inline int fls64(__u64 x)
73808+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
73809 {
73810 __u32 h = x >> 32;
73811 if (h)
73812@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
73813 return fls(x);
73814 }
73815 #elif BITS_PER_LONG == 64
73816-static __always_inline int fls64(__u64 x)
73817+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
73818 {
73819 if (x == 0)
73820 return 0;
73821diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
73822index 1bfcfe5..e04c5c9 100644
73823--- a/include/asm-generic/cache.h
73824+++ b/include/asm-generic/cache.h
73825@@ -6,7 +6,7 @@
73826 * cache lines need to provide their own cache.h.
73827 */
73828
73829-#define L1_CACHE_SHIFT 5
73830-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
73831+#define L1_CACHE_SHIFT 5UL
73832+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
73833
73834 #endif /* __ASM_GENERIC_CACHE_H */
73835diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
73836index 0d68a1e..b74a761 100644
73837--- a/include/asm-generic/emergency-restart.h
73838+++ b/include/asm-generic/emergency-restart.h
73839@@ -1,7 +1,7 @@
73840 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
73841 #define _ASM_GENERIC_EMERGENCY_RESTART_H
73842
73843-static inline void machine_emergency_restart(void)
73844+static inline __noreturn void machine_emergency_restart(void)
73845 {
73846 machine_restart(NULL);
73847 }
73848diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
73849index 90f99c7..00ce236 100644
73850--- a/include/asm-generic/kmap_types.h
73851+++ b/include/asm-generic/kmap_types.h
73852@@ -2,9 +2,9 @@
73853 #define _ASM_GENERIC_KMAP_TYPES_H
73854
73855 #ifdef __WITH_KM_FENCE
73856-# define KM_TYPE_NR 41
73857+# define KM_TYPE_NR 42
73858 #else
73859-# define KM_TYPE_NR 20
73860+# define KM_TYPE_NR 21
73861 #endif
73862
73863 #endif
73864diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
73865index 9ceb03b..62b0b8f 100644
73866--- a/include/asm-generic/local.h
73867+++ b/include/asm-generic/local.h
73868@@ -23,24 +23,37 @@ typedef struct
73869 atomic_long_t a;
73870 } local_t;
73871
73872+typedef struct {
73873+ atomic_long_unchecked_t a;
73874+} local_unchecked_t;
73875+
73876 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
73877
73878 #define local_read(l) atomic_long_read(&(l)->a)
73879+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
73880 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
73881+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
73882 #define local_inc(l) atomic_long_inc(&(l)->a)
73883+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
73884 #define local_dec(l) atomic_long_dec(&(l)->a)
73885+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
73886 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
73887+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
73888 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
73889+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
73890
73891 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
73892 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
73893 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
73894 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
73895 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
73896+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
73897 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
73898 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
73899+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
73900
73901 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
73902+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
73903 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
73904 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
73905 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
73906diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
73907index 725612b..9cc513a 100644
73908--- a/include/asm-generic/pgtable-nopmd.h
73909+++ b/include/asm-generic/pgtable-nopmd.h
73910@@ -1,14 +1,19 @@
73911 #ifndef _PGTABLE_NOPMD_H
73912 #define _PGTABLE_NOPMD_H
73913
73914-#ifndef __ASSEMBLY__
73915-
73916 #include <asm-generic/pgtable-nopud.h>
73917
73918-struct mm_struct;
73919-
73920 #define __PAGETABLE_PMD_FOLDED
73921
73922+#define PMD_SHIFT PUD_SHIFT
73923+#define PTRS_PER_PMD 1
73924+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
73925+#define PMD_MASK (~(PMD_SIZE-1))
73926+
73927+#ifndef __ASSEMBLY__
73928+
73929+struct mm_struct;
73930+
73931 /*
73932 * Having the pmd type consist of a pud gets the size right, and allows
73933 * us to conceptually access the pud entry that this pmd is folded into
73934@@ -16,11 +21,6 @@ struct mm_struct;
73935 */
73936 typedef struct { pud_t pud; } pmd_t;
73937
73938-#define PMD_SHIFT PUD_SHIFT
73939-#define PTRS_PER_PMD 1
73940-#define PMD_SIZE (1UL << PMD_SHIFT)
73941-#define PMD_MASK (~(PMD_SIZE-1))
73942-
73943 /*
73944 * The "pud_xxx()" functions here are trivial for a folded two-level
73945 * setup: the pmd is never bad, and a pmd always exists (as it's folded
73946diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
73947index 810431d..0ec4804f 100644
73948--- a/include/asm-generic/pgtable-nopud.h
73949+++ b/include/asm-generic/pgtable-nopud.h
73950@@ -1,10 +1,15 @@
73951 #ifndef _PGTABLE_NOPUD_H
73952 #define _PGTABLE_NOPUD_H
73953
73954-#ifndef __ASSEMBLY__
73955-
73956 #define __PAGETABLE_PUD_FOLDED
73957
73958+#define PUD_SHIFT PGDIR_SHIFT
73959+#define PTRS_PER_PUD 1
73960+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
73961+#define PUD_MASK (~(PUD_SIZE-1))
73962+
73963+#ifndef __ASSEMBLY__
73964+
73965 /*
73966 * Having the pud type consist of a pgd gets the size right, and allows
73967 * us to conceptually access the pgd entry that this pud is folded into
73968@@ -12,11 +17,6 @@
73969 */
73970 typedef struct { pgd_t pgd; } pud_t;
73971
73972-#define PUD_SHIFT PGDIR_SHIFT
73973-#define PTRS_PER_PUD 1
73974-#define PUD_SIZE (1UL << PUD_SHIFT)
73975-#define PUD_MASK (~(PUD_SIZE-1))
73976-
73977 /*
73978 * The "pgd_xxx()" functions here are trivial for a folded two-level
73979 * setup: the pud is never bad, and a pud always exists (as it's folded
73980@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
73981 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
73982
73983 #define pgd_populate(mm, pgd, pud) do { } while (0)
73984+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
73985 /*
73986 * (puds are folded into pgds so this doesn't get actually called,
73987 * but the define is needed for a generic inline function.)
73988diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
73989index b12079a..86683e3 100644
73990--- a/include/asm-generic/pgtable.h
73991+++ b/include/asm-generic/pgtable.h
73992@@ -599,11 +599,10 @@ static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd)
73993 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
73994 barrier();
73995 #endif
73996- if (pmd_none(pmdval))
73997+ if (pmd_none(pmdval) || pmd_trans_huge(pmdval))
73998 return 1;
73999 if (unlikely(pmd_bad(pmdval))) {
74000- if (!pmd_trans_huge(pmdval))
74001- pmd_clear_bad(pmd);
74002+ pmd_clear_bad(pmd);
74003 return 1;
74004 }
74005 return 0;
74006@@ -737,6 +736,22 @@ static inline pmd_t pmd_mknuma(pmd_t pmd)
74007 }
74008 #endif /* CONFIG_NUMA_BALANCING */
74009
74010+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
74011+#ifdef CONFIG_PAX_KERNEXEC
74012+#error KERNEXEC requires pax_open_kernel
74013+#else
74014+static inline unsigned long pax_open_kernel(void) { return 0; }
74015+#endif
74016+#endif
74017+
74018+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
74019+#ifdef CONFIG_PAX_KERNEXEC
74020+#error KERNEXEC requires pax_close_kernel
74021+#else
74022+static inline unsigned long pax_close_kernel(void) { return 0; }
74023+#endif
74024+#endif
74025+
74026 #endif /* CONFIG_MMU */
74027
74028 #endif /* !__ASSEMBLY__ */
74029diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
74030index dc1269c..48a4f51 100644
74031--- a/include/asm-generic/uaccess.h
74032+++ b/include/asm-generic/uaccess.h
74033@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
74034 return __clear_user(to, n);
74035 }
74036
74037+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
74038+#ifdef CONFIG_PAX_MEMORY_UDEREF
74039+#error UDEREF requires pax_open_userland
74040+#else
74041+static inline unsigned long pax_open_userland(void) { return 0; }
74042+#endif
74043+#endif
74044+
74045+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
74046+#ifdef CONFIG_PAX_MEMORY_UDEREF
74047+#error UDEREF requires pax_close_userland
74048+#else
74049+static inline unsigned long pax_close_userland(void) { return 0; }
74050+#endif
74051+#endif
74052+
74053 #endif /* __ASM_GENERIC_UACCESS_H */
74054diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
74055index 83e2c31..eeb4a04 100644
74056--- a/include/asm-generic/vmlinux.lds.h
74057+++ b/include/asm-generic/vmlinux.lds.h
74058@@ -232,6 +232,7 @@
74059 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
74060 VMLINUX_SYMBOL(__start_rodata) = .; \
74061 *(.rodata) *(.rodata.*) \
74062+ *(.data..read_only) \
74063 *(__vermagic) /* Kernel version magic */ \
74064 . = ALIGN(8); \
74065 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
74066@@ -715,17 +716,18 @@
74067 * section in the linker script will go there too. @phdr should have
74068 * a leading colon.
74069 *
74070- * Note that this macros defines __per_cpu_load as an absolute symbol.
74071+ * Note that this macros defines per_cpu_load as an absolute symbol.
74072 * If there is no need to put the percpu section at a predetermined
74073 * address, use PERCPU_SECTION.
74074 */
74075 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
74076- VMLINUX_SYMBOL(__per_cpu_load) = .; \
74077- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
74078+ per_cpu_load = .; \
74079+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
74080 - LOAD_OFFSET) { \
74081+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
74082 PERCPU_INPUT(cacheline) \
74083 } phdr \
74084- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
74085+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
74086
74087 /**
74088 * PERCPU_SECTION - define output section for percpu area, simple version
74089diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
74090index 418d270..bfd2794 100644
74091--- a/include/crypto/algapi.h
74092+++ b/include/crypto/algapi.h
74093@@ -34,7 +34,7 @@ struct crypto_type {
74094 unsigned int maskclear;
74095 unsigned int maskset;
74096 unsigned int tfmsize;
74097-};
74098+} __do_const;
74099
74100 struct crypto_instance {
74101 struct crypto_alg alg;
74102diff --git a/include/drm/drmP.h b/include/drm/drmP.h
74103index b46fb45..b30d6d5 100644
74104--- a/include/drm/drmP.h
74105+++ b/include/drm/drmP.h
74106@@ -66,6 +66,7 @@
74107 #include <linux/workqueue.h>
74108 #include <linux/poll.h>
74109 #include <asm/pgalloc.h>
74110+#include <asm/local.h>
74111 #include <drm/drm.h>
74112 #include <drm/drm_sarea.h>
74113 #include <drm/drm_vma_manager.h>
74114@@ -277,10 +278,12 @@ do { \
74115 * \param cmd command.
74116 * \param arg argument.
74117 */
74118-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
74119+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
74120+ struct drm_file *file_priv);
74121+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
74122 struct drm_file *file_priv);
74123
74124-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
74125+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
74126 unsigned long arg);
74127
74128 #define DRM_IOCTL_NR(n) _IOC_NR(n)
74129@@ -296,10 +299,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
74130 struct drm_ioctl_desc {
74131 unsigned int cmd;
74132 int flags;
74133- drm_ioctl_t *func;
74134+ drm_ioctl_t func;
74135 unsigned int cmd_drv;
74136 const char *name;
74137-};
74138+} __do_const;
74139
74140 /**
74141 * Creates a driver or general drm_ioctl_desc array entry for the given
74142@@ -1027,7 +1030,7 @@ struct drm_info_list {
74143 int (*show)(struct seq_file*, void*); /** show callback */
74144 u32 driver_features; /**< Required driver features for this entry */
74145 void *data;
74146-};
74147+} __do_const;
74148
74149 /**
74150 * debugfs node structure. This structure represents a debugfs file.
74151@@ -1098,7 +1101,7 @@ struct drm_device {
74152
74153 /** \name Usage Counters */
74154 /*@{ */
74155- int open_count; /**< Outstanding files open */
74156+ local_t open_count; /**< Outstanding files open */
74157 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
74158 atomic_t vma_count; /**< Outstanding vma areas open */
74159 int buf_use; /**< Buffers in use -- cannot alloc */
74160@@ -1109,7 +1112,7 @@ struct drm_device {
74161 /*@{ */
74162 unsigned long counters;
74163 enum drm_stat_type types[15];
74164- atomic_t counts[15];
74165+ atomic_unchecked_t counts[15];
74166 /*@} */
74167
74168 struct list_head filelist;
74169diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
74170index f43d556..94d9343 100644
74171--- a/include/drm/drm_crtc_helper.h
74172+++ b/include/drm/drm_crtc_helper.h
74173@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
74174 struct drm_connector *connector);
74175 /* disable encoder when not in use - more explicit than dpms off */
74176 void (*disable)(struct drm_encoder *encoder);
74177-};
74178+} __no_const;
74179
74180 /**
74181 * drm_connector_helper_funcs - helper operations for connectors
74182diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
74183index 8a10f5c..5de7f5c 100644
74184--- a/include/drm/i915_pciids.h
74185+++ b/include/drm/i915_pciids.h
74186@@ -37,7 +37,7 @@
74187 */
74188 #define INTEL_VGA_DEVICE(id, info) { \
74189 0x8086, id, \
74190- ~0, ~0, \
74191+ PCI_ANY_ID, PCI_ANY_ID, \
74192 0x030000, 0xff0000, \
74193 (unsigned long) info }
74194
74195diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
74196index 72dcbe8..8db58d7 100644
74197--- a/include/drm/ttm/ttm_memory.h
74198+++ b/include/drm/ttm/ttm_memory.h
74199@@ -48,7 +48,7 @@
74200
74201 struct ttm_mem_shrink {
74202 int (*do_shrink) (struct ttm_mem_shrink *);
74203-};
74204+} __no_const;
74205
74206 /**
74207 * struct ttm_mem_global - Global memory accounting structure.
74208diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
74209index 4b840e8..155d235 100644
74210--- a/include/keys/asymmetric-subtype.h
74211+++ b/include/keys/asymmetric-subtype.h
74212@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
74213 /* Verify the signature on a key of this subtype (optional) */
74214 int (*verify_signature)(const struct key *key,
74215 const struct public_key_signature *sig);
74216-};
74217+} __do_const;
74218
74219 /**
74220 * asymmetric_key_subtype - Get the subtype from an asymmetric key
74221diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
74222index c1da539..1dcec55 100644
74223--- a/include/linux/atmdev.h
74224+++ b/include/linux/atmdev.h
74225@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
74226 #endif
74227
74228 struct k_atm_aal_stats {
74229-#define __HANDLE_ITEM(i) atomic_t i
74230+#define __HANDLE_ITEM(i) atomic_unchecked_t i
74231 __AAL_STAT_ITEMS
74232 #undef __HANDLE_ITEM
74233 };
74234@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
74235 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
74236 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
74237 struct module *owner;
74238-};
74239+} __do_const ;
74240
74241 struct atmphy_ops {
74242 int (*start)(struct atm_dev *dev);
74243diff --git a/include/linux/audit.h b/include/linux/audit.h
74244index 729a4d1..9b304ae 100644
74245--- a/include/linux/audit.h
74246+++ b/include/linux/audit.h
74247@@ -193,7 +193,7 @@ static inline void audit_ptrace(struct task_struct *t)
74248 extern unsigned int audit_serial(void);
74249 extern int auditsc_get_stamp(struct audit_context *ctx,
74250 struct timespec *t, unsigned int *serial);
74251-extern int audit_set_loginuid(kuid_t loginuid);
74252+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
74253
74254 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
74255 {
74256diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
74257index 7554fd4..0f86379 100644
74258--- a/include/linux/binfmts.h
74259+++ b/include/linux/binfmts.h
74260@@ -73,8 +73,10 @@ struct linux_binfmt {
74261 int (*load_binary)(struct linux_binprm *);
74262 int (*load_shlib)(struct file *);
74263 int (*core_dump)(struct coredump_params *cprm);
74264+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
74265+ void (*handle_mmap)(struct file *);
74266 unsigned long min_coredump; /* minimal dump size */
74267-};
74268+} __do_const;
74269
74270 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
74271
74272diff --git a/include/linux/bitops.h b/include/linux/bitops.h
74273index a3b6b82..2a7d758 100644
74274--- a/include/linux/bitops.h
74275+++ b/include/linux/bitops.h
74276@@ -91,7 +91,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
74277 * @word: value to rotate
74278 * @shift: bits to roll
74279 */
74280-static inline __u32 rol32(__u32 word, unsigned int shift)
74281+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
74282 {
74283 return (word << shift) | (word >> (32 - shift));
74284 }
74285@@ -101,7 +101,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
74286 * @word: value to rotate
74287 * @shift: bits to roll
74288 */
74289-static inline __u32 ror32(__u32 word, unsigned int shift)
74290+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
74291 {
74292 return (word >> shift) | (word << (32 - shift));
74293 }
74294@@ -157,7 +157,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
74295 return (__s32)(value << shift) >> shift;
74296 }
74297
74298-static inline unsigned fls_long(unsigned long l)
74299+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
74300 {
74301 if (sizeof(l) == 4)
74302 return fls(l);
74303diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
74304index 0e6f765..885bb2b 100644
74305--- a/include/linux/blkdev.h
74306+++ b/include/linux/blkdev.h
74307@@ -1537,7 +1537,7 @@ struct block_device_operations {
74308 /* this callback is with swap_lock and sometimes page table lock held */
74309 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
74310 struct module *owner;
74311-};
74312+} __do_const;
74313
74314 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
74315 unsigned long);
74316diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
74317index 7c2e030..b72475d 100644
74318--- a/include/linux/blktrace_api.h
74319+++ b/include/linux/blktrace_api.h
74320@@ -23,7 +23,7 @@ struct blk_trace {
74321 struct dentry *dir;
74322 struct dentry *dropped_file;
74323 struct dentry *msg_file;
74324- atomic_t dropped;
74325+ atomic_unchecked_t dropped;
74326 };
74327
74328 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
74329diff --git a/include/linux/cache.h b/include/linux/cache.h
74330index 4c57065..40346da 100644
74331--- a/include/linux/cache.h
74332+++ b/include/linux/cache.h
74333@@ -16,6 +16,14 @@
74334 #define __read_mostly
74335 #endif
74336
74337+#ifndef __read_only
74338+#ifdef CONFIG_PAX_KERNEXEC
74339+#error KERNEXEC requires __read_only
74340+#else
74341+#define __read_only __read_mostly
74342+#endif
74343+#endif
74344+
74345 #ifndef ____cacheline_aligned
74346 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
74347 #endif
74348diff --git a/include/linux/capability.h b/include/linux/capability.h
74349index a6ee1f9..e1ca49d 100644
74350--- a/include/linux/capability.h
74351+++ b/include/linux/capability.h
74352@@ -212,8 +212,13 @@ extern bool capable(int cap);
74353 extern bool ns_capable(struct user_namespace *ns, int cap);
74354 extern bool inode_capable(const struct inode *inode, int cap);
74355 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
74356+extern bool capable_nolog(int cap);
74357+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
74358+extern bool inode_capable_nolog(const struct inode *inode, int cap);
74359
74360 /* audit system wants to get cap info from files as well */
74361 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
74362
74363+extern int is_privileged_binary(const struct dentry *dentry);
74364+
74365 #endif /* !_LINUX_CAPABILITY_H */
74366diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
74367index 8609d57..86e4d79 100644
74368--- a/include/linux/cdrom.h
74369+++ b/include/linux/cdrom.h
74370@@ -87,7 +87,6 @@ struct cdrom_device_ops {
74371
74372 /* driver specifications */
74373 const int capability; /* capability flags */
74374- int n_minors; /* number of active minor devices */
74375 /* handle uniform packets for scsi type devices (scsi,atapi) */
74376 int (*generic_packet) (struct cdrom_device_info *,
74377 struct packet_command *);
74378diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
74379index 4ce9056..86caac6 100644
74380--- a/include/linux/cleancache.h
74381+++ b/include/linux/cleancache.h
74382@@ -31,7 +31,7 @@ struct cleancache_ops {
74383 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
74384 void (*invalidate_inode)(int, struct cleancache_filekey);
74385 void (*invalidate_fs)(int);
74386-};
74387+} __no_const;
74388
74389 extern struct cleancache_ops *
74390 cleancache_register_ops(struct cleancache_ops *ops);
74391diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
74392index 73bdb69..d66d47a 100644
74393--- a/include/linux/clk-provider.h
74394+++ b/include/linux/clk-provider.h
74395@@ -141,6 +141,7 @@ struct clk_ops {
74396 unsigned long);
74397 void (*init)(struct clk_hw *hw);
74398 };
74399+typedef struct clk_ops __no_const clk_ops_no_const;
74400
74401 /**
74402 * struct clk_init_data - holds init data that's common to all clocks and is
74403diff --git a/include/linux/compat.h b/include/linux/compat.h
74404index 345da00..b6eff26 100644
74405--- a/include/linux/compat.h
74406+++ b/include/linux/compat.h
74407@@ -313,7 +313,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
74408 compat_size_t __user *len_ptr);
74409
74410 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
74411-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
74412+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
74413 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
74414 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
74415 compat_ssize_t msgsz, int msgflg);
74416@@ -420,7 +420,7 @@ extern int compat_ptrace_request(struct task_struct *child,
74417 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
74418 compat_ulong_t addr, compat_ulong_t data);
74419 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
74420- compat_long_t addr, compat_long_t data);
74421+ compat_ulong_t addr, compat_ulong_t data);
74422
74423 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t);
74424 /*
74425diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
74426index ded4299..da50e3b 100644
74427--- a/include/linux/compiler-gcc4.h
74428+++ b/include/linux/compiler-gcc4.h
74429@@ -39,9 +39,29 @@
74430 # define __compiletime_warning(message) __attribute__((warning(message)))
74431 # define __compiletime_error(message) __attribute__((error(message)))
74432 #endif /* __CHECKER__ */
74433+
74434+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
74435+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
74436+#define __bos0(ptr) __bos((ptr), 0)
74437+#define __bos1(ptr) __bos((ptr), 1)
74438 #endif /* GCC_VERSION >= 40300 */
74439
74440 #if GCC_VERSION >= 40500
74441+
74442+#ifdef CONSTIFY_PLUGIN
74443+#define __no_const __attribute__((no_const))
74444+#define __do_const __attribute__((do_const))
74445+#endif
74446+
74447+#ifdef SIZE_OVERFLOW_PLUGIN
74448+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
74449+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
74450+#endif
74451+
74452+#ifdef LATENT_ENTROPY_PLUGIN
74453+#define __latent_entropy __attribute__((latent_entropy))
74454+#endif
74455+
74456 /*
74457 * Mark a position in code as unreachable. This can be used to
74458 * suppress control flow warnings after asm blocks that transfer
74459diff --git a/include/linux/compiler.h b/include/linux/compiler.h
74460index 92669cd..1771a15 100644
74461--- a/include/linux/compiler.h
74462+++ b/include/linux/compiler.h
74463@@ -5,11 +5,14 @@
74464
74465 #ifdef __CHECKER__
74466 # define __user __attribute__((noderef, address_space(1)))
74467+# define __force_user __force __user
74468 # define __kernel __attribute__((address_space(0)))
74469+# define __force_kernel __force __kernel
74470 # define __safe __attribute__((safe))
74471 # define __force __attribute__((force))
74472 # define __nocast __attribute__((nocast))
74473 # define __iomem __attribute__((noderef, address_space(2)))
74474+# define __force_iomem __force __iomem
74475 # define __must_hold(x) __attribute__((context(x,1,1)))
74476 # define __acquires(x) __attribute__((context(x,0,1)))
74477 # define __releases(x) __attribute__((context(x,1,0)))
74478@@ -17,20 +20,37 @@
74479 # define __release(x) __context__(x,-1)
74480 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
74481 # define __percpu __attribute__((noderef, address_space(3)))
74482+# define __force_percpu __force __percpu
74483 #ifdef CONFIG_SPARSE_RCU_POINTER
74484 # define __rcu __attribute__((noderef, address_space(4)))
74485+# define __force_rcu __force __rcu
74486 #else
74487 # define __rcu
74488+# define __force_rcu
74489 #endif
74490 extern void __chk_user_ptr(const volatile void __user *);
74491 extern void __chk_io_ptr(const volatile void __iomem *);
74492 #else
74493-# define __user
74494-# define __kernel
74495+# ifdef CHECKER_PLUGIN
74496+//# define __user
74497+//# define __force_user
74498+//# define __kernel
74499+//# define __force_kernel
74500+# else
74501+# ifdef STRUCTLEAK_PLUGIN
74502+# define __user __attribute__((user))
74503+# else
74504+# define __user
74505+# endif
74506+# define __force_user
74507+# define __kernel
74508+# define __force_kernel
74509+# endif
74510 # define __safe
74511 # define __force
74512 # define __nocast
74513 # define __iomem
74514+# define __force_iomem
74515 # define __chk_user_ptr(x) (void)0
74516 # define __chk_io_ptr(x) (void)0
74517 # define __builtin_warning(x, y...) (1)
74518@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
74519 # define __release(x) (void)0
74520 # define __cond_lock(x,c) (c)
74521 # define __percpu
74522+# define __force_percpu
74523 # define __rcu
74524+# define __force_rcu
74525 #endif
74526
74527 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
74528@@ -275,6 +297,26 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74529 # define __attribute_const__ /* unimplemented */
74530 #endif
74531
74532+#ifndef __no_const
74533+# define __no_const
74534+#endif
74535+
74536+#ifndef __do_const
74537+# define __do_const
74538+#endif
74539+
74540+#ifndef __size_overflow
74541+# define __size_overflow(...)
74542+#endif
74543+
74544+#ifndef __intentional_overflow
74545+# define __intentional_overflow(...)
74546+#endif
74547+
74548+#ifndef __latent_entropy
74549+# define __latent_entropy
74550+#endif
74551+
74552 /*
74553 * Tell gcc if a function is cold. The compiler will assume any path
74554 * directly leading to the call is unlikely.
74555@@ -284,6 +326,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74556 #define __cold
74557 #endif
74558
74559+#ifndef __alloc_size
74560+#define __alloc_size(...)
74561+#endif
74562+
74563+#ifndef __bos
74564+#define __bos(ptr, arg)
74565+#endif
74566+
74567+#ifndef __bos0
74568+#define __bos0(ptr)
74569+#endif
74570+
74571+#ifndef __bos1
74572+#define __bos1(ptr)
74573+#endif
74574+
74575 /* Simple shorthand for a section definition */
74576 #ifndef __section
74577 # define __section(S) __attribute__ ((__section__(#S)))
74578@@ -349,7 +407,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74579 * use is to mediate communication between process-level code and irq/NMI
74580 * handlers, all running on the same CPU.
74581 */
74582-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
74583+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
74584+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
74585
74586 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
74587 #ifdef CONFIG_KPROBES
74588diff --git a/include/linux/completion.h b/include/linux/completion.h
74589index 3cd574d..240dcb0 100644
74590--- a/include/linux/completion.h
74591+++ b/include/linux/completion.h
74592@@ -78,16 +78,16 @@ static inline void init_completion(struct completion *x)
74593
74594 extern void wait_for_completion(struct completion *);
74595 extern void wait_for_completion_io(struct completion *);
74596-extern int wait_for_completion_interruptible(struct completion *x);
74597-extern int wait_for_completion_killable(struct completion *x);
74598+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
74599+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
74600 extern unsigned long wait_for_completion_timeout(struct completion *x,
74601- unsigned long timeout);
74602+ unsigned long timeout) __intentional_overflow(-1);
74603 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
74604- unsigned long timeout);
74605+ unsigned long timeout) __intentional_overflow(-1);
74606 extern long wait_for_completion_interruptible_timeout(
74607- struct completion *x, unsigned long timeout);
74608+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
74609 extern long wait_for_completion_killable_timeout(
74610- struct completion *x, unsigned long timeout);
74611+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
74612 extern bool try_wait_for_completion(struct completion *x);
74613 extern bool completion_done(struct completion *x);
74614
74615diff --git a/include/linux/configfs.h b/include/linux/configfs.h
74616index 34025df..d94bbbc 100644
74617--- a/include/linux/configfs.h
74618+++ b/include/linux/configfs.h
74619@@ -125,7 +125,7 @@ struct configfs_attribute {
74620 const char *ca_name;
74621 struct module *ca_owner;
74622 umode_t ca_mode;
74623-};
74624+} __do_const;
74625
74626 /*
74627 * Users often need to create attribute structures for their configurable
74628diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
74629index fcabc42..cba5d93 100644
74630--- a/include/linux/cpufreq.h
74631+++ b/include/linux/cpufreq.h
74632@@ -167,6 +167,7 @@ struct global_attr {
74633 ssize_t (*store)(struct kobject *a, struct attribute *b,
74634 const char *c, size_t count);
74635 };
74636+typedef struct global_attr __no_const global_attr_no_const;
74637
74638 #define define_one_global_ro(_name) \
74639 static struct global_attr _name = \
74640@@ -208,7 +209,7 @@ struct cpufreq_driver {
74641 int (*suspend) (struct cpufreq_policy *policy);
74642 int (*resume) (struct cpufreq_policy *policy);
74643 struct freq_attr **attr;
74644-};
74645+} __do_const;
74646
74647 /* flags */
74648 #define CPUFREQ_STICKY 0x01 /* the driver isn't removed even if
74649diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
74650index 781addc..d1e1fe6 100644
74651--- a/include/linux/cpuidle.h
74652+++ b/include/linux/cpuidle.h
74653@@ -50,7 +50,8 @@ struct cpuidle_state {
74654 int index);
74655
74656 int (*enter_dead) (struct cpuidle_device *dev, int index);
74657-};
74658+} __do_const;
74659+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
74660
74661 /* Idle State Flags */
74662 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
74663@@ -192,7 +193,7 @@ struct cpuidle_governor {
74664 void (*reflect) (struct cpuidle_device *dev, int index);
74665
74666 struct module *owner;
74667-};
74668+} __do_const;
74669
74670 #ifdef CONFIG_CPU_IDLE
74671
74672diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
74673index d08e4d2..95fad61 100644
74674--- a/include/linux/cpumask.h
74675+++ b/include/linux/cpumask.h
74676@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
74677 }
74678
74679 /* Valid inputs for n are -1 and 0. */
74680-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74681+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
74682 {
74683 return n+1;
74684 }
74685
74686-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74687+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
74688 {
74689 return n+1;
74690 }
74691
74692-static inline unsigned int cpumask_next_and(int n,
74693+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
74694 const struct cpumask *srcp,
74695 const struct cpumask *andp)
74696 {
74697@@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
74698 *
74699 * Returns >= nr_cpu_ids if no further cpus set.
74700 */
74701-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74702+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
74703 {
74704 /* -1 is a legal arg here. */
74705 if (n != -1)
74706@@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74707 *
74708 * Returns >= nr_cpu_ids if no further cpus unset.
74709 */
74710-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74711+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
74712 {
74713 /* -1 is a legal arg here. */
74714 if (n != -1)
74715@@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74716 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
74717 }
74718
74719-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
74720+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
74721 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
74722
74723 /**
74724diff --git a/include/linux/cred.h b/include/linux/cred.h
74725index 04421e8..6bce4ef 100644
74726--- a/include/linux/cred.h
74727+++ b/include/linux/cred.h
74728@@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
74729 static inline void validate_process_creds(void)
74730 {
74731 }
74732+static inline void validate_task_creds(struct task_struct *task)
74733+{
74734+}
74735 #endif
74736
74737 /**
74738diff --git a/include/linux/crypto.h b/include/linux/crypto.h
74739index b92eadf..b4ecdc1 100644
74740--- a/include/linux/crypto.h
74741+++ b/include/linux/crypto.h
74742@@ -373,7 +373,7 @@ struct cipher_tfm {
74743 const u8 *key, unsigned int keylen);
74744 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
74745 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
74746-};
74747+} __no_const;
74748
74749 struct hash_tfm {
74750 int (*init)(struct hash_desc *desc);
74751@@ -394,13 +394,13 @@ struct compress_tfm {
74752 int (*cot_decompress)(struct crypto_tfm *tfm,
74753 const u8 *src, unsigned int slen,
74754 u8 *dst, unsigned int *dlen);
74755-};
74756+} __no_const;
74757
74758 struct rng_tfm {
74759 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
74760 unsigned int dlen);
74761 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
74762-};
74763+} __no_const;
74764
74765 #define crt_ablkcipher crt_u.ablkcipher
74766 #define crt_aead crt_u.aead
74767diff --git a/include/linux/ctype.h b/include/linux/ctype.h
74768index 653589e..4ef254a 100644
74769--- a/include/linux/ctype.h
74770+++ b/include/linux/ctype.h
74771@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
74772 * Fast implementation of tolower() for internal usage. Do not use in your
74773 * code.
74774 */
74775-static inline char _tolower(const char c)
74776+static inline unsigned char _tolower(const unsigned char c)
74777 {
74778 return c | 0x20;
74779 }
74780diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
74781index 7925bf0..d5143d2 100644
74782--- a/include/linux/decompress/mm.h
74783+++ b/include/linux/decompress/mm.h
74784@@ -77,7 +77,7 @@ static void free(void *where)
74785 * warnings when not needed (indeed large_malloc / large_free are not
74786 * needed by inflate */
74787
74788-#define malloc(a) kmalloc(a, GFP_KERNEL)
74789+#define malloc(a) kmalloc((a), GFP_KERNEL)
74790 #define free(a) kfree(a)
74791
74792 #define large_malloc(a) vmalloc(a)
74793diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
74794index 5f1ab92..39c35ae 100644
74795--- a/include/linux/devfreq.h
74796+++ b/include/linux/devfreq.h
74797@@ -114,7 +114,7 @@ struct devfreq_governor {
74798 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
74799 int (*event_handler)(struct devfreq *devfreq,
74800 unsigned int event, void *data);
74801-};
74802+} __do_const;
74803
74804 /**
74805 * struct devfreq - Device devfreq structure
74806diff --git a/include/linux/device.h b/include/linux/device.h
74807index 2a9d6ed..d14551e3 100644
74808--- a/include/linux/device.h
74809+++ b/include/linux/device.h
74810@@ -313,7 +313,7 @@ struct subsys_interface {
74811 struct list_head node;
74812 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
74813 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
74814-};
74815+} __do_const;
74816
74817 int subsys_interface_register(struct subsys_interface *sif);
74818 void subsys_interface_unregister(struct subsys_interface *sif);
74819@@ -501,7 +501,7 @@ struct device_type {
74820 void (*release)(struct device *dev);
74821
74822 const struct dev_pm_ops *pm;
74823-};
74824+} __do_const;
74825
74826 /* interface for exporting device attributes */
74827 struct device_attribute {
74828@@ -511,11 +511,12 @@ struct device_attribute {
74829 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
74830 const char *buf, size_t count);
74831 };
74832+typedef struct device_attribute __no_const device_attribute_no_const;
74833
74834 struct dev_ext_attribute {
74835 struct device_attribute attr;
74836 void *var;
74837-};
74838+} __do_const;
74839
74840 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
74841 char *buf);
74842diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
74843index 3a8d0a2..c762be2 100644
74844--- a/include/linux/dma-mapping.h
74845+++ b/include/linux/dma-mapping.h
74846@@ -54,7 +54,7 @@ struct dma_map_ops {
74847 u64 (*get_required_mask)(struct device *dev);
74848 #endif
74849 int is_phys;
74850-};
74851+} __do_const;
74852
74853 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
74854
74855diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
74856index 0bc7275..4ccbf11 100644
74857--- a/include/linux/dmaengine.h
74858+++ b/include/linux/dmaengine.h
74859@@ -1078,9 +1078,9 @@ struct dma_pinned_list {
74860 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
74861 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
74862
74863-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
74864+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
74865 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
74866-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
74867+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
74868 struct dma_pinned_list *pinned_list, struct page *page,
74869 unsigned int offset, size_t len);
74870
74871diff --git a/include/linux/efi.h b/include/linux/efi.h
74872index 094ddd0..f1dfcd3 100644
74873--- a/include/linux/efi.h
74874+++ b/include/linux/efi.h
74875@@ -745,6 +745,7 @@ struct efivar_operations {
74876 efi_set_variable_t *set_variable;
74877 efi_query_variable_store_t *query_variable_store;
74878 };
74879+typedef struct efivar_operations __no_const efivar_operations_no_const;
74880
74881 struct efivars {
74882 /*
74883diff --git a/include/linux/elf.h b/include/linux/elf.h
74884index 40a3c0e0..4c45a38 100644
74885--- a/include/linux/elf.h
74886+++ b/include/linux/elf.h
74887@@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
74888 #define elf_note elf32_note
74889 #define elf_addr_t Elf32_Off
74890 #define Elf_Half Elf32_Half
74891+#define elf_dyn Elf32_Dyn
74892
74893 #else
74894
74895@@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
74896 #define elf_note elf64_note
74897 #define elf_addr_t Elf64_Off
74898 #define Elf_Half Elf64_Half
74899+#define elf_dyn Elf64_Dyn
74900
74901 #endif
74902
74903diff --git a/include/linux/err.h b/include/linux/err.h
74904index 15f92e0..e825a8e 100644
74905--- a/include/linux/err.h
74906+++ b/include/linux/err.h
74907@@ -19,12 +19,12 @@
74908
74909 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
74910
74911-static inline void * __must_check ERR_PTR(long error)
74912+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
74913 {
74914 return (void *) error;
74915 }
74916
74917-static inline long __must_check PTR_ERR(__force const void *ptr)
74918+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
74919 {
74920 return (long) ptr;
74921 }
74922diff --git a/include/linux/extcon.h b/include/linux/extcon.h
74923index fcb51c8..bdafcf6 100644
74924--- a/include/linux/extcon.h
74925+++ b/include/linux/extcon.h
74926@@ -134,7 +134,7 @@ struct extcon_dev {
74927 /* /sys/class/extcon/.../mutually_exclusive/... */
74928 struct attribute_group attr_g_muex;
74929 struct attribute **attrs_muex;
74930- struct device_attribute *d_attrs_muex;
74931+ device_attribute_no_const *d_attrs_muex;
74932 };
74933
74934 /**
74935diff --git a/include/linux/fb.h b/include/linux/fb.h
74936index ffac70a..ca3e711 100644
74937--- a/include/linux/fb.h
74938+++ b/include/linux/fb.h
74939@@ -304,7 +304,7 @@ struct fb_ops {
74940 /* called at KDB enter and leave time to prepare the console */
74941 int (*fb_debug_enter)(struct fb_info *info);
74942 int (*fb_debug_leave)(struct fb_info *info);
74943-};
74944+} __do_const;
74945
74946 #ifdef CONFIG_FB_TILEBLITTING
74947 #define FB_TILE_CURSOR_NONE 0
74948diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
74949index 085197b..0fa6f0b 100644
74950--- a/include/linux/fdtable.h
74951+++ b/include/linux/fdtable.h
74952@@ -95,7 +95,7 @@ struct files_struct *get_files_struct(struct task_struct *);
74953 void put_files_struct(struct files_struct *fs);
74954 void reset_files_struct(struct files_struct *);
74955 int unshare_files(struct files_struct **);
74956-struct files_struct *dup_fd(struct files_struct *, int *);
74957+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
74958 void do_close_on_exec(struct files_struct *);
74959 int iterate_fd(struct files_struct *, unsigned,
74960 int (*)(const void *, struct file *, unsigned),
74961diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
74962index 8293262..2b3b8bd 100644
74963--- a/include/linux/frontswap.h
74964+++ b/include/linux/frontswap.h
74965@@ -11,7 +11,7 @@ struct frontswap_ops {
74966 int (*load)(unsigned, pgoff_t, struct page *);
74967 void (*invalidate_page)(unsigned, pgoff_t);
74968 void (*invalidate_area)(unsigned);
74969-};
74970+} __no_const;
74971
74972 extern bool frontswap_enabled;
74973 extern struct frontswap_ops *
74974diff --git a/include/linux/fs.h b/include/linux/fs.h
74975index 164d2a9..0ffa41d0 100644
74976--- a/include/linux/fs.h
74977+++ b/include/linux/fs.h
74978@@ -1552,7 +1552,8 @@ struct file_operations {
74979 long (*fallocate)(struct file *file, int mode, loff_t offset,
74980 loff_t len);
74981 int (*show_fdinfo)(struct seq_file *m, struct file *f);
74982-};
74983+} __do_const;
74984+typedef struct file_operations __no_const file_operations_no_const;
74985
74986 struct inode_operations {
74987 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
74988@@ -2747,4 +2748,14 @@ static inline bool dir_relax(struct inode *inode)
74989 return !IS_DEADDIR(inode);
74990 }
74991
74992+static inline bool is_sidechannel_device(const struct inode *inode)
74993+{
74994+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
74995+ umode_t mode = inode->i_mode;
74996+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
74997+#else
74998+ return false;
74999+#endif
75000+}
75001+
75002 #endif /* _LINUX_FS_H */
75003diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
75004index 0efc3e6..e0e1e5f 100644
75005--- a/include/linux/fs_struct.h
75006+++ b/include/linux/fs_struct.h
75007@@ -6,7 +6,7 @@
75008 #include <linux/seqlock.h>
75009
75010 struct fs_struct {
75011- int users;
75012+ atomic_t users;
75013 spinlock_t lock;
75014 seqcount_t seq;
75015 int umask;
75016diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
75017index 7823e9e..56b6f2f 100644
75018--- a/include/linux/fscache-cache.h
75019+++ b/include/linux/fscache-cache.h
75020@@ -113,7 +113,7 @@ struct fscache_operation {
75021 fscache_operation_release_t release;
75022 };
75023
75024-extern atomic_t fscache_op_debug_id;
75025+extern atomic_unchecked_t fscache_op_debug_id;
75026 extern void fscache_op_work_func(struct work_struct *work);
75027
75028 extern void fscache_enqueue_operation(struct fscache_operation *);
75029@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
75030 INIT_WORK(&op->work, fscache_op_work_func);
75031 atomic_set(&op->usage, 1);
75032 op->state = FSCACHE_OP_ST_INITIALISED;
75033- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
75034+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
75035 op->processor = processor;
75036 op->release = release;
75037 INIT_LIST_HEAD(&op->pend_link);
75038diff --git a/include/linux/fscache.h b/include/linux/fscache.h
75039index 19b4645..3b73dfc 100644
75040--- a/include/linux/fscache.h
75041+++ b/include/linux/fscache.h
75042@@ -152,7 +152,7 @@ struct fscache_cookie_def {
75043 * - this is mandatory for any object that may have data
75044 */
75045 void (*now_uncached)(void *cookie_netfs_data);
75046-};
75047+} __do_const;
75048
75049 /*
75050 * fscache cached network filesystem type
75051diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
75052index 1c804b0..1432c2b 100644
75053--- a/include/linux/fsnotify.h
75054+++ b/include/linux/fsnotify.h
75055@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
75056 struct inode *inode = file_inode(file);
75057 __u32 mask = FS_ACCESS;
75058
75059+ if (is_sidechannel_device(inode))
75060+ return;
75061+
75062 if (S_ISDIR(inode->i_mode))
75063 mask |= FS_ISDIR;
75064
75065@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
75066 struct inode *inode = file_inode(file);
75067 __u32 mask = FS_MODIFY;
75068
75069+ if (is_sidechannel_device(inode))
75070+ return;
75071+
75072 if (S_ISDIR(inode->i_mode))
75073 mask |= FS_ISDIR;
75074
75075@@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
75076 */
75077 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
75078 {
75079- return kstrdup(name, GFP_KERNEL);
75080+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
75081 }
75082
75083 /*
75084diff --git a/include/linux/genhd.h b/include/linux/genhd.h
75085index 9f3c275..8bdff5d 100644
75086--- a/include/linux/genhd.h
75087+++ b/include/linux/genhd.h
75088@@ -194,7 +194,7 @@ struct gendisk {
75089 struct kobject *slave_dir;
75090
75091 struct timer_rand_state *random;
75092- atomic_t sync_io; /* RAID */
75093+ atomic_unchecked_t sync_io; /* RAID */
75094 struct disk_events *ev;
75095 #ifdef CONFIG_BLK_DEV_INTEGRITY
75096 struct blk_integrity *integrity;
75097@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
75098 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
75099
75100 /* drivers/char/random.c */
75101-extern void add_disk_randomness(struct gendisk *disk);
75102+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
75103 extern void rand_initialize_disk(struct gendisk *disk);
75104
75105 static inline sector_t get_start_sect(struct block_device *bdev)
75106diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
75107index 023bc34..b02b46a 100644
75108--- a/include/linux/genl_magic_func.h
75109+++ b/include/linux/genl_magic_func.h
75110@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
75111 },
75112
75113 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
75114-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
75115+static struct genl_ops ZZZ_genl_ops[] = {
75116 #include GENL_MAGIC_INCLUDE_FILE
75117 };
75118
75119diff --git a/include/linux/gfp.h b/include/linux/gfp.h
75120index 9b4dd49..61fd41d 100644
75121--- a/include/linux/gfp.h
75122+++ b/include/linux/gfp.h
75123@@ -35,6 +35,13 @@ struct vm_area_struct;
75124 #define ___GFP_NO_KSWAPD 0x400000u
75125 #define ___GFP_OTHER_NODE 0x800000u
75126 #define ___GFP_WRITE 0x1000000u
75127+
75128+#ifdef CONFIG_PAX_USERCOPY_SLABS
75129+#define ___GFP_USERCOPY 0x2000000u
75130+#else
75131+#define ___GFP_USERCOPY 0
75132+#endif
75133+
75134 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
75135
75136 /*
75137@@ -92,6 +99,7 @@ struct vm_area_struct;
75138 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
75139 #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
75140 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
75141+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
75142
75143 /*
75144 * This may seem redundant, but it's a way of annotating false positives vs.
75145@@ -99,7 +107,7 @@ struct vm_area_struct;
75146 */
75147 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
75148
75149-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
75150+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
75151 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
75152
75153 /* This equals 0, but use constants in case they ever change */
75154@@ -153,6 +161,8 @@ struct vm_area_struct;
75155 /* 4GB DMA on some platforms */
75156 #define GFP_DMA32 __GFP_DMA32
75157
75158+#define GFP_USERCOPY __GFP_USERCOPY
75159+
75160 /* Convert GFP flags to their corresponding migrate type */
75161 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
75162 {
75163diff --git a/include/linux/gracl.h b/include/linux/gracl.h
75164new file mode 100644
75165index 0000000..edb2cb6
75166--- /dev/null
75167+++ b/include/linux/gracl.h
75168@@ -0,0 +1,340 @@
75169+#ifndef GR_ACL_H
75170+#define GR_ACL_H
75171+
75172+#include <linux/grdefs.h>
75173+#include <linux/resource.h>
75174+#include <linux/capability.h>
75175+#include <linux/dcache.h>
75176+#include <asm/resource.h>
75177+
75178+/* Major status information */
75179+
75180+#define GR_VERSION "grsecurity 3.0"
75181+#define GRSECURITY_VERSION 0x3000
75182+
75183+enum {
75184+ GR_SHUTDOWN = 0,
75185+ GR_ENABLE = 1,
75186+ GR_SPROLE = 2,
75187+ GR_OLDRELOAD = 3,
75188+ GR_SEGVMOD = 4,
75189+ GR_STATUS = 5,
75190+ GR_UNSPROLE = 6,
75191+ GR_PASSSET = 7,
75192+ GR_SPROLEPAM = 8,
75193+ GR_RELOAD = 9,
75194+};
75195+
75196+/* Password setup definitions
75197+ * kernel/grhash.c */
75198+enum {
75199+ GR_PW_LEN = 128,
75200+ GR_SALT_LEN = 16,
75201+ GR_SHA_LEN = 32,
75202+};
75203+
75204+enum {
75205+ GR_SPROLE_LEN = 64,
75206+};
75207+
75208+enum {
75209+ GR_NO_GLOB = 0,
75210+ GR_REG_GLOB,
75211+ GR_CREATE_GLOB
75212+};
75213+
75214+#define GR_NLIMITS 32
75215+
75216+/* Begin Data Structures */
75217+
75218+struct sprole_pw {
75219+ unsigned char *rolename;
75220+ unsigned char salt[GR_SALT_LEN];
75221+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
75222+};
75223+
75224+struct name_entry {
75225+ __u32 key;
75226+ ino_t inode;
75227+ dev_t device;
75228+ char *name;
75229+ __u16 len;
75230+ __u8 deleted;
75231+ struct name_entry *prev;
75232+ struct name_entry *next;
75233+};
75234+
75235+struct inodev_entry {
75236+ struct name_entry *nentry;
75237+ struct inodev_entry *prev;
75238+ struct inodev_entry *next;
75239+};
75240+
75241+struct acl_role_db {
75242+ struct acl_role_label **r_hash;
75243+ __u32 r_size;
75244+};
75245+
75246+struct inodev_db {
75247+ struct inodev_entry **i_hash;
75248+ __u32 i_size;
75249+};
75250+
75251+struct name_db {
75252+ struct name_entry **n_hash;
75253+ __u32 n_size;
75254+};
75255+
75256+struct crash_uid {
75257+ uid_t uid;
75258+ unsigned long expires;
75259+};
75260+
75261+struct gr_hash_struct {
75262+ void **table;
75263+ void **nametable;
75264+ void *first;
75265+ __u32 table_size;
75266+ __u32 used_size;
75267+ int type;
75268+};
75269+
75270+/* Userspace Grsecurity ACL data structures */
75271+
75272+struct acl_subject_label {
75273+ char *filename;
75274+ ino_t inode;
75275+ dev_t device;
75276+ __u32 mode;
75277+ kernel_cap_t cap_mask;
75278+ kernel_cap_t cap_lower;
75279+ kernel_cap_t cap_invert_audit;
75280+
75281+ struct rlimit res[GR_NLIMITS];
75282+ __u32 resmask;
75283+
75284+ __u8 user_trans_type;
75285+ __u8 group_trans_type;
75286+ uid_t *user_transitions;
75287+ gid_t *group_transitions;
75288+ __u16 user_trans_num;
75289+ __u16 group_trans_num;
75290+
75291+ __u32 sock_families[2];
75292+ __u32 ip_proto[8];
75293+ __u32 ip_type;
75294+ struct acl_ip_label **ips;
75295+ __u32 ip_num;
75296+ __u32 inaddr_any_override;
75297+
75298+ __u32 crashes;
75299+ unsigned long expires;
75300+
75301+ struct acl_subject_label *parent_subject;
75302+ struct gr_hash_struct *hash;
75303+ struct acl_subject_label *prev;
75304+ struct acl_subject_label *next;
75305+
75306+ struct acl_object_label **obj_hash;
75307+ __u32 obj_hash_size;
75308+ __u16 pax_flags;
75309+};
75310+
75311+struct role_allowed_ip {
75312+ __u32 addr;
75313+ __u32 netmask;
75314+
75315+ struct role_allowed_ip *prev;
75316+ struct role_allowed_ip *next;
75317+};
75318+
75319+struct role_transition {
75320+ char *rolename;
75321+
75322+ struct role_transition *prev;
75323+ struct role_transition *next;
75324+};
75325+
75326+struct acl_role_label {
75327+ char *rolename;
75328+ uid_t uidgid;
75329+ __u16 roletype;
75330+
75331+ __u16 auth_attempts;
75332+ unsigned long expires;
75333+
75334+ struct acl_subject_label *root_label;
75335+ struct gr_hash_struct *hash;
75336+
75337+ struct acl_role_label *prev;
75338+ struct acl_role_label *next;
75339+
75340+ struct role_transition *transitions;
75341+ struct role_allowed_ip *allowed_ips;
75342+ uid_t *domain_children;
75343+ __u16 domain_child_num;
75344+
75345+ umode_t umask;
75346+
75347+ struct acl_subject_label **subj_hash;
75348+ __u32 subj_hash_size;
75349+};
75350+
75351+struct user_acl_role_db {
75352+ struct acl_role_label **r_table;
75353+ __u32 num_pointers; /* Number of allocations to track */
75354+ __u32 num_roles; /* Number of roles */
75355+ __u32 num_domain_children; /* Number of domain children */
75356+ __u32 num_subjects; /* Number of subjects */
75357+ __u32 num_objects; /* Number of objects */
75358+};
75359+
75360+struct acl_object_label {
75361+ char *filename;
75362+ ino_t inode;
75363+ dev_t device;
75364+ __u32 mode;
75365+
75366+ struct acl_subject_label *nested;
75367+ struct acl_object_label *globbed;
75368+
75369+ /* next two structures not used */
75370+
75371+ struct acl_object_label *prev;
75372+ struct acl_object_label *next;
75373+};
75374+
75375+struct acl_ip_label {
75376+ char *iface;
75377+ __u32 addr;
75378+ __u32 netmask;
75379+ __u16 low, high;
75380+ __u8 mode;
75381+ __u32 type;
75382+ __u32 proto[8];
75383+
75384+ /* next two structures not used */
75385+
75386+ struct acl_ip_label *prev;
75387+ struct acl_ip_label *next;
75388+};
75389+
75390+struct gr_arg {
75391+ struct user_acl_role_db role_db;
75392+ unsigned char pw[GR_PW_LEN];
75393+ unsigned char salt[GR_SALT_LEN];
75394+ unsigned char sum[GR_SHA_LEN];
75395+ unsigned char sp_role[GR_SPROLE_LEN];
75396+ struct sprole_pw *sprole_pws;
75397+ dev_t segv_device;
75398+ ino_t segv_inode;
75399+ uid_t segv_uid;
75400+ __u16 num_sprole_pws;
75401+ __u16 mode;
75402+};
75403+
75404+struct gr_arg_wrapper {
75405+ struct gr_arg *arg;
75406+ __u32 version;
75407+ __u32 size;
75408+};
75409+
75410+struct subject_map {
75411+ struct acl_subject_label *user;
75412+ struct acl_subject_label *kernel;
75413+ struct subject_map *prev;
75414+ struct subject_map *next;
75415+};
75416+
75417+struct acl_subj_map_db {
75418+ struct subject_map **s_hash;
75419+ __u32 s_size;
75420+};
75421+
75422+struct gr_policy_state {
75423+ struct sprole_pw **acl_special_roles;
75424+ __u16 num_sprole_pws;
75425+ struct acl_role_label *kernel_role;
75426+ struct acl_role_label *role_list;
75427+ struct acl_role_label *default_role;
75428+ struct acl_role_db acl_role_set;
75429+ struct acl_subj_map_db subj_map_set;
75430+ struct name_db name_set;
75431+ struct inodev_db inodev_set;
75432+};
75433+
75434+struct gr_alloc_state {
75435+ unsigned long alloc_stack_next;
75436+ unsigned long alloc_stack_size;
75437+ void **alloc_stack;
75438+};
75439+
75440+struct gr_reload_state {
75441+ struct gr_policy_state oldpolicy;
75442+ struct gr_alloc_state oldalloc;
75443+ struct gr_policy_state newpolicy;
75444+ struct gr_alloc_state newalloc;
75445+ struct gr_policy_state *oldpolicy_ptr;
75446+ struct gr_alloc_state *oldalloc_ptr;
75447+ unsigned char oldmode;
75448+};
75449+
75450+/* End Data Structures Section */
75451+
75452+/* Hash functions generated by empirical testing by Brad Spengler
75453+ Makes good use of the low bits of the inode. Generally 0-1 times
75454+ in loop for successful match. 0-3 for unsuccessful match.
75455+ Shift/add algorithm with modulus of table size and an XOR*/
75456+
75457+static __inline__ unsigned int
75458+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
75459+{
75460+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
75461+}
75462+
75463+ static __inline__ unsigned int
75464+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
75465+{
75466+ return ((const unsigned long)userp % sz);
75467+}
75468+
75469+static __inline__ unsigned int
75470+gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
75471+{
75472+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
75473+}
75474+
75475+static __inline__ unsigned int
75476+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
75477+{
75478+ return full_name_hash((const unsigned char *)name, len) % sz;
75479+}
75480+
75481+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
75482+ subj = NULL; \
75483+ iter = 0; \
75484+ while (iter < role->subj_hash_size) { \
75485+ if (subj == NULL) \
75486+ subj = role->subj_hash[iter]; \
75487+ if (subj == NULL) { \
75488+ iter++; \
75489+ continue; \
75490+ }
75491+
75492+#define FOR_EACH_SUBJECT_END(subj,iter) \
75493+ subj = subj->next; \
75494+ if (subj == NULL) \
75495+ iter++; \
75496+ }
75497+
75498+
75499+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
75500+ subj = role->hash->first; \
75501+ while (subj != NULL) {
75502+
75503+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
75504+ subj = subj->next; \
75505+ }
75506+
75507+#endif
75508+
75509diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
75510new file mode 100644
75511index 0000000..33ebd1f
75512--- /dev/null
75513+++ b/include/linux/gracl_compat.h
75514@@ -0,0 +1,156 @@
75515+#ifndef GR_ACL_COMPAT_H
75516+#define GR_ACL_COMPAT_H
75517+
75518+#include <linux/resource.h>
75519+#include <asm/resource.h>
75520+
75521+struct sprole_pw_compat {
75522+ compat_uptr_t rolename;
75523+ unsigned char salt[GR_SALT_LEN];
75524+ unsigned char sum[GR_SHA_LEN];
75525+};
75526+
75527+struct gr_hash_struct_compat {
75528+ compat_uptr_t table;
75529+ compat_uptr_t nametable;
75530+ compat_uptr_t first;
75531+ __u32 table_size;
75532+ __u32 used_size;
75533+ int type;
75534+};
75535+
75536+struct acl_subject_label_compat {
75537+ compat_uptr_t filename;
75538+ compat_ino_t inode;
75539+ __u32 device;
75540+ __u32 mode;
75541+ kernel_cap_t cap_mask;
75542+ kernel_cap_t cap_lower;
75543+ kernel_cap_t cap_invert_audit;
75544+
75545+ struct compat_rlimit res[GR_NLIMITS];
75546+ __u32 resmask;
75547+
75548+ __u8 user_trans_type;
75549+ __u8 group_trans_type;
75550+ compat_uptr_t user_transitions;
75551+ compat_uptr_t group_transitions;
75552+ __u16 user_trans_num;
75553+ __u16 group_trans_num;
75554+
75555+ __u32 sock_families[2];
75556+ __u32 ip_proto[8];
75557+ __u32 ip_type;
75558+ compat_uptr_t ips;
75559+ __u32 ip_num;
75560+ __u32 inaddr_any_override;
75561+
75562+ __u32 crashes;
75563+ compat_ulong_t expires;
75564+
75565+ compat_uptr_t parent_subject;
75566+ compat_uptr_t hash;
75567+ compat_uptr_t prev;
75568+ compat_uptr_t next;
75569+
75570+ compat_uptr_t obj_hash;
75571+ __u32 obj_hash_size;
75572+ __u16 pax_flags;
75573+};
75574+
75575+struct role_allowed_ip_compat {
75576+ __u32 addr;
75577+ __u32 netmask;
75578+
75579+ compat_uptr_t prev;
75580+ compat_uptr_t next;
75581+};
75582+
75583+struct role_transition_compat {
75584+ compat_uptr_t rolename;
75585+
75586+ compat_uptr_t prev;
75587+ compat_uptr_t next;
75588+};
75589+
75590+struct acl_role_label_compat {
75591+ compat_uptr_t rolename;
75592+ uid_t uidgid;
75593+ __u16 roletype;
75594+
75595+ __u16 auth_attempts;
75596+ compat_ulong_t expires;
75597+
75598+ compat_uptr_t root_label;
75599+ compat_uptr_t hash;
75600+
75601+ compat_uptr_t prev;
75602+ compat_uptr_t next;
75603+
75604+ compat_uptr_t transitions;
75605+ compat_uptr_t allowed_ips;
75606+ compat_uptr_t domain_children;
75607+ __u16 domain_child_num;
75608+
75609+ umode_t umask;
75610+
75611+ compat_uptr_t subj_hash;
75612+ __u32 subj_hash_size;
75613+};
75614+
75615+struct user_acl_role_db_compat {
75616+ compat_uptr_t r_table;
75617+ __u32 num_pointers;
75618+ __u32 num_roles;
75619+ __u32 num_domain_children;
75620+ __u32 num_subjects;
75621+ __u32 num_objects;
75622+};
75623+
75624+struct acl_object_label_compat {
75625+ compat_uptr_t filename;
75626+ compat_ino_t inode;
75627+ __u32 device;
75628+ __u32 mode;
75629+
75630+ compat_uptr_t nested;
75631+ compat_uptr_t globbed;
75632+
75633+ compat_uptr_t prev;
75634+ compat_uptr_t next;
75635+};
75636+
75637+struct acl_ip_label_compat {
75638+ compat_uptr_t iface;
75639+ __u32 addr;
75640+ __u32 netmask;
75641+ __u16 low, high;
75642+ __u8 mode;
75643+ __u32 type;
75644+ __u32 proto[8];
75645+
75646+ compat_uptr_t prev;
75647+ compat_uptr_t next;
75648+};
75649+
75650+struct gr_arg_compat {
75651+ struct user_acl_role_db_compat role_db;
75652+ unsigned char pw[GR_PW_LEN];
75653+ unsigned char salt[GR_SALT_LEN];
75654+ unsigned char sum[GR_SHA_LEN];
75655+ unsigned char sp_role[GR_SPROLE_LEN];
75656+ compat_uptr_t sprole_pws;
75657+ __u32 segv_device;
75658+ compat_ino_t segv_inode;
75659+ uid_t segv_uid;
75660+ __u16 num_sprole_pws;
75661+ __u16 mode;
75662+};
75663+
75664+struct gr_arg_wrapper_compat {
75665+ compat_uptr_t arg;
75666+ __u32 version;
75667+ __u32 size;
75668+};
75669+
75670+#endif
75671diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
75672new file mode 100644
75673index 0000000..323ecf2
75674--- /dev/null
75675+++ b/include/linux/gralloc.h
75676@@ -0,0 +1,9 @@
75677+#ifndef __GRALLOC_H
75678+#define __GRALLOC_H
75679+
75680+void acl_free_all(void);
75681+int acl_alloc_stack_init(unsigned long size);
75682+void *acl_alloc(unsigned long len);
75683+void *acl_alloc_num(unsigned long num, unsigned long len);
75684+
75685+#endif
75686diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
75687new file mode 100644
75688index 0000000..be66033
75689--- /dev/null
75690+++ b/include/linux/grdefs.h
75691@@ -0,0 +1,140 @@
75692+#ifndef GRDEFS_H
75693+#define GRDEFS_H
75694+
75695+/* Begin grsecurity status declarations */
75696+
75697+enum {
75698+ GR_READY = 0x01,
75699+ GR_STATUS_INIT = 0x00 // disabled state
75700+};
75701+
75702+/* Begin ACL declarations */
75703+
75704+/* Role flags */
75705+
75706+enum {
75707+ GR_ROLE_USER = 0x0001,
75708+ GR_ROLE_GROUP = 0x0002,
75709+ GR_ROLE_DEFAULT = 0x0004,
75710+ GR_ROLE_SPECIAL = 0x0008,
75711+ GR_ROLE_AUTH = 0x0010,
75712+ GR_ROLE_NOPW = 0x0020,
75713+ GR_ROLE_GOD = 0x0040,
75714+ GR_ROLE_LEARN = 0x0080,
75715+ GR_ROLE_TPE = 0x0100,
75716+ GR_ROLE_DOMAIN = 0x0200,
75717+ GR_ROLE_PAM = 0x0400,
75718+ GR_ROLE_PERSIST = 0x0800
75719+};
75720+
75721+/* ACL Subject and Object mode flags */
75722+enum {
75723+ GR_DELETED = 0x80000000
75724+};
75725+
75726+/* ACL Object-only mode flags */
75727+enum {
75728+ GR_READ = 0x00000001,
75729+ GR_APPEND = 0x00000002,
75730+ GR_WRITE = 0x00000004,
75731+ GR_EXEC = 0x00000008,
75732+ GR_FIND = 0x00000010,
75733+ GR_INHERIT = 0x00000020,
75734+ GR_SETID = 0x00000040,
75735+ GR_CREATE = 0x00000080,
75736+ GR_DELETE = 0x00000100,
75737+ GR_LINK = 0x00000200,
75738+ GR_AUDIT_READ = 0x00000400,
75739+ GR_AUDIT_APPEND = 0x00000800,
75740+ GR_AUDIT_WRITE = 0x00001000,
75741+ GR_AUDIT_EXEC = 0x00002000,
75742+ GR_AUDIT_FIND = 0x00004000,
75743+ GR_AUDIT_INHERIT= 0x00008000,
75744+ GR_AUDIT_SETID = 0x00010000,
75745+ GR_AUDIT_CREATE = 0x00020000,
75746+ GR_AUDIT_DELETE = 0x00040000,
75747+ GR_AUDIT_LINK = 0x00080000,
75748+ GR_PTRACERD = 0x00100000,
75749+ GR_NOPTRACE = 0x00200000,
75750+ GR_SUPPRESS = 0x00400000,
75751+ GR_NOLEARN = 0x00800000,
75752+ GR_INIT_TRANSFER= 0x01000000
75753+};
75754+
75755+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
75756+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
75757+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
75758+
75759+/* ACL subject-only mode flags */
75760+enum {
75761+ GR_KILL = 0x00000001,
75762+ GR_VIEW = 0x00000002,
75763+ GR_PROTECTED = 0x00000004,
75764+ GR_LEARN = 0x00000008,
75765+ GR_OVERRIDE = 0x00000010,
75766+ /* just a placeholder, this mode is only used in userspace */
75767+ GR_DUMMY = 0x00000020,
75768+ GR_PROTSHM = 0x00000040,
75769+ GR_KILLPROC = 0x00000080,
75770+ GR_KILLIPPROC = 0x00000100,
75771+ /* just a placeholder, this mode is only used in userspace */
75772+ GR_NOTROJAN = 0x00000200,
75773+ GR_PROTPROCFD = 0x00000400,
75774+ GR_PROCACCT = 0x00000800,
75775+ GR_RELAXPTRACE = 0x00001000,
75776+ //GR_NESTED = 0x00002000,
75777+ GR_INHERITLEARN = 0x00004000,
75778+ GR_PROCFIND = 0x00008000,
75779+ GR_POVERRIDE = 0x00010000,
75780+ GR_KERNELAUTH = 0x00020000,
75781+ GR_ATSECURE = 0x00040000,
75782+ GR_SHMEXEC = 0x00080000
75783+};
75784+
75785+enum {
75786+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
75787+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
75788+ GR_PAX_ENABLE_MPROTECT = 0x0004,
75789+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
75790+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
75791+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
75792+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
75793+ GR_PAX_DISABLE_MPROTECT = 0x0400,
75794+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
75795+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
75796+};
75797+
75798+enum {
75799+ GR_ID_USER = 0x01,
75800+ GR_ID_GROUP = 0x02,
75801+};
75802+
75803+enum {
75804+ GR_ID_ALLOW = 0x01,
75805+ GR_ID_DENY = 0x02,
75806+};
75807+
75808+#define GR_CRASH_RES 31
75809+#define GR_UIDTABLE_MAX 500
75810+
75811+/* begin resource learning section */
75812+enum {
75813+ GR_RLIM_CPU_BUMP = 60,
75814+ GR_RLIM_FSIZE_BUMP = 50000,
75815+ GR_RLIM_DATA_BUMP = 10000,
75816+ GR_RLIM_STACK_BUMP = 1000,
75817+ GR_RLIM_CORE_BUMP = 10000,
75818+ GR_RLIM_RSS_BUMP = 500000,
75819+ GR_RLIM_NPROC_BUMP = 1,
75820+ GR_RLIM_NOFILE_BUMP = 5,
75821+ GR_RLIM_MEMLOCK_BUMP = 50000,
75822+ GR_RLIM_AS_BUMP = 500000,
75823+ GR_RLIM_LOCKS_BUMP = 2,
75824+ GR_RLIM_SIGPENDING_BUMP = 5,
75825+ GR_RLIM_MSGQUEUE_BUMP = 10000,
75826+ GR_RLIM_NICE_BUMP = 1,
75827+ GR_RLIM_RTPRIO_BUMP = 1,
75828+ GR_RLIM_RTTIME_BUMP = 1000000
75829+};
75830+
75831+#endif
75832diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
75833new file mode 100644
75834index 0000000..d25522e
75835--- /dev/null
75836+++ b/include/linux/grinternal.h
75837@@ -0,0 +1,229 @@
75838+#ifndef __GRINTERNAL_H
75839+#define __GRINTERNAL_H
75840+
75841+#ifdef CONFIG_GRKERNSEC
75842+
75843+#include <linux/fs.h>
75844+#include <linux/mnt_namespace.h>
75845+#include <linux/nsproxy.h>
75846+#include <linux/gracl.h>
75847+#include <linux/grdefs.h>
75848+#include <linux/grmsg.h>
75849+
75850+void gr_add_learn_entry(const char *fmt, ...)
75851+ __attribute__ ((format (printf, 1, 2)));
75852+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
75853+ const struct vfsmount *mnt);
75854+__u32 gr_check_create(const struct dentry *new_dentry,
75855+ const struct dentry *parent,
75856+ const struct vfsmount *mnt, const __u32 mode);
75857+int gr_check_protected_task(const struct task_struct *task);
75858+__u32 to_gr_audit(const __u32 reqmode);
75859+int gr_set_acls(const int type);
75860+int gr_acl_is_enabled(void);
75861+char gr_roletype_to_char(void);
75862+
75863+void gr_handle_alertkill(struct task_struct *task);
75864+char *gr_to_filename(const struct dentry *dentry,
75865+ const struct vfsmount *mnt);
75866+char *gr_to_filename1(const struct dentry *dentry,
75867+ const struct vfsmount *mnt);
75868+char *gr_to_filename2(const struct dentry *dentry,
75869+ const struct vfsmount *mnt);
75870+char *gr_to_filename3(const struct dentry *dentry,
75871+ const struct vfsmount *mnt);
75872+
75873+extern int grsec_enable_ptrace_readexec;
75874+extern int grsec_enable_harden_ptrace;
75875+extern int grsec_enable_link;
75876+extern int grsec_enable_fifo;
75877+extern int grsec_enable_execve;
75878+extern int grsec_enable_shm;
75879+extern int grsec_enable_execlog;
75880+extern int grsec_enable_signal;
75881+extern int grsec_enable_audit_ptrace;
75882+extern int grsec_enable_forkfail;
75883+extern int grsec_enable_time;
75884+extern int grsec_enable_rofs;
75885+extern int grsec_deny_new_usb;
75886+extern int grsec_enable_chroot_shmat;
75887+extern int grsec_enable_chroot_mount;
75888+extern int grsec_enable_chroot_double;
75889+extern int grsec_enable_chroot_pivot;
75890+extern int grsec_enable_chroot_chdir;
75891+extern int grsec_enable_chroot_chmod;
75892+extern int grsec_enable_chroot_mknod;
75893+extern int grsec_enable_chroot_fchdir;
75894+extern int grsec_enable_chroot_nice;
75895+extern int grsec_enable_chroot_execlog;
75896+extern int grsec_enable_chroot_caps;
75897+extern int grsec_enable_chroot_sysctl;
75898+extern int grsec_enable_chroot_unix;
75899+extern int grsec_enable_symlinkown;
75900+extern kgid_t grsec_symlinkown_gid;
75901+extern int grsec_enable_tpe;
75902+extern kgid_t grsec_tpe_gid;
75903+extern int grsec_enable_tpe_all;
75904+extern int grsec_enable_tpe_invert;
75905+extern int grsec_enable_socket_all;
75906+extern kgid_t grsec_socket_all_gid;
75907+extern int grsec_enable_socket_client;
75908+extern kgid_t grsec_socket_client_gid;
75909+extern int grsec_enable_socket_server;
75910+extern kgid_t grsec_socket_server_gid;
75911+extern kgid_t grsec_audit_gid;
75912+extern int grsec_enable_group;
75913+extern int grsec_enable_log_rwxmaps;
75914+extern int grsec_enable_mount;
75915+extern int grsec_enable_chdir;
75916+extern int grsec_resource_logging;
75917+extern int grsec_enable_blackhole;
75918+extern int grsec_lastack_retries;
75919+extern int grsec_enable_brute;
75920+extern int grsec_enable_harden_ipc;
75921+extern int grsec_lock;
75922+
75923+extern spinlock_t grsec_alert_lock;
75924+extern unsigned long grsec_alert_wtime;
75925+extern unsigned long grsec_alert_fyet;
75926+
75927+extern spinlock_t grsec_audit_lock;
75928+
75929+extern rwlock_t grsec_exec_file_lock;
75930+
75931+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
75932+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
75933+ (tsk)->exec_file->f_path.mnt) : "/")
75934+
75935+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
75936+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
75937+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
75938+
75939+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
75940+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
75941+ (tsk)->exec_file->f_path.mnt) : "/")
75942+
75943+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
75944+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
75945+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
75946+
75947+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
75948+
75949+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
75950+
75951+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
75952+{
75953+ if (file1 && file2) {
75954+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
75955+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
75956+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
75957+ return true;
75958+ }
75959+
75960+ return false;
75961+}
75962+
75963+#define GR_CHROOT_CAPS {{ \
75964+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
75965+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
75966+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
75967+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
75968+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
75969+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
75970+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
75971+
75972+#define security_learn(normal_msg,args...) \
75973+({ \
75974+ read_lock(&grsec_exec_file_lock); \
75975+ gr_add_learn_entry(normal_msg "\n", ## args); \
75976+ read_unlock(&grsec_exec_file_lock); \
75977+})
75978+
75979+enum {
75980+ GR_DO_AUDIT,
75981+ GR_DONT_AUDIT,
75982+ /* used for non-audit messages that we shouldn't kill the task on */
75983+ GR_DONT_AUDIT_GOOD
75984+};
75985+
75986+enum {
75987+ GR_TTYSNIFF,
75988+ GR_RBAC,
75989+ GR_RBAC_STR,
75990+ GR_STR_RBAC,
75991+ GR_RBAC_MODE2,
75992+ GR_RBAC_MODE3,
75993+ GR_FILENAME,
75994+ GR_SYSCTL_HIDDEN,
75995+ GR_NOARGS,
75996+ GR_ONE_INT,
75997+ GR_ONE_INT_TWO_STR,
75998+ GR_ONE_STR,
75999+ GR_STR_INT,
76000+ GR_TWO_STR_INT,
76001+ GR_TWO_INT,
76002+ GR_TWO_U64,
76003+ GR_THREE_INT,
76004+ GR_FIVE_INT_TWO_STR,
76005+ GR_TWO_STR,
76006+ GR_THREE_STR,
76007+ GR_FOUR_STR,
76008+ GR_STR_FILENAME,
76009+ GR_FILENAME_STR,
76010+ GR_FILENAME_TWO_INT,
76011+ GR_FILENAME_TWO_INT_STR,
76012+ GR_TEXTREL,
76013+ GR_PTRACE,
76014+ GR_RESOURCE,
76015+ GR_CAP,
76016+ GR_SIG,
76017+ GR_SIG2,
76018+ GR_CRASH1,
76019+ GR_CRASH2,
76020+ GR_PSACCT,
76021+ GR_RWXMAP,
76022+ GR_RWXMAPVMA
76023+};
76024+
76025+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
76026+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
76027+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
76028+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
76029+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
76030+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
76031+#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)
76032+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
76033+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
76034+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
76035+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
76036+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
76037+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
76038+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
76039+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
76040+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
76041+#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)
76042+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
76043+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
76044+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
76045+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
76046+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
76047+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
76048+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
76049+#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)
76050+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
76051+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
76052+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
76053+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
76054+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
76055+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
76056+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
76057+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
76058+#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)
76059+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
76060+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
76061+
76062+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
76063+
76064+#endif
76065+
76066+#endif
76067diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
76068new file mode 100644
76069index 0000000..195cbe4
76070--- /dev/null
76071+++ b/include/linux/grmsg.h
76072@@ -0,0 +1,115 @@
76073+#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"
76074+#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"
76075+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
76076+#define GR_STOPMOD_MSG "denied modification of module state by "
76077+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
76078+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
76079+#define GR_IOPERM_MSG "denied use of ioperm() by "
76080+#define GR_IOPL_MSG "denied use of iopl() by "
76081+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
76082+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
76083+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
76084+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
76085+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
76086+#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"
76087+#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"
76088+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
76089+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
76090+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
76091+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
76092+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
76093+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
76094+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
76095+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
76096+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
76097+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
76098+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
76099+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
76100+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
76101+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
76102+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
76103+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
76104+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
76105+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
76106+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
76107+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
76108+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
76109+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
76110+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
76111+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
76112+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
76113+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
76114+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
76115+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
76116+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
76117+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
76118+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
76119+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
76120+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
76121+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
76122+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
76123+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
76124+#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"
76125+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
76126+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
76127+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
76128+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
76129+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
76130+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
76131+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
76132+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
76133+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
76134+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
76135+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
76136+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
76137+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
76138+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
76139+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
76140+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
76141+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
76142+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
76143+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
76144+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
76145+#define GR_FAILFORK_MSG "failed fork with errno %s by "
76146+#define GR_NICE_CHROOT_MSG "denied priority change by "
76147+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
76148+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
76149+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
76150+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
76151+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
76152+#define GR_TIME_MSG "time set by "
76153+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
76154+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
76155+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
76156+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
76157+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
76158+#define GR_BIND_MSG "denied bind() by "
76159+#define GR_CONNECT_MSG "denied connect() by "
76160+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
76161+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
76162+#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"
76163+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
76164+#define GR_CAP_ACL_MSG "use of %s denied for "
76165+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
76166+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
76167+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
76168+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
76169+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
76170+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
76171+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
76172+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
76173+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
76174+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
76175+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
76176+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
76177+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
76178+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
76179+#define GR_VM86_MSG "denied use of vm86 by "
76180+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
76181+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
76182+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
76183+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
76184+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
76185+#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 "
76186+#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 "
76187+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
76188diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
76189new file mode 100644
76190index 0000000..d8b5b48
76191--- /dev/null
76192+++ b/include/linux/grsecurity.h
76193@@ -0,0 +1,245 @@
76194+#ifndef GR_SECURITY_H
76195+#define GR_SECURITY_H
76196+#include <linux/fs.h>
76197+#include <linux/fs_struct.h>
76198+#include <linux/binfmts.h>
76199+#include <linux/gracl.h>
76200+
76201+/* notify of brain-dead configs */
76202+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
76203+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
76204+#endif
76205+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
76206+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
76207+#endif
76208+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
76209+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
76210+#endif
76211+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
76212+#error "CONFIG_PAX enabled, but no PaX options are enabled."
76213+#endif
76214+
76215+int gr_handle_new_usb(void);
76216+
76217+void gr_handle_brute_attach(int dumpable);
76218+void gr_handle_brute_check(void);
76219+void gr_handle_kernel_exploit(void);
76220+
76221+char gr_roletype_to_char(void);
76222+
76223+int gr_acl_enable_at_secure(void);
76224+
76225+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
76226+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
76227+
76228+void gr_del_task_from_ip_table(struct task_struct *p);
76229+
76230+int gr_pid_is_chrooted(struct task_struct *p);
76231+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
76232+int gr_handle_chroot_nice(void);
76233+int gr_handle_chroot_sysctl(const int op);
76234+int gr_handle_chroot_setpriority(struct task_struct *p,
76235+ const int niceval);
76236+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
76237+int gr_handle_chroot_chroot(const struct dentry *dentry,
76238+ const struct vfsmount *mnt);
76239+void gr_handle_chroot_chdir(const struct path *path);
76240+int gr_handle_chroot_chmod(const struct dentry *dentry,
76241+ const struct vfsmount *mnt, const int mode);
76242+int gr_handle_chroot_mknod(const struct dentry *dentry,
76243+ const struct vfsmount *mnt, const int mode);
76244+int gr_handle_chroot_mount(const struct dentry *dentry,
76245+ const struct vfsmount *mnt,
76246+ const char *dev_name);
76247+int gr_handle_chroot_pivot(void);
76248+int gr_handle_chroot_unix(const pid_t pid);
76249+
76250+int gr_handle_rawio(const struct inode *inode);
76251+
76252+void gr_handle_ioperm(void);
76253+void gr_handle_iopl(void);
76254+
76255+umode_t gr_acl_umask(void);
76256+
76257+int gr_tpe_allow(const struct file *file);
76258+
76259+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
76260+void gr_clear_chroot_entries(struct task_struct *task);
76261+
76262+void gr_log_forkfail(const int retval);
76263+void gr_log_timechange(void);
76264+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
76265+void gr_log_chdir(const struct dentry *dentry,
76266+ const struct vfsmount *mnt);
76267+void gr_log_chroot_exec(const struct dentry *dentry,
76268+ const struct vfsmount *mnt);
76269+void gr_log_remount(const char *devname, const int retval);
76270+void gr_log_unmount(const char *devname, const int retval);
76271+void gr_log_mount(const char *from, const char *to, const int retval);
76272+void gr_log_textrel(struct vm_area_struct *vma);
76273+void gr_log_ptgnustack(struct file *file);
76274+void gr_log_rwxmmap(struct file *file);
76275+void gr_log_rwxmprotect(struct vm_area_struct *vma);
76276+
76277+int gr_handle_follow_link(const struct inode *parent,
76278+ const struct inode *inode,
76279+ const struct dentry *dentry,
76280+ const struct vfsmount *mnt);
76281+int gr_handle_fifo(const struct dentry *dentry,
76282+ const struct vfsmount *mnt,
76283+ const struct dentry *dir, const int flag,
76284+ const int acc_mode);
76285+int gr_handle_hardlink(const struct dentry *dentry,
76286+ const struct vfsmount *mnt,
76287+ struct inode *inode,
76288+ const int mode, const struct filename *to);
76289+
76290+int gr_is_capable(const int cap);
76291+int gr_is_capable_nolog(const int cap);
76292+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76293+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
76294+
76295+void gr_copy_label(struct task_struct *tsk);
76296+void gr_handle_crash(struct task_struct *task, const int sig);
76297+int gr_handle_signal(const struct task_struct *p, const int sig);
76298+int gr_check_crash_uid(const kuid_t uid);
76299+int gr_check_protected_task(const struct task_struct *task);
76300+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
76301+int gr_acl_handle_mmap(const struct file *file,
76302+ const unsigned long prot);
76303+int gr_acl_handle_mprotect(const struct file *file,
76304+ const unsigned long prot);
76305+int gr_check_hidden_task(const struct task_struct *tsk);
76306+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
76307+ const struct vfsmount *mnt);
76308+__u32 gr_acl_handle_utime(const struct dentry *dentry,
76309+ const struct vfsmount *mnt);
76310+__u32 gr_acl_handle_access(const struct dentry *dentry,
76311+ const struct vfsmount *mnt, const int fmode);
76312+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
76313+ const struct vfsmount *mnt, umode_t *mode);
76314+__u32 gr_acl_handle_chown(const struct dentry *dentry,
76315+ const struct vfsmount *mnt);
76316+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
76317+ const struct vfsmount *mnt);
76318+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
76319+ const struct vfsmount *mnt);
76320+int gr_handle_ptrace(struct task_struct *task, const long request);
76321+int gr_handle_proc_ptrace(struct task_struct *task);
76322+__u32 gr_acl_handle_execve(const struct dentry *dentry,
76323+ const struct vfsmount *mnt);
76324+int gr_check_crash_exec(const struct file *filp);
76325+int gr_acl_is_enabled(void);
76326+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
76327+ const kgid_t gid);
76328+int gr_set_proc_label(const struct dentry *dentry,
76329+ const struct vfsmount *mnt,
76330+ const int unsafe_flags);
76331+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
76332+ const struct vfsmount *mnt);
76333+__u32 gr_acl_handle_open(const struct dentry *dentry,
76334+ const struct vfsmount *mnt, int acc_mode);
76335+__u32 gr_acl_handle_creat(const struct dentry *dentry,
76336+ const struct dentry *p_dentry,
76337+ const struct vfsmount *p_mnt,
76338+ int open_flags, int acc_mode, const int imode);
76339+void gr_handle_create(const struct dentry *dentry,
76340+ const struct vfsmount *mnt);
76341+void gr_handle_proc_create(const struct dentry *dentry,
76342+ const struct inode *inode);
76343+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
76344+ const struct dentry *parent_dentry,
76345+ const struct vfsmount *parent_mnt,
76346+ const int mode);
76347+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
76348+ const struct dentry *parent_dentry,
76349+ const struct vfsmount *parent_mnt);
76350+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
76351+ const struct vfsmount *mnt);
76352+void gr_handle_delete(const ino_t ino, const dev_t dev);
76353+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
76354+ const struct vfsmount *mnt);
76355+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
76356+ const struct dentry *parent_dentry,
76357+ const struct vfsmount *parent_mnt,
76358+ const struct filename *from);
76359+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
76360+ const struct dentry *parent_dentry,
76361+ const struct vfsmount *parent_mnt,
76362+ const struct dentry *old_dentry,
76363+ const struct vfsmount *old_mnt, const struct filename *to);
76364+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
76365+int gr_acl_handle_rename(struct dentry *new_dentry,
76366+ struct dentry *parent_dentry,
76367+ const struct vfsmount *parent_mnt,
76368+ struct dentry *old_dentry,
76369+ struct inode *old_parent_inode,
76370+ struct vfsmount *old_mnt, const struct filename *newname);
76371+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76372+ struct dentry *old_dentry,
76373+ struct dentry *new_dentry,
76374+ struct vfsmount *mnt, const __u8 replace);
76375+__u32 gr_check_link(const struct dentry *new_dentry,
76376+ const struct dentry *parent_dentry,
76377+ const struct vfsmount *parent_mnt,
76378+ const struct dentry *old_dentry,
76379+ const struct vfsmount *old_mnt);
76380+int gr_acl_handle_filldir(const struct file *file, const char *name,
76381+ const unsigned int namelen, const ino_t ino);
76382+
76383+__u32 gr_acl_handle_unix(const struct dentry *dentry,
76384+ const struct vfsmount *mnt);
76385+void gr_acl_handle_exit(void);
76386+void gr_acl_handle_psacct(struct task_struct *task, const long code);
76387+int gr_acl_handle_procpidmem(const struct task_struct *task);
76388+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
76389+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
76390+void gr_audit_ptrace(struct task_struct *task);
76391+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
76392+void gr_put_exec_file(struct task_struct *task);
76393+
76394+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
76395+
76396+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
76397+extern void gr_learn_resource(const struct task_struct *task, const int res,
76398+ const unsigned long wanted, const int gt);
76399+#else
76400+static inline void gr_learn_resource(const struct task_struct *task, const int res,
76401+ const unsigned long wanted, const int gt)
76402+{
76403+}
76404+#endif
76405+
76406+#ifdef CONFIG_GRKERNSEC_RESLOG
76407+extern void gr_log_resource(const struct task_struct *task, const int res,
76408+ const unsigned long wanted, const int gt);
76409+#else
76410+static inline void gr_log_resource(const struct task_struct *task, const int res,
76411+ const unsigned long wanted, const int gt)
76412+{
76413+}
76414+#endif
76415+
76416+#ifdef CONFIG_GRKERNSEC
76417+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
76418+void gr_handle_vm86(void);
76419+void gr_handle_mem_readwrite(u64 from, u64 to);
76420+
76421+void gr_log_badprocpid(const char *entry);
76422+
76423+extern int grsec_enable_dmesg;
76424+extern int grsec_disable_privio;
76425+
76426+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
76427+extern kgid_t grsec_proc_gid;
76428+#endif
76429+
76430+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76431+extern int grsec_enable_chroot_findtask;
76432+#endif
76433+#ifdef CONFIG_GRKERNSEC_SETXID
76434+extern int grsec_enable_setxid;
76435+#endif
76436+#endif
76437+
76438+#endif
76439diff --git a/include/linux/grsock.h b/include/linux/grsock.h
76440new file mode 100644
76441index 0000000..e7ffaaf
76442--- /dev/null
76443+++ b/include/linux/grsock.h
76444@@ -0,0 +1,19 @@
76445+#ifndef __GRSOCK_H
76446+#define __GRSOCK_H
76447+
76448+extern void gr_attach_curr_ip(const struct sock *sk);
76449+extern int gr_handle_sock_all(const int family, const int type,
76450+ const int protocol);
76451+extern int gr_handle_sock_server(const struct sockaddr *sck);
76452+extern int gr_handle_sock_server_other(const struct sock *sck);
76453+extern int gr_handle_sock_client(const struct sockaddr *sck);
76454+extern int gr_search_connect(struct socket * sock,
76455+ struct sockaddr_in * addr);
76456+extern int gr_search_bind(struct socket * sock,
76457+ struct sockaddr_in * addr);
76458+extern int gr_search_listen(struct socket * sock);
76459+extern int gr_search_accept(struct socket * sock);
76460+extern int gr_search_socket(const int domain, const int type,
76461+ const int protocol);
76462+
76463+#endif
76464diff --git a/include/linux/highmem.h b/include/linux/highmem.h
76465index 7fb31da..08b5114 100644
76466--- a/include/linux/highmem.h
76467+++ b/include/linux/highmem.h
76468@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
76469 kunmap_atomic(kaddr);
76470 }
76471
76472+static inline void sanitize_highpage(struct page *page)
76473+{
76474+ void *kaddr;
76475+ unsigned long flags;
76476+
76477+ local_irq_save(flags);
76478+ kaddr = kmap_atomic(page);
76479+ clear_page(kaddr);
76480+ kunmap_atomic(kaddr);
76481+ local_irq_restore(flags);
76482+}
76483+
76484 static inline void zero_user_segments(struct page *page,
76485 unsigned start1, unsigned end1,
76486 unsigned start2, unsigned end2)
76487diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
76488index 1c7b89a..7dda400 100644
76489--- a/include/linux/hwmon-sysfs.h
76490+++ b/include/linux/hwmon-sysfs.h
76491@@ -25,7 +25,8 @@
76492 struct sensor_device_attribute{
76493 struct device_attribute dev_attr;
76494 int index;
76495-};
76496+} __do_const;
76497+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
76498 #define to_sensor_dev_attr(_dev_attr) \
76499 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
76500
76501@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
76502 struct device_attribute dev_attr;
76503 u8 index;
76504 u8 nr;
76505-};
76506+} __do_const;
76507+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
76508 #define to_sensor_dev_attr_2(_dev_attr) \
76509 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
76510
76511diff --git a/include/linux/i2c.h b/include/linux/i2c.h
76512index 2ab11dc..663a3f2 100644
76513--- a/include/linux/i2c.h
76514+++ b/include/linux/i2c.h
76515@@ -366,6 +366,7 @@ struct i2c_algorithm {
76516 /* To determine what the adapter supports */
76517 u32 (*functionality) (struct i2c_adapter *);
76518 };
76519+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
76520
76521 /**
76522 * struct i2c_bus_recovery_info - I2C bus recovery information
76523diff --git a/include/linux/i2o.h b/include/linux/i2o.h
76524index d23c3c2..eb63c81 100644
76525--- a/include/linux/i2o.h
76526+++ b/include/linux/i2o.h
76527@@ -565,7 +565,7 @@ struct i2o_controller {
76528 struct i2o_device *exec; /* Executive */
76529 #if BITS_PER_LONG == 64
76530 spinlock_t context_list_lock; /* lock for context_list */
76531- atomic_t context_list_counter; /* needed for unique contexts */
76532+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
76533 struct list_head context_list; /* list of context id's
76534 and pointers */
76535 #endif
76536diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
76537index aff7ad8..3942bbd 100644
76538--- a/include/linux/if_pppox.h
76539+++ b/include/linux/if_pppox.h
76540@@ -76,7 +76,7 @@ struct pppox_proto {
76541 int (*ioctl)(struct socket *sock, unsigned int cmd,
76542 unsigned long arg);
76543 struct module *owner;
76544-};
76545+} __do_const;
76546
76547 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
76548 extern void unregister_pppox_proto(int proto_num);
76549diff --git a/include/linux/init.h b/include/linux/init.h
76550index f1c27a71..7d6010e 100644
76551--- a/include/linux/init.h
76552+++ b/include/linux/init.h
76553@@ -39,9 +39,17 @@
76554 * Also note, that this data cannot be "const".
76555 */
76556
76557+#define add_init_latent_entropy __latent_entropy
76558+
76559+#ifdef CONFIG_MEMORY_HOTPLUG
76560+#define add_meminit_latent_entropy
76561+#else
76562+#define add_meminit_latent_entropy __latent_entropy
76563+#endif
76564+
76565 /* These are for everybody (although not all archs will actually
76566 discard it in modules) */
76567-#define __init __section(.init.text) __cold notrace
76568+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
76569 #define __initdata __section(.init.data)
76570 #define __initconst __constsection(.init.rodata)
76571 #define __exitdata __section(.exit.data)
76572@@ -102,7 +110,7 @@
76573 #define __cpuexitconst
76574
76575 /* Used for MEMORY_HOTPLUG */
76576-#define __meminit __section(.meminit.text) __cold notrace
76577+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
76578 #define __meminitdata __section(.meminit.data)
76579 #define __meminitconst __constsection(.meminit.rodata)
76580 #define __memexit __section(.memexit.text) __exitused __cold notrace
76581diff --git a/include/linux/init_task.h b/include/linux/init_task.h
76582index 5cd0f09..c9f67cc 100644
76583--- a/include/linux/init_task.h
76584+++ b/include/linux/init_task.h
76585@@ -154,6 +154,12 @@ extern struct task_group root_task_group;
76586
76587 #define INIT_TASK_COMM "swapper"
76588
76589+#ifdef CONFIG_X86
76590+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
76591+#else
76592+#define INIT_TASK_THREAD_INFO
76593+#endif
76594+
76595 /*
76596 * INIT_TASK is used to set up the first task table, touch at
76597 * your own risk!. Base=0, limit=0x1fffff (=2MB)
76598@@ -193,6 +199,7 @@ extern struct task_group root_task_group;
76599 RCU_POINTER_INITIALIZER(cred, &init_cred), \
76600 .comm = INIT_TASK_COMM, \
76601 .thread = INIT_THREAD, \
76602+ INIT_TASK_THREAD_INFO \
76603 .fs = &init_fs, \
76604 .files = &init_files, \
76605 .signal = &init_signals, \
76606diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
76607index 5e865b5..71bd258 100644
76608--- a/include/linux/interrupt.h
76609+++ b/include/linux/interrupt.h
76610@@ -361,7 +361,7 @@ enum
76611 /* map softirq index to softirq name. update 'softirq_to_name' in
76612 * kernel/softirq.c when adding a new softirq.
76613 */
76614-extern char *softirq_to_name[NR_SOFTIRQS];
76615+extern const char * const softirq_to_name[NR_SOFTIRQS];
76616
76617 /* softirq mask and active fields moved to irq_cpustat_t in
76618 * asm/hardirq.h to get better cache usage. KAO
76619@@ -369,12 +369,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
76620
76621 struct softirq_action
76622 {
76623- void (*action)(struct softirq_action *);
76624-};
76625+ void (*action)(void);
76626+} __no_const;
76627
76628 asmlinkage void do_softirq(void);
76629 asmlinkage void __do_softirq(void);
76630-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
76631+extern void open_softirq(int nr, void (*action)(void));
76632 extern void softirq_init(void);
76633 extern void __raise_softirq_irqoff(unsigned int nr);
76634
76635diff --git a/include/linux/iommu.h b/include/linux/iommu.h
76636index 7ea319e..f9e971d 100644
76637--- a/include/linux/iommu.h
76638+++ b/include/linux/iommu.h
76639@@ -129,7 +129,7 @@ struct iommu_ops {
76640 u32 (*domain_get_windows)(struct iommu_domain *domain);
76641
76642 unsigned long pgsize_bitmap;
76643-};
76644+} __do_const;
76645
76646 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
76647 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
76648diff --git a/include/linux/ioport.h b/include/linux/ioport.h
76649index 89b7c24..382af74 100644
76650--- a/include/linux/ioport.h
76651+++ b/include/linux/ioport.h
76652@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
76653 int adjust_resource(struct resource *res, resource_size_t start,
76654 resource_size_t size);
76655 resource_size_t resource_alignment(struct resource *res);
76656-static inline resource_size_t resource_size(const struct resource *res)
76657+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
76658 {
76659 return res->end - res->start + 1;
76660 }
76661diff --git a/include/linux/irq.h b/include/linux/irq.h
76662index 56bb0dc..8ae94d62 100644
76663--- a/include/linux/irq.h
76664+++ b/include/linux/irq.h
76665@@ -333,7 +333,8 @@ struct irq_chip {
76666 void (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
76667
76668 unsigned long flags;
76669-};
76670+} __do_const;
76671+typedef struct irq_chip __no_const irq_chip_no_const;
76672
76673 /*
76674 * irq_chip specific flags
76675diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
76676index 0e5d9ec..46acb3a 100644
76677--- a/include/linux/irqchip/arm-gic.h
76678+++ b/include/linux/irqchip/arm-gic.h
76679@@ -59,9 +59,11 @@
76680
76681 #ifndef __ASSEMBLY__
76682
76683+#include <linux/irq.h>
76684+
76685 struct device_node;
76686
76687-extern struct irq_chip gic_arch_extn;
76688+extern irq_chip_no_const gic_arch_extn;
76689
76690 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
76691 u32 offset, struct device_node *);
76692diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
76693index d235e88..8ccbe74 100644
76694--- a/include/linux/jiffies.h
76695+++ b/include/linux/jiffies.h
76696@@ -292,14 +292,14 @@ extern unsigned long preset_lpj;
76697 /*
76698 * Convert various time units to each other:
76699 */
76700-extern unsigned int jiffies_to_msecs(const unsigned long j);
76701-extern unsigned int jiffies_to_usecs(const unsigned long j);
76702-extern unsigned long msecs_to_jiffies(const unsigned int m);
76703-extern unsigned long usecs_to_jiffies(const unsigned int u);
76704-extern unsigned long timespec_to_jiffies(const struct timespec *value);
76705+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
76706+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
76707+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
76708+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
76709+extern unsigned long timespec_to_jiffies(const struct timespec *value) __intentional_overflow(-1);
76710 extern void jiffies_to_timespec(const unsigned long jiffies,
76711 struct timespec *value);
76712-extern unsigned long timeval_to_jiffies(const struct timeval *value);
76713+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
76714 extern void jiffies_to_timeval(const unsigned long jiffies,
76715 struct timeval *value);
76716
76717diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
76718index 6883e19..e854fcb 100644
76719--- a/include/linux/kallsyms.h
76720+++ b/include/linux/kallsyms.h
76721@@ -15,7 +15,8 @@
76722
76723 struct module;
76724
76725-#ifdef CONFIG_KALLSYMS
76726+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
76727+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
76728 /* Lookup the address for a symbol. Returns 0 if not found. */
76729 unsigned long kallsyms_lookup_name(const char *name);
76730
76731@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
76732 /* Stupid that this does nothing, but I didn't create this mess. */
76733 #define __print_symbol(fmt, addr)
76734 #endif /*CONFIG_KALLSYMS*/
76735+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
76736+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
76737+extern unsigned long kallsyms_lookup_name(const char *name);
76738+extern void __print_symbol(const char *fmt, unsigned long address);
76739+extern int sprint_backtrace(char *buffer, unsigned long address);
76740+extern int sprint_symbol(char *buffer, unsigned long address);
76741+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
76742+const char *kallsyms_lookup(unsigned long addr,
76743+ unsigned long *symbolsize,
76744+ unsigned long *offset,
76745+ char **modname, char *namebuf);
76746+extern int kallsyms_lookup_size_offset(unsigned long addr,
76747+ unsigned long *symbolsize,
76748+ unsigned long *offset);
76749+#endif
76750
76751 /* This macro allows us to keep printk typechecking */
76752 static __printf(1, 2)
76753diff --git a/include/linux/key-type.h b/include/linux/key-type.h
76754index 518a53a..5e28358 100644
76755--- a/include/linux/key-type.h
76756+++ b/include/linux/key-type.h
76757@@ -125,7 +125,7 @@ struct key_type {
76758 /* internal fields */
76759 struct list_head link; /* link in types list */
76760 struct lock_class_key lock_class; /* key->sem lock class */
76761-};
76762+} __do_const;
76763
76764 extern struct key_type key_type_keyring;
76765
76766diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
76767index c6e091b..a940adf 100644
76768--- a/include/linux/kgdb.h
76769+++ b/include/linux/kgdb.h
76770@@ -52,7 +52,7 @@ extern int kgdb_connected;
76771 extern int kgdb_io_module_registered;
76772
76773 extern atomic_t kgdb_setting_breakpoint;
76774-extern atomic_t kgdb_cpu_doing_single_step;
76775+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
76776
76777 extern struct task_struct *kgdb_usethread;
76778 extern struct task_struct *kgdb_contthread;
76779@@ -254,7 +254,7 @@ struct kgdb_arch {
76780 void (*correct_hw_break)(void);
76781
76782 void (*enable_nmi)(bool on);
76783-};
76784+} __do_const;
76785
76786 /**
76787 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
76788@@ -279,7 +279,7 @@ struct kgdb_io {
76789 void (*pre_exception) (void);
76790 void (*post_exception) (void);
76791 int is_console;
76792-};
76793+} __do_const;
76794
76795 extern struct kgdb_arch arch_kgdb_ops;
76796
76797diff --git a/include/linux/kmod.h b/include/linux/kmod.h
76798index 0555cc6..40116ce 100644
76799--- a/include/linux/kmod.h
76800+++ b/include/linux/kmod.h
76801@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
76802 * usually useless though. */
76803 extern __printf(2, 3)
76804 int __request_module(bool wait, const char *name, ...);
76805+extern __printf(3, 4)
76806+int ___request_module(bool wait, char *param_name, const char *name, ...);
76807 #define request_module(mod...) __request_module(true, mod)
76808 #define request_module_nowait(mod...) __request_module(false, mod)
76809 #define try_then_request_module(x, mod...) \
76810@@ -57,6 +59,9 @@ struct subprocess_info {
76811 struct work_struct work;
76812 struct completion *complete;
76813 char *path;
76814+#ifdef CONFIG_GRKERNSEC
76815+ char *origpath;
76816+#endif
76817 char **argv;
76818 char **envp;
76819 int wait;
76820diff --git a/include/linux/kobject.h b/include/linux/kobject.h
76821index de6dcbcc..4735f88 100644
76822--- a/include/linux/kobject.h
76823+++ b/include/linux/kobject.h
76824@@ -115,7 +115,7 @@ struct kobj_type {
76825 struct attribute **default_attrs;
76826 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
76827 const void *(*namespace)(struct kobject *kobj);
76828-};
76829+} __do_const;
76830
76831 struct kobj_uevent_env {
76832 char *envp[UEVENT_NUM_ENVP];
76833@@ -138,6 +138,7 @@ struct kobj_attribute {
76834 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
76835 const char *buf, size_t count);
76836 };
76837+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
76838
76839 extern const struct sysfs_ops kobj_sysfs_ops;
76840
76841diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
76842index df32d25..fb52e27 100644
76843--- a/include/linux/kobject_ns.h
76844+++ b/include/linux/kobject_ns.h
76845@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
76846 const void *(*netlink_ns)(struct sock *sk);
76847 const void *(*initial_ns)(void);
76848 void (*drop_ns)(void *);
76849-};
76850+} __do_const;
76851
76852 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
76853 int kobj_ns_type_registered(enum kobj_ns_type type);
76854diff --git a/include/linux/kref.h b/include/linux/kref.h
76855index 484604d..0f6c5b6 100644
76856--- a/include/linux/kref.h
76857+++ b/include/linux/kref.h
76858@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
76859 static inline int kref_sub(struct kref *kref, unsigned int count,
76860 void (*release)(struct kref *kref))
76861 {
76862- WARN_ON(release == NULL);
76863+ BUG_ON(release == NULL);
76864
76865 if (atomic_sub_and_test((int) count, &kref->refcount)) {
76866 release(kref);
76867diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
76868index 0fbbc7a..db081e3 100644
76869--- a/include/linux/kvm_host.h
76870+++ b/include/linux/kvm_host.h
76871@@ -458,7 +458,7 @@ static inline void kvm_irqfd_exit(void)
76872 {
76873 }
76874 #endif
76875-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
76876+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
76877 struct module *module);
76878 void kvm_exit(void);
76879
76880@@ -632,7 +632,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
76881 struct kvm_guest_debug *dbg);
76882 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
76883
76884-int kvm_arch_init(void *opaque);
76885+int kvm_arch_init(const void *opaque);
76886 void kvm_arch_exit(void);
76887
76888 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
76889diff --git a/include/linux/libata.h b/include/linux/libata.h
76890index 9b50337..712d748 100644
76891--- a/include/linux/libata.h
76892+++ b/include/linux/libata.h
76893@@ -973,7 +973,7 @@ struct ata_port_operations {
76894 * fields must be pointers.
76895 */
76896 const struct ata_port_operations *inherits;
76897-};
76898+} __do_const;
76899
76900 struct ata_port_info {
76901 unsigned long flags;
76902diff --git a/include/linux/linkage.h b/include/linux/linkage.h
76903index d3e8ad2..a949f68 100644
76904--- a/include/linux/linkage.h
76905+++ b/include/linux/linkage.h
76906@@ -31,6 +31,7 @@
76907 #endif
76908
76909 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
76910+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
76911 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
76912
76913 /*
76914diff --git a/include/linux/list.h b/include/linux/list.h
76915index f4d8a2f..38e6e46 100644
76916--- a/include/linux/list.h
76917+++ b/include/linux/list.h
76918@@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
76919 extern void list_del(struct list_head *entry);
76920 #endif
76921
76922+extern void __pax_list_add(struct list_head *new,
76923+ struct list_head *prev,
76924+ struct list_head *next);
76925+static inline void pax_list_add(struct list_head *new, struct list_head *head)
76926+{
76927+ __pax_list_add(new, head, head->next);
76928+}
76929+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
76930+{
76931+ __pax_list_add(new, head->prev, head);
76932+}
76933+extern void pax_list_del(struct list_head *entry);
76934+
76935 /**
76936 * list_replace - replace old entry by new one
76937 * @old : the element to be replaced
76938@@ -145,6 +158,8 @@ static inline void list_del_init(struct list_head *entry)
76939 INIT_LIST_HEAD(entry);
76940 }
76941
76942+extern void pax_list_del_init(struct list_head *entry);
76943+
76944 /**
76945 * list_move - delete from one list and add as another's head
76946 * @list: the entry to move
76947diff --git a/include/linux/math64.h b/include/linux/math64.h
76948index 69ed5f5..243ed51 100644
76949--- a/include/linux/math64.h
76950+++ b/include/linux/math64.h
76951@@ -15,7 +15,7 @@
76952 * This is commonly provided by 32bit archs to provide an optimized 64bit
76953 * divide.
76954 */
76955-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76956+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76957 {
76958 *remainder = dividend % divisor;
76959 return dividend / divisor;
76960@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
76961 /**
76962 * div64_u64 - unsigned 64bit divide with 64bit divisor
76963 */
76964-static inline u64 div64_u64(u64 dividend, u64 divisor)
76965+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
76966 {
76967 return dividend / divisor;
76968 }
76969@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
76970 #define div64_ul(x, y) div_u64((x), (y))
76971
76972 #ifndef div_u64_rem
76973-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76974+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76975 {
76976 *remainder = do_div(dividend, divisor);
76977 return dividend;
76978@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
76979 #endif
76980
76981 #ifndef div64_u64
76982-extern u64 div64_u64(u64 dividend, u64 divisor);
76983+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
76984 #endif
76985
76986 #ifndef div64_s64
76987@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
76988 * divide.
76989 */
76990 #ifndef div_u64
76991-static inline u64 div_u64(u64 dividend, u32 divisor)
76992+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
76993 {
76994 u32 remainder;
76995 return div_u64_rem(dividend, divisor, &remainder);
76996diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
76997index da6716b..2e31db3 100644
76998--- a/include/linux/mempolicy.h
76999+++ b/include/linux/mempolicy.h
77000@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
77001 }
77002
77003 #define vma_policy(vma) ((vma)->vm_policy)
77004+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
77005+{
77006+ vma->vm_policy = pol;
77007+}
77008
77009 static inline void mpol_get(struct mempolicy *pol)
77010 {
77011@@ -240,6 +244,9 @@ mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx)
77012 }
77013
77014 #define vma_policy(vma) NULL
77015+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
77016+{
77017+}
77018
77019 static inline int
77020 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
77021diff --git a/include/linux/mm.h b/include/linux/mm.h
77022index 8b6e55e..c4edf39 100644
77023--- a/include/linux/mm.h
77024+++ b/include/linux/mm.h
77025@@ -113,6 +113,11 @@ extern unsigned int kobjsize(const void *objp);
77026 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
77027 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
77028 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
77029+
77030+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
77031+#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
77032+#endif
77033+
77034 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
77035
77036 #ifdef CONFIG_MEM_SOFT_DIRTY
77037@@ -215,8 +220,8 @@ struct vm_operations_struct {
77038 /* called by access_process_vm when get_user_pages() fails, typically
77039 * for use by special VMAs that can switch between memory and hardware
77040 */
77041- int (*access)(struct vm_area_struct *vma, unsigned long addr,
77042- void *buf, int len, int write);
77043+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
77044+ void *buf, size_t len, int write);
77045 #ifdef CONFIG_NUMA
77046 /*
77047 * set_policy() op must add a reference to any non-NULL @new mempolicy
77048@@ -246,6 +251,7 @@ struct vm_operations_struct {
77049 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
77050 unsigned long size, pgoff_t pgoff);
77051 };
77052+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
77053
77054 struct mmu_gather;
77055 struct inode;
77056@@ -977,8 +983,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
77057 unsigned long *pfn);
77058 int follow_phys(struct vm_area_struct *vma, unsigned long address,
77059 unsigned int flags, unsigned long *prot, resource_size_t *phys);
77060-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
77061- void *buf, int len, int write);
77062+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
77063+ void *buf, size_t len, int write);
77064
77065 static inline void unmap_shared_mapping_range(struct address_space *mapping,
77066 loff_t const holebegin, loff_t const holelen)
77067@@ -1017,9 +1023,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
77068 }
77069 #endif
77070
77071-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
77072-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
77073- void *buf, int len, int write);
77074+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
77075+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
77076+ void *buf, size_t len, int write);
77077
77078 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
77079 unsigned long start, unsigned long nr_pages,
77080@@ -1051,34 +1057,6 @@ int set_page_dirty(struct page *page);
77081 int set_page_dirty_lock(struct page *page);
77082 int clear_page_dirty_for_io(struct page *page);
77083
77084-/* Is the vma a continuation of the stack vma above it? */
77085-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
77086-{
77087- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
77088-}
77089-
77090-static inline int stack_guard_page_start(struct vm_area_struct *vma,
77091- unsigned long addr)
77092-{
77093- return (vma->vm_flags & VM_GROWSDOWN) &&
77094- (vma->vm_start == addr) &&
77095- !vma_growsdown(vma->vm_prev, addr);
77096-}
77097-
77098-/* Is the vma a continuation of the stack vma below it? */
77099-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
77100-{
77101- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
77102-}
77103-
77104-static inline int stack_guard_page_end(struct vm_area_struct *vma,
77105- unsigned long addr)
77106-{
77107- return (vma->vm_flags & VM_GROWSUP) &&
77108- (vma->vm_end == addr) &&
77109- !vma_growsup(vma->vm_next, addr);
77110-}
77111-
77112 extern pid_t
77113 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
77114
77115@@ -1178,6 +1156,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
77116 }
77117 #endif
77118
77119+#ifdef CONFIG_MMU
77120+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
77121+#else
77122+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
77123+{
77124+ return __pgprot(0);
77125+}
77126+#endif
77127+
77128 int vma_wants_writenotify(struct vm_area_struct *vma);
77129
77130 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
77131@@ -1196,8 +1183,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
77132 {
77133 return 0;
77134 }
77135+
77136+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
77137+ unsigned long address)
77138+{
77139+ return 0;
77140+}
77141 #else
77142 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
77143+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
77144 #endif
77145
77146 #ifdef __PAGETABLE_PMD_FOLDED
77147@@ -1206,8 +1200,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
77148 {
77149 return 0;
77150 }
77151+
77152+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
77153+ unsigned long address)
77154+{
77155+ return 0;
77156+}
77157 #else
77158 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
77159+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
77160 #endif
77161
77162 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
77163@@ -1225,11 +1226,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
77164 NULL: pud_offset(pgd, address);
77165 }
77166
77167+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
77168+{
77169+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
77170+ NULL: pud_offset(pgd, address);
77171+}
77172+
77173 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
77174 {
77175 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
77176 NULL: pmd_offset(pud, address);
77177 }
77178+
77179+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
77180+{
77181+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
77182+ NULL: pmd_offset(pud, address);
77183+}
77184 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
77185
77186 #if USE_SPLIT_PTLOCKS
77187@@ -1517,7 +1530,7 @@ extern int install_special_mapping(struct mm_struct *mm,
77188 unsigned long addr, unsigned long len,
77189 unsigned long flags, struct page **pages);
77190
77191-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
77192+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
77193
77194 extern unsigned long mmap_region(struct file *file, unsigned long addr,
77195 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
77196@@ -1525,6 +1538,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77197 unsigned long len, unsigned long prot, unsigned long flags,
77198 unsigned long pgoff, unsigned long *populate);
77199 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
77200+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
77201
77202 #ifdef CONFIG_MMU
77203 extern int __mm_populate(unsigned long addr, unsigned long len,
77204@@ -1553,10 +1567,11 @@ struct vm_unmapped_area_info {
77205 unsigned long high_limit;
77206 unsigned long align_mask;
77207 unsigned long align_offset;
77208+ unsigned long threadstack_offset;
77209 };
77210
77211-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
77212-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
77213+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
77214+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
77215
77216 /*
77217 * Search for an unmapped address range.
77218@@ -1568,7 +1583,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
77219 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
77220 */
77221 static inline unsigned long
77222-vm_unmapped_area(struct vm_unmapped_area_info *info)
77223+vm_unmapped_area(const struct vm_unmapped_area_info *info)
77224 {
77225 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
77226 return unmapped_area(info);
77227@@ -1631,6 +1646,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
77228 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
77229 struct vm_area_struct **pprev);
77230
77231+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
77232+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
77233+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
77234+
77235 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
77236 NULL if none. Assume start_addr < end_addr. */
77237 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
77238@@ -1659,15 +1678,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
77239 return vma;
77240 }
77241
77242-#ifdef CONFIG_MMU
77243-pgprot_t vm_get_page_prot(unsigned long vm_flags);
77244-#else
77245-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
77246-{
77247- return __pgprot(0);
77248-}
77249-#endif
77250-
77251 #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE
77252 unsigned long change_prot_numa(struct vm_area_struct *vma,
77253 unsigned long start, unsigned long end);
77254@@ -1719,6 +1729,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
77255 static inline void vm_stat_account(struct mm_struct *mm,
77256 unsigned long flags, struct file *file, long pages)
77257 {
77258+
77259+#ifdef CONFIG_PAX_RANDMMAP
77260+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
77261+#endif
77262+
77263 mm->total_vm += pages;
77264 }
77265 #endif /* CONFIG_PROC_FS */
77266@@ -1800,7 +1815,7 @@ extern int unpoison_memory(unsigned long pfn);
77267 extern int sysctl_memory_failure_early_kill;
77268 extern int sysctl_memory_failure_recovery;
77269 extern void shake_page(struct page *p, int access);
77270-extern atomic_long_t num_poisoned_pages;
77271+extern atomic_long_unchecked_t num_poisoned_pages;
77272 extern int soft_offline_page(struct page *page, int flags);
77273
77274 extern void dump_page(struct page *page);
77275@@ -1837,5 +1852,11 @@ void __init setup_nr_node_ids(void);
77276 static inline void setup_nr_node_ids(void) {}
77277 #endif
77278
77279+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
77280+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
77281+#else
77282+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
77283+#endif
77284+
77285 #endif /* __KERNEL__ */
77286 #endif /* _LINUX_MM_H */
77287diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
77288index 8e082f1..f61f576 100644
77289--- a/include/linux/mm_types.h
77290+++ b/include/linux/mm_types.h
77291@@ -289,6 +289,8 @@ struct vm_area_struct {
77292 #ifdef CONFIG_NUMA
77293 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
77294 #endif
77295+
77296+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
77297 };
77298
77299 struct core_thread {
77300@@ -444,6 +446,24 @@ struct mm_struct {
77301 bool tlb_flush_pending;
77302 #endif
77303 struct uprobes_state uprobes_state;
77304+
77305+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
77306+ unsigned long pax_flags;
77307+#endif
77308+
77309+#ifdef CONFIG_PAX_DLRESOLVE
77310+ unsigned long call_dl_resolve;
77311+#endif
77312+
77313+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
77314+ unsigned long call_syscall;
77315+#endif
77316+
77317+#ifdef CONFIG_PAX_ASLR
77318+ unsigned long delta_mmap; /* randomized offset */
77319+ unsigned long delta_stack; /* randomized offset */
77320+#endif
77321+
77322 };
77323
77324 /* first nid will either be a valid NID or one of these values */
77325diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
77326index c5d5278..f0b68c8 100644
77327--- a/include/linux/mmiotrace.h
77328+++ b/include/linux/mmiotrace.h
77329@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
77330 /* Called from ioremap.c */
77331 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
77332 void __iomem *addr);
77333-extern void mmiotrace_iounmap(volatile void __iomem *addr);
77334+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
77335
77336 /* For anyone to insert markers. Remember trailing newline. */
77337 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
77338@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
77339 {
77340 }
77341
77342-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
77343+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
77344 {
77345 }
77346
77347diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
77348index bd791e4..8617c34f 100644
77349--- a/include/linux/mmzone.h
77350+++ b/include/linux/mmzone.h
77351@@ -396,7 +396,7 @@ struct zone {
77352 unsigned long flags; /* zone flags, see below */
77353
77354 /* Zone statistics */
77355- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
77356+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
77357
77358 /*
77359 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
77360diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
77361index 45e9214..a7227d6 100644
77362--- a/include/linux/mod_devicetable.h
77363+++ b/include/linux/mod_devicetable.h
77364@@ -13,7 +13,7 @@
77365 typedef unsigned long kernel_ulong_t;
77366 #endif
77367
77368-#define PCI_ANY_ID (~0)
77369+#define PCI_ANY_ID ((__u16)~0)
77370
77371 struct pci_device_id {
77372 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
77373@@ -139,7 +139,7 @@ struct usb_device_id {
77374 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
77375 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
77376
77377-#define HID_ANY_ID (~0)
77378+#define HID_ANY_ID (~0U)
77379 #define HID_BUS_ANY 0xffff
77380 #define HID_GROUP_ANY 0x0000
77381
77382@@ -467,7 +467,7 @@ struct dmi_system_id {
77383 const char *ident;
77384 struct dmi_strmatch matches[4];
77385 void *driver_data;
77386-};
77387+} __do_const;
77388 /*
77389 * struct dmi_device_id appears during expansion of
77390 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
77391diff --git a/include/linux/module.h b/include/linux/module.h
77392index 05f2447..2aee07c 100644
77393--- a/include/linux/module.h
77394+++ b/include/linux/module.h
77395@@ -17,9 +17,11 @@
77396 #include <linux/moduleparam.h>
77397 #include <linux/tracepoint.h>
77398 #include <linux/export.h>
77399+#include <linux/fs.h>
77400
77401 #include <linux/percpu.h>
77402 #include <asm/module.h>
77403+#include <asm/pgtable.h>
77404
77405 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
77406 #define MODULE_SIG_STRING "~Module signature appended~\n"
77407@@ -55,12 +57,13 @@ struct module_attribute {
77408 int (*test)(struct module *);
77409 void (*free)(struct module *);
77410 };
77411+typedef struct module_attribute __no_const module_attribute_no_const;
77412
77413 struct module_version_attribute {
77414 struct module_attribute mattr;
77415 const char *module_name;
77416 const char *version;
77417-} __attribute__ ((__aligned__(sizeof(void *))));
77418+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
77419
77420 extern ssize_t __modver_version_show(struct module_attribute *,
77421 struct module_kobject *, char *);
77422@@ -238,7 +241,7 @@ struct module
77423
77424 /* Sysfs stuff. */
77425 struct module_kobject mkobj;
77426- struct module_attribute *modinfo_attrs;
77427+ module_attribute_no_const *modinfo_attrs;
77428 const char *version;
77429 const char *srcversion;
77430 struct kobject *holders_dir;
77431@@ -287,19 +290,16 @@ struct module
77432 int (*init)(void);
77433
77434 /* If this is non-NULL, vfree after init() returns */
77435- void *module_init;
77436+ void *module_init_rx, *module_init_rw;
77437
77438 /* Here is the actual code + data, vfree'd on unload. */
77439- void *module_core;
77440+ void *module_core_rx, *module_core_rw;
77441
77442 /* Here are the sizes of the init and core sections */
77443- unsigned int init_size, core_size;
77444+ unsigned int init_size_rw, core_size_rw;
77445
77446 /* The size of the executable code in each section. */
77447- unsigned int init_text_size, core_text_size;
77448-
77449- /* Size of RO sections of the module (text+rodata) */
77450- unsigned int init_ro_size, core_ro_size;
77451+ unsigned int init_size_rx, core_size_rx;
77452
77453 /* Arch-specific module values */
77454 struct mod_arch_specific arch;
77455@@ -355,6 +355,10 @@ struct module
77456 #ifdef CONFIG_EVENT_TRACING
77457 struct ftrace_event_call **trace_events;
77458 unsigned int num_trace_events;
77459+ struct file_operations trace_id;
77460+ struct file_operations trace_enable;
77461+ struct file_operations trace_format;
77462+ struct file_operations trace_filter;
77463 #endif
77464 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
77465 unsigned int num_ftrace_callsites;
77466@@ -402,16 +406,46 @@ bool is_module_address(unsigned long addr);
77467 bool is_module_percpu_address(unsigned long addr);
77468 bool is_module_text_address(unsigned long addr);
77469
77470+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
77471+{
77472+
77473+#ifdef CONFIG_PAX_KERNEXEC
77474+ if (ktla_ktva(addr) >= (unsigned long)start &&
77475+ ktla_ktva(addr) < (unsigned long)start + size)
77476+ return 1;
77477+#endif
77478+
77479+ return ((void *)addr >= start && (void *)addr < start + size);
77480+}
77481+
77482+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
77483+{
77484+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
77485+}
77486+
77487+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
77488+{
77489+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
77490+}
77491+
77492+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
77493+{
77494+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
77495+}
77496+
77497+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
77498+{
77499+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
77500+}
77501+
77502 static inline int within_module_core(unsigned long addr, const struct module *mod)
77503 {
77504- return (unsigned long)mod->module_core <= addr &&
77505- addr < (unsigned long)mod->module_core + mod->core_size;
77506+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
77507 }
77508
77509 static inline int within_module_init(unsigned long addr, const struct module *mod)
77510 {
77511- return (unsigned long)mod->module_init <= addr &&
77512- addr < (unsigned long)mod->module_init + mod->init_size;
77513+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
77514 }
77515
77516 /* Search for module by name: must hold module_mutex. */
77517diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
77518index 560ca53..ef621ef 100644
77519--- a/include/linux/moduleloader.h
77520+++ b/include/linux/moduleloader.h
77521@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
77522 sections. Returns NULL on failure. */
77523 void *module_alloc(unsigned long size);
77524
77525+#ifdef CONFIG_PAX_KERNEXEC
77526+void *module_alloc_exec(unsigned long size);
77527+#else
77528+#define module_alloc_exec(x) module_alloc(x)
77529+#endif
77530+
77531 /* Free memory returned from module_alloc. */
77532 void module_free(struct module *mod, void *module_region);
77533
77534+#ifdef CONFIG_PAX_KERNEXEC
77535+void module_free_exec(struct module *mod, void *module_region);
77536+#else
77537+#define module_free_exec(x, y) module_free((x), (y))
77538+#endif
77539+
77540 /*
77541 * Apply the given relocation to the (simplified) ELF. Return -error
77542 * or 0.
77543@@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
77544 unsigned int relsec,
77545 struct module *me)
77546 {
77547+#ifdef CONFIG_MODULES
77548 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
77549+#endif
77550 return -ENOEXEC;
77551 }
77552 #endif
77553@@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
77554 unsigned int relsec,
77555 struct module *me)
77556 {
77557+#ifdef CONFIG_MODULES
77558 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
77559+#endif
77560 return -ENOEXEC;
77561 }
77562 #endif
77563diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
77564index c3eb102..073c4a6 100644
77565--- a/include/linux/moduleparam.h
77566+++ b/include/linux/moduleparam.h
77567@@ -295,7 +295,7 @@ static inline void __kernel_param_unlock(void)
77568 * @len is usually just sizeof(string).
77569 */
77570 #define module_param_string(name, string, len, perm) \
77571- static const struct kparam_string __param_string_##name \
77572+ static const struct kparam_string __param_string_##name __used \
77573 = { len, string }; \
77574 __module_param_call(MODULE_PARAM_PREFIX, name, \
77575 &param_ops_string, \
77576@@ -434,7 +434,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
77577 */
77578 #define module_param_array_named(name, array, type, nump, perm) \
77579 param_check_##type(name, &(array)[0]); \
77580- static const struct kparam_array __param_arr_##name \
77581+ static const struct kparam_array __param_arr_##name __used \
77582 = { .max = ARRAY_SIZE(array), .num = nump, \
77583 .ops = &param_ops_##type, \
77584 .elemsize = sizeof(array[0]), .elem = array }; \
77585diff --git a/include/linux/namei.h b/include/linux/namei.h
77586index 8e47bc7..c70fd73 100644
77587--- a/include/linux/namei.h
77588+++ b/include/linux/namei.h
77589@@ -19,7 +19,7 @@ struct nameidata {
77590 unsigned seq;
77591 int last_type;
77592 unsigned depth;
77593- char *saved_names[MAX_NESTED_LINKS + 1];
77594+ const char *saved_names[MAX_NESTED_LINKS + 1];
77595 };
77596
77597 /*
77598@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
77599
77600 extern void nd_jump_link(struct nameidata *nd, struct path *path);
77601
77602-static inline void nd_set_link(struct nameidata *nd, char *path)
77603+static inline void nd_set_link(struct nameidata *nd, const char *path)
77604 {
77605 nd->saved_names[nd->depth] = path;
77606 }
77607
77608-static inline char *nd_get_link(struct nameidata *nd)
77609+static inline const char *nd_get_link(const struct nameidata *nd)
77610 {
77611 return nd->saved_names[nd->depth];
77612 }
77613diff --git a/include/linux/net.h b/include/linux/net.h
77614index 8bd9d92..08b1c20 100644
77615--- a/include/linux/net.h
77616+++ b/include/linux/net.h
77617@@ -191,7 +191,7 @@ struct net_proto_family {
77618 int (*create)(struct net *net, struct socket *sock,
77619 int protocol, int kern);
77620 struct module *owner;
77621-};
77622+} __do_const;
77623
77624 struct iovec;
77625 struct kvec;
77626diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
77627index 25f5d2d1..5cf2120 100644
77628--- a/include/linux/netdevice.h
77629+++ b/include/linux/netdevice.h
77630@@ -1098,6 +1098,7 @@ struct net_device_ops {
77631 sa_family_t sa_family,
77632 __be16 port);
77633 };
77634+typedef struct net_device_ops __no_const net_device_ops_no_const;
77635
77636 /*
77637 * The DEVICE structure.
77638@@ -1169,7 +1170,7 @@ struct net_device {
77639 int iflink;
77640
77641 struct net_device_stats stats;
77642- atomic_long_t rx_dropped; /* dropped packets by core network
77643+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
77644 * Do not use this in drivers.
77645 */
77646
77647diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
77648index 708fe72ab9..77084a3 100644
77649--- a/include/linux/netfilter.h
77650+++ b/include/linux/netfilter.h
77651@@ -82,7 +82,7 @@ struct nf_sockopt_ops {
77652 #endif
77653 /* Use the module struct to lock set/get code in place */
77654 struct module *owner;
77655-};
77656+} __do_const;
77657
77658 /* Function to register/unregister hook points. */
77659 int nf_register_hook(struct nf_hook_ops *reg);
77660diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
77661index cadb740..d7c37c0 100644
77662--- a/include/linux/netfilter/nfnetlink.h
77663+++ b/include/linux/netfilter/nfnetlink.h
77664@@ -16,7 +16,7 @@ struct nfnl_callback {
77665 const struct nlattr * const cda[]);
77666 const struct nla_policy *policy; /* netlink attribute policy */
77667 const u_int16_t attr_count; /* number of nlattr's */
77668-};
77669+} __do_const;
77670
77671 struct nfnetlink_subsystem {
77672 const char *name;
77673diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
77674new file mode 100644
77675index 0000000..33f4af8
77676--- /dev/null
77677+++ b/include/linux/netfilter/xt_gradm.h
77678@@ -0,0 +1,9 @@
77679+#ifndef _LINUX_NETFILTER_XT_GRADM_H
77680+#define _LINUX_NETFILTER_XT_GRADM_H 1
77681+
77682+struct xt_gradm_mtinfo {
77683+ __u16 flags;
77684+ __u16 invflags;
77685+};
77686+
77687+#endif
77688diff --git a/include/linux/nls.h b/include/linux/nls.h
77689index 5dc635f..35f5e11 100644
77690--- a/include/linux/nls.h
77691+++ b/include/linux/nls.h
77692@@ -31,7 +31,7 @@ struct nls_table {
77693 const unsigned char *charset2upper;
77694 struct module *owner;
77695 struct nls_table *next;
77696-};
77697+} __do_const;
77698
77699 /* this value hold the maximum octet of charset */
77700 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
77701diff --git a/include/linux/notifier.h b/include/linux/notifier.h
77702index d14a4c3..a078786 100644
77703--- a/include/linux/notifier.h
77704+++ b/include/linux/notifier.h
77705@@ -54,7 +54,8 @@ struct notifier_block {
77706 notifier_fn_t notifier_call;
77707 struct notifier_block __rcu *next;
77708 int priority;
77709-};
77710+} __do_const;
77711+typedef struct notifier_block __no_const notifier_block_no_const;
77712
77713 struct atomic_notifier_head {
77714 spinlock_t lock;
77715diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
77716index b2a0f15..4d7da32 100644
77717--- a/include/linux/oprofile.h
77718+++ b/include/linux/oprofile.h
77719@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
77720 int oprofilefs_create_ro_ulong(struct dentry * root,
77721 char const * name, ulong * val);
77722
77723-/** Create a file for read-only access to an atomic_t. */
77724+/** Create a file for read-only access to an atomic_unchecked_t. */
77725 int oprofilefs_create_ro_atomic(struct dentry * root,
77726- char const * name, atomic_t * val);
77727+ char const * name, atomic_unchecked_t * val);
77728
77729 /** create a directory */
77730 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
77731diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
77732index 430dd96..544e26e 100644
77733--- a/include/linux/pci_hotplug.h
77734+++ b/include/linux/pci_hotplug.h
77735@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
77736 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
77737 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
77738 int (*reset_slot) (struct hotplug_slot *slot, int probe);
77739-};
77740+} __do_const;
77741+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
77742
77743 /**
77744 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
77745diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
77746index c8ba627..24bdfa8 100644
77747--- a/include/linux/perf_event.h
77748+++ b/include/linux/perf_event.h
77749@@ -327,8 +327,8 @@ struct perf_event {
77750
77751 enum perf_event_active_state state;
77752 unsigned int attach_state;
77753- local64_t count;
77754- atomic64_t child_count;
77755+ local64_t count; /* PaX: fix it one day */
77756+ atomic64_unchecked_t child_count;
77757
77758 /*
77759 * These are the total time in nanoseconds that the event
77760@@ -379,8 +379,8 @@ struct perf_event {
77761 * These accumulate total time (in nanoseconds) that children
77762 * events have been enabled and running, respectively.
77763 */
77764- atomic64_t child_total_time_enabled;
77765- atomic64_t child_total_time_running;
77766+ atomic64_unchecked_t child_total_time_enabled;
77767+ atomic64_unchecked_t child_total_time_running;
77768
77769 /*
77770 * Protect attach/detach and child_list:
77771@@ -702,7 +702,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
77772 entry->ip[entry->nr++] = ip;
77773 }
77774
77775-extern int sysctl_perf_event_paranoid;
77776+extern int sysctl_perf_event_legitimately_concerned;
77777 extern int sysctl_perf_event_mlock;
77778 extern int sysctl_perf_event_sample_rate;
77779 extern int sysctl_perf_cpu_time_max_percent;
77780@@ -717,19 +717,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
77781 loff_t *ppos);
77782
77783
77784+static inline bool perf_paranoid_any(void)
77785+{
77786+ return sysctl_perf_event_legitimately_concerned > 2;
77787+}
77788+
77789 static inline bool perf_paranoid_tracepoint_raw(void)
77790 {
77791- return sysctl_perf_event_paranoid > -1;
77792+ return sysctl_perf_event_legitimately_concerned > -1;
77793 }
77794
77795 static inline bool perf_paranoid_cpu(void)
77796 {
77797- return sysctl_perf_event_paranoid > 0;
77798+ return sysctl_perf_event_legitimately_concerned > 0;
77799 }
77800
77801 static inline bool perf_paranoid_kernel(void)
77802 {
77803- return sysctl_perf_event_paranoid > 1;
77804+ return sysctl_perf_event_legitimately_concerned > 1;
77805 }
77806
77807 extern void perf_event_init(void);
77808@@ -845,7 +850,7 @@ struct perf_pmu_events_attr {
77809 struct device_attribute attr;
77810 u64 id;
77811 const char *event_str;
77812-};
77813+} __do_const;
77814
77815 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
77816 static struct perf_pmu_events_attr _var = { \
77817diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
77818index b8809fe..ae4ccd0 100644
77819--- a/include/linux/pipe_fs_i.h
77820+++ b/include/linux/pipe_fs_i.h
77821@@ -47,10 +47,10 @@ struct pipe_inode_info {
77822 struct mutex mutex;
77823 wait_queue_head_t wait;
77824 unsigned int nrbufs, curbuf, buffers;
77825- unsigned int readers;
77826- unsigned int writers;
77827- unsigned int files;
77828- unsigned int waiting_writers;
77829+ atomic_t readers;
77830+ atomic_t writers;
77831+ atomic_t files;
77832+ atomic_t waiting_writers;
77833 unsigned int r_counter;
77834 unsigned int w_counter;
77835 struct page *tmp_page;
77836diff --git a/include/linux/platform_data/usb-ehci-s5p.h b/include/linux/platform_data/usb-ehci-s5p.h
77837index 5f28cae..3d23723 100644
77838--- a/include/linux/platform_data/usb-ehci-s5p.h
77839+++ b/include/linux/platform_data/usb-ehci-s5p.h
77840@@ -14,7 +14,7 @@
77841 struct s5p_ehci_platdata {
77842 int (*phy_init)(struct platform_device *pdev, int type);
77843 int (*phy_exit)(struct platform_device *pdev, int type);
77844-};
77845+} __no_const;
77846
77847 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
77848
77849diff --git a/include/linux/platform_data/usb-ohci-exynos.h b/include/linux/platform_data/usb-ohci-exynos.h
77850index c256c59..8ea94c7 100644
77851--- a/include/linux/platform_data/usb-ohci-exynos.h
77852+++ b/include/linux/platform_data/usb-ohci-exynos.h
77853@@ -14,7 +14,7 @@
77854 struct exynos4_ohci_platdata {
77855 int (*phy_init)(struct platform_device *pdev, int type);
77856 int (*phy_exit)(struct platform_device *pdev, int type);
77857-};
77858+} __no_const;
77859
77860 extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
77861
77862diff --git a/include/linux/pm.h b/include/linux/pm.h
77863index a224c7f..92d8a97 100644
77864--- a/include/linux/pm.h
77865+++ b/include/linux/pm.h
77866@@ -576,6 +576,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
77867 struct dev_pm_domain {
77868 struct dev_pm_ops ops;
77869 };
77870+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
77871
77872 /*
77873 * The PM_EVENT_ messages are also used by drivers implementing the legacy
77874diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
77875index 7c1d252..c5c773e 100644
77876--- a/include/linux/pm_domain.h
77877+++ b/include/linux/pm_domain.h
77878@@ -48,7 +48,7 @@ struct gpd_dev_ops {
77879
77880 struct gpd_cpu_data {
77881 unsigned int saved_exit_latency;
77882- struct cpuidle_state *idle_state;
77883+ cpuidle_state_no_const *idle_state;
77884 };
77885
77886 struct generic_pm_domain {
77887diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
77888index 6fa7cea..7bf6415 100644
77889--- a/include/linux/pm_runtime.h
77890+++ b/include/linux/pm_runtime.h
77891@@ -103,7 +103,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
77892
77893 static inline void pm_runtime_mark_last_busy(struct device *dev)
77894 {
77895- ACCESS_ONCE(dev->power.last_busy) = jiffies;
77896+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
77897 }
77898
77899 #else /* !CONFIG_PM_RUNTIME */
77900diff --git a/include/linux/pnp.h b/include/linux/pnp.h
77901index 195aafc..49a7bc2 100644
77902--- a/include/linux/pnp.h
77903+++ b/include/linux/pnp.h
77904@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
77905 struct pnp_fixup {
77906 char id[7];
77907 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
77908-};
77909+} __do_const;
77910
77911 /* config parameters */
77912 #define PNP_CONFIG_NORMAL 0x0001
77913diff --git a/include/linux/poison.h b/include/linux/poison.h
77914index 2110a81..13a11bb 100644
77915--- a/include/linux/poison.h
77916+++ b/include/linux/poison.h
77917@@ -19,8 +19,8 @@
77918 * under normal circumstances, used to verify that nobody uses
77919 * non-initialized list entries.
77920 */
77921-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
77922-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
77923+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
77924+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
77925
77926 /********** include/linux/timer.h **********/
77927 /*
77928diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
77929index d8b187c3..9a9257a 100644
77930--- a/include/linux/power/smartreflex.h
77931+++ b/include/linux/power/smartreflex.h
77932@@ -238,7 +238,7 @@ struct omap_sr_class_data {
77933 int (*notify)(struct omap_sr *sr, u32 status);
77934 u8 notify_flags;
77935 u8 class_type;
77936-};
77937+} __do_const;
77938
77939 /**
77940 * struct omap_sr_nvalue_table - Smartreflex n-target value info
77941diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
77942index 4ea1d37..80f4b33 100644
77943--- a/include/linux/ppp-comp.h
77944+++ b/include/linux/ppp-comp.h
77945@@ -84,7 +84,7 @@ struct compressor {
77946 struct module *owner;
77947 /* Extra skb space needed by the compressor algorithm */
77948 unsigned int comp_extra;
77949-};
77950+} __do_const;
77951
77952 /*
77953 * The return value from decompress routine is the length of the
77954diff --git a/include/linux/preempt.h b/include/linux/preempt.h
77955index f5d4723..a6ea2fa 100644
77956--- a/include/linux/preempt.h
77957+++ b/include/linux/preempt.h
77958@@ -18,8 +18,13 @@
77959 # define sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
77960 #endif
77961
77962+#define raw_add_preempt_count(val) do { preempt_count() += (val); } while (0)
77963+#define raw_sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
77964+
77965 #define inc_preempt_count() add_preempt_count(1)
77966+#define raw_inc_preempt_count() raw_add_preempt_count(1)
77967 #define dec_preempt_count() sub_preempt_count(1)
77968+#define raw_dec_preempt_count() raw_sub_preempt_count(1)
77969
77970 #define preempt_count() (current_thread_info()->preempt_count)
77971
77972@@ -64,6 +69,12 @@ do { \
77973 barrier(); \
77974 } while (0)
77975
77976+#define raw_preempt_disable() \
77977+do { \
77978+ raw_inc_preempt_count(); \
77979+ barrier(); \
77980+} while (0)
77981+
77982 #define sched_preempt_enable_no_resched() \
77983 do { \
77984 barrier(); \
77985@@ -72,6 +83,12 @@ do { \
77986
77987 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
77988
77989+#define raw_preempt_enable_no_resched() \
77990+do { \
77991+ barrier(); \
77992+ raw_dec_preempt_count(); \
77993+} while (0)
77994+
77995 #define preempt_enable() \
77996 do { \
77997 preempt_enable_no_resched(); \
77998@@ -116,8 +133,10 @@ do { \
77999 * region.
78000 */
78001 #define preempt_disable() barrier()
78002+#define raw_preempt_disable() barrier()
78003 #define sched_preempt_enable_no_resched() barrier()
78004 #define preempt_enable_no_resched() barrier()
78005+#define raw_preempt_enable_no_resched() barrier()
78006 #define preempt_enable() barrier()
78007
78008 #define preempt_disable_notrace() barrier()
78009diff --git a/include/linux/printk.h b/include/linux/printk.h
78010index e6131a78..8e9fb61 100644
78011--- a/include/linux/printk.h
78012+++ b/include/linux/printk.h
78013@@ -106,6 +106,8 @@ static inline __printf(1, 2) __cold
78014 void early_printk(const char *s, ...) { }
78015 #endif
78016
78017+extern int kptr_restrict;
78018+
78019 #ifdef CONFIG_PRINTK
78020 asmlinkage __printf(5, 0)
78021 int vprintk_emit(int facility, int level,
78022@@ -140,7 +142,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
78023
78024 extern int printk_delay_msec;
78025 extern int dmesg_restrict;
78026-extern int kptr_restrict;
78027
78028 extern void wake_up_klogd(void);
78029
78030diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
78031index 608e60a..c26f864 100644
78032--- a/include/linux/proc_fs.h
78033+++ b/include/linux/proc_fs.h
78034@@ -34,6 +34,19 @@ static inline struct proc_dir_entry *proc_create(
78035 return proc_create_data(name, mode, parent, proc_fops, NULL);
78036 }
78037
78038+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
78039+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
78040+{
78041+#ifdef CONFIG_GRKERNSEC_PROC_USER
78042+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
78043+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78044+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
78045+#else
78046+ return proc_create_data(name, mode, parent, proc_fops, NULL);
78047+#endif
78048+}
78049+
78050+
78051 extern void proc_set_size(struct proc_dir_entry *, loff_t);
78052 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
78053 extern void *PDE_DATA(const struct inode *);
78054diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
78055index 34a1e10..03a6d03 100644
78056--- a/include/linux/proc_ns.h
78057+++ b/include/linux/proc_ns.h
78058@@ -14,7 +14,7 @@ struct proc_ns_operations {
78059 void (*put)(void *ns);
78060 int (*install)(struct nsproxy *nsproxy, void *ns);
78061 unsigned int (*inum)(void *ns);
78062-};
78063+} __do_const;
78064
78065 struct proc_ns {
78066 void *ns;
78067diff --git a/include/linux/quota.h b/include/linux/quota.h
78068index cc7494a..1e27036 100644
78069--- a/include/linux/quota.h
78070+++ b/include/linux/quota.h
78071@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
78072
78073 extern bool qid_eq(struct kqid left, struct kqid right);
78074 extern bool qid_lt(struct kqid left, struct kqid right);
78075-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
78076+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
78077 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
78078 extern bool qid_valid(struct kqid qid);
78079
78080diff --git a/include/linux/random.h b/include/linux/random.h
78081index bf9085e..1e8bbcf 100644
78082--- a/include/linux/random.h
78083+++ b/include/linux/random.h
78084@@ -10,9 +10,19 @@
78085
78086
78087 extern void add_device_randomness(const void *, unsigned int);
78088+
78089+static inline void add_latent_entropy(void)
78090+{
78091+
78092+#ifdef LATENT_ENTROPY_PLUGIN
78093+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
78094+#endif
78095+
78096+}
78097+
78098 extern void add_input_randomness(unsigned int type, unsigned int code,
78099- unsigned int value);
78100-extern void add_interrupt_randomness(int irq, int irq_flags);
78101+ unsigned int value) __latent_entropy;
78102+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
78103
78104 extern void get_random_bytes(void *buf, int nbytes);
78105 extern void get_random_bytes_arch(void *buf, int nbytes);
78106@@ -23,16 +33,21 @@ extern int random_int_secret_init(void);
78107 extern const struct file_operations random_fops, urandom_fops;
78108 #endif
78109
78110-unsigned int get_random_int(void);
78111+unsigned int __intentional_overflow(-1) get_random_int(void);
78112 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
78113
78114-u32 prandom_u32(void);
78115+u32 prandom_u32(void) __intentional_overflow(-1);
78116 void prandom_bytes(void *buf, int nbytes);
78117 void prandom_seed(u32 seed);
78118
78119 u32 prandom_u32_state(struct rnd_state *);
78120 void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
78121
78122+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
78123+{
78124+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
78125+}
78126+
78127 /*
78128 * Handle minimum values for seeds
78129 */
78130diff --git a/include/linux/rculist.h b/include/linux/rculist.h
78131index 4106721..132d42c 100644
78132--- a/include/linux/rculist.h
78133+++ b/include/linux/rculist.h
78134@@ -44,6 +44,9 @@ extern void __list_add_rcu(struct list_head *new,
78135 struct list_head *prev, struct list_head *next);
78136 #endif
78137
78138+extern void __pax_list_add_rcu(struct list_head *new,
78139+ struct list_head *prev, struct list_head *next);
78140+
78141 /**
78142 * list_add_rcu - add a new entry to rcu-protected list
78143 * @new: new entry to be added
78144@@ -65,6 +68,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
78145 __list_add_rcu(new, head, head->next);
78146 }
78147
78148+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
78149+{
78150+ __pax_list_add_rcu(new, head, head->next);
78151+}
78152+
78153 /**
78154 * list_add_tail_rcu - add a new entry to rcu-protected list
78155 * @new: new entry to be added
78156@@ -87,6 +95,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
78157 __list_add_rcu(new, head->prev, head);
78158 }
78159
78160+static inline void pax_list_add_tail_rcu(struct list_head *new,
78161+ struct list_head *head)
78162+{
78163+ __pax_list_add_rcu(new, head->prev, head);
78164+}
78165+
78166 /**
78167 * list_del_rcu - deletes entry from list without re-initialization
78168 * @entry: the element to delete from the list.
78169@@ -117,6 +131,8 @@ static inline void list_del_rcu(struct list_head *entry)
78170 entry->prev = LIST_POISON2;
78171 }
78172
78173+extern void pax_list_del_rcu(struct list_head *entry);
78174+
78175 /**
78176 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
78177 * @n: the element to delete from the hash list.
78178diff --git a/include/linux/reboot.h b/include/linux/reboot.h
78179index 9e7db9e..7d4fd72 100644
78180--- a/include/linux/reboot.h
78181+++ b/include/linux/reboot.h
78182@@ -44,9 +44,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
78183 */
78184
78185 extern void migrate_to_reboot_cpu(void);
78186-extern void machine_restart(char *cmd);
78187-extern void machine_halt(void);
78188-extern void machine_power_off(void);
78189+extern void machine_restart(char *cmd) __noreturn;
78190+extern void machine_halt(void) __noreturn;
78191+extern void machine_power_off(void) __noreturn;
78192
78193 extern void machine_shutdown(void);
78194 struct pt_regs;
78195@@ -57,9 +57,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
78196 */
78197
78198 extern void kernel_restart_prepare(char *cmd);
78199-extern void kernel_restart(char *cmd);
78200-extern void kernel_halt(void);
78201-extern void kernel_power_off(void);
78202+extern void kernel_restart(char *cmd) __noreturn;
78203+extern void kernel_halt(void) __noreturn;
78204+extern void kernel_power_off(void) __noreturn;
78205
78206 extern int C_A_D; /* for sysctl */
78207 void ctrl_alt_del(void);
78208@@ -73,7 +73,7 @@ extern int orderly_poweroff(bool force);
78209 * Emergency restart, callable from an interrupt handler.
78210 */
78211
78212-extern void emergency_restart(void);
78213+extern void emergency_restart(void) __noreturn;
78214 #include <asm/emergency-restart.h>
78215
78216 #endif /* _LINUX_REBOOT_H */
78217diff --git a/include/linux/regset.h b/include/linux/regset.h
78218index 8e0c9fe..ac4d221 100644
78219--- a/include/linux/regset.h
78220+++ b/include/linux/regset.h
78221@@ -161,7 +161,8 @@ struct user_regset {
78222 unsigned int align;
78223 unsigned int bias;
78224 unsigned int core_note_type;
78225-};
78226+} __do_const;
78227+typedef struct user_regset __no_const user_regset_no_const;
78228
78229 /**
78230 * struct user_regset_view - available regsets
78231diff --git a/include/linux/relay.h b/include/linux/relay.h
78232index d7c8359..818daf5 100644
78233--- a/include/linux/relay.h
78234+++ b/include/linux/relay.h
78235@@ -157,7 +157,7 @@ struct rchan_callbacks
78236 * The callback should return 0 if successful, negative if not.
78237 */
78238 int (*remove_buf_file)(struct dentry *dentry);
78239-};
78240+} __no_const;
78241
78242 /*
78243 * CONFIG_RELAY kernel API, kernel/relay.c
78244diff --git a/include/linux/rio.h b/include/linux/rio.h
78245index b71d573..2f940bd 100644
78246--- a/include/linux/rio.h
78247+++ b/include/linux/rio.h
78248@@ -355,7 +355,7 @@ struct rio_ops {
78249 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
78250 u64 rstart, u32 size, u32 flags);
78251 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
78252-};
78253+} __no_const;
78254
78255 #define RIO_RESOURCE_MEM 0x00000100
78256 #define RIO_RESOURCE_DOORBELL 0x00000200
78257diff --git a/include/linux/rmap.h b/include/linux/rmap.h
78258index 6dacb93..6174423 100644
78259--- a/include/linux/rmap.h
78260+++ b/include/linux/rmap.h
78261@@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
78262 void anon_vma_init(void); /* create anon_vma_cachep */
78263 int anon_vma_prepare(struct vm_area_struct *);
78264 void unlink_anon_vmas(struct vm_area_struct *);
78265-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
78266-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
78267+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
78268+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
78269
78270 static inline void anon_vma_merge(struct vm_area_struct *vma,
78271 struct vm_area_struct *next)
78272diff --git a/include/linux/sched.h b/include/linux/sched.h
78273index b1e963e..114b8fd 100644
78274--- a/include/linux/sched.h
78275+++ b/include/linux/sched.h
78276@@ -62,6 +62,7 @@ struct bio_list;
78277 struct fs_struct;
78278 struct perf_event_context;
78279 struct blk_plug;
78280+struct linux_binprm;
78281
78282 /*
78283 * List of flags we want to share for kernel threads,
78284@@ -295,7 +296,7 @@ extern char __sched_text_start[], __sched_text_end[];
78285 extern int in_sched_functions(unsigned long addr);
78286
78287 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
78288-extern signed long schedule_timeout(signed long timeout);
78289+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
78290 extern signed long schedule_timeout_interruptible(signed long timeout);
78291 extern signed long schedule_timeout_killable(signed long timeout);
78292 extern signed long schedule_timeout_uninterruptible(signed long timeout);
78293@@ -306,6 +307,19 @@ struct nsproxy;
78294 struct user_namespace;
78295
78296 #ifdef CONFIG_MMU
78297+
78298+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
78299+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
78300+#else
78301+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
78302+{
78303+ return 0;
78304+}
78305+#endif
78306+
78307+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
78308+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
78309+
78310 extern void arch_pick_mmap_layout(struct mm_struct *mm);
78311 extern unsigned long
78312 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
78313@@ -585,6 +599,17 @@ struct signal_struct {
78314 #ifdef CONFIG_TASKSTATS
78315 struct taskstats *stats;
78316 #endif
78317+
78318+#ifdef CONFIG_GRKERNSEC
78319+ u32 curr_ip;
78320+ u32 saved_ip;
78321+ u32 gr_saddr;
78322+ u32 gr_daddr;
78323+ u16 gr_sport;
78324+ u16 gr_dport;
78325+ u8 used_accept:1;
78326+#endif
78327+
78328 #ifdef CONFIG_AUDIT
78329 unsigned audit_tty;
78330 unsigned audit_tty_log_passwd;
78331@@ -665,6 +690,14 @@ struct user_struct {
78332 struct key *session_keyring; /* UID's default session keyring */
78333 #endif
78334
78335+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78336+ unsigned char kernel_banned;
78337+#endif
78338+#ifdef CONFIG_GRKERNSEC_BRUTE
78339+ unsigned char suid_banned;
78340+ unsigned long suid_ban_expires;
78341+#endif
78342+
78343 /* Hash table maintenance information */
78344 struct hlist_node uidhash_node;
78345 kuid_t uid;
78346@@ -1150,8 +1183,8 @@ struct task_struct {
78347 struct list_head thread_group;
78348
78349 struct completion *vfork_done; /* for vfork() */
78350- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
78351- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
78352+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
78353+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
78354
78355 cputime_t utime, stime, utimescaled, stimescaled;
78356 cputime_t gtime;
78357@@ -1176,11 +1209,6 @@ struct task_struct {
78358 struct task_cputime cputime_expires;
78359 struct list_head cpu_timers[3];
78360
78361-/* process credentials */
78362- const struct cred __rcu *real_cred; /* objective and real subjective task
78363- * credentials (COW) */
78364- const struct cred __rcu *cred; /* effective (overridable) subjective task
78365- * credentials (COW) */
78366 char comm[TASK_COMM_LEN]; /* executable name excluding path
78367 - access with [gs]et_task_comm (which lock
78368 it with task_lock())
78369@@ -1197,6 +1225,10 @@ struct task_struct {
78370 #endif
78371 /* CPU-specific state of this task */
78372 struct thread_struct thread;
78373+/* thread_info moved to task_struct */
78374+#ifdef CONFIG_X86
78375+ struct thread_info tinfo;
78376+#endif
78377 /* filesystem information */
78378 struct fs_struct *fs;
78379 /* open file information */
78380@@ -1270,6 +1302,10 @@ struct task_struct {
78381 gfp_t lockdep_reclaim_gfp;
78382 #endif
78383
78384+/* process credentials */
78385+ const struct cred __rcu *real_cred; /* objective and real subjective task
78386+ * credentials (COW) */
78387+
78388 /* journalling filesystem info */
78389 void *journal_info;
78390
78391@@ -1308,6 +1344,10 @@ struct task_struct {
78392 /* cg_list protected by css_set_lock and tsk->alloc_lock */
78393 struct list_head cg_list;
78394 #endif
78395+
78396+ const struct cred __rcu *cred; /* effective (overridable) subjective task
78397+ * credentials (COW) */
78398+
78399 #ifdef CONFIG_FUTEX
78400 struct robust_list_head __user *robust_list;
78401 #ifdef CONFIG_COMPAT
78402@@ -1411,8 +1451,78 @@ struct task_struct {
78403 unsigned int sequential_io;
78404 unsigned int sequential_io_avg;
78405 #endif
78406+
78407+#ifdef CONFIG_GRKERNSEC
78408+ /* grsecurity */
78409+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
78410+ u64 exec_id;
78411+#endif
78412+#ifdef CONFIG_GRKERNSEC_SETXID
78413+ const struct cred *delayed_cred;
78414+#endif
78415+ struct dentry *gr_chroot_dentry;
78416+ struct acl_subject_label *acl;
78417+ struct acl_subject_label *tmpacl;
78418+ struct acl_role_label *role;
78419+ struct file *exec_file;
78420+ unsigned long brute_expires;
78421+ u16 acl_role_id;
78422+ u8 inherited;
78423+ /* is this the task that authenticated to the special role */
78424+ u8 acl_sp_role;
78425+ u8 is_writable;
78426+ u8 brute;
78427+ u8 gr_is_chrooted;
78428+#endif
78429+
78430 };
78431
78432+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
78433+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
78434+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
78435+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
78436+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
78437+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
78438+
78439+#ifdef CONFIG_PAX_SOFTMODE
78440+extern int pax_softmode;
78441+#endif
78442+
78443+extern int pax_check_flags(unsigned long *);
78444+
78445+/* if tsk != current then task_lock must be held on it */
78446+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
78447+static inline unsigned long pax_get_flags(struct task_struct *tsk)
78448+{
78449+ if (likely(tsk->mm))
78450+ return tsk->mm->pax_flags;
78451+ else
78452+ return 0UL;
78453+}
78454+
78455+/* if tsk != current then task_lock must be held on it */
78456+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
78457+{
78458+ if (likely(tsk->mm)) {
78459+ tsk->mm->pax_flags = flags;
78460+ return 0;
78461+ }
78462+ return -EINVAL;
78463+}
78464+#endif
78465+
78466+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
78467+extern void pax_set_initial_flags(struct linux_binprm *bprm);
78468+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
78469+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
78470+#endif
78471+
78472+struct path;
78473+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
78474+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
78475+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
78476+extern void pax_report_refcount_overflow(struct pt_regs *regs);
78477+
78478 /* Future-safe accessor for struct task_struct's cpus_allowed. */
78479 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
78480
78481@@ -1471,7 +1581,7 @@ struct pid_namespace;
78482 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
78483 struct pid_namespace *ns);
78484
78485-static inline pid_t task_pid_nr(struct task_struct *tsk)
78486+static inline pid_t task_pid_nr(const struct task_struct *tsk)
78487 {
78488 return tsk->pid;
78489 }
78490@@ -1921,7 +2031,9 @@ void yield(void);
78491 extern struct exec_domain default_exec_domain;
78492
78493 union thread_union {
78494+#ifndef CONFIG_X86
78495 struct thread_info thread_info;
78496+#endif
78497 unsigned long stack[THREAD_SIZE/sizeof(long)];
78498 };
78499
78500@@ -1954,6 +2066,7 @@ extern struct pid_namespace init_pid_ns;
78501 */
78502
78503 extern struct task_struct *find_task_by_vpid(pid_t nr);
78504+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
78505 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
78506 struct pid_namespace *ns);
78507
78508@@ -2118,7 +2231,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
78509 extern void exit_itimers(struct signal_struct *);
78510 extern void flush_itimer_signals(void);
78511
78512-extern void do_group_exit(int);
78513+extern __noreturn void do_group_exit(int);
78514
78515 extern int allow_signal(int);
78516 extern int disallow_signal(int);
78517@@ -2309,9 +2422,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
78518
78519 #endif
78520
78521-static inline int object_is_on_stack(void *obj)
78522+static inline int object_starts_on_stack(void *obj)
78523 {
78524- void *stack = task_stack_page(current);
78525+ const void *stack = task_stack_page(current);
78526
78527 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
78528 }
78529diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
78530index bf8086b..962b035 100644
78531--- a/include/linux/sched/sysctl.h
78532+++ b/include/linux/sched/sysctl.h
78533@@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
78534 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
78535
78536 extern int sysctl_max_map_count;
78537+extern unsigned long sysctl_heap_stack_gap;
78538
78539 extern unsigned int sysctl_sched_latency;
78540 extern unsigned int sysctl_sched_min_granularity;
78541diff --git a/include/linux/security.h b/include/linux/security.h
78542index 9d37e2b..43368e4 100644
78543--- a/include/linux/security.h
78544+++ b/include/linux/security.h
78545@@ -27,6 +27,7 @@
78546 #include <linux/slab.h>
78547 #include <linux/err.h>
78548 #include <linux/string.h>
78549+#include <linux/grsecurity.h>
78550
78551 struct linux_binprm;
78552 struct cred;
78553@@ -116,8 +117,6 @@ struct seq_file;
78554
78555 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
78556
78557-void reset_security_ops(void);
78558-
78559 #ifdef CONFIG_MMU
78560 extern unsigned long mmap_min_addr;
78561 extern unsigned long dac_mmap_min_addr;
78562diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
78563index dc368b8..e895209 100644
78564--- a/include/linux/semaphore.h
78565+++ b/include/linux/semaphore.h
78566@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
78567 }
78568
78569 extern void down(struct semaphore *sem);
78570-extern int __must_check down_interruptible(struct semaphore *sem);
78571+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
78572 extern int __must_check down_killable(struct semaphore *sem);
78573 extern int __must_check down_trylock(struct semaphore *sem);
78574 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
78575diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
78576index 4e32edc..f8f2d18 100644
78577--- a/include/linux/seq_file.h
78578+++ b/include/linux/seq_file.h
78579@@ -26,6 +26,9 @@ struct seq_file {
78580 struct mutex lock;
78581 const struct seq_operations *op;
78582 int poll_event;
78583+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
78584+ u64 exec_id;
78585+#endif
78586 #ifdef CONFIG_USER_NS
78587 struct user_namespace *user_ns;
78588 #endif
78589@@ -38,6 +41,7 @@ struct seq_operations {
78590 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
78591 int (*show) (struct seq_file *m, void *v);
78592 };
78593+typedef struct seq_operations __no_const seq_operations_no_const;
78594
78595 #define SEQ_SKIP 1
78596
78597diff --git a/include/linux/shm.h b/include/linux/shm.h
78598index 429c199..4d42e38 100644
78599--- a/include/linux/shm.h
78600+++ b/include/linux/shm.h
78601@@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
78602
78603 /* The task created the shm object. NULL if the task is dead. */
78604 struct task_struct *shm_creator;
78605+#ifdef CONFIG_GRKERNSEC
78606+ time_t shm_createtime;
78607+ pid_t shm_lapid;
78608+#endif
78609 };
78610
78611 /* shm_mode upper byte flags */
78612diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
78613index f66f346..2e304d5 100644
78614--- a/include/linux/skbuff.h
78615+++ b/include/linux/skbuff.h
78616@@ -639,7 +639,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
78617 extern struct sk_buff *__alloc_skb(unsigned int size,
78618 gfp_t priority, int flags, int node);
78619 extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
78620-static inline struct sk_buff *alloc_skb(unsigned int size,
78621+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
78622 gfp_t priority)
78623 {
78624 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
78625@@ -755,7 +755,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
78626 */
78627 static inline int skb_queue_empty(const struct sk_buff_head *list)
78628 {
78629- return list->next == (struct sk_buff *)list;
78630+ return list->next == (const struct sk_buff *)list;
78631 }
78632
78633 /**
78634@@ -768,7 +768,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
78635 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
78636 const struct sk_buff *skb)
78637 {
78638- return skb->next == (struct sk_buff *)list;
78639+ return skb->next == (const struct sk_buff *)list;
78640 }
78641
78642 /**
78643@@ -781,7 +781,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
78644 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
78645 const struct sk_buff *skb)
78646 {
78647- return skb->prev == (struct sk_buff *)list;
78648+ return skb->prev == (const struct sk_buff *)list;
78649 }
78650
78651 /**
78652@@ -1741,7 +1741,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
78653 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
78654 */
78655 #ifndef NET_SKB_PAD
78656-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
78657+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
78658 #endif
78659
78660 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
78661@@ -2339,7 +2339,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
78662 int noblock, int *err);
78663 extern unsigned int datagram_poll(struct file *file, struct socket *sock,
78664 struct poll_table_struct *wait);
78665-extern int skb_copy_datagram_iovec(const struct sk_buff *from,
78666+extern int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from,
78667 int offset, struct iovec *to,
78668 int size);
78669 extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
78670@@ -2618,6 +2618,9 @@ static inline void nf_reset(struct sk_buff *skb)
78671 nf_bridge_put(skb->nf_bridge);
78672 skb->nf_bridge = NULL;
78673 #endif
78674+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
78675+ skb->nf_trace = 0;
78676+#endif
78677 }
78678
78679 static inline void nf_reset_trace(struct sk_buff *skb)
78680diff --git a/include/linux/slab.h b/include/linux/slab.h
78681index 74f1058..914b7da 100644
78682--- a/include/linux/slab.h
78683+++ b/include/linux/slab.h
78684@@ -14,15 +14,29 @@
78685 #include <linux/gfp.h>
78686 #include <linux/types.h>
78687 #include <linux/workqueue.h>
78688-
78689+#include <linux/err.h>
78690
78691 /*
78692 * Flags to pass to kmem_cache_create().
78693 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
78694 */
78695 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
78696+
78697+#ifdef CONFIG_PAX_USERCOPY_SLABS
78698+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
78699+#else
78700+#define SLAB_USERCOPY 0x00000000UL
78701+#endif
78702+
78703 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
78704 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
78705+
78706+#ifdef CONFIG_PAX_MEMORY_SANITIZE
78707+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
78708+#else
78709+#define SLAB_NO_SANITIZE 0x00000000UL
78710+#endif
78711+
78712 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
78713 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
78714 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
78715@@ -91,10 +105,13 @@
78716 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
78717 * Both make kfree a no-op.
78718 */
78719-#define ZERO_SIZE_PTR ((void *)16)
78720+#define ZERO_SIZE_PTR \
78721+({ \
78722+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
78723+ (void *)(-MAX_ERRNO-1L); \
78724+})
78725
78726-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
78727- (unsigned long)ZERO_SIZE_PTR)
78728+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
78729
78730 #include <linux/kmemleak.h>
78731
78732@@ -135,6 +152,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
78733 void kfree(const void *);
78734 void kzfree(const void *);
78735 size_t ksize(const void *);
78736+const char *check_heap_object(const void *ptr, unsigned long n);
78737+bool is_usercopy_object(const void *ptr);
78738
78739 /*
78740 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
78741@@ -167,7 +186,7 @@ struct kmem_cache {
78742 unsigned int align; /* Alignment as calculated */
78743 unsigned long flags; /* Active flags on the slab */
78744 const char *name; /* Slab name for sysfs */
78745- int refcount; /* Use counter */
78746+ atomic_t refcount; /* Use counter */
78747 void (*ctor)(void *); /* Called on object slot creation */
78748 struct list_head list; /* List of all slab caches on the system */
78749 };
78750@@ -241,6 +260,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
78751 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
78752 #endif
78753
78754+#ifdef CONFIG_PAX_USERCOPY_SLABS
78755+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
78756+#endif
78757+
78758 /*
78759 * Figure out which kmalloc slab an allocation of a certain size
78760 * belongs to.
78761@@ -249,7 +272,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
78762 * 2 = 120 .. 192 bytes
78763 * n = 2^(n-1) .. 2^n -1
78764 */
78765-static __always_inline int kmalloc_index(size_t size)
78766+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
78767 {
78768 if (!size)
78769 return 0;
78770@@ -292,11 +315,11 @@ static __always_inline int kmalloc_index(size_t size)
78771 }
78772 #endif /* !CONFIG_SLOB */
78773
78774-void *__kmalloc(size_t size, gfp_t flags);
78775+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
78776 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
78777
78778 #ifdef CONFIG_NUMA
78779-void *__kmalloc_node(size_t size, gfp_t flags, int node);
78780+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
78781 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
78782 #else
78783 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
78784diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
78785index e9346b4..1494959 100644
78786--- a/include/linux/slab_def.h
78787+++ b/include/linux/slab_def.h
78788@@ -36,7 +36,7 @@ struct kmem_cache {
78789 /* 4) cache creation/removal */
78790 const char *name;
78791 struct list_head list;
78792- int refcount;
78793+ atomic_t refcount;
78794 int object_size;
78795 int align;
78796
78797@@ -52,10 +52,14 @@ struct kmem_cache {
78798 unsigned long node_allocs;
78799 unsigned long node_frees;
78800 unsigned long node_overflow;
78801- atomic_t allochit;
78802- atomic_t allocmiss;
78803- atomic_t freehit;
78804- atomic_t freemiss;
78805+ atomic_unchecked_t allochit;
78806+ atomic_unchecked_t allocmiss;
78807+ atomic_unchecked_t freehit;
78808+ atomic_unchecked_t freemiss;
78809+#ifdef CONFIG_PAX_MEMORY_SANITIZE
78810+ atomic_unchecked_t sanitized;
78811+ atomic_unchecked_t not_sanitized;
78812+#endif
78813
78814 /*
78815 * If debugging is enabled, then the allocator can add additional
78816diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
78817index cc0b67e..a0329b1 100644
78818--- a/include/linux/slub_def.h
78819+++ b/include/linux/slub_def.h
78820@@ -74,7 +74,7 @@ struct kmem_cache {
78821 struct kmem_cache_order_objects max;
78822 struct kmem_cache_order_objects min;
78823 gfp_t allocflags; /* gfp flags to use on each alloc */
78824- int refcount; /* Refcount for slab cache destroy */
78825+ atomic_t refcount; /* Refcount for slab cache destroy */
78826 void (*ctor)(void *);
78827 int inuse; /* Offset to metadata */
78828 int align; /* Alignment */
78829diff --git a/include/linux/smp.h b/include/linux/smp.h
78830index 731f523..3340268 100644
78831--- a/include/linux/smp.h
78832+++ b/include/linux/smp.h
78833@@ -186,7 +186,9 @@ static inline void __smp_call_function_single(int cpuid,
78834 #endif
78835
78836 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
78837+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
78838 #define put_cpu() preempt_enable()
78839+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
78840
78841 /*
78842 * Callback to arch code if there's nosmp or maxcpus=0 on the
78843diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
78844index 54f91d3..be2c379 100644
78845--- a/include/linux/sock_diag.h
78846+++ b/include/linux/sock_diag.h
78847@@ -11,7 +11,7 @@ struct sock;
78848 struct sock_diag_handler {
78849 __u8 family;
78850 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
78851-};
78852+} __do_const;
78853
78854 int sock_diag_register(const struct sock_diag_handler *h);
78855 void sock_diag_unregister(const struct sock_diag_handler *h);
78856diff --git a/include/linux/sonet.h b/include/linux/sonet.h
78857index 680f9a3..f13aeb0 100644
78858--- a/include/linux/sonet.h
78859+++ b/include/linux/sonet.h
78860@@ -7,7 +7,7 @@
78861 #include <uapi/linux/sonet.h>
78862
78863 struct k_sonet_stats {
78864-#define __HANDLE_ITEM(i) atomic_t i
78865+#define __HANDLE_ITEM(i) atomic_unchecked_t i
78866 __SONET_ITEMS
78867 #undef __HANDLE_ITEM
78868 };
78869diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
78870index 07d8e53..dc934c9 100644
78871--- a/include/linux/sunrpc/addr.h
78872+++ b/include/linux/sunrpc/addr.h
78873@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
78874 {
78875 switch (sap->sa_family) {
78876 case AF_INET:
78877- return ntohs(((struct sockaddr_in *)sap)->sin_port);
78878+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
78879 case AF_INET6:
78880- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
78881+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
78882 }
78883 return 0;
78884 }
78885@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
78886 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
78887 const struct sockaddr *src)
78888 {
78889- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
78890+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
78891 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
78892
78893 dsin->sin_family = ssin->sin_family;
78894@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
78895 if (sa->sa_family != AF_INET6)
78896 return 0;
78897
78898- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
78899+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
78900 }
78901
78902 #endif /* _LINUX_SUNRPC_ADDR_H */
78903diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
78904index 6740801..c535f27 100644
78905--- a/include/linux/sunrpc/clnt.h
78906+++ b/include/linux/sunrpc/clnt.h
78907@@ -96,7 +96,7 @@ struct rpc_procinfo {
78908 unsigned int p_timer; /* Which RTT timer to use */
78909 u32 p_statidx; /* Which procedure to account */
78910 const char * p_name; /* name of procedure */
78911-};
78912+} __do_const;
78913
78914 #ifdef __KERNEL__
78915
78916diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
78917index 6eecfc2..7ada79d 100644
78918--- a/include/linux/sunrpc/svc.h
78919+++ b/include/linux/sunrpc/svc.h
78920@@ -410,7 +410,7 @@ struct svc_procedure {
78921 unsigned int pc_count; /* call count */
78922 unsigned int pc_cachetype; /* cache info (NFS) */
78923 unsigned int pc_xdrressize; /* maximum size of XDR reply */
78924-};
78925+} __do_const;
78926
78927 /*
78928 * Function prototypes.
78929diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
78930index 0b8e3e6..33e0a01 100644
78931--- a/include/linux/sunrpc/svc_rdma.h
78932+++ b/include/linux/sunrpc/svc_rdma.h
78933@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
78934 extern unsigned int svcrdma_max_requests;
78935 extern unsigned int svcrdma_max_req_size;
78936
78937-extern atomic_t rdma_stat_recv;
78938-extern atomic_t rdma_stat_read;
78939-extern atomic_t rdma_stat_write;
78940-extern atomic_t rdma_stat_sq_starve;
78941-extern atomic_t rdma_stat_rq_starve;
78942-extern atomic_t rdma_stat_rq_poll;
78943-extern atomic_t rdma_stat_rq_prod;
78944-extern atomic_t rdma_stat_sq_poll;
78945-extern atomic_t rdma_stat_sq_prod;
78946+extern atomic_unchecked_t rdma_stat_recv;
78947+extern atomic_unchecked_t rdma_stat_read;
78948+extern atomic_unchecked_t rdma_stat_write;
78949+extern atomic_unchecked_t rdma_stat_sq_starve;
78950+extern atomic_unchecked_t rdma_stat_rq_starve;
78951+extern atomic_unchecked_t rdma_stat_rq_poll;
78952+extern atomic_unchecked_t rdma_stat_rq_prod;
78953+extern atomic_unchecked_t rdma_stat_sq_poll;
78954+extern atomic_unchecked_t rdma_stat_sq_prod;
78955
78956 #define RPCRDMA_VERSION 1
78957
78958diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
78959index 8d71d65..f79586e 100644
78960--- a/include/linux/sunrpc/svcauth.h
78961+++ b/include/linux/sunrpc/svcauth.h
78962@@ -120,7 +120,7 @@ struct auth_ops {
78963 int (*release)(struct svc_rqst *rq);
78964 void (*domain_release)(struct auth_domain *);
78965 int (*set_client)(struct svc_rqst *rq);
78966-};
78967+} __do_const;
78968
78969 #define SVC_GARBAGE 1
78970 #define SVC_SYSERR 2
78971diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
78972index a5ffd32..0935dea 100644
78973--- a/include/linux/swiotlb.h
78974+++ b/include/linux/swiotlb.h
78975@@ -60,7 +60,8 @@ extern void
78976
78977 extern void
78978 swiotlb_free_coherent(struct device *hwdev, size_t size,
78979- void *vaddr, dma_addr_t dma_handle);
78980+ void *vaddr, dma_addr_t dma_handle,
78981+ struct dma_attrs *attrs);
78982
78983 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
78984 unsigned long offset, size_t size,
78985diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
78986index 7fac04e..de57300 100644
78987--- a/include/linux/syscalls.h
78988+++ b/include/linux/syscalls.h
78989@@ -97,8 +97,14 @@ struct sigaltstack;
78990 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
78991
78992 #define __SC_DECL(t, a) t a
78993+#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))
78994 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
78995-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
78996+#define __SC_LONG(t, a) __typeof( \
78997+ __builtin_choose_expr( \
78998+ sizeof(t) > sizeof(int), \
78999+ (t) 0, \
79000+ __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
79001+ )) a
79002 #define __SC_CAST(t, a) (t) a
79003 #define __SC_ARGS(t, a) a
79004 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
79005@@ -363,11 +369,11 @@ asmlinkage long sys_sync(void);
79006 asmlinkage long sys_fsync(unsigned int fd);
79007 asmlinkage long sys_fdatasync(unsigned int fd);
79008 asmlinkage long sys_bdflush(int func, long data);
79009-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
79010- char __user *type, unsigned long flags,
79011+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
79012+ const char __user *type, unsigned long flags,
79013 void __user *data);
79014-asmlinkage long sys_umount(char __user *name, int flags);
79015-asmlinkage long sys_oldumount(char __user *name);
79016+asmlinkage long sys_umount(const char __user *name, int flags);
79017+asmlinkage long sys_oldumount(const char __user *name);
79018 asmlinkage long sys_truncate(const char __user *path, long length);
79019 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
79020 asmlinkage long sys_stat(const char __user *filename,
79021@@ -579,7 +585,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
79022 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
79023 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
79024 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
79025- struct sockaddr __user *, int);
79026+ struct sockaddr __user *, int) __intentional_overflow(0);
79027 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
79028 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
79029 unsigned int vlen, unsigned flags);
79030diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
79031index 27b3b0b..e093dd9 100644
79032--- a/include/linux/syscore_ops.h
79033+++ b/include/linux/syscore_ops.h
79034@@ -16,7 +16,7 @@ struct syscore_ops {
79035 int (*suspend)(void);
79036 void (*resume)(void);
79037 void (*shutdown)(void);
79038-};
79039+} __do_const;
79040
79041 extern void register_syscore_ops(struct syscore_ops *ops);
79042 extern void unregister_syscore_ops(struct syscore_ops *ops);
79043diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
79044index 14a8ff2..af52bad 100644
79045--- a/include/linux/sysctl.h
79046+++ b/include/linux/sysctl.h
79047@@ -34,13 +34,13 @@ struct ctl_table_root;
79048 struct ctl_table_header;
79049 struct ctl_dir;
79050
79051-typedef struct ctl_table ctl_table;
79052-
79053 typedef int proc_handler (struct ctl_table *ctl, int write,
79054 void __user *buffer, size_t *lenp, loff_t *ppos);
79055
79056 extern int proc_dostring(struct ctl_table *, int,
79057 void __user *, size_t *, loff_t *);
79058+extern int proc_dostring_modpriv(struct ctl_table *, int,
79059+ void __user *, size_t *, loff_t *);
79060 extern int proc_dointvec(struct ctl_table *, int,
79061 void __user *, size_t *, loff_t *);
79062 extern int proc_dointvec_minmax(struct ctl_table *, int,
79063@@ -115,7 +115,9 @@ struct ctl_table
79064 struct ctl_table_poll *poll;
79065 void *extra1;
79066 void *extra2;
79067-};
79068+} __do_const;
79069+typedef struct ctl_table __no_const ctl_table_no_const;
79070+typedef struct ctl_table ctl_table;
79071
79072 struct ctl_node {
79073 struct rb_node node;
79074diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
79075index 11baec7..706f99f 100644
79076--- a/include/linux/sysfs.h
79077+++ b/include/linux/sysfs.h
79078@@ -33,7 +33,8 @@ struct attribute {
79079 struct lock_class_key *key;
79080 struct lock_class_key skey;
79081 #endif
79082-};
79083+} __do_const;
79084+typedef struct attribute __no_const attribute_no_const;
79085
79086 /**
79087 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
79088@@ -62,7 +63,8 @@ struct attribute_group {
79089 struct attribute *, int);
79090 struct attribute **attrs;
79091 struct bin_attribute **bin_attrs;
79092-};
79093+} __do_const;
79094+typedef struct attribute_group __no_const attribute_group_no_const;
79095
79096 /**
79097 * Use these macros to make defining attributes easier. See include/linux/device.h
79098@@ -126,7 +128,8 @@ struct bin_attribute {
79099 char *, loff_t, size_t);
79100 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
79101 struct vm_area_struct *vma);
79102-};
79103+} __do_const;
79104+typedef struct bin_attribute __no_const bin_attribute_no_const;
79105
79106 /**
79107 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
79108diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
79109index 7faf933..9b85a0c 100644
79110--- a/include/linux/sysrq.h
79111+++ b/include/linux/sysrq.h
79112@@ -16,6 +16,7 @@
79113
79114 #include <linux/errno.h>
79115 #include <linux/types.h>
79116+#include <linux/compiler.h>
79117
79118 /* Enable/disable SYSRQ support by default (0==no, 1==yes). */
79119 #define SYSRQ_DEFAULT_ENABLE 1
79120@@ -36,7 +37,7 @@ struct sysrq_key_op {
79121 char *help_msg;
79122 char *action_msg;
79123 int enable_mask;
79124-};
79125+} __do_const;
79126
79127 #ifdef CONFIG_MAGIC_SYSRQ
79128
79129diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
79130index 4ae6f32..425d3e1 100644
79131--- a/include/linux/thread_info.h
79132+++ b/include/linux/thread_info.h
79133@@ -150,6 +150,15 @@ static inline bool test_and_clear_restore_sigmask(void)
79134 #error "no set_restore_sigmask() provided and default one won't work"
79135 #endif
79136
79137+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user);
79138+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
79139+{
79140+#ifndef CONFIG_PAX_USERCOPY_DEBUG
79141+ if (!__builtin_constant_p(n))
79142+#endif
79143+ __check_object_size(ptr, n, to_user);
79144+}
79145+
79146 #endif /* __KERNEL__ */
79147
79148 #endif /* _LINUX_THREAD_INFO_H */
79149diff --git a/include/linux/tty.h b/include/linux/tty.h
79150index 64f8646..1515fc7 100644
79151--- a/include/linux/tty.h
79152+++ b/include/linux/tty.h
79153@@ -197,7 +197,7 @@ struct tty_port {
79154 const struct tty_port_operations *ops; /* Port operations */
79155 spinlock_t lock; /* Lock protecting tty field */
79156 int blocked_open; /* Waiting to open */
79157- int count; /* Usage count */
79158+ atomic_t count; /* Usage count */
79159 wait_queue_head_t open_wait; /* Open waiters */
79160 wait_queue_head_t close_wait; /* Close waiters */
79161 wait_queue_head_t delta_msr_wait; /* Modem status change */
79162@@ -546,7 +546,7 @@ extern int tty_port_open(struct tty_port *port,
79163 struct tty_struct *tty, struct file *filp);
79164 static inline int tty_port_users(struct tty_port *port)
79165 {
79166- return port->count + port->blocked_open;
79167+ return atomic_read(&port->count) + port->blocked_open;
79168 }
79169
79170 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
79171diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
79172index 756a609..b302dd6 100644
79173--- a/include/linux/tty_driver.h
79174+++ b/include/linux/tty_driver.h
79175@@ -285,7 +285,7 @@ struct tty_operations {
79176 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
79177 #endif
79178 const struct file_operations *proc_fops;
79179-};
79180+} __do_const;
79181
79182 struct tty_driver {
79183 int magic; /* magic number for this structure */
79184diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
79185index f15c898..207b7d1 100644
79186--- a/include/linux/tty_ldisc.h
79187+++ b/include/linux/tty_ldisc.h
79188@@ -211,7 +211,7 @@ struct tty_ldisc_ops {
79189
79190 struct module *owner;
79191
79192- int refcount;
79193+ atomic_t refcount;
79194 };
79195
79196 struct tty_ldisc {
79197diff --git a/include/linux/types.h b/include/linux/types.h
79198index 4d118ba..c3ee9bf 100644
79199--- a/include/linux/types.h
79200+++ b/include/linux/types.h
79201@@ -176,10 +176,26 @@ typedef struct {
79202 int counter;
79203 } atomic_t;
79204
79205+#ifdef CONFIG_PAX_REFCOUNT
79206+typedef struct {
79207+ int counter;
79208+} atomic_unchecked_t;
79209+#else
79210+typedef atomic_t atomic_unchecked_t;
79211+#endif
79212+
79213 #ifdef CONFIG_64BIT
79214 typedef struct {
79215 long counter;
79216 } atomic64_t;
79217+
79218+#ifdef CONFIG_PAX_REFCOUNT
79219+typedef struct {
79220+ long counter;
79221+} atomic64_unchecked_t;
79222+#else
79223+typedef atomic64_t atomic64_unchecked_t;
79224+#endif
79225 #endif
79226
79227 struct list_head {
79228diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
79229index 5ca0951..ab496a5 100644
79230--- a/include/linux/uaccess.h
79231+++ b/include/linux/uaccess.h
79232@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
79233 long ret; \
79234 mm_segment_t old_fs = get_fs(); \
79235 \
79236- set_fs(KERNEL_DS); \
79237 pagefault_disable(); \
79238- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
79239- pagefault_enable(); \
79240+ set_fs(KERNEL_DS); \
79241+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
79242 set_fs(old_fs); \
79243+ pagefault_enable(); \
79244 ret; \
79245 })
79246
79247diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
79248index 8e522cbc..aa8572d 100644
79249--- a/include/linux/uidgid.h
79250+++ b/include/linux/uidgid.h
79251@@ -197,4 +197,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
79252
79253 #endif /* CONFIG_USER_NS */
79254
79255+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
79256+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
79257+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
79258+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
79259+
79260 #endif /* _LINUX_UIDGID_H */
79261diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
79262index 99c1b4d..562e6f3 100644
79263--- a/include/linux/unaligned/access_ok.h
79264+++ b/include/linux/unaligned/access_ok.h
79265@@ -4,34 +4,34 @@
79266 #include <linux/kernel.h>
79267 #include <asm/byteorder.h>
79268
79269-static inline u16 get_unaligned_le16(const void *p)
79270+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
79271 {
79272- return le16_to_cpup((__le16 *)p);
79273+ return le16_to_cpup((const __le16 *)p);
79274 }
79275
79276-static inline u32 get_unaligned_le32(const void *p)
79277+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
79278 {
79279- return le32_to_cpup((__le32 *)p);
79280+ return le32_to_cpup((const __le32 *)p);
79281 }
79282
79283-static inline u64 get_unaligned_le64(const void *p)
79284+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
79285 {
79286- return le64_to_cpup((__le64 *)p);
79287+ return le64_to_cpup((const __le64 *)p);
79288 }
79289
79290-static inline u16 get_unaligned_be16(const void *p)
79291+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
79292 {
79293- return be16_to_cpup((__be16 *)p);
79294+ return be16_to_cpup((const __be16 *)p);
79295 }
79296
79297-static inline u32 get_unaligned_be32(const void *p)
79298+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
79299 {
79300- return be32_to_cpup((__be32 *)p);
79301+ return be32_to_cpup((const __be32 *)p);
79302 }
79303
79304-static inline u64 get_unaligned_be64(const void *p)
79305+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
79306 {
79307- return be64_to_cpup((__be64 *)p);
79308+ return be64_to_cpup((const __be64 *)p);
79309 }
79310
79311 static inline void put_unaligned_le16(u16 val, void *p)
79312diff --git a/include/linux/usb.h b/include/linux/usb.h
79313index 6b02370..2355ffa 100644
79314--- a/include/linux/usb.h
79315+++ b/include/linux/usb.h
79316@@ -563,7 +563,7 @@ struct usb_device {
79317 int maxchild;
79318
79319 u32 quirks;
79320- atomic_t urbnum;
79321+ atomic_unchecked_t urbnum;
79322
79323 unsigned long active_duration;
79324
79325@@ -1639,7 +1639,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
79326
79327 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
79328 __u8 request, __u8 requesttype, __u16 value, __u16 index,
79329- void *data, __u16 size, int timeout);
79330+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
79331 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
79332 void *data, int len, int *actual_length, int timeout);
79333 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
79334diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
79335index e452ba6..78f8e80 100644
79336--- a/include/linux/usb/renesas_usbhs.h
79337+++ b/include/linux/usb/renesas_usbhs.h
79338@@ -39,7 +39,7 @@ enum {
79339 */
79340 struct renesas_usbhs_driver_callback {
79341 int (*notify_hotplug)(struct platform_device *pdev);
79342-};
79343+} __no_const;
79344
79345 /*
79346 * callback functions for platform
79347diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
79348index 6f8fbcf..8259001 100644
79349--- a/include/linux/vermagic.h
79350+++ b/include/linux/vermagic.h
79351@@ -25,9 +25,35 @@
79352 #define MODULE_ARCH_VERMAGIC ""
79353 #endif
79354
79355+#ifdef CONFIG_PAX_REFCOUNT
79356+#define MODULE_PAX_REFCOUNT "REFCOUNT "
79357+#else
79358+#define MODULE_PAX_REFCOUNT ""
79359+#endif
79360+
79361+#ifdef CONSTIFY_PLUGIN
79362+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
79363+#else
79364+#define MODULE_CONSTIFY_PLUGIN ""
79365+#endif
79366+
79367+#ifdef STACKLEAK_PLUGIN
79368+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
79369+#else
79370+#define MODULE_STACKLEAK_PLUGIN ""
79371+#endif
79372+
79373+#ifdef CONFIG_GRKERNSEC
79374+#define MODULE_GRSEC "GRSEC "
79375+#else
79376+#define MODULE_GRSEC ""
79377+#endif
79378+
79379 #define VERMAGIC_STRING \
79380 UTS_RELEASE " " \
79381 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
79382 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
79383- MODULE_ARCH_VERMAGIC
79384+ MODULE_ARCH_VERMAGIC \
79385+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
79386+ MODULE_GRSEC
79387
79388diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
79389index 502073a..a7de024 100644
79390--- a/include/linux/vga_switcheroo.h
79391+++ b/include/linux/vga_switcheroo.h
79392@@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
79393
79394 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
79395
79396-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
79397-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
79398+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
79399+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
79400 #else
79401
79402 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
79403@@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
79404
79405 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
79406
79407-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
79408-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
79409+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
79410+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
79411
79412 #endif
79413 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
79414diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
79415index 4b8a891..cb8df6e 100644
79416--- a/include/linux/vmalloc.h
79417+++ b/include/linux/vmalloc.h
79418@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
79419 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
79420 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
79421 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
79422+
79423+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
79424+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
79425+#endif
79426+
79427 /* bits [20..32] reserved for arch specific ioremap internals */
79428
79429 /*
79430@@ -142,7 +147,7 @@ extern void free_vm_area(struct vm_struct *area);
79431
79432 /* for /dev/kmem */
79433 extern long vread(char *buf, char *addr, unsigned long count);
79434-extern long vwrite(char *buf, char *addr, unsigned long count);
79435+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
79436
79437 /*
79438 * Internals. Dont't use..
79439diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
79440index e4b9480..5a5f65a 100644
79441--- a/include/linux/vmstat.h
79442+++ b/include/linux/vmstat.h
79443@@ -90,18 +90,18 @@ static inline void vm_events_fold_cpu(int cpu)
79444 /*
79445 * Zone based page accounting with per cpu differentials.
79446 */
79447-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
79448+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
79449
79450 static inline void zone_page_state_add(long x, struct zone *zone,
79451 enum zone_stat_item item)
79452 {
79453- atomic_long_add(x, &zone->vm_stat[item]);
79454- atomic_long_add(x, &vm_stat[item]);
79455+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
79456+ atomic_long_add_unchecked(x, &vm_stat[item]);
79457 }
79458
79459-static inline unsigned long global_page_state(enum zone_stat_item item)
79460+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
79461 {
79462- long x = atomic_long_read(&vm_stat[item]);
79463+ long x = atomic_long_read_unchecked(&vm_stat[item]);
79464 #ifdef CONFIG_SMP
79465 if (x < 0)
79466 x = 0;
79467@@ -109,10 +109,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
79468 return x;
79469 }
79470
79471-static inline unsigned long zone_page_state(struct zone *zone,
79472+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
79473 enum zone_stat_item item)
79474 {
79475- long x = atomic_long_read(&zone->vm_stat[item]);
79476+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
79477 #ifdef CONFIG_SMP
79478 if (x < 0)
79479 x = 0;
79480@@ -129,7 +129,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
79481 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
79482 enum zone_stat_item item)
79483 {
79484- long x = atomic_long_read(&zone->vm_stat[item]);
79485+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
79486
79487 #ifdef CONFIG_SMP
79488 int cpu;
79489@@ -220,8 +220,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
79490
79491 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
79492 {
79493- atomic_long_inc(&zone->vm_stat[item]);
79494- atomic_long_inc(&vm_stat[item]);
79495+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
79496+ atomic_long_inc_unchecked(&vm_stat[item]);
79497 }
79498
79499 static inline void __inc_zone_page_state(struct page *page,
79500@@ -232,8 +232,8 @@ static inline void __inc_zone_page_state(struct page *page,
79501
79502 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
79503 {
79504- atomic_long_dec(&zone->vm_stat[item]);
79505- atomic_long_dec(&vm_stat[item]);
79506+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
79507+ atomic_long_dec_unchecked(&vm_stat[item]);
79508 }
79509
79510 static inline void __dec_zone_page_state(struct page *page,
79511diff --git a/include/linux/xattr.h b/include/linux/xattr.h
79512index 91b0a68..0e9adf6 100644
79513--- a/include/linux/xattr.h
79514+++ b/include/linux/xattr.h
79515@@ -28,7 +28,7 @@ struct xattr_handler {
79516 size_t size, int handler_flags);
79517 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
79518 size_t size, int flags, int handler_flags);
79519-};
79520+} __do_const;
79521
79522 struct xattr {
79523 const char *name;
79524@@ -37,6 +37,9 @@ struct xattr {
79525 };
79526
79527 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
79528+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
79529+ssize_t pax_getxattr(struct dentry *, void *, size_t);
79530+#endif
79531 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
79532 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
79533 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
79534diff --git a/include/linux/zlib.h b/include/linux/zlib.h
79535index 9c5a6b4..09c9438 100644
79536--- a/include/linux/zlib.h
79537+++ b/include/linux/zlib.h
79538@@ -31,6 +31,7 @@
79539 #define _ZLIB_H
79540
79541 #include <linux/zconf.h>
79542+#include <linux/compiler.h>
79543
79544 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
79545 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
79546@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
79547
79548 /* basic functions */
79549
79550-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
79551+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
79552 /*
79553 Returns the number of bytes that needs to be allocated for a per-
79554 stream workspace with the specified parameters. A pointer to this
79555diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
79556index c768c9f..bdcaa5a 100644
79557--- a/include/media/v4l2-dev.h
79558+++ b/include/media/v4l2-dev.h
79559@@ -76,7 +76,7 @@ struct v4l2_file_operations {
79560 int (*mmap) (struct file *, struct vm_area_struct *);
79561 int (*open) (struct file *);
79562 int (*release) (struct file *);
79563-};
79564+} __do_const;
79565
79566 /*
79567 * Newer version of video_device, handled by videodev2.c
79568diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
79569index c9b1593..a572459 100644
79570--- a/include/media/v4l2-device.h
79571+++ b/include/media/v4l2-device.h
79572@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
79573 this function returns 0. If the name ends with a digit (e.g. cx18),
79574 then the name will be set to cx18-0 since cx180 looks really odd. */
79575 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
79576- atomic_t *instance);
79577+ atomic_unchecked_t *instance);
79578
79579 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
79580 Since the parent disappears this ensures that v4l2_dev doesn't have an
79581diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
79582index 9a36d92..0aafe2a 100644
79583--- a/include/net/9p/transport.h
79584+++ b/include/net/9p/transport.h
79585@@ -60,7 +60,7 @@ struct p9_trans_module {
79586 int (*cancel) (struct p9_client *, struct p9_req_t *req);
79587 int (*zc_request)(struct p9_client *, struct p9_req_t *,
79588 char *, char *, int , int, int, int);
79589-};
79590+} __do_const;
79591
79592 void v9fs_register_trans(struct p9_trans_module *m);
79593 void v9fs_unregister_trans(struct p9_trans_module *m);
79594diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
79595index 1a966af..2767cf6 100644
79596--- a/include/net/bluetooth/l2cap.h
79597+++ b/include/net/bluetooth/l2cap.h
79598@@ -551,7 +551,7 @@ struct l2cap_ops {
79599 void (*defer) (struct l2cap_chan *chan);
79600 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
79601 unsigned long len, int nb);
79602-};
79603+} __do_const;
79604
79605 struct l2cap_conn {
79606 struct hci_conn *hcon;
79607diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
79608index f2ae33d..c457cf0 100644
79609--- a/include/net/caif/cfctrl.h
79610+++ b/include/net/caif/cfctrl.h
79611@@ -52,7 +52,7 @@ struct cfctrl_rsp {
79612 void (*radioset_rsp)(void);
79613 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
79614 struct cflayer *client_layer);
79615-};
79616+} __no_const;
79617
79618 /* Link Setup Parameters for CAIF-Links. */
79619 struct cfctrl_link_param {
79620@@ -101,8 +101,8 @@ struct cfctrl_request_info {
79621 struct cfctrl {
79622 struct cfsrvl serv;
79623 struct cfctrl_rsp res;
79624- atomic_t req_seq_no;
79625- atomic_t rsp_seq_no;
79626+ atomic_unchecked_t req_seq_no;
79627+ atomic_unchecked_t rsp_seq_no;
79628 struct list_head list;
79629 /* Protects from simultaneous access to first_req list */
79630 spinlock_t info_list_lock;
79631diff --git a/include/net/flow.h b/include/net/flow.h
79632index 628e11b..4c475df 100644
79633--- a/include/net/flow.h
79634+++ b/include/net/flow.h
79635@@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
79636
79637 extern void flow_cache_flush(void);
79638 extern void flow_cache_flush_deferred(void);
79639-extern atomic_t flow_cache_genid;
79640+extern atomic_unchecked_t flow_cache_genid;
79641
79642 #endif
79643diff --git a/include/net/genetlink.h b/include/net/genetlink.h
79644index 8e0b6c8..73cf605 100644
79645--- a/include/net/genetlink.h
79646+++ b/include/net/genetlink.h
79647@@ -120,7 +120,7 @@ struct genl_ops {
79648 struct netlink_callback *cb);
79649 int (*done)(struct netlink_callback *cb);
79650 struct list_head ops_list;
79651-};
79652+} __do_const;
79653
79654 extern int __genl_register_family(struct genl_family *family);
79655
79656diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
79657index 734d9b5..48a9a4b 100644
79658--- a/include/net/gro_cells.h
79659+++ b/include/net/gro_cells.h
79660@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
79661 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
79662
79663 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
79664- atomic_long_inc(&dev->rx_dropped);
79665+ atomic_long_inc_unchecked(&dev->rx_dropped);
79666 kfree_skb(skb);
79667 return;
79668 }
79669diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
79670index de2c785..0588a6b 100644
79671--- a/include/net/inet_connection_sock.h
79672+++ b/include/net/inet_connection_sock.h
79673@@ -62,7 +62,7 @@ struct inet_connection_sock_af_ops {
79674 void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
79675 int (*bind_conflict)(const struct sock *sk,
79676 const struct inet_bind_bucket *tb, bool relax);
79677-};
79678+} __do_const;
79679
79680 /** inet_connection_sock - INET connection oriented sock
79681 *
79682diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
79683index 53f464d..0bd0b49 100644
79684--- a/include/net/inetpeer.h
79685+++ b/include/net/inetpeer.h
79686@@ -47,8 +47,8 @@ struct inet_peer {
79687 */
79688 union {
79689 struct {
79690- atomic_t rid; /* Frag reception counter */
79691- atomic_t ip_id_count; /* IP ID for the next packet */
79692+ atomic_unchecked_t rid; /* Frag reception counter */
79693+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
79694 };
79695 struct rcu_head rcu;
79696 struct inet_peer *gc_next;
79697@@ -178,16 +178,13 @@ static inline void inet_peer_refcheck(const struct inet_peer *p)
79698 /* can be called with or without local BH being disabled */
79699 static inline int inet_getid(struct inet_peer *p, int more)
79700 {
79701- int old, new;
79702+ int id;
79703 more++;
79704 inet_peer_refcheck(p);
79705- do {
79706- old = atomic_read(&p->ip_id_count);
79707- new = old + more;
79708- if (!new)
79709- new = 1;
79710- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
79711- return new;
79712+ id = atomic_add_return_unchecked(more, &p->ip_id_count);
79713+ if (!id)
79714+ id = atomic_inc_return_unchecked(&p->ip_id_count);
79715+ return id;
79716 }
79717
79718 #endif /* _NET_INETPEER_H */
79719diff --git a/include/net/ip.h b/include/net/ip.h
79720index 301f10c..b52cdaf 100644
79721--- a/include/net/ip.h
79722+++ b/include/net/ip.h
79723@@ -212,7 +212,7 @@ extern struct local_ports {
79724 } sysctl_local_ports;
79725 extern void inet_get_local_port_range(int *low, int *high);
79726
79727-extern unsigned long *sysctl_local_reserved_ports;
79728+extern unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
79729 static inline int inet_is_reserved_local_port(int port)
79730 {
79731 return test_bit(port, sysctl_local_reserved_ports);
79732diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
79733index cbf2be3..3683f6d 100644
79734--- a/include/net/ip_fib.h
79735+++ b/include/net/ip_fib.h
79736@@ -169,7 +169,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
79737
79738 #define FIB_RES_SADDR(net, res) \
79739 ((FIB_RES_NH(res).nh_saddr_genid == \
79740- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
79741+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
79742 FIB_RES_NH(res).nh_saddr : \
79743 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
79744 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
79745diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
79746index 772252d..1e69799 100644
79747--- a/include/net/ip_vs.h
79748+++ b/include/net/ip_vs.h
79749@@ -558,7 +558,7 @@ struct ip_vs_conn {
79750 struct ip_vs_conn *control; /* Master control connection */
79751 atomic_t n_control; /* Number of controlled ones */
79752 struct ip_vs_dest *dest; /* real server */
79753- atomic_t in_pkts; /* incoming packet counter */
79754+ atomic_unchecked_t in_pkts; /* incoming packet counter */
79755
79756 /* packet transmitter for different forwarding methods. If it
79757 mangles the packet, it must return NF_DROP or better NF_STOLEN,
79758@@ -705,7 +705,7 @@ struct ip_vs_dest {
79759 __be16 port; /* port number of the server */
79760 union nf_inet_addr addr; /* IP address of the server */
79761 volatile unsigned int flags; /* dest status flags */
79762- atomic_t conn_flags; /* flags to copy to conn */
79763+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
79764 atomic_t weight; /* server weight */
79765
79766 atomic_t refcnt; /* reference counter */
79767@@ -960,11 +960,11 @@ struct netns_ipvs {
79768 /* ip_vs_lblc */
79769 int sysctl_lblc_expiration;
79770 struct ctl_table_header *lblc_ctl_header;
79771- struct ctl_table *lblc_ctl_table;
79772+ ctl_table_no_const *lblc_ctl_table;
79773 /* ip_vs_lblcr */
79774 int sysctl_lblcr_expiration;
79775 struct ctl_table_header *lblcr_ctl_header;
79776- struct ctl_table *lblcr_ctl_table;
79777+ ctl_table_no_const *lblcr_ctl_table;
79778 /* ip_vs_est */
79779 struct list_head est_list; /* estimator list */
79780 spinlock_t est_lock;
79781diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
79782index 80ffde3..968b0f4 100644
79783--- a/include/net/irda/ircomm_tty.h
79784+++ b/include/net/irda/ircomm_tty.h
79785@@ -35,6 +35,7 @@
79786 #include <linux/termios.h>
79787 #include <linux/timer.h>
79788 #include <linux/tty.h> /* struct tty_struct */
79789+#include <asm/local.h>
79790
79791 #include <net/irda/irias_object.h>
79792 #include <net/irda/ircomm_core.h>
79793diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
79794index 714cc9a..ea05f3e 100644
79795--- a/include/net/iucv/af_iucv.h
79796+++ b/include/net/iucv/af_iucv.h
79797@@ -149,7 +149,7 @@ struct iucv_skb_cb {
79798 struct iucv_sock_list {
79799 struct hlist_head head;
79800 rwlock_t lock;
79801- atomic_t autobind_name;
79802+ atomic_unchecked_t autobind_name;
79803 };
79804
79805 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
79806diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
79807index df83f69..9b640b8 100644
79808--- a/include/net/llc_c_ac.h
79809+++ b/include/net/llc_c_ac.h
79810@@ -87,7 +87,7 @@
79811 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
79812 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
79813
79814-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
79815+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
79816
79817 extern int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
79818 extern int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
79819diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
79820index 6ca3113..f8026dd 100644
79821--- a/include/net/llc_c_ev.h
79822+++ b/include/net/llc_c_ev.h
79823@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
79824 return (struct llc_conn_state_ev *)skb->cb;
79825 }
79826
79827-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
79828-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
79829+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
79830+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
79831
79832 extern int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
79833 extern int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
79834diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
79835index 0e79cfb..f46db31 100644
79836--- a/include/net/llc_c_st.h
79837+++ b/include/net/llc_c_st.h
79838@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
79839 u8 next_state;
79840 llc_conn_ev_qfyr_t *ev_qualifiers;
79841 llc_conn_action_t *ev_actions;
79842-};
79843+} __do_const;
79844
79845 struct llc_conn_state {
79846 u8 current_state;
79847diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
79848index 37a3bbd..55a4241 100644
79849--- a/include/net/llc_s_ac.h
79850+++ b/include/net/llc_s_ac.h
79851@@ -23,7 +23,7 @@
79852 #define SAP_ACT_TEST_IND 9
79853
79854 /* All action functions must look like this */
79855-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
79856+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
79857
79858 extern int llc_sap_action_unitdata_ind(struct llc_sap *sap,
79859 struct sk_buff *skb);
79860diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
79861index 567c681..cd73ac0 100644
79862--- a/include/net/llc_s_st.h
79863+++ b/include/net/llc_s_st.h
79864@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
79865 llc_sap_ev_t ev;
79866 u8 next_state;
79867 llc_sap_action_t *ev_actions;
79868-};
79869+} __do_const;
79870
79871 struct llc_sap_state {
79872 u8 curr_state;
79873diff --git a/include/net/mac80211.h b/include/net/mac80211.h
79874index cc6035f..a8406fc 100644
79875--- a/include/net/mac80211.h
79876+++ b/include/net/mac80211.h
79877@@ -4361,7 +4361,7 @@ struct rate_control_ops {
79878 void (*add_sta_debugfs)(void *priv, void *priv_sta,
79879 struct dentry *dir);
79880 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
79881-};
79882+} __do_const;
79883
79884 static inline int rate_supported(struct ieee80211_sta *sta,
79885 enum ieee80211_band band,
79886diff --git a/include/net/neighbour.h b/include/net/neighbour.h
79887index 536501a..7c6193c 100644
79888--- a/include/net/neighbour.h
79889+++ b/include/net/neighbour.h
79890@@ -123,7 +123,7 @@ struct neigh_ops {
79891 void (*error_report)(struct neighbour *, struct sk_buff *);
79892 int (*output)(struct neighbour *, struct sk_buff *);
79893 int (*connected_output)(struct neighbour *, struct sk_buff *);
79894-};
79895+} __do_const;
79896
79897 struct pneigh_entry {
79898 struct pneigh_entry *next;
79899diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
79900index 9d22f08..980fbf8 100644
79901--- a/include/net/net_namespace.h
79902+++ b/include/net/net_namespace.h
79903@@ -120,7 +120,7 @@ struct net {
79904 struct netns_ipvs *ipvs;
79905 #endif
79906 struct sock *diag_nlsk;
79907- atomic_t fnhe_genid;
79908+ atomic_unchecked_t fnhe_genid;
79909 };
79910
79911 /*
79912@@ -277,7 +277,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
79913 #define __net_init __init
79914 #define __net_exit __exit_refok
79915 #define __net_initdata __initdata
79916+#ifdef CONSTIFY_PLUGIN
79917 #define __net_initconst __initconst
79918+#else
79919+#define __net_initconst __initdata
79920+#endif
79921 #endif
79922
79923 struct pernet_operations {
79924@@ -287,7 +291,7 @@ struct pernet_operations {
79925 void (*exit_batch)(struct list_head *net_exit_list);
79926 int *id;
79927 size_t size;
79928-};
79929+} __do_const;
79930
79931 /*
79932 * Use these carefully. If you implement a network device and it
79933@@ -335,23 +339,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
79934
79935 static inline int rt_genid_ipv4(struct net *net)
79936 {
79937- return atomic_read(&net->ipv4.rt_genid);
79938+ return atomic_read_unchecked(&net->ipv4.rt_genid);
79939 }
79940
79941 static inline void rt_genid_bump_ipv4(struct net *net)
79942 {
79943- atomic_inc(&net->ipv4.rt_genid);
79944+ atomic_inc_unchecked(&net->ipv4.rt_genid);
79945 }
79946
79947 #if IS_ENABLED(CONFIG_IPV6)
79948 static inline int rt_genid_ipv6(struct net *net)
79949 {
79950- return atomic_read(&net->ipv6.rt_genid);
79951+ return atomic_read_unchecked(&net->ipv6.rt_genid);
79952 }
79953
79954 static inline void rt_genid_bump_ipv6(struct net *net)
79955 {
79956- atomic_inc(&net->ipv6.rt_genid);
79957+ atomic_inc_unchecked(&net->ipv6.rt_genid);
79958 }
79959 #else
79960 static inline int rt_genid_ipv6(struct net *net)
79961@@ -373,12 +377,12 @@ static inline void rt_genid_bump_all(struct net *net)
79962
79963 static inline int fnhe_genid(struct net *net)
79964 {
79965- return atomic_read(&net->fnhe_genid);
79966+ return atomic_read_unchecked(&net->fnhe_genid);
79967 }
79968
79969 static inline void fnhe_genid_bump(struct net *net)
79970 {
79971- atomic_inc(&net->fnhe_genid);
79972+ atomic_inc_unchecked(&net->fnhe_genid);
79973 }
79974
79975 #endif /* __NET_NET_NAMESPACE_H */
79976diff --git a/include/net/netdma.h b/include/net/netdma.h
79977index 8ba8ce2..99b7fff 100644
79978--- a/include/net/netdma.h
79979+++ b/include/net/netdma.h
79980@@ -24,7 +24,7 @@
79981 #include <linux/dmaengine.h>
79982 #include <linux/skbuff.h>
79983
79984-int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
79985+int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
79986 struct sk_buff *skb, int offset, struct iovec *to,
79987 size_t len, struct dma_pinned_list *pinned_list);
79988
79989diff --git a/include/net/netlink.h b/include/net/netlink.h
79990index 9690b0f..87aded7 100644
79991--- a/include/net/netlink.h
79992+++ b/include/net/netlink.h
79993@@ -534,7 +534,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
79994 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
79995 {
79996 if (mark)
79997- skb_trim(skb, (unsigned char *) mark - skb->data);
79998+ skb_trim(skb, (const unsigned char *) mark - skb->data);
79999 }
80000
80001 /**
80002diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
80003index c9c0c53..53f24c3 100644
80004--- a/include/net/netns/conntrack.h
80005+++ b/include/net/netns/conntrack.h
80006@@ -12,10 +12,10 @@ struct nf_conntrack_ecache;
80007 struct nf_proto_net {
80008 #ifdef CONFIG_SYSCTL
80009 struct ctl_table_header *ctl_table_header;
80010- struct ctl_table *ctl_table;
80011+ ctl_table_no_const *ctl_table;
80012 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
80013 struct ctl_table_header *ctl_compat_header;
80014- struct ctl_table *ctl_compat_table;
80015+ ctl_table_no_const *ctl_compat_table;
80016 #endif
80017 #endif
80018 unsigned int users;
80019@@ -58,7 +58,7 @@ struct nf_ip_net {
80020 struct nf_icmp_net icmpv6;
80021 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
80022 struct ctl_table_header *ctl_table_header;
80023- struct ctl_table *ctl_table;
80024+ ctl_table_no_const *ctl_table;
80025 #endif
80026 };
80027
80028diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
80029index bf2ec22..5e7f9d9 100644
80030--- a/include/net/netns/ipv4.h
80031+++ b/include/net/netns/ipv4.h
80032@@ -67,7 +67,7 @@ struct netns_ipv4 {
80033 kgid_t sysctl_ping_group_range[2];
80034 long sysctl_tcp_mem[3];
80035
80036- atomic_t dev_addr_genid;
80037+ atomic_unchecked_t dev_addr_genid;
80038
80039 #ifdef CONFIG_IP_MROUTE
80040 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
80041@@ -77,6 +77,6 @@ struct netns_ipv4 {
80042 struct fib_rules_ops *mr_rules_ops;
80043 #endif
80044 #endif
80045- atomic_t rt_genid;
80046+ atomic_unchecked_t rt_genid;
80047 };
80048 #endif
80049diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
80050index 0fb2401..477d81c 100644
80051--- a/include/net/netns/ipv6.h
80052+++ b/include/net/netns/ipv6.h
80053@@ -71,8 +71,8 @@ struct netns_ipv6 {
80054 struct fib_rules_ops *mr6_rules_ops;
80055 #endif
80056 #endif
80057- atomic_t dev_addr_genid;
80058- atomic_t rt_genid;
80059+ atomic_unchecked_t dev_addr_genid;
80060+ atomic_unchecked_t rt_genid;
80061 };
80062
80063 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
80064diff --git a/include/net/ping.h b/include/net/ping.h
80065index 2b496e9..935fd8d 100644
80066--- a/include/net/ping.h
80067+++ b/include/net/ping.h
80068@@ -56,7 +56,7 @@ struct ping_iter_state {
80069 extern struct proto ping_prot;
80070 extern struct ping_table ping_table;
80071 #if IS_ENABLED(CONFIG_IPV6)
80072-extern struct pingv6_ops pingv6_ops;
80073+extern struct pingv6_ops *pingv6_ops;
80074 #endif
80075
80076 struct pingfakehdr {
80077diff --git a/include/net/protocol.h b/include/net/protocol.h
80078index 047c047..b9dad15 100644
80079--- a/include/net/protocol.h
80080+++ b/include/net/protocol.h
80081@@ -44,7 +44,7 @@ struct net_protocol {
80082 void (*err_handler)(struct sk_buff *skb, u32 info);
80083 unsigned int no_policy:1,
80084 netns_ok:1;
80085-};
80086+} __do_const;
80087
80088 #if IS_ENABLED(CONFIG_IPV6)
80089 struct inet6_protocol {
80090@@ -57,7 +57,7 @@ struct inet6_protocol {
80091 u8 type, u8 code, int offset,
80092 __be32 info);
80093 unsigned int flags; /* INET6_PROTO_xxx */
80094-};
80095+} __do_const;
80096
80097 #define INET6_PROTO_NOPOLICY 0x1
80098 #define INET6_PROTO_FINAL 0x2
80099diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
80100index 7026648..584cc8c 100644
80101--- a/include/net/rtnetlink.h
80102+++ b/include/net/rtnetlink.h
80103@@ -81,7 +81,7 @@ struct rtnl_link_ops {
80104 const struct net_device *dev);
80105 unsigned int (*get_num_tx_queues)(void);
80106 unsigned int (*get_num_rx_queues)(void);
80107-};
80108+} __do_const;
80109
80110 extern int __rtnl_link_register(struct rtnl_link_ops *ops);
80111 extern void __rtnl_link_unregister(struct rtnl_link_ops *ops);
80112diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
80113index 4ef75af..5aa073a 100644
80114--- a/include/net/sctp/sm.h
80115+++ b/include/net/sctp/sm.h
80116@@ -81,7 +81,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
80117 typedef struct {
80118 sctp_state_fn_t *fn;
80119 const char *name;
80120-} sctp_sm_table_entry_t;
80121+} __do_const sctp_sm_table_entry_t;
80122
80123 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
80124 * currently in use.
80125@@ -293,7 +293,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
80126 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
80127
80128 /* Extern declarations for major data structures. */
80129-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
80130+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
80131
80132
80133 /* Get the size of a DATA chunk payload. */
80134diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
80135index 2174d8d..71d5257 100644
80136--- a/include/net/sctp/structs.h
80137+++ b/include/net/sctp/structs.h
80138@@ -508,7 +508,7 @@ struct sctp_pf {
80139 struct sctp_association *asoc);
80140 void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
80141 struct sctp_af *af;
80142-};
80143+} __do_const;
80144
80145
80146 /* Structure to track chunk fragments that have been acked, but peer
80147diff --git a/include/net/sock.h b/include/net/sock.h
80148index 808cbc2..8617e9c 100644
80149--- a/include/net/sock.h
80150+++ b/include/net/sock.h
80151@@ -332,7 +332,7 @@ struct sock {
80152 unsigned int sk_napi_id;
80153 unsigned int sk_ll_usec;
80154 #endif
80155- atomic_t sk_drops;
80156+ atomic_unchecked_t sk_drops;
80157 int sk_rcvbuf;
80158
80159 struct sk_filter __rcu *sk_filter;
80160@@ -1194,7 +1194,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
80161 return ret >> PAGE_SHIFT;
80162 }
80163
80164-static inline long
80165+static inline long __intentional_overflow(-1)
80166 sk_memory_allocated(const struct sock *sk)
80167 {
80168 struct proto *prot = sk->sk_prot;
80169@@ -1821,7 +1821,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
80170 }
80171
80172 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
80173- char __user *from, char *to,
80174+ char __user *from, unsigned char *to,
80175 int copy, int offset)
80176 {
80177 if (skb->ip_summed == CHECKSUM_NONE) {
80178@@ -2083,7 +2083,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
80179 }
80180 }
80181
80182-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
80183+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
80184
80185 /**
80186 * sk_page_frag - return an appropriate page_frag
80187diff --git a/include/net/tcp.h b/include/net/tcp.h
80188index b1aa324..b8530ea 100644
80189--- a/include/net/tcp.h
80190+++ b/include/net/tcp.h
80191@@ -527,7 +527,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
80192 extern void tcp_xmit_retransmit_queue(struct sock *);
80193 extern void tcp_simple_retransmit(struct sock *);
80194 extern int tcp_trim_head(struct sock *, struct sk_buff *, u32);
80195-extern int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
80196+extern int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
80197
80198 extern void tcp_send_probe0(struct sock *);
80199 extern void tcp_send_partial(struct sock *);
80200@@ -699,8 +699,8 @@ struct tcp_skb_cb {
80201 struct inet6_skb_parm h6;
80202 #endif
80203 } header; /* For incoming frames */
80204- __u32 seq; /* Starting sequence number */
80205- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
80206+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
80207+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
80208 __u32 when; /* used to compute rtt's */
80209 __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
80210
80211@@ -714,7 +714,7 @@ struct tcp_skb_cb {
80212
80213 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
80214 /* 1 byte hole */
80215- __u32 ack_seq; /* Sequence number ACK'd */
80216+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
80217 };
80218
80219 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
80220diff --git a/include/net/xfrm.h b/include/net/xfrm.h
80221index e253bf0..2278b4b 100644
80222--- a/include/net/xfrm.h
80223+++ b/include/net/xfrm.h
80224@@ -287,7 +287,6 @@ struct xfrm_dst;
80225 struct xfrm_policy_afinfo {
80226 unsigned short family;
80227 struct dst_ops *dst_ops;
80228- void (*garbage_collect)(struct net *net);
80229 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
80230 const xfrm_address_t *saddr,
80231 const xfrm_address_t *daddr);
80232@@ -305,7 +304,7 @@ struct xfrm_policy_afinfo {
80233 struct net_device *dev,
80234 const struct flowi *fl);
80235 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
80236-};
80237+} __do_const;
80238
80239 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
80240 extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
80241@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
80242 int (*transport_finish)(struct sk_buff *skb,
80243 int async);
80244 void (*local_error)(struct sk_buff *skb, u32 mtu);
80245-};
80246+} __do_const;
80247
80248 extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
80249 extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
80250@@ -427,7 +426,7 @@ struct xfrm_mode {
80251 struct module *owner;
80252 unsigned int encap;
80253 int flags;
80254-};
80255+} __do_const;
80256
80257 /* Flags for xfrm_mode. */
80258 enum {
80259@@ -524,7 +523,7 @@ struct xfrm_policy {
80260 struct timer_list timer;
80261
80262 struct flow_cache_object flo;
80263- atomic_t genid;
80264+ atomic_unchecked_t genid;
80265 u32 priority;
80266 u32 index;
80267 struct xfrm_mark mark;
80268@@ -1164,6 +1163,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
80269 }
80270
80271 extern void xfrm_garbage_collect(struct net *net);
80272+extern void xfrm_garbage_collect_deferred(struct net *net);
80273
80274 #else
80275
80276@@ -1202,6 +1202,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
80277 static inline void xfrm_garbage_collect(struct net *net)
80278 {
80279 }
80280+static inline void xfrm_garbage_collect_deferred(struct net *net)
80281+{
80282+}
80283 #endif
80284
80285 static __inline__
80286diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
80287index 1017e0b..227aa4d 100644
80288--- a/include/rdma/iw_cm.h
80289+++ b/include/rdma/iw_cm.h
80290@@ -122,7 +122,7 @@ struct iw_cm_verbs {
80291 int backlog);
80292
80293 int (*destroy_listen)(struct iw_cm_id *cm_id);
80294-};
80295+} __no_const;
80296
80297 /**
80298 * iw_create_cm_id - Create an IW CM identifier.
80299diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
80300index e1379b4..67eafbe 100644
80301--- a/include/scsi/libfc.h
80302+++ b/include/scsi/libfc.h
80303@@ -762,6 +762,7 @@ struct libfc_function_template {
80304 */
80305 void (*disc_stop_final) (struct fc_lport *);
80306 };
80307+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
80308
80309 /**
80310 * struct fc_disc - Discovery context
80311@@ -866,7 +867,7 @@ struct fc_lport {
80312 struct fc_vport *vport;
80313
80314 /* Operational Information */
80315- struct libfc_function_template tt;
80316+ libfc_function_template_no_const tt;
80317 u8 link_up;
80318 u8 qfull;
80319 enum fc_lport_state state;
80320diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
80321index d65fbec..f80fef2 100644
80322--- a/include/scsi/scsi_device.h
80323+++ b/include/scsi/scsi_device.h
80324@@ -180,9 +180,9 @@ struct scsi_device {
80325 unsigned int max_device_blocked; /* what device_blocked counts down from */
80326 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
80327
80328- atomic_t iorequest_cnt;
80329- atomic_t iodone_cnt;
80330- atomic_t ioerr_cnt;
80331+ atomic_unchecked_t iorequest_cnt;
80332+ atomic_unchecked_t iodone_cnt;
80333+ atomic_unchecked_t ioerr_cnt;
80334
80335 struct device sdev_gendev,
80336 sdev_dev;
80337diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
80338index b797e8f..8e2c3aa 100644
80339--- a/include/scsi/scsi_transport_fc.h
80340+++ b/include/scsi/scsi_transport_fc.h
80341@@ -751,7 +751,8 @@ struct fc_function_template {
80342 unsigned long show_host_system_hostname:1;
80343
80344 unsigned long disable_target_scan:1;
80345-};
80346+} __do_const;
80347+typedef struct fc_function_template __no_const fc_function_template_no_const;
80348
80349
80350 /**
80351diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
80352index ae6c3b8..fd748ac 100644
80353--- a/include/sound/compress_driver.h
80354+++ b/include/sound/compress_driver.h
80355@@ -128,7 +128,7 @@ struct snd_compr_ops {
80356 struct snd_compr_caps *caps);
80357 int (*get_codec_caps) (struct snd_compr_stream *stream,
80358 struct snd_compr_codec_caps *codec);
80359-};
80360+} __no_const;
80361
80362 /**
80363 * struct snd_compr: Compressed device
80364diff --git a/include/sound/soc.h b/include/sound/soc.h
80365index d22cb0a..c6ba150 100644
80366--- a/include/sound/soc.h
80367+++ b/include/sound/soc.h
80368@@ -780,7 +780,7 @@ struct snd_soc_codec_driver {
80369 /* probe ordering - for components with runtime dependencies */
80370 int probe_order;
80371 int remove_order;
80372-};
80373+} __do_const;
80374
80375 /* SoC platform interface */
80376 struct snd_soc_platform_driver {
80377@@ -826,7 +826,7 @@ struct snd_soc_platform_driver {
80378 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
80379 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
80380 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
80381-};
80382+} __do_const;
80383
80384 struct snd_soc_platform {
80385 const char *name;
80386diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
80387index 23bfd10..1ff3e35 100644
80388--- a/include/target/target_core_base.h
80389+++ b/include/target/target_core_base.h
80390@@ -664,7 +664,7 @@ struct se_device {
80391 spinlock_t stats_lock;
80392 /* Active commands on this virtual SE device */
80393 atomic_t simple_cmds;
80394- atomic_t dev_ordered_id;
80395+ atomic_unchecked_t dev_ordered_id;
80396 atomic_t dev_ordered_sync;
80397 atomic_t dev_qf_count;
80398 int export_count;
80399diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
80400new file mode 100644
80401index 0000000..fb634b7
80402--- /dev/null
80403+++ b/include/trace/events/fs.h
80404@@ -0,0 +1,53 @@
80405+#undef TRACE_SYSTEM
80406+#define TRACE_SYSTEM fs
80407+
80408+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
80409+#define _TRACE_FS_H
80410+
80411+#include <linux/fs.h>
80412+#include <linux/tracepoint.h>
80413+
80414+TRACE_EVENT(do_sys_open,
80415+
80416+ TP_PROTO(const char *filename, int flags, int mode),
80417+
80418+ TP_ARGS(filename, flags, mode),
80419+
80420+ TP_STRUCT__entry(
80421+ __string( filename, filename )
80422+ __field( int, flags )
80423+ __field( int, mode )
80424+ ),
80425+
80426+ TP_fast_assign(
80427+ __assign_str(filename, filename);
80428+ __entry->flags = flags;
80429+ __entry->mode = mode;
80430+ ),
80431+
80432+ TP_printk("\"%s\" %x %o",
80433+ __get_str(filename), __entry->flags, __entry->mode)
80434+);
80435+
80436+TRACE_EVENT(open_exec,
80437+
80438+ TP_PROTO(const char *filename),
80439+
80440+ TP_ARGS(filename),
80441+
80442+ TP_STRUCT__entry(
80443+ __string( filename, filename )
80444+ ),
80445+
80446+ TP_fast_assign(
80447+ __assign_str(filename, filename);
80448+ ),
80449+
80450+ TP_printk("\"%s\"",
80451+ __get_str(filename))
80452+);
80453+
80454+#endif /* _TRACE_FS_H */
80455+
80456+/* This part must be outside protection */
80457+#include <trace/define_trace.h>
80458diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
80459index 1c09820..7f5ec79 100644
80460--- a/include/trace/events/irq.h
80461+++ b/include/trace/events/irq.h
80462@@ -36,7 +36,7 @@ struct softirq_action;
80463 */
80464 TRACE_EVENT(irq_handler_entry,
80465
80466- TP_PROTO(int irq, struct irqaction *action),
80467+ TP_PROTO(int irq, const struct irqaction *action),
80468
80469 TP_ARGS(irq, action),
80470
80471@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
80472 */
80473 TRACE_EVENT(irq_handler_exit,
80474
80475- TP_PROTO(int irq, struct irqaction *action, int ret),
80476+ TP_PROTO(int irq, const struct irqaction *action, int ret),
80477
80478 TP_ARGS(irq, action, ret),
80479
80480diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
80481index 7caf44c..23c6f27 100644
80482--- a/include/uapi/linux/a.out.h
80483+++ b/include/uapi/linux/a.out.h
80484@@ -39,6 +39,14 @@ enum machine_type {
80485 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
80486 };
80487
80488+/* Constants for the N_FLAGS field */
80489+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
80490+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
80491+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
80492+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
80493+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
80494+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
80495+
80496 #if !defined (N_MAGIC)
80497 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
80498 #endif
80499diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
80500index d876736..ccce5c0 100644
80501--- a/include/uapi/linux/byteorder/little_endian.h
80502+++ b/include/uapi/linux/byteorder/little_endian.h
80503@@ -42,51 +42,51 @@
80504
80505 static inline __le64 __cpu_to_le64p(const __u64 *p)
80506 {
80507- return (__force __le64)*p;
80508+ return (__force const __le64)*p;
80509 }
80510-static inline __u64 __le64_to_cpup(const __le64 *p)
80511+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
80512 {
80513- return (__force __u64)*p;
80514+ return (__force const __u64)*p;
80515 }
80516 static inline __le32 __cpu_to_le32p(const __u32 *p)
80517 {
80518- return (__force __le32)*p;
80519+ return (__force const __le32)*p;
80520 }
80521 static inline __u32 __le32_to_cpup(const __le32 *p)
80522 {
80523- return (__force __u32)*p;
80524+ return (__force const __u32)*p;
80525 }
80526 static inline __le16 __cpu_to_le16p(const __u16 *p)
80527 {
80528- return (__force __le16)*p;
80529+ return (__force const __le16)*p;
80530 }
80531 static inline __u16 __le16_to_cpup(const __le16 *p)
80532 {
80533- return (__force __u16)*p;
80534+ return (__force const __u16)*p;
80535 }
80536 static inline __be64 __cpu_to_be64p(const __u64 *p)
80537 {
80538- return (__force __be64)__swab64p(p);
80539+ return (__force const __be64)__swab64p(p);
80540 }
80541 static inline __u64 __be64_to_cpup(const __be64 *p)
80542 {
80543- return __swab64p((__u64 *)p);
80544+ return __swab64p((const __u64 *)p);
80545 }
80546 static inline __be32 __cpu_to_be32p(const __u32 *p)
80547 {
80548- return (__force __be32)__swab32p(p);
80549+ return (__force const __be32)__swab32p(p);
80550 }
80551-static inline __u32 __be32_to_cpup(const __be32 *p)
80552+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
80553 {
80554- return __swab32p((__u32 *)p);
80555+ return __swab32p((const __u32 *)p);
80556 }
80557 static inline __be16 __cpu_to_be16p(const __u16 *p)
80558 {
80559- return (__force __be16)__swab16p(p);
80560+ return (__force const __be16)__swab16p(p);
80561 }
80562 static inline __u16 __be16_to_cpup(const __be16 *p)
80563 {
80564- return __swab16p((__u16 *)p);
80565+ return __swab16p((const __u16 *)p);
80566 }
80567 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
80568 #define __le64_to_cpus(x) do { (void)(x); } while (0)
80569diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
80570index ef6103b..d4e65dd 100644
80571--- a/include/uapi/linux/elf.h
80572+++ b/include/uapi/linux/elf.h
80573@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
80574 #define PT_GNU_EH_FRAME 0x6474e550
80575
80576 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
80577+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
80578+
80579+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
80580+
80581+/* Constants for the e_flags field */
80582+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
80583+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
80584+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
80585+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
80586+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
80587+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
80588
80589 /*
80590 * Extended Numbering
80591@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
80592 #define DT_DEBUG 21
80593 #define DT_TEXTREL 22
80594 #define DT_JMPREL 23
80595+#define DT_FLAGS 30
80596+ #define DF_TEXTREL 0x00000004
80597 #define DT_ENCODING 32
80598 #define OLD_DT_LOOS 0x60000000
80599 #define DT_LOOS 0x6000000d
80600@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
80601 #define PF_W 0x2
80602 #define PF_X 0x1
80603
80604+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
80605+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
80606+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
80607+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
80608+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
80609+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
80610+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
80611+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
80612+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
80613+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
80614+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
80615+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
80616+
80617 typedef struct elf32_phdr{
80618 Elf32_Word p_type;
80619 Elf32_Off p_offset;
80620@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
80621 #define EI_OSABI 7
80622 #define EI_PAD 8
80623
80624+#define EI_PAX 14
80625+
80626 #define ELFMAG0 0x7f /* EI_MAG */
80627 #define ELFMAG1 'E'
80628 #define ELFMAG2 'L'
80629diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
80630index aa169c4..6a2771d 100644
80631--- a/include/uapi/linux/personality.h
80632+++ b/include/uapi/linux/personality.h
80633@@ -30,6 +30,7 @@ enum {
80634 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
80635 ADDR_NO_RANDOMIZE | \
80636 ADDR_COMPAT_LAYOUT | \
80637+ ADDR_LIMIT_3GB | \
80638 MMAP_PAGE_ZERO)
80639
80640 /*
80641diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
80642index 7530e74..e714828 100644
80643--- a/include/uapi/linux/screen_info.h
80644+++ b/include/uapi/linux/screen_info.h
80645@@ -43,7 +43,8 @@ struct screen_info {
80646 __u16 pages; /* 0x32 */
80647 __u16 vesa_attributes; /* 0x34 */
80648 __u32 capabilities; /* 0x36 */
80649- __u8 _reserved[6]; /* 0x3a */
80650+ __u16 vesapm_size; /* 0x3a */
80651+ __u8 _reserved[4]; /* 0x3c */
80652 } __attribute__((packed));
80653
80654 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
80655diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
80656index 0e011eb..82681b1 100644
80657--- a/include/uapi/linux/swab.h
80658+++ b/include/uapi/linux/swab.h
80659@@ -43,7 +43,7 @@
80660 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
80661 */
80662
80663-static inline __attribute_const__ __u16 __fswab16(__u16 val)
80664+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
80665 {
80666 #ifdef __HAVE_BUILTIN_BSWAP16__
80667 return __builtin_bswap16(val);
80668@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
80669 #endif
80670 }
80671
80672-static inline __attribute_const__ __u32 __fswab32(__u32 val)
80673+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
80674 {
80675 #ifdef __HAVE_BUILTIN_BSWAP32__
80676 return __builtin_bswap32(val);
80677@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
80678 #endif
80679 }
80680
80681-static inline __attribute_const__ __u64 __fswab64(__u64 val)
80682+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
80683 {
80684 #ifdef __HAVE_BUILTIN_BSWAP64__
80685 return __builtin_bswap64(val);
80686diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
80687index 6d67213..8dab561 100644
80688--- a/include/uapi/linux/sysctl.h
80689+++ b/include/uapi/linux/sysctl.h
80690@@ -155,7 +155,11 @@ enum
80691 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
80692 };
80693
80694-
80695+#ifdef CONFIG_PAX_SOFTMODE
80696+enum {
80697+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
80698+};
80699+#endif
80700
80701 /* CTL_VM names: */
80702 enum
80703diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
80704index e4629b9..6958086 100644
80705--- a/include/uapi/linux/xattr.h
80706+++ b/include/uapi/linux/xattr.h
80707@@ -63,5 +63,9 @@
80708 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
80709 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
80710
80711+/* User namespace */
80712+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
80713+#define XATTR_PAX_FLAGS_SUFFIX "flags"
80714+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
80715
80716 #endif /* _UAPI_LINUX_XATTR_H */
80717diff --git a/include/video/udlfb.h b/include/video/udlfb.h
80718index f9466fa..f4e2b81 100644
80719--- a/include/video/udlfb.h
80720+++ b/include/video/udlfb.h
80721@@ -53,10 +53,10 @@ struct dlfb_data {
80722 u32 pseudo_palette[256];
80723 int blank_mode; /*one of FB_BLANK_ */
80724 /* blit-only rendering path metrics, exposed through sysfs */
80725- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
80726- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
80727- atomic_t bytes_sent; /* to usb, after compression including overhead */
80728- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
80729+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
80730+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
80731+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
80732+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
80733 };
80734
80735 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
80736diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
80737index 30f5362..8ed8ac9 100644
80738--- a/include/video/uvesafb.h
80739+++ b/include/video/uvesafb.h
80740@@ -122,6 +122,7 @@ struct uvesafb_par {
80741 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
80742 u8 pmi_setpal; /* PMI for palette changes */
80743 u16 *pmi_base; /* protected mode interface location */
80744+ u8 *pmi_code; /* protected mode code location */
80745 void *pmi_start;
80746 void *pmi_pal;
80747 u8 *vbe_state_orig; /*
80748diff --git a/init/Kconfig b/init/Kconfig
80749index 3ecd8a1..627843f 100644
80750--- a/init/Kconfig
80751+++ b/init/Kconfig
80752@@ -1086,6 +1086,7 @@ endif # CGROUPS
80753
80754 config CHECKPOINT_RESTORE
80755 bool "Checkpoint/restore support" if EXPERT
80756+ depends on !GRKERNSEC
80757 default n
80758 help
80759 Enables additional kernel features in a sake of checkpoint/restore.
80760@@ -1557,7 +1558,7 @@ config SLUB_DEBUG
80761
80762 config COMPAT_BRK
80763 bool "Disable heap randomization"
80764- default y
80765+ default n
80766 help
80767 Randomizing heap placement makes heap exploits harder, but it
80768 also breaks ancient binaries (including anything libc5 based).
80769@@ -1832,7 +1833,7 @@ config INIT_ALL_POSSIBLE
80770 config STOP_MACHINE
80771 bool
80772 default y
80773- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
80774+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
80775 help
80776 Need stop_machine() primitive.
80777
80778diff --git a/init/Makefile b/init/Makefile
80779index 7bc47ee..6da2dc7 100644
80780--- a/init/Makefile
80781+++ b/init/Makefile
80782@@ -2,6 +2,9 @@
80783 # Makefile for the linux kernel.
80784 #
80785
80786+ccflags-y := $(GCC_PLUGINS_CFLAGS)
80787+asflags-y := $(GCC_PLUGINS_AFLAGS)
80788+
80789 obj-y := main.o version.o mounts.o
80790 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
80791 obj-y += noinitramfs.o
80792diff --git a/init/do_mounts.c b/init/do_mounts.c
80793index a51cddc..25c2768 100644
80794--- a/init/do_mounts.c
80795+++ b/init/do_mounts.c
80796@@ -357,11 +357,11 @@ static void __init get_fs_names(char *page)
80797 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
80798 {
80799 struct super_block *s;
80800- int err = sys_mount(name, "/root", fs, flags, data);
80801+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
80802 if (err)
80803 return err;
80804
80805- sys_chdir("/root");
80806+ sys_chdir((const char __force_user *)"/root");
80807 s = current->fs->pwd.dentry->d_sb;
80808 ROOT_DEV = s->s_dev;
80809 printk(KERN_INFO
80810@@ -482,18 +482,18 @@ void __init change_floppy(char *fmt, ...)
80811 va_start(args, fmt);
80812 vsprintf(buf, fmt, args);
80813 va_end(args);
80814- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
80815+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
80816 if (fd >= 0) {
80817 sys_ioctl(fd, FDEJECT, 0);
80818 sys_close(fd);
80819 }
80820 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
80821- fd = sys_open("/dev/console", O_RDWR, 0);
80822+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
80823 if (fd >= 0) {
80824 sys_ioctl(fd, TCGETS, (long)&termios);
80825 termios.c_lflag &= ~ICANON;
80826 sys_ioctl(fd, TCSETSF, (long)&termios);
80827- sys_read(fd, &c, 1);
80828+ sys_read(fd, (char __user *)&c, 1);
80829 termios.c_lflag |= ICANON;
80830 sys_ioctl(fd, TCSETSF, (long)&termios);
80831 sys_close(fd);
80832@@ -587,8 +587,8 @@ void __init prepare_namespace(void)
80833 mount_root();
80834 out:
80835 devtmpfs_mount("dev");
80836- sys_mount(".", "/", NULL, MS_MOVE, NULL);
80837- sys_chroot(".");
80838+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
80839+ sys_chroot((const char __force_user *)".");
80840 }
80841
80842 static bool is_tmpfs;
80843diff --git a/init/do_mounts.h b/init/do_mounts.h
80844index f5b978a..69dbfe8 100644
80845--- a/init/do_mounts.h
80846+++ b/init/do_mounts.h
80847@@ -15,15 +15,15 @@ extern int root_mountflags;
80848
80849 static inline int create_dev(char *name, dev_t dev)
80850 {
80851- sys_unlink(name);
80852- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
80853+ sys_unlink((char __force_user *)name);
80854+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
80855 }
80856
80857 #if BITS_PER_LONG == 32
80858 static inline u32 bstat(char *name)
80859 {
80860 struct stat64 stat;
80861- if (sys_stat64(name, &stat) != 0)
80862+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
80863 return 0;
80864 if (!S_ISBLK(stat.st_mode))
80865 return 0;
80866@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
80867 static inline u32 bstat(char *name)
80868 {
80869 struct stat stat;
80870- if (sys_newstat(name, &stat) != 0)
80871+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
80872 return 0;
80873 if (!S_ISBLK(stat.st_mode))
80874 return 0;
80875diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
80876index 3e0878e..8a9d7a0 100644
80877--- a/init/do_mounts_initrd.c
80878+++ b/init/do_mounts_initrd.c
80879@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
80880 {
80881 sys_unshare(CLONE_FS | CLONE_FILES);
80882 /* stdin/stdout/stderr for /linuxrc */
80883- sys_open("/dev/console", O_RDWR, 0);
80884+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
80885 sys_dup(0);
80886 sys_dup(0);
80887 /* move initrd over / and chdir/chroot in initrd root */
80888- sys_chdir("/root");
80889- sys_mount(".", "/", NULL, MS_MOVE, NULL);
80890- sys_chroot(".");
80891+ sys_chdir((const char __force_user *)"/root");
80892+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
80893+ sys_chroot((const char __force_user *)".");
80894 sys_setsid();
80895 return 0;
80896 }
80897@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
80898 create_dev("/dev/root.old", Root_RAM0);
80899 /* mount initrd on rootfs' /root */
80900 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
80901- sys_mkdir("/old", 0700);
80902- sys_chdir("/old");
80903+ sys_mkdir((const char __force_user *)"/old", 0700);
80904+ sys_chdir((const char __force_user *)"/old");
80905
80906 /* try loading default modules from initrd */
80907 load_default_modules();
80908@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
80909 current->flags &= ~PF_FREEZER_SKIP;
80910
80911 /* move initrd to rootfs' /old */
80912- sys_mount("..", ".", NULL, MS_MOVE, NULL);
80913+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
80914 /* switch root and cwd back to / of rootfs */
80915- sys_chroot("..");
80916+ sys_chroot((const char __force_user *)"..");
80917
80918 if (new_decode_dev(real_root_dev) == Root_RAM0) {
80919- sys_chdir("/old");
80920+ sys_chdir((const char __force_user *)"/old");
80921 return;
80922 }
80923
80924- sys_chdir("/");
80925+ sys_chdir((const char __force_user *)"/");
80926 ROOT_DEV = new_decode_dev(real_root_dev);
80927 mount_root();
80928
80929 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
80930- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
80931+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
80932 if (!error)
80933 printk("okay\n");
80934 else {
80935- int fd = sys_open("/dev/root.old", O_RDWR, 0);
80936+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
80937 if (error == -ENOENT)
80938 printk("/initrd does not exist. Ignored.\n");
80939 else
80940 printk("failed\n");
80941 printk(KERN_NOTICE "Unmounting old root\n");
80942- sys_umount("/old", MNT_DETACH);
80943+ sys_umount((char __force_user *)"/old", MNT_DETACH);
80944 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
80945 if (fd < 0) {
80946 error = fd;
80947@@ -127,11 +127,11 @@ int __init initrd_load(void)
80948 * mounted in the normal path.
80949 */
80950 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
80951- sys_unlink("/initrd.image");
80952+ sys_unlink((const char __force_user *)"/initrd.image");
80953 handle_initrd();
80954 return 1;
80955 }
80956 }
80957- sys_unlink("/initrd.image");
80958+ sys_unlink((const char __force_user *)"/initrd.image");
80959 return 0;
80960 }
80961diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
80962index 8cb6db5..d729f50 100644
80963--- a/init/do_mounts_md.c
80964+++ b/init/do_mounts_md.c
80965@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
80966 partitioned ? "_d" : "", minor,
80967 md_setup_args[ent].device_names);
80968
80969- fd = sys_open(name, 0, 0);
80970+ fd = sys_open((char __force_user *)name, 0, 0);
80971 if (fd < 0) {
80972 printk(KERN_ERR "md: open failed - cannot start "
80973 "array %s\n", name);
80974@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
80975 * array without it
80976 */
80977 sys_close(fd);
80978- fd = sys_open(name, 0, 0);
80979+ fd = sys_open((char __force_user *)name, 0, 0);
80980 sys_ioctl(fd, BLKRRPART, 0);
80981 }
80982 sys_close(fd);
80983@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
80984
80985 wait_for_device_probe();
80986
80987- fd = sys_open("/dev/md0", 0, 0);
80988+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
80989 if (fd >= 0) {
80990 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
80991 sys_close(fd);
80992diff --git a/init/init_task.c b/init/init_task.c
80993index ba0a7f36..2bcf1d5 100644
80994--- a/init/init_task.c
80995+++ b/init/init_task.c
80996@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
80997 * Initial thread structure. Alignment of this is handled by a special
80998 * linker map entry.
80999 */
81000+#ifdef CONFIG_X86
81001+union thread_union init_thread_union __init_task_data;
81002+#else
81003 union thread_union init_thread_union __init_task_data =
81004 { INIT_THREAD_INFO(init_task) };
81005+#endif
81006diff --git a/init/initramfs.c b/init/initramfs.c
81007index a67ef9d..2d17ed9 100644
81008--- a/init/initramfs.c
81009+++ b/init/initramfs.c
81010@@ -84,7 +84,7 @@ static void __init free_hash(void)
81011 }
81012 }
81013
81014-static long __init do_utime(char *filename, time_t mtime)
81015+static long __init do_utime(char __force_user *filename, time_t mtime)
81016 {
81017 struct timespec t[2];
81018
81019@@ -119,7 +119,7 @@ static void __init dir_utime(void)
81020 struct dir_entry *de, *tmp;
81021 list_for_each_entry_safe(de, tmp, &dir_list, list) {
81022 list_del(&de->list);
81023- do_utime(de->name, de->mtime);
81024+ do_utime((char __force_user *)de->name, de->mtime);
81025 kfree(de->name);
81026 kfree(de);
81027 }
81028@@ -281,7 +281,7 @@ static int __init maybe_link(void)
81029 if (nlink >= 2) {
81030 char *old = find_link(major, minor, ino, mode, collected);
81031 if (old)
81032- return (sys_link(old, collected) < 0) ? -1 : 1;
81033+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
81034 }
81035 return 0;
81036 }
81037@@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
81038 {
81039 struct stat st;
81040
81041- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
81042+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
81043 if (S_ISDIR(st.st_mode))
81044- sys_rmdir(path);
81045+ sys_rmdir((char __force_user *)path);
81046 else
81047- sys_unlink(path);
81048+ sys_unlink((char __force_user *)path);
81049 }
81050 }
81051
81052@@ -315,7 +315,7 @@ static int __init do_name(void)
81053 int openflags = O_WRONLY|O_CREAT;
81054 if (ml != 1)
81055 openflags |= O_TRUNC;
81056- wfd = sys_open(collected, openflags, mode);
81057+ wfd = sys_open((char __force_user *)collected, openflags, mode);
81058
81059 if (wfd >= 0) {
81060 sys_fchown(wfd, uid, gid);
81061@@ -327,17 +327,17 @@ static int __init do_name(void)
81062 }
81063 }
81064 } else if (S_ISDIR(mode)) {
81065- sys_mkdir(collected, mode);
81066- sys_chown(collected, uid, gid);
81067- sys_chmod(collected, mode);
81068+ sys_mkdir((char __force_user *)collected, mode);
81069+ sys_chown((char __force_user *)collected, uid, gid);
81070+ sys_chmod((char __force_user *)collected, mode);
81071 dir_add(collected, mtime);
81072 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
81073 S_ISFIFO(mode) || S_ISSOCK(mode)) {
81074 if (maybe_link() == 0) {
81075- sys_mknod(collected, mode, rdev);
81076- sys_chown(collected, uid, gid);
81077- sys_chmod(collected, mode);
81078- do_utime(collected, mtime);
81079+ sys_mknod((char __force_user *)collected, mode, rdev);
81080+ sys_chown((char __force_user *)collected, uid, gid);
81081+ sys_chmod((char __force_user *)collected, mode);
81082+ do_utime((char __force_user *)collected, mtime);
81083 }
81084 }
81085 return 0;
81086@@ -346,15 +346,15 @@ static int __init do_name(void)
81087 static int __init do_copy(void)
81088 {
81089 if (count >= body_len) {
81090- sys_write(wfd, victim, body_len);
81091+ sys_write(wfd, (char __force_user *)victim, body_len);
81092 sys_close(wfd);
81093- do_utime(vcollected, mtime);
81094+ do_utime((char __force_user *)vcollected, mtime);
81095 kfree(vcollected);
81096 eat(body_len);
81097 state = SkipIt;
81098 return 0;
81099 } else {
81100- sys_write(wfd, victim, count);
81101+ sys_write(wfd, (char __force_user *)victim, count);
81102 body_len -= count;
81103 eat(count);
81104 return 1;
81105@@ -365,9 +365,9 @@ static int __init do_symlink(void)
81106 {
81107 collected[N_ALIGN(name_len) + body_len] = '\0';
81108 clean_path(collected, 0);
81109- sys_symlink(collected + N_ALIGN(name_len), collected);
81110- sys_lchown(collected, uid, gid);
81111- do_utime(collected, mtime);
81112+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
81113+ sys_lchown((char __force_user *)collected, uid, gid);
81114+ do_utime((char __force_user *)collected, mtime);
81115 state = SkipIt;
81116 next_state = Reset;
81117 return 0;
81118@@ -583,7 +583,7 @@ static int __init populate_rootfs(void)
81119 {
81120 char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
81121 if (err)
81122- panic(err); /* Failed to decompress INTERNAL initramfs */
81123+ panic("%s", err); /* Failed to decompress INTERNAL initramfs */
81124 if (initrd_start) {
81125 #ifdef CONFIG_BLK_DEV_RAM
81126 int fd;
81127diff --git a/init/main.c b/init/main.c
81128index 63d3e8f..50bd5f8 100644
81129--- a/init/main.c
81130+++ b/init/main.c
81131@@ -103,6 +103,8 @@ static inline void mark_rodata_ro(void) { }
81132 extern void tc_init(void);
81133 #endif
81134
81135+extern void grsecurity_init(void);
81136+
81137 /*
81138 * Debug helper: via this flag we know that we are in 'early bootup code'
81139 * where only the boot processor is running with IRQ disabled. This means
81140@@ -156,6 +158,75 @@ static int __init set_reset_devices(char *str)
81141
81142 __setup("reset_devices", set_reset_devices);
81143
81144+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
81145+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
81146+static int __init setup_grsec_proc_gid(char *str)
81147+{
81148+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
81149+ return 1;
81150+}
81151+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
81152+#endif
81153+
81154+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
81155+unsigned long pax_user_shadow_base __read_only;
81156+EXPORT_SYMBOL(pax_user_shadow_base);
81157+extern char pax_enter_kernel_user[];
81158+extern char pax_exit_kernel_user[];
81159+#endif
81160+
81161+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
81162+static int __init setup_pax_nouderef(char *str)
81163+{
81164+#ifdef CONFIG_X86_32
81165+ unsigned int cpu;
81166+ struct desc_struct *gdt;
81167+
81168+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
81169+ gdt = get_cpu_gdt_table(cpu);
81170+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
81171+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
81172+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
81173+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
81174+ }
81175+ loadsegment(ds, __KERNEL_DS);
81176+ loadsegment(es, __KERNEL_DS);
81177+ loadsegment(ss, __KERNEL_DS);
81178+#else
81179+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
81180+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
81181+ clone_pgd_mask = ~(pgdval_t)0UL;
81182+ pax_user_shadow_base = 0UL;
81183+ setup_clear_cpu_cap(X86_FEATURE_PCID);
81184+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
81185+#endif
81186+
81187+ return 0;
81188+}
81189+early_param("pax_nouderef", setup_pax_nouderef);
81190+
81191+#ifdef CONFIG_X86_64
81192+static int __init setup_pax_weakuderef(char *str)
81193+{
81194+ if (clone_pgd_mask != ~(pgdval_t)0UL)
81195+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
81196+ return 1;
81197+}
81198+__setup("pax_weakuderef", setup_pax_weakuderef);
81199+#endif
81200+#endif
81201+
81202+#ifdef CONFIG_PAX_SOFTMODE
81203+int pax_softmode;
81204+
81205+static int __init setup_pax_softmode(char *str)
81206+{
81207+ get_option(&str, &pax_softmode);
81208+ return 1;
81209+}
81210+__setup("pax_softmode=", setup_pax_softmode);
81211+#endif
81212+
81213 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
81214 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
81215 static const char *panic_later, *panic_param;
81216@@ -682,25 +753,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
81217 {
81218 int count = preempt_count();
81219 int ret;
81220- char msgbuf[64];
81221+ const char *msg1 = "", *msg2 = "";
81222
81223 if (initcall_debug)
81224 ret = do_one_initcall_debug(fn);
81225 else
81226 ret = fn();
81227
81228- msgbuf[0] = 0;
81229-
81230 if (preempt_count() != count) {
81231- sprintf(msgbuf, "preemption imbalance ");
81232+ msg1 = " preemption imbalance";
81233 preempt_count() = count;
81234 }
81235 if (irqs_disabled()) {
81236- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
81237+ msg2 = " disabled interrupts";
81238 local_irq_enable();
81239 }
81240- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
81241+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
81242
81243+ add_latent_entropy();
81244 return ret;
81245 }
81246
81247@@ -807,10 +877,14 @@ static int run_init_process(const char *init_filename)
81248 {
81249 argv_init[0] = init_filename;
81250 return do_execve(init_filename,
81251- (const char __user *const __user *)argv_init,
81252- (const char __user *const __user *)envp_init);
81253+ (const char __user *const __force_user *)argv_init,
81254+ (const char __user *const __force_user *)envp_init);
81255 }
81256
81257+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
81258+extern int gr_init_ran;
81259+#endif
81260+
81261 static noinline void __init kernel_init_freeable(void);
81262
81263 static int __ref kernel_init(void *unused)
81264@@ -831,6 +905,11 @@ static int __ref kernel_init(void *unused)
81265 pr_err("Failed to execute %s\n", ramdisk_execute_command);
81266 }
81267
81268+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
81269+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
81270+ gr_init_ran = 1;
81271+#endif
81272+
81273 /*
81274 * We try each of these until one succeeds.
81275 *
81276@@ -885,7 +964,7 @@ static noinline void __init kernel_init_freeable(void)
81277 do_basic_setup();
81278
81279 /* Open the /dev/console on the rootfs, this should never fail */
81280- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
81281+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
81282 pr_err("Warning: unable to open an initial console.\n");
81283
81284 (void) sys_dup(0);
81285@@ -898,11 +977,13 @@ static noinline void __init kernel_init_freeable(void)
81286 if (!ramdisk_execute_command)
81287 ramdisk_execute_command = "/init";
81288
81289- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
81290+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
81291 ramdisk_execute_command = NULL;
81292 prepare_namespace();
81293 }
81294
81295+ grsecurity_init();
81296+
81297 /*
81298 * Ok, we have completed the initial bootup, and
81299 * we're essentially up and running. Get rid of the
81300diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
81301index b0e99de..09f385c 100644
81302--- a/ipc/ipc_sysctl.c
81303+++ b/ipc/ipc_sysctl.c
81304@@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
81305 static int proc_ipc_dointvec(ctl_table *table, int write,
81306 void __user *buffer, size_t *lenp, loff_t *ppos)
81307 {
81308- struct ctl_table ipc_table;
81309+ ctl_table_no_const ipc_table;
81310
81311 memcpy(&ipc_table, table, sizeof(ipc_table));
81312 ipc_table.data = get_ipc(table);
81313@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,
81314 static int proc_ipc_dointvec_minmax(ctl_table *table, int write,
81315 void __user *buffer, size_t *lenp, loff_t *ppos)
81316 {
81317- struct ctl_table ipc_table;
81318+ ctl_table_no_const ipc_table;
81319
81320 memcpy(&ipc_table, table, sizeof(ipc_table));
81321 ipc_table.data = get_ipc(table);
81322@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
81323 static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
81324 void __user *buffer, size_t *lenp, loff_t *ppos)
81325 {
81326- struct ctl_table ipc_table;
81327+ ctl_table_no_const ipc_table;
81328 size_t lenp_bef = *lenp;
81329 int rc;
81330
81331@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
81332 static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
81333 void __user *buffer, size_t *lenp, loff_t *ppos)
81334 {
81335- struct ctl_table ipc_table;
81336+ ctl_table_no_const ipc_table;
81337 memcpy(&ipc_table, table, sizeof(ipc_table));
81338 ipc_table.data = get_ipc(table);
81339
81340@@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
81341 static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
81342 void __user *buffer, size_t *lenp, loff_t *ppos)
81343 {
81344- struct ctl_table ipc_table;
81345+ ctl_table_no_const ipc_table;
81346 size_t lenp_bef = *lenp;
81347 int oldval;
81348 int rc;
81349diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
81350index 383d638..943fdbb 100644
81351--- a/ipc/mq_sysctl.c
81352+++ b/ipc/mq_sysctl.c
81353@@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
81354 static int proc_mq_dointvec_minmax(ctl_table *table, int write,
81355 void __user *buffer, size_t *lenp, loff_t *ppos)
81356 {
81357- struct ctl_table mq_table;
81358+ ctl_table_no_const mq_table;
81359 memcpy(&mq_table, table, sizeof(mq_table));
81360 mq_table.data = get_mq(table);
81361
81362diff --git a/ipc/mqueue.c b/ipc/mqueue.c
81363index ae1996d..a35f2cc 100644
81364--- a/ipc/mqueue.c
81365+++ b/ipc/mqueue.c
81366@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
81367 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
81368 info->attr.mq_msgsize);
81369
81370+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
81371 spin_lock(&mq_lock);
81372 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
81373 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
81374diff --git a/ipc/msg.c b/ipc/msg.c
81375index 558aa91..359e718 100644
81376--- a/ipc/msg.c
81377+++ b/ipc/msg.c
81378@@ -297,18 +297,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
81379 return security_msg_queue_associate(msq, msgflg);
81380 }
81381
81382+static struct ipc_ops msg_ops = {
81383+ .getnew = newque,
81384+ .associate = msg_security,
81385+ .more_checks = NULL
81386+};
81387+
81388 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
81389 {
81390 struct ipc_namespace *ns;
81391- struct ipc_ops msg_ops;
81392 struct ipc_params msg_params;
81393
81394 ns = current->nsproxy->ipc_ns;
81395
81396- msg_ops.getnew = newque;
81397- msg_ops.associate = msg_security;
81398- msg_ops.more_checks = NULL;
81399-
81400 msg_params.key = key;
81401 msg_params.flg = msgflg;
81402
81403diff --git a/ipc/sem.c b/ipc/sem.c
81404index db9d241..bc8427c 100644
81405--- a/ipc/sem.c
81406+++ b/ipc/sem.c
81407@@ -562,10 +562,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
81408 return 0;
81409 }
81410
81411+static struct ipc_ops sem_ops = {
81412+ .getnew = newary,
81413+ .associate = sem_security,
81414+ .more_checks = sem_more_checks
81415+};
81416+
81417 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
81418 {
81419 struct ipc_namespace *ns;
81420- struct ipc_ops sem_ops;
81421 struct ipc_params sem_params;
81422
81423 ns = current->nsproxy->ipc_ns;
81424@@ -573,10 +578,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
81425 if (nsems < 0 || nsems > ns->sc_semmsl)
81426 return -EINVAL;
81427
81428- sem_ops.getnew = newary;
81429- sem_ops.associate = sem_security;
81430- sem_ops.more_checks = sem_more_checks;
81431-
81432 sem_params.key = key;
81433 sem_params.flg = semflg;
81434 sem_params.u.nsems = nsems;
81435diff --git a/ipc/shm.c b/ipc/shm.c
81436index 7a51443..3a257d8 100644
81437--- a/ipc/shm.c
81438+++ b/ipc/shm.c
81439@@ -72,6 +72,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
81440 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
81441 #endif
81442
81443+#ifdef CONFIG_GRKERNSEC
81444+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
81445+ const time_t shm_createtime, const kuid_t cuid,
81446+ const int shmid);
81447+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
81448+ const time_t shm_createtime);
81449+#endif
81450+
81451 void shm_init_ns(struct ipc_namespace *ns)
81452 {
81453 ns->shm_ctlmax = SHMMAX;
81454@@ -554,6 +562,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
81455 shp->shm_lprid = 0;
81456 shp->shm_atim = shp->shm_dtim = 0;
81457 shp->shm_ctim = get_seconds();
81458+#ifdef CONFIG_GRKERNSEC
81459+ {
81460+ struct timespec timeval;
81461+ do_posix_clock_monotonic_gettime(&timeval);
81462+
81463+ shp->shm_createtime = timeval.tv_sec;
81464+ }
81465+#endif
81466 shp->shm_segsz = size;
81467 shp->shm_nattch = 0;
81468 shp->shm_file = file;
81469@@ -607,18 +623,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
81470 return 0;
81471 }
81472
81473+static struct ipc_ops shm_ops = {
81474+ .getnew = newseg,
81475+ .associate = shm_security,
81476+ .more_checks = shm_more_checks
81477+};
81478+
81479 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
81480 {
81481 struct ipc_namespace *ns;
81482- struct ipc_ops shm_ops;
81483 struct ipc_params shm_params;
81484
81485 ns = current->nsproxy->ipc_ns;
81486
81487- shm_ops.getnew = newseg;
81488- shm_ops.associate = shm_security;
81489- shm_ops.more_checks = shm_more_checks;
81490-
81491 shm_params.key = key;
81492 shm_params.flg = shmflg;
81493 shm_params.u.size = size;
81494@@ -1089,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81495 f_mode = FMODE_READ | FMODE_WRITE;
81496 }
81497 if (shmflg & SHM_EXEC) {
81498+
81499+#ifdef CONFIG_PAX_MPROTECT
81500+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
81501+ goto out;
81502+#endif
81503+
81504 prot |= PROT_EXEC;
81505 acc_mode |= S_IXUGO;
81506 }
81507@@ -1113,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81508 if (err)
81509 goto out_unlock;
81510
81511+#ifdef CONFIG_GRKERNSEC
81512+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
81513+ shp->shm_perm.cuid, shmid) ||
81514+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
81515+ err = -EACCES;
81516+ goto out_unlock;
81517+ }
81518+#endif
81519+
81520 ipc_lock_object(&shp->shm_perm);
81521
81522 /* check if shm_destroy() is tearing down shp */
81523@@ -1125,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81524 path = shp->shm_file->f_path;
81525 path_get(&path);
81526 shp->shm_nattch++;
81527+#ifdef CONFIG_GRKERNSEC
81528+ shp->shm_lapid = current->pid;
81529+#endif
81530 size = i_size_read(path.dentry->d_inode);
81531 ipc_unlock_object(&shp->shm_perm);
81532 rcu_read_unlock();
81533diff --git a/ipc/util.c b/ipc/util.c
81534index 7684f41..5bf1880 100644
81535--- a/ipc/util.c
81536+++ b/ipc/util.c
81537@@ -71,6 +71,8 @@ struct ipc_proc_iface {
81538 int (*show)(struct seq_file *, void *);
81539 };
81540
81541+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
81542+
81543 static void ipc_memory_notifier(struct work_struct *work)
81544 {
81545 ipcns_notify(IPCNS_MEMCHANGED);
81546@@ -560,6 +562,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
81547 granted_mode >>= 6;
81548 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
81549 granted_mode >>= 3;
81550+
81551+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
81552+ return -1;
81553+
81554 /* is there some bit set in requested_mode but not in granted_mode? */
81555 if ((requested_mode & ~granted_mode & 0007) &&
81556 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
81557diff --git a/kernel/acct.c b/kernel/acct.c
81558index 8d6e145..33e0b1e 100644
81559--- a/kernel/acct.c
81560+++ b/kernel/acct.c
81561@@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
81562 */
81563 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
81564 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
81565- file->f_op->write(file, (char *)&ac,
81566+ file->f_op->write(file, (char __force_user *)&ac,
81567 sizeof(acct_t), &file->f_pos);
81568 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
81569 set_fs(fs);
81570diff --git a/kernel/audit.c b/kernel/audit.c
81571index 7ddfd8a..49766eb 100644
81572--- a/kernel/audit.c
81573+++ b/kernel/audit.c
81574@@ -118,7 +118,7 @@ u32 audit_sig_sid = 0;
81575 3) suppressed due to audit_rate_limit
81576 4) suppressed due to audit_backlog_limit
81577 */
81578-static atomic_t audit_lost = ATOMIC_INIT(0);
81579+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
81580
81581 /* The netlink socket. */
81582 static struct sock *audit_sock;
81583@@ -240,7 +240,7 @@ void audit_log_lost(const char *message)
81584 unsigned long now;
81585 int print;
81586
81587- atomic_inc(&audit_lost);
81588+ atomic_inc_unchecked(&audit_lost);
81589
81590 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
81591
81592@@ -259,7 +259,7 @@ void audit_log_lost(const char *message)
81593 printk(KERN_WARNING
81594 "audit: audit_lost=%d audit_rate_limit=%d "
81595 "audit_backlog_limit=%d\n",
81596- atomic_read(&audit_lost),
81597+ atomic_read_unchecked(&audit_lost),
81598 audit_rate_limit,
81599 audit_backlog_limit);
81600 audit_panic(message);
81601@@ -665,7 +665,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
81602 status_set.pid = audit_pid;
81603 status_set.rate_limit = audit_rate_limit;
81604 status_set.backlog_limit = audit_backlog_limit;
81605- status_set.lost = atomic_read(&audit_lost);
81606+ status_set.lost = atomic_read_unchecked(&audit_lost);
81607 status_set.backlog = skb_queue_len(&audit_skb_queue);
81608 audit_send_reply(NETLINK_CB(skb).portid, seq, AUDIT_GET, 0, 0,
81609 &status_set, sizeof(status_set));
81610@@ -1252,7 +1252,7 @@ void audit_log_n_hex(struct audit_buffer *ab, const unsigned char *buf,
81611 int i, avail, new_len;
81612 unsigned char *ptr;
81613 struct sk_buff *skb;
81614- static const unsigned char *hex = "0123456789ABCDEF";
81615+ static const unsigned char hex[] = "0123456789ABCDEF";
81616
81617 if (!ab)
81618 return;
81619diff --git a/kernel/auditsc.c b/kernel/auditsc.c
81620index 9845cb3..3ec9369 100644
81621--- a/kernel/auditsc.c
81622+++ b/kernel/auditsc.c
81623@@ -1962,7 +1962,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
81624 }
81625
81626 /* global counter which is incremented every time something logs in */
81627-static atomic_t session_id = ATOMIC_INIT(0);
81628+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
81629
81630 /**
81631 * audit_set_loginuid - set current task's audit_context loginuid
81632@@ -1986,7 +1986,7 @@ int audit_set_loginuid(kuid_t loginuid)
81633 return -EPERM;
81634 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
81635
81636- sessionid = atomic_inc_return(&session_id);
81637+ sessionid = atomic_inc_return_unchecked(&session_id);
81638 if (context && context->in_syscall) {
81639 struct audit_buffer *ab;
81640
81641diff --git a/kernel/capability.c b/kernel/capability.c
81642index 4e66bf9..cdccecf 100644
81643--- a/kernel/capability.c
81644+++ b/kernel/capability.c
81645@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
81646 * before modification is attempted and the application
81647 * fails.
81648 */
81649+ if (tocopy > ARRAY_SIZE(kdata))
81650+ return -EFAULT;
81651+
81652 if (copy_to_user(dataptr, kdata, tocopy
81653 * sizeof(struct __user_cap_data_struct))) {
81654 return -EFAULT;
81655@@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
81656 int ret;
81657
81658 rcu_read_lock();
81659- ret = security_capable(__task_cred(t), ns, cap);
81660+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
81661+ gr_task_is_capable(t, __task_cred(t), cap);
81662 rcu_read_unlock();
81663
81664- return (ret == 0);
81665+ return ret;
81666 }
81667
81668 /**
81669@@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
81670 int ret;
81671
81672 rcu_read_lock();
81673- ret = security_capable_noaudit(__task_cred(t), ns, cap);
81674+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
81675 rcu_read_unlock();
81676
81677- return (ret == 0);
81678+ return ret;
81679 }
81680
81681 /**
81682@@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
81683 BUG();
81684 }
81685
81686- if (security_capable(current_cred(), ns, cap) == 0) {
81687+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
81688 current->flags |= PF_SUPERPRIV;
81689 return true;
81690 }
81691@@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
81692 }
81693 EXPORT_SYMBOL(ns_capable);
81694
81695+bool ns_capable_nolog(struct user_namespace *ns, int cap)
81696+{
81697+ if (unlikely(!cap_valid(cap))) {
81698+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
81699+ BUG();
81700+ }
81701+
81702+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
81703+ current->flags |= PF_SUPERPRIV;
81704+ return true;
81705+ }
81706+ return false;
81707+}
81708+EXPORT_SYMBOL(ns_capable_nolog);
81709+
81710 /**
81711 * file_ns_capable - Determine if the file's opener had a capability in effect
81712 * @file: The file we want to check
81713@@ -432,6 +451,12 @@ bool capable(int cap)
81714 }
81715 EXPORT_SYMBOL(capable);
81716
81717+bool capable_nolog(int cap)
81718+{
81719+ return ns_capable_nolog(&init_user_ns, cap);
81720+}
81721+EXPORT_SYMBOL(capable_nolog);
81722+
81723 /**
81724 * inode_capable - Check superior capability over inode
81725 * @inode: The inode in question
81726@@ -453,3 +478,11 @@ bool inode_capable(const struct inode *inode, int cap)
81727 return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
81728 }
81729 EXPORT_SYMBOL(inode_capable);
81730+
81731+bool inode_capable_nolog(const struct inode *inode, int cap)
81732+{
81733+ struct user_namespace *ns = current_user_ns();
81734+
81735+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
81736+}
81737+EXPORT_SYMBOL(inode_capable_nolog);
81738diff --git a/kernel/cgroup.c b/kernel/cgroup.c
81739index b6fd783..7f526b7 100644
81740--- a/kernel/cgroup.c
81741+++ b/kernel/cgroup.c
81742@@ -5855,7 +5855,7 @@ static int cgroup_css_links_read(struct cgroup_subsys_state *css,
81743 struct css_set *cset = link->cset;
81744 struct task_struct *task;
81745 int count = 0;
81746- seq_printf(seq, "css_set %p\n", cset);
81747+ seq_printf(seq, "css_set %pK\n", cset);
81748 list_for_each_entry(task, &cset->tasks, cg_list) {
81749 if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
81750 seq_puts(seq, " ...\n");
81751diff --git a/kernel/compat.c b/kernel/compat.c
81752index 0a09e48..f44f3f0 100644
81753--- a/kernel/compat.c
81754+++ b/kernel/compat.c
81755@@ -13,6 +13,7 @@
81756
81757 #include <linux/linkage.h>
81758 #include <linux/compat.h>
81759+#include <linux/module.h>
81760 #include <linux/errno.h>
81761 #include <linux/time.h>
81762 #include <linux/signal.h>
81763@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
81764 mm_segment_t oldfs;
81765 long ret;
81766
81767- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
81768+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
81769 oldfs = get_fs();
81770 set_fs(KERNEL_DS);
81771 ret = hrtimer_nanosleep_restart(restart);
81772@@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
81773 oldfs = get_fs();
81774 set_fs(KERNEL_DS);
81775 ret = hrtimer_nanosleep(&tu,
81776- rmtp ? (struct timespec __user *)&rmt : NULL,
81777+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
81778 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
81779 set_fs(oldfs);
81780
81781@@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
81782 mm_segment_t old_fs = get_fs();
81783
81784 set_fs(KERNEL_DS);
81785- ret = sys_sigpending((old_sigset_t __user *) &s);
81786+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
81787 set_fs(old_fs);
81788 if (ret == 0)
81789 ret = put_user(s, set);
81790@@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
81791 mm_segment_t old_fs = get_fs();
81792
81793 set_fs(KERNEL_DS);
81794- ret = sys_old_getrlimit(resource, &r);
81795+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
81796 set_fs(old_fs);
81797
81798 if (!ret) {
81799@@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
81800 set_fs (KERNEL_DS);
81801 ret = sys_wait4(pid,
81802 (stat_addr ?
81803- (unsigned int __user *) &status : NULL),
81804- options, (struct rusage __user *) &r);
81805+ (unsigned int __force_user *) &status : NULL),
81806+ options, (struct rusage __force_user *) &r);
81807 set_fs (old_fs);
81808
81809 if (ret > 0) {
81810@@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
81811 memset(&info, 0, sizeof(info));
81812
81813 set_fs(KERNEL_DS);
81814- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
81815- uru ? (struct rusage __user *)&ru : NULL);
81816+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
81817+ uru ? (struct rusage __force_user *)&ru : NULL);
81818 set_fs(old_fs);
81819
81820 if ((ret < 0) || (info.si_signo == 0))
81821@@ -695,8 +696,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
81822 oldfs = get_fs();
81823 set_fs(KERNEL_DS);
81824 err = sys_timer_settime(timer_id, flags,
81825- (struct itimerspec __user *) &newts,
81826- (struct itimerspec __user *) &oldts);
81827+ (struct itimerspec __force_user *) &newts,
81828+ (struct itimerspec __force_user *) &oldts);
81829 set_fs(oldfs);
81830 if (!err && old && put_compat_itimerspec(old, &oldts))
81831 return -EFAULT;
81832@@ -713,7 +714,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
81833 oldfs = get_fs();
81834 set_fs(KERNEL_DS);
81835 err = sys_timer_gettime(timer_id,
81836- (struct itimerspec __user *) &ts);
81837+ (struct itimerspec __force_user *) &ts);
81838 set_fs(oldfs);
81839 if (!err && put_compat_itimerspec(setting, &ts))
81840 return -EFAULT;
81841@@ -732,7 +733,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
81842 oldfs = get_fs();
81843 set_fs(KERNEL_DS);
81844 err = sys_clock_settime(which_clock,
81845- (struct timespec __user *) &ts);
81846+ (struct timespec __force_user *) &ts);
81847 set_fs(oldfs);
81848 return err;
81849 }
81850@@ -747,7 +748,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
81851 oldfs = get_fs();
81852 set_fs(KERNEL_DS);
81853 err = sys_clock_gettime(which_clock,
81854- (struct timespec __user *) &ts);
81855+ (struct timespec __force_user *) &ts);
81856 set_fs(oldfs);
81857 if (!err && put_compat_timespec(&ts, tp))
81858 return -EFAULT;
81859@@ -767,7 +768,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
81860
81861 oldfs = get_fs();
81862 set_fs(KERNEL_DS);
81863- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
81864+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
81865 set_fs(oldfs);
81866
81867 err = compat_put_timex(utp, &txc);
81868@@ -787,7 +788,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
81869 oldfs = get_fs();
81870 set_fs(KERNEL_DS);
81871 err = sys_clock_getres(which_clock,
81872- (struct timespec __user *) &ts);
81873+ (struct timespec __force_user *) &ts);
81874 set_fs(oldfs);
81875 if (!err && tp && put_compat_timespec(&ts, tp))
81876 return -EFAULT;
81877@@ -799,9 +800,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
81878 long err;
81879 mm_segment_t oldfs;
81880 struct timespec tu;
81881- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
81882+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
81883
81884- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
81885+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
81886 oldfs = get_fs();
81887 set_fs(KERNEL_DS);
81888 err = clock_nanosleep_restart(restart);
81889@@ -833,8 +834,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
81890 oldfs = get_fs();
81891 set_fs(KERNEL_DS);
81892 err = sys_clock_nanosleep(which_clock, flags,
81893- (struct timespec __user *) &in,
81894- (struct timespec __user *) &out);
81895+ (struct timespec __force_user *) &in,
81896+ (struct timespec __force_user *) &out);
81897 set_fs(oldfs);
81898
81899 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
81900diff --git a/kernel/configs.c b/kernel/configs.c
81901index c18b1f1..b9a0132 100644
81902--- a/kernel/configs.c
81903+++ b/kernel/configs.c
81904@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
81905 struct proc_dir_entry *entry;
81906
81907 /* create the current config file */
81908+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
81909+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
81910+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
81911+ &ikconfig_file_ops);
81912+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81913+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
81914+ &ikconfig_file_ops);
81915+#endif
81916+#else
81917 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
81918 &ikconfig_file_ops);
81919+#endif
81920+
81921 if (!entry)
81922 return -ENOMEM;
81923
81924diff --git a/kernel/cred.c b/kernel/cred.c
81925index e0573a4..3874e41 100644
81926--- a/kernel/cred.c
81927+++ b/kernel/cred.c
81928@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
81929 validate_creds(cred);
81930 alter_cred_subscribers(cred, -1);
81931 put_cred(cred);
81932+
81933+#ifdef CONFIG_GRKERNSEC_SETXID
81934+ cred = (struct cred *) tsk->delayed_cred;
81935+ if (cred != NULL) {
81936+ tsk->delayed_cred = NULL;
81937+ validate_creds(cred);
81938+ alter_cred_subscribers(cred, -1);
81939+ put_cred(cred);
81940+ }
81941+#endif
81942 }
81943
81944 /**
81945@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
81946 * Always returns 0 thus allowing this function to be tail-called at the end
81947 * of, say, sys_setgid().
81948 */
81949-int commit_creds(struct cred *new)
81950+static int __commit_creds(struct cred *new)
81951 {
81952 struct task_struct *task = current;
81953 const struct cred *old = task->real_cred;
81954@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
81955
81956 get_cred(new); /* we will require a ref for the subj creds too */
81957
81958+ gr_set_role_label(task, new->uid, new->gid);
81959+
81960 /* dumpability changes */
81961 if (!uid_eq(old->euid, new->euid) ||
81962 !gid_eq(old->egid, new->egid) ||
81963@@ -479,6 +491,102 @@ int commit_creds(struct cred *new)
81964 put_cred(old);
81965 return 0;
81966 }
81967+#ifdef CONFIG_GRKERNSEC_SETXID
81968+extern int set_user(struct cred *new);
81969+
81970+void gr_delayed_cred_worker(void)
81971+{
81972+ const struct cred *new = current->delayed_cred;
81973+ struct cred *ncred;
81974+
81975+ current->delayed_cred = NULL;
81976+
81977+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
81978+ // from doing get_cred on it when queueing this
81979+ put_cred(new);
81980+ return;
81981+ } else if (new == NULL)
81982+ return;
81983+
81984+ ncred = prepare_creds();
81985+ if (!ncred)
81986+ goto die;
81987+ // uids
81988+ ncred->uid = new->uid;
81989+ ncred->euid = new->euid;
81990+ ncred->suid = new->suid;
81991+ ncred->fsuid = new->fsuid;
81992+ // gids
81993+ ncred->gid = new->gid;
81994+ ncred->egid = new->egid;
81995+ ncred->sgid = new->sgid;
81996+ ncred->fsgid = new->fsgid;
81997+ // groups
81998+ if (set_groups(ncred, new->group_info) < 0) {
81999+ abort_creds(ncred);
82000+ goto die;
82001+ }
82002+ // caps
82003+ ncred->securebits = new->securebits;
82004+ ncred->cap_inheritable = new->cap_inheritable;
82005+ ncred->cap_permitted = new->cap_permitted;
82006+ ncred->cap_effective = new->cap_effective;
82007+ ncred->cap_bset = new->cap_bset;
82008+
82009+ if (set_user(ncred)) {
82010+ abort_creds(ncred);
82011+ goto die;
82012+ }
82013+
82014+ // from doing get_cred on it when queueing this
82015+ put_cred(new);
82016+
82017+ __commit_creds(ncred);
82018+ return;
82019+die:
82020+ // from doing get_cred on it when queueing this
82021+ put_cred(new);
82022+ do_group_exit(SIGKILL);
82023+}
82024+#endif
82025+
82026+int commit_creds(struct cred *new)
82027+{
82028+#ifdef CONFIG_GRKERNSEC_SETXID
82029+ int ret;
82030+ int schedule_it = 0;
82031+ struct task_struct *t;
82032+
82033+ /* we won't get called with tasklist_lock held for writing
82034+ and interrupts disabled as the cred struct in that case is
82035+ init_cred
82036+ */
82037+ if (grsec_enable_setxid && !current_is_single_threaded() &&
82038+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
82039+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
82040+ schedule_it = 1;
82041+ }
82042+ ret = __commit_creds(new);
82043+ if (schedule_it) {
82044+ rcu_read_lock();
82045+ read_lock(&tasklist_lock);
82046+ for (t = next_thread(current); t != current;
82047+ t = next_thread(t)) {
82048+ if (t->delayed_cred == NULL) {
82049+ t->delayed_cred = get_cred(new);
82050+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
82051+ set_tsk_need_resched(t);
82052+ }
82053+ }
82054+ read_unlock(&tasklist_lock);
82055+ rcu_read_unlock();
82056+ }
82057+ return ret;
82058+#else
82059+ return __commit_creds(new);
82060+#endif
82061+}
82062+
82063 EXPORT_SYMBOL(commit_creds);
82064
82065 /**
82066diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
82067index 0506d44..2c20034 100644
82068--- a/kernel/debug/debug_core.c
82069+++ b/kernel/debug/debug_core.c
82070@@ -123,7 +123,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
82071 */
82072 static atomic_t masters_in_kgdb;
82073 static atomic_t slaves_in_kgdb;
82074-static atomic_t kgdb_break_tasklet_var;
82075+static atomic_unchecked_t kgdb_break_tasklet_var;
82076 atomic_t kgdb_setting_breakpoint;
82077
82078 struct task_struct *kgdb_usethread;
82079@@ -133,7 +133,7 @@ int kgdb_single_step;
82080 static pid_t kgdb_sstep_pid;
82081
82082 /* to keep track of the CPU which is doing the single stepping*/
82083-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
82084+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
82085
82086 /*
82087 * If you are debugging a problem where roundup (the collection of
82088@@ -541,7 +541,7 @@ return_normal:
82089 * kernel will only try for the value of sstep_tries before
82090 * giving up and continuing on.
82091 */
82092- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
82093+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
82094 (kgdb_info[cpu].task &&
82095 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
82096 atomic_set(&kgdb_active, -1);
82097@@ -635,8 +635,8 @@ cpu_master_loop:
82098 }
82099
82100 kgdb_restore:
82101- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
82102- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
82103+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
82104+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
82105 if (kgdb_info[sstep_cpu].task)
82106 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
82107 else
82108@@ -888,18 +888,18 @@ static void kgdb_unregister_callbacks(void)
82109 static void kgdb_tasklet_bpt(unsigned long ing)
82110 {
82111 kgdb_breakpoint();
82112- atomic_set(&kgdb_break_tasklet_var, 0);
82113+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
82114 }
82115
82116 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
82117
82118 void kgdb_schedule_breakpoint(void)
82119 {
82120- if (atomic_read(&kgdb_break_tasklet_var) ||
82121+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
82122 atomic_read(&kgdb_active) != -1 ||
82123 atomic_read(&kgdb_setting_breakpoint))
82124 return;
82125- atomic_inc(&kgdb_break_tasklet_var);
82126+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
82127 tasklet_schedule(&kgdb_tasklet_breakpoint);
82128 }
82129 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
82130diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
82131index 00eb8f7..d7e3244 100644
82132--- a/kernel/debug/kdb/kdb_main.c
82133+++ b/kernel/debug/kdb/kdb_main.c
82134@@ -1974,7 +1974,7 @@ static int kdb_lsmod(int argc, const char **argv)
82135 continue;
82136
82137 kdb_printf("%-20s%8u 0x%p ", mod->name,
82138- mod->core_size, (void *)mod);
82139+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
82140 #ifdef CONFIG_MODULE_UNLOAD
82141 kdb_printf("%4ld ", module_refcount(mod));
82142 #endif
82143@@ -1984,7 +1984,7 @@ static int kdb_lsmod(int argc, const char **argv)
82144 kdb_printf(" (Loading)");
82145 else
82146 kdb_printf(" (Live)");
82147- kdb_printf(" 0x%p", mod->module_core);
82148+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
82149
82150 #ifdef CONFIG_MODULE_UNLOAD
82151 {
82152diff --git a/kernel/events/core.c b/kernel/events/core.c
82153index 953c143..5646bb1 100644
82154--- a/kernel/events/core.c
82155+++ b/kernel/events/core.c
82156@@ -157,8 +157,15 @@ static struct srcu_struct pmus_srcu;
82157 * 0 - disallow raw tracepoint access for unpriv
82158 * 1 - disallow cpu events for unpriv
82159 * 2 - disallow kernel profiling for unpriv
82160+ * 3 - disallow all unpriv perf event use
82161 */
82162-int sysctl_perf_event_paranoid __read_mostly = 1;
82163+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
82164+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
82165+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
82166+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
82167+#else
82168+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
82169+#endif
82170
82171 /* Minimum for 512 kiB + 1 user control page */
82172 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
82173@@ -271,7 +278,7 @@ void perf_sample_event_took(u64 sample_len_ns)
82174 update_perf_cpu_limits();
82175 }
82176
82177-static atomic64_t perf_event_id;
82178+static atomic64_unchecked_t perf_event_id;
82179
82180 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
82181 enum event_type_t event_type);
82182@@ -2940,7 +2947,7 @@ static void __perf_event_read(void *info)
82183
82184 static inline u64 perf_event_count(struct perf_event *event)
82185 {
82186- return local64_read(&event->count) + atomic64_read(&event->child_count);
82187+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
82188 }
82189
82190 static u64 perf_event_read(struct perf_event *event)
82191@@ -3308,9 +3315,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
82192 mutex_lock(&event->child_mutex);
82193 total += perf_event_read(event);
82194 *enabled += event->total_time_enabled +
82195- atomic64_read(&event->child_total_time_enabled);
82196+ atomic64_read_unchecked(&event->child_total_time_enabled);
82197 *running += event->total_time_running +
82198- atomic64_read(&event->child_total_time_running);
82199+ atomic64_read_unchecked(&event->child_total_time_running);
82200
82201 list_for_each_entry(child, &event->child_list, child_list) {
82202 total += perf_event_read(child);
82203@@ -3725,10 +3732,10 @@ void perf_event_update_userpage(struct perf_event *event)
82204 userpg->offset -= local64_read(&event->hw.prev_count);
82205
82206 userpg->time_enabled = enabled +
82207- atomic64_read(&event->child_total_time_enabled);
82208+ atomic64_read_unchecked(&event->child_total_time_enabled);
82209
82210 userpg->time_running = running +
82211- atomic64_read(&event->child_total_time_running);
82212+ atomic64_read_unchecked(&event->child_total_time_running);
82213
82214 arch_perf_update_userpage(userpg, now);
82215
82216@@ -4279,7 +4286,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
82217
82218 /* Data. */
82219 sp = perf_user_stack_pointer(regs);
82220- rem = __output_copy_user(handle, (void *) sp, dump_size);
82221+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
82222 dyn_size = dump_size - rem;
82223
82224 perf_output_skip(handle, rem);
82225@@ -4370,11 +4377,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
82226 values[n++] = perf_event_count(event);
82227 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
82228 values[n++] = enabled +
82229- atomic64_read(&event->child_total_time_enabled);
82230+ atomic64_read_unchecked(&event->child_total_time_enabled);
82231 }
82232 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
82233 values[n++] = running +
82234- atomic64_read(&event->child_total_time_running);
82235+ atomic64_read_unchecked(&event->child_total_time_running);
82236 }
82237 if (read_format & PERF_FORMAT_ID)
82238 values[n++] = primary_event_id(event);
82239@@ -5112,12 +5119,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
82240 * need to add enough zero bytes after the string to handle
82241 * the 64bit alignment we do later.
82242 */
82243- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
82244+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
82245 if (!buf) {
82246 name = strncpy(tmp, "//enomem", sizeof(tmp));
82247 goto got_name;
82248 }
82249- name = d_path(&file->f_path, buf, PATH_MAX);
82250+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
82251 if (IS_ERR(name)) {
82252 name = strncpy(tmp, "//toolong", sizeof(tmp));
82253 goto got_name;
82254@@ -6639,7 +6646,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
82255 event->parent = parent_event;
82256
82257 event->ns = get_pid_ns(task_active_pid_ns(current));
82258- event->id = atomic64_inc_return(&perf_event_id);
82259+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
82260
82261 event->state = PERF_EVENT_STATE_INACTIVE;
82262
82263@@ -6938,6 +6945,11 @@ SYSCALL_DEFINE5(perf_event_open,
82264 if (flags & ~PERF_FLAG_ALL)
82265 return -EINVAL;
82266
82267+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
82268+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
82269+ return -EACCES;
82270+#endif
82271+
82272 err = perf_copy_attr(attr_uptr, &attr);
82273 if (err)
82274 return err;
82275@@ -7271,10 +7283,10 @@ static void sync_child_event(struct perf_event *child_event,
82276 /*
82277 * Add back the child's count to the parent's count:
82278 */
82279- atomic64_add(child_val, &parent_event->child_count);
82280- atomic64_add(child_event->total_time_enabled,
82281+ atomic64_add_unchecked(child_val, &parent_event->child_count);
82282+ atomic64_add_unchecked(child_event->total_time_enabled,
82283 &parent_event->child_total_time_enabled);
82284- atomic64_add(child_event->total_time_running,
82285+ atomic64_add_unchecked(child_event->total_time_running,
82286 &parent_event->child_total_time_running);
82287
82288 /*
82289diff --git a/kernel/events/internal.h b/kernel/events/internal.h
82290index ca65997..60df03d 100644
82291--- a/kernel/events/internal.h
82292+++ b/kernel/events/internal.h
82293@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
82294 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
82295 }
82296
82297-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
82298-static inline unsigned int \
82299+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
82300+static inline unsigned long \
82301 func_name(struct perf_output_handle *handle, \
82302- const void *buf, unsigned int len) \
82303+ const void user *buf, unsigned long len) \
82304 { \
82305 unsigned long size, written; \
82306 \
82307@@ -116,17 +116,17 @@ static inline int memcpy_common(void *dst, const void *src, size_t n)
82308 return n;
82309 }
82310
82311-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
82312+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
82313
82314 #define MEMCPY_SKIP(dst, src, n) (n)
82315
82316-DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP)
82317+DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP, )
82318
82319 #ifndef arch_perf_out_copy_user
82320 #define arch_perf_out_copy_user __copy_from_user_inatomic
82321 #endif
82322
82323-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
82324+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
82325
82326 /* Callchain handling */
82327 extern struct perf_callchain_entry *
82328diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
82329index ad8e1bd..fed7ba9 100644
82330--- a/kernel/events/uprobes.c
82331+++ b/kernel/events/uprobes.c
82332@@ -1556,7 +1556,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
82333 {
82334 struct page *page;
82335 uprobe_opcode_t opcode;
82336- int result;
82337+ long result;
82338
82339 pagefault_disable();
82340 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
82341diff --git a/kernel/exit.c b/kernel/exit.c
82342index a949819..a5f127d 100644
82343--- a/kernel/exit.c
82344+++ b/kernel/exit.c
82345@@ -172,6 +172,10 @@ void release_task(struct task_struct * p)
82346 struct task_struct *leader;
82347 int zap_leader;
82348 repeat:
82349+#ifdef CONFIG_NET
82350+ gr_del_task_from_ip_table(p);
82351+#endif
82352+
82353 /* don't need to get the RCU readlock here - the process is dead and
82354 * can't be modifying its own credentials. But shut RCU-lockdep up */
82355 rcu_read_lock();
82356@@ -329,7 +333,7 @@ int allow_signal(int sig)
82357 * know it'll be handled, so that they don't get converted to
82358 * SIGKILL or just silently dropped.
82359 */
82360- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
82361+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
82362 recalc_sigpending();
82363 spin_unlock_irq(&current->sighand->siglock);
82364 return 0;
82365@@ -698,6 +702,8 @@ void do_exit(long code)
82366 struct task_struct *tsk = current;
82367 int group_dead;
82368
82369+ set_fs(USER_DS);
82370+
82371 profile_task_exit(tsk);
82372
82373 WARN_ON(blk_needs_flush_plug(tsk));
82374@@ -714,7 +720,6 @@ void do_exit(long code)
82375 * mm_release()->clear_child_tid() from writing to a user-controlled
82376 * kernel address.
82377 */
82378- set_fs(USER_DS);
82379
82380 ptrace_event(PTRACE_EVENT_EXIT, code);
82381
82382@@ -773,6 +778,9 @@ void do_exit(long code)
82383 tsk->exit_code = code;
82384 taskstats_exit(tsk, group_dead);
82385
82386+ gr_acl_handle_psacct(tsk, code);
82387+ gr_acl_handle_exit();
82388+
82389 exit_mm(tsk);
82390
82391 if (group_dead)
82392@@ -894,7 +902,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
82393 * Take down every thread in the group. This is called by fatal signals
82394 * as well as by sys_exit_group (below).
82395 */
82396-void
82397+__noreturn void
82398 do_group_exit(int exit_code)
82399 {
82400 struct signal_struct *sig = current->signal;
82401diff --git a/kernel/fork.c b/kernel/fork.c
82402index 690cfac..3be2d98 100644
82403--- a/kernel/fork.c
82404+++ b/kernel/fork.c
82405@@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
82406 *stackend = STACK_END_MAGIC; /* for overflow detection */
82407
82408 #ifdef CONFIG_CC_STACKPROTECTOR
82409- tsk->stack_canary = get_random_int();
82410+ tsk->stack_canary = pax_get_random_long();
82411 #endif
82412
82413 /*
82414@@ -345,12 +345,80 @@ free_tsk:
82415 }
82416
82417 #ifdef CONFIG_MMU
82418-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82419+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
82420+{
82421+ struct vm_area_struct *tmp;
82422+ unsigned long charge;
82423+ struct file *file;
82424+ int retval;
82425+
82426+ charge = 0;
82427+ if (mpnt->vm_flags & VM_ACCOUNT) {
82428+ unsigned long len = vma_pages(mpnt);
82429+
82430+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
82431+ goto fail_nomem;
82432+ charge = len;
82433+ }
82434+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
82435+ if (!tmp)
82436+ goto fail_nomem;
82437+ *tmp = *mpnt;
82438+ tmp->vm_mm = mm;
82439+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
82440+ retval = vma_dup_policy(mpnt, tmp);
82441+ if (retval)
82442+ goto fail_nomem_policy;
82443+ if (anon_vma_fork(tmp, mpnt))
82444+ goto fail_nomem_anon_vma_fork;
82445+ tmp->vm_flags &= ~VM_LOCKED;
82446+ tmp->vm_next = tmp->vm_prev = NULL;
82447+ tmp->vm_mirror = NULL;
82448+ file = tmp->vm_file;
82449+ if (file) {
82450+ struct inode *inode = file_inode(file);
82451+ struct address_space *mapping = file->f_mapping;
82452+
82453+ get_file(file);
82454+ if (tmp->vm_flags & VM_DENYWRITE)
82455+ atomic_dec(&inode->i_writecount);
82456+ mutex_lock(&mapping->i_mmap_mutex);
82457+ if (tmp->vm_flags & VM_SHARED)
82458+ mapping->i_mmap_writable++;
82459+ flush_dcache_mmap_lock(mapping);
82460+ /* insert tmp into the share list, just after mpnt */
82461+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
82462+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
82463+ else
82464+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
82465+ flush_dcache_mmap_unlock(mapping);
82466+ mutex_unlock(&mapping->i_mmap_mutex);
82467+ }
82468+
82469+ /*
82470+ * Clear hugetlb-related page reserves for children. This only
82471+ * affects MAP_PRIVATE mappings. Faults generated by the child
82472+ * are not guaranteed to succeed, even if read-only
82473+ */
82474+ if (is_vm_hugetlb_page(tmp))
82475+ reset_vma_resv_huge_pages(tmp);
82476+
82477+ return tmp;
82478+
82479+fail_nomem_anon_vma_fork:
82480+ mpol_put(vma_policy(tmp));
82481+fail_nomem_policy:
82482+ kmem_cache_free(vm_area_cachep, tmp);
82483+fail_nomem:
82484+ vm_unacct_memory(charge);
82485+ return NULL;
82486+}
82487+
82488+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82489 {
82490 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
82491 struct rb_node **rb_link, *rb_parent;
82492 int retval;
82493- unsigned long charge;
82494
82495 uprobe_start_dup_mmap();
82496 down_write(&oldmm->mmap_sem);
82497@@ -379,55 +447,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82498
82499 prev = NULL;
82500 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
82501- struct file *file;
82502-
82503 if (mpnt->vm_flags & VM_DONTCOPY) {
82504 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
82505 -vma_pages(mpnt));
82506 continue;
82507 }
82508- charge = 0;
82509- if (mpnt->vm_flags & VM_ACCOUNT) {
82510- unsigned long len = vma_pages(mpnt);
82511-
82512- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
82513- goto fail_nomem;
82514- charge = len;
82515- }
82516- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
82517- if (!tmp)
82518- goto fail_nomem;
82519- *tmp = *mpnt;
82520- INIT_LIST_HEAD(&tmp->anon_vma_chain);
82521- retval = vma_dup_policy(mpnt, tmp);
82522- if (retval)
82523- goto fail_nomem_policy;
82524- tmp->vm_mm = mm;
82525- if (anon_vma_fork(tmp, mpnt))
82526- goto fail_nomem_anon_vma_fork;
82527- tmp->vm_flags &= ~VM_LOCKED;
82528- tmp->vm_next = tmp->vm_prev = NULL;
82529- file = tmp->vm_file;
82530- if (file) {
82531- struct inode *inode = file_inode(file);
82532- struct address_space *mapping = file->f_mapping;
82533-
82534- get_file(file);
82535- if (tmp->vm_flags & VM_DENYWRITE)
82536- atomic_dec(&inode->i_writecount);
82537- mutex_lock(&mapping->i_mmap_mutex);
82538- if (tmp->vm_flags & VM_SHARED)
82539- mapping->i_mmap_writable++;
82540- flush_dcache_mmap_lock(mapping);
82541- /* insert tmp into the share list, just after mpnt */
82542- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
82543- vma_nonlinear_insert(tmp,
82544- &mapping->i_mmap_nonlinear);
82545- else
82546- vma_interval_tree_insert_after(tmp, mpnt,
82547- &mapping->i_mmap);
82548- flush_dcache_mmap_unlock(mapping);
82549- mutex_unlock(&mapping->i_mmap_mutex);
82550+ tmp = dup_vma(mm, oldmm, mpnt);
82551+ if (!tmp) {
82552+ retval = -ENOMEM;
82553+ goto out;
82554 }
82555
82556 /*
82557@@ -459,6 +487,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82558 if (retval)
82559 goto out;
82560 }
82561+
82562+#ifdef CONFIG_PAX_SEGMEXEC
82563+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
82564+ struct vm_area_struct *mpnt_m;
82565+
82566+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
82567+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
82568+
82569+ if (!mpnt->vm_mirror)
82570+ continue;
82571+
82572+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
82573+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
82574+ mpnt->vm_mirror = mpnt_m;
82575+ } else {
82576+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
82577+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
82578+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
82579+ mpnt->vm_mirror->vm_mirror = mpnt;
82580+ }
82581+ }
82582+ BUG_ON(mpnt_m);
82583+ }
82584+#endif
82585+
82586 /* a new mm has just been created */
82587 arch_dup_mmap(oldmm, mm);
82588 retval = 0;
82589@@ -468,14 +521,6 @@ out:
82590 up_write(&oldmm->mmap_sem);
82591 uprobe_end_dup_mmap();
82592 return retval;
82593-fail_nomem_anon_vma_fork:
82594- mpol_put(vma_policy(tmp));
82595-fail_nomem_policy:
82596- kmem_cache_free(vm_area_cachep, tmp);
82597-fail_nomem:
82598- retval = -ENOMEM;
82599- vm_unacct_memory(charge);
82600- goto out;
82601 }
82602
82603 static inline int mm_alloc_pgd(struct mm_struct *mm)
82604@@ -689,8 +734,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
82605 return ERR_PTR(err);
82606
82607 mm = get_task_mm(task);
82608- if (mm && mm != current->mm &&
82609- !ptrace_may_access(task, mode)) {
82610+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
82611+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
82612 mmput(mm);
82613 mm = ERR_PTR(-EACCES);
82614 }
82615@@ -912,13 +957,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
82616 spin_unlock(&fs->lock);
82617 return -EAGAIN;
82618 }
82619- fs->users++;
82620+ atomic_inc(&fs->users);
82621 spin_unlock(&fs->lock);
82622 return 0;
82623 }
82624 tsk->fs = copy_fs_struct(fs);
82625 if (!tsk->fs)
82626 return -ENOMEM;
82627+ /* Carry through gr_chroot_dentry and is_chrooted instead
82628+ of recomputing it here. Already copied when the task struct
82629+ is duplicated. This allows pivot_root to not be treated as
82630+ a chroot
82631+ */
82632+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
82633+
82634 return 0;
82635 }
82636
82637@@ -1129,7 +1181,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
82638 * parts of the process environment (as per the clone
82639 * flags). The actual kick-off is left to the caller.
82640 */
82641-static struct task_struct *copy_process(unsigned long clone_flags,
82642+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
82643 unsigned long stack_start,
82644 unsigned long stack_size,
82645 int __user *child_tidptr,
82646@@ -1201,6 +1253,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
82647 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
82648 #endif
82649 retval = -EAGAIN;
82650+
82651+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
82652+
82653 if (atomic_read(&p->real_cred->user->processes) >=
82654 task_rlimit(p, RLIMIT_NPROC)) {
82655 if (p->real_cred->user != INIT_USER &&
82656@@ -1450,6 +1505,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
82657 goto bad_fork_free_pid;
82658 }
82659
82660+ /* synchronizes with gr_set_acls()
82661+ we need to call this past the point of no return for fork()
82662+ */
82663+ gr_copy_label(p);
82664+
82665 if (likely(p->pid)) {
82666 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
82667
82668@@ -1535,6 +1595,8 @@ bad_fork_cleanup_count:
82669 bad_fork_free:
82670 free_task(p);
82671 fork_out:
82672+ gr_log_forkfail(retval);
82673+
82674 return ERR_PTR(retval);
82675 }
82676
82677@@ -1596,6 +1658,7 @@ long do_fork(unsigned long clone_flags,
82678
82679 p = copy_process(clone_flags, stack_start, stack_size,
82680 child_tidptr, NULL, trace);
82681+ add_latent_entropy();
82682 /*
82683 * Do this prior waking up the new thread - the thread pointer
82684 * might get invalid after that point, if the thread exits quickly.
82685@@ -1610,6 +1673,8 @@ long do_fork(unsigned long clone_flags,
82686 if (clone_flags & CLONE_PARENT_SETTID)
82687 put_user(nr, parent_tidptr);
82688
82689+ gr_handle_brute_check();
82690+
82691 if (clone_flags & CLONE_VFORK) {
82692 p->vfork_done = &vfork;
82693 init_completion(&vfork);
82694@@ -1726,7 +1791,7 @@ void __init proc_caches_init(void)
82695 mm_cachep = kmem_cache_create("mm_struct",
82696 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
82697 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
82698- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
82699+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
82700 mmap_init();
82701 nsproxy_cache_init();
82702 }
82703@@ -1766,7 +1831,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
82704 return 0;
82705
82706 /* don't need lock here; in the worst case we'll do useless copy */
82707- if (fs->users == 1)
82708+ if (atomic_read(&fs->users) == 1)
82709 return 0;
82710
82711 *new_fsp = copy_fs_struct(fs);
82712@@ -1873,7 +1938,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
82713 fs = current->fs;
82714 spin_lock(&fs->lock);
82715 current->fs = new_fs;
82716- if (--fs->users)
82717+ gr_set_chroot_entries(current, &current->fs->root);
82718+ if (atomic_dec_return(&fs->users))
82719 new_fs = NULL;
82720 else
82721 new_fs = fs;
82722diff --git a/kernel/futex.c b/kernel/futex.c
82723index 221a58f..1b8cfce 100644
82724--- a/kernel/futex.c
82725+++ b/kernel/futex.c
82726@@ -54,6 +54,7 @@
82727 #include <linux/mount.h>
82728 #include <linux/pagemap.h>
82729 #include <linux/syscalls.h>
82730+#include <linux/ptrace.h>
82731 #include <linux/signal.h>
82732 #include <linux/export.h>
82733 #include <linux/magic.h>
82734@@ -243,6 +244,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
82735 struct page *page, *page_head;
82736 int err, ro = 0;
82737
82738+#ifdef CONFIG_PAX_SEGMEXEC
82739+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
82740+ return -EFAULT;
82741+#endif
82742+
82743 /*
82744 * The futex address must be "naturally" aligned.
82745 */
82746@@ -441,7 +447,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
82747
82748 static int get_futex_value_locked(u32 *dest, u32 __user *from)
82749 {
82750- int ret;
82751+ unsigned long ret;
82752
82753 pagefault_disable();
82754 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
82755@@ -2734,6 +2740,7 @@ static int __init futex_init(void)
82756 {
82757 u32 curval;
82758 int i;
82759+ mm_segment_t oldfs;
82760
82761 /*
82762 * This will fail and we want it. Some arch implementations do
82763@@ -2745,8 +2752,11 @@ static int __init futex_init(void)
82764 * implementation, the non-functional ones will return
82765 * -ENOSYS.
82766 */
82767+ oldfs = get_fs();
82768+ set_fs(USER_DS);
82769 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
82770 futex_cmpxchg_enabled = 1;
82771+ set_fs(oldfs);
82772
82773 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
82774 plist_head_init(&futex_queues[i].chain);
82775diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
82776index f9f44fd..29885e4 100644
82777--- a/kernel/futex_compat.c
82778+++ b/kernel/futex_compat.c
82779@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
82780 return 0;
82781 }
82782
82783-static void __user *futex_uaddr(struct robust_list __user *entry,
82784+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
82785 compat_long_t futex_offset)
82786 {
82787 compat_uptr_t base = ptr_to_compat(entry);
82788diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
82789index 9b22d03..6295b62 100644
82790--- a/kernel/gcov/base.c
82791+++ b/kernel/gcov/base.c
82792@@ -102,11 +102,6 @@ void gcov_enable_events(void)
82793 }
82794
82795 #ifdef CONFIG_MODULES
82796-static inline int within(void *addr, void *start, unsigned long size)
82797-{
82798- return ((addr >= start) && (addr < start + size));
82799-}
82800-
82801 /* Update list and generate events when modules are unloaded. */
82802 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
82803 void *data)
82804@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
82805 prev = NULL;
82806 /* Remove entries located in module from linked list. */
82807 for (info = gcov_info_head; info; info = info->next) {
82808- if (within(info, mod->module_core, mod->core_size)) {
82809+ if (within_module_core_rw((unsigned long)info, mod)) {
82810 if (prev)
82811 prev->next = info->next;
82812 else
82813diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
82814index 383319b..56ebb13 100644
82815--- a/kernel/hrtimer.c
82816+++ b/kernel/hrtimer.c
82817@@ -1438,7 +1438,7 @@ void hrtimer_peek_ahead_timers(void)
82818 local_irq_restore(flags);
82819 }
82820
82821-static void run_hrtimer_softirq(struct softirq_action *h)
82822+static __latent_entropy void run_hrtimer_softirq(void)
82823 {
82824 hrtimer_peek_ahead_timers();
82825 }
82826diff --git a/kernel/irq_work.c b/kernel/irq_work.c
82827index 55fcce6..0e4cf34 100644
82828--- a/kernel/irq_work.c
82829+++ b/kernel/irq_work.c
82830@@ -189,12 +189,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
82831 return NOTIFY_OK;
82832 }
82833
82834-static struct notifier_block cpu_notify;
82835+static struct notifier_block cpu_notify = {
82836+ .notifier_call = irq_work_cpu_notify,
82837+ .priority = 0,
82838+};
82839
82840 static __init int irq_work_init_cpu_notifier(void)
82841 {
82842- cpu_notify.notifier_call = irq_work_cpu_notify;
82843- cpu_notify.priority = 0;
82844 register_cpu_notifier(&cpu_notify);
82845 return 0;
82846 }
82847diff --git a/kernel/jump_label.c b/kernel/jump_label.c
82848index 297a924..7290070 100644
82849--- a/kernel/jump_label.c
82850+++ b/kernel/jump_label.c
82851@@ -14,6 +14,7 @@
82852 #include <linux/err.h>
82853 #include <linux/static_key.h>
82854 #include <linux/jump_label_ratelimit.h>
82855+#include <linux/mm.h>
82856
82857 #ifdef HAVE_JUMP_LABEL
82858
82859@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
82860
82861 size = (((unsigned long)stop - (unsigned long)start)
82862 / sizeof(struct jump_entry));
82863+ pax_open_kernel();
82864 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
82865+ pax_close_kernel();
82866 }
82867
82868 static void jump_label_update(struct static_key *key, int enable);
82869@@ -358,10 +361,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
82870 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
82871 struct jump_entry *iter;
82872
82873+ pax_open_kernel();
82874 for (iter = iter_start; iter < iter_stop; iter++) {
82875 if (within_module_init(iter->code, mod))
82876 iter->code = 0;
82877 }
82878+ pax_close_kernel();
82879 }
82880
82881 static int
82882diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
82883index 3127ad5..159d880 100644
82884--- a/kernel/kallsyms.c
82885+++ b/kernel/kallsyms.c
82886@@ -11,6 +11,9 @@
82887 * Changed the compression method from stem compression to "table lookup"
82888 * compression (see scripts/kallsyms.c for a more complete description)
82889 */
82890+#ifdef CONFIG_GRKERNSEC_HIDESYM
82891+#define __INCLUDED_BY_HIDESYM 1
82892+#endif
82893 #include <linux/kallsyms.h>
82894 #include <linux/module.h>
82895 #include <linux/init.h>
82896@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
82897
82898 static inline int is_kernel_inittext(unsigned long addr)
82899 {
82900+ if (system_state != SYSTEM_BOOTING)
82901+ return 0;
82902+
82903 if (addr >= (unsigned long)_sinittext
82904 && addr <= (unsigned long)_einittext)
82905 return 1;
82906 return 0;
82907 }
82908
82909+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82910+#ifdef CONFIG_MODULES
82911+static inline int is_module_text(unsigned long addr)
82912+{
82913+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
82914+ return 1;
82915+
82916+ addr = ktla_ktva(addr);
82917+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
82918+}
82919+#else
82920+static inline int is_module_text(unsigned long addr)
82921+{
82922+ return 0;
82923+}
82924+#endif
82925+#endif
82926+
82927 static inline int is_kernel_text(unsigned long addr)
82928 {
82929 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
82930@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
82931
82932 static inline int is_kernel(unsigned long addr)
82933 {
82934+
82935+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82936+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
82937+ return 1;
82938+
82939+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
82940+#else
82941 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
82942+#endif
82943+
82944 return 1;
82945 return in_gate_area_no_mm(addr);
82946 }
82947
82948 static int is_ksym_addr(unsigned long addr)
82949 {
82950+
82951+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82952+ if (is_module_text(addr))
82953+ return 0;
82954+#endif
82955+
82956 if (all_var)
82957 return is_kernel(addr);
82958
82959@@ -480,7 +519,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
82960
82961 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
82962 {
82963- iter->name[0] = '\0';
82964 iter->nameoff = get_symbol_offset(new_pos);
82965 iter->pos = new_pos;
82966 }
82967@@ -528,6 +566,11 @@ static int s_show(struct seq_file *m, void *p)
82968 {
82969 struct kallsym_iter *iter = m->private;
82970
82971+#ifdef CONFIG_GRKERNSEC_HIDESYM
82972+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
82973+ return 0;
82974+#endif
82975+
82976 /* Some debugging symbols have no name. Ignore them. */
82977 if (!iter->name[0])
82978 return 0;
82979@@ -541,6 +584,7 @@ static int s_show(struct seq_file *m, void *p)
82980 */
82981 type = iter->exported ? toupper(iter->type) :
82982 tolower(iter->type);
82983+
82984 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
82985 type, iter->name, iter->module_name);
82986 } else
82987@@ -566,7 +610,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
82988 struct kallsym_iter *iter;
82989 int ret;
82990
82991- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
82992+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
82993 if (!iter)
82994 return -ENOMEM;
82995 reset_iter(iter, 0);
82996diff --git a/kernel/kcmp.c b/kernel/kcmp.c
82997index e30ac0f..3528cac 100644
82998--- a/kernel/kcmp.c
82999+++ b/kernel/kcmp.c
83000@@ -99,6 +99,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
83001 struct task_struct *task1, *task2;
83002 int ret;
83003
83004+#ifdef CONFIG_GRKERNSEC
83005+ return -ENOSYS;
83006+#endif
83007+
83008 rcu_read_lock();
83009
83010 /*
83011diff --git a/kernel/kexec.c b/kernel/kexec.c
83012index 355e13a..06b25d2 100644
83013--- a/kernel/kexec.c
83014+++ b/kernel/kexec.c
83015@@ -1044,7 +1044,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
83016 unsigned long flags)
83017 {
83018 struct compat_kexec_segment in;
83019- struct kexec_segment out, __user *ksegments;
83020+ struct kexec_segment out;
83021+ struct kexec_segment __user *ksegments;
83022 unsigned long i, result;
83023
83024 /* Don't allow clients that don't understand the native
83025diff --git a/kernel/kmod.c b/kernel/kmod.c
83026index b086006..6d2e579 100644
83027--- a/kernel/kmod.c
83028+++ b/kernel/kmod.c
83029@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
83030 kfree(info->argv);
83031 }
83032
83033-static int call_modprobe(char *module_name, int wait)
83034+static int call_modprobe(char *module_name, char *module_param, int wait)
83035 {
83036 struct subprocess_info *info;
83037 static char *envp[] = {
83038@@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
83039 NULL
83040 };
83041
83042- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
83043+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
83044 if (!argv)
83045 goto out;
83046
83047@@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
83048 argv[1] = "-q";
83049 argv[2] = "--";
83050 argv[3] = module_name; /* check free_modprobe_argv() */
83051- argv[4] = NULL;
83052+ argv[4] = module_param;
83053+ argv[5] = NULL;
83054
83055 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
83056 NULL, free_modprobe_argv, NULL);
83057@@ -129,9 +130,8 @@ out:
83058 * If module auto-loading support is disabled then this function
83059 * becomes a no-operation.
83060 */
83061-int __request_module(bool wait, const char *fmt, ...)
83062+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
83063 {
83064- va_list args;
83065 char module_name[MODULE_NAME_LEN];
83066 unsigned int max_modprobes;
83067 int ret;
83068@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
83069 if (!modprobe_path[0])
83070 return 0;
83071
83072- va_start(args, fmt);
83073- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
83074- va_end(args);
83075+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
83076 if (ret >= MODULE_NAME_LEN)
83077 return -ENAMETOOLONG;
83078
83079@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
83080 if (ret)
83081 return ret;
83082
83083+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83084+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
83085+ /* hack to workaround consolekit/udisks stupidity */
83086+ read_lock(&tasklist_lock);
83087+ if (!strcmp(current->comm, "mount") &&
83088+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
83089+ read_unlock(&tasklist_lock);
83090+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
83091+ return -EPERM;
83092+ }
83093+ read_unlock(&tasklist_lock);
83094+ }
83095+#endif
83096+
83097 /* If modprobe needs a service that is in a module, we get a recursive
83098 * loop. Limit the number of running kmod threads to max_threads/2 or
83099 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
83100@@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
83101
83102 trace_module_request(module_name, wait, _RET_IP_);
83103
83104- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
83105+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
83106
83107 atomic_dec(&kmod_concurrent);
83108 return ret;
83109 }
83110+
83111+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
83112+{
83113+ va_list args;
83114+ int ret;
83115+
83116+ va_start(args, fmt);
83117+ ret = ____request_module(wait, module_param, fmt, args);
83118+ va_end(args);
83119+
83120+ return ret;
83121+}
83122+
83123+int __request_module(bool wait, const char *fmt, ...)
83124+{
83125+ va_list args;
83126+ int ret;
83127+
83128+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83129+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
83130+ char module_param[MODULE_NAME_LEN];
83131+
83132+ memset(module_param, 0, sizeof(module_param));
83133+
83134+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
83135+
83136+ va_start(args, fmt);
83137+ ret = ____request_module(wait, module_param, fmt, args);
83138+ va_end(args);
83139+
83140+ return ret;
83141+ }
83142+#endif
83143+
83144+ va_start(args, fmt);
83145+ ret = ____request_module(wait, NULL, fmt, args);
83146+ va_end(args);
83147+
83148+ return ret;
83149+}
83150+
83151 EXPORT_SYMBOL(__request_module);
83152 #endif /* CONFIG_MODULES */
83153
83154@@ -218,6 +271,19 @@ static int ____call_usermodehelper(void *data)
83155 */
83156 set_user_nice(current, 0);
83157
83158+#ifdef CONFIG_GRKERNSEC
83159+ /* this is race-free as far as userland is concerned as we copied
83160+ out the path to be used prior to this point and are now operating
83161+ on that copy
83162+ */
83163+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
83164+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) {
83165+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
83166+ retval = -EPERM;
83167+ goto fail;
83168+ }
83169+#endif
83170+
83171 retval = -ENOMEM;
83172 new = prepare_kernel_cred(current);
83173 if (!new)
83174@@ -260,6 +326,10 @@ static int call_helper(void *data)
83175
83176 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
83177 {
83178+#ifdef CONFIG_GRKERNSEC
83179+ kfree(info->path);
83180+ info->path = info->origpath;
83181+#endif
83182 if (info->cleanup)
83183 (*info->cleanup)(info);
83184 kfree(info);
83185@@ -303,7 +373,7 @@ static int wait_for_helper(void *data)
83186 *
83187 * Thus the __user pointer cast is valid here.
83188 */
83189- sys_wait4(pid, (int __user *)&ret, 0, NULL);
83190+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
83191
83192 /*
83193 * If ret is 0, either ____call_usermodehelper failed and the
83194@@ -542,7 +612,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
83195 goto out;
83196
83197 INIT_WORK(&sub_info->work, __call_usermodehelper);
83198+#ifdef CONFIG_GRKERNSEC
83199+ sub_info->origpath = path;
83200+ sub_info->path = kstrdup(path, gfp_mask);
83201+#else
83202 sub_info->path = path;
83203+#endif
83204 sub_info->argv = argv;
83205 sub_info->envp = envp;
83206
83207@@ -650,7 +725,7 @@ EXPORT_SYMBOL(call_usermodehelper);
83208 static int proc_cap_handler(struct ctl_table *table, int write,
83209 void __user *buffer, size_t *lenp, loff_t *ppos)
83210 {
83211- struct ctl_table t;
83212+ ctl_table_no_const t;
83213 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
83214 kernel_cap_t new_cap;
83215 int err, i;
83216diff --git a/kernel/kprobes.c b/kernel/kprobes.c
83217index a0d367a..11c18b6 100644
83218--- a/kernel/kprobes.c
83219+++ b/kernel/kprobes.c
83220@@ -31,6 +31,9 @@
83221 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
83222 * <prasanna@in.ibm.com> added function-return probes.
83223 */
83224+#ifdef CONFIG_GRKERNSEC_HIDESYM
83225+#define __INCLUDED_BY_HIDESYM 1
83226+#endif
83227 #include <linux/kprobes.h>
83228 #include <linux/hash.h>
83229 #include <linux/init.h>
83230@@ -135,12 +138,12 @@ enum kprobe_slot_state {
83231
83232 static void *alloc_insn_page(void)
83233 {
83234- return module_alloc(PAGE_SIZE);
83235+ return module_alloc_exec(PAGE_SIZE);
83236 }
83237
83238 static void free_insn_page(void *page)
83239 {
83240- module_free(NULL, page);
83241+ module_free_exec(NULL, page);
83242 }
83243
83244 struct kprobe_insn_cache kprobe_insn_slots = {
83245@@ -2066,7 +2069,7 @@ static int __init init_kprobes(void)
83246 {
83247 int i, err = 0;
83248 unsigned long offset = 0, size = 0;
83249- char *modname, namebuf[128];
83250+ char *modname, namebuf[KSYM_NAME_LEN];
83251 const char *symbol_name;
83252 void *addr;
83253 struct kprobe_blackpoint *kb;
83254@@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
83255 kprobe_type = "k";
83256
83257 if (sym)
83258- seq_printf(pi, "%p %s %s+0x%x %s ",
83259+ seq_printf(pi, "%pK %s %s+0x%x %s ",
83260 p->addr, kprobe_type, sym, offset,
83261 (modname ? modname : " "));
83262 else
83263- seq_printf(pi, "%p %s %p ",
83264+ seq_printf(pi, "%pK %s %pK ",
83265 p->addr, kprobe_type, p->addr);
83266
83267 if (!pp)
83268@@ -2192,7 +2195,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
83269 const char *sym = NULL;
83270 unsigned int i = *(loff_t *) v;
83271 unsigned long offset = 0;
83272- char *modname, namebuf[128];
83273+ char *modname, namebuf[KSYM_NAME_LEN];
83274
83275 head = &kprobe_table[i];
83276 preempt_disable();
83277diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
83278index 9659d38..bffd520 100644
83279--- a/kernel/ksysfs.c
83280+++ b/kernel/ksysfs.c
83281@@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
83282 {
83283 if (count+1 > UEVENT_HELPER_PATH_LEN)
83284 return -ENOENT;
83285+ if (!capable(CAP_SYS_ADMIN))
83286+ return -EPERM;
83287 memcpy(uevent_helper, buf, count);
83288 uevent_helper[count] = '\0';
83289 if (count && uevent_helper[count-1] == '\n')
83290@@ -172,7 +174,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
83291 return count;
83292 }
83293
83294-static struct bin_attribute notes_attr = {
83295+static bin_attribute_no_const notes_attr __read_only = {
83296 .attr = {
83297 .name = "notes",
83298 .mode = S_IRUGO,
83299diff --git a/kernel/lockdep.c b/kernel/lockdep.c
83300index e16c45b..6f49c48 100644
83301--- a/kernel/lockdep.c
83302+++ b/kernel/lockdep.c
83303@@ -596,6 +596,10 @@ static int static_obj(void *obj)
83304 end = (unsigned long) &_end,
83305 addr = (unsigned long) obj;
83306
83307+#ifdef CONFIG_PAX_KERNEXEC
83308+ start = ktla_ktva(start);
83309+#endif
83310+
83311 /*
83312 * static variable?
83313 */
83314@@ -736,6 +740,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
83315 if (!static_obj(lock->key)) {
83316 debug_locks_off();
83317 printk("INFO: trying to register non-static key.\n");
83318+ printk("lock:%pS key:%pS.\n", lock, lock->key);
83319 printk("the code is fine but needs lockdep annotation.\n");
83320 printk("turning off the locking correctness validator.\n");
83321 dump_stack();
83322@@ -3080,7 +3085,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
83323 if (!class)
83324 return 0;
83325 }
83326- atomic_inc((atomic_t *)&class->ops);
83327+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
83328 if (very_verbose(class)) {
83329 printk("\nacquire class [%p] %s", class->key, class->name);
83330 if (class->name_version > 1)
83331diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
83332index b2c71c5..7b88d63 100644
83333--- a/kernel/lockdep_proc.c
83334+++ b/kernel/lockdep_proc.c
83335@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
83336 return 0;
83337 }
83338
83339- seq_printf(m, "%p", class->key);
83340+ seq_printf(m, "%pK", class->key);
83341 #ifdef CONFIG_DEBUG_LOCKDEP
83342 seq_printf(m, " OPS:%8ld", class->ops);
83343 #endif
83344@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
83345
83346 list_for_each_entry(entry, &class->locks_after, entry) {
83347 if (entry->distance == 1) {
83348- seq_printf(m, " -> [%p] ", entry->class->key);
83349+ seq_printf(m, " -> [%pK] ", entry->class->key);
83350 print_name(m, entry->class);
83351 seq_puts(m, "\n");
83352 }
83353@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
83354 if (!class->key)
83355 continue;
83356
83357- seq_printf(m, "[%p] ", class->key);
83358+ seq_printf(m, "[%pK] ", class->key);
83359 print_name(m, class);
83360 seq_puts(m, "\n");
83361 }
83362@@ -495,7 +495,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
83363 if (!i)
83364 seq_line(m, '-', 40-namelen, namelen);
83365
83366- snprintf(ip, sizeof(ip), "[<%p>]",
83367+ snprintf(ip, sizeof(ip), "[<%pK>]",
83368 (void *)class->contention_point[i]);
83369 seq_printf(m, "%40s %14lu %29s %pS\n",
83370 name, stats->contention_point[i],
83371@@ -510,7 +510,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
83372 if (!i)
83373 seq_line(m, '-', 40-namelen, namelen);
83374
83375- snprintf(ip, sizeof(ip), "[<%p>]",
83376+ snprintf(ip, sizeof(ip), "[<%pK>]",
83377 (void *)class->contending_point[i]);
83378 seq_printf(m, "%40s %14lu %29s %pS\n",
83379 name, stats->contending_point[i],
83380diff --git a/kernel/module.c b/kernel/module.c
83381index dc58274..3ddfa55 100644
83382--- a/kernel/module.c
83383+++ b/kernel/module.c
83384@@ -61,6 +61,7 @@
83385 #include <linux/pfn.h>
83386 #include <linux/bsearch.h>
83387 #include <linux/fips.h>
83388+#include <linux/grsecurity.h>
83389 #include <uapi/linux/module.h>
83390 #include "module-internal.h"
83391
83392@@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
83393
83394 /* Bounds of module allocation, for speeding __module_address.
83395 * Protected by module_mutex. */
83396-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
83397+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
83398+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
83399
83400 int register_module_notifier(struct notifier_block * nb)
83401 {
83402@@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
83403 return true;
83404
83405 list_for_each_entry_rcu(mod, &modules, list) {
83406- struct symsearch arr[] = {
83407+ struct symsearch modarr[] = {
83408 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
83409 NOT_GPL_ONLY, false },
83410 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
83411@@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
83412 if (mod->state == MODULE_STATE_UNFORMED)
83413 continue;
83414
83415- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
83416+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
83417 return true;
83418 }
83419 return false;
83420@@ -491,7 +493,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
83421 if (!pcpusec->sh_size)
83422 return 0;
83423
83424- if (align > PAGE_SIZE) {
83425+ if (align-1 >= PAGE_SIZE) {
83426 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
83427 mod->name, align, PAGE_SIZE);
83428 align = PAGE_SIZE;
83429@@ -1097,7 +1099,7 @@ struct module_attribute module_uevent =
83430 static ssize_t show_coresize(struct module_attribute *mattr,
83431 struct module_kobject *mk, char *buffer)
83432 {
83433- return sprintf(buffer, "%u\n", mk->mod->core_size);
83434+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
83435 }
83436
83437 static struct module_attribute modinfo_coresize =
83438@@ -1106,7 +1108,7 @@ static struct module_attribute modinfo_coresize =
83439 static ssize_t show_initsize(struct module_attribute *mattr,
83440 struct module_kobject *mk, char *buffer)
83441 {
83442- return sprintf(buffer, "%u\n", mk->mod->init_size);
83443+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
83444 }
83445
83446 static struct module_attribute modinfo_initsize =
83447@@ -1321,7 +1323,7 @@ resolve_symbol_wait(struct module *mod,
83448 */
83449 #ifdef CONFIG_SYSFS
83450
83451-#ifdef CONFIG_KALLSYMS
83452+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
83453 static inline bool sect_empty(const Elf_Shdr *sect)
83454 {
83455 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
83456@@ -1461,7 +1463,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
83457 {
83458 unsigned int notes, loaded, i;
83459 struct module_notes_attrs *notes_attrs;
83460- struct bin_attribute *nattr;
83461+ bin_attribute_no_const *nattr;
83462
83463 /* failed to create section attributes, so can't create notes */
83464 if (!mod->sect_attrs)
83465@@ -1573,7 +1575,7 @@ static void del_usage_links(struct module *mod)
83466 static int module_add_modinfo_attrs(struct module *mod)
83467 {
83468 struct module_attribute *attr;
83469- struct module_attribute *temp_attr;
83470+ module_attribute_no_const *temp_attr;
83471 int error = 0;
83472 int i;
83473
83474@@ -1795,21 +1797,21 @@ static void set_section_ro_nx(void *base,
83475
83476 static void unset_module_core_ro_nx(struct module *mod)
83477 {
83478- set_page_attributes(mod->module_core + mod->core_text_size,
83479- mod->module_core + mod->core_size,
83480+ set_page_attributes(mod->module_core_rw,
83481+ mod->module_core_rw + mod->core_size_rw,
83482 set_memory_x);
83483- set_page_attributes(mod->module_core,
83484- mod->module_core + mod->core_ro_size,
83485+ set_page_attributes(mod->module_core_rx,
83486+ mod->module_core_rx + mod->core_size_rx,
83487 set_memory_rw);
83488 }
83489
83490 static void unset_module_init_ro_nx(struct module *mod)
83491 {
83492- set_page_attributes(mod->module_init + mod->init_text_size,
83493- mod->module_init + mod->init_size,
83494+ set_page_attributes(mod->module_init_rw,
83495+ mod->module_init_rw + mod->init_size_rw,
83496 set_memory_x);
83497- set_page_attributes(mod->module_init,
83498- mod->module_init + mod->init_ro_size,
83499+ set_page_attributes(mod->module_init_rx,
83500+ mod->module_init_rx + mod->init_size_rx,
83501 set_memory_rw);
83502 }
83503
83504@@ -1822,14 +1824,14 @@ void set_all_modules_text_rw(void)
83505 list_for_each_entry_rcu(mod, &modules, list) {
83506 if (mod->state == MODULE_STATE_UNFORMED)
83507 continue;
83508- if ((mod->module_core) && (mod->core_text_size)) {
83509- set_page_attributes(mod->module_core,
83510- mod->module_core + mod->core_text_size,
83511+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
83512+ set_page_attributes(mod->module_core_rx,
83513+ mod->module_core_rx + mod->core_size_rx,
83514 set_memory_rw);
83515 }
83516- if ((mod->module_init) && (mod->init_text_size)) {
83517- set_page_attributes(mod->module_init,
83518- mod->module_init + mod->init_text_size,
83519+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
83520+ set_page_attributes(mod->module_init_rx,
83521+ mod->module_init_rx + mod->init_size_rx,
83522 set_memory_rw);
83523 }
83524 }
83525@@ -1845,14 +1847,14 @@ void set_all_modules_text_ro(void)
83526 list_for_each_entry_rcu(mod, &modules, list) {
83527 if (mod->state == MODULE_STATE_UNFORMED)
83528 continue;
83529- if ((mod->module_core) && (mod->core_text_size)) {
83530- set_page_attributes(mod->module_core,
83531- mod->module_core + mod->core_text_size,
83532+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
83533+ set_page_attributes(mod->module_core_rx,
83534+ mod->module_core_rx + mod->core_size_rx,
83535 set_memory_ro);
83536 }
83537- if ((mod->module_init) && (mod->init_text_size)) {
83538- set_page_attributes(mod->module_init,
83539- mod->module_init + mod->init_text_size,
83540+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
83541+ set_page_attributes(mod->module_init_rx,
83542+ mod->module_init_rx + mod->init_size_rx,
83543 set_memory_ro);
83544 }
83545 }
83546@@ -1903,16 +1905,19 @@ static void free_module(struct module *mod)
83547
83548 /* This may be NULL, but that's OK */
83549 unset_module_init_ro_nx(mod);
83550- module_free(mod, mod->module_init);
83551+ module_free(mod, mod->module_init_rw);
83552+ module_free_exec(mod, mod->module_init_rx);
83553 kfree(mod->args);
83554 percpu_modfree(mod);
83555
83556 /* Free lock-classes: */
83557- lockdep_free_key_range(mod->module_core, mod->core_size);
83558+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
83559+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
83560
83561 /* Finally, free the core (containing the module structure) */
83562 unset_module_core_ro_nx(mod);
83563- module_free(mod, mod->module_core);
83564+ module_free_exec(mod, mod->module_core_rx);
83565+ module_free(mod, mod->module_core_rw);
83566
83567 #ifdef CONFIG_MPU
83568 update_protections(current->mm);
83569@@ -1982,9 +1987,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83570 int ret = 0;
83571 const struct kernel_symbol *ksym;
83572
83573+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83574+ int is_fs_load = 0;
83575+ int register_filesystem_found = 0;
83576+ char *p;
83577+
83578+ p = strstr(mod->args, "grsec_modharden_fs");
83579+ if (p) {
83580+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
83581+ /* copy \0 as well */
83582+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
83583+ is_fs_load = 1;
83584+ }
83585+#endif
83586+
83587 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
83588 const char *name = info->strtab + sym[i].st_name;
83589
83590+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83591+ /* it's a real shame this will never get ripped and copied
83592+ upstream! ;(
83593+ */
83594+ if (is_fs_load && !strcmp(name, "register_filesystem"))
83595+ register_filesystem_found = 1;
83596+#endif
83597+
83598 switch (sym[i].st_shndx) {
83599 case SHN_COMMON:
83600 /* We compiled with -fno-common. These are not
83601@@ -2005,7 +2032,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83602 ksym = resolve_symbol_wait(mod, info, name);
83603 /* Ok if resolved. */
83604 if (ksym && !IS_ERR(ksym)) {
83605+ pax_open_kernel();
83606 sym[i].st_value = ksym->value;
83607+ pax_close_kernel();
83608 break;
83609 }
83610
83611@@ -2024,11 +2053,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83612 secbase = (unsigned long)mod_percpu(mod);
83613 else
83614 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
83615+ pax_open_kernel();
83616 sym[i].st_value += secbase;
83617+ pax_close_kernel();
83618 break;
83619 }
83620 }
83621
83622+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83623+ if (is_fs_load && !register_filesystem_found) {
83624+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
83625+ ret = -EPERM;
83626+ }
83627+#endif
83628+
83629 return ret;
83630 }
83631
83632@@ -2112,22 +2150,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
83633 || s->sh_entsize != ~0UL
83634 || strstarts(sname, ".init"))
83635 continue;
83636- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
83637+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
83638+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
83639+ else
83640+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
83641 pr_debug("\t%s\n", sname);
83642 }
83643- switch (m) {
83644- case 0: /* executable */
83645- mod->core_size = debug_align(mod->core_size);
83646- mod->core_text_size = mod->core_size;
83647- break;
83648- case 1: /* RO: text and ro-data */
83649- mod->core_size = debug_align(mod->core_size);
83650- mod->core_ro_size = mod->core_size;
83651- break;
83652- case 3: /* whole core */
83653- mod->core_size = debug_align(mod->core_size);
83654- break;
83655- }
83656 }
83657
83658 pr_debug("Init section allocation order:\n");
83659@@ -2141,23 +2169,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
83660 || s->sh_entsize != ~0UL
83661 || !strstarts(sname, ".init"))
83662 continue;
83663- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
83664- | INIT_OFFSET_MASK);
83665+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
83666+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
83667+ else
83668+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
83669+ s->sh_entsize |= INIT_OFFSET_MASK;
83670 pr_debug("\t%s\n", sname);
83671 }
83672- switch (m) {
83673- case 0: /* executable */
83674- mod->init_size = debug_align(mod->init_size);
83675- mod->init_text_size = mod->init_size;
83676- break;
83677- case 1: /* RO: text and ro-data */
83678- mod->init_size = debug_align(mod->init_size);
83679- mod->init_ro_size = mod->init_size;
83680- break;
83681- case 3: /* whole init */
83682- mod->init_size = debug_align(mod->init_size);
83683- break;
83684- }
83685 }
83686 }
83687
83688@@ -2330,7 +2348,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
83689
83690 /* Put symbol section at end of init part of module. */
83691 symsect->sh_flags |= SHF_ALLOC;
83692- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
83693+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
83694 info->index.sym) | INIT_OFFSET_MASK;
83695 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
83696
83697@@ -2347,13 +2365,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
83698 }
83699
83700 /* Append room for core symbols at end of core part. */
83701- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
83702- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
83703- mod->core_size += strtab_size;
83704+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
83705+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
83706+ mod->core_size_rx += strtab_size;
83707
83708 /* Put string table section at end of init part of module. */
83709 strsect->sh_flags |= SHF_ALLOC;
83710- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
83711+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
83712 info->index.str) | INIT_OFFSET_MASK;
83713 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
83714 }
83715@@ -2371,12 +2389,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
83716 /* Make sure we get permanent strtab: don't use info->strtab. */
83717 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
83718
83719+ pax_open_kernel();
83720+
83721 /* Set types up while we still have access to sections. */
83722 for (i = 0; i < mod->num_symtab; i++)
83723 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
83724
83725- mod->core_symtab = dst = mod->module_core + info->symoffs;
83726- mod->core_strtab = s = mod->module_core + info->stroffs;
83727+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
83728+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
83729 src = mod->symtab;
83730 for (ndst = i = 0; i < mod->num_symtab; i++) {
83731 if (i == 0 ||
83732@@ -2388,6 +2408,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
83733 }
83734 }
83735 mod->core_num_syms = ndst;
83736+
83737+ pax_close_kernel();
83738 }
83739 #else
83740 static inline void layout_symtab(struct module *mod, struct load_info *info)
83741@@ -2421,17 +2443,33 @@ void * __weak module_alloc(unsigned long size)
83742 return vmalloc_exec(size);
83743 }
83744
83745-static void *module_alloc_update_bounds(unsigned long size)
83746+static void *module_alloc_update_bounds_rw(unsigned long size)
83747 {
83748 void *ret = module_alloc(size);
83749
83750 if (ret) {
83751 mutex_lock(&module_mutex);
83752 /* Update module bounds. */
83753- if ((unsigned long)ret < module_addr_min)
83754- module_addr_min = (unsigned long)ret;
83755- if ((unsigned long)ret + size > module_addr_max)
83756- module_addr_max = (unsigned long)ret + size;
83757+ if ((unsigned long)ret < module_addr_min_rw)
83758+ module_addr_min_rw = (unsigned long)ret;
83759+ if ((unsigned long)ret + size > module_addr_max_rw)
83760+ module_addr_max_rw = (unsigned long)ret + size;
83761+ mutex_unlock(&module_mutex);
83762+ }
83763+ return ret;
83764+}
83765+
83766+static void *module_alloc_update_bounds_rx(unsigned long size)
83767+{
83768+ void *ret = module_alloc_exec(size);
83769+
83770+ if (ret) {
83771+ mutex_lock(&module_mutex);
83772+ /* Update module bounds. */
83773+ if ((unsigned long)ret < module_addr_min_rx)
83774+ module_addr_min_rx = (unsigned long)ret;
83775+ if ((unsigned long)ret + size > module_addr_max_rx)
83776+ module_addr_max_rx = (unsigned long)ret + size;
83777 mutex_unlock(&module_mutex);
83778 }
83779 return ret;
83780@@ -2706,8 +2744,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
83781 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
83782 {
83783 const char *modmagic = get_modinfo(info, "vermagic");
83784+ const char *license = get_modinfo(info, "license");
83785 int err;
83786
83787+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
83788+ if (!license || !license_is_gpl_compatible(license))
83789+ return -ENOEXEC;
83790+#endif
83791+
83792 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
83793 modmagic = NULL;
83794
83795@@ -2733,7 +2777,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
83796 }
83797
83798 /* Set up license info based on the info section */
83799- set_license(mod, get_modinfo(info, "license"));
83800+ set_license(mod, license);
83801
83802 return 0;
83803 }
83804@@ -2814,7 +2858,7 @@ static int move_module(struct module *mod, struct load_info *info)
83805 void *ptr;
83806
83807 /* Do the allocs. */
83808- ptr = module_alloc_update_bounds(mod->core_size);
83809+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
83810 /*
83811 * The pointer to this block is stored in the module structure
83812 * which is inside the block. Just mark it as not being a
83813@@ -2824,11 +2868,11 @@ static int move_module(struct module *mod, struct load_info *info)
83814 if (!ptr)
83815 return -ENOMEM;
83816
83817- memset(ptr, 0, mod->core_size);
83818- mod->module_core = ptr;
83819+ memset(ptr, 0, mod->core_size_rw);
83820+ mod->module_core_rw = ptr;
83821
83822- if (mod->init_size) {
83823- ptr = module_alloc_update_bounds(mod->init_size);
83824+ if (mod->init_size_rw) {
83825+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
83826 /*
83827 * The pointer to this block is stored in the module structure
83828 * which is inside the block. This block doesn't need to be
83829@@ -2837,13 +2881,45 @@ static int move_module(struct module *mod, struct load_info *info)
83830 */
83831 kmemleak_ignore(ptr);
83832 if (!ptr) {
83833- module_free(mod, mod->module_core);
83834+ module_free(mod, mod->module_core_rw);
83835 return -ENOMEM;
83836 }
83837- memset(ptr, 0, mod->init_size);
83838- mod->module_init = ptr;
83839+ memset(ptr, 0, mod->init_size_rw);
83840+ mod->module_init_rw = ptr;
83841 } else
83842- mod->module_init = NULL;
83843+ mod->module_init_rw = NULL;
83844+
83845+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
83846+ kmemleak_not_leak(ptr);
83847+ if (!ptr) {
83848+ if (mod->module_init_rw)
83849+ module_free(mod, mod->module_init_rw);
83850+ module_free(mod, mod->module_core_rw);
83851+ return -ENOMEM;
83852+ }
83853+
83854+ pax_open_kernel();
83855+ memset(ptr, 0, mod->core_size_rx);
83856+ pax_close_kernel();
83857+ mod->module_core_rx = ptr;
83858+
83859+ if (mod->init_size_rx) {
83860+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
83861+ kmemleak_ignore(ptr);
83862+ if (!ptr && mod->init_size_rx) {
83863+ module_free_exec(mod, mod->module_core_rx);
83864+ if (mod->module_init_rw)
83865+ module_free(mod, mod->module_init_rw);
83866+ module_free(mod, mod->module_core_rw);
83867+ return -ENOMEM;
83868+ }
83869+
83870+ pax_open_kernel();
83871+ memset(ptr, 0, mod->init_size_rx);
83872+ pax_close_kernel();
83873+ mod->module_init_rx = ptr;
83874+ } else
83875+ mod->module_init_rx = NULL;
83876
83877 /* Transfer each section which specifies SHF_ALLOC */
83878 pr_debug("final section addresses:\n");
83879@@ -2854,16 +2930,45 @@ static int move_module(struct module *mod, struct load_info *info)
83880 if (!(shdr->sh_flags & SHF_ALLOC))
83881 continue;
83882
83883- if (shdr->sh_entsize & INIT_OFFSET_MASK)
83884- dest = mod->module_init
83885- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83886- else
83887- dest = mod->module_core + shdr->sh_entsize;
83888+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
83889+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
83890+ dest = mod->module_init_rw
83891+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83892+ else
83893+ dest = mod->module_init_rx
83894+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83895+ } else {
83896+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
83897+ dest = mod->module_core_rw + shdr->sh_entsize;
83898+ else
83899+ dest = mod->module_core_rx + shdr->sh_entsize;
83900+ }
83901+
83902+ if (shdr->sh_type != SHT_NOBITS) {
83903+
83904+#ifdef CONFIG_PAX_KERNEXEC
83905+#ifdef CONFIG_X86_64
83906+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
83907+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
83908+#endif
83909+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
83910+ pax_open_kernel();
83911+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
83912+ pax_close_kernel();
83913+ } else
83914+#endif
83915
83916- if (shdr->sh_type != SHT_NOBITS)
83917 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
83918+ }
83919 /* Update sh_addr to point to copy in image. */
83920- shdr->sh_addr = (unsigned long)dest;
83921+
83922+#ifdef CONFIG_PAX_KERNEXEC
83923+ if (shdr->sh_flags & SHF_EXECINSTR)
83924+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
83925+ else
83926+#endif
83927+
83928+ shdr->sh_addr = (unsigned long)dest;
83929 pr_debug("\t0x%lx %s\n",
83930 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
83931 }
83932@@ -2920,12 +3025,12 @@ static void flush_module_icache(const struct module *mod)
83933 * Do it before processing of module parameters, so the module
83934 * can provide parameter accessor functions of its own.
83935 */
83936- if (mod->module_init)
83937- flush_icache_range((unsigned long)mod->module_init,
83938- (unsigned long)mod->module_init
83939- + mod->init_size);
83940- flush_icache_range((unsigned long)mod->module_core,
83941- (unsigned long)mod->module_core + mod->core_size);
83942+ if (mod->module_init_rx)
83943+ flush_icache_range((unsigned long)mod->module_init_rx,
83944+ (unsigned long)mod->module_init_rx
83945+ + mod->init_size_rx);
83946+ flush_icache_range((unsigned long)mod->module_core_rx,
83947+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
83948
83949 set_fs(old_fs);
83950 }
83951@@ -2982,8 +3087,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
83952 static void module_deallocate(struct module *mod, struct load_info *info)
83953 {
83954 percpu_modfree(mod);
83955- module_free(mod, mod->module_init);
83956- module_free(mod, mod->module_core);
83957+ module_free_exec(mod, mod->module_init_rx);
83958+ module_free_exec(mod, mod->module_core_rx);
83959+ module_free(mod, mod->module_init_rw);
83960+ module_free(mod, mod->module_core_rw);
83961 }
83962
83963 int __weak module_finalize(const Elf_Ehdr *hdr,
83964@@ -2996,7 +3103,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
83965 static int post_relocation(struct module *mod, const struct load_info *info)
83966 {
83967 /* Sort exception table now relocations are done. */
83968+ pax_open_kernel();
83969 sort_extable(mod->extable, mod->extable + mod->num_exentries);
83970+ pax_close_kernel();
83971
83972 /* Copy relocated percpu area over. */
83973 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
83974@@ -3050,16 +3159,16 @@ static int do_init_module(struct module *mod)
83975 MODULE_STATE_COMING, mod);
83976
83977 /* Set RO and NX regions for core */
83978- set_section_ro_nx(mod->module_core,
83979- mod->core_text_size,
83980- mod->core_ro_size,
83981- mod->core_size);
83982+ set_section_ro_nx(mod->module_core_rx,
83983+ mod->core_size_rx,
83984+ mod->core_size_rx,
83985+ mod->core_size_rx);
83986
83987 /* Set RO and NX regions for init */
83988- set_section_ro_nx(mod->module_init,
83989- mod->init_text_size,
83990- mod->init_ro_size,
83991- mod->init_size);
83992+ set_section_ro_nx(mod->module_init_rx,
83993+ mod->init_size_rx,
83994+ mod->init_size_rx,
83995+ mod->init_size_rx);
83996
83997 do_mod_ctors(mod);
83998 /* Start the module */
83999@@ -3121,11 +3230,12 @@ static int do_init_module(struct module *mod)
84000 mod->strtab = mod->core_strtab;
84001 #endif
84002 unset_module_init_ro_nx(mod);
84003- module_free(mod, mod->module_init);
84004- mod->module_init = NULL;
84005- mod->init_size = 0;
84006- mod->init_ro_size = 0;
84007- mod->init_text_size = 0;
84008+ module_free(mod, mod->module_init_rw);
84009+ module_free_exec(mod, mod->module_init_rx);
84010+ mod->module_init_rw = NULL;
84011+ mod->module_init_rx = NULL;
84012+ mod->init_size_rw = 0;
84013+ mod->init_size_rx = 0;
84014 mutex_unlock(&module_mutex);
84015 wake_up_all(&module_wq);
84016
84017@@ -3269,9 +3379,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
84018 if (err)
84019 goto free_unload;
84020
84021+ /* Now copy in args */
84022+ mod->args = strndup_user(uargs, ~0UL >> 1);
84023+ if (IS_ERR(mod->args)) {
84024+ err = PTR_ERR(mod->args);
84025+ goto free_unload;
84026+ }
84027+
84028 /* Set up MODINFO_ATTR fields */
84029 setup_modinfo(mod, info);
84030
84031+#ifdef CONFIG_GRKERNSEC_MODHARDEN
84032+ {
84033+ char *p, *p2;
84034+
84035+ if (strstr(mod->args, "grsec_modharden_netdev")) {
84036+ 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);
84037+ err = -EPERM;
84038+ goto free_modinfo;
84039+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
84040+ p += sizeof("grsec_modharden_normal") - 1;
84041+ p2 = strstr(p, "_");
84042+ if (p2) {
84043+ *p2 = '\0';
84044+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
84045+ *p2 = '_';
84046+ }
84047+ err = -EPERM;
84048+ goto free_modinfo;
84049+ }
84050+ }
84051+#endif
84052+
84053 /* Fix up syms, so that st_value is a pointer to location. */
84054 err = simplify_symbols(mod, info);
84055 if (err < 0)
84056@@ -3287,13 +3426,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
84057
84058 flush_module_icache(mod);
84059
84060- /* Now copy in args */
84061- mod->args = strndup_user(uargs, ~0UL >> 1);
84062- if (IS_ERR(mod->args)) {
84063- err = PTR_ERR(mod->args);
84064- goto free_arch_cleanup;
84065- }
84066-
84067 dynamic_debug_setup(info->debug, info->num_debug);
84068
84069 /* Finally it's fully formed, ready to start executing. */
84070@@ -3328,11 +3460,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
84071 ddebug_cleanup:
84072 dynamic_debug_remove(info->debug);
84073 synchronize_sched();
84074- kfree(mod->args);
84075- free_arch_cleanup:
84076 module_arch_cleanup(mod);
84077 free_modinfo:
84078 free_modinfo(mod);
84079+ kfree(mod->args);
84080 free_unload:
84081 module_unload_free(mod);
84082 unlink_mod:
84083@@ -3415,10 +3546,16 @@ static const char *get_ksymbol(struct module *mod,
84084 unsigned long nextval;
84085
84086 /* At worse, next value is at end of module */
84087- if (within_module_init(addr, mod))
84088- nextval = (unsigned long)mod->module_init+mod->init_text_size;
84089+ if (within_module_init_rx(addr, mod))
84090+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
84091+ else if (within_module_init_rw(addr, mod))
84092+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
84093+ else if (within_module_core_rx(addr, mod))
84094+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
84095+ else if (within_module_core_rw(addr, mod))
84096+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
84097 else
84098- nextval = (unsigned long)mod->module_core+mod->core_text_size;
84099+ return NULL;
84100
84101 /* Scan for closest preceding symbol, and next symbol. (ELF
84102 starts real symbols at 1). */
84103@@ -3669,7 +3806,7 @@ static int m_show(struct seq_file *m, void *p)
84104 return 0;
84105
84106 seq_printf(m, "%s %u",
84107- mod->name, mod->init_size + mod->core_size);
84108+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
84109 print_unload_info(m, mod);
84110
84111 /* Informative for users. */
84112@@ -3678,7 +3815,7 @@ static int m_show(struct seq_file *m, void *p)
84113 mod->state == MODULE_STATE_COMING ? "Loading":
84114 "Live");
84115 /* Used by oprofile and other similar tools. */
84116- seq_printf(m, " 0x%pK", mod->module_core);
84117+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
84118
84119 /* Taints info */
84120 if (mod->taints)
84121@@ -3714,7 +3851,17 @@ static const struct file_operations proc_modules_operations = {
84122
84123 static int __init proc_modules_init(void)
84124 {
84125+#ifndef CONFIG_GRKERNSEC_HIDESYM
84126+#ifdef CONFIG_GRKERNSEC_PROC_USER
84127+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
84128+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
84129+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
84130+#else
84131 proc_create("modules", 0, NULL, &proc_modules_operations);
84132+#endif
84133+#else
84134+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
84135+#endif
84136 return 0;
84137 }
84138 module_init(proc_modules_init);
84139@@ -3775,14 +3922,14 @@ struct module *__module_address(unsigned long addr)
84140 {
84141 struct module *mod;
84142
84143- if (addr < module_addr_min || addr > module_addr_max)
84144+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
84145+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
84146 return NULL;
84147
84148 list_for_each_entry_rcu(mod, &modules, list) {
84149 if (mod->state == MODULE_STATE_UNFORMED)
84150 continue;
84151- if (within_module_core(addr, mod)
84152- || within_module_init(addr, mod))
84153+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
84154 return mod;
84155 }
84156 return NULL;
84157@@ -3817,11 +3964,20 @@ bool is_module_text_address(unsigned long addr)
84158 */
84159 struct module *__module_text_address(unsigned long addr)
84160 {
84161- struct module *mod = __module_address(addr);
84162+ struct module *mod;
84163+
84164+#ifdef CONFIG_X86_32
84165+ addr = ktla_ktva(addr);
84166+#endif
84167+
84168+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
84169+ return NULL;
84170+
84171+ mod = __module_address(addr);
84172+
84173 if (mod) {
84174 /* Make sure it's within the text section. */
84175- if (!within(addr, mod->module_init, mod->init_text_size)
84176- && !within(addr, mod->module_core, mod->core_text_size))
84177+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
84178 mod = NULL;
84179 }
84180 return mod;
84181diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
84182index 7e3443f..b2a1e6b 100644
84183--- a/kernel/mutex-debug.c
84184+++ b/kernel/mutex-debug.c
84185@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
84186 }
84187
84188 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84189- struct thread_info *ti)
84190+ struct task_struct *task)
84191 {
84192 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
84193
84194 /* Mark the current thread as blocked on the lock: */
84195- ti->task->blocked_on = waiter;
84196+ task->blocked_on = waiter;
84197 }
84198
84199 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84200- struct thread_info *ti)
84201+ struct task_struct *task)
84202 {
84203 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
84204- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
84205- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
84206- ti->task->blocked_on = NULL;
84207+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
84208+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
84209+ task->blocked_on = NULL;
84210
84211 list_del_init(&waiter->list);
84212 waiter->task = NULL;
84213diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
84214index 0799fd3..d06ae3b 100644
84215--- a/kernel/mutex-debug.h
84216+++ b/kernel/mutex-debug.h
84217@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
84218 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
84219 extern void debug_mutex_add_waiter(struct mutex *lock,
84220 struct mutex_waiter *waiter,
84221- struct thread_info *ti);
84222+ struct task_struct *task);
84223 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84224- struct thread_info *ti);
84225+ struct task_struct *task);
84226 extern void debug_mutex_unlock(struct mutex *lock);
84227 extern void debug_mutex_init(struct mutex *lock, const char *name,
84228 struct lock_class_key *key);
84229diff --git a/kernel/mutex.c b/kernel/mutex.c
84230index d24105b..15648eb 100644
84231--- a/kernel/mutex.c
84232+++ b/kernel/mutex.c
84233@@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
84234 node->locked = 1;
84235 return;
84236 }
84237- ACCESS_ONCE(prev->next) = node;
84238+ ACCESS_ONCE_RW(prev->next) = node;
84239 smp_wmb();
84240 /* Wait until the lock holder passes the lock down */
84241 while (!ACCESS_ONCE(node->locked))
84242@@ -156,7 +156,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
84243 while (!(next = ACCESS_ONCE(node->next)))
84244 arch_mutex_cpu_relax();
84245 }
84246- ACCESS_ONCE(next->locked) = 1;
84247+ ACCESS_ONCE_RW(next->locked) = 1;
84248 smp_wmb();
84249 }
84250
84251@@ -520,7 +520,7 @@ slowpath:
84252 goto skip_wait;
84253
84254 debug_mutex_lock_common(lock, &waiter);
84255- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
84256+ debug_mutex_add_waiter(lock, &waiter, task);
84257
84258 /* add waiting tasks to the end of the waitqueue (FIFO): */
84259 list_add_tail(&waiter.list, &lock->wait_list);
84260@@ -564,7 +564,7 @@ slowpath:
84261 schedule_preempt_disabled();
84262 spin_lock_mutex(&lock->wait_lock, flags);
84263 }
84264- mutex_remove_waiter(lock, &waiter, current_thread_info());
84265+ mutex_remove_waiter(lock, &waiter, task);
84266 /* set it to 0 if there are no waiters left: */
84267 if (likely(list_empty(&lock->wait_list)))
84268 atomic_set(&lock->count, 0);
84269@@ -601,7 +601,7 @@ skip_wait:
84270 return 0;
84271
84272 err:
84273- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
84274+ mutex_remove_waiter(lock, &waiter, task);
84275 spin_unlock_mutex(&lock->wait_lock, flags);
84276 debug_mutex_free_waiter(&waiter);
84277 mutex_release(&lock->dep_map, 1, ip);
84278diff --git a/kernel/notifier.c b/kernel/notifier.c
84279index 2d5cc4c..d9ea600 100644
84280--- a/kernel/notifier.c
84281+++ b/kernel/notifier.c
84282@@ -5,6 +5,7 @@
84283 #include <linux/rcupdate.h>
84284 #include <linux/vmalloc.h>
84285 #include <linux/reboot.h>
84286+#include <linux/mm.h>
84287
84288 /*
84289 * Notifier list for kernel code which wants to be called
84290@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
84291 while ((*nl) != NULL) {
84292 if (n->priority > (*nl)->priority)
84293 break;
84294- nl = &((*nl)->next);
84295+ nl = (struct notifier_block **)&((*nl)->next);
84296 }
84297- n->next = *nl;
84298+ pax_open_kernel();
84299+ *(const void **)&n->next = *nl;
84300 rcu_assign_pointer(*nl, n);
84301+ pax_close_kernel();
84302 return 0;
84303 }
84304
84305@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
84306 return 0;
84307 if (n->priority > (*nl)->priority)
84308 break;
84309- nl = &((*nl)->next);
84310+ nl = (struct notifier_block **)&((*nl)->next);
84311 }
84312- n->next = *nl;
84313+ pax_open_kernel();
84314+ *(const void **)&n->next = *nl;
84315 rcu_assign_pointer(*nl, n);
84316+ pax_close_kernel();
84317 return 0;
84318 }
84319
84320@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
84321 {
84322 while ((*nl) != NULL) {
84323 if ((*nl) == n) {
84324+ pax_open_kernel();
84325 rcu_assign_pointer(*nl, n->next);
84326+ pax_close_kernel();
84327 return 0;
84328 }
84329- nl = &((*nl)->next);
84330+ nl = (struct notifier_block **)&((*nl)->next);
84331 }
84332 return -ENOENT;
84333 }
84334diff --git a/kernel/panic.c b/kernel/panic.c
84335index b6c482c..5578061 100644
84336--- a/kernel/panic.c
84337+++ b/kernel/panic.c
84338@@ -407,7 +407,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
84339 disable_trace_on_warning();
84340
84341 pr_warn("------------[ cut here ]------------\n");
84342- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
84343+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
84344 raw_smp_processor_id(), current->pid, file, line, caller);
84345
84346 if (args)
84347@@ -461,7 +461,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
84348 */
84349 void __stack_chk_fail(void)
84350 {
84351- panic("stack-protector: Kernel stack is corrupted in: %p\n",
84352+ dump_stack();
84353+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
84354 __builtin_return_address(0));
84355 }
84356 EXPORT_SYMBOL(__stack_chk_fail);
84357diff --git a/kernel/pid.c b/kernel/pid.c
84358index 9b9a266..c20ef80 100644
84359--- a/kernel/pid.c
84360+++ b/kernel/pid.c
84361@@ -33,6 +33,7 @@
84362 #include <linux/rculist.h>
84363 #include <linux/bootmem.h>
84364 #include <linux/hash.h>
84365+#include <linux/security.h>
84366 #include <linux/pid_namespace.h>
84367 #include <linux/init_task.h>
84368 #include <linux/syscalls.h>
84369@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
84370
84371 int pid_max = PID_MAX_DEFAULT;
84372
84373-#define RESERVED_PIDS 300
84374+#define RESERVED_PIDS 500
84375
84376 int pid_max_min = RESERVED_PIDS + 1;
84377 int pid_max_max = PID_MAX_LIMIT;
84378@@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
84379 */
84380 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
84381 {
84382+ struct task_struct *task;
84383+
84384 rcu_lockdep_assert(rcu_read_lock_held(),
84385 "find_task_by_pid_ns() needs rcu_read_lock()"
84386 " protection");
84387- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
84388+
84389+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
84390+
84391+ if (gr_pid_is_chrooted(task))
84392+ return NULL;
84393+
84394+ return task;
84395 }
84396
84397 struct task_struct *find_task_by_vpid(pid_t vnr)
84398@@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
84399 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
84400 }
84401
84402+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
84403+{
84404+ rcu_lockdep_assert(rcu_read_lock_held(),
84405+ "find_task_by_pid_ns() needs rcu_read_lock()"
84406+ " protection");
84407+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
84408+}
84409+
84410 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
84411 {
84412 struct pid *pid;
84413diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
84414index 4208655..19f36a5 100644
84415--- a/kernel/pid_namespace.c
84416+++ b/kernel/pid_namespace.c
84417@@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
84418 void __user *buffer, size_t *lenp, loff_t *ppos)
84419 {
84420 struct pid_namespace *pid_ns = task_active_pid_ns(current);
84421- struct ctl_table tmp = *table;
84422+ ctl_table_no_const tmp = *table;
84423
84424 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
84425 return -EPERM;
84426diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
84427index c7f31aa..2b44977 100644
84428--- a/kernel/posix-cpu-timers.c
84429+++ b/kernel/posix-cpu-timers.c
84430@@ -1521,14 +1521,14 @@ struct k_clock clock_posix_cpu = {
84431
84432 static __init int init_posix_cpu_timers(void)
84433 {
84434- struct k_clock process = {
84435+ static struct k_clock process = {
84436 .clock_getres = process_cpu_clock_getres,
84437 .clock_get = process_cpu_clock_get,
84438 .timer_create = process_cpu_timer_create,
84439 .nsleep = process_cpu_nsleep,
84440 .nsleep_restart = process_cpu_nsleep_restart,
84441 };
84442- struct k_clock thread = {
84443+ static struct k_clock thread = {
84444 .clock_getres = thread_cpu_clock_getres,
84445 .clock_get = thread_cpu_clock_get,
84446 .timer_create = thread_cpu_timer_create,
84447diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
84448index 424c2d4..679242f 100644
84449--- a/kernel/posix-timers.c
84450+++ b/kernel/posix-timers.c
84451@@ -43,6 +43,7 @@
84452 #include <linux/hash.h>
84453 #include <linux/posix-clock.h>
84454 #include <linux/posix-timers.h>
84455+#include <linux/grsecurity.h>
84456 #include <linux/syscalls.h>
84457 #include <linux/wait.h>
84458 #include <linux/workqueue.h>
84459@@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
84460 * which we beg off on and pass to do_sys_settimeofday().
84461 */
84462
84463-static struct k_clock posix_clocks[MAX_CLOCKS];
84464+static struct k_clock *posix_clocks[MAX_CLOCKS];
84465
84466 /*
84467 * These ones are defined below.
84468@@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
84469 */
84470 static __init int init_posix_timers(void)
84471 {
84472- struct k_clock clock_realtime = {
84473+ static struct k_clock clock_realtime = {
84474 .clock_getres = hrtimer_get_res,
84475 .clock_get = posix_clock_realtime_get,
84476 .clock_set = posix_clock_realtime_set,
84477@@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
84478 .timer_get = common_timer_get,
84479 .timer_del = common_timer_del,
84480 };
84481- struct k_clock clock_monotonic = {
84482+ static struct k_clock clock_monotonic = {
84483 .clock_getres = hrtimer_get_res,
84484 .clock_get = posix_ktime_get_ts,
84485 .nsleep = common_nsleep,
84486@@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
84487 .timer_get = common_timer_get,
84488 .timer_del = common_timer_del,
84489 };
84490- struct k_clock clock_monotonic_raw = {
84491+ static struct k_clock clock_monotonic_raw = {
84492 .clock_getres = hrtimer_get_res,
84493 .clock_get = posix_get_monotonic_raw,
84494 };
84495- struct k_clock clock_realtime_coarse = {
84496+ static struct k_clock clock_realtime_coarse = {
84497 .clock_getres = posix_get_coarse_res,
84498 .clock_get = posix_get_realtime_coarse,
84499 };
84500- struct k_clock clock_monotonic_coarse = {
84501+ static struct k_clock clock_monotonic_coarse = {
84502 .clock_getres = posix_get_coarse_res,
84503 .clock_get = posix_get_monotonic_coarse,
84504 };
84505- struct k_clock clock_tai = {
84506+ static struct k_clock clock_tai = {
84507 .clock_getres = hrtimer_get_res,
84508 .clock_get = posix_get_tai,
84509 .nsleep = common_nsleep,
84510@@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
84511 .timer_get = common_timer_get,
84512 .timer_del = common_timer_del,
84513 };
84514- struct k_clock clock_boottime = {
84515+ static struct k_clock clock_boottime = {
84516 .clock_getres = hrtimer_get_res,
84517 .clock_get = posix_get_boottime,
84518 .nsleep = common_nsleep,
84519@@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
84520 return;
84521 }
84522
84523- posix_clocks[clock_id] = *new_clock;
84524+ posix_clocks[clock_id] = new_clock;
84525 }
84526 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
84527
84528@@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
84529 return (id & CLOCKFD_MASK) == CLOCKFD ?
84530 &clock_posix_dynamic : &clock_posix_cpu;
84531
84532- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
84533+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
84534 return NULL;
84535- return &posix_clocks[id];
84536+ return posix_clocks[id];
84537 }
84538
84539 static int common_timer_create(struct k_itimer *new_timer)
84540@@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
84541 struct k_clock *kc = clockid_to_kclock(which_clock);
84542 struct k_itimer *new_timer;
84543 int error, new_timer_id;
84544- sigevent_t event;
84545+ sigevent_t event = { };
84546 int it_id_set = IT_ID_NOT_SET;
84547
84548 if (!kc)
84549@@ -1011,6 +1012,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
84550 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
84551 return -EFAULT;
84552
84553+ /* only the CLOCK_REALTIME clock can be set, all other clocks
84554+ have their clock_set fptr set to a nosettime dummy function
84555+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
84556+ call common_clock_set, which calls do_sys_settimeofday, which
84557+ we hook
84558+ */
84559+
84560 return kc->clock_set(which_clock, &new_tp);
84561 }
84562
84563diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
84564index d444c4e..bc3de51 100644
84565--- a/kernel/power/Kconfig
84566+++ b/kernel/power/Kconfig
84567@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
84568 config HIBERNATION
84569 bool "Hibernation (aka 'suspend to disk')"
84570 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
84571+ depends on !GRKERNSEC_KMEM
84572+ depends on !PAX_MEMORY_SANITIZE
84573 select HIBERNATE_CALLBACKS
84574 select LZO_COMPRESS
84575 select LZO_DECOMPRESS
84576diff --git a/kernel/power/process.c b/kernel/power/process.c
84577index 06ec886..9dba35e 100644
84578--- a/kernel/power/process.c
84579+++ b/kernel/power/process.c
84580@@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
84581 unsigned int elapsed_msecs;
84582 bool wakeup = false;
84583 int sleep_usecs = USEC_PER_MSEC;
84584+ bool timedout = false;
84585
84586 do_gettimeofday(&start);
84587
84588@@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
84589
84590 while (true) {
84591 todo = 0;
84592+ if (time_after(jiffies, end_time))
84593+ timedout = true;
84594 read_lock(&tasklist_lock);
84595 do_each_thread(g, p) {
84596 if (p == current || !freeze_task(p))
84597 continue;
84598
84599- if (!freezer_should_skip(p))
84600+ if (!freezer_should_skip(p)) {
84601 todo++;
84602+ if (timedout) {
84603+ printk(KERN_ERR "Task refusing to freeze:\n");
84604+ sched_show_task(p);
84605+ }
84606+ }
84607 } while_each_thread(g, p);
84608 read_unlock(&tasklist_lock);
84609
84610@@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
84611 todo += wq_busy;
84612 }
84613
84614- if (!todo || time_after(jiffies, end_time))
84615+ if (!todo || timedout)
84616 break;
84617
84618 if (pm_wakeup_pending()) {
84619diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
84620index b4e8500..b457a6c 100644
84621--- a/kernel/printk/printk.c
84622+++ b/kernel/printk/printk.c
84623@@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
84624 if (from_file && type != SYSLOG_ACTION_OPEN)
84625 return 0;
84626
84627+#ifdef CONFIG_GRKERNSEC_DMESG
84628+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
84629+ return -EPERM;
84630+#endif
84631+
84632 if (syslog_action_restricted(type)) {
84633 if (capable(CAP_SYSLOG))
84634 return 0;
84635diff --git a/kernel/profile.c b/kernel/profile.c
84636index 6631e1e..310c266 100644
84637--- a/kernel/profile.c
84638+++ b/kernel/profile.c
84639@@ -37,7 +37,7 @@ struct profile_hit {
84640 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
84641 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
84642
84643-static atomic_t *prof_buffer;
84644+static atomic_unchecked_t *prof_buffer;
84645 static unsigned long prof_len, prof_shift;
84646
84647 int prof_on __read_mostly;
84648@@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
84649 hits[i].pc = 0;
84650 continue;
84651 }
84652- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
84653+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
84654 hits[i].hits = hits[i].pc = 0;
84655 }
84656 }
84657@@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
84658 * Add the current hit(s) and flush the write-queue out
84659 * to the global buffer:
84660 */
84661- atomic_add(nr_hits, &prof_buffer[pc]);
84662+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
84663 for (i = 0; i < NR_PROFILE_HIT; ++i) {
84664- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
84665+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
84666 hits[i].pc = hits[i].hits = 0;
84667 }
84668 out:
84669@@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
84670 {
84671 unsigned long pc;
84672 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
84673- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
84674+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
84675 }
84676 #endif /* !CONFIG_SMP */
84677
84678@@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
84679 return -EFAULT;
84680 buf++; p++; count--; read++;
84681 }
84682- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
84683+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
84684 if (copy_to_user(buf, (void *)pnt, count))
84685 return -EFAULT;
84686 read += count;
84687@@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
84688 }
84689 #endif
84690 profile_discard_flip_buffers();
84691- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
84692+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
84693 return count;
84694 }
84695
84696diff --git a/kernel/ptrace.c b/kernel/ptrace.c
84697index 1f4bcb3..99cf7ab 100644
84698--- a/kernel/ptrace.c
84699+++ b/kernel/ptrace.c
84700@@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request,
84701 if (seize)
84702 flags |= PT_SEIZED;
84703 rcu_read_lock();
84704- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
84705+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
84706 flags |= PT_PTRACE_CAP;
84707 rcu_read_unlock();
84708 task->ptrace = flags;
84709@@ -538,7 +538,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
84710 break;
84711 return -EIO;
84712 }
84713- if (copy_to_user(dst, buf, retval))
84714+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
84715 return -EFAULT;
84716 copied += retval;
84717 src += retval;
84718@@ -806,7 +806,7 @@ int ptrace_request(struct task_struct *child, long request,
84719 bool seized = child->ptrace & PT_SEIZED;
84720 int ret = -EIO;
84721 siginfo_t siginfo, *si;
84722- void __user *datavp = (void __user *) data;
84723+ void __user *datavp = (__force void __user *) data;
84724 unsigned long __user *datalp = datavp;
84725 unsigned long flags;
84726
84727@@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
84728 goto out;
84729 }
84730
84731+ if (gr_handle_ptrace(child, request)) {
84732+ ret = -EPERM;
84733+ goto out_put_task_struct;
84734+ }
84735+
84736 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
84737 ret = ptrace_attach(child, request, addr, data);
84738 /*
84739 * Some architectures need to do book-keeping after
84740 * a ptrace attach.
84741 */
84742- if (!ret)
84743+ if (!ret) {
84744 arch_ptrace_attach(child);
84745+ gr_audit_ptrace(child);
84746+ }
84747 goto out_put_task_struct;
84748 }
84749
84750@@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
84751 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
84752 if (copied != sizeof(tmp))
84753 return -EIO;
84754- return put_user(tmp, (unsigned long __user *)data);
84755+ return put_user(tmp, (__force unsigned long __user *)data);
84756 }
84757
84758 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
84759@@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
84760 }
84761
84762 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
84763- compat_long_t addr, compat_long_t data)
84764+ compat_ulong_t addr, compat_ulong_t data)
84765 {
84766 struct task_struct *child;
84767 long ret;
84768@@ -1197,14 +1204,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
84769 goto out;
84770 }
84771
84772+ if (gr_handle_ptrace(child, request)) {
84773+ ret = -EPERM;
84774+ goto out_put_task_struct;
84775+ }
84776+
84777 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
84778 ret = ptrace_attach(child, request, addr, data);
84779 /*
84780 * Some architectures need to do book-keeping after
84781 * a ptrace attach.
84782 */
84783- if (!ret)
84784+ if (!ret) {
84785 arch_ptrace_attach(child);
84786+ gr_audit_ptrace(child);
84787+ }
84788 goto out_put_task_struct;
84789 }
84790
84791diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
84792index b02a339..ce2d20c 100644
84793--- a/kernel/rcupdate.c
84794+++ b/kernel/rcupdate.c
84795@@ -312,10 +312,10 @@ int rcu_jiffies_till_stall_check(void)
84796 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
84797 */
84798 if (till_stall_check < 3) {
84799- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
84800+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
84801 till_stall_check = 3;
84802 } else if (till_stall_check > 300) {
84803- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
84804+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
84805 till_stall_check = 300;
84806 }
84807 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
84808diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
84809index 9ed6075..c9e8a63 100644
84810--- a/kernel/rcutiny.c
84811+++ b/kernel/rcutiny.c
84812@@ -45,7 +45,7 @@
84813 /* Forward declarations for rcutiny_plugin.h. */
84814 struct rcu_ctrlblk;
84815 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
84816-static void rcu_process_callbacks(struct softirq_action *unused);
84817+static void rcu_process_callbacks(void);
84818 static void __call_rcu(struct rcu_head *head,
84819 void (*func)(struct rcu_head *rcu),
84820 struct rcu_ctrlblk *rcp);
84821@@ -309,7 +309,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
84822 false));
84823 }
84824
84825-static void rcu_process_callbacks(struct softirq_action *unused)
84826+static __latent_entropy void rcu_process_callbacks(void)
84827 {
84828 __rcu_process_callbacks(&rcu_sched_ctrlblk);
84829 __rcu_process_callbacks(&rcu_bh_ctrlblk);
84830diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
84831index be63101..05cf721 100644
84832--- a/kernel/rcutorture.c
84833+++ b/kernel/rcutorture.c
84834@@ -170,12 +170,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
84835 { 0 };
84836 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
84837 { 0 };
84838-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
84839-static atomic_t n_rcu_torture_alloc;
84840-static atomic_t n_rcu_torture_alloc_fail;
84841-static atomic_t n_rcu_torture_free;
84842-static atomic_t n_rcu_torture_mberror;
84843-static atomic_t n_rcu_torture_error;
84844+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
84845+static atomic_unchecked_t n_rcu_torture_alloc;
84846+static atomic_unchecked_t n_rcu_torture_alloc_fail;
84847+static atomic_unchecked_t n_rcu_torture_free;
84848+static atomic_unchecked_t n_rcu_torture_mberror;
84849+static atomic_unchecked_t n_rcu_torture_error;
84850 static long n_rcu_torture_barrier_error;
84851 static long n_rcu_torture_boost_ktrerror;
84852 static long n_rcu_torture_boost_rterror;
84853@@ -293,11 +293,11 @@ rcu_torture_alloc(void)
84854
84855 spin_lock_bh(&rcu_torture_lock);
84856 if (list_empty(&rcu_torture_freelist)) {
84857- atomic_inc(&n_rcu_torture_alloc_fail);
84858+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
84859 spin_unlock_bh(&rcu_torture_lock);
84860 return NULL;
84861 }
84862- atomic_inc(&n_rcu_torture_alloc);
84863+ atomic_inc_unchecked(&n_rcu_torture_alloc);
84864 p = rcu_torture_freelist.next;
84865 list_del_init(p);
84866 spin_unlock_bh(&rcu_torture_lock);
84867@@ -310,7 +310,7 @@ rcu_torture_alloc(void)
84868 static void
84869 rcu_torture_free(struct rcu_torture *p)
84870 {
84871- atomic_inc(&n_rcu_torture_free);
84872+ atomic_inc_unchecked(&n_rcu_torture_free);
84873 spin_lock_bh(&rcu_torture_lock);
84874 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
84875 spin_unlock_bh(&rcu_torture_lock);
84876@@ -431,7 +431,7 @@ rcu_torture_cb(struct rcu_head *p)
84877 i = rp->rtort_pipe_count;
84878 if (i > RCU_TORTURE_PIPE_LEN)
84879 i = RCU_TORTURE_PIPE_LEN;
84880- atomic_inc(&rcu_torture_wcount[i]);
84881+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
84882 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
84883 rp->rtort_mbtest = 0;
84884 rcu_torture_free(rp);
84885@@ -821,7 +821,7 @@ rcu_torture_writer(void *arg)
84886 i = old_rp->rtort_pipe_count;
84887 if (i > RCU_TORTURE_PIPE_LEN)
84888 i = RCU_TORTURE_PIPE_LEN;
84889- atomic_inc(&rcu_torture_wcount[i]);
84890+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
84891 old_rp->rtort_pipe_count++;
84892 if (gp_normal == gp_exp)
84893 exp = !!(rcu_random(&rand) & 0x80);
84894@@ -839,7 +839,7 @@ rcu_torture_writer(void *arg)
84895 i = rp->rtort_pipe_count;
84896 if (i > RCU_TORTURE_PIPE_LEN)
84897 i = RCU_TORTURE_PIPE_LEN;
84898- atomic_inc(&rcu_torture_wcount[i]);
84899+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
84900 if (++rp->rtort_pipe_count >=
84901 RCU_TORTURE_PIPE_LEN) {
84902 rp->rtort_mbtest = 0;
84903@@ -938,7 +938,7 @@ static void rcu_torture_timer(unsigned long unused)
84904 return;
84905 }
84906 if (p->rtort_mbtest == 0)
84907- atomic_inc(&n_rcu_torture_mberror);
84908+ atomic_inc_unchecked(&n_rcu_torture_mberror);
84909 spin_lock(&rand_lock);
84910 cur_ops->read_delay(&rand);
84911 n_rcu_torture_timers++;
84912@@ -1008,7 +1008,7 @@ rcu_torture_reader(void *arg)
84913 continue;
84914 }
84915 if (p->rtort_mbtest == 0)
84916- atomic_inc(&n_rcu_torture_mberror);
84917+ atomic_inc_unchecked(&n_rcu_torture_mberror);
84918 cur_ops->read_delay(&rand);
84919 preempt_disable();
84920 pipe_count = p->rtort_pipe_count;
84921@@ -1071,11 +1071,11 @@ rcu_torture_printk(char *page)
84922 rcu_torture_current,
84923 rcu_torture_current_version,
84924 list_empty(&rcu_torture_freelist),
84925- atomic_read(&n_rcu_torture_alloc),
84926- atomic_read(&n_rcu_torture_alloc_fail),
84927- atomic_read(&n_rcu_torture_free));
84928+ atomic_read_unchecked(&n_rcu_torture_alloc),
84929+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
84930+ atomic_read_unchecked(&n_rcu_torture_free));
84931 cnt += sprintf(&page[cnt], "rtmbe: %d rtbke: %ld rtbre: %ld ",
84932- atomic_read(&n_rcu_torture_mberror),
84933+ atomic_read_unchecked(&n_rcu_torture_mberror),
84934 n_rcu_torture_boost_ktrerror,
84935 n_rcu_torture_boost_rterror);
84936 cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ",
84937@@ -1094,14 +1094,14 @@ rcu_torture_printk(char *page)
84938 n_barrier_attempts,
84939 n_rcu_torture_barrier_error);
84940 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
84941- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
84942+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
84943 n_rcu_torture_barrier_error != 0 ||
84944 n_rcu_torture_boost_ktrerror != 0 ||
84945 n_rcu_torture_boost_rterror != 0 ||
84946 n_rcu_torture_boost_failure != 0 ||
84947 i > 1) {
84948 cnt += sprintf(&page[cnt], "!!! ");
84949- atomic_inc(&n_rcu_torture_error);
84950+ atomic_inc_unchecked(&n_rcu_torture_error);
84951 WARN_ON_ONCE(1);
84952 }
84953 cnt += sprintf(&page[cnt], "Reader Pipe: ");
84954@@ -1115,7 +1115,7 @@ rcu_torture_printk(char *page)
84955 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
84956 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
84957 cnt += sprintf(&page[cnt], " %d",
84958- atomic_read(&rcu_torture_wcount[i]));
84959+ atomic_read_unchecked(&rcu_torture_wcount[i]));
84960 }
84961 cnt += sprintf(&page[cnt], "\n");
84962 if (cur_ops->stats)
84963@@ -1830,7 +1830,7 @@ rcu_torture_cleanup(void)
84964
84965 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
84966
84967- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
84968+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
84969 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
84970 else if (n_online_successes != n_online_attempts ||
84971 n_offline_successes != n_offline_attempts)
84972@@ -1952,18 +1952,18 @@ rcu_torture_init(void)
84973
84974 rcu_torture_current = NULL;
84975 rcu_torture_current_version = 0;
84976- atomic_set(&n_rcu_torture_alloc, 0);
84977- atomic_set(&n_rcu_torture_alloc_fail, 0);
84978- atomic_set(&n_rcu_torture_free, 0);
84979- atomic_set(&n_rcu_torture_mberror, 0);
84980- atomic_set(&n_rcu_torture_error, 0);
84981+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
84982+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
84983+ atomic_set_unchecked(&n_rcu_torture_free, 0);
84984+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
84985+ atomic_set_unchecked(&n_rcu_torture_error, 0);
84986 n_rcu_torture_barrier_error = 0;
84987 n_rcu_torture_boost_ktrerror = 0;
84988 n_rcu_torture_boost_rterror = 0;
84989 n_rcu_torture_boost_failure = 0;
84990 n_rcu_torture_boosts = 0;
84991 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
84992- atomic_set(&rcu_torture_wcount[i], 0);
84993+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
84994 for_each_possible_cpu(cpu) {
84995 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
84996 per_cpu(rcu_torture_count, cpu)[i] = 0;
84997diff --git a/kernel/rcutree.c b/kernel/rcutree.c
84998index 32618b3..c1fb822 100644
84999--- a/kernel/rcutree.c
85000+++ b/kernel/rcutree.c
85001@@ -382,9 +382,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
85002 rcu_prepare_for_idle(smp_processor_id());
85003 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
85004 smp_mb__before_atomic_inc(); /* See above. */
85005- atomic_inc(&rdtp->dynticks);
85006+ atomic_inc_unchecked(&rdtp->dynticks);
85007 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
85008- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
85009+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
85010
85011 /*
85012 * It is illegal to enter an extended quiescent state while
85013@@ -501,10 +501,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
85014 int user)
85015 {
85016 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
85017- atomic_inc(&rdtp->dynticks);
85018+ atomic_inc_unchecked(&rdtp->dynticks);
85019 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
85020 smp_mb__after_atomic_inc(); /* See above. */
85021- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
85022+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
85023 rcu_cleanup_after_idle(smp_processor_id());
85024 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
85025 if (!user && !is_idle_task(current)) {
85026@@ -623,14 +623,14 @@ void rcu_nmi_enter(void)
85027 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
85028
85029 if (rdtp->dynticks_nmi_nesting == 0 &&
85030- (atomic_read(&rdtp->dynticks) & 0x1))
85031+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
85032 return;
85033 rdtp->dynticks_nmi_nesting++;
85034 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
85035- atomic_inc(&rdtp->dynticks);
85036+ atomic_inc_unchecked(&rdtp->dynticks);
85037 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
85038 smp_mb__after_atomic_inc(); /* See above. */
85039- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
85040+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
85041 }
85042
85043 /**
85044@@ -649,9 +649,9 @@ void rcu_nmi_exit(void)
85045 return;
85046 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
85047 smp_mb__before_atomic_inc(); /* See above. */
85048- atomic_inc(&rdtp->dynticks);
85049+ atomic_inc_unchecked(&rdtp->dynticks);
85050 smp_mb__after_atomic_inc(); /* Force delay to next write. */
85051- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
85052+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
85053 }
85054
85055 /**
85056@@ -665,7 +665,7 @@ int rcu_is_cpu_idle(void)
85057 int ret;
85058
85059 preempt_disable();
85060- ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
85061+ ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
85062 preempt_enable();
85063 return ret;
85064 }
85065@@ -734,7 +734,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
85066 static int dyntick_save_progress_counter(struct rcu_data *rdp,
85067 bool *isidle, unsigned long *maxj)
85068 {
85069- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
85070+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
85071 rcu_sysidle_check_cpu(rdp, isidle, maxj);
85072 return (rdp->dynticks_snap & 0x1) == 0;
85073 }
85074@@ -751,7 +751,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
85075 unsigned int curr;
85076 unsigned int snap;
85077
85078- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
85079+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
85080 snap = (unsigned int)rdp->dynticks_snap;
85081
85082 /*
85083@@ -1341,9 +1341,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
85084 rdp = this_cpu_ptr(rsp->rda);
85085 rcu_preempt_check_blocked_tasks(rnp);
85086 rnp->qsmask = rnp->qsmaskinit;
85087- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
85088+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
85089 WARN_ON_ONCE(rnp->completed != rsp->completed);
85090- ACCESS_ONCE(rnp->completed) = rsp->completed;
85091+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
85092 if (rnp == rdp->mynode)
85093 __note_gp_changes(rsp, rnp, rdp);
85094 rcu_preempt_boost_start_gp(rnp);
85095@@ -1434,7 +1434,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
85096 */
85097 rcu_for_each_node_breadth_first(rsp, rnp) {
85098 raw_spin_lock_irq(&rnp->lock);
85099- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
85100+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
85101 rdp = this_cpu_ptr(rsp->rda);
85102 if (rnp == rdp->mynode)
85103 __note_gp_changes(rsp, rnp, rdp);
85104@@ -1766,7 +1766,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
85105 rsp->qlen += rdp->qlen;
85106 rdp->n_cbs_orphaned += rdp->qlen;
85107 rdp->qlen_lazy = 0;
85108- ACCESS_ONCE(rdp->qlen) = 0;
85109+ ACCESS_ONCE_RW(rdp->qlen) = 0;
85110 }
85111
85112 /*
85113@@ -2012,7 +2012,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
85114 }
85115 smp_mb(); /* List handling before counting for rcu_barrier(). */
85116 rdp->qlen_lazy -= count_lazy;
85117- ACCESS_ONCE(rdp->qlen) -= count;
85118+ ACCESS_ONCE_RW(rdp->qlen) -= count;
85119 rdp->n_cbs_invoked += count;
85120
85121 /* Reinstate batch limit if we have worked down the excess. */
85122@@ -2209,7 +2209,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
85123 /*
85124 * Do RCU core processing for the current CPU.
85125 */
85126-static void rcu_process_callbacks(struct softirq_action *unused)
85127+static __latent_entropy void rcu_process_callbacks(void)
85128 {
85129 struct rcu_state *rsp;
85130
85131@@ -2316,7 +2316,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
85132 WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
85133 if (debug_rcu_head_queue(head)) {
85134 /* Probable double call_rcu(), so leak the callback. */
85135- ACCESS_ONCE(head->func) = rcu_leak_callback;
85136+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
85137 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
85138 return;
85139 }
85140@@ -2344,7 +2344,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
85141 local_irq_restore(flags);
85142 return;
85143 }
85144- ACCESS_ONCE(rdp->qlen)++;
85145+ ACCESS_ONCE_RW(rdp->qlen)++;
85146 if (lazy)
85147 rdp->qlen_lazy++;
85148 else
85149@@ -2553,11 +2553,11 @@ void synchronize_sched_expedited(void)
85150 * counter wrap on a 32-bit system. Quite a few more CPUs would of
85151 * course be required on a 64-bit system.
85152 */
85153- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
85154+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
85155 (ulong)atomic_long_read(&rsp->expedited_done) +
85156 ULONG_MAX / 8)) {
85157 synchronize_sched();
85158- atomic_long_inc(&rsp->expedited_wrap);
85159+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
85160 return;
85161 }
85162
85163@@ -2565,7 +2565,7 @@ void synchronize_sched_expedited(void)
85164 * Take a ticket. Note that atomic_inc_return() implies a
85165 * full memory barrier.
85166 */
85167- snap = atomic_long_inc_return(&rsp->expedited_start);
85168+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
85169 firstsnap = snap;
85170 get_online_cpus();
85171 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
85172@@ -2578,14 +2578,14 @@ void synchronize_sched_expedited(void)
85173 synchronize_sched_expedited_cpu_stop,
85174 NULL) == -EAGAIN) {
85175 put_online_cpus();
85176- atomic_long_inc(&rsp->expedited_tryfail);
85177+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
85178
85179 /* Check to see if someone else did our work for us. */
85180 s = atomic_long_read(&rsp->expedited_done);
85181 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
85182 /* ensure test happens before caller kfree */
85183 smp_mb__before_atomic_inc(); /* ^^^ */
85184- atomic_long_inc(&rsp->expedited_workdone1);
85185+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
85186 return;
85187 }
85188
85189@@ -2594,7 +2594,7 @@ void synchronize_sched_expedited(void)
85190 udelay(trycount * num_online_cpus());
85191 } else {
85192 wait_rcu_gp(call_rcu_sched);
85193- atomic_long_inc(&rsp->expedited_normal);
85194+ atomic_long_inc_unchecked(&rsp->expedited_normal);
85195 return;
85196 }
85197
85198@@ -2603,7 +2603,7 @@ void synchronize_sched_expedited(void)
85199 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
85200 /* ensure test happens before caller kfree */
85201 smp_mb__before_atomic_inc(); /* ^^^ */
85202- atomic_long_inc(&rsp->expedited_workdone2);
85203+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
85204 return;
85205 }
85206
85207@@ -2615,10 +2615,10 @@ void synchronize_sched_expedited(void)
85208 * period works for us.
85209 */
85210 get_online_cpus();
85211- snap = atomic_long_read(&rsp->expedited_start);
85212+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
85213 smp_mb(); /* ensure read is before try_stop_cpus(). */
85214 }
85215- atomic_long_inc(&rsp->expedited_stoppedcpus);
85216+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
85217
85218 /*
85219 * Everyone up to our most recent fetch is covered by our grace
85220@@ -2627,16 +2627,16 @@ void synchronize_sched_expedited(void)
85221 * than we did already did their update.
85222 */
85223 do {
85224- atomic_long_inc(&rsp->expedited_done_tries);
85225+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
85226 s = atomic_long_read(&rsp->expedited_done);
85227 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
85228 /* ensure test happens before caller kfree */
85229 smp_mb__before_atomic_inc(); /* ^^^ */
85230- atomic_long_inc(&rsp->expedited_done_lost);
85231+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
85232 break;
85233 }
85234 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
85235- atomic_long_inc(&rsp->expedited_done_exit);
85236+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
85237
85238 put_online_cpus();
85239 }
85240@@ -2829,7 +2829,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
85241 * ACCESS_ONCE() to prevent the compiler from speculating
85242 * the increment to precede the early-exit check.
85243 */
85244- ACCESS_ONCE(rsp->n_barrier_done)++;
85245+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
85246 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
85247 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
85248 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
85249@@ -2879,7 +2879,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
85250
85251 /* Increment ->n_barrier_done to prevent duplicate work. */
85252 smp_mb(); /* Keep increment after above mechanism. */
85253- ACCESS_ONCE(rsp->n_barrier_done)++;
85254+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
85255 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
85256 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
85257 smp_mb(); /* Keep increment before caller's subsequent code. */
85258@@ -2924,10 +2924,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
85259 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
85260 init_callback_list(rdp);
85261 rdp->qlen_lazy = 0;
85262- ACCESS_ONCE(rdp->qlen) = 0;
85263+ ACCESS_ONCE_RW(rdp->qlen) = 0;
85264 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
85265 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
85266- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
85267+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
85268 rdp->cpu = cpu;
85269 rdp->rsp = rsp;
85270 rcu_boot_init_nocb_percpu_data(rdp);
85271@@ -2961,8 +2961,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
85272 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
85273 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
85274 rcu_sysidle_init_percpu_data(rdp->dynticks);
85275- atomic_set(&rdp->dynticks->dynticks,
85276- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
85277+ atomic_set_unchecked(&rdp->dynticks->dynticks,
85278+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
85279 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
85280
85281 /* Add CPU to rcu_node bitmasks. */
85282diff --git a/kernel/rcutree.h b/kernel/rcutree.h
85283index 5f97eab..db8f687 100644
85284--- a/kernel/rcutree.h
85285+++ b/kernel/rcutree.h
85286@@ -87,11 +87,11 @@ struct rcu_dynticks {
85287 long long dynticks_nesting; /* Track irq/process nesting level. */
85288 /* Process level is worth LLONG_MAX/2. */
85289 int dynticks_nmi_nesting; /* Track NMI nesting level. */
85290- atomic_t dynticks; /* Even value for idle, else odd. */
85291+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
85292 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
85293 long long dynticks_idle_nesting;
85294 /* irq/process nesting level from idle. */
85295- atomic_t dynticks_idle; /* Even value for idle, else odd. */
85296+ atomic_unchecked_t dynticks_idle; /* Even value for idle, else odd. */
85297 /* "Idle" excludes userspace execution. */
85298 unsigned long dynticks_idle_jiffies;
85299 /* End of last non-NMI non-idle period. */
85300@@ -427,17 +427,17 @@ struct rcu_state {
85301 /* _rcu_barrier(). */
85302 /* End of fields guarded by barrier_mutex. */
85303
85304- atomic_long_t expedited_start; /* Starting ticket. */
85305- atomic_long_t expedited_done; /* Done ticket. */
85306- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
85307- atomic_long_t expedited_tryfail; /* # acquisition failures. */
85308- atomic_long_t expedited_workdone1; /* # done by others #1. */
85309- atomic_long_t expedited_workdone2; /* # done by others #2. */
85310- atomic_long_t expedited_normal; /* # fallbacks to normal. */
85311- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
85312- atomic_long_t expedited_done_tries; /* # tries to update _done. */
85313- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
85314- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
85315+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
85316+ atomic_long_t expedited_done; /* Done ticket. */
85317+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
85318+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
85319+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
85320+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
85321+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
85322+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
85323+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
85324+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
85325+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
85326
85327 unsigned long jiffies_force_qs; /* Time at which to invoke */
85328 /* force_quiescent_state(). */
85329diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
85330index 130c97b..bcbe7f7 100644
85331--- a/kernel/rcutree_plugin.h
85332+++ b/kernel/rcutree_plugin.h
85333@@ -744,7 +744,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
85334 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
85335 {
85336 return !rcu_preempted_readers_exp(rnp) &&
85337- ACCESS_ONCE(rnp->expmask) == 0;
85338+ ACCESS_ONCE_RW(rnp->expmask) == 0;
85339 }
85340
85341 /*
85342@@ -900,7 +900,7 @@ void synchronize_rcu_expedited(void)
85343
85344 /* Clean up and exit. */
85345 smp_mb(); /* ensure expedited GP seen before counter increment. */
85346- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
85347+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
85348 unlock_mb_ret:
85349 mutex_unlock(&sync_rcu_preempt_exp_mutex);
85350 mb_ret:
85351@@ -1474,7 +1474,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
85352 free_cpumask_var(cm);
85353 }
85354
85355-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
85356+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
85357 .store = &rcu_cpu_kthread_task,
85358 .thread_should_run = rcu_cpu_kthread_should_run,
85359 .thread_fn = rcu_cpu_kthread,
85360@@ -1939,7 +1939,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
85361 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
85362 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
85363 cpu, ticks_value, ticks_title,
85364- atomic_read(&rdtp->dynticks) & 0xfff,
85365+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
85366 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
85367 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
85368 fast_no_hz);
85369@@ -2102,7 +2102,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
85370
85371 /* Enqueue the callback on the nocb list and update counts. */
85372 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
85373- ACCESS_ONCE(*old_rhpp) = rhp;
85374+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
85375 atomic_long_add(rhcount, &rdp->nocb_q_count);
85376 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
85377
85378@@ -2242,12 +2242,12 @@ static int rcu_nocb_kthread(void *arg)
85379 * Extract queued callbacks, update counts, and wait
85380 * for a grace period to elapse.
85381 */
85382- ACCESS_ONCE(rdp->nocb_head) = NULL;
85383+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
85384 tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
85385 c = atomic_long_xchg(&rdp->nocb_q_count, 0);
85386 cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
85387- ACCESS_ONCE(rdp->nocb_p_count) += c;
85388- ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
85389+ ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
85390+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
85391 rcu_nocb_wait_gp(rdp);
85392
85393 /* Each pass through the following loop invokes a callback. */
85394@@ -2269,8 +2269,8 @@ static int rcu_nocb_kthread(void *arg)
85395 list = next;
85396 }
85397 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
85398- ACCESS_ONCE(rdp->nocb_p_count) -= c;
85399- ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
85400+ ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
85401+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
85402 rdp->n_nocbs_invoked += c;
85403 }
85404 return 0;
85405@@ -2297,7 +2297,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
85406 t = kthread_run(rcu_nocb_kthread, rdp,
85407 "rcuo%c/%d", rsp->abbr, cpu);
85408 BUG_ON(IS_ERR(t));
85409- ACCESS_ONCE(rdp->nocb_kthread) = t;
85410+ ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
85411 }
85412 }
85413
85414@@ -2423,11 +2423,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
85415
85416 /* Record start of fully idle period. */
85417 j = jiffies;
85418- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
85419+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
85420 smp_mb__before_atomic_inc();
85421- atomic_inc(&rdtp->dynticks_idle);
85422+ atomic_inc_unchecked(&rdtp->dynticks_idle);
85423 smp_mb__after_atomic_inc();
85424- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
85425+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
85426 }
85427
85428 /*
85429@@ -2492,9 +2492,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
85430
85431 /* Record end of idle period. */
85432 smp_mb__before_atomic_inc();
85433- atomic_inc(&rdtp->dynticks_idle);
85434+ atomic_inc_unchecked(&rdtp->dynticks_idle);
85435 smp_mb__after_atomic_inc();
85436- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
85437+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
85438
85439 /*
85440 * If we are the timekeeping CPU, we are permitted to be non-idle
85441@@ -2535,7 +2535,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
85442 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
85443
85444 /* Pick up current idle and NMI-nesting counter and check. */
85445- cur = atomic_read(&rdtp->dynticks_idle);
85446+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
85447 if (cur & 0x1) {
85448 *isidle = false; /* We are not idle! */
85449 return;
85450@@ -2598,7 +2598,7 @@ static void rcu_sysidle(unsigned long j)
85451 case RCU_SYSIDLE_NOT:
85452
85453 /* First time all are idle, so note a short idle period. */
85454- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
85455+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
85456 break;
85457
85458 case RCU_SYSIDLE_SHORT:
85459@@ -2635,7 +2635,7 @@ static void rcu_sysidle(unsigned long j)
85460 static void rcu_sysidle_cancel(void)
85461 {
85462 smp_mb();
85463- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
85464+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
85465 }
85466
85467 /*
85468@@ -2683,7 +2683,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
85469 smp_mb(); /* grace period precedes setting inuse. */
85470
85471 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
85472- ACCESS_ONCE(rshp->inuse) = 0;
85473+ ACCESS_ONCE_RW(rshp->inuse) = 0;
85474 }
85475
85476 /*
85477diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
85478index cf6c174..a8f4b50 100644
85479--- a/kernel/rcutree_trace.c
85480+++ b/kernel/rcutree_trace.c
85481@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
85482 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
85483 rdp->passed_quiesce, rdp->qs_pending);
85484 seq_printf(m, " dt=%d/%llx/%d df=%lu",
85485- atomic_read(&rdp->dynticks->dynticks),
85486+ atomic_read_unchecked(&rdp->dynticks->dynticks),
85487 rdp->dynticks->dynticks_nesting,
85488 rdp->dynticks->dynticks_nmi_nesting,
85489 rdp->dynticks_fqs);
85490@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
85491 struct rcu_state *rsp = (struct rcu_state *)m->private;
85492
85493 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",
85494- atomic_long_read(&rsp->expedited_start),
85495+ atomic_long_read_unchecked(&rsp->expedited_start),
85496 atomic_long_read(&rsp->expedited_done),
85497- atomic_long_read(&rsp->expedited_wrap),
85498- atomic_long_read(&rsp->expedited_tryfail),
85499- atomic_long_read(&rsp->expedited_workdone1),
85500- atomic_long_read(&rsp->expedited_workdone2),
85501- atomic_long_read(&rsp->expedited_normal),
85502- atomic_long_read(&rsp->expedited_stoppedcpus),
85503- atomic_long_read(&rsp->expedited_done_tries),
85504- atomic_long_read(&rsp->expedited_done_lost),
85505- atomic_long_read(&rsp->expedited_done_exit));
85506+ atomic_long_read_unchecked(&rsp->expedited_wrap),
85507+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
85508+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
85509+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
85510+ atomic_long_read_unchecked(&rsp->expedited_normal),
85511+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
85512+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
85513+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
85514+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
85515 return 0;
85516 }
85517
85518diff --git a/kernel/resource.c b/kernel/resource.c
85519index 3f285dc..5755f62 100644
85520--- a/kernel/resource.c
85521+++ b/kernel/resource.c
85522@@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
85523
85524 static int __init ioresources_init(void)
85525 {
85526+#ifdef CONFIG_GRKERNSEC_PROC_ADD
85527+#ifdef CONFIG_GRKERNSEC_PROC_USER
85528+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
85529+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
85530+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
85531+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
85532+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
85533+#endif
85534+#else
85535 proc_create("ioports", 0, NULL, &proc_ioports_operations);
85536 proc_create("iomem", 0, NULL, &proc_iomem_operations);
85537+#endif
85538 return 0;
85539 }
85540 __initcall(ioresources_init);
85541diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
85542index 1d96dd0..994ff19 100644
85543--- a/kernel/rtmutex-tester.c
85544+++ b/kernel/rtmutex-tester.c
85545@@ -22,7 +22,7 @@
85546 #define MAX_RT_TEST_MUTEXES 8
85547
85548 static spinlock_t rttest_lock;
85549-static atomic_t rttest_event;
85550+static atomic_unchecked_t rttest_event;
85551
85552 struct test_thread_data {
85553 int opcode;
85554@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85555
85556 case RTTEST_LOCKCONT:
85557 td->mutexes[td->opdata] = 1;
85558- td->event = atomic_add_return(1, &rttest_event);
85559+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85560 return 0;
85561
85562 case RTTEST_RESET:
85563@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85564 return 0;
85565
85566 case RTTEST_RESETEVENT:
85567- atomic_set(&rttest_event, 0);
85568+ atomic_set_unchecked(&rttest_event, 0);
85569 return 0;
85570
85571 default:
85572@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85573 return ret;
85574
85575 td->mutexes[id] = 1;
85576- td->event = atomic_add_return(1, &rttest_event);
85577+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85578 rt_mutex_lock(&mutexes[id]);
85579- td->event = atomic_add_return(1, &rttest_event);
85580+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85581 td->mutexes[id] = 4;
85582 return 0;
85583
85584@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85585 return ret;
85586
85587 td->mutexes[id] = 1;
85588- td->event = atomic_add_return(1, &rttest_event);
85589+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85590 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
85591- td->event = atomic_add_return(1, &rttest_event);
85592+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85593 td->mutexes[id] = ret ? 0 : 4;
85594 return ret ? -EINTR : 0;
85595
85596@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85597 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
85598 return ret;
85599
85600- td->event = atomic_add_return(1, &rttest_event);
85601+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85602 rt_mutex_unlock(&mutexes[id]);
85603- td->event = atomic_add_return(1, &rttest_event);
85604+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85605 td->mutexes[id] = 0;
85606 return 0;
85607
85608@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85609 break;
85610
85611 td->mutexes[dat] = 2;
85612- td->event = atomic_add_return(1, &rttest_event);
85613+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85614 break;
85615
85616 default:
85617@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85618 return;
85619
85620 td->mutexes[dat] = 3;
85621- td->event = atomic_add_return(1, &rttest_event);
85622+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85623 break;
85624
85625 case RTTEST_LOCKNOWAIT:
85626@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85627 return;
85628
85629 td->mutexes[dat] = 1;
85630- td->event = atomic_add_return(1, &rttest_event);
85631+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85632 return;
85633
85634 default:
85635diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
85636index 4a07353..66b5291 100644
85637--- a/kernel/sched/auto_group.c
85638+++ b/kernel/sched/auto_group.c
85639@@ -11,7 +11,7 @@
85640
85641 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
85642 static struct autogroup autogroup_default;
85643-static atomic_t autogroup_seq_nr;
85644+static atomic_unchecked_t autogroup_seq_nr;
85645
85646 void __init autogroup_init(struct task_struct *init_task)
85647 {
85648@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
85649
85650 kref_init(&ag->kref);
85651 init_rwsem(&ag->lock);
85652- ag->id = atomic_inc_return(&autogroup_seq_nr);
85653+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
85654 ag->tg = tg;
85655 #ifdef CONFIG_RT_GROUP_SCHED
85656 /*
85657diff --git a/kernel/sched/core.c b/kernel/sched/core.c
85658index 5ac63c9..d912786 100644
85659--- a/kernel/sched/core.c
85660+++ b/kernel/sched/core.c
85661@@ -2868,7 +2868,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
85662 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
85663 * or number of jiffies left till timeout) if completed.
85664 */
85665-long __sched
85666+long __sched __intentional_overflow(-1)
85667 wait_for_completion_interruptible_timeout(struct completion *x,
85668 unsigned long timeout)
85669 {
85670@@ -2885,7 +2885,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
85671 *
85672 * Return: -ERESTARTSYS if interrupted, 0 if completed.
85673 */
85674-int __sched wait_for_completion_killable(struct completion *x)
85675+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
85676 {
85677 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
85678 if (t == -ERESTARTSYS)
85679@@ -2906,7 +2906,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
85680 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
85681 * or number of jiffies left till timeout) if completed.
85682 */
85683-long __sched
85684+long __sched __intentional_overflow(-1)
85685 wait_for_completion_killable_timeout(struct completion *x,
85686 unsigned long timeout)
85687 {
85688@@ -3132,6 +3132,8 @@ int can_nice(const struct task_struct *p, const int nice)
85689 /* convert nice value [19,-20] to rlimit style value [1,40] */
85690 int nice_rlim = 20 - nice;
85691
85692+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
85693+
85694 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
85695 capable(CAP_SYS_NICE));
85696 }
85697@@ -3165,7 +3167,8 @@ SYSCALL_DEFINE1(nice, int, increment)
85698 if (nice > 19)
85699 nice = 19;
85700
85701- if (increment < 0 && !can_nice(current, nice))
85702+ if (increment < 0 && (!can_nice(current, nice) ||
85703+ gr_handle_chroot_nice()))
85704 return -EPERM;
85705
85706 retval = security_task_setnice(current, nice);
85707@@ -3327,6 +3330,7 @@ recheck:
85708 unsigned long rlim_rtprio =
85709 task_rlimit(p, RLIMIT_RTPRIO);
85710
85711+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
85712 /* can't set/change the rt policy */
85713 if (policy != p->policy && !rlim_rtprio)
85714 return -EPERM;
85715@@ -4456,7 +4460,7 @@ static void migrate_tasks(unsigned int dead_cpu)
85716
85717 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
85718
85719-static struct ctl_table sd_ctl_dir[] = {
85720+static ctl_table_no_const sd_ctl_dir[] __read_only = {
85721 {
85722 .procname = "sched_domain",
85723 .mode = 0555,
85724@@ -4473,17 +4477,17 @@ static struct ctl_table sd_ctl_root[] = {
85725 {}
85726 };
85727
85728-static struct ctl_table *sd_alloc_ctl_entry(int n)
85729+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
85730 {
85731- struct ctl_table *entry =
85732+ ctl_table_no_const *entry =
85733 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
85734
85735 return entry;
85736 }
85737
85738-static void sd_free_ctl_entry(struct ctl_table **tablep)
85739+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
85740 {
85741- struct ctl_table *entry;
85742+ ctl_table_no_const *entry;
85743
85744 /*
85745 * In the intermediate directories, both the child directory and
85746@@ -4491,22 +4495,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
85747 * will always be set. In the lowest directory the names are
85748 * static strings and all have proc handlers.
85749 */
85750- for (entry = *tablep; entry->mode; entry++) {
85751- if (entry->child)
85752- sd_free_ctl_entry(&entry->child);
85753+ for (entry = tablep; entry->mode; entry++) {
85754+ if (entry->child) {
85755+ sd_free_ctl_entry(entry->child);
85756+ pax_open_kernel();
85757+ entry->child = NULL;
85758+ pax_close_kernel();
85759+ }
85760 if (entry->proc_handler == NULL)
85761 kfree(entry->procname);
85762 }
85763
85764- kfree(*tablep);
85765- *tablep = NULL;
85766+ kfree(tablep);
85767 }
85768
85769 static int min_load_idx = 0;
85770 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
85771
85772 static void
85773-set_table_entry(struct ctl_table *entry,
85774+set_table_entry(ctl_table_no_const *entry,
85775 const char *procname, void *data, int maxlen,
85776 umode_t mode, proc_handler *proc_handler,
85777 bool load_idx)
85778@@ -4526,7 +4533,7 @@ set_table_entry(struct ctl_table *entry,
85779 static struct ctl_table *
85780 sd_alloc_ctl_domain_table(struct sched_domain *sd)
85781 {
85782- struct ctl_table *table = sd_alloc_ctl_entry(13);
85783+ ctl_table_no_const *table = sd_alloc_ctl_entry(13);
85784
85785 if (table == NULL)
85786 return NULL;
85787@@ -4561,9 +4568,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
85788 return table;
85789 }
85790
85791-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
85792+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
85793 {
85794- struct ctl_table *entry, *table;
85795+ ctl_table_no_const *entry, *table;
85796 struct sched_domain *sd;
85797 int domain_num = 0, i;
85798 char buf[32];
85799@@ -4590,11 +4597,13 @@ static struct ctl_table_header *sd_sysctl_header;
85800 static void register_sched_domain_sysctl(void)
85801 {
85802 int i, cpu_num = num_possible_cpus();
85803- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
85804+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
85805 char buf[32];
85806
85807 WARN_ON(sd_ctl_dir[0].child);
85808+ pax_open_kernel();
85809 sd_ctl_dir[0].child = entry;
85810+ pax_close_kernel();
85811
85812 if (entry == NULL)
85813 return;
85814@@ -4617,8 +4626,12 @@ static void unregister_sched_domain_sysctl(void)
85815 if (sd_sysctl_header)
85816 unregister_sysctl_table(sd_sysctl_header);
85817 sd_sysctl_header = NULL;
85818- if (sd_ctl_dir[0].child)
85819- sd_free_ctl_entry(&sd_ctl_dir[0].child);
85820+ if (sd_ctl_dir[0].child) {
85821+ sd_free_ctl_entry(sd_ctl_dir[0].child);
85822+ pax_open_kernel();
85823+ sd_ctl_dir[0].child = NULL;
85824+ pax_close_kernel();
85825+ }
85826 }
85827 #else
85828 static void register_sched_domain_sysctl(void)
85829diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
85830index 7765ad8..774519f 100644
85831--- a/kernel/sched/fair.c
85832+++ b/kernel/sched/fair.c
85833@@ -869,7 +869,7 @@ void task_numa_fault(int node, int pages, bool migrated)
85834
85835 static void reset_ptenuma_scan(struct task_struct *p)
85836 {
85837- ACCESS_ONCE(p->mm->numa_scan_seq)++;
85838+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
85839 p->mm->numa_scan_offset = 0;
85840 }
85841
85842@@ -5847,7 +5847,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
85843 * run_rebalance_domains is triggered when needed from the scheduler tick.
85844 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
85845 */
85846-static void run_rebalance_domains(struct softirq_action *h)
85847+static __latent_entropy void run_rebalance_domains(void)
85848 {
85849 int this_cpu = smp_processor_id();
85850 struct rq *this_rq = cpu_rq(this_cpu);
85851diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
85852index b3c5653..a4d192a 100644
85853--- a/kernel/sched/sched.h
85854+++ b/kernel/sched/sched.h
85855@@ -1004,7 +1004,7 @@ struct sched_class {
85856 #ifdef CONFIG_FAIR_GROUP_SCHED
85857 void (*task_move_group) (struct task_struct *p, int on_rq);
85858 #endif
85859-};
85860+} __do_const;
85861
85862 #define sched_class_highest (&stop_sched_class)
85863 #define for_each_class(class) \
85864diff --git a/kernel/signal.c b/kernel/signal.c
85865index ded28b9..6886c08 100644
85866--- a/kernel/signal.c
85867+++ b/kernel/signal.c
85868@@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep;
85869
85870 int print_fatal_signals __read_mostly;
85871
85872-static void __user *sig_handler(struct task_struct *t, int sig)
85873+static __sighandler_t sig_handler(struct task_struct *t, int sig)
85874 {
85875 return t->sighand->action[sig - 1].sa.sa_handler;
85876 }
85877
85878-static int sig_handler_ignored(void __user *handler, int sig)
85879+static int sig_handler_ignored(__sighandler_t handler, int sig)
85880 {
85881 /* Is it explicitly or implicitly ignored? */
85882 return handler == SIG_IGN ||
85883@@ -65,7 +65,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
85884
85885 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
85886 {
85887- void __user *handler;
85888+ __sighandler_t handler;
85889
85890 handler = sig_handler(t, sig);
85891
85892@@ -369,6 +369,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
85893 atomic_inc(&user->sigpending);
85894 rcu_read_unlock();
85895
85896+ if (!override_rlimit)
85897+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
85898+
85899 if (override_rlimit ||
85900 atomic_read(&user->sigpending) <=
85901 task_rlimit(t, RLIMIT_SIGPENDING)) {
85902@@ -496,7 +499,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
85903
85904 int unhandled_signal(struct task_struct *tsk, int sig)
85905 {
85906- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
85907+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
85908 if (is_global_init(tsk))
85909 return 1;
85910 if (handler != SIG_IGN && handler != SIG_DFL)
85911@@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
85912 }
85913 }
85914
85915+ /* allow glibc communication via tgkill to other threads in our
85916+ thread group */
85917+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
85918+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
85919+ && gr_handle_signal(t, sig))
85920+ return -EPERM;
85921+
85922 return security_task_kill(t, info, sig, 0);
85923 }
85924
85925@@ -1199,7 +1209,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
85926 return send_signal(sig, info, p, 1);
85927 }
85928
85929-static int
85930+int
85931 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85932 {
85933 return send_signal(sig, info, t, 0);
85934@@ -1236,6 +1246,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85935 unsigned long int flags;
85936 int ret, blocked, ignored;
85937 struct k_sigaction *action;
85938+ int is_unhandled = 0;
85939
85940 spin_lock_irqsave(&t->sighand->siglock, flags);
85941 action = &t->sighand->action[sig-1];
85942@@ -1250,9 +1261,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85943 }
85944 if (action->sa.sa_handler == SIG_DFL)
85945 t->signal->flags &= ~SIGNAL_UNKILLABLE;
85946+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
85947+ is_unhandled = 1;
85948 ret = specific_send_sig_info(sig, info, t);
85949 spin_unlock_irqrestore(&t->sighand->siglock, flags);
85950
85951+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
85952+ normal operation */
85953+ if (is_unhandled) {
85954+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
85955+ gr_handle_crash(t, sig);
85956+ }
85957+
85958 return ret;
85959 }
85960
85961@@ -1319,8 +1339,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
85962 ret = check_kill_permission(sig, info, p);
85963 rcu_read_unlock();
85964
85965- if (!ret && sig)
85966+ if (!ret && sig) {
85967 ret = do_send_sig_info(sig, info, p, true);
85968+ if (!ret)
85969+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
85970+ }
85971
85972 return ret;
85973 }
85974@@ -2926,7 +2949,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
85975 int error = -ESRCH;
85976
85977 rcu_read_lock();
85978- p = find_task_by_vpid(pid);
85979+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
85980+ /* allow glibc communication via tgkill to other threads in our
85981+ thread group */
85982+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
85983+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
85984+ p = find_task_by_vpid_unrestricted(pid);
85985+ else
85986+#endif
85987+ p = find_task_by_vpid(pid);
85988 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
85989 error = check_kill_permission(sig, info, p);
85990 /*
85991@@ -3240,8 +3271,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
85992 }
85993 seg = get_fs();
85994 set_fs(KERNEL_DS);
85995- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
85996- (stack_t __force __user *) &uoss,
85997+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
85998+ (stack_t __force_user *) &uoss,
85999 compat_user_stack_pointer());
86000 set_fs(seg);
86001 if (ret >= 0 && uoss_ptr) {
86002diff --git a/kernel/smpboot.c b/kernel/smpboot.c
86003index eb89e18..a4e6792 100644
86004--- a/kernel/smpboot.c
86005+++ b/kernel/smpboot.c
86006@@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
86007 }
86008 smpboot_unpark_thread(plug_thread, cpu);
86009 }
86010- list_add(&plug_thread->list, &hotplug_threads);
86011+ pax_list_add(&plug_thread->list, &hotplug_threads);
86012 out:
86013 mutex_unlock(&smpboot_threads_lock);
86014 return ret;
86015@@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
86016 {
86017 get_online_cpus();
86018 mutex_lock(&smpboot_threads_lock);
86019- list_del(&plug_thread->list);
86020+ pax_list_del(&plug_thread->list);
86021 smpboot_destroy_threads(plug_thread);
86022 mutex_unlock(&smpboot_threads_lock);
86023 put_online_cpus();
86024diff --git a/kernel/softirq.c b/kernel/softirq.c
86025index d7d498d..94fe0f7 100644
86026--- a/kernel/softirq.c
86027+++ b/kernel/softirq.c
86028@@ -53,11 +53,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
86029 EXPORT_SYMBOL(irq_stat);
86030 #endif
86031
86032-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
86033+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
86034
86035 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
86036
86037-char *softirq_to_name[NR_SOFTIRQS] = {
86038+const char * const softirq_to_name[NR_SOFTIRQS] = {
86039 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
86040 "TASKLET", "SCHED", "HRTIMER", "RCU"
86041 };
86042@@ -248,7 +248,7 @@ restart:
86043 kstat_incr_softirqs_this_cpu(vec_nr);
86044
86045 trace_softirq_entry(vec_nr);
86046- h->action(h);
86047+ h->action();
86048 trace_softirq_exit(vec_nr);
86049 if (unlikely(prev_count != preempt_count())) {
86050 printk(KERN_ERR "huh, entered softirq %u %s %p"
86051@@ -412,7 +412,7 @@ void __raise_softirq_irqoff(unsigned int nr)
86052 or_softirq_pending(1UL << nr);
86053 }
86054
86055-void open_softirq(int nr, void (*action)(struct softirq_action *))
86056+void __init open_softirq(int nr, void (*action)(void))
86057 {
86058 softirq_vec[nr].action = action;
86059 }
86060@@ -468,7 +468,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
86061
86062 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
86063
86064-static void tasklet_action(struct softirq_action *a)
86065+static __latent_entropy void tasklet_action(void)
86066 {
86067 struct tasklet_struct *list;
86068
86069@@ -503,7 +503,7 @@ static void tasklet_action(struct softirq_action *a)
86070 }
86071 }
86072
86073-static void tasklet_hi_action(struct softirq_action *a)
86074+static __latent_entropy void tasklet_hi_action(void)
86075 {
86076 struct tasklet_struct *list;
86077
86078@@ -858,7 +858,7 @@ static struct notifier_block cpu_nfb = {
86079 .notifier_call = cpu_callback
86080 };
86081
86082-static struct smp_hotplug_thread softirq_threads = {
86083+static struct smp_hotplug_thread softirq_threads __read_only = {
86084 .store = &ksoftirqd,
86085 .thread_should_run = ksoftirqd_should_run,
86086 .thread_fn = run_ksoftirqd,
86087diff --git a/kernel/srcu.c b/kernel/srcu.c
86088index 01d5ccb..cdcbee6 100644
86089--- a/kernel/srcu.c
86090+++ b/kernel/srcu.c
86091@@ -300,9 +300,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
86092
86093 idx = ACCESS_ONCE(sp->completed) & 0x1;
86094 preempt_disable();
86095- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
86096+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
86097 smp_mb(); /* B */ /* Avoid leaking the critical section. */
86098- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
86099+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
86100 preempt_enable();
86101 return idx;
86102 }
86103diff --git a/kernel/sys.c b/kernel/sys.c
86104index c18ecca..b3c2dd2 100644
86105--- a/kernel/sys.c
86106+++ b/kernel/sys.c
86107@@ -149,6 +149,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
86108 error = -EACCES;
86109 goto out;
86110 }
86111+
86112+ if (gr_handle_chroot_setpriority(p, niceval)) {
86113+ error = -EACCES;
86114+ goto out;
86115+ }
86116+
86117 no_nice = security_task_setnice(p, niceval);
86118 if (no_nice) {
86119 error = no_nice;
86120@@ -352,6 +358,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
86121 goto error;
86122 }
86123
86124+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
86125+ goto error;
86126+
86127 if (rgid != (gid_t) -1 ||
86128 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
86129 new->sgid = new->egid;
86130@@ -387,6 +396,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
86131 old = current_cred();
86132
86133 retval = -EPERM;
86134+
86135+ if (gr_check_group_change(kgid, kgid, kgid))
86136+ goto error;
86137+
86138 if (ns_capable(old->user_ns, CAP_SETGID))
86139 new->gid = new->egid = new->sgid = new->fsgid = kgid;
86140 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
86141@@ -404,7 +417,7 @@ error:
86142 /*
86143 * change the user struct in a credentials set to match the new UID
86144 */
86145-static int set_user(struct cred *new)
86146+int set_user(struct cred *new)
86147 {
86148 struct user_struct *new_user;
86149
86150@@ -484,6 +497,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
86151 goto error;
86152 }
86153
86154+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
86155+ goto error;
86156+
86157 if (!uid_eq(new->uid, old->uid)) {
86158 retval = set_user(new);
86159 if (retval < 0)
86160@@ -534,6 +550,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
86161 old = current_cred();
86162
86163 retval = -EPERM;
86164+
86165+ if (gr_check_crash_uid(kuid))
86166+ goto error;
86167+ if (gr_check_user_change(kuid, kuid, kuid))
86168+ goto error;
86169+
86170 if (ns_capable(old->user_ns, CAP_SETUID)) {
86171 new->suid = new->uid = kuid;
86172 if (!uid_eq(kuid, old->uid)) {
86173@@ -603,6 +625,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
86174 goto error;
86175 }
86176
86177+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
86178+ goto error;
86179+
86180 if (ruid != (uid_t) -1) {
86181 new->uid = kruid;
86182 if (!uid_eq(kruid, old->uid)) {
86183@@ -685,6 +710,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
86184 goto error;
86185 }
86186
86187+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
86188+ goto error;
86189+
86190 if (rgid != (gid_t) -1)
86191 new->gid = krgid;
86192 if (egid != (gid_t) -1)
86193@@ -746,12 +774,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
86194 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
86195 ns_capable(old->user_ns, CAP_SETUID)) {
86196 if (!uid_eq(kuid, old->fsuid)) {
86197+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
86198+ goto error;
86199+
86200 new->fsuid = kuid;
86201 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
86202 goto change_okay;
86203 }
86204 }
86205
86206+error:
86207 abort_creds(new);
86208 return old_fsuid;
86209
86210@@ -784,12 +816,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
86211 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
86212 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
86213 ns_capable(old->user_ns, CAP_SETGID)) {
86214+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
86215+ goto error;
86216+
86217 if (!gid_eq(kgid, old->fsgid)) {
86218 new->fsgid = kgid;
86219 goto change_okay;
86220 }
86221 }
86222
86223+error:
86224 abort_creds(new);
86225 return old_fsgid;
86226
86227@@ -1169,19 +1205,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
86228 return -EFAULT;
86229
86230 down_read(&uts_sem);
86231- error = __copy_to_user(&name->sysname, &utsname()->sysname,
86232+ error = __copy_to_user(name->sysname, &utsname()->sysname,
86233 __OLD_UTS_LEN);
86234 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
86235- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
86236+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
86237 __OLD_UTS_LEN);
86238 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
86239- error |= __copy_to_user(&name->release, &utsname()->release,
86240+ error |= __copy_to_user(name->release, &utsname()->release,
86241 __OLD_UTS_LEN);
86242 error |= __put_user(0, name->release + __OLD_UTS_LEN);
86243- error |= __copy_to_user(&name->version, &utsname()->version,
86244+ error |= __copy_to_user(name->version, &utsname()->version,
86245 __OLD_UTS_LEN);
86246 error |= __put_user(0, name->version + __OLD_UTS_LEN);
86247- error |= __copy_to_user(&name->machine, &utsname()->machine,
86248+ error |= __copy_to_user(name->machine, &utsname()->machine,
86249 __OLD_UTS_LEN);
86250 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
86251 up_read(&uts_sem);
86252@@ -1383,6 +1419,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
86253 */
86254 new_rlim->rlim_cur = 1;
86255 }
86256+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
86257+ is changed to a lower value. Since tasks can be created by the same
86258+ user in between this limit change and an execve by this task, force
86259+ a recheck only for this task by setting PF_NPROC_EXCEEDED
86260+ */
86261+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
86262+ tsk->flags |= PF_NPROC_EXCEEDED;
86263 }
86264 if (!retval) {
86265 if (old_rlim)
86266diff --git a/kernel/sysctl.c b/kernel/sysctl.c
86267index b2f06f3..e6354ab 100644
86268--- a/kernel/sysctl.c
86269+++ b/kernel/sysctl.c
86270@@ -93,7 +93,6 @@
86271
86272
86273 #if defined(CONFIG_SYSCTL)
86274-
86275 /* External variables not in a header file. */
86276 extern int sysctl_overcommit_memory;
86277 extern int sysctl_overcommit_ratio;
86278@@ -119,17 +118,18 @@ extern int blk_iopoll_enabled;
86279
86280 /* Constants used for minimum and maximum */
86281 #ifdef CONFIG_LOCKUP_DETECTOR
86282-static int sixty = 60;
86283+static int sixty __read_only = 60;
86284 #endif
86285
86286-static int zero;
86287-static int __maybe_unused one = 1;
86288-static int __maybe_unused two = 2;
86289-static int __maybe_unused three = 3;
86290-static unsigned long one_ul = 1;
86291-static int one_hundred = 100;
86292+static int neg_one __read_only = -1;
86293+static int zero __read_only = 0;
86294+static int __maybe_unused one __read_only = 1;
86295+static int __maybe_unused two __read_only = 2;
86296+static int __maybe_unused three __read_only = 3;
86297+static unsigned long one_ul __read_only = 1;
86298+static int one_hundred __read_only = 100;
86299 #ifdef CONFIG_PRINTK
86300-static int ten_thousand = 10000;
86301+static int ten_thousand __read_only = 10000;
86302 #endif
86303
86304 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
86305@@ -176,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write,
86306 void __user *buffer, size_t *lenp, loff_t *ppos);
86307 #endif
86308
86309-#ifdef CONFIG_PRINTK
86310 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86311 void __user *buffer, size_t *lenp, loff_t *ppos);
86312-#endif
86313
86314 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
86315 void __user *buffer, size_t *lenp, loff_t *ppos);
86316@@ -210,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
86317
86318 #endif
86319
86320+extern struct ctl_table grsecurity_table[];
86321+
86322 static struct ctl_table kern_table[];
86323 static struct ctl_table vm_table[];
86324 static struct ctl_table fs_table[];
86325@@ -224,6 +224,20 @@ extern struct ctl_table epoll_table[];
86326 int sysctl_legacy_va_layout;
86327 #endif
86328
86329+#ifdef CONFIG_PAX_SOFTMODE
86330+static ctl_table pax_table[] = {
86331+ {
86332+ .procname = "softmode",
86333+ .data = &pax_softmode,
86334+ .maxlen = sizeof(unsigned int),
86335+ .mode = 0600,
86336+ .proc_handler = &proc_dointvec,
86337+ },
86338+
86339+ { }
86340+};
86341+#endif
86342+
86343 /* The default sysctl tables: */
86344
86345 static struct ctl_table sysctl_base_table[] = {
86346@@ -272,6 +286,22 @@ static int max_extfrag_threshold = 1000;
86347 #endif
86348
86349 static struct ctl_table kern_table[] = {
86350+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
86351+ {
86352+ .procname = "grsecurity",
86353+ .mode = 0500,
86354+ .child = grsecurity_table,
86355+ },
86356+#endif
86357+
86358+#ifdef CONFIG_PAX_SOFTMODE
86359+ {
86360+ .procname = "pax",
86361+ .mode = 0500,
86362+ .child = pax_table,
86363+ },
86364+#endif
86365+
86366 {
86367 .procname = "sched_child_runs_first",
86368 .data = &sysctl_sched_child_runs_first,
86369@@ -613,7 +643,7 @@ static struct ctl_table kern_table[] = {
86370 .data = &modprobe_path,
86371 .maxlen = KMOD_PATH_LEN,
86372 .mode = 0644,
86373- .proc_handler = proc_dostring,
86374+ .proc_handler = proc_dostring_modpriv,
86375 },
86376 {
86377 .procname = "modules_disabled",
86378@@ -780,16 +810,20 @@ static struct ctl_table kern_table[] = {
86379 .extra1 = &zero,
86380 .extra2 = &one,
86381 },
86382+#endif
86383 {
86384 .procname = "kptr_restrict",
86385 .data = &kptr_restrict,
86386 .maxlen = sizeof(int),
86387 .mode = 0644,
86388 .proc_handler = proc_dointvec_minmax_sysadmin,
86389+#ifdef CONFIG_GRKERNSEC_HIDESYM
86390+ .extra1 = &two,
86391+#else
86392 .extra1 = &zero,
86393+#endif
86394 .extra2 = &two,
86395 },
86396-#endif
86397 {
86398 .procname = "ngroups_max",
86399 .data = &ngroups_max,
86400@@ -1031,10 +1065,17 @@ static struct ctl_table kern_table[] = {
86401 */
86402 {
86403 .procname = "perf_event_paranoid",
86404- .data = &sysctl_perf_event_paranoid,
86405- .maxlen = sizeof(sysctl_perf_event_paranoid),
86406+ .data = &sysctl_perf_event_legitimately_concerned,
86407+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
86408 .mode = 0644,
86409- .proc_handler = proc_dointvec,
86410+ /* go ahead, be a hero */
86411+ .proc_handler = proc_dointvec_minmax_sysadmin,
86412+ .extra1 = &neg_one,
86413+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
86414+ .extra2 = &three,
86415+#else
86416+ .extra2 = &two,
86417+#endif
86418 },
86419 {
86420 .procname = "perf_event_mlock_kb",
86421@@ -1297,6 +1338,13 @@ static struct ctl_table vm_table[] = {
86422 .proc_handler = proc_dointvec_minmax,
86423 .extra1 = &zero,
86424 },
86425+ {
86426+ .procname = "heap_stack_gap",
86427+ .data = &sysctl_heap_stack_gap,
86428+ .maxlen = sizeof(sysctl_heap_stack_gap),
86429+ .mode = 0644,
86430+ .proc_handler = proc_doulongvec_minmax,
86431+ },
86432 #else
86433 {
86434 .procname = "nr_trim_pages",
86435@@ -1761,6 +1809,16 @@ int proc_dostring(struct ctl_table *table, int write,
86436 buffer, lenp, ppos);
86437 }
86438
86439+int proc_dostring_modpriv(struct ctl_table *table, int write,
86440+ void __user *buffer, size_t *lenp, loff_t *ppos)
86441+{
86442+ if (write && !capable(CAP_SYS_MODULE))
86443+ return -EPERM;
86444+
86445+ return _proc_do_string(table->data, table->maxlen, write,
86446+ buffer, lenp, ppos);
86447+}
86448+
86449 static size_t proc_skip_spaces(char **buf)
86450 {
86451 size_t ret;
86452@@ -1866,6 +1924,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
86453 len = strlen(tmp);
86454 if (len > *size)
86455 len = *size;
86456+ if (len > sizeof(tmp))
86457+ len = sizeof(tmp);
86458 if (copy_to_user(*buf, tmp, len))
86459 return -EFAULT;
86460 *size -= len;
86461@@ -2030,7 +2090,7 @@ int proc_dointvec(struct ctl_table *table, int write,
86462 static int proc_taint(struct ctl_table *table, int write,
86463 void __user *buffer, size_t *lenp, loff_t *ppos)
86464 {
86465- struct ctl_table t;
86466+ ctl_table_no_const t;
86467 unsigned long tmptaint = get_taint();
86468 int err;
86469
86470@@ -2058,7 +2118,6 @@ static int proc_taint(struct ctl_table *table, int write,
86471 return err;
86472 }
86473
86474-#ifdef CONFIG_PRINTK
86475 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86476 void __user *buffer, size_t *lenp, loff_t *ppos)
86477 {
86478@@ -2067,7 +2126,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86479
86480 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
86481 }
86482-#endif
86483
86484 struct do_proc_dointvec_minmax_conv_param {
86485 int *min;
86486@@ -2214,8 +2272,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
86487 *i = val;
86488 } else {
86489 val = convdiv * (*i) / convmul;
86490- if (!first)
86491+ if (!first) {
86492 err = proc_put_char(&buffer, &left, '\t');
86493+ if (err)
86494+ break;
86495+ }
86496 err = proc_put_long(&buffer, &left, val, false);
86497 if (err)
86498 break;
86499@@ -2611,6 +2672,12 @@ int proc_dostring(struct ctl_table *table, int write,
86500 return -ENOSYS;
86501 }
86502
86503+int proc_dostring_modpriv(struct ctl_table *table, int write,
86504+ void __user *buffer, size_t *lenp, loff_t *ppos)
86505+{
86506+ return -ENOSYS;
86507+}
86508+
86509 int proc_dointvec(struct ctl_table *table, int write,
86510 void __user *buffer, size_t *lenp, loff_t *ppos)
86511 {
86512@@ -2667,5 +2734,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
86513 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
86514 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
86515 EXPORT_SYMBOL(proc_dostring);
86516+EXPORT_SYMBOL(proc_dostring_modpriv);
86517 EXPORT_SYMBOL(proc_doulongvec_minmax);
86518 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
86519diff --git a/kernel/taskstats.c b/kernel/taskstats.c
86520index 145bb4d..b2aa969 100644
86521--- a/kernel/taskstats.c
86522+++ b/kernel/taskstats.c
86523@@ -28,9 +28,12 @@
86524 #include <linux/fs.h>
86525 #include <linux/file.h>
86526 #include <linux/pid_namespace.h>
86527+#include <linux/grsecurity.h>
86528 #include <net/genetlink.h>
86529 #include <linux/atomic.h>
86530
86531+extern int gr_is_taskstats_denied(int pid);
86532+
86533 /*
86534 * Maximum length of a cpumask that can be specified in
86535 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
86536@@ -570,6 +573,9 @@ err:
86537
86538 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
86539 {
86540+ if (gr_is_taskstats_denied(current->pid))
86541+ return -EACCES;
86542+
86543 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
86544 return cmd_attr_register_cpumask(info);
86545 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
86546diff --git a/kernel/time.c b/kernel/time.c
86547index 7c7964c..2a0d412 100644
86548--- a/kernel/time.c
86549+++ b/kernel/time.c
86550@@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
86551 return error;
86552
86553 if (tz) {
86554+ /* we log in do_settimeofday called below, so don't log twice
86555+ */
86556+ if (!tv)
86557+ gr_log_timechange();
86558+
86559 sys_tz = *tz;
86560 update_vsyscall_tz();
86561 if (firsttime) {
86562diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
86563index 88c9c65..7497ebc 100644
86564--- a/kernel/time/alarmtimer.c
86565+++ b/kernel/time/alarmtimer.c
86566@@ -795,7 +795,7 @@ static int __init alarmtimer_init(void)
86567 struct platform_device *pdev;
86568 int error = 0;
86569 int i;
86570- struct k_clock alarm_clock = {
86571+ static struct k_clock alarm_clock = {
86572 .clock_getres = alarm_clock_getres,
86573 .clock_get = alarm_clock_get,
86574 .timer_create = alarm_timer_create,
86575diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
86576index 5cf6c70..ac341b0 100644
86577--- a/kernel/time/timekeeping.c
86578+++ b/kernel/time/timekeeping.c
86579@@ -15,6 +15,7 @@
86580 #include <linux/init.h>
86581 #include <linux/mm.h>
86582 #include <linux/sched.h>
86583+#include <linux/grsecurity.h>
86584 #include <linux/syscore_ops.h>
86585 #include <linux/clocksource.h>
86586 #include <linux/jiffies.h>
86587@@ -500,6 +501,8 @@ int do_settimeofday(const struct timespec *tv)
86588 if (!timespec_valid_strict(tv))
86589 return -EINVAL;
86590
86591+ gr_log_timechange();
86592+
86593 raw_spin_lock_irqsave(&timekeeper_lock, flags);
86594 write_seqcount_begin(&timekeeper_seq);
86595
86596diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
86597index 61ed862..3b52c65 100644
86598--- a/kernel/time/timer_list.c
86599+++ b/kernel/time/timer_list.c
86600@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
86601
86602 static void print_name_offset(struct seq_file *m, void *sym)
86603 {
86604+#ifdef CONFIG_GRKERNSEC_HIDESYM
86605+ SEQ_printf(m, "<%p>", NULL);
86606+#else
86607 char symname[KSYM_NAME_LEN];
86608
86609 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
86610 SEQ_printf(m, "<%pK>", sym);
86611 else
86612 SEQ_printf(m, "%s", symname);
86613+#endif
86614 }
86615
86616 static void
86617@@ -119,7 +123,11 @@ next_one:
86618 static void
86619 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
86620 {
86621+#ifdef CONFIG_GRKERNSEC_HIDESYM
86622+ SEQ_printf(m, " .base: %p\n", NULL);
86623+#else
86624 SEQ_printf(m, " .base: %pK\n", base);
86625+#endif
86626 SEQ_printf(m, " .index: %d\n",
86627 base->index);
86628 SEQ_printf(m, " .resolution: %Lu nsecs\n",
86629@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
86630 {
86631 struct proc_dir_entry *pe;
86632
86633+#ifdef CONFIG_GRKERNSEC_PROC_ADD
86634+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
86635+#else
86636 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
86637+#endif
86638 if (!pe)
86639 return -ENOMEM;
86640 return 0;
86641diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
86642index 0b537f2..40d6c20 100644
86643--- a/kernel/time/timer_stats.c
86644+++ b/kernel/time/timer_stats.c
86645@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
86646 static unsigned long nr_entries;
86647 static struct entry entries[MAX_ENTRIES];
86648
86649-static atomic_t overflow_count;
86650+static atomic_unchecked_t overflow_count;
86651
86652 /*
86653 * The entries are in a hash-table, for fast lookup:
86654@@ -140,7 +140,7 @@ static void reset_entries(void)
86655 nr_entries = 0;
86656 memset(entries, 0, sizeof(entries));
86657 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
86658- atomic_set(&overflow_count, 0);
86659+ atomic_set_unchecked(&overflow_count, 0);
86660 }
86661
86662 static struct entry *alloc_entry(void)
86663@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
86664 if (likely(entry))
86665 entry->count++;
86666 else
86667- atomic_inc(&overflow_count);
86668+ atomic_inc_unchecked(&overflow_count);
86669
86670 out_unlock:
86671 raw_spin_unlock_irqrestore(lock, flags);
86672@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
86673
86674 static void print_name_offset(struct seq_file *m, unsigned long addr)
86675 {
86676+#ifdef CONFIG_GRKERNSEC_HIDESYM
86677+ seq_printf(m, "<%p>", NULL);
86678+#else
86679 char symname[KSYM_NAME_LEN];
86680
86681 if (lookup_symbol_name(addr, symname) < 0)
86682- seq_printf(m, "<%p>", (void *)addr);
86683+ seq_printf(m, "<%pK>", (void *)addr);
86684 else
86685 seq_printf(m, "%s", symname);
86686+#endif
86687 }
86688
86689 static int tstats_show(struct seq_file *m, void *v)
86690@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
86691
86692 seq_puts(m, "Timer Stats Version: v0.2\n");
86693 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
86694- if (atomic_read(&overflow_count))
86695+ if (atomic_read_unchecked(&overflow_count))
86696 seq_printf(m, "Overflow: %d entries\n",
86697- atomic_read(&overflow_count));
86698+ atomic_read_unchecked(&overflow_count));
86699
86700 for (i = 0; i < nr_entries; i++) {
86701 entry = entries + i;
86702@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
86703 {
86704 struct proc_dir_entry *pe;
86705
86706+#ifdef CONFIG_GRKERNSEC_PROC_ADD
86707+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
86708+#else
86709 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
86710+#endif
86711 if (!pe)
86712 return -ENOMEM;
86713 return 0;
86714diff --git a/kernel/timer.c b/kernel/timer.c
86715index 4296d13..0164b04 100644
86716--- a/kernel/timer.c
86717+++ b/kernel/timer.c
86718@@ -1366,7 +1366,7 @@ void update_process_times(int user_tick)
86719 /*
86720 * This function runs timers and the timer-tq in bottom half context.
86721 */
86722-static void run_timer_softirq(struct softirq_action *h)
86723+static __latent_entropy void run_timer_softirq(void)
86724 {
86725 struct tvec_base *base = __this_cpu_read(tvec_bases);
86726
86727@@ -1429,7 +1429,7 @@ static void process_timeout(unsigned long __data)
86728 *
86729 * In all cases the return value is guaranteed to be non-negative.
86730 */
86731-signed long __sched schedule_timeout(signed long timeout)
86732+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
86733 {
86734 struct timer_list timer;
86735 unsigned long expire;
86736diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
86737index b8b8560..75b1a09 100644
86738--- a/kernel/trace/blktrace.c
86739+++ b/kernel/trace/blktrace.c
86740@@ -317,7 +317,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
86741 struct blk_trace *bt = filp->private_data;
86742 char buf[16];
86743
86744- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
86745+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
86746
86747 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
86748 }
86749@@ -375,7 +375,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
86750 return 1;
86751
86752 bt = buf->chan->private_data;
86753- atomic_inc(&bt->dropped);
86754+ atomic_inc_unchecked(&bt->dropped);
86755 return 0;
86756 }
86757
86758@@ -476,7 +476,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
86759
86760 bt->dir = dir;
86761 bt->dev = dev;
86762- atomic_set(&bt->dropped, 0);
86763+ atomic_set_unchecked(&bt->dropped, 0);
86764
86765 ret = -EIO;
86766 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
86767diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
86768index 1345d9f..db46efe 100644
86769--- a/kernel/trace/ftrace.c
86770+++ b/kernel/trace/ftrace.c
86771@@ -1944,12 +1944,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
86772 if (unlikely(ftrace_disabled))
86773 return 0;
86774
86775+ ret = ftrace_arch_code_modify_prepare();
86776+ FTRACE_WARN_ON(ret);
86777+ if (ret)
86778+ return 0;
86779+
86780 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
86781+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
86782 if (ret) {
86783 ftrace_bug(ret, ip);
86784- return 0;
86785 }
86786- return 1;
86787+ return ret ? 0 : 1;
86788 }
86789
86790 /*
86791@@ -4043,8 +4048,10 @@ static int ftrace_process_locs(struct module *mod,
86792 if (!count)
86793 return 0;
86794
86795+ pax_open_kernel();
86796 sort(start, count, sizeof(*start),
86797 ftrace_cmp_ips, ftrace_swap_ips);
86798+ pax_close_kernel();
86799
86800 start_pg = ftrace_allocate_pages(count);
86801 if (!start_pg)
86802@@ -4766,8 +4773,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
86803 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
86804
86805 static int ftrace_graph_active;
86806-static struct notifier_block ftrace_suspend_notifier;
86807-
86808 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
86809 {
86810 return 0;
86811@@ -4918,6 +4923,10 @@ static struct ftrace_ops fgraph_ops __read_mostly = {
86812 FTRACE_OPS_FL_RECURSION_SAFE,
86813 };
86814
86815+static struct notifier_block ftrace_suspend_notifier = {
86816+ .notifier_call = ftrace_suspend_notifier_call
86817+};
86818+
86819 int register_ftrace_graph(trace_func_graph_ret_t retfunc,
86820 trace_func_graph_ent_t entryfunc)
86821 {
86822@@ -4931,7 +4940,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
86823 goto out;
86824 }
86825
86826- ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
86827 register_pm_notifier(&ftrace_suspend_notifier);
86828
86829 ftrace_graph_active++;
86830diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
86831index cc2f66f..05edd54 100644
86832--- a/kernel/trace/ring_buffer.c
86833+++ b/kernel/trace/ring_buffer.c
86834@@ -352,9 +352,9 @@ struct buffer_data_page {
86835 */
86836 struct buffer_page {
86837 struct list_head list; /* list of buffer pages */
86838- local_t write; /* index for next write */
86839+ local_unchecked_t write; /* index for next write */
86840 unsigned read; /* index for next read */
86841- local_t entries; /* entries on this page */
86842+ local_unchecked_t entries; /* entries on this page */
86843 unsigned long real_end; /* real end of data */
86844 struct buffer_data_page *page; /* Actual data page */
86845 };
86846@@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
86847 unsigned long last_overrun;
86848 local_t entries_bytes;
86849 local_t entries;
86850- local_t overrun;
86851- local_t commit_overrun;
86852+ local_unchecked_t overrun;
86853+ local_unchecked_t commit_overrun;
86854 local_t dropped_events;
86855 local_t committing;
86856 local_t commits;
86857@@ -992,8 +992,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
86858 *
86859 * We add a counter to the write field to denote this.
86860 */
86861- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
86862- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
86863+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
86864+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
86865
86866 /*
86867 * Just make sure we have seen our old_write and synchronize
86868@@ -1021,8 +1021,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
86869 * cmpxchg to only update if an interrupt did not already
86870 * do it for us. If the cmpxchg fails, we don't care.
86871 */
86872- (void)local_cmpxchg(&next_page->write, old_write, val);
86873- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
86874+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
86875+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
86876
86877 /*
86878 * No need to worry about races with clearing out the commit.
86879@@ -1386,12 +1386,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
86880
86881 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
86882 {
86883- return local_read(&bpage->entries) & RB_WRITE_MASK;
86884+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
86885 }
86886
86887 static inline unsigned long rb_page_write(struct buffer_page *bpage)
86888 {
86889- return local_read(&bpage->write) & RB_WRITE_MASK;
86890+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
86891 }
86892
86893 static int
86894@@ -1486,7 +1486,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
86895 * bytes consumed in ring buffer from here.
86896 * Increment overrun to account for the lost events.
86897 */
86898- local_add(page_entries, &cpu_buffer->overrun);
86899+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
86900 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
86901 }
86902
86903@@ -2064,7 +2064,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
86904 * it is our responsibility to update
86905 * the counters.
86906 */
86907- local_add(entries, &cpu_buffer->overrun);
86908+ local_add_unchecked(entries, &cpu_buffer->overrun);
86909 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
86910
86911 /*
86912@@ -2214,7 +2214,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86913 if (tail == BUF_PAGE_SIZE)
86914 tail_page->real_end = 0;
86915
86916- local_sub(length, &tail_page->write);
86917+ local_sub_unchecked(length, &tail_page->write);
86918 return;
86919 }
86920
86921@@ -2249,7 +2249,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86922 rb_event_set_padding(event);
86923
86924 /* Set the write back to the previous setting */
86925- local_sub(length, &tail_page->write);
86926+ local_sub_unchecked(length, &tail_page->write);
86927 return;
86928 }
86929
86930@@ -2261,7 +2261,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86931
86932 /* Set write to end of buffer */
86933 length = (tail + length) - BUF_PAGE_SIZE;
86934- local_sub(length, &tail_page->write);
86935+ local_sub_unchecked(length, &tail_page->write);
86936 }
86937
86938 /*
86939@@ -2287,7 +2287,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
86940 * about it.
86941 */
86942 if (unlikely(next_page == commit_page)) {
86943- local_inc(&cpu_buffer->commit_overrun);
86944+ local_inc_unchecked(&cpu_buffer->commit_overrun);
86945 goto out_reset;
86946 }
86947
86948@@ -2343,7 +2343,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
86949 cpu_buffer->tail_page) &&
86950 (cpu_buffer->commit_page ==
86951 cpu_buffer->reader_page))) {
86952- local_inc(&cpu_buffer->commit_overrun);
86953+ local_inc_unchecked(&cpu_buffer->commit_overrun);
86954 goto out_reset;
86955 }
86956 }
86957@@ -2391,7 +2391,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
86958 length += RB_LEN_TIME_EXTEND;
86959
86960 tail_page = cpu_buffer->tail_page;
86961- write = local_add_return(length, &tail_page->write);
86962+ write = local_add_return_unchecked(length, &tail_page->write);
86963
86964 /* set write to only the index of the write */
86965 write &= RB_WRITE_MASK;
86966@@ -2408,7 +2408,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
86967 kmemcheck_annotate_bitfield(event, bitfield);
86968 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
86969
86970- local_inc(&tail_page->entries);
86971+ local_inc_unchecked(&tail_page->entries);
86972
86973 /*
86974 * If this is the first commit on the page, then update
86975@@ -2441,7 +2441,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
86976
86977 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
86978 unsigned long write_mask =
86979- local_read(&bpage->write) & ~RB_WRITE_MASK;
86980+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
86981 unsigned long event_length = rb_event_length(event);
86982 /*
86983 * This is on the tail page. It is possible that
86984@@ -2451,7 +2451,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
86985 */
86986 old_index += write_mask;
86987 new_index += write_mask;
86988- index = local_cmpxchg(&bpage->write, old_index, new_index);
86989+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
86990 if (index == old_index) {
86991 /* update counters */
86992 local_sub(event_length, &cpu_buffer->entries_bytes);
86993@@ -2843,7 +2843,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
86994
86995 /* Do the likely case first */
86996 if (likely(bpage->page == (void *)addr)) {
86997- local_dec(&bpage->entries);
86998+ local_dec_unchecked(&bpage->entries);
86999 return;
87000 }
87001
87002@@ -2855,7 +2855,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
87003 start = bpage;
87004 do {
87005 if (bpage->page == (void *)addr) {
87006- local_dec(&bpage->entries);
87007+ local_dec_unchecked(&bpage->entries);
87008 return;
87009 }
87010 rb_inc_page(cpu_buffer, &bpage);
87011@@ -3139,7 +3139,7 @@ static inline unsigned long
87012 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
87013 {
87014 return local_read(&cpu_buffer->entries) -
87015- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
87016+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
87017 }
87018
87019 /**
87020@@ -3228,7 +3228,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
87021 return 0;
87022
87023 cpu_buffer = buffer->buffers[cpu];
87024- ret = local_read(&cpu_buffer->overrun);
87025+ ret = local_read_unchecked(&cpu_buffer->overrun);
87026
87027 return ret;
87028 }
87029@@ -3251,7 +3251,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
87030 return 0;
87031
87032 cpu_buffer = buffer->buffers[cpu];
87033- ret = local_read(&cpu_buffer->commit_overrun);
87034+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
87035
87036 return ret;
87037 }
87038@@ -3336,7 +3336,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
87039 /* if you care about this being correct, lock the buffer */
87040 for_each_buffer_cpu(buffer, cpu) {
87041 cpu_buffer = buffer->buffers[cpu];
87042- overruns += local_read(&cpu_buffer->overrun);
87043+ overruns += local_read_unchecked(&cpu_buffer->overrun);
87044 }
87045
87046 return overruns;
87047@@ -3512,8 +3512,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
87048 /*
87049 * Reset the reader page to size zero.
87050 */
87051- local_set(&cpu_buffer->reader_page->write, 0);
87052- local_set(&cpu_buffer->reader_page->entries, 0);
87053+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
87054+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
87055 local_set(&cpu_buffer->reader_page->page->commit, 0);
87056 cpu_buffer->reader_page->real_end = 0;
87057
87058@@ -3547,7 +3547,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
87059 * want to compare with the last_overrun.
87060 */
87061 smp_mb();
87062- overwrite = local_read(&(cpu_buffer->overrun));
87063+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
87064
87065 /*
87066 * Here's the tricky part.
87067@@ -4117,8 +4117,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
87068
87069 cpu_buffer->head_page
87070 = list_entry(cpu_buffer->pages, struct buffer_page, list);
87071- local_set(&cpu_buffer->head_page->write, 0);
87072- local_set(&cpu_buffer->head_page->entries, 0);
87073+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
87074+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
87075 local_set(&cpu_buffer->head_page->page->commit, 0);
87076
87077 cpu_buffer->head_page->read = 0;
87078@@ -4128,14 +4128,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
87079
87080 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
87081 INIT_LIST_HEAD(&cpu_buffer->new_pages);
87082- local_set(&cpu_buffer->reader_page->write, 0);
87083- local_set(&cpu_buffer->reader_page->entries, 0);
87084+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
87085+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
87086 local_set(&cpu_buffer->reader_page->page->commit, 0);
87087 cpu_buffer->reader_page->read = 0;
87088
87089 local_set(&cpu_buffer->entries_bytes, 0);
87090- local_set(&cpu_buffer->overrun, 0);
87091- local_set(&cpu_buffer->commit_overrun, 0);
87092+ local_set_unchecked(&cpu_buffer->overrun, 0);
87093+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
87094 local_set(&cpu_buffer->dropped_events, 0);
87095 local_set(&cpu_buffer->entries, 0);
87096 local_set(&cpu_buffer->committing, 0);
87097@@ -4540,8 +4540,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
87098 rb_init_page(bpage);
87099 bpage = reader->page;
87100 reader->page = *data_page;
87101- local_set(&reader->write, 0);
87102- local_set(&reader->entries, 0);
87103+ local_set_unchecked(&reader->write, 0);
87104+ local_set_unchecked(&reader->entries, 0);
87105 reader->read = 0;
87106 *data_page = bpage;
87107
87108diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
87109index b778e96..4e84621 100644
87110--- a/kernel/trace/trace.c
87111+++ b/kernel/trace/trace.c
87112@@ -3335,7 +3335,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
87113 return 0;
87114 }
87115
87116-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
87117+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
87118 {
87119 /* do nothing if flag is already set */
87120 if (!!(trace_flags & mask) == !!enabled)
87121diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
87122index 10c86fb..645ab0a 100644
87123--- a/kernel/trace/trace.h
87124+++ b/kernel/trace/trace.h
87125@@ -1029,7 +1029,7 @@ extern const char *__stop___tracepoint_str[];
87126 void trace_printk_init_buffers(void);
87127 void trace_printk_start_comm(void);
87128 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
87129-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
87130+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
87131
87132 /*
87133 * Normal trace_printk() and friends allocates special buffers
87134diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
87135index 26dc348..8708ca7 100644
87136--- a/kernel/trace/trace_clock.c
87137+++ b/kernel/trace/trace_clock.c
87138@@ -123,7 +123,7 @@ u64 notrace trace_clock_global(void)
87139 return now;
87140 }
87141
87142-static atomic64_t trace_counter;
87143+static atomic64_unchecked_t trace_counter;
87144
87145 /*
87146 * trace_clock_counter(): simply an atomic counter.
87147@@ -132,5 +132,5 @@ static atomic64_t trace_counter;
87148 */
87149 u64 notrace trace_clock_counter(void)
87150 {
87151- return atomic64_add_return(1, &trace_counter);
87152+ return atomic64_inc_return_unchecked(&trace_counter);
87153 }
87154diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
87155index 368a4d5..7b6d1d5 100644
87156--- a/kernel/trace/trace_events.c
87157+++ b/kernel/trace/trace_events.c
87158@@ -1673,7 +1673,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
87159 return 0;
87160 }
87161
87162-struct ftrace_module_file_ops;
87163 static void __add_event_to_tracers(struct ftrace_event_call *call);
87164
87165 /* Add an additional event_call dynamically */
87166diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
87167index b3dcfb2..ebee344 100644
87168--- a/kernel/trace/trace_mmiotrace.c
87169+++ b/kernel/trace/trace_mmiotrace.c
87170@@ -24,7 +24,7 @@ struct header_iter {
87171 static struct trace_array *mmio_trace_array;
87172 static bool overrun_detected;
87173 static unsigned long prev_overruns;
87174-static atomic_t dropped_count;
87175+static atomic_unchecked_t dropped_count;
87176
87177 static void mmio_reset_data(struct trace_array *tr)
87178 {
87179@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
87180
87181 static unsigned long count_overruns(struct trace_iterator *iter)
87182 {
87183- unsigned long cnt = atomic_xchg(&dropped_count, 0);
87184+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
87185 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
87186
87187 if (over > prev_overruns)
87188@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
87189 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
87190 sizeof(*entry), 0, pc);
87191 if (!event) {
87192- atomic_inc(&dropped_count);
87193+ atomic_inc_unchecked(&dropped_count);
87194 return;
87195 }
87196 entry = ring_buffer_event_data(event);
87197@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
87198 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
87199 sizeof(*entry), 0, pc);
87200 if (!event) {
87201- atomic_inc(&dropped_count);
87202+ atomic_inc_unchecked(&dropped_count);
87203 return;
87204 }
87205 entry = ring_buffer_event_data(event);
87206diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
87207index 34e7cba..6f9a729 100644
87208--- a/kernel/trace/trace_output.c
87209+++ b/kernel/trace/trace_output.c
87210@@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
87211
87212 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
87213 if (!IS_ERR(p)) {
87214- p = mangle_path(s->buffer + s->len, p, "\n");
87215+ p = mangle_path(s->buffer + s->len, p, "\n\\");
87216 if (p) {
87217 s->len = p - s->buffer;
87218 return 1;
87219@@ -893,14 +893,16 @@ int register_ftrace_event(struct trace_event *event)
87220 goto out;
87221 }
87222
87223+ pax_open_kernel();
87224 if (event->funcs->trace == NULL)
87225- event->funcs->trace = trace_nop_print;
87226+ *(void **)&event->funcs->trace = trace_nop_print;
87227 if (event->funcs->raw == NULL)
87228- event->funcs->raw = trace_nop_print;
87229+ *(void **)&event->funcs->raw = trace_nop_print;
87230 if (event->funcs->hex == NULL)
87231- event->funcs->hex = trace_nop_print;
87232+ *(void **)&event->funcs->hex = trace_nop_print;
87233 if (event->funcs->binary == NULL)
87234- event->funcs->binary = trace_nop_print;
87235+ *(void **)&event->funcs->binary = trace_nop_print;
87236+ pax_close_kernel();
87237
87238 key = event->type & (EVENT_HASHSIZE - 1);
87239
87240diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
87241index b20428c..4845a10 100644
87242--- a/kernel/trace/trace_stack.c
87243+++ b/kernel/trace/trace_stack.c
87244@@ -68,7 +68,7 @@ check_stack(unsigned long ip, unsigned long *stack)
87245 return;
87246
87247 /* we do not handle interrupt stacks yet */
87248- if (!object_is_on_stack(stack))
87249+ if (!object_starts_on_stack(stack))
87250 return;
87251
87252 local_irq_save(flags);
87253diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
87254index 13fb113..a6ced3f 100644
87255--- a/kernel/user_namespace.c
87256+++ b/kernel/user_namespace.c
87257@@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
87258 !kgid_has_mapping(parent_ns, group))
87259 return -EPERM;
87260
87261+#ifdef CONFIG_GRKERNSEC
87262+ /*
87263+ * This doesn't really inspire confidence:
87264+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
87265+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
87266+ * Increases kernel attack surface in areas developers
87267+ * previously cared little about ("low importance due
87268+ * to requiring "root" capability")
87269+ * To be removed when this code receives *proper* review
87270+ */
87271+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
87272+ !capable(CAP_SETGID))
87273+ return -EPERM;
87274+#endif
87275+
87276 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
87277 if (!ns)
87278 return -ENOMEM;
87279@@ -860,7 +875,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
87280 if (atomic_read(&current->mm->mm_users) > 1)
87281 return -EINVAL;
87282
87283- if (current->fs->users != 1)
87284+ if (atomic_read(&current->fs->users) != 1)
87285 return -EINVAL;
87286
87287 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
87288diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
87289index 4f69f9a..7c6f8f8 100644
87290--- a/kernel/utsname_sysctl.c
87291+++ b/kernel/utsname_sysctl.c
87292@@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
87293 static int proc_do_uts_string(ctl_table *table, int write,
87294 void __user *buffer, size_t *lenp, loff_t *ppos)
87295 {
87296- struct ctl_table uts_table;
87297+ ctl_table_no_const uts_table;
87298 int r;
87299 memcpy(&uts_table, table, sizeof(uts_table));
87300 uts_table.data = get_uts(table, write);
87301diff --git a/kernel/watchdog.c b/kernel/watchdog.c
87302index 4431610..4265616 100644
87303--- a/kernel/watchdog.c
87304+++ b/kernel/watchdog.c
87305@@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
87306 static void watchdog_nmi_disable(unsigned int cpu) { return; }
87307 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
87308
87309-static struct smp_hotplug_thread watchdog_threads = {
87310+static struct smp_hotplug_thread watchdog_threads __read_only = {
87311 .store = &softlockup_watchdog,
87312 .thread_should_run = watchdog_should_run,
87313 .thread_fn = watchdog,
87314diff --git a/kernel/workqueue.c b/kernel/workqueue.c
87315index 93c2652..66a1cfd 100644
87316--- a/kernel/workqueue.c
87317+++ b/kernel/workqueue.c
87318@@ -4668,7 +4668,7 @@ static void rebind_workers(struct worker_pool *pool)
87319 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
87320 worker_flags |= WORKER_REBOUND;
87321 worker_flags &= ~WORKER_UNBOUND;
87322- ACCESS_ONCE(worker->flags) = worker_flags;
87323+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
87324 }
87325
87326 spin_unlock_irq(&pool->lock);
87327diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
87328index 094f315..244a824 100644
87329--- a/lib/Kconfig.debug
87330+++ b/lib/Kconfig.debug
87331@@ -836,7 +836,7 @@ config DEBUG_MUTEXES
87332
87333 config DEBUG_WW_MUTEX_SLOWPATH
87334 bool "Wait/wound mutex debugging: Slowpath testing"
87335- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87336+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87337 select DEBUG_LOCK_ALLOC
87338 select DEBUG_SPINLOCK
87339 select DEBUG_MUTEXES
87340@@ -849,7 +849,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
87341
87342 config DEBUG_LOCK_ALLOC
87343 bool "Lock debugging: detect incorrect freeing of live locks"
87344- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87345+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87346 select DEBUG_SPINLOCK
87347 select DEBUG_MUTEXES
87348 select LOCKDEP
87349@@ -863,7 +863,7 @@ config DEBUG_LOCK_ALLOC
87350
87351 config PROVE_LOCKING
87352 bool "Lock debugging: prove locking correctness"
87353- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87354+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87355 select LOCKDEP
87356 select DEBUG_SPINLOCK
87357 select DEBUG_MUTEXES
87358@@ -914,7 +914,7 @@ config LOCKDEP
87359
87360 config LOCK_STAT
87361 bool "Lock usage statistics"
87362- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87363+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87364 select LOCKDEP
87365 select DEBUG_SPINLOCK
87366 select DEBUG_MUTEXES
87367@@ -1376,6 +1376,7 @@ config LATENCYTOP
87368 depends on DEBUG_KERNEL
87369 depends on STACKTRACE_SUPPORT
87370 depends on PROC_FS
87371+ depends on !GRKERNSEC_HIDESYM
87372 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
87373 select KALLSYMS
87374 select KALLSYMS_ALL
87375@@ -1392,7 +1393,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
87376 config DEBUG_STRICT_USER_COPY_CHECKS
87377 bool "Strict user copy size checks"
87378 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
87379- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
87380+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
87381 help
87382 Enabling this option turns a certain set of sanity checks for user
87383 copy operations into compile time failures.
87384@@ -1502,7 +1503,7 @@ endmenu # runtime tests
87385
87386 config PROVIDE_OHCI1394_DMA_INIT
87387 bool "Remote debugging over FireWire early on boot"
87388- depends on PCI && X86
87389+ depends on PCI && X86 && !GRKERNSEC
87390 help
87391 If you want to debug problems which hang or crash the kernel early
87392 on boot and the crashing machine has a FireWire port, you can use
87393@@ -1531,7 +1532,7 @@ config PROVIDE_OHCI1394_DMA_INIT
87394
87395 config FIREWIRE_OHCI_REMOTE_DMA
87396 bool "Remote debugging over FireWire with firewire-ohci"
87397- depends on FIREWIRE_OHCI
87398+ depends on FIREWIRE_OHCI && !GRKERNSEC
87399 help
87400 This option lets you use the FireWire bus for remote debugging
87401 with help of the firewire-ohci driver. It enables unfiltered
87402diff --git a/lib/Makefile b/lib/Makefile
87403index f3bb2cb..b358ace 100644
87404--- a/lib/Makefile
87405+++ b/lib/Makefile
87406@@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
87407
87408 obj-$(CONFIG_BTREE) += btree.o
87409 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
87410-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
87411+obj-y += list_debug.o
87412 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
87413
87414 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
87415diff --git a/lib/bitmap.c b/lib/bitmap.c
87416index 06f7e4f..f3cf2b0 100644
87417--- a/lib/bitmap.c
87418+++ b/lib/bitmap.c
87419@@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
87420 {
87421 int c, old_c, totaldigits, ndigits, nchunks, nbits;
87422 u32 chunk;
87423- const char __user __force *ubuf = (const char __user __force *)buf;
87424+ const char __user *ubuf = (const char __force_user *)buf;
87425
87426 bitmap_zero(maskp, nmaskbits);
87427
87428@@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
87429 {
87430 if (!access_ok(VERIFY_READ, ubuf, ulen))
87431 return -EFAULT;
87432- return __bitmap_parse((const char __force *)ubuf,
87433+ return __bitmap_parse((const char __force_kernel *)ubuf,
87434 ulen, 1, maskp, nmaskbits);
87435
87436 }
87437@@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
87438 {
87439 unsigned a, b;
87440 int c, old_c, totaldigits;
87441- const char __user __force *ubuf = (const char __user __force *)buf;
87442+ const char __user *ubuf = (const char __force_user *)buf;
87443 int exp_digit, in_range;
87444
87445 totaldigits = c = 0;
87446@@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
87447 {
87448 if (!access_ok(VERIFY_READ, ubuf, ulen))
87449 return -EFAULT;
87450- return __bitmap_parselist((const char __force *)ubuf,
87451+ return __bitmap_parselist((const char __force_kernel *)ubuf,
87452 ulen, 1, maskp, nmaskbits);
87453 }
87454 EXPORT_SYMBOL(bitmap_parselist_user);
87455diff --git a/lib/bug.c b/lib/bug.c
87456index 1686034..a9c00c8 100644
87457--- a/lib/bug.c
87458+++ b/lib/bug.c
87459@@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
87460 return BUG_TRAP_TYPE_NONE;
87461
87462 bug = find_bug(bugaddr);
87463+ if (!bug)
87464+ return BUG_TRAP_TYPE_NONE;
87465
87466 file = NULL;
87467 line = 0;
87468diff --git a/lib/debugobjects.c b/lib/debugobjects.c
87469index bf2c8b1..1d00ccf 100644
87470--- a/lib/debugobjects.c
87471+++ b/lib/debugobjects.c
87472@@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
87473 if (limit > 4)
87474 return;
87475
87476- is_on_stack = object_is_on_stack(addr);
87477+ is_on_stack = object_starts_on_stack(addr);
87478 if (is_on_stack == onstack)
87479 return;
87480
87481diff --git a/lib/devres.c b/lib/devres.c
87482index 8235331..5881053 100644
87483--- a/lib/devres.c
87484+++ b/lib/devres.c
87485@@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
87486 void devm_iounmap(struct device *dev, void __iomem *addr)
87487 {
87488 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
87489- (void *)addr));
87490+ (void __force *)addr));
87491 iounmap(addr);
87492 }
87493 EXPORT_SYMBOL(devm_iounmap);
87494@@ -224,7 +224,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
87495 {
87496 ioport_unmap(addr);
87497 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
87498- devm_ioport_map_match, (void *)addr));
87499+ devm_ioport_map_match, (void __force *)addr));
87500 }
87501 EXPORT_SYMBOL(devm_ioport_unmap);
87502 #endif /* CONFIG_HAS_IOPORT */
87503diff --git a/lib/div64.c b/lib/div64.c
87504index 4382ad7..08aa558 100644
87505--- a/lib/div64.c
87506+++ b/lib/div64.c
87507@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
87508 EXPORT_SYMBOL(__div64_32);
87509
87510 #ifndef div_s64_rem
87511-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
87512+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
87513 {
87514 u64 quotient;
87515
87516@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
87517 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
87518 */
87519 #ifndef div64_u64
87520-u64 div64_u64(u64 dividend, u64 divisor)
87521+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
87522 {
87523 u32 high = divisor >> 32;
87524 u64 quot;
87525diff --git a/lib/dma-debug.c b/lib/dma-debug.c
87526index d87a17a..ac0d79a 100644
87527--- a/lib/dma-debug.c
87528+++ b/lib/dma-debug.c
87529@@ -768,7 +768,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
87530
87531 void dma_debug_add_bus(struct bus_type *bus)
87532 {
87533- struct notifier_block *nb;
87534+ notifier_block_no_const *nb;
87535
87536 if (global_disable)
87537 return;
87538@@ -945,7 +945,7 @@ static void check_unmap(struct dma_debug_entry *ref)
87539
87540 static void check_for_stack(struct device *dev, void *addr)
87541 {
87542- if (object_is_on_stack(addr))
87543+ if (object_starts_on_stack(addr))
87544 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
87545 "stack [addr=%p]\n", addr);
87546 }
87547diff --git a/lib/inflate.c b/lib/inflate.c
87548index 013a761..c28f3fc 100644
87549--- a/lib/inflate.c
87550+++ b/lib/inflate.c
87551@@ -269,7 +269,7 @@ static void free(void *where)
87552 malloc_ptr = free_mem_ptr;
87553 }
87554 #else
87555-#define malloc(a) kmalloc(a, GFP_KERNEL)
87556+#define malloc(a) kmalloc((a), GFP_KERNEL)
87557 #define free(a) kfree(a)
87558 #endif
87559
87560diff --git a/lib/ioremap.c b/lib/ioremap.c
87561index 0c9216c..863bd89 100644
87562--- a/lib/ioremap.c
87563+++ b/lib/ioremap.c
87564@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
87565 unsigned long next;
87566
87567 phys_addr -= addr;
87568- pmd = pmd_alloc(&init_mm, pud, addr);
87569+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
87570 if (!pmd)
87571 return -ENOMEM;
87572 do {
87573@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
87574 unsigned long next;
87575
87576 phys_addr -= addr;
87577- pud = pud_alloc(&init_mm, pgd, addr);
87578+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
87579 if (!pud)
87580 return -ENOMEM;
87581 do {
87582diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
87583index bd2bea9..6b3c95e 100644
87584--- a/lib/is_single_threaded.c
87585+++ b/lib/is_single_threaded.c
87586@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
87587 struct task_struct *p, *t;
87588 bool ret;
87589
87590+ if (!mm)
87591+ return true;
87592+
87593 if (atomic_read(&task->signal->live) != 1)
87594 return false;
87595
87596diff --git a/lib/kobject.c b/lib/kobject.c
87597index 084f7b1..d265b8a 100644
87598--- a/lib/kobject.c
87599+++ b/lib/kobject.c
87600@@ -875,9 +875,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
87601
87602
87603 static DEFINE_SPINLOCK(kobj_ns_type_lock);
87604-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
87605+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
87606
87607-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
87608+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
87609 {
87610 enum kobj_ns_type type = ops->type;
87611 int error;
87612diff --git a/lib/list_debug.c b/lib/list_debug.c
87613index c24c2f7..f0296f4 100644
87614--- a/lib/list_debug.c
87615+++ b/lib/list_debug.c
87616@@ -11,7 +11,9 @@
87617 #include <linux/bug.h>
87618 #include <linux/kernel.h>
87619 #include <linux/rculist.h>
87620+#include <linux/mm.h>
87621
87622+#ifdef CONFIG_DEBUG_LIST
87623 /*
87624 * Insert a new entry between two known consecutive entries.
87625 *
87626@@ -19,21 +21,40 @@
87627 * the prev/next entries already!
87628 */
87629
87630+static bool __list_add_debug(struct list_head *new,
87631+ struct list_head *prev,
87632+ struct list_head *next)
87633+{
87634+ if (unlikely(next->prev != prev)) {
87635+ printk(KERN_ERR "list_add corruption. next->prev should be "
87636+ "prev (%p), but was %p. (next=%p).\n",
87637+ prev, next->prev, next);
87638+ BUG();
87639+ return false;
87640+ }
87641+ if (unlikely(prev->next != next)) {
87642+ printk(KERN_ERR "list_add corruption. prev->next should be "
87643+ "next (%p), but was %p. (prev=%p).\n",
87644+ next, prev->next, prev);
87645+ BUG();
87646+ return false;
87647+ }
87648+ if (unlikely(new == prev || new == next)) {
87649+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
87650+ new, prev, next);
87651+ BUG();
87652+ return false;
87653+ }
87654+ return true;
87655+}
87656+
87657 void __list_add(struct list_head *new,
87658- struct list_head *prev,
87659- struct list_head *next)
87660+ struct list_head *prev,
87661+ struct list_head *next)
87662 {
87663- WARN(next->prev != prev,
87664- "list_add corruption. next->prev should be "
87665- "prev (%p), but was %p. (next=%p).\n",
87666- prev, next->prev, next);
87667- WARN(prev->next != next,
87668- "list_add corruption. prev->next should be "
87669- "next (%p), but was %p. (prev=%p).\n",
87670- next, prev->next, prev);
87671- WARN(new == prev || new == next,
87672- "list_add double add: new=%p, prev=%p, next=%p.\n",
87673- new, prev, next);
87674+ if (!__list_add_debug(new, prev, next))
87675+ return;
87676+
87677 next->prev = new;
87678 new->next = next;
87679 new->prev = prev;
87680@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
87681 }
87682 EXPORT_SYMBOL(__list_add);
87683
87684-void __list_del_entry(struct list_head *entry)
87685+static bool __list_del_entry_debug(struct list_head *entry)
87686 {
87687 struct list_head *prev, *next;
87688
87689 prev = entry->prev;
87690 next = entry->next;
87691
87692- if (WARN(next == LIST_POISON1,
87693- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
87694- entry, LIST_POISON1) ||
87695- WARN(prev == LIST_POISON2,
87696- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
87697- entry, LIST_POISON2) ||
87698- WARN(prev->next != entry,
87699- "list_del corruption. prev->next should be %p, "
87700- "but was %p\n", entry, prev->next) ||
87701- WARN(next->prev != entry,
87702- "list_del corruption. next->prev should be %p, "
87703- "but was %p\n", entry, next->prev))
87704+ if (unlikely(next == LIST_POISON1)) {
87705+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
87706+ entry, LIST_POISON1);
87707+ BUG();
87708+ return false;
87709+ }
87710+ if (unlikely(prev == LIST_POISON2)) {
87711+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
87712+ entry, LIST_POISON2);
87713+ BUG();
87714+ return false;
87715+ }
87716+ if (unlikely(entry->prev->next != entry)) {
87717+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
87718+ "but was %p\n", entry, prev->next);
87719+ BUG();
87720+ return false;
87721+ }
87722+ if (unlikely(entry->next->prev != entry)) {
87723+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
87724+ "but was %p\n", entry, next->prev);
87725+ BUG();
87726+ return false;
87727+ }
87728+ return true;
87729+}
87730+
87731+void __list_del_entry(struct list_head *entry)
87732+{
87733+ if (!__list_del_entry_debug(entry))
87734 return;
87735
87736- __list_del(prev, next);
87737+ __list_del(entry->prev, entry->next);
87738 }
87739 EXPORT_SYMBOL(__list_del_entry);
87740
87741@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
87742 void __list_add_rcu(struct list_head *new,
87743 struct list_head *prev, struct list_head *next)
87744 {
87745- WARN(next->prev != prev,
87746- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
87747- prev, next->prev, next);
87748- WARN(prev->next != next,
87749- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
87750- next, prev->next, prev);
87751+ if (!__list_add_debug(new, prev, next))
87752+ return;
87753+
87754 new->next = next;
87755 new->prev = prev;
87756 rcu_assign_pointer(list_next_rcu(prev), new);
87757 next->prev = new;
87758 }
87759 EXPORT_SYMBOL(__list_add_rcu);
87760+#endif
87761+
87762+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
87763+{
87764+#ifdef CONFIG_DEBUG_LIST
87765+ if (!__list_add_debug(new, prev, next))
87766+ return;
87767+#endif
87768+
87769+ pax_open_kernel();
87770+ next->prev = new;
87771+ new->next = next;
87772+ new->prev = prev;
87773+ prev->next = new;
87774+ pax_close_kernel();
87775+}
87776+EXPORT_SYMBOL(__pax_list_add);
87777+
87778+void pax_list_del(struct list_head *entry)
87779+{
87780+#ifdef CONFIG_DEBUG_LIST
87781+ if (!__list_del_entry_debug(entry))
87782+ return;
87783+#endif
87784+
87785+ pax_open_kernel();
87786+ __list_del(entry->prev, entry->next);
87787+ entry->next = LIST_POISON1;
87788+ entry->prev = LIST_POISON2;
87789+ pax_close_kernel();
87790+}
87791+EXPORT_SYMBOL(pax_list_del);
87792+
87793+void pax_list_del_init(struct list_head *entry)
87794+{
87795+ pax_open_kernel();
87796+ __list_del(entry->prev, entry->next);
87797+ INIT_LIST_HEAD(entry);
87798+ pax_close_kernel();
87799+}
87800+EXPORT_SYMBOL(pax_list_del_init);
87801+
87802+void __pax_list_add_rcu(struct list_head *new,
87803+ struct list_head *prev, struct list_head *next)
87804+{
87805+#ifdef CONFIG_DEBUG_LIST
87806+ if (!__list_add_debug(new, prev, next))
87807+ return;
87808+#endif
87809+
87810+ pax_open_kernel();
87811+ new->next = next;
87812+ new->prev = prev;
87813+ rcu_assign_pointer(list_next_rcu(prev), new);
87814+ next->prev = new;
87815+ pax_close_kernel();
87816+}
87817+EXPORT_SYMBOL(__pax_list_add_rcu);
87818+
87819+void pax_list_del_rcu(struct list_head *entry)
87820+{
87821+#ifdef CONFIG_DEBUG_LIST
87822+ if (!__list_del_entry_debug(entry))
87823+ return;
87824+#endif
87825+
87826+ pax_open_kernel();
87827+ __list_del(entry->prev, entry->next);
87828+ entry->next = LIST_POISON1;
87829+ entry->prev = LIST_POISON2;
87830+ pax_close_kernel();
87831+}
87832+EXPORT_SYMBOL(pax_list_del_rcu);
87833diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
87834index 1a53d49..ace934c 100644
87835--- a/lib/percpu-refcount.c
87836+++ b/lib/percpu-refcount.c
87837@@ -29,7 +29,7 @@
87838 * can't hit 0 before we've added up all the percpu refs.
87839 */
87840
87841-#define PCPU_COUNT_BIAS (1U << 31)
87842+#define PCPU_COUNT_BIAS (1U << 30)
87843
87844 /**
87845 * percpu_ref_init - initialize a percpu refcount
87846diff --git a/lib/radix-tree.c b/lib/radix-tree.c
87847index 7811ed3..f80ca19 100644
87848--- a/lib/radix-tree.c
87849+++ b/lib/radix-tree.c
87850@@ -93,7 +93,7 @@ struct radix_tree_preload {
87851 int nr;
87852 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
87853 };
87854-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
87855+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
87856
87857 static inline void *ptr_to_indirect(void *ptr)
87858 {
87859diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
87860index bb2b201..46abaf9 100644
87861--- a/lib/strncpy_from_user.c
87862+++ b/lib/strncpy_from_user.c
87863@@ -21,7 +21,7 @@
87864 */
87865 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
87866 {
87867- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87868+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87869 long res = 0;
87870
87871 /*
87872diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
87873index a28df52..3d55877 100644
87874--- a/lib/strnlen_user.c
87875+++ b/lib/strnlen_user.c
87876@@ -26,7 +26,7 @@
87877 */
87878 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
87879 {
87880- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87881+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87882 long align, res = 0;
87883 unsigned long c;
87884
87885diff --git a/lib/swiotlb.c b/lib/swiotlb.c
87886index 4e8686c..3e8c92f 100644
87887--- a/lib/swiotlb.c
87888+++ b/lib/swiotlb.c
87889@@ -664,7 +664,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
87890
87891 void
87892 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
87893- dma_addr_t dev_addr)
87894+ dma_addr_t dev_addr, struct dma_attrs *attrs)
87895 {
87896 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
87897
87898diff --git a/lib/usercopy.c b/lib/usercopy.c
87899index 4f5b1dd..7cab418 100644
87900--- a/lib/usercopy.c
87901+++ b/lib/usercopy.c
87902@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
87903 WARN(1, "Buffer overflow detected!\n");
87904 }
87905 EXPORT_SYMBOL(copy_from_user_overflow);
87906+
87907+void copy_to_user_overflow(void)
87908+{
87909+ WARN(1, "Buffer overflow detected!\n");
87910+}
87911+EXPORT_SYMBOL(copy_to_user_overflow);
87912diff --git a/lib/vsprintf.c b/lib/vsprintf.c
87913index d76555c..62d4bfe 100644
87914--- a/lib/vsprintf.c
87915+++ b/lib/vsprintf.c
87916@@ -16,6 +16,9 @@
87917 * - scnprintf and vscnprintf
87918 */
87919
87920+#ifdef CONFIG_GRKERNSEC_HIDESYM
87921+#define __INCLUDED_BY_HIDESYM 1
87922+#endif
87923 #include <stdarg.h>
87924 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
87925 #include <linux/types.h>
87926@@ -1155,7 +1158,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
87927 return number(buf, end, *(const netdev_features_t *)addr, spec);
87928 }
87929
87930+#ifdef CONFIG_GRKERNSEC_HIDESYM
87931+int kptr_restrict __read_mostly = 2;
87932+#else
87933 int kptr_restrict __read_mostly;
87934+#endif
87935
87936 /*
87937 * Show a '%p' thing. A kernel extension is that the '%p' is followed
87938@@ -1168,6 +1175,7 @@ int kptr_restrict __read_mostly;
87939 * - 'f' For simple symbolic function names without offset
87940 * - 'S' For symbolic direct pointers with offset
87941 * - 's' For symbolic direct pointers without offset
87942+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
87943 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
87944 * - 'B' For backtraced symbolic direct pointers with offset
87945 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
87946@@ -1232,12 +1240,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87947
87948 if (!ptr && *fmt != 'K') {
87949 /*
87950- * Print (null) with the same width as a pointer so it makes
87951+ * Print (nil) with the same width as a pointer so it makes
87952 * tabular output look nice.
87953 */
87954 if (spec.field_width == -1)
87955 spec.field_width = default_width;
87956- return string(buf, end, "(null)", spec);
87957+ return string(buf, end, "(nil)", spec);
87958 }
87959
87960 switch (*fmt) {
87961@@ -1247,6 +1255,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87962 /* Fallthrough */
87963 case 'S':
87964 case 's':
87965+#ifdef CONFIG_GRKERNSEC_HIDESYM
87966+ break;
87967+#else
87968+ return symbol_string(buf, end, ptr, spec, fmt);
87969+#endif
87970+ case 'A':
87971 case 'B':
87972 return symbol_string(buf, end, ptr, spec, fmt);
87973 case 'R':
87974@@ -1302,6 +1316,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87975 va_end(va);
87976 return buf;
87977 }
87978+ case 'P':
87979+ break;
87980 case 'K':
87981 /*
87982 * %pK cannot be used in IRQ context because its test
87983@@ -1363,6 +1379,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87984 ((const struct file *)ptr)->f_path.dentry,
87985 spec, fmt);
87986 }
87987+
87988+#ifdef CONFIG_GRKERNSEC_HIDESYM
87989+ /* 'P' = approved pointers to copy to userland,
87990+ as in the /proc/kallsyms case, as we make it display nothing
87991+ for non-root users, and the real contents for root users
87992+ Also ignore 'K' pointers, since we force their NULLing for non-root users
87993+ above
87994+ */
87995+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
87996+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
87997+ dump_stack();
87998+ ptr = NULL;
87999+ }
88000+#endif
88001+
88002 spec.flags |= SMALL;
88003 if (spec.field_width == -1) {
88004 spec.field_width = default_width;
88005@@ -2086,11 +2117,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
88006 typeof(type) value; \
88007 if (sizeof(type) == 8) { \
88008 args = PTR_ALIGN(args, sizeof(u32)); \
88009- *(u32 *)&value = *(u32 *)args; \
88010- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
88011+ *(u32 *)&value = *(const u32 *)args; \
88012+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
88013 } else { \
88014 args = PTR_ALIGN(args, sizeof(type)); \
88015- value = *(typeof(type) *)args; \
88016+ value = *(const typeof(type) *)args; \
88017 } \
88018 args += sizeof(type); \
88019 value; \
88020@@ -2153,7 +2184,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
88021 case FORMAT_TYPE_STR: {
88022 const char *str_arg = args;
88023 args += strlen(str_arg) + 1;
88024- str = string(str, end, (char *)str_arg, spec);
88025+ str = string(str, end, str_arg, spec);
88026 break;
88027 }
88028
88029diff --git a/localversion-grsec b/localversion-grsec
88030new file mode 100644
88031index 0000000..7cd6065
88032--- /dev/null
88033+++ b/localversion-grsec
88034@@ -0,0 +1 @@
88035+-grsec
88036diff --git a/mm/Kconfig b/mm/Kconfig
88037index 394838f..0e5f816 100644
88038--- a/mm/Kconfig
88039+++ b/mm/Kconfig
88040@@ -317,10 +317,11 @@ config KSM
88041 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
88042
88043 config DEFAULT_MMAP_MIN_ADDR
88044- int "Low address space to protect from user allocation"
88045+ int "Low address space to protect from user allocation"
88046 depends on MMU
88047- default 4096
88048- help
88049+ default 32768 if ALPHA || ARM || PARISC || SPARC32
88050+ default 65536
88051+ help
88052 This is the portion of low virtual memory which should be protected
88053 from userspace allocation. Keeping a user from writing to low pages
88054 can help reduce the impact of kernel NULL pointer bugs.
88055@@ -351,7 +352,7 @@ config MEMORY_FAILURE
88056
88057 config HWPOISON_INJECT
88058 tristate "HWPoison pages injector"
88059- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
88060+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
88061 select PROC_PAGE_MONITOR
88062
88063 config NOMMU_INITIAL_TRIM_EXCESS
88064diff --git a/mm/backing-dev.c b/mm/backing-dev.c
88065index ce682f7..1fb54f9 100644
88066--- a/mm/backing-dev.c
88067+++ b/mm/backing-dev.c
88068@@ -12,7 +12,7 @@
88069 #include <linux/device.h>
88070 #include <trace/events/writeback.h>
88071
88072-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
88073+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
88074
88075 struct backing_dev_info default_backing_dev_info = {
88076 .name = "default",
88077@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
88078 return err;
88079
88080 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
88081- atomic_long_inc_return(&bdi_seq));
88082+ atomic_long_inc_return_unchecked(&bdi_seq));
88083 if (err) {
88084 bdi_destroy(bdi);
88085 return err;
88086diff --git a/mm/filemap.c b/mm/filemap.c
88087index ae4846f..b0acebe 100644
88088--- a/mm/filemap.c
88089+++ b/mm/filemap.c
88090@@ -1768,7 +1768,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
88091 struct address_space *mapping = file->f_mapping;
88092
88093 if (!mapping->a_ops->readpage)
88094- return -ENOEXEC;
88095+ return -ENODEV;
88096 file_accessed(file);
88097 vma->vm_ops = &generic_file_vm_ops;
88098 return 0;
88099@@ -1950,7 +1950,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
88100
88101 while (bytes) {
88102 char __user *buf = iov->iov_base + base;
88103- int copy = min(bytes, iov->iov_len - base);
88104+ size_t copy = min(bytes, iov->iov_len - base);
88105
88106 base = 0;
88107 left = __copy_from_user_inatomic(vaddr, buf, copy);
88108@@ -1979,7 +1979,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
88109 BUG_ON(!in_atomic());
88110 kaddr = kmap_atomic(page);
88111 if (likely(i->nr_segs == 1)) {
88112- int left;
88113+ size_t left;
88114 char __user *buf = i->iov->iov_base + i->iov_offset;
88115 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
88116 copied = bytes - left;
88117@@ -2007,7 +2007,7 @@ size_t iov_iter_copy_from_user(struct page *page,
88118
88119 kaddr = kmap(page);
88120 if (likely(i->nr_segs == 1)) {
88121- int left;
88122+ size_t left;
88123 char __user *buf = i->iov->iov_base + i->iov_offset;
88124 left = __copy_from_user(kaddr + offset, buf, bytes);
88125 copied = bytes - left;
88126@@ -2037,7 +2037,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
88127 * zero-length segments (without overruning the iovec).
88128 */
88129 while (bytes || unlikely(i->count && !iov->iov_len)) {
88130- int copy;
88131+ size_t copy;
88132
88133 copy = min(bytes, iov->iov_len - base);
88134 BUG_ON(!i->count || i->count < copy);
88135@@ -2108,6 +2108,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
88136 *pos = i_size_read(inode);
88137
88138 if (limit != RLIM_INFINITY) {
88139+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
88140 if (*pos >= limit) {
88141 send_sig(SIGXFSZ, current, 0);
88142 return -EFBIG;
88143diff --git a/mm/fremap.c b/mm/fremap.c
88144index bbc4d66..117b798 100644
88145--- a/mm/fremap.c
88146+++ b/mm/fremap.c
88147@@ -163,6 +163,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
88148 retry:
88149 vma = find_vma(mm, start);
88150
88151+#ifdef CONFIG_PAX_SEGMEXEC
88152+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
88153+ goto out;
88154+#endif
88155+
88156 /*
88157 * Make sure the vma is shared, that it supports prefaulting,
88158 * and that the remapped range is valid and fully within
88159diff --git a/mm/highmem.c b/mm/highmem.c
88160index b32b70c..e512eb0 100644
88161--- a/mm/highmem.c
88162+++ b/mm/highmem.c
88163@@ -138,8 +138,9 @@ static void flush_all_zero_pkmaps(void)
88164 * So no dangers, even with speculative execution.
88165 */
88166 page = pte_page(pkmap_page_table[i]);
88167+ pax_open_kernel();
88168 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
88169-
88170+ pax_close_kernel();
88171 set_page_address(page, NULL);
88172 need_flush = 1;
88173 }
88174@@ -198,9 +199,11 @@ start:
88175 }
88176 }
88177 vaddr = PKMAP_ADDR(last_pkmap_nr);
88178+
88179+ pax_open_kernel();
88180 set_pte_at(&init_mm, vaddr,
88181 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
88182-
88183+ pax_close_kernel();
88184 pkmap_count[last_pkmap_nr] = 1;
88185 set_page_address(page, (void *)vaddr);
88186
88187diff --git a/mm/hugetlb.c b/mm/hugetlb.c
88188index 0b7656e..d21cefc 100644
88189--- a/mm/hugetlb.c
88190+++ b/mm/hugetlb.c
88191@@ -2094,15 +2094,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
88192 struct hstate *h = &default_hstate;
88193 unsigned long tmp;
88194 int ret;
88195+ ctl_table_no_const hugetlb_table;
88196
88197 tmp = h->max_huge_pages;
88198
88199 if (write && h->order >= MAX_ORDER)
88200 return -EINVAL;
88201
88202- table->data = &tmp;
88203- table->maxlen = sizeof(unsigned long);
88204- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
88205+ hugetlb_table = *table;
88206+ hugetlb_table.data = &tmp;
88207+ hugetlb_table.maxlen = sizeof(unsigned long);
88208+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
88209 if (ret)
88210 goto out;
88211
88212@@ -2147,15 +2149,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
88213 struct hstate *h = &default_hstate;
88214 unsigned long tmp;
88215 int ret;
88216+ ctl_table_no_const hugetlb_table;
88217
88218 tmp = h->nr_overcommit_huge_pages;
88219
88220 if (write && h->order >= MAX_ORDER)
88221 return -EINVAL;
88222
88223- table->data = &tmp;
88224- table->maxlen = sizeof(unsigned long);
88225- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
88226+ hugetlb_table = *table;
88227+ hugetlb_table.data = &tmp;
88228+ hugetlb_table.maxlen = sizeof(unsigned long);
88229+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
88230 if (ret)
88231 goto out;
88232
88233@@ -2605,6 +2609,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
88234 return 1;
88235 }
88236
88237+#ifdef CONFIG_PAX_SEGMEXEC
88238+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
88239+{
88240+ struct mm_struct *mm = vma->vm_mm;
88241+ struct vm_area_struct *vma_m;
88242+ unsigned long address_m;
88243+ pte_t *ptep_m;
88244+
88245+ vma_m = pax_find_mirror_vma(vma);
88246+ if (!vma_m)
88247+ return;
88248+
88249+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88250+ address_m = address + SEGMEXEC_TASK_SIZE;
88251+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
88252+ get_page(page_m);
88253+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
88254+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
88255+}
88256+#endif
88257+
88258 /*
88259 * Hugetlb_cow() should be called with page lock of the original hugepage held.
88260 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
88261@@ -2721,6 +2746,11 @@ retry_avoidcopy:
88262 make_huge_pte(vma, new_page, 1));
88263 page_remove_rmap(old_page);
88264 hugepage_add_new_anon_rmap(new_page, vma, address);
88265+
88266+#ifdef CONFIG_PAX_SEGMEXEC
88267+ pax_mirror_huge_pte(vma, address, new_page);
88268+#endif
88269+
88270 /* Make the old page be freed below */
88271 new_page = old_page;
88272 }
88273@@ -2883,6 +2913,10 @@ retry:
88274 && (vma->vm_flags & VM_SHARED)));
88275 set_huge_pte_at(mm, address, ptep, new_pte);
88276
88277+#ifdef CONFIG_PAX_SEGMEXEC
88278+ pax_mirror_huge_pte(vma, address, page);
88279+#endif
88280+
88281 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
88282 /* Optimization, do the COW without a second fault */
88283 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
88284@@ -2912,6 +2946,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
88285 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
88286 struct hstate *h = hstate_vma(vma);
88287
88288+#ifdef CONFIG_PAX_SEGMEXEC
88289+ struct vm_area_struct *vma_m;
88290+#endif
88291+
88292 address &= huge_page_mask(h);
88293
88294 ptep = huge_pte_offset(mm, address);
88295@@ -2925,6 +2963,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
88296 VM_FAULT_SET_HINDEX(hstate_index(h));
88297 }
88298
88299+#ifdef CONFIG_PAX_SEGMEXEC
88300+ vma_m = pax_find_mirror_vma(vma);
88301+ if (vma_m) {
88302+ unsigned long address_m;
88303+
88304+ if (vma->vm_start > vma_m->vm_start) {
88305+ address_m = address;
88306+ address -= SEGMEXEC_TASK_SIZE;
88307+ vma = vma_m;
88308+ h = hstate_vma(vma);
88309+ } else
88310+ address_m = address + SEGMEXEC_TASK_SIZE;
88311+
88312+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
88313+ return VM_FAULT_OOM;
88314+ address_m &= HPAGE_MASK;
88315+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
88316+ }
88317+#endif
88318+
88319 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
88320 if (!ptep)
88321 return VM_FAULT_OOM;
88322diff --git a/mm/internal.h b/mm/internal.h
88323index 684f7aa..9eb9edc 100644
88324--- a/mm/internal.h
88325+++ b/mm/internal.h
88326@@ -97,6 +97,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
88327 * in mm/page_alloc.c
88328 */
88329 extern void __free_pages_bootmem(struct page *page, unsigned int order);
88330+extern void free_compound_page(struct page *page);
88331 extern void prep_compound_page(struct page *page, unsigned long order);
88332 #ifdef CONFIG_MEMORY_FAILURE
88333 extern bool is_free_buddy_page(struct page *page);
88334@@ -352,7 +353,7 @@ extern u32 hwpoison_filter_enable;
88335
88336 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
88337 unsigned long, unsigned long,
88338- unsigned long, unsigned long);
88339+ unsigned long, unsigned long) __intentional_overflow(-1);
88340
88341 extern void set_pageblock_order(void);
88342 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
88343diff --git a/mm/kmemleak.c b/mm/kmemleak.c
88344index e126b0e..e986018 100644
88345--- a/mm/kmemleak.c
88346+++ b/mm/kmemleak.c
88347@@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
88348
88349 for (i = 0; i < object->trace_len; i++) {
88350 void *ptr = (void *)object->trace[i];
88351- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
88352+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
88353 }
88354 }
88355
88356@@ -1851,7 +1851,7 @@ static int __init kmemleak_late_init(void)
88357 return -ENOMEM;
88358 }
88359
88360- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
88361+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
88362 &kmemleak_fops);
88363 if (!dentry)
88364 pr_warning("Failed to create the debugfs kmemleak file\n");
88365diff --git a/mm/maccess.c b/mm/maccess.c
88366index d53adf9..03a24bf 100644
88367--- a/mm/maccess.c
88368+++ b/mm/maccess.c
88369@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
88370 set_fs(KERNEL_DS);
88371 pagefault_disable();
88372 ret = __copy_from_user_inatomic(dst,
88373- (__force const void __user *)src, size);
88374+ (const void __force_user *)src, size);
88375 pagefault_enable();
88376 set_fs(old_fs);
88377
88378@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
88379
88380 set_fs(KERNEL_DS);
88381 pagefault_disable();
88382- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
88383+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
88384 pagefault_enable();
88385 set_fs(old_fs);
88386
88387diff --git a/mm/madvise.c b/mm/madvise.c
88388index 539eeb9..e24a987 100644
88389--- a/mm/madvise.c
88390+++ b/mm/madvise.c
88391@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
88392 pgoff_t pgoff;
88393 unsigned long new_flags = vma->vm_flags;
88394
88395+#ifdef CONFIG_PAX_SEGMEXEC
88396+ struct vm_area_struct *vma_m;
88397+#endif
88398+
88399 switch (behavior) {
88400 case MADV_NORMAL:
88401 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
88402@@ -126,6 +130,13 @@ success:
88403 /*
88404 * vm_flags is protected by the mmap_sem held in write mode.
88405 */
88406+
88407+#ifdef CONFIG_PAX_SEGMEXEC
88408+ vma_m = pax_find_mirror_vma(vma);
88409+ if (vma_m)
88410+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
88411+#endif
88412+
88413 vma->vm_flags = new_flags;
88414
88415 out:
88416@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
88417 struct vm_area_struct **prev,
88418 unsigned long start, unsigned long end)
88419 {
88420+
88421+#ifdef CONFIG_PAX_SEGMEXEC
88422+ struct vm_area_struct *vma_m;
88423+#endif
88424+
88425 *prev = vma;
88426 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
88427 return -EINVAL;
88428@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
88429 zap_page_range(vma, start, end - start, &details);
88430 } else
88431 zap_page_range(vma, start, end - start, NULL);
88432+
88433+#ifdef CONFIG_PAX_SEGMEXEC
88434+ vma_m = pax_find_mirror_vma(vma);
88435+ if (vma_m) {
88436+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
88437+ struct zap_details details = {
88438+ .nonlinear_vma = vma_m,
88439+ .last_index = ULONG_MAX,
88440+ };
88441+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
88442+ } else
88443+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
88444+ }
88445+#endif
88446+
88447 return 0;
88448 }
88449
88450@@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
88451 if (end < start)
88452 return error;
88453
88454+#ifdef CONFIG_PAX_SEGMEXEC
88455+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
88456+ if (end > SEGMEXEC_TASK_SIZE)
88457+ return error;
88458+ } else
88459+#endif
88460+
88461+ if (end > TASK_SIZE)
88462+ return error;
88463+
88464 error = 0;
88465 if (end == start)
88466 return error;
88467diff --git a/mm/memory-failure.c b/mm/memory-failure.c
88468index 9aea53f..f239c30 100644
88469--- a/mm/memory-failure.c
88470+++ b/mm/memory-failure.c
88471@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
88472
88473 int sysctl_memory_failure_recovery __read_mostly = 1;
88474
88475-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
88476+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
88477
88478 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
88479
88480@@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
88481 pfn, t->comm, t->pid);
88482 si.si_signo = SIGBUS;
88483 si.si_errno = 0;
88484- si.si_addr = (void *)addr;
88485+ si.si_addr = (void __user *)addr;
88486 #ifdef __ARCH_SI_TRAPNO
88487 si.si_trapno = trapno;
88488 #endif
88489@@ -762,7 +762,7 @@ static struct page_state {
88490 unsigned long res;
88491 char *msg;
88492 int (*action)(struct page *p, unsigned long pfn);
88493-} error_states[] = {
88494+} __do_const error_states[] = {
88495 { reserved, reserved, "reserved kernel", me_kernel },
88496 /*
88497 * free pages are specially detected outside this table:
88498@@ -1063,7 +1063,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88499 nr_pages = 1 << compound_order(hpage);
88500 else /* normal page or thp */
88501 nr_pages = 1;
88502- atomic_long_add(nr_pages, &num_poisoned_pages);
88503+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
88504
88505 /*
88506 * We need/can do nothing about count=0 pages.
88507@@ -1093,7 +1093,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88508 if (!PageHWPoison(hpage)
88509 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
88510 || (p != hpage && TestSetPageHWPoison(hpage))) {
88511- atomic_long_sub(nr_pages, &num_poisoned_pages);
88512+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88513 return 0;
88514 }
88515 set_page_hwpoison_huge_page(hpage);
88516@@ -1162,7 +1162,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88517 }
88518 if (hwpoison_filter(p)) {
88519 if (TestClearPageHWPoison(p))
88520- atomic_long_sub(nr_pages, &num_poisoned_pages);
88521+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88522 unlock_page(hpage);
88523 put_page(hpage);
88524 return 0;
88525@@ -1380,7 +1380,7 @@ int unpoison_memory(unsigned long pfn)
88526 return 0;
88527 }
88528 if (TestClearPageHWPoison(p))
88529- atomic_long_dec(&num_poisoned_pages);
88530+ atomic_long_dec_unchecked(&num_poisoned_pages);
88531 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
88532 return 0;
88533 }
88534@@ -1394,7 +1394,7 @@ int unpoison_memory(unsigned long pfn)
88535 */
88536 if (TestClearPageHWPoison(page)) {
88537 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
88538- atomic_long_sub(nr_pages, &num_poisoned_pages);
88539+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88540 freeit = 1;
88541 if (PageHuge(page))
88542 clear_page_hwpoison_huge_page(page);
88543@@ -1533,11 +1533,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
88544 if (PageHuge(page)) {
88545 set_page_hwpoison_huge_page(hpage);
88546 dequeue_hwpoisoned_huge_page(hpage);
88547- atomic_long_add(1 << compound_order(hpage),
88548+ atomic_long_add_unchecked(1 << compound_order(hpage),
88549 &num_poisoned_pages);
88550 } else {
88551 SetPageHWPoison(page);
88552- atomic_long_inc(&num_poisoned_pages);
88553+ atomic_long_inc_unchecked(&num_poisoned_pages);
88554 }
88555 }
88556 return ret;
88557@@ -1576,7 +1576,7 @@ static int __soft_offline_page(struct page *page, int flags)
88558 put_page(page);
88559 pr_info("soft_offline: %#lx: invalidated\n", pfn);
88560 SetPageHWPoison(page);
88561- atomic_long_inc(&num_poisoned_pages);
88562+ atomic_long_inc_unchecked(&num_poisoned_pages);
88563 return 0;
88564 }
88565
88566@@ -1621,7 +1621,7 @@ static int __soft_offline_page(struct page *page, int flags)
88567 if (!is_free_buddy_page(page))
88568 pr_info("soft offline: %#lx: page leaked\n",
88569 pfn);
88570- atomic_long_inc(&num_poisoned_pages);
88571+ atomic_long_inc_unchecked(&num_poisoned_pages);
88572 }
88573 } else {
88574 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
88575@@ -1682,11 +1682,11 @@ int soft_offline_page(struct page *page, int flags)
88576 if (PageHuge(page)) {
88577 set_page_hwpoison_huge_page(hpage);
88578 dequeue_hwpoisoned_huge_page(hpage);
88579- atomic_long_add(1 << compound_order(hpage),
88580+ atomic_long_add_unchecked(1 << compound_order(hpage),
88581 &num_poisoned_pages);
88582 } else {
88583 SetPageHWPoison(page);
88584- atomic_long_inc(&num_poisoned_pages);
88585+ atomic_long_inc_unchecked(&num_poisoned_pages);
88586 }
88587 }
88588 unset:
88589diff --git a/mm/memory.c b/mm/memory.c
88590index d176154..cd1b387 100644
88591--- a/mm/memory.c
88592+++ b/mm/memory.c
88593@@ -402,6 +402,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
88594 free_pte_range(tlb, pmd, addr);
88595 } while (pmd++, addr = next, addr != end);
88596
88597+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
88598 start &= PUD_MASK;
88599 if (start < floor)
88600 return;
88601@@ -416,6 +417,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
88602 pmd = pmd_offset(pud, start);
88603 pud_clear(pud);
88604 pmd_free_tlb(tlb, pmd, start);
88605+#endif
88606+
88607 }
88608
88609 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88610@@ -435,6 +438,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88611 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
88612 } while (pud++, addr = next, addr != end);
88613
88614+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
88615 start &= PGDIR_MASK;
88616 if (start < floor)
88617 return;
88618@@ -449,6 +453,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88619 pud = pud_offset(pgd, start);
88620 pgd_clear(pgd);
88621 pud_free_tlb(tlb, pud, start);
88622+#endif
88623+
88624 }
88625
88626 /*
88627@@ -1636,12 +1642,6 @@ no_page_table:
88628 return page;
88629 }
88630
88631-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
88632-{
88633- return stack_guard_page_start(vma, addr) ||
88634- stack_guard_page_end(vma, addr+PAGE_SIZE);
88635-}
88636-
88637 /**
88638 * __get_user_pages() - pin user pages in memory
88639 * @tsk: task_struct of target task
88640@@ -1728,10 +1728,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88641
88642 i = 0;
88643
88644- do {
88645+ while (nr_pages) {
88646 struct vm_area_struct *vma;
88647
88648- vma = find_extend_vma(mm, start);
88649+ vma = find_vma(mm, start);
88650 if (!vma && in_gate_area(mm, start)) {
88651 unsigned long pg = start & PAGE_MASK;
88652 pgd_t *pgd;
88653@@ -1780,7 +1780,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88654 goto next_page;
88655 }
88656
88657- if (!vma ||
88658+ if (!vma || start < vma->vm_start ||
88659 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
88660 !(vm_flags & vma->vm_flags))
88661 return i ? : -EFAULT;
88662@@ -1809,11 +1809,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88663 int ret;
88664 unsigned int fault_flags = 0;
88665
88666- /* For mlock, just skip the stack guard page. */
88667- if (foll_flags & FOLL_MLOCK) {
88668- if (stack_guard_page(vma, start))
88669- goto next_page;
88670- }
88671 if (foll_flags & FOLL_WRITE)
88672 fault_flags |= FAULT_FLAG_WRITE;
88673 if (nonblocking)
88674@@ -1893,7 +1888,7 @@ next_page:
88675 start += page_increm * PAGE_SIZE;
88676 nr_pages -= page_increm;
88677 } while (nr_pages && start < vma->vm_end);
88678- } while (nr_pages);
88679+ }
88680 return i;
88681 }
88682 EXPORT_SYMBOL(__get_user_pages);
88683@@ -2100,6 +2095,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
88684 page_add_file_rmap(page);
88685 set_pte_at(mm, addr, pte, mk_pte(page, prot));
88686
88687+#ifdef CONFIG_PAX_SEGMEXEC
88688+ pax_mirror_file_pte(vma, addr, page, ptl);
88689+#endif
88690+
88691 retval = 0;
88692 pte_unmap_unlock(pte, ptl);
88693 return retval;
88694@@ -2144,9 +2143,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
88695 if (!page_count(page))
88696 return -EINVAL;
88697 if (!(vma->vm_flags & VM_MIXEDMAP)) {
88698+
88699+#ifdef CONFIG_PAX_SEGMEXEC
88700+ struct vm_area_struct *vma_m;
88701+#endif
88702+
88703 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
88704 BUG_ON(vma->vm_flags & VM_PFNMAP);
88705 vma->vm_flags |= VM_MIXEDMAP;
88706+
88707+#ifdef CONFIG_PAX_SEGMEXEC
88708+ vma_m = pax_find_mirror_vma(vma);
88709+ if (vma_m)
88710+ vma_m->vm_flags |= VM_MIXEDMAP;
88711+#endif
88712+
88713 }
88714 return insert_page(vma, addr, page, vma->vm_page_prot);
88715 }
88716@@ -2229,6 +2240,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
88717 unsigned long pfn)
88718 {
88719 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
88720+ BUG_ON(vma->vm_mirror);
88721
88722 if (addr < vma->vm_start || addr >= vma->vm_end)
88723 return -EFAULT;
88724@@ -2476,7 +2488,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
88725
88726 BUG_ON(pud_huge(*pud));
88727
88728- pmd = pmd_alloc(mm, pud, addr);
88729+ pmd = (mm == &init_mm) ?
88730+ pmd_alloc_kernel(mm, pud, addr) :
88731+ pmd_alloc(mm, pud, addr);
88732 if (!pmd)
88733 return -ENOMEM;
88734 do {
88735@@ -2496,7 +2510,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
88736 unsigned long next;
88737 int err;
88738
88739- pud = pud_alloc(mm, pgd, addr);
88740+ pud = (mm == &init_mm) ?
88741+ pud_alloc_kernel(mm, pgd, addr) :
88742+ pud_alloc(mm, pgd, addr);
88743 if (!pud)
88744 return -ENOMEM;
88745 do {
88746@@ -2584,6 +2600,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
88747 copy_user_highpage(dst, src, va, vma);
88748 }
88749
88750+#ifdef CONFIG_PAX_SEGMEXEC
88751+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
88752+{
88753+ struct mm_struct *mm = vma->vm_mm;
88754+ spinlock_t *ptl;
88755+ pte_t *pte, entry;
88756+
88757+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
88758+ entry = *pte;
88759+ if (!pte_present(entry)) {
88760+ if (!pte_none(entry)) {
88761+ BUG_ON(pte_file(entry));
88762+ free_swap_and_cache(pte_to_swp_entry(entry));
88763+ pte_clear_not_present_full(mm, address, pte, 0);
88764+ }
88765+ } else {
88766+ struct page *page;
88767+
88768+ flush_cache_page(vma, address, pte_pfn(entry));
88769+ entry = ptep_clear_flush(vma, address, pte);
88770+ BUG_ON(pte_dirty(entry));
88771+ page = vm_normal_page(vma, address, entry);
88772+ if (page) {
88773+ update_hiwater_rss(mm);
88774+ if (PageAnon(page))
88775+ dec_mm_counter_fast(mm, MM_ANONPAGES);
88776+ else
88777+ dec_mm_counter_fast(mm, MM_FILEPAGES);
88778+ page_remove_rmap(page);
88779+ page_cache_release(page);
88780+ }
88781+ }
88782+ pte_unmap_unlock(pte, ptl);
88783+}
88784+
88785+/* PaX: if vma is mirrored, synchronize the mirror's PTE
88786+ *
88787+ * the ptl of the lower mapped page is held on entry and is not released on exit
88788+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
88789+ */
88790+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
88791+{
88792+ struct mm_struct *mm = vma->vm_mm;
88793+ unsigned long address_m;
88794+ spinlock_t *ptl_m;
88795+ struct vm_area_struct *vma_m;
88796+ pmd_t *pmd_m;
88797+ pte_t *pte_m, entry_m;
88798+
88799+ BUG_ON(!page_m || !PageAnon(page_m));
88800+
88801+ vma_m = pax_find_mirror_vma(vma);
88802+ if (!vma_m)
88803+ return;
88804+
88805+ BUG_ON(!PageLocked(page_m));
88806+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88807+ address_m = address + SEGMEXEC_TASK_SIZE;
88808+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88809+ pte_m = pte_offset_map(pmd_m, address_m);
88810+ ptl_m = pte_lockptr(mm, pmd_m);
88811+ if (ptl != ptl_m) {
88812+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88813+ if (!pte_none(*pte_m))
88814+ goto out;
88815+ }
88816+
88817+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
88818+ page_cache_get(page_m);
88819+ page_add_anon_rmap(page_m, vma_m, address_m);
88820+ inc_mm_counter_fast(mm, MM_ANONPAGES);
88821+ set_pte_at(mm, address_m, pte_m, entry_m);
88822+ update_mmu_cache(vma_m, address_m, pte_m);
88823+out:
88824+ if (ptl != ptl_m)
88825+ spin_unlock(ptl_m);
88826+ pte_unmap(pte_m);
88827+ unlock_page(page_m);
88828+}
88829+
88830+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
88831+{
88832+ struct mm_struct *mm = vma->vm_mm;
88833+ unsigned long address_m;
88834+ spinlock_t *ptl_m;
88835+ struct vm_area_struct *vma_m;
88836+ pmd_t *pmd_m;
88837+ pte_t *pte_m, entry_m;
88838+
88839+ BUG_ON(!page_m || PageAnon(page_m));
88840+
88841+ vma_m = pax_find_mirror_vma(vma);
88842+ if (!vma_m)
88843+ return;
88844+
88845+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88846+ address_m = address + SEGMEXEC_TASK_SIZE;
88847+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88848+ pte_m = pte_offset_map(pmd_m, address_m);
88849+ ptl_m = pte_lockptr(mm, pmd_m);
88850+ if (ptl != ptl_m) {
88851+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88852+ if (!pte_none(*pte_m))
88853+ goto out;
88854+ }
88855+
88856+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
88857+ page_cache_get(page_m);
88858+ page_add_file_rmap(page_m);
88859+ inc_mm_counter_fast(mm, MM_FILEPAGES);
88860+ set_pte_at(mm, address_m, pte_m, entry_m);
88861+ update_mmu_cache(vma_m, address_m, pte_m);
88862+out:
88863+ if (ptl != ptl_m)
88864+ spin_unlock(ptl_m);
88865+ pte_unmap(pte_m);
88866+}
88867+
88868+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
88869+{
88870+ struct mm_struct *mm = vma->vm_mm;
88871+ unsigned long address_m;
88872+ spinlock_t *ptl_m;
88873+ struct vm_area_struct *vma_m;
88874+ pmd_t *pmd_m;
88875+ pte_t *pte_m, entry_m;
88876+
88877+ vma_m = pax_find_mirror_vma(vma);
88878+ if (!vma_m)
88879+ return;
88880+
88881+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88882+ address_m = address + SEGMEXEC_TASK_SIZE;
88883+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88884+ pte_m = pte_offset_map(pmd_m, address_m);
88885+ ptl_m = pte_lockptr(mm, pmd_m);
88886+ if (ptl != ptl_m) {
88887+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88888+ if (!pte_none(*pte_m))
88889+ goto out;
88890+ }
88891+
88892+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
88893+ set_pte_at(mm, address_m, pte_m, entry_m);
88894+out:
88895+ if (ptl != ptl_m)
88896+ spin_unlock(ptl_m);
88897+ pte_unmap(pte_m);
88898+}
88899+
88900+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
88901+{
88902+ struct page *page_m;
88903+ pte_t entry;
88904+
88905+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
88906+ goto out;
88907+
88908+ entry = *pte;
88909+ page_m = vm_normal_page(vma, address, entry);
88910+ if (!page_m)
88911+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
88912+ else if (PageAnon(page_m)) {
88913+ if (pax_find_mirror_vma(vma)) {
88914+ pte_unmap_unlock(pte, ptl);
88915+ lock_page(page_m);
88916+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
88917+ if (pte_same(entry, *pte))
88918+ pax_mirror_anon_pte(vma, address, page_m, ptl);
88919+ else
88920+ unlock_page(page_m);
88921+ }
88922+ } else
88923+ pax_mirror_file_pte(vma, address, page_m, ptl);
88924+
88925+out:
88926+ pte_unmap_unlock(pte, ptl);
88927+}
88928+#endif
88929+
88930 /*
88931 * This routine handles present pages, when users try to write
88932 * to a shared page. It is done by copying the page to a new address
88933@@ -2800,6 +2996,12 @@ gotten:
88934 */
88935 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
88936 if (likely(pte_same(*page_table, orig_pte))) {
88937+
88938+#ifdef CONFIG_PAX_SEGMEXEC
88939+ if (pax_find_mirror_vma(vma))
88940+ BUG_ON(!trylock_page(new_page));
88941+#endif
88942+
88943 if (old_page) {
88944 if (!PageAnon(old_page)) {
88945 dec_mm_counter_fast(mm, MM_FILEPAGES);
88946@@ -2851,6 +3053,10 @@ gotten:
88947 page_remove_rmap(old_page);
88948 }
88949
88950+#ifdef CONFIG_PAX_SEGMEXEC
88951+ pax_mirror_anon_pte(vma, address, new_page, ptl);
88952+#endif
88953+
88954 /* Free the old page.. */
88955 new_page = old_page;
88956 ret |= VM_FAULT_WRITE;
88957@@ -3128,6 +3334,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
88958 swap_free(entry);
88959 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
88960 try_to_free_swap(page);
88961+
88962+#ifdef CONFIG_PAX_SEGMEXEC
88963+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
88964+#endif
88965+
88966 unlock_page(page);
88967 if (page != swapcache) {
88968 /*
88969@@ -3151,6 +3362,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
88970
88971 /* No need to invalidate - it was non-present before */
88972 update_mmu_cache(vma, address, page_table);
88973+
88974+#ifdef CONFIG_PAX_SEGMEXEC
88975+ pax_mirror_anon_pte(vma, address, page, ptl);
88976+#endif
88977+
88978 unlock:
88979 pte_unmap_unlock(page_table, ptl);
88980 out:
88981@@ -3170,40 +3386,6 @@ out_release:
88982 }
88983
88984 /*
88985- * This is like a special single-page "expand_{down|up}wards()",
88986- * except we must first make sure that 'address{-|+}PAGE_SIZE'
88987- * doesn't hit another vma.
88988- */
88989-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
88990-{
88991- address &= PAGE_MASK;
88992- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
88993- struct vm_area_struct *prev = vma->vm_prev;
88994-
88995- /*
88996- * Is there a mapping abutting this one below?
88997- *
88998- * That's only ok if it's the same stack mapping
88999- * that has gotten split..
89000- */
89001- if (prev && prev->vm_end == address)
89002- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
89003-
89004- expand_downwards(vma, address - PAGE_SIZE);
89005- }
89006- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
89007- struct vm_area_struct *next = vma->vm_next;
89008-
89009- /* As VM_GROWSDOWN but s/below/above/ */
89010- if (next && next->vm_start == address + PAGE_SIZE)
89011- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
89012-
89013- expand_upwards(vma, address + PAGE_SIZE);
89014- }
89015- return 0;
89016-}
89017-
89018-/*
89019 * We enter with non-exclusive mmap_sem (to exclude vma changes,
89020 * but allow concurrent faults), and pte mapped but not yet locked.
89021 * We return with mmap_sem still held, but pte unmapped and unlocked.
89022@@ -3212,27 +3394,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
89023 unsigned long address, pte_t *page_table, pmd_t *pmd,
89024 unsigned int flags)
89025 {
89026- struct page *page;
89027+ struct page *page = NULL;
89028 spinlock_t *ptl;
89029 pte_t entry;
89030
89031- pte_unmap(page_table);
89032-
89033- /* Check if we need to add a guard page to the stack */
89034- if (check_stack_guard_page(vma, address) < 0)
89035- return VM_FAULT_SIGBUS;
89036-
89037- /* Use the zero-page for reads */
89038 if (!(flags & FAULT_FLAG_WRITE)) {
89039 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
89040 vma->vm_page_prot));
89041- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
89042+ ptl = pte_lockptr(mm, pmd);
89043+ spin_lock(ptl);
89044 if (!pte_none(*page_table))
89045 goto unlock;
89046 goto setpte;
89047 }
89048
89049 /* Allocate our own private page. */
89050+ pte_unmap(page_table);
89051+
89052 if (unlikely(anon_vma_prepare(vma)))
89053 goto oom;
89054 page = alloc_zeroed_user_highpage_movable(vma, address);
89055@@ -3256,6 +3434,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
89056 if (!pte_none(*page_table))
89057 goto release;
89058
89059+#ifdef CONFIG_PAX_SEGMEXEC
89060+ if (pax_find_mirror_vma(vma))
89061+ BUG_ON(!trylock_page(page));
89062+#endif
89063+
89064 inc_mm_counter_fast(mm, MM_ANONPAGES);
89065 page_add_new_anon_rmap(page, vma, address);
89066 setpte:
89067@@ -3263,6 +3446,12 @@ setpte:
89068
89069 /* No need to invalidate - it was non-present before */
89070 update_mmu_cache(vma, address, page_table);
89071+
89072+#ifdef CONFIG_PAX_SEGMEXEC
89073+ if (page)
89074+ pax_mirror_anon_pte(vma, address, page, ptl);
89075+#endif
89076+
89077 unlock:
89078 pte_unmap_unlock(page_table, ptl);
89079 return 0;
89080@@ -3406,6 +3595,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89081 */
89082 /* Only go through if we didn't race with anybody else... */
89083 if (likely(pte_same(*page_table, orig_pte))) {
89084+
89085+#ifdef CONFIG_PAX_SEGMEXEC
89086+ if (anon && pax_find_mirror_vma(vma))
89087+ BUG_ON(!trylock_page(page));
89088+#endif
89089+
89090 flush_icache_page(vma, page);
89091 entry = mk_pte(page, vma->vm_page_prot);
89092 if (flags & FAULT_FLAG_WRITE)
89093@@ -3427,6 +3622,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89094
89095 /* no need to invalidate: a not-present page won't be cached */
89096 update_mmu_cache(vma, address, page_table);
89097+
89098+#ifdef CONFIG_PAX_SEGMEXEC
89099+ if (anon)
89100+ pax_mirror_anon_pte(vma, address, page, ptl);
89101+ else
89102+ pax_mirror_file_pte(vma, address, page, ptl);
89103+#endif
89104+
89105 } else {
89106 if (cow_page)
89107 mem_cgroup_uncharge_page(cow_page);
89108@@ -3737,6 +3940,12 @@ static int handle_pte_fault(struct mm_struct *mm,
89109 if (flags & FAULT_FLAG_WRITE)
89110 flush_tlb_fix_spurious_fault(vma, address);
89111 }
89112+
89113+#ifdef CONFIG_PAX_SEGMEXEC
89114+ pax_mirror_pte(vma, address, pte, pmd, ptl);
89115+ return 0;
89116+#endif
89117+
89118 unlock:
89119 pte_unmap_unlock(pte, ptl);
89120 return 0;
89121@@ -3753,9 +3962,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89122 pmd_t *pmd;
89123 pte_t *pte;
89124
89125+#ifdef CONFIG_PAX_SEGMEXEC
89126+ struct vm_area_struct *vma_m;
89127+#endif
89128+
89129 if (unlikely(is_vm_hugetlb_page(vma)))
89130 return hugetlb_fault(mm, vma, address, flags);
89131
89132+#ifdef CONFIG_PAX_SEGMEXEC
89133+ vma_m = pax_find_mirror_vma(vma);
89134+ if (vma_m) {
89135+ unsigned long address_m;
89136+ pgd_t *pgd_m;
89137+ pud_t *pud_m;
89138+ pmd_t *pmd_m;
89139+
89140+ if (vma->vm_start > vma_m->vm_start) {
89141+ address_m = address;
89142+ address -= SEGMEXEC_TASK_SIZE;
89143+ vma = vma_m;
89144+ } else
89145+ address_m = address + SEGMEXEC_TASK_SIZE;
89146+
89147+ pgd_m = pgd_offset(mm, address_m);
89148+ pud_m = pud_alloc(mm, pgd_m, address_m);
89149+ if (!pud_m)
89150+ return VM_FAULT_OOM;
89151+ pmd_m = pmd_alloc(mm, pud_m, address_m);
89152+ if (!pmd_m)
89153+ return VM_FAULT_OOM;
89154+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
89155+ return VM_FAULT_OOM;
89156+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
89157+ }
89158+#endif
89159+
89160 retry:
89161 pgd = pgd_offset(mm, address);
89162 pud = pud_alloc(mm, pgd, address);
89163@@ -3894,6 +4135,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
89164 spin_unlock(&mm->page_table_lock);
89165 return 0;
89166 }
89167+
89168+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
89169+{
89170+ pud_t *new = pud_alloc_one(mm, address);
89171+ if (!new)
89172+ return -ENOMEM;
89173+
89174+ smp_wmb(); /* See comment in __pte_alloc */
89175+
89176+ spin_lock(&mm->page_table_lock);
89177+ if (pgd_present(*pgd)) /* Another has populated it */
89178+ pud_free(mm, new);
89179+ else
89180+ pgd_populate_kernel(mm, pgd, new);
89181+ spin_unlock(&mm->page_table_lock);
89182+ return 0;
89183+}
89184 #endif /* __PAGETABLE_PUD_FOLDED */
89185
89186 #ifndef __PAGETABLE_PMD_FOLDED
89187@@ -3924,6 +4182,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
89188 spin_unlock(&mm->page_table_lock);
89189 return 0;
89190 }
89191+
89192+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
89193+{
89194+ pmd_t *new = pmd_alloc_one(mm, address);
89195+ if (!new)
89196+ return -ENOMEM;
89197+
89198+ smp_wmb(); /* See comment in __pte_alloc */
89199+
89200+ spin_lock(&mm->page_table_lock);
89201+#ifndef __ARCH_HAS_4LEVEL_HACK
89202+ if (pud_present(*pud)) /* Another has populated it */
89203+ pmd_free(mm, new);
89204+ else
89205+ pud_populate_kernel(mm, pud, new);
89206+#else
89207+ if (pgd_present(*pud)) /* Another has populated it */
89208+ pmd_free(mm, new);
89209+ else
89210+ pgd_populate_kernel(mm, pud, new);
89211+#endif /* __ARCH_HAS_4LEVEL_HACK */
89212+ spin_unlock(&mm->page_table_lock);
89213+ return 0;
89214+}
89215 #endif /* __PAGETABLE_PMD_FOLDED */
89216
89217 #if !defined(__HAVE_ARCH_GATE_AREA)
89218@@ -3937,7 +4219,7 @@ static int __init gate_vma_init(void)
89219 gate_vma.vm_start = FIXADDR_USER_START;
89220 gate_vma.vm_end = FIXADDR_USER_END;
89221 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
89222- gate_vma.vm_page_prot = __P101;
89223+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
89224
89225 return 0;
89226 }
89227@@ -4071,8 +4353,8 @@ out:
89228 return ret;
89229 }
89230
89231-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
89232- void *buf, int len, int write)
89233+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
89234+ void *buf, size_t len, int write)
89235 {
89236 resource_size_t phys_addr;
89237 unsigned long prot = 0;
89238@@ -4098,8 +4380,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
89239 * Access another process' address space as given in mm. If non-NULL, use the
89240 * given task for page fault accounting.
89241 */
89242-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89243- unsigned long addr, void *buf, int len, int write)
89244+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89245+ unsigned long addr, void *buf, size_t len, int write)
89246 {
89247 struct vm_area_struct *vma;
89248 void *old_buf = buf;
89249@@ -4107,7 +4389,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89250 down_read(&mm->mmap_sem);
89251 /* ignore errors, just check how much was successfully transferred */
89252 while (len) {
89253- int bytes, ret, offset;
89254+ ssize_t bytes, ret, offset;
89255 void *maddr;
89256 struct page *page = NULL;
89257
89258@@ -4166,8 +4448,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89259 *
89260 * The caller must hold a reference on @mm.
89261 */
89262-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
89263- void *buf, int len, int write)
89264+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
89265+ void *buf, size_t len, int write)
89266 {
89267 return __access_remote_vm(NULL, mm, addr, buf, len, write);
89268 }
89269@@ -4177,11 +4459,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
89270 * Source/target buffer must be kernel space,
89271 * Do not walk the page table directly, use get_user_pages
89272 */
89273-int access_process_vm(struct task_struct *tsk, unsigned long addr,
89274- void *buf, int len, int write)
89275+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
89276+ void *buf, size_t len, int write)
89277 {
89278 struct mm_struct *mm;
89279- int ret;
89280+ ssize_t ret;
89281
89282 mm = get_task_mm(tsk);
89283 if (!mm)
89284diff --git a/mm/mempolicy.c b/mm/mempolicy.c
89285index 6b22d8f9..8b5f6cf 100644
89286--- a/mm/mempolicy.c
89287+++ b/mm/mempolicy.c
89288@@ -746,6 +746,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
89289 unsigned long vmstart;
89290 unsigned long vmend;
89291
89292+#ifdef CONFIG_PAX_SEGMEXEC
89293+ struct vm_area_struct *vma_m;
89294+#endif
89295+
89296 vma = find_vma(mm, start);
89297 if (!vma || vma->vm_start > start)
89298 return -EFAULT;
89299@@ -789,6 +793,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
89300 err = vma_replace_policy(vma, new_pol);
89301 if (err)
89302 goto out;
89303+
89304+#ifdef CONFIG_PAX_SEGMEXEC
89305+ vma_m = pax_find_mirror_vma(vma);
89306+ if (vma_m) {
89307+ err = vma_replace_policy(vma_m, new_pol);
89308+ if (err)
89309+ goto out;
89310+ }
89311+#endif
89312+
89313 }
89314
89315 out:
89316@@ -1252,6 +1266,17 @@ static long do_mbind(unsigned long start, unsigned long len,
89317
89318 if (end < start)
89319 return -EINVAL;
89320+
89321+#ifdef CONFIG_PAX_SEGMEXEC
89322+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
89323+ if (end > SEGMEXEC_TASK_SIZE)
89324+ return -EINVAL;
89325+ } else
89326+#endif
89327+
89328+ if (end > TASK_SIZE)
89329+ return -EINVAL;
89330+
89331 if (end == start)
89332 return 0;
89333
89334@@ -1480,8 +1505,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
89335 */
89336 tcred = __task_cred(task);
89337 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
89338- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
89339- !capable(CAP_SYS_NICE)) {
89340+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
89341 rcu_read_unlock();
89342 err = -EPERM;
89343 goto out_put;
89344@@ -1512,6 +1536,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
89345 goto out;
89346 }
89347
89348+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
89349+ if (mm != current->mm &&
89350+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
89351+ mmput(mm);
89352+ err = -EPERM;
89353+ goto out;
89354+ }
89355+#endif
89356+
89357 err = do_migrate_pages(mm, old, new,
89358 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
89359
89360diff --git a/mm/migrate.c b/mm/migrate.c
89361index e3cf71d..c94506c 100644
89362--- a/mm/migrate.c
89363+++ b/mm/migrate.c
89364@@ -1406,8 +1406,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
89365 */
89366 tcred = __task_cred(task);
89367 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
89368- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
89369- !capable(CAP_SYS_NICE)) {
89370+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
89371 rcu_read_unlock();
89372 err = -EPERM;
89373 goto out;
89374diff --git a/mm/mlock.c b/mm/mlock.c
89375index 192e6ee..b044449 100644
89376--- a/mm/mlock.c
89377+++ b/mm/mlock.c
89378@@ -14,6 +14,7 @@
89379 #include <linux/pagevec.h>
89380 #include <linux/mempolicy.h>
89381 #include <linux/syscalls.h>
89382+#include <linux/security.h>
89383 #include <linux/sched.h>
89384 #include <linux/export.h>
89385 #include <linux/rmap.h>
89386@@ -588,7 +589,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
89387 {
89388 unsigned long nstart, end, tmp;
89389 struct vm_area_struct * vma, * prev;
89390- int error;
89391+ int error = 0;
89392
89393 VM_BUG_ON(start & ~PAGE_MASK);
89394 VM_BUG_ON(len != PAGE_ALIGN(len));
89395@@ -597,6 +598,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
89396 return -EINVAL;
89397 if (end == start)
89398 return 0;
89399+ if (end > TASK_SIZE)
89400+ return -EINVAL;
89401+
89402 vma = find_vma(current->mm, start);
89403 if (!vma || vma->vm_start > start)
89404 return -ENOMEM;
89405@@ -608,6 +612,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
89406 for (nstart = start ; ; ) {
89407 vm_flags_t newflags;
89408
89409+#ifdef CONFIG_PAX_SEGMEXEC
89410+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
89411+ break;
89412+#endif
89413+
89414 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
89415
89416 newflags = vma->vm_flags & ~VM_LOCKED;
89417@@ -720,6 +729,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
89418 lock_limit >>= PAGE_SHIFT;
89419
89420 /* check against resource limits */
89421+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
89422 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
89423 error = do_mlock(start, len, 1);
89424 up_write(&current->mm->mmap_sem);
89425@@ -754,6 +764,11 @@ static int do_mlockall(int flags)
89426 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
89427 vm_flags_t newflags;
89428
89429+#ifdef CONFIG_PAX_SEGMEXEC
89430+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
89431+ break;
89432+#endif
89433+
89434 newflags = vma->vm_flags & ~VM_LOCKED;
89435 if (flags & MCL_CURRENT)
89436 newflags |= VM_LOCKED;
89437@@ -787,6 +802,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
89438 lock_limit >>= PAGE_SHIFT;
89439
89440 ret = -ENOMEM;
89441+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
89442 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
89443 capable(CAP_IPC_LOCK))
89444 ret = do_mlockall(flags);
89445diff --git a/mm/mmap.c b/mm/mmap.c
89446index 362e5f1..8968e02 100644
89447--- a/mm/mmap.c
89448+++ b/mm/mmap.c
89449@@ -36,6 +36,7 @@
89450 #include <linux/sched/sysctl.h>
89451 #include <linux/notifier.h>
89452 #include <linux/memory.h>
89453+#include <linux/random.h>
89454
89455 #include <asm/uaccess.h>
89456 #include <asm/cacheflush.h>
89457@@ -52,6 +53,16 @@
89458 #define arch_rebalance_pgtables(addr, len) (addr)
89459 #endif
89460
89461+static inline void verify_mm_writelocked(struct mm_struct *mm)
89462+{
89463+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
89464+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
89465+ up_read(&mm->mmap_sem);
89466+ BUG();
89467+ }
89468+#endif
89469+}
89470+
89471 static void unmap_region(struct mm_struct *mm,
89472 struct vm_area_struct *vma, struct vm_area_struct *prev,
89473 unsigned long start, unsigned long end);
89474@@ -71,16 +82,25 @@ static void unmap_region(struct mm_struct *mm,
89475 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
89476 *
89477 */
89478-pgprot_t protection_map[16] = {
89479+pgprot_t protection_map[16] __read_only = {
89480 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
89481 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
89482 };
89483
89484-pgprot_t vm_get_page_prot(unsigned long vm_flags)
89485+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
89486 {
89487- return __pgprot(pgprot_val(protection_map[vm_flags &
89488+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
89489 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
89490 pgprot_val(arch_vm_get_page_prot(vm_flags)));
89491+
89492+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89493+ if (!(__supported_pte_mask & _PAGE_NX) &&
89494+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
89495+ (vm_flags & (VM_READ | VM_WRITE)))
89496+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
89497+#endif
89498+
89499+ return prot;
89500 }
89501 EXPORT_SYMBOL(vm_get_page_prot);
89502
89503@@ -89,6 +109,7 @@ int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
89504 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
89505 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
89506 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
89507+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
89508 /*
89509 * Make sure vm_committed_as in one cacheline and not cacheline shared with
89510 * other variables. It can be updated by several CPUs frequently.
89511@@ -247,6 +268,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
89512 struct vm_area_struct *next = vma->vm_next;
89513
89514 might_sleep();
89515+ BUG_ON(vma->vm_mirror);
89516 if (vma->vm_ops && vma->vm_ops->close)
89517 vma->vm_ops->close(vma);
89518 if (vma->vm_file)
89519@@ -291,6 +313,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
89520 * not page aligned -Ram Gupta
89521 */
89522 rlim = rlimit(RLIMIT_DATA);
89523+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
89524 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
89525 (mm->end_data - mm->start_data) > rlim)
89526 goto out;
89527@@ -933,6 +956,12 @@ static int
89528 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
89529 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
89530 {
89531+
89532+#ifdef CONFIG_PAX_SEGMEXEC
89533+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
89534+ return 0;
89535+#endif
89536+
89537 if (is_mergeable_vma(vma, file, vm_flags) &&
89538 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
89539 if (vma->vm_pgoff == vm_pgoff)
89540@@ -952,6 +981,12 @@ static int
89541 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
89542 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
89543 {
89544+
89545+#ifdef CONFIG_PAX_SEGMEXEC
89546+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
89547+ return 0;
89548+#endif
89549+
89550 if (is_mergeable_vma(vma, file, vm_flags) &&
89551 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
89552 pgoff_t vm_pglen;
89553@@ -994,13 +1029,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
89554 struct vm_area_struct *vma_merge(struct mm_struct *mm,
89555 struct vm_area_struct *prev, unsigned long addr,
89556 unsigned long end, unsigned long vm_flags,
89557- struct anon_vma *anon_vma, struct file *file,
89558+ struct anon_vma *anon_vma, struct file *file,
89559 pgoff_t pgoff, struct mempolicy *policy)
89560 {
89561 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
89562 struct vm_area_struct *area, *next;
89563 int err;
89564
89565+#ifdef CONFIG_PAX_SEGMEXEC
89566+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
89567+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
89568+
89569+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
89570+#endif
89571+
89572 /*
89573 * We later require that vma->vm_flags == vm_flags,
89574 * so this tests vma->vm_flags & VM_SPECIAL, too.
89575@@ -1016,6 +1058,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89576 if (next && next->vm_end == end) /* cases 6, 7, 8 */
89577 next = next->vm_next;
89578
89579+#ifdef CONFIG_PAX_SEGMEXEC
89580+ if (prev)
89581+ prev_m = pax_find_mirror_vma(prev);
89582+ if (area)
89583+ area_m = pax_find_mirror_vma(area);
89584+ if (next)
89585+ next_m = pax_find_mirror_vma(next);
89586+#endif
89587+
89588 /*
89589 * Can it merge with the predecessor?
89590 */
89591@@ -1035,9 +1086,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89592 /* cases 1, 6 */
89593 err = vma_adjust(prev, prev->vm_start,
89594 next->vm_end, prev->vm_pgoff, NULL);
89595- } else /* cases 2, 5, 7 */
89596+
89597+#ifdef CONFIG_PAX_SEGMEXEC
89598+ if (!err && prev_m)
89599+ err = vma_adjust(prev_m, prev_m->vm_start,
89600+ next_m->vm_end, prev_m->vm_pgoff, NULL);
89601+#endif
89602+
89603+ } else { /* cases 2, 5, 7 */
89604 err = vma_adjust(prev, prev->vm_start,
89605 end, prev->vm_pgoff, NULL);
89606+
89607+#ifdef CONFIG_PAX_SEGMEXEC
89608+ if (!err && prev_m)
89609+ err = vma_adjust(prev_m, prev_m->vm_start,
89610+ end_m, prev_m->vm_pgoff, NULL);
89611+#endif
89612+
89613+ }
89614 if (err)
89615 return NULL;
89616 khugepaged_enter_vma_merge(prev);
89617@@ -1051,12 +1117,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89618 mpol_equal(policy, vma_policy(next)) &&
89619 can_vma_merge_before(next, vm_flags,
89620 anon_vma, file, pgoff+pglen)) {
89621- if (prev && addr < prev->vm_end) /* case 4 */
89622+ if (prev && addr < prev->vm_end) { /* case 4 */
89623 err = vma_adjust(prev, prev->vm_start,
89624 addr, prev->vm_pgoff, NULL);
89625- else /* cases 3, 8 */
89626+
89627+#ifdef CONFIG_PAX_SEGMEXEC
89628+ if (!err && prev_m)
89629+ err = vma_adjust(prev_m, prev_m->vm_start,
89630+ addr_m, prev_m->vm_pgoff, NULL);
89631+#endif
89632+
89633+ } else { /* cases 3, 8 */
89634 err = vma_adjust(area, addr, next->vm_end,
89635 next->vm_pgoff - pglen, NULL);
89636+
89637+#ifdef CONFIG_PAX_SEGMEXEC
89638+ if (!err && area_m)
89639+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
89640+ next_m->vm_pgoff - pglen, NULL);
89641+#endif
89642+
89643+ }
89644 if (err)
89645 return NULL;
89646 khugepaged_enter_vma_merge(area);
89647@@ -1165,8 +1246,10 @@ none:
89648 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
89649 struct file *file, long pages)
89650 {
89651- const unsigned long stack_flags
89652- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
89653+
89654+#ifdef CONFIG_PAX_RANDMMAP
89655+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
89656+#endif
89657
89658 mm->total_vm += pages;
89659
89660@@ -1174,7 +1257,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
89661 mm->shared_vm += pages;
89662 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
89663 mm->exec_vm += pages;
89664- } else if (flags & stack_flags)
89665+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
89666 mm->stack_vm += pages;
89667 }
89668 #endif /* CONFIG_PROC_FS */
89669@@ -1212,7 +1295,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89670 * (the exception is when the underlying filesystem is noexec
89671 * mounted, in which case we dont add PROT_EXEC.)
89672 */
89673- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
89674+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
89675 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
89676 prot |= PROT_EXEC;
89677
89678@@ -1238,7 +1321,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89679 /* Obtain the address to map to. we verify (or select) it and ensure
89680 * that it represents a valid section of the address space.
89681 */
89682- addr = get_unmapped_area(file, addr, len, pgoff, flags);
89683+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
89684 if (addr & ~PAGE_MASK)
89685 return addr;
89686
89687@@ -1249,6 +1332,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89688 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
89689 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
89690
89691+#ifdef CONFIG_PAX_MPROTECT
89692+ if (mm->pax_flags & MF_PAX_MPROTECT) {
89693+
89694+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
89695+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
89696+ mm->binfmt->handle_mmap)
89697+ mm->binfmt->handle_mmap(file);
89698+#endif
89699+
89700+#ifndef CONFIG_PAX_MPROTECT_COMPAT
89701+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
89702+ gr_log_rwxmmap(file);
89703+
89704+#ifdef CONFIG_PAX_EMUPLT
89705+ vm_flags &= ~VM_EXEC;
89706+#else
89707+ return -EPERM;
89708+#endif
89709+
89710+ }
89711+
89712+ if (!(vm_flags & VM_EXEC))
89713+ vm_flags &= ~VM_MAYEXEC;
89714+#else
89715+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
89716+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
89717+#endif
89718+ else
89719+ vm_flags &= ~VM_MAYWRITE;
89720+ }
89721+#endif
89722+
89723+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89724+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
89725+ vm_flags &= ~VM_PAGEEXEC;
89726+#endif
89727+
89728 if (flags & MAP_LOCKED)
89729 if (!can_do_mlock())
89730 return -EPERM;
89731@@ -1260,6 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89732 locked += mm->locked_vm;
89733 lock_limit = rlimit(RLIMIT_MEMLOCK);
89734 lock_limit >>= PAGE_SHIFT;
89735+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
89736 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
89737 return -EAGAIN;
89738 }
89739@@ -1344,6 +1465,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89740 vm_flags |= VM_NORESERVE;
89741 }
89742
89743+ if (!gr_acl_handle_mmap(file, prot))
89744+ return -EACCES;
89745+
89746 addr = mmap_region(file, addr, len, vm_flags, pgoff);
89747 if (!IS_ERR_VALUE(addr) &&
89748 ((vm_flags & VM_LOCKED) ||
89749@@ -1437,7 +1561,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
89750 vm_flags_t vm_flags = vma->vm_flags;
89751
89752 /* If it was private or non-writable, the write bit is already clear */
89753- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
89754+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
89755 return 0;
89756
89757 /* The backer wishes to know when pages are first written to? */
89758@@ -1483,7 +1607,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
89759 struct rb_node **rb_link, *rb_parent;
89760 unsigned long charged = 0;
89761
89762+#ifdef CONFIG_PAX_SEGMEXEC
89763+ struct vm_area_struct *vma_m = NULL;
89764+#endif
89765+
89766+ /*
89767+ * mm->mmap_sem is required to protect against another thread
89768+ * changing the mappings in case we sleep.
89769+ */
89770+ verify_mm_writelocked(mm);
89771+
89772 /* Check against address space limit. */
89773+
89774+#ifdef CONFIG_PAX_RANDMMAP
89775+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
89776+#endif
89777+
89778 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
89779 unsigned long nr_pages;
89780
89781@@ -1502,11 +1641,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
89782
89783 /* Clear old maps */
89784 error = -ENOMEM;
89785-munmap_back:
89786 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
89787 if (do_munmap(mm, addr, len))
89788 return -ENOMEM;
89789- goto munmap_back;
89790+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
89791 }
89792
89793 /*
89794@@ -1537,6 +1675,16 @@ munmap_back:
89795 goto unacct_error;
89796 }
89797
89798+#ifdef CONFIG_PAX_SEGMEXEC
89799+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
89800+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
89801+ if (!vma_m) {
89802+ error = -ENOMEM;
89803+ goto free_vma;
89804+ }
89805+ }
89806+#endif
89807+
89808 vma->vm_mm = mm;
89809 vma->vm_start = addr;
89810 vma->vm_end = addr + len;
89811@@ -1556,6 +1704,13 @@ munmap_back:
89812 if (error)
89813 goto unmap_and_free_vma;
89814
89815+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89816+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
89817+ vma->vm_flags |= VM_PAGEEXEC;
89818+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
89819+ }
89820+#endif
89821+
89822 /* Can addr have changed??
89823 *
89824 * Answer: Yes, several device drivers can do it in their
89825@@ -1589,6 +1744,12 @@ munmap_back:
89826 }
89827
89828 vma_link(mm, vma, prev, rb_link, rb_parent);
89829+
89830+#ifdef CONFIG_PAX_SEGMEXEC
89831+ if (vma_m)
89832+ BUG_ON(pax_mirror_vma(vma_m, vma));
89833+#endif
89834+
89835 /* Once vma denies write, undo our temporary denial count */
89836 if (vm_flags & VM_DENYWRITE)
89837 allow_write_access(file);
89838@@ -1597,6 +1758,7 @@ out:
89839 perf_event_mmap(vma);
89840
89841 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
89842+ track_exec_limit(mm, addr, addr + len, vm_flags);
89843 if (vm_flags & VM_LOCKED) {
89844 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
89845 vma == get_gate_vma(current->mm)))
89846@@ -1629,6 +1791,12 @@ unmap_and_free_vma:
89847 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
89848 charged = 0;
89849 free_vma:
89850+
89851+#ifdef CONFIG_PAX_SEGMEXEC
89852+ if (vma_m)
89853+ kmem_cache_free(vm_area_cachep, vma_m);
89854+#endif
89855+
89856 kmem_cache_free(vm_area_cachep, vma);
89857 unacct_error:
89858 if (charged)
89859@@ -1636,7 +1804,63 @@ unacct_error:
89860 return error;
89861 }
89862
89863-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
89864+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
89865+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
89866+{
89867+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
89868+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
89869+
89870+ return 0;
89871+}
89872+#endif
89873+
89874+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
89875+{
89876+ if (!vma) {
89877+#ifdef CONFIG_STACK_GROWSUP
89878+ if (addr > sysctl_heap_stack_gap)
89879+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
89880+ else
89881+ vma = find_vma(current->mm, 0);
89882+ if (vma && (vma->vm_flags & VM_GROWSUP))
89883+ return false;
89884+#endif
89885+ return true;
89886+ }
89887+
89888+ if (addr + len > vma->vm_start)
89889+ return false;
89890+
89891+ if (vma->vm_flags & VM_GROWSDOWN)
89892+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
89893+#ifdef CONFIG_STACK_GROWSUP
89894+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
89895+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
89896+#endif
89897+ else if (offset)
89898+ return offset <= vma->vm_start - addr - len;
89899+
89900+ return true;
89901+}
89902+
89903+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
89904+{
89905+ if (vma->vm_start < len)
89906+ return -ENOMEM;
89907+
89908+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
89909+ if (offset <= vma->vm_start - len)
89910+ return vma->vm_start - len - offset;
89911+ else
89912+ return -ENOMEM;
89913+ }
89914+
89915+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
89916+ return vma->vm_start - len - sysctl_heap_stack_gap;
89917+ return -ENOMEM;
89918+}
89919+
89920+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
89921 {
89922 /*
89923 * We implement the search by looking for an rbtree node that
89924@@ -1684,11 +1908,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
89925 }
89926 }
89927
89928- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
89929+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
89930 check_current:
89931 /* Check if current node has a suitable gap */
89932 if (gap_start > high_limit)
89933 return -ENOMEM;
89934+
89935+ if (gap_end - gap_start > info->threadstack_offset)
89936+ gap_start += info->threadstack_offset;
89937+ else
89938+ gap_start = gap_end;
89939+
89940+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
89941+ if (gap_end - gap_start > sysctl_heap_stack_gap)
89942+ gap_start += sysctl_heap_stack_gap;
89943+ else
89944+ gap_start = gap_end;
89945+ }
89946+ if (vma->vm_flags & VM_GROWSDOWN) {
89947+ if (gap_end - gap_start > sysctl_heap_stack_gap)
89948+ gap_end -= sysctl_heap_stack_gap;
89949+ else
89950+ gap_end = gap_start;
89951+ }
89952 if (gap_end >= low_limit && gap_end - gap_start >= length)
89953 goto found;
89954
89955@@ -1738,7 +1980,7 @@ found:
89956 return gap_start;
89957 }
89958
89959-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
89960+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
89961 {
89962 struct mm_struct *mm = current->mm;
89963 struct vm_area_struct *vma;
89964@@ -1792,6 +2034,24 @@ check_current:
89965 gap_end = vma->vm_start;
89966 if (gap_end < low_limit)
89967 return -ENOMEM;
89968+
89969+ if (gap_end - gap_start > info->threadstack_offset)
89970+ gap_end -= info->threadstack_offset;
89971+ else
89972+ gap_end = gap_start;
89973+
89974+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
89975+ if (gap_end - gap_start > sysctl_heap_stack_gap)
89976+ gap_start += sysctl_heap_stack_gap;
89977+ else
89978+ gap_start = gap_end;
89979+ }
89980+ if (vma->vm_flags & VM_GROWSDOWN) {
89981+ if (gap_end - gap_start > sysctl_heap_stack_gap)
89982+ gap_end -= sysctl_heap_stack_gap;
89983+ else
89984+ gap_end = gap_start;
89985+ }
89986 if (gap_start <= high_limit && gap_end - gap_start >= length)
89987 goto found;
89988
89989@@ -1855,6 +2115,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
89990 struct mm_struct *mm = current->mm;
89991 struct vm_area_struct *vma;
89992 struct vm_unmapped_area_info info;
89993+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
89994
89995 if (len > TASK_SIZE - mmap_min_addr)
89996 return -ENOMEM;
89997@@ -1862,19 +2123,30 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
89998 if (flags & MAP_FIXED)
89999 return addr;
90000
90001+#ifdef CONFIG_PAX_RANDMMAP
90002+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
90003+#endif
90004+
90005 if (addr) {
90006 addr = PAGE_ALIGN(addr);
90007 vma = find_vma(mm, addr);
90008 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
90009- (!vma || addr + len <= vma->vm_start))
90010+ check_heap_stack_gap(vma, addr, len, offset))
90011 return addr;
90012 }
90013
90014 info.flags = 0;
90015 info.length = len;
90016 info.low_limit = TASK_UNMAPPED_BASE;
90017+
90018+#ifdef CONFIG_PAX_RANDMMAP
90019+ if (mm->pax_flags & MF_PAX_RANDMMAP)
90020+ info.low_limit += mm->delta_mmap;
90021+#endif
90022+
90023 info.high_limit = TASK_SIZE;
90024 info.align_mask = 0;
90025+ info.threadstack_offset = offset;
90026 return vm_unmapped_area(&info);
90027 }
90028 #endif
90029@@ -1893,6 +2165,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90030 struct mm_struct *mm = current->mm;
90031 unsigned long addr = addr0;
90032 struct vm_unmapped_area_info info;
90033+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
90034
90035 /* requested length too big for entire address space */
90036 if (len > TASK_SIZE - mmap_min_addr)
90037@@ -1901,12 +2174,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90038 if (flags & MAP_FIXED)
90039 return addr;
90040
90041+#ifdef CONFIG_PAX_RANDMMAP
90042+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
90043+#endif
90044+
90045 /* requesting a specific address */
90046 if (addr) {
90047 addr = PAGE_ALIGN(addr);
90048 vma = find_vma(mm, addr);
90049 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
90050- (!vma || addr + len <= vma->vm_start))
90051+ check_heap_stack_gap(vma, addr, len, offset))
90052 return addr;
90053 }
90054
90055@@ -1915,6 +2192,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90056 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
90057 info.high_limit = mm->mmap_base;
90058 info.align_mask = 0;
90059+ info.threadstack_offset = offset;
90060 addr = vm_unmapped_area(&info);
90061
90062 /*
90063@@ -1927,6 +2205,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90064 VM_BUG_ON(addr != -ENOMEM);
90065 info.flags = 0;
90066 info.low_limit = TASK_UNMAPPED_BASE;
90067+
90068+#ifdef CONFIG_PAX_RANDMMAP
90069+ if (mm->pax_flags & MF_PAX_RANDMMAP)
90070+ info.low_limit += mm->delta_mmap;
90071+#endif
90072+
90073 info.high_limit = TASK_SIZE;
90074 addr = vm_unmapped_area(&info);
90075 }
90076@@ -2028,6 +2312,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
90077 return vma;
90078 }
90079
90080+#ifdef CONFIG_PAX_SEGMEXEC
90081+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
90082+{
90083+ struct vm_area_struct *vma_m;
90084+
90085+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
90086+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
90087+ BUG_ON(vma->vm_mirror);
90088+ return NULL;
90089+ }
90090+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
90091+ vma_m = vma->vm_mirror;
90092+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
90093+ BUG_ON(vma->vm_file != vma_m->vm_file);
90094+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
90095+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
90096+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
90097+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
90098+ return vma_m;
90099+}
90100+#endif
90101+
90102 /*
90103 * Verify that the stack growth is acceptable and
90104 * update accounting. This is shared with both the
90105@@ -2044,6 +2350,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90106 return -ENOMEM;
90107
90108 /* Stack limit test */
90109+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
90110 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
90111 return -ENOMEM;
90112
90113@@ -2054,6 +2361,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90114 locked = mm->locked_vm + grow;
90115 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
90116 limit >>= PAGE_SHIFT;
90117+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
90118 if (locked > limit && !capable(CAP_IPC_LOCK))
90119 return -ENOMEM;
90120 }
90121@@ -2083,37 +2391,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90122 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
90123 * vma is the last one with address > vma->vm_end. Have to extend vma.
90124 */
90125+#ifndef CONFIG_IA64
90126+static
90127+#endif
90128 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
90129 {
90130 int error;
90131+ bool locknext;
90132
90133 if (!(vma->vm_flags & VM_GROWSUP))
90134 return -EFAULT;
90135
90136+ /* Also guard against wrapping around to address 0. */
90137+ if (address < PAGE_ALIGN(address+1))
90138+ address = PAGE_ALIGN(address+1);
90139+ else
90140+ return -ENOMEM;
90141+
90142 /*
90143 * We must make sure the anon_vma is allocated
90144 * so that the anon_vma locking is not a noop.
90145 */
90146 if (unlikely(anon_vma_prepare(vma)))
90147 return -ENOMEM;
90148+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
90149+ if (locknext && anon_vma_prepare(vma->vm_next))
90150+ return -ENOMEM;
90151 vma_lock_anon_vma(vma);
90152+ if (locknext)
90153+ vma_lock_anon_vma(vma->vm_next);
90154
90155 /*
90156 * vma->vm_start/vm_end cannot change under us because the caller
90157 * is required to hold the mmap_sem in read mode. We need the
90158- * anon_vma lock to serialize against concurrent expand_stacks.
90159- * Also guard against wrapping around to address 0.
90160+ * anon_vma locks to serialize against concurrent expand_stacks
90161+ * and expand_upwards.
90162 */
90163- if (address < PAGE_ALIGN(address+4))
90164- address = PAGE_ALIGN(address+4);
90165- else {
90166- vma_unlock_anon_vma(vma);
90167- return -ENOMEM;
90168- }
90169 error = 0;
90170
90171 /* Somebody else might have raced and expanded it already */
90172- if (address > vma->vm_end) {
90173+ 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)
90174+ error = -ENOMEM;
90175+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
90176 unsigned long size, grow;
90177
90178 size = address - vma->vm_start;
90179@@ -2148,6 +2467,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
90180 }
90181 }
90182 }
90183+ if (locknext)
90184+ vma_unlock_anon_vma(vma->vm_next);
90185 vma_unlock_anon_vma(vma);
90186 khugepaged_enter_vma_merge(vma);
90187 validate_mm(vma->vm_mm);
90188@@ -2162,6 +2483,8 @@ int expand_downwards(struct vm_area_struct *vma,
90189 unsigned long address)
90190 {
90191 int error;
90192+ bool lockprev = false;
90193+ struct vm_area_struct *prev;
90194
90195 /*
90196 * We must make sure the anon_vma is allocated
90197@@ -2175,6 +2498,15 @@ int expand_downwards(struct vm_area_struct *vma,
90198 if (error)
90199 return error;
90200
90201+ prev = vma->vm_prev;
90202+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
90203+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
90204+#endif
90205+ if (lockprev && anon_vma_prepare(prev))
90206+ return -ENOMEM;
90207+ if (lockprev)
90208+ vma_lock_anon_vma(prev);
90209+
90210 vma_lock_anon_vma(vma);
90211
90212 /*
90213@@ -2184,9 +2516,17 @@ int expand_downwards(struct vm_area_struct *vma,
90214 */
90215
90216 /* Somebody else might have raced and expanded it already */
90217- if (address < vma->vm_start) {
90218+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
90219+ error = -ENOMEM;
90220+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
90221 unsigned long size, grow;
90222
90223+#ifdef CONFIG_PAX_SEGMEXEC
90224+ struct vm_area_struct *vma_m;
90225+
90226+ vma_m = pax_find_mirror_vma(vma);
90227+#endif
90228+
90229 size = vma->vm_end - address;
90230 grow = (vma->vm_start - address) >> PAGE_SHIFT;
90231
90232@@ -2211,13 +2551,27 @@ int expand_downwards(struct vm_area_struct *vma,
90233 vma->vm_pgoff -= grow;
90234 anon_vma_interval_tree_post_update_vma(vma);
90235 vma_gap_update(vma);
90236+
90237+#ifdef CONFIG_PAX_SEGMEXEC
90238+ if (vma_m) {
90239+ anon_vma_interval_tree_pre_update_vma(vma_m);
90240+ vma_m->vm_start -= grow << PAGE_SHIFT;
90241+ vma_m->vm_pgoff -= grow;
90242+ anon_vma_interval_tree_post_update_vma(vma_m);
90243+ vma_gap_update(vma_m);
90244+ }
90245+#endif
90246+
90247 spin_unlock(&vma->vm_mm->page_table_lock);
90248
90249+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
90250 perf_event_mmap(vma);
90251 }
90252 }
90253 }
90254 vma_unlock_anon_vma(vma);
90255+ if (lockprev)
90256+ vma_unlock_anon_vma(prev);
90257 khugepaged_enter_vma_merge(vma);
90258 validate_mm(vma->vm_mm);
90259 return error;
90260@@ -2315,6 +2669,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
90261 do {
90262 long nrpages = vma_pages(vma);
90263
90264+#ifdef CONFIG_PAX_SEGMEXEC
90265+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
90266+ vma = remove_vma(vma);
90267+ continue;
90268+ }
90269+#endif
90270+
90271 if (vma->vm_flags & VM_ACCOUNT)
90272 nr_accounted += nrpages;
90273 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
90274@@ -2359,6 +2720,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
90275 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
90276 vma->vm_prev = NULL;
90277 do {
90278+
90279+#ifdef CONFIG_PAX_SEGMEXEC
90280+ if (vma->vm_mirror) {
90281+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
90282+ vma->vm_mirror->vm_mirror = NULL;
90283+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
90284+ vma->vm_mirror = NULL;
90285+ }
90286+#endif
90287+
90288 vma_rb_erase(vma, &mm->mm_rb);
90289 mm->map_count--;
90290 tail_vma = vma;
90291@@ -2384,14 +2755,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90292 struct vm_area_struct *new;
90293 int err = -ENOMEM;
90294
90295+#ifdef CONFIG_PAX_SEGMEXEC
90296+ struct vm_area_struct *vma_m, *new_m = NULL;
90297+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
90298+#endif
90299+
90300 if (is_vm_hugetlb_page(vma) && (addr &
90301 ~(huge_page_mask(hstate_vma(vma)))))
90302 return -EINVAL;
90303
90304+#ifdef CONFIG_PAX_SEGMEXEC
90305+ vma_m = pax_find_mirror_vma(vma);
90306+#endif
90307+
90308 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
90309 if (!new)
90310 goto out_err;
90311
90312+#ifdef CONFIG_PAX_SEGMEXEC
90313+ if (vma_m) {
90314+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
90315+ if (!new_m) {
90316+ kmem_cache_free(vm_area_cachep, new);
90317+ goto out_err;
90318+ }
90319+ }
90320+#endif
90321+
90322 /* most fields are the same, copy all, and then fixup */
90323 *new = *vma;
90324
90325@@ -2404,6 +2794,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90326 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
90327 }
90328
90329+#ifdef CONFIG_PAX_SEGMEXEC
90330+ if (vma_m) {
90331+ *new_m = *vma_m;
90332+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
90333+ new_m->vm_mirror = new;
90334+ new->vm_mirror = new_m;
90335+
90336+ if (new_below)
90337+ new_m->vm_end = addr_m;
90338+ else {
90339+ new_m->vm_start = addr_m;
90340+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
90341+ }
90342+ }
90343+#endif
90344+
90345 err = vma_dup_policy(vma, new);
90346 if (err)
90347 goto out_free_vma;
90348@@ -2423,6 +2829,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90349 else
90350 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
90351
90352+#ifdef CONFIG_PAX_SEGMEXEC
90353+ if (!err && vma_m) {
90354+ struct mempolicy *pol = vma_policy(new);
90355+
90356+ if (anon_vma_clone(new_m, vma_m))
90357+ goto out_free_mpol;
90358+
90359+ mpol_get(pol);
90360+ set_vma_policy(new_m, pol);
90361+
90362+ if (new_m->vm_file)
90363+ get_file(new_m->vm_file);
90364+
90365+ if (new_m->vm_ops && new_m->vm_ops->open)
90366+ new_m->vm_ops->open(new_m);
90367+
90368+ if (new_below)
90369+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
90370+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
90371+ else
90372+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
90373+
90374+ if (err) {
90375+ if (new_m->vm_ops && new_m->vm_ops->close)
90376+ new_m->vm_ops->close(new_m);
90377+ if (new_m->vm_file)
90378+ fput(new_m->vm_file);
90379+ mpol_put(pol);
90380+ }
90381+ }
90382+#endif
90383+
90384 /* Success. */
90385 if (!err)
90386 return 0;
90387@@ -2432,10 +2870,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90388 new->vm_ops->close(new);
90389 if (new->vm_file)
90390 fput(new->vm_file);
90391- unlink_anon_vmas(new);
90392 out_free_mpol:
90393 mpol_put(vma_policy(new));
90394 out_free_vma:
90395+
90396+#ifdef CONFIG_PAX_SEGMEXEC
90397+ if (new_m) {
90398+ unlink_anon_vmas(new_m);
90399+ kmem_cache_free(vm_area_cachep, new_m);
90400+ }
90401+#endif
90402+
90403+ unlink_anon_vmas(new);
90404 kmem_cache_free(vm_area_cachep, new);
90405 out_err:
90406 return err;
90407@@ -2448,6 +2894,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90408 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
90409 unsigned long addr, int new_below)
90410 {
90411+
90412+#ifdef CONFIG_PAX_SEGMEXEC
90413+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
90414+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
90415+ if (mm->map_count >= sysctl_max_map_count-1)
90416+ return -ENOMEM;
90417+ } else
90418+#endif
90419+
90420 if (mm->map_count >= sysctl_max_map_count)
90421 return -ENOMEM;
90422
90423@@ -2459,11 +2914,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
90424 * work. This now handles partial unmappings.
90425 * Jeremy Fitzhardinge <jeremy@goop.org>
90426 */
90427+#ifdef CONFIG_PAX_SEGMEXEC
90428 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90429 {
90430+ int ret = __do_munmap(mm, start, len);
90431+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
90432+ return ret;
90433+
90434+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
90435+}
90436+
90437+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90438+#else
90439+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90440+#endif
90441+{
90442 unsigned long end;
90443 struct vm_area_struct *vma, *prev, *last;
90444
90445+ /*
90446+ * mm->mmap_sem is required to protect against another thread
90447+ * changing the mappings in case we sleep.
90448+ */
90449+ verify_mm_writelocked(mm);
90450+
90451 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
90452 return -EINVAL;
90453
90454@@ -2538,6 +3012,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90455 /* Fix up all other VM information */
90456 remove_vma_list(mm, vma);
90457
90458+ track_exec_limit(mm, start, end, 0UL);
90459+
90460 return 0;
90461 }
90462
90463@@ -2546,6 +3022,13 @@ int vm_munmap(unsigned long start, size_t len)
90464 int ret;
90465 struct mm_struct *mm = current->mm;
90466
90467+
90468+#ifdef CONFIG_PAX_SEGMEXEC
90469+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
90470+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
90471+ return -EINVAL;
90472+#endif
90473+
90474 down_write(&mm->mmap_sem);
90475 ret = do_munmap(mm, start, len);
90476 up_write(&mm->mmap_sem);
90477@@ -2559,16 +3042,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
90478 return vm_munmap(addr, len);
90479 }
90480
90481-static inline void verify_mm_writelocked(struct mm_struct *mm)
90482-{
90483-#ifdef CONFIG_DEBUG_VM
90484- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
90485- WARN_ON(1);
90486- up_read(&mm->mmap_sem);
90487- }
90488-#endif
90489-}
90490-
90491 /*
90492 * this is really a simplified "do_mmap". it only handles
90493 * anonymous maps. eventually we may be able to do some
90494@@ -2582,6 +3055,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90495 struct rb_node ** rb_link, * rb_parent;
90496 pgoff_t pgoff = addr >> PAGE_SHIFT;
90497 int error;
90498+ unsigned long charged;
90499
90500 len = PAGE_ALIGN(len);
90501 if (!len)
90502@@ -2589,16 +3063,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90503
90504 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
90505
90506+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
90507+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
90508+ flags &= ~VM_EXEC;
90509+
90510+#ifdef CONFIG_PAX_MPROTECT
90511+ if (mm->pax_flags & MF_PAX_MPROTECT)
90512+ flags &= ~VM_MAYEXEC;
90513+#endif
90514+
90515+ }
90516+#endif
90517+
90518 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
90519 if (error & ~PAGE_MASK)
90520 return error;
90521
90522+ charged = len >> PAGE_SHIFT;
90523+
90524 /*
90525 * mlock MCL_FUTURE?
90526 */
90527 if (mm->def_flags & VM_LOCKED) {
90528 unsigned long locked, lock_limit;
90529- locked = len >> PAGE_SHIFT;
90530+ locked = charged;
90531 locked += mm->locked_vm;
90532 lock_limit = rlimit(RLIMIT_MEMLOCK);
90533 lock_limit >>= PAGE_SHIFT;
90534@@ -2615,21 +3103,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90535 /*
90536 * Clear old maps. this also does some error checking for us
90537 */
90538- munmap_back:
90539 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
90540 if (do_munmap(mm, addr, len))
90541 return -ENOMEM;
90542- goto munmap_back;
90543+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
90544 }
90545
90546 /* Check against address space limits *after* clearing old maps... */
90547- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
90548+ if (!may_expand_vm(mm, charged))
90549 return -ENOMEM;
90550
90551 if (mm->map_count > sysctl_max_map_count)
90552 return -ENOMEM;
90553
90554- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
90555+ if (security_vm_enough_memory_mm(mm, charged))
90556 return -ENOMEM;
90557
90558 /* Can we just expand an old private anonymous mapping? */
90559@@ -2643,7 +3130,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90560 */
90561 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90562 if (!vma) {
90563- vm_unacct_memory(len >> PAGE_SHIFT);
90564+ vm_unacct_memory(charged);
90565 return -ENOMEM;
90566 }
90567
90568@@ -2657,10 +3144,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90569 vma_link(mm, vma, prev, rb_link, rb_parent);
90570 out:
90571 perf_event_mmap(vma);
90572- mm->total_vm += len >> PAGE_SHIFT;
90573+ mm->total_vm += charged;
90574 if (flags & VM_LOCKED)
90575- mm->locked_vm += (len >> PAGE_SHIFT);
90576+ mm->locked_vm += charged;
90577 vma->vm_flags |= VM_SOFTDIRTY;
90578+ track_exec_limit(mm, addr, addr + len, flags);
90579 return addr;
90580 }
90581
90582@@ -2722,6 +3210,7 @@ void exit_mmap(struct mm_struct *mm)
90583 while (vma) {
90584 if (vma->vm_flags & VM_ACCOUNT)
90585 nr_accounted += vma_pages(vma);
90586+ vma->vm_mirror = NULL;
90587 vma = remove_vma(vma);
90588 }
90589 vm_unacct_memory(nr_accounted);
90590@@ -2738,6 +3227,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
90591 struct vm_area_struct *prev;
90592 struct rb_node **rb_link, *rb_parent;
90593
90594+#ifdef CONFIG_PAX_SEGMEXEC
90595+ struct vm_area_struct *vma_m = NULL;
90596+#endif
90597+
90598+ if (security_mmap_addr(vma->vm_start))
90599+ return -EPERM;
90600+
90601 /*
90602 * The vm_pgoff of a purely anonymous vma should be irrelevant
90603 * until its first write fault, when page's anon_vma and index
90604@@ -2761,7 +3257,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
90605 security_vm_enough_memory_mm(mm, vma_pages(vma)))
90606 return -ENOMEM;
90607
90608+#ifdef CONFIG_PAX_SEGMEXEC
90609+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
90610+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90611+ if (!vma_m)
90612+ return -ENOMEM;
90613+ }
90614+#endif
90615+
90616 vma_link(mm, vma, prev, rb_link, rb_parent);
90617+
90618+#ifdef CONFIG_PAX_SEGMEXEC
90619+ if (vma_m)
90620+ BUG_ON(pax_mirror_vma(vma_m, vma));
90621+#endif
90622+
90623 return 0;
90624 }
90625
90626@@ -2780,6 +3290,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
90627 struct rb_node **rb_link, *rb_parent;
90628 bool faulted_in_anon_vma = true;
90629
90630+ BUG_ON(vma->vm_mirror);
90631+
90632 /*
90633 * If anonymous vma has not yet been faulted, update new pgoff
90634 * to match new location, to increase its chance of merging.
90635@@ -2844,6 +3356,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
90636 return NULL;
90637 }
90638
90639+#ifdef CONFIG_PAX_SEGMEXEC
90640+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
90641+{
90642+ struct vm_area_struct *prev_m;
90643+ struct rb_node **rb_link_m, *rb_parent_m;
90644+ struct mempolicy *pol_m;
90645+
90646+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
90647+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
90648+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
90649+ *vma_m = *vma;
90650+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
90651+ if (anon_vma_clone(vma_m, vma))
90652+ return -ENOMEM;
90653+ pol_m = vma_policy(vma_m);
90654+ mpol_get(pol_m);
90655+ set_vma_policy(vma_m, pol_m);
90656+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
90657+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
90658+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
90659+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
90660+ if (vma_m->vm_file)
90661+ get_file(vma_m->vm_file);
90662+ if (vma_m->vm_ops && vma_m->vm_ops->open)
90663+ vma_m->vm_ops->open(vma_m);
90664+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
90665+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
90666+ vma_m->vm_mirror = vma;
90667+ vma->vm_mirror = vma_m;
90668+ return 0;
90669+}
90670+#endif
90671+
90672 /*
90673 * Return true if the calling process may expand its vm space by the passed
90674 * number of pages
90675@@ -2855,6 +3400,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
90676
90677 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
90678
90679+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
90680 if (cur + npages > lim)
90681 return 0;
90682 return 1;
90683@@ -2925,6 +3471,22 @@ int install_special_mapping(struct mm_struct *mm,
90684 vma->vm_start = addr;
90685 vma->vm_end = addr + len;
90686
90687+#ifdef CONFIG_PAX_MPROTECT
90688+ if (mm->pax_flags & MF_PAX_MPROTECT) {
90689+#ifndef CONFIG_PAX_MPROTECT_COMPAT
90690+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
90691+ return -EPERM;
90692+ if (!(vm_flags & VM_EXEC))
90693+ vm_flags &= ~VM_MAYEXEC;
90694+#else
90695+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
90696+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
90697+#endif
90698+ else
90699+ vm_flags &= ~VM_MAYWRITE;
90700+ }
90701+#endif
90702+
90703 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
90704 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
90705
90706diff --git a/mm/mprotect.c b/mm/mprotect.c
90707index 7651a57..d761c62 100644
90708--- a/mm/mprotect.c
90709+++ b/mm/mprotect.c
90710@@ -23,10 +23,18 @@
90711 #include <linux/mmu_notifier.h>
90712 #include <linux/migrate.h>
90713 #include <linux/perf_event.h>
90714+#include <linux/sched/sysctl.h>
90715+
90716+#ifdef CONFIG_PAX_MPROTECT
90717+#include <linux/elf.h>
90718+#include <linux/binfmts.h>
90719+#endif
90720+
90721 #include <asm/uaccess.h>
90722 #include <asm/pgtable.h>
90723 #include <asm/cacheflush.h>
90724 #include <asm/tlbflush.h>
90725+#include <asm/mmu_context.h>
90726
90727 #ifndef pgprot_modify
90728 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
90729@@ -250,6 +258,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
90730 return pages;
90731 }
90732
90733+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
90734+/* called while holding the mmap semaphor for writing except stack expansion */
90735+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
90736+{
90737+ unsigned long oldlimit, newlimit = 0UL;
90738+
90739+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
90740+ return;
90741+
90742+ spin_lock(&mm->page_table_lock);
90743+ oldlimit = mm->context.user_cs_limit;
90744+ if ((prot & VM_EXEC) && oldlimit < end)
90745+ /* USER_CS limit moved up */
90746+ newlimit = end;
90747+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
90748+ /* USER_CS limit moved down */
90749+ newlimit = start;
90750+
90751+ if (newlimit) {
90752+ mm->context.user_cs_limit = newlimit;
90753+
90754+#ifdef CONFIG_SMP
90755+ wmb();
90756+ cpus_clear(mm->context.cpu_user_cs_mask);
90757+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
90758+#endif
90759+
90760+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
90761+ }
90762+ spin_unlock(&mm->page_table_lock);
90763+ if (newlimit == end) {
90764+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
90765+
90766+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
90767+ if (is_vm_hugetlb_page(vma))
90768+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
90769+ else
90770+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
90771+ }
90772+}
90773+#endif
90774+
90775 int
90776 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90777 unsigned long start, unsigned long end, unsigned long newflags)
90778@@ -262,11 +312,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90779 int error;
90780 int dirty_accountable = 0;
90781
90782+#ifdef CONFIG_PAX_SEGMEXEC
90783+ struct vm_area_struct *vma_m = NULL;
90784+ unsigned long start_m, end_m;
90785+
90786+ start_m = start + SEGMEXEC_TASK_SIZE;
90787+ end_m = end + SEGMEXEC_TASK_SIZE;
90788+#endif
90789+
90790 if (newflags == oldflags) {
90791 *pprev = vma;
90792 return 0;
90793 }
90794
90795+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
90796+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
90797+
90798+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
90799+ return -ENOMEM;
90800+
90801+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
90802+ return -ENOMEM;
90803+ }
90804+
90805 /*
90806 * If we make a private mapping writable we increase our commit;
90807 * but (without finer accounting) cannot reduce our commit if we
90808@@ -283,6 +351,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90809 }
90810 }
90811
90812+#ifdef CONFIG_PAX_SEGMEXEC
90813+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
90814+ if (start != vma->vm_start) {
90815+ error = split_vma(mm, vma, start, 1);
90816+ if (error)
90817+ goto fail;
90818+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
90819+ *pprev = (*pprev)->vm_next;
90820+ }
90821+
90822+ if (end != vma->vm_end) {
90823+ error = split_vma(mm, vma, end, 0);
90824+ if (error)
90825+ goto fail;
90826+ }
90827+
90828+ if (pax_find_mirror_vma(vma)) {
90829+ error = __do_munmap(mm, start_m, end_m - start_m);
90830+ if (error)
90831+ goto fail;
90832+ } else {
90833+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90834+ if (!vma_m) {
90835+ error = -ENOMEM;
90836+ goto fail;
90837+ }
90838+ vma->vm_flags = newflags;
90839+ error = pax_mirror_vma(vma_m, vma);
90840+ if (error) {
90841+ vma->vm_flags = oldflags;
90842+ goto fail;
90843+ }
90844+ }
90845+ }
90846+#endif
90847+
90848 /*
90849 * First try to merge with previous and/or next vma.
90850 */
90851@@ -313,9 +417,21 @@ success:
90852 * vm_flags and vm_page_prot are protected by the mmap_sem
90853 * held in write mode.
90854 */
90855+
90856+#ifdef CONFIG_PAX_SEGMEXEC
90857+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
90858+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
90859+#endif
90860+
90861 vma->vm_flags = newflags;
90862+
90863+#ifdef CONFIG_PAX_MPROTECT
90864+ if (mm->binfmt && mm->binfmt->handle_mprotect)
90865+ mm->binfmt->handle_mprotect(vma, newflags);
90866+#endif
90867+
90868 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
90869- vm_get_page_prot(newflags));
90870+ vm_get_page_prot(vma->vm_flags));
90871
90872 if (vma_wants_writenotify(vma)) {
90873 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
90874@@ -354,6 +470,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90875 end = start + len;
90876 if (end <= start)
90877 return -ENOMEM;
90878+
90879+#ifdef CONFIG_PAX_SEGMEXEC
90880+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
90881+ if (end > SEGMEXEC_TASK_SIZE)
90882+ return -EINVAL;
90883+ } else
90884+#endif
90885+
90886+ if (end > TASK_SIZE)
90887+ return -EINVAL;
90888+
90889 if (!arch_validate_prot(prot))
90890 return -EINVAL;
90891
90892@@ -361,7 +488,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90893 /*
90894 * Does the application expect PROT_READ to imply PROT_EXEC:
90895 */
90896- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
90897+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
90898 prot |= PROT_EXEC;
90899
90900 vm_flags = calc_vm_prot_bits(prot);
90901@@ -393,6 +520,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90902 if (start > vma->vm_start)
90903 prev = vma;
90904
90905+#ifdef CONFIG_PAX_MPROTECT
90906+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
90907+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
90908+#endif
90909+
90910 for (nstart = start ; ; ) {
90911 unsigned long newflags;
90912
90913@@ -403,6 +535,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90914
90915 /* newflags >> 4 shift VM_MAY% in place of VM_% */
90916 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
90917+ if (prot & (PROT_WRITE | PROT_EXEC))
90918+ gr_log_rwxmprotect(vma);
90919+
90920+ error = -EACCES;
90921+ goto out;
90922+ }
90923+
90924+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
90925 error = -EACCES;
90926 goto out;
90927 }
90928@@ -417,6 +557,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90929 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
90930 if (error)
90931 goto out;
90932+
90933+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
90934+
90935 nstart = tmp;
90936
90937 if (nstart < prev->vm_end)
90938diff --git a/mm/mremap.c b/mm/mremap.c
90939index 0843feb..4f5b2e6 100644
90940--- a/mm/mremap.c
90941+++ b/mm/mremap.c
90942@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
90943 continue;
90944 pte = ptep_get_and_clear(mm, old_addr, old_pte);
90945 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
90946+
90947+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
90948+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
90949+ pte = pte_exprotect(pte);
90950+#endif
90951+
90952 pte = move_soft_dirty_pte(pte);
90953 set_pte_at(mm, new_addr, new_pte, pte);
90954 }
90955@@ -337,6 +343,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
90956 if (is_vm_hugetlb_page(vma))
90957 goto Einval;
90958
90959+#ifdef CONFIG_PAX_SEGMEXEC
90960+ if (pax_find_mirror_vma(vma))
90961+ goto Einval;
90962+#endif
90963+
90964 /* We can't remap across vm area boundaries */
90965 if (old_len > vma->vm_end - addr)
90966 goto Efault;
90967@@ -392,20 +403,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
90968 unsigned long ret = -EINVAL;
90969 unsigned long charged = 0;
90970 unsigned long map_flags;
90971+ unsigned long pax_task_size = TASK_SIZE;
90972
90973 if (new_addr & ~PAGE_MASK)
90974 goto out;
90975
90976- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
90977+#ifdef CONFIG_PAX_SEGMEXEC
90978+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
90979+ pax_task_size = SEGMEXEC_TASK_SIZE;
90980+#endif
90981+
90982+ pax_task_size -= PAGE_SIZE;
90983+
90984+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
90985 goto out;
90986
90987 /* Check if the location we're moving into overlaps the
90988 * old location at all, and fail if it does.
90989 */
90990- if ((new_addr <= addr) && (new_addr+new_len) > addr)
90991- goto out;
90992-
90993- if ((addr <= new_addr) && (addr+old_len) > new_addr)
90994+ if (addr + old_len > new_addr && new_addr + new_len > addr)
90995 goto out;
90996
90997 ret = do_munmap(mm, new_addr, new_len);
90998@@ -474,6 +490,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
90999 unsigned long ret = -EINVAL;
91000 unsigned long charged = 0;
91001 bool locked = false;
91002+ unsigned long pax_task_size = TASK_SIZE;
91003
91004 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
91005 return ret;
91006@@ -495,6 +512,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91007 if (!new_len)
91008 return ret;
91009
91010+#ifdef CONFIG_PAX_SEGMEXEC
91011+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
91012+ pax_task_size = SEGMEXEC_TASK_SIZE;
91013+#endif
91014+
91015+ pax_task_size -= PAGE_SIZE;
91016+
91017+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
91018+ old_len > pax_task_size || addr > pax_task_size-old_len)
91019+ return ret;
91020+
91021 down_write(&current->mm->mmap_sem);
91022
91023 if (flags & MREMAP_FIXED) {
91024@@ -545,6 +573,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91025 new_addr = addr;
91026 }
91027 ret = addr;
91028+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
91029 goto out;
91030 }
91031 }
91032@@ -568,7 +597,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91033 goto out;
91034 }
91035
91036+ map_flags = vma->vm_flags;
91037 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
91038+ if (!(ret & ~PAGE_MASK)) {
91039+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
91040+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
91041+ }
91042 }
91043 out:
91044 if (ret & ~PAGE_MASK)
91045diff --git a/mm/nommu.c b/mm/nommu.c
91046index ecd1f15..77039bd 100644
91047--- a/mm/nommu.c
91048+++ b/mm/nommu.c
91049@@ -64,7 +64,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
91050 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
91051 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
91052 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
91053-int heap_stack_gap = 0;
91054
91055 atomic_long_t mmap_pages_allocated;
91056
91057@@ -844,15 +843,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
91058 EXPORT_SYMBOL(find_vma);
91059
91060 /*
91061- * find a VMA
91062- * - we don't extend stack VMAs under NOMMU conditions
91063- */
91064-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
91065-{
91066- return find_vma(mm, addr);
91067-}
91068-
91069-/*
91070 * expand a stack to a given address
91071 * - not supported under NOMMU conditions
91072 */
91073@@ -1563,6 +1553,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
91074
91075 /* most fields are the same, copy all, and then fixup */
91076 *new = *vma;
91077+ INIT_LIST_HEAD(&new->anon_vma_chain);
91078 *region = *vma->vm_region;
91079 new->vm_region = region;
91080
91081@@ -1993,8 +1984,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
91082 }
91083 EXPORT_SYMBOL(generic_file_remap_pages);
91084
91085-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91086- unsigned long addr, void *buf, int len, int write)
91087+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91088+ unsigned long addr, void *buf, size_t len, int write)
91089 {
91090 struct vm_area_struct *vma;
91091
91092@@ -2035,8 +2026,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91093 *
91094 * The caller must hold a reference on @mm.
91095 */
91096-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91097- void *buf, int len, int write)
91098+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
91099+ void *buf, size_t len, int write)
91100 {
91101 return __access_remote_vm(NULL, mm, addr, buf, len, write);
91102 }
91103@@ -2045,7 +2036,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91104 * Access another process' address space.
91105 * - source/target buffer must be kernel space
91106 */
91107-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
91108+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
91109 {
91110 struct mm_struct *mm;
91111
91112diff --git a/mm/page-writeback.c b/mm/page-writeback.c
91113index 6380758..4064aec 100644
91114--- a/mm/page-writeback.c
91115+++ b/mm/page-writeback.c
91116@@ -690,7 +690,7 @@ static inline long long pos_ratio_polynom(unsigned long setpoint,
91117 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
91118 * - the bdi dirty thresh drops quickly due to change of JBOD workload
91119 */
91120-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
91121+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
91122 unsigned long thresh,
91123 unsigned long bg_thresh,
91124 unsigned long dirty,
91125diff --git a/mm/page_alloc.c b/mm/page_alloc.c
91126index 317ea74..a4a1977 100644
91127--- a/mm/page_alloc.c
91128+++ b/mm/page_alloc.c
91129@@ -61,6 +61,7 @@
91130 #include <linux/page-debug-flags.h>
91131 #include <linux/hugetlb.h>
91132 #include <linux/sched/rt.h>
91133+#include <linux/random.h>
91134
91135 #include <asm/sections.h>
91136 #include <asm/tlbflush.h>
91137@@ -354,7 +355,7 @@ out:
91138 * This usage means that zero-order pages may not be compound.
91139 */
91140
91141-static void free_compound_page(struct page *page)
91142+void free_compound_page(struct page *page)
91143 {
91144 __free_pages_ok(page, compound_order(page));
91145 }
91146@@ -712,6 +713,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
91147 int i;
91148 int bad = 0;
91149
91150+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91151+ unsigned long index = 1UL << order;
91152+#endif
91153+
91154 trace_mm_page_free(page, order);
91155 kmemcheck_free_shadow(page, order);
91156
91157@@ -728,6 +733,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
91158 debug_check_no_obj_freed(page_address(page),
91159 PAGE_SIZE << order);
91160 }
91161+
91162+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91163+ for (; index; --index)
91164+ sanitize_highpage(page + index - 1);
91165+#endif
91166+
91167 arch_free_page(page, order);
91168 kernel_map_pages(page, 1 << order, 0);
91169
91170@@ -750,6 +761,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
91171 local_irq_restore(flags);
91172 }
91173
91174+#ifdef CONFIG_PAX_LATENT_ENTROPY
91175+bool __meminitdata extra_latent_entropy;
91176+
91177+static int __init setup_pax_extra_latent_entropy(char *str)
91178+{
91179+ extra_latent_entropy = true;
91180+ return 0;
91181+}
91182+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
91183+
91184+volatile u64 latent_entropy __latent_entropy;
91185+EXPORT_SYMBOL(latent_entropy);
91186+#endif
91187+
91188 void __init __free_pages_bootmem(struct page *page, unsigned int order)
91189 {
91190 unsigned int nr_pages = 1 << order;
91191@@ -765,6 +790,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
91192 __ClearPageReserved(p);
91193 set_page_count(p, 0);
91194
91195+#ifdef CONFIG_PAX_LATENT_ENTROPY
91196+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
91197+ u64 hash = 0;
91198+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
91199+ const u64 *data = lowmem_page_address(page);
91200+
91201+ for (index = 0; index < end; index++)
91202+ hash ^= hash + data[index];
91203+ latent_entropy ^= hash;
91204+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
91205+ }
91206+#endif
91207+
91208 page_zone(page)->managed_pages += nr_pages;
91209 set_page_refcounted(page);
91210 __free_pages(page, order);
91211@@ -870,8 +908,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
91212 arch_alloc_page(page, order);
91213 kernel_map_pages(page, 1 << order, 1);
91214
91215+#ifndef CONFIG_PAX_MEMORY_SANITIZE
91216 if (gfp_flags & __GFP_ZERO)
91217 prep_zero_page(page, order, gfp_flags);
91218+#endif
91219
91220 if (order && (gfp_flags & __GFP_COMP))
91221 prep_compound_page(page, order);
91222diff --git a/mm/page_io.c b/mm/page_io.c
91223index 8c79a47..a689e0d 100644
91224--- a/mm/page_io.c
91225+++ b/mm/page_io.c
91226@@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
91227 struct file *swap_file = sis->swap_file;
91228 struct address_space *mapping = swap_file->f_mapping;
91229 struct iovec iov = {
91230- .iov_base = kmap(page),
91231+ .iov_base = (void __force_user *)kmap(page),
91232 .iov_len = PAGE_SIZE,
91233 };
91234
91235diff --git a/mm/percpu.c b/mm/percpu.c
91236index 8c8e08f..73a5cda 100644
91237--- a/mm/percpu.c
91238+++ b/mm/percpu.c
91239@@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
91240 static unsigned int pcpu_high_unit_cpu __read_mostly;
91241
91242 /* the address of the first chunk which starts with the kernel static area */
91243-void *pcpu_base_addr __read_mostly;
91244+void *pcpu_base_addr __read_only;
91245 EXPORT_SYMBOL_GPL(pcpu_base_addr);
91246
91247 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
91248diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
91249index fd26d04..0cea1b0 100644
91250--- a/mm/process_vm_access.c
91251+++ b/mm/process_vm_access.c
91252@@ -13,6 +13,7 @@
91253 #include <linux/uio.h>
91254 #include <linux/sched.h>
91255 #include <linux/highmem.h>
91256+#include <linux/security.h>
91257 #include <linux/ptrace.h>
91258 #include <linux/slab.h>
91259 #include <linux/syscalls.h>
91260@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
91261 size_t iov_l_curr_offset = 0;
91262 ssize_t iov_len;
91263
91264+ return -ENOSYS; // PaX: until properly audited
91265+
91266 /*
91267 * Work out how many pages of struct pages we're going to need
91268 * when eventually calling get_user_pages
91269 */
91270 for (i = 0; i < riovcnt; i++) {
91271 iov_len = rvec[i].iov_len;
91272- if (iov_len > 0) {
91273- nr_pages_iov = ((unsigned long)rvec[i].iov_base
91274- + iov_len)
91275- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
91276- / PAGE_SIZE + 1;
91277- nr_pages = max(nr_pages, nr_pages_iov);
91278- }
91279+ if (iov_len <= 0)
91280+ continue;
91281+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
91282+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
91283+ nr_pages = max(nr_pages, nr_pages_iov);
91284 }
91285
91286 if (nr_pages == 0)
91287@@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
91288 goto free_proc_pages;
91289 }
91290
91291+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
91292+ rc = -EPERM;
91293+ goto put_task_struct;
91294+ }
91295+
91296 mm = mm_access(task, PTRACE_MODE_ATTACH);
91297 if (!mm || IS_ERR(mm)) {
91298 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
91299diff --git a/mm/rmap.c b/mm/rmap.c
91300index b9d2222..e4baa1f 100644
91301--- a/mm/rmap.c
91302+++ b/mm/rmap.c
91303@@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91304 struct anon_vma *anon_vma = vma->anon_vma;
91305 struct anon_vma_chain *avc;
91306
91307+#ifdef CONFIG_PAX_SEGMEXEC
91308+ struct anon_vma_chain *avc_m = NULL;
91309+#endif
91310+
91311 might_sleep();
91312 if (unlikely(!anon_vma)) {
91313 struct mm_struct *mm = vma->vm_mm;
91314@@ -172,6 +176,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91315 if (!avc)
91316 goto out_enomem;
91317
91318+#ifdef CONFIG_PAX_SEGMEXEC
91319+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
91320+ if (!avc_m)
91321+ goto out_enomem_free_avc;
91322+#endif
91323+
91324 anon_vma = find_mergeable_anon_vma(vma);
91325 allocated = NULL;
91326 if (!anon_vma) {
91327@@ -185,6 +195,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91328 /* page_table_lock to protect against threads */
91329 spin_lock(&mm->page_table_lock);
91330 if (likely(!vma->anon_vma)) {
91331+
91332+#ifdef CONFIG_PAX_SEGMEXEC
91333+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
91334+
91335+ if (vma_m) {
91336+ BUG_ON(vma_m->anon_vma);
91337+ vma_m->anon_vma = anon_vma;
91338+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
91339+ avc_m = NULL;
91340+ }
91341+#endif
91342+
91343 vma->anon_vma = anon_vma;
91344 anon_vma_chain_link(vma, avc, anon_vma);
91345 allocated = NULL;
91346@@ -195,12 +217,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91347
91348 if (unlikely(allocated))
91349 put_anon_vma(allocated);
91350+
91351+#ifdef CONFIG_PAX_SEGMEXEC
91352+ if (unlikely(avc_m))
91353+ anon_vma_chain_free(avc_m);
91354+#endif
91355+
91356 if (unlikely(avc))
91357 anon_vma_chain_free(avc);
91358 }
91359 return 0;
91360
91361 out_enomem_free_avc:
91362+
91363+#ifdef CONFIG_PAX_SEGMEXEC
91364+ if (avc_m)
91365+ anon_vma_chain_free(avc_m);
91366+#endif
91367+
91368 anon_vma_chain_free(avc);
91369 out_enomem:
91370 return -ENOMEM;
91371@@ -236,7 +270,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
91372 * Attach the anon_vmas from src to dst.
91373 * Returns 0 on success, -ENOMEM on failure.
91374 */
91375-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
91376+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
91377 {
91378 struct anon_vma_chain *avc, *pavc;
91379 struct anon_vma *root = NULL;
91380@@ -269,7 +303,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
91381 * the corresponding VMA in the parent process is attached to.
91382 * Returns 0 on success, non-zero on failure.
91383 */
91384-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
91385+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
91386 {
91387 struct anon_vma_chain *avc;
91388 struct anon_vma *anon_vma;
91389@@ -373,8 +407,10 @@ static void anon_vma_ctor(void *data)
91390 void __init anon_vma_init(void)
91391 {
91392 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
91393- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
91394- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
91395+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
91396+ anon_vma_ctor);
91397+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
91398+ SLAB_PANIC|SLAB_NO_SANITIZE);
91399 }
91400
91401 /*
91402diff --git a/mm/shmem.c b/mm/shmem.c
91403index 8297623..6b9dfe9 100644
91404--- a/mm/shmem.c
91405+++ b/mm/shmem.c
91406@@ -33,7 +33,7 @@
91407 #include <linux/swap.h>
91408 #include <linux/aio.h>
91409
91410-static struct vfsmount *shm_mnt;
91411+struct vfsmount *shm_mnt;
91412
91413 #ifdef CONFIG_SHMEM
91414 /*
91415@@ -77,7 +77,7 @@ static struct vfsmount *shm_mnt;
91416 #define BOGO_DIRENT_SIZE 20
91417
91418 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
91419-#define SHORT_SYMLINK_LEN 128
91420+#define SHORT_SYMLINK_LEN 64
91421
91422 /*
91423 * shmem_fallocate and shmem_writepage communicate via inode->i_private
91424@@ -2232,6 +2232,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
91425 static int shmem_xattr_validate(const char *name)
91426 {
91427 struct { const char *prefix; size_t len; } arr[] = {
91428+
91429+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
91430+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
91431+#endif
91432+
91433 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
91434 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
91435 };
91436@@ -2287,6 +2292,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
91437 if (err)
91438 return err;
91439
91440+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
91441+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
91442+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
91443+ return -EOPNOTSUPP;
91444+ if (size > 8)
91445+ return -EINVAL;
91446+ }
91447+#endif
91448+
91449 return simple_xattr_set(&info->xattrs, name, value, size, flags);
91450 }
91451
91452@@ -2599,8 +2613,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
91453 int err = -ENOMEM;
91454
91455 /* Round up to L1_CACHE_BYTES to resist false sharing */
91456- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
91457- L1_CACHE_BYTES), GFP_KERNEL);
91458+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
91459 if (!sbinfo)
91460 return -ENOMEM;
91461
91462diff --git a/mm/slab.c b/mm/slab.c
91463index 2580db0..0523956 100644
91464--- a/mm/slab.c
91465+++ b/mm/slab.c
91466@@ -366,10 +366,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
91467 if ((x)->max_freeable < i) \
91468 (x)->max_freeable = i; \
91469 } while (0)
91470-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
91471-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
91472-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
91473-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
91474+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
91475+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
91476+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
91477+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
91478+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
91479+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
91480 #else
91481 #define STATS_INC_ACTIVE(x) do { } while (0)
91482 #define STATS_DEC_ACTIVE(x) do { } while (0)
91483@@ -386,6 +388,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
91484 #define STATS_INC_ALLOCMISS(x) do { } while (0)
91485 #define STATS_INC_FREEHIT(x) do { } while (0)
91486 #define STATS_INC_FREEMISS(x) do { } while (0)
91487+#define STATS_INC_SANITIZED(x) do { } while (0)
91488+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
91489 #endif
91490
91491 #if DEBUG
91492@@ -477,7 +481,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
91493 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
91494 */
91495 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
91496- const struct slab *slab, void *obj)
91497+ const struct slab *slab, const void *obj)
91498 {
91499 u32 offset = (obj - slab->s_mem);
91500 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
91501@@ -1571,12 +1575,12 @@ void __init kmem_cache_init(void)
91502 */
91503
91504 kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
91505- kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
91506+ kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
91507
91508 if (INDEX_AC != INDEX_NODE)
91509 kmalloc_caches[INDEX_NODE] =
91510 create_kmalloc_cache("kmalloc-node",
91511- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
91512+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
91513
91514 slab_early_init = 0;
91515
91516@@ -3577,6 +3581,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
91517 struct array_cache *ac = cpu_cache_get(cachep);
91518
91519 check_irq_off();
91520+
91521+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91522+ if (pax_sanitize_slab) {
91523+ if (!(cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))) {
91524+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
91525+
91526+ if (cachep->ctor)
91527+ cachep->ctor(objp);
91528+
91529+ STATS_INC_SANITIZED(cachep);
91530+ } else
91531+ STATS_INC_NOT_SANITIZED(cachep);
91532+ }
91533+#endif
91534+
91535 kmemleak_free_recursive(objp, cachep->flags);
91536 objp = cache_free_debugcheck(cachep, objp, caller);
91537
91538@@ -3805,6 +3824,7 @@ void kfree(const void *objp)
91539
91540 if (unlikely(ZERO_OR_NULL_PTR(objp)))
91541 return;
91542+ VM_BUG_ON(!virt_addr_valid(objp));
91543 local_irq_save(flags);
91544 kfree_debugcheck(objp);
91545 c = virt_to_cache(objp);
91546@@ -4246,14 +4266,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
91547 }
91548 /* cpu stats */
91549 {
91550- unsigned long allochit = atomic_read(&cachep->allochit);
91551- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
91552- unsigned long freehit = atomic_read(&cachep->freehit);
91553- unsigned long freemiss = atomic_read(&cachep->freemiss);
91554+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
91555+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
91556+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
91557+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
91558
91559 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
91560 allochit, allocmiss, freehit, freemiss);
91561 }
91562+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91563+ {
91564+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
91565+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
91566+
91567+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
91568+ }
91569+#endif
91570 #endif
91571 }
91572
91573@@ -4471,13 +4499,71 @@ static const struct file_operations proc_slabstats_operations = {
91574 static int __init slab_proc_init(void)
91575 {
91576 #ifdef CONFIG_DEBUG_SLAB_LEAK
91577- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
91578+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
91579 #endif
91580 return 0;
91581 }
91582 module_init(slab_proc_init);
91583 #endif
91584
91585+bool is_usercopy_object(const void *ptr)
91586+{
91587+ struct page *page;
91588+ struct kmem_cache *cachep;
91589+
91590+ if (ZERO_OR_NULL_PTR(ptr))
91591+ return false;
91592+
91593+ if (!slab_is_available())
91594+ return false;
91595+
91596+ if (!virt_addr_valid(ptr))
91597+ return false;
91598+
91599+ page = virt_to_head_page(ptr);
91600+
91601+ if (!PageSlab(page))
91602+ return false;
91603+
91604+ cachep = page->slab_cache;
91605+ return cachep->flags & SLAB_USERCOPY;
91606+}
91607+
91608+#ifdef CONFIG_PAX_USERCOPY
91609+const char *check_heap_object(const void *ptr, unsigned long n)
91610+{
91611+ struct page *page;
91612+ struct kmem_cache *cachep;
91613+ struct slab *slabp;
91614+ unsigned int objnr;
91615+ unsigned long offset;
91616+
91617+ if (ZERO_OR_NULL_PTR(ptr))
91618+ return "<null>";
91619+
91620+ if (!virt_addr_valid(ptr))
91621+ return NULL;
91622+
91623+ page = virt_to_head_page(ptr);
91624+
91625+ if (!PageSlab(page))
91626+ return NULL;
91627+
91628+ cachep = page->slab_cache;
91629+ if (!(cachep->flags & SLAB_USERCOPY))
91630+ return cachep->name;
91631+
91632+ slabp = page->slab_page;
91633+ objnr = obj_to_index(cachep, slabp, ptr);
91634+ BUG_ON(objnr >= cachep->num);
91635+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
91636+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
91637+ return NULL;
91638+
91639+ return cachep->name;
91640+}
91641+#endif
91642+
91643 /**
91644 * ksize - get the actual amount of memory allocated for a given object
91645 * @objp: Pointer to the object
91646diff --git a/mm/slab.h b/mm/slab.h
91647index a535033..2f98fe5 100644
91648--- a/mm/slab.h
91649+++ b/mm/slab.h
91650@@ -32,6 +32,15 @@ extern struct list_head slab_caches;
91651 /* The slab cache that manages slab cache information */
91652 extern struct kmem_cache *kmem_cache;
91653
91654+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91655+#ifdef CONFIG_X86_64
91656+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
91657+#else
91658+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
91659+#endif
91660+extern bool pax_sanitize_slab;
91661+#endif
91662+
91663 unsigned long calculate_alignment(unsigned long flags,
91664 unsigned long align, unsigned long size);
91665
91666@@ -67,7 +76,8 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
91667
91668 /* Legal flag mask for kmem_cache_create(), for various configurations */
91669 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
91670- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
91671+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
91672+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
91673
91674 #if defined(CONFIG_DEBUG_SLAB)
91675 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
91676@@ -231,6 +241,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
91677 return s;
91678
91679 page = virt_to_head_page(x);
91680+
91681+ BUG_ON(!PageSlab(page));
91682+
91683 cachep = page->slab_cache;
91684 if (slab_equal_or_root(cachep, s))
91685 return cachep;
91686diff --git a/mm/slab_common.c b/mm/slab_common.c
91687index e2e98af..3b1a163 100644
91688--- a/mm/slab_common.c
91689+++ b/mm/slab_common.c
91690@@ -23,11 +23,22 @@
91691
91692 #include "slab.h"
91693
91694-enum slab_state slab_state;
91695+enum slab_state slab_state __read_only;
91696 LIST_HEAD(slab_caches);
91697 DEFINE_MUTEX(slab_mutex);
91698 struct kmem_cache *kmem_cache;
91699
91700+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91701+bool pax_sanitize_slab __read_only = true;
91702+static int __init pax_sanitize_slab_setup(char *str)
91703+{
91704+ pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
91705+ printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
91706+ return 1;
91707+}
91708+__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
91709+#endif
91710+
91711 #ifdef CONFIG_DEBUG_VM
91712 static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
91713 size_t size)
91714@@ -212,7 +223,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
91715
91716 err = __kmem_cache_create(s, flags);
91717 if (!err) {
91718- s->refcount = 1;
91719+ atomic_set(&s->refcount, 1);
91720 list_add(&s->list, &slab_caches);
91721 memcg_cache_list_add(memcg, s);
91722 } else {
91723@@ -258,8 +269,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
91724
91725 get_online_cpus();
91726 mutex_lock(&slab_mutex);
91727- s->refcount--;
91728- if (!s->refcount) {
91729+ if (atomic_dec_and_test(&s->refcount)) {
91730 list_del(&s->list);
91731
91732 if (!__kmem_cache_shutdown(s)) {
91733@@ -305,7 +315,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
91734 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
91735 name, size, err);
91736
91737- s->refcount = -1; /* Exempt from merging for now */
91738+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
91739 }
91740
91741 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
91742@@ -318,7 +328,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
91743
91744 create_boot_cache(s, name, size, flags);
91745 list_add(&s->list, &slab_caches);
91746- s->refcount = 1;
91747+ atomic_set(&s->refcount, 1);
91748 return s;
91749 }
91750
91751@@ -330,6 +340,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
91752 EXPORT_SYMBOL(kmalloc_dma_caches);
91753 #endif
91754
91755+#ifdef CONFIG_PAX_USERCOPY_SLABS
91756+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
91757+EXPORT_SYMBOL(kmalloc_usercopy_caches);
91758+#endif
91759+
91760 /*
91761 * Conversion table for small slabs sizes / 8 to the index in the
91762 * kmalloc array. This is necessary for slabs < 192 since we have non power
91763@@ -394,6 +409,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
91764 return kmalloc_dma_caches[index];
91765
91766 #endif
91767+
91768+#ifdef CONFIG_PAX_USERCOPY_SLABS
91769+ if (unlikely((flags & GFP_USERCOPY)))
91770+ return kmalloc_usercopy_caches[index];
91771+
91772+#endif
91773+
91774 return kmalloc_caches[index];
91775 }
91776
91777@@ -450,7 +472,7 @@ void __init create_kmalloc_caches(unsigned long flags)
91778 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
91779 if (!kmalloc_caches[i]) {
91780 kmalloc_caches[i] = create_kmalloc_cache(NULL,
91781- 1 << i, flags);
91782+ 1 << i, SLAB_USERCOPY | flags);
91783 }
91784
91785 /*
91786@@ -459,10 +481,10 @@ void __init create_kmalloc_caches(unsigned long flags)
91787 * earlier power of two caches
91788 */
91789 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
91790- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
91791+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
91792
91793 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
91794- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
91795+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
91796 }
91797
91798 /* Kmalloc array is now usable */
91799@@ -495,6 +517,23 @@ void __init create_kmalloc_caches(unsigned long flags)
91800 }
91801 }
91802 #endif
91803+
91804+#ifdef CONFIG_PAX_USERCOPY_SLABS
91805+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
91806+ struct kmem_cache *s = kmalloc_caches[i];
91807+
91808+ if (s) {
91809+ int size = kmalloc_size(i);
91810+ char *n = kasprintf(GFP_NOWAIT,
91811+ "usercopy-kmalloc-%d", size);
91812+
91813+ BUG_ON(!n);
91814+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
91815+ size, SLAB_USERCOPY | flags);
91816+ }
91817+ }
91818+#endif
91819+
91820 }
91821 #endif /* !CONFIG_SLOB */
91822
91823@@ -535,6 +574,9 @@ void print_slabinfo_header(struct seq_file *m)
91824 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
91825 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
91826 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
91827+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91828+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
91829+#endif
91830 #endif
91831 seq_putc(m, '\n');
91832 }
91833diff --git a/mm/slob.c b/mm/slob.c
91834index 4bf8809..98a6914 100644
91835--- a/mm/slob.c
91836+++ b/mm/slob.c
91837@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
91838 /*
91839 * Return the size of a slob block.
91840 */
91841-static slobidx_t slob_units(slob_t *s)
91842+static slobidx_t slob_units(const slob_t *s)
91843 {
91844 if (s->units > 0)
91845 return s->units;
91846@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
91847 /*
91848 * Return the next free slob block pointer after this one.
91849 */
91850-static slob_t *slob_next(slob_t *s)
91851+static slob_t *slob_next(const slob_t *s)
91852 {
91853 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
91854 slobidx_t next;
91855@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
91856 /*
91857 * Returns true if s is the last free block in its page.
91858 */
91859-static int slob_last(slob_t *s)
91860+static int slob_last(const slob_t *s)
91861 {
91862 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
91863 }
91864
91865-static void *slob_new_pages(gfp_t gfp, int order, int node)
91866+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
91867 {
91868- void *page;
91869+ struct page *page;
91870
91871 #ifdef CONFIG_NUMA
91872 if (node != NUMA_NO_NODE)
91873@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
91874 if (!page)
91875 return NULL;
91876
91877- return page_address(page);
91878+ __SetPageSlab(page);
91879+ return page;
91880 }
91881
91882-static void slob_free_pages(void *b, int order)
91883+static void slob_free_pages(struct page *sp, int order)
91884 {
91885 if (current->reclaim_state)
91886 current->reclaim_state->reclaimed_slab += 1 << order;
91887- free_pages((unsigned long)b, order);
91888+ __ClearPageSlab(sp);
91889+ page_mapcount_reset(sp);
91890+ sp->private = 0;
91891+ __free_pages(sp, order);
91892 }
91893
91894 /*
91895@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
91896
91897 /* Not enough space: must allocate a new page */
91898 if (!b) {
91899- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
91900- if (!b)
91901+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
91902+ if (!sp)
91903 return NULL;
91904- sp = virt_to_page(b);
91905- __SetPageSlab(sp);
91906+ b = page_address(sp);
91907
91908 spin_lock_irqsave(&slob_lock, flags);
91909 sp->units = SLOB_UNITS(PAGE_SIZE);
91910 sp->freelist = b;
91911+ sp->private = 0;
91912 INIT_LIST_HEAD(&sp->list);
91913 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
91914 set_slob_page_free(sp, slob_list);
91915@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
91916 if (slob_page_free(sp))
91917 clear_slob_page_free(sp);
91918 spin_unlock_irqrestore(&slob_lock, flags);
91919- __ClearPageSlab(sp);
91920- page_mapcount_reset(sp);
91921- slob_free_pages(b, 0);
91922+ slob_free_pages(sp, 0);
91923 return;
91924 }
91925
91926+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91927+ if (pax_sanitize_slab)
91928+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
91929+#endif
91930+
91931 if (!slob_page_free(sp)) {
91932 /* This slob page is about to become partially free. Easy! */
91933 sp->units = units;
91934@@ -424,11 +431,10 @@ out:
91935 */
91936
91937 static __always_inline void *
91938-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
91939+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
91940 {
91941- unsigned int *m;
91942- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
91943- void *ret;
91944+ slob_t *m;
91945+ void *ret = NULL;
91946
91947 gfp &= gfp_allowed_mask;
91948
91949@@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
91950
91951 if (!m)
91952 return NULL;
91953- *m = size;
91954+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
91955+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
91956+ m[0].units = size;
91957+ m[1].units = align;
91958 ret = (void *)m + align;
91959
91960 trace_kmalloc_node(caller, ret,
91961 size, size + align, gfp, node);
91962 } else {
91963 unsigned int order = get_order(size);
91964+ struct page *page;
91965
91966 if (likely(order))
91967 gfp |= __GFP_COMP;
91968- ret = slob_new_pages(gfp, order, node);
91969+ page = slob_new_pages(gfp, order, node);
91970+ if (page) {
91971+ ret = page_address(page);
91972+ page->private = size;
91973+ }
91974
91975 trace_kmalloc_node(caller, ret,
91976 size, PAGE_SIZE << order, gfp, node);
91977 }
91978
91979- kmemleak_alloc(ret, size, 1, gfp);
91980+ return ret;
91981+}
91982+
91983+static __always_inline void *
91984+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
91985+{
91986+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
91987+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
91988+
91989+ if (!ZERO_OR_NULL_PTR(ret))
91990+ kmemleak_alloc(ret, size, 1, gfp);
91991 return ret;
91992 }
91993
91994@@ -493,34 +517,112 @@ void kfree(const void *block)
91995 return;
91996 kmemleak_free(block);
91997
91998+ VM_BUG_ON(!virt_addr_valid(block));
91999 sp = virt_to_page(block);
92000- if (PageSlab(sp)) {
92001+ VM_BUG_ON(!PageSlab(sp));
92002+ if (!sp->private) {
92003 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
92004- unsigned int *m = (unsigned int *)(block - align);
92005- slob_free(m, *m + align);
92006- } else
92007+ slob_t *m = (slob_t *)(block - align);
92008+ slob_free(m, m[0].units + align);
92009+ } else {
92010+ __ClearPageSlab(sp);
92011+ page_mapcount_reset(sp);
92012+ sp->private = 0;
92013 __free_pages(sp, compound_order(sp));
92014+ }
92015 }
92016 EXPORT_SYMBOL(kfree);
92017
92018+bool is_usercopy_object(const void *ptr)
92019+{
92020+ if (!slab_is_available())
92021+ return false;
92022+
92023+ // PAX: TODO
92024+
92025+ return false;
92026+}
92027+
92028+#ifdef CONFIG_PAX_USERCOPY
92029+const char *check_heap_object(const void *ptr, unsigned long n)
92030+{
92031+ struct page *page;
92032+ const slob_t *free;
92033+ const void *base;
92034+ unsigned long flags;
92035+
92036+ if (ZERO_OR_NULL_PTR(ptr))
92037+ return "<null>";
92038+
92039+ if (!virt_addr_valid(ptr))
92040+ return NULL;
92041+
92042+ page = virt_to_head_page(ptr);
92043+ if (!PageSlab(page))
92044+ return NULL;
92045+
92046+ if (page->private) {
92047+ base = page;
92048+ if (base <= ptr && n <= page->private - (ptr - base))
92049+ return NULL;
92050+ return "<slob>";
92051+ }
92052+
92053+ /* some tricky double walking to find the chunk */
92054+ spin_lock_irqsave(&slob_lock, flags);
92055+ base = (void *)((unsigned long)ptr & PAGE_MASK);
92056+ free = page->freelist;
92057+
92058+ while (!slob_last(free) && (void *)free <= ptr) {
92059+ base = free + slob_units(free);
92060+ free = slob_next(free);
92061+ }
92062+
92063+ while (base < (void *)free) {
92064+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
92065+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
92066+ int offset;
92067+
92068+ if (ptr < base + align)
92069+ break;
92070+
92071+ offset = ptr - base - align;
92072+ if (offset >= m) {
92073+ base += size;
92074+ continue;
92075+ }
92076+
92077+ if (n > m - offset)
92078+ break;
92079+
92080+ spin_unlock_irqrestore(&slob_lock, flags);
92081+ return NULL;
92082+ }
92083+
92084+ spin_unlock_irqrestore(&slob_lock, flags);
92085+ return "<slob>";
92086+}
92087+#endif
92088+
92089 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
92090 size_t ksize(const void *block)
92091 {
92092 struct page *sp;
92093 int align;
92094- unsigned int *m;
92095+ slob_t *m;
92096
92097 BUG_ON(!block);
92098 if (unlikely(block == ZERO_SIZE_PTR))
92099 return 0;
92100
92101 sp = virt_to_page(block);
92102- if (unlikely(!PageSlab(sp)))
92103- return PAGE_SIZE << compound_order(sp);
92104+ VM_BUG_ON(!PageSlab(sp));
92105+ if (sp->private)
92106+ return sp->private;
92107
92108 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
92109- m = (unsigned int *)(block - align);
92110- return SLOB_UNITS(*m) * SLOB_UNIT;
92111+ m = (slob_t *)(block - align);
92112+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
92113 }
92114 EXPORT_SYMBOL(ksize);
92115
92116@@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
92117
92118 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
92119 {
92120- void *b;
92121+ void *b = NULL;
92122
92123 flags &= gfp_allowed_mask;
92124
92125 lockdep_trace_alloc(flags);
92126
92127+#ifdef CONFIG_PAX_USERCOPY_SLABS
92128+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
92129+#else
92130 if (c->size < PAGE_SIZE) {
92131 b = slob_alloc(c->size, flags, c->align, node);
92132 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
92133 SLOB_UNITS(c->size) * SLOB_UNIT,
92134 flags, node);
92135 } else {
92136- b = slob_new_pages(flags, get_order(c->size), node);
92137+ struct page *sp;
92138+
92139+ sp = slob_new_pages(flags, get_order(c->size), node);
92140+ if (sp) {
92141+ b = page_address(sp);
92142+ sp->private = c->size;
92143+ }
92144 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
92145 PAGE_SIZE << get_order(c->size),
92146 flags, node);
92147 }
92148+#endif
92149
92150 if (b && c->ctor)
92151 c->ctor(b);
92152@@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
92153
92154 static void __kmem_cache_free(void *b, int size)
92155 {
92156- if (size < PAGE_SIZE)
92157+ struct page *sp;
92158+
92159+ sp = virt_to_page(b);
92160+ BUG_ON(!PageSlab(sp));
92161+ if (!sp->private)
92162 slob_free(b, size);
92163 else
92164- slob_free_pages(b, get_order(size));
92165+ slob_free_pages(sp, get_order(size));
92166 }
92167
92168 static void kmem_rcu_free(struct rcu_head *head)
92169@@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head)
92170
92171 void kmem_cache_free(struct kmem_cache *c, void *b)
92172 {
92173+ int size = c->size;
92174+
92175+#ifdef CONFIG_PAX_USERCOPY_SLABS
92176+ if (size + c->align < PAGE_SIZE) {
92177+ size += c->align;
92178+ b -= c->align;
92179+ }
92180+#endif
92181+
92182 kmemleak_free_recursive(b, c->flags);
92183 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
92184 struct slob_rcu *slob_rcu;
92185- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
92186- slob_rcu->size = c->size;
92187+ slob_rcu = b + (size - sizeof(struct slob_rcu));
92188+ slob_rcu->size = size;
92189 call_rcu(&slob_rcu->head, kmem_rcu_free);
92190 } else {
92191- __kmem_cache_free(b, c->size);
92192+ __kmem_cache_free(b, size);
92193 }
92194
92195+#ifdef CONFIG_PAX_USERCOPY_SLABS
92196+ trace_kfree(_RET_IP_, b);
92197+#else
92198 trace_kmem_cache_free(_RET_IP_, b);
92199+#endif
92200+
92201 }
92202 EXPORT_SYMBOL(kmem_cache_free);
92203
92204diff --git a/mm/slub.c b/mm/slub.c
92205index 96f2169..9111a59 100644
92206--- a/mm/slub.c
92207+++ b/mm/slub.c
92208@@ -207,7 +207,7 @@ struct track {
92209
92210 enum track_item { TRACK_ALLOC, TRACK_FREE };
92211
92212-#ifdef CONFIG_SYSFS
92213+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92214 static int sysfs_slab_add(struct kmem_cache *);
92215 static int sysfs_slab_alias(struct kmem_cache *, const char *);
92216 static void sysfs_slab_remove(struct kmem_cache *);
92217@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
92218 if (!t->addr)
92219 return;
92220
92221- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
92222+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
92223 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
92224 #ifdef CONFIG_STACKTRACE
92225 {
92226@@ -2616,6 +2616,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
92227
92228 slab_free_hook(s, x);
92229
92230+#ifdef CONFIG_PAX_MEMORY_SANITIZE
92231+ if (pax_sanitize_slab && !(s->flags & SLAB_NO_SANITIZE)) {
92232+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
92233+ if (s->ctor)
92234+ s->ctor(x);
92235+ }
92236+#endif
92237+
92238 redo:
92239 /*
92240 * Determine the currently cpus per cpu slab.
92241@@ -2683,7 +2691,7 @@ static int slub_min_objects;
92242 * Merge control. If this is set then no merging of slab caches will occur.
92243 * (Could be removed. This was introduced to pacify the merge skeptics.)
92244 */
92245-static int slub_nomerge;
92246+static int slub_nomerge = 1;
92247
92248 /*
92249 * Calculate the order of allocation given an slab object size.
92250@@ -2960,6 +2968,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
92251 s->inuse = size;
92252
92253 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
92254+#ifdef CONFIG_PAX_MEMORY_SANITIZE
92255+ (pax_sanitize_slab && !(flags & SLAB_NO_SANITIZE)) ||
92256+#endif
92257 s->ctor)) {
92258 /*
92259 * Relocate free pointer after the object if it is not
92260@@ -3305,6 +3316,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
92261 EXPORT_SYMBOL(__kmalloc_node);
92262 #endif
92263
92264+bool is_usercopy_object(const void *ptr)
92265+{
92266+ struct page *page;
92267+ struct kmem_cache *s;
92268+
92269+ if (ZERO_OR_NULL_PTR(ptr))
92270+ return false;
92271+
92272+ if (!slab_is_available())
92273+ return false;
92274+
92275+ if (!virt_addr_valid(ptr))
92276+ return false;
92277+
92278+ page = virt_to_head_page(ptr);
92279+
92280+ if (!PageSlab(page))
92281+ return false;
92282+
92283+ s = page->slab_cache;
92284+ return s->flags & SLAB_USERCOPY;
92285+}
92286+
92287+#ifdef CONFIG_PAX_USERCOPY
92288+const char *check_heap_object(const void *ptr, unsigned long n)
92289+{
92290+ struct page *page;
92291+ struct kmem_cache *s;
92292+ unsigned long offset;
92293+
92294+ if (ZERO_OR_NULL_PTR(ptr))
92295+ return "<null>";
92296+
92297+ if (!virt_addr_valid(ptr))
92298+ return NULL;
92299+
92300+ page = virt_to_head_page(ptr);
92301+
92302+ if (!PageSlab(page))
92303+ return NULL;
92304+
92305+ s = page->slab_cache;
92306+ if (!(s->flags & SLAB_USERCOPY))
92307+ return s->name;
92308+
92309+ offset = (ptr - page_address(page)) % s->size;
92310+ if (offset <= s->object_size && n <= s->object_size - offset)
92311+ return NULL;
92312+
92313+ return s->name;
92314+}
92315+#endif
92316+
92317 size_t ksize(const void *object)
92318 {
92319 struct page *page;
92320@@ -3333,6 +3397,7 @@ void kfree(const void *x)
92321 if (unlikely(ZERO_OR_NULL_PTR(x)))
92322 return;
92323
92324+ VM_BUG_ON(!virt_addr_valid(x));
92325 page = virt_to_head_page(x);
92326 if (unlikely(!PageSlab(page))) {
92327 BUG_ON(!PageCompound(page));
92328@@ -3638,7 +3703,7 @@ static int slab_unmergeable(struct kmem_cache *s)
92329 /*
92330 * We may have set a slab to be unmergeable during bootstrap.
92331 */
92332- if (s->refcount < 0)
92333+ if (atomic_read(&s->refcount) < 0)
92334 return 1;
92335
92336 return 0;
92337@@ -3696,7 +3761,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
92338
92339 s = find_mergeable(memcg, size, align, flags, name, ctor);
92340 if (s) {
92341- s->refcount++;
92342+ atomic_inc(&s->refcount);
92343 /*
92344 * Adjust the object sizes so that we clear
92345 * the complete object on kzalloc.
92346@@ -3705,7 +3770,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
92347 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
92348
92349 if (sysfs_slab_alias(s, name)) {
92350- s->refcount--;
92351+ atomic_dec(&s->refcount);
92352 s = NULL;
92353 }
92354 }
92355@@ -3825,7 +3890,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
92356 }
92357 #endif
92358
92359-#ifdef CONFIG_SYSFS
92360+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92361 static int count_inuse(struct page *page)
92362 {
92363 return page->inuse;
92364@@ -4214,12 +4279,12 @@ static void resiliency_test(void)
92365 validate_slab_cache(kmalloc_caches[9]);
92366 }
92367 #else
92368-#ifdef CONFIG_SYSFS
92369+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92370 static void resiliency_test(void) {};
92371 #endif
92372 #endif
92373
92374-#ifdef CONFIG_SYSFS
92375+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92376 enum slab_stat_type {
92377 SL_ALL, /* All slabs */
92378 SL_PARTIAL, /* Only partially allocated slabs */
92379@@ -4459,7 +4524,7 @@ SLAB_ATTR_RO(ctor);
92380
92381 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
92382 {
92383- return sprintf(buf, "%d\n", s->refcount - 1);
92384+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
92385 }
92386 SLAB_ATTR_RO(aliases);
92387
92388@@ -4547,6 +4612,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
92389 SLAB_ATTR_RO(cache_dma);
92390 #endif
92391
92392+#ifdef CONFIG_PAX_USERCOPY_SLABS
92393+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
92394+{
92395+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
92396+}
92397+SLAB_ATTR_RO(usercopy);
92398+#endif
92399+
92400 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
92401 {
92402 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
92403@@ -4881,6 +4954,9 @@ static struct attribute *slab_attrs[] = {
92404 #ifdef CONFIG_ZONE_DMA
92405 &cache_dma_attr.attr,
92406 #endif
92407+#ifdef CONFIG_PAX_USERCOPY_SLABS
92408+ &usercopy_attr.attr,
92409+#endif
92410 #ifdef CONFIG_NUMA
92411 &remote_node_defrag_ratio_attr.attr,
92412 #endif
92413@@ -5113,6 +5189,7 @@ static char *create_unique_id(struct kmem_cache *s)
92414 return name;
92415 }
92416
92417+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92418 static int sysfs_slab_add(struct kmem_cache *s)
92419 {
92420 int err;
92421@@ -5136,7 +5213,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
92422 }
92423
92424 s->kobj.kset = slab_kset;
92425- err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, name);
92426+ err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, "%s", name);
92427 if (err) {
92428 kobject_put(&s->kobj);
92429 return err;
92430@@ -5170,6 +5247,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
92431 kobject_del(&s->kobj);
92432 kobject_put(&s->kobj);
92433 }
92434+#endif
92435
92436 /*
92437 * Need to buffer aliases during bootup until sysfs becomes
92438@@ -5183,6 +5261,7 @@ struct saved_alias {
92439
92440 static struct saved_alias *alias_list;
92441
92442+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92443 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
92444 {
92445 struct saved_alias *al;
92446@@ -5205,6 +5284,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
92447 alias_list = al;
92448 return 0;
92449 }
92450+#endif
92451
92452 static int __init slab_sysfs_init(void)
92453 {
92454diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
92455index 27eeab3..7c3f7f2 100644
92456--- a/mm/sparse-vmemmap.c
92457+++ b/mm/sparse-vmemmap.c
92458@@ -130,7 +130,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
92459 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
92460 if (!p)
92461 return NULL;
92462- pud_populate(&init_mm, pud, p);
92463+ pud_populate_kernel(&init_mm, pud, p);
92464 }
92465 return pud;
92466 }
92467@@ -142,7 +142,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
92468 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
92469 if (!p)
92470 return NULL;
92471- pgd_populate(&init_mm, pgd, p);
92472+ pgd_populate_kernel(&init_mm, pgd, p);
92473 }
92474 return pgd;
92475 }
92476diff --git a/mm/sparse.c b/mm/sparse.c
92477index 4ac1d7e..bbfcb1f 100644
92478--- a/mm/sparse.c
92479+++ b/mm/sparse.c
92480@@ -745,7 +745,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
92481
92482 for (i = 0; i < PAGES_PER_SECTION; i++) {
92483 if (PageHWPoison(&memmap[i])) {
92484- atomic_long_sub(1, &num_poisoned_pages);
92485+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
92486 ClearPageHWPoison(&memmap[i]);
92487 }
92488 }
92489diff --git a/mm/swap.c b/mm/swap.c
92490index 759c3ca..7c1a5b4 100644
92491--- a/mm/swap.c
92492+++ b/mm/swap.c
92493@@ -77,6 +77,8 @@ static void __put_compound_page(struct page *page)
92494
92495 __page_cache_release(page);
92496 dtor = get_compound_page_dtor(page);
92497+ if (!PageHuge(page))
92498+ BUG_ON(dtor != free_compound_page);
92499 (*dtor)(page);
92500 }
92501
92502diff --git a/mm/swapfile.c b/mm/swapfile.c
92503index de7c904..c84bf11 100644
92504--- a/mm/swapfile.c
92505+++ b/mm/swapfile.c
92506@@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
92507
92508 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
92509 /* Activity counter to indicate that a swapon or swapoff has occurred */
92510-static atomic_t proc_poll_event = ATOMIC_INIT(0);
92511+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
92512
92513 static inline unsigned char swap_count(unsigned char ent)
92514 {
92515@@ -1949,7 +1949,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
92516 }
92517 filp_close(swap_file, NULL);
92518 err = 0;
92519- atomic_inc(&proc_poll_event);
92520+ atomic_inc_unchecked(&proc_poll_event);
92521 wake_up_interruptible(&proc_poll_wait);
92522
92523 out_dput:
92524@@ -1966,8 +1966,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
92525
92526 poll_wait(file, &proc_poll_wait, wait);
92527
92528- if (seq->poll_event != atomic_read(&proc_poll_event)) {
92529- seq->poll_event = atomic_read(&proc_poll_event);
92530+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
92531+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
92532 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
92533 }
92534
92535@@ -2065,7 +2065,7 @@ static int swaps_open(struct inode *inode, struct file *file)
92536 return ret;
92537
92538 seq = file->private_data;
92539- seq->poll_event = atomic_read(&proc_poll_event);
92540+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
92541 return 0;
92542 }
92543
92544@@ -2524,7 +2524,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
92545 (frontswap_map) ? "FS" : "");
92546
92547 mutex_unlock(&swapon_mutex);
92548- atomic_inc(&proc_poll_event);
92549+ atomic_inc_unchecked(&proc_poll_event);
92550 wake_up_interruptible(&proc_poll_wait);
92551
92552 if (S_ISREG(inode->i_mode))
92553diff --git a/mm/util.c b/mm/util.c
92554index eaf63fc2..32b2629 100644
92555--- a/mm/util.c
92556+++ b/mm/util.c
92557@@ -294,6 +294,12 @@ done:
92558 void arch_pick_mmap_layout(struct mm_struct *mm)
92559 {
92560 mm->mmap_base = TASK_UNMAPPED_BASE;
92561+
92562+#ifdef CONFIG_PAX_RANDMMAP
92563+ if (mm->pax_flags & MF_PAX_RANDMMAP)
92564+ mm->mmap_base += mm->delta_mmap;
92565+#endif
92566+
92567 mm->get_unmapped_area = arch_get_unmapped_area;
92568 }
92569 #endif
92570diff --git a/mm/vmalloc.c b/mm/vmalloc.c
92571index 1074543..136dbe0 100644
92572--- a/mm/vmalloc.c
92573+++ b/mm/vmalloc.c
92574@@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
92575
92576 pte = pte_offset_kernel(pmd, addr);
92577 do {
92578- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
92579- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
92580+
92581+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92582+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
92583+ BUG_ON(!pte_exec(*pte));
92584+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
92585+ continue;
92586+ }
92587+#endif
92588+
92589+ {
92590+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
92591+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
92592+ }
92593 } while (pte++, addr += PAGE_SIZE, addr != end);
92594 }
92595
92596@@ -120,16 +131,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
92597 pte = pte_alloc_kernel(pmd, addr);
92598 if (!pte)
92599 return -ENOMEM;
92600+
92601+ pax_open_kernel();
92602 do {
92603 struct page *page = pages[*nr];
92604
92605- if (WARN_ON(!pte_none(*pte)))
92606+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92607+ if (pgprot_val(prot) & _PAGE_NX)
92608+#endif
92609+
92610+ if (!pte_none(*pte)) {
92611+ pax_close_kernel();
92612+ WARN_ON(1);
92613 return -EBUSY;
92614- if (WARN_ON(!page))
92615+ }
92616+ if (!page) {
92617+ pax_close_kernel();
92618+ WARN_ON(1);
92619 return -ENOMEM;
92620+ }
92621 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
92622 (*nr)++;
92623 } while (pte++, addr += PAGE_SIZE, addr != end);
92624+ pax_close_kernel();
92625 return 0;
92626 }
92627
92628@@ -139,7 +163,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
92629 pmd_t *pmd;
92630 unsigned long next;
92631
92632- pmd = pmd_alloc(&init_mm, pud, addr);
92633+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
92634 if (!pmd)
92635 return -ENOMEM;
92636 do {
92637@@ -156,7 +180,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
92638 pud_t *pud;
92639 unsigned long next;
92640
92641- pud = pud_alloc(&init_mm, pgd, addr);
92642+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
92643 if (!pud)
92644 return -ENOMEM;
92645 do {
92646@@ -216,6 +240,12 @@ int is_vmalloc_or_module_addr(const void *x)
92647 if (addr >= MODULES_VADDR && addr < MODULES_END)
92648 return 1;
92649 #endif
92650+
92651+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92652+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
92653+ return 1;
92654+#endif
92655+
92656 return is_vmalloc_addr(x);
92657 }
92658
92659@@ -236,8 +266,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
92660
92661 if (!pgd_none(*pgd)) {
92662 pud_t *pud = pud_offset(pgd, addr);
92663+#ifdef CONFIG_X86
92664+ if (!pud_large(*pud))
92665+#endif
92666 if (!pud_none(*pud)) {
92667 pmd_t *pmd = pmd_offset(pud, addr);
92668+#ifdef CONFIG_X86
92669+ if (!pmd_large(*pmd))
92670+#endif
92671 if (!pmd_none(*pmd)) {
92672 pte_t *ptep, pte;
92673
92674@@ -1303,6 +1339,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
92675 struct vm_struct *area;
92676
92677 BUG_ON(in_interrupt());
92678+
92679+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92680+ if (flags & VM_KERNEXEC) {
92681+ if (start != VMALLOC_START || end != VMALLOC_END)
92682+ return NULL;
92683+ start = (unsigned long)MODULES_EXEC_VADDR;
92684+ end = (unsigned long)MODULES_EXEC_END;
92685+ }
92686+#endif
92687+
92688 if (flags & VM_IOREMAP)
92689 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
92690
92691@@ -1528,6 +1574,11 @@ void *vmap(struct page **pages, unsigned int count,
92692 if (count > totalram_pages)
92693 return NULL;
92694
92695+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92696+ if (!(pgprot_val(prot) & _PAGE_NX))
92697+ flags |= VM_KERNEXEC;
92698+#endif
92699+
92700 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
92701 __builtin_return_address(0));
92702 if (!area)
92703@@ -1629,6 +1680,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
92704 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
92705 goto fail;
92706
92707+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92708+ if (!(pgprot_val(prot) & _PAGE_NX))
92709+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
92710+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
92711+ else
92712+#endif
92713+
92714 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
92715 start, end, node, gfp_mask, caller);
92716 if (!area)
92717@@ -1805,10 +1863,9 @@ EXPORT_SYMBOL(vzalloc_node);
92718 * For tight control over page level allocator and protection flags
92719 * use __vmalloc() instead.
92720 */
92721-
92722 void *vmalloc_exec(unsigned long size)
92723 {
92724- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
92725+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
92726 NUMA_NO_NODE, __builtin_return_address(0));
92727 }
92728
92729@@ -2115,6 +2172,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
92730 {
92731 struct vm_struct *area;
92732
92733+ BUG_ON(vma->vm_mirror);
92734+
92735 size = PAGE_ALIGN(size);
92736
92737 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
92738@@ -2600,7 +2659,11 @@ static int s_show(struct seq_file *m, void *p)
92739 v->addr, v->addr + v->size, v->size);
92740
92741 if (v->caller)
92742+#ifdef CONFIG_GRKERNSEC_HIDESYM
92743+ seq_printf(m, " %pK", v->caller);
92744+#else
92745 seq_printf(m, " %pS", v->caller);
92746+#endif
92747
92748 if (v->nr_pages)
92749 seq_printf(m, " pages=%d", v->nr_pages);
92750diff --git a/mm/vmstat.c b/mm/vmstat.c
92751index 5a442a7..dbbda4a 100644
92752--- a/mm/vmstat.c
92753+++ b/mm/vmstat.c
92754@@ -20,6 +20,7 @@
92755 #include <linux/writeback.h>
92756 #include <linux/compaction.h>
92757 #include <linux/mm_inline.h>
92758+#include <linux/grsecurity.h>
92759
92760 #include "internal.h"
92761
92762@@ -79,7 +80,7 @@ void vm_events_fold_cpu(int cpu)
92763 *
92764 * vm_stat contains the global counters
92765 */
92766-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
92767+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
92768 EXPORT_SYMBOL(vm_stat);
92769
92770 #ifdef CONFIG_SMP
92771@@ -423,7 +424,7 @@ static inline void fold_diff(int *diff)
92772
92773 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
92774 if (diff[i])
92775- atomic_long_add(diff[i], &vm_stat[i]);
92776+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
92777 }
92778
92779 /*
92780@@ -455,7 +456,7 @@ static void refresh_cpu_vm_stats(void)
92781 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
92782 if (v) {
92783
92784- atomic_long_add(v, &zone->vm_stat[i]);
92785+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92786 global_diff[i] += v;
92787 #ifdef CONFIG_NUMA
92788 /* 3 seconds idle till flush */
92789@@ -517,7 +518,7 @@ void cpu_vm_stats_fold(int cpu)
92790
92791 v = p->vm_stat_diff[i];
92792 p->vm_stat_diff[i] = 0;
92793- atomic_long_add(v, &zone->vm_stat[i]);
92794+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92795 global_diff[i] += v;
92796 }
92797 }
92798@@ -537,8 +538,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
92799 if (pset->vm_stat_diff[i]) {
92800 int v = pset->vm_stat_diff[i];
92801 pset->vm_stat_diff[i] = 0;
92802- atomic_long_add(v, &zone->vm_stat[i]);
92803- atomic_long_add(v, &vm_stat[i]);
92804+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92805+ atomic_long_add_unchecked(v, &vm_stat[i]);
92806 }
92807 }
92808 #endif
92809@@ -1148,10 +1149,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
92810 stat_items_size += sizeof(struct vm_event_state);
92811 #endif
92812
92813- v = kmalloc(stat_items_size, GFP_KERNEL);
92814+ v = kzalloc(stat_items_size, GFP_KERNEL);
92815 m->private = v;
92816 if (!v)
92817 return ERR_PTR(-ENOMEM);
92818+
92819+#ifdef CONFIG_GRKERNSEC_PROC_ADD
92820+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92821+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
92822+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
92823+ && !in_group_p(grsec_proc_gid)
92824+#endif
92825+ )
92826+ return (unsigned long *)m->private + *pos;
92827+#endif
92828+#endif
92829+
92830 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
92831 v[i] = global_page_state(i);
92832 v += NR_VM_ZONE_STAT_ITEMS;
92833@@ -1281,10 +1294,16 @@ static int __init setup_vmstat(void)
92834 start_cpu_timer(cpu);
92835 #endif
92836 #ifdef CONFIG_PROC_FS
92837- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
92838- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
92839- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
92840- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
92841+ {
92842+ mode_t gr_mode = S_IRUGO;
92843+#ifdef CONFIG_GRKERNSEC_PROC_ADD
92844+ gr_mode = S_IRUSR;
92845+#endif
92846+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
92847+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
92848+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
92849+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
92850+ }
92851 #endif
92852 return 0;
92853 }
92854diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
92855index 61fc573..b5e47d0 100644
92856--- a/net/8021q/vlan.c
92857+++ b/net/8021q/vlan.c
92858@@ -472,7 +472,7 @@ out:
92859 return NOTIFY_DONE;
92860 }
92861
92862-static struct notifier_block vlan_notifier_block __read_mostly = {
92863+static struct notifier_block vlan_notifier_block = {
92864 .notifier_call = vlan_device_event,
92865 };
92866
92867@@ -547,8 +547,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
92868 err = -EPERM;
92869 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
92870 break;
92871- if ((args.u.name_type >= 0) &&
92872- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
92873+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
92874 struct vlan_net *vn;
92875
92876 vn = net_generic(net, vlan_net_id);
92877diff --git a/net/9p/mod.c b/net/9p/mod.c
92878index 6ab36ae..6f1841b 100644
92879--- a/net/9p/mod.c
92880+++ b/net/9p/mod.c
92881@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
92882 void v9fs_register_trans(struct p9_trans_module *m)
92883 {
92884 spin_lock(&v9fs_trans_lock);
92885- list_add_tail(&m->list, &v9fs_trans_list);
92886+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
92887 spin_unlock(&v9fs_trans_lock);
92888 }
92889 EXPORT_SYMBOL(v9fs_register_trans);
92890@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
92891 void v9fs_unregister_trans(struct p9_trans_module *m)
92892 {
92893 spin_lock(&v9fs_trans_lock);
92894- list_del_init(&m->list);
92895+ pax_list_del_init((struct list_head *)&m->list);
92896 spin_unlock(&v9fs_trans_lock);
92897 }
92898 EXPORT_SYMBOL(v9fs_unregister_trans);
92899diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
92900index 3ffda1b..fceac96 100644
92901--- a/net/9p/trans_fd.c
92902+++ b/net/9p/trans_fd.c
92903@@ -432,7 +432,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
92904 oldfs = get_fs();
92905 set_fs(get_ds());
92906 /* The cast to a user pointer is valid due to the set_fs() */
92907- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
92908+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
92909 set_fs(oldfs);
92910
92911 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
92912diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
92913index 876fbe8..8bbea9f 100644
92914--- a/net/atm/atm_misc.c
92915+++ b/net/atm/atm_misc.c
92916@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
92917 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
92918 return 1;
92919 atm_return(vcc, truesize);
92920- atomic_inc(&vcc->stats->rx_drop);
92921+ atomic_inc_unchecked(&vcc->stats->rx_drop);
92922 return 0;
92923 }
92924 EXPORT_SYMBOL(atm_charge);
92925@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
92926 }
92927 }
92928 atm_return(vcc, guess);
92929- atomic_inc(&vcc->stats->rx_drop);
92930+ atomic_inc_unchecked(&vcc->stats->rx_drop);
92931 return NULL;
92932 }
92933 EXPORT_SYMBOL(atm_alloc_charge);
92934@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
92935
92936 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
92937 {
92938-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
92939+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
92940 __SONET_ITEMS
92941 #undef __HANDLE_ITEM
92942 }
92943@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
92944
92945 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
92946 {
92947-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
92948+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
92949 __SONET_ITEMS
92950 #undef __HANDLE_ITEM
92951 }
92952diff --git a/net/atm/lec.h b/net/atm/lec.h
92953index 4149db1..f2ab682 100644
92954--- a/net/atm/lec.h
92955+++ b/net/atm/lec.h
92956@@ -48,7 +48,7 @@ struct lane2_ops {
92957 const u8 *tlvs, u32 sizeoftlvs);
92958 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
92959 const u8 *tlvs, u32 sizeoftlvs);
92960-};
92961+} __no_const;
92962
92963 /*
92964 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
92965diff --git a/net/atm/proc.c b/net/atm/proc.c
92966index bbb6461..cf04016 100644
92967--- a/net/atm/proc.c
92968+++ b/net/atm/proc.c
92969@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
92970 const struct k_atm_aal_stats *stats)
92971 {
92972 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
92973- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
92974- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
92975- atomic_read(&stats->rx_drop));
92976+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
92977+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
92978+ atomic_read_unchecked(&stats->rx_drop));
92979 }
92980
92981 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
92982diff --git a/net/atm/resources.c b/net/atm/resources.c
92983index 0447d5d..3cf4728 100644
92984--- a/net/atm/resources.c
92985+++ b/net/atm/resources.c
92986@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
92987 static void copy_aal_stats(struct k_atm_aal_stats *from,
92988 struct atm_aal_stats *to)
92989 {
92990-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
92991+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
92992 __AAL_STAT_ITEMS
92993 #undef __HANDLE_ITEM
92994 }
92995@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
92996 static void subtract_aal_stats(struct k_atm_aal_stats *from,
92997 struct atm_aal_stats *to)
92998 {
92999-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
93000+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
93001 __AAL_STAT_ITEMS
93002 #undef __HANDLE_ITEM
93003 }
93004diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
93005index 919a5ce..cc6b444 100644
93006--- a/net/ax25/sysctl_net_ax25.c
93007+++ b/net/ax25/sysctl_net_ax25.c
93008@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
93009 {
93010 char path[sizeof("net/ax25/") + IFNAMSIZ];
93011 int k;
93012- struct ctl_table *table;
93013+ ctl_table_no_const *table;
93014
93015 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
93016 if (!table)
93017diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
93018index 0a8a80c..f7e89aa 100644
93019--- a/net/batman-adv/bat_iv_ogm.c
93020+++ b/net/batman-adv/bat_iv_ogm.c
93021@@ -121,7 +121,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
93022
93023 /* randomize initial seqno to avoid collision */
93024 get_random_bytes(&random_seqno, sizeof(random_seqno));
93025- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
93026+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
93027
93028 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
93029 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
93030@@ -703,9 +703,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
93031 batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff);
93032
93033 /* change sequence number to network order */
93034- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
93035+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
93036 batadv_ogm_packet->seqno = htonl(seqno);
93037- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
93038+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
93039
93040 batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn);
93041 batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc);
93042@@ -1111,7 +1111,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
93043 return;
93044
93045 /* could be changed by schedule_own_packet() */
93046- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
93047+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
93048
93049 if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)
93050 has_directlink_flag = 1;
93051diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
93052index c478e6b..469fd2f 100644
93053--- a/net/batman-adv/hard-interface.c
93054+++ b/net/batman-adv/hard-interface.c
93055@@ -453,7 +453,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
93056 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
93057 dev_add_pack(&hard_iface->batman_adv_ptype);
93058
93059- atomic_set(&hard_iface->frag_seqno, 1);
93060+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
93061 batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
93062 hard_iface->net_dev->name);
93063
93064diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
93065index 813db4e..847edac 100644
93066--- a/net/batman-adv/soft-interface.c
93067+++ b/net/batman-adv/soft-interface.c
93068@@ -263,7 +263,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
93069 primary_if->net_dev->dev_addr, ETH_ALEN);
93070
93071 /* set broadcast sequence number */
93072- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
93073+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
93074 bcast_packet->seqno = htonl(seqno);
93075
93076 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
93077@@ -483,7 +483,7 @@ static int batadv_softif_init_late(struct net_device *dev)
93078 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
93079
93080 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
93081- atomic_set(&bat_priv->bcast_seqno, 1);
93082+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
93083 atomic_set(&bat_priv->tt.vn, 0);
93084 atomic_set(&bat_priv->tt.local_changes, 0);
93085 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
93086diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
93087index b2c94e1..3d47e07 100644
93088--- a/net/batman-adv/types.h
93089+++ b/net/batman-adv/types.h
93090@@ -51,7 +51,7 @@
93091 struct batadv_hard_iface_bat_iv {
93092 unsigned char *ogm_buff;
93093 int ogm_buff_len;
93094- atomic_t ogm_seqno;
93095+ atomic_unchecked_t ogm_seqno;
93096 };
93097
93098 /**
93099@@ -76,7 +76,7 @@ struct batadv_hard_iface {
93100 int16_t if_num;
93101 char if_status;
93102 struct net_device *net_dev;
93103- atomic_t frag_seqno;
93104+ atomic_unchecked_t frag_seqno;
93105 uint8_t num_bcasts;
93106 struct kobject *hardif_obj;
93107 atomic_t refcount;
93108@@ -560,7 +560,7 @@ struct batadv_priv {
93109 #ifdef CONFIG_BATMAN_ADV_DEBUG
93110 atomic_t log_level;
93111 #endif
93112- atomic_t bcast_seqno;
93113+ atomic_unchecked_t bcast_seqno;
93114 atomic_t bcast_queue_left;
93115 atomic_t batman_queue_left;
93116 char num_ifaces;
93117diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
93118index 48b31d3..62a0bcb 100644
93119--- a/net/batman-adv/unicast.c
93120+++ b/net/batman-adv/unicast.c
93121@@ -272,7 +272,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
93122 frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail;
93123 frag2->flags = large_tail;
93124
93125- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
93126+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
93127 frag1->seqno = htons(seqno - 1);
93128 frag2->seqno = htons(seqno);
93129
93130diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
93131index fa4bf66..e92948f 100644
93132--- a/net/bluetooth/hci_sock.c
93133+++ b/net/bluetooth/hci_sock.c
93134@@ -932,7 +932,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
93135 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
93136 }
93137
93138- len = min_t(unsigned int, len, sizeof(uf));
93139+ len = min((size_t)len, sizeof(uf));
93140 if (copy_from_user(&uf, optval, len)) {
93141 err = -EFAULT;
93142 break;
93143diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
93144index 63fa111..b166ec6 100644
93145--- a/net/bluetooth/l2cap_core.c
93146+++ b/net/bluetooth/l2cap_core.c
93147@@ -3511,8 +3511,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
93148 break;
93149
93150 case L2CAP_CONF_RFC:
93151- if (olen == sizeof(rfc))
93152- memcpy(&rfc, (void *)val, olen);
93153+ if (olen != sizeof(rfc))
93154+ break;
93155+
93156+ memcpy(&rfc, (void *)val, olen);
93157
93158 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
93159 rfc.mode != chan->mode)
93160diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
93161index 0098af8..fb5a31f 100644
93162--- a/net/bluetooth/l2cap_sock.c
93163+++ b/net/bluetooth/l2cap_sock.c
93164@@ -485,7 +485,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
93165 struct sock *sk = sock->sk;
93166 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
93167 struct l2cap_options opts;
93168- int len, err = 0;
93169+ int err = 0;
93170+ size_t len = optlen;
93171 u32 opt;
93172
93173 BT_DBG("sk %p", sk);
93174@@ -507,7 +508,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
93175 opts.max_tx = chan->max_tx;
93176 opts.txwin_size = chan->tx_win;
93177
93178- len = min_t(unsigned int, sizeof(opts), optlen);
93179+ len = min(sizeof(opts), len);
93180 if (copy_from_user((char *) &opts, optval, len)) {
93181 err = -EFAULT;
93182 break;
93183@@ -587,7 +588,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93184 struct bt_security sec;
93185 struct bt_power pwr;
93186 struct l2cap_conn *conn;
93187- int len, err = 0;
93188+ int err = 0;
93189+ size_t len = optlen;
93190 u32 opt;
93191
93192 BT_DBG("sk %p", sk);
93193@@ -610,7 +612,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93194
93195 sec.level = BT_SECURITY_LOW;
93196
93197- len = min_t(unsigned int, sizeof(sec), optlen);
93198+ len = min(sizeof(sec), len);
93199 if (copy_from_user((char *) &sec, optval, len)) {
93200 err = -EFAULT;
93201 break;
93202@@ -707,7 +709,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93203
93204 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
93205
93206- len = min_t(unsigned int, sizeof(pwr), optlen);
93207+ len = min(sizeof(pwr), len);
93208 if (copy_from_user((char *) &pwr, optval, len)) {
93209 err = -EFAULT;
93210 break;
93211diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
93212index c1c6028..17e8dcc 100644
93213--- a/net/bluetooth/rfcomm/sock.c
93214+++ b/net/bluetooth/rfcomm/sock.c
93215@@ -665,7 +665,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
93216 struct sock *sk = sock->sk;
93217 struct bt_security sec;
93218 int err = 0;
93219- size_t len;
93220+ size_t len = optlen;
93221 u32 opt;
93222
93223 BT_DBG("sk %p", sk);
93224@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
93225
93226 sec.level = BT_SECURITY_LOW;
93227
93228- len = min_t(unsigned int, sizeof(sec), optlen);
93229+ len = min(sizeof(sec), len);
93230 if (copy_from_user((char *) &sec, optval, len)) {
93231 err = -EFAULT;
93232 break;
93233diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
93234index 84fcf9f..e389b27 100644
93235--- a/net/bluetooth/rfcomm/tty.c
93236+++ b/net/bluetooth/rfcomm/tty.c
93237@@ -684,7 +684,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
93238 BT_DBG("tty %p id %d", tty, tty->index);
93239
93240 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
93241- dev->channel, dev->port.count);
93242+ dev->channel, atomic_read(&dev->port.count));
93243
93244 err = tty_port_open(&dev->port, tty, filp);
93245 if (err)
93246@@ -707,7 +707,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
93247 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
93248
93249 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
93250- dev->port.count);
93251+ atomic_read(&dev->port.count));
93252
93253 tty_port_close(&dev->port, tty, filp);
93254 }
93255diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
93256index 5180938..7c470c3 100644
93257--- a/net/bridge/netfilter/ebt_ulog.c
93258+++ b/net/bridge/netfilter/ebt_ulog.c
93259@@ -181,6 +181,7 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93260 ub->qlen++;
93261
93262 pm = nlmsg_data(nlh);
93263+ memset(pm, 0, sizeof(*pm));
93264
93265 /* Fill in the ulog data */
93266 pm->version = EBT_ULOG_VERSION;
93267@@ -193,8 +194,6 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93268 pm->hook = hooknr;
93269 if (uloginfo->prefix != NULL)
93270 strcpy(pm->prefix, uloginfo->prefix);
93271- else
93272- *(pm->prefix) = '\0';
93273
93274 if (in) {
93275 strcpy(pm->physindev, in->name);
93276@@ -204,16 +203,14 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93277 strcpy(pm->indev, br_port_get_rcu(in)->br->dev->name);
93278 else
93279 strcpy(pm->indev, in->name);
93280- } else
93281- pm->indev[0] = pm->physindev[0] = '\0';
93282+ }
93283
93284 if (out) {
93285 /* If out exists, then out is a bridge port */
93286 strcpy(pm->physoutdev, out->name);
93287 /* rcu_read_lock()ed by nf_hook_slow */
93288 strcpy(pm->outdev, br_port_get_rcu(out)->br->dev->name);
93289- } else
93290- pm->outdev[0] = pm->physoutdev[0] = '\0';
93291+ }
93292
93293 if (skb_copy_bits(skb, -ETH_HLEN, pm->data, copy_len) < 0)
93294 BUG();
93295diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
93296index ac78024..161a80c 100644
93297--- a/net/bridge/netfilter/ebtables.c
93298+++ b/net/bridge/netfilter/ebtables.c
93299@@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
93300 tmp.valid_hooks = t->table->valid_hooks;
93301 }
93302 mutex_unlock(&ebt_mutex);
93303- if (copy_to_user(user, &tmp, *len) != 0){
93304+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
93305 BUGPRINT("c2u Didn't work\n");
93306 ret = -EFAULT;
93307 break;
93308@@ -2331,7 +2331,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
93309 goto out;
93310 tmp.valid_hooks = t->valid_hooks;
93311
93312- if (copy_to_user(user, &tmp, *len) != 0) {
93313+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
93314 ret = -EFAULT;
93315 break;
93316 }
93317@@ -2342,7 +2342,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
93318 tmp.entries_size = t->table->entries_size;
93319 tmp.valid_hooks = t->table->valid_hooks;
93320
93321- if (copy_to_user(user, &tmp, *len) != 0) {
93322+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
93323 ret = -EFAULT;
93324 break;
93325 }
93326diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
93327index 0f45522..dab651f 100644
93328--- a/net/caif/cfctrl.c
93329+++ b/net/caif/cfctrl.c
93330@@ -10,6 +10,7 @@
93331 #include <linux/spinlock.h>
93332 #include <linux/slab.h>
93333 #include <linux/pkt_sched.h>
93334+#include <linux/sched.h>
93335 #include <net/caif/caif_layer.h>
93336 #include <net/caif/cfpkt.h>
93337 #include <net/caif/cfctrl.h>
93338@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
93339 memset(&dev_info, 0, sizeof(dev_info));
93340 dev_info.id = 0xff;
93341 cfsrvl_init(&this->serv, 0, &dev_info, false);
93342- atomic_set(&this->req_seq_no, 1);
93343- atomic_set(&this->rsp_seq_no, 1);
93344+ atomic_set_unchecked(&this->req_seq_no, 1);
93345+ atomic_set_unchecked(&this->rsp_seq_no, 1);
93346 this->serv.layer.receive = cfctrl_recv;
93347 sprintf(this->serv.layer.name, "ctrl");
93348 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
93349@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
93350 struct cfctrl_request_info *req)
93351 {
93352 spin_lock_bh(&ctrl->info_list_lock);
93353- atomic_inc(&ctrl->req_seq_no);
93354- req->sequence_no = atomic_read(&ctrl->req_seq_no);
93355+ atomic_inc_unchecked(&ctrl->req_seq_no);
93356+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
93357 list_add_tail(&req->list, &ctrl->list);
93358 spin_unlock_bh(&ctrl->info_list_lock);
93359 }
93360@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
93361 if (p != first)
93362 pr_warn("Requests are not received in order\n");
93363
93364- atomic_set(&ctrl->rsp_seq_no,
93365+ atomic_set_unchecked(&ctrl->rsp_seq_no,
93366 p->sequence_no);
93367 list_del(&p->list);
93368 goto out;
93369diff --git a/net/can/af_can.c b/net/can/af_can.c
93370index 3ab8dd2..b9aef13 100644
93371--- a/net/can/af_can.c
93372+++ b/net/can/af_can.c
93373@@ -862,7 +862,7 @@ static const struct net_proto_family can_family_ops = {
93374 };
93375
93376 /* notifier block for netdevice event */
93377-static struct notifier_block can_netdev_notifier __read_mostly = {
93378+static struct notifier_block can_netdev_notifier = {
93379 .notifier_call = can_notifier,
93380 };
93381
93382diff --git a/net/can/gw.c b/net/can/gw.c
93383index 3f9b0f3..fc6d4fa 100644
93384--- a/net/can/gw.c
93385+++ b/net/can/gw.c
93386@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
93387 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
93388
93389 static HLIST_HEAD(cgw_list);
93390-static struct notifier_block notifier;
93391
93392 static struct kmem_cache *cgw_cache __read_mostly;
93393
93394@@ -954,6 +953,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
93395 return err;
93396 }
93397
93398+static struct notifier_block notifier = {
93399+ .notifier_call = cgw_notifier
93400+};
93401+
93402 static __init int cgw_module_init(void)
93403 {
93404 /* sanitize given module parameter */
93405@@ -969,7 +972,6 @@ static __init int cgw_module_init(void)
93406 return -ENOMEM;
93407
93408 /* set notifier */
93409- notifier.notifier_call = cgw_notifier;
93410 register_netdevice_notifier(&notifier);
93411
93412 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
93413diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
93414index 4a5df7b..9ad1f1d 100644
93415--- a/net/ceph/messenger.c
93416+++ b/net/ceph/messenger.c
93417@@ -186,7 +186,7 @@ static void con_fault(struct ceph_connection *con);
93418 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
93419
93420 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
93421-static atomic_t addr_str_seq = ATOMIC_INIT(0);
93422+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
93423
93424 static struct page *zero_page; /* used in certain error cases */
93425
93426@@ -197,7 +197,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
93427 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
93428 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
93429
93430- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
93431+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
93432 s = addr_str[i];
93433
93434 switch (ss->ss_family) {
93435diff --git a/net/compat.c b/net/compat.c
93436index dd32e34..6066f87 100644
93437--- a/net/compat.c
93438+++ b/net/compat.c
93439@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
93440 return -EFAULT;
93441 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
93442 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
93443- kmsg->msg_name = compat_ptr(tmp1);
93444- kmsg->msg_iov = compat_ptr(tmp2);
93445- kmsg->msg_control = compat_ptr(tmp3);
93446+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
93447+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
93448+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
93449 return 0;
93450 }
93451
93452@@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93453
93454 if (kern_msg->msg_namelen) {
93455 if (mode == VERIFY_READ) {
93456- int err = move_addr_to_kernel(kern_msg->msg_name,
93457+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
93458 kern_msg->msg_namelen,
93459 kern_address);
93460 if (err < 0)
93461@@ -99,7 +99,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93462 kern_msg->msg_name = NULL;
93463
93464 tot_len = iov_from_user_compat_to_kern(kern_iov,
93465- (struct compat_iovec __user *)kern_msg->msg_iov,
93466+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
93467 kern_msg->msg_iovlen);
93468 if (tot_len >= 0)
93469 kern_msg->msg_iov = kern_iov;
93470@@ -119,20 +119,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93471
93472 #define CMSG_COMPAT_FIRSTHDR(msg) \
93473 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
93474- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
93475+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
93476 (struct compat_cmsghdr __user *)NULL)
93477
93478 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
93479 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
93480 (ucmlen) <= (unsigned long) \
93481 ((mhdr)->msg_controllen - \
93482- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
93483+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
93484
93485 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
93486 struct compat_cmsghdr __user *cmsg, int cmsg_len)
93487 {
93488 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
93489- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
93490+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
93491 msg->msg_controllen)
93492 return NULL;
93493 return (struct compat_cmsghdr __user *)ptr;
93494@@ -222,7 +222,7 @@ Efault:
93495
93496 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
93497 {
93498- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
93499+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
93500 struct compat_cmsghdr cmhdr;
93501 struct compat_timeval ctv;
93502 struct compat_timespec cts[3];
93503@@ -278,7 +278,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
93504
93505 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
93506 {
93507- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
93508+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
93509 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
93510 int fdnum = scm->fp->count;
93511 struct file **fp = scm->fp->fp;
93512@@ -366,7 +366,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
93513 return -EFAULT;
93514 old_fs = get_fs();
93515 set_fs(KERNEL_DS);
93516- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
93517+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
93518 set_fs(old_fs);
93519
93520 return err;
93521@@ -427,7 +427,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
93522 len = sizeof(ktime);
93523 old_fs = get_fs();
93524 set_fs(KERNEL_DS);
93525- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
93526+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
93527 set_fs(old_fs);
93528
93529 if (!err) {
93530@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93531 case MCAST_JOIN_GROUP:
93532 case MCAST_LEAVE_GROUP:
93533 {
93534- struct compat_group_req __user *gr32 = (void *)optval;
93535+ struct compat_group_req __user *gr32 = (void __user *)optval;
93536 struct group_req __user *kgr =
93537 compat_alloc_user_space(sizeof(struct group_req));
93538 u32 interface;
93539@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93540 case MCAST_BLOCK_SOURCE:
93541 case MCAST_UNBLOCK_SOURCE:
93542 {
93543- struct compat_group_source_req __user *gsr32 = (void *)optval;
93544+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
93545 struct group_source_req __user *kgsr = compat_alloc_user_space(
93546 sizeof(struct group_source_req));
93547 u32 interface;
93548@@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93549 }
93550 case MCAST_MSFILTER:
93551 {
93552- struct compat_group_filter __user *gf32 = (void *)optval;
93553+ struct compat_group_filter __user *gf32 = (void __user *)optval;
93554 struct group_filter __user *kgf;
93555 u32 interface, fmode, numsrc;
93556
93557@@ -650,7 +650,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
93558 char __user *optval, int __user *optlen,
93559 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
93560 {
93561- struct compat_group_filter __user *gf32 = (void *)optval;
93562+ struct compat_group_filter __user *gf32 = (void __user *)optval;
93563 struct group_filter __user *kgf;
93564 int __user *koptlen;
93565 u32 interface, fmode, numsrc;
93566@@ -808,7 +808,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
93567
93568 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
93569 return -EINVAL;
93570- if (copy_from_user(a, args, nas[call]))
93571+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
93572 return -EFAULT;
93573 a0 = a[0];
93574 a1 = a[1];
93575diff --git a/net/core/datagram.c b/net/core/datagram.c
93576index af814e7..3d761de 100644
93577--- a/net/core/datagram.c
93578+++ b/net/core/datagram.c
93579@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
93580 }
93581
93582 kfree_skb(skb);
93583- atomic_inc(&sk->sk_drops);
93584+ atomic_inc_unchecked(&sk->sk_drops);
93585 sk_mem_reclaim_partial(sk);
93586
93587 return err;
93588diff --git a/net/core/dev.c b/net/core/dev.c
93589index 3d13874..6e78dc7 100644
93590--- a/net/core/dev.c
93591+++ b/net/core/dev.c
93592@@ -1680,14 +1680,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
93593 {
93594 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
93595 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
93596- atomic_long_inc(&dev->rx_dropped);
93597+ atomic_long_inc_unchecked(&dev->rx_dropped);
93598 kfree_skb(skb);
93599 return NET_RX_DROP;
93600 }
93601 }
93602
93603 if (unlikely(!is_skb_forwardable(dev, skb))) {
93604- atomic_long_inc(&dev->rx_dropped);
93605+ atomic_long_inc_unchecked(&dev->rx_dropped);
93606 kfree_skb(skb);
93607 return NET_RX_DROP;
93608 }
93609@@ -2428,7 +2428,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
93610
93611 struct dev_gso_cb {
93612 void (*destructor)(struct sk_buff *skb);
93613-};
93614+} __no_const;
93615
93616 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
93617
93618@@ -3203,7 +3203,7 @@ enqueue:
93619
93620 local_irq_restore(flags);
93621
93622- atomic_long_inc(&skb->dev->rx_dropped);
93623+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
93624 kfree_skb(skb);
93625 return NET_RX_DROP;
93626 }
93627@@ -3275,7 +3275,7 @@ int netif_rx_ni(struct sk_buff *skb)
93628 }
93629 EXPORT_SYMBOL(netif_rx_ni);
93630
93631-static void net_tx_action(struct softirq_action *h)
93632+static __latent_entropy void net_tx_action(void)
93633 {
93634 struct softnet_data *sd = &__get_cpu_var(softnet_data);
93635
93636@@ -3609,7 +3609,7 @@ ncls:
93637 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
93638 } else {
93639 drop:
93640- atomic_long_inc(&skb->dev->rx_dropped);
93641+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
93642 kfree_skb(skb);
93643 /* Jamal, now you will not able to escape explaining
93644 * me how you were going to use this. :-)
93645@@ -4269,7 +4269,7 @@ void netif_napi_del(struct napi_struct *napi)
93646 }
93647 EXPORT_SYMBOL(netif_napi_del);
93648
93649-static void net_rx_action(struct softirq_action *h)
93650+static __latent_entropy void net_rx_action(void)
93651 {
93652 struct softnet_data *sd = &__get_cpu_var(softnet_data);
93653 unsigned long time_limit = jiffies + 2;
93654@@ -5973,7 +5973,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
93655 } else {
93656 netdev_stats_to_stats64(storage, &dev->stats);
93657 }
93658- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
93659+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
93660 return storage;
93661 }
93662 EXPORT_SYMBOL(dev_get_stats);
93663diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
93664index 5b7d0e1..cb960fc 100644
93665--- a/net/core/dev_ioctl.c
93666+++ b/net/core/dev_ioctl.c
93667@@ -365,9 +365,13 @@ void dev_load(struct net *net, const char *name)
93668 if (no_module && capable(CAP_NET_ADMIN))
93669 no_module = request_module("netdev-%s", name);
93670 if (no_module && capable(CAP_SYS_MODULE)) {
93671+#ifdef CONFIG_GRKERNSEC_MODHARDEN
93672+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
93673+#else
93674 if (!request_module("%s", name))
93675 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
93676 name);
93677+#endif
93678 }
93679 }
93680 EXPORT_SYMBOL(dev_load);
93681diff --git a/net/core/flow.c b/net/core/flow.c
93682index dfa602c..3103d88 100644
93683--- a/net/core/flow.c
93684+++ b/net/core/flow.c
93685@@ -61,7 +61,7 @@ struct flow_cache {
93686 struct timer_list rnd_timer;
93687 };
93688
93689-atomic_t flow_cache_genid = ATOMIC_INIT(0);
93690+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
93691 EXPORT_SYMBOL(flow_cache_genid);
93692 static struct flow_cache flow_cache_global;
93693 static struct kmem_cache *flow_cachep __read_mostly;
93694@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
93695
93696 static int flow_entry_valid(struct flow_cache_entry *fle)
93697 {
93698- if (atomic_read(&flow_cache_genid) != fle->genid)
93699+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
93700 return 0;
93701 if (fle->object && !fle->object->ops->check(fle->object))
93702 return 0;
93703@@ -258,7 +258,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
93704 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
93705 fcp->hash_count++;
93706 }
93707- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
93708+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
93709 flo = fle->object;
93710 if (!flo)
93711 goto ret_object;
93712@@ -279,7 +279,7 @@ nocache:
93713 }
93714 flo = resolver(net, key, family, dir, flo, ctx);
93715 if (fle) {
93716- fle->genid = atomic_read(&flow_cache_genid);
93717+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
93718 if (!IS_ERR(flo))
93719 fle->object = flo;
93720 else
93721diff --git a/net/core/iovec.c b/net/core/iovec.c
93722index 7d84ea1..55385ae 100644
93723--- a/net/core/iovec.c
93724+++ b/net/core/iovec.c
93725@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
93726 if (m->msg_namelen) {
93727 if (mode == VERIFY_READ) {
93728 void __user *namep;
93729- namep = (void __user __force *) m->msg_name;
93730+ namep = (void __force_user *) m->msg_name;
93731 err = move_addr_to_kernel(namep, m->msg_namelen,
93732 address);
93733 if (err < 0)
93734@@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
93735 }
93736
93737 size = m->msg_iovlen * sizeof(struct iovec);
93738- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
93739+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
93740 return -EFAULT;
93741
93742 m->msg_iov = iov;
93743diff --git a/net/core/neighbour.c b/net/core/neighbour.c
93744index 6072610..7374c18 100644
93745--- a/net/core/neighbour.c
93746+++ b/net/core/neighbour.c
93747@@ -2774,7 +2774,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
93748 void __user *buffer, size_t *lenp, loff_t *ppos)
93749 {
93750 int size, ret;
93751- struct ctl_table tmp = *ctl;
93752+ ctl_table_no_const tmp = *ctl;
93753
93754 tmp.extra1 = &zero;
93755 tmp.extra2 = &unres_qlen_max;
93756diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
93757index 2bf8329..7960607 100644
93758--- a/net/core/net-procfs.c
93759+++ b/net/core/net-procfs.c
93760@@ -283,8 +283,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
93761 else
93762 seq_printf(seq, "%04x", ntohs(pt->type));
93763
93764+#ifdef CONFIG_GRKERNSEC_HIDESYM
93765+ seq_printf(seq, " %-8s %pf\n",
93766+ pt->dev ? pt->dev->name : "", NULL);
93767+#else
93768 seq_printf(seq, " %-8s %pf\n",
93769 pt->dev ? pt->dev->name : "", pt->func);
93770+#endif
93771 }
93772
93773 return 0;
93774diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
93775index d954b56..b0a0f7a 100644
93776--- a/net/core/net-sysfs.c
93777+++ b/net/core/net-sysfs.c
93778@@ -1356,7 +1356,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr)
93779 }
93780 EXPORT_SYMBOL(netdev_class_remove_file);
93781
93782-int netdev_kobject_init(void)
93783+int __init netdev_kobject_init(void)
93784 {
93785 kobj_ns_type_register(&net_ns_type_operations);
93786 return class_register(&net_class);
93787diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
93788index 81d3a9a..a0bd7a8 100644
93789--- a/net/core/net_namespace.c
93790+++ b/net/core/net_namespace.c
93791@@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
93792 int error;
93793 LIST_HEAD(net_exit_list);
93794
93795- list_add_tail(&ops->list, list);
93796+ pax_list_add_tail((struct list_head *)&ops->list, list);
93797 if (ops->init || (ops->id && ops->size)) {
93798 for_each_net(net) {
93799 error = ops_init(ops, net);
93800@@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
93801
93802 out_undo:
93803 /* If I have an error cleanup all namespaces I initialized */
93804- list_del(&ops->list);
93805+ pax_list_del((struct list_head *)&ops->list);
93806 ops_exit_list(ops, &net_exit_list);
93807 ops_free_list(ops, &net_exit_list);
93808 return error;
93809@@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
93810 struct net *net;
93811 LIST_HEAD(net_exit_list);
93812
93813- list_del(&ops->list);
93814+ pax_list_del((struct list_head *)&ops->list);
93815 for_each_net(net)
93816 list_add_tail(&net->exit_list, &net_exit_list);
93817 ops_exit_list(ops, &net_exit_list);
93818@@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
93819 mutex_lock(&net_mutex);
93820 error = register_pernet_operations(&pernet_list, ops);
93821 if (!error && (first_device == &pernet_list))
93822- first_device = &ops->list;
93823+ first_device = (struct list_head *)&ops->list;
93824 mutex_unlock(&net_mutex);
93825 return error;
93826 }
93827diff --git a/net/core/netpoll.c b/net/core/netpoll.c
93828index fc75c9e..8c8e9be 100644
93829--- a/net/core/netpoll.c
93830+++ b/net/core/netpoll.c
93831@@ -428,7 +428,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
93832 struct udphdr *udph;
93833 struct iphdr *iph;
93834 struct ethhdr *eth;
93835- static atomic_t ip_ident;
93836+ static atomic_unchecked_t ip_ident;
93837 struct ipv6hdr *ip6h;
93838
93839 udp_len = len + sizeof(*udph);
93840@@ -499,7 +499,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
93841 put_unaligned(0x45, (unsigned char *)iph);
93842 iph->tos = 0;
93843 put_unaligned(htons(ip_len), &(iph->tot_len));
93844- iph->id = htons(atomic_inc_return(&ip_ident));
93845+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
93846 iph->frag_off = 0;
93847 iph->ttl = 64;
93848 iph->protocol = IPPROTO_UDP;
93849diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
93850index 2a0e21d..6ad7642 100644
93851--- a/net/core/rtnetlink.c
93852+++ b/net/core/rtnetlink.c
93853@@ -58,7 +58,7 @@ struct rtnl_link {
93854 rtnl_doit_func doit;
93855 rtnl_dumpit_func dumpit;
93856 rtnl_calcit_func calcit;
93857-};
93858+} __no_const;
93859
93860 static DEFINE_MUTEX(rtnl_mutex);
93861
93862@@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
93863 if (rtnl_link_ops_get(ops->kind))
93864 return -EEXIST;
93865
93866- if (!ops->dellink)
93867- ops->dellink = unregister_netdevice_queue;
93868+ if (!ops->dellink) {
93869+ pax_open_kernel();
93870+ *(void **)&ops->dellink = unregister_netdevice_queue;
93871+ pax_close_kernel();
93872+ }
93873
93874- list_add_tail(&ops->list, &link_ops);
93875+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
93876 return 0;
93877 }
93878 EXPORT_SYMBOL_GPL(__rtnl_link_register);
93879@@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
93880 for_each_net(net) {
93881 __rtnl_kill_links(net, ops);
93882 }
93883- list_del(&ops->list);
93884+ pax_list_del((struct list_head *)&ops->list);
93885 }
93886 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
93887
93888diff --git a/net/core/scm.c b/net/core/scm.c
93889index b442e7e..6f5b5a2 100644
93890--- a/net/core/scm.c
93891+++ b/net/core/scm.c
93892@@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
93893 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
93894 {
93895 struct cmsghdr __user *cm
93896- = (__force struct cmsghdr __user *)msg->msg_control;
93897+ = (struct cmsghdr __force_user *)msg->msg_control;
93898 struct cmsghdr cmhdr;
93899 int cmlen = CMSG_LEN(len);
93900 int err;
93901@@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
93902 err = -EFAULT;
93903 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
93904 goto out;
93905- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
93906+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
93907 goto out;
93908 cmlen = CMSG_SPACE(len);
93909 if (msg->msg_controllen < cmlen)
93910@@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
93911 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
93912 {
93913 struct cmsghdr __user *cm
93914- = (__force struct cmsghdr __user*)msg->msg_control;
93915+ = (struct cmsghdr __force_user *)msg->msg_control;
93916
93917 int fdmax = 0;
93918 int fdnum = scm->fp->count;
93919@@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
93920 if (fdnum < fdmax)
93921 fdmax = fdnum;
93922
93923- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
93924+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
93925 i++, cmfptr++)
93926 {
93927 struct socket *sock;
93928diff --git a/net/core/skbuff.c b/net/core/skbuff.c
93929index c28c7fe..a399a6d 100644
93930--- a/net/core/skbuff.c
93931+++ b/net/core/skbuff.c
93932@@ -3104,13 +3104,15 @@ void __init skb_init(void)
93933 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
93934 sizeof(struct sk_buff),
93935 0,
93936- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
93937+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
93938+ SLAB_NO_SANITIZE,
93939 NULL);
93940 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
93941 (2*sizeof(struct sk_buff)) +
93942 sizeof(atomic_t),
93943 0,
93944- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
93945+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
93946+ SLAB_NO_SANITIZE,
93947 NULL);
93948 }
93949
93950@@ -3541,6 +3543,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
93951 skb->tstamp.tv64 = 0;
93952 skb->pkt_type = PACKET_HOST;
93953 skb->skb_iif = 0;
93954+ skb->local_df = 0;
93955 skb_dst_drop(skb);
93956 skb->mark = 0;
93957 secpath_reset(skb);
93958diff --git a/net/core/sock.c b/net/core/sock.c
93959index 0b39e7a..5e9f91e 100644
93960--- a/net/core/sock.c
93961+++ b/net/core/sock.c
93962@@ -393,7 +393,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93963 struct sk_buff_head *list = &sk->sk_receive_queue;
93964
93965 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
93966- atomic_inc(&sk->sk_drops);
93967+ atomic_inc_unchecked(&sk->sk_drops);
93968 trace_sock_rcvqueue_full(sk, skb);
93969 return -ENOMEM;
93970 }
93971@@ -403,7 +403,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93972 return err;
93973
93974 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
93975- atomic_inc(&sk->sk_drops);
93976+ atomic_inc_unchecked(&sk->sk_drops);
93977 return -ENOBUFS;
93978 }
93979
93980@@ -423,7 +423,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93981 skb_dst_force(skb);
93982
93983 spin_lock_irqsave(&list->lock, flags);
93984- skb->dropcount = atomic_read(&sk->sk_drops);
93985+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
93986 __skb_queue_tail(list, skb);
93987 spin_unlock_irqrestore(&list->lock, flags);
93988
93989@@ -443,7 +443,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
93990 skb->dev = NULL;
93991
93992 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
93993- atomic_inc(&sk->sk_drops);
93994+ atomic_inc_unchecked(&sk->sk_drops);
93995 goto discard_and_relse;
93996 }
93997 if (nested)
93998@@ -461,7 +461,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
93999 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
94000 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
94001 bh_unlock_sock(sk);
94002- atomic_inc(&sk->sk_drops);
94003+ atomic_inc_unchecked(&sk->sk_drops);
94004 goto discard_and_relse;
94005 }
94006
94007@@ -949,12 +949,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94008 struct timeval tm;
94009 } v;
94010
94011- int lv = sizeof(int);
94012- int len;
94013+ unsigned int lv = sizeof(int);
94014+ unsigned int len;
94015
94016 if (get_user(len, optlen))
94017 return -EFAULT;
94018- if (len < 0)
94019+ if (len > INT_MAX)
94020 return -EINVAL;
94021
94022 memset(&v, 0, sizeof(v));
94023@@ -1106,11 +1106,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94024
94025 case SO_PEERNAME:
94026 {
94027- char address[128];
94028+ char address[_K_SS_MAXSIZE];
94029
94030 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
94031 return -ENOTCONN;
94032- if (lv < len)
94033+ if (lv < len || sizeof address < len)
94034 return -EINVAL;
94035 if (copy_to_user(optval, address, len))
94036 return -EFAULT;
94037@@ -1183,7 +1183,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94038
94039 if (len > lv)
94040 len = lv;
94041- if (copy_to_user(optval, &v, len))
94042+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
94043 return -EFAULT;
94044 lenout:
94045 if (put_user(len, optlen))
94046@@ -2326,7 +2326,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
94047 */
94048 smp_wmb();
94049 atomic_set(&sk->sk_refcnt, 1);
94050- atomic_set(&sk->sk_drops, 0);
94051+ atomic_set_unchecked(&sk->sk_drops, 0);
94052 }
94053 EXPORT_SYMBOL(sock_init_data);
94054
94055@@ -2451,6 +2451,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
94056 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
94057 int level, int type)
94058 {
94059+ struct sock_extended_err ee;
94060 struct sock_exterr_skb *serr;
94061 struct sk_buff *skb, *skb2;
94062 int copied, err;
94063@@ -2472,7 +2473,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
94064 sock_recv_timestamp(msg, sk, skb);
94065
94066 serr = SKB_EXT_ERR(skb);
94067- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
94068+ ee = serr->ee;
94069+ put_cmsg(msg, level, type, sizeof ee, &ee);
94070
94071 msg->msg_flags |= MSG_ERRQUEUE;
94072 err = copied;
94073diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
94074index a0e9cf6..ef7f9ed 100644
94075--- a/net/core/sock_diag.c
94076+++ b/net/core/sock_diag.c
94077@@ -9,26 +9,33 @@
94078 #include <linux/inet_diag.h>
94079 #include <linux/sock_diag.h>
94080
94081-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
94082+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
94083 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
94084 static DEFINE_MUTEX(sock_diag_table_mutex);
94085
94086 int sock_diag_check_cookie(void *sk, __u32 *cookie)
94087 {
94088+#ifndef CONFIG_GRKERNSEC_HIDESYM
94089 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
94090 cookie[1] != INET_DIAG_NOCOOKIE) &&
94091 ((u32)(unsigned long)sk != cookie[0] ||
94092 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
94093 return -ESTALE;
94094 else
94095+#endif
94096 return 0;
94097 }
94098 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
94099
94100 void sock_diag_save_cookie(void *sk, __u32 *cookie)
94101 {
94102+#ifdef CONFIG_GRKERNSEC_HIDESYM
94103+ cookie[0] = 0;
94104+ cookie[1] = 0;
94105+#else
94106 cookie[0] = (u32)(unsigned long)sk;
94107 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
94108+#endif
94109 }
94110 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
94111
94112@@ -113,8 +120,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
94113 mutex_lock(&sock_diag_table_mutex);
94114 if (sock_diag_handlers[hndl->family])
94115 err = -EBUSY;
94116- else
94117+ else {
94118+ pax_open_kernel();
94119 sock_diag_handlers[hndl->family] = hndl;
94120+ pax_close_kernel();
94121+ }
94122 mutex_unlock(&sock_diag_table_mutex);
94123
94124 return err;
94125@@ -130,7 +140,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
94126
94127 mutex_lock(&sock_diag_table_mutex);
94128 BUG_ON(sock_diag_handlers[family] != hnld);
94129+ pax_open_kernel();
94130 sock_diag_handlers[family] = NULL;
94131+ pax_close_kernel();
94132 mutex_unlock(&sock_diag_table_mutex);
94133 }
94134 EXPORT_SYMBOL_GPL(sock_diag_unregister);
94135diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
94136index cca4441..5e616de 100644
94137--- a/net/core/sysctl_net_core.c
94138+++ b/net/core/sysctl_net_core.c
94139@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
94140 {
94141 unsigned int orig_size, size;
94142 int ret, i;
94143- struct ctl_table tmp = {
94144+ ctl_table_no_const tmp = {
94145 .data = &size,
94146 .maxlen = sizeof(size),
94147 .mode = table->mode
94148@@ -199,7 +199,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
94149 void __user *buffer, size_t *lenp, loff_t *ppos)
94150 {
94151 char id[IFNAMSIZ];
94152- struct ctl_table tbl = {
94153+ ctl_table_no_const tbl = {
94154 .data = id,
94155 .maxlen = IFNAMSIZ,
94156 };
94157@@ -378,13 +378,12 @@ static struct ctl_table netns_core_table[] = {
94158
94159 static __net_init int sysctl_core_net_init(struct net *net)
94160 {
94161- struct ctl_table *tbl;
94162+ ctl_table_no_const *tbl = NULL;
94163
94164 net->core.sysctl_somaxconn = SOMAXCONN;
94165
94166- tbl = netns_core_table;
94167 if (!net_eq(net, &init_net)) {
94168- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
94169+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
94170 if (tbl == NULL)
94171 goto err_dup;
94172
94173@@ -394,17 +393,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
94174 if (net->user_ns != &init_user_ns) {
94175 tbl[0].procname = NULL;
94176 }
94177- }
94178-
94179- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
94180+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
94181+ } else
94182+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
94183 if (net->core.sysctl_hdr == NULL)
94184 goto err_reg;
94185
94186 return 0;
94187
94188 err_reg:
94189- if (tbl != netns_core_table)
94190- kfree(tbl);
94191+ kfree(tbl);
94192 err_dup:
94193 return -ENOMEM;
94194 }
94195@@ -419,7 +417,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
94196 kfree(tbl);
94197 }
94198
94199-static __net_initdata struct pernet_operations sysctl_core_ops = {
94200+static __net_initconst struct pernet_operations sysctl_core_ops = {
94201 .init = sysctl_core_net_init,
94202 .exit = sysctl_core_net_exit,
94203 };
94204diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
94205index dd4d506..fb2fb87 100644
94206--- a/net/decnet/af_decnet.c
94207+++ b/net/decnet/af_decnet.c
94208@@ -465,6 +465,7 @@ static struct proto dn_proto = {
94209 .sysctl_rmem = sysctl_decnet_rmem,
94210 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
94211 .obj_size = sizeof(struct dn_sock),
94212+ .slab_flags = SLAB_USERCOPY,
94213 };
94214
94215 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
94216diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
94217index 5325b54..a0d4d69 100644
94218--- a/net/decnet/sysctl_net_decnet.c
94219+++ b/net/decnet/sysctl_net_decnet.c
94220@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
94221
94222 if (len > *lenp) len = *lenp;
94223
94224- if (copy_to_user(buffer, addr, len))
94225+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
94226 return -EFAULT;
94227
94228 *lenp = len;
94229@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
94230
94231 if (len > *lenp) len = *lenp;
94232
94233- if (copy_to_user(buffer, devname, len))
94234+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
94235 return -EFAULT;
94236
94237 *lenp = len;
94238diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
94239index 008f337..b03b8c9 100644
94240--- a/net/ieee802154/6lowpan.c
94241+++ b/net/ieee802154/6lowpan.c
94242@@ -548,7 +548,7 @@ static int lowpan_header_create(struct sk_buff *skb,
94243 hc06_ptr += 3;
94244 } else {
94245 /* compress nothing */
94246- memcpy(hc06_ptr, &hdr, 4);
94247+ memcpy(hc06_ptr, hdr, 4);
94248 /* replace the top byte with new ECN | DSCP format */
94249 *hc06_ptr = tmp;
94250 hc06_ptr += 4;
94251diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
94252index cfeb85c..385989a 100644
94253--- a/net/ipv4/af_inet.c
94254+++ b/net/ipv4/af_inet.c
94255@@ -1675,13 +1675,9 @@ static int __init inet_init(void)
94256
94257 BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
94258
94259- sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
94260- if (!sysctl_local_reserved_ports)
94261- goto out;
94262-
94263 rc = proto_register(&tcp_prot, 1);
94264 if (rc)
94265- goto out_free_reserved_ports;
94266+ goto out;
94267
94268 rc = proto_register(&udp_prot, 1);
94269 if (rc)
94270@@ -1790,8 +1786,6 @@ out_unregister_udp_proto:
94271 proto_unregister(&udp_prot);
94272 out_unregister_tcp_proto:
94273 proto_unregister(&tcp_prot);
94274-out_free_reserved_ports:
94275- kfree(sysctl_local_reserved_ports);
94276 goto out;
94277 }
94278
94279diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
94280index a1b5bcb..62ec5c6 100644
94281--- a/net/ipv4/devinet.c
94282+++ b/net/ipv4/devinet.c
94283@@ -1533,7 +1533,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
94284 idx = 0;
94285 head = &net->dev_index_head[h];
94286 rcu_read_lock();
94287- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
94288+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
94289 net->dev_base_seq;
94290 hlist_for_each_entry_rcu(dev, head, index_hlist) {
94291 if (idx < s_idx)
94292@@ -1844,7 +1844,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
94293 idx = 0;
94294 head = &net->dev_index_head[h];
94295 rcu_read_lock();
94296- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
94297+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
94298 net->dev_base_seq;
94299 hlist_for_each_entry_rcu(dev, head, index_hlist) {
94300 if (idx < s_idx)
94301@@ -2069,7 +2069,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
94302 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
94303 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
94304
94305-static struct devinet_sysctl_table {
94306+static const struct devinet_sysctl_table {
94307 struct ctl_table_header *sysctl_header;
94308 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
94309 } devinet_sysctl = {
94310@@ -2191,7 +2191,7 @@ static __net_init int devinet_init_net(struct net *net)
94311 int err;
94312 struct ipv4_devconf *all, *dflt;
94313 #ifdef CONFIG_SYSCTL
94314- struct ctl_table *tbl = ctl_forward_entry;
94315+ ctl_table_no_const *tbl = NULL;
94316 struct ctl_table_header *forw_hdr;
94317 #endif
94318
94319@@ -2209,7 +2209,7 @@ static __net_init int devinet_init_net(struct net *net)
94320 goto err_alloc_dflt;
94321
94322 #ifdef CONFIG_SYSCTL
94323- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
94324+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
94325 if (tbl == NULL)
94326 goto err_alloc_ctl;
94327
94328@@ -2229,7 +2229,10 @@ static __net_init int devinet_init_net(struct net *net)
94329 goto err_reg_dflt;
94330
94331 err = -ENOMEM;
94332- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
94333+ if (!net_eq(net, &init_net))
94334+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
94335+ else
94336+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
94337 if (forw_hdr == NULL)
94338 goto err_reg_ctl;
94339 net->ipv4.forw_hdr = forw_hdr;
94340@@ -2245,8 +2248,7 @@ err_reg_ctl:
94341 err_reg_dflt:
94342 __devinet_sysctl_unregister(all);
94343 err_reg_all:
94344- if (tbl != ctl_forward_entry)
94345- kfree(tbl);
94346+ kfree(tbl);
94347 err_alloc_ctl:
94348 #endif
94349 if (dflt != &ipv4_devconf_dflt)
94350diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
94351index b3f627a..b0f3e99 100644
94352--- a/net/ipv4/fib_frontend.c
94353+++ b/net/ipv4/fib_frontend.c
94354@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
94355 #ifdef CONFIG_IP_ROUTE_MULTIPATH
94356 fib_sync_up(dev);
94357 #endif
94358- atomic_inc(&net->ipv4.dev_addr_genid);
94359+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94360 rt_cache_flush(dev_net(dev));
94361 break;
94362 case NETDEV_DOWN:
94363 fib_del_ifaddr(ifa, NULL);
94364- atomic_inc(&net->ipv4.dev_addr_genid);
94365+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94366 if (ifa->ifa_dev->ifa_list == NULL) {
94367 /* Last address was deleted from this interface.
94368 * Disable IP.
94369@@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
94370 #ifdef CONFIG_IP_ROUTE_MULTIPATH
94371 fib_sync_up(dev);
94372 #endif
94373- atomic_inc(&net->ipv4.dev_addr_genid);
94374+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94375 rt_cache_flush(net);
94376 break;
94377 case NETDEV_DOWN:
94378diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
94379index d5dbca5..6251d5f 100644
94380--- a/net/ipv4/fib_semantics.c
94381+++ b/net/ipv4/fib_semantics.c
94382@@ -766,7 +766,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
94383 nh->nh_saddr = inet_select_addr(nh->nh_dev,
94384 nh->nh_gw,
94385 nh->nh_parent->fib_scope);
94386- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
94387+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
94388
94389 return nh->nh_saddr;
94390 }
94391diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
94392index 6acb541..9ea617d 100644
94393--- a/net/ipv4/inet_connection_sock.c
94394+++ b/net/ipv4/inet_connection_sock.c
94395@@ -37,7 +37,7 @@ struct local_ports sysctl_local_ports __read_mostly = {
94396 .range = { 32768, 61000 },
94397 };
94398
94399-unsigned long *sysctl_local_reserved_ports;
94400+unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
94401 EXPORT_SYMBOL(sysctl_local_reserved_ports);
94402
94403 void inet_get_local_port_range(int *low, int *high)
94404diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
94405index 5f64875..31cf54d 100644
94406--- a/net/ipv4/inet_diag.c
94407+++ b/net/ipv4/inet_diag.c
94408@@ -106,6 +106,10 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
94409
94410 r->id.idiag_sport = inet->inet_sport;
94411 r->id.idiag_dport = inet->inet_dport;
94412+
94413+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94414+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94415+
94416 r->id.idiag_src[0] = inet->inet_rcv_saddr;
94417 r->id.idiag_dst[0] = inet->inet_daddr;
94418
94419@@ -240,12 +244,19 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
94420
94421 r->idiag_family = tw->tw_family;
94422 r->idiag_retrans = 0;
94423+
94424 r->id.idiag_if = tw->tw_bound_dev_if;
94425 sock_diag_save_cookie(tw, r->id.idiag_cookie);
94426+
94427 r->id.idiag_sport = tw->tw_sport;
94428 r->id.idiag_dport = tw->tw_dport;
94429+
94430+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94431+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94432+
94433 r->id.idiag_src[0] = tw->tw_rcv_saddr;
94434 r->id.idiag_dst[0] = tw->tw_daddr;
94435+
94436 r->idiag_state = tw->tw_substate;
94437 r->idiag_timer = 3;
94438 r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
94439@@ -732,8 +743,13 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
94440
94441 r->id.idiag_sport = inet->inet_sport;
94442 r->id.idiag_dport = ireq->rmt_port;
94443+
94444+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94445+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94446+
94447 r->id.idiag_src[0] = ireq->loc_addr;
94448 r->id.idiag_dst[0] = ireq->rmt_addr;
94449+
94450 r->idiag_expires = jiffies_to_msecs(tmo);
94451 r->idiag_rqueue = 0;
94452 r->idiag_wqueue = 0;
94453diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
94454index 96da9c7..b956690 100644
94455--- a/net/ipv4/inet_hashtables.c
94456+++ b/net/ipv4/inet_hashtables.c
94457@@ -18,12 +18,15 @@
94458 #include <linux/sched.h>
94459 #include <linux/slab.h>
94460 #include <linux/wait.h>
94461+#include <linux/security.h>
94462
94463 #include <net/inet_connection_sock.h>
94464 #include <net/inet_hashtables.h>
94465 #include <net/secure_seq.h>
94466 #include <net/ip.h>
94467
94468+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
94469+
94470 /*
94471 * Allocate and initialize a new local port bind bucket.
94472 * The bindhash mutex for snum's hash chain must be held here.
94473@@ -554,6 +557,8 @@ ok:
94474 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
94475 spin_unlock(&head->lock);
94476
94477+ gr_update_task_in_ip_table(current, inet_sk(sk));
94478+
94479 if (tw) {
94480 inet_twsk_deschedule(tw, death_row);
94481 while (twrefcnt) {
94482diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
94483index 33d5537..da337a4 100644
94484--- a/net/ipv4/inetpeer.c
94485+++ b/net/ipv4/inetpeer.c
94486@@ -503,8 +503,8 @@ relookup:
94487 if (p) {
94488 p->daddr = *daddr;
94489 atomic_set(&p->refcnt, 1);
94490- atomic_set(&p->rid, 0);
94491- atomic_set(&p->ip_id_count,
94492+ atomic_set_unchecked(&p->rid, 0);
94493+ atomic_set_unchecked(&p->ip_id_count,
94494 (daddr->family == AF_INET) ?
94495 secure_ip_id(daddr->addr.a4) :
94496 secure_ipv6_id(daddr->addr.a6));
94497diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
94498index b66910a..cfe416e 100644
94499--- a/net/ipv4/ip_fragment.c
94500+++ b/net/ipv4/ip_fragment.c
94501@@ -282,7 +282,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
94502 return 0;
94503
94504 start = qp->rid;
94505- end = atomic_inc_return(&peer->rid);
94506+ end = atomic_inc_return_unchecked(&peer->rid);
94507 qp->rid = end;
94508
94509 rc = qp->q.fragments && (end - start) > max;
94510@@ -759,12 +759,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
94511
94512 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94513 {
94514- struct ctl_table *table;
94515+ ctl_table_no_const *table = NULL;
94516 struct ctl_table_header *hdr;
94517
94518- table = ip4_frags_ns_ctl_table;
94519 if (!net_eq(net, &init_net)) {
94520- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
94521+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
94522 if (table == NULL)
94523 goto err_alloc;
94524
94525@@ -775,9 +774,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94526 /* Don't export sysctls to unprivileged users */
94527 if (net->user_ns != &init_user_ns)
94528 table[0].procname = NULL;
94529- }
94530+ hdr = register_net_sysctl(net, "net/ipv4", table);
94531+ } else
94532+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
94533
94534- hdr = register_net_sysctl(net, "net/ipv4", table);
94535 if (hdr == NULL)
94536 goto err_reg;
94537
94538@@ -785,8 +785,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94539 return 0;
94540
94541 err_reg:
94542- if (!net_eq(net, &init_net))
94543- kfree(table);
94544+ kfree(table);
94545 err_alloc:
94546 return -ENOMEM;
94547 }
94548diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
94549index d7aea4c..a8ee872 100644
94550--- a/net/ipv4/ip_gre.c
94551+++ b/net/ipv4/ip_gre.c
94552@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
94553 module_param(log_ecn_error, bool, 0644);
94554 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
94555
94556-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
94557+static struct rtnl_link_ops ipgre_link_ops;
94558 static int ipgre_tunnel_init(struct net_device *dev);
94559
94560 static int ipgre_net_id __read_mostly;
94561@@ -731,7 +731,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
94562 [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
94563 };
94564
94565-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
94566+static struct rtnl_link_ops ipgre_link_ops = {
94567 .kind = "gre",
94568 .maxtype = IFLA_GRE_MAX,
94569 .policy = ipgre_policy,
94570@@ -745,7 +745,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
94571 .fill_info = ipgre_fill_info,
94572 };
94573
94574-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
94575+static struct rtnl_link_ops ipgre_tap_ops = {
94576 .kind = "gretap",
94577 .maxtype = IFLA_GRE_MAX,
94578 .policy = ipgre_policy,
94579diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
94580index 23e6ab0..be67a57 100644
94581--- a/net/ipv4/ip_sockglue.c
94582+++ b/net/ipv4/ip_sockglue.c
94583@@ -1153,7 +1153,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
94584 len = min_t(unsigned int, len, opt->optlen);
94585 if (put_user(len, optlen))
94586 return -EFAULT;
94587- if (copy_to_user(optval, opt->__data, len))
94588+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
94589+ copy_to_user(optval, opt->__data, len))
94590 return -EFAULT;
94591 return 0;
94592 }
94593@@ -1284,7 +1285,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
94594 if (sk->sk_type != SOCK_STREAM)
94595 return -ENOPROTOOPT;
94596
94597- msg.msg_control = optval;
94598+ msg.msg_control = (void __force_kernel *)optval;
94599 msg.msg_controllen = len;
94600 msg.msg_flags = flags;
94601
94602diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
94603index 26847e1..75d2d2f 100644
94604--- a/net/ipv4/ip_vti.c
94605+++ b/net/ipv4/ip_vti.c
94606@@ -44,7 +44,7 @@
94607 #include <net/net_namespace.h>
94608 #include <net/netns/generic.h>
94609
94610-static struct rtnl_link_ops vti_link_ops __read_mostly;
94611+static struct rtnl_link_ops vti_link_ops;
94612
94613 static int vti_net_id __read_mostly;
94614 static int vti_tunnel_init(struct net_device *dev);
94615@@ -425,7 +425,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
94616 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
94617 };
94618
94619-static struct rtnl_link_ops vti_link_ops __read_mostly = {
94620+static struct rtnl_link_ops vti_link_ops = {
94621 .kind = "vti",
94622 .maxtype = IFLA_VTI_MAX,
94623 .policy = vti_policy,
94624diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
94625index efa1138..20dbba0 100644
94626--- a/net/ipv4/ipconfig.c
94627+++ b/net/ipv4/ipconfig.c
94628@@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
94629
94630 mm_segment_t oldfs = get_fs();
94631 set_fs(get_ds());
94632- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
94633+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
94634 set_fs(oldfs);
94635 return res;
94636 }
94637@@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
94638
94639 mm_segment_t oldfs = get_fs();
94640 set_fs(get_ds());
94641- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
94642+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
94643 set_fs(oldfs);
94644 return res;
94645 }
94646@@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
94647
94648 mm_segment_t oldfs = get_fs();
94649 set_fs(get_ds());
94650- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
94651+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
94652 set_fs(oldfs);
94653 return res;
94654 }
94655diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
94656index 7f80fb4..b0328f6 100644
94657--- a/net/ipv4/ipip.c
94658+++ b/net/ipv4/ipip.c
94659@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
94660 static int ipip_net_id __read_mostly;
94661
94662 static int ipip_tunnel_init(struct net_device *dev);
94663-static struct rtnl_link_ops ipip_link_ops __read_mostly;
94664+static struct rtnl_link_ops ipip_link_ops;
94665
94666 static int ipip_err(struct sk_buff *skb, u32 info)
94667 {
94668@@ -408,7 +408,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
94669 [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
94670 };
94671
94672-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
94673+static struct rtnl_link_ops ipip_link_ops = {
94674 .kind = "ipip",
94675 .maxtype = IFLA_IPTUN_MAX,
94676 .policy = ipip_policy,
94677diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
94678index 85a4f21..1beb1f5 100644
94679--- a/net/ipv4/netfilter/arp_tables.c
94680+++ b/net/ipv4/netfilter/arp_tables.c
94681@@ -880,14 +880,14 @@ static int compat_table_info(const struct xt_table_info *info,
94682 #endif
94683
94684 static int get_info(struct net *net, void __user *user,
94685- const int *len, int compat)
94686+ int len, int compat)
94687 {
94688 char name[XT_TABLE_MAXNAMELEN];
94689 struct xt_table *t;
94690 int ret;
94691
94692- if (*len != sizeof(struct arpt_getinfo)) {
94693- duprintf("length %u != %Zu\n", *len,
94694+ if (len != sizeof(struct arpt_getinfo)) {
94695+ duprintf("length %u != %Zu\n", len,
94696 sizeof(struct arpt_getinfo));
94697 return -EINVAL;
94698 }
94699@@ -924,7 +924,7 @@ static int get_info(struct net *net, void __user *user,
94700 info.size = private->size;
94701 strcpy(info.name, name);
94702
94703- if (copy_to_user(user, &info, *len) != 0)
94704+ if (copy_to_user(user, &info, len) != 0)
94705 ret = -EFAULT;
94706 else
94707 ret = 0;
94708@@ -1683,7 +1683,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
94709
94710 switch (cmd) {
94711 case ARPT_SO_GET_INFO:
94712- ret = get_info(sock_net(sk), user, len, 1);
94713+ ret = get_info(sock_net(sk), user, *len, 1);
94714 break;
94715 case ARPT_SO_GET_ENTRIES:
94716 ret = compat_get_entries(sock_net(sk), user, len);
94717@@ -1728,7 +1728,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
94718
94719 switch (cmd) {
94720 case ARPT_SO_GET_INFO:
94721- ret = get_info(sock_net(sk), user, len, 0);
94722+ ret = get_info(sock_net(sk), user, *len, 0);
94723 break;
94724
94725 case ARPT_SO_GET_ENTRIES:
94726diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
94727index d23118d..6ad7277 100644
94728--- a/net/ipv4/netfilter/ip_tables.c
94729+++ b/net/ipv4/netfilter/ip_tables.c
94730@@ -1068,14 +1068,14 @@ static int compat_table_info(const struct xt_table_info *info,
94731 #endif
94732
94733 static int get_info(struct net *net, void __user *user,
94734- const int *len, int compat)
94735+ int len, int compat)
94736 {
94737 char name[XT_TABLE_MAXNAMELEN];
94738 struct xt_table *t;
94739 int ret;
94740
94741- if (*len != sizeof(struct ipt_getinfo)) {
94742- duprintf("length %u != %zu\n", *len,
94743+ if (len != sizeof(struct ipt_getinfo)) {
94744+ duprintf("length %u != %zu\n", len,
94745 sizeof(struct ipt_getinfo));
94746 return -EINVAL;
94747 }
94748@@ -1112,7 +1112,7 @@ static int get_info(struct net *net, void __user *user,
94749 info.size = private->size;
94750 strcpy(info.name, name);
94751
94752- if (copy_to_user(user, &info, *len) != 0)
94753+ if (copy_to_user(user, &info, len) != 0)
94754 ret = -EFAULT;
94755 else
94756 ret = 0;
94757@@ -1966,7 +1966,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
94758
94759 switch (cmd) {
94760 case IPT_SO_GET_INFO:
94761- ret = get_info(sock_net(sk), user, len, 1);
94762+ ret = get_info(sock_net(sk), user, *len, 1);
94763 break;
94764 case IPT_SO_GET_ENTRIES:
94765 ret = compat_get_entries(sock_net(sk), user, len);
94766@@ -2013,7 +2013,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
94767
94768 switch (cmd) {
94769 case IPT_SO_GET_INFO:
94770- ret = get_info(sock_net(sk), user, len, 0);
94771+ ret = get_info(sock_net(sk), user, *len, 0);
94772 break;
94773
94774 case IPT_SO_GET_ENTRIES:
94775diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
94776index cbc2215..9cb993c 100644
94777--- a/net/ipv4/netfilter/ipt_ULOG.c
94778+++ b/net/ipv4/netfilter/ipt_ULOG.c
94779@@ -220,6 +220,7 @@ static void ipt_ulog_packet(struct net *net,
94780 ub->qlen++;
94781
94782 pm = nlmsg_data(nlh);
94783+ memset(pm, 0, sizeof(*pm));
94784
94785 /* We might not have a timestamp, get one */
94786 if (skb->tstamp.tv64 == 0)
94787@@ -238,8 +239,6 @@ static void ipt_ulog_packet(struct net *net,
94788 }
94789 else if (loginfo->prefix[0] != '\0')
94790 strncpy(pm->prefix, loginfo->prefix, sizeof(pm->prefix));
94791- else
94792- *(pm->prefix) = '\0';
94793
94794 if (in && in->hard_header_len > 0 &&
94795 skb->mac_header != skb->network_header &&
94796@@ -251,13 +250,9 @@ static void ipt_ulog_packet(struct net *net,
94797
94798 if (in)
94799 strncpy(pm->indev_name, in->name, sizeof(pm->indev_name));
94800- else
94801- pm->indev_name[0] = '\0';
94802
94803 if (out)
94804 strncpy(pm->outdev_name, out->name, sizeof(pm->outdev_name));
94805- else
94806- pm->outdev_name[0] = '\0';
94807
94808 /* copy_len <= skb->len, so can't fail. */
94809 if (skb_copy_bits(skb, 0, pm->payload, copy_len) < 0)
94810diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
94811index c482f7c..2784262 100644
94812--- a/net/ipv4/ping.c
94813+++ b/net/ipv4/ping.c
94814@@ -55,7 +55,7 @@
94815
94816
94817 struct ping_table ping_table;
94818-struct pingv6_ops pingv6_ops;
94819+struct pingv6_ops *pingv6_ops;
94820 EXPORT_SYMBOL_GPL(pingv6_ops);
94821
94822 static u16 ping_port_rover;
94823@@ -335,7 +335,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
94824 return -ENODEV;
94825 }
94826 }
94827- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
94828+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
94829 scoped);
94830 rcu_read_unlock();
94831
94832@@ -541,7 +541,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
94833 }
94834 #if IS_ENABLED(CONFIG_IPV6)
94835 } else if (skb->protocol == htons(ETH_P_IPV6)) {
94836- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
94837+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
94838 #endif
94839 }
94840
94841@@ -559,7 +559,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
94842 info, (u8 *)icmph);
94843 #if IS_ENABLED(CONFIG_IPV6)
94844 } else if (family == AF_INET6) {
94845- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
94846+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
94847 info, (u8 *)icmph);
94848 #endif
94849 }
94850@@ -841,7 +841,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
94851 return ip_recv_error(sk, msg, len, addr_len);
94852 #if IS_ENABLED(CONFIG_IPV6)
94853 } else if (family == AF_INET6) {
94854- return pingv6_ops.ipv6_recv_error(sk, msg, len,
94855+ return pingv6_ops->ipv6_recv_error(sk, msg, len,
94856 addr_len);
94857 #endif
94858 }
94859@@ -900,7 +900,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
94860 }
94861
94862 if (inet6_sk(sk)->rxopt.all)
94863- pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);
94864+ pingv6_ops->ip6_datagram_recv_ctl(sk, msg, skb);
94865 #endif
94866 } else {
94867 BUG();
94868@@ -1090,7 +1090,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
94869 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
94870 0, sock_i_ino(sp),
94871 atomic_read(&sp->sk_refcnt), sp,
94872- atomic_read(&sp->sk_drops), len);
94873+ atomic_read_unchecked(&sp->sk_drops), len);
94874 }
94875
94876 static int ping_v4_seq_show(struct seq_file *seq, void *v)
94877diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
94878index 7d3db78..9fd511d 100644
94879--- a/net/ipv4/raw.c
94880+++ b/net/ipv4/raw.c
94881@@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
94882 int raw_rcv(struct sock *sk, struct sk_buff *skb)
94883 {
94884 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
94885- atomic_inc(&sk->sk_drops);
94886+ atomic_inc_unchecked(&sk->sk_drops);
94887 kfree_skb(skb);
94888 return NET_RX_DROP;
94889 }
94890@@ -746,16 +746,20 @@ static int raw_init(struct sock *sk)
94891
94892 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
94893 {
94894+ struct icmp_filter filter;
94895+
94896 if (optlen > sizeof(struct icmp_filter))
94897 optlen = sizeof(struct icmp_filter);
94898- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
94899+ if (copy_from_user(&filter, optval, optlen))
94900 return -EFAULT;
94901+ raw_sk(sk)->filter = filter;
94902 return 0;
94903 }
94904
94905 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
94906 {
94907 int len, ret = -EFAULT;
94908+ struct icmp_filter filter;
94909
94910 if (get_user(len, optlen))
94911 goto out;
94912@@ -765,8 +769,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
94913 if (len > sizeof(struct icmp_filter))
94914 len = sizeof(struct icmp_filter);
94915 ret = -EFAULT;
94916- if (put_user(len, optlen) ||
94917- copy_to_user(optval, &raw_sk(sk)->filter, len))
94918+ filter = raw_sk(sk)->filter;
94919+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
94920 goto out;
94921 ret = 0;
94922 out: return ret;
94923@@ -995,7 +999,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
94924 0, 0L, 0,
94925 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
94926 0, sock_i_ino(sp),
94927- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
94928+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
94929 }
94930
94931 static int raw_seq_show(struct seq_file *seq, void *v)
94932diff --git a/net/ipv4/route.c b/net/ipv4/route.c
94933index 62290b5..f0d944f 100644
94934--- a/net/ipv4/route.c
94935+++ b/net/ipv4/route.c
94936@@ -2617,34 +2617,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
94937 .maxlen = sizeof(int),
94938 .mode = 0200,
94939 .proc_handler = ipv4_sysctl_rtcache_flush,
94940+ .extra1 = &init_net,
94941 },
94942 { },
94943 };
94944
94945 static __net_init int sysctl_route_net_init(struct net *net)
94946 {
94947- struct ctl_table *tbl;
94948+ ctl_table_no_const *tbl = NULL;
94949
94950- tbl = ipv4_route_flush_table;
94951 if (!net_eq(net, &init_net)) {
94952- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
94953+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
94954 if (tbl == NULL)
94955 goto err_dup;
94956
94957 /* Don't export sysctls to unprivileged users */
94958 if (net->user_ns != &init_user_ns)
94959 tbl[0].procname = NULL;
94960- }
94961- tbl[0].extra1 = net;
94962+ tbl[0].extra1 = net;
94963+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
94964+ } else
94965+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
94966
94967- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
94968 if (net->ipv4.route_hdr == NULL)
94969 goto err_reg;
94970 return 0;
94971
94972 err_reg:
94973- if (tbl != ipv4_route_flush_table)
94974- kfree(tbl);
94975+ kfree(tbl);
94976 err_dup:
94977 return -ENOMEM;
94978 }
94979@@ -2667,8 +2667,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
94980
94981 static __net_init int rt_genid_init(struct net *net)
94982 {
94983- atomic_set(&net->ipv4.rt_genid, 0);
94984- atomic_set(&net->fnhe_genid, 0);
94985+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
94986+ atomic_set_unchecked(&net->fnhe_genid, 0);
94987 get_random_bytes(&net->ipv4.dev_addr_genid,
94988 sizeof(net->ipv4.dev_addr_genid));
94989 return 0;
94990diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
94991index 540279f..9855b16 100644
94992--- a/net/ipv4/sysctl_net_ipv4.c
94993+++ b/net/ipv4/sysctl_net_ipv4.c
94994@@ -58,7 +58,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
94995 {
94996 int ret;
94997 int range[2];
94998- struct ctl_table tmp = {
94999+ ctl_table_no_const tmp = {
95000 .data = &range,
95001 .maxlen = sizeof(range),
95002 .mode = table->mode,
95003@@ -111,7 +111,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
95004 int ret;
95005 gid_t urange[2];
95006 kgid_t low, high;
95007- struct ctl_table tmp = {
95008+ ctl_table_no_const tmp = {
95009 .data = &urange,
95010 .maxlen = sizeof(urange),
95011 .mode = table->mode,
95012@@ -142,7 +142,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
95013 void __user *buffer, size_t *lenp, loff_t *ppos)
95014 {
95015 char val[TCP_CA_NAME_MAX];
95016- struct ctl_table tbl = {
95017+ ctl_table_no_const tbl = {
95018 .data = val,
95019 .maxlen = TCP_CA_NAME_MAX,
95020 };
95021@@ -161,7 +161,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
95022 void __user *buffer, size_t *lenp,
95023 loff_t *ppos)
95024 {
95025- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
95026+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
95027 int ret;
95028
95029 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
95030@@ -178,7 +178,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
95031 void __user *buffer, size_t *lenp,
95032 loff_t *ppos)
95033 {
95034- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
95035+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
95036 int ret;
95037
95038 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
95039@@ -204,15 +204,17 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write,
95040 struct mem_cgroup *memcg;
95041 #endif
95042
95043- struct ctl_table tmp = {
95044+ ctl_table_no_const tmp = {
95045 .data = &vec,
95046 .maxlen = sizeof(vec),
95047 .mode = ctl->mode,
95048 };
95049
95050 if (!write) {
95051- ctl->data = &net->ipv4.sysctl_tcp_mem;
95052- return proc_doulongvec_minmax(ctl, write, buffer, lenp, ppos);
95053+ ctl_table_no_const tcp_mem = *ctl;
95054+
95055+ tcp_mem.data = &net->ipv4.sysctl_tcp_mem;
95056+ return proc_doulongvec_minmax(&tcp_mem, write, buffer, lenp, ppos);
95057 }
95058
95059 ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos);
95060@@ -240,7 +242,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
95061 void __user *buffer, size_t *lenp,
95062 loff_t *ppos)
95063 {
95064- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
95065+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
95066 struct tcp_fastopen_context *ctxt;
95067 int ret;
95068 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
95069@@ -483,7 +485,7 @@ static struct ctl_table ipv4_table[] = {
95070 },
95071 {
95072 .procname = "ip_local_reserved_ports",
95073- .data = NULL, /* initialized in sysctl_ipv4_init */
95074+ .data = sysctl_local_reserved_ports,
95075 .maxlen = 65536,
95076 .mode = 0644,
95077 .proc_handler = proc_do_large_bitmap,
95078@@ -864,11 +866,10 @@ static struct ctl_table ipv4_net_table[] = {
95079
95080 static __net_init int ipv4_sysctl_init_net(struct net *net)
95081 {
95082- struct ctl_table *table;
95083+ ctl_table_no_const *table = NULL;
95084
95085- table = ipv4_net_table;
95086 if (!net_eq(net, &init_net)) {
95087- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
95088+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
95089 if (table == NULL)
95090 goto err_alloc;
95091
95092@@ -903,15 +904,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
95093
95094 tcp_init_mem(net);
95095
95096- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
95097+ if (!net_eq(net, &init_net))
95098+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
95099+ else
95100+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
95101 if (net->ipv4.ipv4_hdr == NULL)
95102 goto err_reg;
95103
95104 return 0;
95105
95106 err_reg:
95107- if (!net_eq(net, &init_net))
95108- kfree(table);
95109+ kfree(table);
95110 err_alloc:
95111 return -ENOMEM;
95112 }
95113@@ -933,16 +936,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
95114 static __init int sysctl_ipv4_init(void)
95115 {
95116 struct ctl_table_header *hdr;
95117- struct ctl_table *i;
95118-
95119- for (i = ipv4_table; i->procname; i++) {
95120- if (strcmp(i->procname, "ip_local_reserved_ports") == 0) {
95121- i->data = sysctl_local_reserved_ports;
95122- break;
95123- }
95124- }
95125- if (!i->procname)
95126- return -EINVAL;
95127
95128 hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
95129 if (hdr == NULL)
95130diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
95131index 068c8fb..a755c52 100644
95132--- a/net/ipv4/tcp_input.c
95133+++ b/net/ipv4/tcp_input.c
95134@@ -4435,7 +4435,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
95135 * simplifies code)
95136 */
95137 static void
95138-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
95139+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
95140 struct sk_buff *head, struct sk_buff *tail,
95141 u32 start, u32 end)
95142 {
95143@@ -5520,6 +5520,7 @@ discard:
95144 tcp_paws_reject(&tp->rx_opt, 0))
95145 goto discard_and_undo;
95146
95147+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
95148 if (th->syn) {
95149 /* We see SYN without ACK. It is attempt of
95150 * simultaneous connect with crossed SYNs.
95151@@ -5570,6 +5571,7 @@ discard:
95152 goto discard;
95153 #endif
95154 }
95155+#endif
95156 /* "fifth, if neither of the SYN or RST bits is set then
95157 * drop the segment and return."
95158 */
95159@@ -5616,7 +5618,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
95160 goto discard;
95161
95162 if (th->syn) {
95163- if (th->fin)
95164+ if (th->fin || th->urg || th->psh)
95165 goto discard;
95166 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
95167 return 1;
95168diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
95169index 5031f68..91569e2 100644
95170--- a/net/ipv4/tcp_ipv4.c
95171+++ b/net/ipv4/tcp_ipv4.c
95172@@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
95173 EXPORT_SYMBOL(sysctl_tcp_low_latency);
95174
95175
95176+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95177+extern int grsec_enable_blackhole;
95178+#endif
95179+
95180 #ifdef CONFIG_TCP_MD5SIG
95181 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
95182 __be32 daddr, __be32 saddr, const struct tcphdr *th);
95183@@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
95184 return 0;
95185
95186 reset:
95187+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95188+ if (!grsec_enable_blackhole)
95189+#endif
95190 tcp_v4_send_reset(rsk, skb);
95191 discard:
95192 kfree_skb(skb);
95193@@ -1974,12 +1981,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
95194 TCP_SKB_CB(skb)->sacked = 0;
95195
95196 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
95197- if (!sk)
95198+ if (!sk) {
95199+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95200+ ret = 1;
95201+#endif
95202 goto no_tcp_socket;
95203-
95204+ }
95205 process:
95206- if (sk->sk_state == TCP_TIME_WAIT)
95207+ if (sk->sk_state == TCP_TIME_WAIT) {
95208+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95209+ ret = 2;
95210+#endif
95211 goto do_time_wait;
95212+ }
95213
95214 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
95215 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
95216@@ -2033,6 +2047,10 @@ csum_error:
95217 bad_packet:
95218 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
95219 } else {
95220+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95221+ if (!grsec_enable_blackhole || (ret == 1 &&
95222+ (skb->dev->flags & IFF_LOOPBACK)))
95223+#endif
95224 tcp_v4_send_reset(NULL, skb);
95225 }
95226
95227diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
95228index 58a3e69..7f0626e 100644
95229--- a/net/ipv4/tcp_minisocks.c
95230+++ b/net/ipv4/tcp_minisocks.c
95231@@ -27,6 +27,10 @@
95232 #include <net/inet_common.h>
95233 #include <net/xfrm.h>
95234
95235+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95236+extern int grsec_enable_blackhole;
95237+#endif
95238+
95239 int sysctl_tcp_syncookies __read_mostly = 1;
95240 EXPORT_SYMBOL(sysctl_tcp_syncookies);
95241
95242@@ -711,7 +715,10 @@ embryonic_reset:
95243 * avoid becoming vulnerable to outside attack aiming at
95244 * resetting legit local connections.
95245 */
95246- req->rsk_ops->send_reset(sk, skb);
95247+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95248+ if (!grsec_enable_blackhole)
95249+#endif
95250+ req->rsk_ops->send_reset(sk, skb);
95251 } else if (fastopen) { /* received a valid RST pkt */
95252 reqsk_fastopen_remove(sk, req, true);
95253 tcp_reset(sk);
95254diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
95255index 611beab..c4b6e1d 100644
95256--- a/net/ipv4/tcp_probe.c
95257+++ b/net/ipv4/tcp_probe.c
95258@@ -245,7 +245,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
95259 if (cnt + width >= len)
95260 break;
95261
95262- if (copy_to_user(buf + cnt, tbuf, width))
95263+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
95264 return -EFAULT;
95265 cnt += width;
95266 }
95267diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
95268index 4b85e6f..22f9ac9 100644
95269--- a/net/ipv4/tcp_timer.c
95270+++ b/net/ipv4/tcp_timer.c
95271@@ -22,6 +22,10 @@
95272 #include <linux/gfp.h>
95273 #include <net/tcp.h>
95274
95275+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95276+extern int grsec_lastack_retries;
95277+#endif
95278+
95279 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
95280 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
95281 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
95282@@ -185,6 +189,13 @@ static int tcp_write_timeout(struct sock *sk)
95283 }
95284 }
95285
95286+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95287+ if ((sk->sk_state == TCP_LAST_ACK) &&
95288+ (grsec_lastack_retries > 0) &&
95289+ (grsec_lastack_retries < retry_until))
95290+ retry_until = grsec_lastack_retries;
95291+#endif
95292+
95293 if (retransmits_timed_out(sk, retry_until,
95294 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
95295 /* Has it gone just too far? */
95296diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
95297index 5e2c2f1..6473c22 100644
95298--- a/net/ipv4/udp.c
95299+++ b/net/ipv4/udp.c
95300@@ -87,6 +87,7 @@
95301 #include <linux/types.h>
95302 #include <linux/fcntl.h>
95303 #include <linux/module.h>
95304+#include <linux/security.h>
95305 #include <linux/socket.h>
95306 #include <linux/sockios.h>
95307 #include <linux/igmp.h>
95308@@ -112,6 +113,10 @@
95309 #include <net/busy_poll.h>
95310 #include "udp_impl.h"
95311
95312+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95313+extern int grsec_enable_blackhole;
95314+#endif
95315+
95316 struct udp_table udp_table __read_mostly;
95317 EXPORT_SYMBOL(udp_table);
95318
95319@@ -595,6 +600,9 @@ found:
95320 return s;
95321 }
95322
95323+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
95324+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
95325+
95326 /*
95327 * This routine is called by the ICMP module when it gets some
95328 * sort of error condition. If err < 0 then the socket should
95329@@ -892,9 +900,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
95330 dport = usin->sin_port;
95331 if (dport == 0)
95332 return -EINVAL;
95333+
95334+ err = gr_search_udp_sendmsg(sk, usin);
95335+ if (err)
95336+ return err;
95337 } else {
95338 if (sk->sk_state != TCP_ESTABLISHED)
95339 return -EDESTADDRREQ;
95340+
95341+ err = gr_search_udp_sendmsg(sk, NULL);
95342+ if (err)
95343+ return err;
95344+
95345 daddr = inet->inet_daddr;
95346 dport = inet->inet_dport;
95347 /* Open fast path for connected socket.
95348@@ -1141,7 +1158,7 @@ static unsigned int first_packet_length(struct sock *sk)
95349 IS_UDPLITE(sk));
95350 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
95351 IS_UDPLITE(sk));
95352- atomic_inc(&sk->sk_drops);
95353+ atomic_inc_unchecked(&sk->sk_drops);
95354 __skb_unlink(skb, rcvq);
95355 __skb_queue_tail(&list_kill, skb);
95356 }
95357@@ -1221,6 +1238,10 @@ try_again:
95358 if (!skb)
95359 goto out;
95360
95361+ err = gr_search_udp_recvmsg(sk, skb);
95362+ if (err)
95363+ goto out_free;
95364+
95365 ulen = skb->len - sizeof(struct udphdr);
95366 copied = len;
95367 if (copied > ulen)
95368@@ -1254,7 +1275,7 @@ try_again:
95369 if (unlikely(err)) {
95370 trace_kfree_skb(skb, udp_recvmsg);
95371 if (!peeked) {
95372- atomic_inc(&sk->sk_drops);
95373+ atomic_inc_unchecked(&sk->sk_drops);
95374 UDP_INC_STATS_USER(sock_net(sk),
95375 UDP_MIB_INERRORS, is_udplite);
95376 }
95377@@ -1542,7 +1563,7 @@ csum_error:
95378 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
95379 drop:
95380 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
95381- atomic_inc(&sk->sk_drops);
95382+ atomic_inc_unchecked(&sk->sk_drops);
95383 kfree_skb(skb);
95384 return -1;
95385 }
95386@@ -1561,7 +1582,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
95387 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
95388
95389 if (!skb1) {
95390- atomic_inc(&sk->sk_drops);
95391+ atomic_inc_unchecked(&sk->sk_drops);
95392 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
95393 IS_UDPLITE(sk));
95394 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
95395@@ -1733,6 +1754,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
95396 goto csum_error;
95397
95398 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
95399+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95400+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
95401+#endif
95402 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
95403
95404 /*
95405@@ -2165,7 +2189,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
95406 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
95407 0, sock_i_ino(sp),
95408 atomic_read(&sp->sk_refcnt), sp,
95409- atomic_read(&sp->sk_drops), len);
95410+ atomic_read_unchecked(&sp->sk_drops), len);
95411 }
95412
95413 int udp4_seq_show(struct seq_file *seq, void *v)
95414diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
95415index adf9983..8e45d0a 100644
95416--- a/net/ipv4/xfrm4_policy.c
95417+++ b/net/ipv4/xfrm4_policy.c
95418@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
95419 fl4->flowi4_tos = iph->tos;
95420 }
95421
95422-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
95423+static int xfrm4_garbage_collect(struct dst_ops *ops)
95424 {
95425 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
95426
95427- xfrm4_policy_afinfo.garbage_collect(net);
95428+ xfrm_garbage_collect_deferred(net);
95429 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
95430 }
95431
95432@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
95433
95434 static int __net_init xfrm4_net_init(struct net *net)
95435 {
95436- struct ctl_table *table;
95437+ ctl_table_no_const *table = NULL;
95438 struct ctl_table_header *hdr;
95439
95440- table = xfrm4_policy_table;
95441 if (!net_eq(net, &init_net)) {
95442- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
95443+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
95444 if (!table)
95445 goto err_alloc;
95446
95447 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
95448- }
95449-
95450- hdr = register_net_sysctl(net, "net/ipv4", table);
95451+ hdr = register_net_sysctl(net, "net/ipv4", table);
95452+ } else
95453+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
95454 if (!hdr)
95455 goto err_reg;
95456
95457@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
95458 return 0;
95459
95460 err_reg:
95461- if (!net_eq(net, &init_net))
95462- kfree(table);
95463+ kfree(table);
95464 err_alloc:
95465 return -ENOMEM;
95466 }
95467diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
95468index cd3fb30..b7dfef7 100644
95469--- a/net/ipv6/addrconf.c
95470+++ b/net/ipv6/addrconf.c
95471@@ -586,7 +586,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
95472 idx = 0;
95473 head = &net->dev_index_head[h];
95474 rcu_read_lock();
95475- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
95476+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
95477 net->dev_base_seq;
95478 hlist_for_each_entry_rcu(dev, head, index_hlist) {
95479 if (idx < s_idx)
95480@@ -2364,7 +2364,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
95481 p.iph.ihl = 5;
95482 p.iph.protocol = IPPROTO_IPV6;
95483 p.iph.ttl = 64;
95484- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
95485+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
95486
95487 if (ops->ndo_do_ioctl) {
95488 mm_segment_t oldfs = get_fs();
95489@@ -3977,7 +3977,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
95490 s_ip_idx = ip_idx = cb->args[2];
95491
95492 rcu_read_lock();
95493- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
95494+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
95495 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
95496 idx = 0;
95497 head = &net->dev_index_head[h];
95498@@ -4603,7 +4603,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
95499 dst_free(&ifp->rt->dst);
95500 break;
95501 }
95502- atomic_inc(&net->ipv6.dev_addr_genid);
95503+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
95504 rt_genid_bump_ipv6(net);
95505 }
95506
95507@@ -4624,7 +4624,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
95508 int *valp = ctl->data;
95509 int val = *valp;
95510 loff_t pos = *ppos;
95511- struct ctl_table lctl;
95512+ ctl_table_no_const lctl;
95513 int ret;
95514
95515 /*
95516@@ -4709,7 +4709,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
95517 int *valp = ctl->data;
95518 int val = *valp;
95519 loff_t pos = *ppos;
95520- struct ctl_table lctl;
95521+ ctl_table_no_const lctl;
95522 int ret;
95523
95524 /*
95525diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
95526index 8132b44..b8eca70 100644
95527--- a/net/ipv6/af_inet6.c
95528+++ b/net/ipv6/af_inet6.c
95529@@ -767,7 +767,7 @@ static int __net_init inet6_net_init(struct net *net)
95530
95531 net->ipv6.sysctl.bindv6only = 0;
95532 net->ipv6.sysctl.icmpv6_time = 1*HZ;
95533- atomic_set(&net->ipv6.rt_genid, 0);
95534+ atomic_set_unchecked(&net->ipv6.rt_genid, 0);
95535
95536 err = ipv6_init_mibs(net);
95537 if (err)
95538diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
95539index c66c6df..f375d3c 100644
95540--- a/net/ipv6/datagram.c
95541+++ b/net/ipv6/datagram.c
95542@@ -908,5 +908,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
95543 0,
95544 sock_i_ino(sp),
95545 atomic_read(&sp->sk_refcnt), sp,
95546- atomic_read(&sp->sk_drops));
95547+ atomic_read_unchecked(&sp->sk_drops));
95548 }
95549diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
95550index eef8d94..cfa1852 100644
95551--- a/net/ipv6/icmp.c
95552+++ b/net/ipv6/icmp.c
95553@@ -997,7 +997,7 @@ struct ctl_table ipv6_icmp_table_template[] = {
95554
95555 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
95556 {
95557- struct ctl_table *table;
95558+ ctl_table_no_const *table;
95559
95560 table = kmemdup(ipv6_icmp_table_template,
95561 sizeof(ipv6_icmp_table_template),
95562diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
95563index bf4a9a0..e5f6ac5 100644
95564--- a/net/ipv6/ip6_gre.c
95565+++ b/net/ipv6/ip6_gre.c
95566@@ -74,7 +74,7 @@ struct ip6gre_net {
95567 struct net_device *fb_tunnel_dev;
95568 };
95569
95570-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
95571+static struct rtnl_link_ops ip6gre_link_ops;
95572 static int ip6gre_tunnel_init(struct net_device *dev);
95573 static void ip6gre_tunnel_setup(struct net_device *dev);
95574 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
95575@@ -1286,7 +1286,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
95576 }
95577
95578
95579-static struct inet6_protocol ip6gre_protocol __read_mostly = {
95580+static struct inet6_protocol ip6gre_protocol = {
95581 .handler = ip6gre_rcv,
95582 .err_handler = ip6gre_err,
95583 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
95584@@ -1622,7 +1622,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
95585 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
95586 };
95587
95588-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
95589+static struct rtnl_link_ops ip6gre_link_ops = {
95590 .kind = "ip6gre",
95591 .maxtype = IFLA_GRE_MAX,
95592 .policy = ip6gre_policy,
95593@@ -1635,7 +1635,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
95594 .fill_info = ip6gre_fill_info,
95595 };
95596
95597-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
95598+static struct rtnl_link_ops ip6gre_tap_ops = {
95599 .kind = "ip6gretap",
95600 .maxtype = IFLA_GRE_MAX,
95601 .policy = ip6gre_policy,
95602diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
95603index c1e11b5..568e633 100644
95604--- a/net/ipv6/ip6_tunnel.c
95605+++ b/net/ipv6/ip6_tunnel.c
95606@@ -89,7 +89,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
95607
95608 static int ip6_tnl_dev_init(struct net_device *dev);
95609 static void ip6_tnl_dev_setup(struct net_device *dev);
95610-static struct rtnl_link_ops ip6_link_ops __read_mostly;
95611+static struct rtnl_link_ops ip6_link_ops;
95612
95613 static int ip6_tnl_net_id __read_mostly;
95614 struct ip6_tnl_net {
95615@@ -1699,7 +1699,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
95616 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
95617 };
95618
95619-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
95620+static struct rtnl_link_ops ip6_link_ops = {
95621 .kind = "ip6tnl",
95622 .maxtype = IFLA_IPTUN_MAX,
95623 .policy = ip6_tnl_policy,
95624diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
95625index d1e2e8e..51c19ae 100644
95626--- a/net/ipv6/ipv6_sockglue.c
95627+++ b/net/ipv6/ipv6_sockglue.c
95628@@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
95629 if (sk->sk_type != SOCK_STREAM)
95630 return -ENOPROTOOPT;
95631
95632- msg.msg_control = optval;
95633+ msg.msg_control = (void __force_kernel *)optval;
95634 msg.msg_controllen = len;
95635 msg.msg_flags = flags;
95636
95637diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
95638index 44400c2..8e11f52 100644
95639--- a/net/ipv6/netfilter/ip6_tables.c
95640+++ b/net/ipv6/netfilter/ip6_tables.c
95641@@ -1078,14 +1078,14 @@ static int compat_table_info(const struct xt_table_info *info,
95642 #endif
95643
95644 static int get_info(struct net *net, void __user *user,
95645- const int *len, int compat)
95646+ int len, int compat)
95647 {
95648 char name[XT_TABLE_MAXNAMELEN];
95649 struct xt_table *t;
95650 int ret;
95651
95652- if (*len != sizeof(struct ip6t_getinfo)) {
95653- duprintf("length %u != %zu\n", *len,
95654+ if (len != sizeof(struct ip6t_getinfo)) {
95655+ duprintf("length %u != %zu\n", len,
95656 sizeof(struct ip6t_getinfo));
95657 return -EINVAL;
95658 }
95659@@ -1122,7 +1122,7 @@ static int get_info(struct net *net, void __user *user,
95660 info.size = private->size;
95661 strcpy(info.name, name);
95662
95663- if (copy_to_user(user, &info, *len) != 0)
95664+ if (copy_to_user(user, &info, len) != 0)
95665 ret = -EFAULT;
95666 else
95667 ret = 0;
95668@@ -1976,7 +1976,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
95669
95670 switch (cmd) {
95671 case IP6T_SO_GET_INFO:
95672- ret = get_info(sock_net(sk), user, len, 1);
95673+ ret = get_info(sock_net(sk), user, *len, 1);
95674 break;
95675 case IP6T_SO_GET_ENTRIES:
95676 ret = compat_get_entries(sock_net(sk), user, len);
95677@@ -2023,7 +2023,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
95678
95679 switch (cmd) {
95680 case IP6T_SO_GET_INFO:
95681- ret = get_info(sock_net(sk), user, len, 0);
95682+ ret = get_info(sock_net(sk), user, *len, 0);
95683 break;
95684
95685 case IP6T_SO_GET_ENTRIES:
95686diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
95687index 253566a..9fa50c7 100644
95688--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
95689+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
95690@@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
95691
95692 static int nf_ct_frag6_sysctl_register(struct net *net)
95693 {
95694- struct ctl_table *table;
95695+ ctl_table_no_const *table = NULL;
95696 struct ctl_table_header *hdr;
95697
95698- table = nf_ct_frag6_sysctl_table;
95699 if (!net_eq(net, &init_net)) {
95700- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
95701+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
95702 GFP_KERNEL);
95703 if (table == NULL)
95704 goto err_alloc;
95705@@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
95706 table[0].data = &net->nf_frag.frags.timeout;
95707 table[1].data = &net->nf_frag.frags.low_thresh;
95708 table[2].data = &net->nf_frag.frags.high_thresh;
95709- }
95710-
95711- hdr = register_net_sysctl(net, "net/netfilter", table);
95712+ hdr = register_net_sysctl(net, "net/netfilter", table);
95713+ } else
95714+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
95715 if (hdr == NULL)
95716 goto err_reg;
95717
95718@@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
95719 return 0;
95720
95721 err_reg:
95722- if (!net_eq(net, &init_net))
95723- kfree(table);
95724+ kfree(table);
95725 err_alloc:
95726 return -ENOMEM;
95727 }
95728diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
95729index 827f795..7e28e82 100644
95730--- a/net/ipv6/output_core.c
95731+++ b/net/ipv6/output_core.c
95732@@ -9,8 +9,8 @@
95733
95734 void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
95735 {
95736- static atomic_t ipv6_fragmentation_id;
95737- int old, new;
95738+ static atomic_unchecked_t ipv6_fragmentation_id;
95739+ int id;
95740
95741 #if IS_ENABLED(CONFIG_IPV6)
95742 if (rt && !(rt->dst.flags & DST_NOPEER)) {
95743@@ -26,13 +26,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
95744 }
95745 }
95746 #endif
95747- do {
95748- old = atomic_read(&ipv6_fragmentation_id);
95749- new = old + 1;
95750- if (!new)
95751- new = 1;
95752- } while (atomic_cmpxchg(&ipv6_fragmentation_id, old, new) != old);
95753- fhdr->identification = htonl(new);
95754+ id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
95755+ if (!id)
95756+ id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
95757+ fhdr->identification = htonl(id);
95758 }
95759 EXPORT_SYMBOL(ipv6_select_ident);
95760
95761diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
95762index 7856e96..75ebc7f 100644
95763--- a/net/ipv6/ping.c
95764+++ b/net/ipv6/ping.c
95765@@ -246,6 +246,22 @@ static struct pernet_operations ping_v6_net_ops = {
95766 };
95767 #endif
95768
95769+static struct pingv6_ops real_pingv6_ops = {
95770+ .ipv6_recv_error = ipv6_recv_error,
95771+ .ip6_datagram_recv_ctl = ip6_datagram_recv_ctl,
95772+ .icmpv6_err_convert = icmpv6_err_convert,
95773+ .ipv6_icmp_error = ipv6_icmp_error,
95774+ .ipv6_chk_addr = ipv6_chk_addr,
95775+};
95776+
95777+static struct pingv6_ops dummy_pingv6_ops = {
95778+ .ipv6_recv_error = dummy_ipv6_recv_error,
95779+ .ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl,
95780+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
95781+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
95782+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
95783+};
95784+
95785 int __init pingv6_init(void)
95786 {
95787 #ifdef CONFIG_PROC_FS
95788@@ -253,11 +269,7 @@ int __init pingv6_init(void)
95789 if (ret)
95790 return ret;
95791 #endif
95792- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
95793- pingv6_ops.ip6_datagram_recv_ctl = ip6_datagram_recv_ctl;
95794- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
95795- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
95796- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
95797+ pingv6_ops = &real_pingv6_ops;
95798 return inet6_register_protosw(&pingv6_protosw);
95799 }
95800
95801@@ -266,11 +278,7 @@ int __init pingv6_init(void)
95802 */
95803 void pingv6_exit(void)
95804 {
95805- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
95806- pingv6_ops.ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl;
95807- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
95808- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
95809- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
95810+ pingv6_ops = &dummy_pingv6_ops;
95811 #ifdef CONFIG_PROC_FS
95812 unregister_pernet_subsys(&ping_v6_net_ops);
95813 #endif
95814diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
95815index 430067c..4adf088 100644
95816--- a/net/ipv6/raw.c
95817+++ b/net/ipv6/raw.c
95818@@ -385,7 +385,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
95819 {
95820 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
95821 skb_checksum_complete(skb)) {
95822- atomic_inc(&sk->sk_drops);
95823+ atomic_inc_unchecked(&sk->sk_drops);
95824 kfree_skb(skb);
95825 return NET_RX_DROP;
95826 }
95827@@ -413,7 +413,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
95828 struct raw6_sock *rp = raw6_sk(sk);
95829
95830 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
95831- atomic_inc(&sk->sk_drops);
95832+ atomic_inc_unchecked(&sk->sk_drops);
95833 kfree_skb(skb);
95834 return NET_RX_DROP;
95835 }
95836@@ -437,7 +437,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
95837
95838 if (inet->hdrincl) {
95839 if (skb_checksum_complete(skb)) {
95840- atomic_inc(&sk->sk_drops);
95841+ atomic_inc_unchecked(&sk->sk_drops);
95842 kfree_skb(skb);
95843 return NET_RX_DROP;
95844 }
95845@@ -607,7 +607,7 @@ out:
95846 return err;
95847 }
95848
95849-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
95850+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
95851 struct flowi6 *fl6, struct dst_entry **dstp,
95852 unsigned int flags)
95853 {
95854@@ -920,12 +920,15 @@ do_confirm:
95855 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
95856 char __user *optval, int optlen)
95857 {
95858+ struct icmp6_filter filter;
95859+
95860 switch (optname) {
95861 case ICMPV6_FILTER:
95862 if (optlen > sizeof(struct icmp6_filter))
95863 optlen = sizeof(struct icmp6_filter);
95864- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
95865+ if (copy_from_user(&filter, optval, optlen))
95866 return -EFAULT;
95867+ raw6_sk(sk)->filter = filter;
95868 return 0;
95869 default:
95870 return -ENOPROTOOPT;
95871@@ -938,6 +941,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
95872 char __user *optval, int __user *optlen)
95873 {
95874 int len;
95875+ struct icmp6_filter filter;
95876
95877 switch (optname) {
95878 case ICMPV6_FILTER:
95879@@ -949,7 +953,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
95880 len = sizeof(struct icmp6_filter);
95881 if (put_user(len, optlen))
95882 return -EFAULT;
95883- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
95884+ filter = raw6_sk(sk)->filter;
95885+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
95886 return -EFAULT;
95887 return 0;
95888 default:
95889diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
95890index 1aeb473..bea761c 100644
95891--- a/net/ipv6/reassembly.c
95892+++ b/net/ipv6/reassembly.c
95893@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
95894
95895 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95896 {
95897- struct ctl_table *table;
95898+ ctl_table_no_const *table = NULL;
95899 struct ctl_table_header *hdr;
95900
95901- table = ip6_frags_ns_ctl_table;
95902 if (!net_eq(net, &init_net)) {
95903- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
95904+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
95905 if (table == NULL)
95906 goto err_alloc;
95907
95908@@ -642,9 +641,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95909 /* Don't export sysctls to unprivileged users */
95910 if (net->user_ns != &init_user_ns)
95911 table[0].procname = NULL;
95912- }
95913+ hdr = register_net_sysctl(net, "net/ipv6", table);
95914+ } else
95915+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
95916
95917- hdr = register_net_sysctl(net, "net/ipv6", table);
95918 if (hdr == NULL)
95919 goto err_reg;
95920
95921@@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95922 return 0;
95923
95924 err_reg:
95925- if (!net_eq(net, &init_net))
95926- kfree(table);
95927+ kfree(table);
95928 err_alloc:
95929 return -ENOMEM;
95930 }
95931diff --git a/net/ipv6/route.c b/net/ipv6/route.c
95932index 77308af..36ed509 100644
95933--- a/net/ipv6/route.c
95934+++ b/net/ipv6/route.c
95935@@ -3009,7 +3009,7 @@ struct ctl_table ipv6_route_table_template[] = {
95936
95937 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
95938 {
95939- struct ctl_table *table;
95940+ ctl_table_no_const *table;
95941
95942 table = kmemdup(ipv6_route_table_template,
95943 sizeof(ipv6_route_table_template),
95944diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
95945index b433884..3875266 100644
95946--- a/net/ipv6/sit.c
95947+++ b/net/ipv6/sit.c
95948@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
95949 static void ipip6_dev_free(struct net_device *dev);
95950 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
95951 __be32 *v4dst);
95952-static struct rtnl_link_ops sit_link_ops __read_mostly;
95953+static struct rtnl_link_ops sit_link_ops;
95954
95955 static int sit_net_id __read_mostly;
95956 struct sit_net {
95957@@ -1603,7 +1603,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
95958 unregister_netdevice_queue(dev, head);
95959 }
95960
95961-static struct rtnl_link_ops sit_link_ops __read_mostly = {
95962+static struct rtnl_link_ops sit_link_ops = {
95963 .kind = "sit",
95964 .maxtype = IFLA_IPTUN_MAX,
95965 .policy = ipip6_policy,
95966diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
95967index 107b2f1..72741a9 100644
95968--- a/net/ipv6/sysctl_net_ipv6.c
95969+++ b/net/ipv6/sysctl_net_ipv6.c
95970@@ -40,7 +40,7 @@ static struct ctl_table ipv6_rotable[] = {
95971
95972 static int __net_init ipv6_sysctl_net_init(struct net *net)
95973 {
95974- struct ctl_table *ipv6_table;
95975+ ctl_table_no_const *ipv6_table;
95976 struct ctl_table *ipv6_route_table;
95977 struct ctl_table *ipv6_icmp_table;
95978 int err;
95979diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
95980index 5c71501..7e8d5d3 100644
95981--- a/net/ipv6/tcp_ipv6.c
95982+++ b/net/ipv6/tcp_ipv6.c
95983@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
95984 inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
95985 }
95986
95987+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95988+extern int grsec_enable_blackhole;
95989+#endif
95990+
95991 static void tcp_v6_hash(struct sock *sk)
95992 {
95993 if (sk->sk_state != TCP_CLOSE) {
95994@@ -1397,6 +1401,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
95995 return 0;
95996
95997 reset:
95998+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95999+ if (!grsec_enable_blackhole)
96000+#endif
96001 tcp_v6_send_reset(sk, skb);
96002 discard:
96003 if (opt_skb)
96004@@ -1479,12 +1486,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
96005 TCP_SKB_CB(skb)->sacked = 0;
96006
96007 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
96008- if (!sk)
96009+ if (!sk) {
96010+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96011+ ret = 1;
96012+#endif
96013 goto no_tcp_socket;
96014+ }
96015
96016 process:
96017- if (sk->sk_state == TCP_TIME_WAIT)
96018+ if (sk->sk_state == TCP_TIME_WAIT) {
96019+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96020+ ret = 2;
96021+#endif
96022 goto do_time_wait;
96023+ }
96024
96025 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
96026 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
96027@@ -1536,6 +1551,10 @@ csum_error:
96028 bad_packet:
96029 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
96030 } else {
96031+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96032+ if (!grsec_enable_blackhole || (ret == 1 &&
96033+ (skb->dev->flags & IFF_LOOPBACK)))
96034+#endif
96035 tcp_v6_send_reset(NULL, skb);
96036 }
96037
96038diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
96039index 3d2758d..626c422 100644
96040--- a/net/ipv6/udp.c
96041+++ b/net/ipv6/udp.c
96042@@ -53,6 +53,10 @@
96043 #include <trace/events/skb.h>
96044 #include "udp_impl.h"
96045
96046+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96047+extern int grsec_enable_blackhole;
96048+#endif
96049+
96050 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
96051 {
96052 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
96053@@ -417,7 +421,7 @@ try_again:
96054 if (unlikely(err)) {
96055 trace_kfree_skb(skb, udpv6_recvmsg);
96056 if (!peeked) {
96057- atomic_inc(&sk->sk_drops);
96058+ atomic_inc_unchecked(&sk->sk_drops);
96059 if (is_udp4)
96060 UDP_INC_STATS_USER(sock_net(sk),
96061 UDP_MIB_INERRORS,
96062@@ -665,7 +669,7 @@ csum_error:
96063 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
96064 drop:
96065 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
96066- atomic_inc(&sk->sk_drops);
96067+ atomic_inc_unchecked(&sk->sk_drops);
96068 kfree_skb(skb);
96069 return -1;
96070 }
96071@@ -723,7 +727,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
96072 if (likely(skb1 == NULL))
96073 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
96074 if (!skb1) {
96075- atomic_inc(&sk->sk_drops);
96076+ atomic_inc_unchecked(&sk->sk_drops);
96077 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
96078 IS_UDPLITE(sk));
96079 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
96080@@ -863,6 +867,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
96081 goto csum_error;
96082
96083 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
96084+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96085+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
96086+#endif
96087 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
96088
96089 kfree_skb(skb);
96090diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
96091index 550b195..6acea83 100644
96092--- a/net/ipv6/xfrm6_policy.c
96093+++ b/net/ipv6/xfrm6_policy.c
96094@@ -212,11 +212,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
96095 }
96096 }
96097
96098-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
96099+static int xfrm6_garbage_collect(struct dst_ops *ops)
96100 {
96101 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
96102
96103- xfrm6_policy_afinfo.garbage_collect(net);
96104+ xfrm_garbage_collect_deferred(net);
96105 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
96106 }
96107
96108@@ -329,19 +329,19 @@ static struct ctl_table xfrm6_policy_table[] = {
96109
96110 static int __net_init xfrm6_net_init(struct net *net)
96111 {
96112- struct ctl_table *table;
96113+ ctl_table_no_const *table = NULL;
96114 struct ctl_table_header *hdr;
96115
96116- table = xfrm6_policy_table;
96117 if (!net_eq(net, &init_net)) {
96118- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
96119+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
96120 if (!table)
96121 goto err_alloc;
96122
96123 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
96124- }
96125+ hdr = register_net_sysctl(net, "net/ipv6", table);
96126+ } else
96127+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
96128
96129- hdr = register_net_sysctl(net, "net/ipv6", table);
96130 if (!hdr)
96131 goto err_reg;
96132
96133@@ -349,8 +349,7 @@ static int __net_init xfrm6_net_init(struct net *net)
96134 return 0;
96135
96136 err_reg:
96137- if (!net_eq(net, &init_net))
96138- kfree(table);
96139+ kfree(table);
96140 err_alloc:
96141 return -ENOMEM;
96142 }
96143diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
96144index 41ac7938..75e3bb1 100644
96145--- a/net/irda/ircomm/ircomm_tty.c
96146+++ b/net/irda/ircomm/ircomm_tty.c
96147@@ -319,11 +319,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96148 add_wait_queue(&port->open_wait, &wait);
96149
96150 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
96151- __FILE__, __LINE__, tty->driver->name, port->count);
96152+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96153
96154 spin_lock_irqsave(&port->lock, flags);
96155 if (!tty_hung_up_p(filp))
96156- port->count--;
96157+ atomic_dec(&port->count);
96158 port->blocked_open++;
96159 spin_unlock_irqrestore(&port->lock, flags);
96160
96161@@ -358,7 +358,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96162 }
96163
96164 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
96165- __FILE__, __LINE__, tty->driver->name, port->count);
96166+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96167
96168 schedule();
96169 }
96170@@ -368,12 +368,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96171
96172 spin_lock_irqsave(&port->lock, flags);
96173 if (!tty_hung_up_p(filp))
96174- port->count++;
96175+ atomic_inc(&port->count);
96176 port->blocked_open--;
96177 spin_unlock_irqrestore(&port->lock, flags);
96178
96179 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
96180- __FILE__, __LINE__, tty->driver->name, port->count);
96181+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96182
96183 if (!retval)
96184 port->flags |= ASYNC_NORMAL_ACTIVE;
96185@@ -447,12 +447,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
96186
96187 /* ++ is not atomic, so this should be protected - Jean II */
96188 spin_lock_irqsave(&self->port.lock, flags);
96189- self->port.count++;
96190+ atomic_inc(&self->port.count);
96191 spin_unlock_irqrestore(&self->port.lock, flags);
96192 tty_port_tty_set(&self->port, tty);
96193
96194 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
96195- self->line, self->port.count);
96196+ self->line, atomic_read(&self->port.count));
96197
96198 /* Not really used by us, but lets do it anyway */
96199 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
96200@@ -989,7 +989,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
96201 tty_kref_put(port->tty);
96202 }
96203 port->tty = NULL;
96204- port->count = 0;
96205+ atomic_set(&port->count, 0);
96206 spin_unlock_irqrestore(&port->lock, flags);
96207
96208 wake_up_interruptible(&port->open_wait);
96209@@ -1346,7 +1346,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
96210 seq_putc(m, '\n');
96211
96212 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
96213- seq_printf(m, "Open count: %d\n", self->port.count);
96214+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
96215 seq_printf(m, "Max data size: %d\n", self->max_data_size);
96216 seq_printf(m, "Max header size: %d\n", self->max_header_size);
96217
96218diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
96219index c4b7218..3e83259 100644
96220--- a/net/iucv/af_iucv.c
96221+++ b/net/iucv/af_iucv.c
96222@@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
96223
96224 write_lock_bh(&iucv_sk_list.lock);
96225
96226- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
96227+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
96228 while (__iucv_get_sock_by_name(name)) {
96229 sprintf(name, "%08x",
96230- atomic_inc_return(&iucv_sk_list.autobind_name));
96231+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
96232 }
96233
96234 write_unlock_bh(&iucv_sk_list.lock);
96235diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
96236index cd5b8ec..f205e6b 100644
96237--- a/net/iucv/iucv.c
96238+++ b/net/iucv/iucv.c
96239@@ -690,7 +690,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
96240 return NOTIFY_OK;
96241 }
96242
96243-static struct notifier_block __refdata iucv_cpu_notifier = {
96244+static struct notifier_block iucv_cpu_notifier = {
96245 .notifier_call = iucv_cpu_notify,
96246 };
96247
96248diff --git a/net/key/af_key.c b/net/key/af_key.c
96249index 545f047..9757a9d 100644
96250--- a/net/key/af_key.c
96251+++ b/net/key/af_key.c
96252@@ -3041,10 +3041,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
96253 static u32 get_acqseq(void)
96254 {
96255 u32 res;
96256- static atomic_t acqseq;
96257+ static atomic_unchecked_t acqseq;
96258
96259 do {
96260- res = atomic_inc_return(&acqseq);
96261+ res = atomic_inc_return_unchecked(&acqseq);
96262 } while (!res);
96263 return res;
96264 }
96265diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
96266index 9903ee5..18978be 100644
96267--- a/net/mac80211/cfg.c
96268+++ b/net/mac80211/cfg.c
96269@@ -826,7 +826,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
96270 ret = ieee80211_vif_use_channel(sdata, chandef,
96271 IEEE80211_CHANCTX_EXCLUSIVE);
96272 }
96273- } else if (local->open_count == local->monitors) {
96274+ } else if (local_read(&local->open_count) == local->monitors) {
96275 local->_oper_chandef = *chandef;
96276 ieee80211_hw_config(local, 0);
96277 }
96278@@ -3124,7 +3124,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
96279 else
96280 local->probe_req_reg--;
96281
96282- if (!local->open_count)
96283+ if (!local_read(&local->open_count))
96284 break;
96285
96286 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
96287@@ -3587,8 +3587,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
96288 if (chanctx_conf) {
96289 *chandef = chanctx_conf->def;
96290 ret = 0;
96291- } else if (local->open_count > 0 &&
96292- local->open_count == local->monitors &&
96293+ } else if (local_read(&local->open_count) > 0 &&
96294+ local_read(&local->open_count) == local->monitors &&
96295 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
96296 if (local->use_chanctx)
96297 *chandef = local->monitor_chandef;
96298diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
96299index 611abfc..8c2c7e4 100644
96300--- a/net/mac80211/ieee80211_i.h
96301+++ b/net/mac80211/ieee80211_i.h
96302@@ -28,6 +28,7 @@
96303 #include <net/ieee80211_radiotap.h>
96304 #include <net/cfg80211.h>
96305 #include <net/mac80211.h>
96306+#include <asm/local.h>
96307 #include "key.h"
96308 #include "sta_info.h"
96309 #include "debug.h"
96310@@ -945,7 +946,7 @@ struct ieee80211_local {
96311 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
96312 spinlock_t queue_stop_reason_lock;
96313
96314- int open_count;
96315+ local_t open_count;
96316 int monitors, cooked_mntrs;
96317 /* number of interfaces with corresponding FIF_ flags */
96318 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
96319diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
96320index fcecd63..a404454 100644
96321--- a/net/mac80211/iface.c
96322+++ b/net/mac80211/iface.c
96323@@ -519,7 +519,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96324 break;
96325 }
96326
96327- if (local->open_count == 0) {
96328+ if (local_read(&local->open_count) == 0) {
96329 res = drv_start(local);
96330 if (res)
96331 goto err_del_bss;
96332@@ -566,7 +566,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96333 res = drv_add_interface(local, sdata);
96334 if (res)
96335 goto err_stop;
96336- } else if (local->monitors == 0 && local->open_count == 0) {
96337+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
96338 res = ieee80211_add_virtual_monitor(local);
96339 if (res)
96340 goto err_stop;
96341@@ -675,7 +675,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96342 atomic_inc(&local->iff_promiscs);
96343
96344 if (coming_up)
96345- local->open_count++;
96346+ local_inc(&local->open_count);
96347
96348 if (hw_reconf_flags)
96349 ieee80211_hw_config(local, hw_reconf_flags);
96350@@ -713,7 +713,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96351 err_del_interface:
96352 drv_remove_interface(local, sdata);
96353 err_stop:
96354- if (!local->open_count)
96355+ if (!local_read(&local->open_count))
96356 drv_stop(local);
96357 err_del_bss:
96358 sdata->bss = NULL;
96359@@ -852,7 +852,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96360 }
96361
96362 if (going_down)
96363- local->open_count--;
96364+ local_dec(&local->open_count);
96365
96366 switch (sdata->vif.type) {
96367 case NL80211_IFTYPE_AP_VLAN:
96368@@ -919,7 +919,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96369 }
96370 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
96371
96372- if (local->open_count == 0)
96373+ if (local_read(&local->open_count) == 0)
96374 ieee80211_clear_tx_pending(local);
96375
96376 /*
96377@@ -959,7 +959,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96378
96379 ieee80211_recalc_ps(local, -1);
96380
96381- if (local->open_count == 0) {
96382+ if (local_read(&local->open_count) == 0) {
96383 ieee80211_stop_device(local);
96384
96385 /* no reconfiguring after stop! */
96386@@ -970,7 +970,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96387 ieee80211_configure_filter(local);
96388 ieee80211_hw_config(local, hw_reconf_flags);
96389
96390- if (local->monitors == local->open_count)
96391+ if (local->monitors == local_read(&local->open_count))
96392 ieee80211_add_virtual_monitor(local);
96393 }
96394
96395diff --git a/net/mac80211/main.c b/net/mac80211/main.c
96396index e765f77..dfd72e7 100644
96397--- a/net/mac80211/main.c
96398+++ b/net/mac80211/main.c
96399@@ -172,7 +172,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
96400 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
96401 IEEE80211_CONF_CHANGE_POWER);
96402
96403- if (changed && local->open_count) {
96404+ if (changed && local_read(&local->open_count)) {
96405 ret = drv_config(local, changed);
96406 /*
96407 * Goal:
96408diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
96409index 3401262..d5cd68d 100644
96410--- a/net/mac80211/pm.c
96411+++ b/net/mac80211/pm.c
96412@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96413 struct ieee80211_sub_if_data *sdata;
96414 struct sta_info *sta;
96415
96416- if (!local->open_count)
96417+ if (!local_read(&local->open_count))
96418 goto suspend;
96419
96420 ieee80211_scan_cancel(local);
96421@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96422 cancel_work_sync(&local->dynamic_ps_enable_work);
96423 del_timer_sync(&local->dynamic_ps_timer);
96424
96425- local->wowlan = wowlan && local->open_count;
96426+ local->wowlan = wowlan && local_read(&local->open_count);
96427 if (local->wowlan) {
96428 int err = drv_suspend(local, wowlan);
96429 if (err < 0) {
96430@@ -116,7 +116,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96431 WARN_ON(!list_empty(&local->chanctx_list));
96432
96433 /* stop hardware - this must stop RX */
96434- if (local->open_count)
96435+ if (local_read(&local->open_count))
96436 ieee80211_stop_device(local);
96437
96438 suspend:
96439diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
96440index e126605..73d2c39 100644
96441--- a/net/mac80211/rate.c
96442+++ b/net/mac80211/rate.c
96443@@ -725,7 +725,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
96444
96445 ASSERT_RTNL();
96446
96447- if (local->open_count)
96448+ if (local_read(&local->open_count))
96449 return -EBUSY;
96450
96451 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
96452diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
96453index c97a065..ff61928 100644
96454--- a/net/mac80211/rc80211_pid_debugfs.c
96455+++ b/net/mac80211/rc80211_pid_debugfs.c
96456@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
96457
96458 spin_unlock_irqrestore(&events->lock, status);
96459
96460- if (copy_to_user(buf, pb, p))
96461+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
96462 return -EFAULT;
96463
96464 return p;
96465diff --git a/net/mac80211/util.c b/net/mac80211/util.c
96466index 69e4ef5..e8e4b92 100644
96467--- a/net/mac80211/util.c
96468+++ b/net/mac80211/util.c
96469@@ -1470,7 +1470,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
96470 }
96471 #endif
96472 /* everything else happens only if HW was up & running */
96473- if (!local->open_count)
96474+ if (!local_read(&local->open_count))
96475 goto wake_up;
96476
96477 /*
96478@@ -1695,7 +1695,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
96479 local->in_reconfig = false;
96480 barrier();
96481
96482- if (local->monitors == local->open_count && local->monitors > 0)
96483+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
96484 ieee80211_add_virtual_monitor(local);
96485
96486 /*
96487diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
96488index 6e839b6..002a233 100644
96489--- a/net/netfilter/Kconfig
96490+++ b/net/netfilter/Kconfig
96491@@ -950,6 +950,16 @@ config NETFILTER_XT_MATCH_ESP
96492
96493 To compile it as a module, choose M here. If unsure, say N.
96494
96495+config NETFILTER_XT_MATCH_GRADM
96496+ tristate '"gradm" match support'
96497+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
96498+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
96499+ ---help---
96500+ The gradm match allows to match on grsecurity RBAC being enabled.
96501+ It is useful when iptables rules are applied early on bootup to
96502+ prevent connections to the machine (except from a trusted host)
96503+ while the RBAC system is disabled.
96504+
96505 config NETFILTER_XT_MATCH_HASHLIMIT
96506 tristate '"hashlimit" match support'
96507 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
96508diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
96509index c3a0a12..90b587f 100644
96510--- a/net/netfilter/Makefile
96511+++ b/net/netfilter/Makefile
96512@@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
96513 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
96514 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
96515 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
96516+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
96517 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
96518 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
96519 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
96520diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
96521index f2e30fb..f131862 100644
96522--- a/net/netfilter/ipset/ip_set_core.c
96523+++ b/net/netfilter/ipset/ip_set_core.c
96524@@ -1819,7 +1819,7 @@ done:
96525 return ret;
96526 }
96527
96528-static struct nf_sockopt_ops so_set __read_mostly = {
96529+static struct nf_sockopt_ops so_set = {
96530 .pf = PF_INET,
96531 .get_optmin = SO_IP_SET,
96532 .get_optmax = SO_IP_SET + 1,
96533diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
96534index 4c8e5c0..5a79b4d 100644
96535--- a/net/netfilter/ipvs/ip_vs_conn.c
96536+++ b/net/netfilter/ipvs/ip_vs_conn.c
96537@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
96538 /* Increase the refcnt counter of the dest */
96539 ip_vs_dest_hold(dest);
96540
96541- conn_flags = atomic_read(&dest->conn_flags);
96542+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
96543 if (cp->protocol != IPPROTO_UDP)
96544 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
96545 flags = cp->flags;
96546@@ -900,7 +900,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
96547
96548 cp->control = NULL;
96549 atomic_set(&cp->n_control, 0);
96550- atomic_set(&cp->in_pkts, 0);
96551+ atomic_set_unchecked(&cp->in_pkts, 0);
96552
96553 cp->packet_xmit = NULL;
96554 cp->app = NULL;
96555@@ -1188,7 +1188,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
96556
96557 /* Don't drop the entry if its number of incoming packets is not
96558 located in [0, 8] */
96559- i = atomic_read(&cp->in_pkts);
96560+ i = atomic_read_unchecked(&cp->in_pkts);
96561 if (i > 8 || i < 0) return 0;
96562
96563 if (!todrop_rate[i]) return 0;
96564diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
96565index 3581736..c0453e9 100644
96566--- a/net/netfilter/ipvs/ip_vs_core.c
96567+++ b/net/netfilter/ipvs/ip_vs_core.c
96568@@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
96569 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
96570 /* do not touch skb anymore */
96571
96572- atomic_inc(&cp->in_pkts);
96573+ atomic_inc_unchecked(&cp->in_pkts);
96574 ip_vs_conn_put(cp);
96575 return ret;
96576 }
96577@@ -1706,7 +1706,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
96578 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
96579 pkts = sysctl_sync_threshold(ipvs);
96580 else
96581- pkts = atomic_add_return(1, &cp->in_pkts);
96582+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96583
96584 if (ipvs->sync_state & IP_VS_STATE_MASTER)
96585 ip_vs_sync_conn(net, cp, pkts);
96586diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
96587index a3df9bd..895ae09 100644
96588--- a/net/netfilter/ipvs/ip_vs_ctl.c
96589+++ b/net/netfilter/ipvs/ip_vs_ctl.c
96590@@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
96591 */
96592 ip_vs_rs_hash(ipvs, dest);
96593 }
96594- atomic_set(&dest->conn_flags, conn_flags);
96595+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
96596
96597 /* bind the service */
96598 old_svc = rcu_dereference_protected(dest->svc, 1);
96599@@ -1641,7 +1641,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
96600 * align with netns init in ip_vs_control_net_init()
96601 */
96602
96603-static struct ctl_table vs_vars[] = {
96604+static ctl_table_no_const vs_vars[] __read_only = {
96605 {
96606 .procname = "amemthresh",
96607 .maxlen = sizeof(int),
96608@@ -2062,7 +2062,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
96609 " %-7s %-6d %-10d %-10d\n",
96610 &dest->addr.in6,
96611 ntohs(dest->port),
96612- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
96613+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
96614 atomic_read(&dest->weight),
96615 atomic_read(&dest->activeconns),
96616 atomic_read(&dest->inactconns));
96617@@ -2073,7 +2073,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
96618 "%-7s %-6d %-10d %-10d\n",
96619 ntohl(dest->addr.ip),
96620 ntohs(dest->port),
96621- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
96622+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
96623 atomic_read(&dest->weight),
96624 atomic_read(&dest->activeconns),
96625 atomic_read(&dest->inactconns));
96626@@ -2551,7 +2551,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
96627
96628 entry.addr = dest->addr.ip;
96629 entry.port = dest->port;
96630- entry.conn_flags = atomic_read(&dest->conn_flags);
96631+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
96632 entry.weight = atomic_read(&dest->weight);
96633 entry.u_threshold = dest->u_threshold;
96634 entry.l_threshold = dest->l_threshold;
96635@@ -3094,7 +3094,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
96636 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
96637 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
96638 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
96639- (atomic_read(&dest->conn_flags) &
96640+ (atomic_read_unchecked(&dest->conn_flags) &
96641 IP_VS_CONN_F_FWD_MASK)) ||
96642 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
96643 atomic_read(&dest->weight)) ||
96644@@ -3684,7 +3684,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
96645 {
96646 int idx;
96647 struct netns_ipvs *ipvs = net_ipvs(net);
96648- struct ctl_table *tbl;
96649+ ctl_table_no_const *tbl;
96650
96651 atomic_set(&ipvs->dropentry, 0);
96652 spin_lock_init(&ipvs->dropentry_lock);
96653diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
96654index eff13c9..c1aab3e 100644
96655--- a/net/netfilter/ipvs/ip_vs_lblc.c
96656+++ b/net/netfilter/ipvs/ip_vs_lblc.c
96657@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
96658 * IPVS LBLC sysctl table
96659 */
96660 #ifdef CONFIG_SYSCTL
96661-static struct ctl_table vs_vars_table[] = {
96662+static ctl_table_no_const vs_vars_table[] __read_only = {
96663 {
96664 .procname = "lblc_expiration",
96665 .data = NULL,
96666diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
96667index 0b85500..8513fa5 100644
96668--- a/net/netfilter/ipvs/ip_vs_lblcr.c
96669+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
96670@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
96671 * IPVS LBLCR sysctl table
96672 */
96673
96674-static struct ctl_table vs_vars_table[] = {
96675+static ctl_table_no_const vs_vars_table[] __read_only = {
96676 {
96677 .procname = "lblcr_expiration",
96678 .data = NULL,
96679diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
96680index f448471..995f131 100644
96681--- a/net/netfilter/ipvs/ip_vs_sync.c
96682+++ b/net/netfilter/ipvs/ip_vs_sync.c
96683@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
96684 cp = cp->control;
96685 if (cp) {
96686 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
96687- pkts = atomic_add_return(1, &cp->in_pkts);
96688+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96689 else
96690 pkts = sysctl_sync_threshold(ipvs);
96691 ip_vs_sync_conn(net, cp->control, pkts);
96692@@ -771,7 +771,7 @@ control:
96693 if (!cp)
96694 return;
96695 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
96696- pkts = atomic_add_return(1, &cp->in_pkts);
96697+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96698 else
96699 pkts = sysctl_sync_threshold(ipvs);
96700 goto sloop;
96701@@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
96702
96703 if (opt)
96704 memcpy(&cp->in_seq, opt, sizeof(*opt));
96705- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
96706+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
96707 cp->state = state;
96708 cp->old_state = cp->state;
96709 /*
96710diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
96711index c47444e..b0961c6 100644
96712--- a/net/netfilter/ipvs/ip_vs_xmit.c
96713+++ b/net/netfilter/ipvs/ip_vs_xmit.c
96714@@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
96715 else
96716 rc = NF_ACCEPT;
96717 /* do not touch skb anymore */
96718- atomic_inc(&cp->in_pkts);
96719+ atomic_inc_unchecked(&cp->in_pkts);
96720 goto out;
96721 }
96722
96723@@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
96724 else
96725 rc = NF_ACCEPT;
96726 /* do not touch skb anymore */
96727- atomic_inc(&cp->in_pkts);
96728+ atomic_inc_unchecked(&cp->in_pkts);
96729 goto out;
96730 }
96731
96732diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
96733index 2d3030a..7ba1c0a 100644
96734--- a/net/netfilter/nf_conntrack_acct.c
96735+++ b/net/netfilter/nf_conntrack_acct.c
96736@@ -60,7 +60,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
96737 #ifdef CONFIG_SYSCTL
96738 static int nf_conntrack_acct_init_sysctl(struct net *net)
96739 {
96740- struct ctl_table *table;
96741+ ctl_table_no_const *table;
96742
96743 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
96744 GFP_KERNEL);
96745diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
96746index 5d892fe..d2fc9d8 100644
96747--- a/net/netfilter/nf_conntrack_core.c
96748+++ b/net/netfilter/nf_conntrack_core.c
96749@@ -1600,6 +1600,10 @@ void nf_conntrack_init_end(void)
96750 #define DYING_NULLS_VAL ((1<<30)+1)
96751 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
96752
96753+#ifdef CONFIG_GRKERNSEC_HIDESYM
96754+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
96755+#endif
96756+
96757 int nf_conntrack_init_net(struct net *net)
96758 {
96759 int ret;
96760@@ -1614,7 +1618,11 @@ int nf_conntrack_init_net(struct net *net)
96761 goto err_stat;
96762 }
96763
96764+#ifdef CONFIG_GRKERNSEC_HIDESYM
96765+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08lx", atomic_inc_return_unchecked(&conntrack_cache_id));
96766+#else
96767 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
96768+#endif
96769 if (!net->ct.slabname) {
96770 ret = -ENOMEM;
96771 goto err_slabname;
96772diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
96773index 1df1761..ce8b88a 100644
96774--- a/net/netfilter/nf_conntrack_ecache.c
96775+++ b/net/netfilter/nf_conntrack_ecache.c
96776@@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
96777 #ifdef CONFIG_SYSCTL
96778 static int nf_conntrack_event_init_sysctl(struct net *net)
96779 {
96780- struct ctl_table *table;
96781+ ctl_table_no_const *table;
96782
96783 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
96784 GFP_KERNEL);
96785diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
96786index 974a2a4..52cc6ff 100644
96787--- a/net/netfilter/nf_conntrack_helper.c
96788+++ b/net/netfilter/nf_conntrack_helper.c
96789@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
96790
96791 static int nf_conntrack_helper_init_sysctl(struct net *net)
96792 {
96793- struct ctl_table *table;
96794+ ctl_table_no_const *table;
96795
96796 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
96797 GFP_KERNEL);
96798diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
96799index ce30041..3861b5d 100644
96800--- a/net/netfilter/nf_conntrack_proto.c
96801+++ b/net/netfilter/nf_conntrack_proto.c
96802@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
96803
96804 static void
96805 nf_ct_unregister_sysctl(struct ctl_table_header **header,
96806- struct ctl_table **table,
96807+ ctl_table_no_const **table,
96808 unsigned int users)
96809 {
96810 if (users > 0)
96811diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
96812index a99b6c3..cb372f9 100644
96813--- a/net/netfilter/nf_conntrack_proto_dccp.c
96814+++ b/net/netfilter/nf_conntrack_proto_dccp.c
96815@@ -428,7 +428,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
96816 const char *msg;
96817 u_int8_t state;
96818
96819- dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96820+ dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96821 BUG_ON(dh == NULL);
96822
96823 state = dccp_state_table[CT_DCCP_ROLE_CLIENT][dh->dccph_type][CT_DCCP_NONE];
96824@@ -457,7 +457,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
96825 out_invalid:
96826 if (LOG_INVALID(net, IPPROTO_DCCP))
96827 nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL,
96828- NULL, msg);
96829+ NULL, "%s", msg);
96830 return false;
96831 }
96832
96833@@ -486,7 +486,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
96834 u_int8_t type, old_state, new_state;
96835 enum ct_dccp_roles role;
96836
96837- dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96838+ dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96839 BUG_ON(dh == NULL);
96840 type = dh->dccph_type;
96841
96842@@ -577,7 +577,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
96843 unsigned int cscov;
96844 const char *msg;
96845
96846- dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96847+ dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96848 if (dh == NULL) {
96849 msg = "nf_ct_dccp: short packet ";
96850 goto out_invalid;
96851@@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
96852
96853 out_invalid:
96854 if (LOG_INVALID(net, IPPROTO_DCCP))
96855- nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, msg);
96856+ nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, "%s", msg);
96857 return -NF_ACCEPT;
96858 }
96859
96860diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
96861index f641751..d3c5b51 100644
96862--- a/net/netfilter/nf_conntrack_standalone.c
96863+++ b/net/netfilter/nf_conntrack_standalone.c
96864@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
96865
96866 static int nf_conntrack_standalone_init_sysctl(struct net *net)
96867 {
96868- struct ctl_table *table;
96869+ ctl_table_no_const *table;
96870
96871 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
96872 GFP_KERNEL);
96873diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
96874index 902fb0a..87f7fdb 100644
96875--- a/net/netfilter/nf_conntrack_timestamp.c
96876+++ b/net/netfilter/nf_conntrack_timestamp.c
96877@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
96878 #ifdef CONFIG_SYSCTL
96879 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
96880 {
96881- struct ctl_table *table;
96882+ ctl_table_no_const *table;
96883
96884 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
96885 GFP_KERNEL);
96886diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
96887index 85296d4..8becdec 100644
96888--- a/net/netfilter/nf_log.c
96889+++ b/net/netfilter/nf_log.c
96890@@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
96891
96892 #ifdef CONFIG_SYSCTL
96893 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
96894-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
96895+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
96896
96897 static int nf_log_proc_dostring(struct ctl_table *table, int write,
96898 void __user *buffer, size_t *lenp, loff_t *ppos)
96899@@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
96900 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
96901 mutex_unlock(&nf_log_mutex);
96902 } else {
96903+ ctl_table_no_const nf_log_table = *table;
96904+
96905 mutex_lock(&nf_log_mutex);
96906 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
96907 lockdep_is_held(&nf_log_mutex));
96908 if (!logger)
96909- table->data = "NONE";
96910+ nf_log_table.data = "NONE";
96911 else
96912- table->data = logger->name;
96913- r = proc_dostring(table, write, buffer, lenp, ppos);
96914+ nf_log_table.data = logger->name;
96915+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
96916 mutex_unlock(&nf_log_mutex);
96917 }
96918
96919diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
96920index f042ae5..30ea486 100644
96921--- a/net/netfilter/nf_sockopt.c
96922+++ b/net/netfilter/nf_sockopt.c
96923@@ -45,7 +45,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
96924 }
96925 }
96926
96927- list_add(&reg->list, &nf_sockopts);
96928+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
96929 out:
96930 mutex_unlock(&nf_sockopt_mutex);
96931 return ret;
96932@@ -55,7 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
96933 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
96934 {
96935 mutex_lock(&nf_sockopt_mutex);
96936- list_del(&reg->list);
96937+ pax_list_del((struct list_head *)&reg->list);
96938 mutex_unlock(&nf_sockopt_mutex);
96939 }
96940 EXPORT_SYMBOL(nf_unregister_sockopt);
96941diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
96942index d92cc31..e46f350 100644
96943--- a/net/netfilter/nfnetlink_log.c
96944+++ b/net/netfilter/nfnetlink_log.c
96945@@ -82,7 +82,7 @@ static int nfnl_log_net_id __read_mostly;
96946 struct nfnl_log_net {
96947 spinlock_t instances_lock;
96948 struct hlist_head instance_table[INSTANCE_BUCKETS];
96949- atomic_t global_seq;
96950+ atomic_unchecked_t global_seq;
96951 };
96952
96953 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
96954@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
96955 /* global sequence number */
96956 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
96957 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
96958- htonl(atomic_inc_return(&log->global_seq))))
96959+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
96960 goto nla_put_failure;
96961
96962 if (data_len) {
96963diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
96964new file mode 100644
96965index 0000000..c566332
96966--- /dev/null
96967+++ b/net/netfilter/xt_gradm.c
96968@@ -0,0 +1,51 @@
96969+/*
96970+ * gradm match for netfilter
96971