]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.0-3.12.7-201401091837.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-201401091837.patch
CommitLineData
6cc54bec
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/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
42940index 545c04c..a14bded 100644
42941--- a/drivers/media/radio/radio-cadet.c
42942+++ b/drivers/media/radio/radio-cadet.c
42943@@ -324,6 +324,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
42944 unsigned char readbuf[RDS_BUFFER];
42945 int i = 0;
42946
42947+ if (count > RDS_BUFFER)
42948+ return -EFAULT;
42949 mutex_lock(&dev->lock);
42950 if (dev->rdsstat == 0)
42951 cadet_start_rds(dev);
42952@@ -339,7 +341,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
42953 while (i < count && dev->rdsin != dev->rdsout)
42954 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
42955
42956- if (i && copy_to_user(data, readbuf, i))
42957+ if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
42958 i = -EFAULT;
42959 unlock:
42960 mutex_unlock(&dev->lock);
42961diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
42962index 5236035..c622c74 100644
42963--- a/drivers/media/radio/radio-maxiradio.c
42964+++ b/drivers/media/radio/radio-maxiradio.c
42965@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
42966 /* TEA5757 pin mappings */
42967 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
42968
42969-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
42970+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
42971
42972 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
42973 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
42974diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
42975index b914772..7ddbf9b 100644
42976--- a/drivers/media/radio/radio-shark.c
42977+++ b/drivers/media/radio/radio-shark.c
42978@@ -79,7 +79,7 @@ struct shark_device {
42979 u32 last_val;
42980 };
42981
42982-static atomic_t shark_instance = ATOMIC_INIT(0);
42983+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
42984
42985 static void shark_write_val(struct snd_tea575x *tea, u32 val)
42986 {
42987diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
42988index 9fb6697..f167415 100644
42989--- a/drivers/media/radio/radio-shark2.c
42990+++ b/drivers/media/radio/radio-shark2.c
42991@@ -74,7 +74,7 @@ struct shark_device {
42992 u8 *transfer_buffer;
42993 };
42994
42995-static atomic_t shark_instance = ATOMIC_INIT(0);
42996+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
42997
42998 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
42999 {
43000diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
43001index 9c9084c..a9e8dfb 100644
43002--- a/drivers/media/radio/radio-si476x.c
43003+++ b/drivers/media/radio/radio-si476x.c
43004@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
43005 struct si476x_radio *radio;
43006 struct v4l2_ctrl *ctrl;
43007
43008- static atomic_t instance = ATOMIC_INIT(0);
43009+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
43010
43011 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
43012 if (!radio)
43013diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
43014index 46da365..3ba4206 100644
43015--- a/drivers/media/rc/rc-main.c
43016+++ b/drivers/media/rc/rc-main.c
43017@@ -1065,7 +1065,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
43018 int rc_register_device(struct rc_dev *dev)
43019 {
43020 static bool raw_init = false; /* raw decoders loaded? */
43021- static atomic_t devno = ATOMIC_INIT(0);
43022+ static atomic_unchecked_t devno = ATOMIC_INIT(0);
43023 struct rc_map *rc_map;
43024 const char *path;
43025 int rc;
43026@@ -1096,7 +1096,7 @@ int rc_register_device(struct rc_dev *dev)
43027 */
43028 mutex_lock(&dev->lock);
43029
43030- dev->devno = (unsigned long)(atomic_inc_return(&devno) - 1);
43031+ dev->devno = (unsigned long)(atomic_inc_return_unchecked(&devno) - 1);
43032 dev_set_name(&dev->dev, "rc%ld", dev->devno);
43033 dev_set_drvdata(&dev->dev, dev);
43034 rc = device_add(&dev->dev);
43035diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
43036index 20e345d..da56fe4 100644
43037--- a/drivers/media/usb/dvb-usb/cxusb.c
43038+++ b/drivers/media/usb/dvb-usb/cxusb.c
43039@@ -1101,7 +1101,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
43040
43041 struct dib0700_adapter_state {
43042 int (*set_param_save) (struct dvb_frontend *);
43043-};
43044+} __no_const;
43045
43046 static int dib7070_set_param_override(struct dvb_frontend *fe)
43047 {
43048diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
43049index 71b22f5..a63b33f 100644
43050--- a/drivers/media/usb/dvb-usb/dw2102.c
43051+++ b/drivers/media/usb/dvb-usb/dw2102.c
43052@@ -121,7 +121,7 @@ struct su3000_state {
43053
43054 struct s6x0_state {
43055 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
43056-};
43057+} __no_const;
43058
43059 /* debug */
43060 static int dvb_usb_dw2102_debug;
43061diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43062index 8f7a6a4..59502dd 100644
43063--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43064+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
43065@@ -326,7 +326,7 @@ struct v4l2_buffer32 {
43066 __u32 reserved;
43067 };
43068
43069-static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43070+static int get_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
43071 enum v4l2_memory memory)
43072 {
43073 void __user *up_pln;
43074@@ -355,7 +355,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43075 return 0;
43076 }
43077
43078-static int put_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
43079+static int put_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
43080 enum v4l2_memory memory)
43081 {
43082 if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
43083@@ -772,7 +772,7 @@ static int put_v4l2_subdev_edid32(struct v4l2_subdev_edid *kp, struct v4l2_subde
43084 put_user(kp->start_block, &up->start_block) ||
43085 put_user(kp->blocks, &up->blocks) ||
43086 put_user(tmp, &up->edid) ||
43087- copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
43088+ copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
43089 return -EFAULT;
43090 return 0;
43091 }
43092diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
43093index 02d1b63..5fd6b16 100644
43094--- a/drivers/media/v4l2-core/v4l2-device.c
43095+++ b/drivers/media/v4l2-core/v4l2-device.c
43096@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
43097 EXPORT_SYMBOL_GPL(v4l2_device_put);
43098
43099 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
43100- atomic_t *instance)
43101+ atomic_unchecked_t *instance)
43102 {
43103- int num = atomic_inc_return(instance) - 1;
43104+ int num = atomic_inc_return_unchecked(instance) - 1;
43105 int len = strlen(basename);
43106
43107 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
43108diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
43109index 68e6b5e..d8b923e 100644
43110--- a/drivers/media/v4l2-core/v4l2-ioctl.c
43111+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
43112@@ -1939,7 +1939,8 @@ struct v4l2_ioctl_info {
43113 struct file *file, void *fh, void *p);
43114 } u;
43115 void (*debug)(const void *arg, bool write_only);
43116-};
43117+} __do_const;
43118+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
43119
43120 /* This control needs a priority check */
43121 #define INFO_FL_PRIO (1 << 0)
43122@@ -2120,7 +2121,7 @@ static long __video_do_ioctl(struct file *file,
43123 struct video_device *vfd = video_devdata(file);
43124 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
43125 bool write_only = false;
43126- struct v4l2_ioctl_info default_info;
43127+ v4l2_ioctl_info_no_const default_info;
43128 const struct v4l2_ioctl_info *info;
43129 void *fh = file->private_data;
43130 struct v4l2_fh *vfh = NULL;
43131@@ -2194,7 +2195,7 @@ done:
43132 }
43133
43134 static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43135- void * __user *user_ptr, void ***kernel_ptr)
43136+ void __user **user_ptr, void ***kernel_ptr)
43137 {
43138 int ret = 0;
43139
43140@@ -2210,7 +2211,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43141 ret = -EINVAL;
43142 break;
43143 }
43144- *user_ptr = (void __user *)buf->m.planes;
43145+ *user_ptr = (void __force_user *)buf->m.planes;
43146 *kernel_ptr = (void *)&buf->m.planes;
43147 *array_size = sizeof(struct v4l2_plane) * buf->length;
43148 ret = 1;
43149@@ -2245,7 +2246,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
43150 ret = -EINVAL;
43151 break;
43152 }
43153- *user_ptr = (void __user *)ctrls->controls;
43154+ *user_ptr = (void __force_user *)ctrls->controls;
43155 *kernel_ptr = (void *)&ctrls->controls;
43156 *array_size = sizeof(struct v4l2_ext_control)
43157 * ctrls->count;
43158diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
43159index 767ff4d..c69d259 100644
43160--- a/drivers/message/fusion/mptbase.c
43161+++ b/drivers/message/fusion/mptbase.c
43162@@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
43163 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
43164 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
43165
43166+#ifdef CONFIG_GRKERNSEC_HIDESYM
43167+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
43168+#else
43169 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
43170 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
43171+#endif
43172+
43173 /*
43174 * Rounding UP to nearest 4-kB boundary here...
43175 */
43176@@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
43177 ioc->facts.GlobalCredits);
43178
43179 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
43180+#ifdef CONFIG_GRKERNSEC_HIDESYM
43181+ NULL, NULL);
43182+#else
43183 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
43184+#endif
43185 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
43186 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
43187 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
43188diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
43189index dd239bd..689c4f7 100644
43190--- a/drivers/message/fusion/mptsas.c
43191+++ b/drivers/message/fusion/mptsas.c
43192@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
43193 return 0;
43194 }
43195
43196+static inline void
43197+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
43198+{
43199+ if (phy_info->port_details) {
43200+ phy_info->port_details->rphy = rphy;
43201+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
43202+ ioc->name, rphy));
43203+ }
43204+
43205+ if (rphy) {
43206+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
43207+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
43208+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
43209+ ioc->name, rphy, rphy->dev.release));
43210+ }
43211+}
43212+
43213 /* no mutex */
43214 static void
43215 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
43216@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
43217 return NULL;
43218 }
43219
43220-static inline void
43221-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
43222-{
43223- if (phy_info->port_details) {
43224- phy_info->port_details->rphy = rphy;
43225- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
43226- ioc->name, rphy));
43227- }
43228-
43229- if (rphy) {
43230- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
43231- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
43232- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
43233- ioc->name, rphy, rphy->dev.release));
43234- }
43235-}
43236-
43237 static inline struct sas_port *
43238 mptsas_get_port(struct mptsas_phyinfo *phy_info)
43239 {
43240diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
43241index 727819c..ad74694 100644
43242--- a/drivers/message/fusion/mptscsih.c
43243+++ b/drivers/message/fusion/mptscsih.c
43244@@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
43245
43246 h = shost_priv(SChost);
43247
43248- if (h) {
43249- if (h->info_kbuf == NULL)
43250- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
43251- return h->info_kbuf;
43252- h->info_kbuf[0] = '\0';
43253+ if (!h)
43254+ return NULL;
43255
43256- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
43257- h->info_kbuf[size-1] = '\0';
43258- }
43259+ if (h->info_kbuf == NULL)
43260+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
43261+ return h->info_kbuf;
43262+ h->info_kbuf[0] = '\0';
43263+
43264+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
43265+ h->info_kbuf[size-1] = '\0';
43266
43267 return h->info_kbuf;
43268 }
43269diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
43270index b7d87cd..3fb36da 100644
43271--- a/drivers/message/i2o/i2o_proc.c
43272+++ b/drivers/message/i2o/i2o_proc.c
43273@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
43274 "Array Controller Device"
43275 };
43276
43277-static char *chtostr(char *tmp, u8 *chars, int n)
43278-{
43279- tmp[0] = 0;
43280- return strncat(tmp, (char *)chars, n);
43281-}
43282-
43283 static int i2o_report_query_status(struct seq_file *seq, int block_status,
43284 char *group)
43285 {
43286@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
43287 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
43288 {
43289 struct i2o_controller *c = (struct i2o_controller *)seq->private;
43290- static u32 work32[5];
43291- static u8 *work8 = (u8 *) work32;
43292- static u16 *work16 = (u16 *) work32;
43293+ u32 work32[5];
43294+ u8 *work8 = (u8 *) work32;
43295+ u16 *work16 = (u16 *) work32;
43296 int token;
43297 u32 hwcap;
43298
43299@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
43300 } *result;
43301
43302 i2o_exec_execute_ddm_table ddm_table;
43303- char tmp[28 + 1];
43304
43305 result = kmalloc(sizeof(*result), GFP_KERNEL);
43306 if (!result)
43307@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
43308
43309 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
43310 seq_printf(seq, "%-#8x", ddm_table.module_id);
43311- seq_printf(seq, "%-29s",
43312- chtostr(tmp, ddm_table.module_name_version, 28));
43313+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
43314 seq_printf(seq, "%9d ", ddm_table.data_size);
43315 seq_printf(seq, "%8d", ddm_table.code_size);
43316
43317@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
43318
43319 i2o_driver_result_table *result;
43320 i2o_driver_store_table *dst;
43321- char tmp[28 + 1];
43322
43323 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
43324 if (result == NULL)
43325@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
43326
43327 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
43328 seq_printf(seq, "%-#8x", dst->module_id);
43329- seq_printf(seq, "%-29s",
43330- chtostr(tmp, dst->module_name_version, 28));
43331- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
43332+ seq_printf(seq, "%-.28s", dst->module_name_version);
43333+ seq_printf(seq, "%-.8s", dst->date);
43334 seq_printf(seq, "%8d ", dst->module_size);
43335 seq_printf(seq, "%8d ", dst->mpb_size);
43336 seq_printf(seq, "0x%04x", dst->module_flags);
43337@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
43338 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
43339 {
43340 struct i2o_device *d = (struct i2o_device *)seq->private;
43341- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
43342+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
43343 // == (allow) 512d bytes (max)
43344- static u16 *work16 = (u16 *) work32;
43345+ u16 *work16 = (u16 *) work32;
43346 int token;
43347- char tmp[16 + 1];
43348
43349 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
43350
43351@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
43352 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
43353 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
43354 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
43355- seq_printf(seq, "Vendor info : %s\n",
43356- chtostr(tmp, (u8 *) (work32 + 2), 16));
43357- seq_printf(seq, "Product info : %s\n",
43358- chtostr(tmp, (u8 *) (work32 + 6), 16));
43359- seq_printf(seq, "Description : %s\n",
43360- chtostr(tmp, (u8 *) (work32 + 10), 16));
43361- seq_printf(seq, "Product rev. : %s\n",
43362- chtostr(tmp, (u8 *) (work32 + 14), 8));
43363+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
43364+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
43365+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
43366+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
43367
43368 seq_printf(seq, "Serial number : ");
43369 print_serial_number(seq, (u8 *) (work32 + 16),
43370@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
43371 u8 pad[256]; // allow up to 256 byte (max) serial number
43372 } result;
43373
43374- char tmp[24 + 1];
43375-
43376 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
43377
43378 if (token < 0) {
43379@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
43380 }
43381
43382 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
43383- seq_printf(seq, "Module name : %s\n",
43384- chtostr(tmp, result.module_name, 24));
43385- seq_printf(seq, "Module revision : %s\n",
43386- chtostr(tmp, result.module_rev, 8));
43387+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
43388+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
43389
43390 seq_printf(seq, "Serial number : ");
43391 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
43392@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43393 u8 instance_number[4];
43394 } result;
43395
43396- char tmp[64 + 1];
43397-
43398 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
43399
43400 if (token < 0) {
43401@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43402 return 0;
43403 }
43404
43405- seq_printf(seq, "Device name : %s\n",
43406- chtostr(tmp, result.device_name, 64));
43407- seq_printf(seq, "Service name : %s\n",
43408- chtostr(tmp, result.service_name, 64));
43409- seq_printf(seq, "Physical name : %s\n",
43410- chtostr(tmp, result.physical_location, 64));
43411- seq_printf(seq, "Instance number : %s\n",
43412- chtostr(tmp, result.instance_number, 4));
43413+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
43414+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
43415+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
43416+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
43417
43418 return 0;
43419 }
43420@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
43421 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
43422 {
43423 struct i2o_device *d = (struct i2o_device *)seq->private;
43424- static u32 work32[12];
43425- static u16 *work16 = (u16 *) work32;
43426- static u8 *work8 = (u8 *) work32;
43427+ u32 work32[12];
43428+ u16 *work16 = (u16 *) work32;
43429+ u8 *work8 = (u8 *) work32;
43430 int token;
43431
43432 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
43433diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
43434index a8c08f3..155fe3d 100644
43435--- a/drivers/message/i2o/iop.c
43436+++ b/drivers/message/i2o/iop.c
43437@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
43438
43439 spin_lock_irqsave(&c->context_list_lock, flags);
43440
43441- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
43442- atomic_inc(&c->context_list_counter);
43443+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
43444+ atomic_inc_unchecked(&c->context_list_counter);
43445
43446- entry->context = atomic_read(&c->context_list_counter);
43447+ entry->context = atomic_read_unchecked(&c->context_list_counter);
43448
43449 list_add(&entry->list, &c->context_list);
43450
43451@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
43452
43453 #if BITS_PER_LONG == 64
43454 spin_lock_init(&c->context_list_lock);
43455- atomic_set(&c->context_list_counter, 0);
43456+ atomic_set_unchecked(&c->context_list_counter, 0);
43457 INIT_LIST_HEAD(&c->context_list);
43458 #endif
43459
43460diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
43461index fcbb2e9..2635e11 100644
43462--- a/drivers/mfd/janz-cmodio.c
43463+++ b/drivers/mfd/janz-cmodio.c
43464@@ -13,6 +13,7 @@
43465
43466 #include <linux/kernel.h>
43467 #include <linux/module.h>
43468+#include <linux/slab.h>
43469 #include <linux/init.h>
43470 #include <linux/pci.h>
43471 #include <linux/interrupt.h>
43472diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
43473index de7fb80..7c1b931 100644
43474--- a/drivers/mfd/max8925-i2c.c
43475+++ b/drivers/mfd/max8925-i2c.c
43476@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
43477 const struct i2c_device_id *id)
43478 {
43479 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
43480- static struct max8925_chip *chip;
43481+ struct max8925_chip *chip;
43482 struct device_node *node = client->dev.of_node;
43483
43484 if (node && !pdata) {
43485diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
43486index d792772..cd73ba3 100644
43487--- a/drivers/mfd/tps65910.c
43488+++ b/drivers/mfd/tps65910.c
43489@@ -229,7 +229,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
43490 struct tps65910_platform_data *pdata)
43491 {
43492 int ret = 0;
43493- static struct regmap_irq_chip *tps6591x_irqs_chip;
43494+ struct regmap_irq_chip *tps6591x_irqs_chip;
43495
43496 if (!irq) {
43497 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
43498diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
43499index 9aa6d1e..1631bfc 100644
43500--- a/drivers/mfd/twl4030-irq.c
43501+++ b/drivers/mfd/twl4030-irq.c
43502@@ -35,6 +35,7 @@
43503 #include <linux/of.h>
43504 #include <linux/irqdomain.h>
43505 #include <linux/i2c/twl.h>
43506+#include <asm/pgtable.h>
43507
43508 #include "twl-core.h"
43509
43510@@ -726,10 +727,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
43511 * Install an irq handler for each of the SIH modules;
43512 * clone dummy irq_chip since PIH can't *do* anything
43513 */
43514- twl4030_irq_chip = dummy_irq_chip;
43515- twl4030_irq_chip.name = "twl4030";
43516+ pax_open_kernel();
43517+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
43518+ *(const char **)&twl4030_irq_chip.name = "twl4030";
43519
43520- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
43521+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
43522+ pax_close_kernel();
43523
43524 for (i = irq_base; i < irq_end; i++) {
43525 irq_set_chip_and_handler(i, &twl4030_irq_chip,
43526diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
43527index 464419b..64bae8d 100644
43528--- a/drivers/misc/c2port/core.c
43529+++ b/drivers/misc/c2port/core.c
43530@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
43531 goto error_idr_alloc;
43532 c2dev->id = ret;
43533
43534- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
43535+ pax_open_kernel();
43536+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
43537+ pax_close_kernel();
43538
43539 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
43540 "c2port%d", c2dev->id);
43541diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
43542index 36f5d52..32311c3 100644
43543--- a/drivers/misc/kgdbts.c
43544+++ b/drivers/misc/kgdbts.c
43545@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
43546 char before[BREAK_INSTR_SIZE];
43547 char after[BREAK_INSTR_SIZE];
43548
43549- probe_kernel_read(before, (char *)kgdbts_break_test,
43550+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
43551 BREAK_INSTR_SIZE);
43552 init_simple_test();
43553 ts.tst = plant_and_detach_test;
43554@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
43555 /* Activate test with initial breakpoint */
43556 if (!is_early)
43557 kgdb_breakpoint();
43558- probe_kernel_read(after, (char *)kgdbts_break_test,
43559+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
43560 BREAK_INSTR_SIZE);
43561 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
43562 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
43563diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
43564index 036effe..b3a6336 100644
43565--- a/drivers/misc/lis3lv02d/lis3lv02d.c
43566+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
43567@@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
43568 * the lid is closed. This leads to interrupts as soon as a little move
43569 * is done.
43570 */
43571- atomic_inc(&lis3->count);
43572+ atomic_inc_unchecked(&lis3->count);
43573
43574 wake_up_interruptible(&lis3->misc_wait);
43575 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
43576@@ -584,7 +584,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
43577 if (lis3->pm_dev)
43578 pm_runtime_get_sync(lis3->pm_dev);
43579
43580- atomic_set(&lis3->count, 0);
43581+ atomic_set_unchecked(&lis3->count, 0);
43582 return 0;
43583 }
43584
43585@@ -616,7 +616,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
43586 add_wait_queue(&lis3->misc_wait, &wait);
43587 while (true) {
43588 set_current_state(TASK_INTERRUPTIBLE);
43589- data = atomic_xchg(&lis3->count, 0);
43590+ data = atomic_xchg_unchecked(&lis3->count, 0);
43591 if (data)
43592 break;
43593
43594@@ -657,7 +657,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
43595 struct lis3lv02d, miscdev);
43596
43597 poll_wait(file, &lis3->misc_wait, wait);
43598- if (atomic_read(&lis3->count))
43599+ if (atomic_read_unchecked(&lis3->count))
43600 return POLLIN | POLLRDNORM;
43601 return 0;
43602 }
43603diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
43604index c439c82..1f20f57 100644
43605--- a/drivers/misc/lis3lv02d/lis3lv02d.h
43606+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
43607@@ -297,7 +297,7 @@ struct lis3lv02d {
43608 struct input_polled_dev *idev; /* input device */
43609 struct platform_device *pdev; /* platform device */
43610 struct regulator_bulk_data regulators[2];
43611- atomic_t count; /* interrupt count after last read */
43612+ atomic_unchecked_t count; /* interrupt count after last read */
43613 union axis_conversion ac; /* hw -> logical axis */
43614 int mapped_btns[3];
43615
43616diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
43617index 2f30bad..c4c13d0 100644
43618--- a/drivers/misc/sgi-gru/gruhandles.c
43619+++ b/drivers/misc/sgi-gru/gruhandles.c
43620@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
43621 unsigned long nsec;
43622
43623 nsec = CLKS2NSEC(clks);
43624- atomic_long_inc(&mcs_op_statistics[op].count);
43625- atomic_long_add(nsec, &mcs_op_statistics[op].total);
43626+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
43627+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
43628 if (mcs_op_statistics[op].max < nsec)
43629 mcs_op_statistics[op].max = nsec;
43630 }
43631diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
43632index 4f76359..cdfcb2e 100644
43633--- a/drivers/misc/sgi-gru/gruprocfs.c
43634+++ b/drivers/misc/sgi-gru/gruprocfs.c
43635@@ -32,9 +32,9 @@
43636
43637 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
43638
43639-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
43640+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
43641 {
43642- unsigned long val = atomic_long_read(v);
43643+ unsigned long val = atomic_long_read_unchecked(v);
43644
43645 seq_printf(s, "%16lu %s\n", val, id);
43646 }
43647@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
43648
43649 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
43650 for (op = 0; op < mcsop_last; op++) {
43651- count = atomic_long_read(&mcs_op_statistics[op].count);
43652- total = atomic_long_read(&mcs_op_statistics[op].total);
43653+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
43654+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
43655 max = mcs_op_statistics[op].max;
43656 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
43657 count ? total / count : 0, max);
43658diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
43659index 5c3ce24..4915ccb 100644
43660--- a/drivers/misc/sgi-gru/grutables.h
43661+++ b/drivers/misc/sgi-gru/grutables.h
43662@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
43663 * GRU statistics.
43664 */
43665 struct gru_stats_s {
43666- atomic_long_t vdata_alloc;
43667- atomic_long_t vdata_free;
43668- atomic_long_t gts_alloc;
43669- atomic_long_t gts_free;
43670- atomic_long_t gms_alloc;
43671- atomic_long_t gms_free;
43672- atomic_long_t gts_double_allocate;
43673- atomic_long_t assign_context;
43674- atomic_long_t assign_context_failed;
43675- atomic_long_t free_context;
43676- atomic_long_t load_user_context;
43677- atomic_long_t load_kernel_context;
43678- atomic_long_t lock_kernel_context;
43679- atomic_long_t unlock_kernel_context;
43680- atomic_long_t steal_user_context;
43681- atomic_long_t steal_kernel_context;
43682- atomic_long_t steal_context_failed;
43683- atomic_long_t nopfn;
43684- atomic_long_t asid_new;
43685- atomic_long_t asid_next;
43686- atomic_long_t asid_wrap;
43687- atomic_long_t asid_reuse;
43688- atomic_long_t intr;
43689- atomic_long_t intr_cbr;
43690- atomic_long_t intr_tfh;
43691- atomic_long_t intr_spurious;
43692- atomic_long_t intr_mm_lock_failed;
43693- atomic_long_t call_os;
43694- atomic_long_t call_os_wait_queue;
43695- atomic_long_t user_flush_tlb;
43696- atomic_long_t user_unload_context;
43697- atomic_long_t user_exception;
43698- atomic_long_t set_context_option;
43699- atomic_long_t check_context_retarget_intr;
43700- atomic_long_t check_context_unload;
43701- atomic_long_t tlb_dropin;
43702- atomic_long_t tlb_preload_page;
43703- atomic_long_t tlb_dropin_fail_no_asid;
43704- atomic_long_t tlb_dropin_fail_upm;
43705- atomic_long_t tlb_dropin_fail_invalid;
43706- atomic_long_t tlb_dropin_fail_range_active;
43707- atomic_long_t tlb_dropin_fail_idle;
43708- atomic_long_t tlb_dropin_fail_fmm;
43709- atomic_long_t tlb_dropin_fail_no_exception;
43710- atomic_long_t tfh_stale_on_fault;
43711- atomic_long_t mmu_invalidate_range;
43712- atomic_long_t mmu_invalidate_page;
43713- atomic_long_t flush_tlb;
43714- atomic_long_t flush_tlb_gru;
43715- atomic_long_t flush_tlb_gru_tgh;
43716- atomic_long_t flush_tlb_gru_zero_asid;
43717+ atomic_long_unchecked_t vdata_alloc;
43718+ atomic_long_unchecked_t vdata_free;
43719+ atomic_long_unchecked_t gts_alloc;
43720+ atomic_long_unchecked_t gts_free;
43721+ atomic_long_unchecked_t gms_alloc;
43722+ atomic_long_unchecked_t gms_free;
43723+ atomic_long_unchecked_t gts_double_allocate;
43724+ atomic_long_unchecked_t assign_context;
43725+ atomic_long_unchecked_t assign_context_failed;
43726+ atomic_long_unchecked_t free_context;
43727+ atomic_long_unchecked_t load_user_context;
43728+ atomic_long_unchecked_t load_kernel_context;
43729+ atomic_long_unchecked_t lock_kernel_context;
43730+ atomic_long_unchecked_t unlock_kernel_context;
43731+ atomic_long_unchecked_t steal_user_context;
43732+ atomic_long_unchecked_t steal_kernel_context;
43733+ atomic_long_unchecked_t steal_context_failed;
43734+ atomic_long_unchecked_t nopfn;
43735+ atomic_long_unchecked_t asid_new;
43736+ atomic_long_unchecked_t asid_next;
43737+ atomic_long_unchecked_t asid_wrap;
43738+ atomic_long_unchecked_t asid_reuse;
43739+ atomic_long_unchecked_t intr;
43740+ atomic_long_unchecked_t intr_cbr;
43741+ atomic_long_unchecked_t intr_tfh;
43742+ atomic_long_unchecked_t intr_spurious;
43743+ atomic_long_unchecked_t intr_mm_lock_failed;
43744+ atomic_long_unchecked_t call_os;
43745+ atomic_long_unchecked_t call_os_wait_queue;
43746+ atomic_long_unchecked_t user_flush_tlb;
43747+ atomic_long_unchecked_t user_unload_context;
43748+ atomic_long_unchecked_t user_exception;
43749+ atomic_long_unchecked_t set_context_option;
43750+ atomic_long_unchecked_t check_context_retarget_intr;
43751+ atomic_long_unchecked_t check_context_unload;
43752+ atomic_long_unchecked_t tlb_dropin;
43753+ atomic_long_unchecked_t tlb_preload_page;
43754+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
43755+ atomic_long_unchecked_t tlb_dropin_fail_upm;
43756+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
43757+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
43758+ atomic_long_unchecked_t tlb_dropin_fail_idle;
43759+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
43760+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
43761+ atomic_long_unchecked_t tfh_stale_on_fault;
43762+ atomic_long_unchecked_t mmu_invalidate_range;
43763+ atomic_long_unchecked_t mmu_invalidate_page;
43764+ atomic_long_unchecked_t flush_tlb;
43765+ atomic_long_unchecked_t flush_tlb_gru;
43766+ atomic_long_unchecked_t flush_tlb_gru_tgh;
43767+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
43768
43769- atomic_long_t copy_gpa;
43770- atomic_long_t read_gpa;
43771+ atomic_long_unchecked_t copy_gpa;
43772+ atomic_long_unchecked_t read_gpa;
43773
43774- atomic_long_t mesq_receive;
43775- atomic_long_t mesq_receive_none;
43776- atomic_long_t mesq_send;
43777- atomic_long_t mesq_send_failed;
43778- atomic_long_t mesq_noop;
43779- atomic_long_t mesq_send_unexpected_error;
43780- atomic_long_t mesq_send_lb_overflow;
43781- atomic_long_t mesq_send_qlimit_reached;
43782- atomic_long_t mesq_send_amo_nacked;
43783- atomic_long_t mesq_send_put_nacked;
43784- atomic_long_t mesq_page_overflow;
43785- atomic_long_t mesq_qf_locked;
43786- atomic_long_t mesq_qf_noop_not_full;
43787- atomic_long_t mesq_qf_switch_head_failed;
43788- atomic_long_t mesq_qf_unexpected_error;
43789- atomic_long_t mesq_noop_unexpected_error;
43790- atomic_long_t mesq_noop_lb_overflow;
43791- atomic_long_t mesq_noop_qlimit_reached;
43792- atomic_long_t mesq_noop_amo_nacked;
43793- atomic_long_t mesq_noop_put_nacked;
43794- atomic_long_t mesq_noop_page_overflow;
43795+ atomic_long_unchecked_t mesq_receive;
43796+ atomic_long_unchecked_t mesq_receive_none;
43797+ atomic_long_unchecked_t mesq_send;
43798+ atomic_long_unchecked_t mesq_send_failed;
43799+ atomic_long_unchecked_t mesq_noop;
43800+ atomic_long_unchecked_t mesq_send_unexpected_error;
43801+ atomic_long_unchecked_t mesq_send_lb_overflow;
43802+ atomic_long_unchecked_t mesq_send_qlimit_reached;
43803+ atomic_long_unchecked_t mesq_send_amo_nacked;
43804+ atomic_long_unchecked_t mesq_send_put_nacked;
43805+ atomic_long_unchecked_t mesq_page_overflow;
43806+ atomic_long_unchecked_t mesq_qf_locked;
43807+ atomic_long_unchecked_t mesq_qf_noop_not_full;
43808+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
43809+ atomic_long_unchecked_t mesq_qf_unexpected_error;
43810+ atomic_long_unchecked_t mesq_noop_unexpected_error;
43811+ atomic_long_unchecked_t mesq_noop_lb_overflow;
43812+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
43813+ atomic_long_unchecked_t mesq_noop_amo_nacked;
43814+ atomic_long_unchecked_t mesq_noop_put_nacked;
43815+ atomic_long_unchecked_t mesq_noop_page_overflow;
43816
43817 };
43818
43819@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
43820 tghop_invalidate, mcsop_last};
43821
43822 struct mcs_op_statistic {
43823- atomic_long_t count;
43824- atomic_long_t total;
43825+ atomic_long_unchecked_t count;
43826+ atomic_long_unchecked_t total;
43827 unsigned long max;
43828 };
43829
43830@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
43831
43832 #define STAT(id) do { \
43833 if (gru_options & OPT_STATS) \
43834- atomic_long_inc(&gru_stats.id); \
43835+ atomic_long_inc_unchecked(&gru_stats.id); \
43836 } while (0)
43837
43838 #ifdef CONFIG_SGI_GRU_DEBUG
43839diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
43840index c862cd4..0d176fe 100644
43841--- a/drivers/misc/sgi-xp/xp.h
43842+++ b/drivers/misc/sgi-xp/xp.h
43843@@ -288,7 +288,7 @@ struct xpc_interface {
43844 xpc_notify_func, void *);
43845 void (*received) (short, int, void *);
43846 enum xp_retval (*partid_to_nasids) (short, void *);
43847-};
43848+} __no_const;
43849
43850 extern struct xpc_interface xpc_interface;
43851
43852diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
43853index b94d5f7..7f494c5 100644
43854--- a/drivers/misc/sgi-xp/xpc.h
43855+++ b/drivers/misc/sgi-xp/xpc.h
43856@@ -835,6 +835,7 @@ struct xpc_arch_operations {
43857 void (*received_payload) (struct xpc_channel *, void *);
43858 void (*notify_senders_of_disconnect) (struct xpc_channel *);
43859 };
43860+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
43861
43862 /* struct xpc_partition act_state values (for XPC HB) */
43863
43864@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
43865 /* found in xpc_main.c */
43866 extern struct device *xpc_part;
43867 extern struct device *xpc_chan;
43868-extern struct xpc_arch_operations xpc_arch_ops;
43869+extern xpc_arch_operations_no_const xpc_arch_ops;
43870 extern int xpc_disengage_timelimit;
43871 extern int xpc_disengage_timedout;
43872 extern int xpc_activate_IRQ_rcvd;
43873diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
43874index 82dc574..8539ab2 100644
43875--- a/drivers/misc/sgi-xp/xpc_main.c
43876+++ b/drivers/misc/sgi-xp/xpc_main.c
43877@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
43878 .notifier_call = xpc_system_die,
43879 };
43880
43881-struct xpc_arch_operations xpc_arch_ops;
43882+xpc_arch_operations_no_const xpc_arch_ops;
43883
43884 /*
43885 * Timer function to enforce the timelimit on the partition disengage.
43886@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
43887
43888 if (((die_args->trapnr == X86_TRAP_MF) ||
43889 (die_args->trapnr == X86_TRAP_XF)) &&
43890- !user_mode_vm(die_args->regs))
43891+ !user_mode(die_args->regs))
43892 xpc_die_deactivate();
43893
43894 break;
43895diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
43896index ef18348..1b53cf0 100644
43897--- a/drivers/mmc/core/mmc_ops.c
43898+++ b/drivers/mmc/core/mmc_ops.c
43899@@ -213,7 +213,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
43900 void *data_buf;
43901 int is_on_stack;
43902
43903- is_on_stack = object_is_on_stack(buf);
43904+ is_on_stack = object_starts_on_stack(buf);
43905 if (is_on_stack) {
43906 /*
43907 * dma onto stack is unsafe/nonportable, but callers to this
43908diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
43909index 81b2994..dce857e 100644
43910--- a/drivers/mmc/host/dw_mmc.h
43911+++ b/drivers/mmc/host/dw_mmc.h
43912@@ -203,5 +203,5 @@ struct dw_mci_drv_data {
43913 void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
43914 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
43915 int (*parse_dt)(struct dw_mci *host);
43916-};
43917+} __do_const;
43918 #endif /* _DW_MMC_H_ */
43919diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
43920index c3785ed..1984c44 100644
43921--- a/drivers/mmc/host/mmci.c
43922+++ b/drivers/mmc/host/mmci.c
43923@@ -1482,7 +1482,9 @@ static int mmci_probe(struct amba_device *dev,
43924 }
43925
43926 if (variant->busy_detect) {
43927- mmci_ops.card_busy = mmci_card_busy;
43928+ pax_open_kernel();
43929+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
43930+ pax_close_kernel();
43931 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
43932 }
43933
43934diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
43935index 6debda9..2ba7427 100644
43936--- a/drivers/mmc/host/sdhci-s3c.c
43937+++ b/drivers/mmc/host/sdhci-s3c.c
43938@@ -668,9 +668,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
43939 * we can use overriding functions instead of default.
43940 */
43941 if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
43942- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
43943- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
43944- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
43945+ pax_open_kernel();
43946+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
43947+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
43948+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
43949+ pax_close_kernel();
43950 }
43951
43952 /* It supports additional host capabilities if needed */
43953diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
43954index 096993f..f02c23b 100644
43955--- a/drivers/mtd/chips/cfi_cmdset_0020.c
43956+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
43957@@ -669,7 +669,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
43958 size_t totlen = 0, thislen;
43959 int ret = 0;
43960 size_t buflen = 0;
43961- static char *buffer;
43962+ char *buffer;
43963
43964 if (!ECCBUF_SIZE) {
43965 /* We should fall back to a general writev implementation.
43966diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
43967index 2ed2bb3..2d0b82e 100644
43968--- a/drivers/mtd/nand/denali.c
43969+++ b/drivers/mtd/nand/denali.c
43970@@ -24,6 +24,7 @@
43971 #include <linux/slab.h>
43972 #include <linux/mtd/mtd.h>
43973 #include <linux/module.h>
43974+#include <linux/slab.h>
43975
43976 #include "denali.h"
43977
43978diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
43979index 51b9d6a..52af9a7 100644
43980--- a/drivers/mtd/nftlmount.c
43981+++ b/drivers/mtd/nftlmount.c
43982@@ -24,6 +24,7 @@
43983 #include <asm/errno.h>
43984 #include <linux/delay.h>
43985 #include <linux/slab.h>
43986+#include <linux/sched.h>
43987 #include <linux/mtd/mtd.h>
43988 #include <linux/mtd/nand.h>
43989 #include <linux/mtd/nftl.h>
43990diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
43991index 4b8e895..6b3c498 100644
43992--- a/drivers/mtd/sm_ftl.c
43993+++ b/drivers/mtd/sm_ftl.c
43994@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
43995 #define SM_CIS_VENDOR_OFFSET 0x59
43996 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
43997 {
43998- struct attribute_group *attr_group;
43999+ attribute_group_no_const *attr_group;
44000 struct attribute **attributes;
44001 struct sm_sysfs_attribute *vendor_attribute;
44002
44003diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
44004index dd8057d..22aaf36 100644
44005--- a/drivers/net/bonding/bond_main.c
44006+++ b/drivers/net/bonding/bond_main.c
44007@@ -4511,7 +4511,7 @@ static unsigned int bond_get_num_tx_queues(void)
44008 return tx_queues;
44009 }
44010
44011-static struct rtnl_link_ops bond_link_ops __read_mostly = {
44012+static struct rtnl_link_ops bond_link_ops = {
44013 .kind = "bond",
44014 .priv_size = sizeof(struct bonding),
44015 .setup = bond_setup,
44016@@ -4636,8 +4636,8 @@ static void __exit bonding_exit(void)
44017
44018 bond_destroy_debugfs();
44019
44020- rtnl_link_unregister(&bond_link_ops);
44021 unregister_pernet_subsys(&bond_net_ops);
44022+ rtnl_link_unregister(&bond_link_ops);
44023
44024 #ifdef CONFIG_NET_POLL_CONTROLLER
44025 /*
44026diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
44027index f92f001..0b2f9bf 100644
44028--- a/drivers/net/ethernet/8390/ax88796.c
44029+++ b/drivers/net/ethernet/8390/ax88796.c
44030@@ -872,9 +872,11 @@ static int ax_probe(struct platform_device *pdev)
44031 if (ax->plat->reg_offsets)
44032 ei_local->reg_offset = ax->plat->reg_offsets;
44033 else {
44034+ resource_size_t _mem_size = mem_size;
44035+ do_div(_mem_size, 0x18);
44036 ei_local->reg_offset = ax->reg_offsets;
44037 for (ret = 0; ret < 0x18; ret++)
44038- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
44039+ ax->reg_offsets[ret] = _mem_size * ret;
44040 }
44041
44042 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
44043diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44044index da8fcaa..f4b5d3b 100644
44045--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44046+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
44047@@ -1138,7 +1138,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
44048 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
44049 {
44050 /* RX_MODE controlling object */
44051- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
44052+ bnx2x_init_rx_mode_obj(bp);
44053
44054 /* multicast configuration controlling object */
44055 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
44056diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44057index 9fbeee5..5e3e37a 100644
44058--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44059+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
44060@@ -2590,15 +2590,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
44061 return rc;
44062 }
44063
44064-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
44065- struct bnx2x_rx_mode_obj *o)
44066+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
44067 {
44068 if (CHIP_IS_E1x(bp)) {
44069- o->wait_comp = bnx2x_empty_rx_mode_wait;
44070- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
44071+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
44072+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
44073 } else {
44074- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
44075- o->config_rx_mode = bnx2x_set_rx_mode_e2;
44076+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
44077+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
44078 }
44079 }
44080
44081diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44082index 658f4e3..15074a6 100644
44083--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44084+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
44085@@ -1325,8 +1325,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
44086
44087 /********************* RX MODE ****************/
44088
44089-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
44090- struct bnx2x_rx_mode_obj *o);
44091+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
44092
44093 /**
44094 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
44095diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
44096index 7025780..e55a71c 100644
44097--- a/drivers/net/ethernet/broadcom/tg3.h
44098+++ b/drivers/net/ethernet/broadcom/tg3.h
44099@@ -147,6 +147,7 @@
44100 #define CHIPREV_ID_5750_A0 0x4000
44101 #define CHIPREV_ID_5750_A1 0x4001
44102 #define CHIPREV_ID_5750_A3 0x4003
44103+#define CHIPREV_ID_5750_C1 0x4201
44104 #define CHIPREV_ID_5750_C2 0x4202
44105 #define CHIPREV_ID_5752_A0_HW 0x5000
44106 #define CHIPREV_ID_5752_A0 0x6000
44107diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44108index 8cffcdf..aadf043 100644
44109--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44110+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
44111@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
44112 */
44113 struct l2t_skb_cb {
44114 arp_failure_handler_func arp_failure_handler;
44115-};
44116+} __no_const;
44117
44118 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
44119
44120diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44121index c73cabd..cd278b1 100644
44122--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44123+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
44124@@ -2186,7 +2186,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
44125
44126 int i;
44127 struct adapter *ap = netdev2adap(dev);
44128- static const unsigned int *reg_ranges;
44129+ const unsigned int *reg_ranges;
44130 int arr_size = 0, buf_size = 0;
44131
44132 if (is_t4(ap->chip)) {
44133diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
44134index 263b92c..f05134b 100644
44135--- a/drivers/net/ethernet/dec/tulip/de4x5.c
44136+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
44137@@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
44138 for (i=0; i<ETH_ALEN; i++) {
44139 tmp.addr[i] = dev->dev_addr[i];
44140 }
44141- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
44142+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
44143 break;
44144
44145 case DE4X5_SET_HWADDR: /* Set the hardware address */
44146@@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
44147 spin_lock_irqsave(&lp->lock, flags);
44148 memcpy(&statbuf, &lp->pktStats, ioc->len);
44149 spin_unlock_irqrestore(&lp->lock, flags);
44150- if (copy_to_user(ioc->data, &statbuf, ioc->len))
44151+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
44152 return -EFAULT;
44153 break;
44154 }
44155diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
44156index 2c38cc4..0323f6e 100644
44157--- a/drivers/net/ethernet/emulex/benet/be_main.c
44158+++ b/drivers/net/ethernet/emulex/benet/be_main.c
44159@@ -470,7 +470,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
44160
44161 if (wrapped)
44162 newacc += 65536;
44163- ACCESS_ONCE(*acc) = newacc;
44164+ ACCESS_ONCE_RW(*acc) = newacc;
44165 }
44166
44167 static void populate_erx_stats(struct be_adapter *adapter,
44168diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
44169index 212f44b..fb69959 100644
44170--- a/drivers/net/ethernet/faraday/ftgmac100.c
44171+++ b/drivers/net/ethernet/faraday/ftgmac100.c
44172@@ -31,6 +31,8 @@
44173 #include <linux/netdevice.h>
44174 #include <linux/phy.h>
44175 #include <linux/platform_device.h>
44176+#include <linux/interrupt.h>
44177+#include <linux/irqreturn.h>
44178 #include <net/ip.h>
44179
44180 #include "ftgmac100.h"
44181diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
44182index 8be5b40..081bc1b 100644
44183--- a/drivers/net/ethernet/faraday/ftmac100.c
44184+++ b/drivers/net/ethernet/faraday/ftmac100.c
44185@@ -31,6 +31,8 @@
44186 #include <linux/module.h>
44187 #include <linux/netdevice.h>
44188 #include <linux/platform_device.h>
44189+#include <linux/interrupt.h>
44190+#include <linux/irqreturn.h>
44191
44192 #include "ftmac100.h"
44193
44194diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44195index 5184e2a..acb28c3 100644
44196--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44197+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
44198@@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
44199 }
44200
44201 /* update the base incval used to calculate frequency adjustment */
44202- ACCESS_ONCE(adapter->base_incval) = incval;
44203+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
44204 smp_mb();
44205
44206 /* need lock to prevent incorrect read while modifying cyclecounter */
44207diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
44208index fbe5363..266b4e3 100644
44209--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
44210+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
44211@@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
44212 struct __vxge_hw_fifo *fifo;
44213 struct vxge_hw_fifo_config *config;
44214 u32 txdl_size, txdl_per_memblock;
44215- struct vxge_hw_mempool_cbs fifo_mp_callback;
44216+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
44217+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
44218+ };
44219+
44220 struct __vxge_hw_virtualpath *vpath;
44221
44222 if ((vp == NULL) || (attr == NULL)) {
44223@@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
44224 goto exit;
44225 }
44226
44227- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
44228-
44229 fifo->mempool =
44230 __vxge_hw_mempool_create(vpath->hldev,
44231 fifo->config->memblock_size,
44232diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44233index f09e787..f3916a8 100644
44234--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44235+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
44236@@ -2055,7 +2055,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
44237
44238 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
44239 ahw->nic_mode = QLC_83XX_DEFAULT_MODE;
44240- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
44241+ pax_open_kernel();
44242+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
44243+ pax_close_kernel();
44244 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44245 } else {
44246 return -EIO;
44247diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44248index 0248a4c..9648d96 100644
44249--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44250+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
44251@@ -191,17 +191,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
44252 case QLCNIC_NON_PRIV_FUNC:
44253 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
44254 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44255- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
44256+ pax_open_kernel();
44257+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
44258+ pax_close_kernel();
44259 break;
44260 case QLCNIC_PRIV_FUNC:
44261 ahw->op_mode = QLCNIC_PRIV_FUNC;
44262 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
44263- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
44264+ pax_open_kernel();
44265+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
44266+ pax_close_kernel();
44267 break;
44268 case QLCNIC_MGMT_FUNC:
44269 ahw->op_mode = QLCNIC_MGMT_FUNC;
44270 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
44271- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
44272+ pax_open_kernel();
44273+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
44274+ pax_close_kernel();
44275 break;
44276 default:
44277 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
44278diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44279index 1551360..ed6510f 100644
44280--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44281+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
44282@@ -1108,7 +1108,7 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
44283 struct qlcnic_dump_entry *entry;
44284 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
44285 struct qlcnic_dump_template_hdr *tmpl_hdr = fw_dump->tmpl_hdr;
44286- static const struct qlcnic_dump_operations *fw_dump_ops;
44287+ const struct qlcnic_dump_operations *fw_dump_ops;
44288 struct device *dev = &adapter->pdev->dev;
44289 struct qlcnic_hardware_context *ahw;
44290 void *temp_buffer;
44291diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
44292index fb3f8dc..9d2ff38 100644
44293--- a/drivers/net/ethernet/realtek/r8169.c
44294+++ b/drivers/net/ethernet/realtek/r8169.c
44295@@ -759,22 +759,22 @@ struct rtl8169_private {
44296 struct mdio_ops {
44297 void (*write)(struct rtl8169_private *, int, int);
44298 int (*read)(struct rtl8169_private *, int);
44299- } mdio_ops;
44300+ } __no_const mdio_ops;
44301
44302 struct pll_power_ops {
44303 void (*down)(struct rtl8169_private *);
44304 void (*up)(struct rtl8169_private *);
44305- } pll_power_ops;
44306+ } __no_const pll_power_ops;
44307
44308 struct jumbo_ops {
44309 void (*enable)(struct rtl8169_private *);
44310 void (*disable)(struct rtl8169_private *);
44311- } jumbo_ops;
44312+ } __no_const jumbo_ops;
44313
44314 struct csi_ops {
44315 void (*write)(struct rtl8169_private *, int, int);
44316 u32 (*read)(struct rtl8169_private *, int);
44317- } csi_ops;
44318+ } __no_const csi_ops;
44319
44320 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
44321 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
44322diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
44323index 03acf57..e1251ff 100644
44324--- a/drivers/net/ethernet/sfc/ptp.c
44325+++ b/drivers/net/ethernet/sfc/ptp.c
44326@@ -539,7 +539,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
44327 ptp->start.dma_addr);
44328
44329 /* Clear flag that signals MC ready */
44330- ACCESS_ONCE(*start) = 0;
44331+ ACCESS_ONCE_RW(*start) = 0;
44332 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
44333 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
44334 EFX_BUG_ON_PARANOID(rc);
44335diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44336index 50617c5..b13724c 100644
44337--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44338+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
44339@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
44340
44341 writel(value, ioaddr + MMC_CNTRL);
44342
44343- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
44344- MMC_CNTRL, value);
44345+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
44346+// MMC_CNTRL, value);
44347 }
44348
44349 /* To mask all all interrupts.*/
44350diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
44351index 3169252..5d78c1d 100644
44352--- a/drivers/net/hamradio/hdlcdrv.c
44353+++ b/drivers/net/hamradio/hdlcdrv.c
44354@@ -571,6 +571,8 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44355 case HDLCDRVCTL_CALIBRATE:
44356 if(!capable(CAP_SYS_RAWIO))
44357 return -EPERM;
44358+ if (bi.data.calibrate > INT_MAX / s->par.bitrate)
44359+ return -EINVAL;
44360 s->hdlctx.calibrate = bi.data.calibrate * s->par.bitrate / 16;
44361 return 0;
44362
44363diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
44364index e6fe0d8..2b7d752 100644
44365--- a/drivers/net/hyperv/hyperv_net.h
44366+++ b/drivers/net/hyperv/hyperv_net.h
44367@@ -101,7 +101,7 @@ struct rndis_device {
44368
44369 enum rndis_device_state state;
44370 bool link_state;
44371- atomic_t new_req_id;
44372+ atomic_unchecked_t new_req_id;
44373
44374 spinlock_t request_lock;
44375 struct list_head req_list;
44376diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
44377index 0775f0a..d4fb316 100644
44378--- a/drivers/net/hyperv/rndis_filter.c
44379+++ b/drivers/net/hyperv/rndis_filter.c
44380@@ -104,7 +104,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
44381 * template
44382 */
44383 set = &rndis_msg->msg.set_req;
44384- set->req_id = atomic_inc_return(&dev->new_req_id);
44385+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
44386
44387 /* Add to the request list */
44388 spin_lock_irqsave(&dev->request_lock, flags);
44389@@ -752,7 +752,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
44390
44391 /* Setup the rndis set */
44392 halt = &request->request_msg.msg.halt_req;
44393- halt->req_id = atomic_inc_return(&dev->new_req_id);
44394+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
44395
44396 /* Ignore return since this msg is optional. */
44397 rndis_filter_send_request(dev, request);
44398diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
44399index bf0d55e..82bcfbd1 100644
44400--- a/drivers/net/ieee802154/fakehard.c
44401+++ b/drivers/net/ieee802154/fakehard.c
44402@@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
44403 phy->transmit_power = 0xbf;
44404
44405 dev->netdev_ops = &fake_ops;
44406- dev->ml_priv = &fake_mlme;
44407+ dev->ml_priv = (void *)&fake_mlme;
44408
44409 priv = netdev_priv(dev);
44410 priv->phy = phy;
44411diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
44412index 9bf46bd..bfdaa84 100644
44413--- a/drivers/net/macvlan.c
44414+++ b/drivers/net/macvlan.c
44415@@ -939,13 +939,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
44416 int macvlan_link_register(struct rtnl_link_ops *ops)
44417 {
44418 /* common fields */
44419- ops->priv_size = sizeof(struct macvlan_dev);
44420- ops->validate = macvlan_validate;
44421- ops->maxtype = IFLA_MACVLAN_MAX;
44422- ops->policy = macvlan_policy;
44423- ops->changelink = macvlan_changelink;
44424- ops->get_size = macvlan_get_size;
44425- ops->fill_info = macvlan_fill_info;
44426+ pax_open_kernel();
44427+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
44428+ *(void **)&ops->validate = macvlan_validate;
44429+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
44430+ *(const void **)&ops->policy = macvlan_policy;
44431+ *(void **)&ops->changelink = macvlan_changelink;
44432+ *(void **)&ops->get_size = macvlan_get_size;
44433+ *(void **)&ops->fill_info = macvlan_fill_info;
44434+ pax_close_kernel();
44435
44436 return rtnl_link_register(ops);
44437 };
44438@@ -1001,7 +1003,7 @@ static int macvlan_device_event(struct notifier_block *unused,
44439 return NOTIFY_DONE;
44440 }
44441
44442-static struct notifier_block macvlan_notifier_block __read_mostly = {
44443+static struct notifier_block macvlan_notifier_block = {
44444 .notifier_call = macvlan_device_event,
44445 };
44446
44447diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
44448index dc76670..e18f39c 100644
44449--- a/drivers/net/macvtap.c
44450+++ b/drivers/net/macvtap.c
44451@@ -1189,7 +1189,7 @@ static int macvtap_device_event(struct notifier_block *unused,
44452 return NOTIFY_DONE;
44453 }
44454
44455-static struct notifier_block macvtap_notifier_block __read_mostly = {
44456+static struct notifier_block macvtap_notifier_block = {
44457 .notifier_call = macvtap_device_event,
44458 };
44459
44460diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
44461index daec9b0..6428fcb 100644
44462--- a/drivers/net/phy/mdio-bitbang.c
44463+++ b/drivers/net/phy/mdio-bitbang.c
44464@@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
44465 struct mdiobb_ctrl *ctrl = bus->priv;
44466
44467 module_put(ctrl->ops->owner);
44468+ mdiobus_unregister(bus);
44469 mdiobus_free(bus);
44470 }
44471 EXPORT_SYMBOL(free_mdio_bitbang);
44472diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
44473index 72ff14b..11d442d 100644
44474--- a/drivers/net/ppp/ppp_generic.c
44475+++ b/drivers/net/ppp/ppp_generic.c
44476@@ -999,7 +999,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44477 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
44478 struct ppp_stats stats;
44479 struct ppp_comp_stats cstats;
44480- char *vers;
44481
44482 switch (cmd) {
44483 case SIOCGPPPSTATS:
44484@@ -1021,8 +1020,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
44485 break;
44486
44487 case SIOCGPPPVER:
44488- vers = PPP_VERSION;
44489- if (copy_to_user(addr, vers, strlen(vers) + 1))
44490+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
44491 break;
44492 err = 0;
44493 break;
44494diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
44495index 1252d9c..80e660b 100644
44496--- a/drivers/net/slip/slhc.c
44497+++ b/drivers/net/slip/slhc.c
44498@@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
44499 register struct tcphdr *thp;
44500 register struct iphdr *ip;
44501 register struct cstate *cs;
44502- int len, hdrlen;
44503+ long len, hdrlen;
44504 unsigned char *cp = icp;
44505
44506 /* We've got a compressed packet; read the change byte */
44507diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
44508index 6327df2..e6e1ebe 100644
44509--- a/drivers/net/team/team.c
44510+++ b/drivers/net/team/team.c
44511@@ -2873,7 +2873,7 @@ static int team_device_event(struct notifier_block *unused,
44512 return NOTIFY_DONE;
44513 }
44514
44515-static struct notifier_block team_notifier_block __read_mostly = {
44516+static struct notifier_block team_notifier_block = {
44517 .notifier_call = team_device_event,
44518 };
44519
44520diff --git a/drivers/net/tun.c b/drivers/net/tun.c
44521index 782e38b..d076fdc 100644
44522--- a/drivers/net/tun.c
44523+++ b/drivers/net/tun.c
44524@@ -1834,7 +1834,7 @@ unlock:
44525 }
44526
44527 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
44528- unsigned long arg, int ifreq_len)
44529+ unsigned long arg, size_t ifreq_len)
44530 {
44531 struct tun_file *tfile = file->private_data;
44532 struct tun_struct *tun;
44533@@ -1847,6 +1847,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
44534 unsigned int ifindex;
44535 int ret;
44536
44537+ if (ifreq_len > sizeof ifr)
44538+ return -EFAULT;
44539+
44540 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
44541 if (copy_from_user(&ifr, argp, ifreq_len))
44542 return -EFAULT;
44543diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
44544index 86292e6..8d34433 100644
44545--- a/drivers/net/usb/hso.c
44546+++ b/drivers/net/usb/hso.c
44547@@ -71,7 +71,7 @@
44548 #include <asm/byteorder.h>
44549 #include <linux/serial_core.h>
44550 #include <linux/serial.h>
44551-
44552+#include <asm/local.h>
44553
44554 #define MOD_AUTHOR "Option Wireless"
44555 #define MOD_DESCRIPTION "USB High Speed Option driver"
44556@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
44557 struct urb *urb;
44558
44559 urb = serial->rx_urb[0];
44560- if (serial->port.count > 0) {
44561+ if (atomic_read(&serial->port.count) > 0) {
44562 count = put_rxbuf_data(urb, serial);
44563 if (count == -1)
44564 return;
44565@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
44566 DUMP1(urb->transfer_buffer, urb->actual_length);
44567
44568 /* Anyone listening? */
44569- if (serial->port.count == 0)
44570+ if (atomic_read(&serial->port.count) == 0)
44571 return;
44572
44573 if (status == 0) {
44574@@ -1298,8 +1298,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
44575 tty_port_tty_set(&serial->port, tty);
44576
44577 /* check for port already opened, if not set the termios */
44578- serial->port.count++;
44579- if (serial->port.count == 1) {
44580+ if (atomic_inc_return(&serial->port.count) == 1) {
44581 serial->rx_state = RX_IDLE;
44582 /* Force default termio settings */
44583 _hso_serial_set_termios(tty, NULL);
44584@@ -1311,7 +1310,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
44585 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
44586 if (result) {
44587 hso_stop_serial_device(serial->parent);
44588- serial->port.count--;
44589+ atomic_dec(&serial->port.count);
44590 kref_put(&serial->parent->ref, hso_serial_ref_free);
44591 }
44592 } else {
44593@@ -1348,10 +1347,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
44594
44595 /* reset the rts and dtr */
44596 /* do the actual close */
44597- serial->port.count--;
44598+ atomic_dec(&serial->port.count);
44599
44600- if (serial->port.count <= 0) {
44601- serial->port.count = 0;
44602+ if (atomic_read(&serial->port.count) <= 0) {
44603+ atomic_set(&serial->port.count, 0);
44604 tty_port_tty_set(&serial->port, NULL);
44605 if (!usb_gone)
44606 hso_stop_serial_device(serial->parent);
44607@@ -1427,7 +1426,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
44608
44609 /* the actual setup */
44610 spin_lock_irqsave(&serial->serial_lock, flags);
44611- if (serial->port.count)
44612+ if (atomic_read(&serial->port.count))
44613 _hso_serial_set_termios(tty, old);
44614 else
44615 tty->termios = *old;
44616@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
44617 D1("Pending read interrupt on port %d\n", i);
44618 spin_lock(&serial->serial_lock);
44619 if (serial->rx_state == RX_IDLE &&
44620- serial->port.count > 0) {
44621+ atomic_read(&serial->port.count) > 0) {
44622 /* Setup and send a ctrl req read on
44623 * port i */
44624 if (!serial->rx_urb_filled[0]) {
44625@@ -3062,7 +3061,7 @@ static int hso_resume(struct usb_interface *iface)
44626 /* Start all serial ports */
44627 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
44628 if (serial_table[i] && (serial_table[i]->interface == iface)) {
44629- if (dev2ser(serial_table[i])->port.count) {
44630+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
44631 result =
44632 hso_start_serial_device(serial_table[i], GFP_NOIO);
44633 hso_kick_transmit(dev2ser(serial_table[i]));
44634diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
44635index a79e9d3..78cd4fa 100644
44636--- a/drivers/net/usb/sierra_net.c
44637+++ b/drivers/net/usb/sierra_net.c
44638@@ -52,7 +52,7 @@ static const char driver_name[] = "sierra_net";
44639 /* atomic counter partially included in MAC address to make sure 2 devices
44640 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
44641 */
44642-static atomic_t iface_counter = ATOMIC_INIT(0);
44643+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
44644
44645 /*
44646 * SYNC Timer Delay definition used to set the expiry time
44647@@ -698,7 +698,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
44648 dev->net->netdev_ops = &sierra_net_device_ops;
44649
44650 /* change MAC addr to include, ifacenum, and to be unique */
44651- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
44652+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
44653 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
44654
44655 /* we will have to manufacture ethernet headers, prepare template */
44656diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
44657index 2ef5b62..6fa0ec3 100644
44658--- a/drivers/net/vxlan.c
44659+++ b/drivers/net/vxlan.c
44660@@ -2615,7 +2615,7 @@ nla_put_failure:
44661 return -EMSGSIZE;
44662 }
44663
44664-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
44665+static struct rtnl_link_ops vxlan_link_ops = {
44666 .kind = "vxlan",
44667 .maxtype = IFLA_VXLAN_MAX,
44668 .policy = vxlan_policy,
44669diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
44670index 0b60295..b8bfa5b 100644
44671--- a/drivers/net/wimax/i2400m/rx.c
44672+++ b/drivers/net/wimax/i2400m/rx.c
44673@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
44674 if (i2400m->rx_roq == NULL)
44675 goto error_roq_alloc;
44676
44677- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
44678+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
44679 GFP_KERNEL);
44680 if (rd == NULL) {
44681 result = -ENOMEM;
44682diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
44683index 7fe1964..7016de0 100644
44684--- a/drivers/net/wireless/airo.c
44685+++ b/drivers/net/wireless/airo.c
44686@@ -7844,7 +7844,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
44687 struct airo_info *ai = dev->ml_priv;
44688 int ridcode;
44689 int enabled;
44690- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
44691+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
44692 unsigned char *iobuf;
44693
44694 /* Only super-user can write RIDs */
44695diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
44696index 34c8a33..3261fdc 100644
44697--- a/drivers/net/wireless/at76c50x-usb.c
44698+++ b/drivers/net/wireless/at76c50x-usb.c
44699@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
44700 }
44701
44702 /* Convert timeout from the DFU status to jiffies */
44703-static inline unsigned long at76_get_timeout(struct dfu_status *s)
44704+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
44705 {
44706 return msecs_to_jiffies((s->poll_timeout[2] << 16)
44707 | (s->poll_timeout[1] << 8)
44708diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
44709index ef3329e..c28ff5d 100644
44710--- a/drivers/net/wireless/ath/ath10k/htc.c
44711+++ b/drivers/net/wireless/ath/ath10k/htc.c
44712@@ -963,7 +963,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
44713 /* registered target arrival callback from the HIF layer */
44714 int ath10k_htc_init(struct ath10k *ar)
44715 {
44716- struct ath10k_hif_cb htc_callbacks;
44717+ static struct ath10k_hif_cb htc_callbacks = {
44718+ .rx_completion = ath10k_htc_rx_completion_handler,
44719+ .tx_completion = ath10k_htc_tx_completion_handler,
44720+ };
44721 struct ath10k_htc_ep *ep = NULL;
44722 struct ath10k_htc *htc = &ar->htc;
44723
44724@@ -973,8 +976,6 @@ int ath10k_htc_init(struct ath10k *ar)
44725 ath10k_htc_reset_endpoint_states(htc);
44726
44727 /* setup HIF layer callbacks */
44728- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
44729- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
44730 htc->ar = ar;
44731
44732 /* Get HIF default pipe for HTC message exchange */
44733diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
44734index e1dd8c7..9f91b3f 100644
44735--- a/drivers/net/wireless/ath/ath10k/htc.h
44736+++ b/drivers/net/wireless/ath/ath10k/htc.h
44737@@ -271,12 +271,12 @@ enum ath10k_htc_ep_id {
44738
44739 struct ath10k_htc_ops {
44740 void (*target_send_suspend_complete)(struct ath10k *ar);
44741-};
44742+} __no_const;
44743
44744 struct ath10k_htc_ep_ops {
44745 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
44746 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
44747-};
44748+} __no_const;
44749
44750 /* service connection information */
44751 struct ath10k_htc_svc_conn_req {
44752diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44753index a366d6b..b6f28f8 100644
44754--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44755+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
44756@@ -218,8 +218,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44757 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
44758 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
44759
44760- ACCESS_ONCE(ads->ds_link) = i->link;
44761- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
44762+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
44763+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
44764
44765 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
44766 ctl6 = SM(i->keytype, AR_EncrType);
44767@@ -233,26 +233,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44768
44769 if ((i->is_first || i->is_last) &&
44770 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
44771- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
44772+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
44773 | set11nTries(i->rates, 1)
44774 | set11nTries(i->rates, 2)
44775 | set11nTries(i->rates, 3)
44776 | (i->dur_update ? AR_DurUpdateEna : 0)
44777 | SM(0, AR_BurstDur);
44778
44779- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
44780+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
44781 | set11nRate(i->rates, 1)
44782 | set11nRate(i->rates, 2)
44783 | set11nRate(i->rates, 3);
44784 } else {
44785- ACCESS_ONCE(ads->ds_ctl2) = 0;
44786- ACCESS_ONCE(ads->ds_ctl3) = 0;
44787+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
44788+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
44789 }
44790
44791 if (!i->is_first) {
44792- ACCESS_ONCE(ads->ds_ctl0) = 0;
44793- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
44794- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
44795+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
44796+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
44797+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
44798 return;
44799 }
44800
44801@@ -277,7 +277,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44802 break;
44803 }
44804
44805- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
44806+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
44807 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
44808 | SM(i->txpower, AR_XmitPower)
44809 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
44810@@ -287,19 +287,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44811 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
44812 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
44813
44814- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
44815- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
44816+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
44817+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
44818
44819 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
44820 return;
44821
44822- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
44823+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
44824 | set11nPktDurRTSCTS(i->rates, 1);
44825
44826- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
44827+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
44828 | set11nPktDurRTSCTS(i->rates, 3);
44829
44830- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
44831+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
44832 | set11nRateFlags(i->rates, 1)
44833 | set11nRateFlags(i->rates, 2)
44834 | set11nRateFlags(i->rates, 3)
44835diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44836index f6c5c1b..6058354 100644
44837--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44838+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
44839@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44840 (i->qcu << AR_TxQcuNum_S) | desc_len;
44841
44842 checksum += val;
44843- ACCESS_ONCE(ads->info) = val;
44844+ ACCESS_ONCE_RW(ads->info) = val;
44845
44846 checksum += i->link;
44847- ACCESS_ONCE(ads->link) = i->link;
44848+ ACCESS_ONCE_RW(ads->link) = i->link;
44849
44850 checksum += i->buf_addr[0];
44851- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
44852+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
44853 checksum += i->buf_addr[1];
44854- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
44855+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
44856 checksum += i->buf_addr[2];
44857- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
44858+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
44859 checksum += i->buf_addr[3];
44860- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
44861+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
44862
44863 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
44864- ACCESS_ONCE(ads->ctl3) = val;
44865+ ACCESS_ONCE_RW(ads->ctl3) = val;
44866 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
44867- ACCESS_ONCE(ads->ctl5) = val;
44868+ ACCESS_ONCE_RW(ads->ctl5) = val;
44869 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
44870- ACCESS_ONCE(ads->ctl7) = val;
44871+ ACCESS_ONCE_RW(ads->ctl7) = val;
44872 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
44873- ACCESS_ONCE(ads->ctl9) = val;
44874+ ACCESS_ONCE_RW(ads->ctl9) = val;
44875
44876 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
44877- ACCESS_ONCE(ads->ctl10) = checksum;
44878+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
44879
44880 if (i->is_first || i->is_last) {
44881- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
44882+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
44883 | set11nTries(i->rates, 1)
44884 | set11nTries(i->rates, 2)
44885 | set11nTries(i->rates, 3)
44886 | (i->dur_update ? AR_DurUpdateEna : 0)
44887 | SM(0, AR_BurstDur);
44888
44889- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
44890+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
44891 | set11nRate(i->rates, 1)
44892 | set11nRate(i->rates, 2)
44893 | set11nRate(i->rates, 3);
44894 } else {
44895- ACCESS_ONCE(ads->ctl13) = 0;
44896- ACCESS_ONCE(ads->ctl14) = 0;
44897+ ACCESS_ONCE_RW(ads->ctl13) = 0;
44898+ ACCESS_ONCE_RW(ads->ctl14) = 0;
44899 }
44900
44901 ads->ctl20 = 0;
44902@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44903
44904 ctl17 = SM(i->keytype, AR_EncrType);
44905 if (!i->is_first) {
44906- ACCESS_ONCE(ads->ctl11) = 0;
44907- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
44908- ACCESS_ONCE(ads->ctl15) = 0;
44909- ACCESS_ONCE(ads->ctl16) = 0;
44910- ACCESS_ONCE(ads->ctl17) = ctl17;
44911- ACCESS_ONCE(ads->ctl18) = 0;
44912- ACCESS_ONCE(ads->ctl19) = 0;
44913+ ACCESS_ONCE_RW(ads->ctl11) = 0;
44914+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
44915+ ACCESS_ONCE_RW(ads->ctl15) = 0;
44916+ ACCESS_ONCE_RW(ads->ctl16) = 0;
44917+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
44918+ ACCESS_ONCE_RW(ads->ctl18) = 0;
44919+ ACCESS_ONCE_RW(ads->ctl19) = 0;
44920 return;
44921 }
44922
44923- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
44924+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
44925 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
44926 | SM(i->txpower, AR_XmitPower)
44927 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
44928@@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
44929 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
44930 ctl12 |= SM(val, AR_PAPRDChainMask);
44931
44932- ACCESS_ONCE(ads->ctl12) = ctl12;
44933- ACCESS_ONCE(ads->ctl17) = ctl17;
44934+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
44935+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
44936
44937- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
44938+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
44939 | set11nPktDurRTSCTS(i->rates, 1);
44940
44941- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
44942+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
44943 | set11nPktDurRTSCTS(i->rates, 3);
44944
44945- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
44946+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
44947 | set11nRateFlags(i->rates, 1)
44948 | set11nRateFlags(i->rates, 2)
44949 | set11nRateFlags(i->rates, 3)
44950 | SM(i->rtscts_rate, AR_RTSCTSRate);
44951
44952- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
44953+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
44954 }
44955
44956 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
44957diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
44958index 69a907b..91e071c 100644
44959--- a/drivers/net/wireless/ath/ath9k/hw.h
44960+++ b/drivers/net/wireless/ath/ath9k/hw.h
44961@@ -657,7 +657,7 @@ struct ath_hw_private_ops {
44962
44963 /* ANI */
44964 void (*ani_cache_ini_regs)(struct ath_hw *ah);
44965-};
44966+} __no_const;
44967
44968 /**
44969 * struct ath_spec_scan - parameters for Atheros spectral scan
44970@@ -729,7 +729,7 @@ struct ath_hw_ops {
44971 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
44972 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
44973 #endif
44974-};
44975+} __no_const;
44976
44977 struct ath_nf_limits {
44978 s16 max;
44979diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
44980index 92190da..f3a4c4c 100644
44981--- a/drivers/net/wireless/b43/phy_lp.c
44982+++ b/drivers/net/wireless/b43/phy_lp.c
44983@@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
44984 {
44985 struct ssb_bus *bus = dev->dev->sdev->bus;
44986
44987- static const struct b206x_channel *chandata = NULL;
44988+ const struct b206x_channel *chandata = NULL;
44989 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
44990 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
44991 u16 old_comm15, scale;
44992diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
44993index 9581d07..84f6a76 100644
44994--- a/drivers/net/wireless/iwlegacy/3945-mac.c
44995+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
44996@@ -3639,7 +3639,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
44997 */
44998 if (il3945_mod_params.disable_hw_scan) {
44999 D_INFO("Disabling hw_scan\n");
45000- il3945_mac_ops.hw_scan = NULL;
45001+ pax_open_kernel();
45002+ *(void **)&il3945_mac_ops.hw_scan = NULL;
45003+ pax_close_kernel();
45004 }
45005
45006 D_INFO("*** LOAD DRIVER ***\n");
45007diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
45008index d94f8ab..5b568c8 100644
45009--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
45010+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
45011@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
45012 {
45013 struct iwl_priv *priv = file->private_data;
45014 char buf[64];
45015- int buf_size;
45016+ size_t buf_size;
45017 u32 offset, len;
45018
45019 memset(buf, 0, sizeof(buf));
45020@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
45021 struct iwl_priv *priv = file->private_data;
45022
45023 char buf[8];
45024- int buf_size;
45025+ size_t buf_size;
45026 u32 reset_flag;
45027
45028 memset(buf, 0, sizeof(buf));
45029@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
45030 {
45031 struct iwl_priv *priv = file->private_data;
45032 char buf[8];
45033- int buf_size;
45034+ size_t buf_size;
45035 int ht40;
45036
45037 memset(buf, 0, sizeof(buf));
45038@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
45039 {
45040 struct iwl_priv *priv = file->private_data;
45041 char buf[8];
45042- int buf_size;
45043+ size_t buf_size;
45044 int value;
45045
45046 memset(buf, 0, sizeof(buf));
45047@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
45048 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
45049 DEBUGFS_READ_FILE_OPS(current_sleep_command);
45050
45051-static const char *fmt_value = " %-30s %10u\n";
45052-static const char *fmt_hex = " %-30s 0x%02X\n";
45053-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
45054-static const char *fmt_header =
45055+static const char fmt_value[] = " %-30s %10u\n";
45056+static const char fmt_hex[] = " %-30s 0x%02X\n";
45057+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
45058+static const char fmt_header[] =
45059 "%-32s current cumulative delta max\n";
45060
45061 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
45062@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
45063 {
45064 struct iwl_priv *priv = file->private_data;
45065 char buf[8];
45066- int buf_size;
45067+ size_t buf_size;
45068 int clear;
45069
45070 memset(buf, 0, sizeof(buf));
45071@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
45072 {
45073 struct iwl_priv *priv = file->private_data;
45074 char buf[8];
45075- int buf_size;
45076+ size_t buf_size;
45077 int trace;
45078
45079 memset(buf, 0, sizeof(buf));
45080@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
45081 {
45082 struct iwl_priv *priv = file->private_data;
45083 char buf[8];
45084- int buf_size;
45085+ size_t buf_size;
45086 int missed;
45087
45088 memset(buf, 0, sizeof(buf));
45089@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
45090
45091 struct iwl_priv *priv = file->private_data;
45092 char buf[8];
45093- int buf_size;
45094+ size_t buf_size;
45095 int plcp;
45096
45097 memset(buf, 0, sizeof(buf));
45098@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
45099
45100 struct iwl_priv *priv = file->private_data;
45101 char buf[8];
45102- int buf_size;
45103+ size_t buf_size;
45104 int flush;
45105
45106 memset(buf, 0, sizeof(buf));
45107@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
45108
45109 struct iwl_priv *priv = file->private_data;
45110 char buf[8];
45111- int buf_size;
45112+ size_t buf_size;
45113 int rts;
45114
45115 if (!priv->cfg->ht_params)
45116@@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
45117 {
45118 struct iwl_priv *priv = file->private_data;
45119 char buf[8];
45120- int buf_size;
45121+ size_t buf_size;
45122
45123 memset(buf, 0, sizeof(buf));
45124 buf_size = min(count, sizeof(buf) - 1);
45125@@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
45126 struct iwl_priv *priv = file->private_data;
45127 u32 event_log_flag;
45128 char buf[8];
45129- int buf_size;
45130+ size_t buf_size;
45131
45132 /* check that the interface is up */
45133 if (!iwl_is_ready(priv))
45134@@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
45135 struct iwl_priv *priv = file->private_data;
45136 char buf[8];
45137 u32 calib_disabled;
45138- int buf_size;
45139+ size_t buf_size;
45140
45141 memset(buf, 0, sizeof(buf));
45142 buf_size = min(count, sizeof(buf) - 1);
45143diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
45144index 7aad766..06addb4 100644
45145--- a/drivers/net/wireless/iwlwifi/dvm/main.c
45146+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
45147@@ -1123,7 +1123,7 @@ static void iwl_option_config(struct iwl_priv *priv)
45148 static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
45149 {
45150 struct iwl_nvm_data *data = priv->nvm_data;
45151- char *debug_msg;
45152+ static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
45153
45154 if (data->sku_cap_11n_enable &&
45155 !priv->cfg->ht_params) {
45156@@ -1137,7 +1137,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
45157 return -EINVAL;
45158 }
45159
45160- debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
45161 IWL_DEBUG_INFO(priv, debug_msg,
45162 data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
45163 data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
45164diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
45165index 6bc3100..dd1b80d 100644
45166--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
45167+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
45168@@ -1249,7 +1249,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
45169 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
45170
45171 char buf[8];
45172- int buf_size;
45173+ size_t buf_size;
45174 u32 reset_flag;
45175
45176 memset(buf, 0, sizeof(buf));
45177@@ -1270,7 +1270,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
45178 {
45179 struct iwl_trans *trans = file->private_data;
45180 char buf[8];
45181- int buf_size;
45182+ size_t buf_size;
45183 int csr;
45184
45185 memset(buf, 0, sizeof(buf));
45186diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
45187index 2cd3f54..e936f90 100644
45188--- a/drivers/net/wireless/mac80211_hwsim.c
45189+++ b/drivers/net/wireless/mac80211_hwsim.c
45190@@ -2196,25 +2196,19 @@ static int __init init_mac80211_hwsim(void)
45191
45192 if (channels > 1) {
45193 hwsim_if_comb.num_different_channels = channels;
45194- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
45195- mac80211_hwsim_ops.cancel_hw_scan =
45196- mac80211_hwsim_cancel_hw_scan;
45197- mac80211_hwsim_ops.sw_scan_start = NULL;
45198- mac80211_hwsim_ops.sw_scan_complete = NULL;
45199- mac80211_hwsim_ops.remain_on_channel =
45200- mac80211_hwsim_roc;
45201- mac80211_hwsim_ops.cancel_remain_on_channel =
45202- mac80211_hwsim_croc;
45203- mac80211_hwsim_ops.add_chanctx =
45204- mac80211_hwsim_add_chanctx;
45205- mac80211_hwsim_ops.remove_chanctx =
45206- mac80211_hwsim_remove_chanctx;
45207- mac80211_hwsim_ops.change_chanctx =
45208- mac80211_hwsim_change_chanctx;
45209- mac80211_hwsim_ops.assign_vif_chanctx =
45210- mac80211_hwsim_assign_vif_chanctx;
45211- mac80211_hwsim_ops.unassign_vif_chanctx =
45212- mac80211_hwsim_unassign_vif_chanctx;
45213+ pax_open_kernel();
45214+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
45215+ *(void **)&mac80211_hwsim_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
45216+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
45217+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
45218+ *(void **)&mac80211_hwsim_ops.remain_on_channel = mac80211_hwsim_roc;
45219+ *(void **)&mac80211_hwsim_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
45220+ *(void **)&mac80211_hwsim_ops.add_chanctx = mac80211_hwsim_add_chanctx;
45221+ *(void **)&mac80211_hwsim_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
45222+ *(void **)&mac80211_hwsim_ops.change_chanctx = mac80211_hwsim_change_chanctx;
45223+ *(void **)&mac80211_hwsim_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
45224+ *(void **)&mac80211_hwsim_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
45225+ pax_close_kernel();
45226 }
45227
45228 spin_lock_init(&hwsim_radio_lock);
45229diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
45230index 8169a85..7fa3b47 100644
45231--- a/drivers/net/wireless/rndis_wlan.c
45232+++ b/drivers/net/wireless/rndis_wlan.c
45233@@ -1238,7 +1238,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
45234
45235 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
45236
45237- if (rts_threshold < 0 || rts_threshold > 2347)
45238+ if (rts_threshold > 2347)
45239 rts_threshold = 2347;
45240
45241 tmp = cpu_to_le32(rts_threshold);
45242diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
45243index fe4c572..99dedfa 100644
45244--- a/drivers/net/wireless/rt2x00/rt2x00.h
45245+++ b/drivers/net/wireless/rt2x00/rt2x00.h
45246@@ -387,7 +387,7 @@ struct rt2x00_intf {
45247 * for hardware which doesn't support hardware
45248 * sequence counting.
45249 */
45250- atomic_t seqno;
45251+ atomic_unchecked_t seqno;
45252 };
45253
45254 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
45255diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
45256index 66a2db8..70cad04 100644
45257--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
45258+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
45259@@ -252,9 +252,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
45260 * sequence counter given by mac80211.
45261 */
45262 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
45263- seqno = atomic_add_return(0x10, &intf->seqno);
45264+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
45265 else
45266- seqno = atomic_read(&intf->seqno);
45267+ seqno = atomic_read_unchecked(&intf->seqno);
45268
45269 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
45270 hdr->seq_ctrl |= cpu_to_le16(seqno);
45271diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
45272index e2b3d9c..67a5184 100644
45273--- a/drivers/net/wireless/ti/wl1251/sdio.c
45274+++ b/drivers/net/wireless/ti/wl1251/sdio.c
45275@@ -271,13 +271,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
45276
45277 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
45278
45279- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
45280- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
45281+ pax_open_kernel();
45282+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
45283+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
45284+ pax_close_kernel();
45285
45286 wl1251_info("using dedicated interrupt line");
45287 } else {
45288- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
45289- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
45290+ pax_open_kernel();
45291+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
45292+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
45293+ pax_close_kernel();
45294
45295 wl1251_info("using SDIO interrupt");
45296 }
45297diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
45298index 1c627da..69f7d17 100644
45299--- a/drivers/net/wireless/ti/wl12xx/main.c
45300+++ b/drivers/net/wireless/ti/wl12xx/main.c
45301@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
45302 sizeof(wl->conf.mem));
45303
45304 /* read data preparation is only needed by wl127x */
45305- wl->ops->prepare_read = wl127x_prepare_read;
45306+ pax_open_kernel();
45307+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
45308+ pax_close_kernel();
45309
45310 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
45311 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
45312@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
45313 sizeof(wl->conf.mem));
45314
45315 /* read data preparation is only needed by wl127x */
45316- wl->ops->prepare_read = wl127x_prepare_read;
45317+ pax_open_kernel();
45318+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
45319+ pax_close_kernel();
45320
45321 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
45322 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
45323diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
45324index 7aa0eb8..5a9ef38 100644
45325--- a/drivers/net/wireless/ti/wl18xx/main.c
45326+++ b/drivers/net/wireless/ti/wl18xx/main.c
45327@@ -1730,8 +1730,10 @@ static int wl18xx_setup(struct wl1271 *wl)
45328 }
45329
45330 if (!checksum_param) {
45331- wl18xx_ops.set_rx_csum = NULL;
45332- wl18xx_ops.init_vif = NULL;
45333+ pax_open_kernel();
45334+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
45335+ *(void **)&wl18xx_ops.init_vif = NULL;
45336+ pax_close_kernel();
45337 }
45338
45339 /* Enable 11a Band only if we have 5G antennas */
45340diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
45341index 7ef0b4a..ff65c28 100644
45342--- a/drivers/net/wireless/zd1211rw/zd_usb.c
45343+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
45344@@ -386,7 +386,7 @@ static inline void handle_regs_int(struct urb *urb)
45345 {
45346 struct zd_usb *usb = urb->context;
45347 struct zd_usb_interrupt *intr = &usb->intr;
45348- int len;
45349+ unsigned int len;
45350 u16 int_num;
45351
45352 ZD_ASSERT(in_interrupt());
45353diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
45354index 59f95d8..53e0e7f 100644
45355--- a/drivers/nfc/nfcwilink.c
45356+++ b/drivers/nfc/nfcwilink.c
45357@@ -513,7 +513,7 @@ static struct nci_ops nfcwilink_ops = {
45358
45359 static int nfcwilink_probe(struct platform_device *pdev)
45360 {
45361- static struct nfcwilink *drv;
45362+ struct nfcwilink *drv;
45363 int rc;
45364 __u32 protocols;
45365
45366diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
45367index d93b2b6..ae50401 100644
45368--- a/drivers/oprofile/buffer_sync.c
45369+++ b/drivers/oprofile/buffer_sync.c
45370@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
45371 if (cookie == NO_COOKIE)
45372 offset = pc;
45373 if (cookie == INVALID_COOKIE) {
45374- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
45375+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
45376 offset = pc;
45377 }
45378 if (cookie != last_cookie) {
45379@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
45380 /* add userspace sample */
45381
45382 if (!mm) {
45383- atomic_inc(&oprofile_stats.sample_lost_no_mm);
45384+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
45385 return 0;
45386 }
45387
45388 cookie = lookup_dcookie(mm, s->eip, &offset);
45389
45390 if (cookie == INVALID_COOKIE) {
45391- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
45392+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
45393 return 0;
45394 }
45395
45396@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
45397 /* ignore backtraces if failed to add a sample */
45398 if (state == sb_bt_start) {
45399 state = sb_bt_ignore;
45400- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
45401+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
45402 }
45403 }
45404 release_mm(mm);
45405diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
45406index c0cc4e7..44d4e54 100644
45407--- a/drivers/oprofile/event_buffer.c
45408+++ b/drivers/oprofile/event_buffer.c
45409@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
45410 }
45411
45412 if (buffer_pos == buffer_size) {
45413- atomic_inc(&oprofile_stats.event_lost_overflow);
45414+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
45415 return;
45416 }
45417
45418diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
45419index ed2c3ec..deda85a 100644
45420--- a/drivers/oprofile/oprof.c
45421+++ b/drivers/oprofile/oprof.c
45422@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
45423 if (oprofile_ops.switch_events())
45424 return;
45425
45426- atomic_inc(&oprofile_stats.multiplex_counter);
45427+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
45428 start_switch_worker();
45429 }
45430
45431diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
45432index ee2cfce..7f8f699 100644
45433--- a/drivers/oprofile/oprofile_files.c
45434+++ b/drivers/oprofile/oprofile_files.c
45435@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
45436
45437 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
45438
45439-static ssize_t timeout_read(struct file *file, char __user *buf,
45440+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
45441 size_t count, loff_t *offset)
45442 {
45443 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
45444diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
45445index 59659ce..6c860a0 100644
45446--- a/drivers/oprofile/oprofile_stats.c
45447+++ b/drivers/oprofile/oprofile_stats.c
45448@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
45449 cpu_buf->sample_invalid_eip = 0;
45450 }
45451
45452- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
45453- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
45454- atomic_set(&oprofile_stats.event_lost_overflow, 0);
45455- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
45456- atomic_set(&oprofile_stats.multiplex_counter, 0);
45457+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
45458+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
45459+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
45460+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
45461+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
45462 }
45463
45464
45465diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
45466index 1fc622b..8c48fc3 100644
45467--- a/drivers/oprofile/oprofile_stats.h
45468+++ b/drivers/oprofile/oprofile_stats.h
45469@@ -13,11 +13,11 @@
45470 #include <linux/atomic.h>
45471
45472 struct oprofile_stat_struct {
45473- atomic_t sample_lost_no_mm;
45474- atomic_t sample_lost_no_mapping;
45475- atomic_t bt_lost_no_mapping;
45476- atomic_t event_lost_overflow;
45477- atomic_t multiplex_counter;
45478+ atomic_unchecked_t sample_lost_no_mm;
45479+ atomic_unchecked_t sample_lost_no_mapping;
45480+ atomic_unchecked_t bt_lost_no_mapping;
45481+ atomic_unchecked_t event_lost_overflow;
45482+ atomic_unchecked_t multiplex_counter;
45483 };
45484
45485 extern struct oprofile_stat_struct oprofile_stats;
45486diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
45487index 3f49345..c750d0b 100644
45488--- a/drivers/oprofile/oprofilefs.c
45489+++ b/drivers/oprofile/oprofilefs.c
45490@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
45491
45492 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
45493 {
45494- atomic_t *val = file->private_data;
45495- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
45496+ atomic_unchecked_t *val = file->private_data;
45497+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
45498 }
45499
45500
45501@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
45502
45503
45504 int oprofilefs_create_ro_atomic(struct dentry *root,
45505- char const *name, atomic_t *val)
45506+ char const *name, atomic_unchecked_t *val)
45507 {
45508 return __oprofilefs_create_file(root, name,
45509 &atomic_ro_fops, 0444, val);
45510diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
45511index 61be1d9..dec05d7 100644
45512--- a/drivers/oprofile/timer_int.c
45513+++ b/drivers/oprofile/timer_int.c
45514@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
45515 return NOTIFY_OK;
45516 }
45517
45518-static struct notifier_block __refdata oprofile_cpu_notifier = {
45519+static struct notifier_block oprofile_cpu_notifier = {
45520 .notifier_call = oprofile_cpu_notify,
45521 };
45522
45523diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
45524index 92ed045..62d39bd7 100644
45525--- a/drivers/parport/procfs.c
45526+++ b/drivers/parport/procfs.c
45527@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
45528
45529 *ppos += len;
45530
45531- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
45532+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
45533 }
45534
45535 #ifdef CONFIG_PARPORT_1284
45536@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
45537
45538 *ppos += len;
45539
45540- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
45541+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
45542 }
45543 #endif /* IEEE1284.3 support. */
45544
45545diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
45546index 2f5786c..61ab4d1 100644
45547--- a/drivers/pci/hotplug/acpiphp_ibm.c
45548+++ b/drivers/pci/hotplug/acpiphp_ibm.c
45549@@ -463,7 +463,9 @@ static int __init ibm_acpiphp_init(void)
45550 goto init_cleanup;
45551 }
45552
45553- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
45554+ pax_open_kernel();
45555+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
45556+ pax_close_kernel();
45557 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
45558
45559 return retval;
45560diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
45561index a6a71c4..c91097b 100644
45562--- a/drivers/pci/hotplug/cpcihp_generic.c
45563+++ b/drivers/pci/hotplug/cpcihp_generic.c
45564@@ -73,7 +73,6 @@ static u16 port;
45565 static unsigned int enum_bit;
45566 static u8 enum_mask;
45567
45568-static struct cpci_hp_controller_ops generic_hpc_ops;
45569 static struct cpci_hp_controller generic_hpc;
45570
45571 static int __init validate_parameters(void)
45572@@ -139,6 +138,10 @@ static int query_enum(void)
45573 return ((value & enum_mask) == enum_mask);
45574 }
45575
45576+static struct cpci_hp_controller_ops generic_hpc_ops = {
45577+ .query_enum = query_enum,
45578+};
45579+
45580 static int __init cpcihp_generic_init(void)
45581 {
45582 int status;
45583@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
45584 pci_dev_put(dev);
45585
45586 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
45587- generic_hpc_ops.query_enum = query_enum;
45588 generic_hpc.ops = &generic_hpc_ops;
45589
45590 status = cpci_hp_register_controller(&generic_hpc);
45591diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
45592index 449b4bb..257e2e8 100644
45593--- a/drivers/pci/hotplug/cpcihp_zt5550.c
45594+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
45595@@ -59,7 +59,6 @@
45596 /* local variables */
45597 static bool debug;
45598 static bool poll;
45599-static struct cpci_hp_controller_ops zt5550_hpc_ops;
45600 static struct cpci_hp_controller zt5550_hpc;
45601
45602 /* Primary cPCI bus bridge device */
45603@@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
45604 return 0;
45605 }
45606
45607+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
45608+ .query_enum = zt5550_hc_query_enum,
45609+};
45610+
45611 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
45612 {
45613 int status;
45614@@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
45615 dbg("returned from zt5550_hc_config");
45616
45617 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
45618- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
45619 zt5550_hpc.ops = &zt5550_hpc_ops;
45620 if(!poll) {
45621 zt5550_hpc.irq = hc_dev->irq;
45622 zt5550_hpc.irq_flags = IRQF_SHARED;
45623 zt5550_hpc.dev_id = hc_dev;
45624
45625- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
45626- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
45627- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
45628+ pax_open_kernel();
45629+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
45630+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
45631+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
45632+ pax_open_kernel();
45633 } else {
45634 info("using ENUM# polling mode");
45635 }
45636diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
45637index 76ba8a1..20ca857 100644
45638--- a/drivers/pci/hotplug/cpqphp_nvram.c
45639+++ b/drivers/pci/hotplug/cpqphp_nvram.c
45640@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
45641
45642 void compaq_nvram_init (void __iomem *rom_start)
45643 {
45644+
45645+#ifndef CONFIG_PAX_KERNEXEC
45646 if (rom_start) {
45647 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
45648 }
45649+#endif
45650+
45651 dbg("int15 entry = %p\n", compaq_int15_entry_point);
45652
45653 /* initialize our int15 lock */
45654diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
45655index ec20f74..c1d961e 100644
45656--- a/drivers/pci/hotplug/pci_hotplug_core.c
45657+++ b/drivers/pci/hotplug/pci_hotplug_core.c
45658@@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
45659 return -EINVAL;
45660 }
45661
45662- slot->ops->owner = owner;
45663- slot->ops->mod_name = mod_name;
45664+ pax_open_kernel();
45665+ *(struct module **)&slot->ops->owner = owner;
45666+ *(const char **)&slot->ops->mod_name = mod_name;
45667+ pax_close_kernel();
45668
45669 mutex_lock(&pci_hp_mutex);
45670 /*
45671diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
45672index f4a18f5..ff2463c 100644
45673--- a/drivers/pci/hotplug/pciehp_core.c
45674+++ b/drivers/pci/hotplug/pciehp_core.c
45675@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
45676 struct slot *slot = ctrl->slot;
45677 struct hotplug_slot *hotplug = NULL;
45678 struct hotplug_slot_info *info = NULL;
45679- struct hotplug_slot_ops *ops = NULL;
45680+ hotplug_slot_ops_no_const *ops = NULL;
45681 char name[SLOT_NAME_SIZE];
45682 int retval = -ENOMEM;
45683
45684diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
45685index 7128cfd..a0640d6 100644
45686--- a/drivers/pci/pci-sysfs.c
45687+++ b/drivers/pci/pci-sysfs.c
45688@@ -1083,7 +1083,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
45689 {
45690 /* allocate attribute structure, piggyback attribute name */
45691 int name_len = write_combine ? 13 : 10;
45692- struct bin_attribute *res_attr;
45693+ bin_attribute_no_const *res_attr;
45694 int retval;
45695
45696 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
45697@@ -1268,7 +1268,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
45698 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
45699 {
45700 int retval;
45701- struct bin_attribute *attr;
45702+ bin_attribute_no_const *attr;
45703
45704 /* If the device has VPD, try to expose it in sysfs. */
45705 if (dev->vpd) {
45706@@ -1315,7 +1315,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
45707 {
45708 int retval;
45709 int rom_size = 0;
45710- struct bin_attribute *attr;
45711+ bin_attribute_no_const *attr;
45712
45713 if (!sysfs_initialized)
45714 return -EACCES;
45715diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
45716index 8a00c06..18a9715 100644
45717--- a/drivers/pci/pci.h
45718+++ b/drivers/pci/pci.h
45719@@ -95,7 +95,7 @@ struct pci_vpd_ops {
45720 struct pci_vpd {
45721 unsigned int len;
45722 const struct pci_vpd_ops *ops;
45723- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
45724+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
45725 };
45726
45727 int pci_vpd_pci22_init(struct pci_dev *dev);
45728diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
45729index 403a443..034e050 100644
45730--- a/drivers/pci/pcie/aspm.c
45731+++ b/drivers/pci/pcie/aspm.c
45732@@ -27,9 +27,9 @@
45733 #define MODULE_PARAM_PREFIX "pcie_aspm."
45734
45735 /* Note: those are not register definitions */
45736-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
45737-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
45738-#define ASPM_STATE_L1 (4) /* L1 state */
45739+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
45740+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
45741+#define ASPM_STATE_L1 (4U) /* L1 state */
45742 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
45743 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
45744
45745diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
45746index 7ef0f86..17b710f 100644
45747--- a/drivers/pci/probe.c
45748+++ b/drivers/pci/probe.c
45749@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
45750 struct pci_bus_region region, inverted_region;
45751 bool bar_too_big = false, bar_disabled = false;
45752
45753- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
45754+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
45755
45756 /* No printks while decoding is disabled! */
45757 if (!dev->mmio_always_on) {
45758diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
45759index cdc7836..528635c 100644
45760--- a/drivers/pci/proc.c
45761+++ b/drivers/pci/proc.c
45762@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
45763 static int __init pci_proc_init(void)
45764 {
45765 struct pci_dev *dev = NULL;
45766+
45767+#ifdef CONFIG_GRKERNSEC_PROC_ADD
45768+#ifdef CONFIG_GRKERNSEC_PROC_USER
45769+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
45770+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
45771+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
45772+#endif
45773+#else
45774 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
45775+#endif
45776 proc_create("devices", 0, proc_bus_pci_dir,
45777 &proc_bus_pci_dev_operations);
45778 proc_initialized = 1;
45779diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
45780index 19c313b..ed28b38 100644
45781--- a/drivers/platform/x86/asus-wmi.c
45782+++ b/drivers/platform/x86/asus-wmi.c
45783@@ -1618,6 +1618,10 @@ static int show_dsts(struct seq_file *m, void *data)
45784 int err;
45785 u32 retval = -1;
45786
45787+#ifdef CONFIG_GRKERNSEC_KMEM
45788+ return -EPERM;
45789+#endif
45790+
45791 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
45792
45793 if (err < 0)
45794@@ -1634,6 +1638,10 @@ static int show_devs(struct seq_file *m, void *data)
45795 int err;
45796 u32 retval = -1;
45797
45798+#ifdef CONFIG_GRKERNSEC_KMEM
45799+ return -EPERM;
45800+#endif
45801+
45802 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
45803 &retval);
45804
45805@@ -1658,6 +1666,10 @@ static int show_call(struct seq_file *m, void *data)
45806 union acpi_object *obj;
45807 acpi_status status;
45808
45809+#ifdef CONFIG_GRKERNSEC_KMEM
45810+ return -EPERM;
45811+#endif
45812+
45813 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
45814 1, asus->debug.method_id,
45815 &input, &output);
45816diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
45817index 3e5b4497..dcdfb70 100644
45818--- a/drivers/platform/x86/chromeos_laptop.c
45819+++ b/drivers/platform/x86/chromeos_laptop.c
45820@@ -301,7 +301,7 @@ static int __init setup_tsl2563_als(const struct dmi_system_id *id)
45821 return 0;
45822 }
45823
45824-static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
45825+static struct dmi_system_id __initconst chromeos_laptop_dmi_table[] = {
45826 {
45827 .ident = "Samsung Series 5 550 - Touchpad",
45828 .matches = {
45829diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
45830index 62f8030..c7f2a45 100644
45831--- a/drivers/platform/x86/msi-laptop.c
45832+++ b/drivers/platform/x86/msi-laptop.c
45833@@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
45834
45835 if (!quirks->ec_read_only) {
45836 /* allow userland write sysfs file */
45837- dev_attr_bluetooth.store = store_bluetooth;
45838- dev_attr_wlan.store = store_wlan;
45839- dev_attr_threeg.store = store_threeg;
45840- dev_attr_bluetooth.attr.mode |= S_IWUSR;
45841- dev_attr_wlan.attr.mode |= S_IWUSR;
45842- dev_attr_threeg.attr.mode |= S_IWUSR;
45843+ pax_open_kernel();
45844+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
45845+ *(void **)&dev_attr_wlan.store = store_wlan;
45846+ *(void **)&dev_attr_threeg.store = store_threeg;
45847+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
45848+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
45849+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
45850+ pax_close_kernel();
45851 }
45852
45853 /* disable hardware control by fn key */
45854diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
45855index 70222f2..8c8ce66 100644
45856--- a/drivers/platform/x86/msi-wmi.c
45857+++ b/drivers/platform/x86/msi-wmi.c
45858@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
45859 static void msi_wmi_notify(u32 value, void *context)
45860 {
45861 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
45862- static struct key_entry *key;
45863+ struct key_entry *key;
45864 union acpi_object *obj;
45865 acpi_status status;
45866
45867diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
45868index 3484dd2..13ee730 100644
45869--- a/drivers/platform/x86/sony-laptop.c
45870+++ b/drivers/platform/x86/sony-laptop.c
45871@@ -2448,7 +2448,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
45872 }
45873
45874 /* High speed charging function */
45875-static struct device_attribute *hsc_handle;
45876+static device_attribute_no_const *hsc_handle;
45877
45878 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
45879 struct device_attribute *attr,
45880diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
45881index 4e86e97..04d50d1 100644
45882--- a/drivers/platform/x86/thinkpad_acpi.c
45883+++ b/drivers/platform/x86/thinkpad_acpi.c
45884@@ -2091,7 +2091,7 @@ static int hotkey_mask_get(void)
45885 return 0;
45886 }
45887
45888-void static hotkey_mask_warn_incomplete_mask(void)
45889+static void hotkey_mask_warn_incomplete_mask(void)
45890 {
45891 /* log only what the user can fix... */
45892 const u32 wantedmask = hotkey_driver_mask &
45893@@ -2318,11 +2318,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
45894 }
45895 }
45896
45897-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45898- struct tp_nvram_state *newn,
45899- const u32 event_mask)
45900-{
45901-
45902 #define TPACPI_COMPARE_KEY(__scancode, __member) \
45903 do { \
45904 if ((event_mask & (1 << __scancode)) && \
45905@@ -2336,36 +2331,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45906 tpacpi_hotkey_send_key(__scancode); \
45907 } while (0)
45908
45909- void issue_volchange(const unsigned int oldvol,
45910- const unsigned int newvol)
45911- {
45912- unsigned int i = oldvol;
45913+static void issue_volchange(const unsigned int oldvol,
45914+ const unsigned int newvol,
45915+ const u32 event_mask)
45916+{
45917+ unsigned int i = oldvol;
45918
45919- while (i > newvol) {
45920- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
45921- i--;
45922- }
45923- while (i < newvol) {
45924- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
45925- i++;
45926- }
45927+ while (i > newvol) {
45928+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
45929+ i--;
45930 }
45931+ while (i < newvol) {
45932+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
45933+ i++;
45934+ }
45935+}
45936
45937- void issue_brightnesschange(const unsigned int oldbrt,
45938- const unsigned int newbrt)
45939- {
45940- unsigned int i = oldbrt;
45941+static void issue_brightnesschange(const unsigned int oldbrt,
45942+ const unsigned int newbrt,
45943+ const u32 event_mask)
45944+{
45945+ unsigned int i = oldbrt;
45946
45947- while (i > newbrt) {
45948- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
45949- i--;
45950- }
45951- while (i < newbrt) {
45952- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
45953- i++;
45954- }
45955+ while (i > newbrt) {
45956+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
45957+ i--;
45958+ }
45959+ while (i < newbrt) {
45960+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
45961+ i++;
45962 }
45963+}
45964
45965+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45966+ struct tp_nvram_state *newn,
45967+ const u32 event_mask)
45968+{
45969 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
45970 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
45971 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
45972@@ -2399,7 +2400,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45973 oldn->volume_level != newn->volume_level) {
45974 /* recently muted, or repeated mute keypress, or
45975 * multiple presses ending in mute */
45976- issue_volchange(oldn->volume_level, newn->volume_level);
45977+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
45978 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
45979 }
45980 } else {
45981@@ -2409,7 +2410,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45982 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
45983 }
45984 if (oldn->volume_level != newn->volume_level) {
45985- issue_volchange(oldn->volume_level, newn->volume_level);
45986+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
45987 } else if (oldn->volume_toggle != newn->volume_toggle) {
45988 /* repeated vol up/down keypress at end of scale ? */
45989 if (newn->volume_level == 0)
45990@@ -2422,7 +2423,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
45991 /* handle brightness */
45992 if (oldn->brightness_level != newn->brightness_level) {
45993 issue_brightnesschange(oldn->brightness_level,
45994- newn->brightness_level);
45995+ newn->brightness_level,
45996+ event_mask);
45997 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
45998 /* repeated key presses that didn't change state */
45999 if (newn->brightness_level == 0)
46000@@ -2431,10 +2433,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
46001 && !tp_features.bright_unkfw)
46002 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
46003 }
46004+}
46005
46006 #undef TPACPI_COMPARE_KEY
46007 #undef TPACPI_MAY_SEND_KEY
46008-}
46009
46010 /*
46011 * Polling driver
46012diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
46013index 769d265..a3a05ca 100644
46014--- a/drivers/pnp/pnpbios/bioscalls.c
46015+++ b/drivers/pnp/pnpbios/bioscalls.c
46016@@ -58,7 +58,7 @@ do { \
46017 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
46018 } while(0)
46019
46020-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
46021+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
46022 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
46023
46024 /*
46025@@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
46026
46027 cpu = get_cpu();
46028 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
46029+
46030+ pax_open_kernel();
46031 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
46032+ pax_close_kernel();
46033
46034 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
46035 spin_lock_irqsave(&pnp_bios_lock, flags);
46036@@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
46037 :"memory");
46038 spin_unlock_irqrestore(&pnp_bios_lock, flags);
46039
46040+ pax_open_kernel();
46041 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
46042+ pax_close_kernel();
46043+
46044 put_cpu();
46045
46046 /* If we get here and this is set then the PnP BIOS faulted on us. */
46047@@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
46048 return status;
46049 }
46050
46051-void pnpbios_calls_init(union pnp_bios_install_struct *header)
46052+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
46053 {
46054 int i;
46055
46056@@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
46057 pnp_bios_callpoint.offset = header->fields.pm16offset;
46058 pnp_bios_callpoint.segment = PNP_CS16;
46059
46060+ pax_open_kernel();
46061+
46062 for_each_possible_cpu(i) {
46063 struct desc_struct *gdt = get_cpu_gdt_table(i);
46064 if (!gdt)
46065@@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
46066 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
46067 (unsigned long)__va(header->fields.pm16dseg));
46068 }
46069+
46070+ pax_close_kernel();
46071 }
46072diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
46073index d95e101..67f0c3f 100644
46074--- a/drivers/pnp/resource.c
46075+++ b/drivers/pnp/resource.c
46076@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
46077 return 1;
46078
46079 /* check if the resource is valid */
46080- if (*irq < 0 || *irq > 15)
46081+ if (*irq > 15)
46082 return 0;
46083
46084 /* check if the resource is reserved */
46085@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
46086 return 1;
46087
46088 /* check if the resource is valid */
46089- if (*dma < 0 || *dma == 4 || *dma > 7)
46090+ if (*dma == 4 || *dma > 7)
46091 return 0;
46092
46093 /* check if the resource is reserved */
46094diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
46095index 0c52e2a..3421ab7 100644
46096--- a/drivers/power/pda_power.c
46097+++ b/drivers/power/pda_power.c
46098@@ -37,7 +37,11 @@ static int polling;
46099
46100 #if IS_ENABLED(CONFIG_USB_PHY)
46101 static struct usb_phy *transceiver;
46102-static struct notifier_block otg_nb;
46103+static int otg_handle_notification(struct notifier_block *nb,
46104+ unsigned long event, void *unused);
46105+static struct notifier_block otg_nb = {
46106+ .notifier_call = otg_handle_notification
46107+};
46108 #endif
46109
46110 static struct regulator *ac_draw;
46111@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
46112
46113 #if IS_ENABLED(CONFIG_USB_PHY)
46114 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
46115- otg_nb.notifier_call = otg_handle_notification;
46116 ret = usb_register_notifier(transceiver, &otg_nb);
46117 if (ret) {
46118 dev_err(dev, "failure to register otg notifier\n");
46119diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
46120index cc439fd..8fa30df 100644
46121--- a/drivers/power/power_supply.h
46122+++ b/drivers/power/power_supply.h
46123@@ -16,12 +16,12 @@ struct power_supply;
46124
46125 #ifdef CONFIG_SYSFS
46126
46127-extern void power_supply_init_attrs(struct device_type *dev_type);
46128+extern void power_supply_init_attrs(void);
46129 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
46130
46131 #else
46132
46133-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
46134+static inline void power_supply_init_attrs(void) {}
46135 #define power_supply_uevent NULL
46136
46137 #endif /* CONFIG_SYSFS */
46138diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
46139index 557af94..84dc1fe 100644
46140--- a/drivers/power/power_supply_core.c
46141+++ b/drivers/power/power_supply_core.c
46142@@ -24,7 +24,10 @@
46143 struct class *power_supply_class;
46144 EXPORT_SYMBOL_GPL(power_supply_class);
46145
46146-static struct device_type power_supply_dev_type;
46147+extern const struct attribute_group *power_supply_attr_groups[];
46148+static struct device_type power_supply_dev_type = {
46149+ .groups = power_supply_attr_groups,
46150+};
46151
46152 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
46153 struct power_supply *supply)
46154@@ -584,7 +587,7 @@ static int __init power_supply_class_init(void)
46155 return PTR_ERR(power_supply_class);
46156
46157 power_supply_class->dev_uevent = power_supply_uevent;
46158- power_supply_init_attrs(&power_supply_dev_type);
46159+ power_supply_init_attrs();
46160
46161 return 0;
46162 }
46163diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
46164index 44420d1..967126e 100644
46165--- a/drivers/power/power_supply_sysfs.c
46166+++ b/drivers/power/power_supply_sysfs.c
46167@@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
46168 .is_visible = power_supply_attr_is_visible,
46169 };
46170
46171-static const struct attribute_group *power_supply_attr_groups[] = {
46172+const struct attribute_group *power_supply_attr_groups[] = {
46173 &power_supply_attr_group,
46174 NULL,
46175 };
46176
46177-void power_supply_init_attrs(struct device_type *dev_type)
46178+void power_supply_init_attrs(void)
46179 {
46180 int i;
46181
46182- dev_type->groups = power_supply_attr_groups;
46183-
46184 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
46185 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
46186 }
46187diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
46188index a01b8b3..37c2afe 100644
46189--- a/drivers/regulator/core.c
46190+++ b/drivers/regulator/core.c
46191@@ -3307,7 +3307,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
46192 {
46193 const struct regulation_constraints *constraints = NULL;
46194 const struct regulator_init_data *init_data;
46195- static atomic_t regulator_no = ATOMIC_INIT(0);
46196+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
46197 struct regulator_dev *rdev;
46198 struct device *dev;
46199 int ret, i;
46200@@ -3377,7 +3377,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
46201 rdev->dev.of_node = config->of_node;
46202 rdev->dev.parent = dev;
46203 dev_set_name(&rdev->dev, "regulator.%d",
46204- atomic_inc_return(&regulator_no) - 1);
46205+ atomic_inc_return_unchecked(&regulator_no) - 1);
46206 ret = device_register(&rdev->dev);
46207 if (ret != 0) {
46208 put_device(&rdev->dev);
46209diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
46210index 144bcac..d20e7db 100644
46211--- a/drivers/regulator/max8660.c
46212+++ b/drivers/regulator/max8660.c
46213@@ -420,8 +420,10 @@ static int max8660_probe(struct i2c_client *client,
46214 max8660->shadow_regs[MAX8660_OVER1] = 5;
46215 } else {
46216 /* Otherwise devices can be toggled via software */
46217- max8660_dcdc_ops.enable = max8660_dcdc_enable;
46218- max8660_dcdc_ops.disable = max8660_dcdc_disable;
46219+ pax_open_kernel();
46220+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
46221+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
46222+ pax_close_kernel();
46223 }
46224
46225 /*
46226diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
46227index 5b77ab7..a62f061 100644
46228--- a/drivers/regulator/max8973-regulator.c
46229+++ b/drivers/regulator/max8973-regulator.c
46230@@ -406,9 +406,11 @@ static int max8973_probe(struct i2c_client *client,
46231 if (!pdata || !pdata->enable_ext_control) {
46232 max->desc.enable_reg = MAX8973_VOUT;
46233 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
46234- max->ops.enable = regulator_enable_regmap;
46235- max->ops.disable = regulator_disable_regmap;
46236- max->ops.is_enabled = regulator_is_enabled_regmap;
46237+ pax_open_kernel();
46238+ *(void **)&max->ops.enable = regulator_enable_regmap;
46239+ *(void **)&max->ops.disable = regulator_disable_regmap;
46240+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
46241+ pax_close_kernel();
46242 }
46243
46244 if (pdata) {
46245diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
46246index 1037e07..e64dea1 100644
46247--- a/drivers/regulator/mc13892-regulator.c
46248+++ b/drivers/regulator/mc13892-regulator.c
46249@@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
46250 }
46251 mc13xxx_unlock(mc13892);
46252
46253- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
46254+ pax_open_kernel();
46255+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
46256 = mc13892_vcam_set_mode;
46257- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
46258+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
46259 = mc13892_vcam_get_mode;
46260+ pax_close_kernel();
46261
46262 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
46263 ARRAY_SIZE(mc13892_regulators));
46264diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
46265index 24e733c..bfbaa3e 100644
46266--- a/drivers/rtc/rtc-cmos.c
46267+++ b/drivers/rtc/rtc-cmos.c
46268@@ -731,7 +731,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
46269 hpet_rtc_timer_init();
46270
46271 /* export at least the first block of NVRAM */
46272- nvram.size = address_space - NVRAM_OFFSET;
46273+ pax_open_kernel();
46274+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
46275+ pax_close_kernel();
46276 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
46277 if (retval < 0) {
46278 dev_dbg(dev, "can't create nvram file? %d\n", retval);
46279diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
46280index d049393..bb20be0 100644
46281--- a/drivers/rtc/rtc-dev.c
46282+++ b/drivers/rtc/rtc-dev.c
46283@@ -16,6 +16,7 @@
46284 #include <linux/module.h>
46285 #include <linux/rtc.h>
46286 #include <linux/sched.h>
46287+#include <linux/grsecurity.h>
46288 #include "rtc-core.h"
46289
46290 static dev_t rtc_devt;
46291@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
46292 if (copy_from_user(&tm, uarg, sizeof(tm)))
46293 return -EFAULT;
46294
46295+ gr_log_timechange();
46296+
46297 return rtc_set_time(rtc, &tm);
46298
46299 case RTC_PIE_ON:
46300diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
46301index ca18fd1..055e42d 100644
46302--- a/drivers/rtc/rtc-ds1307.c
46303+++ b/drivers/rtc/rtc-ds1307.c
46304@@ -107,7 +107,7 @@ struct ds1307 {
46305 u8 offset; /* register's offset */
46306 u8 regs[11];
46307 u16 nvram_offset;
46308- struct bin_attribute *nvram;
46309+ bin_attribute_no_const *nvram;
46310 enum ds_type type;
46311 unsigned long flags;
46312 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
46313diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
46314index fcb0329..d77b7f2 100644
46315--- a/drivers/rtc/rtc-m48t59.c
46316+++ b/drivers/rtc/rtc-m48t59.c
46317@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
46318 if (IS_ERR(m48t59->rtc))
46319 return PTR_ERR(m48t59->rtc);
46320
46321- m48t59_nvram_attr.size = pdata->offset;
46322+ pax_open_kernel();
46323+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
46324+ pax_close_kernel();
46325
46326 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
46327 if (ret)
46328diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
46329index 14b5f8d..cc9bd26 100644
46330--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
46331+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
46332@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
46333 for (bit = 0; bit < 8; bit++) {
46334
46335 if ((pci_status[i] & (0x1 << bit)) != 0) {
46336- static const char *s;
46337+ const char *s;
46338
46339 s = pci_status_strings[bit];
46340 if (i == 7/*TARG*/ && bit == 3)
46341@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
46342
46343 for (bit = 0; bit < 8; bit++) {
46344
46345- if ((split_status[i] & (0x1 << bit)) != 0) {
46346- static const char *s;
46347-
46348- s = split_status_strings[bit];
46349- printk(s, ahd_name(ahd),
46350+ if ((split_status[i] & (0x1 << bit)) != 0)
46351+ printk(split_status_strings[bit], ahd_name(ahd),
46352 split_status_source[i]);
46353- }
46354
46355 if (i > 1)
46356 continue;
46357
46358- if ((sg_split_status[i] & (0x1 << bit)) != 0) {
46359- static const char *s;
46360-
46361- s = split_status_strings[bit];
46362- printk(s, ahd_name(ahd), "SG");
46363- }
46364+ if ((sg_split_status[i] & (0x1 << bit)) != 0)
46365+ printk(split_status_strings[bit], ahd_name(ahd), "SG");
46366 }
46367 }
46368 /*
46369diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
46370index e693af6..2e525b6 100644
46371--- a/drivers/scsi/bfa/bfa_fcpim.h
46372+++ b/drivers/scsi/bfa/bfa_fcpim.h
46373@@ -36,7 +36,7 @@ struct bfa_iotag_s {
46374
46375 struct bfa_itn_s {
46376 bfa_isr_func_t isr;
46377-};
46378+} __no_const;
46379
46380 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
46381 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
46382diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
46383index 90814fe..4384138 100644
46384--- a/drivers/scsi/bfa/bfa_ioc.h
46385+++ b/drivers/scsi/bfa/bfa_ioc.h
46386@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
46387 bfa_ioc_disable_cbfn_t disable_cbfn;
46388 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
46389 bfa_ioc_reset_cbfn_t reset_cbfn;
46390-};
46391+} __no_const;
46392
46393 /*
46394 * IOC event notification mechanism.
46395@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
46396 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
46397 enum bfi_ioc_state fwstate);
46398 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
46399-};
46400+} __no_const;
46401
46402 /*
46403 * Queue element to wait for room in request queue. FIFO order is
46404diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
46405index c9382d6..6619864 100644
46406--- a/drivers/scsi/fcoe/fcoe_sysfs.c
46407+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
46408@@ -33,8 +33,8 @@
46409 */
46410 #include "libfcoe.h"
46411
46412-static atomic_t ctlr_num;
46413-static atomic_t fcf_num;
46414+static atomic_unchecked_t ctlr_num;
46415+static atomic_unchecked_t fcf_num;
46416
46417 /*
46418 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
46419@@ -681,7 +681,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
46420 if (!ctlr)
46421 goto out;
46422
46423- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
46424+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
46425 ctlr->f = f;
46426 ctlr->mode = FIP_CONN_TYPE_FABRIC;
46427 INIT_LIST_HEAD(&ctlr->fcfs);
46428@@ -898,7 +898,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
46429 fcf->dev.parent = &ctlr->dev;
46430 fcf->dev.bus = &fcoe_bus_type;
46431 fcf->dev.type = &fcoe_fcf_device_type;
46432- fcf->id = atomic_inc_return(&fcf_num) - 1;
46433+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
46434 fcf->state = FCOE_FCF_STATE_UNKNOWN;
46435
46436 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
46437@@ -934,8 +934,8 @@ int __init fcoe_sysfs_setup(void)
46438 {
46439 int error;
46440
46441- atomic_set(&ctlr_num, 0);
46442- atomic_set(&fcf_num, 0);
46443+ atomic_set_unchecked(&ctlr_num, 0);
46444+ atomic_set_unchecked(&fcf_num, 0);
46445
46446 error = bus_register(&fcoe_bus_type);
46447 if (error)
46448diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
46449index 3cafe0d..f1e87f8 100644
46450--- a/drivers/scsi/hosts.c
46451+++ b/drivers/scsi/hosts.c
46452@@ -42,7 +42,7 @@
46453 #include "scsi_logging.h"
46454
46455
46456-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
46457+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
46458
46459
46460 static void scsi_host_cls_release(struct device *dev)
46461@@ -361,7 +361,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
46462 * subtract one because we increment first then return, but we need to
46463 * know what the next host number was before increment
46464 */
46465- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
46466+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
46467 shost->dma_channel = 0xff;
46468
46469 /* These three are default values which can be overridden */
46470diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
46471index 0eb0940..3ca9b79 100644
46472--- a/drivers/scsi/hpsa.c
46473+++ b/drivers/scsi/hpsa.c
46474@@ -579,7 +579,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
46475 unsigned long flags;
46476
46477 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
46478- return h->access.command_completed(h, q);
46479+ return h->access->command_completed(h, q);
46480
46481 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
46482 a = rq->head[rq->current_entry];
46483@@ -3445,7 +3445,7 @@ static void start_io(struct ctlr_info *h)
46484 while (!list_empty(&h->reqQ)) {
46485 c = list_entry(h->reqQ.next, struct CommandList, list);
46486 /* can't do anything if fifo is full */
46487- if ((h->access.fifo_full(h))) {
46488+ if ((h->access->fifo_full(h))) {
46489 dev_warn(&h->pdev->dev, "fifo full\n");
46490 break;
46491 }
46492@@ -3467,7 +3467,7 @@ static void start_io(struct ctlr_info *h)
46493
46494 /* Tell the controller execute command */
46495 spin_unlock_irqrestore(&h->lock, flags);
46496- h->access.submit_command(h, c);
46497+ h->access->submit_command(h, c);
46498 spin_lock_irqsave(&h->lock, flags);
46499 }
46500 spin_unlock_irqrestore(&h->lock, flags);
46501@@ -3475,17 +3475,17 @@ static void start_io(struct ctlr_info *h)
46502
46503 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
46504 {
46505- return h->access.command_completed(h, q);
46506+ return h->access->command_completed(h, q);
46507 }
46508
46509 static inline bool interrupt_pending(struct ctlr_info *h)
46510 {
46511- return h->access.intr_pending(h);
46512+ return h->access->intr_pending(h);
46513 }
46514
46515 static inline long interrupt_not_for_us(struct ctlr_info *h)
46516 {
46517- return (h->access.intr_pending(h) == 0) ||
46518+ return (h->access->intr_pending(h) == 0) ||
46519 (h->interrupts_enabled == 0);
46520 }
46521
46522@@ -4387,7 +4387,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
46523 if (prod_index < 0)
46524 return -ENODEV;
46525 h->product_name = products[prod_index].product_name;
46526- h->access = *(products[prod_index].access);
46527+ h->access = products[prod_index].access;
46528
46529 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
46530 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
46531@@ -4669,7 +4669,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
46532
46533 assert_spin_locked(&lockup_detector_lock);
46534 remove_ctlr_from_lockup_detector_list(h);
46535- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46536+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46537 spin_lock_irqsave(&h->lock, flags);
46538 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
46539 spin_unlock_irqrestore(&h->lock, flags);
46540@@ -4846,7 +4846,7 @@ reinit_after_soft_reset:
46541 }
46542
46543 /* make sure the board interrupts are off */
46544- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46545+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46546
46547 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
46548 goto clean2;
46549@@ -4880,7 +4880,7 @@ reinit_after_soft_reset:
46550 * fake ones to scoop up any residual completions.
46551 */
46552 spin_lock_irqsave(&h->lock, flags);
46553- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46554+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46555 spin_unlock_irqrestore(&h->lock, flags);
46556 free_irqs(h);
46557 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
46558@@ -4899,9 +4899,9 @@ reinit_after_soft_reset:
46559 dev_info(&h->pdev->dev, "Board READY.\n");
46560 dev_info(&h->pdev->dev,
46561 "Waiting for stale completions to drain.\n");
46562- h->access.set_intr_mask(h, HPSA_INTR_ON);
46563+ h->access->set_intr_mask(h, HPSA_INTR_ON);
46564 msleep(10000);
46565- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46566+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46567
46568 rc = controller_reset_failed(h->cfgtable);
46569 if (rc)
46570@@ -4922,7 +4922,7 @@ reinit_after_soft_reset:
46571 }
46572
46573 /* Turn the interrupts on so we can service requests */
46574- h->access.set_intr_mask(h, HPSA_INTR_ON);
46575+ h->access->set_intr_mask(h, HPSA_INTR_ON);
46576
46577 hpsa_hba_inquiry(h);
46578 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
46579@@ -4977,7 +4977,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
46580 * To write all data in the battery backed cache to disks
46581 */
46582 hpsa_flush_cache(h);
46583- h->access.set_intr_mask(h, HPSA_INTR_OFF);
46584+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
46585 hpsa_free_irqs_and_disable_msix(h);
46586 }
46587
46588@@ -5145,7 +5145,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
46589 return;
46590 }
46591 /* Change the access methods to the performant access methods */
46592- h->access = SA5_performant_access;
46593+ h->access = &SA5_performant_access;
46594 h->transMethod = CFGTBL_Trans_Performant;
46595 }
46596
46597diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
46598index bc85e72..ae04a39 100644
46599--- a/drivers/scsi/hpsa.h
46600+++ b/drivers/scsi/hpsa.h
46601@@ -79,7 +79,7 @@ struct ctlr_info {
46602 unsigned int msix_vector;
46603 unsigned int msi_vector;
46604 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
46605- struct access_method access;
46606+ struct access_method *access;
46607
46608 /* queue and queue Info */
46609 struct list_head reqQ;
46610diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
46611index 5879929..32b241d 100644
46612--- a/drivers/scsi/libfc/fc_exch.c
46613+++ b/drivers/scsi/libfc/fc_exch.c
46614@@ -100,12 +100,12 @@ struct fc_exch_mgr {
46615 u16 pool_max_index;
46616
46617 struct {
46618- atomic_t no_free_exch;
46619- atomic_t no_free_exch_xid;
46620- atomic_t xid_not_found;
46621- atomic_t xid_busy;
46622- atomic_t seq_not_found;
46623- atomic_t non_bls_resp;
46624+ atomic_unchecked_t no_free_exch;
46625+ atomic_unchecked_t no_free_exch_xid;
46626+ atomic_unchecked_t xid_not_found;
46627+ atomic_unchecked_t xid_busy;
46628+ atomic_unchecked_t seq_not_found;
46629+ atomic_unchecked_t non_bls_resp;
46630 } stats;
46631 };
46632
46633@@ -736,7 +736,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
46634 /* allocate memory for exchange */
46635 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
46636 if (!ep) {
46637- atomic_inc(&mp->stats.no_free_exch);
46638+ atomic_inc_unchecked(&mp->stats.no_free_exch);
46639 goto out;
46640 }
46641 memset(ep, 0, sizeof(*ep));
46642@@ -797,7 +797,7 @@ out:
46643 return ep;
46644 err:
46645 spin_unlock_bh(&pool->lock);
46646- atomic_inc(&mp->stats.no_free_exch_xid);
46647+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
46648 mempool_free(ep, mp->ep_pool);
46649 return NULL;
46650 }
46651@@ -940,7 +940,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46652 xid = ntohs(fh->fh_ox_id); /* we originated exch */
46653 ep = fc_exch_find(mp, xid);
46654 if (!ep) {
46655- atomic_inc(&mp->stats.xid_not_found);
46656+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46657 reject = FC_RJT_OX_ID;
46658 goto out;
46659 }
46660@@ -970,7 +970,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46661 ep = fc_exch_find(mp, xid);
46662 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
46663 if (ep) {
46664- atomic_inc(&mp->stats.xid_busy);
46665+ atomic_inc_unchecked(&mp->stats.xid_busy);
46666 reject = FC_RJT_RX_ID;
46667 goto rel;
46668 }
46669@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46670 }
46671 xid = ep->xid; /* get our XID */
46672 } else if (!ep) {
46673- atomic_inc(&mp->stats.xid_not_found);
46674+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46675 reject = FC_RJT_RX_ID; /* XID not found */
46676 goto out;
46677 }
46678@@ -998,7 +998,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
46679 } else {
46680 sp = &ep->seq;
46681 if (sp->id != fh->fh_seq_id) {
46682- atomic_inc(&mp->stats.seq_not_found);
46683+ atomic_inc_unchecked(&mp->stats.seq_not_found);
46684 if (f_ctl & FC_FC_END_SEQ) {
46685 /*
46686 * Update sequence_id based on incoming last
46687@@ -1448,22 +1448,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46688
46689 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
46690 if (!ep) {
46691- atomic_inc(&mp->stats.xid_not_found);
46692+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46693 goto out;
46694 }
46695 if (ep->esb_stat & ESB_ST_COMPLETE) {
46696- atomic_inc(&mp->stats.xid_not_found);
46697+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46698 goto rel;
46699 }
46700 if (ep->rxid == FC_XID_UNKNOWN)
46701 ep->rxid = ntohs(fh->fh_rx_id);
46702 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
46703- atomic_inc(&mp->stats.xid_not_found);
46704+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46705 goto rel;
46706 }
46707 if (ep->did != ntoh24(fh->fh_s_id) &&
46708 ep->did != FC_FID_FLOGI) {
46709- atomic_inc(&mp->stats.xid_not_found);
46710+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46711 goto rel;
46712 }
46713 sof = fr_sof(fp);
46714@@ -1472,7 +1472,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46715 sp->ssb_stat |= SSB_ST_RESP;
46716 sp->id = fh->fh_seq_id;
46717 } else if (sp->id != fh->fh_seq_id) {
46718- atomic_inc(&mp->stats.seq_not_found);
46719+ atomic_inc_unchecked(&mp->stats.seq_not_found);
46720 goto rel;
46721 }
46722
46723@@ -1536,9 +1536,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
46724 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
46725
46726 if (!sp)
46727- atomic_inc(&mp->stats.xid_not_found);
46728+ atomic_inc_unchecked(&mp->stats.xid_not_found);
46729 else
46730- atomic_inc(&mp->stats.non_bls_resp);
46731+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
46732
46733 fc_frame_free(fp);
46734 }
46735@@ -2185,13 +2185,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
46736
46737 list_for_each_entry(ema, &lport->ema_list, ema_list) {
46738 mp = ema->mp;
46739- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
46740+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
46741 st->fc_no_free_exch_xid +=
46742- atomic_read(&mp->stats.no_free_exch_xid);
46743- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
46744- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
46745- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
46746- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
46747+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
46748+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
46749+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
46750+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
46751+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
46752 }
46753 }
46754 EXPORT_SYMBOL(fc_exch_update_stats);
46755diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
46756index d289583..b745eec 100644
46757--- a/drivers/scsi/libsas/sas_ata.c
46758+++ b/drivers/scsi/libsas/sas_ata.c
46759@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
46760 .postreset = ata_std_postreset,
46761 .error_handler = ata_std_error_handler,
46762 .post_internal_cmd = sas_ata_post_internal,
46763- .qc_defer = ata_std_qc_defer,
46764+ .qc_defer = ata_std_qc_defer,
46765 .qc_prep = ata_noop_qc_prep,
46766 .qc_issue = sas_ata_qc_issue,
46767 .qc_fill_rtf = sas_ata_qc_fill_rtf,
46768diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
46769index 4e1b75c..0bbdfa9 100644
46770--- a/drivers/scsi/lpfc/lpfc.h
46771+++ b/drivers/scsi/lpfc/lpfc.h
46772@@ -432,7 +432,7 @@ struct lpfc_vport {
46773 struct dentry *debug_nodelist;
46774 struct dentry *vport_debugfs_root;
46775 struct lpfc_debugfs_trc *disc_trc;
46776- atomic_t disc_trc_cnt;
46777+ atomic_unchecked_t disc_trc_cnt;
46778 #endif
46779 uint8_t stat_data_enabled;
46780 uint8_t stat_data_blocked;
46781@@ -865,8 +865,8 @@ struct lpfc_hba {
46782 struct timer_list fabric_block_timer;
46783 unsigned long bit_flags;
46784 #define FABRIC_COMANDS_BLOCKED 0
46785- atomic_t num_rsrc_err;
46786- atomic_t num_cmd_success;
46787+ atomic_unchecked_t num_rsrc_err;
46788+ atomic_unchecked_t num_cmd_success;
46789 unsigned long last_rsrc_error_time;
46790 unsigned long last_ramp_down_time;
46791 unsigned long last_ramp_up_time;
46792@@ -902,7 +902,7 @@ struct lpfc_hba {
46793
46794 struct dentry *debug_slow_ring_trc;
46795 struct lpfc_debugfs_trc *slow_ring_trc;
46796- atomic_t slow_ring_trc_cnt;
46797+ atomic_unchecked_t slow_ring_trc_cnt;
46798 /* iDiag debugfs sub-directory */
46799 struct dentry *idiag_root;
46800 struct dentry *idiag_pci_cfg;
46801diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
46802index 60084e6..0e2e700 100644
46803--- a/drivers/scsi/lpfc/lpfc_debugfs.c
46804+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
46805@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
46806
46807 #include <linux/debugfs.h>
46808
46809-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
46810+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
46811 static unsigned long lpfc_debugfs_start_time = 0L;
46812
46813 /* iDiag */
46814@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
46815 lpfc_debugfs_enable = 0;
46816
46817 len = 0;
46818- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
46819+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
46820 (lpfc_debugfs_max_disc_trc - 1);
46821 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
46822 dtp = vport->disc_trc + i;
46823@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
46824 lpfc_debugfs_enable = 0;
46825
46826 len = 0;
46827- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
46828+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
46829 (lpfc_debugfs_max_slow_ring_trc - 1);
46830 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
46831 dtp = phba->slow_ring_trc + i;
46832@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
46833 !vport || !vport->disc_trc)
46834 return;
46835
46836- index = atomic_inc_return(&vport->disc_trc_cnt) &
46837+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
46838 (lpfc_debugfs_max_disc_trc - 1);
46839 dtp = vport->disc_trc + index;
46840 dtp->fmt = fmt;
46841 dtp->data1 = data1;
46842 dtp->data2 = data2;
46843 dtp->data3 = data3;
46844- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
46845+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
46846 dtp->jif = jiffies;
46847 #endif
46848 return;
46849@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
46850 !phba || !phba->slow_ring_trc)
46851 return;
46852
46853- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
46854+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
46855 (lpfc_debugfs_max_slow_ring_trc - 1);
46856 dtp = phba->slow_ring_trc + index;
46857 dtp->fmt = fmt;
46858 dtp->data1 = data1;
46859 dtp->data2 = data2;
46860 dtp->data3 = data3;
46861- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
46862+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
46863 dtp->jif = jiffies;
46864 #endif
46865 return;
46866@@ -4168,7 +4168,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
46867 "slow_ring buffer\n");
46868 goto debug_failed;
46869 }
46870- atomic_set(&phba->slow_ring_trc_cnt, 0);
46871+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
46872 memset(phba->slow_ring_trc, 0,
46873 (sizeof(struct lpfc_debugfs_trc) *
46874 lpfc_debugfs_max_slow_ring_trc));
46875@@ -4214,7 +4214,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
46876 "buffer\n");
46877 goto debug_failed;
46878 }
46879- atomic_set(&vport->disc_trc_cnt, 0);
46880+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
46881
46882 snprintf(name, sizeof(name), "discovery_trace");
46883 vport->debug_disc_trc =
46884diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
46885index 647f5bf..d0068b9 100644
46886--- a/drivers/scsi/lpfc/lpfc_init.c
46887+++ b/drivers/scsi/lpfc/lpfc_init.c
46888@@ -10952,8 +10952,10 @@ lpfc_init(void)
46889 "misc_register returned with status %d", error);
46890
46891 if (lpfc_enable_npiv) {
46892- lpfc_transport_functions.vport_create = lpfc_vport_create;
46893- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
46894+ pax_open_kernel();
46895+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
46896+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
46897+ pax_close_kernel();
46898 }
46899 lpfc_transport_template =
46900 fc_attach_transport(&lpfc_transport_functions);
46901diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
46902index c913e8c..d34a119 100644
46903--- a/drivers/scsi/lpfc/lpfc_scsi.c
46904+++ b/drivers/scsi/lpfc/lpfc_scsi.c
46905@@ -353,7 +353,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
46906 uint32_t evt_posted;
46907
46908 spin_lock_irqsave(&phba->hbalock, flags);
46909- atomic_inc(&phba->num_rsrc_err);
46910+ atomic_inc_unchecked(&phba->num_rsrc_err);
46911 phba->last_rsrc_error_time = jiffies;
46912
46913 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
46914@@ -394,7 +394,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
46915 unsigned long flags;
46916 struct lpfc_hba *phba = vport->phba;
46917 uint32_t evt_posted;
46918- atomic_inc(&phba->num_cmd_success);
46919+ atomic_inc_unchecked(&phba->num_cmd_success);
46920
46921 if (vport->cfg_lun_queue_depth <= queue_depth)
46922 return;
46923@@ -438,8 +438,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
46924 unsigned long num_rsrc_err, num_cmd_success;
46925 int i;
46926
46927- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
46928- num_cmd_success = atomic_read(&phba->num_cmd_success);
46929+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
46930+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
46931
46932 /*
46933 * The error and success command counters are global per
46934@@ -467,8 +467,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
46935 }
46936 }
46937 lpfc_destroy_vport_work_array(phba, vports);
46938- atomic_set(&phba->num_rsrc_err, 0);
46939- atomic_set(&phba->num_cmd_success, 0);
46940+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
46941+ atomic_set_unchecked(&phba->num_cmd_success, 0);
46942 }
46943
46944 /**
46945@@ -502,8 +502,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
46946 }
46947 }
46948 lpfc_destroy_vport_work_array(phba, vports);
46949- atomic_set(&phba->num_rsrc_err, 0);
46950- atomic_set(&phba->num_cmd_success, 0);
46951+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
46952+ atomic_set_unchecked(&phba->num_cmd_success, 0);
46953 }
46954
46955 /**
46956diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
46957index 7f0af4f..193ac3e 100644
46958--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
46959+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
46960@@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
46961 {
46962 struct scsi_device *sdev = to_scsi_device(dev);
46963 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
46964- static struct _raid_device *raid_device;
46965+ struct _raid_device *raid_device;
46966 unsigned long flags;
46967 Mpi2RaidVolPage0_t vol_pg0;
46968 Mpi2ConfigReply_t mpi_reply;
46969@@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
46970 {
46971 struct scsi_device *sdev = to_scsi_device(dev);
46972 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
46973- static struct _raid_device *raid_device;
46974+ struct _raid_device *raid_device;
46975 unsigned long flags;
46976 Mpi2RaidVolPage0_t vol_pg0;
46977 Mpi2ConfigReply_t mpi_reply;
46978@@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
46979 struct fw_event_work *fw_event)
46980 {
46981 Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
46982- static struct _raid_device *raid_device;
46983+ struct _raid_device *raid_device;
46984 unsigned long flags;
46985 u16 handle;
46986
46987@@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
46988 u64 sas_address;
46989 struct _sas_device *sas_device;
46990 struct _sas_node *expander_device;
46991- static struct _raid_device *raid_device;
46992+ struct _raid_device *raid_device;
46993 u8 retry_count;
46994 unsigned long flags;
46995
46996diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
46997index a38f71b..f3bc572 100644
46998--- a/drivers/scsi/pmcraid.c
46999+++ b/drivers/scsi/pmcraid.c
47000@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
47001 res->scsi_dev = scsi_dev;
47002 scsi_dev->hostdata = res;
47003 res->change_detected = 0;
47004- atomic_set(&res->read_failures, 0);
47005- atomic_set(&res->write_failures, 0);
47006+ atomic_set_unchecked(&res->read_failures, 0);
47007+ atomic_set_unchecked(&res->write_failures, 0);
47008 rc = 0;
47009 }
47010 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
47011@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
47012
47013 /* If this was a SCSI read/write command keep count of errors */
47014 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
47015- atomic_inc(&res->read_failures);
47016+ atomic_inc_unchecked(&res->read_failures);
47017 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
47018- atomic_inc(&res->write_failures);
47019+ atomic_inc_unchecked(&res->write_failures);
47020
47021 if (!RES_IS_GSCSI(res->cfg_entry) &&
47022 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
47023@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
47024 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
47025 * hrrq_id assigned here in queuecommand
47026 */
47027- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
47028+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
47029 pinstance->num_hrrq;
47030 cmd->cmd_done = pmcraid_io_done;
47031
47032@@ -3846,7 +3846,7 @@ static long pmcraid_ioctl_passthrough(
47033 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
47034 * hrrq_id assigned here in queuecommand
47035 */
47036- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
47037+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
47038 pinstance->num_hrrq;
47039
47040 if (request_size) {
47041@@ -4484,7 +4484,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
47042
47043 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
47044 /* add resources only after host is added into system */
47045- if (!atomic_read(&pinstance->expose_resources))
47046+ if (!atomic_read_unchecked(&pinstance->expose_resources))
47047 return;
47048
47049 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
47050@@ -5311,8 +5311,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
47051 init_waitqueue_head(&pinstance->reset_wait_q);
47052
47053 atomic_set(&pinstance->outstanding_cmds, 0);
47054- atomic_set(&pinstance->last_message_id, 0);
47055- atomic_set(&pinstance->expose_resources, 0);
47056+ atomic_set_unchecked(&pinstance->last_message_id, 0);
47057+ atomic_set_unchecked(&pinstance->expose_resources, 0);
47058
47059 INIT_LIST_HEAD(&pinstance->free_res_q);
47060 INIT_LIST_HEAD(&pinstance->used_res_q);
47061@@ -6025,7 +6025,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
47062 /* Schedule worker thread to handle CCN and take care of adding and
47063 * removing devices to OS
47064 */
47065- atomic_set(&pinstance->expose_resources, 1);
47066+ atomic_set_unchecked(&pinstance->expose_resources, 1);
47067 schedule_work(&pinstance->worker_q);
47068 return rc;
47069
47070diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
47071index e1d150f..6c6df44 100644
47072--- a/drivers/scsi/pmcraid.h
47073+++ b/drivers/scsi/pmcraid.h
47074@@ -748,7 +748,7 @@ struct pmcraid_instance {
47075 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
47076
47077 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
47078- atomic_t last_message_id;
47079+ atomic_unchecked_t last_message_id;
47080
47081 /* configuration table */
47082 struct pmcraid_config_table *cfg_table;
47083@@ -777,7 +777,7 @@ struct pmcraid_instance {
47084 atomic_t outstanding_cmds;
47085
47086 /* should add/delete resources to mid-layer now ?*/
47087- atomic_t expose_resources;
47088+ atomic_unchecked_t expose_resources;
47089
47090
47091
47092@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
47093 struct pmcraid_config_table_entry_ext cfg_entry_ext;
47094 };
47095 struct scsi_device *scsi_dev; /* Link scsi_device structure */
47096- atomic_t read_failures; /* count of failed READ commands */
47097- atomic_t write_failures; /* count of failed WRITE commands */
47098+ atomic_unchecked_t read_failures; /* count of failed READ commands */
47099+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
47100
47101 /* To indicate add/delete/modify during CCN */
47102 u8 change_detected;
47103diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
47104index 5f174b8..98d32b0 100644
47105--- a/drivers/scsi/qla2xxx/qla_attr.c
47106+++ b/drivers/scsi/qla2xxx/qla_attr.c
47107@@ -2040,7 +2040,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
47108 return 0;
47109 }
47110
47111-struct fc_function_template qla2xxx_transport_functions = {
47112+fc_function_template_no_const qla2xxx_transport_functions = {
47113
47114 .show_host_node_name = 1,
47115 .show_host_port_name = 1,
47116@@ -2088,7 +2088,7 @@ struct fc_function_template qla2xxx_transport_functions = {
47117 .bsg_timeout = qla24xx_bsg_timeout,
47118 };
47119
47120-struct fc_function_template qla2xxx_transport_vport_functions = {
47121+fc_function_template_no_const qla2xxx_transport_vport_functions = {
47122
47123 .show_host_node_name = 1,
47124 .show_host_port_name = 1,
47125diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
47126index 4446bf5..9a3574d 100644
47127--- a/drivers/scsi/qla2xxx/qla_gbl.h
47128+++ b/drivers/scsi/qla2xxx/qla_gbl.h
47129@@ -538,8 +538,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
47130 struct device_attribute;
47131 extern struct device_attribute *qla2x00_host_attrs[];
47132 struct fc_function_template;
47133-extern struct fc_function_template qla2xxx_transport_functions;
47134-extern struct fc_function_template qla2xxx_transport_vport_functions;
47135+extern fc_function_template_no_const qla2xxx_transport_functions;
47136+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
47137 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
47138 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
47139 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
47140diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
47141index 9f01bbb..5e1dcee 100644
47142--- a/drivers/scsi/qla2xxx/qla_os.c
47143+++ b/drivers/scsi/qla2xxx/qla_os.c
47144@@ -1572,8 +1572,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
47145 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
47146 /* Ok, a 64bit DMA mask is applicable. */
47147 ha->flags.enable_64bit_addressing = 1;
47148- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
47149- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
47150+ pax_open_kernel();
47151+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
47152+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
47153+ pax_close_kernel();
47154 return;
47155 }
47156 }
47157diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
47158index 41327d4..feb03d479 100644
47159--- a/drivers/scsi/qla4xxx/ql4_def.h
47160+++ b/drivers/scsi/qla4xxx/ql4_def.h
47161@@ -296,7 +296,7 @@ struct ddb_entry {
47162 * (4000 only) */
47163 atomic_t relogin_timer; /* Max Time to wait for
47164 * relogin to complete */
47165- atomic_t relogin_retry_count; /* Num of times relogin has been
47166+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
47167 * retried */
47168 uint32_t default_time2wait; /* Default Min time between
47169 * relogins (+aens) */
47170diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
47171index f8a0a26..ec03cee 100644
47172--- a/drivers/scsi/qla4xxx/ql4_os.c
47173+++ b/drivers/scsi/qla4xxx/ql4_os.c
47174@@ -3066,12 +3066,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
47175 */
47176 if (!iscsi_is_session_online(cls_sess)) {
47177 /* Reset retry relogin timer */
47178- atomic_inc(&ddb_entry->relogin_retry_count);
47179+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
47180 DEBUG2(ql4_printk(KERN_INFO, ha,
47181 "%s: index[%d] relogin timed out-retrying"
47182 " relogin (%d), retry (%d)\n", __func__,
47183 ddb_entry->fw_ddb_index,
47184- atomic_read(&ddb_entry->relogin_retry_count),
47185+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
47186 ddb_entry->default_time2wait + 4));
47187 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
47188 atomic_set(&ddb_entry->retry_relogin_timer,
47189@@ -5209,7 +5209,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
47190
47191 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
47192 atomic_set(&ddb_entry->relogin_timer, 0);
47193- atomic_set(&ddb_entry->relogin_retry_count, 0);
47194+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
47195 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
47196 ddb_entry->default_relogin_timeout =
47197 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
47198diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
47199index eaa808e..95f8841 100644
47200--- a/drivers/scsi/scsi.c
47201+++ b/drivers/scsi/scsi.c
47202@@ -661,7 +661,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
47203 unsigned long timeout;
47204 int rtn = 0;
47205
47206- atomic_inc(&cmd->device->iorequest_cnt);
47207+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
47208
47209 /* check if the device is still usable */
47210 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
47211diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
47212index d1549b7..2f60767 100644
47213--- a/drivers/scsi/scsi_lib.c
47214+++ b/drivers/scsi/scsi_lib.c
47215@@ -1474,7 +1474,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
47216 shost = sdev->host;
47217 scsi_init_cmd_errh(cmd);
47218 cmd->result = DID_NO_CONNECT << 16;
47219- atomic_inc(&cmd->device->iorequest_cnt);
47220+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
47221
47222 /*
47223 * SCSI request completion path will do scsi_device_unbusy(),
47224@@ -1500,9 +1500,9 @@ static void scsi_softirq_done(struct request *rq)
47225
47226 INIT_LIST_HEAD(&cmd->eh_entry);
47227
47228- atomic_inc(&cmd->device->iodone_cnt);
47229+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
47230 if (cmd->result)
47231- atomic_inc(&cmd->device->ioerr_cnt);
47232+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
47233
47234 disposition = scsi_decide_disposition(cmd);
47235 if (disposition != SUCCESS &&
47236diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
47237index 40c6394..62356c2 100644
47238--- a/drivers/scsi/scsi_sysfs.c
47239+++ b/drivers/scsi/scsi_sysfs.c
47240@@ -687,7 +687,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
47241 char *buf) \
47242 { \
47243 struct scsi_device *sdev = to_scsi_device(dev); \
47244- unsigned long long count = atomic_read(&sdev->field); \
47245+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
47246 return snprintf(buf, 20, "0x%llx\n", count); \
47247 } \
47248 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
47249diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
47250index 84a1fdf..693b0d6 100644
47251--- a/drivers/scsi/scsi_tgt_lib.c
47252+++ b/drivers/scsi/scsi_tgt_lib.c
47253@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
47254 int err;
47255
47256 dprintk("%lx %u\n", uaddr, len);
47257- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
47258+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
47259 if (err) {
47260 /*
47261 * TODO: need to fixup sg_tablesize, max_segment_size,
47262diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
47263index 4628fd5..a94a1c2 100644
47264--- a/drivers/scsi/scsi_transport_fc.c
47265+++ b/drivers/scsi/scsi_transport_fc.c
47266@@ -497,7 +497,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
47267 * Netlink Infrastructure
47268 */
47269
47270-static atomic_t fc_event_seq;
47271+static atomic_unchecked_t fc_event_seq;
47272
47273 /**
47274 * fc_get_event_number - Obtain the next sequential FC event number
47275@@ -510,7 +510,7 @@ static atomic_t fc_event_seq;
47276 u32
47277 fc_get_event_number(void)
47278 {
47279- return atomic_add_return(1, &fc_event_seq);
47280+ return atomic_add_return_unchecked(1, &fc_event_seq);
47281 }
47282 EXPORT_SYMBOL(fc_get_event_number);
47283
47284@@ -654,7 +654,7 @@ static __init int fc_transport_init(void)
47285 {
47286 int error;
47287
47288- atomic_set(&fc_event_seq, 0);
47289+ atomic_set_unchecked(&fc_event_seq, 0);
47290
47291 error = transport_class_register(&fc_host_class);
47292 if (error)
47293@@ -844,7 +844,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
47294 char *cp;
47295
47296 *val = simple_strtoul(buf, &cp, 0);
47297- if ((*cp && (*cp != '\n')) || (*val < 0))
47298+ if (*cp && (*cp != '\n'))
47299 return -EINVAL;
47300 /*
47301 * Check for overflow; dev_loss_tmo is u32
47302diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
47303index e4a989f..293090c 100644
47304--- a/drivers/scsi/scsi_transport_iscsi.c
47305+++ b/drivers/scsi/scsi_transport_iscsi.c
47306@@ -79,7 +79,7 @@ struct iscsi_internal {
47307 struct transport_container session_cont;
47308 };
47309
47310-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
47311+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
47312 static struct workqueue_struct *iscsi_eh_timer_workq;
47313
47314 static DEFINE_IDA(iscsi_sess_ida);
47315@@ -1737,7 +1737,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
47316 int err;
47317
47318 ihost = shost->shost_data;
47319- session->sid = atomic_add_return(1, &iscsi_session_nr);
47320+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
47321
47322 if (target_id == ISCSI_MAX_TARGET) {
47323 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
47324@@ -4077,7 +4077,7 @@ static __init int iscsi_transport_init(void)
47325 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
47326 ISCSI_TRANSPORT_VERSION);
47327
47328- atomic_set(&iscsi_session_nr, 0);
47329+ atomic_set_unchecked(&iscsi_session_nr, 0);
47330
47331 err = class_register(&iscsi_transport_class);
47332 if (err)
47333diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
47334index f379c7f..e8fc69c 100644
47335--- a/drivers/scsi/scsi_transport_srp.c
47336+++ b/drivers/scsi/scsi_transport_srp.c
47337@@ -33,7 +33,7 @@
47338 #include "scsi_transport_srp_internal.h"
47339
47340 struct srp_host_attrs {
47341- atomic_t next_port_id;
47342+ atomic_unchecked_t next_port_id;
47343 };
47344 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
47345
47346@@ -61,7 +61,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
47347 struct Scsi_Host *shost = dev_to_shost(dev);
47348 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
47349
47350- atomic_set(&srp_host->next_port_id, 0);
47351+ atomic_set_unchecked(&srp_host->next_port_id, 0);
47352 return 0;
47353 }
47354
47355@@ -210,7 +210,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
47356 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
47357 rport->roles = ids->roles;
47358
47359- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
47360+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
47361 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
47362
47363 transport_setup_device(&rport->dev);
47364diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
47365index 2634d69..fcf7a81 100644
47366--- a/drivers/scsi/sd.c
47367+++ b/drivers/scsi/sd.c
47368@@ -2940,7 +2940,7 @@ static int sd_probe(struct device *dev)
47369 sdkp->disk = gd;
47370 sdkp->index = index;
47371 atomic_set(&sdkp->openers, 0);
47372- atomic_set(&sdkp->device->ioerr_cnt, 0);
47373+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
47374
47375 if (!sdp->request_queue->rq_timeout) {
47376 if (sdp->type != TYPE_MOD)
47377diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
47378index df5e961..df6b97f 100644
47379--- a/drivers/scsi/sg.c
47380+++ b/drivers/scsi/sg.c
47381@@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
47382 sdp->disk->disk_name,
47383 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
47384 NULL,
47385- (char *)arg);
47386+ (char __user *)arg);
47387 case BLKTRACESTART:
47388 return blk_trace_startstop(sdp->device->request_queue, 1);
47389 case BLKTRACESTOP:
47390diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
47391index 9e039c6..ae9e800 100644
47392--- a/drivers/spi/spi.c
47393+++ b/drivers/spi/spi.c
47394@@ -1762,7 +1762,7 @@ int spi_bus_unlock(struct spi_master *master)
47395 EXPORT_SYMBOL_GPL(spi_bus_unlock);
47396
47397 /* portable code must never pass more than 32 bytes */
47398-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
47399+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
47400
47401 static u8 *buf;
47402
47403diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
47404index 2c61783..4d49e4e 100644
47405--- a/drivers/staging/android/timed_output.c
47406+++ b/drivers/staging/android/timed_output.c
47407@@ -25,7 +25,7 @@
47408 #include "timed_output.h"
47409
47410 static struct class *timed_output_class;
47411-static atomic_t device_count;
47412+static atomic_unchecked_t device_count;
47413
47414 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
47415 char *buf)
47416@@ -63,7 +63,7 @@ static int create_timed_output_class(void)
47417 timed_output_class = class_create(THIS_MODULE, "timed_output");
47418 if (IS_ERR(timed_output_class))
47419 return PTR_ERR(timed_output_class);
47420- atomic_set(&device_count, 0);
47421+ atomic_set_unchecked(&device_count, 0);
47422 timed_output_class->dev_groups = timed_output_groups;
47423 }
47424
47425@@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
47426 if (ret < 0)
47427 return ret;
47428
47429- tdev->index = atomic_inc_return(&device_count);
47430+ tdev->index = atomic_inc_return_unchecked(&device_count);
47431 tdev->dev = device_create(timed_output_class, NULL,
47432 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
47433 if (IS_ERR(tdev->dev))
47434diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
47435index 0247a20..cb9595c 100644
47436--- a/drivers/staging/gdm724x/gdm_tty.c
47437+++ b/drivers/staging/gdm724x/gdm_tty.c
47438@@ -45,7 +45,7 @@
47439 #define gdm_tty_send_control(n, r, v, d, l) (\
47440 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
47441
47442-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
47443+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
47444
47445 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
47446 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
47447diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
47448index ef5064e..fce01db 100644
47449--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
47450+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
47451@@ -478,13 +478,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
47452 return 0;
47453 }
47454
47455-sfw_test_client_ops_t brw_test_client;
47456-void brw_init_test_client(void)
47457-{
47458- brw_test_client.tso_init = brw_client_init;
47459- brw_test_client.tso_fini = brw_client_fini;
47460- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
47461- brw_test_client.tso_done_rpc = brw_client_done_rpc;
47462+sfw_test_client_ops_t brw_test_client = {
47463+ .tso_init = brw_client_init,
47464+ .tso_fini = brw_client_fini,
47465+ .tso_prep_rpc = brw_client_prep_rpc,
47466+ .tso_done_rpc = brw_client_done_rpc,
47467 };
47468
47469 srpc_service_t brw_test_service;
47470diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
47471index 483c785..e1a2a7b 100644
47472--- a/drivers/staging/lustre/lnet/selftest/framework.c
47473+++ b/drivers/staging/lustre/lnet/selftest/framework.c
47474@@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
47475
47476 extern sfw_test_client_ops_t ping_test_client;
47477 extern srpc_service_t ping_test_service;
47478-extern void ping_init_test_client(void);
47479 extern void ping_init_test_service(void);
47480
47481 extern sfw_test_client_ops_t brw_test_client;
47482 extern srpc_service_t brw_test_service;
47483-extern void brw_init_test_client(void);
47484 extern void brw_init_test_service(void);
47485
47486
47487@@ -1684,12 +1682,10 @@ sfw_startup (void)
47488 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
47489 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
47490
47491- brw_init_test_client();
47492 brw_init_test_service();
47493 rc = sfw_register_test(&brw_test_service, &brw_test_client);
47494 LASSERT (rc == 0);
47495
47496- ping_init_test_client();
47497 ping_init_test_service();
47498 rc = sfw_register_test(&ping_test_service, &ping_test_client);
47499 LASSERT (rc == 0);
47500diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
47501index f0f9194..b589047 100644
47502--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
47503+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
47504@@ -210,14 +210,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
47505 return 0;
47506 }
47507
47508-sfw_test_client_ops_t ping_test_client;
47509-void ping_init_test_client(void)
47510-{
47511- ping_test_client.tso_init = ping_client_init;
47512- ping_test_client.tso_fini = ping_client_fini;
47513- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
47514- ping_test_client.tso_done_rpc = ping_client_done_rpc;
47515-}
47516+sfw_test_client_ops_t ping_test_client = {
47517+ .tso_init = ping_client_init,
47518+ .tso_fini = ping_client_fini,
47519+ .tso_prep_rpc = ping_client_prep_rpc,
47520+ .tso_done_rpc = ping_client_done_rpc,
47521+};
47522
47523 srpc_service_t ping_test_service;
47524 void ping_init_test_service(void)
47525diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
47526index 7020d9c..0d3b580 100644
47527--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
47528+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
47529@@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
47530 ldlm_completion_callback lcs_completion;
47531 ldlm_blocking_callback lcs_blocking;
47532 ldlm_glimpse_callback lcs_glimpse;
47533-};
47534+} __no_const;
47535
47536 /* ldlm_lockd.c */
47537 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
47538diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
47539index a612255..9a9e2dd 100644
47540--- a/drivers/staging/lustre/lustre/include/obd.h
47541+++ b/drivers/staging/lustre/lustre/include/obd.h
47542@@ -1417,7 +1417,7 @@ struct md_ops {
47543 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
47544 * wrapper function in include/linux/obd_class.h.
47545 */
47546-};
47547+} __no_const;
47548
47549 struct lsm_operations {
47550 void (*lsm_free)(struct lov_stripe_md *);
47551diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47552index fc6c977..df1f956 100644
47553--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47554+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
47555@@ -219,7 +219,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
47556 int LL_PROC_PROTO(proc_console_max_delay_cs)
47557 {
47558 int rc, max_delay_cs;
47559- ctl_table_t dummy = *table;
47560+ ctl_table_no_const dummy = *table;
47561 cfs_duration_t d;
47562
47563 dummy.data = &max_delay_cs;
47564@@ -250,7 +250,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
47565 int LL_PROC_PROTO(proc_console_min_delay_cs)
47566 {
47567 int rc, min_delay_cs;
47568- ctl_table_t dummy = *table;
47569+ ctl_table_no_const dummy = *table;
47570 cfs_duration_t d;
47571
47572 dummy.data = &min_delay_cs;
47573@@ -281,7 +281,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
47574 int LL_PROC_PROTO(proc_console_backoff)
47575 {
47576 int rc, backoff;
47577- ctl_table_t dummy = *table;
47578+ ctl_table_no_const dummy = *table;
47579
47580 dummy.data = &backoff;
47581 dummy.proc_handler = &proc_dointvec;
47582diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
47583index 3675020..e80d92c 100644
47584--- a/drivers/staging/media/solo6x10/solo6x10-core.c
47585+++ b/drivers/staging/media/solo6x10/solo6x10-core.c
47586@@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
47587
47588 static int solo_sysfs_init(struct solo_dev *solo_dev)
47589 {
47590- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
47591+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
47592 struct device *dev = &solo_dev->dev;
47593 const char *driver;
47594 int i;
47595diff --git a/drivers/staging/media/solo6x10/solo6x10-p2m.c b/drivers/staging/media/solo6x10/solo6x10-p2m.c
47596index 3335941..2b26186 100644
47597--- a/drivers/staging/media/solo6x10/solo6x10-p2m.c
47598+++ b/drivers/staging/media/solo6x10/solo6x10-p2m.c
47599@@ -77,7 +77,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
47600
47601 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
47602 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
47603- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
47604+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
47605 if (p2m_id < 0)
47606 p2m_id = -p2m_id;
47607 }
47608diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
47609index 6f91d2e..3f011d2 100644
47610--- a/drivers/staging/media/solo6x10/solo6x10.h
47611+++ b/drivers/staging/media/solo6x10/solo6x10.h
47612@@ -238,7 +238,7 @@ struct solo_dev {
47613
47614 /* P2M DMA Engine */
47615 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
47616- atomic_t p2m_count;
47617+ atomic_unchecked_t p2m_count;
47618 int p2m_jiffies;
47619 unsigned int p2m_timeouts;
47620
47621diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
47622index e14a1bb..9cb9bbe 100644
47623--- a/drivers/staging/octeon/ethernet-rx.c
47624+++ b/drivers/staging/octeon/ethernet-rx.c
47625@@ -419,11 +419,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
47626 /* Increment RX stats for virtual ports */
47627 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
47628 #ifdef CONFIG_64BIT
47629- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
47630- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
47631+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
47632+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
47633 #else
47634- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
47635- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
47636+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
47637+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
47638 #endif
47639 }
47640 netif_receive_skb(skb);
47641@@ -434,9 +434,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
47642 dev->name);
47643 */
47644 #ifdef CONFIG_64BIT
47645- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
47646+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
47647 #else
47648- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
47649+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
47650 #endif
47651 dev_kfree_skb_irq(skb);
47652 }
47653diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
47654index c3a90e7..023619a 100644
47655--- a/drivers/staging/octeon/ethernet.c
47656+++ b/drivers/staging/octeon/ethernet.c
47657@@ -252,11 +252,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
47658 * since the RX tasklet also increments it.
47659 */
47660 #ifdef CONFIG_64BIT
47661- atomic64_add(rx_status.dropped_packets,
47662- (atomic64_t *)&priv->stats.rx_dropped);
47663+ atomic64_add_unchecked(rx_status.dropped_packets,
47664+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
47665 #else
47666- atomic_add(rx_status.dropped_packets,
47667- (atomic_t *)&priv->stats.rx_dropped);
47668+ atomic_add_unchecked(rx_status.dropped_packets,
47669+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
47670 #endif
47671 }
47672
47673diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
47674index 439c3c9..2d74293 100644
47675--- a/drivers/staging/rtl8188eu/include/hal_intf.h
47676+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
47677@@ -271,7 +271,7 @@ struct hal_ops {
47678 s32 (*c2h_handler)(struct adapter *padapter,
47679 struct c2h_evt_hdr *c2h_evt);
47680 c2h_id_filter c2h_id_filter_ccx;
47681-};
47682+} __no_const;
47683
47684 enum rt_eeprom_type {
47685 EEPROM_93C46,
47686diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
47687index eb6f0e5..e6a0958 100644
47688--- a/drivers/staging/rtl8188eu/include/rtw_io.h
47689+++ b/drivers/staging/rtl8188eu/include/rtw_io.h
47690@@ -126,7 +126,7 @@ struct _io_ops {
47691 u32 (*_write_scsi)(struct intf_hdl *pintfhdl,u32 cnt, u8 *pmem);
47692 void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
47693 void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
47694-};
47695+} __no_const;
47696
47697 struct io_req {
47698 struct list_head list;
47699diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
47700index dc23395..cf7e9b1 100644
47701--- a/drivers/staging/rtl8712/rtl871x_io.h
47702+++ b/drivers/staging/rtl8712/rtl871x_io.h
47703@@ -108,7 +108,7 @@ struct _io_ops {
47704 u8 *pmem);
47705 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
47706 u8 *pmem);
47707-};
47708+} __no_const;
47709
47710 struct io_req {
47711 struct list_head list;
47712diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
47713index 1f5088b..0e59820 100644
47714--- a/drivers/staging/sbe-2t3e3/netdev.c
47715+++ b/drivers/staging/sbe-2t3e3/netdev.c
47716@@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
47717 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
47718
47719 if (rlen)
47720- if (copy_to_user(data, &resp, rlen))
47721+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
47722 return -EFAULT;
47723
47724 return 0;
47725diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
47726index a863a98..d272795 100644
47727--- a/drivers/staging/usbip/vhci.h
47728+++ b/drivers/staging/usbip/vhci.h
47729@@ -83,7 +83,7 @@ struct vhci_hcd {
47730 unsigned resuming:1;
47731 unsigned long re_timeout;
47732
47733- atomic_t seqnum;
47734+ atomic_unchecked_t seqnum;
47735
47736 /*
47737 * NOTE:
47738diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
47739index d7974cb..d78076b 100644
47740--- a/drivers/staging/usbip/vhci_hcd.c
47741+++ b/drivers/staging/usbip/vhci_hcd.c
47742@@ -441,7 +441,7 @@ static void vhci_tx_urb(struct urb *urb)
47743
47744 spin_lock(&vdev->priv_lock);
47745
47746- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
47747+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
47748 if (priv->seqnum == 0xffff)
47749 dev_info(&urb->dev->dev, "seqnum max\n");
47750
47751@@ -687,7 +687,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
47752 return -ENOMEM;
47753 }
47754
47755- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
47756+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
47757 if (unlink->seqnum == 0xffff)
47758 pr_info("seqnum max\n");
47759
47760@@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
47761 vdev->rhport = rhport;
47762 }
47763
47764- atomic_set(&vhci->seqnum, 0);
47765+ atomic_set_unchecked(&vhci->seqnum, 0);
47766 spin_lock_init(&vhci->lock);
47767
47768 hcd->power_budget = 0; /* no limit */
47769diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
47770index d07fcb5..358e1e1 100644
47771--- a/drivers/staging/usbip/vhci_rx.c
47772+++ b/drivers/staging/usbip/vhci_rx.c
47773@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
47774 if (!urb) {
47775 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
47776 pr_info("max seqnum %d\n",
47777- atomic_read(&the_controller->seqnum));
47778+ atomic_read_unchecked(&the_controller->seqnum));
47779 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
47780 return;
47781 }
47782diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
47783index 8acff44..bdb2fca 100644
47784--- a/drivers/staging/vt6655/hostap.c
47785+++ b/drivers/staging/vt6655/hostap.c
47786@@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
47787 *
47788 */
47789
47790+static net_device_ops_no_const apdev_netdev_ops;
47791+
47792 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
47793 {
47794 PSDevice apdev_priv;
47795 struct net_device *dev = pDevice->dev;
47796 int ret;
47797- const struct net_device_ops apdev_netdev_ops = {
47798- .ndo_start_xmit = pDevice->tx_80211,
47799- };
47800
47801 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
47802
47803@@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
47804 *apdev_priv = *pDevice;
47805 eth_hw_addr_inherit(pDevice->apdev, dev);
47806
47807+ /* only half broken now */
47808+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
47809 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
47810
47811 pDevice->apdev->type = ARPHRD_IEEE80211;
47812diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
47813index c699a30..b90a5fd 100644
47814--- a/drivers/staging/vt6656/hostap.c
47815+++ b/drivers/staging/vt6656/hostap.c
47816@@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
47817 *
47818 */
47819
47820+static net_device_ops_no_const apdev_netdev_ops;
47821+
47822 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
47823 {
47824 struct vnt_private *apdev_priv;
47825 struct net_device *dev = pDevice->dev;
47826 int ret;
47827- const struct net_device_ops apdev_netdev_ops = {
47828- .ndo_start_xmit = pDevice->tx_80211,
47829- };
47830
47831 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
47832
47833@@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
47834 *apdev_priv = *pDevice;
47835 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
47836
47837+ /* only half broken now */
47838+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
47839 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
47840
47841 pDevice->apdev->type = ARPHRD_IEEE80211;
47842diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
47843index e51b09a..5ebac31 100644
47844--- a/drivers/target/sbp/sbp_target.c
47845+++ b/drivers/target/sbp/sbp_target.c
47846@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
47847
47848 #define SESSION_MAINTENANCE_INTERVAL HZ
47849
47850-static atomic_t login_id = ATOMIC_INIT(0);
47851+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
47852
47853 static void session_maintenance_work(struct work_struct *);
47854 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
47855@@ -444,7 +444,7 @@ static void sbp_management_request_login(
47856 login->lun = se_lun;
47857 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
47858 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
47859- login->login_id = atomic_inc_return(&login_id);
47860+ login->login_id = atomic_inc_return_unchecked(&login_id);
47861
47862 login->tgt_agt = sbp_target_agent_register(login);
47863 if (IS_ERR(login->tgt_agt)) {
47864diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
47865index e5e3965..a7b487c 100644
47866--- a/drivers/target/target_core_device.c
47867+++ b/drivers/target/target_core_device.c
47868@@ -1436,7 +1436,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
47869 spin_lock_init(&dev->se_tmr_lock);
47870 spin_lock_init(&dev->qf_cmd_lock);
47871 sema_init(&dev->caw_sem, 1);
47872- atomic_set(&dev->dev_ordered_id, 0);
47873+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
47874 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
47875 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
47876 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
47877diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
47878index 0b0009b..215e88e 100644
47879--- a/drivers/target/target_core_transport.c
47880+++ b/drivers/target/target_core_transport.c
47881@@ -1137,7 +1137,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
47882 * Used to determine when ORDERED commands should go from
47883 * Dormant to Active status.
47884 */
47885- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
47886+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
47887 smp_mb__after_atomic_inc();
47888 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
47889 cmd->se_ordered_id, cmd->sam_task_attr,
47890diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
47891index 33f83fe..d80f8e1 100644
47892--- a/drivers/tty/cyclades.c
47893+++ b/drivers/tty/cyclades.c
47894@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
47895 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
47896 info->port.count);
47897 #endif
47898- info->port.count++;
47899+ atomic_inc(&info->port.count);
47900 #ifdef CY_DEBUG_COUNT
47901 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
47902- current->pid, info->port.count);
47903+ current->pid, atomic_read(&info->port.count));
47904 #endif
47905
47906 /*
47907@@ -3972,7 +3972,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
47908 for (j = 0; j < cy_card[i].nports; j++) {
47909 info = &cy_card[i].ports[j];
47910
47911- if (info->port.count) {
47912+ if (atomic_read(&info->port.count)) {
47913 /* XXX is the ldisc num worth this? */
47914 struct tty_struct *tty;
47915 struct tty_ldisc *ld;
47916diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
47917index 9eba119..5070303 100644
47918--- a/drivers/tty/hvc/hvc_console.c
47919+++ b/drivers/tty/hvc/hvc_console.c
47920@@ -338,7 +338,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
47921
47922 spin_lock_irqsave(&hp->port.lock, flags);
47923 /* Check and then increment for fast path open. */
47924- if (hp->port.count++ > 0) {
47925+ if (atomic_inc_return(&hp->port.count) > 1) {
47926 spin_unlock_irqrestore(&hp->port.lock, flags);
47927 hvc_kick();
47928 return 0;
47929@@ -393,7 +393,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
47930
47931 spin_lock_irqsave(&hp->port.lock, flags);
47932
47933- if (--hp->port.count == 0) {
47934+ if (atomic_dec_return(&hp->port.count) == 0) {
47935 spin_unlock_irqrestore(&hp->port.lock, flags);
47936 /* We are done with the tty pointer now. */
47937 tty_port_tty_set(&hp->port, NULL);
47938@@ -415,9 +415,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
47939 */
47940 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
47941 } else {
47942- if (hp->port.count < 0)
47943+ if (atomic_read(&hp->port.count) < 0)
47944 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
47945- hp->vtermno, hp->port.count);
47946+ hp->vtermno, atomic_read(&hp->port.count));
47947 spin_unlock_irqrestore(&hp->port.lock, flags);
47948 }
47949 }
47950@@ -447,12 +447,12 @@ static void hvc_hangup(struct tty_struct *tty)
47951 * open->hangup case this can be called after the final close so prevent
47952 * that from happening for now.
47953 */
47954- if (hp->port.count <= 0) {
47955+ if (atomic_read(&hp->port.count) <= 0) {
47956 spin_unlock_irqrestore(&hp->port.lock, flags);
47957 return;
47958 }
47959
47960- hp->port.count = 0;
47961+ atomic_set(&hp->port.count, 0);
47962 spin_unlock_irqrestore(&hp->port.lock, flags);
47963 tty_port_tty_set(&hp->port, NULL);
47964
47965@@ -500,7 +500,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
47966 return -EPIPE;
47967
47968 /* FIXME what's this (unprotected) check for? */
47969- if (hp->port.count <= 0)
47970+ if (atomic_read(&hp->port.count) <= 0)
47971 return -EIO;
47972
47973 spin_lock_irqsave(&hp->lock, flags);
47974diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
47975index 81e939e..95ead10 100644
47976--- a/drivers/tty/hvc/hvcs.c
47977+++ b/drivers/tty/hvc/hvcs.c
47978@@ -83,6 +83,7 @@
47979 #include <asm/hvcserver.h>
47980 #include <asm/uaccess.h>
47981 #include <asm/vio.h>
47982+#include <asm/local.h>
47983
47984 /*
47985 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
47986@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
47987
47988 spin_lock_irqsave(&hvcsd->lock, flags);
47989
47990- if (hvcsd->port.count > 0) {
47991+ if (atomic_read(&hvcsd->port.count) > 0) {
47992 spin_unlock_irqrestore(&hvcsd->lock, flags);
47993 printk(KERN_INFO "HVCS: vterm state unchanged. "
47994 "The hvcs device node is still in use.\n");
47995@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
47996 }
47997 }
47998
47999- hvcsd->port.count = 0;
48000+ atomic_set(&hvcsd->port.count, 0);
48001 hvcsd->port.tty = tty;
48002 tty->driver_data = hvcsd;
48003
48004@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
48005 unsigned long flags;
48006
48007 spin_lock_irqsave(&hvcsd->lock, flags);
48008- hvcsd->port.count++;
48009+ atomic_inc(&hvcsd->port.count);
48010 hvcsd->todo_mask |= HVCS_SCHED_READ;
48011 spin_unlock_irqrestore(&hvcsd->lock, flags);
48012
48013@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
48014 hvcsd = tty->driver_data;
48015
48016 spin_lock_irqsave(&hvcsd->lock, flags);
48017- if (--hvcsd->port.count == 0) {
48018+ if (atomic_dec_and_test(&hvcsd->port.count)) {
48019
48020 vio_disable_interrupts(hvcsd->vdev);
48021
48022@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
48023
48024 free_irq(irq, hvcsd);
48025 return;
48026- } else if (hvcsd->port.count < 0) {
48027+ } else if (atomic_read(&hvcsd->port.count) < 0) {
48028 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
48029 " is missmanaged.\n",
48030- hvcsd->vdev->unit_address, hvcsd->port.count);
48031+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
48032 }
48033
48034 spin_unlock_irqrestore(&hvcsd->lock, flags);
48035@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
48036
48037 spin_lock_irqsave(&hvcsd->lock, flags);
48038 /* Preserve this so that we know how many kref refs to put */
48039- temp_open_count = hvcsd->port.count;
48040+ temp_open_count = atomic_read(&hvcsd->port.count);
48041
48042 /*
48043 * Don't kref put inside the spinlock because the destruction
48044@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
48045 tty->driver_data = NULL;
48046 hvcsd->port.tty = NULL;
48047
48048- hvcsd->port.count = 0;
48049+ atomic_set(&hvcsd->port.count, 0);
48050
48051 /* This will drop any buffered data on the floor which is OK in a hangup
48052 * scenario. */
48053@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
48054 * the middle of a write operation? This is a crummy place to do this
48055 * but we want to keep it all in the spinlock.
48056 */
48057- if (hvcsd->port.count <= 0) {
48058+ if (atomic_read(&hvcsd->port.count) <= 0) {
48059 spin_unlock_irqrestore(&hvcsd->lock, flags);
48060 return -ENODEV;
48061 }
48062@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
48063 {
48064 struct hvcs_struct *hvcsd = tty->driver_data;
48065
48066- if (!hvcsd || hvcsd->port.count <= 0)
48067+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
48068 return 0;
48069
48070 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
48071diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
48072index 4190199..48f2920 100644
48073--- a/drivers/tty/hvc/hvsi.c
48074+++ b/drivers/tty/hvc/hvsi.c
48075@@ -85,7 +85,7 @@ struct hvsi_struct {
48076 int n_outbuf;
48077 uint32_t vtermno;
48078 uint32_t virq;
48079- atomic_t seqno; /* HVSI packet sequence number */
48080+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
48081 uint16_t mctrl;
48082 uint8_t state; /* HVSI protocol state */
48083 uint8_t flags;
48084@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
48085
48086 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
48087 packet.hdr.len = sizeof(struct hvsi_query_response);
48088- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48089+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48090 packet.verb = VSV_SEND_VERSION_NUMBER;
48091 packet.u.version = HVSI_VERSION;
48092 packet.query_seqno = query_seqno+1;
48093@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
48094
48095 packet.hdr.type = VS_QUERY_PACKET_HEADER;
48096 packet.hdr.len = sizeof(struct hvsi_query);
48097- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48098+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48099 packet.verb = verb;
48100
48101 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
48102@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
48103 int wrote;
48104
48105 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
48106- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48107+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48108 packet.hdr.len = sizeof(struct hvsi_control);
48109 packet.verb = VSV_SET_MODEM_CTL;
48110 packet.mask = HVSI_TSDTR;
48111@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
48112 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
48113
48114 packet.hdr.type = VS_DATA_PACKET_HEADER;
48115- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48116+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48117 packet.hdr.len = count + sizeof(struct hvsi_header);
48118 memcpy(&packet.data, buf, count);
48119
48120@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
48121 struct hvsi_control packet __ALIGNED__;
48122
48123 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
48124- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
48125+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
48126 packet.hdr.len = 6;
48127 packet.verb = VSV_CLOSE_PROTOCOL;
48128
48129diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
48130index ac27671..0f627ee 100644
48131--- a/drivers/tty/hvc/hvsi_lib.c
48132+++ b/drivers/tty/hvc/hvsi_lib.c
48133@@ -9,7 +9,7 @@
48134
48135 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
48136 {
48137- packet->seqno = atomic_inc_return(&pv->seqno);
48138+ packet->seqno = atomic_inc_return_unchecked(&pv->seqno);
48139
48140 /* Assumes that always succeeds, works in practice */
48141 return pv->put_chars(pv->termno, (char *)packet, packet->len);
48142@@ -21,7 +21,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
48143
48144 /* Reset state */
48145 pv->established = 0;
48146- atomic_set(&pv->seqno, 0);
48147+ atomic_set_unchecked(&pv->seqno, 0);
48148
48149 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
48150
48151@@ -265,7 +265,7 @@ int hvsilib_read_mctrl(struct hvsi_priv *pv)
48152 pv->mctrl_update = 0;
48153 q.hdr.type = VS_QUERY_PACKET_HEADER;
48154 q.hdr.len = sizeof(struct hvsi_query);
48155- q.hdr.seqno = atomic_inc_return(&pv->seqno);
48156+ q.hdr.seqno = atomic_inc_return_unchecked(&pv->seqno);
48157 q.verb = VSV_SEND_MODEM_CTL_STATUS;
48158 rc = hvsi_send_packet(pv, &q.hdr);
48159 if (rc <= 0) {
48160diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
48161index 8fd72ff..34a0bed 100644
48162--- a/drivers/tty/ipwireless/tty.c
48163+++ b/drivers/tty/ipwireless/tty.c
48164@@ -29,6 +29,7 @@
48165 #include <linux/tty_driver.h>
48166 #include <linux/tty_flip.h>
48167 #include <linux/uaccess.h>
48168+#include <asm/local.h>
48169
48170 #include "tty.h"
48171 #include "network.h"
48172@@ -99,10 +100,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
48173 mutex_unlock(&tty->ipw_tty_mutex);
48174 return -ENODEV;
48175 }
48176- if (tty->port.count == 0)
48177+ if (atomic_read(&tty->port.count) == 0)
48178 tty->tx_bytes_queued = 0;
48179
48180- tty->port.count++;
48181+ atomic_inc(&tty->port.count);
48182
48183 tty->port.tty = linux_tty;
48184 linux_tty->driver_data = tty;
48185@@ -118,9 +119,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
48186
48187 static void do_ipw_close(struct ipw_tty *tty)
48188 {
48189- tty->port.count--;
48190-
48191- if (tty->port.count == 0) {
48192+ if (atomic_dec_return(&tty->port.count) == 0) {
48193 struct tty_struct *linux_tty = tty->port.tty;
48194
48195 if (linux_tty != NULL) {
48196@@ -141,7 +140,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
48197 return;
48198
48199 mutex_lock(&tty->ipw_tty_mutex);
48200- if (tty->port.count == 0) {
48201+ if (atomic_read(&tty->port.count) == 0) {
48202 mutex_unlock(&tty->ipw_tty_mutex);
48203 return;
48204 }
48205@@ -164,7 +163,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
48206
48207 mutex_lock(&tty->ipw_tty_mutex);
48208
48209- if (!tty->port.count) {
48210+ if (!atomic_read(&tty->port.count)) {
48211 mutex_unlock(&tty->ipw_tty_mutex);
48212 return;
48213 }
48214@@ -206,7 +205,7 @@ static int ipw_write(struct tty_struct *linux_tty,
48215 return -ENODEV;
48216
48217 mutex_lock(&tty->ipw_tty_mutex);
48218- if (!tty->port.count) {
48219+ if (!atomic_read(&tty->port.count)) {
48220 mutex_unlock(&tty->ipw_tty_mutex);
48221 return -EINVAL;
48222 }
48223@@ -246,7 +245,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
48224 if (!tty)
48225 return -ENODEV;
48226
48227- if (!tty->port.count)
48228+ if (!atomic_read(&tty->port.count))
48229 return -EINVAL;
48230
48231 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
48232@@ -288,7 +287,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
48233 if (!tty)
48234 return 0;
48235
48236- if (!tty->port.count)
48237+ if (!atomic_read(&tty->port.count))
48238 return 0;
48239
48240 return tty->tx_bytes_queued;
48241@@ -369,7 +368,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
48242 if (!tty)
48243 return -ENODEV;
48244
48245- if (!tty->port.count)
48246+ if (!atomic_read(&tty->port.count))
48247 return -EINVAL;
48248
48249 return get_control_lines(tty);
48250@@ -385,7 +384,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
48251 if (!tty)
48252 return -ENODEV;
48253
48254- if (!tty->port.count)
48255+ if (!atomic_read(&tty->port.count))
48256 return -EINVAL;
48257
48258 return set_control_lines(tty, set, clear);
48259@@ -399,7 +398,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
48260 if (!tty)
48261 return -ENODEV;
48262
48263- if (!tty->port.count)
48264+ if (!atomic_read(&tty->port.count))
48265 return -EINVAL;
48266
48267 /* FIXME: Exactly how is the tty object locked here .. */
48268@@ -555,7 +554,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
48269 * are gone */
48270 mutex_lock(&ttyj->ipw_tty_mutex);
48271 }
48272- while (ttyj->port.count)
48273+ while (atomic_read(&ttyj->port.count))
48274 do_ipw_close(ttyj);
48275 ipwireless_disassociate_network_ttys(network,
48276 ttyj->channel_idx);
48277diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
48278index 1deaca4..c8582d4 100644
48279--- a/drivers/tty/moxa.c
48280+++ b/drivers/tty/moxa.c
48281@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
48282 }
48283
48284 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
48285- ch->port.count++;
48286+ atomic_inc(&ch->port.count);
48287 tty->driver_data = ch;
48288 tty_port_tty_set(&ch->port, tty);
48289 mutex_lock(&ch->port.mutex);
48290diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
48291index c0f76da..d974c32 100644
48292--- a/drivers/tty/n_gsm.c
48293+++ b/drivers/tty/n_gsm.c
48294@@ -1632,7 +1632,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
48295 spin_lock_init(&dlci->lock);
48296 mutex_init(&dlci->mutex);
48297 dlci->fifo = &dlci->_fifo;
48298- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
48299+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
48300 kfree(dlci);
48301 return NULL;
48302 }
48303@@ -2935,7 +2935,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
48304 struct gsm_dlci *dlci = tty->driver_data;
48305 struct tty_port *port = &dlci->port;
48306
48307- port->count++;
48308+ atomic_inc(&port->count);
48309 dlci_get(dlci);
48310 dlci_get(dlci->gsm->dlci[0]);
48311 mux_get(dlci->gsm);
48312diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
48313index d4a89db..dbe8d8c 100644
48314--- a/drivers/tty/n_tty.c
48315+++ b/drivers/tty/n_tty.c
48316@@ -114,7 +114,7 @@ struct n_tty_data {
48317 int minimum_to_wake;
48318
48319 /* consumer-published */
48320- size_t read_tail;
48321+ size_t read_tail __intentional_overflow(-1);
48322 size_t line_start;
48323
48324 /* protected by output lock */
48325@@ -2509,6 +2509,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
48326 {
48327 *ops = tty_ldisc_N_TTY;
48328 ops->owner = NULL;
48329- ops->refcount = ops->flags = 0;
48330+ atomic_set(&ops->refcount, 0);
48331+ ops->flags = 0;
48332 }
48333 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
48334diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
48335index 25c9bc7..24077b7 100644
48336--- a/drivers/tty/pty.c
48337+++ b/drivers/tty/pty.c
48338@@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
48339 panic("Couldn't register Unix98 pts driver");
48340
48341 /* Now create the /dev/ptmx special device */
48342+ pax_open_kernel();
48343 tty_default_fops(&ptmx_fops);
48344- ptmx_fops.open = ptmx_open;
48345+ *(void **)&ptmx_fops.open = ptmx_open;
48346+ pax_close_kernel();
48347
48348 cdev_init(&ptmx_cdev, &ptmx_fops);
48349 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
48350diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
48351index 354564e..fe50d9a 100644
48352--- a/drivers/tty/rocket.c
48353+++ b/drivers/tty/rocket.c
48354@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
48355 tty->driver_data = info;
48356 tty_port_tty_set(port, tty);
48357
48358- if (port->count++ == 0) {
48359+ if (atomic_inc_return(&port->count) == 1) {
48360 atomic_inc(&rp_num_ports_open);
48361
48362 #ifdef ROCKET_DEBUG_OPEN
48363@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
48364 #endif
48365 }
48366 #ifdef ROCKET_DEBUG_OPEN
48367- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
48368+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
48369 #endif
48370
48371 /*
48372@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
48373 spin_unlock_irqrestore(&info->port.lock, flags);
48374 return;
48375 }
48376- if (info->port.count)
48377+ if (atomic_read(&info->port.count))
48378 atomic_dec(&rp_num_ports_open);
48379 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
48380 spin_unlock_irqrestore(&info->port.lock, flags);
48381diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
48382index 1274499..f541382 100644
48383--- a/drivers/tty/serial/ioc4_serial.c
48384+++ b/drivers/tty/serial/ioc4_serial.c
48385@@ -437,7 +437,7 @@ struct ioc4_soft {
48386 } is_intr_info[MAX_IOC4_INTR_ENTS];
48387
48388 /* Number of entries active in the above array */
48389- atomic_t is_num_intrs;
48390+ atomic_unchecked_t is_num_intrs;
48391 } is_intr_type[IOC4_NUM_INTR_TYPES];
48392
48393 /* is_ir_lock must be held while
48394@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
48395 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
48396 || (type == IOC4_OTHER_INTR_TYPE)));
48397
48398- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
48399+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
48400 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
48401
48402 /* Save off the lower level interrupt handler */
48403@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
48404
48405 soft = arg;
48406 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
48407- num_intrs = (int)atomic_read(
48408+ num_intrs = (int)atomic_read_unchecked(
48409 &soft->is_intr_type[intr_type].is_num_intrs);
48410
48411 this_mir = this_ir = pending_intrs(soft, intr_type);
48412diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
48413index a260cde..6b2b5ce 100644
48414--- a/drivers/tty/serial/kgdboc.c
48415+++ b/drivers/tty/serial/kgdboc.c
48416@@ -24,8 +24,9 @@
48417 #define MAX_CONFIG_LEN 40
48418
48419 static struct kgdb_io kgdboc_io_ops;
48420+static struct kgdb_io kgdboc_io_ops_console;
48421
48422-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
48423+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
48424 static int configured = -1;
48425
48426 static char config[MAX_CONFIG_LEN];
48427@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
48428 kgdboc_unregister_kbd();
48429 if (configured == 1)
48430 kgdb_unregister_io_module(&kgdboc_io_ops);
48431+ else if (configured == 2)
48432+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
48433 }
48434
48435 static int configure_kgdboc(void)
48436@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
48437 int err;
48438 char *cptr = config;
48439 struct console *cons;
48440+ int is_console = 0;
48441
48442 err = kgdboc_option_setup(config);
48443 if (err || !strlen(config) || isspace(config[0]))
48444 goto noconfig;
48445
48446 err = -ENODEV;
48447- kgdboc_io_ops.is_console = 0;
48448 kgdb_tty_driver = NULL;
48449
48450 kgdboc_use_kms = 0;
48451@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
48452 int idx;
48453 if (cons->device && cons->device(cons, &idx) == p &&
48454 idx == tty_line) {
48455- kgdboc_io_ops.is_console = 1;
48456+ is_console = 1;
48457 break;
48458 }
48459 cons = cons->next;
48460@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
48461 kgdb_tty_line = tty_line;
48462
48463 do_register:
48464- err = kgdb_register_io_module(&kgdboc_io_ops);
48465+ if (is_console) {
48466+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
48467+ configured = 2;
48468+ } else {
48469+ err = kgdb_register_io_module(&kgdboc_io_ops);
48470+ configured = 1;
48471+ }
48472 if (err)
48473 goto noconfig;
48474
48475@@ -205,8 +214,6 @@ do_register:
48476 if (err)
48477 goto nmi_con_failed;
48478
48479- configured = 1;
48480-
48481 return 0;
48482
48483 nmi_con_failed:
48484@@ -223,7 +230,7 @@ noconfig:
48485 static int __init init_kgdboc(void)
48486 {
48487 /* Already configured? */
48488- if (configured == 1)
48489+ if (configured >= 1)
48490 return 0;
48491
48492 return configure_kgdboc();
48493@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
48494 if (config[len - 1] == '\n')
48495 config[len - 1] = '\0';
48496
48497- if (configured == 1)
48498+ if (configured >= 1)
48499 cleanup_kgdboc();
48500
48501 /* Go and configure with the new params. */
48502@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
48503 .post_exception = kgdboc_post_exp_handler,
48504 };
48505
48506+static struct kgdb_io kgdboc_io_ops_console = {
48507+ .name = "kgdboc",
48508+ .read_char = kgdboc_get_char,
48509+ .write_char = kgdboc_put_char,
48510+ .pre_exception = kgdboc_pre_exp_handler,
48511+ .post_exception = kgdboc_post_exp_handler,
48512+ .is_console = 1
48513+};
48514+
48515 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
48516 /* This is only available if kgdboc is a built in for early debugging */
48517 static int __init kgdboc_early_init(char *opt)
48518diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
48519index b5d779c..3622cfe 100644
48520--- a/drivers/tty/serial/msm_serial.c
48521+++ b/drivers/tty/serial/msm_serial.c
48522@@ -897,7 +897,7 @@ static struct uart_driver msm_uart_driver = {
48523 .cons = MSM_CONSOLE,
48524 };
48525
48526-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
48527+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
48528
48529 static const struct of_device_id msm_uartdm_table[] = {
48530 { .compatible = "qcom,msm-uartdm" },
48531@@ -912,7 +912,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
48532 int irq;
48533
48534 if (pdev->id == -1)
48535- pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
48536+ pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
48537
48538 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
48539 return -ENXIO;
48540diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
48541index f3dfa19..342f2ff 100644
48542--- a/drivers/tty/serial/samsung.c
48543+++ b/drivers/tty/serial/samsung.c
48544@@ -456,11 +456,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
48545 }
48546 }
48547
48548+static int s3c64xx_serial_startup(struct uart_port *port);
48549 static int s3c24xx_serial_startup(struct uart_port *port)
48550 {
48551 struct s3c24xx_uart_port *ourport = to_ourport(port);
48552 int ret;
48553
48554+ /* Startup sequence is different for s3c64xx and higher SoC's */
48555+ if (s3c24xx_serial_has_interrupt_mask(port))
48556+ return s3c64xx_serial_startup(port);
48557+
48558 dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
48559 port->mapbase, port->membase);
48560
48561@@ -1127,10 +1132,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
48562 /* setup info for port */
48563 port->dev = &platdev->dev;
48564
48565- /* Startup sequence is different for s3c64xx and higher SoC's */
48566- if (s3c24xx_serial_has_interrupt_mask(port))
48567- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
48568-
48569 port->uartclk = 1;
48570
48571 if (cfg->uart_flags & UPF_CONS_FLOW) {
48572diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
48573index 0f02351..07c59c5 100644
48574--- a/drivers/tty/serial/serial_core.c
48575+++ b/drivers/tty/serial/serial_core.c
48576@@ -1448,7 +1448,7 @@ static void uart_hangup(struct tty_struct *tty)
48577 uart_flush_buffer(tty);
48578 uart_shutdown(tty, state);
48579 spin_lock_irqsave(&port->lock, flags);
48580- port->count = 0;
48581+ atomic_set(&port->count, 0);
48582 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
48583 spin_unlock_irqrestore(&port->lock, flags);
48584 tty_port_tty_set(port, NULL);
48585@@ -1544,7 +1544,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48586 goto end;
48587 }
48588
48589- port->count++;
48590+ atomic_inc(&port->count);
48591 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
48592 retval = -ENXIO;
48593 goto err_dec_count;
48594@@ -1572,7 +1572,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48595 /*
48596 * Make sure the device is in D0 state.
48597 */
48598- if (port->count == 1)
48599+ if (atomic_read(&port->count) == 1)
48600 uart_change_pm(state, UART_PM_STATE_ON);
48601
48602 /*
48603@@ -1590,7 +1590,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
48604 end:
48605 return retval;
48606 err_dec_count:
48607- port->count--;
48608+ atomic_inc(&port->count);
48609 mutex_unlock(&port->mutex);
48610 goto end;
48611 }
48612diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
48613index e1ce141..6d4ed80 100644
48614--- a/drivers/tty/synclink.c
48615+++ b/drivers/tty/synclink.c
48616@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
48617
48618 if (debug_level >= DEBUG_LEVEL_INFO)
48619 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
48620- __FILE__,__LINE__, info->device_name, info->port.count);
48621+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
48622
48623 if (tty_port_close_start(&info->port, tty, filp) == 0)
48624 goto cleanup;
48625@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
48626 cleanup:
48627 if (debug_level >= DEBUG_LEVEL_INFO)
48628 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
48629- tty->driver->name, info->port.count);
48630+ tty->driver->name, atomic_read(&info->port.count));
48631
48632 } /* end of mgsl_close() */
48633
48634@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
48635
48636 mgsl_flush_buffer(tty);
48637 shutdown(info);
48638-
48639- info->port.count = 0;
48640+
48641+ atomic_set(&info->port.count, 0);
48642 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48643 info->port.tty = NULL;
48644
48645@@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
48646
48647 if (debug_level >= DEBUG_LEVEL_INFO)
48648 printk("%s(%d):block_til_ready before block on %s count=%d\n",
48649- __FILE__,__LINE__, tty->driver->name, port->count );
48650+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48651
48652 spin_lock_irqsave(&info->irq_spinlock, flags);
48653 if (!tty_hung_up_p(filp)) {
48654 extra_count = true;
48655- port->count--;
48656+ atomic_dec(&port->count);
48657 }
48658 spin_unlock_irqrestore(&info->irq_spinlock, flags);
48659 port->blocked_open++;
48660@@ -3331,7 +3331,7 @@ 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 blocking 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 tty_unlock(tty);
48668 schedule();
48669@@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
48670
48671 /* FIXME: Racy on hangup during close wait */
48672 if (extra_count)
48673- port->count++;
48674+ atomic_inc(&port->count);
48675 port->blocked_open--;
48676
48677 if (debug_level >= DEBUG_LEVEL_INFO)
48678 printk("%s(%d):block_til_ready after 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 if (!retval)
48683 port->flags |= ASYNC_NORMAL_ACTIVE;
48684@@ -3400,7 +3400,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
48685
48686 if (debug_level >= DEBUG_LEVEL_INFO)
48687 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
48688- __FILE__,__LINE__,tty->driver->name, info->port.count);
48689+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
48690
48691 /* If port is closing, signal caller to try again */
48692 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48693@@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
48694 spin_unlock_irqrestore(&info->netlock, flags);
48695 goto cleanup;
48696 }
48697- info->port.count++;
48698+ atomic_inc(&info->port.count);
48699 spin_unlock_irqrestore(&info->netlock, flags);
48700
48701- if (info->port.count == 1) {
48702+ if (atomic_read(&info->port.count) == 1) {
48703 /* 1st open on this device, init hardware */
48704 retval = startup(info);
48705 if (retval < 0)
48706@@ -3446,8 +3446,8 @@ cleanup:
48707 if (retval) {
48708 if (tty->count == 1)
48709 info->port.tty = NULL; /* tty layer will release tty struct */
48710- if(info->port.count)
48711- info->port.count--;
48712+ if (atomic_read(&info->port.count))
48713+ atomic_dec(&info->port.count);
48714 }
48715
48716 return retval;
48717@@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48718 unsigned short new_crctype;
48719
48720 /* return error if TTY interface open */
48721- if (info->port.count)
48722+ if (atomic_read(&info->port.count))
48723 return -EBUSY;
48724
48725 switch (encoding)
48726@@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
48727
48728 /* arbitrate between network and tty opens */
48729 spin_lock_irqsave(&info->netlock, flags);
48730- if (info->port.count != 0 || info->netcount != 0) {
48731+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
48732 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
48733 spin_unlock_irqrestore(&info->netlock, flags);
48734 return -EBUSY;
48735@@ -7846,7 +7846,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48736 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
48737
48738 /* return error if TTY interface open */
48739- if (info->port.count)
48740+ if (atomic_read(&info->port.count))
48741 return -EBUSY;
48742
48743 if (cmd != SIOCWANDEV)
48744diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
48745index 1abf946..1ee34fc 100644
48746--- a/drivers/tty/synclink_gt.c
48747+++ b/drivers/tty/synclink_gt.c
48748@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
48749 tty->driver_data = info;
48750 info->port.tty = tty;
48751
48752- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
48753+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
48754
48755 /* If port is closing, signal caller to try again */
48756 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48757@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
48758 mutex_unlock(&info->port.mutex);
48759 goto cleanup;
48760 }
48761- info->port.count++;
48762+ atomic_inc(&info->port.count);
48763 spin_unlock_irqrestore(&info->netlock, flags);
48764
48765- if (info->port.count == 1) {
48766+ if (atomic_read(&info->port.count) == 1) {
48767 /* 1st open on this device, init hardware */
48768 retval = startup(info);
48769 if (retval < 0) {
48770@@ -715,8 +715,8 @@ cleanup:
48771 if (retval) {
48772 if (tty->count == 1)
48773 info->port.tty = NULL; /* tty layer will release tty struct */
48774- if(info->port.count)
48775- info->port.count--;
48776+ if(atomic_read(&info->port.count))
48777+ atomic_dec(&info->port.count);
48778 }
48779
48780 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
48781@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48782
48783 if (sanity_check(info, tty->name, "close"))
48784 return;
48785- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
48786+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
48787
48788 if (tty_port_close_start(&info->port, tty, filp) == 0)
48789 goto cleanup;
48790@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48791 tty_port_close_end(&info->port, tty);
48792 info->port.tty = NULL;
48793 cleanup:
48794- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
48795+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
48796 }
48797
48798 static void hangup(struct tty_struct *tty)
48799@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
48800 shutdown(info);
48801
48802 spin_lock_irqsave(&info->port.lock, flags);
48803- info->port.count = 0;
48804+ atomic_set(&info->port.count, 0);
48805 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48806 info->port.tty = NULL;
48807 spin_unlock_irqrestore(&info->port.lock, flags);
48808@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48809 unsigned short new_crctype;
48810
48811 /* return error if TTY interface open */
48812- if (info->port.count)
48813+ if (atomic_read(&info->port.count))
48814 return -EBUSY;
48815
48816 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
48817@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
48818
48819 /* arbitrate between network and tty opens */
48820 spin_lock_irqsave(&info->netlock, flags);
48821- if (info->port.count != 0 || info->netcount != 0) {
48822+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
48823 DBGINFO(("%s hdlc_open busy\n", dev->name));
48824 spin_unlock_irqrestore(&info->netlock, flags);
48825 return -EBUSY;
48826@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48827 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
48828
48829 /* return error if TTY interface open */
48830- if (info->port.count)
48831+ if (atomic_read(&info->port.count))
48832 return -EBUSY;
48833
48834 if (cmd != SIOCWANDEV)
48835@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
48836 if (port == NULL)
48837 continue;
48838 spin_lock(&port->lock);
48839- if ((port->port.count || port->netcount) &&
48840+ if ((atomic_read(&port->port.count) || port->netcount) &&
48841 port->pending_bh && !port->bh_running &&
48842 !port->bh_requested) {
48843 DBGISR(("%s bh queued\n", port->device_name));
48844@@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48845 spin_lock_irqsave(&info->lock, flags);
48846 if (!tty_hung_up_p(filp)) {
48847 extra_count = true;
48848- port->count--;
48849+ atomic_dec(&port->count);
48850 }
48851 spin_unlock_irqrestore(&info->lock, flags);
48852 port->blocked_open++;
48853@@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48854 remove_wait_queue(&port->open_wait, &wait);
48855
48856 if (extra_count)
48857- port->count++;
48858+ atomic_inc(&port->count);
48859 port->blocked_open--;
48860
48861 if (!retval)
48862diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
48863index dc6e969..5dc8786 100644
48864--- a/drivers/tty/synclinkmp.c
48865+++ b/drivers/tty/synclinkmp.c
48866@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
48867
48868 if (debug_level >= DEBUG_LEVEL_INFO)
48869 printk("%s(%d):%s open(), old ref count = %d\n",
48870- __FILE__,__LINE__,tty->driver->name, info->port.count);
48871+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
48872
48873 /* If port is closing, signal caller to try again */
48874 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
48875@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
48876 spin_unlock_irqrestore(&info->netlock, flags);
48877 goto cleanup;
48878 }
48879- info->port.count++;
48880+ atomic_inc(&info->port.count);
48881 spin_unlock_irqrestore(&info->netlock, flags);
48882
48883- if (info->port.count == 1) {
48884+ if (atomic_read(&info->port.count) == 1) {
48885 /* 1st open on this device, init hardware */
48886 retval = startup(info);
48887 if (retval < 0)
48888@@ -796,8 +796,8 @@ cleanup:
48889 if (retval) {
48890 if (tty->count == 1)
48891 info->port.tty = NULL; /* tty layer will release tty struct */
48892- if(info->port.count)
48893- info->port.count--;
48894+ if(atomic_read(&info->port.count))
48895+ atomic_dec(&info->port.count);
48896 }
48897
48898 return retval;
48899@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48900
48901 if (debug_level >= DEBUG_LEVEL_INFO)
48902 printk("%s(%d):%s close() entry, count=%d\n",
48903- __FILE__,__LINE__, info->device_name, info->port.count);
48904+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
48905
48906 if (tty_port_close_start(&info->port, tty, filp) == 0)
48907 goto cleanup;
48908@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
48909 cleanup:
48910 if (debug_level >= DEBUG_LEVEL_INFO)
48911 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
48912- tty->driver->name, info->port.count);
48913+ tty->driver->name, atomic_read(&info->port.count));
48914 }
48915
48916 /* Called by tty_hangup() when a hangup is signaled.
48917@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
48918 shutdown(info);
48919
48920 spin_lock_irqsave(&info->port.lock, flags);
48921- info->port.count = 0;
48922+ atomic_set(&info->port.count, 0);
48923 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
48924 info->port.tty = NULL;
48925 spin_unlock_irqrestore(&info->port.lock, flags);
48926@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
48927 unsigned short new_crctype;
48928
48929 /* return error if TTY interface open */
48930- if (info->port.count)
48931+ if (atomic_read(&info->port.count))
48932 return -EBUSY;
48933
48934 switch (encoding)
48935@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
48936
48937 /* arbitrate between network and tty opens */
48938 spin_lock_irqsave(&info->netlock, flags);
48939- if (info->port.count != 0 || info->netcount != 0) {
48940+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
48941 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
48942 spin_unlock_irqrestore(&info->netlock, flags);
48943 return -EBUSY;
48944@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48945 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
48946
48947 /* return error if TTY interface open */
48948- if (info->port.count)
48949+ if (atomic_read(&info->port.count))
48950 return -EBUSY;
48951
48952 if (cmd != SIOCWANDEV)
48953@@ -2620,7 +2620,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
48954 * do not request bottom half processing if the
48955 * device is not open in a normal mode.
48956 */
48957- if ( port && (port->port.count || port->netcount) &&
48958+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
48959 port->pending_bh && !port->bh_running &&
48960 !port->bh_requested ) {
48961 if ( debug_level >= DEBUG_LEVEL_ISR )
48962@@ -3318,12 +3318,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48963
48964 if (debug_level >= DEBUG_LEVEL_INFO)
48965 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
48966- __FILE__,__LINE__, tty->driver->name, port->count );
48967+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48968
48969 spin_lock_irqsave(&info->lock, flags);
48970 if (!tty_hung_up_p(filp)) {
48971 extra_count = true;
48972- port->count--;
48973+ atomic_dec(&port->count);
48974 }
48975 spin_unlock_irqrestore(&info->lock, flags);
48976 port->blocked_open++;
48977@@ -3352,7 +3352,7 @@ 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() count=%d\n",
48981- __FILE__,__LINE__, tty->driver->name, port->count );
48982+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48983
48984 tty_unlock(tty);
48985 schedule();
48986@@ -3363,12 +3363,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
48987 remove_wait_queue(&port->open_wait, &wait);
48988
48989 if (extra_count)
48990- port->count++;
48991+ atomic_inc(&port->count);
48992 port->blocked_open--;
48993
48994 if (debug_level >= DEBUG_LEVEL_INFO)
48995 printk("%s(%d):%s block_til_ready() after, count=%d\n",
48996- __FILE__,__LINE__, tty->driver->name, port->count );
48997+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
48998
48999 if (!retval)
49000 port->flags |= ASYNC_NORMAL_ACTIVE;
49001diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
49002index 40a9fe9..a3f10cc 100644
49003--- a/drivers/tty/sysrq.c
49004+++ b/drivers/tty/sysrq.c
49005@@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
49006 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
49007 size_t count, loff_t *ppos)
49008 {
49009- if (count) {
49010+ if (count && capable(CAP_SYS_ADMIN)) {
49011 char c;
49012
49013 if (get_user(c, buf))
49014diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
49015index c74a00a..02cf211a 100644
49016--- a/drivers/tty/tty_io.c
49017+++ b/drivers/tty/tty_io.c
49018@@ -3474,7 +3474,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
49019
49020 void tty_default_fops(struct file_operations *fops)
49021 {
49022- *fops = tty_fops;
49023+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
49024 }
49025
49026 /*
49027diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
49028index 6458e11..6cfc218 100644
49029--- a/drivers/tty/tty_ldisc.c
49030+++ b/drivers/tty/tty_ldisc.c
49031@@ -72,7 +72,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
49032 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49033 tty_ldiscs[disc] = new_ldisc;
49034 new_ldisc->num = disc;
49035- new_ldisc->refcount = 0;
49036+ atomic_set(&new_ldisc->refcount, 0);
49037 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
49038
49039 return ret;
49040@@ -100,7 +100,7 @@ int tty_unregister_ldisc(int disc)
49041 return -EINVAL;
49042
49043 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49044- if (tty_ldiscs[disc]->refcount)
49045+ if (atomic_read(&tty_ldiscs[disc]->refcount))
49046 ret = -EBUSY;
49047 else
49048 tty_ldiscs[disc] = NULL;
49049@@ -121,7 +121,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
49050 if (ldops) {
49051 ret = ERR_PTR(-EAGAIN);
49052 if (try_module_get(ldops->owner)) {
49053- ldops->refcount++;
49054+ atomic_inc(&ldops->refcount);
49055 ret = ldops;
49056 }
49057 }
49058@@ -134,7 +134,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
49059 unsigned long flags;
49060
49061 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
49062- ldops->refcount--;
49063+ atomic_dec(&ldops->refcount);
49064 module_put(ldops->owner);
49065 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
49066 }
49067diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
49068index f597e88..b7f68ed 100644
49069--- a/drivers/tty/tty_port.c
49070+++ b/drivers/tty/tty_port.c
49071@@ -232,7 +232,7 @@ void tty_port_hangup(struct tty_port *port)
49072 unsigned long flags;
49073
49074 spin_lock_irqsave(&port->lock, flags);
49075- port->count = 0;
49076+ atomic_set(&port->count, 0);
49077 port->flags &= ~ASYNC_NORMAL_ACTIVE;
49078 tty = port->tty;
49079 if (tty)
49080@@ -390,7 +390,7 @@ int tty_port_block_til_ready(struct tty_port *port,
49081 /* The port lock protects the port counts */
49082 spin_lock_irqsave(&port->lock, flags);
49083 if (!tty_hung_up_p(filp))
49084- port->count--;
49085+ atomic_dec(&port->count);
49086 port->blocked_open++;
49087 spin_unlock_irqrestore(&port->lock, flags);
49088
49089@@ -432,7 +432,7 @@ int tty_port_block_til_ready(struct tty_port *port,
49090 we must not mess that up further */
49091 spin_lock_irqsave(&port->lock, flags);
49092 if (!tty_hung_up_p(filp))
49093- port->count++;
49094+ atomic_inc(&port->count);
49095 port->blocked_open--;
49096 if (retval == 0)
49097 port->flags |= ASYNC_NORMAL_ACTIVE;
49098@@ -466,19 +466,19 @@ int tty_port_close_start(struct tty_port *port,
49099 return 0;
49100 }
49101
49102- if (tty->count == 1 && port->count != 1) {
49103+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
49104 printk(KERN_WARNING
49105 "tty_port_close_start: tty->count = 1 port count = %d.\n",
49106- port->count);
49107- port->count = 1;
49108+ atomic_read(&port->count));
49109+ atomic_set(&port->count, 1);
49110 }
49111- if (--port->count < 0) {
49112+ if (atomic_dec_return(&port->count) < 0) {
49113 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
49114- port->count);
49115- port->count = 0;
49116+ atomic_read(&port->count));
49117+ atomic_set(&port->count, 0);
49118 }
49119
49120- if (port->count) {
49121+ if (atomic_read(&port->count)) {
49122 spin_unlock_irqrestore(&port->lock, flags);
49123 if (port->ops->drop)
49124 port->ops->drop(port);
49125@@ -564,7 +564,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
49126 {
49127 spin_lock_irq(&port->lock);
49128 if (!tty_hung_up_p(filp))
49129- ++port->count;
49130+ atomic_inc(&port->count);
49131 spin_unlock_irq(&port->lock);
49132 tty_port_tty_set(port, tty);
49133
49134diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
49135index d0e3a44..5f8b754 100644
49136--- a/drivers/tty/vt/keyboard.c
49137+++ b/drivers/tty/vt/keyboard.c
49138@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
49139 kbd->kbdmode == VC_OFF) &&
49140 value != KVAL(K_SAK))
49141 return; /* SAK is allowed even in raw mode */
49142+
49143+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
49144+ {
49145+ void *func = fn_handler[value];
49146+ if (func == fn_show_state || func == fn_show_ptregs ||
49147+ func == fn_show_mem)
49148+ return;
49149+ }
49150+#endif
49151+
49152 fn_handler[value](vc);
49153 }
49154
49155@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
49156 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
49157 return -EFAULT;
49158
49159- if (!capable(CAP_SYS_TTY_CONFIG))
49160- perm = 0;
49161-
49162 switch (cmd) {
49163 case KDGKBENT:
49164 /* Ensure another thread doesn't free it under us */
49165@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
49166 spin_unlock_irqrestore(&kbd_event_lock, flags);
49167 return put_user(val, &user_kbe->kb_value);
49168 case KDSKBENT:
49169+ if (!capable(CAP_SYS_TTY_CONFIG))
49170+ perm = 0;
49171+
49172 if (!perm)
49173 return -EPERM;
49174 if (!i && v == K_NOSUCHMAP) {
49175@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
49176 int i, j, k;
49177 int ret;
49178
49179- if (!capable(CAP_SYS_TTY_CONFIG))
49180- perm = 0;
49181-
49182 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
49183 if (!kbs) {
49184 ret = -ENOMEM;
49185@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
49186 kfree(kbs);
49187 return ((p && *p) ? -EOVERFLOW : 0);
49188 case KDSKBSENT:
49189+ if (!capable(CAP_SYS_TTY_CONFIG))
49190+ perm = 0;
49191+
49192 if (!perm) {
49193 ret = -EPERM;
49194 goto reterr;
49195diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
49196index 0e808cf..d7d274b 100644
49197--- a/drivers/uio/uio.c
49198+++ b/drivers/uio/uio.c
49199@@ -25,6 +25,7 @@
49200 #include <linux/kobject.h>
49201 #include <linux/cdev.h>
49202 #include <linux/uio_driver.h>
49203+#include <asm/local.h>
49204
49205 #define UIO_MAX_DEVICES (1U << MINORBITS)
49206
49207@@ -32,7 +33,7 @@ struct uio_device {
49208 struct module *owner;
49209 struct device *dev;
49210 int minor;
49211- atomic_t event;
49212+ atomic_unchecked_t event;
49213 struct fasync_struct *async_queue;
49214 wait_queue_head_t wait;
49215 struct uio_info *info;
49216@@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
49217 struct device_attribute *attr, char *buf)
49218 {
49219 struct uio_device *idev = dev_get_drvdata(dev);
49220- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
49221+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
49222 }
49223 static DEVICE_ATTR_RO(event);
49224
49225@@ -401,7 +402,7 @@ void uio_event_notify(struct uio_info *info)
49226 {
49227 struct uio_device *idev = info->uio_dev;
49228
49229- atomic_inc(&idev->event);
49230+ atomic_inc_unchecked(&idev->event);
49231 wake_up_interruptible(&idev->wait);
49232 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
49233 }
49234@@ -454,7 +455,7 @@ static int uio_open(struct inode *inode, struct file *filep)
49235 }
49236
49237 listener->dev = idev;
49238- listener->event_count = atomic_read(&idev->event);
49239+ listener->event_count = atomic_read_unchecked(&idev->event);
49240 filep->private_data = listener;
49241
49242 if (idev->info->open) {
49243@@ -505,7 +506,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
49244 return -EIO;
49245
49246 poll_wait(filep, &idev->wait, wait);
49247- if (listener->event_count != atomic_read(&idev->event))
49248+ if (listener->event_count != atomic_read_unchecked(&idev->event))
49249 return POLLIN | POLLRDNORM;
49250 return 0;
49251 }
49252@@ -530,7 +531,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
49253 do {
49254 set_current_state(TASK_INTERRUPTIBLE);
49255
49256- event_count = atomic_read(&idev->event);
49257+ event_count = atomic_read_unchecked(&idev->event);
49258 if (event_count != listener->event_count) {
49259 if (copy_to_user(buf, &event_count, count))
49260 retval = -EFAULT;
49261@@ -587,9 +588,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
49262 static int uio_find_mem_index(struct vm_area_struct *vma)
49263 {
49264 struct uio_device *idev = vma->vm_private_data;
49265+ unsigned long size;
49266
49267 if (vma->vm_pgoff < MAX_UIO_MAPS) {
49268- if (idev->info->mem[vma->vm_pgoff].size == 0)
49269+ size = idev->info->mem[vma->vm_pgoff].size;
49270+ if (size == 0)
49271+ return -1;
49272+ if (vma->vm_end - vma->vm_start > size)
49273 return -1;
49274 return (int)vma->vm_pgoff;
49275 }
49276@@ -647,6 +652,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
49277 return -EINVAL;
49278 mem = idev->info->mem + mi;
49279
49280+ if (mem->addr & ~PAGE_MASK)
49281+ return -ENODEV;
49282 if (vma->vm_end - vma->vm_start > mem->size)
49283 return -EINVAL;
49284
49285@@ -818,7 +825,7 @@ int __uio_register_device(struct module *owner,
49286 idev->owner = owner;
49287 idev->info = info;
49288 init_waitqueue_head(&idev->wait);
49289- atomic_set(&idev->event, 0);
49290+ atomic_set_unchecked(&idev->event, 0);
49291
49292 ret = uio_get_minor(idev);
49293 if (ret)
49294diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
49295index 8a7eb77..c00402f 100644
49296--- a/drivers/usb/atm/cxacru.c
49297+++ b/drivers/usb/atm/cxacru.c
49298@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
49299 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
49300 if (ret < 2)
49301 return -EINVAL;
49302- if (index < 0 || index > 0x7f)
49303+ if (index > 0x7f)
49304 return -EINVAL;
49305 pos += tmp;
49306
49307diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
49308index 25a7bfc..57f3cf5 100644
49309--- a/drivers/usb/atm/usbatm.c
49310+++ b/drivers/usb/atm/usbatm.c
49311@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49312 if (printk_ratelimit())
49313 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
49314 __func__, vpi, vci);
49315- atomic_inc(&vcc->stats->rx_err);
49316+ atomic_inc_unchecked(&vcc->stats->rx_err);
49317 return;
49318 }
49319
49320@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49321 if (length > ATM_MAX_AAL5_PDU) {
49322 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
49323 __func__, length, vcc);
49324- atomic_inc(&vcc->stats->rx_err);
49325+ atomic_inc_unchecked(&vcc->stats->rx_err);
49326 goto out;
49327 }
49328
49329@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49330 if (sarb->len < pdu_length) {
49331 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
49332 __func__, pdu_length, sarb->len, vcc);
49333- atomic_inc(&vcc->stats->rx_err);
49334+ atomic_inc_unchecked(&vcc->stats->rx_err);
49335 goto out;
49336 }
49337
49338 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
49339 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
49340 __func__, vcc);
49341- atomic_inc(&vcc->stats->rx_err);
49342+ atomic_inc_unchecked(&vcc->stats->rx_err);
49343 goto out;
49344 }
49345
49346@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49347 if (printk_ratelimit())
49348 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
49349 __func__, length);
49350- atomic_inc(&vcc->stats->rx_drop);
49351+ atomic_inc_unchecked(&vcc->stats->rx_drop);
49352 goto out;
49353 }
49354
49355@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
49356
49357 vcc->push(vcc, skb);
49358
49359- atomic_inc(&vcc->stats->rx);
49360+ atomic_inc_unchecked(&vcc->stats->rx);
49361 out:
49362 skb_trim(sarb, 0);
49363 }
49364@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
49365 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
49366
49367 usbatm_pop(vcc, skb);
49368- atomic_inc(&vcc->stats->tx);
49369+ atomic_inc_unchecked(&vcc->stats->tx);
49370
49371 skb = skb_dequeue(&instance->sndqueue);
49372 }
49373@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
49374 if (!left--)
49375 return sprintf(page,
49376 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
49377- atomic_read(&atm_dev->stats.aal5.tx),
49378- atomic_read(&atm_dev->stats.aal5.tx_err),
49379- atomic_read(&atm_dev->stats.aal5.rx),
49380- atomic_read(&atm_dev->stats.aal5.rx_err),
49381- atomic_read(&atm_dev->stats.aal5.rx_drop));
49382+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
49383+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
49384+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
49385+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
49386+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
49387
49388 if (!left--) {
49389 if (instance->disconnected)
49390diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
49391index 2a3bbdf..91d72cf 100644
49392--- a/drivers/usb/core/devices.c
49393+++ b/drivers/usb/core/devices.c
49394@@ -126,7 +126,7 @@ static const char format_endpt[] =
49395 * time it gets called.
49396 */
49397 static struct device_connect_event {
49398- atomic_t count;
49399+ atomic_unchecked_t count;
49400 wait_queue_head_t wait;
49401 } device_event = {
49402 .count = ATOMIC_INIT(1),
49403@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
49404
49405 void usbfs_conn_disc_event(void)
49406 {
49407- atomic_add(2, &device_event.count);
49408+ atomic_add_unchecked(2, &device_event.count);
49409 wake_up(&device_event.wait);
49410 }
49411
49412@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
49413
49414 poll_wait(file, &device_event.wait, wait);
49415
49416- event_count = atomic_read(&device_event.count);
49417+ event_count = atomic_read_unchecked(&device_event.count);
49418 if (file->f_version != event_count) {
49419 file->f_version = event_count;
49420 return POLLIN | POLLRDNORM;
49421diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
49422index 71dc5d7..d4c488f 100644
49423--- a/drivers/usb/core/devio.c
49424+++ b/drivers/usb/core/devio.c
49425@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
49426 struct dev_state *ps = file->private_data;
49427 struct usb_device *dev = ps->dev;
49428 ssize_t ret = 0;
49429- unsigned len;
49430+ size_t len;
49431 loff_t pos;
49432 int i;
49433
49434@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
49435 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
49436 struct usb_config_descriptor *config =
49437 (struct usb_config_descriptor *)dev->rawdescriptors[i];
49438- unsigned int length = le16_to_cpu(config->wTotalLength);
49439+ size_t length = le16_to_cpu(config->wTotalLength);
49440
49441 if (*ppos < pos + length) {
49442
49443 /* The descriptor may claim to be longer than it
49444 * really is. Here is the actual allocated length. */
49445- unsigned alloclen =
49446+ size_t alloclen =
49447 le16_to_cpu(dev->config[i].desc.wTotalLength);
49448
49449- len = length - (*ppos - pos);
49450+ len = length + pos - *ppos;
49451 if (len > nbytes)
49452 len = nbytes;
49453
49454 /* Simply don't write (skip over) unallocated parts */
49455 if (alloclen > (*ppos - pos)) {
49456- alloclen -= (*ppos - pos);
49457+ alloclen = alloclen + pos - *ppos;
49458 if (copy_to_user(buf,
49459 dev->rawdescriptors[i] + (*ppos - pos),
49460 min(len, alloclen))) {
49461diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
49462index f20a044..d1059aa 100644
49463--- a/drivers/usb/core/hcd.c
49464+++ b/drivers/usb/core/hcd.c
49465@@ -1552,7 +1552,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
49466 */
49467 usb_get_urb(urb);
49468 atomic_inc(&urb->use_count);
49469- atomic_inc(&urb->dev->urbnum);
49470+ atomic_inc_unchecked(&urb->dev->urbnum);
49471 usbmon_urb_submit(&hcd->self, urb);
49472
49473 /* NOTE requirements on root-hub callers (usbfs and the hub
49474@@ -1579,7 +1579,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
49475 urb->hcpriv = NULL;
49476 INIT_LIST_HEAD(&urb->urb_list);
49477 atomic_dec(&urb->use_count);
49478- atomic_dec(&urb->dev->urbnum);
49479+ atomic_dec_unchecked(&urb->dev->urbnum);
49480 if (atomic_read(&urb->reject))
49481 wake_up(&usb_kill_urb_queue);
49482 usb_put_urb(urb);
49483diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
49484index c5c3667..e54e5cd 100644
49485--- a/drivers/usb/core/hub.c
49486+++ b/drivers/usb/core/hub.c
49487@@ -27,6 +27,7 @@
49488 #include <linux/freezer.h>
49489 #include <linux/random.h>
49490 #include <linux/pm_qos.h>
49491+#include <linux/grsecurity.h>
49492
49493 #include <asm/uaccess.h>
49494 #include <asm/byteorder.h>
49495@@ -4467,6 +4468,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
49496 goto done;
49497 return;
49498 }
49499+
49500+ if (gr_handle_new_usb())
49501+ goto done;
49502+
49503 if (hub_is_superspeed(hub->hdev))
49504 unit_load = 150;
49505 else
49506diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
49507index 82927e1..4993dbf 100644
49508--- a/drivers/usb/core/message.c
49509+++ b/drivers/usb/core/message.c
49510@@ -129,7 +129,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
49511 * Return: If successful, the number of bytes transferred. Otherwise, a negative
49512 * error number.
49513 */
49514-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
49515+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
49516 __u8 requesttype, __u16 value, __u16 index, void *data,
49517 __u16 size, int timeout)
49518 {
49519@@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
49520 * If successful, 0. Otherwise a negative error number. The number of actual
49521 * bytes transferred will be stored in the @actual_length paramater.
49522 */
49523-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
49524+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
49525 void *data, int len, int *actual_length, int timeout)
49526 {
49527 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
49528@@ -221,7 +221,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
49529 * bytes transferred will be stored in the @actual_length paramater.
49530 *
49531 */
49532-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
49533+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
49534 void *data, int len, int *actual_length, int timeout)
49535 {
49536 struct urb *urb;
49537diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
49538index ca516ac..6c36ee4 100644
49539--- a/drivers/usb/core/sysfs.c
49540+++ b/drivers/usb/core/sysfs.c
49541@@ -236,7 +236,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
49542 struct usb_device *udev;
49543
49544 udev = to_usb_device(dev);
49545- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
49546+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
49547 }
49548 static DEVICE_ATTR_RO(urbnum);
49549
49550diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
49551index 0a6ee2e..6f8d7e8 100644
49552--- a/drivers/usb/core/usb.c
49553+++ b/drivers/usb/core/usb.c
49554@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
49555 set_dev_node(&dev->dev, dev_to_node(bus->controller));
49556 dev->state = USB_STATE_ATTACHED;
49557 dev->lpm_disable_count = 1;
49558- atomic_set(&dev->urbnum, 0);
49559+ atomic_set_unchecked(&dev->urbnum, 0);
49560
49561 INIT_LIST_HEAD(&dev->ep0.urb_list);
49562 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
49563diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
49564index 02e44fc..3c4fe64 100644
49565--- a/drivers/usb/dwc3/gadget.c
49566+++ b/drivers/usb/dwc3/gadget.c
49567@@ -532,8 +532,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
49568 if (!usb_endpoint_xfer_isoc(desc))
49569 return 0;
49570
49571- memset(&trb_link, 0, sizeof(trb_link));
49572-
49573 /* Link TRB for ISOC. The HWO bit is never reset */
49574 trb_st_hw = &dep->trb_pool[0];
49575
49576diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
49577index 5e29dde..eca992f 100644
49578--- a/drivers/usb/early/ehci-dbgp.c
49579+++ b/drivers/usb/early/ehci-dbgp.c
49580@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
49581
49582 #ifdef CONFIG_KGDB
49583 static struct kgdb_io kgdbdbgp_io_ops;
49584-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
49585+static struct kgdb_io kgdbdbgp_io_ops_console;
49586+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
49587 #else
49588 #define dbgp_kgdb_mode (0)
49589 #endif
49590@@ -1047,6 +1048,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
49591 .write_char = kgdbdbgp_write_char,
49592 };
49593
49594+static struct kgdb_io kgdbdbgp_io_ops_console = {
49595+ .name = "kgdbdbgp",
49596+ .read_char = kgdbdbgp_read_char,
49597+ .write_char = kgdbdbgp_write_char,
49598+ .is_console = 1
49599+};
49600+
49601 static int kgdbdbgp_wait_time;
49602
49603 static int __init kgdbdbgp_parse_config(char *str)
49604@@ -1062,8 +1070,10 @@ static int __init kgdbdbgp_parse_config(char *str)
49605 ptr++;
49606 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
49607 }
49608- kgdb_register_io_module(&kgdbdbgp_io_ops);
49609- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
49610+ if (early_dbgp_console.index != -1)
49611+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
49612+ else
49613+ kgdb_register_io_module(&kgdbdbgp_io_ops);
49614
49615 return 0;
49616 }
49617diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
49618index b369292..9f3ba40 100644
49619--- a/drivers/usb/gadget/u_serial.c
49620+++ b/drivers/usb/gadget/u_serial.c
49621@@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
49622 spin_lock_irq(&port->port_lock);
49623
49624 /* already open? Great. */
49625- if (port->port.count) {
49626+ if (atomic_read(&port->port.count)) {
49627 status = 0;
49628- port->port.count++;
49629+ atomic_inc(&port->port.count);
49630
49631 /* currently opening/closing? wait ... */
49632 } else if (port->openclose) {
49633@@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
49634 tty->driver_data = port;
49635 port->port.tty = tty;
49636
49637- port->port.count = 1;
49638+ atomic_set(&port->port.count, 1);
49639 port->openclose = false;
49640
49641 /* if connected, start the I/O stream */
49642@@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
49643
49644 spin_lock_irq(&port->port_lock);
49645
49646- if (port->port.count != 1) {
49647- if (port->port.count == 0)
49648+ if (atomic_read(&port->port.count) != 1) {
49649+ if (atomic_read(&port->port.count) == 0)
49650 WARN_ON(1);
49651 else
49652- --port->port.count;
49653+ atomic_dec(&port->port.count);
49654 goto exit;
49655 }
49656
49657@@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
49658 * and sleep if necessary
49659 */
49660 port->openclose = true;
49661- port->port.count = 0;
49662+ atomic_set(&port->port.count, 0);
49663
49664 gser = port->port_usb;
49665 if (gser && gser->disconnect)
49666@@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
49667 int cond;
49668
49669 spin_lock_irq(&port->port_lock);
49670- cond = (port->port.count == 0) && !port->openclose;
49671+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
49672 spin_unlock_irq(&port->port_lock);
49673 return cond;
49674 }
49675@@ -1209,7 +1209,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
49676 /* if it's already open, start I/O ... and notify the serial
49677 * protocol about open/close status (connect/disconnect).
49678 */
49679- if (port->port.count) {
49680+ if (atomic_read(&port->port.count)) {
49681 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
49682 gs_start_io(port);
49683 if (gser->connect)
49684@@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
49685
49686 port->port_usb = NULL;
49687 gser->ioport = NULL;
49688- if (port->port.count > 0 || port->openclose) {
49689+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
49690 wake_up_interruptible(&port->drain_wait);
49691 if (port->port.tty)
49692 tty_hangup(port->port.tty);
49693@@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
49694
49695 /* finally, free any unused/unusable I/O buffers */
49696 spin_lock_irqsave(&port->port_lock, flags);
49697- if (port->port.count == 0 && !port->openclose)
49698+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
49699 gs_buf_free(&port->port_write_buf);
49700 gs_free_requests(gser->out, &port->read_pool, NULL);
49701 gs_free_requests(gser->out, &port->read_queue, NULL);
49702diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
49703index 835fc08..f8b22bf 100644
49704--- a/drivers/usb/host/ehci-hub.c
49705+++ b/drivers/usb/host/ehci-hub.c
49706@@ -762,7 +762,7 @@ static struct urb *request_single_step_set_feature_urb(
49707 urb->transfer_flags = URB_DIR_IN;
49708 usb_get_urb(urb);
49709 atomic_inc(&urb->use_count);
49710- atomic_inc(&urb->dev->urbnum);
49711+ atomic_inc_unchecked(&urb->dev->urbnum);
49712 urb->setup_dma = dma_map_single(
49713 hcd->self.controller,
49714 urb->setup_packet,
49715@@ -829,7 +829,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
49716 urb->status = -EINPROGRESS;
49717 usb_get_urb(urb);
49718 atomic_inc(&urb->use_count);
49719- atomic_inc(&urb->dev->urbnum);
49720+ atomic_inc_unchecked(&urb->dev->urbnum);
49721 retval = submit_single_step_set_feature(hcd, urb, 0);
49722 if (!retval && !wait_for_completion_timeout(&done,
49723 msecs_to_jiffies(2000))) {
49724diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
49725index ba6a5d6..f88f7f3 100644
49726--- a/drivers/usb/misc/appledisplay.c
49727+++ b/drivers/usb/misc/appledisplay.c
49728@@ -83,7 +83,7 @@ struct appledisplay {
49729 spinlock_t lock;
49730 };
49731
49732-static atomic_t count_displays = ATOMIC_INIT(0);
49733+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
49734 static struct workqueue_struct *wq;
49735
49736 static void appledisplay_complete(struct urb *urb)
49737@@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,
49738
49739 /* Register backlight device */
49740 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
49741- atomic_inc_return(&count_displays) - 1);
49742+ atomic_inc_return_unchecked(&count_displays) - 1);
49743 memset(&props, 0, sizeof(struct backlight_properties));
49744 props.type = BACKLIGHT_RAW;
49745 props.max_brightness = 0xff;
49746diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
49747index c69bb50..215ef37 100644
49748--- a/drivers/usb/serial/console.c
49749+++ b/drivers/usb/serial/console.c
49750@@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options)
49751
49752 info->port = port;
49753
49754- ++port->port.count;
49755+ atomic_inc(&port->port.count);
49756 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
49757 if (serial->type->set_termios) {
49758 /*
49759@@ -170,7 +170,7 @@ static int usb_console_setup(struct console *co, char *options)
49760 }
49761 /* Now that any required fake tty operations are completed restore
49762 * the tty port count */
49763- --port->port.count;
49764+ atomic_dec(&port->port.count);
49765 /* The console is special in terms of closing the device so
49766 * indicate this port is now acting as a system console. */
49767 port->port.console = 1;
49768@@ -183,7 +183,7 @@ static int usb_console_setup(struct console *co, char *options)
49769 free_tty:
49770 kfree(tty);
49771 reset_open_count:
49772- port->port.count = 0;
49773+ atomic_set(&port->port.count, 0);
49774 usb_autopm_put_interface(serial->interface);
49775 error_get_interface:
49776 usb_serial_put(serial);
49777@@ -194,7 +194,7 @@ static int usb_console_setup(struct console *co, char *options)
49778 static void usb_console_write(struct console *co,
49779 const char *buf, unsigned count)
49780 {
49781- static struct usbcons_info *info = &usbcons_info;
49782+ struct usbcons_info *info = &usbcons_info;
49783 struct usb_serial_port *port = info->port;
49784 struct usb_serial *serial;
49785 int retval = -ENODEV;
49786diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
49787index 75f70f0..d467e1a 100644
49788--- a/drivers/usb/storage/usb.h
49789+++ b/drivers/usb/storage/usb.h
49790@@ -63,7 +63,7 @@ struct us_unusual_dev {
49791 __u8 useProtocol;
49792 __u8 useTransport;
49793 int (*initFunction)(struct us_data *);
49794-};
49795+} __do_const;
49796
49797
49798 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
49799diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
49800index cf250c2..ad9d904 100644
49801--- a/drivers/usb/wusbcore/wa-hc.h
49802+++ b/drivers/usb/wusbcore/wa-hc.h
49803@@ -199,7 +199,7 @@ struct wahc {
49804 spinlock_t xfer_list_lock;
49805 struct work_struct xfer_enqueue_work;
49806 struct work_struct xfer_error_work;
49807- atomic_t xfer_id_count;
49808+ atomic_unchecked_t xfer_id_count;
49809 };
49810
49811
49812@@ -255,7 +255,7 @@ static inline void wa_init(struct wahc *wa)
49813 spin_lock_init(&wa->xfer_list_lock);
49814 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
49815 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
49816- atomic_set(&wa->xfer_id_count, 1);
49817+ atomic_set_unchecked(&wa->xfer_id_count, 1);
49818 }
49819
49820 /**
49821diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
49822index 3dcf66f..8faaf6e 100644
49823--- a/drivers/usb/wusbcore/wa-xfer.c
49824+++ b/drivers/usb/wusbcore/wa-xfer.c
49825@@ -300,7 +300,7 @@ out:
49826 */
49827 static void wa_xfer_id_init(struct wa_xfer *xfer)
49828 {
49829- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
49830+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
49831 }
49832
49833 /*
49834diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
49835index 1eab4ac..e21efc9 100644
49836--- a/drivers/vfio/vfio.c
49837+++ b/drivers/vfio/vfio.c
49838@@ -488,7 +488,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
49839 return 0;
49840
49841 /* TODO Prevent device auto probing */
49842- WARN("Device %s added to live group %d!\n", dev_name(dev),
49843+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
49844 iommu_group_id(group->iommu_group));
49845
49846 return 0;
49847diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
49848index 5174eba..86e764a 100644
49849--- a/drivers/vhost/vringh.c
49850+++ b/drivers/vhost/vringh.c
49851@@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
49852
49853 static inline int putu16_kern(u16 *p, u16 val)
49854 {
49855- ACCESS_ONCE(*p) = val;
49856+ ACCESS_ONCE_RW(*p) = val;
49857 return 0;
49858 }
49859
49860diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
49861index e43401a..dd49b3f 100644
49862--- a/drivers/video/arcfb.c
49863+++ b/drivers/video/arcfb.c
49864@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
49865 return -ENOSPC;
49866
49867 err = 0;
49868- if ((count + p) > fbmemlength) {
49869+ if (count > (fbmemlength - p)) {
49870 count = fbmemlength - p;
49871 err = -ENOSPC;
49872 }
49873diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
49874index a4dfe8c..297ddd9 100644
49875--- a/drivers/video/aty/aty128fb.c
49876+++ b/drivers/video/aty/aty128fb.c
49877@@ -149,7 +149,7 @@ enum {
49878 };
49879
49880 /* Must match above enum */
49881-static char * const r128_family[] = {
49882+static const char * const r128_family[] = {
49883 "AGP",
49884 "PCI",
49885 "PRO AGP",
49886diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
49887index 9b0f12c..024673d 100644
49888--- a/drivers/video/aty/atyfb_base.c
49889+++ b/drivers/video/aty/atyfb_base.c
49890@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
49891 par->accel_flags = var->accel_flags; /* hack */
49892
49893 if (var->accel_flags) {
49894- info->fbops->fb_sync = atyfb_sync;
49895+ pax_open_kernel();
49896+ *(void **)&info->fbops->fb_sync = atyfb_sync;
49897+ pax_close_kernel();
49898 info->flags &= ~FBINFO_HWACCEL_DISABLED;
49899 } else {
49900- info->fbops->fb_sync = NULL;
49901+ pax_open_kernel();
49902+ *(void **)&info->fbops->fb_sync = NULL;
49903+ pax_close_kernel();
49904 info->flags |= FBINFO_HWACCEL_DISABLED;
49905 }
49906
49907diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
49908index 95ec042..e6affdd 100644
49909--- a/drivers/video/aty/mach64_cursor.c
49910+++ b/drivers/video/aty/mach64_cursor.c
49911@@ -7,6 +7,7 @@
49912 #include <linux/string.h>
49913
49914 #include <asm/io.h>
49915+#include <asm/pgtable.h>
49916
49917 #ifdef __sparc__
49918 #include <asm/fbio.h>
49919@@ -208,7 +209,9 @@ int aty_init_cursor(struct fb_info *info)
49920 info->sprite.buf_align = 16; /* and 64 lines tall. */
49921 info->sprite.flags = FB_PIXMAP_IO;
49922
49923- info->fbops->fb_cursor = atyfb_cursor;
49924+ pax_open_kernel();
49925+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
49926+ pax_close_kernel();
49927
49928 return 0;
49929 }
49930diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
49931index bca6ccc..252107e 100644
49932--- a/drivers/video/backlight/kb3886_bl.c
49933+++ b/drivers/video/backlight/kb3886_bl.c
49934@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
49935 static unsigned long kb3886bl_flags;
49936 #define KB3886BL_SUSPENDED 0x01
49937
49938-static struct dmi_system_id __initdata kb3886bl_device_table[] = {
49939+static const struct dmi_system_id __initconst kb3886bl_device_table[] = {
49940 {
49941 .ident = "Sahara Touch-iT",
49942 .matches = {
49943diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
49944index 900aa4e..6d49418 100644
49945--- a/drivers/video/fb_defio.c
49946+++ b/drivers/video/fb_defio.c
49947@@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
49948
49949 BUG_ON(!fbdefio);
49950 mutex_init(&fbdefio->lock);
49951- info->fbops->fb_mmap = fb_deferred_io_mmap;
49952+ pax_open_kernel();
49953+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
49954+ pax_close_kernel();
49955 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
49956 INIT_LIST_HEAD(&fbdefio->pagelist);
49957 if (fbdefio->delay == 0) /* set a default of 1 s */
49958@@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
49959 page->mapping = NULL;
49960 }
49961
49962- info->fbops->fb_mmap = NULL;
49963+ *(void **)&info->fbops->fb_mmap = NULL;
49964 mutex_destroy(&fbdefio->lock);
49965 }
49966 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
49967diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
49968index dacaf74..8478a46 100644
49969--- a/drivers/video/fbmem.c
49970+++ b/drivers/video/fbmem.c
49971@@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
49972 image->dx += image->width + 8;
49973 }
49974 } else if (rotate == FB_ROTATE_UD) {
49975- for (x = 0; x < num && image->dx >= 0; x++) {
49976+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
49977 info->fbops->fb_imageblit(info, image);
49978 image->dx -= image->width + 8;
49979 }
49980@@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
49981 image->dy += image->height + 8;
49982 }
49983 } else if (rotate == FB_ROTATE_CCW) {
49984- for (x = 0; x < num && image->dy >= 0; x++) {
49985+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
49986 info->fbops->fb_imageblit(info, image);
49987 image->dy -= image->height + 8;
49988 }
49989@@ -1175,7 +1175,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
49990 return -EFAULT;
49991 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
49992 return -EINVAL;
49993- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
49994+ if (con2fb.framebuffer >= FB_MAX)
49995 return -EINVAL;
49996 if (!registered_fb[con2fb.framebuffer])
49997 request_module("fb%d", con2fb.framebuffer);
49998diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c
49999index 8d456dc..b4fa44b 100644
50000--- a/drivers/video/hyperv_fb.c
50001+++ b/drivers/video/hyperv_fb.c
50002@@ -233,7 +233,7 @@ static uint screen_fb_size;
50003 static inline int synthvid_send(struct hv_device *hdev,
50004 struct synthvid_msg *msg)
50005 {
50006- static atomic64_t request_id = ATOMIC64_INIT(0);
50007+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
50008 int ret;
50009
50010 msg->pipe_hdr.type = PIPE_MSG_DATA;
50011@@ -241,7 +241,7 @@ static inline int synthvid_send(struct hv_device *hdev,
50012
50013 ret = vmbus_sendpacket(hdev->channel, msg,
50014 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
50015- atomic64_inc_return(&request_id),
50016+ atomic64_inc_return_unchecked(&request_id),
50017 VM_PKT_DATA_INBAND, 0);
50018
50019 if (ret)
50020diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
50021index 7672d2e..b56437f 100644
50022--- a/drivers/video/i810/i810_accel.c
50023+++ b/drivers/video/i810/i810_accel.c
50024@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
50025 }
50026 }
50027 printk("ringbuffer lockup!!!\n");
50028+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
50029 i810_report_error(mmio);
50030 par->dev_flags |= LOCKUP;
50031 info->pixmap.scan_align = 1;
50032diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
50033index 3c14e43..2630570 100644
50034--- a/drivers/video/logo/logo_linux_clut224.ppm
50035+++ b/drivers/video/logo/logo_linux_clut224.ppm
50036@@ -2,1603 +2,1123 @@ P3
50037 # Standard 224-color Linux logo
50038 80 80
50039 255
50040- 0 0 0 0 0 0 0 0 0 0 0 0
50041- 0 0 0 0 0 0 0 0 0 0 0 0
50042- 0 0 0 0 0 0 0 0 0 0 0 0
50043- 0 0 0 0 0 0 0 0 0 0 0 0
50044- 0 0 0 0 0 0 0 0 0 0 0 0
50045- 0 0 0 0 0 0 0 0 0 0 0 0
50046- 0 0 0 0 0 0 0 0 0 0 0 0
50047- 0 0 0 0 0 0 0 0 0 0 0 0
50048- 0 0 0 0 0 0 0 0 0 0 0 0
50049- 6 6 6 6 6 6 10 10 10 10 10 10
50050- 10 10 10 6 6 6 6 6 6 6 6 6
50051- 0 0 0 0 0 0 0 0 0 0 0 0
50052- 0 0 0 0 0 0 0 0 0 0 0 0
50053- 0 0 0 0 0 0 0 0 0 0 0 0
50054- 0 0 0 0 0 0 0 0 0 0 0 0
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- 0 0 0 0 0 0 0 0 0 0 0 0
50065- 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 10 10 10 14 14 14
50069- 22 22 22 26 26 26 30 30 30 34 34 34
50070- 30 30 30 30 30 30 26 26 26 18 18 18
50071- 14 14 14 10 10 10 6 6 6 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 1 0 0 1 0 0 0
50082- 0 0 0 0 0 0 0 0 0 0 0 0
50083- 0 0 0 0 0 0 0 0 0 0 0 0
50084- 0 0 0 0 0 0 0 0 0 0 0 0
50085- 0 0 0 0 0 0 0 0 0 0 0 0
50086- 0 0 0 0 0 0 0 0 0 0 0 0
50087- 0 0 0 0 0 0 0 0 0 0 0 0
50088- 6 6 6 14 14 14 26 26 26 42 42 42
50089- 54 54 54 66 66 66 78 78 78 78 78 78
50090- 78 78 78 74 74 74 66 66 66 54 54 54
50091- 42 42 42 26 26 26 18 18 18 10 10 10
50092- 6 6 6 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 0 0 0 0 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 1 0 0 0 0 0 0 0 0 0
50102- 0 0 0 0 0 0 0 0 0 0 0 0
50103- 0 0 0 0 0 0 0 0 0 0 0 0
50104- 0 0 0 0 0 0 0 0 0 0 0 0
50105- 0 0 0 0 0 0 0 0 0 0 0 0
50106- 0 0 0 0 0 0 0 0 0 0 0 0
50107- 0 0 0 0 0 0 0 0 0 10 10 10
50108- 22 22 22 42 42 42 66 66 66 86 86 86
50109- 66 66 66 38 38 38 38 38 38 22 22 22
50110- 26 26 26 34 34 34 54 54 54 66 66 66
50111- 86 86 86 70 70 70 46 46 46 26 26 26
50112- 14 14 14 6 6 6 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 0 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 1 0 0 1 0 0 1 0 0 0
50122- 0 0 0 0 0 0 0 0 0 0 0 0
50123- 0 0 0 0 0 0 0 0 0 0 0 0
50124- 0 0 0 0 0 0 0 0 0 0 0 0
50125- 0 0 0 0 0 0 0 0 0 0 0 0
50126- 0 0 0 0 0 0 0 0 0 0 0 0
50127- 0 0 0 0 0 0 10 10 10 26 26 26
50128- 50 50 50 82 82 82 58 58 58 6 6 6
50129- 2 2 6 2 2 6 2 2 6 2 2 6
50130- 2 2 6 2 2 6 2 2 6 2 2 6
50131- 6 6 6 54 54 54 86 86 86 66 66 66
50132- 38 38 38 18 18 18 6 6 6 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 0 0 0 0 0 0 0 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 0 0 0 0 0 0
50143- 0 0 0 0 0 0 0 0 0 0 0 0
50144- 0 0 0 0 0 0 0 0 0 0 0 0
50145- 0 0 0 0 0 0 0 0 0 0 0 0
50146- 0 0 0 0 0 0 0 0 0 0 0 0
50147- 0 0 0 6 6 6 22 22 22 50 50 50
50148- 78 78 78 34 34 34 2 2 6 2 2 6
50149- 2 2 6 2 2 6 2 2 6 2 2 6
50150- 2 2 6 2 2 6 2 2 6 2 2 6
50151- 2 2 6 2 2 6 6 6 6 70 70 70
50152- 78 78 78 46 46 46 22 22 22 6 6 6
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 1 0 0 1 0 0 1 0 0 0
50162- 0 0 0 0 0 0 0 0 0 0 0 0
50163- 0 0 0 0 0 0 0 0 0 0 0 0
50164- 0 0 0 0 0 0 0 0 0 0 0 0
50165- 0 0 0 0 0 0 0 0 0 0 0 0
50166- 0 0 0 0 0 0 0 0 0 0 0 0
50167- 6 6 6 18 18 18 42 42 42 82 82 82
50168- 26 26 26 2 2 6 2 2 6 2 2 6
50169- 2 2 6 2 2 6 2 2 6 2 2 6
50170- 2 2 6 2 2 6 2 2 6 14 14 14
50171- 46 46 46 34 34 34 6 6 6 2 2 6
50172- 42 42 42 78 78 78 42 42 42 18 18 18
50173- 6 6 6 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 0 0 0 0 0 0 0 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 1 0 0 0 0 0 1 0 0 0
50182- 0 0 0 0 0 0 0 0 0 0 0 0
50183- 0 0 0 0 0 0 0 0 0 0 0 0
50184- 0 0 0 0 0 0 0 0 0 0 0 0
50185- 0 0 0 0 0 0 0 0 0 0 0 0
50186- 0 0 0 0 0 0 0 0 0 0 0 0
50187- 10 10 10 30 30 30 66 66 66 58 58 58
50188- 2 2 6 2 2 6 2 2 6 2 2 6
50189- 2 2 6 2 2 6 2 2 6 2 2 6
50190- 2 2 6 2 2 6 2 2 6 26 26 26
50191- 86 86 86 101 101 101 46 46 46 10 10 10
50192- 2 2 6 58 58 58 70 70 70 34 34 34
50193- 10 10 10 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 0 0 0 0 0 0 0 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 1 0 0 1 0 0 1 0 0 0
50202- 0 0 0 0 0 0 0 0 0 0 0 0
50203- 0 0 0 0 0 0 0 0 0 0 0 0
50204- 0 0 0 0 0 0 0 0 0 0 0 0
50205- 0 0 0 0 0 0 0 0 0 0 0 0
50206- 0 0 0 0 0 0 0 0 0 0 0 0
50207- 14 14 14 42 42 42 86 86 86 10 10 10
50208- 2 2 6 2 2 6 2 2 6 2 2 6
50209- 2 2 6 2 2 6 2 2 6 2 2 6
50210- 2 2 6 2 2 6 2 2 6 30 30 30
50211- 94 94 94 94 94 94 58 58 58 26 26 26
50212- 2 2 6 6 6 6 78 78 78 54 54 54
50213- 22 22 22 6 6 6 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 0 0 0 0 0 0 0 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- 0 0 0 0 0 0 0 0 0 0 0 0
50223- 0 0 0 0 0 0 0 0 0 0 0 0
50224- 0 0 0 0 0 0 0 0 0 0 0 0
50225- 0 0 0 0 0 0 0 0 0 0 0 0
50226- 0 0 0 0 0 0 0 0 0 6 6 6
50227- 22 22 22 62 62 62 62 62 62 2 2 6
50228- 2 2 6 2 2 6 2 2 6 2 2 6
50229- 2 2 6 2 2 6 2 2 6 2 2 6
50230- 2 2 6 2 2 6 2 2 6 26 26 26
50231- 54 54 54 38 38 38 18 18 18 10 10 10
50232- 2 2 6 2 2 6 34 34 34 82 82 82
50233- 38 38 38 14 14 14 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 1 0 0 1 0 0 0
50242- 0 0 0 0 0 0 0 0 0 0 0 0
50243- 0 0 0 0 0 0 0 0 0 0 0 0
50244- 0 0 0 0 0 0 0 0 0 0 0 0
50245- 0 0 0 0 0 0 0 0 0 0 0 0
50246- 0 0 0 0 0 0 0 0 0 6 6 6
50247- 30 30 30 78 78 78 30 30 30 2 2 6
50248- 2 2 6 2 2 6 2 2 6 2 2 6
50249- 2 2 6 2 2 6 2 2 6 2 2 6
50250- 2 2 6 2 2 6 2 2 6 10 10 10
50251- 10 10 10 2 2 6 2 2 6 2 2 6
50252- 2 2 6 2 2 6 2 2 6 78 78 78
50253- 50 50 50 18 18 18 6 6 6 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 0 0 0 0 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 1 0 0 0 0 0 0 0 0 0
50262- 0 0 0 0 0 0 0 0 0 0 0 0
50263- 0 0 0 0 0 0 0 0 0 0 0 0
50264- 0 0 0 0 0 0 0 0 0 0 0 0
50265- 0 0 0 0 0 0 0 0 0 0 0 0
50266- 0 0 0 0 0 0 0 0 0 10 10 10
50267- 38 38 38 86 86 86 14 14 14 2 2 6
50268- 2 2 6 2 2 6 2 2 6 2 2 6
50269- 2 2 6 2 2 6 2 2 6 2 2 6
50270- 2 2 6 2 2 6 2 2 6 2 2 6
50271- 2 2 6 2 2 6 2 2 6 2 2 6
50272- 2 2 6 2 2 6 2 2 6 54 54 54
50273- 66 66 66 26 26 26 6 6 6 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 0 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 1 0 0 1 0 0 0
50282- 0 0 0 0 0 0 0 0 0 0 0 0
50283- 0 0 0 0 0 0 0 0 0 0 0 0
50284- 0 0 0 0 0 0 0 0 0 0 0 0
50285- 0 0 0 0 0 0 0 0 0 0 0 0
50286- 0 0 0 0 0 0 0 0 0 14 14 14
50287- 42 42 42 82 82 82 2 2 6 2 2 6
50288- 2 2 6 6 6 6 10 10 10 2 2 6
50289- 2 2 6 2 2 6 2 2 6 2 2 6
50290- 2 2 6 2 2 6 2 2 6 6 6 6
50291- 14 14 14 10 10 10 2 2 6 2 2 6
50292- 2 2 6 2 2 6 2 2 6 18 18 18
50293- 82 82 82 34 34 34 10 10 10 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 0 0 0 0 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 1 0 0 0 0 0 0 0 0 0
50302- 0 0 0 0 0 0 0 0 0 0 0 0
50303- 0 0 0 0 0 0 0 0 0 0 0 0
50304- 0 0 0 0 0 0 0 0 0 0 0 0
50305- 0 0 0 0 0 0 0 0 0 0 0 0
50306- 0 0 0 0 0 0 0 0 0 14 14 14
50307- 46 46 46 86 86 86 2 2 6 2 2 6
50308- 6 6 6 6 6 6 22 22 22 34 34 34
50309- 6 6 6 2 2 6 2 2 6 2 2 6
50310- 2 2 6 2 2 6 18 18 18 34 34 34
50311- 10 10 10 50 50 50 22 22 22 2 2 6
50312- 2 2 6 2 2 6 2 2 6 10 10 10
50313- 86 86 86 42 42 42 14 14 14 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 0 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 1 0 0 1 0 0 1 0 0 0
50322- 0 0 0 0 0 0 0 0 0 0 0 0
50323- 0 0 0 0 0 0 0 0 0 0 0 0
50324- 0 0 0 0 0 0 0 0 0 0 0 0
50325- 0 0 0 0 0 0 0 0 0 0 0 0
50326- 0 0 0 0 0 0 0 0 0 14 14 14
50327- 46 46 46 86 86 86 2 2 6 2 2 6
50328- 38 38 38 116 116 116 94 94 94 22 22 22
50329- 22 22 22 2 2 6 2 2 6 2 2 6
50330- 14 14 14 86 86 86 138 138 138 162 162 162
50331-154 154 154 38 38 38 26 26 26 6 6 6
50332- 2 2 6 2 2 6 2 2 6 2 2 6
50333- 86 86 86 46 46 46 14 14 14 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 0 0 0 0 0 0 0 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 0 0 0
50342- 0 0 0 0 0 0 0 0 0 0 0 0
50343- 0 0 0 0 0 0 0 0 0 0 0 0
50344- 0 0 0 0 0 0 0 0 0 0 0 0
50345- 0 0 0 0 0 0 0 0 0 0 0 0
50346- 0 0 0 0 0 0 0 0 0 14 14 14
50347- 46 46 46 86 86 86 2 2 6 14 14 14
50348-134 134 134 198 198 198 195 195 195 116 116 116
50349- 10 10 10 2 2 6 2 2 6 6 6 6
50350-101 98 89 187 187 187 210 210 210 218 218 218
50351-214 214 214 134 134 134 14 14 14 6 6 6
50352- 2 2 6 2 2 6 2 2 6 2 2 6
50353- 86 86 86 50 50 50 18 18 18 6 6 6
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 1 0 0 0
50361- 0 0 1 0 0 1 0 0 1 0 0 0
50362- 0 0 0 0 0 0 0 0 0 0 0 0
50363- 0 0 0 0 0 0 0 0 0 0 0 0
50364- 0 0 0 0 0 0 0 0 0 0 0 0
50365- 0 0 0 0 0 0 0 0 0 0 0 0
50366- 0 0 0 0 0 0 0 0 0 14 14 14
50367- 46 46 46 86 86 86 2 2 6 54 54 54
50368-218 218 218 195 195 195 226 226 226 246 246 246
50369- 58 58 58 2 2 6 2 2 6 30 30 30
50370-210 210 210 253 253 253 174 174 174 123 123 123
50371-221 221 221 234 234 234 74 74 74 2 2 6
50372- 2 2 6 2 2 6 2 2 6 2 2 6
50373- 70 70 70 58 58 58 22 22 22 6 6 6
50374- 0 0 0 0 0 0 0 0 0 0 0 0
50375- 0 0 0 0 0 0 0 0 0 0 0 0
50376- 0 0 0 0 0 0 0 0 0 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 0 0 0
50382- 0 0 0 0 0 0 0 0 0 0 0 0
50383- 0 0 0 0 0 0 0 0 0 0 0 0
50384- 0 0 0 0 0 0 0 0 0 0 0 0
50385- 0 0 0 0 0 0 0 0 0 0 0 0
50386- 0 0 0 0 0 0 0 0 0 14 14 14
50387- 46 46 46 82 82 82 2 2 6 106 106 106
50388-170 170 170 26 26 26 86 86 86 226 226 226
50389-123 123 123 10 10 10 14 14 14 46 46 46
50390-231 231 231 190 190 190 6 6 6 70 70 70
50391- 90 90 90 238 238 238 158 158 158 2 2 6
50392- 2 2 6 2 2 6 2 2 6 2 2 6
50393- 70 70 70 58 58 58 22 22 22 6 6 6
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 1 0 0 0
50401- 0 0 1 0 0 1 0 0 1 0 0 0
50402- 0 0 0 0 0 0 0 0 0 0 0 0
50403- 0 0 0 0 0 0 0 0 0 0 0 0
50404- 0 0 0 0 0 0 0 0 0 0 0 0
50405- 0 0 0 0 0 0 0 0 0 0 0 0
50406- 0 0 0 0 0 0 0 0 0 14 14 14
50407- 42 42 42 86 86 86 6 6 6 116 116 116
50408-106 106 106 6 6 6 70 70 70 149 149 149
50409-128 128 128 18 18 18 38 38 38 54 54 54
50410-221 221 221 106 106 106 2 2 6 14 14 14
50411- 46 46 46 190 190 190 198 198 198 2 2 6
50412- 2 2 6 2 2 6 2 2 6 2 2 6
50413- 74 74 74 62 62 62 22 22 22 6 6 6
50414- 0 0 0 0 0 0 0 0 0 0 0 0
50415- 0 0 0 0 0 0 0 0 0 0 0 0
50416- 0 0 0 0 0 0 0 0 0 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 1 0 0 0
50421- 0 0 1 0 0 0 0 0 1 0 0 0
50422- 0 0 0 0 0 0 0 0 0 0 0 0
50423- 0 0 0 0 0 0 0 0 0 0 0 0
50424- 0 0 0 0 0 0 0 0 0 0 0 0
50425- 0 0 0 0 0 0 0 0 0 0 0 0
50426- 0 0 0 0 0 0 0 0 0 14 14 14
50427- 42 42 42 94 94 94 14 14 14 101 101 101
50428-128 128 128 2 2 6 18 18 18 116 116 116
50429-118 98 46 121 92 8 121 92 8 98 78 10
50430-162 162 162 106 106 106 2 2 6 2 2 6
50431- 2 2 6 195 195 195 195 195 195 6 6 6
50432- 2 2 6 2 2 6 2 2 6 2 2 6
50433- 74 74 74 62 62 62 22 22 22 6 6 6
50434- 0 0 0 0 0 0 0 0 0 0 0 0
50435- 0 0 0 0 0 0 0 0 0 0 0 0
50436- 0 0 0 0 0 0 0 0 0 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 1 0 0 1
50441- 0 0 1 0 0 0 0 0 1 0 0 0
50442- 0 0 0 0 0 0 0 0 0 0 0 0
50443- 0 0 0 0 0 0 0 0 0 0 0 0
50444- 0 0 0 0 0 0 0 0 0 0 0 0
50445- 0 0 0 0 0 0 0 0 0 0 0 0
50446- 0 0 0 0 0 0 0 0 0 10 10 10
50447- 38 38 38 90 90 90 14 14 14 58 58 58
50448-210 210 210 26 26 26 54 38 6 154 114 10
50449-226 170 11 236 186 11 225 175 15 184 144 12
50450-215 174 15 175 146 61 37 26 9 2 2 6
50451- 70 70 70 246 246 246 138 138 138 2 2 6
50452- 2 2 6 2 2 6 2 2 6 2 2 6
50453- 70 70 70 66 66 66 26 26 26 6 6 6
50454- 0 0 0 0 0 0 0 0 0 0 0 0
50455- 0 0 0 0 0 0 0 0 0 0 0 0
50456- 0 0 0 0 0 0 0 0 0 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 0 0 0
50462- 0 0 0 0 0 0 0 0 0 0 0 0
50463- 0 0 0 0 0 0 0 0 0 0 0 0
50464- 0 0 0 0 0 0 0 0 0 0 0 0
50465- 0 0 0 0 0 0 0 0 0 0 0 0
50466- 0 0 0 0 0 0 0 0 0 10 10 10
50467- 38 38 38 86 86 86 14 14 14 10 10 10
50468-195 195 195 188 164 115 192 133 9 225 175 15
50469-239 182 13 234 190 10 232 195 16 232 200 30
50470-245 207 45 241 208 19 232 195 16 184 144 12
50471-218 194 134 211 206 186 42 42 42 2 2 6
50472- 2 2 6 2 2 6 2 2 6 2 2 6
50473- 50 50 50 74 74 74 30 30 30 6 6 6
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 0 0 0
50482- 0 0 0 0 0 0 0 0 0 0 0 0
50483- 0 0 0 0 0 0 0 0 0 0 0 0
50484- 0 0 0 0 0 0 0 0 0 0 0 0
50485- 0 0 0 0 0 0 0 0 0 0 0 0
50486- 0 0 0 0 0 0 0 0 0 10 10 10
50487- 34 34 34 86 86 86 14 14 14 2 2 6
50488-121 87 25 192 133 9 219 162 10 239 182 13
50489-236 186 11 232 195 16 241 208 19 244 214 54
50490-246 218 60 246 218 38 246 215 20 241 208 19
50491-241 208 19 226 184 13 121 87 25 2 2 6
50492- 2 2 6 2 2 6 2 2 6 2 2 6
50493- 50 50 50 82 82 82 34 34 34 10 10 10
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 0 0 0
50502- 0 0 0 0 0 0 0 0 0 0 0 0
50503- 0 0 0 0 0 0 0 0 0 0 0 0
50504- 0 0 0 0 0 0 0 0 0 0 0 0
50505- 0 0 0 0 0 0 0 0 0 0 0 0
50506- 0 0 0 0 0 0 0 0 0 10 10 10
50507- 34 34 34 82 82 82 30 30 30 61 42 6
50508-180 123 7 206 145 10 230 174 11 239 182 13
50509-234 190 10 238 202 15 241 208 19 246 218 74
50510-246 218 38 246 215 20 246 215 20 246 215 20
50511-226 184 13 215 174 15 184 144 12 6 6 6
50512- 2 2 6 2 2 6 2 2 6 2 2 6
50513- 26 26 26 94 94 94 42 42 42 14 14 14
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 0 0 0
50522- 0 0 0 0 0 0 0 0 0 0 0 0
50523- 0 0 0 0 0 0 0 0 0 0 0 0
50524- 0 0 0 0 0 0 0 0 0 0 0 0
50525- 0 0 0 0 0 0 0 0 0 0 0 0
50526- 0 0 0 0 0 0 0 0 0 10 10 10
50527- 30 30 30 78 78 78 50 50 50 104 69 6
50528-192 133 9 216 158 10 236 178 12 236 186 11
50529-232 195 16 241 208 19 244 214 54 245 215 43
50530-246 215 20 246 215 20 241 208 19 198 155 10
50531-200 144 11 216 158 10 156 118 10 2 2 6
50532- 2 2 6 2 2 6 2 2 6 2 2 6
50533- 6 6 6 90 90 90 54 54 54 18 18 18
50534- 6 6 6 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 0 0 0
50542- 0 0 0 0 0 0 0 0 0 0 0 0
50543- 0 0 0 0 0 0 0 0 0 0 0 0
50544- 0 0 0 0 0 0 0 0 0 0 0 0
50545- 0 0 0 0 0 0 0 0 0 0 0 0
50546- 0 0 0 0 0 0 0 0 0 10 10 10
50547- 30 30 30 78 78 78 46 46 46 22 22 22
50548-137 92 6 210 162 10 239 182 13 238 190 10
50549-238 202 15 241 208 19 246 215 20 246 215 20
50550-241 208 19 203 166 17 185 133 11 210 150 10
50551-216 158 10 210 150 10 102 78 10 2 2 6
50552- 6 6 6 54 54 54 14 14 14 2 2 6
50553- 2 2 6 62 62 62 74 74 74 30 30 30
50554- 10 10 10 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 0 0 0
50562- 0 0 0 0 0 0 0 0 0 0 0 0
50563- 0 0 0 0 0 0 0 0 0 0 0 0
50564- 0 0 0 0 0 0 0 0 0 0 0 0
50565- 0 0 0 0 0 0 0 0 0 0 0 0
50566- 0 0 0 0 0 0 0 0 0 10 10 10
50567- 34 34 34 78 78 78 50 50 50 6 6 6
50568- 94 70 30 139 102 15 190 146 13 226 184 13
50569-232 200 30 232 195 16 215 174 15 190 146 13
50570-168 122 10 192 133 9 210 150 10 213 154 11
50571-202 150 34 182 157 106 101 98 89 2 2 6
50572- 2 2 6 78 78 78 116 116 116 58 58 58
50573- 2 2 6 22 22 22 90 90 90 46 46 46
50574- 18 18 18 6 6 6 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 0 0 0
50582- 0 0 0 0 0 0 0 0 0 0 0 0
50583- 0 0 0 0 0 0 0 0 0 0 0 0
50584- 0 0 0 0 0 0 0 0 0 0 0 0
50585- 0 0 0 0 0 0 0 0 0 0 0 0
50586- 0 0 0 0 0 0 0 0 0 10 10 10
50587- 38 38 38 86 86 86 50 50 50 6 6 6
50588-128 128 128 174 154 114 156 107 11 168 122 10
50589-198 155 10 184 144 12 197 138 11 200 144 11
50590-206 145 10 206 145 10 197 138 11 188 164 115
50591-195 195 195 198 198 198 174 174 174 14 14 14
50592- 2 2 6 22 22 22 116 116 116 116 116 116
50593- 22 22 22 2 2 6 74 74 74 70 70 70
50594- 30 30 30 10 10 10 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 0 0 0
50602- 0 0 0 0 0 0 0 0 0 0 0 0
50603- 0 0 0 0 0 0 0 0 0 0 0 0
50604- 0 0 0 0 0 0 0 0 0 0 0 0
50605- 0 0 0 0 0 0 0 0 0 0 0 0
50606- 0 0 0 0 0 0 6 6 6 18 18 18
50607- 50 50 50 101 101 101 26 26 26 10 10 10
50608-138 138 138 190 190 190 174 154 114 156 107 11
50609-197 138 11 200 144 11 197 138 11 192 133 9
50610-180 123 7 190 142 34 190 178 144 187 187 187
50611-202 202 202 221 221 221 214 214 214 66 66 66
50612- 2 2 6 2 2 6 50 50 50 62 62 62
50613- 6 6 6 2 2 6 10 10 10 90 90 90
50614- 50 50 50 18 18 18 6 6 6 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 0 0 0 0 0 0
50622- 0 0 0 0 0 0 0 0 0 0 0 0
50623- 0 0 0 0 0 0 0 0 0 0 0 0
50624- 0 0 0 0 0 0 0 0 0 0 0 0
50625- 0 0 0 0 0 0 0 0 0 0 0 0
50626- 0 0 0 0 0 0 10 10 10 34 34 34
50627- 74 74 74 74 74 74 2 2 6 6 6 6
50628-144 144 144 198 198 198 190 190 190 178 166 146
50629-154 121 60 156 107 11 156 107 11 168 124 44
50630-174 154 114 187 187 187 190 190 190 210 210 210
50631-246 246 246 253 253 253 253 253 253 182 182 182
50632- 6 6 6 2 2 6 2 2 6 2 2 6
50633- 2 2 6 2 2 6 2 2 6 62 62 62
50634- 74 74 74 34 34 34 14 14 14 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 0 0 0 0 0 0
50642- 0 0 0 0 0 0 0 0 0 0 0 0
50643- 0 0 0 0 0 0 0 0 0 0 0 0
50644- 0 0 0 0 0 0 0 0 0 0 0 0
50645- 0 0 0 0 0 0 0 0 0 0 0 0
50646- 0 0 0 10 10 10 22 22 22 54 54 54
50647- 94 94 94 18 18 18 2 2 6 46 46 46
50648-234 234 234 221 221 221 190 190 190 190 190 190
50649-190 190 190 187 187 187 187 187 187 190 190 190
50650-190 190 190 195 195 195 214 214 214 242 242 242
50651-253 253 253 253 253 253 253 253 253 253 253 253
50652- 82 82 82 2 2 6 2 2 6 2 2 6
50653- 2 2 6 2 2 6 2 2 6 14 14 14
50654- 86 86 86 54 54 54 22 22 22 6 6 6
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 0 0 0 0 0 0 0 0 0
50662- 0 0 0 0 0 0 0 0 0 0 0 0
50663- 0 0 0 0 0 0 0 0 0 0 0 0
50664- 0 0 0 0 0 0 0 0 0 0 0 0
50665- 0 0 0 0 0 0 0 0 0 0 0 0
50666- 6 6 6 18 18 18 46 46 46 90 90 90
50667- 46 46 46 18 18 18 6 6 6 182 182 182
50668-253 253 253 246 246 246 206 206 206 190 190 190
50669-190 190 190 190 190 190 190 190 190 190 190 190
50670-206 206 206 231 231 231 250 250 250 253 253 253
50671-253 253 253 253 253 253 253 253 253 253 253 253
50672-202 202 202 14 14 14 2 2 6 2 2 6
50673- 2 2 6 2 2 6 2 2 6 2 2 6
50674- 42 42 42 86 86 86 42 42 42 18 18 18
50675- 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
50682- 0 0 0 0 0 0 0 0 0 0 0 0
50683- 0 0 0 0 0 0 0 0 0 0 0 0
50684- 0 0 0 0 0 0 0 0 0 0 0 0
50685- 0 0 0 0 0 0 0 0 0 6 6 6
50686- 14 14 14 38 38 38 74 74 74 66 66 66
50687- 2 2 6 6 6 6 90 90 90 250 250 250
50688-253 253 253 253 253 253 238 238 238 198 198 198
50689-190 190 190 190 190 190 195 195 195 221 221 221
50690-246 246 246 253 253 253 253 253 253 253 253 253
50691-253 253 253 253 253 253 253 253 253 253 253 253
50692-253 253 253 82 82 82 2 2 6 2 2 6
50693- 2 2 6 2 2 6 2 2 6 2 2 6
50694- 2 2 6 78 78 78 70 70 70 34 34 34
50695- 14 14 14 6 6 6 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 0 0 0
50701- 0 0 0 0 0 0 0 0 0 0 0 0
50702- 0 0 0 0 0 0 0 0 0 0 0 0
50703- 0 0 0 0 0 0 0 0 0 0 0 0
50704- 0 0 0 0 0 0 0 0 0 0 0 0
50705- 0 0 0 0 0 0 0 0 0 14 14 14
50706- 34 34 34 66 66 66 78 78 78 6 6 6
50707- 2 2 6 18 18 18 218 218 218 253 253 253
50708-253 253 253 253 253 253 253 253 253 246 246 246
50709-226 226 226 231 231 231 246 246 246 253 253 253
50710-253 253 253 253 253 253 253 253 253 253 253 253
50711-253 253 253 253 253 253 253 253 253 253 253 253
50712-253 253 253 178 178 178 2 2 6 2 2 6
50713- 2 2 6 2 2 6 2 2 6 2 2 6
50714- 2 2 6 18 18 18 90 90 90 62 62 62
50715- 30 30 30 10 10 10 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 0 0 0
50721- 0 0 0 0 0 0 0 0 0 0 0 0
50722- 0 0 0 0 0 0 0 0 0 0 0 0
50723- 0 0 0 0 0 0 0 0 0 0 0 0
50724- 0 0 0 0 0 0 0 0 0 0 0 0
50725- 0 0 0 0 0 0 10 10 10 26 26 26
50726- 58 58 58 90 90 90 18 18 18 2 2 6
50727- 2 2 6 110 110 110 253 253 253 253 253 253
50728-253 253 253 253 253 253 253 253 253 253 253 253
50729-250 250 250 253 253 253 253 253 253 253 253 253
50730-253 253 253 253 253 253 253 253 253 253 253 253
50731-253 253 253 253 253 253 253 253 253 253 253 253
50732-253 253 253 231 231 231 18 18 18 2 2 6
50733- 2 2 6 2 2 6 2 2 6 2 2 6
50734- 2 2 6 2 2 6 18 18 18 94 94 94
50735- 54 54 54 26 26 26 10 10 10 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 0 0 0 0 0 0
50741- 0 0 0 0 0 0 0 0 0 0 0 0
50742- 0 0 0 0 0 0 0 0 0 0 0 0
50743- 0 0 0 0 0 0 0 0 0 0 0 0
50744- 0 0 0 0 0 0 0 0 0 0 0 0
50745- 0 0 0 6 6 6 22 22 22 50 50 50
50746- 90 90 90 26 26 26 2 2 6 2 2 6
50747- 14 14 14 195 195 195 250 250 250 253 253 253
50748-253 253 253 253 253 253 253 253 253 253 253 253
50749-253 253 253 253 253 253 253 253 253 253 253 253
50750-253 253 253 253 253 253 253 253 253 253 253 253
50751-253 253 253 253 253 253 253 253 253 253 253 253
50752-250 250 250 242 242 242 54 54 54 2 2 6
50753- 2 2 6 2 2 6 2 2 6 2 2 6
50754- 2 2 6 2 2 6 2 2 6 38 38 38
50755- 86 86 86 50 50 50 22 22 22 6 6 6
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 0 0 0 0 0 0 0 0 0
50761- 0 0 0 0 0 0 0 0 0 0 0 0
50762- 0 0 0 0 0 0 0 0 0 0 0 0
50763- 0 0 0 0 0 0 0 0 0 0 0 0
50764- 0 0 0 0 0 0 0 0 0 0 0 0
50765- 6 6 6 14 14 14 38 38 38 82 82 82
50766- 34 34 34 2 2 6 2 2 6 2 2 6
50767- 42 42 42 195 195 195 246 246 246 253 253 253
50768-253 253 253 253 253 253 253 253 253 250 250 250
50769-242 242 242 242 242 242 250 250 250 253 253 253
50770-253 253 253 253 253 253 253 253 253 253 253 253
50771-253 253 253 250 250 250 246 246 246 238 238 238
50772-226 226 226 231 231 231 101 101 101 6 6 6
50773- 2 2 6 2 2 6 2 2 6 2 2 6
50774- 2 2 6 2 2 6 2 2 6 2 2 6
50775- 38 38 38 82 82 82 42 42 42 14 14 14
50776- 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
50781- 0 0 0 0 0 0 0 0 0 0 0 0
50782- 0 0 0 0 0 0 0 0 0 0 0 0
50783- 0 0 0 0 0 0 0 0 0 0 0 0
50784- 0 0 0 0 0 0 0 0 0 0 0 0
50785- 10 10 10 26 26 26 62 62 62 66 66 66
50786- 2 2 6 2 2 6 2 2 6 6 6 6
50787- 70 70 70 170 170 170 206 206 206 234 234 234
50788-246 246 246 250 250 250 250 250 250 238 238 238
50789-226 226 226 231 231 231 238 238 238 250 250 250
50790-250 250 250 250 250 250 246 246 246 231 231 231
50791-214 214 214 206 206 206 202 202 202 202 202 202
50792-198 198 198 202 202 202 182 182 182 18 18 18
50793- 2 2 6 2 2 6 2 2 6 2 2 6
50794- 2 2 6 2 2 6 2 2 6 2 2 6
50795- 2 2 6 62 62 62 66 66 66 30 30 30
50796- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
50801- 0 0 0 0 0 0 0 0 0 0 0 0
50802- 0 0 0 0 0 0 0 0 0 0 0 0
50803- 0 0 0 0 0 0 0 0 0 0 0 0
50804- 0 0 0 0 0 0 0 0 0 0 0 0
50805- 14 14 14 42 42 42 82 82 82 18 18 18
50806- 2 2 6 2 2 6 2 2 6 10 10 10
50807- 94 94 94 182 182 182 218 218 218 242 242 242
50808-250 250 250 253 253 253 253 253 253 250 250 250
50809-234 234 234 253 253 253 253 253 253 253 253 253
50810-253 253 253 253 253 253 253 253 253 246 246 246
50811-238 238 238 226 226 226 210 210 210 202 202 202
50812-195 195 195 195 195 195 210 210 210 158 158 158
50813- 6 6 6 14 14 14 50 50 50 14 14 14
50814- 2 2 6 2 2 6 2 2 6 2 2 6
50815- 2 2 6 6 6 6 86 86 86 46 46 46
50816- 18 18 18 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
50821- 0 0 0 0 0 0 0 0 0 0 0 0
50822- 0 0 0 0 0 0 0 0 0 0 0 0
50823- 0 0 0 0 0 0 0 0 0 0 0 0
50824- 0 0 0 0 0 0 0 0 0 6 6 6
50825- 22 22 22 54 54 54 70 70 70 2 2 6
50826- 2 2 6 10 10 10 2 2 6 22 22 22
50827-166 166 166 231 231 231 250 250 250 253 253 253
50828-253 253 253 253 253 253 253 253 253 250 250 250
50829-242 242 242 253 253 253 253 253 253 253 253 253
50830-253 253 253 253 253 253 253 253 253 253 253 253
50831-253 253 253 253 253 253 253 253 253 246 246 246
50832-231 231 231 206 206 206 198 198 198 226 226 226
50833- 94 94 94 2 2 6 6 6 6 38 38 38
50834- 30 30 30 2 2 6 2 2 6 2 2 6
50835- 2 2 6 2 2 6 62 62 62 66 66 66
50836- 26 26 26 10 10 10 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 0 0 0
50840- 0 0 0 0 0 0 0 0 0 0 0 0
50841- 0 0 0 0 0 0 0 0 0 0 0 0
50842- 0 0 0 0 0 0 0 0 0 0 0 0
50843- 0 0 0 0 0 0 0 0 0 0 0 0
50844- 0 0 0 0 0 0 0 0 0 10 10 10
50845- 30 30 30 74 74 74 50 50 50 2 2 6
50846- 26 26 26 26 26 26 2 2 6 106 106 106
50847-238 238 238 253 253 253 253 253 253 253 253 253
50848-253 253 253 253 253 253 253 253 253 253 253 253
50849-253 253 253 253 253 253 253 253 253 253 253 253
50850-253 253 253 253 253 253 253 253 253 253 253 253
50851-253 253 253 253 253 253 253 253 253 253 253 253
50852-253 253 253 246 246 246 218 218 218 202 202 202
50853-210 210 210 14 14 14 2 2 6 2 2 6
50854- 30 30 30 22 22 22 2 2 6 2 2 6
50855- 2 2 6 2 2 6 18 18 18 86 86 86
50856- 42 42 42 14 14 14 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 0 0 0
50860- 0 0 0 0 0 0 0 0 0 0 0 0
50861- 0 0 0 0 0 0 0 0 0 0 0 0
50862- 0 0 0 0 0 0 0 0 0 0 0 0
50863- 0 0 0 0 0 0 0 0 0 0 0 0
50864- 0 0 0 0 0 0 0 0 0 14 14 14
50865- 42 42 42 90 90 90 22 22 22 2 2 6
50866- 42 42 42 2 2 6 18 18 18 218 218 218
50867-253 253 253 253 253 253 253 253 253 253 253 253
50868-253 253 253 253 253 253 253 253 253 253 253 253
50869-253 253 253 253 253 253 253 253 253 253 253 253
50870-253 253 253 253 253 253 253 253 253 253 253 253
50871-253 253 253 253 253 253 253 253 253 253 253 253
50872-253 253 253 253 253 253 250 250 250 221 221 221
50873-218 218 218 101 101 101 2 2 6 14 14 14
50874- 18 18 18 38 38 38 10 10 10 2 2 6
50875- 2 2 6 2 2 6 2 2 6 78 78 78
50876- 58 58 58 22 22 22 6 6 6 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 0 0 0
50880- 0 0 0 0 0 0 0 0 0 0 0 0
50881- 0 0 0 0 0 0 0 0 0 0 0 0
50882- 0 0 0 0 0 0 0 0 0 0 0 0
50883- 0 0 0 0 0 0 0 0 0 0 0 0
50884- 0 0 0 0 0 0 6 6 6 18 18 18
50885- 54 54 54 82 82 82 2 2 6 26 26 26
50886- 22 22 22 2 2 6 123 123 123 253 253 253
50887-253 253 253 253 253 253 253 253 253 253 253 253
50888-253 253 253 253 253 253 253 253 253 253 253 253
50889-253 253 253 253 253 253 253 253 253 253 253 253
50890-253 253 253 253 253 253 253 253 253 253 253 253
50891-253 253 253 253 253 253 253 253 253 253 253 253
50892-253 253 253 253 253 253 253 253 253 250 250 250
50893-238 238 238 198 198 198 6 6 6 38 38 38
50894- 58 58 58 26 26 26 38 38 38 2 2 6
50895- 2 2 6 2 2 6 2 2 6 46 46 46
50896- 78 78 78 30 30 30 10 10 10 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 0 0 0 0 0 0
50900- 0 0 0 0 0 0 0 0 0 0 0 0
50901- 0 0 0 0 0 0 0 0 0 0 0 0
50902- 0 0 0 0 0 0 0 0 0 0 0 0
50903- 0 0 0 0 0 0 0 0 0 0 0 0
50904- 0 0 0 0 0 0 10 10 10 30 30 30
50905- 74 74 74 58 58 58 2 2 6 42 42 42
50906- 2 2 6 22 22 22 231 231 231 253 253 253
50907-253 253 253 253 253 253 253 253 253 253 253 253
50908-253 253 253 253 253 253 253 253 253 250 250 250
50909-253 253 253 253 253 253 253 253 253 253 253 253
50910-253 253 253 253 253 253 253 253 253 253 253 253
50911-253 253 253 253 253 253 253 253 253 253 253 253
50912-253 253 253 253 253 253 253 253 253 253 253 253
50913-253 253 253 246 246 246 46 46 46 38 38 38
50914- 42 42 42 14 14 14 38 38 38 14 14 14
50915- 2 2 6 2 2 6 2 2 6 6 6 6
50916- 86 86 86 46 46 46 14 14 14 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 0 0 0 0 0 0
50920- 0 0 0 0 0 0 0 0 0 0 0 0
50921- 0 0 0 0 0 0 0 0 0 0 0 0
50922- 0 0 0 0 0 0 0 0 0 0 0 0
50923- 0 0 0 0 0 0 0 0 0 0 0 0
50924- 0 0 0 6 6 6 14 14 14 42 42 42
50925- 90 90 90 18 18 18 18 18 18 26 26 26
50926- 2 2 6 116 116 116 253 253 253 253 253 253
50927-253 253 253 253 253 253 253 253 253 253 253 253
50928-253 253 253 253 253 253 250 250 250 238 238 238
50929-253 253 253 253 253 253 253 253 253 253 253 253
50930-253 253 253 253 253 253 253 253 253 253 253 253
50931-253 253 253 253 253 253 253 253 253 253 253 253
50932-253 253 253 253 253 253 253 253 253 253 253 253
50933-253 253 253 253 253 253 94 94 94 6 6 6
50934- 2 2 6 2 2 6 10 10 10 34 34 34
50935- 2 2 6 2 2 6 2 2 6 2 2 6
50936- 74 74 74 58 58 58 22 22 22 6 6 6
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 0 0 0 0 0 0 0 0 0
50940- 0 0 0 0 0 0 0 0 0 0 0 0
50941- 0 0 0 0 0 0 0 0 0 0 0 0
50942- 0 0 0 0 0 0 0 0 0 0 0 0
50943- 0 0 0 0 0 0 0 0 0 0 0 0
50944- 0 0 0 10 10 10 26 26 26 66 66 66
50945- 82 82 82 2 2 6 38 38 38 6 6 6
50946- 14 14 14 210 210 210 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 246 246 246 242 242 242
50949-253 253 253 253 253 253 253 253 253 253 253 253
50950-253 253 253 253 253 253 253 253 253 253 253 253
50951-253 253 253 253 253 253 253 253 253 253 253 253
50952-253 253 253 253 253 253 253 253 253 253 253 253
50953-253 253 253 253 253 253 144 144 144 2 2 6
50954- 2 2 6 2 2 6 2 2 6 46 46 46
50955- 2 2 6 2 2 6 2 2 6 2 2 6
50956- 42 42 42 74 74 74 30 30 30 10 10 10
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 0 0 0 0 0 0 0 0 0
50960- 0 0 0 0 0 0 0 0 0 0 0 0
50961- 0 0 0 0 0 0 0 0 0 0 0 0
50962- 0 0 0 0 0 0 0 0 0 0 0 0
50963- 0 0 0 0 0 0 0 0 0 0 0 0
50964- 6 6 6 14 14 14 42 42 42 90 90 90
50965- 26 26 26 6 6 6 42 42 42 2 2 6
50966- 74 74 74 250 250 250 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 242 242 242 242 242 242
50969-253 253 253 253 253 253 253 253 253 253 253 253
50970-253 253 253 253 253 253 253 253 253 253 253 253
50971-253 253 253 253 253 253 253 253 253 253 253 253
50972-253 253 253 253 253 253 253 253 253 253 253 253
50973-253 253 253 253 253 253 182 182 182 2 2 6
50974- 2 2 6 2 2 6 2 2 6 46 46 46
50975- 2 2 6 2 2 6 2 2 6 2 2 6
50976- 10 10 10 86 86 86 38 38 38 10 10 10
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- 0 0 0 0 0 0 0 0 0 0 0 0
50980- 0 0 0 0 0 0 0 0 0 0 0 0
50981- 0 0 0 0 0 0 0 0 0 0 0 0
50982- 0 0 0 0 0 0 0 0 0 0 0 0
50983- 0 0 0 0 0 0 0 0 0 0 0 0
50984- 10 10 10 26 26 26 66 66 66 82 82 82
50985- 2 2 6 22 22 22 18 18 18 2 2 6
50986-149 149 149 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 234 234 234 242 242 242
50989-253 253 253 253 253 253 253 253 253 253 253 253
50990-253 253 253 253 253 253 253 253 253 253 253 253
50991-253 253 253 253 253 253 253 253 253 253 253 253
50992-253 253 253 253 253 253 253 253 253 253 253 253
50993-253 253 253 253 253 253 206 206 206 2 2 6
50994- 2 2 6 2 2 6 2 2 6 38 38 38
50995- 2 2 6 2 2 6 2 2 6 2 2 6
50996- 6 6 6 86 86 86 46 46 46 14 14 14
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- 0 0 0 0 0 0 0 0 0 0 0 0
51000- 0 0 0 0 0 0 0 0 0 0 0 0
51001- 0 0 0 0 0 0 0 0 0 0 0 0
51002- 0 0 0 0 0 0 0 0 0 0 0 0
51003- 0 0 0 0 0 0 0 0 0 6 6 6
51004- 18 18 18 46 46 46 86 86 86 18 18 18
51005- 2 2 6 34 34 34 10 10 10 6 6 6
51006-210 210 210 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 234 234 234 242 242 242
51009-253 253 253 253 253 253 253 253 253 253 253 253
51010-253 253 253 253 253 253 253 253 253 253 253 253
51011-253 253 253 253 253 253 253 253 253 253 253 253
51012-253 253 253 253 253 253 253 253 253 253 253 253
51013-253 253 253 253 253 253 221 221 221 6 6 6
51014- 2 2 6 2 2 6 6 6 6 30 30 30
51015- 2 2 6 2 2 6 2 2 6 2 2 6
51016- 2 2 6 82 82 82 54 54 54 18 18 18
51017- 6 6 6 0 0 0 0 0 0 0 0 0
51018- 0 0 0 0 0 0 0 0 0 0 0 0
51019- 0 0 0 0 0 0 0 0 0 0 0 0
51020- 0 0 0 0 0 0 0 0 0 0 0 0
51021- 0 0 0 0 0 0 0 0 0 0 0 0
51022- 0 0 0 0 0 0 0 0 0 0 0 0
51023- 0 0 0 0 0 0 0 0 0 10 10 10
51024- 26 26 26 66 66 66 62 62 62 2 2 6
51025- 2 2 6 38 38 38 10 10 10 26 26 26
51026-238 238 238 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 231 231 231 238 238 238
51029-253 253 253 253 253 253 253 253 253 253 253 253
51030-253 253 253 253 253 253 253 253 253 253 253 253
51031-253 253 253 253 253 253 253 253 253 253 253 253
51032-253 253 253 253 253 253 253 253 253 253 253 253
51033-253 253 253 253 253 253 231 231 231 6 6 6
51034- 2 2 6 2 2 6 10 10 10 30 30 30
51035- 2 2 6 2 2 6 2 2 6 2 2 6
51036- 2 2 6 66 66 66 58 58 58 22 22 22
51037- 6 6 6 0 0 0 0 0 0 0 0 0
51038- 0 0 0 0 0 0 0 0 0 0 0 0
51039- 0 0 0 0 0 0 0 0 0 0 0 0
51040- 0 0 0 0 0 0 0 0 0 0 0 0
51041- 0 0 0 0 0 0 0 0 0 0 0 0
51042- 0 0 0 0 0 0 0 0 0 0 0 0
51043- 0 0 0 0 0 0 0 0 0 10 10 10
51044- 38 38 38 78 78 78 6 6 6 2 2 6
51045- 2 2 6 46 46 46 14 14 14 42 42 42
51046-246 246 246 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 242 242 242
51049-253 253 253 253 253 253 253 253 253 253 253 253
51050-253 253 253 253 253 253 253 253 253 253 253 253
51051-253 253 253 253 253 253 253 253 253 253 253 253
51052-253 253 253 253 253 253 253 253 253 253 253 253
51053-253 253 253 253 253 253 234 234 234 10 10 10
51054- 2 2 6 2 2 6 22 22 22 14 14 14
51055- 2 2 6 2 2 6 2 2 6 2 2 6
51056- 2 2 6 66 66 66 62 62 62 22 22 22
51057- 6 6 6 0 0 0 0 0 0 0 0 0
51058- 0 0 0 0 0 0 0 0 0 0 0 0
51059- 0 0 0 0 0 0 0 0 0 0 0 0
51060- 0 0 0 0 0 0 0 0 0 0 0 0
51061- 0 0 0 0 0 0 0 0 0 0 0 0
51062- 0 0 0 0 0 0 0 0 0 0 0 0
51063- 0 0 0 0 0 0 6 6 6 18 18 18
51064- 50 50 50 74 74 74 2 2 6 2 2 6
51065- 14 14 14 70 70 70 34 34 34 62 62 62
51066-250 250 250 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 231 231 231 246 246 246
51069-253 253 253 253 253 253 253 253 253 253 253 253
51070-253 253 253 253 253 253 253 253 253 253 253 253
51071-253 253 253 253 253 253 253 253 253 253 253 253
51072-253 253 253 253 253 253 253 253 253 253 253 253
51073-253 253 253 253 253 253 234 234 234 14 14 14
51074- 2 2 6 2 2 6 30 30 30 2 2 6
51075- 2 2 6 2 2 6 2 2 6 2 2 6
51076- 2 2 6 66 66 66 62 62 62 22 22 22
51077- 6 6 6 0 0 0 0 0 0 0 0 0
51078- 0 0 0 0 0 0 0 0 0 0 0 0
51079- 0 0 0 0 0 0 0 0 0 0 0 0
51080- 0 0 0 0 0 0 0 0 0 0 0 0
51081- 0 0 0 0 0 0 0 0 0 0 0 0
51082- 0 0 0 0 0 0 0 0 0 0 0 0
51083- 0 0 0 0 0 0 6 6 6 18 18 18
51084- 54 54 54 62 62 62 2 2 6 2 2 6
51085- 2 2 6 30 30 30 46 46 46 70 70 70
51086-250 250 250 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 231 231 231 246 246 246
51089-253 253 253 253 253 253 253 253 253 253 253 253
51090-253 253 253 253 253 253 253 253 253 253 253 253
51091-253 253 253 253 253 253 253 253 253 253 253 253
51092-253 253 253 253 253 253 253 253 253 253 253 253
51093-253 253 253 253 253 253 226 226 226 10 10 10
51094- 2 2 6 6 6 6 30 30 30 2 2 6
51095- 2 2 6 2 2 6 2 2 6 2 2 6
51096- 2 2 6 66 66 66 58 58 58 22 22 22
51097- 6 6 6 0 0 0 0 0 0 0 0 0
51098- 0 0 0 0 0 0 0 0 0 0 0 0
51099- 0 0 0 0 0 0 0 0 0 0 0 0
51100- 0 0 0 0 0 0 0 0 0 0 0 0
51101- 0 0 0 0 0 0 0 0 0 0 0 0
51102- 0 0 0 0 0 0 0 0 0 0 0 0
51103- 0 0 0 0 0 0 6 6 6 22 22 22
51104- 58 58 58 62 62 62 2 2 6 2 2 6
51105- 2 2 6 2 2 6 30 30 30 78 78 78
51106-250 250 250 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 231 231 231 246 246 246
51109-253 253 253 253 253 253 253 253 253 253 253 253
51110-253 253 253 253 253 253 253 253 253 253 253 253
51111-253 253 253 253 253 253 253 253 253 253 253 253
51112-253 253 253 253 253 253 253 253 253 253 253 253
51113-253 253 253 253 253 253 206 206 206 2 2 6
51114- 22 22 22 34 34 34 18 14 6 22 22 22
51115- 26 26 26 18 18 18 6 6 6 2 2 6
51116- 2 2 6 82 82 82 54 54 54 18 18 18
51117- 6 6 6 0 0 0 0 0 0 0 0 0
51118- 0 0 0 0 0 0 0 0 0 0 0 0
51119- 0 0 0 0 0 0 0 0 0 0 0 0
51120- 0 0 0 0 0 0 0 0 0 0 0 0
51121- 0 0 0 0 0 0 0 0 0 0 0 0
51122- 0 0 0 0 0 0 0 0 0 0 0 0
51123- 0 0 0 0 0 0 6 6 6 26 26 26
51124- 62 62 62 106 106 106 74 54 14 185 133 11
51125-210 162 10 121 92 8 6 6 6 62 62 62
51126-238 238 238 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 231 231 231 246 246 246
51129-253 253 253 253 253 253 253 253 253 253 253 253
51130-253 253 253 253 253 253 253 253 253 253 253 253
51131-253 253 253 253 253 253 253 253 253 253 253 253
51132-253 253 253 253 253 253 253 253 253 253 253 253
51133-253 253 253 253 253 253 158 158 158 18 18 18
51134- 14 14 14 2 2 6 2 2 6 2 2 6
51135- 6 6 6 18 18 18 66 66 66 38 38 38
51136- 6 6 6 94 94 94 50 50 50 18 18 18
51137- 6 6 6 0 0 0 0 0 0 0 0 0
51138- 0 0 0 0 0 0 0 0 0 0 0 0
51139- 0 0 0 0 0 0 0 0 0 0 0 0
51140- 0 0 0 0 0 0 0 0 0 0 0 0
51141- 0 0 0 0 0 0 0 0 0 0 0 0
51142- 0 0 0 0 0 0 0 0 0 6 6 6
51143- 10 10 10 10 10 10 18 18 18 38 38 38
51144- 78 78 78 142 134 106 216 158 10 242 186 14
51145-246 190 14 246 190 14 156 118 10 10 10 10
51146- 90 90 90 238 238 238 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 231 231 231 250 250 250
51149-253 253 253 253 253 253 253 253 253 253 253 253
51150-253 253 253 253 253 253 253 253 253 253 253 253
51151-253 253 253 253 253 253 253 253 253 253 253 253
51152-253 253 253 253 253 253 253 253 253 246 230 190
51153-238 204 91 238 204 91 181 142 44 37 26 9
51154- 2 2 6 2 2 6 2 2 6 2 2 6
51155- 2 2 6 2 2 6 38 38 38 46 46 46
51156- 26 26 26 106 106 106 54 54 54 18 18 18
51157- 6 6 6 0 0 0 0 0 0 0 0 0
51158- 0 0 0 0 0 0 0 0 0 0 0 0
51159- 0 0 0 0 0 0 0 0 0 0 0 0
51160- 0 0 0 0 0 0 0 0 0 0 0 0
51161- 0 0 0 0 0 0 0 0 0 0 0 0
51162- 0 0 0 6 6 6 14 14 14 22 22 22
51163- 30 30 30 38 38 38 50 50 50 70 70 70
51164-106 106 106 190 142 34 226 170 11 242 186 14
51165-246 190 14 246 190 14 246 190 14 154 114 10
51166- 6 6 6 74 74 74 226 226 226 253 253 253
51167-253 253 253 253 253 253 253 253 253 253 253 253
51168-253 253 253 253 253 253 231 231 231 250 250 250
51169-253 253 253 253 253 253 253 253 253 253 253 253
51170-253 253 253 253 253 253 253 253 253 253 253 253
51171-253 253 253 253 253 253 253 253 253 253 253 253
51172-253 253 253 253 253 253 253 253 253 228 184 62
51173-241 196 14 241 208 19 232 195 16 38 30 10
51174- 2 2 6 2 2 6 2 2 6 2 2 6
51175- 2 2 6 6 6 6 30 30 30 26 26 26
51176-203 166 17 154 142 90 66 66 66 26 26 26
51177- 6 6 6 0 0 0 0 0 0 0 0 0
51178- 0 0 0 0 0 0 0 0 0 0 0 0
51179- 0 0 0 0 0 0 0 0 0 0 0 0
51180- 0 0 0 0 0 0 0 0 0 0 0 0
51181- 0 0 0 0 0 0 0 0 0 0 0 0
51182- 6 6 6 18 18 18 38 38 38 58 58 58
51183- 78 78 78 86 86 86 101 101 101 123 123 123
51184-175 146 61 210 150 10 234 174 13 246 186 14
51185-246 190 14 246 190 14 246 190 14 238 190 10
51186-102 78 10 2 2 6 46 46 46 198 198 198
51187-253 253 253 253 253 253 253 253 253 253 253 253
51188-253 253 253 253 253 253 234 234 234 242 242 242
51189-253 253 253 253 253 253 253 253 253 253 253 253
51190-253 253 253 253 253 253 253 253 253 253 253 253
51191-253 253 253 253 253 253 253 253 253 253 253 253
51192-253 253 253 253 253 253 253 253 253 224 178 62
51193-242 186 14 241 196 14 210 166 10 22 18 6
51194- 2 2 6 2 2 6 2 2 6 2 2 6
51195- 2 2 6 2 2 6 6 6 6 121 92 8
51196-238 202 15 232 195 16 82 82 82 34 34 34
51197- 10 10 10 0 0 0 0 0 0 0 0 0
51198- 0 0 0 0 0 0 0 0 0 0 0 0
51199- 0 0 0 0 0 0 0 0 0 0 0 0
51200- 0 0 0 0 0 0 0 0 0 0 0 0
51201- 0 0 0 0 0 0 0 0 0 0 0 0
51202- 14 14 14 38 38 38 70 70 70 154 122 46
51203-190 142 34 200 144 11 197 138 11 197 138 11
51204-213 154 11 226 170 11 242 186 14 246 190 14
51205-246 190 14 246 190 14 246 190 14 246 190 14
51206-225 175 15 46 32 6 2 2 6 22 22 22
51207-158 158 158 250 250 250 253 253 253 253 253 253
51208-253 253 253 253 253 253 253 253 253 253 253 253
51209-253 253 253 253 253 253 253 253 253 253 253 253
51210-253 253 253 253 253 253 253 253 253 253 253 253
51211-253 253 253 253 253 253 253 253 253 253 253 253
51212-253 253 253 250 250 250 242 242 242 224 178 62
51213-239 182 13 236 186 11 213 154 11 46 32 6
51214- 2 2 6 2 2 6 2 2 6 2 2 6
51215- 2 2 6 2 2 6 61 42 6 225 175 15
51216-238 190 10 236 186 11 112 100 78 42 42 42
51217- 14 14 14 0 0 0 0 0 0 0 0 0
51218- 0 0 0 0 0 0 0 0 0 0 0 0
51219- 0 0 0 0 0 0 0 0 0 0 0 0
51220- 0 0 0 0 0 0 0 0 0 0 0 0
51221- 0 0 0 0 0 0 0 0 0 6 6 6
51222- 22 22 22 54 54 54 154 122 46 213 154 11
51223-226 170 11 230 174 11 226 170 11 226 170 11
51224-236 178 12 242 186 14 246 190 14 246 190 14
51225-246 190 14 246 190 14 246 190 14 246 190 14
51226-241 196 14 184 144 12 10 10 10 2 2 6
51227- 6 6 6 116 116 116 242 242 242 253 253 253
51228-253 253 253 253 253 253 253 253 253 253 253 253
51229-253 253 253 253 253 253 253 253 253 253 253 253
51230-253 253 253 253 253 253 253 253 253 253 253 253
51231-253 253 253 253 253 253 253 253 253 253 253 253
51232-253 253 253 231 231 231 198 198 198 214 170 54
51233-236 178 12 236 178 12 210 150 10 137 92 6
51234- 18 14 6 2 2 6 2 2 6 2 2 6
51235- 6 6 6 70 47 6 200 144 11 236 178 12
51236-239 182 13 239 182 13 124 112 88 58 58 58
51237- 22 22 22 6 6 6 0 0 0 0 0 0
51238- 0 0 0 0 0 0 0 0 0 0 0 0
51239- 0 0 0 0 0 0 0 0 0 0 0 0
51240- 0 0 0 0 0 0 0 0 0 0 0 0
51241- 0 0 0 0 0 0 0 0 0 10 10 10
51242- 30 30 30 70 70 70 180 133 36 226 170 11
51243-239 182 13 242 186 14 242 186 14 246 186 14
51244-246 190 14 246 190 14 246 190 14 246 190 14
51245-246 190 14 246 190 14 246 190 14 246 190 14
51246-246 190 14 232 195 16 98 70 6 2 2 6
51247- 2 2 6 2 2 6 66 66 66 221 221 221
51248-253 253 253 253 253 253 253 253 253 253 253 253
51249-253 253 253 253 253 253 253 253 253 253 253 253
51250-253 253 253 253 253 253 253 253 253 253 253 253
51251-253 253 253 253 253 253 253 253 253 253 253 253
51252-253 253 253 206 206 206 198 198 198 214 166 58
51253-230 174 11 230 174 11 216 158 10 192 133 9
51254-163 110 8 116 81 8 102 78 10 116 81 8
51255-167 114 7 197 138 11 226 170 11 239 182 13
51256-242 186 14 242 186 14 162 146 94 78 78 78
51257- 34 34 34 14 14 14 6 6 6 0 0 0
51258- 0 0 0 0 0 0 0 0 0 0 0 0
51259- 0 0 0 0 0 0 0 0 0 0 0 0
51260- 0 0 0 0 0 0 0 0 0 0 0 0
51261- 0 0 0 0 0 0 0 0 0 6 6 6
51262- 30 30 30 78 78 78 190 142 34 226 170 11
51263-239 182 13 246 190 14 246 190 14 246 190 14
51264-246 190 14 246 190 14 246 190 14 246 190 14
51265-246 190 14 246 190 14 246 190 14 246 190 14
51266-246 190 14 241 196 14 203 166 17 22 18 6
51267- 2 2 6 2 2 6 2 2 6 38 38 38
51268-218 218 218 253 253 253 253 253 253 253 253 253
51269-253 253 253 253 253 253 253 253 253 253 253 253
51270-253 253 253 253 253 253 253 253 253 253 253 253
51271-253 253 253 253 253 253 253 253 253 253 253 253
51272-250 250 250 206 206 206 198 198 198 202 162 69
51273-226 170 11 236 178 12 224 166 10 210 150 10
51274-200 144 11 197 138 11 192 133 9 197 138 11
51275-210 150 10 226 170 11 242 186 14 246 190 14
51276-246 190 14 246 186 14 225 175 15 124 112 88
51277- 62 62 62 30 30 30 14 14 14 6 6 6
51278- 0 0 0 0 0 0 0 0 0 0 0 0
51279- 0 0 0 0 0 0 0 0 0 0 0 0
51280- 0 0 0 0 0 0 0 0 0 0 0 0
51281- 0 0 0 0 0 0 0 0 0 10 10 10
51282- 30 30 30 78 78 78 174 135 50 224 166 10
51283-239 182 13 246 190 14 246 190 14 246 190 14
51284-246 190 14 246 190 14 246 190 14 246 190 14
51285-246 190 14 246 190 14 246 190 14 246 190 14
51286-246 190 14 246 190 14 241 196 14 139 102 15
51287- 2 2 6 2 2 6 2 2 6 2 2 6
51288- 78 78 78 250 250 250 253 253 253 253 253 253
51289-253 253 253 253 253 253 253 253 253 253 253 253
51290-253 253 253 253 253 253 253 253 253 253 253 253
51291-253 253 253 253 253 253 253 253 253 253 253 253
51292-250 250 250 214 214 214 198 198 198 190 150 46
51293-219 162 10 236 178 12 234 174 13 224 166 10
51294-216 158 10 213 154 11 213 154 11 216 158 10
51295-226 170 11 239 182 13 246 190 14 246 190 14
51296-246 190 14 246 190 14 242 186 14 206 162 42
51297-101 101 101 58 58 58 30 30 30 14 14 14
51298- 6 6 6 0 0 0 0 0 0 0 0 0
51299- 0 0 0 0 0 0 0 0 0 0 0 0
51300- 0 0 0 0 0 0 0 0 0 0 0 0
51301- 0 0 0 0 0 0 0 0 0 10 10 10
51302- 30 30 30 74 74 74 174 135 50 216 158 10
51303-236 178 12 246 190 14 246 190 14 246 190 14
51304-246 190 14 246 190 14 246 190 14 246 190 14
51305-246 190 14 246 190 14 246 190 14 246 190 14
51306-246 190 14 246 190 14 241 196 14 226 184 13
51307- 61 42 6 2 2 6 2 2 6 2 2 6
51308- 22 22 22 238 238 238 253 253 253 253 253 253
51309-253 253 253 253 253 253 253 253 253 253 253 253
51310-253 253 253 253 253 253 253 253 253 253 253 253
51311-253 253 253 253 253 253 253 253 253 253 253 253
51312-253 253 253 226 226 226 187 187 187 180 133 36
51313-216 158 10 236 178 12 239 182 13 236 178 12
51314-230 174 11 226 170 11 226 170 11 230 174 11
51315-236 178 12 242 186 14 246 190 14 246 190 14
51316-246 190 14 246 190 14 246 186 14 239 182 13
51317-206 162 42 106 106 106 66 66 66 34 34 34
51318- 14 14 14 6 6 6 0 0 0 0 0 0
51319- 0 0 0 0 0 0 0 0 0 0 0 0
51320- 0 0 0 0 0 0 0 0 0 0 0 0
51321- 0 0 0 0 0 0 0 0 0 6 6 6
51322- 26 26 26 70 70 70 163 133 67 213 154 11
51323-236 178 12 246 190 14 246 190 14 246 190 14
51324-246 190 14 246 190 14 246 190 14 246 190 14
51325-246 190 14 246 190 14 246 190 14 246 190 14
51326-246 190 14 246 190 14 246 190 14 241 196 14
51327-190 146 13 18 14 6 2 2 6 2 2 6
51328- 46 46 46 246 246 246 253 253 253 253 253 253
51329-253 253 253 253 253 253 253 253 253 253 253 253
51330-253 253 253 253 253 253 253 253 253 253 253 253
51331-253 253 253 253 253 253 253 253 253 253 253 253
51332-253 253 253 221 221 221 86 86 86 156 107 11
51333-216 158 10 236 178 12 242 186 14 246 186 14
51334-242 186 14 239 182 13 239 182 13 242 186 14
51335-242 186 14 246 186 14 246 190 14 246 190 14
51336-246 190 14 246 190 14 246 190 14 246 190 14
51337-242 186 14 225 175 15 142 122 72 66 66 66
51338- 30 30 30 10 10 10 0 0 0 0 0 0
51339- 0 0 0 0 0 0 0 0 0 0 0 0
51340- 0 0 0 0 0 0 0 0 0 0 0 0
51341- 0 0 0 0 0 0 0 0 0 6 6 6
51342- 26 26 26 70 70 70 163 133 67 210 150 10
51343-236 178 12 246 190 14 246 190 14 246 190 14
51344-246 190 14 246 190 14 246 190 14 246 190 14
51345-246 190 14 246 190 14 246 190 14 246 190 14
51346-246 190 14 246 190 14 246 190 14 246 190 14
51347-232 195 16 121 92 8 34 34 34 106 106 106
51348-221 221 221 253 253 253 253 253 253 253 253 253
51349-253 253 253 253 253 253 253 253 253 253 253 253
51350-253 253 253 253 253 253 253 253 253 253 253 253
51351-253 253 253 253 253 253 253 253 253 253 253 253
51352-242 242 242 82 82 82 18 14 6 163 110 8
51353-216 158 10 236 178 12 242 186 14 246 190 14
51354-246 190 14 246 190 14 246 190 14 246 190 14
51355-246 190 14 246 190 14 246 190 14 246 190 14
51356-246 190 14 246 190 14 246 190 14 246 190 14
51357-246 190 14 246 190 14 242 186 14 163 133 67
51358- 46 46 46 18 18 18 6 6 6 0 0 0
51359- 0 0 0 0 0 0 0 0 0 0 0 0
51360- 0 0 0 0 0 0 0 0 0 0 0 0
51361- 0 0 0 0 0 0 0 0 0 10 10 10
51362- 30 30 30 78 78 78 163 133 67 210 150 10
51363-236 178 12 246 186 14 246 190 14 246 190 14
51364-246 190 14 246 190 14 246 190 14 246 190 14
51365-246 190 14 246 190 14 246 190 14 246 190 14
51366-246 190 14 246 190 14 246 190 14 246 190 14
51367-241 196 14 215 174 15 190 178 144 253 253 253
51368-253 253 253 253 253 253 253 253 253 253 253 253
51369-253 253 253 253 253 253 253 253 253 253 253 253
51370-253 253 253 253 253 253 253 253 253 253 253 253
51371-253 253 253 253 253 253 253 253 253 218 218 218
51372- 58 58 58 2 2 6 22 18 6 167 114 7
51373-216 158 10 236 178 12 246 186 14 246 190 14
51374-246 190 14 246 190 14 246 190 14 246 190 14
51375-246 190 14 246 190 14 246 190 14 246 190 14
51376-246 190 14 246 190 14 246 190 14 246 190 14
51377-246 190 14 246 186 14 242 186 14 190 150 46
51378- 54 54 54 22 22 22 6 6 6 0 0 0
51379- 0 0 0 0 0 0 0 0 0 0 0 0
51380- 0 0 0 0 0 0 0 0 0 0 0 0
51381- 0 0 0 0 0 0 0 0 0 14 14 14
51382- 38 38 38 86 86 86 180 133 36 213 154 11
51383-236 178 12 246 186 14 246 190 14 246 190 14
51384-246 190 14 246 190 14 246 190 14 246 190 14
51385-246 190 14 246 190 14 246 190 14 246 190 14
51386-246 190 14 246 190 14 246 190 14 246 190 14
51387-246 190 14 232 195 16 190 146 13 214 214 214
51388-253 253 253 253 253 253 253 253 253 253 253 253
51389-253 253 253 253 253 253 253 253 253 253 253 253
51390-253 253 253 253 253 253 253 253 253 253 253 253
51391-253 253 253 250 250 250 170 170 170 26 26 26
51392- 2 2 6 2 2 6 37 26 9 163 110 8
51393-219 162 10 239 182 13 246 186 14 246 190 14
51394-246 190 14 246 190 14 246 190 14 246 190 14
51395-246 190 14 246 190 14 246 190 14 246 190 14
51396-246 190 14 246 190 14 246 190 14 246 190 14
51397-246 186 14 236 178 12 224 166 10 142 122 72
51398- 46 46 46 18 18 18 6 6 6 0 0 0
51399- 0 0 0 0 0 0 0 0 0 0 0 0
51400- 0 0 0 0 0 0 0 0 0 0 0 0
51401- 0 0 0 0 0 0 6 6 6 18 18 18
51402- 50 50 50 109 106 95 192 133 9 224 166 10
51403-242 186 14 246 190 14 246 190 14 246 190 14
51404-246 190 14 246 190 14 246 190 14 246 190 14
51405-246 190 14 246 190 14 246 190 14 246 190 14
51406-246 190 14 246 190 14 246 190 14 246 190 14
51407-242 186 14 226 184 13 210 162 10 142 110 46
51408-226 226 226 253 253 253 253 253 253 253 253 253
51409-253 253 253 253 253 253 253 253 253 253 253 253
51410-253 253 253 253 253 253 253 253 253 253 253 253
51411-198 198 198 66 66 66 2 2 6 2 2 6
51412- 2 2 6 2 2 6 50 34 6 156 107 11
51413-219 162 10 239 182 13 246 186 14 246 190 14
51414-246 190 14 246 190 14 246 190 14 246 190 14
51415-246 190 14 246 190 14 246 190 14 246 190 14
51416-246 190 14 246 190 14 246 190 14 242 186 14
51417-234 174 13 213 154 11 154 122 46 66 66 66
51418- 30 30 30 10 10 10 0 0 0 0 0 0
51419- 0 0 0 0 0 0 0 0 0 0 0 0
51420- 0 0 0 0 0 0 0 0 0 0 0 0
51421- 0 0 0 0 0 0 6 6 6 22 22 22
51422- 58 58 58 154 121 60 206 145 10 234 174 13
51423-242 186 14 246 186 14 246 190 14 246 190 14
51424-246 190 14 246 190 14 246 190 14 246 190 14
51425-246 190 14 246 190 14 246 190 14 246 190 14
51426-246 190 14 246 190 14 246 190 14 246 190 14
51427-246 186 14 236 178 12 210 162 10 163 110 8
51428- 61 42 6 138 138 138 218 218 218 250 250 250
51429-253 253 253 253 253 253 253 253 253 250 250 250
51430-242 242 242 210 210 210 144 144 144 66 66 66
51431- 6 6 6 2 2 6 2 2 6 2 2 6
51432- 2 2 6 2 2 6 61 42 6 163 110 8
51433-216 158 10 236 178 12 246 190 14 246 190 14
51434-246 190 14 246 190 14 246 190 14 246 190 14
51435-246 190 14 246 190 14 246 190 14 246 190 14
51436-246 190 14 239 182 13 230 174 11 216 158 10
51437-190 142 34 124 112 88 70 70 70 38 38 38
51438- 18 18 18 6 6 6 0 0 0 0 0 0
51439- 0 0 0 0 0 0 0 0 0 0 0 0
51440- 0 0 0 0 0 0 0 0 0 0 0 0
51441- 0 0 0 0 0 0 6 6 6 22 22 22
51442- 62 62 62 168 124 44 206 145 10 224 166 10
51443-236 178 12 239 182 13 242 186 14 242 186 14
51444-246 186 14 246 190 14 246 190 14 246 190 14
51445-246 190 14 246 190 14 246 190 14 246 190 14
51446-246 190 14 246 190 14 246 190 14 246 190 14
51447-246 190 14 236 178 12 216 158 10 175 118 6
51448- 80 54 7 2 2 6 6 6 6 30 30 30
51449- 54 54 54 62 62 62 50 50 50 38 38 38
51450- 14 14 14 2 2 6 2 2 6 2 2 6
51451- 2 2 6 2 2 6 2 2 6 2 2 6
51452- 2 2 6 6 6 6 80 54 7 167 114 7
51453-213 154 11 236 178 12 246 190 14 246 190 14
51454-246 190 14 246 190 14 246 190 14 246 190 14
51455-246 190 14 242 186 14 239 182 13 239 182 13
51456-230 174 11 210 150 10 174 135 50 124 112 88
51457- 82 82 82 54 54 54 34 34 34 18 18 18
51458- 6 6 6 0 0 0 0 0 0 0 0 0
51459- 0 0 0 0 0 0 0 0 0 0 0 0
51460- 0 0 0 0 0 0 0 0 0 0 0 0
51461- 0 0 0 0 0 0 6 6 6 18 18 18
51462- 50 50 50 158 118 36 192 133 9 200 144 11
51463-216 158 10 219 162 10 224 166 10 226 170 11
51464-230 174 11 236 178 12 239 182 13 239 182 13
51465-242 186 14 246 186 14 246 190 14 246 190 14
51466-246 190 14 246 190 14 246 190 14 246 190 14
51467-246 186 14 230 174 11 210 150 10 163 110 8
51468-104 69 6 10 10 10 2 2 6 2 2 6
51469- 2 2 6 2 2 6 2 2 6 2 2 6
51470- 2 2 6 2 2 6 2 2 6 2 2 6
51471- 2 2 6 2 2 6 2 2 6 2 2 6
51472- 2 2 6 6 6 6 91 60 6 167 114 7
51473-206 145 10 230 174 11 242 186 14 246 190 14
51474-246 190 14 246 190 14 246 186 14 242 186 14
51475-239 182 13 230 174 11 224 166 10 213 154 11
51476-180 133 36 124 112 88 86 86 86 58 58 58
51477- 38 38 38 22 22 22 10 10 10 6 6 6
51478- 0 0 0 0 0 0 0 0 0 0 0 0
51479- 0 0 0 0 0 0 0 0 0 0 0 0
51480- 0 0 0 0 0 0 0 0 0 0 0 0
51481- 0 0 0 0 0 0 0 0 0 14 14 14
51482- 34 34 34 70 70 70 138 110 50 158 118 36
51483-167 114 7 180 123 7 192 133 9 197 138 11
51484-200 144 11 206 145 10 213 154 11 219 162 10
51485-224 166 10 230 174 11 239 182 13 242 186 14
51486-246 186 14 246 186 14 246 186 14 246 186 14
51487-239 182 13 216 158 10 185 133 11 152 99 6
51488-104 69 6 18 14 6 2 2 6 2 2 6
51489- 2 2 6 2 2 6 2 2 6 2 2 6
51490- 2 2 6 2 2 6 2 2 6 2 2 6
51491- 2 2 6 2 2 6 2 2 6 2 2 6
51492- 2 2 6 6 6 6 80 54 7 152 99 6
51493-192 133 9 219 162 10 236 178 12 239 182 13
51494-246 186 14 242 186 14 239 182 13 236 178 12
51495-224 166 10 206 145 10 192 133 9 154 121 60
51496- 94 94 94 62 62 62 42 42 42 22 22 22
51497- 14 14 14 6 6 6 0 0 0 0 0 0
51498- 0 0 0 0 0 0 0 0 0 0 0 0
51499- 0 0 0 0 0 0 0 0 0 0 0 0
51500- 0 0 0 0 0 0 0 0 0 0 0 0
51501- 0 0 0 0 0 0 0 0 0 6 6 6
51502- 18 18 18 34 34 34 58 58 58 78 78 78
51503-101 98 89 124 112 88 142 110 46 156 107 11
51504-163 110 8 167 114 7 175 118 6 180 123 7
51505-185 133 11 197 138 11 210 150 10 219 162 10
51506-226 170 11 236 178 12 236 178 12 234 174 13
51507-219 162 10 197 138 11 163 110 8 130 83 6
51508- 91 60 6 10 10 10 2 2 6 2 2 6
51509- 18 18 18 38 38 38 38 38 38 38 38 38
51510- 38 38 38 38 38 38 38 38 38 38 38 38
51511- 38 38 38 38 38 38 26 26 26 2 2 6
51512- 2 2 6 6 6 6 70 47 6 137 92 6
51513-175 118 6 200 144 11 219 162 10 230 174 11
51514-234 174 13 230 174 11 219 162 10 210 150 10
51515-192 133 9 163 110 8 124 112 88 82 82 82
51516- 50 50 50 30 30 30 14 14 14 6 6 6
51517- 0 0 0 0 0 0 0 0 0 0 0 0
51518- 0 0 0 0 0 0 0 0 0 0 0 0
51519- 0 0 0 0 0 0 0 0 0 0 0 0
51520- 0 0 0 0 0 0 0 0 0 0 0 0
51521- 0 0 0 0 0 0 0 0 0 0 0 0
51522- 6 6 6 14 14 14 22 22 22 34 34 34
51523- 42 42 42 58 58 58 74 74 74 86 86 86
51524-101 98 89 122 102 70 130 98 46 121 87 25
51525-137 92 6 152 99 6 163 110 8 180 123 7
51526-185 133 11 197 138 11 206 145 10 200 144 11
51527-180 123 7 156 107 11 130 83 6 104 69 6
51528- 50 34 6 54 54 54 110 110 110 101 98 89
51529- 86 86 86 82 82 82 78 78 78 78 78 78
51530- 78 78 78 78 78 78 78 78 78 78 78 78
51531- 78 78 78 82 82 82 86 86 86 94 94 94
51532-106 106 106 101 101 101 86 66 34 124 80 6
51533-156 107 11 180 123 7 192 133 9 200 144 11
51534-206 145 10 200 144 11 192 133 9 175 118 6
51535-139 102 15 109 106 95 70 70 70 42 42 42
51536- 22 22 22 10 10 10 0 0 0 0 0 0
51537- 0 0 0 0 0 0 0 0 0 0 0 0
51538- 0 0 0 0 0 0 0 0 0 0 0 0
51539- 0 0 0 0 0 0 0 0 0 0 0 0
51540- 0 0 0 0 0 0 0 0 0 0 0 0
51541- 0 0 0 0 0 0 0 0 0 0 0 0
51542- 0 0 0 0 0 0 6 6 6 10 10 10
51543- 14 14 14 22 22 22 30 30 30 38 38 38
51544- 50 50 50 62 62 62 74 74 74 90 90 90
51545-101 98 89 112 100 78 121 87 25 124 80 6
51546-137 92 6 152 99 6 152 99 6 152 99 6
51547-138 86 6 124 80 6 98 70 6 86 66 30
51548-101 98 89 82 82 82 58 58 58 46 46 46
51549- 38 38 38 34 34 34 34 34 34 34 34 34
51550- 34 34 34 34 34 34 34 34 34 34 34 34
51551- 34 34 34 34 34 34 38 38 38 42 42 42
51552- 54 54 54 82 82 82 94 86 76 91 60 6
51553-134 86 6 156 107 11 167 114 7 175 118 6
51554-175 118 6 167 114 7 152 99 6 121 87 25
51555-101 98 89 62 62 62 34 34 34 18 18 18
51556- 6 6 6 0 0 0 0 0 0 0 0 0
51557- 0 0 0 0 0 0 0 0 0 0 0 0
51558- 0 0 0 0 0 0 0 0 0 0 0 0
51559- 0 0 0 0 0 0 0 0 0 0 0 0
51560- 0 0 0 0 0 0 0 0 0 0 0 0
51561- 0 0 0 0 0 0 0 0 0 0 0 0
51562- 0 0 0 0 0 0 0 0 0 0 0 0
51563- 0 0 0 6 6 6 6 6 6 10 10 10
51564- 18 18 18 22 22 22 30 30 30 42 42 42
51565- 50 50 50 66 66 66 86 86 86 101 98 89
51566-106 86 58 98 70 6 104 69 6 104 69 6
51567-104 69 6 91 60 6 82 62 34 90 90 90
51568- 62 62 62 38 38 38 22 22 22 14 14 14
51569- 10 10 10 10 10 10 10 10 10 10 10 10
51570- 10 10 10 10 10 10 6 6 6 10 10 10
51571- 10 10 10 10 10 10 10 10 10 14 14 14
51572- 22 22 22 42 42 42 70 70 70 89 81 66
51573- 80 54 7 104 69 6 124 80 6 137 92 6
51574-134 86 6 116 81 8 100 82 52 86 86 86
51575- 58 58 58 30 30 30 14 14 14 6 6 6
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 0 0 0 0 0 0 0 0 0
51579- 0 0 0 0 0 0 0 0 0 0 0 0
51580- 0 0 0 0 0 0 0 0 0 0 0 0
51581- 0 0 0 0 0 0 0 0 0 0 0 0
51582- 0 0 0 0 0 0 0 0 0 0 0 0
51583- 0 0 0 0 0 0 0 0 0 0 0 0
51584- 0 0 0 6 6 6 10 10 10 14 14 14
51585- 18 18 18 26 26 26 38 38 38 54 54 54
51586- 70 70 70 86 86 86 94 86 76 89 81 66
51587- 89 81 66 86 86 86 74 74 74 50 50 50
51588- 30 30 30 14 14 14 6 6 6 0 0 0
51589- 0 0 0 0 0 0 0 0 0 0 0 0
51590- 0 0 0 0 0 0 0 0 0 0 0 0
51591- 0 0 0 0 0 0 0 0 0 0 0 0
51592- 6 6 6 18 18 18 34 34 34 58 58 58
51593- 82 82 82 89 81 66 89 81 66 89 81 66
51594- 94 86 66 94 86 76 74 74 74 50 50 50
51595- 26 26 26 14 14 14 6 6 6 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 0 0 0 0 0 0 0 0 0
51600- 0 0 0 0 0 0 0 0 0 0 0 0
51601- 0 0 0 0 0 0 0 0 0 0 0 0
51602- 0 0 0 0 0 0 0 0 0 0 0 0
51603- 0 0 0 0 0 0 0 0 0 0 0 0
51604- 0 0 0 0 0 0 0 0 0 0 0 0
51605- 6 6 6 6 6 6 14 14 14 18 18 18
51606- 30 30 30 38 38 38 46 46 46 54 54 54
51607- 50 50 50 42 42 42 30 30 30 18 18 18
51608- 10 10 10 0 0 0 0 0 0 0 0 0
51609- 0 0 0 0 0 0 0 0 0 0 0 0
51610- 0 0 0 0 0 0 0 0 0 0 0 0
51611- 0 0 0 0 0 0 0 0 0 0 0 0
51612- 0 0 0 6 6 6 14 14 14 26 26 26
51613- 38 38 38 50 50 50 58 58 58 58 58 58
51614- 54 54 54 42 42 42 30 30 30 18 18 18
51615- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
51621- 0 0 0 0 0 0 0 0 0 0 0 0
51622- 0 0 0 0 0 0 0 0 0 0 0 0
51623- 0 0 0 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 6 6 6
51626- 6 6 6 10 10 10 14 14 14 18 18 18
51627- 18 18 18 14 14 14 10 10 10 6 6 6
51628- 0 0 0 0 0 0 0 0 0 0 0 0
51629- 0 0 0 0 0 0 0 0 0 0 0 0
51630- 0 0 0 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 6 6 6
51633- 14 14 14 18 18 18 22 22 22 22 22 22
51634- 18 18 18 14 14 14 10 10 10 6 6 6
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+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51641+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51642+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51643+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51646+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51647+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51648+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51649+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51650+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51651+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51652+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51653+4 4 4 4 4 4
51654+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
51668+4 4 4 4 4 4 4 4 4 4 4 4 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
51682+4 4 4 4 4 4 4 4 4 4 4 4 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
51696+4 4 4 4 4 4 4 4 4 4 4 4 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
51710+4 4 4 4 4 4 4 4 4 4 4 4 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
51724+4 4 4 4 4 4 4 4 4 4 4 4 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 3 3 3 0 0 0 0 0 0
51729+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 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 1 1 1 0 0 0
51734+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51735+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
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
51738+4 4 4 4 4 4 4 4 4 4 4 4 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 2 2 2 0 0 0 3 4 3 26 28 28
51743+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
51744+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 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 3 3 3 0 0 0 1 1 1 6 6 6
51748+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
51749+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
51750+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51751+4 4 4 4 4 4
51752+4 4 4 4 4 4 4 4 4 4 4 4 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+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
51757+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
51758+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51759+4 4 4 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 0 0 0 4 4 4 41 54 63 125 124 125
51762+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
51763+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
51764+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
51765+4 4 4 4 4 4
51766+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 5 5 5 2 2 2 0 0 0
51770+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
51771+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
51772+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
51773+4 4 4 4 4 4 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 5 5 5 5 5 5
51775+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
51776+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
51777+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
51778+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
51779+4 4 4 4 4 4
51780+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
51784+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
51785+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
51786+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
51787+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
51788+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
51789+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
51790+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
51791+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
51792+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
51793+4 4 4 4 4 4
51794+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5
51797+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
51798+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
51799+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
51800+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
51801+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
51802+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
51803+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
51804+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
51805+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
51806+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
51807+4 4 4 4 4 4
51808+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 3 3 3
51811+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
51812+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
51813+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
51814+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
51815+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
51816+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
51817+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
51818+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
51819+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
51820+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
51821+4 4 4 4 4 4
51822+4 4 4 4 4 4 4 4 4 4 4 4 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 2 2 2 0 0 0 4 0 0
51825+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
51826+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
51827+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
51828+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
51829+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
51830+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
51831+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
51832+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
51833+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
51834+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
51835+4 4 4 4 4 4
51836+4 4 4 4 4 4 4 4 4 4 4 4 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 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
51839+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
51840+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
51841+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
51842+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
51843+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
51844+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
51845+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
51846+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
51847+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
51848+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
51849+4 4 4 4 4 4
51850+4 4 4 4 4 4 4 4 4 4 4 4 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+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
51853+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
51854+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
51855+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
51856+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
51857+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
51858+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
51859+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
51860+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
51861+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
51862+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
51863+4 4 4 4 4 4
51864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51865+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
51866+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
51867+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
51868+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
51869+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
51870+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
51871+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
51872+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
51873+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
51874+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
51875+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
51876+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
51877+4 4 4 4 4 4
51878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
51879+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
51880+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
51881+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
51882+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
51883+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
51884+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
51885+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
51886+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
51887+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
51888+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
51889+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
51890+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
51891+0 0 0 4 4 4
51892+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
51893+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
51894+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
51895+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
51896+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
51897+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
51898+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
51899+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
51900+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
51901+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
51902+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
51903+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
51904+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
51905+2 0 0 0 0 0
51906+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
51907+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
51908+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
51909+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
51910+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
51911+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
51912+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
51913+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
51914+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
51915+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
51916+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
51917+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
51918+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
51919+37 38 37 0 0 0
51920+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
51921+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
51922+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
51923+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
51924+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
51925+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
51926+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
51927+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
51928+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
51929+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
51930+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
51931+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
51932+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
51933+85 115 134 4 0 0
51934+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
51935+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
51936+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
51937+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
51938+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
51939+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
51940+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
51941+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
51942+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
51943+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
51944+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
51945+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
51946+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
51947+60 73 81 4 0 0
51948+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
51949+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
51950+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
51951+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
51952+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
51953+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
51954+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
51955+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
51956+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
51957+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
51958+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
51959+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
51960+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
51961+16 19 21 4 0 0
51962+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
51963+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
51964+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
51965+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
51966+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
51967+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
51968+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
51969+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
51970+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
51971+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
51972+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
51973+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
51974+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
51975+4 0 0 4 3 3
51976+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
51977+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
51978+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
51979+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
51980+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
51981+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
51982+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
51983+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
51984+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
51985+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
51986+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
51987+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
51988+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
51989+3 2 2 4 4 4
51990+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
51991+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
51992+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
51993+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
51994+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
51995+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
51996+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
51997+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
51998+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
51999+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
52000+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
52001+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
52002+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
52003+4 4 4 4 4 4
52004+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
52005+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
52006+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
52007+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
52008+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
52009+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
52010+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
52011+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
52012+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
52013+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
52014+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
52015+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
52016+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
52017+4 4 4 4 4 4
52018+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
52019+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
52020+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
52021+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
52022+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
52023+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
52024+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
52025+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
52026+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
52027+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
52028+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
52029+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
52030+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
52031+5 5 5 5 5 5
52032+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
52033+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
52034+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
52035+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
52036+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
52037+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52038+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
52039+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
52040+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
52041+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
52042+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
52043+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
52044+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
52045+5 5 5 4 4 4
52046+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
52047+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
52048+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
52049+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
52050+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52051+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
52052+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
52053+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
52054+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
52055+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
52056+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
52057+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
52058+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52059+4 4 4 4 4 4
52060+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
52061+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
52062+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
52063+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
52064+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
52065+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52066+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52067+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
52068+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
52069+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
52070+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
52071+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
52072+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52073+4 4 4 4 4 4
52074+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
52075+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
52076+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
52077+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
52078+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52079+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
52080+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
52081+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
52082+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
52083+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
52084+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
52085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52086+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52087+4 4 4 4 4 4
52088+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
52089+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
52090+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
52091+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
52092+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52093+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52094+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
52095+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
52096+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
52097+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
52098+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
52099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
52102+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
52103+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
52104+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
52105+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
52106+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52107+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
52108+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
52109+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
52110+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
52111+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
52112+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52113+4 4 4 4 4 4 4 4 4 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
52116+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
52117+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
52118+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
52119+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
52120+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
52121+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
52122+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
52123+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
52124+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
52125+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
52126+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
52127+4 4 4 4 4 4 4 4 4 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
52130+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
52131+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
52132+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
52133+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
52134+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
52135+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
52136+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
52137+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
52138+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
52139+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
52140+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
52141+4 4 4 4 4 4 4 4 4 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
52144+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
52145+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
52146+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
52147+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
52148+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
52149+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
52150+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
52151+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
52152+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
52153+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
52154+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52155+4 4 4 4 4 4 4 4 4 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
52158+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
52159+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
52160+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
52161+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
52162+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52163+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
52164+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
52165+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
52166+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
52167+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
52168+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52169+4 4 4 4 4 4 4 4 4 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
52172+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
52173+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
52174+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
52175+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
52176+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52177+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
52178+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
52179+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
52180+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
52181+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
52182+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52183+4 4 4 4 4 4 4 4 4 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
52186+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
52187+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
52188+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
52189+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
52190+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52191+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
52192+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
52193+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
52194+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
52195+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52196+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52197+4 4 4 4 4 4 4 4 4 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
52200+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
52201+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
52202+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
52203+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
52204+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
52205+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
52206+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
52207+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
52208+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52209+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52210+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52211+4 4 4 4 4 4 4 4 4 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
52214+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
52215+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
52216+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
52217+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
52218+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52219+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
52220+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
52221+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
52222+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52223+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52224+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52225+4 4 4 4 4 4 4 4 4 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
52228+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
52229+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
52230+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
52231+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
52232+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
52233+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
52234+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
52235+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
52236+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52237+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52238+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52239+4 4 4 4 4 4 4 4 4 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
52242+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
52243+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
52244+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52245+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
52246+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
52247+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
52248+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
52249+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
52250+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
52251+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52252+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52253+4 4 4 4 4 4 4 4 4 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
52256+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
52257+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
52258+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
52259+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
52260+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
52261+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
52262+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
52263+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
52264+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52265+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52266+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52267+4 4 4 4 4 4 4 4 4 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
52270+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
52271+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
52272+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52273+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
52274+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
52275+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
52276+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
52277+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
52278+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
52279+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52280+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52281+4 4 4 4 4 4 4 4 4 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
52284+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
52285+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
52286+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
52287+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
52288+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
52289+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
52290+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
52291+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
52292+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52293+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52294+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52295+4 4 4 4 4 4 4 4 4 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
52298+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52299+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
52300+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
52301+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
52302+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
52303+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
52304+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
52305+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
52306+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52307+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52308+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52309+4 4 4 4 4 4 4 4 4 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
52312+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
52313+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
52314+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
52315+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
52316+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
52317+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
52318+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52319+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
52320+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
52321+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52322+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52323+4 4 4 4 4 4 4 4 4 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
52326+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52327+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
52328+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
52329+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
52330+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
52331+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
52332+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
52333+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
52334+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
52335+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52336+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52337+4 4 4 4 4 4 4 4 4 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
52340+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
52341+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
52342+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
52343+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
52344+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
52345+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
52346+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
52347+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
52348+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
52349+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52350+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52351+4 4 4 4 4 4 4 4 4 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
52354+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52355+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
52356+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
52357+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
52358+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
52359+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
52360+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
52361+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
52362+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
52363+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52364+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52365+4 4 4 4 4 4 4 4 4 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
52368+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
52369+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
52370+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
52371+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
52372+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
52373+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
52374+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
52375+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
52376+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
52377+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52378+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52379+4 4 4 4 4 4 4 4 4 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
52382+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
52383+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
52384+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
52385+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
52386+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
52387+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
52388+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
52389+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
52390+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
52391+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
52392+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52393+4 4 4 4 4 4 4 4 4 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
52396+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
52397+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
52398+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
52399+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
52400+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
52401+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
52402+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
52403+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
52404+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
52405+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
52406+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52407+4 4 4 4 4 4 4 4 4 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
52410+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
52411+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
52412+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
52413+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
52414+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
52415+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
52416+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
52417+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
52418+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
52419+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
52420+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52421+4 4 4 4 4 4 4 4 4 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
52424+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
52425+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
52426+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
52427+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
52428+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
52429+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
52430+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52431+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
52432+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
52433+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
52434+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52435+4 4 4 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
52438+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
52439+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
52440+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
52441+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
52442+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
52443+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
52444+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
52445+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
52446+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
52447+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
52448+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52449+4 4 4 4 4 4 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
52452+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
52453+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
52454+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
52455+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
52456+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
52457+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
52458+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
52459+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
52460+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
52461+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
52462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52463+4 4 4 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
52466+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52467+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
52468+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
52469+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
52470+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
52471+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
52472+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
52473+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
52474+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
52475+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
52476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
52480+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
52481+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
52482+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
52483+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
52484+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
52485+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
52486+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
52487+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
52488+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
52489+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
52490+4 4 4 4 4 4 4 4 4 4 4 4 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
52494+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
52495+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
52496+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
52497+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
52498+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
52499+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
52500+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
52501+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
52502+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
52503+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52504+4 4 4 4 4 4 4 4 4 4 4 4 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
52508+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
52509+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52510+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
52511+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
52512+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
52513+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
52514+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
52515+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
52516+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
52517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52518+4 4 4 4 4 4 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
52522+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
52523+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
52524+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
52525+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
52526+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
52527+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
52528+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
52529+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
52530+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
52531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
52536+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
52537+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
52538+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
52539+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
52540+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
52541+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
52542+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
52543+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
52544+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52545+4 4 4 4 4 4 4 4 4 4 4 4 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
52550+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
52551+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
52552+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
52553+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
52554+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
52555+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
52556+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
52557+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
52558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52559+4 4 4 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
52564+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
52565+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
52566+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
52567+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
52568+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
52569+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
52570+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
52571+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
52572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
52578+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
52579+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
52580+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52581+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
52582+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
52583+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
52584+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
52585+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
52586+4 4 4 4 4 4 4 4 4 4 4 4 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
52592+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52593+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
52594+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
52595+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
52596+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
52597+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
52598+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
52599+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
52600+4 4 4 4 4 4 4 4 4 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
52606+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52607+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
52608+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
52609+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
52610+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
52611+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
52612+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
52613+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52614+4 4 4 4 4 4 4 4 4 4 4 4 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
52620+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
52623+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
52624+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
52625+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
52626+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
52627+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
52628+4 4 4 4 4 4 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
52634+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5
52637+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52638+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
52639+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
52640+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
52641+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52642+4 4 4 4 4 4 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
52648+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
52652+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
52653+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
52654+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
52655+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
52662+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 6 6 6
52666+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
52667+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
52668+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
52669+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
52676+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5
52680+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
52681+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
52682+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
52683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
52690+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5
52694+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
52695+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
52696+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
52697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
52704+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
52709+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
52710+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
52711+4 4 4 4 4 4 4 4 4 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
52718+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
52723+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
52724+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52725+4 4 4 4 4 4 4 4 4 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
52732+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 6 6 6
52737+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
52738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
52739+4 4 4 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
52746+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3
52751+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
52752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
52760diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
52761index fe92eed..106e085 100644
52762--- a/drivers/video/mb862xx/mb862xxfb_accel.c
52763+++ b/drivers/video/mb862xx/mb862xxfb_accel.c
52764@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
52765 struct mb862xxfb_par *par = info->par;
52766
52767 if (info->var.bits_per_pixel == 32) {
52768- info->fbops->fb_fillrect = cfb_fillrect;
52769- info->fbops->fb_copyarea = cfb_copyarea;
52770- info->fbops->fb_imageblit = cfb_imageblit;
52771+ pax_open_kernel();
52772+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52773+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52774+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52775+ pax_close_kernel();
52776 } else {
52777 outreg(disp, GC_L0EM, 3);
52778- info->fbops->fb_fillrect = mb86290fb_fillrect;
52779- info->fbops->fb_copyarea = mb86290fb_copyarea;
52780- info->fbops->fb_imageblit = mb86290fb_imageblit;
52781+ pax_open_kernel();
52782+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
52783+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
52784+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
52785+ pax_close_kernel();
52786 }
52787 outreg(draw, GDC_REG_DRAW_BASE, 0);
52788 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
52789diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
52790index ff22871..b129bed 100644
52791--- a/drivers/video/nvidia/nvidia.c
52792+++ b/drivers/video/nvidia/nvidia.c
52793@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
52794 info->fix.line_length = (info->var.xres_virtual *
52795 info->var.bits_per_pixel) >> 3;
52796 if (info->var.accel_flags) {
52797- info->fbops->fb_imageblit = nvidiafb_imageblit;
52798- info->fbops->fb_fillrect = nvidiafb_fillrect;
52799- info->fbops->fb_copyarea = nvidiafb_copyarea;
52800- info->fbops->fb_sync = nvidiafb_sync;
52801+ pax_open_kernel();
52802+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
52803+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
52804+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
52805+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
52806+ pax_close_kernel();
52807 info->pixmap.scan_align = 4;
52808 info->flags &= ~FBINFO_HWACCEL_DISABLED;
52809 info->flags |= FBINFO_READS_FAST;
52810 NVResetGraphics(info);
52811 } else {
52812- info->fbops->fb_imageblit = cfb_imageblit;
52813- info->fbops->fb_fillrect = cfb_fillrect;
52814- info->fbops->fb_copyarea = cfb_copyarea;
52815- info->fbops->fb_sync = NULL;
52816+ pax_open_kernel();
52817+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52818+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52819+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52820+ *(void **)&info->fbops->fb_sync = NULL;
52821+ pax_close_kernel();
52822 info->pixmap.scan_align = 1;
52823 info->flags |= FBINFO_HWACCEL_DISABLED;
52824 info->flags &= ~FBINFO_READS_FAST;
52825@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
52826 info->pixmap.size = 8 * 1024;
52827 info->pixmap.flags = FB_PIXMAP_SYSTEM;
52828
52829- if (!hwcur)
52830- info->fbops->fb_cursor = NULL;
52831+ if (!hwcur) {
52832+ pax_open_kernel();
52833+ *(void **)&info->fbops->fb_cursor = NULL;
52834+ pax_close_kernel();
52835+ }
52836
52837 info->var.accel_flags = (!noaccel);
52838
52839diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
52840index fafe7c9..93197b9 100644
52841--- a/drivers/video/omap2/dss/display.c
52842+++ b/drivers/video/omap2/dss/display.c
52843@@ -137,12 +137,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
52844 snprintf(dssdev->alias, sizeof(dssdev->alias),
52845 "display%d", disp_num_counter++);
52846
52847+ pax_open_kernel();
52848 if (drv && drv->get_resolution == NULL)
52849- drv->get_resolution = omapdss_default_get_resolution;
52850+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
52851 if (drv && drv->get_recommended_bpp == NULL)
52852- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52853+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52854 if (drv && drv->get_timings == NULL)
52855- drv->get_timings = omapdss_default_get_timings;
52856+ *(void **)&drv->get_timings = omapdss_default_get_timings;
52857+ pax_close_kernel();
52858
52859 mutex_lock(&panel_list_mutex);
52860 list_add_tail(&dssdev->panel_list, &panel_list);
52861diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
52862index 05c2dc3..ea1f391 100644
52863--- a/drivers/video/s1d13xxxfb.c
52864+++ b/drivers/video/s1d13xxxfb.c
52865@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
52866
52867 switch(prod_id) {
52868 case S1D13506_PROD_ID: /* activate acceleration */
52869- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52870- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52871+ pax_open_kernel();
52872+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52873+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52874+ pax_close_kernel();
52875 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
52876 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
52877 break;
52878diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
52879index e188ada..aac63c8 100644
52880--- a/drivers/video/smscufx.c
52881+++ b/drivers/video/smscufx.c
52882@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
52883 fb_deferred_io_cleanup(info);
52884 kfree(info->fbdefio);
52885 info->fbdefio = NULL;
52886- info->fbops->fb_mmap = ufx_ops_mmap;
52887+ pax_open_kernel();
52888+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
52889+ pax_close_kernel();
52890 }
52891
52892 pr_debug("released /dev/fb%d user=%d count=%d",
52893diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
52894index d2e5bc3..4cb05d1 100644
52895--- a/drivers/video/udlfb.c
52896+++ b/drivers/video/udlfb.c
52897@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
52898 dlfb_urb_completion(urb);
52899
52900 error:
52901- atomic_add(bytes_sent, &dev->bytes_sent);
52902- atomic_add(bytes_identical, &dev->bytes_identical);
52903- atomic_add(width*height*2, &dev->bytes_rendered);
52904+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52905+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52906+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
52907 end_cycles = get_cycles();
52908- atomic_add(((unsigned int) ((end_cycles - start_cycles)
52909+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52910 >> 10)), /* Kcycles */
52911 &dev->cpu_kcycles_used);
52912
52913@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
52914 dlfb_urb_completion(urb);
52915
52916 error:
52917- atomic_add(bytes_sent, &dev->bytes_sent);
52918- atomic_add(bytes_identical, &dev->bytes_identical);
52919- atomic_add(bytes_rendered, &dev->bytes_rendered);
52920+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52921+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52922+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
52923 end_cycles = get_cycles();
52924- atomic_add(((unsigned int) ((end_cycles - start_cycles)
52925+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52926 >> 10)), /* Kcycles */
52927 &dev->cpu_kcycles_used);
52928 }
52929@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
52930 fb_deferred_io_cleanup(info);
52931 kfree(info->fbdefio);
52932 info->fbdefio = NULL;
52933- info->fbops->fb_mmap = dlfb_ops_mmap;
52934+ pax_open_kernel();
52935+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
52936+ pax_close_kernel();
52937 }
52938
52939 pr_warn("released /dev/fb%d user=%d count=%d\n",
52940@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
52941 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52942 struct dlfb_data *dev = fb_info->par;
52943 return snprintf(buf, PAGE_SIZE, "%u\n",
52944- atomic_read(&dev->bytes_rendered));
52945+ atomic_read_unchecked(&dev->bytes_rendered));
52946 }
52947
52948 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
52949@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
52950 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52951 struct dlfb_data *dev = fb_info->par;
52952 return snprintf(buf, PAGE_SIZE, "%u\n",
52953- atomic_read(&dev->bytes_identical));
52954+ atomic_read_unchecked(&dev->bytes_identical));
52955 }
52956
52957 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
52958@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
52959 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52960 struct dlfb_data *dev = fb_info->par;
52961 return snprintf(buf, PAGE_SIZE, "%u\n",
52962- atomic_read(&dev->bytes_sent));
52963+ atomic_read_unchecked(&dev->bytes_sent));
52964 }
52965
52966 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
52967@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
52968 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52969 struct dlfb_data *dev = fb_info->par;
52970 return snprintf(buf, PAGE_SIZE, "%u\n",
52971- atomic_read(&dev->cpu_kcycles_used));
52972+ atomic_read_unchecked(&dev->cpu_kcycles_used));
52973 }
52974
52975 static ssize_t edid_show(
52976@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
52977 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52978 struct dlfb_data *dev = fb_info->par;
52979
52980- atomic_set(&dev->bytes_rendered, 0);
52981- atomic_set(&dev->bytes_identical, 0);
52982- atomic_set(&dev->bytes_sent, 0);
52983- atomic_set(&dev->cpu_kcycles_used, 0);
52984+ atomic_set_unchecked(&dev->bytes_rendered, 0);
52985+ atomic_set_unchecked(&dev->bytes_identical, 0);
52986+ atomic_set_unchecked(&dev->bytes_sent, 0);
52987+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
52988
52989 return count;
52990 }
52991diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
52992index 7aec6f3..e3b2d55 100644
52993--- a/drivers/video/uvesafb.c
52994+++ b/drivers/video/uvesafb.c
52995@@ -19,6 +19,7 @@
52996 #include <linux/io.h>
52997 #include <linux/mutex.h>
52998 #include <linux/slab.h>
52999+#include <linux/moduleloader.h>
53000 #include <video/edid.h>
53001 #include <video/uvesafb.h>
53002 #ifdef CONFIG_X86
53003@@ -566,10 +567,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
53004 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
53005 par->pmi_setpal = par->ypan = 0;
53006 } else {
53007+
53008+#ifdef CONFIG_PAX_KERNEXEC
53009+#ifdef CONFIG_MODULES
53010+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
53011+#endif
53012+ if (!par->pmi_code) {
53013+ par->pmi_setpal = par->ypan = 0;
53014+ return 0;
53015+ }
53016+#endif
53017+
53018 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
53019 + task->t.regs.edi);
53020+
53021+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53022+ pax_open_kernel();
53023+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
53024+ pax_close_kernel();
53025+
53026+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
53027+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
53028+#else
53029 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
53030 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
53031+#endif
53032+
53033 printk(KERN_INFO "uvesafb: protected mode interface info at "
53034 "%04x:%04x\n",
53035 (u16)task->t.regs.es, (u16)task->t.regs.edi);
53036@@ -814,13 +837,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
53037 par->ypan = ypan;
53038
53039 if (par->pmi_setpal || par->ypan) {
53040+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
53041 if (__supported_pte_mask & _PAGE_NX) {
53042 par->pmi_setpal = par->ypan = 0;
53043 printk(KERN_WARNING "uvesafb: NX protection is active, "
53044 "better not use the PMI.\n");
53045- } else {
53046+ } else
53047+#endif
53048 uvesafb_vbe_getpmi(task, par);
53049- }
53050 }
53051 #else
53052 /* The protected mode interface is not available on non-x86. */
53053@@ -1454,8 +1478,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
53054 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
53055
53056 /* Disable blanking if the user requested so. */
53057- if (!blank)
53058- info->fbops->fb_blank = NULL;
53059+ if (!blank) {
53060+ pax_open_kernel();
53061+ *(void **)&info->fbops->fb_blank = NULL;
53062+ pax_close_kernel();
53063+ }
53064
53065 /*
53066 * Find out how much IO memory is required for the mode with
53067@@ -1531,8 +1558,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
53068 info->flags = FBINFO_FLAG_DEFAULT |
53069 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
53070
53071- if (!par->ypan)
53072- info->fbops->fb_pan_display = NULL;
53073+ if (!par->ypan) {
53074+ pax_open_kernel();
53075+ *(void **)&info->fbops->fb_pan_display = NULL;
53076+ pax_close_kernel();
53077+ }
53078 }
53079
53080 static void uvesafb_init_mtrr(struct fb_info *info)
53081@@ -1796,6 +1826,11 @@ out:
53082 if (par->vbe_modes)
53083 kfree(par->vbe_modes);
53084
53085+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53086+ if (par->pmi_code)
53087+ module_free_exec(NULL, par->pmi_code);
53088+#endif
53089+
53090 framebuffer_release(info);
53091 return err;
53092 }
53093@@ -1823,6 +1858,12 @@ static int uvesafb_remove(struct platform_device *dev)
53094 kfree(par->vbe_state_orig);
53095 if (par->vbe_state_saved)
53096 kfree(par->vbe_state_saved);
53097+
53098+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53099+ if (par->pmi_code)
53100+ module_free_exec(NULL, par->pmi_code);
53101+#endif
53102+
53103 }
53104
53105 framebuffer_release(info);
53106diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
53107index bd83233..7d8a5aa 100644
53108--- a/drivers/video/vesafb.c
53109+++ b/drivers/video/vesafb.c
53110@@ -9,6 +9,7 @@
53111 */
53112
53113 #include <linux/module.h>
53114+#include <linux/moduleloader.h>
53115 #include <linux/kernel.h>
53116 #include <linux/errno.h>
53117 #include <linux/string.h>
53118@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
53119 static int vram_total; /* Set total amount of memory */
53120 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
53121 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
53122-static void (*pmi_start)(void) __read_mostly;
53123-static void (*pmi_pal) (void) __read_mostly;
53124+static void (*pmi_start)(void) __read_only;
53125+static void (*pmi_pal) (void) __read_only;
53126 static int depth __read_mostly;
53127 static int vga_compat __read_mostly;
53128 /* --------------------------------------------------------------------- */
53129@@ -234,6 +235,7 @@ static int vesafb_probe(struct platform_device *dev)
53130 unsigned int size_remap;
53131 unsigned int size_total;
53132 char *option = NULL;
53133+ void *pmi_code = NULL;
53134
53135 /* ignore error return of fb_get_options */
53136 fb_get_options("vesafb", &option);
53137@@ -280,10 +282,6 @@ static int vesafb_probe(struct platform_device *dev)
53138 size_remap = size_total;
53139 vesafb_fix.smem_len = size_remap;
53140
53141-#ifndef __i386__
53142- screen_info.vesapm_seg = 0;
53143-#endif
53144-
53145 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
53146 printk(KERN_WARNING
53147 "vesafb: cannot reserve video memory at 0x%lx\n",
53148@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
53149 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
53150 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
53151
53152+#ifdef __i386__
53153+
53154+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53155+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
53156+ if (!pmi_code)
53157+#elif !defined(CONFIG_PAX_KERNEXEC)
53158+ if (0)
53159+#endif
53160+
53161+#endif
53162+ screen_info.vesapm_seg = 0;
53163+
53164 if (screen_info.vesapm_seg) {
53165- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
53166- screen_info.vesapm_seg,screen_info.vesapm_off);
53167+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
53168+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
53169 }
53170
53171 if (screen_info.vesapm_seg < 0xc000)
53172@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
53173
53174 if (ypan || pmi_setpal) {
53175 unsigned short *pmi_base;
53176+
53177 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
53178- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
53179- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
53180+
53181+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53182+ pax_open_kernel();
53183+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
53184+#else
53185+ pmi_code = pmi_base;
53186+#endif
53187+
53188+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
53189+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
53190+
53191+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53192+ pmi_start = ktva_ktla(pmi_start);
53193+ pmi_pal = ktva_ktla(pmi_pal);
53194+ pax_close_kernel();
53195+#endif
53196+
53197 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
53198 if (pmi_base[3]) {
53199 printk(KERN_INFO "vesafb: pmi: ports = ");
53200@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
53201 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
53202 (ypan ? FBINFO_HWACCEL_YPAN : 0);
53203
53204- if (!ypan)
53205- info->fbops->fb_pan_display = NULL;
53206+ if (!ypan) {
53207+ pax_open_kernel();
53208+ *(void **)&info->fbops->fb_pan_display = NULL;
53209+ pax_close_kernel();
53210+ }
53211
53212 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
53213 err = -ENOMEM;
53214@@ -493,6 +522,11 @@ static int vesafb_probe(struct platform_device *dev)
53215 info->node, info->fix.id);
53216 return 0;
53217 err:
53218+
53219+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53220+ module_free_exec(NULL, pmi_code);
53221+#endif
53222+
53223 if (info->screen_base)
53224 iounmap(info->screen_base);
53225 framebuffer_release(info);
53226diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
53227index 88714ae..16c2e11 100644
53228--- a/drivers/video/via/via_clock.h
53229+++ b/drivers/video/via/via_clock.h
53230@@ -56,7 +56,7 @@ struct via_clock {
53231
53232 void (*set_engine_pll_state)(u8 state);
53233 void (*set_engine_pll)(struct via_pll_config config);
53234-};
53235+} __no_const;
53236
53237
53238 static inline u32 get_pll_internal_frequency(u32 ref_freq,
53239diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
53240index fef20db..d28b1ab 100644
53241--- a/drivers/xen/xenfs/xenstored.c
53242+++ b/drivers/xen/xenfs/xenstored.c
53243@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
53244 static int xsd_kva_open(struct inode *inode, struct file *file)
53245 {
53246 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
53247+#ifdef CONFIG_GRKERNSEC_HIDESYM
53248+ NULL);
53249+#else
53250 xen_store_interface);
53251+#endif
53252+
53253 if (!file->private_data)
53254 return -ENOMEM;
53255 return 0;
53256diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
53257index 9ff073f..05cef23 100644
53258--- a/fs/9p/vfs_addr.c
53259+++ b/fs/9p/vfs_addr.c
53260@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
53261
53262 retval = v9fs_file_write_internal(inode,
53263 v9inode->writeback_fid,
53264- (__force const char __user *)buffer,
53265+ (const char __force_user *)buffer,
53266 len, &offset, 0);
53267 if (retval > 0)
53268 retval = 0;
53269diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
53270index 94de6d1..8d81256 100644
53271--- a/fs/9p/vfs_inode.c
53272+++ b/fs/9p/vfs_inode.c
53273@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
53274 void
53275 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
53276 {
53277- char *s = nd_get_link(nd);
53278+ const char *s = nd_get_link(nd);
53279
53280 p9_debug(P9_DEBUG_VFS, " %s %s\n",
53281 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
53282diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
53283index 370b24c..ff0be7b 100644
53284--- a/fs/Kconfig.binfmt
53285+++ b/fs/Kconfig.binfmt
53286@@ -103,7 +103,7 @@ config HAVE_AOUT
53287
53288 config BINFMT_AOUT
53289 tristate "Kernel support for a.out and ECOFF binaries"
53290- depends on HAVE_AOUT
53291+ depends on HAVE_AOUT && BROKEN
53292 ---help---
53293 A.out (Assembler.OUTput) is a set of formats for libraries and
53294 executables used in the earliest versions of UNIX. Linux used
53295diff --git a/fs/afs/inode.c b/fs/afs/inode.c
53296index 789bc25..fafaeea 100644
53297--- a/fs/afs/inode.c
53298+++ b/fs/afs/inode.c
53299@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
53300 struct afs_vnode *vnode;
53301 struct super_block *sb;
53302 struct inode *inode;
53303- static atomic_t afs_autocell_ino;
53304+ static atomic_unchecked_t afs_autocell_ino;
53305
53306 _enter("{%x:%u},%*.*s,",
53307 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
53308@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
53309 data.fid.unique = 0;
53310 data.fid.vnode = 0;
53311
53312- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
53313+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
53314 afs_iget5_autocell_test, afs_iget5_set,
53315 &data);
53316 if (!inode) {
53317diff --git a/fs/aio.c b/fs/aio.c
53318index 062a5f6..e5618e0 100644
53319--- a/fs/aio.c
53320+++ b/fs/aio.c
53321@@ -374,7 +374,7 @@ static int aio_setup_ring(struct kioctx *ctx)
53322 size += sizeof(struct io_event) * nr_events;
53323
53324 nr_pages = PFN_UP(size);
53325- if (nr_pages < 0)
53326+ if (nr_pages <= 0)
53327 return -EINVAL;
53328
53329 file = aio_private_file(ctx, nr_pages);
53330diff --git a/fs/attr.c b/fs/attr.c
53331index 1449adb..a2038c2 100644
53332--- a/fs/attr.c
53333+++ b/fs/attr.c
53334@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
53335 unsigned long limit;
53336
53337 limit = rlimit(RLIMIT_FSIZE);
53338+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
53339 if (limit != RLIM_INFINITY && offset > limit)
53340 goto out_sig;
53341 if (offset > inode->i_sb->s_maxbytes)
53342diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
53343index 689e40d..515cac5 100644
53344--- a/fs/autofs4/waitq.c
53345+++ b/fs/autofs4/waitq.c
53346@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
53347 {
53348 unsigned long sigpipe, flags;
53349 mm_segment_t fs;
53350- const char *data = (const char *)addr;
53351+ const char __user *data = (const char __force_user *)addr;
53352 ssize_t wr = 0;
53353
53354 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
53355@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
53356 return 1;
53357 }
53358
53359+#ifdef CONFIG_GRKERNSEC_HIDESYM
53360+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
53361+#endif
53362+
53363 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
53364 enum autofs_notify notify)
53365 {
53366@@ -373,7 +377,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
53367
53368 /* If this is a direct mount request create a dummy name */
53369 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
53370+#ifdef CONFIG_GRKERNSEC_HIDESYM
53371+ /* this name does get written to userland via autofs4_write() */
53372+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
53373+#else
53374 qstr.len = sprintf(name, "%p", dentry);
53375+#endif
53376 else {
53377 qstr.len = autofs4_getpath(sbi, dentry, &name);
53378 if (!qstr.len) {
53379diff --git a/fs/befs/endian.h b/fs/befs/endian.h
53380index 2722387..56059b5 100644
53381--- a/fs/befs/endian.h
53382+++ b/fs/befs/endian.h
53383@@ -11,7 +11,7 @@
53384
53385 #include <asm/byteorder.h>
53386
53387-static inline u64
53388+static inline u64 __intentional_overflow(-1)
53389 fs64_to_cpu(const struct super_block *sb, fs64 n)
53390 {
53391 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53392@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
53393 return (__force fs64)cpu_to_be64(n);
53394 }
53395
53396-static inline u32
53397+static inline u32 __intentional_overflow(-1)
53398 fs32_to_cpu(const struct super_block *sb, fs32 n)
53399 {
53400 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53401@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
53402 return (__force fs32)cpu_to_be32(n);
53403 }
53404
53405-static inline u16
53406+static inline u16 __intentional_overflow(-1)
53407 fs16_to_cpu(const struct super_block *sb, fs16 n)
53408 {
53409 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
53410diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
53411index e9c75e2..1baece1 100644
53412--- a/fs/befs/linuxvfs.c
53413+++ b/fs/befs/linuxvfs.c
53414@@ -514,7 +514,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
53415 {
53416 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
53417 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
53418- char *link = nd_get_link(nd);
53419+ const char *link = nd_get_link(nd);
53420 if (!IS_ERR(link))
53421 kfree(link);
53422 }
53423diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
53424index 89dec7f..361b0d75 100644
53425--- a/fs/binfmt_aout.c
53426+++ b/fs/binfmt_aout.c
53427@@ -16,6 +16,7 @@
53428 #include <linux/string.h>
53429 #include <linux/fs.h>
53430 #include <linux/file.h>
53431+#include <linux/security.h>
53432 #include <linux/stat.h>
53433 #include <linux/fcntl.h>
53434 #include <linux/ptrace.h>
53435@@ -59,6 +60,8 @@ static int aout_core_dump(struct coredump_params *cprm)
53436 #endif
53437 # define START_STACK(u) ((void __user *)u.start_stack)
53438
53439+ memset(&dump, 0, sizeof(dump));
53440+
53441 fs = get_fs();
53442 set_fs(KERNEL_DS);
53443 has_dumped = 1;
53444@@ -69,10 +72,12 @@ static int aout_core_dump(struct coredump_params *cprm)
53445
53446 /* If the size of the dump file exceeds the rlimit, then see what would happen
53447 if we wrote the stack, but not the data area. */
53448+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
53449 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
53450 dump.u_dsize = 0;
53451
53452 /* Make sure we have enough room to write the stack and data areas. */
53453+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
53454 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
53455 dump.u_ssize = 0;
53456
53457@@ -233,6 +238,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
53458 rlim = rlimit(RLIMIT_DATA);
53459 if (rlim >= RLIM_INFINITY)
53460 rlim = ~0;
53461+
53462+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
53463 if (ex.a_data + ex.a_bss > rlim)
53464 return -ENOMEM;
53465
53466@@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
53467
53468 install_exec_creds(bprm);
53469
53470+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
53471+ current->mm->pax_flags = 0UL;
53472+#endif
53473+
53474+#ifdef CONFIG_PAX_PAGEEXEC
53475+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
53476+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
53477+
53478+#ifdef CONFIG_PAX_EMUTRAMP
53479+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
53480+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
53481+#endif
53482+
53483+#ifdef CONFIG_PAX_MPROTECT
53484+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
53485+ current->mm->pax_flags |= MF_PAX_MPROTECT;
53486+#endif
53487+
53488+ }
53489+#endif
53490+
53491 if (N_MAGIC(ex) == OMAGIC) {
53492 unsigned long text_addr, map_size;
53493 loff_t pos;
53494@@ -322,7 +350,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
53495 }
53496
53497 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
53498- PROT_READ | PROT_WRITE | PROT_EXEC,
53499+ PROT_READ | PROT_WRITE,
53500 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
53501 fd_offset + ex.a_text);
53502 if (error != N_DATADDR(ex)) {
53503diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
53504index 4c94a79..228e9da 100644
53505--- a/fs/binfmt_elf.c
53506+++ b/fs/binfmt_elf.c
53507@@ -34,6 +34,7 @@
53508 #include <linux/utsname.h>
53509 #include <linux/coredump.h>
53510 #include <linux/sched.h>
53511+#include <linux/xattr.h>
53512 #include <asm/uaccess.h>
53513 #include <asm/param.h>
53514 #include <asm/page.h>
53515@@ -60,6 +61,14 @@ static int elf_core_dump(struct coredump_params *cprm);
53516 #define elf_core_dump NULL
53517 #endif
53518
53519+#ifdef CONFIG_PAX_MPROTECT
53520+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
53521+#endif
53522+
53523+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
53524+static void elf_handle_mmap(struct file *file);
53525+#endif
53526+
53527 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
53528 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
53529 #else
53530@@ -79,6 +88,15 @@ static struct linux_binfmt elf_format = {
53531 .load_binary = load_elf_binary,
53532 .load_shlib = load_elf_library,
53533 .core_dump = elf_core_dump,
53534+
53535+#ifdef CONFIG_PAX_MPROTECT
53536+ .handle_mprotect= elf_handle_mprotect,
53537+#endif
53538+
53539+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
53540+ .handle_mmap = elf_handle_mmap,
53541+#endif
53542+
53543 .min_coredump = ELF_EXEC_PAGESIZE,
53544 };
53545
53546@@ -86,6 +104,8 @@ static struct linux_binfmt elf_format = {
53547
53548 static int set_brk(unsigned long start, unsigned long end)
53549 {
53550+ unsigned long e = end;
53551+
53552 start = ELF_PAGEALIGN(start);
53553 end = ELF_PAGEALIGN(end);
53554 if (end > start) {
53555@@ -94,7 +114,7 @@ static int set_brk(unsigned long start, unsigned long end)
53556 if (BAD_ADDR(addr))
53557 return addr;
53558 }
53559- current->mm->start_brk = current->mm->brk = end;
53560+ current->mm->start_brk = current->mm->brk = e;
53561 return 0;
53562 }
53563
53564@@ -155,12 +175,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53565 elf_addr_t __user *u_rand_bytes;
53566 const char *k_platform = ELF_PLATFORM;
53567 const char *k_base_platform = ELF_BASE_PLATFORM;
53568- unsigned char k_rand_bytes[16];
53569+ u32 k_rand_bytes[4];
53570 int items;
53571 elf_addr_t *elf_info;
53572 int ei_index = 0;
53573 const struct cred *cred = current_cred();
53574 struct vm_area_struct *vma;
53575+ unsigned long saved_auxv[AT_VECTOR_SIZE];
53576
53577 /*
53578 * In some cases (e.g. Hyper-Threading), we want to avoid L1
53579@@ -202,8 +223,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53580 * Generate 16 random bytes for userspace PRNG seeding.
53581 */
53582 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
53583- u_rand_bytes = (elf_addr_t __user *)
53584- STACK_ALLOC(p, sizeof(k_rand_bytes));
53585+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
53586+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
53587+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
53588+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
53589+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
53590+ u_rand_bytes = (elf_addr_t __user *) p;
53591 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
53592 return -EFAULT;
53593
53594@@ -318,9 +343,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
53595 return -EFAULT;
53596 current->mm->env_end = p;
53597
53598+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
53599+
53600 /* Put the elf_info on the stack in the right place. */
53601 sp = (elf_addr_t __user *)envp + 1;
53602- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
53603+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
53604 return -EFAULT;
53605 return 0;
53606 }
53607@@ -388,15 +415,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
53608 an ELF header */
53609
53610 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53611- struct file *interpreter, unsigned long *interp_map_addr,
53612- unsigned long no_base)
53613+ struct file *interpreter, unsigned long no_base)
53614 {
53615 struct elf_phdr *elf_phdata;
53616 struct elf_phdr *eppnt;
53617- unsigned long load_addr = 0;
53618+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
53619 int load_addr_set = 0;
53620 unsigned long last_bss = 0, elf_bss = 0;
53621- unsigned long error = ~0UL;
53622+ unsigned long error = -EINVAL;
53623 unsigned long total_size;
53624 int retval, i, size;
53625
53626@@ -442,6 +468,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53627 goto out_close;
53628 }
53629
53630+#ifdef CONFIG_PAX_SEGMEXEC
53631+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
53632+ pax_task_size = SEGMEXEC_TASK_SIZE;
53633+#endif
53634+
53635 eppnt = elf_phdata;
53636 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
53637 if (eppnt->p_type == PT_LOAD) {
53638@@ -465,8 +496,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53639 map_addr = elf_map(interpreter, load_addr + vaddr,
53640 eppnt, elf_prot, elf_type, total_size);
53641 total_size = 0;
53642- if (!*interp_map_addr)
53643- *interp_map_addr = map_addr;
53644 error = map_addr;
53645 if (BAD_ADDR(map_addr))
53646 goto out_close;
53647@@ -485,8 +514,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53648 k = load_addr + eppnt->p_vaddr;
53649 if (BAD_ADDR(k) ||
53650 eppnt->p_filesz > eppnt->p_memsz ||
53651- eppnt->p_memsz > TASK_SIZE ||
53652- TASK_SIZE - eppnt->p_memsz < k) {
53653+ eppnt->p_memsz > pax_task_size ||
53654+ pax_task_size - eppnt->p_memsz < k) {
53655 error = -ENOMEM;
53656 goto out_close;
53657 }
53658@@ -525,9 +554,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
53659 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
53660
53661 /* Map the last of the bss segment */
53662- error = vm_brk(elf_bss, last_bss - elf_bss);
53663- if (BAD_ADDR(error))
53664- goto out_close;
53665+ if (last_bss > elf_bss) {
53666+ error = vm_brk(elf_bss, last_bss - elf_bss);
53667+ if (BAD_ADDR(error))
53668+ goto out_close;
53669+ }
53670 }
53671
53672 error = load_addr;
53673@@ -538,6 +569,322 @@ out:
53674 return error;
53675 }
53676
53677+#ifdef CONFIG_PAX_PT_PAX_FLAGS
53678+#ifdef CONFIG_PAX_SOFTMODE
53679+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
53680+{
53681+ unsigned long pax_flags = 0UL;
53682+
53683+#ifdef CONFIG_PAX_PAGEEXEC
53684+ if (elf_phdata->p_flags & PF_PAGEEXEC)
53685+ pax_flags |= MF_PAX_PAGEEXEC;
53686+#endif
53687+
53688+#ifdef CONFIG_PAX_SEGMEXEC
53689+ if (elf_phdata->p_flags & PF_SEGMEXEC)
53690+ pax_flags |= MF_PAX_SEGMEXEC;
53691+#endif
53692+
53693+#ifdef CONFIG_PAX_EMUTRAMP
53694+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
53695+ pax_flags |= MF_PAX_EMUTRAMP;
53696+#endif
53697+
53698+#ifdef CONFIG_PAX_MPROTECT
53699+ if (elf_phdata->p_flags & PF_MPROTECT)
53700+ pax_flags |= MF_PAX_MPROTECT;
53701+#endif
53702+
53703+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53704+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
53705+ pax_flags |= MF_PAX_RANDMMAP;
53706+#endif
53707+
53708+ return pax_flags;
53709+}
53710+#endif
53711+
53712+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
53713+{
53714+ unsigned long pax_flags = 0UL;
53715+
53716+#ifdef CONFIG_PAX_PAGEEXEC
53717+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
53718+ pax_flags |= MF_PAX_PAGEEXEC;
53719+#endif
53720+
53721+#ifdef CONFIG_PAX_SEGMEXEC
53722+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
53723+ pax_flags |= MF_PAX_SEGMEXEC;
53724+#endif
53725+
53726+#ifdef CONFIG_PAX_EMUTRAMP
53727+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
53728+ pax_flags |= MF_PAX_EMUTRAMP;
53729+#endif
53730+
53731+#ifdef CONFIG_PAX_MPROTECT
53732+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
53733+ pax_flags |= MF_PAX_MPROTECT;
53734+#endif
53735+
53736+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53737+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
53738+ pax_flags |= MF_PAX_RANDMMAP;
53739+#endif
53740+
53741+ return pax_flags;
53742+}
53743+#endif
53744+
53745+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
53746+#ifdef CONFIG_PAX_SOFTMODE
53747+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
53748+{
53749+ unsigned long pax_flags = 0UL;
53750+
53751+#ifdef CONFIG_PAX_PAGEEXEC
53752+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
53753+ pax_flags |= MF_PAX_PAGEEXEC;
53754+#endif
53755+
53756+#ifdef CONFIG_PAX_SEGMEXEC
53757+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
53758+ pax_flags |= MF_PAX_SEGMEXEC;
53759+#endif
53760+
53761+#ifdef CONFIG_PAX_EMUTRAMP
53762+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
53763+ pax_flags |= MF_PAX_EMUTRAMP;
53764+#endif
53765+
53766+#ifdef CONFIG_PAX_MPROTECT
53767+ if (pax_flags_softmode & MF_PAX_MPROTECT)
53768+ pax_flags |= MF_PAX_MPROTECT;
53769+#endif
53770+
53771+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53772+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
53773+ pax_flags |= MF_PAX_RANDMMAP;
53774+#endif
53775+
53776+ return pax_flags;
53777+}
53778+#endif
53779+
53780+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
53781+{
53782+ unsigned long pax_flags = 0UL;
53783+
53784+#ifdef CONFIG_PAX_PAGEEXEC
53785+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
53786+ pax_flags |= MF_PAX_PAGEEXEC;
53787+#endif
53788+
53789+#ifdef CONFIG_PAX_SEGMEXEC
53790+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
53791+ pax_flags |= MF_PAX_SEGMEXEC;
53792+#endif
53793+
53794+#ifdef CONFIG_PAX_EMUTRAMP
53795+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
53796+ pax_flags |= MF_PAX_EMUTRAMP;
53797+#endif
53798+
53799+#ifdef CONFIG_PAX_MPROTECT
53800+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
53801+ pax_flags |= MF_PAX_MPROTECT;
53802+#endif
53803+
53804+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
53805+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
53806+ pax_flags |= MF_PAX_RANDMMAP;
53807+#endif
53808+
53809+ return pax_flags;
53810+}
53811+#endif
53812+
53813+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
53814+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
53815+{
53816+ unsigned long pax_flags = 0UL;
53817+
53818+#ifdef CONFIG_PAX_EI_PAX
53819+
53820+#ifdef CONFIG_PAX_PAGEEXEC
53821+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
53822+ pax_flags |= MF_PAX_PAGEEXEC;
53823+#endif
53824+
53825+#ifdef CONFIG_PAX_SEGMEXEC
53826+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
53827+ pax_flags |= MF_PAX_SEGMEXEC;
53828+#endif
53829+
53830+#ifdef CONFIG_PAX_EMUTRAMP
53831+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
53832+ pax_flags |= MF_PAX_EMUTRAMP;
53833+#endif
53834+
53835+#ifdef CONFIG_PAX_MPROTECT
53836+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
53837+ pax_flags |= MF_PAX_MPROTECT;
53838+#endif
53839+
53840+#ifdef CONFIG_PAX_ASLR
53841+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
53842+ pax_flags |= MF_PAX_RANDMMAP;
53843+#endif
53844+
53845+#else
53846+
53847+#ifdef CONFIG_PAX_PAGEEXEC
53848+ pax_flags |= MF_PAX_PAGEEXEC;
53849+#endif
53850+
53851+#ifdef CONFIG_PAX_SEGMEXEC
53852+ pax_flags |= MF_PAX_SEGMEXEC;
53853+#endif
53854+
53855+#ifdef CONFIG_PAX_MPROTECT
53856+ pax_flags |= MF_PAX_MPROTECT;
53857+#endif
53858+
53859+#ifdef CONFIG_PAX_RANDMMAP
53860+ if (randomize_va_space)
53861+ pax_flags |= MF_PAX_RANDMMAP;
53862+#endif
53863+
53864+#endif
53865+
53866+ return pax_flags;
53867+}
53868+
53869+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
53870+{
53871+
53872+#ifdef CONFIG_PAX_PT_PAX_FLAGS
53873+ unsigned long i;
53874+
53875+ for (i = 0UL; i < elf_ex->e_phnum; i++)
53876+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
53877+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
53878+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
53879+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
53880+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
53881+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
53882+ return ~0UL;
53883+
53884+#ifdef CONFIG_PAX_SOFTMODE
53885+ if (pax_softmode)
53886+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
53887+ else
53888+#endif
53889+
53890+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
53891+ break;
53892+ }
53893+#endif
53894+
53895+ return ~0UL;
53896+}
53897+
53898+static unsigned long pax_parse_xattr_pax(struct file * const file)
53899+{
53900+
53901+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
53902+ ssize_t xattr_size, i;
53903+ unsigned char xattr_value[sizeof("pemrs") - 1];
53904+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
53905+
53906+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
53907+ switch (xattr_size) {
53908+ default:
53909+ return ~0UL;
53910+
53911+ case -ENODATA:
53912+ break;
53913+
53914+ case 0 ... sizeof xattr_value:
53915+ for (i = 0; i < xattr_size; i++)
53916+ switch (xattr_value[i]) {
53917+ default:
53918+ return ~0UL;
53919+
53920+#define parse_flag(option1, option2, flag) \
53921+ case option1: \
53922+ if (pax_flags_hardmode & MF_PAX_##flag) \
53923+ return ~0UL; \
53924+ pax_flags_hardmode |= MF_PAX_##flag; \
53925+ break; \
53926+ case option2: \
53927+ if (pax_flags_softmode & MF_PAX_##flag) \
53928+ return ~0UL; \
53929+ pax_flags_softmode |= MF_PAX_##flag; \
53930+ break;
53931+
53932+ parse_flag('p', 'P', PAGEEXEC);
53933+ parse_flag('e', 'E', EMUTRAMP);
53934+ parse_flag('m', 'M', MPROTECT);
53935+ parse_flag('r', 'R', RANDMMAP);
53936+ parse_flag('s', 'S', SEGMEXEC);
53937+
53938+#undef parse_flag
53939+ }
53940+ break;
53941+ }
53942+
53943+ if (pax_flags_hardmode & pax_flags_softmode)
53944+ return ~0UL;
53945+
53946+#ifdef CONFIG_PAX_SOFTMODE
53947+ if (pax_softmode)
53948+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
53949+ else
53950+#endif
53951+
53952+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
53953+#else
53954+ return ~0UL;
53955+#endif
53956+
53957+}
53958+
53959+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
53960+{
53961+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
53962+
53963+ pax_flags = pax_parse_ei_pax(elf_ex);
53964+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
53965+ xattr_pax_flags = pax_parse_xattr_pax(file);
53966+
53967+ if (pt_pax_flags == ~0UL)
53968+ pt_pax_flags = xattr_pax_flags;
53969+ else if (xattr_pax_flags == ~0UL)
53970+ xattr_pax_flags = pt_pax_flags;
53971+ if (pt_pax_flags != xattr_pax_flags)
53972+ return -EINVAL;
53973+ if (pt_pax_flags != ~0UL)
53974+ pax_flags = pt_pax_flags;
53975+
53976+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
53977+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
53978+ if ((__supported_pte_mask & _PAGE_NX))
53979+ pax_flags &= ~MF_PAX_SEGMEXEC;
53980+ else
53981+ pax_flags &= ~MF_PAX_PAGEEXEC;
53982+ }
53983+#endif
53984+
53985+ if (0 > pax_check_flags(&pax_flags))
53986+ return -EINVAL;
53987+
53988+ current->mm->pax_flags = pax_flags;
53989+ return 0;
53990+}
53991+#endif
53992+
53993 /*
53994 * These are the functions used to load ELF style executables and shared
53995 * libraries. There is no binary dependent code anywhere else.
53996@@ -554,6 +901,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
53997 {
53998 unsigned int random_variable = 0;
53999
54000+#ifdef CONFIG_PAX_RANDUSTACK
54001+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
54002+ return stack_top - current->mm->delta_stack;
54003+#endif
54004+
54005 if ((current->flags & PF_RANDOMIZE) &&
54006 !(current->personality & ADDR_NO_RANDOMIZE)) {
54007 random_variable = get_random_int() & STACK_RND_MASK;
54008@@ -572,7 +924,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
54009 unsigned long load_addr = 0, load_bias = 0;
54010 int load_addr_set = 0;
54011 char * elf_interpreter = NULL;
54012- unsigned long error;
54013+ unsigned long error = 0;
54014 struct elf_phdr *elf_ppnt, *elf_phdata;
54015 unsigned long elf_bss, elf_brk;
54016 int retval, i;
54017@@ -582,12 +934,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
54018 unsigned long start_code, end_code, start_data, end_data;
54019 unsigned long reloc_func_desc __maybe_unused = 0;
54020 int executable_stack = EXSTACK_DEFAULT;
54021- unsigned long def_flags = 0;
54022 struct pt_regs *regs = current_pt_regs();
54023 struct {
54024 struct elfhdr elf_ex;
54025 struct elfhdr interp_elf_ex;
54026 } *loc;
54027+ unsigned long pax_task_size;
54028
54029 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
54030 if (!loc) {
54031@@ -723,11 +1075,82 @@ static int load_elf_binary(struct linux_binprm *bprm)
54032 goto out_free_dentry;
54033
54034 /* OK, This is the point of no return */
54035- current->mm->def_flags = def_flags;
54036+ current->mm->def_flags = 0;
54037
54038 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
54039 may depend on the personality. */
54040 SET_PERSONALITY(loc->elf_ex);
54041+
54042+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
54043+ current->mm->pax_flags = 0UL;
54044+#endif
54045+
54046+#ifdef CONFIG_PAX_DLRESOLVE
54047+ current->mm->call_dl_resolve = 0UL;
54048+#endif
54049+
54050+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
54051+ current->mm->call_syscall = 0UL;
54052+#endif
54053+
54054+#ifdef CONFIG_PAX_ASLR
54055+ current->mm->delta_mmap = 0UL;
54056+ current->mm->delta_stack = 0UL;
54057+#endif
54058+
54059+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
54060+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
54061+ send_sig(SIGKILL, current, 0);
54062+ goto out_free_dentry;
54063+ }
54064+#endif
54065+
54066+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
54067+ pax_set_initial_flags(bprm);
54068+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
54069+ if (pax_set_initial_flags_func)
54070+ (pax_set_initial_flags_func)(bprm);
54071+#endif
54072+
54073+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
54074+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
54075+ current->mm->context.user_cs_limit = PAGE_SIZE;
54076+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
54077+ }
54078+#endif
54079+
54080+#ifdef CONFIG_PAX_SEGMEXEC
54081+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
54082+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
54083+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
54084+ pax_task_size = SEGMEXEC_TASK_SIZE;
54085+ current->mm->def_flags |= VM_NOHUGEPAGE;
54086+ } else
54087+#endif
54088+
54089+ pax_task_size = TASK_SIZE;
54090+
54091+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
54092+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
54093+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
54094+ put_cpu();
54095+ }
54096+#endif
54097+
54098+#ifdef CONFIG_PAX_ASLR
54099+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
54100+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
54101+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
54102+ }
54103+#endif
54104+
54105+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
54106+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
54107+ executable_stack = EXSTACK_DISABLE_X;
54108+ current->personality &= ~READ_IMPLIES_EXEC;
54109+ } else
54110+#endif
54111+
54112 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
54113 current->personality |= READ_IMPLIES_EXEC;
54114
54115@@ -817,6 +1240,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
54116 #else
54117 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
54118 #endif
54119+
54120+#ifdef CONFIG_PAX_RANDMMAP
54121+ /* PaX: randomize base address at the default exe base if requested */
54122+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
54123+#ifdef CONFIG_SPARC64
54124+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
54125+#else
54126+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
54127+#endif
54128+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
54129+ elf_flags |= MAP_FIXED;
54130+ }
54131+#endif
54132+
54133 }
54134
54135 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
54136@@ -849,9 +1286,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
54137 * allowed task size. Note that p_filesz must always be
54138 * <= p_memsz so it is only necessary to check p_memsz.
54139 */
54140- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
54141- elf_ppnt->p_memsz > TASK_SIZE ||
54142- TASK_SIZE - elf_ppnt->p_memsz < k) {
54143+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
54144+ elf_ppnt->p_memsz > pax_task_size ||
54145+ pax_task_size - elf_ppnt->p_memsz < k) {
54146 /* set_brk can never work. Avoid overflows. */
54147 send_sig(SIGKILL, current, 0);
54148 retval = -EINVAL;
54149@@ -890,17 +1327,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
54150 goto out_free_dentry;
54151 }
54152 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
54153- send_sig(SIGSEGV, current, 0);
54154- retval = -EFAULT; /* Nobody gets to see this, but.. */
54155- goto out_free_dentry;
54156+ /*
54157+ * This bss-zeroing can fail if the ELF
54158+ * file specifies odd protections. So
54159+ * we don't check the return value
54160+ */
54161 }
54162
54163+#ifdef CONFIG_PAX_RANDMMAP
54164+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
54165+ unsigned long start, size, flags;
54166+ vm_flags_t vm_flags;
54167+
54168+ start = ELF_PAGEALIGN(elf_brk);
54169+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
54170+ flags = MAP_FIXED | MAP_PRIVATE;
54171+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
54172+
54173+ down_write(&current->mm->mmap_sem);
54174+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
54175+ retval = -ENOMEM;
54176+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
54177+// if (current->personality & ADDR_NO_RANDOMIZE)
54178+// vm_flags |= VM_READ | VM_MAYREAD;
54179+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
54180+ retval = IS_ERR_VALUE(start) ? start : 0;
54181+ }
54182+ up_write(&current->mm->mmap_sem);
54183+ if (retval == 0)
54184+ retval = set_brk(start + size, start + size + PAGE_SIZE);
54185+ if (retval < 0) {
54186+ send_sig(SIGKILL, current, 0);
54187+ goto out_free_dentry;
54188+ }
54189+ }
54190+#endif
54191+
54192 if (elf_interpreter) {
54193- unsigned long interp_map_addr = 0;
54194-
54195 elf_entry = load_elf_interp(&loc->interp_elf_ex,
54196 interpreter,
54197- &interp_map_addr,
54198 load_bias);
54199 if (!IS_ERR((void *)elf_entry)) {
54200 /*
54201@@ -1122,7 +1587,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
54202 * Decide what to dump of a segment, part, all or none.
54203 */
54204 static unsigned long vma_dump_size(struct vm_area_struct *vma,
54205- unsigned long mm_flags)
54206+ unsigned long mm_flags, long signr)
54207 {
54208 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
54209
54210@@ -1160,7 +1625,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
54211 if (vma->vm_file == NULL)
54212 return 0;
54213
54214- if (FILTER(MAPPED_PRIVATE))
54215+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
54216 goto whole;
54217
54218 /*
54219@@ -1385,9 +1850,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
54220 {
54221 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
54222 int i = 0;
54223- do
54224+ do {
54225 i += 2;
54226- while (auxv[i - 2] != AT_NULL);
54227+ } while (auxv[i - 2] != AT_NULL);
54228 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
54229 }
54230
54231@@ -1396,7 +1861,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
54232 {
54233 mm_segment_t old_fs = get_fs();
54234 set_fs(KERNEL_DS);
54235- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
54236+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
54237 set_fs(old_fs);
54238 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
54239 }
54240@@ -2023,14 +2488,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
54241 }
54242
54243 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
54244- unsigned long mm_flags)
54245+ struct coredump_params *cprm)
54246 {
54247 struct vm_area_struct *vma;
54248 size_t size = 0;
54249
54250 for (vma = first_vma(current, gate_vma); vma != NULL;
54251 vma = next_vma(vma, gate_vma))
54252- size += vma_dump_size(vma, mm_flags);
54253+ size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54254 return size;
54255 }
54256
54257@@ -2123,7 +2588,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54258
54259 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
54260
54261- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
54262+ offset += elf_core_vma_data_size(gate_vma, cprm);
54263 offset += elf_core_extra_data_size();
54264 e_shoff = offset;
54265
54266@@ -2137,10 +2602,12 @@ static int elf_core_dump(struct coredump_params *cprm)
54267 offset = dataoff;
54268
54269 size += sizeof(*elf);
54270+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
54271 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
54272 goto end_coredump;
54273
54274 size += sizeof(*phdr4note);
54275+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
54276 if (size > cprm->limit
54277 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
54278 goto end_coredump;
54279@@ -2154,7 +2621,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54280 phdr.p_offset = offset;
54281 phdr.p_vaddr = vma->vm_start;
54282 phdr.p_paddr = 0;
54283- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
54284+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54285 phdr.p_memsz = vma->vm_end - vma->vm_start;
54286 offset += phdr.p_filesz;
54287 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
54288@@ -2165,6 +2632,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54289 phdr.p_align = ELF_EXEC_PAGESIZE;
54290
54291 size += sizeof(phdr);
54292+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
54293 if (size > cprm->limit
54294 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
54295 goto end_coredump;
54296@@ -2189,7 +2657,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54297 unsigned long addr;
54298 unsigned long end;
54299
54300- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
54301+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
54302
54303 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
54304 struct page *page;
54305@@ -2198,6 +2666,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54306 page = get_dump_page(addr);
54307 if (page) {
54308 void *kaddr = kmap(page);
54309+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
54310 stop = ((size += PAGE_SIZE) > cprm->limit) ||
54311 !dump_write(cprm->file, kaddr,
54312 PAGE_SIZE);
54313@@ -2215,6 +2684,7 @@ static int elf_core_dump(struct coredump_params *cprm)
54314
54315 if (e_phnum == PN_XNUM) {
54316 size += sizeof(*shdr4extnum);
54317+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
54318 if (size > cprm->limit
54319 || !dump_write(cprm->file, shdr4extnum,
54320 sizeof(*shdr4extnum)))
54321@@ -2235,6 +2705,167 @@ out:
54322
54323 #endif /* CONFIG_ELF_CORE */
54324
54325+#ifdef CONFIG_PAX_MPROTECT
54326+/* PaX: non-PIC ELF libraries need relocations on their executable segments
54327+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
54328+ * we'll remove VM_MAYWRITE for good on RELRO segments.
54329+ *
54330+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
54331+ * basis because we want to allow the common case and not the special ones.
54332+ */
54333+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
54334+{
54335+ struct elfhdr elf_h;
54336+ struct elf_phdr elf_p;
54337+ unsigned long i;
54338+ unsigned long oldflags;
54339+ bool is_textrel_rw, is_textrel_rx, is_relro;
54340+
54341+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
54342+ return;
54343+
54344+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
54345+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
54346+
54347+#ifdef CONFIG_PAX_ELFRELOCS
54348+ /* possible TEXTREL */
54349+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
54350+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
54351+#else
54352+ is_textrel_rw = false;
54353+ is_textrel_rx = false;
54354+#endif
54355+
54356+ /* possible RELRO */
54357+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
54358+
54359+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
54360+ return;
54361+
54362+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
54363+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
54364+
54365+#ifdef CONFIG_PAX_ETEXECRELOCS
54366+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
54367+#else
54368+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
54369+#endif
54370+
54371+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
54372+ !elf_check_arch(&elf_h) ||
54373+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
54374+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
54375+ return;
54376+
54377+ for (i = 0UL; i < elf_h.e_phnum; i++) {
54378+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
54379+ return;
54380+ switch (elf_p.p_type) {
54381+ case PT_DYNAMIC:
54382+ if (!is_textrel_rw && !is_textrel_rx)
54383+ continue;
54384+ i = 0UL;
54385+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
54386+ elf_dyn dyn;
54387+
54388+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
54389+ break;
54390+ if (dyn.d_tag == DT_NULL)
54391+ break;
54392+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
54393+ gr_log_textrel(vma);
54394+ if (is_textrel_rw)
54395+ vma->vm_flags |= VM_MAYWRITE;
54396+ else
54397+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
54398+ vma->vm_flags &= ~VM_MAYWRITE;
54399+ break;
54400+ }
54401+ i++;
54402+ }
54403+ is_textrel_rw = false;
54404+ is_textrel_rx = false;
54405+ continue;
54406+
54407+ case PT_GNU_RELRO:
54408+ if (!is_relro)
54409+ continue;
54410+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
54411+ vma->vm_flags &= ~VM_MAYWRITE;
54412+ is_relro = false;
54413+ continue;
54414+
54415+#ifdef CONFIG_PAX_PT_PAX_FLAGS
54416+ case PT_PAX_FLAGS: {
54417+ const char *msg_mprotect = "", *msg_emutramp = "";
54418+ char *buffer_lib, *buffer_exe;
54419+
54420+ if (elf_p.p_flags & PF_NOMPROTECT)
54421+ msg_mprotect = "MPROTECT disabled";
54422+
54423+#ifdef CONFIG_PAX_EMUTRAMP
54424+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
54425+ msg_emutramp = "EMUTRAMP enabled";
54426+#endif
54427+
54428+ if (!msg_mprotect[0] && !msg_emutramp[0])
54429+ continue;
54430+
54431+ if (!printk_ratelimit())
54432+ continue;
54433+
54434+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
54435+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
54436+ if (buffer_lib && buffer_exe) {
54437+ char *path_lib, *path_exe;
54438+
54439+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
54440+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
54441+
54442+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
54443+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
54444+
54445+ }
54446+ free_page((unsigned long)buffer_exe);
54447+ free_page((unsigned long)buffer_lib);
54448+ continue;
54449+ }
54450+#endif
54451+
54452+ }
54453+ }
54454+}
54455+#endif
54456+
54457+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
54458+
54459+extern int grsec_enable_log_rwxmaps;
54460+
54461+static void elf_handle_mmap(struct file *file)
54462+{
54463+ struct elfhdr elf_h;
54464+ struct elf_phdr elf_p;
54465+ unsigned long i;
54466+
54467+ if (!grsec_enable_log_rwxmaps)
54468+ return;
54469+
54470+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
54471+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
54472+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
54473+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
54474+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
54475+ return;
54476+
54477+ for (i = 0UL; i < elf_h.e_phnum; i++) {
54478+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
54479+ return;
54480+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
54481+ gr_log_ptgnustack(file);
54482+ }
54483+}
54484+#endif
54485+
54486 static int __init init_elf_binfmt(void)
54487 {
54488 register_binfmt(&elf_format);
54489diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
54490index d50bbe5..af3b649 100644
54491--- a/fs/binfmt_flat.c
54492+++ b/fs/binfmt_flat.c
54493@@ -566,7 +566,9 @@ static int load_flat_file(struct linux_binprm * bprm,
54494 realdatastart = (unsigned long) -ENOMEM;
54495 printk("Unable to allocate RAM for process data, errno %d\n",
54496 (int)-realdatastart);
54497+ down_write(&current->mm->mmap_sem);
54498 vm_munmap(textpos, text_len);
54499+ up_write(&current->mm->mmap_sem);
54500 ret = realdatastart;
54501 goto err;
54502 }
54503@@ -590,8 +592,10 @@ static int load_flat_file(struct linux_binprm * bprm,
54504 }
54505 if (IS_ERR_VALUE(result)) {
54506 printk("Unable to read data+bss, errno %d\n", (int)-result);
54507+ down_write(&current->mm->mmap_sem);
54508 vm_munmap(textpos, text_len);
54509 vm_munmap(realdatastart, len);
54510+ up_write(&current->mm->mmap_sem);
54511 ret = result;
54512 goto err;
54513 }
54514@@ -653,8 +657,10 @@ static int load_flat_file(struct linux_binprm * bprm,
54515 }
54516 if (IS_ERR_VALUE(result)) {
54517 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
54518+ down_write(&current->mm->mmap_sem);
54519 vm_munmap(textpos, text_len + data_len + extra +
54520 MAX_SHARED_LIBS * sizeof(unsigned long));
54521+ up_write(&current->mm->mmap_sem);
54522 ret = result;
54523 goto err;
54524 }
54525diff --git a/fs/bio.c b/fs/bio.c
54526index ea5035d..a2932eb 100644
54527--- a/fs/bio.c
54528+++ b/fs/bio.c
54529@@ -1106,7 +1106,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
54530 /*
54531 * Overflow, abort
54532 */
54533- if (end < start)
54534+ if (end < start || end - start > INT_MAX - nr_pages)
54535 return ERR_PTR(-EINVAL);
54536
54537 nr_pages += end - start;
54538@@ -1240,7 +1240,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
54539 /*
54540 * Overflow, abort
54541 */
54542- if (end < start)
54543+ if (end < start || end - start > INT_MAX - nr_pages)
54544 return ERR_PTR(-EINVAL);
54545
54546 nr_pages += end - start;
54547@@ -1502,7 +1502,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
54548 const int read = bio_data_dir(bio) == READ;
54549 struct bio_map_data *bmd = bio->bi_private;
54550 int i;
54551- char *p = bmd->sgvecs[0].iov_base;
54552+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
54553
54554 bio_for_each_segment_all(bvec, bio, i) {
54555 char *addr = page_address(bvec->bv_page);
54556diff --git a/fs/block_dev.c b/fs/block_dev.c
54557index 1e86823..8e34695 100644
54558--- a/fs/block_dev.c
54559+++ b/fs/block_dev.c
54560@@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
54561 else if (bdev->bd_contains == bdev)
54562 return true; /* is a whole device which isn't held */
54563
54564- else if (whole->bd_holder == bd_may_claim)
54565+ else if (whole->bd_holder == (void *)bd_may_claim)
54566 return true; /* is a partition of a device that is being partitioned */
54567 else if (whole->bd_holder != NULL)
54568 return false; /* is a partition of a held device */
54569diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
54570index b544a44..f3fb987 100644
54571--- a/fs/btrfs/ctree.c
54572+++ b/fs/btrfs/ctree.c
54573@@ -1028,9 +1028,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
54574 free_extent_buffer(buf);
54575 add_root_to_dirty_list(root);
54576 } else {
54577- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
54578- parent_start = parent->start;
54579- else
54580+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
54581+ if (parent)
54582+ parent_start = parent->start;
54583+ else
54584+ parent_start = 0;
54585+ } else
54586 parent_start = 0;
54587
54588 WARN_ON(trans->transid != btrfs_header_generation(parent));
54589diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
54590index cbd9523..5cca781 100644
54591--- a/fs/btrfs/delayed-inode.c
54592+++ b/fs/btrfs/delayed-inode.c
54593@@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
54594
54595 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
54596 {
54597- int seq = atomic_inc_return(&delayed_root->items_seq);
54598+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
54599 if ((atomic_dec_return(&delayed_root->items) <
54600 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
54601 waitqueue_active(&delayed_root->wait))
54602@@ -1378,7 +1378,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
54603 static int refs_newer(struct btrfs_delayed_root *delayed_root,
54604 int seq, int count)
54605 {
54606- int val = atomic_read(&delayed_root->items_seq);
54607+ int val = atomic_read_unchecked(&delayed_root->items_seq);
54608
54609 if (val < seq || val >= seq + count)
54610 return 1;
54611@@ -1395,7 +1395,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
54612 if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND)
54613 return;
54614
54615- seq = atomic_read(&delayed_root->items_seq);
54616+ seq = atomic_read_unchecked(&delayed_root->items_seq);
54617
54618 if (atomic_read(&delayed_root->items) >= BTRFS_DELAYED_WRITEBACK) {
54619 int ret;
54620diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
54621index a4b38f9..f86a509 100644
54622--- a/fs/btrfs/delayed-inode.h
54623+++ b/fs/btrfs/delayed-inode.h
54624@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
54625 */
54626 struct list_head prepare_list;
54627 atomic_t items; /* for delayed items */
54628- atomic_t items_seq; /* for delayed items */
54629+ atomic_unchecked_t items_seq; /* for delayed items */
54630 int nodes; /* for delayed nodes */
54631 wait_queue_head_t wait;
54632 };
54633@@ -87,7 +87,7 @@ static inline void btrfs_init_delayed_root(
54634 struct btrfs_delayed_root *delayed_root)
54635 {
54636 atomic_set(&delayed_root->items, 0);
54637- atomic_set(&delayed_root->items_seq, 0);
54638+ atomic_set_unchecked(&delayed_root->items_seq, 0);
54639 delayed_root->nodes = 0;
54640 spin_lock_init(&delayed_root->lock);
54641 init_waitqueue_head(&delayed_root->wait);
54642diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
54643index 8747feb..ad1655c 100644
54644--- a/fs/btrfs/ioctl.c
54645+++ b/fs/btrfs/ioctl.c
54646@@ -3465,9 +3465,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
54647 for (i = 0; i < num_types; i++) {
54648 struct btrfs_space_info *tmp;
54649
54650+ /* Don't copy in more than we allocated */
54651 if (!slot_count)
54652 break;
54653
54654+ slot_count--;
54655+
54656 info = NULL;
54657 rcu_read_lock();
54658 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
54659@@ -3489,10 +3492,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
54660 memcpy(dest, &space, sizeof(space));
54661 dest++;
54662 space_args.total_spaces++;
54663- slot_count--;
54664 }
54665- if (!slot_count)
54666- break;
54667 }
54668 up_read(&info->groups_sem);
54669 }
54670diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
54671index e913328..a34fb36 100644
54672--- a/fs/btrfs/super.c
54673+++ b/fs/btrfs/super.c
54674@@ -266,7 +266,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
54675 function, line, errstr);
54676 return;
54677 }
54678- ACCESS_ONCE(trans->transaction->aborted) = errno;
54679+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
54680 /* Wake up anybody who may be waiting on this transaction */
54681 wake_up(&root->fs_info->transaction_wait);
54682 wake_up(&root->fs_info->transaction_blocked_wait);
54683diff --git a/fs/buffer.c b/fs/buffer.c
54684index 6024877..7bd000a 100644
54685--- a/fs/buffer.c
54686+++ b/fs/buffer.c
54687@@ -3426,7 +3426,7 @@ void __init buffer_init(void)
54688 bh_cachep = kmem_cache_create("buffer_head",
54689 sizeof(struct buffer_head), 0,
54690 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
54691- SLAB_MEM_SPREAD),
54692+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
54693 NULL);
54694
54695 /*
54696diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
54697index 622f469..e8d2d55 100644
54698--- a/fs/cachefiles/bind.c
54699+++ b/fs/cachefiles/bind.c
54700@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
54701 args);
54702
54703 /* start by checking things over */
54704- ASSERT(cache->fstop_percent >= 0 &&
54705- cache->fstop_percent < cache->fcull_percent &&
54706+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
54707 cache->fcull_percent < cache->frun_percent &&
54708 cache->frun_percent < 100);
54709
54710- ASSERT(cache->bstop_percent >= 0 &&
54711- cache->bstop_percent < cache->bcull_percent &&
54712+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
54713 cache->bcull_percent < cache->brun_percent &&
54714 cache->brun_percent < 100);
54715
54716diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
54717index 0a1467b..6a53245 100644
54718--- a/fs/cachefiles/daemon.c
54719+++ b/fs/cachefiles/daemon.c
54720@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
54721 if (n > buflen)
54722 return -EMSGSIZE;
54723
54724- if (copy_to_user(_buffer, buffer, n) != 0)
54725+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
54726 return -EFAULT;
54727
54728 return n;
54729@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
54730 if (test_bit(CACHEFILES_DEAD, &cache->flags))
54731 return -EIO;
54732
54733- if (datalen < 0 || datalen > PAGE_SIZE - 1)
54734+ if (datalen > PAGE_SIZE - 1)
54735 return -EOPNOTSUPP;
54736
54737 /* drag the command string into the kernel so we can parse it */
54738@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
54739 if (args[0] != '%' || args[1] != '\0')
54740 return -EINVAL;
54741
54742- if (fstop < 0 || fstop >= cache->fcull_percent)
54743+ if (fstop >= cache->fcull_percent)
54744 return cachefiles_daemon_range_error(cache, args);
54745
54746 cache->fstop_percent = fstop;
54747@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
54748 if (args[0] != '%' || args[1] != '\0')
54749 return -EINVAL;
54750
54751- if (bstop < 0 || bstop >= cache->bcull_percent)
54752+ if (bstop >= cache->bcull_percent)
54753 return cachefiles_daemon_range_error(cache, args);
54754
54755 cache->bstop_percent = bstop;
54756diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
54757index 5349473..d6c0b93 100644
54758--- a/fs/cachefiles/internal.h
54759+++ b/fs/cachefiles/internal.h
54760@@ -59,7 +59,7 @@ struct cachefiles_cache {
54761 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
54762 struct rb_root active_nodes; /* active nodes (can't be culled) */
54763 rwlock_t active_lock; /* lock for active_nodes */
54764- atomic_t gravecounter; /* graveyard uniquifier */
54765+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
54766 unsigned frun_percent; /* when to stop culling (% files) */
54767 unsigned fcull_percent; /* when to start culling (% files) */
54768 unsigned fstop_percent; /* when to stop allocating (% files) */
54769@@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
54770 * proc.c
54771 */
54772 #ifdef CONFIG_CACHEFILES_HISTOGRAM
54773-extern atomic_t cachefiles_lookup_histogram[HZ];
54774-extern atomic_t cachefiles_mkdir_histogram[HZ];
54775-extern atomic_t cachefiles_create_histogram[HZ];
54776+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
54777+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
54778+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
54779
54780 extern int __init cachefiles_proc_init(void);
54781 extern void cachefiles_proc_cleanup(void);
54782 static inline
54783-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
54784+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
54785 {
54786 unsigned long jif = jiffies - start_jif;
54787 if (jif >= HZ)
54788 jif = HZ - 1;
54789- atomic_inc(&histogram[jif]);
54790+ atomic_inc_unchecked(&histogram[jif]);
54791 }
54792
54793 #else
54794diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
54795index f4a08d7..5aa4599 100644
54796--- a/fs/cachefiles/namei.c
54797+++ b/fs/cachefiles/namei.c
54798@@ -317,7 +317,7 @@ try_again:
54799 /* first step is to make up a grave dentry in the graveyard */
54800 sprintf(nbuffer, "%08x%08x",
54801 (uint32_t) get_seconds(),
54802- (uint32_t) atomic_inc_return(&cache->gravecounter));
54803+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
54804
54805 /* do the multiway lock magic */
54806 trap = lock_rename(cache->graveyard, dir);
54807diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
54808index eccd339..4c1d995 100644
54809--- a/fs/cachefiles/proc.c
54810+++ b/fs/cachefiles/proc.c
54811@@ -14,9 +14,9 @@
54812 #include <linux/seq_file.h>
54813 #include "internal.h"
54814
54815-atomic_t cachefiles_lookup_histogram[HZ];
54816-atomic_t cachefiles_mkdir_histogram[HZ];
54817-atomic_t cachefiles_create_histogram[HZ];
54818+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
54819+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
54820+atomic_unchecked_t cachefiles_create_histogram[HZ];
54821
54822 /*
54823 * display the latency histogram
54824@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
54825 return 0;
54826 default:
54827 index = (unsigned long) v - 3;
54828- x = atomic_read(&cachefiles_lookup_histogram[index]);
54829- y = atomic_read(&cachefiles_mkdir_histogram[index]);
54830- z = atomic_read(&cachefiles_create_histogram[index]);
54831+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
54832+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
54833+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
54834 if (x == 0 && y == 0 && z == 0)
54835 return 0;
54836
54837diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
54838index ebaff36..7e3ea26 100644
54839--- a/fs/cachefiles/rdwr.c
54840+++ b/fs/cachefiles/rdwr.c
54841@@ -950,7 +950,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
54842 old_fs = get_fs();
54843 set_fs(KERNEL_DS);
54844 ret = file->f_op->write(
54845- file, (const void __user *) data, len, &pos);
54846+ file, (const void __force_user *) data, len, &pos);
54847 set_fs(old_fs);
54848 kunmap(page);
54849 file_end_write(file);
54850diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
54851index 868b61d..58835a5 100644
54852--- a/fs/ceph/dir.c
54853+++ b/fs/ceph/dir.c
54854@@ -240,7 +240,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
54855 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
54856 struct ceph_mds_client *mdsc = fsc->mdsc;
54857 unsigned frag = fpos_frag(ctx->pos);
54858- int off = fpos_off(ctx->pos);
54859+ unsigned int off = fpos_off(ctx->pos);
54860 int err;
54861 u32 ftype;
54862 struct ceph_mds_reply_info_parsed *rinfo;
54863diff --git a/fs/ceph/super.c b/fs/ceph/super.c
54864index 6a0951e..03fac6d 100644
54865--- a/fs/ceph/super.c
54866+++ b/fs/ceph/super.c
54867@@ -870,7 +870,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
54868 /*
54869 * construct our own bdi so we can control readahead, etc.
54870 */
54871-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
54872+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
54873
54874 static int ceph_register_bdi(struct super_block *sb,
54875 struct ceph_fs_client *fsc)
54876@@ -887,7 +887,7 @@ static int ceph_register_bdi(struct super_block *sb,
54877 default_backing_dev_info.ra_pages;
54878
54879 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
54880- atomic_long_inc_return(&bdi_seq));
54881+ atomic_long_inc_return_unchecked(&bdi_seq));
54882 if (!err)
54883 sb->s_bdi = &fsc->backing_dev_info;
54884 return err;
54885diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
54886index f3ac415..3d2420c 100644
54887--- a/fs/cifs/cifs_debug.c
54888+++ b/fs/cifs/cifs_debug.c
54889@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
54890
54891 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
54892 #ifdef CONFIG_CIFS_STATS2
54893- atomic_set(&totBufAllocCount, 0);
54894- atomic_set(&totSmBufAllocCount, 0);
54895+ atomic_set_unchecked(&totBufAllocCount, 0);
54896+ atomic_set_unchecked(&totSmBufAllocCount, 0);
54897 #endif /* CONFIG_CIFS_STATS2 */
54898 spin_lock(&cifs_tcp_ses_lock);
54899 list_for_each(tmp1, &cifs_tcp_ses_list) {
54900@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
54901 tcon = list_entry(tmp3,
54902 struct cifs_tcon,
54903 tcon_list);
54904- atomic_set(&tcon->num_smbs_sent, 0);
54905+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
54906 if (server->ops->clear_stats)
54907 server->ops->clear_stats(tcon);
54908 }
54909@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
54910 smBufAllocCount.counter, cifs_min_small);
54911 #ifdef CONFIG_CIFS_STATS2
54912 seq_printf(m, "Total Large %d Small %d Allocations\n",
54913- atomic_read(&totBufAllocCount),
54914- atomic_read(&totSmBufAllocCount));
54915+ atomic_read_unchecked(&totBufAllocCount),
54916+ atomic_read_unchecked(&totSmBufAllocCount));
54917 #endif /* CONFIG_CIFS_STATS2 */
54918
54919 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
54920@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
54921 if (tcon->need_reconnect)
54922 seq_puts(m, "\tDISCONNECTED ");
54923 seq_printf(m, "\nSMBs: %d",
54924- atomic_read(&tcon->num_smbs_sent));
54925+ atomic_read_unchecked(&tcon->num_smbs_sent));
54926 if (server->ops->print_stats)
54927 server->ops->print_stats(m, tcon);
54928 }
54929diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
54930index 77fc5e1..e3d13e6 100644
54931--- a/fs/cifs/cifsfs.c
54932+++ b/fs/cifs/cifsfs.c
54933@@ -1056,7 +1056,7 @@ cifs_init_request_bufs(void)
54934 */
54935 cifs_req_cachep = kmem_cache_create("cifs_request",
54936 CIFSMaxBufSize + max_hdr_size, 0,
54937- SLAB_HWCACHE_ALIGN, NULL);
54938+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
54939 if (cifs_req_cachep == NULL)
54940 return -ENOMEM;
54941
54942@@ -1083,7 +1083,7 @@ cifs_init_request_bufs(void)
54943 efficient to alloc 1 per page off the slab compared to 17K (5page)
54944 alloc of large cifs buffers even when page debugging is on */
54945 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
54946- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
54947+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
54948 NULL);
54949 if (cifs_sm_req_cachep == NULL) {
54950 mempool_destroy(cifs_req_poolp);
54951@@ -1168,8 +1168,8 @@ init_cifs(void)
54952 atomic_set(&bufAllocCount, 0);
54953 atomic_set(&smBufAllocCount, 0);
54954 #ifdef CONFIG_CIFS_STATS2
54955- atomic_set(&totBufAllocCount, 0);
54956- atomic_set(&totSmBufAllocCount, 0);
54957+ atomic_set_unchecked(&totBufAllocCount, 0);
54958+ atomic_set_unchecked(&totSmBufAllocCount, 0);
54959 #endif /* CONFIG_CIFS_STATS2 */
54960
54961 atomic_set(&midCount, 0);
54962diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
54963index c8e03f8..75362f6 100644
54964--- a/fs/cifs/cifsglob.h
54965+++ b/fs/cifs/cifsglob.h
54966@@ -758,35 +758,35 @@ struct cifs_tcon {
54967 __u16 Flags; /* optional support bits */
54968 enum statusEnum tidStatus;
54969 #ifdef CONFIG_CIFS_STATS
54970- atomic_t num_smbs_sent;
54971+ atomic_unchecked_t num_smbs_sent;
54972 union {
54973 struct {
54974- atomic_t num_writes;
54975- atomic_t num_reads;
54976- atomic_t num_flushes;
54977- atomic_t num_oplock_brks;
54978- atomic_t num_opens;
54979- atomic_t num_closes;
54980- atomic_t num_deletes;
54981- atomic_t num_mkdirs;
54982- atomic_t num_posixopens;
54983- atomic_t num_posixmkdirs;
54984- atomic_t num_rmdirs;
54985- atomic_t num_renames;
54986- atomic_t num_t2renames;
54987- atomic_t num_ffirst;
54988- atomic_t num_fnext;
54989- atomic_t num_fclose;
54990- atomic_t num_hardlinks;
54991- atomic_t num_symlinks;
54992- atomic_t num_locks;
54993- atomic_t num_acl_get;
54994- atomic_t num_acl_set;
54995+ atomic_unchecked_t num_writes;
54996+ atomic_unchecked_t num_reads;
54997+ atomic_unchecked_t num_flushes;
54998+ atomic_unchecked_t num_oplock_brks;
54999+ atomic_unchecked_t num_opens;
55000+ atomic_unchecked_t num_closes;
55001+ atomic_unchecked_t num_deletes;
55002+ atomic_unchecked_t num_mkdirs;
55003+ atomic_unchecked_t num_posixopens;
55004+ atomic_unchecked_t num_posixmkdirs;
55005+ atomic_unchecked_t num_rmdirs;
55006+ atomic_unchecked_t num_renames;
55007+ atomic_unchecked_t num_t2renames;
55008+ atomic_unchecked_t num_ffirst;
55009+ atomic_unchecked_t num_fnext;
55010+ atomic_unchecked_t num_fclose;
55011+ atomic_unchecked_t num_hardlinks;
55012+ atomic_unchecked_t num_symlinks;
55013+ atomic_unchecked_t num_locks;
55014+ atomic_unchecked_t num_acl_get;
55015+ atomic_unchecked_t num_acl_set;
55016 } cifs_stats;
55017 #ifdef CONFIG_CIFS_SMB2
55018 struct {
55019- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
55020- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
55021+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
55022+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
55023 } smb2_stats;
55024 #endif /* CONFIG_CIFS_SMB2 */
55025 } stats;
55026@@ -1111,7 +1111,7 @@ convert_delimiter(char *path, char delim)
55027 }
55028
55029 #ifdef CONFIG_CIFS_STATS
55030-#define cifs_stats_inc atomic_inc
55031+#define cifs_stats_inc atomic_inc_unchecked
55032
55033 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
55034 unsigned int bytes)
55035@@ -1477,8 +1477,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
55036 /* Various Debug counters */
55037 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
55038 #ifdef CONFIG_CIFS_STATS2
55039-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
55040-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
55041+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
55042+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
55043 #endif
55044 GLOBAL_EXTERN atomic_t smBufAllocCount;
55045 GLOBAL_EXTERN atomic_t midCount;
55046diff --git a/fs/cifs/file.c b/fs/cifs/file.c
55047index 7ddddf2..2e12dbc 100644
55048--- a/fs/cifs/file.c
55049+++ b/fs/cifs/file.c
55050@@ -1900,10 +1900,14 @@ static int cifs_writepages(struct address_space *mapping,
55051 index = mapping->writeback_index; /* Start from prev offset */
55052 end = -1;
55053 } else {
55054- index = wbc->range_start >> PAGE_CACHE_SHIFT;
55055- end = wbc->range_end >> PAGE_CACHE_SHIFT;
55056- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
55057+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
55058 range_whole = true;
55059+ index = 0;
55060+ end = ULONG_MAX;
55061+ } else {
55062+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
55063+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
55064+ }
55065 scanned = true;
55066 }
55067 retry:
55068diff --git a/fs/cifs/link.c b/fs/cifs/link.c
55069index 477e53b..7a32216 100644
55070--- a/fs/cifs/link.c
55071+++ b/fs/cifs/link.c
55072@@ -620,7 +620,7 @@ symlink_exit:
55073
55074 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
55075 {
55076- char *p = nd_get_link(nd);
55077+ const char *p = nd_get_link(nd);
55078 if (!IS_ERR(p))
55079 kfree(p);
55080 }
55081diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
55082index 138a011..cf9e13a 100644
55083--- a/fs/cifs/misc.c
55084+++ b/fs/cifs/misc.c
55085@@ -170,7 +170,7 @@ cifs_buf_get(void)
55086 memset(ret_buf, 0, buf_size + 3);
55087 atomic_inc(&bufAllocCount);
55088 #ifdef CONFIG_CIFS_STATS2
55089- atomic_inc(&totBufAllocCount);
55090+ atomic_inc_unchecked(&totBufAllocCount);
55091 #endif /* CONFIG_CIFS_STATS2 */
55092 }
55093
55094@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
55095 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
55096 atomic_inc(&smBufAllocCount);
55097 #ifdef CONFIG_CIFS_STATS2
55098- atomic_inc(&totSmBufAllocCount);
55099+ atomic_inc_unchecked(&totSmBufAllocCount);
55100 #endif /* CONFIG_CIFS_STATS2 */
55101
55102 }
55103diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
55104index e50554b..c011413 100644
55105--- a/fs/cifs/smb1ops.c
55106+++ b/fs/cifs/smb1ops.c
55107@@ -609,27 +609,27 @@ static void
55108 cifs_clear_stats(struct cifs_tcon *tcon)
55109 {
55110 #ifdef CONFIG_CIFS_STATS
55111- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
55112- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
55113- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
55114- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
55115- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
55116- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
55117- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
55118- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
55119- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
55120- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
55121- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
55122- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
55123- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
55124- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
55125- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
55126- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
55127- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
55128- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
55129- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
55130- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
55131- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
55132+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
55133+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
55134+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
55135+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
55136+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
55137+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
55138+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
55139+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
55140+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
55141+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
55142+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
55143+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
55144+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
55145+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
55146+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
55147+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
55148+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
55149+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
55150+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
55151+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
55152+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
55153 #endif
55154 }
55155
55156@@ -638,36 +638,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
55157 {
55158 #ifdef CONFIG_CIFS_STATS
55159 seq_printf(m, " Oplocks breaks: %d",
55160- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
55161+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
55162 seq_printf(m, "\nReads: %d Bytes: %llu",
55163- atomic_read(&tcon->stats.cifs_stats.num_reads),
55164+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
55165 (long long)(tcon->bytes_read));
55166 seq_printf(m, "\nWrites: %d Bytes: %llu",
55167- atomic_read(&tcon->stats.cifs_stats.num_writes),
55168+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
55169 (long long)(tcon->bytes_written));
55170 seq_printf(m, "\nFlushes: %d",
55171- atomic_read(&tcon->stats.cifs_stats.num_flushes));
55172+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
55173 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
55174- atomic_read(&tcon->stats.cifs_stats.num_locks),
55175- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
55176- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
55177+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
55178+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
55179+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
55180 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
55181- atomic_read(&tcon->stats.cifs_stats.num_opens),
55182- atomic_read(&tcon->stats.cifs_stats.num_closes),
55183- atomic_read(&tcon->stats.cifs_stats.num_deletes));
55184+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
55185+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
55186+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
55187 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
55188- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
55189- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
55190+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
55191+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
55192 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
55193- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
55194- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
55195+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
55196+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
55197 seq_printf(m, "\nRenames: %d T2 Renames %d",
55198- atomic_read(&tcon->stats.cifs_stats.num_renames),
55199- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
55200+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
55201+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
55202 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
55203- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
55204- atomic_read(&tcon->stats.cifs_stats.num_fnext),
55205- atomic_read(&tcon->stats.cifs_stats.num_fclose));
55206+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
55207+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
55208+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
55209 #endif
55210 }
55211
55212diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
55213index 861b332..5506392 100644
55214--- a/fs/cifs/smb2ops.c
55215+++ b/fs/cifs/smb2ops.c
55216@@ -282,8 +282,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
55217 #ifdef CONFIG_CIFS_STATS
55218 int i;
55219 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
55220- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
55221- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
55222+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
55223+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
55224 }
55225 #endif
55226 }
55227@@ -311,65 +311,65 @@ static void
55228 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
55229 {
55230 #ifdef CONFIG_CIFS_STATS
55231- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
55232- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
55233+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
55234+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
55235 seq_printf(m, "\nNegotiates: %d sent %d failed",
55236- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
55237- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
55238+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
55239+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
55240 seq_printf(m, "\nSessionSetups: %d sent %d failed",
55241- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
55242- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
55243+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
55244+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
55245 seq_printf(m, "\nLogoffs: %d sent %d failed",
55246- atomic_read(&sent[SMB2_LOGOFF_HE]),
55247- atomic_read(&failed[SMB2_LOGOFF_HE]));
55248+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
55249+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
55250 seq_printf(m, "\nTreeConnects: %d sent %d failed",
55251- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
55252- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
55253+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
55254+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
55255 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
55256- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
55257- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
55258+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
55259+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
55260 seq_printf(m, "\nCreates: %d sent %d failed",
55261- atomic_read(&sent[SMB2_CREATE_HE]),
55262- atomic_read(&failed[SMB2_CREATE_HE]));
55263+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
55264+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
55265 seq_printf(m, "\nCloses: %d sent %d failed",
55266- atomic_read(&sent[SMB2_CLOSE_HE]),
55267- atomic_read(&failed[SMB2_CLOSE_HE]));
55268+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
55269+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
55270 seq_printf(m, "\nFlushes: %d sent %d failed",
55271- atomic_read(&sent[SMB2_FLUSH_HE]),
55272- atomic_read(&failed[SMB2_FLUSH_HE]));
55273+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
55274+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
55275 seq_printf(m, "\nReads: %d sent %d failed",
55276- atomic_read(&sent[SMB2_READ_HE]),
55277- atomic_read(&failed[SMB2_READ_HE]));
55278+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
55279+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
55280 seq_printf(m, "\nWrites: %d sent %d failed",
55281- atomic_read(&sent[SMB2_WRITE_HE]),
55282- atomic_read(&failed[SMB2_WRITE_HE]));
55283+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
55284+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
55285 seq_printf(m, "\nLocks: %d sent %d failed",
55286- atomic_read(&sent[SMB2_LOCK_HE]),
55287- atomic_read(&failed[SMB2_LOCK_HE]));
55288+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
55289+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
55290 seq_printf(m, "\nIOCTLs: %d sent %d failed",
55291- atomic_read(&sent[SMB2_IOCTL_HE]),
55292- atomic_read(&failed[SMB2_IOCTL_HE]));
55293+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
55294+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
55295 seq_printf(m, "\nCancels: %d sent %d failed",
55296- atomic_read(&sent[SMB2_CANCEL_HE]),
55297- atomic_read(&failed[SMB2_CANCEL_HE]));
55298+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
55299+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
55300 seq_printf(m, "\nEchos: %d sent %d failed",
55301- atomic_read(&sent[SMB2_ECHO_HE]),
55302- atomic_read(&failed[SMB2_ECHO_HE]));
55303+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
55304+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
55305 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
55306- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
55307- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
55308+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
55309+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
55310 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
55311- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
55312- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
55313+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
55314+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
55315 seq_printf(m, "\nQueryInfos: %d sent %d failed",
55316- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
55317- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
55318+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
55319+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
55320 seq_printf(m, "\nSetInfos: %d sent %d failed",
55321- atomic_read(&sent[SMB2_SET_INFO_HE]),
55322- atomic_read(&failed[SMB2_SET_INFO_HE]));
55323+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
55324+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
55325 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
55326- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
55327- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
55328+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
55329+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
55330 #endif
55331 }
55332
55333diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
55334index edccb52..16bc6db 100644
55335--- a/fs/cifs/smb2pdu.c
55336+++ b/fs/cifs/smb2pdu.c
55337@@ -1957,8 +1957,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
55338 default:
55339 cifs_dbg(VFS, "info level %u isn't supported\n",
55340 srch_inf->info_level);
55341- rc = -EINVAL;
55342- goto qdir_exit;
55343+ return -EINVAL;
55344 }
55345
55346 req->FileIndex = cpu_to_le32(index);
55347diff --git a/fs/coda/cache.c b/fs/coda/cache.c
55348index 1da168c..8bc7ff6 100644
55349--- a/fs/coda/cache.c
55350+++ b/fs/coda/cache.c
55351@@ -24,7 +24,7 @@
55352 #include "coda_linux.h"
55353 #include "coda_cache.h"
55354
55355-static atomic_t permission_epoch = ATOMIC_INIT(0);
55356+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
55357
55358 /* replace or extend an acl cache hit */
55359 void coda_cache_enter(struct inode *inode, int mask)
55360@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
55361 struct coda_inode_info *cii = ITOC(inode);
55362
55363 spin_lock(&cii->c_lock);
55364- cii->c_cached_epoch = atomic_read(&permission_epoch);
55365+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
55366 if (!uid_eq(cii->c_uid, current_fsuid())) {
55367 cii->c_uid = current_fsuid();
55368 cii->c_cached_perm = mask;
55369@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
55370 {
55371 struct coda_inode_info *cii = ITOC(inode);
55372 spin_lock(&cii->c_lock);
55373- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
55374+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
55375 spin_unlock(&cii->c_lock);
55376 }
55377
55378 /* remove all acl caches */
55379 void coda_cache_clear_all(struct super_block *sb)
55380 {
55381- atomic_inc(&permission_epoch);
55382+ atomic_inc_unchecked(&permission_epoch);
55383 }
55384
55385
55386@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
55387 spin_lock(&cii->c_lock);
55388 hit = (mask & cii->c_cached_perm) == mask &&
55389 uid_eq(cii->c_uid, current_fsuid()) &&
55390- cii->c_cached_epoch == atomic_read(&permission_epoch);
55391+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
55392 spin_unlock(&cii->c_lock);
55393
55394 return hit;
55395diff --git a/fs/compat.c b/fs/compat.c
55396index 6af20de..fec3fbb 100644
55397--- a/fs/compat.c
55398+++ b/fs/compat.c
55399@@ -54,7 +54,7 @@
55400 #include <asm/ioctls.h>
55401 #include "internal.h"
55402
55403-int compat_log = 1;
55404+int compat_log = 0;
55405
55406 int compat_printk(const char *fmt, ...)
55407 {
55408@@ -488,7 +488,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
55409
55410 set_fs(KERNEL_DS);
55411 /* The __user pointer cast is valid because of the set_fs() */
55412- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
55413+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
55414 set_fs(oldfs);
55415 /* truncating is ok because it's a user address */
55416 if (!ret)
55417@@ -546,7 +546,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
55418 goto out;
55419
55420 ret = -EINVAL;
55421- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
55422+ if (nr_segs > UIO_MAXIOV)
55423 goto out;
55424 if (nr_segs > fast_segs) {
55425 ret = -ENOMEM;
55426@@ -834,6 +834,7 @@ struct compat_old_linux_dirent {
55427 struct compat_readdir_callback {
55428 struct dir_context ctx;
55429 struct compat_old_linux_dirent __user *dirent;
55430+ struct file * file;
55431 int result;
55432 };
55433
55434@@ -851,6 +852,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
55435 buf->result = -EOVERFLOW;
55436 return -EOVERFLOW;
55437 }
55438+
55439+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55440+ return 0;
55441+
55442 buf->result++;
55443 dirent = buf->dirent;
55444 if (!access_ok(VERIFY_WRITE, dirent,
55445@@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
55446 if (!f.file)
55447 return -EBADF;
55448
55449+ buf.file = f.file;
55450 error = iterate_dir(f.file, &buf.ctx);
55451 if (buf.result)
55452 error = buf.result;
55453@@ -901,6 +907,7 @@ struct compat_getdents_callback {
55454 struct dir_context ctx;
55455 struct compat_linux_dirent __user *current_dir;
55456 struct compat_linux_dirent __user *previous;
55457+ struct file * file;
55458 int count;
55459 int error;
55460 };
55461@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
55462 buf->error = -EOVERFLOW;
55463 return -EOVERFLOW;
55464 }
55465+
55466+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55467+ return 0;
55468+
55469 dirent = buf->previous;
55470 if (dirent) {
55471 if (__put_user(offset, &dirent->d_off))
55472@@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
55473 if (!f.file)
55474 return -EBADF;
55475
55476+ buf.file = f.file;
55477 error = iterate_dir(f.file, &buf.ctx);
55478 if (error >= 0)
55479 error = buf.error;
55480@@ -987,6 +999,7 @@ struct compat_getdents_callback64 {
55481 struct dir_context ctx;
55482 struct linux_dirent64 __user *current_dir;
55483 struct linux_dirent64 __user *previous;
55484+ struct file * file;
55485 int count;
55486 int error;
55487 };
55488@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
55489 buf->error = -EINVAL; /* only used if we fail.. */
55490 if (reclen > buf->count)
55491 return -EINVAL;
55492+
55493+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
55494+ return 0;
55495+
55496 dirent = buf->previous;
55497
55498 if (dirent) {
55499@@ -1052,6 +1069,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
55500 if (!f.file)
55501 return -EBADF;
55502
55503+ buf.file = f.file;
55504 error = iterate_dir(f.file, &buf.ctx);
55505 if (error >= 0)
55506 error = buf.error;
55507diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
55508index a81147e..20bf2b5 100644
55509--- a/fs/compat_binfmt_elf.c
55510+++ b/fs/compat_binfmt_elf.c
55511@@ -30,11 +30,13 @@
55512 #undef elf_phdr
55513 #undef elf_shdr
55514 #undef elf_note
55515+#undef elf_dyn
55516 #undef elf_addr_t
55517 #define elfhdr elf32_hdr
55518 #define elf_phdr elf32_phdr
55519 #define elf_shdr elf32_shdr
55520 #define elf_note elf32_note
55521+#define elf_dyn Elf32_Dyn
55522 #define elf_addr_t Elf32_Addr
55523
55524 /*
55525diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
55526index 5d19acf..9ab093b 100644
55527--- a/fs/compat_ioctl.c
55528+++ b/fs/compat_ioctl.c
55529@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
55530 return -EFAULT;
55531 if (__get_user(udata, &ss32->iomem_base))
55532 return -EFAULT;
55533- ss.iomem_base = compat_ptr(udata);
55534+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
55535 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
55536 __get_user(ss.port_high, &ss32->port_high))
55537 return -EFAULT;
55538@@ -702,8 +702,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
55539 for (i = 0; i < nmsgs; i++) {
55540 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
55541 return -EFAULT;
55542- if (get_user(datap, &umsgs[i].buf) ||
55543- put_user(compat_ptr(datap), &tmsgs[i].buf))
55544+ if (get_user(datap, (u8 __user * __user *)&umsgs[i].buf) ||
55545+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
55546 return -EFAULT;
55547 }
55548 return sys_ioctl(fd, cmd, (unsigned long)tdata);
55549@@ -796,7 +796,7 @@ static int compat_ioctl_preallocate(struct file *file,
55550 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
55551 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
55552 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
55553- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
55554+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
55555 return -EFAULT;
55556
55557 return ioctl_preallocate(file, p);
55558@@ -1616,8 +1616,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
55559 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
55560 {
55561 unsigned int a, b;
55562- a = *(unsigned int *)p;
55563- b = *(unsigned int *)q;
55564+ a = *(const unsigned int *)p;
55565+ b = *(const unsigned int *)q;
55566 if (a > b)
55567 return 1;
55568 if (a < b)
55569diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
55570index 511d415..319d0e5 100644
55571--- a/fs/configfs/dir.c
55572+++ b/fs/configfs/dir.c
55573@@ -1558,7 +1558,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
55574 }
55575 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
55576 struct configfs_dirent *next;
55577- const char *name;
55578+ const unsigned char * name;
55579+ char d_name[sizeof(next->s_dentry->d_iname)];
55580 int len;
55581 struct inode *inode = NULL;
55582
55583@@ -1567,7 +1568,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
55584 continue;
55585
55586 name = configfs_get_name(next);
55587- len = strlen(name);
55588+ if (next->s_dentry && name == next->s_dentry->d_iname) {
55589+ len = next->s_dentry->d_name.len;
55590+ memcpy(d_name, name, len);
55591+ name = d_name;
55592+ } else
55593+ len = strlen(name);
55594
55595 /*
55596 * We'll have a dentry and an inode for
55597diff --git a/fs/coredump.c b/fs/coredump.c
55598index 9bdeca1..2a9b08d 100644
55599--- a/fs/coredump.c
55600+++ b/fs/coredump.c
55601@@ -438,8 +438,8 @@ static void wait_for_dump_helpers(struct file *file)
55602 struct pipe_inode_info *pipe = file->private_data;
55603
55604 pipe_lock(pipe);
55605- pipe->readers++;
55606- pipe->writers--;
55607+ atomic_inc(&pipe->readers);
55608+ atomic_dec(&pipe->writers);
55609 wake_up_interruptible_sync(&pipe->wait);
55610 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
55611 pipe_unlock(pipe);
55612@@ -448,11 +448,11 @@ static void wait_for_dump_helpers(struct file *file)
55613 * We actually want wait_event_freezable() but then we need
55614 * to clear TIF_SIGPENDING and improve dump_interrupted().
55615 */
55616- wait_event_interruptible(pipe->wait, pipe->readers == 1);
55617+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
55618
55619 pipe_lock(pipe);
55620- pipe->readers--;
55621- pipe->writers++;
55622+ atomic_dec(&pipe->readers);
55623+ atomic_inc(&pipe->writers);
55624 pipe_unlock(pipe);
55625 }
55626
55627@@ -499,7 +499,9 @@ void do_coredump(siginfo_t *siginfo)
55628 struct files_struct *displaced;
55629 bool need_nonrelative = false;
55630 bool core_dumped = false;
55631- static atomic_t core_dump_count = ATOMIC_INIT(0);
55632+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
55633+ long signr = siginfo->si_signo;
55634+ int dumpable;
55635 struct coredump_params cprm = {
55636 .siginfo = siginfo,
55637 .regs = signal_pt_regs(),
55638@@ -512,12 +514,17 @@ void do_coredump(siginfo_t *siginfo)
55639 .mm_flags = mm->flags,
55640 };
55641
55642- audit_core_dumps(siginfo->si_signo);
55643+ audit_core_dumps(signr);
55644+
55645+ dumpable = __get_dumpable(cprm.mm_flags);
55646+
55647+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
55648+ gr_handle_brute_attach(dumpable);
55649
55650 binfmt = mm->binfmt;
55651 if (!binfmt || !binfmt->core_dump)
55652 goto fail;
55653- if (!__get_dumpable(cprm.mm_flags))
55654+ if (!dumpable)
55655 goto fail;
55656
55657 cred = prepare_creds();
55658@@ -536,7 +543,7 @@ void do_coredump(siginfo_t *siginfo)
55659 need_nonrelative = true;
55660 }
55661
55662- retval = coredump_wait(siginfo->si_signo, &core_state);
55663+ retval = coredump_wait(signr, &core_state);
55664 if (retval < 0)
55665 goto fail_creds;
55666
55667@@ -579,7 +586,7 @@ void do_coredump(siginfo_t *siginfo)
55668 }
55669 cprm.limit = RLIM_INFINITY;
55670
55671- dump_count = atomic_inc_return(&core_dump_count);
55672+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
55673 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
55674 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
55675 task_tgid_vnr(current), current->comm);
55676@@ -611,6 +618,8 @@ void do_coredump(siginfo_t *siginfo)
55677 } else {
55678 struct inode *inode;
55679
55680+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
55681+
55682 if (cprm.limit < binfmt->min_coredump)
55683 goto fail_unlock;
55684
55685@@ -669,7 +678,7 @@ close_fail:
55686 filp_close(cprm.file, NULL);
55687 fail_dropcount:
55688 if (ispipe)
55689- atomic_dec(&core_dump_count);
55690+ atomic_dec_unchecked(&core_dump_count);
55691 fail_unlock:
55692 kfree(cn.corename);
55693 coredump_finish(mm, core_dumped);
55694@@ -689,7 +698,7 @@ int dump_write(struct file *file, const void *addr, int nr)
55695 {
55696 return !dump_interrupted() &&
55697 access_ok(VERIFY_READ, addr, nr) &&
55698- file->f_op->write(file, addr, nr, &file->f_pos) == nr;
55699+ file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
55700 }
55701 EXPORT_SYMBOL(dump_write);
55702
55703diff --git a/fs/dcache.c b/fs/dcache.c
55704index 89f9671..d2dce57 100644
55705--- a/fs/dcache.c
55706+++ b/fs/dcache.c
55707@@ -1570,7 +1570,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
55708 */
55709 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
55710 if (name->len > DNAME_INLINE_LEN-1) {
55711- dname = kmalloc(name->len + 1, GFP_KERNEL);
55712+ dname = kmalloc(round_up(name->len + 1, sizeof(unsigned long)), GFP_KERNEL);
55713 if (!dname) {
55714 kmem_cache_free(dentry_cache, dentry);
55715 return NULL;
55716@@ -2893,6 +2893,7 @@ static int prepend_path(const struct path *path,
55717 restart:
55718 bptr = *buffer;
55719 blen = *buflen;
55720+ error = 0;
55721 dentry = path->dentry;
55722 vfsmnt = path->mnt;
55723 mnt = real_mount(vfsmnt);
55724@@ -3432,7 +3433,8 @@ void __init vfs_caches_init(unsigned long mempages)
55725 mempages -= reserve;
55726
55727 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
55728- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
55729+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
55730+ SLAB_NO_SANITIZE, NULL);
55731
55732 dcache_init();
55733 inode_init();
55734diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
55735index c7c83ff..bda9461 100644
55736--- a/fs/debugfs/inode.c
55737+++ b/fs/debugfs/inode.c
55738@@ -415,7 +415,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
55739 */
55740 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
55741 {
55742+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
55743+ return __create_file(name, S_IFDIR | S_IRWXU,
55744+#else
55745 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
55746+#endif
55747 parent, NULL, NULL);
55748 }
55749 EXPORT_SYMBOL_GPL(debugfs_create_dir);
55750diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
55751index 67e9b63..a9adb68 100644
55752--- a/fs/ecryptfs/inode.c
55753+++ b/fs/ecryptfs/inode.c
55754@@ -674,7 +674,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
55755 old_fs = get_fs();
55756 set_fs(get_ds());
55757 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
55758- (char __user *)lower_buf,
55759+ (char __force_user *)lower_buf,
55760 PATH_MAX);
55761 set_fs(old_fs);
55762 if (rc < 0)
55763@@ -706,7 +706,7 @@ out:
55764 static void
55765 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
55766 {
55767- char *buf = nd_get_link(nd);
55768+ const char *buf = nd_get_link(nd);
55769 if (!IS_ERR(buf)) {
55770 /* Free the char* */
55771 kfree(buf);
55772diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
55773index e4141f2..d8263e8 100644
55774--- a/fs/ecryptfs/miscdev.c
55775+++ b/fs/ecryptfs/miscdev.c
55776@@ -304,7 +304,7 @@ check_list:
55777 goto out_unlock_msg_ctx;
55778 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
55779 if (msg_ctx->msg) {
55780- if (copy_to_user(&buf[i], packet_length, packet_length_size))
55781+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
55782 goto out_unlock_msg_ctx;
55783 i += packet_length_size;
55784 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
55785diff --git a/fs/exec.c b/fs/exec.c
55786index bb8afc1..2f5087e 100644
55787--- a/fs/exec.c
55788+++ b/fs/exec.c
55789@@ -55,8 +55,20 @@
55790 #include <linux/pipe_fs_i.h>
55791 #include <linux/oom.h>
55792 #include <linux/compat.h>
55793+#include <linux/random.h>
55794+#include <linux/seq_file.h>
55795+#include <linux/coredump.h>
55796+#include <linux/mman.h>
55797+
55798+#ifdef CONFIG_PAX_REFCOUNT
55799+#include <linux/kallsyms.h>
55800+#include <linux/kdebug.h>
55801+#endif
55802+
55803+#include <trace/events/fs.h>
55804
55805 #include <asm/uaccess.h>
55806+#include <asm/sections.h>
55807 #include <asm/mmu_context.h>
55808 #include <asm/tlb.h>
55809
55810@@ -66,19 +78,34 @@
55811
55812 #include <trace/events/sched.h>
55813
55814+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
55815+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
55816+{
55817+ 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");
55818+}
55819+#endif
55820+
55821+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
55822+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
55823+EXPORT_SYMBOL(pax_set_initial_flags_func);
55824+#endif
55825+
55826 int suid_dumpable = 0;
55827
55828 static LIST_HEAD(formats);
55829 static DEFINE_RWLOCK(binfmt_lock);
55830
55831+extern int gr_process_kernel_exec_ban(void);
55832+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
55833+
55834 void __register_binfmt(struct linux_binfmt * fmt, int insert)
55835 {
55836 BUG_ON(!fmt);
55837 if (WARN_ON(!fmt->load_binary))
55838 return;
55839 write_lock(&binfmt_lock);
55840- insert ? list_add(&fmt->lh, &formats) :
55841- list_add_tail(&fmt->lh, &formats);
55842+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
55843+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
55844 write_unlock(&binfmt_lock);
55845 }
55846
55847@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
55848 void unregister_binfmt(struct linux_binfmt * fmt)
55849 {
55850 write_lock(&binfmt_lock);
55851- list_del(&fmt->lh);
55852+ pax_list_del((struct list_head *)&fmt->lh);
55853 write_unlock(&binfmt_lock);
55854 }
55855
55856@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
55857 int write)
55858 {
55859 struct page *page;
55860- int ret;
55861
55862-#ifdef CONFIG_STACK_GROWSUP
55863- if (write) {
55864- ret = expand_downwards(bprm->vma, pos);
55865- if (ret < 0)
55866- return NULL;
55867- }
55868-#endif
55869- ret = get_user_pages(current, bprm->mm, pos,
55870- 1, write, 1, &page, NULL);
55871- if (ret <= 0)
55872+ if (0 > expand_downwards(bprm->vma, pos))
55873+ return NULL;
55874+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
55875 return NULL;
55876
55877 if (write) {
55878@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
55879 if (size <= ARG_MAX)
55880 return page;
55881
55882+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
55883+ // only allow 512KB for argv+env on suid/sgid binaries
55884+ // to prevent easy ASLR exhaustion
55885+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
55886+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
55887+ (size > (512 * 1024))) {
55888+ put_page(page);
55889+ return NULL;
55890+ }
55891+#endif
55892+
55893 /*
55894 * Limit to 1/4-th the stack size for the argv+env strings.
55895 * This ensures that:
55896@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
55897 vma->vm_end = STACK_TOP_MAX;
55898 vma->vm_start = vma->vm_end - PAGE_SIZE;
55899 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
55900+
55901+#ifdef CONFIG_PAX_SEGMEXEC
55902+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
55903+#endif
55904+
55905 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
55906 INIT_LIST_HEAD(&vma->anon_vma_chain);
55907
55908@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
55909 mm->stack_vm = mm->total_vm = 1;
55910 up_write(&mm->mmap_sem);
55911 bprm->p = vma->vm_end - sizeof(void *);
55912+
55913+#ifdef CONFIG_PAX_RANDUSTACK
55914+ if (randomize_va_space)
55915+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
55916+#endif
55917+
55918 return 0;
55919 err:
55920 up_write(&mm->mmap_sem);
55921@@ -399,7 +440,7 @@ struct user_arg_ptr {
55922 } ptr;
55923 };
55924
55925-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55926+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55927 {
55928 const char __user *native;
55929
55930@@ -408,14 +449,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
55931 compat_uptr_t compat;
55932
55933 if (get_user(compat, argv.ptr.compat + nr))
55934- return ERR_PTR(-EFAULT);
55935+ return (const char __force_user *)ERR_PTR(-EFAULT);
55936
55937 return compat_ptr(compat);
55938 }
55939 #endif
55940
55941 if (get_user(native, argv.ptr.native + nr))
55942- return ERR_PTR(-EFAULT);
55943+ return (const char __force_user *)ERR_PTR(-EFAULT);
55944
55945 return native;
55946 }
55947@@ -434,7 +475,7 @@ static int count(struct user_arg_ptr argv, int max)
55948 if (!p)
55949 break;
55950
55951- if (IS_ERR(p))
55952+ if (IS_ERR((const char __force_kernel *)p))
55953 return -EFAULT;
55954
55955 if (i >= max)
55956@@ -469,7 +510,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
55957
55958 ret = -EFAULT;
55959 str = get_user_arg_ptr(argv, argc);
55960- if (IS_ERR(str))
55961+ if (IS_ERR((const char __force_kernel *)str))
55962 goto out;
55963
55964 len = strnlen_user(str, MAX_ARG_STRLEN);
55965@@ -551,7 +592,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
55966 int r;
55967 mm_segment_t oldfs = get_fs();
55968 struct user_arg_ptr argv = {
55969- .ptr.native = (const char __user *const __user *)__argv,
55970+ .ptr.native = (const char __force_user * const __force_user *)__argv,
55971 };
55972
55973 set_fs(KERNEL_DS);
55974@@ -586,7 +627,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
55975 unsigned long new_end = old_end - shift;
55976 struct mmu_gather tlb;
55977
55978- BUG_ON(new_start > new_end);
55979+ if (new_start >= new_end || new_start < mmap_min_addr)
55980+ return -ENOMEM;
55981
55982 /*
55983 * ensure there are no vmas between where we want to go
55984@@ -595,6 +637,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
55985 if (vma != find_vma(mm, new_start))
55986 return -EFAULT;
55987
55988+#ifdef CONFIG_PAX_SEGMEXEC
55989+ BUG_ON(pax_find_mirror_vma(vma));
55990+#endif
55991+
55992 /*
55993 * cover the whole range: [new_start, old_end)
55994 */
55995@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
55996 stack_top = arch_align_stack(stack_top);
55997 stack_top = PAGE_ALIGN(stack_top);
55998
55999- if (unlikely(stack_top < mmap_min_addr) ||
56000- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
56001- return -ENOMEM;
56002-
56003 stack_shift = vma->vm_end - stack_top;
56004
56005 bprm->p -= stack_shift;
56006@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
56007 bprm->exec -= stack_shift;
56008
56009 down_write(&mm->mmap_sem);
56010+
56011+ /* Move stack pages down in memory. */
56012+ if (stack_shift) {
56013+ ret = shift_arg_pages(vma, stack_shift);
56014+ if (ret)
56015+ goto out_unlock;
56016+ }
56017+
56018 vm_flags = VM_STACK_FLAGS;
56019
56020+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56021+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56022+ vm_flags &= ~VM_EXEC;
56023+
56024+#ifdef CONFIG_PAX_MPROTECT
56025+ if (mm->pax_flags & MF_PAX_MPROTECT)
56026+ vm_flags &= ~VM_MAYEXEC;
56027+#endif
56028+
56029+ }
56030+#endif
56031+
56032 /*
56033 * Adjust stack execute permissions; explicitly enable for
56034 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
56035@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
56036 goto out_unlock;
56037 BUG_ON(prev != vma);
56038
56039- /* Move stack pages down in memory. */
56040- if (stack_shift) {
56041- ret = shift_arg_pages(vma, stack_shift);
56042- if (ret)
56043- goto out_unlock;
56044- }
56045-
56046 /* mprotect_fixup is overkill to remove the temporary stack flags */
56047 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
56048
56049@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
56050 #endif
56051 current->mm->start_stack = bprm->p;
56052 ret = expand_stack(vma, stack_base);
56053+
56054+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
56055+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
56056+ unsigned long size;
56057+ vm_flags_t vm_flags;
56058+
56059+ size = STACK_TOP - vma->vm_end;
56060+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
56061+
56062+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
56063+
56064+#ifdef CONFIG_X86
56065+ if (!ret) {
56066+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
56067+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
56068+ }
56069+#endif
56070+
56071+ }
56072+#endif
56073+
56074 if (ret)
56075 ret = -EFAULT;
56076
56077@@ -776,6 +852,8 @@ struct file *open_exec(const char *name)
56078
56079 fsnotify_open(file);
56080
56081+ trace_open_exec(name);
56082+
56083 err = deny_write_access(file);
56084 if (err)
56085 goto exit;
56086@@ -799,7 +877,7 @@ int kernel_read(struct file *file, loff_t offset,
56087 old_fs = get_fs();
56088 set_fs(get_ds());
56089 /* The cast to a user pointer is valid due to the set_fs() */
56090- result = vfs_read(file, (void __user *)addr, count, &pos);
56091+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
56092 set_fs(old_fs);
56093 return result;
56094 }
56095@@ -1255,7 +1333,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
56096 }
56097 rcu_read_unlock();
56098
56099- if (p->fs->users > n_fs) {
56100+ if (atomic_read(&p->fs->users) > n_fs) {
56101 bprm->unsafe |= LSM_UNSAFE_SHARE;
56102 } else {
56103 res = -EAGAIN;
56104@@ -1451,6 +1529,31 @@ static int exec_binprm(struct linux_binprm *bprm)
56105 return ret;
56106 }
56107
56108+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
56109+static DEFINE_PER_CPU(u64, exec_counter);
56110+static int __init init_exec_counters(void)
56111+{
56112+ unsigned int cpu;
56113+
56114+ for_each_possible_cpu(cpu) {
56115+ per_cpu(exec_counter, cpu) = (u64)cpu;
56116+ }
56117+
56118+ return 0;
56119+}
56120+early_initcall(init_exec_counters);
56121+static inline void increment_exec_counter(void)
56122+{
56123+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
56124+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
56125+}
56126+#else
56127+static inline void increment_exec_counter(void) {}
56128+#endif
56129+
56130+extern void gr_handle_exec_args(struct linux_binprm *bprm,
56131+ struct user_arg_ptr argv);
56132+
56133 /*
56134 * sys_execve() executes a new program.
56135 */
56136@@ -1458,12 +1561,19 @@ static int do_execve_common(const char *filename,
56137 struct user_arg_ptr argv,
56138 struct user_arg_ptr envp)
56139 {
56140+#ifdef CONFIG_GRKERNSEC
56141+ struct file *old_exec_file;
56142+ struct acl_subject_label *old_acl;
56143+ struct rlimit old_rlim[RLIM_NLIMITS];
56144+#endif
56145 struct linux_binprm *bprm;
56146 struct file *file;
56147 struct files_struct *displaced;
56148 bool clear_in_exec;
56149 int retval;
56150
56151+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
56152+
56153 /*
56154 * We move the actual failure in case of RLIMIT_NPROC excess from
56155 * set*uid() to execve() because too many poorly written programs
56156@@ -1504,12 +1614,22 @@ static int do_execve_common(const char *filename,
56157 if (IS_ERR(file))
56158 goto out_unmark;
56159
56160+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
56161+ retval = -EPERM;
56162+ goto out_file;
56163+ }
56164+
56165 sched_exec();
56166
56167 bprm->file = file;
56168 bprm->filename = filename;
56169 bprm->interp = filename;
56170
56171+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
56172+ retval = -EACCES;
56173+ goto out_file;
56174+ }
56175+
56176 retval = bprm_mm_init(bprm);
56177 if (retval)
56178 goto out_file;
56179@@ -1526,24 +1646,70 @@ static int do_execve_common(const char *filename,
56180 if (retval < 0)
56181 goto out;
56182
56183+#ifdef CONFIG_GRKERNSEC
56184+ old_acl = current->acl;
56185+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
56186+ old_exec_file = current->exec_file;
56187+ get_file(file);
56188+ current->exec_file = file;
56189+#endif
56190+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
56191+ /* limit suid stack to 8MB
56192+ * we saved the old limits above and will restore them if this exec fails
56193+ */
56194+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
56195+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
56196+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
56197+#endif
56198+
56199+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
56200+ retval = -EPERM;
56201+ goto out_fail;
56202+ }
56203+
56204+ if (!gr_tpe_allow(file)) {
56205+ retval = -EACCES;
56206+ goto out_fail;
56207+ }
56208+
56209+ if (gr_check_crash_exec(file)) {
56210+ retval = -EACCES;
56211+ goto out_fail;
56212+ }
56213+
56214+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
56215+ bprm->unsafe);
56216+ if (retval < 0)
56217+ goto out_fail;
56218+
56219 retval = copy_strings_kernel(1, &bprm->filename, bprm);
56220 if (retval < 0)
56221- goto out;
56222+ goto out_fail;
56223
56224 bprm->exec = bprm->p;
56225 retval = copy_strings(bprm->envc, envp, bprm);
56226 if (retval < 0)
56227- goto out;
56228+ goto out_fail;
56229
56230 retval = copy_strings(bprm->argc, argv, bprm);
56231 if (retval < 0)
56232- goto out;
56233+ goto out_fail;
56234+
56235+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
56236+
56237+ gr_handle_exec_args(bprm, argv);
56238
56239 retval = exec_binprm(bprm);
56240 if (retval < 0)
56241- goto out;
56242+ goto out_fail;
56243+#ifdef CONFIG_GRKERNSEC
56244+ if (old_exec_file)
56245+ fput(old_exec_file);
56246+#endif
56247
56248 /* execve succeeded */
56249+
56250+ increment_exec_counter();
56251 current->fs->in_exec = 0;
56252 current->in_execve = 0;
56253 acct_update_integrals(current);
56254@@ -1552,6 +1718,14 @@ static int do_execve_common(const char *filename,
56255 put_files_struct(displaced);
56256 return retval;
56257
56258+out_fail:
56259+#ifdef CONFIG_GRKERNSEC
56260+ current->acl = old_acl;
56261+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
56262+ fput(current->exec_file);
56263+ current->exec_file = old_exec_file;
56264+#endif
56265+
56266 out:
56267 if (bprm->mm) {
56268 acct_arg_size(bprm, 0);
56269@@ -1706,3 +1880,295 @@ asmlinkage long compat_sys_execve(const char __user * filename,
56270 return error;
56271 }
56272 #endif
56273+
56274+int pax_check_flags(unsigned long *flags)
56275+{
56276+ int retval = 0;
56277+
56278+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
56279+ if (*flags & MF_PAX_SEGMEXEC)
56280+ {
56281+ *flags &= ~MF_PAX_SEGMEXEC;
56282+ retval = -EINVAL;
56283+ }
56284+#endif
56285+
56286+ if ((*flags & MF_PAX_PAGEEXEC)
56287+
56288+#ifdef CONFIG_PAX_PAGEEXEC
56289+ && (*flags & MF_PAX_SEGMEXEC)
56290+#endif
56291+
56292+ )
56293+ {
56294+ *flags &= ~MF_PAX_PAGEEXEC;
56295+ retval = -EINVAL;
56296+ }
56297+
56298+ if ((*flags & MF_PAX_MPROTECT)
56299+
56300+#ifdef CONFIG_PAX_MPROTECT
56301+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
56302+#endif
56303+
56304+ )
56305+ {
56306+ *flags &= ~MF_PAX_MPROTECT;
56307+ retval = -EINVAL;
56308+ }
56309+
56310+ if ((*flags & MF_PAX_EMUTRAMP)
56311+
56312+#ifdef CONFIG_PAX_EMUTRAMP
56313+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
56314+#endif
56315+
56316+ )
56317+ {
56318+ *flags &= ~MF_PAX_EMUTRAMP;
56319+ retval = -EINVAL;
56320+ }
56321+
56322+ return retval;
56323+}
56324+
56325+EXPORT_SYMBOL(pax_check_flags);
56326+
56327+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56328+char *pax_get_path(const struct path *path, char *buf, int buflen)
56329+{
56330+ char *pathname = d_path(path, buf, buflen);
56331+
56332+ if (IS_ERR(pathname))
56333+ goto toolong;
56334+
56335+ pathname = mangle_path(buf, pathname, "\t\n\\");
56336+ if (!pathname)
56337+ goto toolong;
56338+
56339+ *pathname = 0;
56340+ return buf;
56341+
56342+toolong:
56343+ return "<path too long>";
56344+}
56345+EXPORT_SYMBOL(pax_get_path);
56346+
56347+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
56348+{
56349+ struct task_struct *tsk = current;
56350+ struct mm_struct *mm = current->mm;
56351+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
56352+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
56353+ char *path_exec = NULL;
56354+ char *path_fault = NULL;
56355+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
56356+ siginfo_t info = { };
56357+
56358+ if (buffer_exec && buffer_fault) {
56359+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
56360+
56361+ down_read(&mm->mmap_sem);
56362+ vma = mm->mmap;
56363+ while (vma && (!vma_exec || !vma_fault)) {
56364+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
56365+ vma_exec = vma;
56366+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
56367+ vma_fault = vma;
56368+ vma = vma->vm_next;
56369+ }
56370+ if (vma_exec)
56371+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
56372+ if (vma_fault) {
56373+ start = vma_fault->vm_start;
56374+ end = vma_fault->vm_end;
56375+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
56376+ if (vma_fault->vm_file)
56377+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
56378+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
56379+ path_fault = "<heap>";
56380+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
56381+ path_fault = "<stack>";
56382+ else
56383+ path_fault = "<anonymous mapping>";
56384+ }
56385+ up_read(&mm->mmap_sem);
56386+ }
56387+ if (tsk->signal->curr_ip)
56388+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
56389+ else
56390+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
56391+ 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),
56392+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
56393+ free_page((unsigned long)buffer_exec);
56394+ free_page((unsigned long)buffer_fault);
56395+ pax_report_insns(regs, pc, sp);
56396+ info.si_signo = SIGKILL;
56397+ info.si_errno = 0;
56398+ info.si_code = SI_KERNEL;
56399+ info.si_pid = 0;
56400+ info.si_uid = 0;
56401+ do_coredump(&info);
56402+}
56403+#endif
56404+
56405+#ifdef CONFIG_PAX_REFCOUNT
56406+void pax_report_refcount_overflow(struct pt_regs *regs)
56407+{
56408+ if (current->signal->curr_ip)
56409+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
56410+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
56411+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
56412+ else
56413+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
56414+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
56415+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
56416+ preempt_disable();
56417+ show_regs(regs);
56418+ preempt_enable();
56419+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
56420+}
56421+#endif
56422+
56423+#ifdef CONFIG_PAX_USERCOPY
56424+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
56425+static noinline int check_stack_object(const void *obj, unsigned long len)
56426+{
56427+ const void * const stack = task_stack_page(current);
56428+ const void * const stackend = stack + THREAD_SIZE;
56429+
56430+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
56431+ const void *frame = NULL;
56432+ const void *oldframe;
56433+#endif
56434+
56435+ if (obj + len < obj)
56436+ return -1;
56437+
56438+ if (obj + len <= stack || stackend <= obj)
56439+ return 0;
56440+
56441+ if (obj < stack || stackend < obj + len)
56442+ return -1;
56443+
56444+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
56445+ oldframe = __builtin_frame_address(1);
56446+ if (oldframe)
56447+ frame = __builtin_frame_address(2);
56448+ /*
56449+ low ----------------------------------------------> high
56450+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
56451+ ^----------------^
56452+ allow copies only within here
56453+ */
56454+ while (stack <= frame && frame < stackend) {
56455+ /* if obj + len extends past the last frame, this
56456+ check won't pass and the next frame will be 0,
56457+ causing us to bail out and correctly report
56458+ the copy as invalid
56459+ */
56460+ if (obj + len <= frame)
56461+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
56462+ oldframe = frame;
56463+ frame = *(const void * const *)frame;
56464+ }
56465+ return -1;
56466+#else
56467+ return 1;
56468+#endif
56469+}
56470+
56471+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
56472+{
56473+ if (current->signal->curr_ip)
56474+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
56475+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
56476+ else
56477+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
56478+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
56479+ dump_stack();
56480+ gr_handle_kernel_exploit();
56481+ do_group_exit(SIGKILL);
56482+}
56483+#endif
56484+
56485+#ifdef CONFIG_PAX_USERCOPY
56486+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
56487+{
56488+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
56489+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
56490+#ifdef CONFIG_MODULES
56491+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
56492+#else
56493+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
56494+#endif
56495+
56496+#else
56497+ unsigned long textlow = (unsigned long)_stext;
56498+ unsigned long texthigh = (unsigned long)_etext;
56499+
56500+#ifdef CONFIG_X86_64
56501+ /* check against linear mapping as well */
56502+ if (high > (unsigned long)__va(__pa(textlow)) &&
56503+ low <= (unsigned long)__va(__pa(texthigh)))
56504+ return true;
56505+#endif
56506+
56507+#endif
56508+
56509+ if (high <= textlow || low > texthigh)
56510+ return false;
56511+ else
56512+ return true;
56513+}
56514+#endif
56515+
56516+void __check_object_size(const void *ptr, unsigned long n, bool to_user)
56517+{
56518+
56519+#ifdef CONFIG_PAX_USERCOPY
56520+ const char *type;
56521+
56522+ if (!n)
56523+ return;
56524+
56525+ type = check_heap_object(ptr, n);
56526+ if (!type) {
56527+ int ret = check_stack_object(ptr, n);
56528+ if (ret == 1 || ret == 2)
56529+ return;
56530+ if (ret == 0) {
56531+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
56532+ type = "<kernel text>";
56533+ else
56534+ return;
56535+ } else
56536+ type = "<process stack>";
56537+ }
56538+
56539+ pax_report_usercopy(ptr, n, to_user, type);
56540+#endif
56541+
56542+}
56543+EXPORT_SYMBOL(__check_object_size);
56544+
56545+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
56546+void pax_track_stack(void)
56547+{
56548+ unsigned long sp = (unsigned long)&sp;
56549+ if (sp < current_thread_info()->lowest_stack &&
56550+ sp > (unsigned long)task_stack_page(current))
56551+ current_thread_info()->lowest_stack = sp;
56552+}
56553+EXPORT_SYMBOL(pax_track_stack);
56554+#endif
56555+
56556+#ifdef CONFIG_PAX_SIZE_OVERFLOW
56557+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
56558+{
56559+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
56560+ dump_stack();
56561+ do_group_exit(SIGKILL);
56562+}
56563+EXPORT_SYMBOL(report_size_overflow);
56564+#endif
56565diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
56566index 9f9992b..8b59411 100644
56567--- a/fs/ext2/balloc.c
56568+++ b/fs/ext2/balloc.c
56569@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
56570
56571 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
56572 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
56573- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
56574+ if (free_blocks < root_blocks + 1 &&
56575 !uid_eq(sbi->s_resuid, current_fsuid()) &&
56576 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
56577- !in_group_p (sbi->s_resgid))) {
56578+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
56579 return 0;
56580 }
56581 return 1;
56582diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
56583index 2d7557d..14e38f94 100644
56584--- a/fs/ext2/xattr.c
56585+++ b/fs/ext2/xattr.c
56586@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
56587 struct buffer_head *bh = NULL;
56588 struct ext2_xattr_entry *entry;
56589 char *end;
56590- size_t rest = buffer_size;
56591+ size_t rest = buffer_size, total_size = 0;
56592 int error;
56593
56594 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
56595@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
56596 buffer += size;
56597 }
56598 rest -= size;
56599+ total_size += size;
56600 }
56601 }
56602- error = buffer_size - rest; /* total size */
56603+ error = total_size;
56604
56605 cleanup:
56606 brelse(bh);
56607diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
56608index 22548f5..41521d8 100644
56609--- a/fs/ext3/balloc.c
56610+++ b/fs/ext3/balloc.c
56611@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
56612
56613 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
56614 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
56615- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
56616+ if (free_blocks < root_blocks + 1 &&
56617 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
56618 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
56619- !in_group_p (sbi->s_resgid))) {
56620+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
56621 return 0;
56622 }
56623 return 1;
56624diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
56625index b1fc963..881228c 100644
56626--- a/fs/ext3/xattr.c
56627+++ b/fs/ext3/xattr.c
56628@@ -330,7 +330,7 @@ static int
56629 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
56630 char *buffer, size_t buffer_size)
56631 {
56632- size_t rest = buffer_size;
56633+ size_t rest = buffer_size, total_size = 0;
56634
56635 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
56636 const struct xattr_handler *handler =
56637@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
56638 buffer += size;
56639 }
56640 rest -= size;
56641+ total_size += size;
56642 }
56643 }
56644- return buffer_size - rest;
56645+ return total_size;
56646 }
56647
56648 static int
56649diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
56650index dc5d572..4c21f8e 100644
56651--- a/fs/ext4/balloc.c
56652+++ b/fs/ext4/balloc.c
56653@@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
56654 /* Hm, nope. Are (enough) root reserved clusters available? */
56655 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
56656 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
56657- capable(CAP_SYS_RESOURCE) ||
56658- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
56659+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
56660+ capable_nolog(CAP_SYS_RESOURCE)) {
56661
56662 if (free_clusters >= (nclusters + dirty_clusters +
56663 resv_clusters))
56664diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
56665index 745faaa..a072816 100644
56666--- a/fs/ext4/ext4.h
56667+++ b/fs/ext4/ext4.h
56668@@ -1266,19 +1266,19 @@ struct ext4_sb_info {
56669 unsigned long s_mb_last_start;
56670
56671 /* stats for buddy allocator */
56672- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
56673- atomic_t s_bal_success; /* we found long enough chunks */
56674- atomic_t s_bal_allocated; /* in blocks */
56675- atomic_t s_bal_ex_scanned; /* total extents scanned */
56676- atomic_t s_bal_goals; /* goal hits */
56677- atomic_t s_bal_breaks; /* too long searches */
56678- atomic_t s_bal_2orders; /* 2^order hits */
56679+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
56680+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
56681+ atomic_unchecked_t s_bal_allocated; /* in blocks */
56682+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
56683+ atomic_unchecked_t s_bal_goals; /* goal hits */
56684+ atomic_unchecked_t s_bal_breaks; /* too long searches */
56685+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
56686 spinlock_t s_bal_lock;
56687 unsigned long s_mb_buddies_generated;
56688 unsigned long long s_mb_generation_time;
56689- atomic_t s_mb_lost_chunks;
56690- atomic_t s_mb_preallocated;
56691- atomic_t s_mb_discarded;
56692+ atomic_unchecked_t s_mb_lost_chunks;
56693+ atomic_unchecked_t s_mb_preallocated;
56694+ atomic_unchecked_t s_mb_discarded;
56695 atomic_t s_lock_busy;
56696
56697 /* locality groups */
56698diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
56699index 04a5c75..09894fa 100644
56700--- a/fs/ext4/mballoc.c
56701+++ b/fs/ext4/mballoc.c
56702@@ -1880,7 +1880,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
56703 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
56704
56705 if (EXT4_SB(sb)->s_mb_stats)
56706- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
56707+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
56708
56709 break;
56710 }
56711@@ -2189,7 +2189,7 @@ repeat:
56712 ac->ac_status = AC_STATUS_CONTINUE;
56713 ac->ac_flags |= EXT4_MB_HINT_FIRST;
56714 cr = 3;
56715- atomic_inc(&sbi->s_mb_lost_chunks);
56716+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
56717 goto repeat;
56718 }
56719 }
56720@@ -2697,25 +2697,25 @@ int ext4_mb_release(struct super_block *sb)
56721 if (sbi->s_mb_stats) {
56722 ext4_msg(sb, KERN_INFO,
56723 "mballoc: %u blocks %u reqs (%u success)",
56724- atomic_read(&sbi->s_bal_allocated),
56725- atomic_read(&sbi->s_bal_reqs),
56726- atomic_read(&sbi->s_bal_success));
56727+ atomic_read_unchecked(&sbi->s_bal_allocated),
56728+ atomic_read_unchecked(&sbi->s_bal_reqs),
56729+ atomic_read_unchecked(&sbi->s_bal_success));
56730 ext4_msg(sb, KERN_INFO,
56731 "mballoc: %u extents scanned, %u goal hits, "
56732 "%u 2^N hits, %u breaks, %u lost",
56733- atomic_read(&sbi->s_bal_ex_scanned),
56734- atomic_read(&sbi->s_bal_goals),
56735- atomic_read(&sbi->s_bal_2orders),
56736- atomic_read(&sbi->s_bal_breaks),
56737- atomic_read(&sbi->s_mb_lost_chunks));
56738+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
56739+ atomic_read_unchecked(&sbi->s_bal_goals),
56740+ atomic_read_unchecked(&sbi->s_bal_2orders),
56741+ atomic_read_unchecked(&sbi->s_bal_breaks),
56742+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
56743 ext4_msg(sb, KERN_INFO,
56744 "mballoc: %lu generated and it took %Lu",
56745 sbi->s_mb_buddies_generated,
56746 sbi->s_mb_generation_time);
56747 ext4_msg(sb, KERN_INFO,
56748 "mballoc: %u preallocated, %u discarded",
56749- atomic_read(&sbi->s_mb_preallocated),
56750- atomic_read(&sbi->s_mb_discarded));
56751+ atomic_read_unchecked(&sbi->s_mb_preallocated),
56752+ atomic_read_unchecked(&sbi->s_mb_discarded));
56753 }
56754
56755 free_percpu(sbi->s_locality_groups);
56756@@ -3169,16 +3169,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
56757 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
56758
56759 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
56760- atomic_inc(&sbi->s_bal_reqs);
56761- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
56762+ atomic_inc_unchecked(&sbi->s_bal_reqs);
56763+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
56764 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
56765- atomic_inc(&sbi->s_bal_success);
56766- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
56767+ atomic_inc_unchecked(&sbi->s_bal_success);
56768+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
56769 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
56770 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
56771- atomic_inc(&sbi->s_bal_goals);
56772+ atomic_inc_unchecked(&sbi->s_bal_goals);
56773 if (ac->ac_found > sbi->s_mb_max_to_scan)
56774- atomic_inc(&sbi->s_bal_breaks);
56775+ atomic_inc_unchecked(&sbi->s_bal_breaks);
56776 }
56777
56778 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
56779@@ -3583,7 +3583,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
56780 trace_ext4_mb_new_inode_pa(ac, pa);
56781
56782 ext4_mb_use_inode_pa(ac, pa);
56783- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
56784+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
56785
56786 ei = EXT4_I(ac->ac_inode);
56787 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
56788@@ -3643,7 +3643,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
56789 trace_ext4_mb_new_group_pa(ac, pa);
56790
56791 ext4_mb_use_group_pa(ac, pa);
56792- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
56793+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
56794
56795 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
56796 lg = ac->ac_lg;
56797@@ -3732,7 +3732,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
56798 * from the bitmap and continue.
56799 */
56800 }
56801- atomic_add(free, &sbi->s_mb_discarded);
56802+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
56803
56804 return err;
56805 }
56806@@ -3750,7 +3750,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
56807 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
56808 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
56809 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
56810- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
56811+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
56812 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
56813
56814 return 0;
56815diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
56816index 214461e..3614c89 100644
56817--- a/fs/ext4/mmp.c
56818+++ b/fs/ext4/mmp.c
56819@@ -113,7 +113,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
56820 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
56821 const char *function, unsigned int line, const char *msg)
56822 {
56823- __ext4_warning(sb, function, line, msg);
56824+ __ext4_warning(sb, function, line, "%s", msg);
56825 __ext4_warning(sb, function, line,
56826 "MMP failure info: last update time: %llu, last update "
56827 "node: %s, last update device: %s\n",
56828diff --git a/fs/ext4/super.c b/fs/ext4/super.c
56829index b947e0a..c102e3b 100644
56830--- a/fs/ext4/super.c
56831+++ b/fs/ext4/super.c
56832@@ -1251,7 +1251,7 @@ static ext4_fsblk_t get_sb_block(void **data)
56833 }
56834
56835 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
56836-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
56837+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
56838 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
56839
56840 #ifdef CONFIG_QUOTA
56841@@ -2431,7 +2431,7 @@ struct ext4_attr {
56842 int offset;
56843 int deprecated_val;
56844 } u;
56845-};
56846+} __do_const;
56847
56848 static int parse_strtoull(const char *buf,
56849 unsigned long long max, unsigned long long *value)
56850diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
56851index 1423c48..9c0c6dc 100644
56852--- a/fs/ext4/xattr.c
56853+++ b/fs/ext4/xattr.c
56854@@ -381,7 +381,7 @@ static int
56855 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
56856 char *buffer, size_t buffer_size)
56857 {
56858- size_t rest = buffer_size;
56859+ size_t rest = buffer_size, total_size = 0;
56860
56861 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
56862 const struct xattr_handler *handler =
56863@@ -398,9 +398,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
56864 buffer += size;
56865 }
56866 rest -= size;
56867+ total_size += size;
56868 }
56869 }
56870- return buffer_size - rest;
56871+ return total_size;
56872 }
56873
56874 static int
56875diff --git a/fs/fcntl.c b/fs/fcntl.c
56876index 65343c3..9969dcf 100644
56877--- a/fs/fcntl.c
56878+++ b/fs/fcntl.c
56879@@ -107,6 +107,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
56880 if (err)
56881 return err;
56882
56883+ if (gr_handle_chroot_fowner(pid, type))
56884+ return -ENOENT;
56885+ if (gr_check_protected_task_fowner(pid, type))
56886+ return -EACCES;
56887+
56888 f_modown(filp, pid, type, force);
56889 return 0;
56890 }
56891diff --git a/fs/fhandle.c b/fs/fhandle.c
56892index 999ff5c..41f4109 100644
56893--- a/fs/fhandle.c
56894+++ b/fs/fhandle.c
56895@@ -67,8 +67,7 @@ static long do_sys_name_to_handle(struct path *path,
56896 } else
56897 retval = 0;
56898 /* copy the mount id */
56899- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
56900- sizeof(*mnt_id)) ||
56901+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
56902 copy_to_user(ufh, handle,
56903 sizeof(struct file_handle) + handle_bytes))
56904 retval = -EFAULT;
56905diff --git a/fs/file.c b/fs/file.c
56906index 4a78f98..f9a6d25 100644
56907--- a/fs/file.c
56908+++ b/fs/file.c
56909@@ -16,6 +16,7 @@
56910 #include <linux/slab.h>
56911 #include <linux/vmalloc.h>
56912 #include <linux/file.h>
56913+#include <linux/security.h>
56914 #include <linux/fdtable.h>
56915 #include <linux/bitops.h>
56916 #include <linux/interrupt.h>
56917@@ -141,7 +142,7 @@ out:
56918 * Return <0 error code on error; 1 on successful completion.
56919 * The files->file_lock should be held on entry, and will be held on exit.
56920 */
56921-static int expand_fdtable(struct files_struct *files, int nr)
56922+static int expand_fdtable(struct files_struct *files, unsigned int nr)
56923 __releases(files->file_lock)
56924 __acquires(files->file_lock)
56925 {
56926@@ -186,7 +187,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
56927 * expanded and execution may have blocked.
56928 * The files->file_lock should be held on entry, and will be held on exit.
56929 */
56930-static int expand_files(struct files_struct *files, int nr)
56931+static int expand_files(struct files_struct *files, unsigned int nr)
56932 {
56933 struct fdtable *fdt;
56934
56935@@ -828,6 +829,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
56936 if (!file)
56937 return __close_fd(files, fd);
56938
56939+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
56940 if (fd >= rlimit(RLIMIT_NOFILE))
56941 return -EBADF;
56942
56943@@ -854,6 +856,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
56944 if (unlikely(oldfd == newfd))
56945 return -EINVAL;
56946
56947+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
56948 if (newfd >= rlimit(RLIMIT_NOFILE))
56949 return -EBADF;
56950
56951@@ -909,6 +912,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
56952 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
56953 {
56954 int err;
56955+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
56956 if (from >= rlimit(RLIMIT_NOFILE))
56957 return -EINVAL;
56958 err = alloc_fd(from, flags);
56959diff --git a/fs/filesystems.c b/fs/filesystems.c
56960index 92567d9..fcd8cbf 100644
56961--- a/fs/filesystems.c
56962+++ b/fs/filesystems.c
56963@@ -273,7 +273,11 @@ struct file_system_type *get_fs_type(const char *name)
56964 int len = dot ? dot - name : strlen(name);
56965
56966 fs = __get_fs_type(name, len);
56967+#ifdef CONFIG_GRKERNSEC_MODHARDEN
56968+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
56969+#else
56970 if (!fs && (request_module("fs-%.*s", len, name) == 0))
56971+#endif
56972 fs = __get_fs_type(name, len);
56973
56974 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
56975diff --git a/fs/fs_struct.c b/fs/fs_struct.c
56976index d8ac61d..79a36f0 100644
56977--- a/fs/fs_struct.c
56978+++ b/fs/fs_struct.c
56979@@ -4,6 +4,7 @@
56980 #include <linux/path.h>
56981 #include <linux/slab.h>
56982 #include <linux/fs_struct.h>
56983+#include <linux/grsecurity.h>
56984 #include "internal.h"
56985
56986 /*
56987@@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
56988 write_seqcount_begin(&fs->seq);
56989 old_root = fs->root;
56990 fs->root = *path;
56991+ gr_set_chroot_entries(current, path);
56992 write_seqcount_end(&fs->seq);
56993 spin_unlock(&fs->lock);
56994 if (old_root.dentry)
56995@@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
56996 int hits = 0;
56997 spin_lock(&fs->lock);
56998 write_seqcount_begin(&fs->seq);
56999+ /* this root replacement is only done by pivot_root,
57000+ leave grsec's chroot tagging alone for this task
57001+ so that a pivoted root isn't treated as a chroot
57002+ */
57003 hits += replace_path(&fs->root, old_root, new_root);
57004 hits += replace_path(&fs->pwd, old_root, new_root);
57005 write_seqcount_end(&fs->seq);
57006@@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
57007 task_lock(tsk);
57008 spin_lock(&fs->lock);
57009 tsk->fs = NULL;
57010- kill = !--fs->users;
57011+ gr_clear_chroot_entries(tsk);
57012+ kill = !atomic_dec_return(&fs->users);
57013 spin_unlock(&fs->lock);
57014 task_unlock(tsk);
57015 if (kill)
57016@@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
57017 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
57018 /* We don't need to lock fs - think why ;-) */
57019 if (fs) {
57020- fs->users = 1;
57021+ atomic_set(&fs->users, 1);
57022 fs->in_exec = 0;
57023 spin_lock_init(&fs->lock);
57024 seqcount_init(&fs->seq);
57025@@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
57026 spin_lock(&old->lock);
57027 fs->root = old->root;
57028 path_get(&fs->root);
57029+ /* instead of calling gr_set_chroot_entries here,
57030+ we call it from every caller of this function
57031+ */
57032 fs->pwd = old->pwd;
57033 path_get(&fs->pwd);
57034 spin_unlock(&old->lock);
57035@@ -139,8 +149,9 @@ int unshare_fs_struct(void)
57036
57037 task_lock(current);
57038 spin_lock(&fs->lock);
57039- kill = !--fs->users;
57040+ kill = !atomic_dec_return(&fs->users);
57041 current->fs = new_fs;
57042+ gr_set_chroot_entries(current, &new_fs->root);
57043 spin_unlock(&fs->lock);
57044 task_unlock(current);
57045
57046@@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
57047
57048 int current_umask(void)
57049 {
57050- return current->fs->umask;
57051+ return current->fs->umask | gr_acl_umask();
57052 }
57053 EXPORT_SYMBOL(current_umask);
57054
57055 /* to be mentioned only in INIT_TASK */
57056 struct fs_struct init_fs = {
57057- .users = 1,
57058+ .users = ATOMIC_INIT(1),
57059 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
57060 .seq = SEQCNT_ZERO,
57061 .umask = 0022,
57062diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
57063index b2a86e3..37f425a 100644
57064--- a/fs/fscache/cookie.c
57065+++ b/fs/fscache/cookie.c
57066@@ -19,7 +19,7 @@
57067
57068 struct kmem_cache *fscache_cookie_jar;
57069
57070-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
57071+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
57072
57073 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
57074 static int fscache_alloc_object(struct fscache_cache *cache,
57075@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
57076 parent ? (char *) parent->def->name : "<no-parent>",
57077 def->name, netfs_data);
57078
57079- fscache_stat(&fscache_n_acquires);
57080+ fscache_stat_unchecked(&fscache_n_acquires);
57081
57082 /* if there's no parent cookie, then we don't create one here either */
57083 if (!parent) {
57084- fscache_stat(&fscache_n_acquires_null);
57085+ fscache_stat_unchecked(&fscache_n_acquires_null);
57086 _leave(" [no parent]");
57087 return NULL;
57088 }
57089@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
57090 /* allocate and initialise a cookie */
57091 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
57092 if (!cookie) {
57093- fscache_stat(&fscache_n_acquires_oom);
57094+ fscache_stat_unchecked(&fscache_n_acquires_oom);
57095 _leave(" [ENOMEM]");
57096 return NULL;
57097 }
57098@@ -114,13 +114,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
57099
57100 switch (cookie->def->type) {
57101 case FSCACHE_COOKIE_TYPE_INDEX:
57102- fscache_stat(&fscache_n_cookie_index);
57103+ fscache_stat_unchecked(&fscache_n_cookie_index);
57104 break;
57105 case FSCACHE_COOKIE_TYPE_DATAFILE:
57106- fscache_stat(&fscache_n_cookie_data);
57107+ fscache_stat_unchecked(&fscache_n_cookie_data);
57108 break;
57109 default:
57110- fscache_stat(&fscache_n_cookie_special);
57111+ fscache_stat_unchecked(&fscache_n_cookie_special);
57112 break;
57113 }
57114
57115@@ -131,13 +131,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
57116 if (fscache_acquire_non_index_cookie(cookie) < 0) {
57117 atomic_dec(&parent->n_children);
57118 __fscache_cookie_put(cookie);
57119- fscache_stat(&fscache_n_acquires_nobufs);
57120+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
57121 _leave(" = NULL");
57122 return NULL;
57123 }
57124 }
57125
57126- fscache_stat(&fscache_n_acquires_ok);
57127+ fscache_stat_unchecked(&fscache_n_acquires_ok);
57128 _leave(" = %p", cookie);
57129 return cookie;
57130 }
57131@@ -173,7 +173,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
57132 cache = fscache_select_cache_for_object(cookie->parent);
57133 if (!cache) {
57134 up_read(&fscache_addremove_sem);
57135- fscache_stat(&fscache_n_acquires_no_cache);
57136+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
57137 _leave(" = -ENOMEDIUM [no cache]");
57138 return -ENOMEDIUM;
57139 }
57140@@ -259,14 +259,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
57141 object = cache->ops->alloc_object(cache, cookie);
57142 fscache_stat_d(&fscache_n_cop_alloc_object);
57143 if (IS_ERR(object)) {
57144- fscache_stat(&fscache_n_object_no_alloc);
57145+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
57146 ret = PTR_ERR(object);
57147 goto error;
57148 }
57149
57150- fscache_stat(&fscache_n_object_alloc);
57151+ fscache_stat_unchecked(&fscache_n_object_alloc);
57152
57153- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
57154+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
57155
57156 _debug("ALLOC OBJ%x: %s {%lx}",
57157 object->debug_id, cookie->def->name, object->events);
57158@@ -380,7 +380,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
57159
57160 _enter("{%s}", cookie->def->name);
57161
57162- fscache_stat(&fscache_n_invalidates);
57163+ fscache_stat_unchecked(&fscache_n_invalidates);
57164
57165 /* Only permit invalidation of data files. Invalidating an index will
57166 * require the caller to release all its attachments to the tree rooted
57167@@ -438,10 +438,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
57168 {
57169 struct fscache_object *object;
57170
57171- fscache_stat(&fscache_n_updates);
57172+ fscache_stat_unchecked(&fscache_n_updates);
57173
57174 if (!cookie) {
57175- fscache_stat(&fscache_n_updates_null);
57176+ fscache_stat_unchecked(&fscache_n_updates_null);
57177 _leave(" [no cookie]");
57178 return;
57179 }
57180@@ -473,12 +473,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
57181 {
57182 struct fscache_object *object;
57183
57184- fscache_stat(&fscache_n_relinquishes);
57185+ fscache_stat_unchecked(&fscache_n_relinquishes);
57186 if (retire)
57187- fscache_stat(&fscache_n_relinquishes_retire);
57188+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
57189
57190 if (!cookie) {
57191- fscache_stat(&fscache_n_relinquishes_null);
57192+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
57193 _leave(" [no cookie]");
57194 return;
57195 }
57196@@ -598,7 +598,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
57197 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
57198 goto inconsistent;
57199
57200- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
57201+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
57202
57203 atomic_inc(&cookie->n_active);
57204 if (fscache_submit_op(object, op) < 0)
57205diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
57206index 4226f66..0fb3f45 100644
57207--- a/fs/fscache/internal.h
57208+++ b/fs/fscache/internal.h
57209@@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
57210 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
57211 extern int fscache_wait_for_operation_activation(struct fscache_object *,
57212 struct fscache_operation *,
57213- atomic_t *,
57214- atomic_t *,
57215+ atomic_unchecked_t *,
57216+ atomic_unchecked_t *,
57217 void (*)(struct fscache_operation *));
57218 extern void fscache_invalidate_writes(struct fscache_cookie *);
57219
57220@@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
57221 * stats.c
57222 */
57223 #ifdef CONFIG_FSCACHE_STATS
57224-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
57225-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
57226+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
57227+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
57228
57229-extern atomic_t fscache_n_op_pend;
57230-extern atomic_t fscache_n_op_run;
57231-extern atomic_t fscache_n_op_enqueue;
57232-extern atomic_t fscache_n_op_deferred_release;
57233-extern atomic_t fscache_n_op_release;
57234-extern atomic_t fscache_n_op_gc;
57235-extern atomic_t fscache_n_op_cancelled;
57236-extern atomic_t fscache_n_op_rejected;
57237+extern atomic_unchecked_t fscache_n_op_pend;
57238+extern atomic_unchecked_t fscache_n_op_run;
57239+extern atomic_unchecked_t fscache_n_op_enqueue;
57240+extern atomic_unchecked_t fscache_n_op_deferred_release;
57241+extern atomic_unchecked_t fscache_n_op_release;
57242+extern atomic_unchecked_t fscache_n_op_gc;
57243+extern atomic_unchecked_t fscache_n_op_cancelled;
57244+extern atomic_unchecked_t fscache_n_op_rejected;
57245
57246-extern atomic_t fscache_n_attr_changed;
57247-extern atomic_t fscache_n_attr_changed_ok;
57248-extern atomic_t fscache_n_attr_changed_nobufs;
57249-extern atomic_t fscache_n_attr_changed_nomem;
57250-extern atomic_t fscache_n_attr_changed_calls;
57251+extern atomic_unchecked_t fscache_n_attr_changed;
57252+extern atomic_unchecked_t fscache_n_attr_changed_ok;
57253+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
57254+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
57255+extern atomic_unchecked_t fscache_n_attr_changed_calls;
57256
57257-extern atomic_t fscache_n_allocs;
57258-extern atomic_t fscache_n_allocs_ok;
57259-extern atomic_t fscache_n_allocs_wait;
57260-extern atomic_t fscache_n_allocs_nobufs;
57261-extern atomic_t fscache_n_allocs_intr;
57262-extern atomic_t fscache_n_allocs_object_dead;
57263-extern atomic_t fscache_n_alloc_ops;
57264-extern atomic_t fscache_n_alloc_op_waits;
57265+extern atomic_unchecked_t fscache_n_allocs;
57266+extern atomic_unchecked_t fscache_n_allocs_ok;
57267+extern atomic_unchecked_t fscache_n_allocs_wait;
57268+extern atomic_unchecked_t fscache_n_allocs_nobufs;
57269+extern atomic_unchecked_t fscache_n_allocs_intr;
57270+extern atomic_unchecked_t fscache_n_allocs_object_dead;
57271+extern atomic_unchecked_t fscache_n_alloc_ops;
57272+extern atomic_unchecked_t fscache_n_alloc_op_waits;
57273
57274-extern atomic_t fscache_n_retrievals;
57275-extern atomic_t fscache_n_retrievals_ok;
57276-extern atomic_t fscache_n_retrievals_wait;
57277-extern atomic_t fscache_n_retrievals_nodata;
57278-extern atomic_t fscache_n_retrievals_nobufs;
57279-extern atomic_t fscache_n_retrievals_intr;
57280-extern atomic_t fscache_n_retrievals_nomem;
57281-extern atomic_t fscache_n_retrievals_object_dead;
57282-extern atomic_t fscache_n_retrieval_ops;
57283-extern atomic_t fscache_n_retrieval_op_waits;
57284+extern atomic_unchecked_t fscache_n_retrievals;
57285+extern atomic_unchecked_t fscache_n_retrievals_ok;
57286+extern atomic_unchecked_t fscache_n_retrievals_wait;
57287+extern atomic_unchecked_t fscache_n_retrievals_nodata;
57288+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
57289+extern atomic_unchecked_t fscache_n_retrievals_intr;
57290+extern atomic_unchecked_t fscache_n_retrievals_nomem;
57291+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
57292+extern atomic_unchecked_t fscache_n_retrieval_ops;
57293+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
57294
57295-extern atomic_t fscache_n_stores;
57296-extern atomic_t fscache_n_stores_ok;
57297-extern atomic_t fscache_n_stores_again;
57298-extern atomic_t fscache_n_stores_nobufs;
57299-extern atomic_t fscache_n_stores_oom;
57300-extern atomic_t fscache_n_store_ops;
57301-extern atomic_t fscache_n_store_calls;
57302-extern atomic_t fscache_n_store_pages;
57303-extern atomic_t fscache_n_store_radix_deletes;
57304-extern atomic_t fscache_n_store_pages_over_limit;
57305+extern atomic_unchecked_t fscache_n_stores;
57306+extern atomic_unchecked_t fscache_n_stores_ok;
57307+extern atomic_unchecked_t fscache_n_stores_again;
57308+extern atomic_unchecked_t fscache_n_stores_nobufs;
57309+extern atomic_unchecked_t fscache_n_stores_oom;
57310+extern atomic_unchecked_t fscache_n_store_ops;
57311+extern atomic_unchecked_t fscache_n_store_calls;
57312+extern atomic_unchecked_t fscache_n_store_pages;
57313+extern atomic_unchecked_t fscache_n_store_radix_deletes;
57314+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
57315
57316-extern atomic_t fscache_n_store_vmscan_not_storing;
57317-extern atomic_t fscache_n_store_vmscan_gone;
57318-extern atomic_t fscache_n_store_vmscan_busy;
57319-extern atomic_t fscache_n_store_vmscan_cancelled;
57320-extern atomic_t fscache_n_store_vmscan_wait;
57321+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
57322+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
57323+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
57324+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
57325+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
57326
57327-extern atomic_t fscache_n_marks;
57328-extern atomic_t fscache_n_uncaches;
57329+extern atomic_unchecked_t fscache_n_marks;
57330+extern atomic_unchecked_t fscache_n_uncaches;
57331
57332-extern atomic_t fscache_n_acquires;
57333-extern atomic_t fscache_n_acquires_null;
57334-extern atomic_t fscache_n_acquires_no_cache;
57335-extern atomic_t fscache_n_acquires_ok;
57336-extern atomic_t fscache_n_acquires_nobufs;
57337-extern atomic_t fscache_n_acquires_oom;
57338+extern atomic_unchecked_t fscache_n_acquires;
57339+extern atomic_unchecked_t fscache_n_acquires_null;
57340+extern atomic_unchecked_t fscache_n_acquires_no_cache;
57341+extern atomic_unchecked_t fscache_n_acquires_ok;
57342+extern atomic_unchecked_t fscache_n_acquires_nobufs;
57343+extern atomic_unchecked_t fscache_n_acquires_oom;
57344
57345-extern atomic_t fscache_n_invalidates;
57346-extern atomic_t fscache_n_invalidates_run;
57347+extern atomic_unchecked_t fscache_n_invalidates;
57348+extern atomic_unchecked_t fscache_n_invalidates_run;
57349
57350-extern atomic_t fscache_n_updates;
57351-extern atomic_t fscache_n_updates_null;
57352-extern atomic_t fscache_n_updates_run;
57353+extern atomic_unchecked_t fscache_n_updates;
57354+extern atomic_unchecked_t fscache_n_updates_null;
57355+extern atomic_unchecked_t fscache_n_updates_run;
57356
57357-extern atomic_t fscache_n_relinquishes;
57358-extern atomic_t fscache_n_relinquishes_null;
57359-extern atomic_t fscache_n_relinquishes_waitcrt;
57360-extern atomic_t fscache_n_relinquishes_retire;
57361+extern atomic_unchecked_t fscache_n_relinquishes;
57362+extern atomic_unchecked_t fscache_n_relinquishes_null;
57363+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
57364+extern atomic_unchecked_t fscache_n_relinquishes_retire;
57365
57366-extern atomic_t fscache_n_cookie_index;
57367-extern atomic_t fscache_n_cookie_data;
57368-extern atomic_t fscache_n_cookie_special;
57369+extern atomic_unchecked_t fscache_n_cookie_index;
57370+extern atomic_unchecked_t fscache_n_cookie_data;
57371+extern atomic_unchecked_t fscache_n_cookie_special;
57372
57373-extern atomic_t fscache_n_object_alloc;
57374-extern atomic_t fscache_n_object_no_alloc;
57375-extern atomic_t fscache_n_object_lookups;
57376-extern atomic_t fscache_n_object_lookups_negative;
57377-extern atomic_t fscache_n_object_lookups_positive;
57378-extern atomic_t fscache_n_object_lookups_timed_out;
57379-extern atomic_t fscache_n_object_created;
57380-extern atomic_t fscache_n_object_avail;
57381-extern atomic_t fscache_n_object_dead;
57382+extern atomic_unchecked_t fscache_n_object_alloc;
57383+extern atomic_unchecked_t fscache_n_object_no_alloc;
57384+extern atomic_unchecked_t fscache_n_object_lookups;
57385+extern atomic_unchecked_t fscache_n_object_lookups_negative;
57386+extern atomic_unchecked_t fscache_n_object_lookups_positive;
57387+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
57388+extern atomic_unchecked_t fscache_n_object_created;
57389+extern atomic_unchecked_t fscache_n_object_avail;
57390+extern atomic_unchecked_t fscache_n_object_dead;
57391
57392-extern atomic_t fscache_n_checkaux_none;
57393-extern atomic_t fscache_n_checkaux_okay;
57394-extern atomic_t fscache_n_checkaux_update;
57395-extern atomic_t fscache_n_checkaux_obsolete;
57396+extern atomic_unchecked_t fscache_n_checkaux_none;
57397+extern atomic_unchecked_t fscache_n_checkaux_okay;
57398+extern atomic_unchecked_t fscache_n_checkaux_update;
57399+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
57400
57401 extern atomic_t fscache_n_cop_alloc_object;
57402 extern atomic_t fscache_n_cop_lookup_object;
57403@@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
57404 atomic_inc(stat);
57405 }
57406
57407+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
57408+{
57409+ atomic_inc_unchecked(stat);
57410+}
57411+
57412 static inline void fscache_stat_d(atomic_t *stat)
57413 {
57414 atomic_dec(stat);
57415@@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
57416
57417 #define __fscache_stat(stat) (NULL)
57418 #define fscache_stat(stat) do {} while (0)
57419+#define fscache_stat_unchecked(stat) do {} while (0)
57420 #define fscache_stat_d(stat) do {} while (0)
57421 #endif
57422
57423diff --git a/fs/fscache/object.c b/fs/fscache/object.c
57424index 86d75a6..5f3d7a0 100644
57425--- a/fs/fscache/object.c
57426+++ b/fs/fscache/object.c
57427@@ -451,7 +451,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
57428 _debug("LOOKUP \"%s\" in \"%s\"",
57429 cookie->def->name, object->cache->tag->name);
57430
57431- fscache_stat(&fscache_n_object_lookups);
57432+ fscache_stat_unchecked(&fscache_n_object_lookups);
57433 fscache_stat(&fscache_n_cop_lookup_object);
57434 ret = object->cache->ops->lookup_object(object);
57435 fscache_stat_d(&fscache_n_cop_lookup_object);
57436@@ -461,7 +461,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
57437 if (ret == -ETIMEDOUT) {
57438 /* probably stuck behind another object, so move this one to
57439 * the back of the queue */
57440- fscache_stat(&fscache_n_object_lookups_timed_out);
57441+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
57442 _leave(" [timeout]");
57443 return NO_TRANSIT;
57444 }
57445@@ -489,7 +489,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
57446 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
57447
57448 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
57449- fscache_stat(&fscache_n_object_lookups_negative);
57450+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
57451
57452 /* Allow write requests to begin stacking up and read requests to begin
57453 * returning ENODATA.
57454@@ -523,7 +523,7 @@ void fscache_obtained_object(struct fscache_object *object)
57455 /* if we were still looking up, then we must have a positive lookup
57456 * result, in which case there may be data available */
57457 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
57458- fscache_stat(&fscache_n_object_lookups_positive);
57459+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
57460
57461 /* We do (presumably) have data */
57462 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
57463@@ -534,7 +534,7 @@ void fscache_obtained_object(struct fscache_object *object)
57464 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
57465 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
57466 } else {
57467- fscache_stat(&fscache_n_object_created);
57468+ fscache_stat_unchecked(&fscache_n_object_created);
57469 }
57470
57471 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
57472@@ -570,7 +570,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
57473 fscache_stat_d(&fscache_n_cop_lookup_complete);
57474
57475 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
57476- fscache_stat(&fscache_n_object_avail);
57477+ fscache_stat_unchecked(&fscache_n_object_avail);
57478
57479 _leave("");
57480 return transit_to(JUMPSTART_DEPS);
57481@@ -716,7 +716,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
57482
57483 /* this just shifts the object release to the work processor */
57484 fscache_put_object(object);
57485- fscache_stat(&fscache_n_object_dead);
57486+ fscache_stat_unchecked(&fscache_n_object_dead);
57487
57488 _leave("");
57489 return transit_to(OBJECT_DEAD);
57490@@ -881,7 +881,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
57491 enum fscache_checkaux result;
57492
57493 if (!object->cookie->def->check_aux) {
57494- fscache_stat(&fscache_n_checkaux_none);
57495+ fscache_stat_unchecked(&fscache_n_checkaux_none);
57496 return FSCACHE_CHECKAUX_OKAY;
57497 }
57498
57499@@ -890,17 +890,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
57500 switch (result) {
57501 /* entry okay as is */
57502 case FSCACHE_CHECKAUX_OKAY:
57503- fscache_stat(&fscache_n_checkaux_okay);
57504+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
57505 break;
57506
57507 /* entry requires update */
57508 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
57509- fscache_stat(&fscache_n_checkaux_update);
57510+ fscache_stat_unchecked(&fscache_n_checkaux_update);
57511 break;
57512
57513 /* entry requires deletion */
57514 case FSCACHE_CHECKAUX_OBSOLETE:
57515- fscache_stat(&fscache_n_checkaux_obsolete);
57516+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
57517 break;
57518
57519 default:
57520@@ -986,7 +986,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
57521 {
57522 const struct fscache_state *s;
57523
57524- fscache_stat(&fscache_n_invalidates_run);
57525+ fscache_stat_unchecked(&fscache_n_invalidates_run);
57526 fscache_stat(&fscache_n_cop_invalidate_object);
57527 s = _fscache_invalidate_object(object, event);
57528 fscache_stat_d(&fscache_n_cop_invalidate_object);
57529@@ -1001,7 +1001,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
57530 {
57531 _enter("{OBJ%x},%d", object->debug_id, event);
57532
57533- fscache_stat(&fscache_n_updates_run);
57534+ fscache_stat_unchecked(&fscache_n_updates_run);
57535 fscache_stat(&fscache_n_cop_update_object);
57536 object->cache->ops->update_object(object);
57537 fscache_stat_d(&fscache_n_cop_update_object);
57538diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
57539index 318071a..379938b 100644
57540--- a/fs/fscache/operation.c
57541+++ b/fs/fscache/operation.c
57542@@ -17,7 +17,7 @@
57543 #include <linux/slab.h>
57544 #include "internal.h"
57545
57546-atomic_t fscache_op_debug_id;
57547+atomic_unchecked_t fscache_op_debug_id;
57548 EXPORT_SYMBOL(fscache_op_debug_id);
57549
57550 /**
57551@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
57552 ASSERTCMP(atomic_read(&op->usage), >, 0);
57553 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
57554
57555- fscache_stat(&fscache_n_op_enqueue);
57556+ fscache_stat_unchecked(&fscache_n_op_enqueue);
57557 switch (op->flags & FSCACHE_OP_TYPE) {
57558 case FSCACHE_OP_ASYNC:
57559 _debug("queue async");
57560@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
57561 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
57562 if (op->processor)
57563 fscache_enqueue_operation(op);
57564- fscache_stat(&fscache_n_op_run);
57565+ fscache_stat_unchecked(&fscache_n_op_run);
57566 }
57567
57568 /*
57569@@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
57570 if (object->n_in_progress > 0) {
57571 atomic_inc(&op->usage);
57572 list_add_tail(&op->pend_link, &object->pending_ops);
57573- fscache_stat(&fscache_n_op_pend);
57574+ fscache_stat_unchecked(&fscache_n_op_pend);
57575 } else if (!list_empty(&object->pending_ops)) {
57576 atomic_inc(&op->usage);
57577 list_add_tail(&op->pend_link, &object->pending_ops);
57578- fscache_stat(&fscache_n_op_pend);
57579+ fscache_stat_unchecked(&fscache_n_op_pend);
57580 fscache_start_operations(object);
57581 } else {
57582 ASSERTCMP(object->n_in_progress, ==, 0);
57583@@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
57584 object->n_exclusive++; /* reads and writes must wait */
57585 atomic_inc(&op->usage);
57586 list_add_tail(&op->pend_link, &object->pending_ops);
57587- fscache_stat(&fscache_n_op_pend);
57588+ fscache_stat_unchecked(&fscache_n_op_pend);
57589 ret = 0;
57590 } else {
57591 /* If we're in any other state, there must have been an I/O
57592@@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
57593 if (object->n_exclusive > 0) {
57594 atomic_inc(&op->usage);
57595 list_add_tail(&op->pend_link, &object->pending_ops);
57596- fscache_stat(&fscache_n_op_pend);
57597+ fscache_stat_unchecked(&fscache_n_op_pend);
57598 } else if (!list_empty(&object->pending_ops)) {
57599 atomic_inc(&op->usage);
57600 list_add_tail(&op->pend_link, &object->pending_ops);
57601- fscache_stat(&fscache_n_op_pend);
57602+ fscache_stat_unchecked(&fscache_n_op_pend);
57603 fscache_start_operations(object);
57604 } else {
57605 ASSERTCMP(object->n_exclusive, ==, 0);
57606@@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
57607 object->n_ops++;
57608 atomic_inc(&op->usage);
57609 list_add_tail(&op->pend_link, &object->pending_ops);
57610- fscache_stat(&fscache_n_op_pend);
57611+ fscache_stat_unchecked(&fscache_n_op_pend);
57612 ret = 0;
57613 } else if (fscache_object_is_dying(object)) {
57614- fscache_stat(&fscache_n_op_rejected);
57615+ fscache_stat_unchecked(&fscache_n_op_rejected);
57616 op->state = FSCACHE_OP_ST_CANCELLED;
57617 ret = -ENOBUFS;
57618 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
57619@@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
57620 ret = -EBUSY;
57621 if (op->state == FSCACHE_OP_ST_PENDING) {
57622 ASSERT(!list_empty(&op->pend_link));
57623- fscache_stat(&fscache_n_op_cancelled);
57624+ fscache_stat_unchecked(&fscache_n_op_cancelled);
57625 list_del_init(&op->pend_link);
57626 if (do_cancel)
57627 do_cancel(op);
57628@@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
57629 while (!list_empty(&object->pending_ops)) {
57630 op = list_entry(object->pending_ops.next,
57631 struct fscache_operation, pend_link);
57632- fscache_stat(&fscache_n_op_cancelled);
57633+ fscache_stat_unchecked(&fscache_n_op_cancelled);
57634 list_del_init(&op->pend_link);
57635
57636 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
57637@@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
57638 op->state, ==, FSCACHE_OP_ST_CANCELLED);
57639 op->state = FSCACHE_OP_ST_DEAD;
57640
57641- fscache_stat(&fscache_n_op_release);
57642+ fscache_stat_unchecked(&fscache_n_op_release);
57643
57644 if (op->release) {
57645 op->release(op);
57646@@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
57647 * lock, and defer it otherwise */
57648 if (!spin_trylock(&object->lock)) {
57649 _debug("defer put");
57650- fscache_stat(&fscache_n_op_deferred_release);
57651+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
57652
57653 cache = object->cache;
57654 spin_lock(&cache->op_gc_list_lock);
57655@@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
57656
57657 _debug("GC DEFERRED REL OBJ%x OP%x",
57658 object->debug_id, op->debug_id);
57659- fscache_stat(&fscache_n_op_gc);
57660+ fscache_stat_unchecked(&fscache_n_op_gc);
57661
57662 ASSERTCMP(atomic_read(&op->usage), ==, 0);
57663 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
57664diff --git a/fs/fscache/page.c b/fs/fscache/page.c
57665index 73899c1..ae40c58 100644
57666--- a/fs/fscache/page.c
57667+++ b/fs/fscache/page.c
57668@@ -61,7 +61,7 @@ try_again:
57669 val = radix_tree_lookup(&cookie->stores, page->index);
57670 if (!val) {
57671 rcu_read_unlock();
57672- fscache_stat(&fscache_n_store_vmscan_not_storing);
57673+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
57674 __fscache_uncache_page(cookie, page);
57675 return true;
57676 }
57677@@ -91,11 +91,11 @@ try_again:
57678 spin_unlock(&cookie->stores_lock);
57679
57680 if (xpage) {
57681- fscache_stat(&fscache_n_store_vmscan_cancelled);
57682- fscache_stat(&fscache_n_store_radix_deletes);
57683+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
57684+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
57685 ASSERTCMP(xpage, ==, page);
57686 } else {
57687- fscache_stat(&fscache_n_store_vmscan_gone);
57688+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
57689 }
57690
57691 wake_up_bit(&cookie->flags, 0);
57692@@ -110,11 +110,11 @@ page_busy:
57693 * sleeping on memory allocation, so we may need to impose a timeout
57694 * too. */
57695 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
57696- fscache_stat(&fscache_n_store_vmscan_busy);
57697+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
57698 return false;
57699 }
57700
57701- fscache_stat(&fscache_n_store_vmscan_wait);
57702+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
57703 __fscache_wait_on_page_write(cookie, page);
57704 gfp &= ~__GFP_WAIT;
57705 goto try_again;
57706@@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
57707 FSCACHE_COOKIE_STORING_TAG);
57708 if (!radix_tree_tag_get(&cookie->stores, page->index,
57709 FSCACHE_COOKIE_PENDING_TAG)) {
57710- fscache_stat(&fscache_n_store_radix_deletes);
57711+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
57712 xpage = radix_tree_delete(&cookie->stores, page->index);
57713 }
57714 spin_unlock(&cookie->stores_lock);
57715@@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
57716
57717 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
57718
57719- fscache_stat(&fscache_n_attr_changed_calls);
57720+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
57721
57722 if (fscache_object_is_active(object) &&
57723 fscache_use_cookie(object)) {
57724@@ -189,11 +189,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57725
57726 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
57727
57728- fscache_stat(&fscache_n_attr_changed);
57729+ fscache_stat_unchecked(&fscache_n_attr_changed);
57730
57731 op = kzalloc(sizeof(*op), GFP_KERNEL);
57732 if (!op) {
57733- fscache_stat(&fscache_n_attr_changed_nomem);
57734+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
57735 _leave(" = -ENOMEM");
57736 return -ENOMEM;
57737 }
57738@@ -211,7 +211,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57739 if (fscache_submit_exclusive_op(object, op) < 0)
57740 goto nobufs;
57741 spin_unlock(&cookie->lock);
57742- fscache_stat(&fscache_n_attr_changed_ok);
57743+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
57744 fscache_put_operation(op);
57745 _leave(" = 0");
57746 return 0;
57747@@ -219,7 +219,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
57748 nobufs:
57749 spin_unlock(&cookie->lock);
57750 kfree(op);
57751- fscache_stat(&fscache_n_attr_changed_nobufs);
57752+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
57753 _leave(" = %d", -ENOBUFS);
57754 return -ENOBUFS;
57755 }
57756@@ -258,7 +258,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
57757 /* allocate a retrieval operation and attempt to submit it */
57758 op = kzalloc(sizeof(*op), GFP_NOIO);
57759 if (!op) {
57760- fscache_stat(&fscache_n_retrievals_nomem);
57761+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57762 return NULL;
57763 }
57764
57765@@ -289,13 +289,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
57766 return 0;
57767 }
57768
57769- fscache_stat(&fscache_n_retrievals_wait);
57770+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
57771
57772 jif = jiffies;
57773 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
57774 fscache_wait_bit_interruptible,
57775 TASK_INTERRUPTIBLE) != 0) {
57776- fscache_stat(&fscache_n_retrievals_intr);
57777+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
57778 _leave(" = -ERESTARTSYS");
57779 return -ERESTARTSYS;
57780 }
57781@@ -324,8 +324,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
57782 */
57783 int fscache_wait_for_operation_activation(struct fscache_object *object,
57784 struct fscache_operation *op,
57785- atomic_t *stat_op_waits,
57786- atomic_t *stat_object_dead,
57787+ atomic_unchecked_t *stat_op_waits,
57788+ atomic_unchecked_t *stat_object_dead,
57789 void (*do_cancel)(struct fscache_operation *))
57790 {
57791 int ret;
57792@@ -335,7 +335,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
57793
57794 _debug(">>> WT");
57795 if (stat_op_waits)
57796- fscache_stat(stat_op_waits);
57797+ fscache_stat_unchecked(stat_op_waits);
57798 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
57799 fscache_wait_bit_interruptible,
57800 TASK_INTERRUPTIBLE) != 0) {
57801@@ -353,7 +353,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
57802 check_if_dead:
57803 if (op->state == FSCACHE_OP_ST_CANCELLED) {
57804 if (stat_object_dead)
57805- fscache_stat(stat_object_dead);
57806+ fscache_stat_unchecked(stat_object_dead);
57807 _leave(" = -ENOBUFS [cancelled]");
57808 return -ENOBUFS;
57809 }
57810@@ -361,7 +361,7 @@ check_if_dead:
57811 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
57812 fscache_cancel_op(op, do_cancel);
57813 if (stat_object_dead)
57814- fscache_stat(stat_object_dead);
57815+ fscache_stat_unchecked(stat_object_dead);
57816 return -ENOBUFS;
57817 }
57818 return 0;
57819@@ -388,7 +388,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57820
57821 _enter("%p,%p,,,", cookie, page);
57822
57823- fscache_stat(&fscache_n_retrievals);
57824+ fscache_stat_unchecked(&fscache_n_retrievals);
57825
57826 if (hlist_empty(&cookie->backing_objects))
57827 goto nobufs;
57828@@ -428,7 +428,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57829 goto nobufs_unlock_dec;
57830 spin_unlock(&cookie->lock);
57831
57832- fscache_stat(&fscache_n_retrieval_ops);
57833+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
57834
57835 /* pin the netfs read context in case we need to do the actual netfs
57836 * read because we've encountered a cache read failure */
57837@@ -459,15 +459,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
57838
57839 error:
57840 if (ret == -ENOMEM)
57841- fscache_stat(&fscache_n_retrievals_nomem);
57842+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57843 else if (ret == -ERESTARTSYS)
57844- fscache_stat(&fscache_n_retrievals_intr);
57845+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
57846 else if (ret == -ENODATA)
57847- fscache_stat(&fscache_n_retrievals_nodata);
57848+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
57849 else if (ret < 0)
57850- fscache_stat(&fscache_n_retrievals_nobufs);
57851+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57852 else
57853- fscache_stat(&fscache_n_retrievals_ok);
57854+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
57855
57856 fscache_put_retrieval(op);
57857 _leave(" = %d", ret);
57858@@ -480,7 +480,7 @@ nobufs_unlock:
57859 atomic_dec(&cookie->n_active);
57860 kfree(op);
57861 nobufs:
57862- fscache_stat(&fscache_n_retrievals_nobufs);
57863+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57864 _leave(" = -ENOBUFS");
57865 return -ENOBUFS;
57866 }
57867@@ -518,7 +518,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57868
57869 _enter("%p,,%d,,,", cookie, *nr_pages);
57870
57871- fscache_stat(&fscache_n_retrievals);
57872+ fscache_stat_unchecked(&fscache_n_retrievals);
57873
57874 if (hlist_empty(&cookie->backing_objects))
57875 goto nobufs;
57876@@ -554,7 +554,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57877 goto nobufs_unlock_dec;
57878 spin_unlock(&cookie->lock);
57879
57880- fscache_stat(&fscache_n_retrieval_ops);
57881+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
57882
57883 /* pin the netfs read context in case we need to do the actual netfs
57884 * read because we've encountered a cache read failure */
57885@@ -585,15 +585,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
57886
57887 error:
57888 if (ret == -ENOMEM)
57889- fscache_stat(&fscache_n_retrievals_nomem);
57890+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
57891 else if (ret == -ERESTARTSYS)
57892- fscache_stat(&fscache_n_retrievals_intr);
57893+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
57894 else if (ret == -ENODATA)
57895- fscache_stat(&fscache_n_retrievals_nodata);
57896+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
57897 else if (ret < 0)
57898- fscache_stat(&fscache_n_retrievals_nobufs);
57899+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57900 else
57901- fscache_stat(&fscache_n_retrievals_ok);
57902+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
57903
57904 fscache_put_retrieval(op);
57905 _leave(" = %d", ret);
57906@@ -606,7 +606,7 @@ nobufs_unlock:
57907 atomic_dec(&cookie->n_active);
57908 kfree(op);
57909 nobufs:
57910- fscache_stat(&fscache_n_retrievals_nobufs);
57911+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
57912 _leave(" = -ENOBUFS");
57913 return -ENOBUFS;
57914 }
57915@@ -630,7 +630,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57916
57917 _enter("%p,%p,,,", cookie, page);
57918
57919- fscache_stat(&fscache_n_allocs);
57920+ fscache_stat_unchecked(&fscache_n_allocs);
57921
57922 if (hlist_empty(&cookie->backing_objects))
57923 goto nobufs;
57924@@ -662,7 +662,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57925 goto nobufs_unlock;
57926 spin_unlock(&cookie->lock);
57927
57928- fscache_stat(&fscache_n_alloc_ops);
57929+ fscache_stat_unchecked(&fscache_n_alloc_ops);
57930
57931 ret = fscache_wait_for_operation_activation(
57932 object, &op->op,
57933@@ -679,11 +679,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
57934
57935 error:
57936 if (ret == -ERESTARTSYS)
57937- fscache_stat(&fscache_n_allocs_intr);
57938+ fscache_stat_unchecked(&fscache_n_allocs_intr);
57939 else if (ret < 0)
57940- fscache_stat(&fscache_n_allocs_nobufs);
57941+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
57942 else
57943- fscache_stat(&fscache_n_allocs_ok);
57944+ fscache_stat_unchecked(&fscache_n_allocs_ok);
57945
57946 fscache_put_retrieval(op);
57947 _leave(" = %d", ret);
57948@@ -694,7 +694,7 @@ nobufs_unlock:
57949 atomic_dec(&cookie->n_active);
57950 kfree(op);
57951 nobufs:
57952- fscache_stat(&fscache_n_allocs_nobufs);
57953+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
57954 _leave(" = -ENOBUFS");
57955 return -ENOBUFS;
57956 }
57957@@ -770,7 +770,7 @@ static void fscache_write_op(struct fscache_operation *_op)
57958
57959 spin_lock(&cookie->stores_lock);
57960
57961- fscache_stat(&fscache_n_store_calls);
57962+ fscache_stat_unchecked(&fscache_n_store_calls);
57963
57964 /* find a page to store */
57965 page = NULL;
57966@@ -781,7 +781,7 @@ static void fscache_write_op(struct fscache_operation *_op)
57967 page = results[0];
57968 _debug("gang %d [%lx]", n, page->index);
57969 if (page->index > op->store_limit) {
57970- fscache_stat(&fscache_n_store_pages_over_limit);
57971+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
57972 goto superseded;
57973 }
57974
57975@@ -793,7 +793,7 @@ static void fscache_write_op(struct fscache_operation *_op)
57976 spin_unlock(&cookie->stores_lock);
57977 spin_unlock(&object->lock);
57978
57979- fscache_stat(&fscache_n_store_pages);
57980+ fscache_stat_unchecked(&fscache_n_store_pages);
57981 fscache_stat(&fscache_n_cop_write_page);
57982 ret = object->cache->ops->write_page(op, page);
57983 fscache_stat_d(&fscache_n_cop_write_page);
57984@@ -896,7 +896,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
57985 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
57986 ASSERT(PageFsCache(page));
57987
57988- fscache_stat(&fscache_n_stores);
57989+ fscache_stat_unchecked(&fscache_n_stores);
57990
57991 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
57992 _leave(" = -ENOBUFS [invalidating]");
57993@@ -954,7 +954,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
57994 spin_unlock(&cookie->stores_lock);
57995 spin_unlock(&object->lock);
57996
57997- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
57998+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
57999 op->store_limit = object->store_limit;
58000
58001 atomic_inc(&cookie->n_active);
58002@@ -963,8 +963,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58003
58004 spin_unlock(&cookie->lock);
58005 radix_tree_preload_end();
58006- fscache_stat(&fscache_n_store_ops);
58007- fscache_stat(&fscache_n_stores_ok);
58008+ fscache_stat_unchecked(&fscache_n_store_ops);
58009+ fscache_stat_unchecked(&fscache_n_stores_ok);
58010
58011 /* the work queue now carries its own ref on the object */
58012 fscache_put_operation(&op->op);
58013@@ -972,14 +972,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
58014 return 0;
58015
58016 already_queued:
58017- fscache_stat(&fscache_n_stores_again);
58018+ fscache_stat_unchecked(&fscache_n_stores_again);
58019 already_pending:
58020 spin_unlock(&cookie->stores_lock);
58021 spin_unlock(&object->lock);
58022 spin_unlock(&cookie->lock);
58023 radix_tree_preload_end();
58024 kfree(op);
58025- fscache_stat(&fscache_n_stores_ok);
58026+ fscache_stat_unchecked(&fscache_n_stores_ok);
58027 _leave(" = 0");
58028 return 0;
58029
58030@@ -999,14 +999,14 @@ nobufs:
58031 spin_unlock(&cookie->lock);
58032 radix_tree_preload_end();
58033 kfree(op);
58034- fscache_stat(&fscache_n_stores_nobufs);
58035+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
58036 _leave(" = -ENOBUFS");
58037 return -ENOBUFS;
58038
58039 nomem_free:
58040 kfree(op);
58041 nomem:
58042- fscache_stat(&fscache_n_stores_oom);
58043+ fscache_stat_unchecked(&fscache_n_stores_oom);
58044 _leave(" = -ENOMEM");
58045 return -ENOMEM;
58046 }
58047@@ -1024,7 +1024,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
58048 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
58049 ASSERTCMP(page, !=, NULL);
58050
58051- fscache_stat(&fscache_n_uncaches);
58052+ fscache_stat_unchecked(&fscache_n_uncaches);
58053
58054 /* cache withdrawal may beat us to it */
58055 if (!PageFsCache(page))
58056@@ -1075,7 +1075,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
58057 struct fscache_cookie *cookie = op->op.object->cookie;
58058
58059 #ifdef CONFIG_FSCACHE_STATS
58060- atomic_inc(&fscache_n_marks);
58061+ atomic_inc_unchecked(&fscache_n_marks);
58062 #endif
58063
58064 _debug("- mark %p{%lx}", page, page->index);
58065diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
58066index 40d13c7..ddf52b9 100644
58067--- a/fs/fscache/stats.c
58068+++ b/fs/fscache/stats.c
58069@@ -18,99 +18,99 @@
58070 /*
58071 * operation counters
58072 */
58073-atomic_t fscache_n_op_pend;
58074-atomic_t fscache_n_op_run;
58075-atomic_t fscache_n_op_enqueue;
58076-atomic_t fscache_n_op_requeue;
58077-atomic_t fscache_n_op_deferred_release;
58078-atomic_t fscache_n_op_release;
58079-atomic_t fscache_n_op_gc;
58080-atomic_t fscache_n_op_cancelled;
58081-atomic_t fscache_n_op_rejected;
58082+atomic_unchecked_t fscache_n_op_pend;
58083+atomic_unchecked_t fscache_n_op_run;
58084+atomic_unchecked_t fscache_n_op_enqueue;
58085+atomic_unchecked_t fscache_n_op_requeue;
58086+atomic_unchecked_t fscache_n_op_deferred_release;
58087+atomic_unchecked_t fscache_n_op_release;
58088+atomic_unchecked_t fscache_n_op_gc;
58089+atomic_unchecked_t fscache_n_op_cancelled;
58090+atomic_unchecked_t fscache_n_op_rejected;
58091
58092-atomic_t fscache_n_attr_changed;
58093-atomic_t fscache_n_attr_changed_ok;
58094-atomic_t fscache_n_attr_changed_nobufs;
58095-atomic_t fscache_n_attr_changed_nomem;
58096-atomic_t fscache_n_attr_changed_calls;
58097+atomic_unchecked_t fscache_n_attr_changed;
58098+atomic_unchecked_t fscache_n_attr_changed_ok;
58099+atomic_unchecked_t fscache_n_attr_changed_nobufs;
58100+atomic_unchecked_t fscache_n_attr_changed_nomem;
58101+atomic_unchecked_t fscache_n_attr_changed_calls;
58102
58103-atomic_t fscache_n_allocs;
58104-atomic_t fscache_n_allocs_ok;
58105-atomic_t fscache_n_allocs_wait;
58106-atomic_t fscache_n_allocs_nobufs;
58107-atomic_t fscache_n_allocs_intr;
58108-atomic_t fscache_n_allocs_object_dead;
58109-atomic_t fscache_n_alloc_ops;
58110-atomic_t fscache_n_alloc_op_waits;
58111+atomic_unchecked_t fscache_n_allocs;
58112+atomic_unchecked_t fscache_n_allocs_ok;
58113+atomic_unchecked_t fscache_n_allocs_wait;
58114+atomic_unchecked_t fscache_n_allocs_nobufs;
58115+atomic_unchecked_t fscache_n_allocs_intr;
58116+atomic_unchecked_t fscache_n_allocs_object_dead;
58117+atomic_unchecked_t fscache_n_alloc_ops;
58118+atomic_unchecked_t fscache_n_alloc_op_waits;
58119
58120-atomic_t fscache_n_retrievals;
58121-atomic_t fscache_n_retrievals_ok;
58122-atomic_t fscache_n_retrievals_wait;
58123-atomic_t fscache_n_retrievals_nodata;
58124-atomic_t fscache_n_retrievals_nobufs;
58125-atomic_t fscache_n_retrievals_intr;
58126-atomic_t fscache_n_retrievals_nomem;
58127-atomic_t fscache_n_retrievals_object_dead;
58128-atomic_t fscache_n_retrieval_ops;
58129-atomic_t fscache_n_retrieval_op_waits;
58130+atomic_unchecked_t fscache_n_retrievals;
58131+atomic_unchecked_t fscache_n_retrievals_ok;
58132+atomic_unchecked_t fscache_n_retrievals_wait;
58133+atomic_unchecked_t fscache_n_retrievals_nodata;
58134+atomic_unchecked_t fscache_n_retrievals_nobufs;
58135+atomic_unchecked_t fscache_n_retrievals_intr;
58136+atomic_unchecked_t fscache_n_retrievals_nomem;
58137+atomic_unchecked_t fscache_n_retrievals_object_dead;
58138+atomic_unchecked_t fscache_n_retrieval_ops;
58139+atomic_unchecked_t fscache_n_retrieval_op_waits;
58140
58141-atomic_t fscache_n_stores;
58142-atomic_t fscache_n_stores_ok;
58143-atomic_t fscache_n_stores_again;
58144-atomic_t fscache_n_stores_nobufs;
58145-atomic_t fscache_n_stores_oom;
58146-atomic_t fscache_n_store_ops;
58147-atomic_t fscache_n_store_calls;
58148-atomic_t fscache_n_store_pages;
58149-atomic_t fscache_n_store_radix_deletes;
58150-atomic_t fscache_n_store_pages_over_limit;
58151+atomic_unchecked_t fscache_n_stores;
58152+atomic_unchecked_t fscache_n_stores_ok;
58153+atomic_unchecked_t fscache_n_stores_again;
58154+atomic_unchecked_t fscache_n_stores_nobufs;
58155+atomic_unchecked_t fscache_n_stores_oom;
58156+atomic_unchecked_t fscache_n_store_ops;
58157+atomic_unchecked_t fscache_n_store_calls;
58158+atomic_unchecked_t fscache_n_store_pages;
58159+atomic_unchecked_t fscache_n_store_radix_deletes;
58160+atomic_unchecked_t fscache_n_store_pages_over_limit;
58161
58162-atomic_t fscache_n_store_vmscan_not_storing;
58163-atomic_t fscache_n_store_vmscan_gone;
58164-atomic_t fscache_n_store_vmscan_busy;
58165-atomic_t fscache_n_store_vmscan_cancelled;
58166-atomic_t fscache_n_store_vmscan_wait;
58167+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
58168+atomic_unchecked_t fscache_n_store_vmscan_gone;
58169+atomic_unchecked_t fscache_n_store_vmscan_busy;
58170+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
58171+atomic_unchecked_t fscache_n_store_vmscan_wait;
58172
58173-atomic_t fscache_n_marks;
58174-atomic_t fscache_n_uncaches;
58175+atomic_unchecked_t fscache_n_marks;
58176+atomic_unchecked_t fscache_n_uncaches;
58177
58178-atomic_t fscache_n_acquires;
58179-atomic_t fscache_n_acquires_null;
58180-atomic_t fscache_n_acquires_no_cache;
58181-atomic_t fscache_n_acquires_ok;
58182-atomic_t fscache_n_acquires_nobufs;
58183-atomic_t fscache_n_acquires_oom;
58184+atomic_unchecked_t fscache_n_acquires;
58185+atomic_unchecked_t fscache_n_acquires_null;
58186+atomic_unchecked_t fscache_n_acquires_no_cache;
58187+atomic_unchecked_t fscache_n_acquires_ok;
58188+atomic_unchecked_t fscache_n_acquires_nobufs;
58189+atomic_unchecked_t fscache_n_acquires_oom;
58190
58191-atomic_t fscache_n_invalidates;
58192-atomic_t fscache_n_invalidates_run;
58193+atomic_unchecked_t fscache_n_invalidates;
58194+atomic_unchecked_t fscache_n_invalidates_run;
58195
58196-atomic_t fscache_n_updates;
58197-atomic_t fscache_n_updates_null;
58198-atomic_t fscache_n_updates_run;
58199+atomic_unchecked_t fscache_n_updates;
58200+atomic_unchecked_t fscache_n_updates_null;
58201+atomic_unchecked_t fscache_n_updates_run;
58202
58203-atomic_t fscache_n_relinquishes;
58204-atomic_t fscache_n_relinquishes_null;
58205-atomic_t fscache_n_relinquishes_waitcrt;
58206-atomic_t fscache_n_relinquishes_retire;
58207+atomic_unchecked_t fscache_n_relinquishes;
58208+atomic_unchecked_t fscache_n_relinquishes_null;
58209+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
58210+atomic_unchecked_t fscache_n_relinquishes_retire;
58211
58212-atomic_t fscache_n_cookie_index;
58213-atomic_t fscache_n_cookie_data;
58214-atomic_t fscache_n_cookie_special;
58215+atomic_unchecked_t fscache_n_cookie_index;
58216+atomic_unchecked_t fscache_n_cookie_data;
58217+atomic_unchecked_t fscache_n_cookie_special;
58218
58219-atomic_t fscache_n_object_alloc;
58220-atomic_t fscache_n_object_no_alloc;
58221-atomic_t fscache_n_object_lookups;
58222-atomic_t fscache_n_object_lookups_negative;
58223-atomic_t fscache_n_object_lookups_positive;
58224-atomic_t fscache_n_object_lookups_timed_out;
58225-atomic_t fscache_n_object_created;
58226-atomic_t fscache_n_object_avail;
58227-atomic_t fscache_n_object_dead;
58228+atomic_unchecked_t fscache_n_object_alloc;
58229+atomic_unchecked_t fscache_n_object_no_alloc;
58230+atomic_unchecked_t fscache_n_object_lookups;
58231+atomic_unchecked_t fscache_n_object_lookups_negative;
58232+atomic_unchecked_t fscache_n_object_lookups_positive;
58233+atomic_unchecked_t fscache_n_object_lookups_timed_out;
58234+atomic_unchecked_t fscache_n_object_created;
58235+atomic_unchecked_t fscache_n_object_avail;
58236+atomic_unchecked_t fscache_n_object_dead;
58237
58238-atomic_t fscache_n_checkaux_none;
58239-atomic_t fscache_n_checkaux_okay;
58240-atomic_t fscache_n_checkaux_update;
58241-atomic_t fscache_n_checkaux_obsolete;
58242+atomic_unchecked_t fscache_n_checkaux_none;
58243+atomic_unchecked_t fscache_n_checkaux_okay;
58244+atomic_unchecked_t fscache_n_checkaux_update;
58245+atomic_unchecked_t fscache_n_checkaux_obsolete;
58246
58247 atomic_t fscache_n_cop_alloc_object;
58248 atomic_t fscache_n_cop_lookup_object;
58249@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
58250 seq_puts(m, "FS-Cache statistics\n");
58251
58252 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
58253- atomic_read(&fscache_n_cookie_index),
58254- atomic_read(&fscache_n_cookie_data),
58255- atomic_read(&fscache_n_cookie_special));
58256+ atomic_read_unchecked(&fscache_n_cookie_index),
58257+ atomic_read_unchecked(&fscache_n_cookie_data),
58258+ atomic_read_unchecked(&fscache_n_cookie_special));
58259
58260 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
58261- atomic_read(&fscache_n_object_alloc),
58262- atomic_read(&fscache_n_object_no_alloc),
58263- atomic_read(&fscache_n_object_avail),
58264- atomic_read(&fscache_n_object_dead));
58265+ atomic_read_unchecked(&fscache_n_object_alloc),
58266+ atomic_read_unchecked(&fscache_n_object_no_alloc),
58267+ atomic_read_unchecked(&fscache_n_object_avail),
58268+ atomic_read_unchecked(&fscache_n_object_dead));
58269 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
58270- atomic_read(&fscache_n_checkaux_none),
58271- atomic_read(&fscache_n_checkaux_okay),
58272- atomic_read(&fscache_n_checkaux_update),
58273- atomic_read(&fscache_n_checkaux_obsolete));
58274+ atomic_read_unchecked(&fscache_n_checkaux_none),
58275+ atomic_read_unchecked(&fscache_n_checkaux_okay),
58276+ atomic_read_unchecked(&fscache_n_checkaux_update),
58277+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
58278
58279 seq_printf(m, "Pages : mrk=%u unc=%u\n",
58280- atomic_read(&fscache_n_marks),
58281- atomic_read(&fscache_n_uncaches));
58282+ atomic_read_unchecked(&fscache_n_marks),
58283+ atomic_read_unchecked(&fscache_n_uncaches));
58284
58285 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
58286 " oom=%u\n",
58287- atomic_read(&fscache_n_acquires),
58288- atomic_read(&fscache_n_acquires_null),
58289- atomic_read(&fscache_n_acquires_no_cache),
58290- atomic_read(&fscache_n_acquires_ok),
58291- atomic_read(&fscache_n_acquires_nobufs),
58292- atomic_read(&fscache_n_acquires_oom));
58293+ atomic_read_unchecked(&fscache_n_acquires),
58294+ atomic_read_unchecked(&fscache_n_acquires_null),
58295+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
58296+ atomic_read_unchecked(&fscache_n_acquires_ok),
58297+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
58298+ atomic_read_unchecked(&fscache_n_acquires_oom));
58299
58300 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
58301- atomic_read(&fscache_n_object_lookups),
58302- atomic_read(&fscache_n_object_lookups_negative),
58303- atomic_read(&fscache_n_object_lookups_positive),
58304- atomic_read(&fscache_n_object_created),
58305- atomic_read(&fscache_n_object_lookups_timed_out));
58306+ atomic_read_unchecked(&fscache_n_object_lookups),
58307+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
58308+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
58309+ atomic_read_unchecked(&fscache_n_object_created),
58310+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
58311
58312 seq_printf(m, "Invals : n=%u run=%u\n",
58313- atomic_read(&fscache_n_invalidates),
58314- atomic_read(&fscache_n_invalidates_run));
58315+ atomic_read_unchecked(&fscache_n_invalidates),
58316+ atomic_read_unchecked(&fscache_n_invalidates_run));
58317
58318 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
58319- atomic_read(&fscache_n_updates),
58320- atomic_read(&fscache_n_updates_null),
58321- atomic_read(&fscache_n_updates_run));
58322+ atomic_read_unchecked(&fscache_n_updates),
58323+ atomic_read_unchecked(&fscache_n_updates_null),
58324+ atomic_read_unchecked(&fscache_n_updates_run));
58325
58326 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
58327- atomic_read(&fscache_n_relinquishes),
58328- atomic_read(&fscache_n_relinquishes_null),
58329- atomic_read(&fscache_n_relinquishes_waitcrt),
58330- atomic_read(&fscache_n_relinquishes_retire));
58331+ atomic_read_unchecked(&fscache_n_relinquishes),
58332+ atomic_read_unchecked(&fscache_n_relinquishes_null),
58333+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
58334+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
58335
58336 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
58337- atomic_read(&fscache_n_attr_changed),
58338- atomic_read(&fscache_n_attr_changed_ok),
58339- atomic_read(&fscache_n_attr_changed_nobufs),
58340- atomic_read(&fscache_n_attr_changed_nomem),
58341- atomic_read(&fscache_n_attr_changed_calls));
58342+ atomic_read_unchecked(&fscache_n_attr_changed),
58343+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
58344+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
58345+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
58346+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
58347
58348 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
58349- atomic_read(&fscache_n_allocs),
58350- atomic_read(&fscache_n_allocs_ok),
58351- atomic_read(&fscache_n_allocs_wait),
58352- atomic_read(&fscache_n_allocs_nobufs),
58353- atomic_read(&fscache_n_allocs_intr));
58354+ atomic_read_unchecked(&fscache_n_allocs),
58355+ atomic_read_unchecked(&fscache_n_allocs_ok),
58356+ atomic_read_unchecked(&fscache_n_allocs_wait),
58357+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
58358+ atomic_read_unchecked(&fscache_n_allocs_intr));
58359 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
58360- atomic_read(&fscache_n_alloc_ops),
58361- atomic_read(&fscache_n_alloc_op_waits),
58362- atomic_read(&fscache_n_allocs_object_dead));
58363+ atomic_read_unchecked(&fscache_n_alloc_ops),
58364+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
58365+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
58366
58367 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
58368 " int=%u oom=%u\n",
58369- atomic_read(&fscache_n_retrievals),
58370- atomic_read(&fscache_n_retrievals_ok),
58371- atomic_read(&fscache_n_retrievals_wait),
58372- atomic_read(&fscache_n_retrievals_nodata),
58373- atomic_read(&fscache_n_retrievals_nobufs),
58374- atomic_read(&fscache_n_retrievals_intr),
58375- atomic_read(&fscache_n_retrievals_nomem));
58376+ atomic_read_unchecked(&fscache_n_retrievals),
58377+ atomic_read_unchecked(&fscache_n_retrievals_ok),
58378+ atomic_read_unchecked(&fscache_n_retrievals_wait),
58379+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
58380+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
58381+ atomic_read_unchecked(&fscache_n_retrievals_intr),
58382+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
58383 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
58384- atomic_read(&fscache_n_retrieval_ops),
58385- atomic_read(&fscache_n_retrieval_op_waits),
58386- atomic_read(&fscache_n_retrievals_object_dead));
58387+ atomic_read_unchecked(&fscache_n_retrieval_ops),
58388+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
58389+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
58390
58391 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
58392- atomic_read(&fscache_n_stores),
58393- atomic_read(&fscache_n_stores_ok),
58394- atomic_read(&fscache_n_stores_again),
58395- atomic_read(&fscache_n_stores_nobufs),
58396- atomic_read(&fscache_n_stores_oom));
58397+ atomic_read_unchecked(&fscache_n_stores),
58398+ atomic_read_unchecked(&fscache_n_stores_ok),
58399+ atomic_read_unchecked(&fscache_n_stores_again),
58400+ atomic_read_unchecked(&fscache_n_stores_nobufs),
58401+ atomic_read_unchecked(&fscache_n_stores_oom));
58402 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
58403- atomic_read(&fscache_n_store_ops),
58404- atomic_read(&fscache_n_store_calls),
58405- atomic_read(&fscache_n_store_pages),
58406- atomic_read(&fscache_n_store_radix_deletes),
58407- atomic_read(&fscache_n_store_pages_over_limit));
58408+ atomic_read_unchecked(&fscache_n_store_ops),
58409+ atomic_read_unchecked(&fscache_n_store_calls),
58410+ atomic_read_unchecked(&fscache_n_store_pages),
58411+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
58412+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
58413
58414 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
58415- atomic_read(&fscache_n_store_vmscan_not_storing),
58416- atomic_read(&fscache_n_store_vmscan_gone),
58417- atomic_read(&fscache_n_store_vmscan_busy),
58418- atomic_read(&fscache_n_store_vmscan_cancelled),
58419- atomic_read(&fscache_n_store_vmscan_wait));
58420+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
58421+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
58422+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
58423+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
58424+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
58425
58426 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
58427- atomic_read(&fscache_n_op_pend),
58428- atomic_read(&fscache_n_op_run),
58429- atomic_read(&fscache_n_op_enqueue),
58430- atomic_read(&fscache_n_op_cancelled),
58431- atomic_read(&fscache_n_op_rejected));
58432+ atomic_read_unchecked(&fscache_n_op_pend),
58433+ atomic_read_unchecked(&fscache_n_op_run),
58434+ atomic_read_unchecked(&fscache_n_op_enqueue),
58435+ atomic_read_unchecked(&fscache_n_op_cancelled),
58436+ atomic_read_unchecked(&fscache_n_op_rejected));
58437 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
58438- atomic_read(&fscache_n_op_deferred_release),
58439- atomic_read(&fscache_n_op_release),
58440- atomic_read(&fscache_n_op_gc));
58441+ atomic_read_unchecked(&fscache_n_op_deferred_release),
58442+ atomic_read_unchecked(&fscache_n_op_release),
58443+ atomic_read_unchecked(&fscache_n_op_gc));
58444
58445 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
58446 atomic_read(&fscache_n_cop_alloc_object),
58447diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
58448index adbfd66..4b25822 100644
58449--- a/fs/fuse/cuse.c
58450+++ b/fs/fuse/cuse.c
58451@@ -603,10 +603,12 @@ static int __init cuse_init(void)
58452 INIT_LIST_HEAD(&cuse_conntbl[i]);
58453
58454 /* inherit and extend fuse_dev_operations */
58455- cuse_channel_fops = fuse_dev_operations;
58456- cuse_channel_fops.owner = THIS_MODULE;
58457- cuse_channel_fops.open = cuse_channel_open;
58458- cuse_channel_fops.release = cuse_channel_release;
58459+ pax_open_kernel();
58460+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
58461+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
58462+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
58463+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
58464+ pax_close_kernel();
58465
58466 cuse_class = class_create(THIS_MODULE, "cuse");
58467 if (IS_ERR(cuse_class))
58468diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
58469index ef74ad5..c9ac759e 100644
58470--- a/fs/fuse/dev.c
58471+++ b/fs/fuse/dev.c
58472@@ -1339,7 +1339,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
58473 ret = 0;
58474 pipe_lock(pipe);
58475
58476- if (!pipe->readers) {
58477+ if (!atomic_read(&pipe->readers)) {
58478 send_sig(SIGPIPE, current, 0);
58479 if (!ret)
58480 ret = -EPIPE;
58481@@ -1364,7 +1364,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
58482 page_nr++;
58483 ret += buf->len;
58484
58485- if (pipe->files)
58486+ if (atomic_read(&pipe->files))
58487 do_wakeup = 1;
58488 }
58489
58490diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
58491index b7989f2..1f72ec4 100644
58492--- a/fs/fuse/dir.c
58493+++ b/fs/fuse/dir.c
58494@@ -1438,7 +1438,7 @@ static char *read_link(struct dentry *dentry)
58495 return link;
58496 }
58497
58498-static void free_link(char *link)
58499+static void free_link(const char *link)
58500 {
58501 if (!IS_ERR(link))
58502 free_page((unsigned long) link);
58503diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
58504index 1298766..c964c60 100644
58505--- a/fs/gfs2/inode.c
58506+++ b/fs/gfs2/inode.c
58507@@ -1515,7 +1515,7 @@ out:
58508
58509 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58510 {
58511- char *s = nd_get_link(nd);
58512+ const char *s = nd_get_link(nd);
58513 if (!IS_ERR(s))
58514 kfree(s);
58515 }
58516diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
58517index 2543728..14d7bd4 100644
58518--- a/fs/hostfs/hostfs_kern.c
58519+++ b/fs/hostfs/hostfs_kern.c
58520@@ -904,7 +904,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58521
58522 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
58523 {
58524- char *s = nd_get_link(nd);
58525+ const char *s = nd_get_link(nd);
58526 if (!IS_ERR(s))
58527 __putname(s);
58528 }
58529diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
58530index d19b30a..ef89c36 100644
58531--- a/fs/hugetlbfs/inode.c
58532+++ b/fs/hugetlbfs/inode.c
58533@@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
58534 struct mm_struct *mm = current->mm;
58535 struct vm_area_struct *vma;
58536 struct hstate *h = hstate_file(file);
58537+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
58538 struct vm_unmapped_area_info info;
58539
58540 if (len & ~huge_page_mask(h))
58541@@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
58542 return addr;
58543 }
58544
58545+#ifdef CONFIG_PAX_RANDMMAP
58546+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
58547+#endif
58548+
58549 if (addr) {
58550 addr = ALIGN(addr, huge_page_size(h));
58551 vma = find_vma(mm, addr);
58552- if (TASK_SIZE - len >= addr &&
58553- (!vma || addr + len <= vma->vm_start))
58554+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
58555 return addr;
58556 }
58557
58558 info.flags = 0;
58559 info.length = len;
58560 info.low_limit = TASK_UNMAPPED_BASE;
58561+
58562+#ifdef CONFIG_PAX_RANDMMAP
58563+ if (mm->pax_flags & MF_PAX_RANDMMAP)
58564+ info.low_limit += mm->delta_mmap;
58565+#endif
58566+
58567 info.high_limit = TASK_SIZE;
58568 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
58569 info.align_offset = 0;
58570@@ -908,7 +918,7 @@ static struct file_system_type hugetlbfs_fs_type = {
58571 };
58572 MODULE_ALIAS_FS("hugetlbfs");
58573
58574-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
58575+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
58576
58577 static int can_do_hugetlb_shm(void)
58578 {
58579diff --git a/fs/inode.c b/fs/inode.c
58580index b33ba8e..3c79a47 100644
58581--- a/fs/inode.c
58582+++ b/fs/inode.c
58583@@ -849,8 +849,8 @@ unsigned int get_next_ino(void)
58584
58585 #ifdef CONFIG_SMP
58586 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
58587- static atomic_t shared_last_ino;
58588- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
58589+ static atomic_unchecked_t shared_last_ino;
58590+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
58591
58592 res = next - LAST_INO_BATCH;
58593 }
58594diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
58595index 4a6cf28..d3a29d3 100644
58596--- a/fs/jffs2/erase.c
58597+++ b/fs/jffs2/erase.c
58598@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
58599 struct jffs2_unknown_node marker = {
58600 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
58601 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
58602- .totlen = cpu_to_je32(c->cleanmarker_size)
58603+ .totlen = cpu_to_je32(c->cleanmarker_size),
58604+ .hdr_crc = cpu_to_je32(0)
58605 };
58606
58607 jffs2_prealloc_raw_node_refs(c, jeb, 1);
58608diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
58609index a6597d6..41b30ec 100644
58610--- a/fs/jffs2/wbuf.c
58611+++ b/fs/jffs2/wbuf.c
58612@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
58613 {
58614 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
58615 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
58616- .totlen = constant_cpu_to_je32(8)
58617+ .totlen = constant_cpu_to_je32(8),
58618+ .hdr_crc = constant_cpu_to_je32(0)
58619 };
58620
58621 /*
58622diff --git a/fs/jfs/super.c b/fs/jfs/super.c
58623index 6669aa2..36b033d 100644
58624--- a/fs/jfs/super.c
58625+++ b/fs/jfs/super.c
58626@@ -882,7 +882,7 @@ static int __init init_jfs_fs(void)
58627
58628 jfs_inode_cachep =
58629 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
58630- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
58631+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
58632 init_once);
58633 if (jfs_inode_cachep == NULL)
58634 return -ENOMEM;
58635diff --git a/fs/libfs.c b/fs/libfs.c
58636index 193e0c2..7404665 100644
58637--- a/fs/libfs.c
58638+++ b/fs/libfs.c
58639@@ -150,6 +150,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
58640
58641 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
58642 struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
58643+ char d_name[sizeof(next->d_iname)];
58644+ const unsigned char *name;
58645+
58646 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
58647 if (!simple_positive(next)) {
58648 spin_unlock(&next->d_lock);
58649@@ -158,7 +161,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
58650
58651 spin_unlock(&next->d_lock);
58652 spin_unlock(&dentry->d_lock);
58653- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
58654+ name = next->d_name.name;
58655+ if (name == next->d_iname) {
58656+ memcpy(d_name, name, next->d_name.len);
58657+ name = d_name;
58658+ }
58659+ if (!dir_emit(ctx, name, next->d_name.len,
58660 next->d_inode->i_ino, dt_type(next->d_inode)))
58661 return 0;
58662 spin_lock(&dentry->d_lock);
58663diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
58664index acd3947..1f896e2 100644
58665--- a/fs/lockd/clntproc.c
58666+++ b/fs/lockd/clntproc.c
58667@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
58668 /*
58669 * Cookie counter for NLM requests
58670 */
58671-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
58672+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
58673
58674 void nlmclnt_next_cookie(struct nlm_cookie *c)
58675 {
58676- u32 cookie = atomic_inc_return(&nlm_cookie);
58677+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
58678
58679 memcpy(c->data, &cookie, 4);
58680 c->len=4;
58681diff --git a/fs/locks.c b/fs/locks.c
58682index b27a300..4156d0b 100644
58683--- a/fs/locks.c
58684+++ b/fs/locks.c
58685@@ -2183,16 +2183,16 @@ void locks_remove_flock(struct file *filp)
58686 return;
58687
58688 if (filp->f_op && filp->f_op->flock) {
58689- struct file_lock fl = {
58690+ struct file_lock flock = {
58691 .fl_pid = current->tgid,
58692 .fl_file = filp,
58693 .fl_flags = FL_FLOCK,
58694 .fl_type = F_UNLCK,
58695 .fl_end = OFFSET_MAX,
58696 };
58697- filp->f_op->flock(filp, F_SETLKW, &fl);
58698- if (fl.fl_ops && fl.fl_ops->fl_release_private)
58699- fl.fl_ops->fl_release_private(&fl);
58700+ filp->f_op->flock(filp, F_SETLKW, &flock);
58701+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
58702+ flock.fl_ops->fl_release_private(&flock);
58703 }
58704
58705 spin_lock(&inode->i_lock);
58706diff --git a/fs/namei.c b/fs/namei.c
58707index 23ac50f..c6757a5 100644
58708--- a/fs/namei.c
58709+++ b/fs/namei.c
58710@@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask)
58711 if (ret != -EACCES)
58712 return ret;
58713
58714+#ifdef CONFIG_GRKERNSEC
58715+ /* we'll block if we have to log due to a denied capability use */
58716+ if (mask & MAY_NOT_BLOCK)
58717+ return -ECHILD;
58718+#endif
58719+
58720 if (S_ISDIR(inode->i_mode)) {
58721 /* DACs are overridable for directories */
58722- if (inode_capable(inode, CAP_DAC_OVERRIDE))
58723- return 0;
58724 if (!(mask & MAY_WRITE))
58725- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
58726+ if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
58727+ inode_capable(inode, CAP_DAC_READ_SEARCH))
58728 return 0;
58729+ if (inode_capable(inode, CAP_DAC_OVERRIDE))
58730+ return 0;
58731 return -EACCES;
58732 }
58733 /*
58734+ * Searching includes executable on directories, else just read.
58735+ */
58736+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
58737+ if (mask == MAY_READ)
58738+ if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
58739+ inode_capable(inode, CAP_DAC_READ_SEARCH))
58740+ return 0;
58741+
58742+ /*
58743 * Read/write DACs are always overridable.
58744 * Executable DACs are overridable when there is
58745 * at least one exec bit set.
58746@@ -337,14 +353,6 @@ int generic_permission(struct inode *inode, int mask)
58747 if (inode_capable(inode, CAP_DAC_OVERRIDE))
58748 return 0;
58749
58750- /*
58751- * Searching includes executable on directories, else just read.
58752- */
58753- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
58754- if (mask == MAY_READ)
58755- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
58756- return 0;
58757-
58758 return -EACCES;
58759 }
58760
58761@@ -821,7 +829,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
58762 {
58763 struct dentry *dentry = link->dentry;
58764 int error;
58765- char *s;
58766+ const char *s;
58767
58768 BUG_ON(nd->flags & LOOKUP_RCU);
58769
58770@@ -842,6 +850,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
58771 if (error)
58772 goto out_put_nd_path;
58773
58774+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
58775+ dentry->d_inode, dentry, nd->path.mnt)) {
58776+ error = -EACCES;
58777+ goto out_put_nd_path;
58778+ }
58779+
58780 nd->last_type = LAST_BIND;
58781 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
58782 error = PTR_ERR(*p);
58783@@ -1602,6 +1616,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
58784 if (res)
58785 break;
58786 res = walk_component(nd, path, LOOKUP_FOLLOW);
58787+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
58788+ res = -EACCES;
58789 put_link(nd, &link, cookie);
58790 } while (res > 0);
58791
58792@@ -1700,7 +1716,7 @@ EXPORT_SYMBOL(full_name_hash);
58793 static inline unsigned long hash_name(const char *name, unsigned int *hashp)
58794 {
58795 unsigned long a, b, adata, bdata, mask, hash, len;
58796- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
58797+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
58798
58799 hash = a = 0;
58800 len = -sizeof(unsigned long);
58801@@ -1981,6 +1997,8 @@ static int path_lookupat(int dfd, const char *name,
58802 if (err)
58803 break;
58804 err = lookup_last(nd, &path);
58805+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
58806+ err = -EACCES;
58807 put_link(nd, &link, cookie);
58808 }
58809 }
58810@@ -1988,6 +2006,13 @@ static int path_lookupat(int dfd, const char *name,
58811 if (!err)
58812 err = complete_walk(nd);
58813
58814+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
58815+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
58816+ path_put(&nd->path);
58817+ err = -ENOENT;
58818+ }
58819+ }
58820+
58821 if (!err && nd->flags & LOOKUP_DIRECTORY) {
58822 if (!can_lookup(nd->inode)) {
58823 path_put(&nd->path);
58824@@ -2015,8 +2040,15 @@ static int filename_lookup(int dfd, struct filename *name,
58825 retval = path_lookupat(dfd, name->name,
58826 flags | LOOKUP_REVAL, nd);
58827
58828- if (likely(!retval))
58829+ if (likely(!retval)) {
58830 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
58831+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
58832+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
58833+ path_put(&nd->path);
58834+ return -ENOENT;
58835+ }
58836+ }
58837+ }
58838 return retval;
58839 }
58840
58841@@ -2587,6 +2619,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
58842 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
58843 return -EPERM;
58844
58845+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
58846+ return -EPERM;
58847+ if (gr_handle_rawio(inode))
58848+ return -EPERM;
58849+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
58850+ return -EACCES;
58851+
58852 return 0;
58853 }
58854
58855@@ -2818,7 +2857,7 @@ looked_up:
58856 * cleared otherwise prior to returning.
58857 */
58858 static int lookup_open(struct nameidata *nd, struct path *path,
58859- struct file *file,
58860+ struct path *link, struct file *file,
58861 const struct open_flags *op,
58862 bool got_write, int *opened)
58863 {
58864@@ -2853,6 +2892,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
58865 /* Negative dentry, just create the file */
58866 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
58867 umode_t mode = op->mode;
58868+
58869+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
58870+ error = -EACCES;
58871+ goto out_dput;
58872+ }
58873+
58874+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
58875+ error = -EACCES;
58876+ goto out_dput;
58877+ }
58878+
58879 if (!IS_POSIXACL(dir->d_inode))
58880 mode &= ~current_umask();
58881 /*
58882@@ -2874,6 +2924,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
58883 nd->flags & LOOKUP_EXCL);
58884 if (error)
58885 goto out_dput;
58886+ else
58887+ gr_handle_create(dentry, nd->path.mnt);
58888 }
58889 out_no_open:
58890 path->dentry = dentry;
58891@@ -2888,7 +2940,7 @@ out_dput:
58892 /*
58893 * Handle the last step of open()
58894 */
58895-static int do_last(struct nameidata *nd, struct path *path,
58896+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
58897 struct file *file, const struct open_flags *op,
58898 int *opened, struct filename *name)
58899 {
58900@@ -2938,6 +2990,15 @@ static int do_last(struct nameidata *nd, struct path *path,
58901 if (error)
58902 return error;
58903
58904+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
58905+ error = -ENOENT;
58906+ goto out;
58907+ }
58908+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
58909+ error = -EACCES;
58910+ goto out;
58911+ }
58912+
58913 audit_inode(name, dir, LOOKUP_PARENT);
58914 error = -EISDIR;
58915 /* trailing slashes? */
58916@@ -2957,7 +3018,7 @@ retry_lookup:
58917 */
58918 }
58919 mutex_lock(&dir->d_inode->i_mutex);
58920- error = lookup_open(nd, path, file, op, got_write, opened);
58921+ error = lookup_open(nd, path, link, file, op, got_write, opened);
58922 mutex_unlock(&dir->d_inode->i_mutex);
58923
58924 if (error <= 0) {
58925@@ -2981,11 +3042,28 @@ retry_lookup:
58926 goto finish_open_created;
58927 }
58928
58929+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
58930+ error = -ENOENT;
58931+ goto exit_dput;
58932+ }
58933+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
58934+ error = -EACCES;
58935+ goto exit_dput;
58936+ }
58937+
58938 /*
58939 * create/update audit record if it already exists.
58940 */
58941- if (path->dentry->d_inode)
58942+ if (path->dentry->d_inode) {
58943+ /* only check if O_CREAT is specified, all other checks need to go
58944+ into may_open */
58945+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
58946+ error = -EACCES;
58947+ goto exit_dput;
58948+ }
58949+
58950 audit_inode(name, path->dentry, 0);
58951+ }
58952
58953 /*
58954 * If atomic_open() acquired write access it is dropped now due to
58955@@ -3026,6 +3104,11 @@ finish_lookup:
58956 }
58957 }
58958 BUG_ON(inode != path->dentry->d_inode);
58959+ /* if we're resolving a symlink to another symlink */
58960+ if (link && gr_handle_symlink_owner(link, inode)) {
58961+ error = -EACCES;
58962+ goto out;
58963+ }
58964 return 1;
58965 }
58966
58967@@ -3035,7 +3118,6 @@ finish_lookup:
58968 save_parent.dentry = nd->path.dentry;
58969 save_parent.mnt = mntget(path->mnt);
58970 nd->path.dentry = path->dentry;
58971-
58972 }
58973 nd->inode = inode;
58974 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
58975@@ -3045,7 +3127,18 @@ finish_open:
58976 path_put(&save_parent);
58977 return error;
58978 }
58979+
58980+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
58981+ error = -ENOENT;
58982+ goto out;
58983+ }
58984+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
58985+ error = -EACCES;
58986+ goto out;
58987+ }
58988+
58989 audit_inode(name, nd->path.dentry, 0);
58990+
58991 error = -EISDIR;
58992 if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
58993 goto out;
58994@@ -3208,7 +3301,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
58995 if (unlikely(error))
58996 goto out;
58997
58998- error = do_last(nd, &path, file, op, &opened, pathname);
58999+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
59000 while (unlikely(error > 0)) { /* trailing symlink */
59001 struct path link = path;
59002 void *cookie;
59003@@ -3226,7 +3319,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
59004 error = follow_link(&link, nd, &cookie);
59005 if (unlikely(error))
59006 break;
59007- error = do_last(nd, &path, file, op, &opened, pathname);
59008+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
59009 put_link(nd, &link, cookie);
59010 }
59011 out:
59012@@ -3326,8 +3419,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
59013 goto unlock;
59014
59015 error = -EEXIST;
59016- if (dentry->d_inode)
59017+ if (dentry->d_inode) {
59018+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
59019+ error = -ENOENT;
59020+ }
59021 goto fail;
59022+ }
59023 /*
59024 * Special case - lookup gave negative, but... we had foo/bar/
59025 * From the vfs_mknod() POV we just have a negative dentry -
59026@@ -3379,6 +3476,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
59027 }
59028 EXPORT_SYMBOL(user_path_create);
59029
59030+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
59031+{
59032+ struct filename *tmp = getname(pathname);
59033+ struct dentry *res;
59034+ if (IS_ERR(tmp))
59035+ return ERR_CAST(tmp);
59036+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
59037+ if (IS_ERR(res))
59038+ putname(tmp);
59039+ else
59040+ *to = tmp;
59041+ return res;
59042+}
59043+
59044 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
59045 {
59046 int error = may_create(dir, dentry);
59047@@ -3441,6 +3552,17 @@ retry:
59048
59049 if (!IS_POSIXACL(path.dentry->d_inode))
59050 mode &= ~current_umask();
59051+
59052+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
59053+ error = -EPERM;
59054+ goto out;
59055+ }
59056+
59057+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
59058+ error = -EACCES;
59059+ goto out;
59060+ }
59061+
59062 error = security_path_mknod(&path, dentry, mode, dev);
59063 if (error)
59064 goto out;
59065@@ -3457,6 +3579,8 @@ retry:
59066 break;
59067 }
59068 out:
59069+ if (!error)
59070+ gr_handle_create(dentry, path.mnt);
59071 done_path_create(&path, dentry);
59072 if (retry_estale(error, lookup_flags)) {
59073 lookup_flags |= LOOKUP_REVAL;
59074@@ -3509,9 +3633,16 @@ retry:
59075
59076 if (!IS_POSIXACL(path.dentry->d_inode))
59077 mode &= ~current_umask();
59078+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
59079+ error = -EACCES;
59080+ goto out;
59081+ }
59082 error = security_path_mkdir(&path, dentry, mode);
59083 if (!error)
59084 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
59085+ if (!error)
59086+ gr_handle_create(dentry, path.mnt);
59087+out:
59088 done_path_create(&path, dentry);
59089 if (retry_estale(error, lookup_flags)) {
59090 lookup_flags |= LOOKUP_REVAL;
59091@@ -3592,6 +3723,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
59092 struct filename *name;
59093 struct dentry *dentry;
59094 struct nameidata nd;
59095+ ino_t saved_ino = 0;
59096+ dev_t saved_dev = 0;
59097 unsigned int lookup_flags = 0;
59098 retry:
59099 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
59100@@ -3624,10 +3757,21 @@ retry:
59101 error = -ENOENT;
59102 goto exit3;
59103 }
59104+
59105+ saved_ino = dentry->d_inode->i_ino;
59106+ saved_dev = gr_get_dev_from_dentry(dentry);
59107+
59108+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
59109+ error = -EACCES;
59110+ goto exit3;
59111+ }
59112+
59113 error = security_path_rmdir(&nd.path, dentry);
59114 if (error)
59115 goto exit3;
59116 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
59117+ if (!error && (saved_dev || saved_ino))
59118+ gr_handle_delete(saved_ino, saved_dev);
59119 exit3:
59120 dput(dentry);
59121 exit2:
59122@@ -3693,6 +3837,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
59123 struct dentry *dentry;
59124 struct nameidata nd;
59125 struct inode *inode = NULL;
59126+ ino_t saved_ino = 0;
59127+ dev_t saved_dev = 0;
59128 unsigned int lookup_flags = 0;
59129 retry:
59130 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
59131@@ -3719,10 +3865,22 @@ retry:
59132 if (!inode)
59133 goto slashes;
59134 ihold(inode);
59135+
59136+ if (inode->i_nlink <= 1) {
59137+ saved_ino = inode->i_ino;
59138+ saved_dev = gr_get_dev_from_dentry(dentry);
59139+ }
59140+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
59141+ error = -EACCES;
59142+ goto exit2;
59143+ }
59144+
59145 error = security_path_unlink(&nd.path, dentry);
59146 if (error)
59147 goto exit2;
59148 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
59149+ if (!error && (saved_ino || saved_dev))
59150+ gr_handle_delete(saved_ino, saved_dev);
59151 exit2:
59152 dput(dentry);
59153 }
59154@@ -3800,9 +3958,17 @@ retry:
59155 if (IS_ERR(dentry))
59156 goto out_putname;
59157
59158+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
59159+ error = -EACCES;
59160+ goto out;
59161+ }
59162+
59163 error = security_path_symlink(&path, dentry, from->name);
59164 if (!error)
59165 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
59166+ if (!error)
59167+ gr_handle_create(dentry, path.mnt);
59168+out:
59169 done_path_create(&path, dentry);
59170 if (retry_estale(error, lookup_flags)) {
59171 lookup_flags |= LOOKUP_REVAL;
59172@@ -3882,6 +4048,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
59173 {
59174 struct dentry *new_dentry;
59175 struct path old_path, new_path;
59176+ struct filename *to = NULL;
59177 int how = 0;
59178 int error;
59179
59180@@ -3905,7 +4072,7 @@ retry:
59181 if (error)
59182 return error;
59183
59184- new_dentry = user_path_create(newdfd, newname, &new_path,
59185+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
59186 (how & LOOKUP_REVAL));
59187 error = PTR_ERR(new_dentry);
59188 if (IS_ERR(new_dentry))
59189@@ -3917,11 +4084,28 @@ retry:
59190 error = may_linkat(&old_path);
59191 if (unlikely(error))
59192 goto out_dput;
59193+
59194+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
59195+ old_path.dentry->d_inode,
59196+ old_path.dentry->d_inode->i_mode, to)) {
59197+ error = -EACCES;
59198+ goto out_dput;
59199+ }
59200+
59201+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
59202+ old_path.dentry, old_path.mnt, to)) {
59203+ error = -EACCES;
59204+ goto out_dput;
59205+ }
59206+
59207 error = security_path_link(old_path.dentry, &new_path, new_dentry);
59208 if (error)
59209 goto out_dput;
59210 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
59211+ if (!error)
59212+ gr_handle_create(new_dentry, new_path.mnt);
59213 out_dput:
59214+ putname(to);
59215 done_path_create(&new_path, new_dentry);
59216 if (retry_estale(error, how)) {
59217 how |= LOOKUP_REVAL;
59218@@ -4167,12 +4351,21 @@ retry:
59219 if (new_dentry == trap)
59220 goto exit5;
59221
59222+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
59223+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
59224+ to);
59225+ if (error)
59226+ goto exit5;
59227+
59228 error = security_path_rename(&oldnd.path, old_dentry,
59229 &newnd.path, new_dentry);
59230 if (error)
59231 goto exit5;
59232 error = vfs_rename(old_dir->d_inode, old_dentry,
59233 new_dir->d_inode, new_dentry);
59234+ if (!error)
59235+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
59236+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
59237 exit5:
59238 dput(new_dentry);
59239 exit4:
59240@@ -4204,6 +4397,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
59241
59242 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
59243 {
59244+ char tmpbuf[64];
59245+ const char *newlink;
59246 int len;
59247
59248 len = PTR_ERR(link);
59249@@ -4213,7 +4408,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
59250 len = strlen(link);
59251 if (len > (unsigned) buflen)
59252 len = buflen;
59253- if (copy_to_user(buffer, link, len))
59254+
59255+ if (len < sizeof(tmpbuf)) {
59256+ memcpy(tmpbuf, link, len);
59257+ newlink = tmpbuf;
59258+ } else
59259+ newlink = link;
59260+
59261+ if (copy_to_user(buffer, newlink, len))
59262 len = -EFAULT;
59263 out:
59264 return len;
59265diff --git a/fs/namespace.c b/fs/namespace.c
59266index da5c494..a755a54 100644
59267--- a/fs/namespace.c
59268+++ b/fs/namespace.c
59269@@ -1268,6 +1268,9 @@ static int do_umount(struct mount *mnt, int flags)
59270 if (!(sb->s_flags & MS_RDONLY))
59271 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
59272 up_write(&sb->s_umount);
59273+
59274+ gr_log_remount(mnt->mnt_devname, retval);
59275+
59276 return retval;
59277 }
59278
59279@@ -1286,6 +1289,9 @@ static int do_umount(struct mount *mnt, int flags)
59280 }
59281 br_write_unlock(&vfsmount_lock);
59282 namespace_unlock();
59283+
59284+ gr_log_unmount(mnt->mnt_devname, retval);
59285+
59286 return retval;
59287 }
59288
59289@@ -1305,7 +1311,7 @@ static inline bool may_mount(void)
59290 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
59291 */
59292
59293-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
59294+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
59295 {
59296 struct path path;
59297 struct mount *mnt;
59298@@ -1347,7 +1353,7 @@ out:
59299 /*
59300 * The 2.0 compatible umount. No flags.
59301 */
59302-SYSCALL_DEFINE1(oldumount, char __user *, name)
59303+SYSCALL_DEFINE1(oldumount, const char __user *, name)
59304 {
59305 return sys_umount(name, 0);
59306 }
59307@@ -2358,6 +2364,16 @@ long do_mount(const char *dev_name, const char *dir_name,
59308 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
59309 MS_STRICTATIME);
59310
59311+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
59312+ retval = -EPERM;
59313+ goto dput_out;
59314+ }
59315+
59316+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
59317+ retval = -EPERM;
59318+ goto dput_out;
59319+ }
59320+
59321 if (flags & MS_REMOUNT)
59322 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
59323 data_page);
59324@@ -2372,6 +2388,9 @@ long do_mount(const char *dev_name, const char *dir_name,
59325 dev_name, data_page);
59326 dput_out:
59327 path_put(&path);
59328+
59329+ gr_log_mount(dev_name, dir_name, retval);
59330+
59331 return retval;
59332 }
59333
59334@@ -2389,7 +2408,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
59335 * number incrementing at 10Ghz will take 12,427 years to wrap which
59336 * is effectively never, so we can ignore the possibility.
59337 */
59338-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
59339+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
59340
59341 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59342 {
59343@@ -2404,7 +2423,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59344 kfree(new_ns);
59345 return ERR_PTR(ret);
59346 }
59347- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
59348+ new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
59349 atomic_set(&new_ns->count, 1);
59350 new_ns->root = NULL;
59351 INIT_LIST_HEAD(&new_ns->list);
59352@@ -2418,7 +2437,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
59353 * Allocate a new namespace structure and populate it with contents
59354 * copied from the namespace of the passed in task structure.
59355 */
59356-static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
59357+static __latent_entropy struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
59358 struct user_namespace *user_ns, struct fs_struct *fs)
59359 {
59360 struct mnt_namespace *new_ns;
59361@@ -2549,8 +2568,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
59362 }
59363 EXPORT_SYMBOL(mount_subtree);
59364
59365-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
59366- char __user *, type, unsigned long, flags, void __user *, data)
59367+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
59368+ const char __user *, type, unsigned long, flags, void __user *, data)
59369 {
59370 int ret;
59371 char *kernel_type;
59372@@ -2663,6 +2682,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
59373 if (error)
59374 goto out2;
59375
59376+ if (gr_handle_chroot_pivot()) {
59377+ error = -EPERM;
59378+ goto out2;
59379+ }
59380+
59381 get_fs_root(current->fs, &root);
59382 old_mp = lock_mount(&old);
59383 error = PTR_ERR(old_mp);
59384@@ -2932,7 +2956,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
59385 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
59386 return -EPERM;
59387
59388- if (fs->users != 1)
59389+ if (atomic_read(&fs->users) != 1)
59390 return -EINVAL;
59391
59392 get_mnt_ns(mnt_ns);
59393diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
59394index f4ccfe6..a5cf064 100644
59395--- a/fs/nfs/callback_xdr.c
59396+++ b/fs/nfs/callback_xdr.c
59397@@ -51,7 +51,7 @@ struct callback_op {
59398 callback_decode_arg_t decode_args;
59399 callback_encode_res_t encode_res;
59400 long res_maxsize;
59401-};
59402+} __do_const;
59403
59404 static struct callback_op callback_ops[];
59405
59406diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
59407index eda8879..bfc6837 100644
59408--- a/fs/nfs/inode.c
59409+++ b/fs/nfs/inode.c
59410@@ -1150,16 +1150,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
59411 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
59412 }
59413
59414-static atomic_long_t nfs_attr_generation_counter;
59415+static atomic_long_unchecked_t nfs_attr_generation_counter;
59416
59417 static unsigned long nfs_read_attr_generation_counter(void)
59418 {
59419- return atomic_long_read(&nfs_attr_generation_counter);
59420+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
59421 }
59422
59423 unsigned long nfs_inc_attr_generation_counter(void)
59424 {
59425- return atomic_long_inc_return(&nfs_attr_generation_counter);
59426+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
59427 }
59428
59429 void nfs_fattr_init(struct nfs_fattr *fattr)
59430diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
59431index 419572f..5414a23 100644
59432--- a/fs/nfsd/nfs4proc.c
59433+++ b/fs/nfsd/nfs4proc.c
59434@@ -1168,7 +1168,7 @@ struct nfsd4_operation {
59435 nfsd4op_rsize op_rsize_bop;
59436 stateid_getter op_get_currentstateid;
59437 stateid_setter op_set_currentstateid;
59438-};
59439+} __do_const;
59440
59441 static struct nfsd4_operation nfsd4_ops[];
59442
59443diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
59444index ecc735e..79b2d31 100644
59445--- a/fs/nfsd/nfs4xdr.c
59446+++ b/fs/nfsd/nfs4xdr.c
59447@@ -1500,7 +1500,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
59448
59449 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
59450
59451-static nfsd4_dec nfsd4_dec_ops[] = {
59452+static const nfsd4_dec nfsd4_dec_ops[] = {
59453 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
59454 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
59455 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
59456@@ -1540,7 +1540,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
59457 [OP_RELEASE_LOCKOWNER] = (nfsd4_dec)nfsd4_decode_release_lockowner,
59458 };
59459
59460-static nfsd4_dec nfsd41_dec_ops[] = {
59461+static const nfsd4_dec nfsd41_dec_ops[] = {
59462 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
59463 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
59464 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
59465@@ -1602,7 +1602,7 @@ static nfsd4_dec nfsd41_dec_ops[] = {
59466 };
59467
59468 struct nfsd4_minorversion_ops {
59469- nfsd4_dec *decoders;
59470+ const nfsd4_dec *decoders;
59471 int nops;
59472 };
59473
59474diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
59475index b6af150..f6ec5e3 100644
59476--- a/fs/nfsd/nfscache.c
59477+++ b/fs/nfsd/nfscache.c
59478@@ -547,14 +547,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
59479 {
59480 struct svc_cacherep *rp = rqstp->rq_cacherep;
59481 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
59482- int len;
59483+ long len;
59484 size_t bufsize = 0;
59485
59486 if (!rp)
59487 return;
59488
59489- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
59490- len >>= 2;
59491+ if (statp) {
59492+ len = (char*)statp - (char*)resv->iov_base;
59493+ len = resv->iov_len - len;
59494+ len >>= 2;
59495+ }
59496
59497 /* Don't cache excessive amounts of data and XDR failures */
59498 if (!statp || len > (256 >> 2)) {
59499diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
59500index 72cb28e..5b5f87d 100644
59501--- a/fs/nfsd/vfs.c
59502+++ b/fs/nfsd/vfs.c
59503@@ -993,7 +993,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
59504 } else {
59505 oldfs = get_fs();
59506 set_fs(KERNEL_DS);
59507- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
59508+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
59509 set_fs(oldfs);
59510 }
59511
59512@@ -1080,7 +1080,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
59513
59514 /* Write the data. */
59515 oldfs = get_fs(); set_fs(KERNEL_DS);
59516- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
59517+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
59518 set_fs(oldfs);
59519 if (host_err < 0)
59520 goto out_nfserr;
59521@@ -1626,7 +1626,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
59522 */
59523
59524 oldfs = get_fs(); set_fs(KERNEL_DS);
59525- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
59526+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
59527 set_fs(oldfs);
59528
59529 if (host_err < 0)
59530diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
59531index fea6bd5..8ee9d81 100644
59532--- a/fs/nls/nls_base.c
59533+++ b/fs/nls/nls_base.c
59534@@ -234,20 +234,22 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
59535
59536 int register_nls(struct nls_table * nls)
59537 {
59538- struct nls_table ** tmp = &tables;
59539+ struct nls_table *tmp = tables;
59540
59541 if (nls->next)
59542 return -EBUSY;
59543
59544 spin_lock(&nls_lock);
59545- while (*tmp) {
59546- if (nls == *tmp) {
59547+ while (tmp) {
59548+ if (nls == tmp) {
59549 spin_unlock(&nls_lock);
59550 return -EBUSY;
59551 }
59552- tmp = &(*tmp)->next;
59553+ tmp = tmp->next;
59554 }
59555- nls->next = tables;
59556+ pax_open_kernel();
59557+ *(struct nls_table **)&nls->next = tables;
59558+ pax_close_kernel();
59559 tables = nls;
59560 spin_unlock(&nls_lock);
59561 return 0;
59562@@ -255,12 +257,14 @@ int register_nls(struct nls_table * nls)
59563
59564 int unregister_nls(struct nls_table * nls)
59565 {
59566- struct nls_table ** tmp = &tables;
59567+ struct nls_table * const * tmp = &tables;
59568
59569 spin_lock(&nls_lock);
59570 while (*tmp) {
59571 if (nls == *tmp) {
59572- *tmp = nls->next;
59573+ pax_open_kernel();
59574+ *(struct nls_table **)tmp = nls->next;
59575+ pax_close_kernel();
59576 spin_unlock(&nls_lock);
59577 return 0;
59578 }
59579diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
59580index 7424929..35f6be5 100644
59581--- a/fs/nls/nls_euc-jp.c
59582+++ b/fs/nls/nls_euc-jp.c
59583@@ -561,8 +561,10 @@ static int __init init_nls_euc_jp(void)
59584 p_nls = load_nls("cp932");
59585
59586 if (p_nls) {
59587- table.charset2upper = p_nls->charset2upper;
59588- table.charset2lower = p_nls->charset2lower;
59589+ pax_open_kernel();
59590+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
59591+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
59592+ pax_close_kernel();
59593 return register_nls(&table);
59594 }
59595
59596diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
59597index e7bc1d7..06bd4bb 100644
59598--- a/fs/nls/nls_koi8-ru.c
59599+++ b/fs/nls/nls_koi8-ru.c
59600@@ -63,8 +63,10 @@ static int __init init_nls_koi8_ru(void)
59601 p_nls = load_nls("koi8-u");
59602
59603 if (p_nls) {
59604- table.charset2upper = p_nls->charset2upper;
59605- table.charset2lower = p_nls->charset2lower;
59606+ pax_open_kernel();
59607+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
59608+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
59609+ pax_close_kernel();
59610 return register_nls(&table);
59611 }
59612
59613diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
59614index e44cb64..4807084 100644
59615--- a/fs/notify/fanotify/fanotify_user.c
59616+++ b/fs/notify/fanotify/fanotify_user.c
59617@@ -253,8 +253,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
59618
59619 fd = fanotify_event_metadata.fd;
59620 ret = -EFAULT;
59621- if (copy_to_user(buf, &fanotify_event_metadata,
59622- fanotify_event_metadata.event_len))
59623+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
59624+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
59625 goto out_close_fd;
59626
59627 ret = prepare_for_access_response(group, event, fd);
59628diff --git a/fs/notify/notification.c b/fs/notify/notification.c
59629index 7b51b05..5ea5ef6 100644
59630--- a/fs/notify/notification.c
59631+++ b/fs/notify/notification.c
59632@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
59633 * get set to 0 so it will never get 'freed'
59634 */
59635 static struct fsnotify_event *q_overflow_event;
59636-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59637+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59638
59639 /**
59640 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
59641@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
59642 */
59643 u32 fsnotify_get_cookie(void)
59644 {
59645- return atomic_inc_return(&fsnotify_sync_cookie);
59646+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
59647 }
59648 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
59649
59650diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
59651index 9e38daf..5727cae 100644
59652--- a/fs/ntfs/dir.c
59653+++ b/fs/ntfs/dir.c
59654@@ -1310,7 +1310,7 @@ find_next_index_buffer:
59655 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
59656 ~(s64)(ndir->itype.index.block_size - 1)));
59657 /* Bounds checks. */
59658- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
59659+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
59660 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
59661 "inode 0x%lx or driver bug.", vdir->i_ino);
59662 goto err_out;
59663diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
59664index ea4ba9d..1e13d34 100644
59665--- a/fs/ntfs/file.c
59666+++ b/fs/ntfs/file.c
59667@@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
59668 char *addr;
59669 size_t total = 0;
59670 unsigned len;
59671- int left;
59672+ unsigned left;
59673
59674 do {
59675 len = PAGE_CACHE_SIZE - ofs;
59676diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
59677index 82650d5..db37dcf 100644
59678--- a/fs/ntfs/super.c
59679+++ b/fs/ntfs/super.c
59680@@ -685,7 +685,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59681 if (!silent)
59682 ntfs_error(sb, "Primary boot sector is invalid.");
59683 } else if (!silent)
59684- ntfs_error(sb, read_err_str, "primary");
59685+ ntfs_error(sb, read_err_str, "%s", "primary");
59686 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
59687 if (bh_primary)
59688 brelse(bh_primary);
59689@@ -701,7 +701,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59690 goto hotfix_primary_boot_sector;
59691 brelse(bh_backup);
59692 } else if (!silent)
59693- ntfs_error(sb, read_err_str, "backup");
59694+ ntfs_error(sb, read_err_str, "%s", "backup");
59695 /* Try to read NT3.51- backup boot sector. */
59696 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
59697 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
59698@@ -712,7 +712,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
59699 "sector.");
59700 brelse(bh_backup);
59701 } else if (!silent)
59702- ntfs_error(sb, read_err_str, "backup");
59703+ ntfs_error(sb, read_err_str, "%s", "backup");
59704 /* We failed. Cleanup and return. */
59705 if (bh_primary)
59706 brelse(bh_primary);
59707diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
59708index cd5496b..26a1055 100644
59709--- a/fs/ocfs2/localalloc.c
59710+++ b/fs/ocfs2/localalloc.c
59711@@ -1278,7 +1278,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
59712 goto bail;
59713 }
59714
59715- atomic_inc(&osb->alloc_stats.moves);
59716+ atomic_inc_unchecked(&osb->alloc_stats.moves);
59717
59718 bail:
59719 if (handle)
59720diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
59721index 3a90347..c40bef8 100644
59722--- a/fs/ocfs2/ocfs2.h
59723+++ b/fs/ocfs2/ocfs2.h
59724@@ -235,11 +235,11 @@ enum ocfs2_vol_state
59725
59726 struct ocfs2_alloc_stats
59727 {
59728- atomic_t moves;
59729- atomic_t local_data;
59730- atomic_t bitmap_data;
59731- atomic_t bg_allocs;
59732- atomic_t bg_extends;
59733+ atomic_unchecked_t moves;
59734+ atomic_unchecked_t local_data;
59735+ atomic_unchecked_t bitmap_data;
59736+ atomic_unchecked_t bg_allocs;
59737+ atomic_unchecked_t bg_extends;
59738 };
59739
59740 enum ocfs2_local_alloc_state
59741diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
59742index 5397c07..54afc55 100644
59743--- a/fs/ocfs2/suballoc.c
59744+++ b/fs/ocfs2/suballoc.c
59745@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
59746 mlog_errno(status);
59747 goto bail;
59748 }
59749- atomic_inc(&osb->alloc_stats.bg_extends);
59750+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
59751
59752 /* You should never ask for this much metadata */
59753 BUG_ON(bits_wanted >
59754@@ -2000,7 +2000,7 @@ int ocfs2_claim_metadata(handle_t *handle,
59755 mlog_errno(status);
59756 goto bail;
59757 }
59758- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59759+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59760
59761 *suballoc_loc = res.sr_bg_blkno;
59762 *suballoc_bit_start = res.sr_bit_offset;
59763@@ -2164,7 +2164,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
59764 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
59765 res->sr_bits);
59766
59767- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59768+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59769
59770 BUG_ON(res->sr_bits != 1);
59771
59772@@ -2206,7 +2206,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
59773 mlog_errno(status);
59774 goto bail;
59775 }
59776- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59777+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
59778
59779 BUG_ON(res.sr_bits != 1);
59780
59781@@ -2310,7 +2310,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
59782 cluster_start,
59783 num_clusters);
59784 if (!status)
59785- atomic_inc(&osb->alloc_stats.local_data);
59786+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
59787 } else {
59788 if (min_clusters > (osb->bitmap_cpg - 1)) {
59789 /* The only paths asking for contiguousness
59790@@ -2336,7 +2336,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
59791 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
59792 res.sr_bg_blkno,
59793 res.sr_bit_offset);
59794- atomic_inc(&osb->alloc_stats.bitmap_data);
59795+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
59796 *num_clusters = res.sr_bits;
59797 }
59798 }
59799diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
59800index d4e81e4..ad89f5f 100644
59801--- a/fs/ocfs2/super.c
59802+++ b/fs/ocfs2/super.c
59803@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
59804 "%10s => GlobalAllocs: %d LocalAllocs: %d "
59805 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
59806 "Stats",
59807- atomic_read(&osb->alloc_stats.bitmap_data),
59808- atomic_read(&osb->alloc_stats.local_data),
59809- atomic_read(&osb->alloc_stats.bg_allocs),
59810- atomic_read(&osb->alloc_stats.moves),
59811- atomic_read(&osb->alloc_stats.bg_extends));
59812+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
59813+ atomic_read_unchecked(&osb->alloc_stats.local_data),
59814+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
59815+ atomic_read_unchecked(&osb->alloc_stats.moves),
59816+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
59817
59818 out += snprintf(buf + out, len - out,
59819 "%10s => State: %u Descriptor: %llu Size: %u bits "
59820@@ -2121,11 +2121,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
59821 spin_lock_init(&osb->osb_xattr_lock);
59822 ocfs2_init_steal_slots(osb);
59823
59824- atomic_set(&osb->alloc_stats.moves, 0);
59825- atomic_set(&osb->alloc_stats.local_data, 0);
59826- atomic_set(&osb->alloc_stats.bitmap_data, 0);
59827- atomic_set(&osb->alloc_stats.bg_allocs, 0);
59828- atomic_set(&osb->alloc_stats.bg_extends, 0);
59829+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
59830+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
59831+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
59832+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
59833+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
59834
59835 /* Copy the blockcheck stats from the superblock probe */
59836 osb->osb_ecc_stats = *stats;
59837diff --git a/fs/open.c b/fs/open.c
59838index d420331..2dbb3fd 100644
59839--- a/fs/open.c
59840+++ b/fs/open.c
59841@@ -32,6 +32,8 @@
59842 #include <linux/dnotify.h>
59843 #include <linux/compat.h>
59844
59845+#define CREATE_TRACE_POINTS
59846+#include <trace/events/fs.h>
59847 #include "internal.h"
59848
59849 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
59850@@ -102,6 +104,8 @@ long vfs_truncate(struct path *path, loff_t length)
59851 error = locks_verify_truncate(inode, NULL, length);
59852 if (!error)
59853 error = security_path_truncate(path);
59854+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
59855+ error = -EACCES;
59856 if (!error)
59857 error = do_truncate(path->dentry, length, 0, NULL);
59858
59859@@ -186,6 +190,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
59860 error = locks_verify_truncate(inode, f.file, length);
59861 if (!error)
59862 error = security_path_truncate(&f.file->f_path);
59863+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
59864+ error = -EACCES;
59865 if (!error)
59866 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
59867 sb_end_write(inode->i_sb);
59868@@ -360,6 +366,9 @@ retry:
59869 if (__mnt_is_readonly(path.mnt))
59870 res = -EROFS;
59871
59872+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
59873+ res = -EACCES;
59874+
59875 out_path_release:
59876 path_put(&path);
59877 if (retry_estale(res, lookup_flags)) {
59878@@ -391,6 +400,8 @@ retry:
59879 if (error)
59880 goto dput_and_out;
59881
59882+ gr_log_chdir(path.dentry, path.mnt);
59883+
59884 set_fs_pwd(current->fs, &path);
59885
59886 dput_and_out:
59887@@ -420,6 +431,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
59888 goto out_putf;
59889
59890 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
59891+
59892+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
59893+ error = -EPERM;
59894+
59895+ if (!error)
59896+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
59897+
59898 if (!error)
59899 set_fs_pwd(current->fs, &f.file->f_path);
59900 out_putf:
59901@@ -449,7 +467,13 @@ retry:
59902 if (error)
59903 goto dput_and_out;
59904
59905+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
59906+ goto dput_and_out;
59907+
59908 set_fs_root(current->fs, &path);
59909+
59910+ gr_handle_chroot_chdir(&path);
59911+
59912 error = 0;
59913 dput_and_out:
59914 path_put(&path);
59915@@ -471,6 +495,16 @@ static int chmod_common(struct path *path, umode_t mode)
59916 if (error)
59917 return error;
59918 mutex_lock(&inode->i_mutex);
59919+
59920+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
59921+ error = -EACCES;
59922+ goto out_unlock;
59923+ }
59924+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
59925+ error = -EACCES;
59926+ goto out_unlock;
59927+ }
59928+
59929 error = security_path_chmod(path, mode);
59930 if (error)
59931 goto out_unlock;
59932@@ -530,6 +564,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
59933 uid = make_kuid(current_user_ns(), user);
59934 gid = make_kgid(current_user_ns(), group);
59935
59936+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
59937+ return -EACCES;
59938+
59939 newattrs.ia_valid = ATTR_CTIME;
59940 if (user != (uid_t) -1) {
59941 if (!uid_valid(uid))
59942@@ -974,6 +1011,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
59943 } else {
59944 fsnotify_open(f);
59945 fd_install(fd, f);
59946+ trace_do_sys_open(tmp->name, flags, mode);
59947 }
59948 }
59949 putname(tmp);
59950diff --git a/fs/pipe.c b/fs/pipe.c
59951index 0e0752e..7cfdd50 100644
59952--- a/fs/pipe.c
59953+++ b/fs/pipe.c
59954@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
59955
59956 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
59957 {
59958- if (pipe->files)
59959+ if (atomic_read(&pipe->files))
59960 mutex_lock_nested(&pipe->mutex, subclass);
59961 }
59962
59963@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
59964
59965 void pipe_unlock(struct pipe_inode_info *pipe)
59966 {
59967- if (pipe->files)
59968+ if (atomic_read(&pipe->files))
59969 mutex_unlock(&pipe->mutex);
59970 }
59971 EXPORT_SYMBOL(pipe_unlock);
59972@@ -449,9 +449,9 @@ redo:
59973 }
59974 if (bufs) /* More to do? */
59975 continue;
59976- if (!pipe->writers)
59977+ if (!atomic_read(&pipe->writers))
59978 break;
59979- if (!pipe->waiting_writers) {
59980+ if (!atomic_read(&pipe->waiting_writers)) {
59981 /* syscall merging: Usually we must not sleep
59982 * if O_NONBLOCK is set, or if we got some data.
59983 * But if a writer sleeps in kernel space, then
59984@@ -513,7 +513,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
59985 ret = 0;
59986 __pipe_lock(pipe);
59987
59988- if (!pipe->readers) {
59989+ if (!atomic_read(&pipe->readers)) {
59990 send_sig(SIGPIPE, current, 0);
59991 ret = -EPIPE;
59992 goto out;
59993@@ -562,7 +562,7 @@ redo1:
59994 for (;;) {
59995 int bufs;
59996
59997- if (!pipe->readers) {
59998+ if (!atomic_read(&pipe->readers)) {
59999 send_sig(SIGPIPE, current, 0);
60000 if (!ret)
60001 ret = -EPIPE;
60002@@ -653,9 +653,9 @@ redo2:
60003 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60004 do_wakeup = 0;
60005 }
60006- pipe->waiting_writers++;
60007+ atomic_inc(&pipe->waiting_writers);
60008 pipe_wait(pipe);
60009- pipe->waiting_writers--;
60010+ atomic_dec(&pipe->waiting_writers);
60011 }
60012 out:
60013 __pipe_unlock(pipe);
60014@@ -709,7 +709,7 @@ pipe_poll(struct file *filp, poll_table *wait)
60015 mask = 0;
60016 if (filp->f_mode & FMODE_READ) {
60017 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
60018- if (!pipe->writers && filp->f_version != pipe->w_counter)
60019+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
60020 mask |= POLLHUP;
60021 }
60022
60023@@ -719,7 +719,7 @@ pipe_poll(struct file *filp, poll_table *wait)
60024 * Most Unices do not set POLLERR for FIFOs but on Linux they
60025 * behave exactly like pipes for poll().
60026 */
60027- if (!pipe->readers)
60028+ if (!atomic_read(&pipe->readers))
60029 mask |= POLLERR;
60030 }
60031
60032@@ -731,7 +731,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
60033 int kill = 0;
60034
60035 spin_lock(&inode->i_lock);
60036- if (!--pipe->files) {
60037+ if (atomic_dec_and_test(&pipe->files)) {
60038 inode->i_pipe = NULL;
60039 kill = 1;
60040 }
60041@@ -748,11 +748,11 @@ pipe_release(struct inode *inode, struct file *file)
60042
60043 __pipe_lock(pipe);
60044 if (file->f_mode & FMODE_READ)
60045- pipe->readers--;
60046+ atomic_dec(&pipe->readers);
60047 if (file->f_mode & FMODE_WRITE)
60048- pipe->writers--;
60049+ atomic_dec(&pipe->writers);
60050
60051- if (pipe->readers || pipe->writers) {
60052+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
60053 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
60054 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60055 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
60056@@ -817,7 +817,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
60057 kfree(pipe);
60058 }
60059
60060-static struct vfsmount *pipe_mnt __read_mostly;
60061+struct vfsmount *pipe_mnt __read_mostly;
60062
60063 /*
60064 * pipefs_dname() is called from d_path().
60065@@ -847,8 +847,9 @@ static struct inode * get_pipe_inode(void)
60066 goto fail_iput;
60067
60068 inode->i_pipe = pipe;
60069- pipe->files = 2;
60070- pipe->readers = pipe->writers = 1;
60071+ atomic_set(&pipe->files, 2);
60072+ atomic_set(&pipe->readers, 1);
60073+ atomic_set(&pipe->writers, 1);
60074 inode->i_fop = &pipefifo_fops;
60075
60076 /*
60077@@ -1027,17 +1028,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
60078 spin_lock(&inode->i_lock);
60079 if (inode->i_pipe) {
60080 pipe = inode->i_pipe;
60081- pipe->files++;
60082+ atomic_inc(&pipe->files);
60083 spin_unlock(&inode->i_lock);
60084 } else {
60085 spin_unlock(&inode->i_lock);
60086 pipe = alloc_pipe_info();
60087 if (!pipe)
60088 return -ENOMEM;
60089- pipe->files = 1;
60090+ atomic_set(&pipe->files, 1);
60091 spin_lock(&inode->i_lock);
60092 if (unlikely(inode->i_pipe)) {
60093- inode->i_pipe->files++;
60094+ atomic_inc(&inode->i_pipe->files);
60095 spin_unlock(&inode->i_lock);
60096 free_pipe_info(pipe);
60097 pipe = inode->i_pipe;
60098@@ -1062,10 +1063,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
60099 * opened, even when there is no process writing the FIFO.
60100 */
60101 pipe->r_counter++;
60102- if (pipe->readers++ == 0)
60103+ if (atomic_inc_return(&pipe->readers) == 1)
60104 wake_up_partner(pipe);
60105
60106- if (!is_pipe && !pipe->writers) {
60107+ if (!is_pipe && !atomic_read(&pipe->writers)) {
60108 if ((filp->f_flags & O_NONBLOCK)) {
60109 /* suppress POLLHUP until we have
60110 * seen a writer */
60111@@ -1084,14 +1085,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
60112 * errno=ENXIO when there is no process reading the FIFO.
60113 */
60114 ret = -ENXIO;
60115- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
60116+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
60117 goto err;
60118
60119 pipe->w_counter++;
60120- if (!pipe->writers++)
60121+ if (atomic_inc_return(&pipe->writers) == 1)
60122 wake_up_partner(pipe);
60123
60124- if (!is_pipe && !pipe->readers) {
60125+ if (!is_pipe && !atomic_read(&pipe->readers)) {
60126 if (wait_for_partner(pipe, &pipe->r_counter))
60127 goto err_wr;
60128 }
60129@@ -1105,11 +1106,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
60130 * the process can at least talk to itself.
60131 */
60132
60133- pipe->readers++;
60134- pipe->writers++;
60135+ atomic_inc(&pipe->readers);
60136+ atomic_inc(&pipe->writers);
60137 pipe->r_counter++;
60138 pipe->w_counter++;
60139- if (pipe->readers == 1 || pipe->writers == 1)
60140+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
60141 wake_up_partner(pipe);
60142 break;
60143
60144@@ -1123,13 +1124,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
60145 return 0;
60146
60147 err_rd:
60148- if (!--pipe->readers)
60149+ if (atomic_dec_and_test(&pipe->readers))
60150 wake_up_interruptible(&pipe->wait);
60151 ret = -ERESTARTSYS;
60152 goto err;
60153
60154 err_wr:
60155- if (!--pipe->writers)
60156+ if (atomic_dec_and_test(&pipe->writers))
60157 wake_up_interruptible(&pipe->wait);
60158 ret = -ERESTARTSYS;
60159 goto err;
60160diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
60161index 15af622..0e9f4467 100644
60162--- a/fs/proc/Kconfig
60163+++ b/fs/proc/Kconfig
60164@@ -30,12 +30,12 @@ config PROC_FS
60165
60166 config PROC_KCORE
60167 bool "/proc/kcore support" if !ARM
60168- depends on PROC_FS && MMU
60169+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
60170
60171 config PROC_VMCORE
60172 bool "/proc/vmcore support"
60173- depends on PROC_FS && CRASH_DUMP
60174- default y
60175+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
60176+ default n
60177 help
60178 Exports the dump image of crashed kernel in ELF format.
60179
60180@@ -59,8 +59,8 @@ config PROC_SYSCTL
60181 limited in memory.
60182
60183 config PROC_PAGE_MONITOR
60184- default y
60185- depends on PROC_FS && MMU
60186+ default n
60187+ depends on PROC_FS && MMU && !GRKERNSEC
60188 bool "Enable /proc page monitoring" if EXPERT
60189 help
60190 Various /proc files exist to monitor process memory utilization:
60191diff --git a/fs/proc/array.c b/fs/proc/array.c
60192index cbd0f1b..adec3f0 100644
60193--- a/fs/proc/array.c
60194+++ b/fs/proc/array.c
60195@@ -60,6 +60,7 @@
60196 #include <linux/tty.h>
60197 #include <linux/string.h>
60198 #include <linux/mman.h>
60199+#include <linux/grsecurity.h>
60200 #include <linux/proc_fs.h>
60201 #include <linux/ioport.h>
60202 #include <linux/uaccess.h>
60203@@ -363,6 +364,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
60204 seq_putc(m, '\n');
60205 }
60206
60207+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
60208+static inline void task_pax(struct seq_file *m, struct task_struct *p)
60209+{
60210+ if (p->mm)
60211+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
60212+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
60213+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
60214+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
60215+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
60216+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
60217+ else
60218+ seq_printf(m, "PaX:\t-----\n");
60219+}
60220+#endif
60221+
60222 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
60223 struct pid *pid, struct task_struct *task)
60224 {
60225@@ -381,9 +397,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
60226 task_cpus_allowed(m, task);
60227 cpuset_task_status_allowed(m, task);
60228 task_context_switch_counts(m, task);
60229+
60230+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
60231+ task_pax(m, task);
60232+#endif
60233+
60234+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
60235+ task_grsec_rbac(m, task);
60236+#endif
60237+
60238 return 0;
60239 }
60240
60241+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60242+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
60243+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
60244+ _mm->pax_flags & MF_PAX_SEGMEXEC))
60245+#endif
60246+
60247 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60248 struct pid *pid, struct task_struct *task, int whole)
60249 {
60250@@ -405,6 +436,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60251 char tcomm[sizeof(task->comm)];
60252 unsigned long flags;
60253
60254+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60255+ if (current->exec_id != m->exec_id) {
60256+ gr_log_badprocpid("stat");
60257+ return 0;
60258+ }
60259+#endif
60260+
60261 state = *get_task_state(task);
60262 vsize = eip = esp = 0;
60263 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
60264@@ -476,6 +514,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60265 gtime = task_gtime(task);
60266 }
60267
60268+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60269+ if (PAX_RAND_FLAGS(mm)) {
60270+ eip = 0;
60271+ esp = 0;
60272+ wchan = 0;
60273+ }
60274+#endif
60275+#ifdef CONFIG_GRKERNSEC_HIDESYM
60276+ wchan = 0;
60277+ eip =0;
60278+ esp =0;
60279+#endif
60280+
60281 /* scale priority and nice values from timeslices to -20..20 */
60282 /* to make it look like a "normal" Unix priority/nice value */
60283 priority = task_prio(task);
60284@@ -512,9 +563,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60285 seq_put_decimal_ull(m, ' ', vsize);
60286 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
60287 seq_put_decimal_ull(m, ' ', rsslim);
60288+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60289+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
60290+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
60291+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
60292+#else
60293 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
60294 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
60295 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
60296+#endif
60297 seq_put_decimal_ull(m, ' ', esp);
60298 seq_put_decimal_ull(m, ' ', eip);
60299 /* The signal information here is obsolete.
60300@@ -536,7 +593,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
60301 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
60302 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
60303
60304- if (mm && permitted) {
60305+ if (mm && permitted
60306+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60307+ && !PAX_RAND_FLAGS(mm)
60308+#endif
60309+ ) {
60310 seq_put_decimal_ull(m, ' ', mm->start_data);
60311 seq_put_decimal_ull(m, ' ', mm->end_data);
60312 seq_put_decimal_ull(m, ' ', mm->start_brk);
60313@@ -574,8 +635,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
60314 struct pid *pid, struct task_struct *task)
60315 {
60316 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
60317- struct mm_struct *mm = get_task_mm(task);
60318+ struct mm_struct *mm;
60319
60320+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60321+ if (current->exec_id != m->exec_id) {
60322+ gr_log_badprocpid("statm");
60323+ return 0;
60324+ }
60325+#endif
60326+ mm = get_task_mm(task);
60327 if (mm) {
60328 size = task_statm(mm, &shared, &text, &data, &resident);
60329 mmput(mm);
60330@@ -598,6 +666,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
60331 return 0;
60332 }
60333
60334+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60335+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
60336+{
60337+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
60338+}
60339+#endif
60340+
60341 #ifdef CONFIG_CHECKPOINT_RESTORE
60342 static struct pid *
60343 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
60344diff --git a/fs/proc/base.c b/fs/proc/base.c
60345index 1485e38..8ad4236 100644
60346--- a/fs/proc/base.c
60347+++ b/fs/proc/base.c
60348@@ -113,6 +113,14 @@ struct pid_entry {
60349 union proc_op op;
60350 };
60351
60352+struct getdents_callback {
60353+ struct linux_dirent __user * current_dir;
60354+ struct linux_dirent __user * previous;
60355+ struct file * file;
60356+ int count;
60357+ int error;
60358+};
60359+
60360 #define NOD(NAME, MODE, IOP, FOP, OP) { \
60361 .name = (NAME), \
60362 .len = sizeof(NAME) - 1, \
60363@@ -210,6 +218,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
60364 if (!mm->arg_end)
60365 goto out_mm; /* Shh! No looking before we're done */
60366
60367+ if (gr_acl_handle_procpidmem(task))
60368+ goto out_mm;
60369+
60370 len = mm->arg_end - mm->arg_start;
60371
60372 if (len > PAGE_SIZE)
60373@@ -237,12 +248,28 @@ out:
60374 return res;
60375 }
60376
60377+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60378+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
60379+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
60380+ _mm->pax_flags & MF_PAX_SEGMEXEC))
60381+#endif
60382+
60383 static int proc_pid_auxv(struct task_struct *task, char *buffer)
60384 {
60385 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
60386 int res = PTR_ERR(mm);
60387 if (mm && !IS_ERR(mm)) {
60388 unsigned int nwords = 0;
60389+
60390+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60391+ /* allow if we're currently ptracing this task */
60392+ if (PAX_RAND_FLAGS(mm) &&
60393+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
60394+ mmput(mm);
60395+ return 0;
60396+ }
60397+#endif
60398+
60399 do {
60400 nwords += 2;
60401 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
60402@@ -256,7 +283,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
60403 }
60404
60405
60406-#ifdef CONFIG_KALLSYMS
60407+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60408 /*
60409 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
60410 * Returns the resolved symbol. If that fails, simply return the address.
60411@@ -295,7 +322,7 @@ static void unlock_trace(struct task_struct *task)
60412 mutex_unlock(&task->signal->cred_guard_mutex);
60413 }
60414
60415-#ifdef CONFIG_STACKTRACE
60416+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60417
60418 #define MAX_STACK_TRACE_DEPTH 64
60419
60420@@ -518,7 +545,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
60421 return count;
60422 }
60423
60424-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60425+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60426 static int proc_pid_syscall(struct task_struct *task, char *buffer)
60427 {
60428 long nr;
60429@@ -547,7 +574,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
60430 /************************************************************************/
60431
60432 /* permission checks */
60433-static int proc_fd_access_allowed(struct inode *inode)
60434+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
60435 {
60436 struct task_struct *task;
60437 int allowed = 0;
60438@@ -557,7 +584,10 @@ static int proc_fd_access_allowed(struct inode *inode)
60439 */
60440 task = get_proc_task(inode);
60441 if (task) {
60442- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
60443+ if (log)
60444+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
60445+ else
60446+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
60447 put_task_struct(task);
60448 }
60449 return allowed;
60450@@ -588,10 +618,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
60451 struct task_struct *task,
60452 int hide_pid_min)
60453 {
60454+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60455+ return false;
60456+
60457+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60458+ rcu_read_lock();
60459+ {
60460+ const struct cred *tmpcred = current_cred();
60461+ const struct cred *cred = __task_cred(task);
60462+
60463+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
60464+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60465+ || in_group_p(grsec_proc_gid)
60466+#endif
60467+ ) {
60468+ rcu_read_unlock();
60469+ return true;
60470+ }
60471+ }
60472+ rcu_read_unlock();
60473+
60474+ if (!pid->hide_pid)
60475+ return false;
60476+#endif
60477+
60478 if (pid->hide_pid < hide_pid_min)
60479 return true;
60480 if (in_group_p(pid->pid_gid))
60481 return true;
60482+
60483 return ptrace_may_access(task, PTRACE_MODE_READ);
60484 }
60485
60486@@ -609,7 +664,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
60487 put_task_struct(task);
60488
60489 if (!has_perms) {
60490+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60491+ {
60492+#else
60493 if (pid->hide_pid == 2) {
60494+#endif
60495 /*
60496 * Let's make getdents(), stat(), and open()
60497 * consistent with each other. If a process
60498@@ -707,6 +766,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
60499 if (!task)
60500 return -ESRCH;
60501
60502+ if (gr_acl_handle_procpidmem(task)) {
60503+ put_task_struct(task);
60504+ return -EPERM;
60505+ }
60506+
60507 mm = mm_access(task, mode);
60508 put_task_struct(task);
60509
60510@@ -722,6 +786,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
60511
60512 file->private_data = mm;
60513
60514+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60515+ file->f_version = current->exec_id;
60516+#endif
60517+
60518 return 0;
60519 }
60520
60521@@ -743,6 +811,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
60522 ssize_t copied;
60523 char *page;
60524
60525+#ifdef CONFIG_GRKERNSEC
60526+ if (write)
60527+ return -EPERM;
60528+#endif
60529+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60530+ if (file->f_version != current->exec_id) {
60531+ gr_log_badprocpid("mem");
60532+ return 0;
60533+ }
60534+#endif
60535+
60536 if (!mm)
60537 return 0;
60538
60539@@ -755,7 +834,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
60540 goto free;
60541
60542 while (count > 0) {
60543- int this_len = min_t(int, count, PAGE_SIZE);
60544+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
60545
60546 if (write && copy_from_user(page, buf, this_len)) {
60547 copied = -EFAULT;
60548@@ -847,6 +926,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
60549 if (!mm)
60550 return 0;
60551
60552+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60553+ if (file->f_version != current->exec_id) {
60554+ gr_log_badprocpid("environ");
60555+ return 0;
60556+ }
60557+#endif
60558+
60559 page = (char *)__get_free_page(GFP_TEMPORARY);
60560 if (!page)
60561 return -ENOMEM;
60562@@ -856,7 +942,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
60563 goto free;
60564 while (count > 0) {
60565 size_t this_len, max_len;
60566- int retval;
60567+ ssize_t retval;
60568
60569 if (src >= (mm->env_end - mm->env_start))
60570 break;
60571@@ -1461,7 +1547,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
60572 int error = -EACCES;
60573
60574 /* Are we allowed to snoop on the tasks file descriptors? */
60575- if (!proc_fd_access_allowed(inode))
60576+ if (!proc_fd_access_allowed(inode, 0))
60577 goto out;
60578
60579 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
60580@@ -1505,8 +1591,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
60581 struct path path;
60582
60583 /* Are we allowed to snoop on the tasks file descriptors? */
60584- if (!proc_fd_access_allowed(inode))
60585- goto out;
60586+ /* logging this is needed for learning on chromium to work properly,
60587+ but we don't want to flood the logs from 'ps' which does a readlink
60588+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
60589+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
60590+ */
60591+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
60592+ if (!proc_fd_access_allowed(inode,0))
60593+ goto out;
60594+ } else {
60595+ if (!proc_fd_access_allowed(inode,1))
60596+ goto out;
60597+ }
60598
60599 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
60600 if (error)
60601@@ -1556,7 +1652,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
60602 rcu_read_lock();
60603 cred = __task_cred(task);
60604 inode->i_uid = cred->euid;
60605+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60606+ inode->i_gid = grsec_proc_gid;
60607+#else
60608 inode->i_gid = cred->egid;
60609+#endif
60610 rcu_read_unlock();
60611 }
60612 security_task_to_inode(task, inode);
60613@@ -1592,10 +1692,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
60614 return -ENOENT;
60615 }
60616 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
60617+#ifdef CONFIG_GRKERNSEC_PROC_USER
60618+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
60619+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60620+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
60621+#endif
60622 task_dumpable(task)) {
60623 cred = __task_cred(task);
60624 stat->uid = cred->euid;
60625+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60626+ stat->gid = grsec_proc_gid;
60627+#else
60628 stat->gid = cred->egid;
60629+#endif
60630 }
60631 }
60632 rcu_read_unlock();
60633@@ -1633,11 +1742,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
60634
60635 if (task) {
60636 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
60637+#ifdef CONFIG_GRKERNSEC_PROC_USER
60638+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
60639+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60640+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
60641+#endif
60642 task_dumpable(task)) {
60643 rcu_read_lock();
60644 cred = __task_cred(task);
60645 inode->i_uid = cred->euid;
60646+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60647+ inode->i_gid = grsec_proc_gid;
60648+#else
60649 inode->i_gid = cred->egid;
60650+#endif
60651 rcu_read_unlock();
60652 } else {
60653 inode->i_uid = GLOBAL_ROOT_UID;
60654@@ -2166,6 +2284,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
60655 if (!task)
60656 goto out_no_task;
60657
60658+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60659+ goto out;
60660+
60661 /*
60662 * Yes, it does not scale. And it should not. Don't add
60663 * new entries into /proc/<tgid>/ without very good reasons.
60664@@ -2196,6 +2317,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
60665 if (!task)
60666 return -ENOENT;
60667
60668+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60669+ goto out;
60670+
60671 if (!dir_emit_dots(file, ctx))
60672 goto out;
60673
60674@@ -2585,7 +2709,7 @@ static const struct pid_entry tgid_base_stuff[] = {
60675 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
60676 #endif
60677 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
60678-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60679+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60680 INF("syscall", S_IRUGO, proc_pid_syscall),
60681 #endif
60682 INF("cmdline", S_IRUGO, proc_pid_cmdline),
60683@@ -2610,10 +2734,10 @@ static const struct pid_entry tgid_base_stuff[] = {
60684 #ifdef CONFIG_SECURITY
60685 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
60686 #endif
60687-#ifdef CONFIG_KALLSYMS
60688+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60689 INF("wchan", S_IRUGO, proc_pid_wchan),
60690 #endif
60691-#ifdef CONFIG_STACKTRACE
60692+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60693 ONE("stack", S_IRUGO, proc_pid_stack),
60694 #endif
60695 #ifdef CONFIG_SCHEDSTATS
60696@@ -2647,6 +2771,9 @@ static const struct pid_entry tgid_base_stuff[] = {
60697 #ifdef CONFIG_HARDWALL
60698 INF("hardwall", S_IRUGO, proc_pid_hardwall),
60699 #endif
60700+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60701+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
60702+#endif
60703 #ifdef CONFIG_USER_NS
60704 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
60705 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
60706@@ -2777,7 +2904,14 @@ static int proc_pid_instantiate(struct inode *dir,
60707 if (!inode)
60708 goto out;
60709
60710+#ifdef CONFIG_GRKERNSEC_PROC_USER
60711+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
60712+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
60713+ inode->i_gid = grsec_proc_gid;
60714+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
60715+#else
60716 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
60717+#endif
60718 inode->i_op = &proc_tgid_base_inode_operations;
60719 inode->i_fop = &proc_tgid_base_operations;
60720 inode->i_flags|=S_IMMUTABLE;
60721@@ -2815,7 +2949,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
60722 if (!task)
60723 goto out;
60724
60725+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
60726+ goto out_put_task;
60727+
60728 result = proc_pid_instantiate(dir, dentry, task, NULL);
60729+out_put_task:
60730 put_task_struct(task);
60731 out:
60732 return ERR_PTR(result);
60733@@ -2921,7 +3059,7 @@ static const struct pid_entry tid_base_stuff[] = {
60734 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
60735 #endif
60736 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
60737-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
60738+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
60739 INF("syscall", S_IRUGO, proc_pid_syscall),
60740 #endif
60741 INF("cmdline", S_IRUGO, proc_pid_cmdline),
60742@@ -2948,10 +3086,10 @@ static const struct pid_entry tid_base_stuff[] = {
60743 #ifdef CONFIG_SECURITY
60744 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
60745 #endif
60746-#ifdef CONFIG_KALLSYMS
60747+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60748 INF("wchan", S_IRUGO, proc_pid_wchan),
60749 #endif
60750-#ifdef CONFIG_STACKTRACE
60751+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
60752 ONE("stack", S_IRUGO, proc_pid_stack),
60753 #endif
60754 #ifdef CONFIG_SCHEDSTATS
60755diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
60756index 82676e3..5f8518a 100644
60757--- a/fs/proc/cmdline.c
60758+++ b/fs/proc/cmdline.c
60759@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
60760
60761 static int __init proc_cmdline_init(void)
60762 {
60763+#ifdef CONFIG_GRKERNSEC_PROC_ADD
60764+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
60765+#else
60766 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
60767+#endif
60768 return 0;
60769 }
60770 module_init(proc_cmdline_init);
60771diff --git a/fs/proc/devices.c b/fs/proc/devices.c
60772index b143471..bb105e5 100644
60773--- a/fs/proc/devices.c
60774+++ b/fs/proc/devices.c
60775@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
60776
60777 static int __init proc_devices_init(void)
60778 {
60779+#ifdef CONFIG_GRKERNSEC_PROC_ADD
60780+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
60781+#else
60782 proc_create("devices", 0, NULL, &proc_devinfo_operations);
60783+#endif
60784 return 0;
60785 }
60786 module_init(proc_devices_init);
60787diff --git a/fs/proc/fd.c b/fs/proc/fd.c
60788index 985ea88..d118a0a 100644
60789--- a/fs/proc/fd.c
60790+++ b/fs/proc/fd.c
60791@@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v)
60792 if (!task)
60793 return -ENOENT;
60794
60795- files = get_files_struct(task);
60796+ if (!gr_acl_handle_procpidmem(task))
60797+ files = get_files_struct(task);
60798 put_task_struct(task);
60799
60800 if (files) {
60801@@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
60802 */
60803 int proc_fd_permission(struct inode *inode, int mask)
60804 {
60805+ struct task_struct *task;
60806 int rv = generic_permission(inode, mask);
60807- if (rv == 0)
60808- return 0;
60809+
60810 if (task_tgid(current) == proc_pid(inode))
60811 rv = 0;
60812+
60813+ task = get_proc_task(inode);
60814+ if (task == NULL)
60815+ return rv;
60816+
60817+ if (gr_acl_handle_procpidmem(task))
60818+ rv = -EACCES;
60819+
60820+ put_task_struct(task);
60821+
60822 return rv;
60823 }
60824
60825diff --git a/fs/proc/inode.c b/fs/proc/inode.c
60826index 8eaa1ba..cc6ff42 100644
60827--- a/fs/proc/inode.c
60828+++ b/fs/proc/inode.c
60829@@ -23,11 +23,17 @@
60830 #include <linux/slab.h>
60831 #include <linux/mount.h>
60832 #include <linux/magic.h>
60833+#include <linux/grsecurity.h>
60834
60835 #include <asm/uaccess.h>
60836
60837 #include "internal.h"
60838
60839+#ifdef CONFIG_PROC_SYSCTL
60840+extern const struct inode_operations proc_sys_inode_operations;
60841+extern const struct inode_operations proc_sys_dir_operations;
60842+#endif
60843+
60844 static void proc_evict_inode(struct inode *inode)
60845 {
60846 struct proc_dir_entry *de;
60847@@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
60848 ns = PROC_I(inode)->ns.ns;
60849 if (ns_ops && ns)
60850 ns_ops->put(ns);
60851+
60852+#ifdef CONFIG_PROC_SYSCTL
60853+ if (inode->i_op == &proc_sys_inode_operations ||
60854+ inode->i_op == &proc_sys_dir_operations)
60855+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
60856+#endif
60857+
60858 }
60859
60860 static struct kmem_cache * proc_inode_cachep;
60861@@ -405,7 +418,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
60862 if (de->mode) {
60863 inode->i_mode = de->mode;
60864 inode->i_uid = de->uid;
60865+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
60866+ inode->i_gid = grsec_proc_gid;
60867+#else
60868 inode->i_gid = de->gid;
60869+#endif
60870 }
60871 if (de->size)
60872 inode->i_size = de->size;
60873diff --git a/fs/proc/internal.h b/fs/proc/internal.h
60874index 651d09a..60c73ae 100644
60875--- a/fs/proc/internal.h
60876+++ b/fs/proc/internal.h
60877@@ -155,6 +155,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
60878 struct pid *, struct task_struct *);
60879 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
60880 struct pid *, struct task_struct *);
60881+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
60882+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
60883+#endif
60884
60885 /*
60886 * base.c
60887diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
60888index 05029c0..7ea1987 100644
60889--- a/fs/proc/interrupts.c
60890+++ b/fs/proc/interrupts.c
60891@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
60892
60893 static int __init proc_interrupts_init(void)
60894 {
60895+#ifdef CONFIG_GRKERNSEC_PROC_ADD
60896+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
60897+#else
60898 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
60899+#endif
60900 return 0;
60901 }
60902 module_init(proc_interrupts_init);
60903diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
60904index 06ea155..9a798c7 100644
60905--- a/fs/proc/kcore.c
60906+++ b/fs/proc/kcore.c
60907@@ -484,9 +484,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
60908 * the addresses in the elf_phdr on our list.
60909 */
60910 start = kc_offset_to_vaddr(*fpos - elf_buflen);
60911- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
60912+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
60913+ if (tsz > buflen)
60914 tsz = buflen;
60915-
60916+
60917 while (buflen) {
60918 struct kcore_list *m;
60919
60920@@ -515,20 +516,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
60921 kfree(elf_buf);
60922 } else {
60923 if (kern_addr_valid(start)) {
60924- unsigned long n;
60925+ char *elf_buf;
60926+ mm_segment_t oldfs;
60927
60928- n = copy_to_user(buffer, (char *)start, tsz);
60929- /*
60930- * We cannot distinguish between fault on source
60931- * and fault on destination. When this happens
60932- * we clear too and hope it will trigger the
60933- * EFAULT again.
60934- */
60935- if (n) {
60936- if (clear_user(buffer + tsz - n,
60937- n))
60938+ elf_buf = kmalloc(tsz, GFP_KERNEL);
60939+ if (!elf_buf)
60940+ return -ENOMEM;
60941+ oldfs = get_fs();
60942+ set_fs(KERNEL_DS);
60943+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
60944+ set_fs(oldfs);
60945+ if (copy_to_user(buffer, elf_buf, tsz)) {
60946+ kfree(elf_buf);
60947 return -EFAULT;
60948+ }
60949 }
60950+ set_fs(oldfs);
60951+ kfree(elf_buf);
60952 } else {
60953 if (clear_user(buffer, tsz))
60954 return -EFAULT;
60955@@ -548,6 +552,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
60956
60957 static int open_kcore(struct inode *inode, struct file *filp)
60958 {
60959+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
60960+ return -EPERM;
60961+#endif
60962 if (!capable(CAP_SYS_RAWIO))
60963 return -EPERM;
60964 if (kcore_need_update)
60965diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
60966index 59d85d6..ac6fc05 100644
60967--- a/fs/proc/meminfo.c
60968+++ b/fs/proc/meminfo.c
60969@@ -153,7 +153,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
60970 vmi.used >> 10,
60971 vmi.largest_chunk >> 10
60972 #ifdef CONFIG_MEMORY_FAILURE
60973- ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
60974+ ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
60975 #endif
60976 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
60977 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
60978diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
60979index ccfd99b..1b7e255 100644
60980--- a/fs/proc/nommu.c
60981+++ b/fs/proc/nommu.c
60982@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
60983 if (len < 1)
60984 len = 1;
60985 seq_printf(m, "%*c", len, ' ');
60986- seq_path(m, &file->f_path, "");
60987+ seq_path(m, &file->f_path, "\n\\");
60988 }
60989
60990 seq_putc(m, '\n');
60991diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
60992index 4677bb7..408e936 100644
60993--- a/fs/proc/proc_net.c
60994+++ b/fs/proc/proc_net.c
60995@@ -23,6 +23,7 @@
60996 #include <linux/nsproxy.h>
60997 #include <net/net_namespace.h>
60998 #include <linux/seq_file.h>
60999+#include <linux/grsecurity.h>
61000
61001 #include "internal.h"
61002
61003@@ -109,6 +110,17 @@ static struct net *get_proc_task_net(struct inode *dir)
61004 struct task_struct *task;
61005 struct nsproxy *ns;
61006 struct net *net = NULL;
61007+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61008+ const struct cred *cred = current_cred();
61009+#endif
61010+
61011+#ifdef CONFIG_GRKERNSEC_PROC_USER
61012+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
61013+ return net;
61014+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61015+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
61016+ return net;
61017+#endif
61018
61019 rcu_read_lock();
61020 task = pid_task(proc_pid(dir), PIDTYPE_PID);
61021diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
61022index 7129046..6914844 100644
61023--- a/fs/proc/proc_sysctl.c
61024+++ b/fs/proc/proc_sysctl.c
61025@@ -11,13 +11,21 @@
61026 #include <linux/namei.h>
61027 #include <linux/mm.h>
61028 #include <linux/module.h>
61029+#include <linux/nsproxy.h>
61030+#ifdef CONFIG_GRKERNSEC
61031+#include <net/net_namespace.h>
61032+#endif
61033 #include "internal.h"
61034
61035+extern int gr_handle_chroot_sysctl(const int op);
61036+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
61037+ const int op);
61038+
61039 static const struct dentry_operations proc_sys_dentry_operations;
61040 static const struct file_operations proc_sys_file_operations;
61041-static const struct inode_operations proc_sys_inode_operations;
61042+const struct inode_operations proc_sys_inode_operations;
61043 static const struct file_operations proc_sys_dir_file_operations;
61044-static const struct inode_operations proc_sys_dir_operations;
61045+const struct inode_operations proc_sys_dir_operations;
61046
61047 void proc_sys_poll_notify(struct ctl_table_poll *poll)
61048 {
61049@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
61050
61051 err = NULL;
61052 d_set_d_op(dentry, &proc_sys_dentry_operations);
61053+
61054+ gr_handle_proc_create(dentry, inode);
61055+
61056 d_add(dentry, inode);
61057
61058 out:
61059@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61060 struct inode *inode = file_inode(filp);
61061 struct ctl_table_header *head = grab_header(inode);
61062 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
61063+ int op = write ? MAY_WRITE : MAY_READ;
61064 ssize_t error;
61065 size_t res;
61066
61067@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61068 * and won't be until we finish.
61069 */
61070 error = -EPERM;
61071- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
61072+ if (sysctl_perm(head, table, op))
61073 goto out;
61074
61075 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
61076@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
61077 if (!table->proc_handler)
61078 goto out;
61079
61080+#ifdef CONFIG_GRKERNSEC
61081+ error = -EPERM;
61082+ if (gr_handle_chroot_sysctl(op))
61083+ goto out;
61084+ dget(filp->f_path.dentry);
61085+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
61086+ dput(filp->f_path.dentry);
61087+ goto out;
61088+ }
61089+ dput(filp->f_path.dentry);
61090+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
61091+ goto out;
61092+ if (write) {
61093+ if (current->nsproxy->net_ns != table->extra2) {
61094+ if (!capable(CAP_SYS_ADMIN))
61095+ goto out;
61096+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
61097+ goto out;
61098+ }
61099+#endif
61100+
61101 /* careful: calling conventions are nasty here */
61102 res = count;
61103 error = table->proc_handler(table, write, buf, &res, ppos);
61104@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
61105 return false;
61106 } else {
61107 d_set_d_op(child, &proc_sys_dentry_operations);
61108+
61109+ gr_handle_proc_create(child, inode);
61110+
61111 d_add(child, inode);
61112 }
61113 } else {
61114@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
61115 if ((*pos)++ < ctx->pos)
61116 return true;
61117
61118+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
61119+ return 0;
61120+
61121 if (unlikely(S_ISLNK(table->mode)))
61122 res = proc_sys_link_fill_cache(file, ctx, head, table);
61123 else
61124@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
61125 if (IS_ERR(head))
61126 return PTR_ERR(head);
61127
61128+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
61129+ return -ENOENT;
61130+
61131 generic_fillattr(inode, stat);
61132 if (table)
61133 stat->mode = (stat->mode & S_IFMT) | table->mode;
61134@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
61135 .llseek = generic_file_llseek,
61136 };
61137
61138-static const struct inode_operations proc_sys_inode_operations = {
61139+const struct inode_operations proc_sys_inode_operations = {
61140 .permission = proc_sys_permission,
61141 .setattr = proc_sys_setattr,
61142 .getattr = proc_sys_getattr,
61143 };
61144
61145-static const struct inode_operations proc_sys_dir_operations = {
61146+const struct inode_operations proc_sys_dir_operations = {
61147 .lookup = proc_sys_lookup,
61148 .permission = proc_sys_permission,
61149 .setattr = proc_sys_setattr,
61150@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
61151 static struct ctl_dir *new_dir(struct ctl_table_set *set,
61152 const char *name, int namelen)
61153 {
61154- struct ctl_table *table;
61155+ ctl_table_no_const *table;
61156 struct ctl_dir *new;
61157 struct ctl_node *node;
61158 char *new_name;
61159@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
61160 return NULL;
61161
61162 node = (struct ctl_node *)(new + 1);
61163- table = (struct ctl_table *)(node + 1);
61164+ table = (ctl_table_no_const *)(node + 1);
61165 new_name = (char *)(table + 2);
61166 memcpy(new_name, name, namelen);
61167 new_name[namelen] = '\0';
61168@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
61169 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
61170 struct ctl_table_root *link_root)
61171 {
61172- struct ctl_table *link_table, *entry, *link;
61173+ ctl_table_no_const *link_table, *link;
61174+ struct ctl_table *entry;
61175 struct ctl_table_header *links;
61176 struct ctl_node *node;
61177 char *link_name;
61178@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
61179 return NULL;
61180
61181 node = (struct ctl_node *)(links + 1);
61182- link_table = (struct ctl_table *)(node + nr_entries);
61183+ link_table = (ctl_table_no_const *)(node + nr_entries);
61184 link_name = (char *)&link_table[nr_entries + 1];
61185
61186 for (link = link_table, entry = table; entry->procname; link++, entry++) {
61187@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61188 struct ctl_table_header ***subheader, struct ctl_table_set *set,
61189 struct ctl_table *table)
61190 {
61191- struct ctl_table *ctl_table_arg = NULL;
61192- struct ctl_table *entry, *files;
61193+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
61194+ struct ctl_table *entry;
61195 int nr_files = 0;
61196 int nr_dirs = 0;
61197 int err = -ENOMEM;
61198@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61199 nr_files++;
61200 }
61201
61202- files = table;
61203 /* If there are mixed files and directories we need a new table */
61204 if (nr_dirs && nr_files) {
61205- struct ctl_table *new;
61206+ ctl_table_no_const *new;
61207 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
61208 GFP_KERNEL);
61209 if (!files)
61210@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
61211 /* Register everything except a directory full of subdirectories */
61212 if (nr_files || !nr_dirs) {
61213 struct ctl_table_header *header;
61214- header = __register_sysctl_table(set, path, files);
61215+ header = __register_sysctl_table(set, path, files ? files : table);
61216 if (!header) {
61217 kfree(ctl_table_arg);
61218 goto out;
61219diff --git a/fs/proc/root.c b/fs/proc/root.c
61220index 87dbcbe..55e1b4d 100644
61221--- a/fs/proc/root.c
61222+++ b/fs/proc/root.c
61223@@ -186,7 +186,15 @@ void __init proc_root_init(void)
61224 #ifdef CONFIG_PROC_DEVICETREE
61225 proc_device_tree_init();
61226 #endif
61227+#ifdef CONFIG_GRKERNSEC_PROC_ADD
61228+#ifdef CONFIG_GRKERNSEC_PROC_USER
61229+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
61230+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61231+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
61232+#endif
61233+#else
61234 proc_mkdir("bus", NULL);
61235+#endif
61236 proc_sys_init();
61237 }
61238
61239diff --git a/fs/proc/self.c b/fs/proc/self.c
61240index 6b6a993..807cccc 100644
61241--- a/fs/proc/self.c
61242+++ b/fs/proc/self.c
61243@@ -39,7 +39,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
61244 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
61245 void *cookie)
61246 {
61247- char *s = nd_get_link(nd);
61248+ const char *s = nd_get_link(nd);
61249 if (!IS_ERR(s))
61250 kfree(s);
61251 }
61252diff --git a/fs/proc/stat.c b/fs/proc/stat.c
61253index 1cf86c0..0ee1ca5 100644
61254--- a/fs/proc/stat.c
61255+++ b/fs/proc/stat.c
61256@@ -11,6 +11,7 @@
61257 #include <linux/irqnr.h>
61258 #include <asm/cputime.h>
61259 #include <linux/tick.h>
61260+#include <linux/grsecurity.h>
61261
61262 #ifndef arch_irq_stat_cpu
61263 #define arch_irq_stat_cpu(cpu) 0
61264@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
61265 u64 sum_softirq = 0;
61266 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
61267 struct timespec boottime;
61268+ int unrestricted = 1;
61269+
61270+#ifdef CONFIG_GRKERNSEC_PROC_ADD
61271+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61272+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
61273+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
61274+ && !in_group_p(grsec_proc_gid)
61275+#endif
61276+ )
61277+ unrestricted = 0;
61278+#endif
61279+#endif
61280
61281 user = nice = system = idle = iowait =
61282 irq = softirq = steal = 0;
61283@@ -94,6 +107,7 @@ static int show_stat(struct seq_file *p, void *v)
61284 getboottime(&boottime);
61285 jif = boottime.tv_sec;
61286
61287+ if (unrestricted) {
61288 for_each_possible_cpu(i) {
61289 user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
61290 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
61291@@ -116,6 +130,7 @@ static int show_stat(struct seq_file *p, void *v)
61292 }
61293 }
61294 sum += arch_irq_stat();
61295+ }
61296
61297 seq_puts(p, "cpu ");
61298 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
61299@@ -131,6 +146,7 @@ static int show_stat(struct seq_file *p, void *v)
61300 seq_putc(p, '\n');
61301
61302 for_each_online_cpu(i) {
61303+ if (unrestricted) {
61304 /* Copy values here to work around gcc-2.95.3, gcc-2.96 */
61305 user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
61306 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
61307@@ -142,6 +158,7 @@ static int show_stat(struct seq_file *p, void *v)
61308 steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
61309 guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
61310 guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
61311+ }
61312 seq_printf(p, "cpu%d", i);
61313 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
61314 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
61315@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
61316
61317 /* sum again ? it could be updated? */
61318 for_each_irq_nr(j)
61319- seq_put_decimal_ull(p, ' ', kstat_irqs(j));
61320+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
61321
61322 seq_printf(p,
61323 "\nctxt %llu\n"
61324@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
61325 "processes %lu\n"
61326 "procs_running %lu\n"
61327 "procs_blocked %lu\n",
61328- nr_context_switches(),
61329+ unrestricted ? nr_context_switches() : 0ULL,
61330 (unsigned long)jif,
61331- total_forks,
61332- nr_running(),
61333- nr_iowait());
61334+ unrestricted ? total_forks : 0UL,
61335+ unrestricted ? nr_running() : 0UL,
61336+ unrestricted ? nr_iowait() : 0UL);
61337
61338 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
61339
61340diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
61341index 390bdab..83c1e8a 100644
61342--- a/fs/proc/task_mmu.c
61343+++ b/fs/proc/task_mmu.c
61344@@ -12,12 +12,19 @@
61345 #include <linux/swap.h>
61346 #include <linux/swapops.h>
61347 #include <linux/mmu_notifier.h>
61348+#include <linux/grsecurity.h>
61349
61350 #include <asm/elf.h>
61351 #include <asm/uaccess.h>
61352 #include <asm/tlbflush.h>
61353 #include "internal.h"
61354
61355+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61356+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
61357+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
61358+ _mm->pax_flags & MF_PAX_SEGMEXEC))
61359+#endif
61360+
61361 void task_mem(struct seq_file *m, struct mm_struct *mm)
61362 {
61363 unsigned long data, text, lib, swap;
61364@@ -53,8 +60,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61365 "VmExe:\t%8lu kB\n"
61366 "VmLib:\t%8lu kB\n"
61367 "VmPTE:\t%8lu kB\n"
61368- "VmSwap:\t%8lu kB\n",
61369- hiwater_vm << (PAGE_SHIFT-10),
61370+ "VmSwap:\t%8lu kB\n"
61371+
61372+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
61373+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
61374+#endif
61375+
61376+ ,hiwater_vm << (PAGE_SHIFT-10),
61377 total_vm << (PAGE_SHIFT-10),
61378 mm->locked_vm << (PAGE_SHIFT-10),
61379 mm->pinned_vm << (PAGE_SHIFT-10),
61380@@ -63,7 +75,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61381 data << (PAGE_SHIFT-10),
61382 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
61383 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
61384- swap << (PAGE_SHIFT-10));
61385+ swap << (PAGE_SHIFT-10)
61386+
61387+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
61388+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61389+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
61390+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
61391+#else
61392+ , mm->context.user_cs_base
61393+ , mm->context.user_cs_limit
61394+#endif
61395+#endif
61396+
61397+ );
61398 }
61399
61400 unsigned long task_vsize(struct mm_struct *mm)
61401@@ -278,13 +302,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61402 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
61403 }
61404
61405- /* We don't show the stack guard page in /proc/maps */
61406+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61407+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
61408+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
61409+#else
61410 start = vma->vm_start;
61411- if (stack_guard_page_start(vma, start))
61412- start += PAGE_SIZE;
61413 end = vma->vm_end;
61414- if (stack_guard_page_end(vma, end))
61415- end -= PAGE_SIZE;
61416+#endif
61417
61418 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
61419 start,
61420@@ -293,7 +317,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61421 flags & VM_WRITE ? 'w' : '-',
61422 flags & VM_EXEC ? 'x' : '-',
61423 flags & VM_MAYSHARE ? 's' : 'p',
61424+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61425+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
61426+#else
61427 pgoff,
61428+#endif
61429 MAJOR(dev), MINOR(dev), ino, &len);
61430
61431 /*
61432@@ -302,7 +330,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61433 */
61434 if (file) {
61435 pad_len_spaces(m, len);
61436- seq_path(m, &file->f_path, "\n");
61437+ seq_path(m, &file->f_path, "\n\\");
61438 goto done;
61439 }
61440
61441@@ -328,8 +356,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
61442 * Thread stack in /proc/PID/task/TID/maps or
61443 * the main process stack.
61444 */
61445- if (!is_pid || (vma->vm_start <= mm->start_stack &&
61446- vma->vm_end >= mm->start_stack)) {
61447+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
61448+ (vma->vm_start <= mm->start_stack &&
61449+ vma->vm_end >= mm->start_stack)) {
61450 name = "[stack]";
61451 } else {
61452 /* Thread stack in /proc/PID/maps */
61453@@ -353,6 +382,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
61454 struct proc_maps_private *priv = m->private;
61455 struct task_struct *task = priv->task;
61456
61457+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61458+ if (current->exec_id != m->exec_id) {
61459+ gr_log_badprocpid("maps");
61460+ return 0;
61461+ }
61462+#endif
61463+
61464 show_map_vma(m, vma, is_pid);
61465
61466 if (m->count < m->size) /* vma is copied successfully */
61467@@ -590,12 +626,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
61468 .private = &mss,
61469 };
61470
61471+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61472+ if (current->exec_id != m->exec_id) {
61473+ gr_log_badprocpid("smaps");
61474+ return 0;
61475+ }
61476+#endif
61477 memset(&mss, 0, sizeof mss);
61478- mss.vma = vma;
61479- /* mmap_sem is held in m_start */
61480- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
61481- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
61482-
61483+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61484+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
61485+#endif
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+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61491+ }
61492+#endif
61493 show_map_vma(m, vma, is_pid);
61494
61495 seq_printf(m,
61496@@ -613,7 +660,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
61497 "KernelPageSize: %8lu kB\n"
61498 "MMUPageSize: %8lu kB\n"
61499 "Locked: %8lu kB\n",
61500+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61501+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
61502+#else
61503 (vma->vm_end - vma->vm_start) >> 10,
61504+#endif
61505 mss.resident >> 10,
61506 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
61507 mss.shared_clean >> 10,
61508@@ -1390,6 +1441,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
61509 int n;
61510 char buffer[50];
61511
61512+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61513+ if (current->exec_id != m->exec_id) {
61514+ gr_log_badprocpid("numa_maps");
61515+ return 0;
61516+ }
61517+#endif
61518+
61519 if (!mm)
61520 return 0;
61521
61522@@ -1409,11 +1467,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
61523 if (n < 0)
61524 return n;
61525
61526+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61527+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
61528+#else
61529 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
61530+#endif
61531
61532 if (file) {
61533 seq_printf(m, " file=");
61534- seq_path(m, &file->f_path, "\n\t= ");
61535+ seq_path(m, &file->f_path, "\n\t\\= ");
61536 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
61537 seq_printf(m, " heap");
61538 } else {
61539diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
61540index 56123a6..5a2f6ec 100644
61541--- a/fs/proc/task_nommu.c
61542+++ b/fs/proc/task_nommu.c
61543@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
61544 else
61545 bytes += kobjsize(mm);
61546
61547- if (current->fs && current->fs->users > 1)
61548+ if (current->fs && atomic_read(&current->fs->users) > 1)
61549 sbytes += kobjsize(current->fs);
61550 else
61551 bytes += kobjsize(current->fs);
61552@@ -168,7 +168,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
61553
61554 if (file) {
61555 pad_len_spaces(m, len);
61556- seq_path(m, &file->f_path, "");
61557+ seq_path(m, &file->f_path, "\n\\");
61558 } else if (mm) {
61559 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
61560
61561diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
61562index 9100d69..f1f9fc9 100644
61563--- a/fs/proc/vmcore.c
61564+++ b/fs/proc/vmcore.c
61565@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
61566 nr_bytes = count;
61567
61568 /* If pfn is not ram, return zeros for sparse dump files */
61569- if (pfn_is_ram(pfn) == 0)
61570- memset(buf, 0, nr_bytes);
61571- else {
61572+ if (pfn_is_ram(pfn) == 0) {
61573+ if (userbuf) {
61574+ if (clear_user((char __force_user *)buf, nr_bytes))
61575+ return -EFAULT;
61576+ } else
61577+ memset(buf, 0, nr_bytes);
61578+ } else {
61579 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
61580 offset, userbuf);
61581 if (tmp < 0)
61582@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
61583 if (*fpos < m->offset + m->size) {
61584 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
61585 start = m->paddr + *fpos - m->offset;
61586- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
61587+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
61588 if (tmp < 0)
61589 return tmp;
61590 buflen -= tsz;
61591diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
61592index b00fcc9..e0c6381 100644
61593--- a/fs/qnx6/qnx6.h
61594+++ b/fs/qnx6/qnx6.h
61595@@ -74,7 +74,7 @@ enum {
61596 BYTESEX_BE,
61597 };
61598
61599-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
61600+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
61601 {
61602 if (sbi->s_bytesex == BYTESEX_LE)
61603 return le64_to_cpu((__force __le64)n);
61604@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
61605 return (__force __fs64)cpu_to_be64(n);
61606 }
61607
61608-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
61609+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
61610 {
61611 if (sbi->s_bytesex == BYTESEX_LE)
61612 return le32_to_cpu((__force __le32)n);
61613diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
61614index 16e8abb..2dcf914 100644
61615--- a/fs/quota/netlink.c
61616+++ b/fs/quota/netlink.c
61617@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
61618 void quota_send_warning(struct kqid qid, dev_t dev,
61619 const char warntype)
61620 {
61621- static atomic_t seq;
61622+ static atomic_unchecked_t seq;
61623 struct sk_buff *skb;
61624 void *msg_head;
61625 int ret;
61626@@ -49,7 +49,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
61627 "VFS: Not enough memory to send quota warning.\n");
61628 return;
61629 }
61630- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
61631+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
61632 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
61633 if (!msg_head) {
61634 printk(KERN_ERR
61635diff --git a/fs/read_write.c b/fs/read_write.c
61636index e3cd280..a378473 100644
61637--- a/fs/read_write.c
61638+++ b/fs/read_write.c
61639@@ -438,7 +438,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
61640
61641 old_fs = get_fs();
61642 set_fs(get_ds());
61643- p = (__force const char __user *)buf;
61644+ p = (const char __force_user *)buf;
61645 if (count > MAX_RW_COUNT)
61646 count = MAX_RW_COUNT;
61647 if (file->f_op->write)
61648diff --git a/fs/readdir.c b/fs/readdir.c
61649index 93d71e5..6a14be8 100644
61650--- a/fs/readdir.c
61651+++ b/fs/readdir.c
61652@@ -17,6 +17,7 @@
61653 #include <linux/security.h>
61654 #include <linux/syscalls.h>
61655 #include <linux/unistd.h>
61656+#include <linux/namei.h>
61657
61658 #include <asm/uaccess.h>
61659
61660@@ -69,6 +70,7 @@ struct old_linux_dirent {
61661 struct readdir_callback {
61662 struct dir_context ctx;
61663 struct old_linux_dirent __user * dirent;
61664+ struct file * file;
61665 int result;
61666 };
61667
61668@@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
61669 buf->result = -EOVERFLOW;
61670 return -EOVERFLOW;
61671 }
61672+
61673+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61674+ return 0;
61675+
61676 buf->result++;
61677 dirent = buf->dirent;
61678 if (!access_ok(VERIFY_WRITE, dirent,
61679@@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
61680 if (!f.file)
61681 return -EBADF;
61682
61683+ buf.file = f.file;
61684 error = iterate_dir(f.file, &buf.ctx);
61685 if (buf.result)
61686 error = buf.result;
61687@@ -142,6 +149,7 @@ struct getdents_callback {
61688 struct dir_context ctx;
61689 struct linux_dirent __user * current_dir;
61690 struct linux_dirent __user * previous;
61691+ struct file * file;
61692 int count;
61693 int error;
61694 };
61695@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
61696 buf->error = -EOVERFLOW;
61697 return -EOVERFLOW;
61698 }
61699+
61700+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61701+ return 0;
61702+
61703 dirent = buf->previous;
61704 if (dirent) {
61705 if (__put_user(offset, &dirent->d_off))
61706@@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
61707 if (!f.file)
61708 return -EBADF;
61709
61710+ buf.file = f.file;
61711 error = iterate_dir(f.file, &buf.ctx);
61712 if (error >= 0)
61713 error = buf.error;
61714@@ -226,6 +239,7 @@ struct getdents_callback64 {
61715 struct dir_context ctx;
61716 struct linux_dirent64 __user * current_dir;
61717 struct linux_dirent64 __user * previous;
61718+ struct file *file;
61719 int count;
61720 int error;
61721 };
61722@@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
61723 buf->error = -EINVAL; /* only used if we fail.. */
61724 if (reclen > buf->count)
61725 return -EINVAL;
61726+
61727+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61728+ return 0;
61729+
61730 dirent = buf->previous;
61731 if (dirent) {
61732 if (__put_user(offset, &dirent->d_off))
61733@@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
61734 if (!f.file)
61735 return -EBADF;
61736
61737+ buf.file = f.file;
61738 error = iterate_dir(f.file, &buf.ctx);
61739 if (error >= 0)
61740 error = buf.error;
61741diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
61742index 2b7882b..1c5ef48 100644
61743--- a/fs/reiserfs/do_balan.c
61744+++ b/fs/reiserfs/do_balan.c
61745@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
61746 return;
61747 }
61748
61749- atomic_inc(&(fs_generation(tb->tb_sb)));
61750+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
61751 do_balance_starts(tb);
61752
61753 /* balance leaf returns 0 except if combining L R and S into
61754diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
61755index a958444..42b2323 100644
61756--- a/fs/reiserfs/procfs.c
61757+++ b/fs/reiserfs/procfs.c
61758@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
61759 "SMALL_TAILS " : "NO_TAILS ",
61760 replay_only(sb) ? "REPLAY_ONLY " : "",
61761 convert_reiserfs(sb) ? "CONV " : "",
61762- atomic_read(&r->s_generation_counter),
61763+ atomic_read_unchecked(&r->s_generation_counter),
61764 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
61765 SF(s_do_balance), SF(s_unneeded_left_neighbor),
61766 SF(s_good_search_by_key_reada), SF(s_bmaps),
61767diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
61768index f8adaee..0eeeeca 100644
61769--- a/fs/reiserfs/reiserfs.h
61770+++ b/fs/reiserfs/reiserfs.h
61771@@ -453,7 +453,7 @@ struct reiserfs_sb_info {
61772 /* Comment? -Hans */
61773 wait_queue_head_t s_wait;
61774 /* To be obsoleted soon by per buffer seals.. -Hans */
61775- atomic_t s_generation_counter; // increased by one every time the
61776+ atomic_unchecked_t s_generation_counter; // increased by one every time the
61777 // tree gets re-balanced
61778 unsigned long s_properties; /* File system properties. Currently holds
61779 on-disk FS format */
61780@@ -1982,7 +1982,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
61781 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
61782
61783 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
61784-#define get_generation(s) atomic_read (&fs_generation(s))
61785+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
61786 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
61787 #define __fs_changed(gen,s) (gen != get_generation (s))
61788 #define fs_changed(gen,s) \
61789diff --git a/fs/select.c b/fs/select.c
61790index dfd5cb1..1754d57 100644
61791--- a/fs/select.c
61792+++ b/fs/select.c
61793@@ -20,6 +20,7 @@
61794 #include <linux/export.h>
61795 #include <linux/slab.h>
61796 #include <linux/poll.h>
61797+#include <linux/security.h>
61798 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
61799 #include <linux/file.h>
61800 #include <linux/fdtable.h>
61801@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
61802 struct poll_list *walk = head;
61803 unsigned long todo = nfds;
61804
61805+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
61806 if (nfds > rlimit(RLIMIT_NOFILE))
61807 return -EINVAL;
61808
61809diff --git a/fs/seq_file.c b/fs/seq_file.c
61810index a290157..ec3211a 100644
61811--- a/fs/seq_file.c
61812+++ b/fs/seq_file.c
61813@@ -10,6 +10,7 @@
61814 #include <linux/seq_file.h>
61815 #include <linux/slab.h>
61816 #include <linux/cred.h>
61817+#include <linux/sched.h>
61818
61819 #include <asm/uaccess.h>
61820 #include <asm/page.h>
61821@@ -60,6 +61,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
61822 #ifdef CONFIG_USER_NS
61823 p->user_ns = file->f_cred->user_ns;
61824 #endif
61825+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61826+ p->exec_id = current->exec_id;
61827+#endif
61828
61829 /*
61830 * Wrappers around seq_open(e.g. swaps_open) need to be
61831@@ -96,7 +100,7 @@ static int traverse(struct seq_file *m, loff_t offset)
61832 return 0;
61833 }
61834 if (!m->buf) {
61835- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
61836+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
61837 if (!m->buf)
61838 return -ENOMEM;
61839 }
61840@@ -136,7 +140,7 @@ static int traverse(struct seq_file *m, loff_t offset)
61841 Eoverflow:
61842 m->op->stop(m, p);
61843 kfree(m->buf);
61844- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
61845+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
61846 return !m->buf ? -ENOMEM : -EAGAIN;
61847 }
61848
61849@@ -152,7 +156,7 @@ Eoverflow:
61850 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61851 {
61852 struct seq_file *m = file->private_data;
61853- size_t copied = 0;
61854+ ssize_t copied = 0;
61855 loff_t pos;
61856 size_t n;
61857 void *p;
61858@@ -191,7 +195,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61859
61860 /* grab buffer if we didn't have one */
61861 if (!m->buf) {
61862- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
61863+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
61864 if (!m->buf)
61865 goto Enomem;
61866 }
61867@@ -232,7 +236,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
61868 goto Fill;
61869 m->op->stop(m, p);
61870 kfree(m->buf);
61871- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
61872+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
61873 if (!m->buf)
61874 goto Enomem;
61875 m->count = 0;
61876@@ -583,7 +587,7 @@ static void single_stop(struct seq_file *p, void *v)
61877 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
61878 void *data)
61879 {
61880- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
61881+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
61882 int res = -ENOMEM;
61883
61884 if (op) {
61885diff --git a/fs/splice.c b/fs/splice.c
61886index 3b7ee65..87fc2e4 100644
61887--- a/fs/splice.c
61888+++ b/fs/splice.c
61889@@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61890 pipe_lock(pipe);
61891
61892 for (;;) {
61893- if (!pipe->readers) {
61894+ if (!atomic_read(&pipe->readers)) {
61895 send_sig(SIGPIPE, current, 0);
61896 if (!ret)
61897 ret = -EPIPE;
61898@@ -219,7 +219,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61899 page_nr++;
61900 ret += buf->len;
61901
61902- if (pipe->files)
61903+ if (atomic_read(&pipe->files))
61904 do_wakeup = 1;
61905
61906 if (!--spd->nr_pages)
61907@@ -250,9 +250,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
61908 do_wakeup = 0;
61909 }
61910
61911- pipe->waiting_writers++;
61912+ atomic_inc(&pipe->waiting_writers);
61913 pipe_wait(pipe);
61914- pipe->waiting_writers--;
61915+ atomic_dec(&pipe->waiting_writers);
61916 }
61917
61918 pipe_unlock(pipe);
61919@@ -565,7 +565,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
61920 old_fs = get_fs();
61921 set_fs(get_ds());
61922 /* The cast to a user pointer is valid due to the set_fs() */
61923- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
61924+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
61925 set_fs(old_fs);
61926
61927 return res;
61928@@ -580,7 +580,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
61929 old_fs = get_fs();
61930 set_fs(get_ds());
61931 /* The cast to a user pointer is valid due to the set_fs() */
61932- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
61933+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
61934 set_fs(old_fs);
61935
61936 return res;
61937@@ -633,7 +633,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
61938 goto err;
61939
61940 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
61941- vec[i].iov_base = (void __user *) page_address(page);
61942+ vec[i].iov_base = (void __force_user *) page_address(page);
61943 vec[i].iov_len = this_len;
61944 spd.pages[i] = page;
61945 spd.nr_pages++;
61946@@ -829,7 +829,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
61947 ops->release(pipe, buf);
61948 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
61949 pipe->nrbufs--;
61950- if (pipe->files)
61951+ if (atomic_read(&pipe->files))
61952 sd->need_wakeup = true;
61953 }
61954
61955@@ -854,10 +854,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
61956 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
61957 {
61958 while (!pipe->nrbufs) {
61959- if (!pipe->writers)
61960+ if (!atomic_read(&pipe->writers))
61961 return 0;
61962
61963- if (!pipe->waiting_writers && sd->num_spliced)
61964+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
61965 return 0;
61966
61967 if (sd->flags & SPLICE_F_NONBLOCK)
61968@@ -1179,7 +1179,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
61969 * out of the pipe right after the splice_to_pipe(). So set
61970 * PIPE_READERS appropriately.
61971 */
61972- pipe->readers = 1;
61973+ atomic_set(&pipe->readers, 1);
61974
61975 current->splice_pipe = pipe;
61976 }
61977@@ -1475,6 +1475,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
61978
61979 partial[buffers].offset = off;
61980 partial[buffers].len = plen;
61981+ partial[buffers].private = 0;
61982
61983 off = 0;
61984 len -= plen;
61985@@ -1777,9 +1778,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
61986 ret = -ERESTARTSYS;
61987 break;
61988 }
61989- if (!pipe->writers)
61990+ if (!atomic_read(&pipe->writers))
61991 break;
61992- if (!pipe->waiting_writers) {
61993+ if (!atomic_read(&pipe->waiting_writers)) {
61994 if (flags & SPLICE_F_NONBLOCK) {
61995 ret = -EAGAIN;
61996 break;
61997@@ -1811,7 +1812,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
61998 pipe_lock(pipe);
61999
62000 while (pipe->nrbufs >= pipe->buffers) {
62001- if (!pipe->readers) {
62002+ if (!atomic_read(&pipe->readers)) {
62003 send_sig(SIGPIPE, current, 0);
62004 ret = -EPIPE;
62005 break;
62006@@ -1824,9 +1825,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
62007 ret = -ERESTARTSYS;
62008 break;
62009 }
62010- pipe->waiting_writers++;
62011+ atomic_inc(&pipe->waiting_writers);
62012 pipe_wait(pipe);
62013- pipe->waiting_writers--;
62014+ atomic_dec(&pipe->waiting_writers);
62015 }
62016
62017 pipe_unlock(pipe);
62018@@ -1862,14 +1863,14 @@ retry:
62019 pipe_double_lock(ipipe, opipe);
62020
62021 do {
62022- if (!opipe->readers) {
62023+ if (!atomic_read(&opipe->readers)) {
62024 send_sig(SIGPIPE, current, 0);
62025 if (!ret)
62026 ret = -EPIPE;
62027 break;
62028 }
62029
62030- if (!ipipe->nrbufs && !ipipe->writers)
62031+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
62032 break;
62033
62034 /*
62035@@ -1966,7 +1967,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
62036 pipe_double_lock(ipipe, opipe);
62037
62038 do {
62039- if (!opipe->readers) {
62040+ if (!atomic_read(&opipe->readers)) {
62041 send_sig(SIGPIPE, current, 0);
62042 if (!ret)
62043 ret = -EPIPE;
62044@@ -2011,7 +2012,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
62045 * return EAGAIN if we have the potential of some data in the
62046 * future, otherwise just return 0
62047 */
62048- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
62049+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
62050 ret = -EAGAIN;
62051
62052 pipe_unlock(ipipe);
62053diff --git a/fs/stat.c b/fs/stat.c
62054index ae0c3ce..9ee641c 100644
62055--- a/fs/stat.c
62056+++ b/fs/stat.c
62057@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
62058 stat->gid = inode->i_gid;
62059 stat->rdev = inode->i_rdev;
62060 stat->size = i_size_read(inode);
62061- stat->atime = inode->i_atime;
62062- stat->mtime = inode->i_mtime;
62063+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
62064+ stat->atime = inode->i_ctime;
62065+ stat->mtime = inode->i_ctime;
62066+ } else {
62067+ stat->atime = inode->i_atime;
62068+ stat->mtime = inode->i_mtime;
62069+ }
62070 stat->ctime = inode->i_ctime;
62071 stat->blksize = (1 << inode->i_blkbits);
62072 stat->blocks = inode->i_blocks;
62073@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
62074 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
62075 {
62076 struct inode *inode = path->dentry->d_inode;
62077+ int retval;
62078
62079- if (inode->i_op->getattr)
62080- return inode->i_op->getattr(path->mnt, path->dentry, stat);
62081+ if (inode->i_op->getattr) {
62082+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
62083+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
62084+ stat->atime = stat->ctime;
62085+ stat->mtime = stat->ctime;
62086+ }
62087+ return retval;
62088+ }
62089
62090 generic_fillattr(inode, stat);
62091 return 0;
62092diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
62093index c590cab..6dfd6fc 100644
62094--- a/fs/sysfs/bin.c
62095+++ b/fs/sysfs/bin.c
62096@@ -234,13 +234,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
62097 return ret;
62098 }
62099
62100-static int bin_access(struct vm_area_struct *vma, unsigned long addr,
62101- void *buf, int len, int write)
62102+static ssize_t bin_access(struct vm_area_struct *vma, unsigned long addr,
62103+ void *buf, size_t len, int write)
62104 {
62105 struct file *file = vma->vm_file;
62106 struct bin_buffer *bb = file->private_data;
62107 struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
62108- int ret;
62109+ ssize_t ret;
62110
62111 if (!bb->vm_ops)
62112 return -EINVAL;
62113diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
62114index 4d83ced..049dc45 100644
62115--- a/fs/sysfs/dir.c
62116+++ b/fs/sysfs/dir.c
62117@@ -40,7 +40,7 @@ static DEFINE_IDA(sysfs_ino_ida);
62118 *
62119 * Returns 31 bit hash of ns + name (so it fits in an off_t )
62120 */
62121-static unsigned int sysfs_name_hash(const void *ns, const char *name)
62122+static unsigned int sysfs_name_hash(const void *ns, const unsigned char *name)
62123 {
62124 unsigned long hash = init_name_hash();
62125 unsigned int len = strlen(name);
62126@@ -675,6 +675,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
62127 struct sysfs_dirent *sd;
62128 int rc;
62129
62130+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
62131+ const char *parent_name = parent_sd->s_name;
62132+
62133+ mode = S_IFDIR | S_IRWXU;
62134+
62135+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
62136+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
62137+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
62138+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
62139+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
62140+#endif
62141+
62142 /* allocate */
62143 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
62144 if (!sd)
62145diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
62146index 15ef5eb..e474372 100644
62147--- a/fs/sysfs/file.c
62148+++ b/fs/sysfs/file.c
62149@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
62150
62151 struct sysfs_open_dirent {
62152 atomic_t refcnt;
62153- atomic_t event;
62154+ atomic_unchecked_t event;
62155 wait_queue_head_t poll;
62156 struct list_head buffers; /* goes through sysfs_buffer.list */
62157 };
62158@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry *dentry, struct sysfs_buffer *buffer)
62159 if (!sysfs_get_active(attr_sd))
62160 return -ENODEV;
62161
62162- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
62163+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
62164 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
62165
62166 sysfs_put_active(attr_sd);
62167@@ -284,7 +284,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
62168 return -ENOMEM;
62169
62170 atomic_set(&new_od->refcnt, 0);
62171- atomic_set(&new_od->event, 1);
62172+ atomic_set_unchecked(&new_od->event, 1);
62173 init_waitqueue_head(&new_od->poll);
62174 INIT_LIST_HEAD(&new_od->buffers);
62175 goto retry;
62176@@ -430,7 +430,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
62177
62178 sysfs_put_active(attr_sd);
62179
62180- if (buffer->event != atomic_read(&od->event))
62181+ if (buffer->event != atomic_read_unchecked(&od->event))
62182 goto trigger;
62183
62184 return DEFAULT_POLLMASK;
62185@@ -450,7 +450,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
62186 if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) {
62187 od = sd->s_attr.open;
62188 if (od) {
62189- atomic_inc(&od->event);
62190+ atomic_inc_unchecked(&od->event);
62191 wake_up_interruptible(&od->poll);
62192 }
62193 }
62194diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
62195index 2dd4507..62a215a 100644
62196--- a/fs/sysfs/symlink.c
62197+++ b/fs/sysfs/symlink.c
62198@@ -308,7 +308,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
62199 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd,
62200 void *cookie)
62201 {
62202- char *page = nd_get_link(nd);
62203+ const char *page = nd_get_link(nd);
62204 if (!IS_ERR(page))
62205 free_page((unsigned long)page);
62206 }
62207diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
62208index 69d4889..a810bd4 100644
62209--- a/fs/sysv/sysv.h
62210+++ b/fs/sysv/sysv.h
62211@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
62212 #endif
62213 }
62214
62215-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
62216+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
62217 {
62218 if (sbi->s_bytesex == BYTESEX_PDP)
62219 return PDP_swab((__force __u32)n);
62220diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
62221index e18b988..f1d4ad0f 100644
62222--- a/fs/ubifs/io.c
62223+++ b/fs/ubifs/io.c
62224@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
62225 return err;
62226 }
62227
62228-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
62229+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
62230 {
62231 int err;
62232
62233diff --git a/fs/udf/misc.c b/fs/udf/misc.c
62234index c175b4d..8f36a16 100644
62235--- a/fs/udf/misc.c
62236+++ b/fs/udf/misc.c
62237@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
62238
62239 u8 udf_tag_checksum(const struct tag *t)
62240 {
62241- u8 *data = (u8 *)t;
62242+ const u8 *data = (const u8 *)t;
62243 u8 checksum = 0;
62244 int i;
62245 for (i = 0; i < sizeof(struct tag); ++i)
62246diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
62247index 8d974c4..b82f6ec 100644
62248--- a/fs/ufs/swab.h
62249+++ b/fs/ufs/swab.h
62250@@ -22,7 +22,7 @@ enum {
62251 BYTESEX_BE
62252 };
62253
62254-static inline u64
62255+static inline u64 __intentional_overflow(-1)
62256 fs64_to_cpu(struct super_block *sbp, __fs64 n)
62257 {
62258 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
62259@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
62260 return (__force __fs64)cpu_to_be64(n);
62261 }
62262
62263-static inline u32
62264+static inline u32 __intentional_overflow(-1)
62265 fs32_to_cpu(struct super_block *sbp, __fs32 n)
62266 {
62267 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
62268diff --git a/fs/utimes.c b/fs/utimes.c
62269index f4fb7ec..3fe03c0 100644
62270--- a/fs/utimes.c
62271+++ b/fs/utimes.c
62272@@ -1,6 +1,7 @@
62273 #include <linux/compiler.h>
62274 #include <linux/file.h>
62275 #include <linux/fs.h>
62276+#include <linux/security.h>
62277 #include <linux/linkage.h>
62278 #include <linux/mount.h>
62279 #include <linux/namei.h>
62280@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
62281 goto mnt_drop_write_and_out;
62282 }
62283 }
62284+
62285+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
62286+ error = -EACCES;
62287+ goto mnt_drop_write_and_out;
62288+ }
62289+
62290 mutex_lock(&inode->i_mutex);
62291 error = notify_change(path->dentry, &newattrs);
62292 mutex_unlock(&inode->i_mutex);
62293diff --git a/fs/xattr.c b/fs/xattr.c
62294index 3377dff..f394815 100644
62295--- a/fs/xattr.c
62296+++ b/fs/xattr.c
62297@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
62298 return rc;
62299 }
62300
62301+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
62302+ssize_t
62303+pax_getxattr(struct dentry *dentry, void *value, size_t size)
62304+{
62305+ struct inode *inode = dentry->d_inode;
62306+ ssize_t error;
62307+
62308+ error = inode_permission(inode, MAY_EXEC);
62309+ if (error)
62310+ return error;
62311+
62312+ if (inode->i_op->getxattr)
62313+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
62314+ else
62315+ error = -EOPNOTSUPP;
62316+
62317+ return error;
62318+}
62319+EXPORT_SYMBOL(pax_getxattr);
62320+#endif
62321+
62322 ssize_t
62323 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
62324 {
62325@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
62326 * Extended attribute SET operations
62327 */
62328 static long
62329-setxattr(struct dentry *d, const char __user *name, const void __user *value,
62330+setxattr(struct path *path, const char __user *name, const void __user *value,
62331 size_t size, int flags)
62332 {
62333 int error;
62334@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
62335 posix_acl_fix_xattr_from_user(kvalue, size);
62336 }
62337
62338- error = vfs_setxattr(d, kname, kvalue, size, flags);
62339+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
62340+ error = -EACCES;
62341+ goto out;
62342+ }
62343+
62344+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
62345 out:
62346 if (vvalue)
62347 vfree(vvalue);
62348@@ -377,7 +403,7 @@ retry:
62349 return error;
62350 error = mnt_want_write(path.mnt);
62351 if (!error) {
62352- error = setxattr(path.dentry, name, value, size, flags);
62353+ error = setxattr(&path, name, value, size, flags);
62354 mnt_drop_write(path.mnt);
62355 }
62356 path_put(&path);
62357@@ -401,7 +427,7 @@ retry:
62358 return error;
62359 error = mnt_want_write(path.mnt);
62360 if (!error) {
62361- error = setxattr(path.dentry, name, value, size, flags);
62362+ error = setxattr(&path, name, value, size, flags);
62363 mnt_drop_write(path.mnt);
62364 }
62365 path_put(&path);
62366@@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
62367 const void __user *,value, size_t, size, int, flags)
62368 {
62369 struct fd f = fdget(fd);
62370- struct dentry *dentry;
62371 int error = -EBADF;
62372
62373 if (!f.file)
62374 return error;
62375- dentry = f.file->f_path.dentry;
62376- audit_inode(NULL, dentry, 0);
62377+ audit_inode(NULL, f.file->f_path.dentry, 0);
62378 error = mnt_want_write_file(f.file);
62379 if (!error) {
62380- error = setxattr(dentry, name, value, size, flags);
62381+ error = setxattr(&f.file->f_path, name, value, size, flags);
62382 mnt_drop_write_file(f.file);
62383 }
62384 fdput(f);
62385@@ -626,7 +650,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
62386 * Extended attribute REMOVE operations
62387 */
62388 static long
62389-removexattr(struct dentry *d, const char __user *name)
62390+removexattr(struct path *path, const char __user *name)
62391 {
62392 int error;
62393 char kname[XATTR_NAME_MAX + 1];
62394@@ -637,7 +661,10 @@ removexattr(struct dentry *d, const char __user *name)
62395 if (error < 0)
62396 return error;
62397
62398- return vfs_removexattr(d, kname);
62399+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
62400+ return -EACCES;
62401+
62402+ return vfs_removexattr(path->dentry, kname);
62403 }
62404
62405 SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
62406@@ -652,7 +679,7 @@ retry:
62407 return error;
62408 error = mnt_want_write(path.mnt);
62409 if (!error) {
62410- error = removexattr(path.dentry, name);
62411+ error = removexattr(&path, name);
62412 mnt_drop_write(path.mnt);
62413 }
62414 path_put(&path);
62415@@ -675,7 +702,7 @@ retry:
62416 return error;
62417 error = mnt_want_write(path.mnt);
62418 if (!error) {
62419- error = removexattr(path.dentry, name);
62420+ error = removexattr(&path, name);
62421 mnt_drop_write(path.mnt);
62422 }
62423 path_put(&path);
62424@@ -689,16 +716,16 @@ retry:
62425 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
62426 {
62427 struct fd f = fdget(fd);
62428- struct dentry *dentry;
62429+ struct path *path;
62430 int error = -EBADF;
62431
62432 if (!f.file)
62433 return error;
62434- dentry = f.file->f_path.dentry;
62435- audit_inode(NULL, dentry, 0);
62436+ path = &f.file->f_path;
62437+ audit_inode(NULL, path->dentry, 0);
62438 error = mnt_want_write_file(f.file);
62439 if (!error) {
62440- error = removexattr(dentry, name);
62441+ error = removexattr(path, name);
62442 mnt_drop_write_file(f.file);
62443 }
62444 fdput(f);
62445diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
62446index 9fbea87..6b19972 100644
62447--- a/fs/xattr_acl.c
62448+++ b/fs/xattr_acl.c
62449@@ -76,8 +76,8 @@ struct posix_acl *
62450 posix_acl_from_xattr(struct user_namespace *user_ns,
62451 const void *value, size_t size)
62452 {
62453- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
62454- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
62455+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
62456+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
62457 int count;
62458 struct posix_acl *acl;
62459 struct posix_acl_entry *acl_e;
62460diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
62461index f47e65c..e7125d9 100644
62462--- a/fs/xfs/xfs_bmap.c
62463+++ b/fs/xfs/xfs_bmap.c
62464@@ -586,7 +586,7 @@ xfs_bmap_validate_ret(
62465
62466 #else
62467 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
62468-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
62469+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
62470 #endif /* DEBUG */
62471
62472 /*
62473diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
62474index 8f84153..7ce60d0 100644
62475--- a/fs/xfs/xfs_dir2_readdir.c
62476+++ b/fs/xfs/xfs_dir2_readdir.c
62477@@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
62478 ino = xfs_dir3_sfe_get_ino(mp, sfp, sfep);
62479 filetype = xfs_dir3_sfe_get_ftype(mp, sfp, sfep);
62480 ctx->pos = off & 0x7fffffff;
62481- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
62482+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
62483+ char name[sfep->namelen];
62484+ memcpy(name, sfep->name, sfep->namelen);
62485+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
62486+ return 0;
62487+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
62488 xfs_dir3_get_dtype(mp, filetype)))
62489 return 0;
62490 sfep = xfs_dir3_sf_nextentry(mp, sfp, sfep);
62491diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
62492index 8c8ef24..689f742 100644
62493--- a/fs/xfs/xfs_ioctl.c
62494+++ b/fs/xfs/xfs_ioctl.c
62495@@ -127,7 +127,7 @@ xfs_find_handle(
62496 }
62497
62498 error = -EFAULT;
62499- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
62500+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
62501 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
62502 goto out_put;
62503
62504diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
62505index 2b8952d..a60c6be 100644
62506--- a/fs/xfs/xfs_iops.c
62507+++ b/fs/xfs/xfs_iops.c
62508@@ -401,7 +401,7 @@ xfs_vn_put_link(
62509 struct nameidata *nd,
62510 void *p)
62511 {
62512- char *s = nd_get_link(nd);
62513+ const char *s = nd_get_link(nd);
62514
62515 if (!IS_ERR(s))
62516 kfree(s);
62517diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
62518new file mode 100644
62519index 0000000..5b2538b
62520--- /dev/null
62521+++ b/grsecurity/Kconfig
62522@@ -0,0 +1,1116 @@
62523+#
62524+# grecurity configuration
62525+#
62526+menu "Memory Protections"
62527+depends on GRKERNSEC
62528+
62529+config GRKERNSEC_KMEM
62530+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
62531+ default y if GRKERNSEC_CONFIG_AUTO
62532+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
62533+ help
62534+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
62535+ be written to or read from to modify or leak the contents of the running
62536+ kernel. /dev/port will also not be allowed to be opened, and support
62537+ for /dev/cpu/*/msr and kexec will be removed. If you have module
62538+ support disabled, enabling this will close up six ways that are
62539+ currently used to insert malicious code into the running kernel.
62540+
62541+ Even with this feature enabled, we still highly recommend that
62542+ you use the RBAC system, as it is still possible for an attacker to
62543+ modify the running kernel through other more obscure methods.
62544+
62545+ Enabling this feature will prevent the "cpupower" and "powertop" tools
62546+ from working.
62547+
62548+ It is highly recommended that you say Y here if you meet all the
62549+ conditions above.
62550+
62551+config GRKERNSEC_VM86
62552+ bool "Restrict VM86 mode"
62553+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62554+ depends on X86_32
62555+
62556+ help
62557+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
62558+ make use of a special execution mode on 32bit x86 processors called
62559+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
62560+ video cards and will still work with this option enabled. The purpose
62561+ of the option is to prevent exploitation of emulation errors in
62562+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
62563+ Nearly all users should be able to enable this option.
62564+
62565+config GRKERNSEC_IO
62566+ bool "Disable privileged I/O"
62567+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62568+ depends on X86
62569+ select RTC_CLASS
62570+ select RTC_INTF_DEV
62571+ select RTC_DRV_CMOS
62572+
62573+ help
62574+ If you say Y here, all ioperm and iopl calls will return an error.
62575+ Ioperm and iopl can be used to modify the running kernel.
62576+ Unfortunately, some programs need this access to operate properly,
62577+ the most notable of which are XFree86 and hwclock. hwclock can be
62578+ remedied by having RTC support in the kernel, so real-time
62579+ clock support is enabled if this option is enabled, to ensure
62580+ that hwclock operates correctly.
62581+
62582+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
62583+ you may not be able to boot into a graphical environment with this
62584+ option enabled. In this case, you should use the RBAC system instead.
62585+
62586+config GRKERNSEC_JIT_HARDEN
62587+ bool "Harden BPF JIT against spray attacks"
62588+ default y if GRKERNSEC_CONFIG_AUTO
62589+ depends on BPF_JIT
62590+ help
62591+ If you say Y here, the native code generated by the kernel's Berkeley
62592+ Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
62593+ attacks that attempt to fit attacker-beneficial instructions in
62594+ 32bit immediate fields of JIT-generated native instructions. The
62595+ attacker will generally aim to cause an unintended instruction sequence
62596+ of JIT-generated native code to execute by jumping into the middle of
62597+ a generated instruction. This feature effectively randomizes the 32bit
62598+ immediate constants present in the generated code to thwart such attacks.
62599+
62600+ If you're using KERNEXEC, it's recommended that you enable this option
62601+ to supplement the hardening of the kernel.
62602+
62603+config GRKERNSEC_PERF_HARDEN
62604+ bool "Disable unprivileged PERF_EVENTS usage by default"
62605+ default y if GRKERNSEC_CONFIG_AUTO
62606+ depends on PERF_EVENTS
62607+ help
62608+ If you say Y here, the range of acceptable values for the
62609+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
62610+ default to a new value: 3. When the sysctl is set to this value, no
62611+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
62612+
62613+ Though PERF_EVENTS can be used legitimately for performance monitoring
62614+ and low-level application profiling, it is forced on regardless of
62615+ configuration, has been at fault for several vulnerabilities, and
62616+ creates new opportunities for side channels and other information leaks.
62617+
62618+ This feature puts PERF_EVENTS into a secure default state and permits
62619+ the administrator to change out of it temporarily if unprivileged
62620+ application profiling is needed.
62621+
62622+config GRKERNSEC_RAND_THREADSTACK
62623+ bool "Insert random gaps between thread stacks"
62624+ default y if GRKERNSEC_CONFIG_AUTO
62625+ depends on PAX_RANDMMAP && !PPC
62626+ help
62627+ If you say Y here, a random-sized gap will be enforced between allocated
62628+ thread stacks. Glibc's NPTL and other threading libraries that
62629+ pass MAP_STACK to the kernel for thread stack allocation are supported.
62630+ The implementation currently provides 8 bits of entropy for the gap.
62631+
62632+ Many distributions do not compile threaded remote services with the
62633+ -fstack-check argument to GCC, causing the variable-sized stack-based
62634+ allocator, alloca(), to not probe the stack on allocation. This
62635+ permits an unbounded alloca() to skip over any guard page and potentially
62636+ modify another thread's stack reliably. An enforced random gap
62637+ reduces the reliability of such an attack and increases the chance
62638+ that such a read/write to another thread's stack instead lands in
62639+ an unmapped area, causing a crash and triggering grsecurity's
62640+ anti-bruteforcing logic.
62641+
62642+config GRKERNSEC_PROC_MEMMAP
62643+ bool "Harden ASLR against information leaks and entropy reduction"
62644+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
62645+ depends on PAX_NOEXEC || PAX_ASLR
62646+ help
62647+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
62648+ give no information about the addresses of its mappings if
62649+ PaX features that rely on random addresses are enabled on the task.
62650+ In addition to sanitizing this information and disabling other
62651+ dangerous sources of information, this option causes reads of sensitive
62652+ /proc/<pid> entries where the file descriptor was opened in a different
62653+ task than the one performing the read. Such attempts are logged.
62654+ This option also limits argv/env strings for suid/sgid binaries
62655+ to 512KB to prevent a complete exhaustion of the stack entropy provided
62656+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
62657+ binaries to prevent alternative mmap layouts from being abused.
62658+
62659+ If you use PaX it is essential that you say Y here as it closes up
62660+ several holes that make full ASLR useless locally.
62661+
62662+config GRKERNSEC_BRUTE
62663+ bool "Deter exploit bruteforcing"
62664+ default y if GRKERNSEC_CONFIG_AUTO
62665+ help
62666+ If you say Y here, attempts to bruteforce exploits against forking
62667+ daemons such as apache or sshd, as well as against suid/sgid binaries
62668+ will be deterred. When a child of a forking daemon is killed by PaX
62669+ or crashes due to an illegal instruction or other suspicious signal,
62670+ the parent process will be delayed 30 seconds upon every subsequent
62671+ fork until the administrator is able to assess the situation and
62672+ restart the daemon.
62673+ In the suid/sgid case, the attempt is logged, the user has all their
62674+ existing instances of the suid/sgid binary terminated and will
62675+ be unable to execute any suid/sgid binaries for 15 minutes.
62676+
62677+ It is recommended that you also enable signal logging in the auditing
62678+ section so that logs are generated when a process triggers a suspicious
62679+ signal.
62680+ If the sysctl option is enabled, a sysctl option with name
62681+ "deter_bruteforce" is created.
62682+
62683+
62684+config GRKERNSEC_MODHARDEN
62685+ bool "Harden module auto-loading"
62686+ default y if GRKERNSEC_CONFIG_AUTO
62687+ depends on MODULES
62688+ help
62689+ If you say Y here, module auto-loading in response to use of some
62690+ feature implemented by an unloaded module will be restricted to
62691+ root users. Enabling this option helps defend against attacks
62692+ by unprivileged users who abuse the auto-loading behavior to
62693+ cause a vulnerable module to load that is then exploited.
62694+
62695+ If this option prevents a legitimate use of auto-loading for a
62696+ non-root user, the administrator can execute modprobe manually
62697+ with the exact name of the module mentioned in the alert log.
62698+ Alternatively, the administrator can add the module to the list
62699+ of modules loaded at boot by modifying init scripts.
62700+
62701+ Modification of init scripts will most likely be needed on
62702+ Ubuntu servers with encrypted home directory support enabled,
62703+ as the first non-root user logging in will cause the ecb(aes),
62704+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
62705+
62706+config GRKERNSEC_HIDESYM
62707+ bool "Hide kernel symbols"
62708+ default y if GRKERNSEC_CONFIG_AUTO
62709+ select PAX_USERCOPY_SLABS
62710+ help
62711+ If you say Y here, getting information on loaded modules, and
62712+ displaying all kernel symbols through a syscall will be restricted
62713+ to users with CAP_SYS_MODULE. For software compatibility reasons,
62714+ /proc/kallsyms will be restricted to the root user. The RBAC
62715+ system can hide that entry even from root.
62716+
62717+ This option also prevents leaking of kernel addresses through
62718+ several /proc entries.
62719+
62720+ Note that this option is only effective provided the following
62721+ conditions are met:
62722+ 1) The kernel using grsecurity is not precompiled by some distribution
62723+ 2) You have also enabled GRKERNSEC_DMESG
62724+ 3) You are using the RBAC system and hiding other files such as your
62725+ kernel image and System.map. Alternatively, enabling this option
62726+ causes the permissions on /boot, /lib/modules, and the kernel
62727+ source directory to change at compile time to prevent
62728+ reading by non-root users.
62729+ If the above conditions are met, this option will aid in providing a
62730+ useful protection against local kernel exploitation of overflows
62731+ and arbitrary read/write vulnerabilities.
62732+
62733+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
62734+ in addition to this feature.
62735+
62736+config GRKERNSEC_KERN_LOCKOUT
62737+ bool "Active kernel exploit response"
62738+ default y if GRKERNSEC_CONFIG_AUTO
62739+ depends on X86 || ARM || PPC || SPARC
62740+ help
62741+ If you say Y here, when a PaX alert is triggered due to suspicious
62742+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
62743+ or an OOPS occurs due to bad memory accesses, instead of just
62744+ terminating the offending process (and potentially allowing
62745+ a subsequent exploit from the same user), we will take one of two
62746+ actions:
62747+ If the user was root, we will panic the system
62748+ If the user was non-root, we will log the attempt, terminate
62749+ all processes owned by the user, then prevent them from creating
62750+ any new processes until the system is restarted
62751+ This deters repeated kernel exploitation/bruteforcing attempts
62752+ and is useful for later forensics.
62753+
62754+config GRKERNSEC_OLD_ARM_USERLAND
62755+ bool "Old ARM userland compatibility"
62756+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
62757+ help
62758+ If you say Y here, stubs of executable code to perform such operations
62759+ as "compare-exchange" will be placed at fixed locations in the ARM vector
62760+ table. This is unfortunately needed for old ARM userland meant to run
62761+ across a wide range of processors. Without this option enabled,
62762+ the get_tls and data memory barrier stubs will be emulated by the kernel,
62763+ which is enough for Linaro userlands or other userlands designed for v6
62764+ and newer ARM CPUs. It's recommended that you try without this option enabled
62765+ first, and only enable it if your userland does not boot (it will likely fail
62766+ at init time).
62767+
62768+endmenu
62769+menu "Role Based Access Control Options"
62770+depends on GRKERNSEC
62771+
62772+config GRKERNSEC_RBAC_DEBUG
62773+ bool
62774+
62775+config GRKERNSEC_NO_RBAC
62776+ bool "Disable RBAC system"
62777+ help
62778+ If you say Y here, the /dev/grsec device will be removed from the kernel,
62779+ preventing the RBAC system from being enabled. You should only say Y
62780+ here if you have no intention of using the RBAC system, so as to prevent
62781+ an attacker with root access from misusing the RBAC system to hide files
62782+ and processes when loadable module support and /dev/[k]mem have been
62783+ locked down.
62784+
62785+config GRKERNSEC_ACL_HIDEKERN
62786+ bool "Hide kernel processes"
62787+ help
62788+ If you say Y here, all kernel threads will be hidden to all
62789+ processes but those whose subject has the "view hidden processes"
62790+ flag.
62791+
62792+config GRKERNSEC_ACL_MAXTRIES
62793+ int "Maximum tries before password lockout"
62794+ default 3
62795+ help
62796+ This option enforces the maximum number of times a user can attempt
62797+ to authorize themselves with the grsecurity RBAC system before being
62798+ denied the ability to attempt authorization again for a specified time.
62799+ The lower the number, the harder it will be to brute-force a password.
62800+
62801+config GRKERNSEC_ACL_TIMEOUT
62802+ int "Time to wait after max password tries, in seconds"
62803+ default 30
62804+ help
62805+ This option specifies the time the user must wait after attempting to
62806+ authorize to the RBAC system with the maximum number of invalid
62807+ passwords. The higher the number, the harder it will be to brute-force
62808+ a password.
62809+
62810+endmenu
62811+menu "Filesystem Protections"
62812+depends on GRKERNSEC
62813+
62814+config GRKERNSEC_PROC
62815+ bool "Proc restrictions"
62816+ default y if GRKERNSEC_CONFIG_AUTO
62817+ help
62818+ If you say Y here, the permissions of the /proc filesystem
62819+ will be altered to enhance system security and privacy. You MUST
62820+ choose either a user only restriction or a user and group restriction.
62821+ Depending upon the option you choose, you can either restrict users to
62822+ see only the processes they themselves run, or choose a group that can
62823+ view all processes and files normally restricted to root if you choose
62824+ the "restrict to user only" option. NOTE: If you're running identd or
62825+ ntpd as a non-root user, you will have to run it as the group you
62826+ specify here.
62827+
62828+config GRKERNSEC_PROC_USER
62829+ bool "Restrict /proc to user only"
62830+ depends on GRKERNSEC_PROC
62831+ help
62832+ If you say Y here, non-root users will only be able to view their own
62833+ processes, and restricts them from viewing network-related information,
62834+ and viewing kernel symbol and module information.
62835+
62836+config GRKERNSEC_PROC_USERGROUP
62837+ bool "Allow special group"
62838+ default y if GRKERNSEC_CONFIG_AUTO
62839+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
62840+ help
62841+ If you say Y here, you will be able to select a group that will be
62842+ able to view all processes and network-related information. If you've
62843+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
62844+ remain hidden. This option is useful if you want to run identd as
62845+ a non-root user. The group you select may also be chosen at boot time
62846+ via "grsec_proc_gid=" on the kernel commandline.
62847+
62848+config GRKERNSEC_PROC_GID
62849+ int "GID for special group"
62850+ depends on GRKERNSEC_PROC_USERGROUP
62851+ default 1001
62852+
62853+config GRKERNSEC_PROC_ADD
62854+ bool "Additional restrictions"
62855+ default y if GRKERNSEC_CONFIG_AUTO
62856+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
62857+ help
62858+ If you say Y here, additional restrictions will be placed on
62859+ /proc that keep normal users from viewing device information and
62860+ slabinfo information that could be useful for exploits.
62861+
62862+config GRKERNSEC_LINK
62863+ bool "Linking restrictions"
62864+ default y if GRKERNSEC_CONFIG_AUTO
62865+ help
62866+ If you say Y here, /tmp race exploits will be prevented, since users
62867+ will no longer be able to follow symlinks owned by other users in
62868+ world-writable +t directories (e.g. /tmp), unless the owner of the
62869+ symlink is the owner of the directory. users will also not be
62870+ able to hardlink to files they do not own. If the sysctl option is
62871+ enabled, a sysctl option with name "linking_restrictions" is created.
62872+
62873+config GRKERNSEC_SYMLINKOWN
62874+ bool "Kernel-enforced SymlinksIfOwnerMatch"
62875+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
62876+ help
62877+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
62878+ that prevents it from being used as a security feature. As Apache
62879+ verifies the symlink by performing a stat() against the target of
62880+ the symlink before it is followed, an attacker can setup a symlink
62881+ to point to a same-owned file, then replace the symlink with one
62882+ that targets another user's file just after Apache "validates" the
62883+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
62884+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
62885+ will be in place for the group you specify. If the sysctl option
62886+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
62887+ created.
62888+
62889+config GRKERNSEC_SYMLINKOWN_GID
62890+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
62891+ depends on GRKERNSEC_SYMLINKOWN
62892+ default 1006
62893+ help
62894+ Setting this GID determines what group kernel-enforced
62895+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
62896+ is enabled, a sysctl option with name "symlinkown_gid" is created.
62897+
62898+config GRKERNSEC_FIFO
62899+ bool "FIFO restrictions"
62900+ default y if GRKERNSEC_CONFIG_AUTO
62901+ help
62902+ If you say Y here, users will not be able to write to FIFOs they don't
62903+ own in world-writable +t directories (e.g. /tmp), unless the owner of
62904+ the FIFO is the same owner of the directory it's held in. If the sysctl
62905+ option is enabled, a sysctl option with name "fifo_restrictions" is
62906+ created.
62907+
62908+config GRKERNSEC_SYSFS_RESTRICT
62909+ bool "Sysfs/debugfs restriction"
62910+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
62911+ depends on SYSFS
62912+ help
62913+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
62914+ any filesystem normally mounted under it (e.g. debugfs) will be
62915+ mostly accessible only by root. These filesystems generally provide access
62916+ to hardware and debug information that isn't appropriate for unprivileged
62917+ users of the system. Sysfs and debugfs have also become a large source
62918+ of new vulnerabilities, ranging from infoleaks to local compromise.
62919+ There has been very little oversight with an eye toward security involved
62920+ in adding new exporters of information to these filesystems, so their
62921+ use is discouraged.
62922+ For reasons of compatibility, a few directories have been whitelisted
62923+ for access by non-root users:
62924+ /sys/fs/selinux
62925+ /sys/fs/fuse
62926+ /sys/devices/system/cpu
62927+
62928+config GRKERNSEC_ROFS
62929+ bool "Runtime read-only mount protection"
62930+ depends on SYSCTL
62931+ help
62932+ If you say Y here, a sysctl option with name "romount_protect" will
62933+ be created. By setting this option to 1 at runtime, filesystems
62934+ will be protected in the following ways:
62935+ * No new writable mounts will be allowed
62936+ * Existing read-only mounts won't be able to be remounted read/write
62937+ * Write operations will be denied on all block devices
62938+ This option acts independently of grsec_lock: once it is set to 1,
62939+ it cannot be turned off. Therefore, please be mindful of the resulting
62940+ behavior if this option is enabled in an init script on a read-only
62941+ filesystem.
62942+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
62943+ and GRKERNSEC_IO should be enabled and module loading disabled via
62944+ config or at runtime.
62945+ This feature is mainly intended for secure embedded systems.
62946+
62947+
62948+config GRKERNSEC_DEVICE_SIDECHANNEL
62949+ bool "Eliminate stat/notify-based device sidechannels"
62950+ default y if GRKERNSEC_CONFIG_AUTO
62951+ help
62952+ If you say Y here, timing analyses on block or character
62953+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
62954+ will be thwarted for unprivileged users. If a process without
62955+ CAP_MKNOD stats such a device, the last access and last modify times
62956+ will match the device's create time. No access or modify events
62957+ will be triggered through inotify/dnotify/fanotify for such devices.
62958+ This feature will prevent attacks that may at a minimum
62959+ allow an attacker to determine the administrator's password length.
62960+
62961+config GRKERNSEC_CHROOT
62962+ bool "Chroot jail restrictions"
62963+ default y if GRKERNSEC_CONFIG_AUTO
62964+ help
62965+ If you say Y here, you will be able to choose several options that will
62966+ make breaking out of a chrooted jail much more difficult. If you
62967+ encounter no software incompatibilities with the following options, it
62968+ is recommended that you enable each one.
62969+
62970+config GRKERNSEC_CHROOT_MOUNT
62971+ bool "Deny mounts"
62972+ default y if GRKERNSEC_CONFIG_AUTO
62973+ depends on GRKERNSEC_CHROOT
62974+ help
62975+ If you say Y here, processes inside a chroot will not be able to
62976+ mount or remount filesystems. If the sysctl option is enabled, a
62977+ sysctl option with name "chroot_deny_mount" is created.
62978+
62979+config GRKERNSEC_CHROOT_DOUBLE
62980+ bool "Deny double-chroots"
62981+ default y if GRKERNSEC_CONFIG_AUTO
62982+ depends on GRKERNSEC_CHROOT
62983+ help
62984+ If you say Y here, processes inside a chroot will not be able to chroot
62985+ again outside the chroot. This is a widely used method of breaking
62986+ out of a chroot jail and should not be allowed. If the sysctl
62987+ option is enabled, a sysctl option with name
62988+ "chroot_deny_chroot" is created.
62989+
62990+config GRKERNSEC_CHROOT_PIVOT
62991+ bool "Deny pivot_root in chroot"
62992+ default y if GRKERNSEC_CONFIG_AUTO
62993+ depends on GRKERNSEC_CHROOT
62994+ help
62995+ If you say Y here, processes inside a chroot will not be able to use
62996+ a function called pivot_root() that was introduced in Linux 2.3.41. It
62997+ works similar to chroot in that it changes the root filesystem. This
62998+ function could be misused in a chrooted process to attempt to break out
62999+ of the chroot, and therefore should not be allowed. If the sysctl
63000+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
63001+ created.
63002+
63003+config GRKERNSEC_CHROOT_CHDIR
63004+ bool "Enforce chdir(\"/\") on all chroots"
63005+ default y if GRKERNSEC_CONFIG_AUTO
63006+ depends on GRKERNSEC_CHROOT
63007+ help
63008+ If you say Y here, the current working directory of all newly-chrooted
63009+ applications will be set to the the root directory of the chroot.
63010+ The man page on chroot(2) states:
63011+ Note that this call does not change the current working
63012+ directory, so that `.' can be outside the tree rooted at
63013+ `/'. In particular, the super-user can escape from a
63014+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
63015+
63016+ It is recommended that you say Y here, since it's not known to break
63017+ any software. If the sysctl option is enabled, a sysctl option with
63018+ name "chroot_enforce_chdir" is created.
63019+
63020+config GRKERNSEC_CHROOT_CHMOD
63021+ bool "Deny (f)chmod +s"
63022+ default y if GRKERNSEC_CONFIG_AUTO
63023+ depends on GRKERNSEC_CHROOT
63024+ help
63025+ If you say Y here, processes inside a chroot will not be able to chmod
63026+ or fchmod files to make them have suid or sgid bits. This protects
63027+ against another published method of breaking a chroot. If the sysctl
63028+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
63029+ created.
63030+
63031+config GRKERNSEC_CHROOT_FCHDIR
63032+ bool "Deny fchdir out of chroot"
63033+ default y if GRKERNSEC_CONFIG_AUTO
63034+ depends on GRKERNSEC_CHROOT
63035+ help
63036+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
63037+ to a file descriptor of the chrooting process that points to a directory
63038+ outside the filesystem will be stopped. If the sysctl option
63039+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
63040+
63041+config GRKERNSEC_CHROOT_MKNOD
63042+ bool "Deny mknod"
63043+ default y if GRKERNSEC_CONFIG_AUTO
63044+ depends on GRKERNSEC_CHROOT
63045+ help
63046+ If you say Y here, processes inside a chroot will not be allowed to
63047+ mknod. The problem with using mknod inside a chroot is that it
63048+ would allow an attacker to create a device entry that is the same
63049+ as one on the physical root of your system, which could range from
63050+ anything from the console device to a device for your harddrive (which
63051+ they could then use to wipe the drive or steal data). It is recommended
63052+ that you say Y here, unless you run into software incompatibilities.
63053+ If the sysctl option is enabled, a sysctl option with name
63054+ "chroot_deny_mknod" is created.
63055+
63056+config GRKERNSEC_CHROOT_SHMAT
63057+ bool "Deny shmat() out of chroot"
63058+ default y if GRKERNSEC_CONFIG_AUTO
63059+ depends on GRKERNSEC_CHROOT
63060+ help
63061+ If you say Y here, processes inside a chroot will not be able to attach
63062+ to shared memory segments that were created outside of the chroot jail.
63063+ It is recommended that you say Y here. If the sysctl option is enabled,
63064+ a sysctl option with name "chroot_deny_shmat" is created.
63065+
63066+config GRKERNSEC_CHROOT_UNIX
63067+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
63068+ default y if GRKERNSEC_CONFIG_AUTO
63069+ depends on GRKERNSEC_CHROOT
63070+ help
63071+ If you say Y here, processes inside a chroot will not be able to
63072+ connect to abstract (meaning not belonging to a filesystem) Unix
63073+ domain sockets that were bound outside of a chroot. It is recommended
63074+ that you say Y here. If the sysctl option is enabled, a sysctl option
63075+ with name "chroot_deny_unix" is created.
63076+
63077+config GRKERNSEC_CHROOT_FINDTASK
63078+ bool "Protect outside processes"
63079+ default y if GRKERNSEC_CONFIG_AUTO
63080+ depends on GRKERNSEC_CHROOT
63081+ help
63082+ If you say Y here, processes inside a chroot will not be able to
63083+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
63084+ getsid, or view any process outside of the chroot. If the sysctl
63085+ option is enabled, a sysctl option with name "chroot_findtask" is
63086+ created.
63087+
63088+config GRKERNSEC_CHROOT_NICE
63089+ bool "Restrict priority changes"
63090+ default y if GRKERNSEC_CONFIG_AUTO
63091+ depends on GRKERNSEC_CHROOT
63092+ help
63093+ If you say Y here, processes inside a chroot will not be able to raise
63094+ the priority of processes in the chroot, or alter the priority of
63095+ processes outside the chroot. This provides more security than simply
63096+ removing CAP_SYS_NICE from the process' capability set. If the
63097+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
63098+ is created.
63099+
63100+config GRKERNSEC_CHROOT_SYSCTL
63101+ bool "Deny sysctl writes"
63102+ default y if GRKERNSEC_CONFIG_AUTO
63103+ depends on GRKERNSEC_CHROOT
63104+ help
63105+ If you say Y here, an attacker in a chroot will not be able to
63106+ write to sysctl entries, either by sysctl(2) or through a /proc
63107+ interface. It is strongly recommended that you say Y here. If the
63108+ sysctl option is enabled, a sysctl option with name
63109+ "chroot_deny_sysctl" is created.
63110+
63111+config GRKERNSEC_CHROOT_CAPS
63112+ bool "Capability restrictions"
63113+ default y if GRKERNSEC_CONFIG_AUTO
63114+ depends on GRKERNSEC_CHROOT
63115+ help
63116+ If you say Y here, the capabilities on all processes within a
63117+ chroot jail will be lowered to stop module insertion, raw i/o,
63118+ system and net admin tasks, rebooting the system, modifying immutable
63119+ files, modifying IPC owned by another, and changing the system time.
63120+ This is left an option because it can break some apps. Disable this
63121+ if your chrooted apps are having problems performing those kinds of
63122+ tasks. If the sysctl option is enabled, a sysctl option with
63123+ name "chroot_caps" is created.
63124+
63125+config GRKERNSEC_CHROOT_INITRD
63126+ bool "Exempt initrd tasks from restrictions"
63127+ default y if GRKERNSEC_CONFIG_AUTO
63128+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
63129+ help
63130+ If you say Y here, tasks started prior to init will be exempted from
63131+ grsecurity's chroot restrictions. This option is mainly meant to
63132+ resolve Plymouth's performing privileged operations unnecessarily
63133+ in a chroot.
63134+
63135+endmenu
63136+menu "Kernel Auditing"
63137+depends on GRKERNSEC
63138+
63139+config GRKERNSEC_AUDIT_GROUP
63140+ bool "Single group for auditing"
63141+ help
63142+ If you say Y here, the exec and chdir logging features will only operate
63143+ on a group you specify. This option is recommended if you only want to
63144+ watch certain users instead of having a large amount of logs from the
63145+ entire system. If the sysctl option is enabled, a sysctl option with
63146+ name "audit_group" is created.
63147+
63148+config GRKERNSEC_AUDIT_GID
63149+ int "GID for auditing"
63150+ depends on GRKERNSEC_AUDIT_GROUP
63151+ default 1007
63152+
63153+config GRKERNSEC_EXECLOG
63154+ bool "Exec logging"
63155+ help
63156+ If you say Y here, all execve() calls will be logged (since the
63157+ other exec*() calls are frontends to execve(), all execution
63158+ will be logged). Useful for shell-servers that like to keep track
63159+ of their users. If the sysctl option is enabled, a sysctl option with
63160+ name "exec_logging" is created.
63161+ WARNING: This option when enabled will produce a LOT of logs, especially
63162+ on an active system.
63163+
63164+config GRKERNSEC_RESLOG
63165+ bool "Resource logging"
63166+ default y if GRKERNSEC_CONFIG_AUTO
63167+ help
63168+ If you say Y here, all attempts to overstep resource limits will
63169+ be logged with the resource name, the requested size, and the current
63170+ limit. It is highly recommended that you say Y here. If the sysctl
63171+ option is enabled, a sysctl option with name "resource_logging" is
63172+ created. If the RBAC system is enabled, the sysctl value is ignored.
63173+
63174+config GRKERNSEC_CHROOT_EXECLOG
63175+ bool "Log execs within chroot"
63176+ help
63177+ If you say Y here, all executions inside a chroot jail will be logged
63178+ to syslog. This can cause a large amount of logs if certain
63179+ applications (eg. djb's daemontools) are installed on the system, and
63180+ is therefore left as an option. If the sysctl option is enabled, a
63181+ sysctl option with name "chroot_execlog" is created.
63182+
63183+config GRKERNSEC_AUDIT_PTRACE
63184+ bool "Ptrace logging"
63185+ help
63186+ If you say Y here, all attempts to attach to a process via ptrace
63187+ will be logged. If the sysctl option is enabled, a sysctl option
63188+ with name "audit_ptrace" is created.
63189+
63190+config GRKERNSEC_AUDIT_CHDIR
63191+ bool "Chdir logging"
63192+ help
63193+ If you say Y here, all chdir() calls will be logged. If the sysctl
63194+ option is enabled, a sysctl option with name "audit_chdir" is created.
63195+
63196+config GRKERNSEC_AUDIT_MOUNT
63197+ bool "(Un)Mount logging"
63198+ help
63199+ If you say Y here, all mounts and unmounts will be logged. If the
63200+ sysctl option is enabled, a sysctl option with name "audit_mount" is
63201+ created.
63202+
63203+config GRKERNSEC_SIGNAL
63204+ bool "Signal logging"
63205+ default y if GRKERNSEC_CONFIG_AUTO
63206+ help
63207+ If you say Y here, certain important signals will be logged, such as
63208+ SIGSEGV, which will as a result inform you of when a error in a program
63209+ occurred, which in some cases could mean a possible exploit attempt.
63210+ If the sysctl option is enabled, a sysctl option with name
63211+ "signal_logging" is created.
63212+
63213+config GRKERNSEC_FORKFAIL
63214+ bool "Fork failure logging"
63215+ help
63216+ If you say Y here, all failed fork() attempts will be logged.
63217+ This could suggest a fork bomb, or someone attempting to overstep
63218+ their process limit. If the sysctl option is enabled, a sysctl option
63219+ with name "forkfail_logging" is created.
63220+
63221+config GRKERNSEC_TIME
63222+ bool "Time change logging"
63223+ default y if GRKERNSEC_CONFIG_AUTO
63224+ help
63225+ If you say Y here, any changes of the system clock will be logged.
63226+ If the sysctl option is enabled, a sysctl option with name
63227+ "timechange_logging" is created.
63228+
63229+config GRKERNSEC_PROC_IPADDR
63230+ bool "/proc/<pid>/ipaddr support"
63231+ default y if GRKERNSEC_CONFIG_AUTO
63232+ help
63233+ If you say Y here, a new entry will be added to each /proc/<pid>
63234+ directory that contains the IP address of the person using the task.
63235+ The IP is carried across local TCP and AF_UNIX stream sockets.
63236+ This information can be useful for IDS/IPSes to perform remote response
63237+ to a local attack. The entry is readable by only the owner of the
63238+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
63239+ the RBAC system), and thus does not create privacy concerns.
63240+
63241+config GRKERNSEC_RWXMAP_LOG
63242+ bool 'Denied RWX mmap/mprotect logging'
63243+ default y if GRKERNSEC_CONFIG_AUTO
63244+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
63245+ help
63246+ If you say Y here, calls to mmap() and mprotect() with explicit
63247+ usage of PROT_WRITE and PROT_EXEC together will be logged when
63248+ denied by the PAX_MPROTECT feature. This feature will also
63249+ log other problematic scenarios that can occur when PAX_MPROTECT
63250+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
63251+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
63252+ is created.
63253+
63254+endmenu
63255+
63256+menu "Executable Protections"
63257+depends on GRKERNSEC
63258+
63259+config GRKERNSEC_DMESG
63260+ bool "Dmesg(8) restriction"
63261+ default y if GRKERNSEC_CONFIG_AUTO
63262+ help
63263+ If you say Y here, non-root users will not be able to use dmesg(8)
63264+ to view the contents of the kernel's circular log buffer.
63265+ The kernel's log buffer often contains kernel addresses and other
63266+ identifying information useful to an attacker in fingerprinting a
63267+ system for a targeted exploit.
63268+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
63269+ created.
63270+
63271+config GRKERNSEC_HARDEN_PTRACE
63272+ bool "Deter ptrace-based process snooping"
63273+ default y if GRKERNSEC_CONFIG_AUTO
63274+ help
63275+ If you say Y here, TTY sniffers and other malicious monitoring
63276+ programs implemented through ptrace will be defeated. If you
63277+ have been using the RBAC system, this option has already been
63278+ enabled for several years for all users, with the ability to make
63279+ fine-grained exceptions.
63280+
63281+ This option only affects the ability of non-root users to ptrace
63282+ processes that are not a descendent of the ptracing process.
63283+ This means that strace ./binary and gdb ./binary will still work,
63284+ but attaching to arbitrary processes will not. If the sysctl
63285+ option is enabled, a sysctl option with name "harden_ptrace" is
63286+ created.
63287+
63288+config GRKERNSEC_PTRACE_READEXEC
63289+ bool "Require read access to ptrace sensitive binaries"
63290+ default y if GRKERNSEC_CONFIG_AUTO
63291+ help
63292+ If you say Y here, unprivileged users will not be able to ptrace unreadable
63293+ binaries. This option is useful in environments that
63294+ remove the read bits (e.g. file mode 4711) from suid binaries to
63295+ prevent infoleaking of their contents. This option adds
63296+ consistency to the use of that file mode, as the binary could normally
63297+ be read out when run without privileges while ptracing.
63298+
63299+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
63300+ is created.
63301+
63302+config GRKERNSEC_SETXID
63303+ bool "Enforce consistent multithreaded privileges"
63304+ default y if GRKERNSEC_CONFIG_AUTO
63305+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
63306+ help
63307+ If you say Y here, a change from a root uid to a non-root uid
63308+ in a multithreaded application will cause the resulting uids,
63309+ gids, supplementary groups, and capabilities in that thread
63310+ to be propagated to the other threads of the process. In most
63311+ cases this is unnecessary, as glibc will emulate this behavior
63312+ on behalf of the application. Other libcs do not act in the
63313+ same way, allowing the other threads of the process to continue
63314+ running with root privileges. If the sysctl option is enabled,
63315+ a sysctl option with name "consistent_setxid" is created.
63316+
63317+config GRKERNSEC_HARDEN_IPC
63318+ bool "Disallow access to overly-permissive IPC objects"
63319+ default y if GRKERNSEC_CONFIG_AUTO
63320+ depends on SYSVIPC
63321+ help
63322+ If you say Y here, access to overly-permissive IPC objects (shared
63323+ memory, message queues, and semaphores) will be denied for processes
63324+ given the following criteria beyond normal permission checks:
63325+ 1) If the IPC object is world-accessible and the euid doesn't match
63326+ that of the creator or current uid for the IPC object
63327+ 2) If the IPC object is group-accessible and the egid doesn't
63328+ match that of the creator or current gid for the IPC object
63329+ It's a common error to grant too much permission to these objects,
63330+ with impact ranging from denial of service and information leaking to
63331+ privilege escalation. This feature was developed in response to
63332+ research by Tim Brown:
63333+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
63334+ who found hundreds of such insecure usages. Processes with
63335+ CAP_IPC_OWNER are still permitted to access these IPC objects.
63336+ If the sysctl option is enabled, a sysctl option with name
63337+ "harden_ipc" is created.
63338+
63339+config GRKERNSEC_TPE
63340+ bool "Trusted Path Execution (TPE)"
63341+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
63342+ help
63343+ If you say Y here, you will be able to choose a gid to add to the
63344+ supplementary groups of users you want to mark as "untrusted."
63345+ These users will not be able to execute any files that are not in
63346+ root-owned directories writable only by root. If the sysctl option
63347+ is enabled, a sysctl option with name "tpe" is created.
63348+
63349+config GRKERNSEC_TPE_ALL
63350+ bool "Partially restrict all non-root users"
63351+ depends on GRKERNSEC_TPE
63352+ help
63353+ If you say Y here, all non-root users will be covered under
63354+ a weaker TPE restriction. This is separate from, and in addition to,
63355+ the main TPE options that you have selected elsewhere. Thus, if a
63356+ "trusted" GID is chosen, this restriction applies to even that GID.
63357+ Under this restriction, all non-root users will only be allowed to
63358+ execute files in directories they own that are not group or
63359+ world-writable, or in directories owned by root and writable only by
63360+ root. If the sysctl option is enabled, a sysctl option with name
63361+ "tpe_restrict_all" is created.
63362+
63363+config GRKERNSEC_TPE_INVERT
63364+ bool "Invert GID option"
63365+ depends on GRKERNSEC_TPE
63366+ help
63367+ If you say Y here, the group you specify in the TPE configuration will
63368+ decide what group TPE restrictions will be *disabled* for. This
63369+ option is useful if you want TPE restrictions to be applied to most
63370+ users on the system. If the sysctl option is enabled, a sysctl option
63371+ with name "tpe_invert" is created. Unlike other sysctl options, this
63372+ entry will default to on for backward-compatibility.
63373+
63374+config GRKERNSEC_TPE_GID
63375+ int
63376+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
63377+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
63378+
63379+config GRKERNSEC_TPE_UNTRUSTED_GID
63380+ int "GID for TPE-untrusted users"
63381+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
63382+ default 1005
63383+ help
63384+ Setting this GID determines what group TPE restrictions will be
63385+ *enabled* for. If the sysctl option is enabled, a sysctl option
63386+ with name "tpe_gid" is created.
63387+
63388+config GRKERNSEC_TPE_TRUSTED_GID
63389+ int "GID for TPE-trusted users"
63390+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
63391+ default 1005
63392+ help
63393+ Setting this GID determines what group TPE restrictions will be
63394+ *disabled* for. If the sysctl option is enabled, a sysctl option
63395+ with name "tpe_gid" is created.
63396+
63397+endmenu
63398+menu "Network Protections"
63399+depends on GRKERNSEC
63400+
63401+config GRKERNSEC_RANDNET
63402+ bool "Larger entropy pools"
63403+ default y if GRKERNSEC_CONFIG_AUTO
63404+ help
63405+ If you say Y here, the entropy pools used for many features of Linux
63406+ and grsecurity will be doubled in size. Since several grsecurity
63407+ features use additional randomness, it is recommended that you say Y
63408+ here. Saying Y here has a similar effect as modifying
63409+ /proc/sys/kernel/random/poolsize.
63410+
63411+config GRKERNSEC_BLACKHOLE
63412+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
63413+ default y if GRKERNSEC_CONFIG_AUTO
63414+ depends on NET
63415+ help
63416+ If you say Y here, neither TCP resets nor ICMP
63417+ destination-unreachable packets will be sent in response to packets
63418+ sent to ports for which no associated listening process exists.
63419+ This feature supports both IPV4 and IPV6 and exempts the
63420+ loopback interface from blackholing. Enabling this feature
63421+ makes a host more resilient to DoS attacks and reduces network
63422+ visibility against scanners.
63423+
63424+ The blackhole feature as-implemented is equivalent to the FreeBSD
63425+ blackhole feature, as it prevents RST responses to all packets, not
63426+ just SYNs. Under most application behavior this causes no
63427+ problems, but applications (like haproxy) may not close certain
63428+ connections in a way that cleanly terminates them on the remote
63429+ end, leaving the remote host in LAST_ACK state. Because of this
63430+ side-effect and to prevent intentional LAST_ACK DoSes, this
63431+ feature also adds automatic mitigation against such attacks.
63432+ The mitigation drastically reduces the amount of time a socket
63433+ can spend in LAST_ACK state. If you're using haproxy and not
63434+ all servers it connects to have this option enabled, consider
63435+ disabling this feature on the haproxy host.
63436+
63437+ If the sysctl option is enabled, two sysctl options with names
63438+ "ip_blackhole" and "lastack_retries" will be created.
63439+ While "ip_blackhole" takes the standard zero/non-zero on/off
63440+ toggle, "lastack_retries" uses the same kinds of values as
63441+ "tcp_retries1" and "tcp_retries2". The default value of 4
63442+ prevents a socket from lasting more than 45 seconds in LAST_ACK
63443+ state.
63444+
63445+config GRKERNSEC_NO_SIMULT_CONNECT
63446+ bool "Disable TCP Simultaneous Connect"
63447+ default y if GRKERNSEC_CONFIG_AUTO
63448+ depends on NET
63449+ help
63450+ If you say Y here, a feature by Willy Tarreau will be enabled that
63451+ removes a weakness in Linux's strict implementation of TCP that
63452+ allows two clients to connect to each other without either entering
63453+ a listening state. The weakness allows an attacker to easily prevent
63454+ a client from connecting to a known server provided the source port
63455+ for the connection is guessed correctly.
63456+
63457+ As the weakness could be used to prevent an antivirus or IPS from
63458+ fetching updates, or prevent an SSL gateway from fetching a CRL,
63459+ it should be eliminated by enabling this option. Though Linux is
63460+ one of few operating systems supporting simultaneous connect, it
63461+ has no legitimate use in practice and is rarely supported by firewalls.
63462+
63463+config GRKERNSEC_SOCKET
63464+ bool "Socket restrictions"
63465+ depends on NET
63466+ help
63467+ If you say Y here, you will be able to choose from several options.
63468+ If you assign a GID on your system and add it to the supplementary
63469+ groups of users you want to restrict socket access to, this patch
63470+ will perform up to three things, based on the option(s) you choose.
63471+
63472+config GRKERNSEC_SOCKET_ALL
63473+ bool "Deny any sockets to group"
63474+ depends on GRKERNSEC_SOCKET
63475+ help
63476+ If you say Y here, you will be able to choose a GID of whose users will
63477+ be unable to connect to other hosts from your machine or run server
63478+ applications from your machine. If the sysctl option is enabled, a
63479+ sysctl option with name "socket_all" is created.
63480+
63481+config GRKERNSEC_SOCKET_ALL_GID
63482+ int "GID to deny all sockets for"
63483+ depends on GRKERNSEC_SOCKET_ALL
63484+ default 1004
63485+ help
63486+ Here you can choose the GID to disable socket access for. Remember to
63487+ add the users you want socket access disabled for to the GID
63488+ specified here. If the sysctl option is enabled, a sysctl option
63489+ with name "socket_all_gid" is created.
63490+
63491+config GRKERNSEC_SOCKET_CLIENT
63492+ bool "Deny client sockets to group"
63493+ depends on GRKERNSEC_SOCKET
63494+ help
63495+ If you say Y here, you will be able to choose a GID of whose users will
63496+ be unable to connect to other hosts from your machine, but will be
63497+ able to run servers. If this option is enabled, all users in the group
63498+ you specify will have to use passive mode when initiating ftp transfers
63499+ from the shell on your machine. If the sysctl option is enabled, a
63500+ sysctl option with name "socket_client" is created.
63501+
63502+config GRKERNSEC_SOCKET_CLIENT_GID
63503+ int "GID to deny client sockets for"
63504+ depends on GRKERNSEC_SOCKET_CLIENT
63505+ default 1003
63506+ help
63507+ Here you can choose the GID to disable client socket access for.
63508+ Remember to add the users you want client socket access disabled for to
63509+ the GID specified here. If the sysctl option is enabled, a sysctl
63510+ option with name "socket_client_gid" is created.
63511+
63512+config GRKERNSEC_SOCKET_SERVER
63513+ bool "Deny server sockets to group"
63514+ depends on GRKERNSEC_SOCKET
63515+ help
63516+ If you say Y here, you will be able to choose a GID of whose users will
63517+ be unable to run server applications from your machine. If the sysctl
63518+ option is enabled, a sysctl option with name "socket_server" is created.
63519+
63520+config GRKERNSEC_SOCKET_SERVER_GID
63521+ int "GID to deny server sockets for"
63522+ depends on GRKERNSEC_SOCKET_SERVER
63523+ default 1002
63524+ help
63525+ Here you can choose the GID to disable server socket access for.
63526+ Remember to add the users you want server socket access disabled for to
63527+ the GID specified here. If the sysctl option is enabled, a sysctl
63528+ option with name "socket_server_gid" is created.
63529+
63530+endmenu
63531+
63532+menu "Physical Protections"
63533+depends on GRKERNSEC
63534+
63535+config GRKERNSEC_DENYUSB
63536+ bool "Deny new USB connections after toggle"
63537+ default y if GRKERNSEC_CONFIG_AUTO
63538+ depends on SYSCTL && USB_SUPPORT
63539+ help
63540+ If you say Y here, a new sysctl option with name "deny_new_usb"
63541+ will be created. Setting its value to 1 will prevent any new
63542+ USB devices from being recognized by the OS. Any attempted USB
63543+ device insertion will be logged. This option is intended to be
63544+ used against custom USB devices designed to exploit vulnerabilities
63545+ in various USB device drivers.
63546+
63547+ For greatest effectiveness, this sysctl should be set after any
63548+ relevant init scripts. This option is safe to enable in distros
63549+ as each user can choose whether or not to toggle the sysctl.
63550+
63551+config GRKERNSEC_DENYUSB_FORCE
63552+ bool "Reject all USB devices not connected at boot"
63553+ select USB
63554+ depends on GRKERNSEC_DENYUSB
63555+ help
63556+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
63557+ that doesn't involve a sysctl entry. This option should only be
63558+ enabled if you're sure you want to deny all new USB connections
63559+ at runtime and don't want to modify init scripts. This should not
63560+ be enabled by distros. It forces the core USB code to be built
63561+ into the kernel image so that all devices connected at boot time
63562+ can be recognized and new USB device connections can be prevented
63563+ prior to init running.
63564+
63565+endmenu
63566+
63567+menu "Sysctl Support"
63568+depends on GRKERNSEC && SYSCTL
63569+
63570+config GRKERNSEC_SYSCTL
63571+ bool "Sysctl support"
63572+ default y if GRKERNSEC_CONFIG_AUTO
63573+ help
63574+ If you say Y here, you will be able to change the options that
63575+ grsecurity runs with at bootup, without having to recompile your
63576+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
63577+ to enable (1) or disable (0) various features. All the sysctl entries
63578+ are mutable until the "grsec_lock" entry is set to a non-zero value.
63579+ All features enabled in the kernel configuration are disabled at boot
63580+ if you do not say Y to the "Turn on features by default" option.
63581+ All options should be set at startup, and the grsec_lock entry should
63582+ be set to a non-zero value after all the options are set.
63583+ *THIS IS EXTREMELY IMPORTANT*
63584+
63585+config GRKERNSEC_SYSCTL_DISTRO
63586+ bool "Extra sysctl support for distro makers (READ HELP)"
63587+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
63588+ help
63589+ If you say Y here, additional sysctl options will be created
63590+ for features that affect processes running as root. Therefore,
63591+ it is critical when using this option that the grsec_lock entry be
63592+ enabled after boot. Only distros with prebuilt kernel packages
63593+ with this option enabled that can ensure grsec_lock is enabled
63594+ after boot should use this option.
63595+ *Failure to set grsec_lock after boot makes all grsec features
63596+ this option covers useless*
63597+
63598+ Currently this option creates the following sysctl entries:
63599+ "Disable Privileged I/O": "disable_priv_io"
63600+
63601+config GRKERNSEC_SYSCTL_ON
63602+ bool "Turn on features by default"
63603+ default y if GRKERNSEC_CONFIG_AUTO
63604+ depends on GRKERNSEC_SYSCTL
63605+ help
63606+ If you say Y here, instead of having all features enabled in the
63607+ kernel configuration disabled at boot time, the features will be
63608+ enabled at boot time. It is recommended you say Y here unless
63609+ there is some reason you would want all sysctl-tunable features to
63610+ be disabled by default. As mentioned elsewhere, it is important
63611+ to enable the grsec_lock entry once you have finished modifying
63612+ the sysctl entries.
63613+
63614+endmenu
63615+menu "Logging Options"
63616+depends on GRKERNSEC
63617+
63618+config GRKERNSEC_FLOODTIME
63619+ int "Seconds in between log messages (minimum)"
63620+ default 10
63621+ help
63622+ This option allows you to enforce the number of seconds between
63623+ grsecurity log messages. The default should be suitable for most
63624+ people, however, if you choose to change it, choose a value small enough
63625+ to allow informative logs to be produced, but large enough to
63626+ prevent flooding.
63627+
63628+config GRKERNSEC_FLOODBURST
63629+ int "Number of messages in a burst (maximum)"
63630+ default 6
63631+ help
63632+ This option allows you to choose the maximum number of messages allowed
63633+ within the flood time interval you chose in a separate option. The
63634+ default should be suitable for most people, however if you find that
63635+ many of your logs are being interpreted as flooding, you may want to
63636+ raise this value.
63637+
63638+endmenu
63639diff --git a/grsecurity/Makefile b/grsecurity/Makefile
63640new file mode 100644
63641index 0000000..85beb79
63642--- /dev/null
63643+++ b/grsecurity/Makefile
63644@@ -0,0 +1,43 @@
63645+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
63646+# during 2001-2009 it has been completely redesigned by Brad Spengler
63647+# into an RBAC system
63648+#
63649+# All code in this directory and various hooks inserted throughout the kernel
63650+# are copyright Brad Spengler - Open Source Security, Inc., and released
63651+# under the GPL v2 or higher
63652+
63653+KBUILD_CFLAGS += -Werror
63654+
63655+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
63656+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
63657+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
63658+ grsec_usb.o grsec_ipc.o
63659+
63660+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
63661+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
63662+ gracl_learn.o grsec_log.o gracl_policy.o
63663+ifdef CONFIG_COMPAT
63664+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
63665+endif
63666+
63667+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
63668+
63669+ifdef CONFIG_NET
63670+obj-y += grsec_sock.o
63671+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
63672+endif
63673+
63674+ifndef CONFIG_GRKERNSEC
63675+obj-y += grsec_disabled.o
63676+endif
63677+
63678+ifdef CONFIG_GRKERNSEC_HIDESYM
63679+extra-y := grsec_hidesym.o
63680+$(obj)/grsec_hidesym.o:
63681+ @-chmod -f 500 /boot
63682+ @-chmod -f 500 /lib/modules
63683+ @-chmod -f 500 /lib64/modules
63684+ @-chmod -f 500 /lib32/modules
63685+ @-chmod -f 700 .
63686+ @echo ' grsec: protected kernel image paths'
63687+endif
63688diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
63689new file mode 100644
63690index 0000000..90f71ce
63691--- /dev/null
63692+++ b/grsecurity/gracl.c
63693@@ -0,0 +1,2679 @@
63694+#include <linux/kernel.h>
63695+#include <linux/module.h>
63696+#include <linux/sched.h>
63697+#include <linux/mm.h>
63698+#include <linux/file.h>
63699+#include <linux/fs.h>
63700+#include <linux/namei.h>
63701+#include <linux/mount.h>
63702+#include <linux/tty.h>
63703+#include <linux/proc_fs.h>
63704+#include <linux/lglock.h>
63705+#include <linux/slab.h>
63706+#include <linux/vmalloc.h>
63707+#include <linux/types.h>
63708+#include <linux/sysctl.h>
63709+#include <linux/netdevice.h>
63710+#include <linux/ptrace.h>
63711+#include <linux/gracl.h>
63712+#include <linux/gralloc.h>
63713+#include <linux/security.h>
63714+#include <linux/grinternal.h>
63715+#include <linux/pid_namespace.h>
63716+#include <linux/stop_machine.h>
63717+#include <linux/fdtable.h>
63718+#include <linux/percpu.h>
63719+#include <linux/lglock.h>
63720+#include <linux/hugetlb.h>
63721+#include <linux/posix-timers.h>
63722+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
63723+#include <linux/magic.h>
63724+#include <linux/pagemap.h>
63725+#include "../fs/btrfs/async-thread.h"
63726+#include "../fs/btrfs/ctree.h"
63727+#include "../fs/btrfs/btrfs_inode.h"
63728+#endif
63729+#include "../fs/mount.h"
63730+
63731+#include <asm/uaccess.h>
63732+#include <asm/errno.h>
63733+#include <asm/mman.h>
63734+
63735+#define FOR_EACH_ROLE_START(role) \
63736+ role = running_polstate.role_list; \
63737+ while (role) {
63738+
63739+#define FOR_EACH_ROLE_END(role) \
63740+ role = role->prev; \
63741+ }
63742+
63743+extern struct lglock vfsmount_lock;
63744+
63745+extern struct path gr_real_root;
63746+
63747+static struct gr_policy_state running_polstate;
63748+struct gr_policy_state *polstate = &running_polstate;
63749+extern struct gr_alloc_state *current_alloc_state;
63750+
63751+extern char *gr_shared_page[4];
63752+DEFINE_RWLOCK(gr_inode_lock);
63753+
63754+static unsigned int gr_status __read_only = GR_STATUS_INIT;
63755+
63756+#ifdef CONFIG_NET
63757+extern struct vfsmount *sock_mnt;
63758+#endif
63759+
63760+extern struct vfsmount *pipe_mnt;
63761+extern struct vfsmount *shm_mnt;
63762+
63763+#ifdef CONFIG_HUGETLBFS
63764+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63765+#endif
63766+
63767+extern u16 acl_sp_role_value;
63768+extern struct acl_object_label *fakefs_obj_rw;
63769+extern struct acl_object_label *fakefs_obj_rwx;
63770+
63771+int gr_acl_is_enabled(void)
63772+{
63773+ return (gr_status & GR_READY);
63774+}
63775+
63776+void gr_enable_rbac_system(void)
63777+{
63778+ pax_open_kernel();
63779+ gr_status |= GR_READY;
63780+ pax_close_kernel();
63781+}
63782+
63783+int gr_rbac_disable(void *unused)
63784+{
63785+ pax_open_kernel();
63786+ gr_status &= ~GR_READY;
63787+ pax_close_kernel();
63788+
63789+ return 0;
63790+}
63791+
63792+static inline dev_t __get_dev(const struct dentry *dentry)
63793+{
63794+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
63795+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
63796+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
63797+ else
63798+#endif
63799+ return dentry->d_sb->s_dev;
63800+}
63801+
63802+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
63803+{
63804+ return __get_dev(dentry);
63805+}
63806+
63807+static char gr_task_roletype_to_char(struct task_struct *task)
63808+{
63809+ switch (task->role->roletype &
63810+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
63811+ GR_ROLE_SPECIAL)) {
63812+ case GR_ROLE_DEFAULT:
63813+ return 'D';
63814+ case GR_ROLE_USER:
63815+ return 'U';
63816+ case GR_ROLE_GROUP:
63817+ return 'G';
63818+ case GR_ROLE_SPECIAL:
63819+ return 'S';
63820+ }
63821+
63822+ return 'X';
63823+}
63824+
63825+char gr_roletype_to_char(void)
63826+{
63827+ return gr_task_roletype_to_char(current);
63828+}
63829+
63830+__inline__ int
63831+gr_acl_tpe_check(void)
63832+{
63833+ if (unlikely(!(gr_status & GR_READY)))
63834+ return 0;
63835+ if (current->role->roletype & GR_ROLE_TPE)
63836+ return 1;
63837+ else
63838+ return 0;
63839+}
63840+
63841+int
63842+gr_handle_rawio(const struct inode *inode)
63843+{
63844+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
63845+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
63846+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
63847+ !capable(CAP_SYS_RAWIO))
63848+ return 1;
63849+#endif
63850+ return 0;
63851+}
63852+
63853+int
63854+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
63855+{
63856+ if (likely(lena != lenb))
63857+ return 0;
63858+
63859+ return !memcmp(a, b, lena);
63860+}
63861+
63862+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
63863+{
63864+ *buflen -= namelen;
63865+ if (*buflen < 0)
63866+ return -ENAMETOOLONG;
63867+ *buffer -= namelen;
63868+ memcpy(*buffer, str, namelen);
63869+ return 0;
63870+}
63871+
63872+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
63873+{
63874+ return prepend(buffer, buflen, name->name, name->len);
63875+}
63876+
63877+static int prepend_path(const struct path *path, struct path *root,
63878+ char **buffer, int *buflen)
63879+{
63880+ struct dentry *dentry = path->dentry;
63881+ struct vfsmount *vfsmnt = path->mnt;
63882+ struct mount *mnt = real_mount(vfsmnt);
63883+ bool slash = false;
63884+ int error = 0;
63885+
63886+ while (dentry != root->dentry || vfsmnt != root->mnt) {
63887+ struct dentry * parent;
63888+
63889+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
63890+ /* Global root? */
63891+ if (!mnt_has_parent(mnt)) {
63892+ goto out;
63893+ }
63894+ dentry = mnt->mnt_mountpoint;
63895+ mnt = mnt->mnt_parent;
63896+ vfsmnt = &mnt->mnt;
63897+ continue;
63898+ }
63899+ parent = dentry->d_parent;
63900+ prefetch(parent);
63901+ spin_lock(&dentry->d_lock);
63902+ error = prepend_name(buffer, buflen, &dentry->d_name);
63903+ spin_unlock(&dentry->d_lock);
63904+ if (!error)
63905+ error = prepend(buffer, buflen, "/", 1);
63906+ if (error)
63907+ break;
63908+
63909+ slash = true;
63910+ dentry = parent;
63911+ }
63912+
63913+out:
63914+ if (!error && !slash)
63915+ error = prepend(buffer, buflen, "/", 1);
63916+
63917+ return error;
63918+}
63919+
63920+/* this must be called with vfsmount_lock and rename_lock held */
63921+
63922+static char *__our_d_path(const struct path *path, struct path *root,
63923+ char *buf, int buflen)
63924+{
63925+ char *res = buf + buflen;
63926+ int error;
63927+
63928+ prepend(&res, &buflen, "\0", 1);
63929+ error = prepend_path(path, root, &res, &buflen);
63930+ if (error)
63931+ return ERR_PTR(error);
63932+
63933+ return res;
63934+}
63935+
63936+static char *
63937+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
63938+{
63939+ char *retval;
63940+
63941+ retval = __our_d_path(path, root, buf, buflen);
63942+ if (unlikely(IS_ERR(retval)))
63943+ retval = strcpy(buf, "<path too long>");
63944+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
63945+ retval[1] = '\0';
63946+
63947+ return retval;
63948+}
63949+
63950+static char *
63951+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
63952+ char *buf, int buflen)
63953+{
63954+ struct path path;
63955+ char *res;
63956+
63957+ path.dentry = (struct dentry *)dentry;
63958+ path.mnt = (struct vfsmount *)vfsmnt;
63959+
63960+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
63961+ by the RBAC system */
63962+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
63963+
63964+ return res;
63965+}
63966+
63967+static char *
63968+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
63969+ char *buf, int buflen)
63970+{
63971+ char *res;
63972+ struct path path;
63973+ struct path root;
63974+ struct task_struct *reaper = init_pid_ns.child_reaper;
63975+
63976+ path.dentry = (struct dentry *)dentry;
63977+ path.mnt = (struct vfsmount *)vfsmnt;
63978+
63979+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
63980+ get_fs_root(reaper->fs, &root);
63981+
63982+ br_read_lock(&vfsmount_lock);
63983+ write_seqlock(&rename_lock);
63984+ res = gen_full_path(&path, &root, buf, buflen);
63985+ write_sequnlock(&rename_lock);
63986+ br_read_unlock(&vfsmount_lock);
63987+
63988+ path_put(&root);
63989+ return res;
63990+}
63991+
63992+char *
63993+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
63994+{
63995+ char *ret;
63996+ br_read_lock(&vfsmount_lock);
63997+ write_seqlock(&rename_lock);
63998+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
63999+ PAGE_SIZE);
64000+ write_sequnlock(&rename_lock);
64001+ br_read_unlock(&vfsmount_lock);
64002+ return ret;
64003+}
64004+
64005+static char *
64006+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
64007+{
64008+ char *ret;
64009+ char *buf;
64010+ int buflen;
64011+
64012+ br_read_lock(&vfsmount_lock);
64013+ write_seqlock(&rename_lock);
64014+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
64015+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
64016+ buflen = (int)(ret - buf);
64017+ if (buflen >= 5)
64018+ prepend(&ret, &buflen, "/proc", 5);
64019+ else
64020+ ret = strcpy(buf, "<path too long>");
64021+ write_sequnlock(&rename_lock);
64022+ br_read_unlock(&vfsmount_lock);
64023+ return ret;
64024+}
64025+
64026+char *
64027+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
64028+{
64029+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
64030+ PAGE_SIZE);
64031+}
64032+
64033+char *
64034+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
64035+{
64036+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
64037+ PAGE_SIZE);
64038+}
64039+
64040+char *
64041+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
64042+{
64043+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
64044+ PAGE_SIZE);
64045+}
64046+
64047+char *
64048+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
64049+{
64050+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
64051+ PAGE_SIZE);
64052+}
64053+
64054+char *
64055+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
64056+{
64057+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
64058+ PAGE_SIZE);
64059+}
64060+
64061+__inline__ __u32
64062+to_gr_audit(const __u32 reqmode)
64063+{
64064+ /* masks off auditable permission flags, then shifts them to create
64065+ auditing flags, and adds the special case of append auditing if
64066+ we're requesting write */
64067+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
64068+}
64069+
64070+struct acl_role_label *
64071+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
64072+ const gid_t gid)
64073+{
64074+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
64075+ struct acl_role_label *match;
64076+ struct role_allowed_ip *ipp;
64077+ unsigned int x;
64078+ u32 curr_ip = task->signal->saved_ip;
64079+
64080+ match = state->acl_role_set.r_hash[index];
64081+
64082+ while (match) {
64083+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
64084+ for (x = 0; x < match->domain_child_num; x++) {
64085+ if (match->domain_children[x] == uid)
64086+ goto found;
64087+ }
64088+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
64089+ break;
64090+ match = match->next;
64091+ }
64092+found:
64093+ if (match == NULL) {
64094+ try_group:
64095+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
64096+ match = state->acl_role_set.r_hash[index];
64097+
64098+ while (match) {
64099+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
64100+ for (x = 0; x < match->domain_child_num; x++) {
64101+ if (match->domain_children[x] == gid)
64102+ goto found2;
64103+ }
64104+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
64105+ break;
64106+ match = match->next;
64107+ }
64108+found2:
64109+ if (match == NULL)
64110+ match = state->default_role;
64111+ if (match->allowed_ips == NULL)
64112+ return match;
64113+ else {
64114+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
64115+ if (likely
64116+ ((ntohl(curr_ip) & ipp->netmask) ==
64117+ (ntohl(ipp->addr) & ipp->netmask)))
64118+ return match;
64119+ }
64120+ match = state->default_role;
64121+ }
64122+ } else if (match->allowed_ips == NULL) {
64123+ return match;
64124+ } else {
64125+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
64126+ if (likely
64127+ ((ntohl(curr_ip) & ipp->netmask) ==
64128+ (ntohl(ipp->addr) & ipp->netmask)))
64129+ return match;
64130+ }
64131+ goto try_group;
64132+ }
64133+
64134+ return match;
64135+}
64136+
64137+static struct acl_role_label *
64138+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
64139+ const gid_t gid)
64140+{
64141+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
64142+}
64143+
64144+struct acl_subject_label *
64145+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
64146+ const struct acl_role_label *role)
64147+{
64148+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
64149+ struct acl_subject_label *match;
64150+
64151+ match = role->subj_hash[index];
64152+
64153+ while (match && (match->inode != ino || match->device != dev ||
64154+ (match->mode & GR_DELETED))) {
64155+ match = match->next;
64156+ }
64157+
64158+ if (match && !(match->mode & GR_DELETED))
64159+ return match;
64160+ else
64161+ return NULL;
64162+}
64163+
64164+struct acl_subject_label *
64165+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
64166+ const struct acl_role_label *role)
64167+{
64168+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
64169+ struct acl_subject_label *match;
64170+
64171+ match = role->subj_hash[index];
64172+
64173+ while (match && (match->inode != ino || match->device != dev ||
64174+ !(match->mode & GR_DELETED))) {
64175+ match = match->next;
64176+ }
64177+
64178+ if (match && (match->mode & GR_DELETED))
64179+ return match;
64180+ else
64181+ return NULL;
64182+}
64183+
64184+static struct acl_object_label *
64185+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
64186+ const struct acl_subject_label *subj)
64187+{
64188+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
64189+ struct acl_object_label *match;
64190+
64191+ match = subj->obj_hash[index];
64192+
64193+ while (match && (match->inode != ino || match->device != dev ||
64194+ (match->mode & GR_DELETED))) {
64195+ match = match->next;
64196+ }
64197+
64198+ if (match && !(match->mode & GR_DELETED))
64199+ return match;
64200+ else
64201+ return NULL;
64202+}
64203+
64204+static struct acl_object_label *
64205+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
64206+ const struct acl_subject_label *subj)
64207+{
64208+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
64209+ struct acl_object_label *match;
64210+
64211+ match = subj->obj_hash[index];
64212+
64213+ while (match && (match->inode != ino || match->device != dev ||
64214+ !(match->mode & GR_DELETED))) {
64215+ match = match->next;
64216+ }
64217+
64218+ if (match && (match->mode & GR_DELETED))
64219+ return match;
64220+
64221+ match = subj->obj_hash[index];
64222+
64223+ while (match && (match->inode != ino || match->device != dev ||
64224+ (match->mode & GR_DELETED))) {
64225+ match = match->next;
64226+ }
64227+
64228+ if (match && !(match->mode & GR_DELETED))
64229+ return match;
64230+ else
64231+ return NULL;
64232+}
64233+
64234+struct name_entry *
64235+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
64236+{
64237+ unsigned int len = strlen(name);
64238+ unsigned int key = full_name_hash(name, len);
64239+ unsigned int index = key % state->name_set.n_size;
64240+ struct name_entry *match;
64241+
64242+ match = state->name_set.n_hash[index];
64243+
64244+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
64245+ match = match->next;
64246+
64247+ return match;
64248+}
64249+
64250+static struct name_entry *
64251+lookup_name_entry(const char *name)
64252+{
64253+ return __lookup_name_entry(&running_polstate, name);
64254+}
64255+
64256+static struct name_entry *
64257+lookup_name_entry_create(const char *name)
64258+{
64259+ unsigned int len = strlen(name);
64260+ unsigned int key = full_name_hash(name, len);
64261+ unsigned int index = key % running_polstate.name_set.n_size;
64262+ struct name_entry *match;
64263+
64264+ match = running_polstate.name_set.n_hash[index];
64265+
64266+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
64267+ !match->deleted))
64268+ match = match->next;
64269+
64270+ if (match && match->deleted)
64271+ return match;
64272+
64273+ match = running_polstate.name_set.n_hash[index];
64274+
64275+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
64276+ match->deleted))
64277+ match = match->next;
64278+
64279+ if (match && !match->deleted)
64280+ return match;
64281+ else
64282+ return NULL;
64283+}
64284+
64285+static struct inodev_entry *
64286+lookup_inodev_entry(const ino_t ino, const dev_t dev)
64287+{
64288+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
64289+ struct inodev_entry *match;
64290+
64291+ match = running_polstate.inodev_set.i_hash[index];
64292+
64293+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
64294+ match = match->next;
64295+
64296+ return match;
64297+}
64298+
64299+void
64300+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
64301+{
64302+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
64303+ state->inodev_set.i_size);
64304+ struct inodev_entry **curr;
64305+
64306+ entry->prev = NULL;
64307+
64308+ curr = &state->inodev_set.i_hash[index];
64309+ if (*curr != NULL)
64310+ (*curr)->prev = entry;
64311+
64312+ entry->next = *curr;
64313+ *curr = entry;
64314+
64315+ return;
64316+}
64317+
64318+static void
64319+insert_inodev_entry(struct inodev_entry *entry)
64320+{
64321+ __insert_inodev_entry(&running_polstate, entry);
64322+}
64323+
64324+void
64325+insert_acl_obj_label(struct acl_object_label *obj,
64326+ struct acl_subject_label *subj)
64327+{
64328+ unsigned int index =
64329+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
64330+ struct acl_object_label **curr;
64331+
64332+ obj->prev = NULL;
64333+
64334+ curr = &subj->obj_hash[index];
64335+ if (*curr != NULL)
64336+ (*curr)->prev = obj;
64337+
64338+ obj->next = *curr;
64339+ *curr = obj;
64340+
64341+ return;
64342+}
64343+
64344+void
64345+insert_acl_subj_label(struct acl_subject_label *obj,
64346+ struct acl_role_label *role)
64347+{
64348+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
64349+ struct acl_subject_label **curr;
64350+
64351+ obj->prev = NULL;
64352+
64353+ curr = &role->subj_hash[index];
64354+ if (*curr != NULL)
64355+ (*curr)->prev = obj;
64356+
64357+ obj->next = *curr;
64358+ *curr = obj;
64359+
64360+ return;
64361+}
64362+
64363+/* derived from glibc fnmatch() 0: match, 1: no match*/
64364+
64365+static int
64366+glob_match(const char *p, const char *n)
64367+{
64368+ char c;
64369+
64370+ while ((c = *p++) != '\0') {
64371+ switch (c) {
64372+ case '?':
64373+ if (*n == '\0')
64374+ return 1;
64375+ else if (*n == '/')
64376+ return 1;
64377+ break;
64378+ case '\\':
64379+ if (*n != c)
64380+ return 1;
64381+ break;
64382+ case '*':
64383+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
64384+ if (*n == '/')
64385+ return 1;
64386+ else if (c == '?') {
64387+ if (*n == '\0')
64388+ return 1;
64389+ else
64390+ ++n;
64391+ }
64392+ }
64393+ if (c == '\0') {
64394+ return 0;
64395+ } else {
64396+ const char *endp;
64397+
64398+ if ((endp = strchr(n, '/')) == NULL)
64399+ endp = n + strlen(n);
64400+
64401+ if (c == '[') {
64402+ for (--p; n < endp; ++n)
64403+ if (!glob_match(p, n))
64404+ return 0;
64405+ } else if (c == '/') {
64406+ while (*n != '\0' && *n != '/')
64407+ ++n;
64408+ if (*n == '/' && !glob_match(p, n + 1))
64409+ return 0;
64410+ } else {
64411+ for (--p; n < endp; ++n)
64412+ if (*n == c && !glob_match(p, n))
64413+ return 0;
64414+ }
64415+
64416+ return 1;
64417+ }
64418+ case '[':
64419+ {
64420+ int not;
64421+ char cold;
64422+
64423+ if (*n == '\0' || *n == '/')
64424+ return 1;
64425+
64426+ not = (*p == '!' || *p == '^');
64427+ if (not)
64428+ ++p;
64429+
64430+ c = *p++;
64431+ for (;;) {
64432+ unsigned char fn = (unsigned char)*n;
64433+
64434+ if (c == '\0')
64435+ return 1;
64436+ else {
64437+ if (c == fn)
64438+ goto matched;
64439+ cold = c;
64440+ c = *p++;
64441+
64442+ if (c == '-' && *p != ']') {
64443+ unsigned char cend = *p++;
64444+
64445+ if (cend == '\0')
64446+ return 1;
64447+
64448+ if (cold <= fn && fn <= cend)
64449+ goto matched;
64450+
64451+ c = *p++;
64452+ }
64453+ }
64454+
64455+ if (c == ']')
64456+ break;
64457+ }
64458+ if (!not)
64459+ return 1;
64460+ break;
64461+ matched:
64462+ while (c != ']') {
64463+ if (c == '\0')
64464+ return 1;
64465+
64466+ c = *p++;
64467+ }
64468+ if (not)
64469+ return 1;
64470+ }
64471+ break;
64472+ default:
64473+ if (c != *n)
64474+ return 1;
64475+ }
64476+
64477+ ++n;
64478+ }
64479+
64480+ if (*n == '\0')
64481+ return 0;
64482+
64483+ if (*n == '/')
64484+ return 0;
64485+
64486+ return 1;
64487+}
64488+
64489+static struct acl_object_label *
64490+chk_glob_label(struct acl_object_label *globbed,
64491+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
64492+{
64493+ struct acl_object_label *tmp;
64494+
64495+ if (*path == NULL)
64496+ *path = gr_to_filename_nolock(dentry, mnt);
64497+
64498+ tmp = globbed;
64499+
64500+ while (tmp) {
64501+ if (!glob_match(tmp->filename, *path))
64502+ return tmp;
64503+ tmp = tmp->next;
64504+ }
64505+
64506+ return NULL;
64507+}
64508+
64509+static struct acl_object_label *
64510+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
64511+ const ino_t curr_ino, const dev_t curr_dev,
64512+ const struct acl_subject_label *subj, char **path, const int checkglob)
64513+{
64514+ struct acl_subject_label *tmpsubj;
64515+ struct acl_object_label *retval;
64516+ struct acl_object_label *retval2;
64517+
64518+ tmpsubj = (struct acl_subject_label *) subj;
64519+ read_lock(&gr_inode_lock);
64520+ do {
64521+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
64522+ if (retval) {
64523+ if (checkglob && retval->globbed) {
64524+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
64525+ if (retval2)
64526+ retval = retval2;
64527+ }
64528+ break;
64529+ }
64530+ } while ((tmpsubj = tmpsubj->parent_subject));
64531+ read_unlock(&gr_inode_lock);
64532+
64533+ return retval;
64534+}
64535+
64536+static __inline__ struct acl_object_label *
64537+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
64538+ struct dentry *curr_dentry,
64539+ const struct acl_subject_label *subj, char **path, const int checkglob)
64540+{
64541+ int newglob = checkglob;
64542+ ino_t inode;
64543+ dev_t device;
64544+
64545+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
64546+ as we don't want a / * rule to match instead of the / object
64547+ don't do this for create lookups that call this function though, since they're looking up
64548+ on the parent and thus need globbing checks on all paths
64549+ */
64550+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
64551+ newglob = GR_NO_GLOB;
64552+
64553+ spin_lock(&curr_dentry->d_lock);
64554+ inode = curr_dentry->d_inode->i_ino;
64555+ device = __get_dev(curr_dentry);
64556+ spin_unlock(&curr_dentry->d_lock);
64557+
64558+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
64559+}
64560+
64561+#ifdef CONFIG_HUGETLBFS
64562+static inline bool
64563+is_hugetlbfs_mnt(const struct vfsmount *mnt)
64564+{
64565+ int i;
64566+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
64567+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
64568+ return true;
64569+ }
64570+
64571+ return false;
64572+}
64573+#endif
64574+
64575+static struct acl_object_label *
64576+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64577+ const struct acl_subject_label *subj, char *path, const int checkglob)
64578+{
64579+ struct dentry *dentry = (struct dentry *) l_dentry;
64580+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
64581+ struct mount *real_mnt = real_mount(mnt);
64582+ struct acl_object_label *retval;
64583+ struct dentry *parent;
64584+
64585+ br_read_lock(&vfsmount_lock);
64586+ write_seqlock(&rename_lock);
64587+
64588+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
64589+#ifdef CONFIG_NET
64590+ mnt == sock_mnt ||
64591+#endif
64592+#ifdef CONFIG_HUGETLBFS
64593+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
64594+#endif
64595+ /* ignore Eric Biederman */
64596+ IS_PRIVATE(l_dentry->d_inode))) {
64597+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
64598+ goto out;
64599+ }
64600+
64601+ for (;;) {
64602+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
64603+ break;
64604+
64605+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
64606+ if (!mnt_has_parent(real_mnt))
64607+ break;
64608+
64609+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64610+ if (retval != NULL)
64611+ goto out;
64612+
64613+ dentry = real_mnt->mnt_mountpoint;
64614+ real_mnt = real_mnt->mnt_parent;
64615+ mnt = &real_mnt->mnt;
64616+ continue;
64617+ }
64618+
64619+ parent = dentry->d_parent;
64620+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64621+ if (retval != NULL)
64622+ goto out;
64623+
64624+ dentry = parent;
64625+ }
64626+
64627+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
64628+
64629+ /* gr_real_root is pinned so we don't have to hold a reference */
64630+ if (retval == NULL)
64631+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
64632+out:
64633+ write_sequnlock(&rename_lock);
64634+ br_read_unlock(&vfsmount_lock);
64635+
64636+ BUG_ON(retval == NULL);
64637+
64638+ return retval;
64639+}
64640+
64641+static __inline__ struct acl_object_label *
64642+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64643+ const struct acl_subject_label *subj)
64644+{
64645+ char *path = NULL;
64646+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
64647+}
64648+
64649+static __inline__ struct acl_object_label *
64650+chk_obj_label_noglob(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_NO_GLOB);
64655+}
64656+
64657+static __inline__ struct acl_object_label *
64658+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64659+ const struct acl_subject_label *subj, char *path)
64660+{
64661+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
64662+}
64663+
64664+struct acl_subject_label *
64665+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
64666+ const struct acl_role_label *role)
64667+{
64668+ struct dentry *dentry = (struct dentry *) l_dentry;
64669+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
64670+ struct mount *real_mnt = real_mount(mnt);
64671+ struct acl_subject_label *retval;
64672+ struct dentry *parent;
64673+
64674+ br_read_lock(&vfsmount_lock);
64675+ write_seqlock(&rename_lock);
64676+
64677+ for (;;) {
64678+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
64679+ break;
64680+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
64681+ if (!mnt_has_parent(real_mnt))
64682+ break;
64683+
64684+ spin_lock(&dentry->d_lock);
64685+ read_lock(&gr_inode_lock);
64686+ retval =
64687+ lookup_acl_subj_label(dentry->d_inode->i_ino,
64688+ __get_dev(dentry), role);
64689+ read_unlock(&gr_inode_lock);
64690+ spin_unlock(&dentry->d_lock);
64691+ if (retval != NULL)
64692+ goto out;
64693+
64694+ dentry = real_mnt->mnt_mountpoint;
64695+ real_mnt = real_mnt->mnt_parent;
64696+ mnt = &real_mnt->mnt;
64697+ continue;
64698+ }
64699+
64700+ spin_lock(&dentry->d_lock);
64701+ read_lock(&gr_inode_lock);
64702+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
64703+ __get_dev(dentry), role);
64704+ read_unlock(&gr_inode_lock);
64705+ parent = dentry->d_parent;
64706+ spin_unlock(&dentry->d_lock);
64707+
64708+ if (retval != NULL)
64709+ goto out;
64710+
64711+ dentry = parent;
64712+ }
64713+
64714+ spin_lock(&dentry->d_lock);
64715+ read_lock(&gr_inode_lock);
64716+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
64717+ __get_dev(dentry), role);
64718+ read_unlock(&gr_inode_lock);
64719+ spin_unlock(&dentry->d_lock);
64720+
64721+ if (unlikely(retval == NULL)) {
64722+ /* gr_real_root is pinned, we don't need to hold a reference */
64723+ read_lock(&gr_inode_lock);
64724+ retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
64725+ __get_dev(gr_real_root.dentry), role);
64726+ read_unlock(&gr_inode_lock);
64727+ }
64728+out:
64729+ write_sequnlock(&rename_lock);
64730+ br_read_unlock(&vfsmount_lock);
64731+
64732+ BUG_ON(retval == NULL);
64733+
64734+ return retval;
64735+}
64736+
64737+void
64738+assign_special_role(const char *rolename)
64739+{
64740+ struct acl_object_label *obj;
64741+ struct acl_role_label *r;
64742+ struct acl_role_label *assigned = NULL;
64743+ struct task_struct *tsk;
64744+ struct file *filp;
64745+
64746+ FOR_EACH_ROLE_START(r)
64747+ if (!strcmp(rolename, r->rolename) &&
64748+ (r->roletype & GR_ROLE_SPECIAL)) {
64749+ assigned = r;
64750+ break;
64751+ }
64752+ FOR_EACH_ROLE_END(r)
64753+
64754+ if (!assigned)
64755+ return;
64756+
64757+ read_lock(&tasklist_lock);
64758+ read_lock(&grsec_exec_file_lock);
64759+
64760+ tsk = current->real_parent;
64761+ if (tsk == NULL)
64762+ goto out_unlock;
64763+
64764+ filp = tsk->exec_file;
64765+ if (filp == NULL)
64766+ goto out_unlock;
64767+
64768+ tsk->is_writable = 0;
64769+ tsk->inherited = 0;
64770+
64771+ tsk->acl_sp_role = 1;
64772+ tsk->acl_role_id = ++acl_sp_role_value;
64773+ tsk->role = assigned;
64774+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
64775+
64776+ /* ignore additional mmap checks for processes that are writable
64777+ by the default ACL */
64778+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
64779+ if (unlikely(obj->mode & GR_WRITE))
64780+ tsk->is_writable = 1;
64781+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
64782+ if (unlikely(obj->mode & GR_WRITE))
64783+ tsk->is_writable = 1;
64784+
64785+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
64786+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
64787+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
64788+#endif
64789+
64790+out_unlock:
64791+ read_unlock(&grsec_exec_file_lock);
64792+ read_unlock(&tasklist_lock);
64793+ return;
64794+}
64795+
64796+
64797+static void
64798+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
64799+{
64800+ struct task_struct *task = current;
64801+ const struct cred *cred = current_cred();
64802+
64803+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
64804+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64805+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64806+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
64807+
64808+ return;
64809+}
64810+
64811+static void
64812+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
64813+{
64814+ struct task_struct *task = current;
64815+ const struct cred *cred = current_cred();
64816+
64817+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
64818+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64819+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64820+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
64821+
64822+ return;
64823+}
64824+
64825+static void
64826+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
64827+{
64828+ struct task_struct *task = current;
64829+ const struct cred *cred = current_cred();
64830+
64831+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
64832+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
64833+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
64834+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
64835+
64836+ return;
64837+}
64838+
64839+static void
64840+gr_set_proc_res(struct task_struct *task)
64841+{
64842+ struct acl_subject_label *proc;
64843+ unsigned short i;
64844+
64845+ proc = task->acl;
64846+
64847+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
64848+ return;
64849+
64850+ for (i = 0; i < RLIM_NLIMITS; i++) {
64851+ if (!(proc->resmask & (1U << i)))
64852+ continue;
64853+
64854+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
64855+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
64856+
64857+ if (i == RLIMIT_CPU)
64858+ update_rlimit_cpu(task, proc->res[i].rlim_cur);
64859+ }
64860+
64861+ return;
64862+}
64863+
64864+/* both of the below must be called with
64865+ rcu_read_lock();
64866+ read_lock(&tasklist_lock);
64867+ read_lock(&grsec_exec_file_lock);
64868+*/
64869+
64870+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
64871+{
64872+ char *tmpname;
64873+ struct acl_subject_label *tmpsubj;
64874+ struct file *filp;
64875+ struct name_entry *nmatch;
64876+
64877+ filp = task->exec_file;
64878+ if (filp == NULL)
64879+ return NULL;
64880+
64881+ /* the following is to apply the correct subject
64882+ on binaries running when the RBAC system
64883+ is enabled, when the binaries have been
64884+ replaced or deleted since their execution
64885+ -----
64886+ when the RBAC system starts, the inode/dev
64887+ from exec_file will be one the RBAC system
64888+ is unaware of. It only knows the inode/dev
64889+ of the present file on disk, or the absence
64890+ of it.
64891+ */
64892+
64893+ if (filename)
64894+ nmatch = __lookup_name_entry(state, filename);
64895+ else {
64896+ preempt_disable();
64897+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
64898+
64899+ nmatch = __lookup_name_entry(state, tmpname);
64900+ preempt_enable();
64901+ }
64902+ tmpsubj = NULL;
64903+ if (nmatch) {
64904+ if (nmatch->deleted)
64905+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
64906+ else
64907+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
64908+ }
64909+ /* this also works for the reload case -- if we don't match a potentially inherited subject
64910+ then we fall back to a normal lookup based on the binary's ino/dev
64911+ */
64912+ if (tmpsubj == NULL)
64913+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
64914+
64915+ return tmpsubj;
64916+}
64917+
64918+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
64919+{
64920+ return __gr_get_subject_for_task(&running_polstate, task, filename);
64921+}
64922+
64923+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
64924+{
64925+ struct acl_object_label *obj;
64926+ struct file *filp;
64927+
64928+ filp = task->exec_file;
64929+
64930+ task->acl = subj;
64931+ task->is_writable = 0;
64932+ /* ignore additional mmap checks for processes that are writable
64933+ by the default ACL */
64934+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
64935+ if (unlikely(obj->mode & GR_WRITE))
64936+ task->is_writable = 1;
64937+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
64938+ if (unlikely(obj->mode & GR_WRITE))
64939+ task->is_writable = 1;
64940+
64941+ gr_set_proc_res(task);
64942+
64943+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
64944+ 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);
64945+#endif
64946+}
64947+
64948+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
64949+{
64950+ __gr_apply_subject_to_task(&running_polstate, task, subj);
64951+}
64952+
64953+__u32
64954+gr_search_file(const struct dentry * dentry, const __u32 mode,
64955+ const struct vfsmount * mnt)
64956+{
64957+ __u32 retval = mode;
64958+ struct acl_subject_label *curracl;
64959+ struct acl_object_label *currobj;
64960+
64961+ if (unlikely(!(gr_status & GR_READY)))
64962+ return (mode & ~GR_AUDITS);
64963+
64964+ curracl = current->acl;
64965+
64966+ currobj = chk_obj_label(dentry, mnt, curracl);
64967+ retval = currobj->mode & mode;
64968+
64969+ /* if we're opening a specified transfer file for writing
64970+ (e.g. /dev/initctl), then transfer our role to init
64971+ */
64972+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
64973+ current->role->roletype & GR_ROLE_PERSIST)) {
64974+ struct task_struct *task = init_pid_ns.child_reaper;
64975+
64976+ if (task->role != current->role) {
64977+ struct acl_subject_label *subj;
64978+
64979+ task->acl_sp_role = 0;
64980+ task->acl_role_id = current->acl_role_id;
64981+ task->role = current->role;
64982+ rcu_read_lock();
64983+ read_lock(&grsec_exec_file_lock);
64984+ subj = gr_get_subject_for_task(task, NULL);
64985+ gr_apply_subject_to_task(task, subj);
64986+ read_unlock(&grsec_exec_file_lock);
64987+ rcu_read_unlock();
64988+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
64989+ }
64990+ }
64991+
64992+ if (unlikely
64993+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
64994+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
64995+ __u32 new_mode = mode;
64996+
64997+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
64998+
64999+ retval = new_mode;
65000+
65001+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
65002+ new_mode |= GR_INHERIT;
65003+
65004+ if (!(mode & GR_NOLEARN))
65005+ gr_log_learn(dentry, mnt, new_mode);
65006+ }
65007+
65008+ return retval;
65009+}
65010+
65011+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
65012+ const struct dentry *parent,
65013+ const struct vfsmount *mnt)
65014+{
65015+ struct name_entry *match;
65016+ struct acl_object_label *matchpo;
65017+ struct acl_subject_label *curracl;
65018+ char *path;
65019+
65020+ if (unlikely(!(gr_status & GR_READY)))
65021+ return NULL;
65022+
65023+ preempt_disable();
65024+ path = gr_to_filename_rbac(new_dentry, mnt);
65025+ match = lookup_name_entry_create(path);
65026+
65027+ curracl = current->acl;
65028+
65029+ if (match) {
65030+ read_lock(&gr_inode_lock);
65031+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
65032+ read_unlock(&gr_inode_lock);
65033+
65034+ if (matchpo) {
65035+ preempt_enable();
65036+ return matchpo;
65037+ }
65038+ }
65039+
65040+ // lookup parent
65041+
65042+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
65043+
65044+ preempt_enable();
65045+ return matchpo;
65046+}
65047+
65048+__u32
65049+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
65050+ const struct vfsmount * mnt, const __u32 mode)
65051+{
65052+ struct acl_object_label *matchpo;
65053+ __u32 retval;
65054+
65055+ if (unlikely(!(gr_status & GR_READY)))
65056+ return (mode & ~GR_AUDITS);
65057+
65058+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
65059+
65060+ retval = matchpo->mode & mode;
65061+
65062+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
65063+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
65064+ __u32 new_mode = mode;
65065+
65066+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
65067+
65068+ gr_log_learn(new_dentry, mnt, new_mode);
65069+ return new_mode;
65070+ }
65071+
65072+ return retval;
65073+}
65074+
65075+__u32
65076+gr_check_link(const struct dentry * new_dentry,
65077+ const struct dentry * parent_dentry,
65078+ const struct vfsmount * parent_mnt,
65079+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
65080+{
65081+ struct acl_object_label *obj;
65082+ __u32 oldmode, newmode;
65083+ __u32 needmode;
65084+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
65085+ GR_DELETE | GR_INHERIT;
65086+
65087+ if (unlikely(!(gr_status & GR_READY)))
65088+ return (GR_CREATE | GR_LINK);
65089+
65090+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
65091+ oldmode = obj->mode;
65092+
65093+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
65094+ newmode = obj->mode;
65095+
65096+ needmode = newmode & checkmodes;
65097+
65098+ // old name for hardlink must have at least the permissions of the new name
65099+ if ((oldmode & needmode) != needmode)
65100+ goto bad;
65101+
65102+ // if old name had restrictions/auditing, make sure the new name does as well
65103+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
65104+
65105+ // don't allow hardlinking of suid/sgid/fcapped files without permission
65106+ if (is_privileged_binary(old_dentry))
65107+ needmode |= GR_SETID;
65108+
65109+ if ((newmode & needmode) != needmode)
65110+ goto bad;
65111+
65112+ // enforce minimum permissions
65113+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
65114+ return newmode;
65115+bad:
65116+ needmode = oldmode;
65117+ if (is_privileged_binary(old_dentry))
65118+ needmode |= GR_SETID;
65119+
65120+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
65121+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
65122+ return (GR_CREATE | GR_LINK);
65123+ } else if (newmode & GR_SUPPRESS)
65124+ return GR_SUPPRESS;
65125+ else
65126+ return 0;
65127+}
65128+
65129+int
65130+gr_check_hidden_task(const struct task_struct *task)
65131+{
65132+ if (unlikely(!(gr_status & GR_READY)))
65133+ return 0;
65134+
65135+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
65136+ return 1;
65137+
65138+ return 0;
65139+}
65140+
65141+int
65142+gr_check_protected_task(const struct task_struct *task)
65143+{
65144+ if (unlikely(!(gr_status & GR_READY) || !task))
65145+ return 0;
65146+
65147+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
65148+ task->acl != current->acl)
65149+ return 1;
65150+
65151+ return 0;
65152+}
65153+
65154+int
65155+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
65156+{
65157+ struct task_struct *p;
65158+ int ret = 0;
65159+
65160+ if (unlikely(!(gr_status & GR_READY) || !pid))
65161+ return ret;
65162+
65163+ read_lock(&tasklist_lock);
65164+ do_each_pid_task(pid, type, p) {
65165+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
65166+ p->acl != current->acl) {
65167+ ret = 1;
65168+ goto out;
65169+ }
65170+ } while_each_pid_task(pid, type, p);
65171+out:
65172+ read_unlock(&tasklist_lock);
65173+
65174+ return ret;
65175+}
65176+
65177+void
65178+gr_copy_label(struct task_struct *tsk)
65179+{
65180+ struct task_struct *p = current;
65181+
65182+ tsk->inherited = p->inherited;
65183+ tsk->acl_sp_role = 0;
65184+ tsk->acl_role_id = p->acl_role_id;
65185+ tsk->acl = p->acl;
65186+ tsk->role = p->role;
65187+ tsk->signal->used_accept = 0;
65188+ tsk->signal->curr_ip = p->signal->curr_ip;
65189+ tsk->signal->saved_ip = p->signal->saved_ip;
65190+ if (p->exec_file)
65191+ get_file(p->exec_file);
65192+ tsk->exec_file = p->exec_file;
65193+ tsk->is_writable = p->is_writable;
65194+ if (unlikely(p->signal->used_accept)) {
65195+ p->signal->curr_ip = 0;
65196+ p->signal->saved_ip = 0;
65197+ }
65198+
65199+ return;
65200+}
65201+
65202+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
65203+
65204+int
65205+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
65206+{
65207+ unsigned int i;
65208+ __u16 num;
65209+ uid_t *uidlist;
65210+ uid_t curuid;
65211+ int realok = 0;
65212+ int effectiveok = 0;
65213+ int fsok = 0;
65214+ uid_t globalreal, globaleffective, globalfs;
65215+
65216+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
65217+ struct user_struct *user;
65218+
65219+ if (!uid_valid(real))
65220+ goto skipit;
65221+
65222+ /* find user based on global namespace */
65223+
65224+ globalreal = GR_GLOBAL_UID(real);
65225+
65226+ user = find_user(make_kuid(&init_user_ns, globalreal));
65227+ if (user == NULL)
65228+ goto skipit;
65229+
65230+ if (gr_process_kernel_setuid_ban(user)) {
65231+ /* for find_user */
65232+ free_uid(user);
65233+ return 1;
65234+ }
65235+
65236+ /* for find_user */
65237+ free_uid(user);
65238+
65239+skipit:
65240+#endif
65241+
65242+ if (unlikely(!(gr_status & GR_READY)))
65243+ return 0;
65244+
65245+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
65246+ gr_log_learn_uid_change(real, effective, fs);
65247+
65248+ num = current->acl->user_trans_num;
65249+ uidlist = current->acl->user_transitions;
65250+
65251+ if (uidlist == NULL)
65252+ return 0;
65253+
65254+ if (!uid_valid(real)) {
65255+ realok = 1;
65256+ globalreal = (uid_t)-1;
65257+ } else {
65258+ globalreal = GR_GLOBAL_UID(real);
65259+ }
65260+ if (!uid_valid(effective)) {
65261+ effectiveok = 1;
65262+ globaleffective = (uid_t)-1;
65263+ } else {
65264+ globaleffective = GR_GLOBAL_UID(effective);
65265+ }
65266+ if (!uid_valid(fs)) {
65267+ fsok = 1;
65268+ globalfs = (uid_t)-1;
65269+ } else {
65270+ globalfs = GR_GLOBAL_UID(fs);
65271+ }
65272+
65273+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
65274+ for (i = 0; i < num; i++) {
65275+ curuid = uidlist[i];
65276+ if (globalreal == curuid)
65277+ realok = 1;
65278+ if (globaleffective == curuid)
65279+ effectiveok = 1;
65280+ if (globalfs == curuid)
65281+ fsok = 1;
65282+ }
65283+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
65284+ for (i = 0; i < num; i++) {
65285+ curuid = uidlist[i];
65286+ if (globalreal == curuid)
65287+ break;
65288+ if (globaleffective == curuid)
65289+ break;
65290+ if (globalfs == curuid)
65291+ break;
65292+ }
65293+ /* not in deny list */
65294+ if (i == num) {
65295+ realok = 1;
65296+ effectiveok = 1;
65297+ fsok = 1;
65298+ }
65299+ }
65300+
65301+ if (realok && effectiveok && fsok)
65302+ return 0;
65303+ else {
65304+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
65305+ return 1;
65306+ }
65307+}
65308+
65309+int
65310+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
65311+{
65312+ unsigned int i;
65313+ __u16 num;
65314+ gid_t *gidlist;
65315+ gid_t curgid;
65316+ int realok = 0;
65317+ int effectiveok = 0;
65318+ int fsok = 0;
65319+ gid_t globalreal, globaleffective, globalfs;
65320+
65321+ if (unlikely(!(gr_status & GR_READY)))
65322+ return 0;
65323+
65324+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
65325+ gr_log_learn_gid_change(real, effective, fs);
65326+
65327+ num = current->acl->group_trans_num;
65328+ gidlist = current->acl->group_transitions;
65329+
65330+ if (gidlist == NULL)
65331+ return 0;
65332+
65333+ if (!gid_valid(real)) {
65334+ realok = 1;
65335+ globalreal = (gid_t)-1;
65336+ } else {
65337+ globalreal = GR_GLOBAL_GID(real);
65338+ }
65339+ if (!gid_valid(effective)) {
65340+ effectiveok = 1;
65341+ globaleffective = (gid_t)-1;
65342+ } else {
65343+ globaleffective = GR_GLOBAL_GID(effective);
65344+ }
65345+ if (!gid_valid(fs)) {
65346+ fsok = 1;
65347+ globalfs = (gid_t)-1;
65348+ } else {
65349+ globalfs = GR_GLOBAL_GID(fs);
65350+ }
65351+
65352+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
65353+ for (i = 0; i < num; i++) {
65354+ curgid = gidlist[i];
65355+ if (globalreal == curgid)
65356+ realok = 1;
65357+ if (globaleffective == curgid)
65358+ effectiveok = 1;
65359+ if (globalfs == curgid)
65360+ fsok = 1;
65361+ }
65362+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
65363+ for (i = 0; i < num; i++) {
65364+ curgid = gidlist[i];
65365+ if (globalreal == curgid)
65366+ break;
65367+ if (globaleffective == curgid)
65368+ break;
65369+ if (globalfs == curgid)
65370+ break;
65371+ }
65372+ /* not in deny list */
65373+ if (i == num) {
65374+ realok = 1;
65375+ effectiveok = 1;
65376+ fsok = 1;
65377+ }
65378+ }
65379+
65380+ if (realok && effectiveok && fsok)
65381+ return 0;
65382+ else {
65383+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
65384+ return 1;
65385+ }
65386+}
65387+
65388+extern int gr_acl_is_capable(const int cap);
65389+
65390+void
65391+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
65392+{
65393+ struct acl_role_label *role = task->role;
65394+ struct acl_subject_label *subj = NULL;
65395+ struct acl_object_label *obj;
65396+ struct file *filp;
65397+ uid_t uid;
65398+ gid_t gid;
65399+
65400+ if (unlikely(!(gr_status & GR_READY)))
65401+ return;
65402+
65403+ uid = GR_GLOBAL_UID(kuid);
65404+ gid = GR_GLOBAL_GID(kgid);
65405+
65406+ filp = task->exec_file;
65407+
65408+ /* kernel process, we'll give them the kernel role */
65409+ if (unlikely(!filp)) {
65410+ task->role = running_polstate.kernel_role;
65411+ task->acl = running_polstate.kernel_role->root_label;
65412+ return;
65413+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
65414+ /* save the current ip at time of role lookup so that the proper
65415+ IP will be learned for role_allowed_ip */
65416+ task->signal->saved_ip = task->signal->curr_ip;
65417+ role = lookup_acl_role_label(task, uid, gid);
65418+ }
65419+
65420+ /* don't change the role if we're not a privileged process */
65421+ if (role && task->role != role &&
65422+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
65423+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
65424+ return;
65425+
65426+ /* perform subject lookup in possibly new role
65427+ we can use this result below in the case where role == task->role
65428+ */
65429+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
65430+
65431+ /* if we changed uid/gid, but result in the same role
65432+ and are using inheritance, don't lose the inherited subject
65433+ if current subject is other than what normal lookup
65434+ would result in, we arrived via inheritance, don't
65435+ lose subject
65436+ */
65437+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
65438+ (subj == task->acl)))
65439+ task->acl = subj;
65440+
65441+ /* leave task->inherited unaffected */
65442+
65443+ task->role = role;
65444+
65445+ task->is_writable = 0;
65446+
65447+ /* ignore additional mmap checks for processes that are writable
65448+ by the default ACL */
65449+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
65450+ if (unlikely(obj->mode & GR_WRITE))
65451+ task->is_writable = 1;
65452+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
65453+ if (unlikely(obj->mode & GR_WRITE))
65454+ task->is_writable = 1;
65455+
65456+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
65457+ 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);
65458+#endif
65459+
65460+ gr_set_proc_res(task);
65461+
65462+ return;
65463+}
65464+
65465+int
65466+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
65467+ const int unsafe_flags)
65468+{
65469+ struct task_struct *task = current;
65470+ struct acl_subject_label *newacl;
65471+ struct acl_object_label *obj;
65472+ __u32 retmode;
65473+
65474+ if (unlikely(!(gr_status & GR_READY)))
65475+ return 0;
65476+
65477+ newacl = chk_subj_label(dentry, mnt, task->role);
65478+
65479+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
65480+ did an exec
65481+ */
65482+ rcu_read_lock();
65483+ read_lock(&tasklist_lock);
65484+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
65485+ (task->parent->acl->mode & GR_POVERRIDE))) {
65486+ read_unlock(&tasklist_lock);
65487+ rcu_read_unlock();
65488+ goto skip_check;
65489+ }
65490+ read_unlock(&tasklist_lock);
65491+ rcu_read_unlock();
65492+
65493+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
65494+ !(task->role->roletype & GR_ROLE_GOD) &&
65495+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
65496+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
65497+ if (unsafe_flags & LSM_UNSAFE_SHARE)
65498+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
65499+ else
65500+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
65501+ return -EACCES;
65502+ }
65503+
65504+skip_check:
65505+
65506+ obj = chk_obj_label(dentry, mnt, task->acl);
65507+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
65508+
65509+ if (!(task->acl->mode & GR_INHERITLEARN) &&
65510+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
65511+ if (obj->nested)
65512+ task->acl = obj->nested;
65513+ else
65514+ task->acl = newacl;
65515+ task->inherited = 0;
65516+ } else {
65517+ task->inherited = 1;
65518+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
65519+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
65520+ }
65521+
65522+ task->is_writable = 0;
65523+
65524+ /* ignore additional mmap checks for processes that are writable
65525+ by the default ACL */
65526+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
65527+ if (unlikely(obj->mode & GR_WRITE))
65528+ task->is_writable = 1;
65529+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
65530+ if (unlikely(obj->mode & GR_WRITE))
65531+ task->is_writable = 1;
65532+
65533+ gr_set_proc_res(task);
65534+
65535+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
65536+ 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);
65537+#endif
65538+ return 0;
65539+}
65540+
65541+/* always called with valid inodev ptr */
65542+static void
65543+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
65544+{
65545+ struct acl_object_label *matchpo;
65546+ struct acl_subject_label *matchps;
65547+ struct acl_subject_label *subj;
65548+ struct acl_role_label *role;
65549+ unsigned int x;
65550+
65551+ FOR_EACH_ROLE_START(role)
65552+ FOR_EACH_SUBJECT_START(role, subj, x)
65553+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
65554+ matchpo->mode |= GR_DELETED;
65555+ FOR_EACH_SUBJECT_END(subj,x)
65556+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
65557+ /* nested subjects aren't in the role's subj_hash table */
65558+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
65559+ matchpo->mode |= GR_DELETED;
65560+ FOR_EACH_NESTED_SUBJECT_END(subj)
65561+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
65562+ matchps->mode |= GR_DELETED;
65563+ FOR_EACH_ROLE_END(role)
65564+
65565+ inodev->nentry->deleted = 1;
65566+
65567+ return;
65568+}
65569+
65570+void
65571+gr_handle_delete(const ino_t ino, const dev_t dev)
65572+{
65573+ struct inodev_entry *inodev;
65574+
65575+ if (unlikely(!(gr_status & GR_READY)))
65576+ return;
65577+
65578+ write_lock(&gr_inode_lock);
65579+ inodev = lookup_inodev_entry(ino, dev);
65580+ if (inodev != NULL)
65581+ do_handle_delete(inodev, ino, dev);
65582+ write_unlock(&gr_inode_lock);
65583+
65584+ return;
65585+}
65586+
65587+static void
65588+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
65589+ const ino_t newinode, const dev_t newdevice,
65590+ struct acl_subject_label *subj)
65591+{
65592+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
65593+ struct acl_object_label *match;
65594+
65595+ match = subj->obj_hash[index];
65596+
65597+ while (match && (match->inode != oldinode ||
65598+ match->device != olddevice ||
65599+ !(match->mode & GR_DELETED)))
65600+ match = match->next;
65601+
65602+ if (match && (match->inode == oldinode)
65603+ && (match->device == olddevice)
65604+ && (match->mode & GR_DELETED)) {
65605+ if (match->prev == NULL) {
65606+ subj->obj_hash[index] = match->next;
65607+ if (match->next != NULL)
65608+ match->next->prev = NULL;
65609+ } else {
65610+ match->prev->next = match->next;
65611+ if (match->next != NULL)
65612+ match->next->prev = match->prev;
65613+ }
65614+ match->prev = NULL;
65615+ match->next = NULL;
65616+ match->inode = newinode;
65617+ match->device = newdevice;
65618+ match->mode &= ~GR_DELETED;
65619+
65620+ insert_acl_obj_label(match, subj);
65621+ }
65622+
65623+ return;
65624+}
65625+
65626+static void
65627+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
65628+ const ino_t newinode, const dev_t newdevice,
65629+ struct acl_role_label *role)
65630+{
65631+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
65632+ struct acl_subject_label *match;
65633+
65634+ match = role->subj_hash[index];
65635+
65636+ while (match && (match->inode != oldinode ||
65637+ match->device != olddevice ||
65638+ !(match->mode & GR_DELETED)))
65639+ match = match->next;
65640+
65641+ if (match && (match->inode == oldinode)
65642+ && (match->device == olddevice)
65643+ && (match->mode & GR_DELETED)) {
65644+ if (match->prev == NULL) {
65645+ role->subj_hash[index] = match->next;
65646+ if (match->next != NULL)
65647+ match->next->prev = NULL;
65648+ } else {
65649+ match->prev->next = match->next;
65650+ if (match->next != NULL)
65651+ match->next->prev = match->prev;
65652+ }
65653+ match->prev = NULL;
65654+ match->next = NULL;
65655+ match->inode = newinode;
65656+ match->device = newdevice;
65657+ match->mode &= ~GR_DELETED;
65658+
65659+ insert_acl_subj_label(match, role);
65660+ }
65661+
65662+ return;
65663+}
65664+
65665+static void
65666+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
65667+ const ino_t newinode, const dev_t newdevice)
65668+{
65669+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
65670+ struct inodev_entry *match;
65671+
65672+ match = running_polstate.inodev_set.i_hash[index];
65673+
65674+ while (match && (match->nentry->inode != oldinode ||
65675+ match->nentry->device != olddevice || !match->nentry->deleted))
65676+ match = match->next;
65677+
65678+ if (match && (match->nentry->inode == oldinode)
65679+ && (match->nentry->device == olddevice) &&
65680+ match->nentry->deleted) {
65681+ if (match->prev == NULL) {
65682+ running_polstate.inodev_set.i_hash[index] = match->next;
65683+ if (match->next != NULL)
65684+ match->next->prev = NULL;
65685+ } else {
65686+ match->prev->next = match->next;
65687+ if (match->next != NULL)
65688+ match->next->prev = match->prev;
65689+ }
65690+ match->prev = NULL;
65691+ match->next = NULL;
65692+ match->nentry->inode = newinode;
65693+ match->nentry->device = newdevice;
65694+ match->nentry->deleted = 0;
65695+
65696+ insert_inodev_entry(match);
65697+ }
65698+
65699+ return;
65700+}
65701+
65702+static void
65703+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
65704+{
65705+ struct acl_subject_label *subj;
65706+ struct acl_role_label *role;
65707+ unsigned int x;
65708+
65709+ FOR_EACH_ROLE_START(role)
65710+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
65711+
65712+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
65713+ if ((subj->inode == ino) && (subj->device == dev)) {
65714+ subj->inode = ino;
65715+ subj->device = dev;
65716+ }
65717+ /* nested subjects aren't in the role's subj_hash table */
65718+ update_acl_obj_label(matchn->inode, matchn->device,
65719+ ino, dev, subj);
65720+ FOR_EACH_NESTED_SUBJECT_END(subj)
65721+ FOR_EACH_SUBJECT_START(role, subj, x)
65722+ update_acl_obj_label(matchn->inode, matchn->device,
65723+ ino, dev, subj);
65724+ FOR_EACH_SUBJECT_END(subj,x)
65725+ FOR_EACH_ROLE_END(role)
65726+
65727+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
65728+
65729+ return;
65730+}
65731+
65732+static void
65733+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
65734+ const struct vfsmount *mnt)
65735+{
65736+ ino_t ino = dentry->d_inode->i_ino;
65737+ dev_t dev = __get_dev(dentry);
65738+
65739+ __do_handle_create(matchn, ino, dev);
65740+
65741+ return;
65742+}
65743+
65744+void
65745+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
65746+{
65747+ struct name_entry *matchn;
65748+
65749+ if (unlikely(!(gr_status & GR_READY)))
65750+ return;
65751+
65752+ preempt_disable();
65753+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
65754+
65755+ if (unlikely((unsigned long)matchn)) {
65756+ write_lock(&gr_inode_lock);
65757+ do_handle_create(matchn, dentry, mnt);
65758+ write_unlock(&gr_inode_lock);
65759+ }
65760+ preempt_enable();
65761+
65762+ return;
65763+}
65764+
65765+void
65766+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
65767+{
65768+ struct name_entry *matchn;
65769+
65770+ if (unlikely(!(gr_status & GR_READY)))
65771+ return;
65772+
65773+ preempt_disable();
65774+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
65775+
65776+ if (unlikely((unsigned long)matchn)) {
65777+ write_lock(&gr_inode_lock);
65778+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
65779+ write_unlock(&gr_inode_lock);
65780+ }
65781+ preempt_enable();
65782+
65783+ return;
65784+}
65785+
65786+void
65787+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
65788+ struct dentry *old_dentry,
65789+ struct dentry *new_dentry,
65790+ struct vfsmount *mnt, const __u8 replace)
65791+{
65792+ struct name_entry *matchn;
65793+ struct inodev_entry *inodev;
65794+ struct inode *inode = new_dentry->d_inode;
65795+ ino_t old_ino = old_dentry->d_inode->i_ino;
65796+ dev_t old_dev = __get_dev(old_dentry);
65797+
65798+ /* vfs_rename swaps the name and parent link for old_dentry and
65799+ new_dentry
65800+ at this point, old_dentry has the new name, parent link, and inode
65801+ for the renamed file
65802+ if a file is being replaced by a rename, new_dentry has the inode
65803+ and name for the replaced file
65804+ */
65805+
65806+ if (unlikely(!(gr_status & GR_READY)))
65807+ return;
65808+
65809+ preempt_disable();
65810+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
65811+
65812+ /* we wouldn't have to check d_inode if it weren't for
65813+ NFS silly-renaming
65814+ */
65815+
65816+ write_lock(&gr_inode_lock);
65817+ if (unlikely(replace && inode)) {
65818+ ino_t new_ino = inode->i_ino;
65819+ dev_t new_dev = __get_dev(new_dentry);
65820+
65821+ inodev = lookup_inodev_entry(new_ino, new_dev);
65822+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
65823+ do_handle_delete(inodev, new_ino, new_dev);
65824+ }
65825+
65826+ inodev = lookup_inodev_entry(old_ino, old_dev);
65827+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
65828+ do_handle_delete(inodev, old_ino, old_dev);
65829+
65830+ if (unlikely((unsigned long)matchn))
65831+ do_handle_create(matchn, old_dentry, mnt);
65832+
65833+ write_unlock(&gr_inode_lock);
65834+ preempt_enable();
65835+
65836+ return;
65837+}
65838+
65839+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
65840+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
65841+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
65842+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
65843+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
65844+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
65845+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
65846+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
65847+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
65848+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
65849+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
65850+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
65851+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
65852+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
65853+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
65854+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
65855+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
65856+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
65857+};
65858+
65859+void
65860+gr_learn_resource(const struct task_struct *task,
65861+ const int res, const unsigned long wanted, const int gt)
65862+{
65863+ struct acl_subject_label *acl;
65864+ const struct cred *cred;
65865+
65866+ if (unlikely((gr_status & GR_READY) &&
65867+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
65868+ goto skip_reslog;
65869+
65870+ gr_log_resource(task, res, wanted, gt);
65871+skip_reslog:
65872+
65873+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
65874+ return;
65875+
65876+ acl = task->acl;
65877+
65878+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
65879+ !(acl->resmask & (1U << (unsigned short) res))))
65880+ return;
65881+
65882+ if (wanted >= acl->res[res].rlim_cur) {
65883+ unsigned long res_add;
65884+
65885+ res_add = wanted + res_learn_bumps[res];
65886+
65887+ acl->res[res].rlim_cur = res_add;
65888+
65889+ if (wanted > acl->res[res].rlim_max)
65890+ acl->res[res].rlim_max = res_add;
65891+
65892+ /* only log the subject filename, since resource logging is supported for
65893+ single-subject learning only */
65894+ rcu_read_lock();
65895+ cred = __task_cred(task);
65896+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
65897+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
65898+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
65899+ "", (unsigned long) res, &task->signal->saved_ip);
65900+ rcu_read_unlock();
65901+ }
65902+
65903+ return;
65904+}
65905+EXPORT_SYMBOL(gr_learn_resource);
65906+#endif
65907+
65908+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
65909+void
65910+pax_set_initial_flags(struct linux_binprm *bprm)
65911+{
65912+ struct task_struct *task = current;
65913+ struct acl_subject_label *proc;
65914+ unsigned long flags;
65915+
65916+ if (unlikely(!(gr_status & GR_READY)))
65917+ return;
65918+
65919+ flags = pax_get_flags(task);
65920+
65921+ proc = task->acl;
65922+
65923+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
65924+ flags &= ~MF_PAX_PAGEEXEC;
65925+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
65926+ flags &= ~MF_PAX_SEGMEXEC;
65927+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
65928+ flags &= ~MF_PAX_RANDMMAP;
65929+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
65930+ flags &= ~MF_PAX_EMUTRAMP;
65931+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
65932+ flags &= ~MF_PAX_MPROTECT;
65933+
65934+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
65935+ flags |= MF_PAX_PAGEEXEC;
65936+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
65937+ flags |= MF_PAX_SEGMEXEC;
65938+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
65939+ flags |= MF_PAX_RANDMMAP;
65940+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
65941+ flags |= MF_PAX_EMUTRAMP;
65942+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
65943+ flags |= MF_PAX_MPROTECT;
65944+
65945+ pax_set_flags(task, flags);
65946+
65947+ return;
65948+}
65949+#endif
65950+
65951+int
65952+gr_handle_proc_ptrace(struct task_struct *task)
65953+{
65954+ struct file *filp;
65955+ struct task_struct *tmp = task;
65956+ struct task_struct *curtemp = current;
65957+ __u32 retmode;
65958+
65959+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
65960+ if (unlikely(!(gr_status & GR_READY)))
65961+ return 0;
65962+#endif
65963+
65964+ read_lock(&tasklist_lock);
65965+ read_lock(&grsec_exec_file_lock);
65966+ filp = task->exec_file;
65967+
65968+ while (task_pid_nr(tmp) > 0) {
65969+ if (tmp == curtemp)
65970+ break;
65971+ tmp = tmp->real_parent;
65972+ }
65973+
65974+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
65975+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
65976+ read_unlock(&grsec_exec_file_lock);
65977+ read_unlock(&tasklist_lock);
65978+ return 1;
65979+ }
65980+
65981+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
65982+ if (!(gr_status & GR_READY)) {
65983+ read_unlock(&grsec_exec_file_lock);
65984+ read_unlock(&tasklist_lock);
65985+ return 0;
65986+ }
65987+#endif
65988+
65989+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
65990+ read_unlock(&grsec_exec_file_lock);
65991+ read_unlock(&tasklist_lock);
65992+
65993+ if (retmode & GR_NOPTRACE)
65994+ return 1;
65995+
65996+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
65997+ && (current->acl != task->acl || (current->acl != current->role->root_label
65998+ && task_pid_nr(current) != task_pid_nr(task))))
65999+ return 1;
66000+
66001+ return 0;
66002+}
66003+
66004+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
66005+{
66006+ if (unlikely(!(gr_status & GR_READY)))
66007+ return;
66008+
66009+ if (!(current->role->roletype & GR_ROLE_GOD))
66010+ return;
66011+
66012+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
66013+ p->role->rolename, gr_task_roletype_to_char(p),
66014+ p->acl->filename);
66015+}
66016+
66017+int
66018+gr_handle_ptrace(struct task_struct *task, const long request)
66019+{
66020+ struct task_struct *tmp = task;
66021+ struct task_struct *curtemp = current;
66022+ __u32 retmode;
66023+
66024+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
66025+ if (unlikely(!(gr_status & GR_READY)))
66026+ return 0;
66027+#endif
66028+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
66029+ read_lock(&tasklist_lock);
66030+ while (task_pid_nr(tmp) > 0) {
66031+ if (tmp == curtemp)
66032+ break;
66033+ tmp = tmp->real_parent;
66034+ }
66035+
66036+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
66037+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
66038+ read_unlock(&tasklist_lock);
66039+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66040+ return 1;
66041+ }
66042+ read_unlock(&tasklist_lock);
66043+ }
66044+
66045+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
66046+ if (!(gr_status & GR_READY))
66047+ return 0;
66048+#endif
66049+
66050+ read_lock(&grsec_exec_file_lock);
66051+ if (unlikely(!task->exec_file)) {
66052+ read_unlock(&grsec_exec_file_lock);
66053+ return 0;
66054+ }
66055+
66056+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
66057+ read_unlock(&grsec_exec_file_lock);
66058+
66059+ if (retmode & GR_NOPTRACE) {
66060+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66061+ return 1;
66062+ }
66063+
66064+ if (retmode & GR_PTRACERD) {
66065+ switch (request) {
66066+ case PTRACE_SEIZE:
66067+ case PTRACE_POKETEXT:
66068+ case PTRACE_POKEDATA:
66069+ case PTRACE_POKEUSR:
66070+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
66071+ case PTRACE_SETREGS:
66072+ case PTRACE_SETFPREGS:
66073+#endif
66074+#ifdef CONFIG_X86
66075+ case PTRACE_SETFPXREGS:
66076+#endif
66077+#ifdef CONFIG_ALTIVEC
66078+ case PTRACE_SETVRREGS:
66079+#endif
66080+ return 1;
66081+ default:
66082+ return 0;
66083+ }
66084+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
66085+ !(current->role->roletype & GR_ROLE_GOD) &&
66086+ (current->acl != task->acl)) {
66087+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
66088+ return 1;
66089+ }
66090+
66091+ return 0;
66092+}
66093+
66094+static int is_writable_mmap(const struct file *filp)
66095+{
66096+ struct task_struct *task = current;
66097+ struct acl_object_label *obj, *obj2;
66098+
66099+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
66100+ !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))) {
66101+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
66102+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
66103+ task->role->root_label);
66104+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
66105+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
66106+ return 1;
66107+ }
66108+ }
66109+ return 0;
66110+}
66111+
66112+int
66113+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
66114+{
66115+ __u32 mode;
66116+
66117+ if (unlikely(!file || !(prot & PROT_EXEC)))
66118+ return 1;
66119+
66120+ if (is_writable_mmap(file))
66121+ return 0;
66122+
66123+ mode =
66124+ gr_search_file(file->f_path.dentry,
66125+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
66126+ file->f_path.mnt);
66127+
66128+ if (!gr_tpe_allow(file))
66129+ return 0;
66130+
66131+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
66132+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66133+ return 0;
66134+ } else if (unlikely(!(mode & GR_EXEC))) {
66135+ return 0;
66136+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
66137+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66138+ return 1;
66139+ }
66140+
66141+ return 1;
66142+}
66143+
66144+int
66145+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
66146+{
66147+ __u32 mode;
66148+
66149+ if (unlikely(!file || !(prot & PROT_EXEC)))
66150+ return 1;
66151+
66152+ if (is_writable_mmap(file))
66153+ return 0;
66154+
66155+ mode =
66156+ gr_search_file(file->f_path.dentry,
66157+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
66158+ file->f_path.mnt);
66159+
66160+ if (!gr_tpe_allow(file))
66161+ return 0;
66162+
66163+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
66164+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66165+ return 0;
66166+ } else if (unlikely(!(mode & GR_EXEC))) {
66167+ return 0;
66168+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
66169+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
66170+ return 1;
66171+ }
66172+
66173+ return 1;
66174+}
66175+
66176+void
66177+gr_acl_handle_psacct(struct task_struct *task, const long code)
66178+{
66179+ unsigned long runtime;
66180+ unsigned long cputime;
66181+ unsigned int wday, cday;
66182+ __u8 whr, chr;
66183+ __u8 wmin, cmin;
66184+ __u8 wsec, csec;
66185+ struct timespec timeval;
66186+
66187+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
66188+ !(task->acl->mode & GR_PROCACCT)))
66189+ return;
66190+
66191+ do_posix_clock_monotonic_gettime(&timeval);
66192+ runtime = timeval.tv_sec - task->start_time.tv_sec;
66193+ wday = runtime / (3600 * 24);
66194+ runtime -= wday * (3600 * 24);
66195+ whr = runtime / 3600;
66196+ runtime -= whr * 3600;
66197+ wmin = runtime / 60;
66198+ runtime -= wmin * 60;
66199+ wsec = runtime;
66200+
66201+ cputime = (task->utime + task->stime) / HZ;
66202+ cday = cputime / (3600 * 24);
66203+ cputime -= cday * (3600 * 24);
66204+ chr = cputime / 3600;
66205+ cputime -= chr * 3600;
66206+ cmin = cputime / 60;
66207+ cputime -= cmin * 60;
66208+ csec = cputime;
66209+
66210+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
66211+
66212+ return;
66213+}
66214+
66215+#ifdef CONFIG_TASKSTATS
66216+int gr_is_taskstats_denied(int pid)
66217+{
66218+ struct task_struct *task;
66219+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66220+ const struct cred *cred;
66221+#endif
66222+ int ret = 0;
66223+
66224+ /* restrict taskstats viewing to un-chrooted root users
66225+ who have the 'view' subject flag if the RBAC system is enabled
66226+ */
66227+
66228+ rcu_read_lock();
66229+ read_lock(&tasklist_lock);
66230+ task = find_task_by_vpid(pid);
66231+ if (task) {
66232+#ifdef CONFIG_GRKERNSEC_CHROOT
66233+ if (proc_is_chrooted(task))
66234+ ret = -EACCES;
66235+#endif
66236+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66237+ cred = __task_cred(task);
66238+#ifdef CONFIG_GRKERNSEC_PROC_USER
66239+ if (gr_is_global_nonroot(cred->uid))
66240+ ret = -EACCES;
66241+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66242+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
66243+ ret = -EACCES;
66244+#endif
66245+#endif
66246+ if (gr_status & GR_READY) {
66247+ if (!(task->acl->mode & GR_VIEW))
66248+ ret = -EACCES;
66249+ }
66250+ } else
66251+ ret = -ENOENT;
66252+
66253+ read_unlock(&tasklist_lock);
66254+ rcu_read_unlock();
66255+
66256+ return ret;
66257+}
66258+#endif
66259+
66260+/* AUXV entries are filled via a descendant of search_binary_handler
66261+ after we've already applied the subject for the target
66262+*/
66263+int gr_acl_enable_at_secure(void)
66264+{
66265+ if (unlikely(!(gr_status & GR_READY)))
66266+ return 0;
66267+
66268+ if (current->acl->mode & GR_ATSECURE)
66269+ return 1;
66270+
66271+ return 0;
66272+}
66273+
66274+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
66275+{
66276+ struct task_struct *task = current;
66277+ struct dentry *dentry = file->f_path.dentry;
66278+ struct vfsmount *mnt = file->f_path.mnt;
66279+ struct acl_object_label *obj, *tmp;
66280+ struct acl_subject_label *subj;
66281+ unsigned int bufsize;
66282+ int is_not_root;
66283+ char *path;
66284+ dev_t dev = __get_dev(dentry);
66285+
66286+ if (unlikely(!(gr_status & GR_READY)))
66287+ return 1;
66288+
66289+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
66290+ return 1;
66291+
66292+ /* ignore Eric Biederman */
66293+ if (IS_PRIVATE(dentry->d_inode))
66294+ return 1;
66295+
66296+ subj = task->acl;
66297+ read_lock(&gr_inode_lock);
66298+ do {
66299+ obj = lookup_acl_obj_label(ino, dev, subj);
66300+ if (obj != NULL) {
66301+ read_unlock(&gr_inode_lock);
66302+ return (obj->mode & GR_FIND) ? 1 : 0;
66303+ }
66304+ } while ((subj = subj->parent_subject));
66305+ read_unlock(&gr_inode_lock);
66306+
66307+ /* this is purely an optimization since we're looking for an object
66308+ for the directory we're doing a readdir on
66309+ if it's possible for any globbed object to match the entry we're
66310+ filling into the directory, then the object we find here will be
66311+ an anchor point with attached globbed objects
66312+ */
66313+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
66314+ if (obj->globbed == NULL)
66315+ return (obj->mode & GR_FIND) ? 1 : 0;
66316+
66317+ is_not_root = ((obj->filename[0] == '/') &&
66318+ (obj->filename[1] == '\0')) ? 0 : 1;
66319+ bufsize = PAGE_SIZE - namelen - is_not_root;
66320+
66321+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
66322+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
66323+ return 1;
66324+
66325+ preempt_disable();
66326+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
66327+ bufsize);
66328+
66329+ bufsize = strlen(path);
66330+
66331+ /* if base is "/", don't append an additional slash */
66332+ if (is_not_root)
66333+ *(path + bufsize) = '/';
66334+ memcpy(path + bufsize + is_not_root, name, namelen);
66335+ *(path + bufsize + namelen + is_not_root) = '\0';
66336+
66337+ tmp = obj->globbed;
66338+ while (tmp) {
66339+ if (!glob_match(tmp->filename, path)) {
66340+ preempt_enable();
66341+ return (tmp->mode & GR_FIND) ? 1 : 0;
66342+ }
66343+ tmp = tmp->next;
66344+ }
66345+ preempt_enable();
66346+ return (obj->mode & GR_FIND) ? 1 : 0;
66347+}
66348+
66349+void gr_put_exec_file(struct task_struct *task)
66350+{
66351+ struct file *filp;
66352+
66353+ write_lock(&grsec_exec_file_lock);
66354+ filp = task->exec_file;
66355+ task->exec_file = NULL;
66356+ write_unlock(&grsec_exec_file_lock);
66357+
66358+ if (filp)
66359+ fput(filp);
66360+
66361+ return;
66362+}
66363+
66364+
66365+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
66366+EXPORT_SYMBOL(gr_acl_is_enabled);
66367+#endif
66368+#ifdef CONFIG_SECURITY
66369+EXPORT_SYMBOL(gr_check_user_change);
66370+EXPORT_SYMBOL(gr_check_group_change);
66371+#endif
66372+
66373diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
66374new file mode 100644
66375index 0000000..18ffbbd
66376--- /dev/null
66377+++ b/grsecurity/gracl_alloc.c
66378@@ -0,0 +1,105 @@
66379+#include <linux/kernel.h>
66380+#include <linux/mm.h>
66381+#include <linux/slab.h>
66382+#include <linux/vmalloc.h>
66383+#include <linux/gracl.h>
66384+#include <linux/grsecurity.h>
66385+
66386+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
66387+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
66388+
66389+static __inline__ int
66390+alloc_pop(void)
66391+{
66392+ if (current_alloc_state->alloc_stack_next == 1)
66393+ return 0;
66394+
66395+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
66396+
66397+ current_alloc_state->alloc_stack_next--;
66398+
66399+ return 1;
66400+}
66401+
66402+static __inline__ int
66403+alloc_push(void *buf)
66404+{
66405+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
66406+ return 1;
66407+
66408+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
66409+
66410+ current_alloc_state->alloc_stack_next++;
66411+
66412+ return 0;
66413+}
66414+
66415+void *
66416+acl_alloc(unsigned long len)
66417+{
66418+ void *ret = NULL;
66419+
66420+ if (!len || len > PAGE_SIZE)
66421+ goto out;
66422+
66423+ ret = kmalloc(len, GFP_KERNEL);
66424+
66425+ if (ret) {
66426+ if (alloc_push(ret)) {
66427+ kfree(ret);
66428+ ret = NULL;
66429+ }
66430+ }
66431+
66432+out:
66433+ return ret;
66434+}
66435+
66436+void *
66437+acl_alloc_num(unsigned long num, unsigned long len)
66438+{
66439+ if (!len || (num > (PAGE_SIZE / len)))
66440+ return NULL;
66441+
66442+ return acl_alloc(num * len);
66443+}
66444+
66445+void
66446+acl_free_all(void)
66447+{
66448+ if (!current_alloc_state->alloc_stack)
66449+ return;
66450+
66451+ while (alloc_pop()) ;
66452+
66453+ if (current_alloc_state->alloc_stack) {
66454+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
66455+ kfree(current_alloc_state->alloc_stack);
66456+ else
66457+ vfree(current_alloc_state->alloc_stack);
66458+ }
66459+
66460+ current_alloc_state->alloc_stack = NULL;
66461+ current_alloc_state->alloc_stack_size = 1;
66462+ current_alloc_state->alloc_stack_next = 1;
66463+
66464+ return;
66465+}
66466+
66467+int
66468+acl_alloc_stack_init(unsigned long size)
66469+{
66470+ if ((size * sizeof (void *)) <= PAGE_SIZE)
66471+ current_alloc_state->alloc_stack =
66472+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
66473+ else
66474+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
66475+
66476+ current_alloc_state->alloc_stack_size = size;
66477+ current_alloc_state->alloc_stack_next = 1;
66478+
66479+ if (!current_alloc_state->alloc_stack)
66480+ return 0;
66481+ else
66482+ return 1;
66483+}
66484diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
66485new file mode 100644
66486index 0000000..bdd51ea
66487--- /dev/null
66488+++ b/grsecurity/gracl_cap.c
66489@@ -0,0 +1,110 @@
66490+#include <linux/kernel.h>
66491+#include <linux/module.h>
66492+#include <linux/sched.h>
66493+#include <linux/gracl.h>
66494+#include <linux/grsecurity.h>
66495+#include <linux/grinternal.h>
66496+
66497+extern const char *captab_log[];
66498+extern int captab_log_entries;
66499+
66500+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
66501+{
66502+ struct acl_subject_label *curracl;
66503+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
66504+ kernel_cap_t cap_audit = __cap_empty_set;
66505+
66506+ if (!gr_acl_is_enabled())
66507+ return 1;
66508+
66509+ curracl = task->acl;
66510+
66511+ cap_drop = curracl->cap_lower;
66512+ cap_mask = curracl->cap_mask;
66513+ cap_audit = curracl->cap_invert_audit;
66514+
66515+ while ((curracl = curracl->parent_subject)) {
66516+ /* if the cap isn't specified in the current computed mask but is specified in the
66517+ current level subject, and is lowered in the current level subject, then add
66518+ it to the set of dropped capabilities
66519+ otherwise, add the current level subject's mask to the current computed mask
66520+ */
66521+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
66522+ cap_raise(cap_mask, cap);
66523+ if (cap_raised(curracl->cap_lower, cap))
66524+ cap_raise(cap_drop, cap);
66525+ if (cap_raised(curracl->cap_invert_audit, cap))
66526+ cap_raise(cap_audit, cap);
66527+ }
66528+ }
66529+
66530+ if (!cap_raised(cap_drop, cap)) {
66531+ if (cap_raised(cap_audit, cap))
66532+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
66533+ return 1;
66534+ }
66535+
66536+ curracl = task->acl;
66537+
66538+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
66539+ && cap_raised(cred->cap_effective, cap)) {
66540+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
66541+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
66542+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
66543+ gr_to_filename(task->exec_file->f_path.dentry,
66544+ task->exec_file->f_path.mnt) : curracl->filename,
66545+ curracl->filename, 0UL,
66546+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
66547+ return 1;
66548+ }
66549+
66550+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
66551+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
66552+
66553+ return 0;
66554+}
66555+
66556+int
66557+gr_acl_is_capable(const int cap)
66558+{
66559+ return gr_task_acl_is_capable(current, current_cred(), cap);
66560+}
66561+
66562+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
66563+{
66564+ struct acl_subject_label *curracl;
66565+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
66566+
66567+ if (!gr_acl_is_enabled())
66568+ return 1;
66569+
66570+ curracl = task->acl;
66571+
66572+ cap_drop = curracl->cap_lower;
66573+ cap_mask = curracl->cap_mask;
66574+
66575+ while ((curracl = curracl->parent_subject)) {
66576+ /* if the cap isn't specified in the current computed mask but is specified in the
66577+ current level subject, and is lowered in the current level subject, then add
66578+ it to the set of dropped capabilities
66579+ otherwise, add the current level subject's mask to the current computed mask
66580+ */
66581+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
66582+ cap_raise(cap_mask, cap);
66583+ if (cap_raised(curracl->cap_lower, cap))
66584+ cap_raise(cap_drop, cap);
66585+ }
66586+ }
66587+
66588+ if (!cap_raised(cap_drop, cap))
66589+ return 1;
66590+
66591+ return 0;
66592+}
66593+
66594+int
66595+gr_acl_is_capable_nolog(const int cap)
66596+{
66597+ return gr_task_acl_is_capable_nolog(current, cap);
66598+}
66599+
66600diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
66601new file mode 100644
66602index 0000000..ca25605
66603--- /dev/null
66604+++ b/grsecurity/gracl_compat.c
66605@@ -0,0 +1,270 @@
66606+#include <linux/kernel.h>
66607+#include <linux/gracl.h>
66608+#include <linux/compat.h>
66609+#include <linux/gracl_compat.h>
66610+
66611+#include <asm/uaccess.h>
66612+
66613+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
66614+{
66615+ struct gr_arg_wrapper_compat uwrapcompat;
66616+
66617+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
66618+ return -EFAULT;
66619+
66620+ if (((uwrapcompat.version != GRSECURITY_VERSION) &&
66621+ (uwrapcompat.version != 0x2901)) ||
66622+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
66623+ return -EINVAL;
66624+
66625+ uwrap->arg = compat_ptr(uwrapcompat.arg);
66626+ uwrap->version = uwrapcompat.version;
66627+ uwrap->size = sizeof(struct gr_arg);
66628+
66629+ return 0;
66630+}
66631+
66632+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
66633+{
66634+ struct gr_arg_compat argcompat;
66635+
66636+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
66637+ return -EFAULT;
66638+
66639+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
66640+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
66641+ arg->role_db.num_roles = argcompat.role_db.num_roles;
66642+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
66643+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
66644+ arg->role_db.num_objects = argcompat.role_db.num_objects;
66645+
66646+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
66647+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
66648+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
66649+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
66650+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
66651+ arg->segv_device = argcompat.segv_device;
66652+ arg->segv_inode = argcompat.segv_inode;
66653+ arg->segv_uid = argcompat.segv_uid;
66654+ arg->num_sprole_pws = argcompat.num_sprole_pws;
66655+ arg->mode = argcompat.mode;
66656+
66657+ return 0;
66658+}
66659+
66660+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
66661+{
66662+ struct acl_object_label_compat objcompat;
66663+
66664+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
66665+ return -EFAULT;
66666+
66667+ obj->filename = compat_ptr(objcompat.filename);
66668+ obj->inode = objcompat.inode;
66669+ obj->device = objcompat.device;
66670+ obj->mode = objcompat.mode;
66671+
66672+ obj->nested = compat_ptr(objcompat.nested);
66673+ obj->globbed = compat_ptr(objcompat.globbed);
66674+
66675+ obj->prev = compat_ptr(objcompat.prev);
66676+ obj->next = compat_ptr(objcompat.next);
66677+
66678+ return 0;
66679+}
66680+
66681+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
66682+{
66683+ unsigned int i;
66684+ struct acl_subject_label_compat subjcompat;
66685+
66686+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
66687+ return -EFAULT;
66688+
66689+ subj->filename = compat_ptr(subjcompat.filename);
66690+ subj->inode = subjcompat.inode;
66691+ subj->device = subjcompat.device;
66692+ subj->mode = subjcompat.mode;
66693+ subj->cap_mask = subjcompat.cap_mask;
66694+ subj->cap_lower = subjcompat.cap_lower;
66695+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
66696+
66697+ for (i = 0; i < GR_NLIMITS; i++) {
66698+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
66699+ subj->res[i].rlim_cur = RLIM_INFINITY;
66700+ else
66701+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
66702+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
66703+ subj->res[i].rlim_max = RLIM_INFINITY;
66704+ else
66705+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
66706+ }
66707+ subj->resmask = subjcompat.resmask;
66708+
66709+ subj->user_trans_type = subjcompat.user_trans_type;
66710+ subj->group_trans_type = subjcompat.group_trans_type;
66711+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
66712+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
66713+ subj->user_trans_num = subjcompat.user_trans_num;
66714+ subj->group_trans_num = subjcompat.group_trans_num;
66715+
66716+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
66717+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
66718+ subj->ip_type = subjcompat.ip_type;
66719+ subj->ips = compat_ptr(subjcompat.ips);
66720+ subj->ip_num = subjcompat.ip_num;
66721+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
66722+
66723+ subj->crashes = subjcompat.crashes;
66724+ subj->expires = subjcompat.expires;
66725+
66726+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
66727+ subj->hash = compat_ptr(subjcompat.hash);
66728+ subj->prev = compat_ptr(subjcompat.prev);
66729+ subj->next = compat_ptr(subjcompat.next);
66730+
66731+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
66732+ subj->obj_hash_size = subjcompat.obj_hash_size;
66733+ subj->pax_flags = subjcompat.pax_flags;
66734+
66735+ return 0;
66736+}
66737+
66738+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
66739+{
66740+ struct acl_role_label_compat rolecompat;
66741+
66742+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
66743+ return -EFAULT;
66744+
66745+ role->rolename = compat_ptr(rolecompat.rolename);
66746+ role->uidgid = rolecompat.uidgid;
66747+ role->roletype = rolecompat.roletype;
66748+
66749+ role->auth_attempts = rolecompat.auth_attempts;
66750+ role->expires = rolecompat.expires;
66751+
66752+ role->root_label = compat_ptr(rolecompat.root_label);
66753+ role->hash = compat_ptr(rolecompat.hash);
66754+
66755+ role->prev = compat_ptr(rolecompat.prev);
66756+ role->next = compat_ptr(rolecompat.next);
66757+
66758+ role->transitions = compat_ptr(rolecompat.transitions);
66759+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
66760+ role->domain_children = compat_ptr(rolecompat.domain_children);
66761+ role->domain_child_num = rolecompat.domain_child_num;
66762+
66763+ role->umask = rolecompat.umask;
66764+
66765+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
66766+ role->subj_hash_size = rolecompat.subj_hash_size;
66767+
66768+ return 0;
66769+}
66770+
66771+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
66772+{
66773+ struct role_allowed_ip_compat roleip_compat;
66774+
66775+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
66776+ return -EFAULT;
66777+
66778+ roleip->addr = roleip_compat.addr;
66779+ roleip->netmask = roleip_compat.netmask;
66780+
66781+ roleip->prev = compat_ptr(roleip_compat.prev);
66782+ roleip->next = compat_ptr(roleip_compat.next);
66783+
66784+ return 0;
66785+}
66786+
66787+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
66788+{
66789+ struct role_transition_compat trans_compat;
66790+
66791+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
66792+ return -EFAULT;
66793+
66794+ trans->rolename = compat_ptr(trans_compat.rolename);
66795+
66796+ trans->prev = compat_ptr(trans_compat.prev);
66797+ trans->next = compat_ptr(trans_compat.next);
66798+
66799+ return 0;
66800+
66801+}
66802+
66803+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
66804+{
66805+ struct gr_hash_struct_compat hash_compat;
66806+
66807+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
66808+ return -EFAULT;
66809+
66810+ hash->table = compat_ptr(hash_compat.table);
66811+ hash->nametable = compat_ptr(hash_compat.nametable);
66812+ hash->first = compat_ptr(hash_compat.first);
66813+
66814+ hash->table_size = hash_compat.table_size;
66815+ hash->used_size = hash_compat.used_size;
66816+
66817+ hash->type = hash_compat.type;
66818+
66819+ return 0;
66820+}
66821+
66822+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
66823+{
66824+ compat_uptr_t ptrcompat;
66825+
66826+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
66827+ return -EFAULT;
66828+
66829+ *(void **)ptr = compat_ptr(ptrcompat);
66830+
66831+ return 0;
66832+}
66833+
66834+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
66835+{
66836+ struct acl_ip_label_compat ip_compat;
66837+
66838+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
66839+ return -EFAULT;
66840+
66841+ ip->iface = compat_ptr(ip_compat.iface);
66842+ ip->addr = ip_compat.addr;
66843+ ip->netmask = ip_compat.netmask;
66844+ ip->low = ip_compat.low;
66845+ ip->high = ip_compat.high;
66846+ ip->mode = ip_compat.mode;
66847+ ip->type = ip_compat.type;
66848+
66849+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
66850+
66851+ ip->prev = compat_ptr(ip_compat.prev);
66852+ ip->next = compat_ptr(ip_compat.next);
66853+
66854+ return 0;
66855+}
66856+
66857+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
66858+{
66859+ struct sprole_pw_compat pw_compat;
66860+
66861+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
66862+ return -EFAULT;
66863+
66864+ pw->rolename = compat_ptr(pw_compat.rolename);
66865+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
66866+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
66867+
66868+ return 0;
66869+}
66870+
66871+size_t get_gr_arg_wrapper_size_compat(void)
66872+{
66873+ return sizeof(struct gr_arg_wrapper_compat);
66874+}
66875+
66876diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
66877new file mode 100644
66878index 0000000..deb6f3b
66879--- /dev/null
66880+++ b/grsecurity/gracl_fs.c
66881@@ -0,0 +1,437 @@
66882+#include <linux/kernel.h>
66883+#include <linux/sched.h>
66884+#include <linux/types.h>
66885+#include <linux/fs.h>
66886+#include <linux/file.h>
66887+#include <linux/stat.h>
66888+#include <linux/grsecurity.h>
66889+#include <linux/grinternal.h>
66890+#include <linux/gracl.h>
66891+
66892+umode_t
66893+gr_acl_umask(void)
66894+{
66895+ if (unlikely(!gr_acl_is_enabled()))
66896+ return 0;
66897+
66898+ return current->role->umask;
66899+}
66900+
66901+__u32
66902+gr_acl_handle_hidden_file(const struct dentry * dentry,
66903+ const struct vfsmount * mnt)
66904+{
66905+ __u32 mode;
66906+
66907+ if (unlikely(!dentry->d_inode))
66908+ return GR_FIND;
66909+
66910+ mode =
66911+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
66912+
66913+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
66914+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
66915+ return mode;
66916+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
66917+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
66918+ return 0;
66919+ } else if (unlikely(!(mode & GR_FIND)))
66920+ return 0;
66921+
66922+ return GR_FIND;
66923+}
66924+
66925+__u32
66926+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
66927+ int acc_mode)
66928+{
66929+ __u32 reqmode = GR_FIND;
66930+ __u32 mode;
66931+
66932+ if (unlikely(!dentry->d_inode))
66933+ return reqmode;
66934+
66935+ if (acc_mode & MAY_APPEND)
66936+ reqmode |= GR_APPEND;
66937+ else if (acc_mode & MAY_WRITE)
66938+ reqmode |= GR_WRITE;
66939+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
66940+ reqmode |= GR_READ;
66941+
66942+ mode =
66943+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
66944+ mnt);
66945+
66946+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
66947+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
66948+ reqmode & GR_READ ? " reading" : "",
66949+ reqmode & GR_WRITE ? " writing" : reqmode &
66950+ GR_APPEND ? " appending" : "");
66951+ return reqmode;
66952+ } else
66953+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
66954+ {
66955+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
66956+ reqmode & GR_READ ? " reading" : "",
66957+ reqmode & GR_WRITE ? " writing" : reqmode &
66958+ GR_APPEND ? " appending" : "");
66959+ return 0;
66960+ } else if (unlikely((mode & reqmode) != reqmode))
66961+ return 0;
66962+
66963+ return reqmode;
66964+}
66965+
66966+__u32
66967+gr_acl_handle_creat(const struct dentry * dentry,
66968+ const struct dentry * p_dentry,
66969+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
66970+ const int imode)
66971+{
66972+ __u32 reqmode = GR_WRITE | GR_CREATE;
66973+ __u32 mode;
66974+
66975+ if (acc_mode & MAY_APPEND)
66976+ reqmode |= GR_APPEND;
66977+ // if a directory was required or the directory already exists, then
66978+ // don't count this open as a read
66979+ if ((acc_mode & MAY_READ) &&
66980+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
66981+ reqmode |= GR_READ;
66982+ if ((open_flags & O_CREAT) &&
66983+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
66984+ reqmode |= GR_SETID;
66985+
66986+ mode =
66987+ gr_check_create(dentry, p_dentry, p_mnt,
66988+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
66989+
66990+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
66991+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
66992+ reqmode & GR_READ ? " reading" : "",
66993+ reqmode & GR_WRITE ? " writing" : reqmode &
66994+ GR_APPEND ? " appending" : "");
66995+ return reqmode;
66996+ } else
66997+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
66998+ {
66999+ gr_log_fs_rbac_mode2(GR_DONT_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 0;
67004+ } else if (unlikely((mode & reqmode) != reqmode))
67005+ return 0;
67006+
67007+ return reqmode;
67008+}
67009+
67010+__u32
67011+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
67012+ const int fmode)
67013+{
67014+ __u32 mode, reqmode = GR_FIND;
67015+
67016+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
67017+ reqmode |= GR_EXEC;
67018+ if (fmode & S_IWOTH)
67019+ reqmode |= GR_WRITE;
67020+ if (fmode & S_IROTH)
67021+ reqmode |= GR_READ;
67022+
67023+ mode =
67024+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
67025+ mnt);
67026+
67027+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
67028+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
67029+ reqmode & GR_READ ? " reading" : "",
67030+ reqmode & GR_WRITE ? " writing" : "",
67031+ reqmode & GR_EXEC ? " executing" : "");
67032+ return reqmode;
67033+ } else
67034+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
67035+ {
67036+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
67037+ reqmode & GR_READ ? " reading" : "",
67038+ reqmode & GR_WRITE ? " writing" : "",
67039+ reqmode & GR_EXEC ? " executing" : "");
67040+ return 0;
67041+ } else if (unlikely((mode & reqmode) != reqmode))
67042+ return 0;
67043+
67044+ return reqmode;
67045+}
67046+
67047+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
67048+{
67049+ __u32 mode;
67050+
67051+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
67052+
67053+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
67054+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
67055+ return mode;
67056+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
67057+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
67058+ return 0;
67059+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
67060+ return 0;
67061+
67062+ return (reqmode);
67063+}
67064+
67065+__u32
67066+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
67067+{
67068+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
67069+}
67070+
67071+__u32
67072+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
67073+{
67074+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
67075+}
67076+
67077+__u32
67078+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
67079+{
67080+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
67081+}
67082+
67083+__u32
67084+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
67085+{
67086+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
67087+}
67088+
67089+__u32
67090+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
67091+ umode_t *modeptr)
67092+{
67093+ umode_t mode;
67094+
67095+ *modeptr &= ~gr_acl_umask();
67096+ mode = *modeptr;
67097+
67098+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
67099+ return 1;
67100+
67101+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
67102+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
67103+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
67104+ GR_CHMOD_ACL_MSG);
67105+ } else {
67106+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
67107+ }
67108+}
67109+
67110+__u32
67111+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
67112+{
67113+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
67114+}
67115+
67116+__u32
67117+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
67118+{
67119+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
67120+}
67121+
67122+__u32
67123+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
67124+{
67125+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
67126+}
67127+
67128+__u32
67129+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
67130+{
67131+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
67132+}
67133+
67134+__u32
67135+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
67136+{
67137+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
67138+ GR_UNIXCONNECT_ACL_MSG);
67139+}
67140+
67141+/* hardlinks require at minimum create and link permission,
67142+ any additional privilege required is based on the
67143+ privilege of the file being linked to
67144+*/
67145+__u32
67146+gr_acl_handle_link(const struct dentry * new_dentry,
67147+ const struct dentry * parent_dentry,
67148+ const struct vfsmount * parent_mnt,
67149+ const struct dentry * old_dentry,
67150+ const struct vfsmount * old_mnt, const struct filename *to)
67151+{
67152+ __u32 mode;
67153+ __u32 needmode = GR_CREATE | GR_LINK;
67154+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
67155+
67156+ mode =
67157+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
67158+ old_mnt);
67159+
67160+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
67161+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
67162+ return mode;
67163+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
67164+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
67165+ return 0;
67166+ } else if (unlikely((mode & needmode) != needmode))
67167+ return 0;
67168+
67169+ return 1;
67170+}
67171+
67172+__u32
67173+gr_acl_handle_symlink(const struct dentry * new_dentry,
67174+ const struct dentry * parent_dentry,
67175+ const struct vfsmount * parent_mnt, const struct filename *from)
67176+{
67177+ __u32 needmode = GR_WRITE | GR_CREATE;
67178+ __u32 mode;
67179+
67180+ mode =
67181+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
67182+ GR_CREATE | GR_AUDIT_CREATE |
67183+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
67184+
67185+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
67186+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
67187+ return mode;
67188+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
67189+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
67190+ return 0;
67191+ } else if (unlikely((mode & needmode) != needmode))
67192+ return 0;
67193+
67194+ return (GR_WRITE | GR_CREATE);
67195+}
67196+
67197+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)
67198+{
67199+ __u32 mode;
67200+
67201+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
67202+
67203+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
67204+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
67205+ return mode;
67206+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
67207+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
67208+ return 0;
67209+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
67210+ return 0;
67211+
67212+ return (reqmode);
67213+}
67214+
67215+__u32
67216+gr_acl_handle_mknod(const struct dentry * new_dentry,
67217+ const struct dentry * parent_dentry,
67218+ const struct vfsmount * parent_mnt,
67219+ const int mode)
67220+{
67221+ __u32 reqmode = GR_WRITE | GR_CREATE;
67222+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
67223+ reqmode |= GR_SETID;
67224+
67225+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
67226+ reqmode, GR_MKNOD_ACL_MSG);
67227+}
67228+
67229+__u32
67230+gr_acl_handle_mkdir(const struct dentry *new_dentry,
67231+ const struct dentry *parent_dentry,
67232+ const struct vfsmount *parent_mnt)
67233+{
67234+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
67235+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
67236+}
67237+
67238+#define RENAME_CHECK_SUCCESS(old, new) \
67239+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
67240+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
67241+
67242+int
67243+gr_acl_handle_rename(struct dentry *new_dentry,
67244+ struct dentry *parent_dentry,
67245+ const struct vfsmount *parent_mnt,
67246+ struct dentry *old_dentry,
67247+ struct inode *old_parent_inode,
67248+ struct vfsmount *old_mnt, const struct filename *newname)
67249+{
67250+ __u32 comp1, comp2;
67251+ int error = 0;
67252+
67253+ if (unlikely(!gr_acl_is_enabled()))
67254+ return 0;
67255+
67256+ if (!new_dentry->d_inode) {
67257+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
67258+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
67259+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
67260+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
67261+ GR_DELETE | GR_AUDIT_DELETE |
67262+ GR_AUDIT_READ | GR_AUDIT_WRITE |
67263+ GR_SUPPRESS, old_mnt);
67264+ } else {
67265+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
67266+ GR_CREATE | GR_DELETE |
67267+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
67268+ GR_AUDIT_READ | GR_AUDIT_WRITE |
67269+ GR_SUPPRESS, parent_mnt);
67270+ comp2 =
67271+ gr_search_file(old_dentry,
67272+ GR_READ | GR_WRITE | GR_AUDIT_READ |
67273+ GR_DELETE | GR_AUDIT_DELETE |
67274+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
67275+ }
67276+
67277+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
67278+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
67279+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
67280+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
67281+ && !(comp2 & GR_SUPPRESS)) {
67282+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
67283+ error = -EACCES;
67284+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
67285+ error = -EACCES;
67286+
67287+ return error;
67288+}
67289+
67290+void
67291+gr_acl_handle_exit(void)
67292+{
67293+ u16 id;
67294+ char *rolename;
67295+
67296+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
67297+ !(current->role->roletype & GR_ROLE_PERSIST))) {
67298+ id = current->acl_role_id;
67299+ rolename = current->role->rolename;
67300+ gr_set_acls(1);
67301+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
67302+ }
67303+
67304+ gr_put_exec_file(current);
67305+ return;
67306+}
67307+
67308+int
67309+gr_acl_handle_procpidmem(const struct task_struct *task)
67310+{
67311+ if (unlikely(!gr_acl_is_enabled()))
67312+ return 0;
67313+
67314+ if (task != current && task->acl->mode & GR_PROTPROCFD)
67315+ return -EACCES;
67316+
67317+ return 0;
67318+}
67319diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
67320new file mode 100644
67321index 0000000..f056b81
67322--- /dev/null
67323+++ b/grsecurity/gracl_ip.c
67324@@ -0,0 +1,386 @@
67325+#include <linux/kernel.h>
67326+#include <asm/uaccess.h>
67327+#include <asm/errno.h>
67328+#include <net/sock.h>
67329+#include <linux/file.h>
67330+#include <linux/fs.h>
67331+#include <linux/net.h>
67332+#include <linux/in.h>
67333+#include <linux/skbuff.h>
67334+#include <linux/ip.h>
67335+#include <linux/udp.h>
67336+#include <linux/types.h>
67337+#include <linux/sched.h>
67338+#include <linux/netdevice.h>
67339+#include <linux/inetdevice.h>
67340+#include <linux/gracl.h>
67341+#include <linux/grsecurity.h>
67342+#include <linux/grinternal.h>
67343+
67344+#define GR_BIND 0x01
67345+#define GR_CONNECT 0x02
67346+#define GR_INVERT 0x04
67347+#define GR_BINDOVERRIDE 0x08
67348+#define GR_CONNECTOVERRIDE 0x10
67349+#define GR_SOCK_FAMILY 0x20
67350+
67351+static const char * gr_protocols[IPPROTO_MAX] = {
67352+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
67353+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
67354+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
67355+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
67356+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
67357+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
67358+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
67359+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
67360+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
67361+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
67362+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
67363+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
67364+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
67365+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
67366+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
67367+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
67368+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
67369+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
67370+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
67371+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
67372+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
67373+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
67374+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
67375+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
67376+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
67377+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
67378+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
67379+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
67380+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
67381+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
67382+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
67383+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
67384+ };
67385+
67386+static const char * gr_socktypes[SOCK_MAX] = {
67387+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
67388+ "unknown:7", "unknown:8", "unknown:9", "packet"
67389+ };
67390+
67391+static const char * gr_sockfamilies[AF_MAX+1] = {
67392+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
67393+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
67394+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
67395+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
67396+ };
67397+
67398+const char *
67399+gr_proto_to_name(unsigned char proto)
67400+{
67401+ return gr_protocols[proto];
67402+}
67403+
67404+const char *
67405+gr_socktype_to_name(unsigned char type)
67406+{
67407+ return gr_socktypes[type];
67408+}
67409+
67410+const char *
67411+gr_sockfamily_to_name(unsigned char family)
67412+{
67413+ return gr_sockfamilies[family];
67414+}
67415+
67416+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
67417+
67418+int
67419+gr_search_socket(const int domain, const int type, const int protocol)
67420+{
67421+ struct acl_subject_label *curr;
67422+ const struct cred *cred = current_cred();
67423+
67424+ if (unlikely(!gr_acl_is_enabled()))
67425+ goto exit;
67426+
67427+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
67428+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
67429+ goto exit; // let the kernel handle it
67430+
67431+ curr = current->acl;
67432+
67433+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
67434+ /* the family is allowed, if this is PF_INET allow it only if
67435+ the extra sock type/protocol checks pass */
67436+ if (domain == PF_INET)
67437+ goto inet_check;
67438+ goto exit;
67439+ } else {
67440+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67441+ __u32 fakeip = 0;
67442+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67443+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
67444+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
67445+ gr_to_filename(current->exec_file->f_path.dentry,
67446+ current->exec_file->f_path.mnt) :
67447+ curr->filename, curr->filename,
67448+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
67449+ &current->signal->saved_ip);
67450+ goto exit;
67451+ }
67452+ goto exit_fail;
67453+ }
67454+
67455+inet_check:
67456+ /* the rest of this checking is for IPv4 only */
67457+ if (!curr->ips)
67458+ goto exit;
67459+
67460+ if ((curr->ip_type & (1U << type)) &&
67461+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
67462+ goto exit;
67463+
67464+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67465+ /* we don't place acls on raw sockets , and sometimes
67466+ dgram/ip sockets are opened for ioctl and not
67467+ bind/connect, so we'll fake a bind learn log */
67468+ if (type == SOCK_RAW || type == SOCK_PACKET) {
67469+ __u32 fakeip = 0;
67470+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67471+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
67472+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
67473+ gr_to_filename(current->exec_file->f_path.dentry,
67474+ current->exec_file->f_path.mnt) :
67475+ curr->filename, curr->filename,
67476+ &fakeip, 0, type,
67477+ protocol, GR_CONNECT, &current->signal->saved_ip);
67478+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
67479+ __u32 fakeip = 0;
67480+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67481+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
67482+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
67483+ gr_to_filename(current->exec_file->f_path.dentry,
67484+ current->exec_file->f_path.mnt) :
67485+ curr->filename, curr->filename,
67486+ &fakeip, 0, type,
67487+ protocol, GR_BIND, &current->signal->saved_ip);
67488+ }
67489+ /* we'll log when they use connect or bind */
67490+ goto exit;
67491+ }
67492+
67493+exit_fail:
67494+ if (domain == PF_INET)
67495+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
67496+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
67497+ else if (rcu_access_pointer(net_families[domain]) != NULL)
67498+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
67499+ gr_socktype_to_name(type), protocol);
67500+
67501+ return 0;
67502+exit:
67503+ return 1;
67504+}
67505+
67506+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)
67507+{
67508+ if ((ip->mode & mode) &&
67509+ (ip_port >= ip->low) &&
67510+ (ip_port <= ip->high) &&
67511+ ((ntohl(ip_addr) & our_netmask) ==
67512+ (ntohl(our_addr) & our_netmask))
67513+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
67514+ && (ip->type & (1U << type))) {
67515+ if (ip->mode & GR_INVERT)
67516+ return 2; // specifically denied
67517+ else
67518+ return 1; // allowed
67519+ }
67520+
67521+ return 0; // not specifically allowed, may continue parsing
67522+}
67523+
67524+static int
67525+gr_search_connectbind(const int full_mode, struct sock *sk,
67526+ struct sockaddr_in *addr, const int type)
67527+{
67528+ char iface[IFNAMSIZ] = {0};
67529+ struct acl_subject_label *curr;
67530+ struct acl_ip_label *ip;
67531+ struct inet_sock *isk;
67532+ struct net_device *dev;
67533+ struct in_device *idev;
67534+ unsigned long i;
67535+ int ret;
67536+ int mode = full_mode & (GR_BIND | GR_CONNECT);
67537+ __u32 ip_addr = 0;
67538+ __u32 our_addr;
67539+ __u32 our_netmask;
67540+ char *p;
67541+ __u16 ip_port = 0;
67542+ const struct cred *cred = current_cred();
67543+
67544+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
67545+ return 0;
67546+
67547+ curr = current->acl;
67548+ isk = inet_sk(sk);
67549+
67550+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
67551+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
67552+ addr->sin_addr.s_addr = curr->inaddr_any_override;
67553+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
67554+ struct sockaddr_in saddr;
67555+ int err;
67556+
67557+ saddr.sin_family = AF_INET;
67558+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
67559+ saddr.sin_port = isk->inet_sport;
67560+
67561+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
67562+ if (err)
67563+ return err;
67564+
67565+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
67566+ if (err)
67567+ return err;
67568+ }
67569+
67570+ if (!curr->ips)
67571+ return 0;
67572+
67573+ ip_addr = addr->sin_addr.s_addr;
67574+ ip_port = ntohs(addr->sin_port);
67575+
67576+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
67577+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
67578+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
67579+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
67580+ gr_to_filename(current->exec_file->f_path.dentry,
67581+ current->exec_file->f_path.mnt) :
67582+ curr->filename, curr->filename,
67583+ &ip_addr, ip_port, type,
67584+ sk->sk_protocol, mode, &current->signal->saved_ip);
67585+ return 0;
67586+ }
67587+
67588+ for (i = 0; i < curr->ip_num; i++) {
67589+ ip = *(curr->ips + i);
67590+ if (ip->iface != NULL) {
67591+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
67592+ p = strchr(iface, ':');
67593+ if (p != NULL)
67594+ *p = '\0';
67595+ dev = dev_get_by_name(sock_net(sk), iface);
67596+ if (dev == NULL)
67597+ continue;
67598+ idev = in_dev_get(dev);
67599+ if (idev == NULL) {
67600+ dev_put(dev);
67601+ continue;
67602+ }
67603+ rcu_read_lock();
67604+ for_ifa(idev) {
67605+ if (!strcmp(ip->iface, ifa->ifa_label)) {
67606+ our_addr = ifa->ifa_address;
67607+ our_netmask = 0xffffffff;
67608+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
67609+ if (ret == 1) {
67610+ rcu_read_unlock();
67611+ in_dev_put(idev);
67612+ dev_put(dev);
67613+ return 0;
67614+ } else if (ret == 2) {
67615+ rcu_read_unlock();
67616+ in_dev_put(idev);
67617+ dev_put(dev);
67618+ goto denied;
67619+ }
67620+ }
67621+ } endfor_ifa(idev);
67622+ rcu_read_unlock();
67623+ in_dev_put(idev);
67624+ dev_put(dev);
67625+ } else {
67626+ our_addr = ip->addr;
67627+ our_netmask = ip->netmask;
67628+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
67629+ if (ret == 1)
67630+ return 0;
67631+ else if (ret == 2)
67632+ goto denied;
67633+ }
67634+ }
67635+
67636+denied:
67637+ if (mode == GR_BIND)
67638+ 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));
67639+ else if (mode == GR_CONNECT)
67640+ 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));
67641+
67642+ return -EACCES;
67643+}
67644+
67645+int
67646+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
67647+{
67648+ /* always allow disconnection of dgram sockets with connect */
67649+ if (addr->sin_family == AF_UNSPEC)
67650+ return 0;
67651+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
67652+}
67653+
67654+int
67655+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
67656+{
67657+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
67658+}
67659+
67660+int gr_search_listen(struct socket *sock)
67661+{
67662+ struct sock *sk = sock->sk;
67663+ struct sockaddr_in addr;
67664+
67665+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
67666+ addr.sin_port = inet_sk(sk)->inet_sport;
67667+
67668+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
67669+}
67670+
67671+int gr_search_accept(struct socket *sock)
67672+{
67673+ struct sock *sk = sock->sk;
67674+ struct sockaddr_in addr;
67675+
67676+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
67677+ addr.sin_port = inet_sk(sk)->inet_sport;
67678+
67679+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
67680+}
67681+
67682+int
67683+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
67684+{
67685+ if (addr)
67686+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
67687+ else {
67688+ struct sockaddr_in sin;
67689+ const struct inet_sock *inet = inet_sk(sk);
67690+
67691+ sin.sin_addr.s_addr = inet->inet_daddr;
67692+ sin.sin_port = inet->inet_dport;
67693+
67694+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
67695+ }
67696+}
67697+
67698+int
67699+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
67700+{
67701+ struct sockaddr_in sin;
67702+
67703+ if (unlikely(skb->len < sizeof (struct udphdr)))
67704+ return 0; // skip this packet
67705+
67706+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
67707+ sin.sin_port = udp_hdr(skb)->source;
67708+
67709+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
67710+}
67711diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
67712new file mode 100644
67713index 0000000..25f54ef
67714--- /dev/null
67715+++ b/grsecurity/gracl_learn.c
67716@@ -0,0 +1,207 @@
67717+#include <linux/kernel.h>
67718+#include <linux/mm.h>
67719+#include <linux/sched.h>
67720+#include <linux/poll.h>
67721+#include <linux/string.h>
67722+#include <linux/file.h>
67723+#include <linux/types.h>
67724+#include <linux/vmalloc.h>
67725+#include <linux/grinternal.h>
67726+
67727+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
67728+ size_t count, loff_t *ppos);
67729+extern int gr_acl_is_enabled(void);
67730+
67731+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
67732+static int gr_learn_attached;
67733+
67734+/* use a 512k buffer */
67735+#define LEARN_BUFFER_SIZE (512 * 1024)
67736+
67737+static DEFINE_SPINLOCK(gr_learn_lock);
67738+static DEFINE_MUTEX(gr_learn_user_mutex);
67739+
67740+/* we need to maintain two buffers, so that the kernel context of grlearn
67741+ uses a semaphore around the userspace copying, and the other kernel contexts
67742+ use a spinlock when copying into the buffer, since they cannot sleep
67743+*/
67744+static char *learn_buffer;
67745+static char *learn_buffer_user;
67746+static int learn_buffer_len;
67747+static int learn_buffer_user_len;
67748+
67749+static ssize_t
67750+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
67751+{
67752+ DECLARE_WAITQUEUE(wait, current);
67753+ ssize_t retval = 0;
67754+
67755+ add_wait_queue(&learn_wait, &wait);
67756+ set_current_state(TASK_INTERRUPTIBLE);
67757+ do {
67758+ mutex_lock(&gr_learn_user_mutex);
67759+ spin_lock(&gr_learn_lock);
67760+ if (learn_buffer_len)
67761+ break;
67762+ spin_unlock(&gr_learn_lock);
67763+ mutex_unlock(&gr_learn_user_mutex);
67764+ if (file->f_flags & O_NONBLOCK) {
67765+ retval = -EAGAIN;
67766+ goto out;
67767+ }
67768+ if (signal_pending(current)) {
67769+ retval = -ERESTARTSYS;
67770+ goto out;
67771+ }
67772+
67773+ schedule();
67774+ } while (1);
67775+
67776+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
67777+ learn_buffer_user_len = learn_buffer_len;
67778+ retval = learn_buffer_len;
67779+ learn_buffer_len = 0;
67780+
67781+ spin_unlock(&gr_learn_lock);
67782+
67783+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
67784+ retval = -EFAULT;
67785+
67786+ mutex_unlock(&gr_learn_user_mutex);
67787+out:
67788+ set_current_state(TASK_RUNNING);
67789+ remove_wait_queue(&learn_wait, &wait);
67790+ return retval;
67791+}
67792+
67793+static unsigned int
67794+poll_learn(struct file * file, poll_table * wait)
67795+{
67796+ poll_wait(file, &learn_wait, wait);
67797+
67798+ if (learn_buffer_len)
67799+ return (POLLIN | POLLRDNORM);
67800+
67801+ return 0;
67802+}
67803+
67804+void
67805+gr_clear_learn_entries(void)
67806+{
67807+ char *tmp;
67808+
67809+ mutex_lock(&gr_learn_user_mutex);
67810+ spin_lock(&gr_learn_lock);
67811+ tmp = learn_buffer;
67812+ learn_buffer = NULL;
67813+ spin_unlock(&gr_learn_lock);
67814+ if (tmp)
67815+ vfree(tmp);
67816+ if (learn_buffer_user != NULL) {
67817+ vfree(learn_buffer_user);
67818+ learn_buffer_user = NULL;
67819+ }
67820+ learn_buffer_len = 0;
67821+ mutex_unlock(&gr_learn_user_mutex);
67822+
67823+ return;
67824+}
67825+
67826+void
67827+gr_add_learn_entry(const char *fmt, ...)
67828+{
67829+ va_list args;
67830+ unsigned int len;
67831+
67832+ if (!gr_learn_attached)
67833+ return;
67834+
67835+ spin_lock(&gr_learn_lock);
67836+
67837+ /* leave a gap at the end so we know when it's "full" but don't have to
67838+ compute the exact length of the string we're trying to append
67839+ */
67840+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
67841+ spin_unlock(&gr_learn_lock);
67842+ wake_up_interruptible(&learn_wait);
67843+ return;
67844+ }
67845+ if (learn_buffer == NULL) {
67846+ spin_unlock(&gr_learn_lock);
67847+ return;
67848+ }
67849+
67850+ va_start(args, fmt);
67851+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
67852+ va_end(args);
67853+
67854+ learn_buffer_len += len + 1;
67855+
67856+ spin_unlock(&gr_learn_lock);
67857+ wake_up_interruptible(&learn_wait);
67858+
67859+ return;
67860+}
67861+
67862+static int
67863+open_learn(struct inode *inode, struct file *file)
67864+{
67865+ if (file->f_mode & FMODE_READ && gr_learn_attached)
67866+ return -EBUSY;
67867+ if (file->f_mode & FMODE_READ) {
67868+ int retval = 0;
67869+ mutex_lock(&gr_learn_user_mutex);
67870+ if (learn_buffer == NULL)
67871+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
67872+ if (learn_buffer_user == NULL)
67873+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
67874+ if (learn_buffer == NULL) {
67875+ retval = -ENOMEM;
67876+ goto out_error;
67877+ }
67878+ if (learn_buffer_user == NULL) {
67879+ retval = -ENOMEM;
67880+ goto out_error;
67881+ }
67882+ learn_buffer_len = 0;
67883+ learn_buffer_user_len = 0;
67884+ gr_learn_attached = 1;
67885+out_error:
67886+ mutex_unlock(&gr_learn_user_mutex);
67887+ return retval;
67888+ }
67889+ return 0;
67890+}
67891+
67892+static int
67893+close_learn(struct inode *inode, struct file *file)
67894+{
67895+ if (file->f_mode & FMODE_READ) {
67896+ char *tmp = NULL;
67897+ mutex_lock(&gr_learn_user_mutex);
67898+ spin_lock(&gr_learn_lock);
67899+ tmp = learn_buffer;
67900+ learn_buffer = NULL;
67901+ spin_unlock(&gr_learn_lock);
67902+ if (tmp)
67903+ vfree(tmp);
67904+ if (learn_buffer_user != NULL) {
67905+ vfree(learn_buffer_user);
67906+ learn_buffer_user = NULL;
67907+ }
67908+ learn_buffer_len = 0;
67909+ learn_buffer_user_len = 0;
67910+ gr_learn_attached = 0;
67911+ mutex_unlock(&gr_learn_user_mutex);
67912+ }
67913+
67914+ return 0;
67915+}
67916+
67917+const struct file_operations grsec_fops = {
67918+ .read = read_learn,
67919+ .write = write_grsec_handler,
67920+ .open = open_learn,
67921+ .release = close_learn,
67922+ .poll = poll_learn,
67923+};
67924diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
67925new file mode 100644
67926index 0000000..361a099
67927--- /dev/null
67928+++ b/grsecurity/gracl_policy.c
67929@@ -0,0 +1,1782 @@
67930+#include <linux/kernel.h>
67931+#include <linux/module.h>
67932+#include <linux/sched.h>
67933+#include <linux/mm.h>
67934+#include <linux/file.h>
67935+#include <linux/fs.h>
67936+#include <linux/namei.h>
67937+#include <linux/mount.h>
67938+#include <linux/tty.h>
67939+#include <linux/proc_fs.h>
67940+#include <linux/lglock.h>
67941+#include <linux/slab.h>
67942+#include <linux/vmalloc.h>
67943+#include <linux/types.h>
67944+#include <linux/sysctl.h>
67945+#include <linux/netdevice.h>
67946+#include <linux/ptrace.h>
67947+#include <linux/gracl.h>
67948+#include <linux/gralloc.h>
67949+#include <linux/security.h>
67950+#include <linux/grinternal.h>
67951+#include <linux/pid_namespace.h>
67952+#include <linux/stop_machine.h>
67953+#include <linux/fdtable.h>
67954+#include <linux/percpu.h>
67955+#include <linux/lglock.h>
67956+#include <linux/hugetlb.h>
67957+#include <linux/posix-timers.h>
67958+#include "../fs/mount.h"
67959+
67960+#include <asm/uaccess.h>
67961+#include <asm/errno.h>
67962+#include <asm/mman.h>
67963+
67964+extern struct gr_policy_state *polstate;
67965+
67966+#define FOR_EACH_ROLE_START(role) \
67967+ role = polstate->role_list; \
67968+ while (role) {
67969+
67970+#define FOR_EACH_ROLE_END(role) \
67971+ role = role->prev; \
67972+ }
67973+
67974+struct path gr_real_root;
67975+
67976+extern struct gr_alloc_state *current_alloc_state;
67977+
67978+u16 acl_sp_role_value;
67979+
67980+static DEFINE_MUTEX(gr_dev_mutex);
67981+
67982+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
67983+extern void gr_clear_learn_entries(void);
67984+
67985+static struct gr_arg gr_usermode;
67986+static unsigned char gr_system_salt[GR_SALT_LEN];
67987+static unsigned char gr_system_sum[GR_SHA_LEN];
67988+
67989+static unsigned int gr_auth_attempts = 0;
67990+static unsigned long gr_auth_expires = 0UL;
67991+
67992+struct acl_object_label *fakefs_obj_rw;
67993+struct acl_object_label *fakefs_obj_rwx;
67994+
67995+extern int gr_init_uidset(void);
67996+extern void gr_free_uidset(void);
67997+extern void gr_remove_uid(uid_t uid);
67998+extern int gr_find_uid(uid_t uid);
67999+
68000+extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
68001+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
68002+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
68003+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
68004+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);
68005+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
68006+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
68007+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
68008+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
68009+extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
68010+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
68011+extern void assign_special_role(const char *rolename);
68012+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
68013+extern int gr_rbac_disable(void *unused);
68014+extern void gr_enable_rbac_system(void);
68015+
68016+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
68017+{
68018+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
68019+ return -EFAULT;
68020+
68021+ return 0;
68022+}
68023+
68024+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
68025+{
68026+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
68027+ return -EFAULT;
68028+
68029+ return 0;
68030+}
68031+
68032+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
68033+{
68034+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
68035+ return -EFAULT;
68036+
68037+ return 0;
68038+}
68039+
68040+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
68041+{
68042+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
68043+ return -EFAULT;
68044+
68045+ return 0;
68046+}
68047+
68048+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
68049+{
68050+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
68051+ return -EFAULT;
68052+
68053+ return 0;
68054+}
68055+
68056+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
68057+{
68058+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
68059+ return -EFAULT;
68060+
68061+ return 0;
68062+}
68063+
68064+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
68065+{
68066+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
68067+ return -EFAULT;
68068+
68069+ return 0;
68070+}
68071+
68072+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
68073+{
68074+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
68075+ return -EFAULT;
68076+
68077+ return 0;
68078+}
68079+
68080+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
68081+{
68082+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
68083+ return -EFAULT;
68084+
68085+ return 0;
68086+}
68087+
68088+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
68089+{
68090+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
68091+ return -EFAULT;
68092+
68093+ if (((uwrap->version != GRSECURITY_VERSION) &&
68094+ (uwrap->version != 0x2901)) ||
68095+ (uwrap->size != sizeof(struct gr_arg)))
68096+ return -EINVAL;
68097+
68098+ return 0;
68099+}
68100+
68101+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
68102+{
68103+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
68104+ return -EFAULT;
68105+
68106+ return 0;
68107+}
68108+
68109+static size_t get_gr_arg_wrapper_size_normal(void)
68110+{
68111+ return sizeof(struct gr_arg_wrapper);
68112+}
68113+
68114+#ifdef CONFIG_COMPAT
68115+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
68116+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
68117+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
68118+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
68119+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
68120+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
68121+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
68122+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
68123+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
68124+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
68125+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
68126+extern size_t get_gr_arg_wrapper_size_compat(void);
68127+
68128+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
68129+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
68130+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
68131+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
68132+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
68133+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
68134+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
68135+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
68136+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
68137+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
68138+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
68139+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
68140+
68141+#else
68142+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
68143+#define copy_gr_arg copy_gr_arg_normal
68144+#define copy_gr_hash_struct copy_gr_hash_struct_normal
68145+#define copy_acl_object_label copy_acl_object_label_normal
68146+#define copy_acl_subject_label copy_acl_subject_label_normal
68147+#define copy_acl_role_label copy_acl_role_label_normal
68148+#define copy_acl_ip_label copy_acl_ip_label_normal
68149+#define copy_pointer_from_array copy_pointer_from_array_normal
68150+#define copy_sprole_pw copy_sprole_pw_normal
68151+#define copy_role_transition copy_role_transition_normal
68152+#define copy_role_allowed_ip copy_role_allowed_ip_normal
68153+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
68154+#endif
68155+
68156+static struct acl_subject_label *
68157+lookup_subject_map(const struct acl_subject_label *userp)
68158+{
68159+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
68160+ struct subject_map *match;
68161+
68162+ match = polstate->subj_map_set.s_hash[index];
68163+
68164+ while (match && match->user != userp)
68165+ match = match->next;
68166+
68167+ if (match != NULL)
68168+ return match->kernel;
68169+ else
68170+ return NULL;
68171+}
68172+
68173+static void
68174+insert_subj_map_entry(struct subject_map *subjmap)
68175+{
68176+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
68177+ struct subject_map **curr;
68178+
68179+ subjmap->prev = NULL;
68180+
68181+ curr = &polstate->subj_map_set.s_hash[index];
68182+ if (*curr != NULL)
68183+ (*curr)->prev = subjmap;
68184+
68185+ subjmap->next = *curr;
68186+ *curr = subjmap;
68187+
68188+ return;
68189+}
68190+
68191+static void
68192+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
68193+{
68194+ unsigned int index =
68195+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
68196+ struct acl_role_label **curr;
68197+ struct acl_role_label *tmp, *tmp2;
68198+
68199+ curr = &polstate->acl_role_set.r_hash[index];
68200+
68201+ /* simple case, slot is empty, just set it to our role */
68202+ if (*curr == NULL) {
68203+ *curr = role;
68204+ } else {
68205+ /* example:
68206+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
68207+ 2 -> 3
68208+ */
68209+ /* first check to see if we can already be reached via this slot */
68210+ tmp = *curr;
68211+ while (tmp && tmp != role)
68212+ tmp = tmp->next;
68213+ if (tmp == role) {
68214+ /* we don't need to add ourselves to this slot's chain */
68215+ return;
68216+ }
68217+ /* we need to add ourselves to this chain, two cases */
68218+ if (role->next == NULL) {
68219+ /* simple case, append the current chain to our role */
68220+ role->next = *curr;
68221+ *curr = role;
68222+ } else {
68223+ /* 1 -> 2 -> 3 -> 4
68224+ 2 -> 3 -> 4
68225+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
68226+ */
68227+ /* trickier case: walk our role's chain until we find
68228+ the role for the start of the current slot's chain */
68229+ tmp = role;
68230+ tmp2 = *curr;
68231+ while (tmp->next && tmp->next != tmp2)
68232+ tmp = tmp->next;
68233+ if (tmp->next == tmp2) {
68234+ /* from example above, we found 3, so just
68235+ replace this slot's chain with ours */
68236+ *curr = role;
68237+ } else {
68238+ /* we didn't find a subset of our role's chain
68239+ in the current slot's chain, so append their
68240+ chain to ours, and set us as the first role in
68241+ the slot's chain
68242+
68243+ we could fold this case with the case above,
68244+ but making it explicit for clarity
68245+ */
68246+ tmp->next = tmp2;
68247+ *curr = role;
68248+ }
68249+ }
68250+ }
68251+
68252+ return;
68253+}
68254+
68255+static void
68256+insert_acl_role_label(struct acl_role_label *role)
68257+{
68258+ int i;
68259+
68260+ if (polstate->role_list == NULL) {
68261+ polstate->role_list = role;
68262+ role->prev = NULL;
68263+ } else {
68264+ role->prev = polstate->role_list;
68265+ polstate->role_list = role;
68266+ }
68267+
68268+ /* used for hash chains */
68269+ role->next = NULL;
68270+
68271+ if (role->roletype & GR_ROLE_DOMAIN) {
68272+ for (i = 0; i < role->domain_child_num; i++)
68273+ __insert_acl_role_label(role, role->domain_children[i]);
68274+ } else
68275+ __insert_acl_role_label(role, role->uidgid);
68276+}
68277+
68278+static int
68279+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
68280+{
68281+ struct name_entry **curr, *nentry;
68282+ struct inodev_entry *ientry;
68283+ unsigned int len = strlen(name);
68284+ unsigned int key = full_name_hash(name, len);
68285+ unsigned int index = key % polstate->name_set.n_size;
68286+
68287+ curr = &polstate->name_set.n_hash[index];
68288+
68289+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
68290+ curr = &((*curr)->next);
68291+
68292+ if (*curr != NULL)
68293+ return 1;
68294+
68295+ nentry = acl_alloc(sizeof (struct name_entry));
68296+ if (nentry == NULL)
68297+ return 0;
68298+ ientry = acl_alloc(sizeof (struct inodev_entry));
68299+ if (ientry == NULL)
68300+ return 0;
68301+ ientry->nentry = nentry;
68302+
68303+ nentry->key = key;
68304+ nentry->name = name;
68305+ nentry->inode = inode;
68306+ nentry->device = device;
68307+ nentry->len = len;
68308+ nentry->deleted = deleted;
68309+
68310+ nentry->prev = NULL;
68311+ curr = &polstate->name_set.n_hash[index];
68312+ if (*curr != NULL)
68313+ (*curr)->prev = nentry;
68314+ nentry->next = *curr;
68315+ *curr = nentry;
68316+
68317+ /* insert us into the table searchable by inode/dev */
68318+ __insert_inodev_entry(polstate, ientry);
68319+
68320+ return 1;
68321+}
68322+
68323+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
68324+
68325+static void *
68326+create_table(__u32 * len, int elementsize)
68327+{
68328+ unsigned int table_sizes[] = {
68329+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
68330+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
68331+ 4194301, 8388593, 16777213, 33554393, 67108859
68332+ };
68333+ void *newtable = NULL;
68334+ unsigned int pwr = 0;
68335+
68336+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
68337+ table_sizes[pwr] <= *len)
68338+ pwr++;
68339+
68340+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
68341+ return newtable;
68342+
68343+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
68344+ newtable =
68345+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
68346+ else
68347+ newtable = vmalloc(table_sizes[pwr] * elementsize);
68348+
68349+ *len = table_sizes[pwr];
68350+
68351+ return newtable;
68352+}
68353+
68354+static int
68355+init_variables(const struct gr_arg *arg, bool reload)
68356+{
68357+ struct task_struct *reaper = init_pid_ns.child_reaper;
68358+ unsigned int stacksize;
68359+
68360+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
68361+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
68362+ polstate->name_set.n_size = arg->role_db.num_objects;
68363+ polstate->inodev_set.i_size = arg->role_db.num_objects;
68364+
68365+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
68366+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
68367+ return 1;
68368+
68369+ if (!reload) {
68370+ if (!gr_init_uidset())
68371+ return 1;
68372+ }
68373+
68374+ /* set up the stack that holds allocation info */
68375+
68376+ stacksize = arg->role_db.num_pointers + 5;
68377+
68378+ if (!acl_alloc_stack_init(stacksize))
68379+ return 1;
68380+
68381+ if (!reload) {
68382+ /* grab reference for the real root dentry and vfsmount */
68383+ get_fs_root(reaper->fs, &gr_real_root);
68384+
68385+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68386+ 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);
68387+#endif
68388+
68389+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
68390+ if (fakefs_obj_rw == NULL)
68391+ return 1;
68392+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
68393+
68394+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
68395+ if (fakefs_obj_rwx == NULL)
68396+ return 1;
68397+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
68398+ }
68399+
68400+ polstate->subj_map_set.s_hash =
68401+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
68402+ polstate->acl_role_set.r_hash =
68403+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
68404+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
68405+ polstate->inodev_set.i_hash =
68406+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
68407+
68408+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
68409+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
68410+ return 1;
68411+
68412+ memset(polstate->subj_map_set.s_hash, 0,
68413+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
68414+ memset(polstate->acl_role_set.r_hash, 0,
68415+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
68416+ memset(polstate->name_set.n_hash, 0,
68417+ sizeof (struct name_entry *) * polstate->name_set.n_size);
68418+ memset(polstate->inodev_set.i_hash, 0,
68419+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
68420+
68421+ return 0;
68422+}
68423+
68424+/* free information not needed after startup
68425+ currently contains user->kernel pointer mappings for subjects
68426+*/
68427+
68428+static void
68429+free_init_variables(void)
68430+{
68431+ __u32 i;
68432+
68433+ if (polstate->subj_map_set.s_hash) {
68434+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
68435+ if (polstate->subj_map_set.s_hash[i]) {
68436+ kfree(polstate->subj_map_set.s_hash[i]);
68437+ polstate->subj_map_set.s_hash[i] = NULL;
68438+ }
68439+ }
68440+
68441+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
68442+ PAGE_SIZE)
68443+ kfree(polstate->subj_map_set.s_hash);
68444+ else
68445+ vfree(polstate->subj_map_set.s_hash);
68446+ }
68447+
68448+ return;
68449+}
68450+
68451+static void
68452+free_variables(bool reload)
68453+{
68454+ struct acl_subject_label *s;
68455+ struct acl_role_label *r;
68456+ struct task_struct *task, *task2;
68457+ unsigned int x;
68458+
68459+ if (!reload) {
68460+ gr_clear_learn_entries();
68461+
68462+ read_lock(&tasklist_lock);
68463+ do_each_thread(task2, task) {
68464+ task->acl_sp_role = 0;
68465+ task->acl_role_id = 0;
68466+ task->inherited = 0;
68467+ task->acl = NULL;
68468+ task->role = NULL;
68469+ } while_each_thread(task2, task);
68470+ read_unlock(&tasklist_lock);
68471+
68472+ kfree(fakefs_obj_rw);
68473+ fakefs_obj_rw = NULL;
68474+ kfree(fakefs_obj_rwx);
68475+ fakefs_obj_rwx = NULL;
68476+
68477+ /* release the reference to the real root dentry and vfsmount */
68478+ path_put(&gr_real_root);
68479+ memset(&gr_real_root, 0, sizeof(gr_real_root));
68480+ }
68481+
68482+ /* free all object hash tables */
68483+
68484+ FOR_EACH_ROLE_START(r)
68485+ if (r->subj_hash == NULL)
68486+ goto next_role;
68487+ FOR_EACH_SUBJECT_START(r, s, x)
68488+ if (s->obj_hash == NULL)
68489+ break;
68490+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
68491+ kfree(s->obj_hash);
68492+ else
68493+ vfree(s->obj_hash);
68494+ FOR_EACH_SUBJECT_END(s, x)
68495+ FOR_EACH_NESTED_SUBJECT_START(r, s)
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_NESTED_SUBJECT_END(s)
68503+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
68504+ kfree(r->subj_hash);
68505+ else
68506+ vfree(r->subj_hash);
68507+ r->subj_hash = NULL;
68508+next_role:
68509+ FOR_EACH_ROLE_END(r)
68510+
68511+ acl_free_all();
68512+
68513+ if (polstate->acl_role_set.r_hash) {
68514+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
68515+ PAGE_SIZE)
68516+ kfree(polstate->acl_role_set.r_hash);
68517+ else
68518+ vfree(polstate->acl_role_set.r_hash);
68519+ }
68520+ if (polstate->name_set.n_hash) {
68521+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
68522+ PAGE_SIZE)
68523+ kfree(polstate->name_set.n_hash);
68524+ else
68525+ vfree(polstate->name_set.n_hash);
68526+ }
68527+
68528+ if (polstate->inodev_set.i_hash) {
68529+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
68530+ PAGE_SIZE)
68531+ kfree(polstate->inodev_set.i_hash);
68532+ else
68533+ vfree(polstate->inodev_set.i_hash);
68534+ }
68535+
68536+ if (!reload)
68537+ gr_free_uidset();
68538+
68539+ memset(&polstate->name_set, 0, sizeof (struct name_db));
68540+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
68541+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
68542+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
68543+
68544+ polstate->default_role = NULL;
68545+ polstate->kernel_role = NULL;
68546+ polstate->role_list = NULL;
68547+
68548+ return;
68549+}
68550+
68551+static struct acl_subject_label *
68552+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
68553+
68554+static int alloc_and_copy_string(char **name, unsigned int maxlen)
68555+{
68556+ unsigned int len = strnlen_user(*name, maxlen);
68557+ char *tmp;
68558+
68559+ if (!len || len >= maxlen)
68560+ return -EINVAL;
68561+
68562+ if ((tmp = (char *) acl_alloc(len)) == NULL)
68563+ return -ENOMEM;
68564+
68565+ if (copy_from_user(tmp, *name, len))
68566+ return -EFAULT;
68567+
68568+ tmp[len-1] = '\0';
68569+ *name = tmp;
68570+
68571+ return 0;
68572+}
68573+
68574+static int
68575+copy_user_glob(struct acl_object_label *obj)
68576+{
68577+ struct acl_object_label *g_tmp, **guser;
68578+ int error;
68579+
68580+ if (obj->globbed == NULL)
68581+ return 0;
68582+
68583+ guser = &obj->globbed;
68584+ while (*guser) {
68585+ g_tmp = (struct acl_object_label *)
68586+ acl_alloc(sizeof (struct acl_object_label));
68587+ if (g_tmp == NULL)
68588+ return -ENOMEM;
68589+
68590+ if (copy_acl_object_label(g_tmp, *guser))
68591+ return -EFAULT;
68592+
68593+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
68594+ if (error)
68595+ return error;
68596+
68597+ *guser = g_tmp;
68598+ guser = &(g_tmp->next);
68599+ }
68600+
68601+ return 0;
68602+}
68603+
68604+static int
68605+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
68606+ struct acl_role_label *role)
68607+{
68608+ struct acl_object_label *o_tmp;
68609+ int ret;
68610+
68611+ while (userp) {
68612+ if ((o_tmp = (struct acl_object_label *)
68613+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
68614+ return -ENOMEM;
68615+
68616+ if (copy_acl_object_label(o_tmp, userp))
68617+ return -EFAULT;
68618+
68619+ userp = o_tmp->prev;
68620+
68621+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
68622+ if (ret)
68623+ return ret;
68624+
68625+ insert_acl_obj_label(o_tmp, subj);
68626+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
68627+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
68628+ return -ENOMEM;
68629+
68630+ ret = copy_user_glob(o_tmp);
68631+ if (ret)
68632+ return ret;
68633+
68634+ if (o_tmp->nested) {
68635+ int already_copied;
68636+
68637+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
68638+ if (IS_ERR(o_tmp->nested))
68639+ return PTR_ERR(o_tmp->nested);
68640+
68641+ /* insert into nested subject list if we haven't copied this one yet
68642+ to prevent duplicate entries */
68643+ if (!already_copied) {
68644+ o_tmp->nested->next = role->hash->first;
68645+ role->hash->first = o_tmp->nested;
68646+ }
68647+ }
68648+ }
68649+
68650+ return 0;
68651+}
68652+
68653+static __u32
68654+count_user_subjs(struct acl_subject_label *userp)
68655+{
68656+ struct acl_subject_label s_tmp;
68657+ __u32 num = 0;
68658+
68659+ while (userp) {
68660+ if (copy_acl_subject_label(&s_tmp, userp))
68661+ break;
68662+
68663+ userp = s_tmp.prev;
68664+ }
68665+
68666+ return num;
68667+}
68668+
68669+static int
68670+copy_user_allowedips(struct acl_role_label *rolep)
68671+{
68672+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
68673+
68674+ ruserip = rolep->allowed_ips;
68675+
68676+ while (ruserip) {
68677+ rlast = rtmp;
68678+
68679+ if ((rtmp = (struct role_allowed_ip *)
68680+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
68681+ return -ENOMEM;
68682+
68683+ if (copy_role_allowed_ip(rtmp, ruserip))
68684+ return -EFAULT;
68685+
68686+ ruserip = rtmp->prev;
68687+
68688+ if (!rlast) {
68689+ rtmp->prev = NULL;
68690+ rolep->allowed_ips = rtmp;
68691+ } else {
68692+ rlast->next = rtmp;
68693+ rtmp->prev = rlast;
68694+ }
68695+
68696+ if (!ruserip)
68697+ rtmp->next = NULL;
68698+ }
68699+
68700+ return 0;
68701+}
68702+
68703+static int
68704+copy_user_transitions(struct acl_role_label *rolep)
68705+{
68706+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
68707+ int error;
68708+
68709+ rusertp = rolep->transitions;
68710+
68711+ while (rusertp) {
68712+ rlast = rtmp;
68713+
68714+ if ((rtmp = (struct role_transition *)
68715+ acl_alloc(sizeof (struct role_transition))) == NULL)
68716+ return -ENOMEM;
68717+
68718+ if (copy_role_transition(rtmp, rusertp))
68719+ return -EFAULT;
68720+
68721+ rusertp = rtmp->prev;
68722+
68723+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
68724+ if (error)
68725+ return error;
68726+
68727+ if (!rlast) {
68728+ rtmp->prev = NULL;
68729+ rolep->transitions = rtmp;
68730+ } else {
68731+ rlast->next = rtmp;
68732+ rtmp->prev = rlast;
68733+ }
68734+
68735+ if (!rusertp)
68736+ rtmp->next = NULL;
68737+ }
68738+
68739+ return 0;
68740+}
68741+
68742+static __u32 count_user_objs(const struct acl_object_label __user *userp)
68743+{
68744+ struct acl_object_label o_tmp;
68745+ __u32 num = 0;
68746+
68747+ while (userp) {
68748+ if (copy_acl_object_label(&o_tmp, userp))
68749+ break;
68750+
68751+ userp = o_tmp.prev;
68752+ num++;
68753+ }
68754+
68755+ return num;
68756+}
68757+
68758+static struct acl_subject_label *
68759+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
68760+{
68761+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
68762+ __u32 num_objs;
68763+ struct acl_ip_label **i_tmp, *i_utmp2;
68764+ struct gr_hash_struct ghash;
68765+ struct subject_map *subjmap;
68766+ unsigned int i_num;
68767+ int err;
68768+
68769+ if (already_copied != NULL)
68770+ *already_copied = 0;
68771+
68772+ s_tmp = lookup_subject_map(userp);
68773+
68774+ /* we've already copied this subject into the kernel, just return
68775+ the reference to it, and don't copy it over again
68776+ */
68777+ if (s_tmp) {
68778+ if (already_copied != NULL)
68779+ *already_copied = 1;
68780+ return(s_tmp);
68781+ }
68782+
68783+ if ((s_tmp = (struct acl_subject_label *)
68784+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
68785+ return ERR_PTR(-ENOMEM);
68786+
68787+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
68788+ if (subjmap == NULL)
68789+ return ERR_PTR(-ENOMEM);
68790+
68791+ subjmap->user = userp;
68792+ subjmap->kernel = s_tmp;
68793+ insert_subj_map_entry(subjmap);
68794+
68795+ if (copy_acl_subject_label(s_tmp, userp))
68796+ return ERR_PTR(-EFAULT);
68797+
68798+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
68799+ if (err)
68800+ return ERR_PTR(err);
68801+
68802+ if (!strcmp(s_tmp->filename, "/"))
68803+ role->root_label = s_tmp;
68804+
68805+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
68806+ return ERR_PTR(-EFAULT);
68807+
68808+ /* copy user and group transition tables */
68809+
68810+ if (s_tmp->user_trans_num) {
68811+ uid_t *uidlist;
68812+
68813+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
68814+ if (uidlist == NULL)
68815+ return ERR_PTR(-ENOMEM);
68816+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
68817+ return ERR_PTR(-EFAULT);
68818+
68819+ s_tmp->user_transitions = uidlist;
68820+ }
68821+
68822+ if (s_tmp->group_trans_num) {
68823+ gid_t *gidlist;
68824+
68825+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
68826+ if (gidlist == NULL)
68827+ return ERR_PTR(-ENOMEM);
68828+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
68829+ return ERR_PTR(-EFAULT);
68830+
68831+ s_tmp->group_transitions = gidlist;
68832+ }
68833+
68834+ /* set up object hash table */
68835+ num_objs = count_user_objs(ghash.first);
68836+
68837+ s_tmp->obj_hash_size = num_objs;
68838+ s_tmp->obj_hash =
68839+ (struct acl_object_label **)
68840+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
68841+
68842+ if (!s_tmp->obj_hash)
68843+ return ERR_PTR(-ENOMEM);
68844+
68845+ memset(s_tmp->obj_hash, 0,
68846+ s_tmp->obj_hash_size *
68847+ sizeof (struct acl_object_label *));
68848+
68849+ /* add in objects */
68850+ err = copy_user_objs(ghash.first, s_tmp, role);
68851+
68852+ if (err)
68853+ return ERR_PTR(err);
68854+
68855+ /* set pointer for parent subject */
68856+ if (s_tmp->parent_subject) {
68857+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
68858+
68859+ if (IS_ERR(s_tmp2))
68860+ return s_tmp2;
68861+
68862+ s_tmp->parent_subject = s_tmp2;
68863+ }
68864+
68865+ /* add in ip acls */
68866+
68867+ if (!s_tmp->ip_num) {
68868+ s_tmp->ips = NULL;
68869+ goto insert;
68870+ }
68871+
68872+ i_tmp =
68873+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
68874+ sizeof (struct acl_ip_label *));
68875+
68876+ if (!i_tmp)
68877+ return ERR_PTR(-ENOMEM);
68878+
68879+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
68880+ *(i_tmp + i_num) =
68881+ (struct acl_ip_label *)
68882+ acl_alloc(sizeof (struct acl_ip_label));
68883+ if (!*(i_tmp + i_num))
68884+ return ERR_PTR(-ENOMEM);
68885+
68886+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
68887+ return ERR_PTR(-EFAULT);
68888+
68889+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
68890+ return ERR_PTR(-EFAULT);
68891+
68892+ if ((*(i_tmp + i_num))->iface == NULL)
68893+ continue;
68894+
68895+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
68896+ if (err)
68897+ return ERR_PTR(err);
68898+ }
68899+
68900+ s_tmp->ips = i_tmp;
68901+
68902+insert:
68903+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
68904+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
68905+ return ERR_PTR(-ENOMEM);
68906+
68907+ return s_tmp;
68908+}
68909+
68910+static int
68911+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
68912+{
68913+ struct acl_subject_label s_pre;
68914+ struct acl_subject_label * ret;
68915+ int err;
68916+
68917+ while (userp) {
68918+ if (copy_acl_subject_label(&s_pre, userp))
68919+ return -EFAULT;
68920+
68921+ ret = do_copy_user_subj(userp, role, NULL);
68922+
68923+ err = PTR_ERR(ret);
68924+ if (IS_ERR(ret))
68925+ return err;
68926+
68927+ insert_acl_subj_label(ret, role);
68928+
68929+ userp = s_pre.prev;
68930+ }
68931+
68932+ return 0;
68933+}
68934+
68935+static int
68936+copy_user_acl(struct gr_arg *arg)
68937+{
68938+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
68939+ struct acl_subject_label *subj_list;
68940+ struct sprole_pw *sptmp;
68941+ struct gr_hash_struct *ghash;
68942+ uid_t *domainlist;
68943+ unsigned int r_num;
68944+ int err = 0;
68945+ __u16 i;
68946+ __u32 num_subjs;
68947+
68948+ /* we need a default and kernel role */
68949+ if (arg->role_db.num_roles < 2)
68950+ return -EINVAL;
68951+
68952+ /* copy special role authentication info from userspace */
68953+
68954+ polstate->num_sprole_pws = arg->num_sprole_pws;
68955+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
68956+
68957+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
68958+ return -ENOMEM;
68959+
68960+ for (i = 0; i < polstate->num_sprole_pws; i++) {
68961+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
68962+ if (!sptmp)
68963+ return -ENOMEM;
68964+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
68965+ return -EFAULT;
68966+
68967+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
68968+ if (err)
68969+ return err;
68970+
68971+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68972+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
68973+#endif
68974+
68975+ polstate->acl_special_roles[i] = sptmp;
68976+ }
68977+
68978+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
68979+
68980+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
68981+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
68982+
68983+ if (!r_tmp)
68984+ return -ENOMEM;
68985+
68986+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
68987+ return -EFAULT;
68988+
68989+ if (copy_acl_role_label(r_tmp, r_utmp2))
68990+ return -EFAULT;
68991+
68992+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
68993+ if (err)
68994+ return err;
68995+
68996+ if (!strcmp(r_tmp->rolename, "default")
68997+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
68998+ polstate->default_role = r_tmp;
68999+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
69000+ polstate->kernel_role = r_tmp;
69001+ }
69002+
69003+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
69004+ return -ENOMEM;
69005+
69006+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
69007+ return -EFAULT;
69008+
69009+ r_tmp->hash = ghash;
69010+
69011+ num_subjs = count_user_subjs(r_tmp->hash->first);
69012+
69013+ r_tmp->subj_hash_size = num_subjs;
69014+ r_tmp->subj_hash =
69015+ (struct acl_subject_label **)
69016+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
69017+
69018+ if (!r_tmp->subj_hash)
69019+ return -ENOMEM;
69020+
69021+ err = copy_user_allowedips(r_tmp);
69022+ if (err)
69023+ return err;
69024+
69025+ /* copy domain info */
69026+ if (r_tmp->domain_children != NULL) {
69027+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
69028+ if (domainlist == NULL)
69029+ return -ENOMEM;
69030+
69031+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
69032+ return -EFAULT;
69033+
69034+ r_tmp->domain_children = domainlist;
69035+ }
69036+
69037+ err = copy_user_transitions(r_tmp);
69038+ if (err)
69039+ return err;
69040+
69041+ memset(r_tmp->subj_hash, 0,
69042+ r_tmp->subj_hash_size *
69043+ sizeof (struct acl_subject_label *));
69044+
69045+ /* acquire the list of subjects, then NULL out
69046+ the list prior to parsing the subjects for this role,
69047+ as during this parsing the list is replaced with a list
69048+ of *nested* subjects for the role
69049+ */
69050+ subj_list = r_tmp->hash->first;
69051+
69052+ /* set nested subject list to null */
69053+ r_tmp->hash->first = NULL;
69054+
69055+ err = copy_user_subjs(subj_list, r_tmp);
69056+
69057+ if (err)
69058+ return err;
69059+
69060+ insert_acl_role_label(r_tmp);
69061+ }
69062+
69063+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
69064+ return -EINVAL;
69065+
69066+ return err;
69067+}
69068+
69069+static int gracl_reload_apply_policies(void *reload)
69070+{
69071+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
69072+ struct task_struct *task, *task2;
69073+ struct acl_role_label *role, *rtmp;
69074+ struct acl_subject_label *subj;
69075+ const struct cred *cred;
69076+ int role_applied;
69077+ int ret = 0;
69078+
69079+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
69080+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
69081+
69082+ /* first make sure we'll be able to apply the new policy cleanly */
69083+ do_each_thread(task2, task) {
69084+ if (task->exec_file == NULL)
69085+ continue;
69086+ role_applied = 0;
69087+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
69088+ /* preserve special roles */
69089+ FOR_EACH_ROLE_START(role)
69090+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
69091+ rtmp = task->role;
69092+ task->role = role;
69093+ role_applied = 1;
69094+ break;
69095+ }
69096+ FOR_EACH_ROLE_END(role)
69097+ }
69098+ if (!role_applied) {
69099+ cred = __task_cred(task);
69100+ rtmp = task->role;
69101+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69102+ }
69103+ /* this handles non-nested inherited subjects, nested subjects will still
69104+ be dropped currently */
69105+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
69106+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
69107+ /* change the role back so that we've made no modifications to the policy */
69108+ task->role = rtmp;
69109+
69110+ if (subj == NULL || task->tmpacl == NULL) {
69111+ ret = -EINVAL;
69112+ goto out;
69113+ }
69114+ } while_each_thread(task2, task);
69115+
69116+ /* now actually apply the policy */
69117+
69118+ do_each_thread(task2, task) {
69119+ if (task->exec_file) {
69120+ role_applied = 0;
69121+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
69122+ /* preserve special roles */
69123+ FOR_EACH_ROLE_START(role)
69124+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
69125+ task->role = role;
69126+ role_applied = 1;
69127+ break;
69128+ }
69129+ FOR_EACH_ROLE_END(role)
69130+ }
69131+ if (!role_applied) {
69132+ cred = __task_cred(task);
69133+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69134+ }
69135+ /* this handles non-nested inherited subjects, nested subjects will still
69136+ be dropped currently */
69137+ if (!reload_state->oldmode && task->inherited)
69138+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
69139+ else {
69140+ /* looked up and tagged to the task previously */
69141+ subj = task->tmpacl;
69142+ }
69143+ /* subj will be non-null */
69144+ __gr_apply_subject_to_task(polstate, task, subj);
69145+ if (reload_state->oldmode) {
69146+ task->acl_role_id = 0;
69147+ task->acl_sp_role = 0;
69148+ task->inherited = 0;
69149+ }
69150+ } else {
69151+ // it's a kernel process
69152+ task->role = polstate->kernel_role;
69153+ task->acl = polstate->kernel_role->root_label;
69154+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
69155+ task->acl->mode &= ~GR_PROCFIND;
69156+#endif
69157+ }
69158+ } while_each_thread(task2, task);
69159+
69160+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
69161+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
69162+
69163+out:
69164+
69165+ return ret;
69166+}
69167+
69168+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
69169+{
69170+ struct gr_reload_state new_reload_state = { };
69171+ int err;
69172+
69173+ new_reload_state.oldpolicy_ptr = polstate;
69174+ new_reload_state.oldalloc_ptr = current_alloc_state;
69175+ new_reload_state.oldmode = oldmode;
69176+
69177+ current_alloc_state = &new_reload_state.newalloc;
69178+ polstate = &new_reload_state.newpolicy;
69179+
69180+ /* everything relevant is now saved off, copy in the new policy */
69181+ if (init_variables(args, true)) {
69182+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
69183+ err = -ENOMEM;
69184+ goto error;
69185+ }
69186+
69187+ err = copy_user_acl(args);
69188+ free_init_variables();
69189+ if (err)
69190+ goto error;
69191+ /* the new policy is copied in, with the old policy available via saved_state
69192+ first go through applying roles, making sure to preserve special roles
69193+ then apply new subjects, making sure to preserve inherited and nested subjects,
69194+ though currently only inherited subjects will be preserved
69195+ */
69196+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
69197+ if (err)
69198+ goto error;
69199+
69200+ /* we've now applied the new policy, so restore the old policy state to free it */
69201+ polstate = &new_reload_state.oldpolicy;
69202+ current_alloc_state = &new_reload_state.oldalloc;
69203+ free_variables(true);
69204+
69205+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
69206+ to running_polstate/current_alloc_state inside stop_machine
69207+ */
69208+ err = 0;
69209+ goto out;
69210+error:
69211+ /* on error of loading the new policy, we'll just keep the previous
69212+ policy set around
69213+ */
69214+ free_variables(true);
69215+
69216+ /* doesn't affect runtime, but maintains consistent state */
69217+out:
69218+ polstate = new_reload_state.oldpolicy_ptr;
69219+ current_alloc_state = new_reload_state.oldalloc_ptr;
69220+
69221+ return err;
69222+}
69223+
69224+static int
69225+gracl_init(struct gr_arg *args)
69226+{
69227+ int error = 0;
69228+
69229+ memcpy(&gr_system_salt, args->salt, sizeof(gr_system_salt));
69230+ memcpy(&gr_system_sum, args->sum, sizeof(gr_system_sum));
69231+
69232+ if (init_variables(args, false)) {
69233+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
69234+ error = -ENOMEM;
69235+ goto out;
69236+ }
69237+
69238+ error = copy_user_acl(args);
69239+ free_init_variables();
69240+ if (error)
69241+ goto out;
69242+
69243+ error = gr_set_acls(0);
69244+ if (error)
69245+ goto out;
69246+
69247+ gr_enable_rbac_system();
69248+
69249+ return 0;
69250+
69251+out:
69252+ free_variables(false);
69253+ return error;
69254+}
69255+
69256+static int
69257+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
69258+ unsigned char **sum)
69259+{
69260+ struct acl_role_label *r;
69261+ struct role_allowed_ip *ipp;
69262+ struct role_transition *trans;
69263+ unsigned int i;
69264+ int found = 0;
69265+ u32 curr_ip = current->signal->curr_ip;
69266+
69267+ current->signal->saved_ip = curr_ip;
69268+
69269+ /* check transition table */
69270+
69271+ for (trans = current->role->transitions; trans; trans = trans->next) {
69272+ if (!strcmp(rolename, trans->rolename)) {
69273+ found = 1;
69274+ break;
69275+ }
69276+ }
69277+
69278+ if (!found)
69279+ return 0;
69280+
69281+ /* handle special roles that do not require authentication
69282+ and check ip */
69283+
69284+ FOR_EACH_ROLE_START(r)
69285+ if (!strcmp(rolename, r->rolename) &&
69286+ (r->roletype & GR_ROLE_SPECIAL)) {
69287+ found = 0;
69288+ if (r->allowed_ips != NULL) {
69289+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
69290+ if ((ntohl(curr_ip) & ipp->netmask) ==
69291+ (ntohl(ipp->addr) & ipp->netmask))
69292+ found = 1;
69293+ }
69294+ } else
69295+ found = 2;
69296+ if (!found)
69297+ return 0;
69298+
69299+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
69300+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
69301+ *salt = NULL;
69302+ *sum = NULL;
69303+ return 1;
69304+ }
69305+ }
69306+ FOR_EACH_ROLE_END(r)
69307+
69308+ for (i = 0; i < polstate->num_sprole_pws; i++) {
69309+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
69310+ *salt = polstate->acl_special_roles[i]->salt;
69311+ *sum = polstate->acl_special_roles[i]->sum;
69312+ return 1;
69313+ }
69314+ }
69315+
69316+ return 0;
69317+}
69318+
69319+int gr_check_secure_terminal(struct task_struct *task)
69320+{
69321+ struct task_struct *p, *p2, *p3;
69322+ struct files_struct *files;
69323+ struct fdtable *fdt;
69324+ struct file *our_file = NULL, *file;
69325+ int i;
69326+
69327+ if (task->signal->tty == NULL)
69328+ return 1;
69329+
69330+ files = get_files_struct(task);
69331+ if (files != NULL) {
69332+ rcu_read_lock();
69333+ fdt = files_fdtable(files);
69334+ for (i=0; i < fdt->max_fds; i++) {
69335+ file = fcheck_files(files, i);
69336+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
69337+ get_file(file);
69338+ our_file = file;
69339+ }
69340+ }
69341+ rcu_read_unlock();
69342+ put_files_struct(files);
69343+ }
69344+
69345+ if (our_file == NULL)
69346+ return 1;
69347+
69348+ read_lock(&tasklist_lock);
69349+ do_each_thread(p2, p) {
69350+ files = get_files_struct(p);
69351+ if (files == NULL ||
69352+ (p->signal && p->signal->tty == task->signal->tty)) {
69353+ if (files != NULL)
69354+ put_files_struct(files);
69355+ continue;
69356+ }
69357+ rcu_read_lock();
69358+ fdt = files_fdtable(files);
69359+ for (i=0; i < fdt->max_fds; i++) {
69360+ file = fcheck_files(files, i);
69361+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
69362+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
69363+ p3 = task;
69364+ while (task_pid_nr(p3) > 0) {
69365+ if (p3 == p)
69366+ break;
69367+ p3 = p3->real_parent;
69368+ }
69369+ if (p3 == p)
69370+ break;
69371+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
69372+ gr_handle_alertkill(p);
69373+ rcu_read_unlock();
69374+ put_files_struct(files);
69375+ read_unlock(&tasklist_lock);
69376+ fput(our_file);
69377+ return 0;
69378+ }
69379+ }
69380+ rcu_read_unlock();
69381+ put_files_struct(files);
69382+ } while_each_thread(p2, p);
69383+ read_unlock(&tasklist_lock);
69384+
69385+ fput(our_file);
69386+ return 1;
69387+}
69388+
69389+ssize_t
69390+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
69391+{
69392+ struct gr_arg_wrapper uwrap;
69393+ unsigned char *sprole_salt = NULL;
69394+ unsigned char *sprole_sum = NULL;
69395+ int error = 0;
69396+ int error2 = 0;
69397+ size_t req_count = 0;
69398+ unsigned char oldmode = 0;
69399+
69400+ mutex_lock(&gr_dev_mutex);
69401+
69402+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
69403+ error = -EPERM;
69404+ goto out;
69405+ }
69406+
69407+#ifdef CONFIG_COMPAT
69408+ pax_open_kernel();
69409+ if (is_compat_task()) {
69410+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
69411+ copy_gr_arg = &copy_gr_arg_compat;
69412+ copy_acl_object_label = &copy_acl_object_label_compat;
69413+ copy_acl_subject_label = &copy_acl_subject_label_compat;
69414+ copy_acl_role_label = &copy_acl_role_label_compat;
69415+ copy_acl_ip_label = &copy_acl_ip_label_compat;
69416+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
69417+ copy_role_transition = &copy_role_transition_compat;
69418+ copy_sprole_pw = &copy_sprole_pw_compat;
69419+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
69420+ copy_pointer_from_array = &copy_pointer_from_array_compat;
69421+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
69422+ } else {
69423+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
69424+ copy_gr_arg = &copy_gr_arg_normal;
69425+ copy_acl_object_label = &copy_acl_object_label_normal;
69426+ copy_acl_subject_label = &copy_acl_subject_label_normal;
69427+ copy_acl_role_label = &copy_acl_role_label_normal;
69428+ copy_acl_ip_label = &copy_acl_ip_label_normal;
69429+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
69430+ copy_role_transition = &copy_role_transition_normal;
69431+ copy_sprole_pw = &copy_sprole_pw_normal;
69432+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
69433+ copy_pointer_from_array = &copy_pointer_from_array_normal;
69434+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
69435+ }
69436+ pax_close_kernel();
69437+#endif
69438+
69439+ req_count = get_gr_arg_wrapper_size();
69440+
69441+ if (count != req_count) {
69442+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
69443+ error = -EINVAL;
69444+ goto out;
69445+ }
69446+
69447+
69448+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
69449+ gr_auth_expires = 0;
69450+ gr_auth_attempts = 0;
69451+ }
69452+
69453+ error = copy_gr_arg_wrapper(buf, &uwrap);
69454+ if (error)
69455+ goto out;
69456+
69457+ error = copy_gr_arg(uwrap.arg, &gr_usermode);
69458+ if (error)
69459+ goto out;
69460+
69461+ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_SPROLEPAM &&
69462+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
69463+ time_after(gr_auth_expires, get_seconds())) {
69464+ error = -EBUSY;
69465+ goto out;
69466+ }
69467+
69468+ /* if non-root trying to do anything other than use a special role,
69469+ do not attempt authentication, do not count towards authentication
69470+ locking
69471+ */
69472+
69473+ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS &&
69474+ gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM &&
69475+ gr_is_global_nonroot(current_uid())) {
69476+ error = -EPERM;
69477+ goto out;
69478+ }
69479+
69480+ /* ensure pw and special role name are null terminated */
69481+
69482+ gr_usermode.pw[GR_PW_LEN - 1] = '\0';
69483+ gr_usermode.sp_role[GR_SPROLE_LEN - 1] = '\0';
69484+
69485+ /* Okay.
69486+ * We have our enough of the argument structure..(we have yet
69487+ * to copy_from_user the tables themselves) . Copy the tables
69488+ * only if we need them, i.e. for loading operations. */
69489+
69490+ switch (gr_usermode.mode) {
69491+ case GR_STATUS:
69492+ if (gr_acl_is_enabled()) {
69493+ error = 1;
69494+ if (!gr_check_secure_terminal(current))
69495+ error = 3;
69496+ } else
69497+ error = 2;
69498+ goto out;
69499+ case GR_SHUTDOWN:
69500+ if (gr_acl_is_enabled() && !(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69501+ stop_machine(gr_rbac_disable, NULL, NULL);
69502+ free_variables(false);
69503+ memset(&gr_usermode, 0, sizeof(gr_usermode));
69504+ memset(&gr_system_salt, 0, sizeof(gr_system_salt));
69505+ memset(&gr_system_sum, 0, sizeof(gr_system_sum));
69506+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
69507+ } else if (gr_acl_is_enabled()) {
69508+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
69509+ error = -EPERM;
69510+ } else {
69511+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
69512+ error = -EAGAIN;
69513+ }
69514+ break;
69515+ case GR_ENABLE:
69516+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(&gr_usermode)))
69517+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
69518+ else {
69519+ if (gr_acl_is_enabled())
69520+ error = -EAGAIN;
69521+ else
69522+ error = error2;
69523+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
69524+ }
69525+ break;
69526+ case GR_OLDRELOAD:
69527+ oldmode = 1;
69528+ case GR_RELOAD:
69529+ if (!gr_acl_is_enabled()) {
69530+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
69531+ error = -EAGAIN;
69532+ } else if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69533+ error2 = gracl_reload(&gr_usermode, oldmode);
69534+ if (!error2)
69535+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
69536+ else {
69537+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
69538+ error = error2;
69539+ }
69540+ } else {
69541+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
69542+ error = -EPERM;
69543+ }
69544+ break;
69545+ case GR_SEGVMOD:
69546+ if (unlikely(!gr_acl_is_enabled())) {
69547+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
69548+ error = -EAGAIN;
69549+ break;
69550+ }
69551+
69552+ if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
69553+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
69554+ if (gr_usermode.segv_device && gr_usermode.segv_inode) {
69555+ struct acl_subject_label *segvacl;
69556+ segvacl =
69557+ lookup_acl_subj_label(gr_usermode.segv_inode,
69558+ gr_usermode.segv_device,
69559+ current->role);
69560+ if (segvacl) {
69561+ segvacl->crashes = 0;
69562+ segvacl->expires = 0;
69563+ }
69564+ } else if (gr_find_uid(gr_usermode.segv_uid) >= 0) {
69565+ gr_remove_uid(gr_usermode.segv_uid);
69566+ }
69567+ } else {
69568+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
69569+ error = -EPERM;
69570+ }
69571+ break;
69572+ case GR_SPROLE:
69573+ case GR_SPROLEPAM:
69574+ if (unlikely(!gr_acl_is_enabled())) {
69575+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
69576+ error = -EAGAIN;
69577+ break;
69578+ }
69579+
69580+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
69581+ current->role->expires = 0;
69582+ current->role->auth_attempts = 0;
69583+ }
69584+
69585+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
69586+ time_after(current->role->expires, get_seconds())) {
69587+ error = -EBUSY;
69588+ goto out;
69589+ }
69590+
69591+ if (lookup_special_role_auth
69592+ (gr_usermode.mode, gr_usermode.sp_role, &sprole_salt, &sprole_sum)
69593+ && ((!sprole_salt && !sprole_sum)
69594+ || !(chkpw(&gr_usermode, sprole_salt, sprole_sum)))) {
69595+ char *p = "";
69596+ assign_special_role(gr_usermode.sp_role);
69597+ read_lock(&tasklist_lock);
69598+ if (current->real_parent)
69599+ p = current->real_parent->role->rolename;
69600+ read_unlock(&tasklist_lock);
69601+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
69602+ p, acl_sp_role_value);
69603+ } else {
69604+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode.sp_role);
69605+ error = -EPERM;
69606+ if(!(current->role->auth_attempts++))
69607+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
69608+
69609+ goto out;
69610+ }
69611+ break;
69612+ case GR_UNSPROLE:
69613+ if (unlikely(!gr_acl_is_enabled())) {
69614+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
69615+ error = -EAGAIN;
69616+ break;
69617+ }
69618+
69619+ if (current->role->roletype & GR_ROLE_SPECIAL) {
69620+ char *p = "";
69621+ int i = 0;
69622+
69623+ read_lock(&tasklist_lock);
69624+ if (current->real_parent) {
69625+ p = current->real_parent->role->rolename;
69626+ i = current->real_parent->acl_role_id;
69627+ }
69628+ read_unlock(&tasklist_lock);
69629+
69630+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
69631+ gr_set_acls(1);
69632+ } else {
69633+ error = -EPERM;
69634+ goto out;
69635+ }
69636+ break;
69637+ default:
69638+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode.mode);
69639+ error = -EINVAL;
69640+ break;
69641+ }
69642+
69643+ if (error != -EPERM)
69644+ goto out;
69645+
69646+ if(!(gr_auth_attempts++))
69647+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
69648+
69649+ out:
69650+ mutex_unlock(&gr_dev_mutex);
69651+
69652+ if (!error)
69653+ error = req_count;
69654+
69655+ return error;
69656+}
69657+
69658+int
69659+gr_set_acls(const int type)
69660+{
69661+ struct task_struct *task, *task2;
69662+ struct acl_role_label *role = current->role;
69663+ struct acl_subject_label *subj;
69664+ __u16 acl_role_id = current->acl_role_id;
69665+ const struct cred *cred;
69666+ int ret;
69667+
69668+ rcu_read_lock();
69669+ read_lock(&tasklist_lock);
69670+ read_lock(&grsec_exec_file_lock);
69671+ do_each_thread(task2, task) {
69672+ /* check to see if we're called from the exit handler,
69673+ if so, only replace ACLs that have inherited the admin
69674+ ACL */
69675+
69676+ if (type && (task->role != role ||
69677+ task->acl_role_id != acl_role_id))
69678+ continue;
69679+
69680+ task->acl_role_id = 0;
69681+ task->acl_sp_role = 0;
69682+ task->inherited = 0;
69683+
69684+ if (task->exec_file) {
69685+ cred = __task_cred(task);
69686+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
69687+ subj = __gr_get_subject_for_task(polstate, task, NULL);
69688+ if (subj == NULL) {
69689+ ret = -EINVAL;
69690+ read_unlock(&grsec_exec_file_lock);
69691+ read_unlock(&tasklist_lock);
69692+ rcu_read_unlock();
69693+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
69694+ return ret;
69695+ }
69696+ __gr_apply_subject_to_task(polstate, task, subj);
69697+ } else {
69698+ // it's a kernel process
69699+ task->role = polstate->kernel_role;
69700+ task->acl = polstate->kernel_role->root_label;
69701+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
69702+ task->acl->mode &= ~GR_PROCFIND;
69703+#endif
69704+ }
69705+ } while_each_thread(task2, task);
69706+ read_unlock(&grsec_exec_file_lock);
69707+ read_unlock(&tasklist_lock);
69708+ rcu_read_unlock();
69709+
69710+ return 0;
69711+}
69712diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
69713new file mode 100644
69714index 0000000..39645c9
69715--- /dev/null
69716+++ b/grsecurity/gracl_res.c
69717@@ -0,0 +1,68 @@
69718+#include <linux/kernel.h>
69719+#include <linux/sched.h>
69720+#include <linux/gracl.h>
69721+#include <linux/grinternal.h>
69722+
69723+static const char *restab_log[] = {
69724+ [RLIMIT_CPU] = "RLIMIT_CPU",
69725+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
69726+ [RLIMIT_DATA] = "RLIMIT_DATA",
69727+ [RLIMIT_STACK] = "RLIMIT_STACK",
69728+ [RLIMIT_CORE] = "RLIMIT_CORE",
69729+ [RLIMIT_RSS] = "RLIMIT_RSS",
69730+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
69731+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
69732+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
69733+ [RLIMIT_AS] = "RLIMIT_AS",
69734+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
69735+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
69736+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
69737+ [RLIMIT_NICE] = "RLIMIT_NICE",
69738+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
69739+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
69740+ [GR_CRASH_RES] = "RLIMIT_CRASH"
69741+};
69742+
69743+void
69744+gr_log_resource(const struct task_struct *task,
69745+ const int res, const unsigned long wanted, const int gt)
69746+{
69747+ const struct cred *cred;
69748+ unsigned long rlim;
69749+
69750+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
69751+ return;
69752+
69753+ // not yet supported resource
69754+ if (unlikely(!restab_log[res]))
69755+ return;
69756+
69757+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
69758+ rlim = task_rlimit_max(task, res);
69759+ else
69760+ rlim = task_rlimit(task, res);
69761+
69762+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
69763+ return;
69764+
69765+ rcu_read_lock();
69766+ cred = __task_cred(task);
69767+
69768+ if (res == RLIMIT_NPROC &&
69769+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
69770+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
69771+ goto out_rcu_unlock;
69772+ else if (res == RLIMIT_MEMLOCK &&
69773+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
69774+ goto out_rcu_unlock;
69775+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
69776+ goto out_rcu_unlock;
69777+ rcu_read_unlock();
69778+
69779+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
69780+
69781+ return;
69782+out_rcu_unlock:
69783+ rcu_read_unlock();
69784+ return;
69785+}
69786diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
69787new file mode 100644
69788index 0000000..2040e61
69789--- /dev/null
69790+++ b/grsecurity/gracl_segv.c
69791@@ -0,0 +1,313 @@
69792+#include <linux/kernel.h>
69793+#include <linux/mm.h>
69794+#include <asm/uaccess.h>
69795+#include <asm/errno.h>
69796+#include <asm/mman.h>
69797+#include <net/sock.h>
69798+#include <linux/file.h>
69799+#include <linux/fs.h>
69800+#include <linux/net.h>
69801+#include <linux/in.h>
69802+#include <linux/slab.h>
69803+#include <linux/types.h>
69804+#include <linux/sched.h>
69805+#include <linux/timer.h>
69806+#include <linux/gracl.h>
69807+#include <linux/grsecurity.h>
69808+#include <linux/grinternal.h>
69809+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69810+#include <linux/magic.h>
69811+#include <linux/pagemap.h>
69812+#include "../fs/btrfs/async-thread.h"
69813+#include "../fs/btrfs/ctree.h"
69814+#include "../fs/btrfs/btrfs_inode.h"
69815+#endif
69816+
69817+static struct crash_uid *uid_set;
69818+static unsigned short uid_used;
69819+static DEFINE_SPINLOCK(gr_uid_lock);
69820+extern rwlock_t gr_inode_lock;
69821+extern struct acl_subject_label *
69822+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
69823+ struct acl_role_label *role);
69824+
69825+static inline dev_t __get_dev(const struct dentry *dentry)
69826+{
69827+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69828+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69829+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
69830+ else
69831+#endif
69832+ return dentry->d_sb->s_dev;
69833+}
69834+
69835+int
69836+gr_init_uidset(void)
69837+{
69838+ uid_set =
69839+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
69840+ uid_used = 0;
69841+
69842+ return uid_set ? 1 : 0;
69843+}
69844+
69845+void
69846+gr_free_uidset(void)
69847+{
69848+ if (uid_set) {
69849+ struct crash_uid *tmpset;
69850+ spin_lock(&gr_uid_lock);
69851+ tmpset = uid_set;
69852+ uid_set = NULL;
69853+ uid_used = 0;
69854+ spin_unlock(&gr_uid_lock);
69855+ if (tmpset)
69856+ kfree(tmpset);
69857+ }
69858+
69859+ return;
69860+}
69861+
69862+int
69863+gr_find_uid(const uid_t uid)
69864+{
69865+ struct crash_uid *tmp = uid_set;
69866+ uid_t buid;
69867+ int low = 0, high = uid_used - 1, mid;
69868+
69869+ while (high >= low) {
69870+ mid = (low + high) >> 1;
69871+ buid = tmp[mid].uid;
69872+ if (buid == uid)
69873+ return mid;
69874+ if (buid > uid)
69875+ high = mid - 1;
69876+ if (buid < uid)
69877+ low = mid + 1;
69878+ }
69879+
69880+ return -1;
69881+}
69882+
69883+static __inline__ void
69884+gr_insertsort(void)
69885+{
69886+ unsigned short i, j;
69887+ struct crash_uid index;
69888+
69889+ for (i = 1; i < uid_used; i++) {
69890+ index = uid_set[i];
69891+ j = i;
69892+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
69893+ uid_set[j] = uid_set[j - 1];
69894+ j--;
69895+ }
69896+ uid_set[j] = index;
69897+ }
69898+
69899+ return;
69900+}
69901+
69902+static __inline__ void
69903+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
69904+{
69905+ int loc;
69906+ uid_t uid = GR_GLOBAL_UID(kuid);
69907+
69908+ if (uid_used == GR_UIDTABLE_MAX)
69909+ return;
69910+
69911+ loc = gr_find_uid(uid);
69912+
69913+ if (loc >= 0) {
69914+ uid_set[loc].expires = expires;
69915+ return;
69916+ }
69917+
69918+ uid_set[uid_used].uid = uid;
69919+ uid_set[uid_used].expires = expires;
69920+ uid_used++;
69921+
69922+ gr_insertsort();
69923+
69924+ return;
69925+}
69926+
69927+void
69928+gr_remove_uid(const unsigned short loc)
69929+{
69930+ unsigned short i;
69931+
69932+ for (i = loc + 1; i < uid_used; i++)
69933+ uid_set[i - 1] = uid_set[i];
69934+
69935+ uid_used--;
69936+
69937+ return;
69938+}
69939+
69940+int
69941+gr_check_crash_uid(const kuid_t kuid)
69942+{
69943+ int loc;
69944+ int ret = 0;
69945+ uid_t uid;
69946+
69947+ if (unlikely(!gr_acl_is_enabled()))
69948+ return 0;
69949+
69950+ uid = GR_GLOBAL_UID(kuid);
69951+
69952+ spin_lock(&gr_uid_lock);
69953+ loc = gr_find_uid(uid);
69954+
69955+ if (loc < 0)
69956+ goto out_unlock;
69957+
69958+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
69959+ gr_remove_uid(loc);
69960+ else
69961+ ret = 1;
69962+
69963+out_unlock:
69964+ spin_unlock(&gr_uid_lock);
69965+ return ret;
69966+}
69967+
69968+static __inline__ int
69969+proc_is_setxid(const struct cred *cred)
69970+{
69971+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
69972+ !uid_eq(cred->uid, cred->fsuid))
69973+ return 1;
69974+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
69975+ !gid_eq(cred->gid, cred->fsgid))
69976+ return 1;
69977+
69978+ return 0;
69979+}
69980+
69981+extern int gr_fake_force_sig(int sig, struct task_struct *t);
69982+
69983+void
69984+gr_handle_crash(struct task_struct *task, const int sig)
69985+{
69986+ struct acl_subject_label *curr;
69987+ struct task_struct *tsk, *tsk2;
69988+ const struct cred *cred;
69989+ const struct cred *cred2;
69990+
69991+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
69992+ return;
69993+
69994+ if (unlikely(!gr_acl_is_enabled()))
69995+ return;
69996+
69997+ curr = task->acl;
69998+
69999+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
70000+ return;
70001+
70002+ if (time_before_eq(curr->expires, get_seconds())) {
70003+ curr->expires = 0;
70004+ curr->crashes = 0;
70005+ }
70006+
70007+ curr->crashes++;
70008+
70009+ if (!curr->expires)
70010+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
70011+
70012+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
70013+ time_after(curr->expires, get_seconds())) {
70014+ rcu_read_lock();
70015+ cred = __task_cred(task);
70016+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
70017+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
70018+ spin_lock(&gr_uid_lock);
70019+ gr_insert_uid(cred->uid, curr->expires);
70020+ spin_unlock(&gr_uid_lock);
70021+ curr->expires = 0;
70022+ curr->crashes = 0;
70023+ read_lock(&tasklist_lock);
70024+ do_each_thread(tsk2, tsk) {
70025+ cred2 = __task_cred(tsk);
70026+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
70027+ gr_fake_force_sig(SIGKILL, tsk);
70028+ } while_each_thread(tsk2, tsk);
70029+ read_unlock(&tasklist_lock);
70030+ } else {
70031+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
70032+ read_lock(&tasklist_lock);
70033+ read_lock(&grsec_exec_file_lock);
70034+ do_each_thread(tsk2, tsk) {
70035+ if (likely(tsk != task)) {
70036+ // if this thread has the same subject as the one that triggered
70037+ // RES_CRASH and it's the same binary, kill it
70038+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
70039+ gr_fake_force_sig(SIGKILL, tsk);
70040+ }
70041+ } while_each_thread(tsk2, tsk);
70042+ read_unlock(&grsec_exec_file_lock);
70043+ read_unlock(&tasklist_lock);
70044+ }
70045+ rcu_read_unlock();
70046+ }
70047+
70048+ return;
70049+}
70050+
70051+int
70052+gr_check_crash_exec(const struct file *filp)
70053+{
70054+ struct acl_subject_label *curr;
70055+
70056+ if (unlikely(!gr_acl_is_enabled()))
70057+ return 0;
70058+
70059+ read_lock(&gr_inode_lock);
70060+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
70061+ __get_dev(filp->f_path.dentry),
70062+ current->role);
70063+ read_unlock(&gr_inode_lock);
70064+
70065+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
70066+ (!curr->crashes && !curr->expires))
70067+ return 0;
70068+
70069+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
70070+ time_after(curr->expires, get_seconds()))
70071+ return 1;
70072+ else if (time_before_eq(curr->expires, get_seconds())) {
70073+ curr->crashes = 0;
70074+ curr->expires = 0;
70075+ }
70076+
70077+ return 0;
70078+}
70079+
70080+void
70081+gr_handle_alertkill(struct task_struct *task)
70082+{
70083+ struct acl_subject_label *curracl;
70084+ __u32 curr_ip;
70085+ struct task_struct *p, *p2;
70086+
70087+ if (unlikely(!gr_acl_is_enabled()))
70088+ return;
70089+
70090+ curracl = task->acl;
70091+ curr_ip = task->signal->curr_ip;
70092+
70093+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
70094+ read_lock(&tasklist_lock);
70095+ do_each_thread(p2, p) {
70096+ if (p->signal->curr_ip == curr_ip)
70097+ gr_fake_force_sig(SIGKILL, p);
70098+ } while_each_thread(p2, p);
70099+ read_unlock(&tasklist_lock);
70100+ } else if (curracl->mode & GR_KILLPROC)
70101+ gr_fake_force_sig(SIGKILL, task);
70102+
70103+ return;
70104+}
70105diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
70106new file mode 100644
70107index 0000000..98011b0
70108--- /dev/null
70109+++ b/grsecurity/gracl_shm.c
70110@@ -0,0 +1,40 @@
70111+#include <linux/kernel.h>
70112+#include <linux/mm.h>
70113+#include <linux/sched.h>
70114+#include <linux/file.h>
70115+#include <linux/ipc.h>
70116+#include <linux/gracl.h>
70117+#include <linux/grsecurity.h>
70118+#include <linux/grinternal.h>
70119+
70120+int
70121+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70122+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
70123+{
70124+ struct task_struct *task;
70125+
70126+ if (!gr_acl_is_enabled())
70127+ return 1;
70128+
70129+ rcu_read_lock();
70130+ read_lock(&tasklist_lock);
70131+
70132+ task = find_task_by_vpid(shm_cprid);
70133+
70134+ if (unlikely(!task))
70135+ task = find_task_by_vpid(shm_lapid);
70136+
70137+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
70138+ (task_pid_nr(task) == shm_lapid)) &&
70139+ (task->acl->mode & GR_PROTSHM) &&
70140+ (task->acl != current->acl))) {
70141+ read_unlock(&tasklist_lock);
70142+ rcu_read_unlock();
70143+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
70144+ return 0;
70145+ }
70146+ read_unlock(&tasklist_lock);
70147+ rcu_read_unlock();
70148+
70149+ return 1;
70150+}
70151diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
70152new file mode 100644
70153index 0000000..bc0be01
70154--- /dev/null
70155+++ b/grsecurity/grsec_chdir.c
70156@@ -0,0 +1,19 @@
70157+#include <linux/kernel.h>
70158+#include <linux/sched.h>
70159+#include <linux/fs.h>
70160+#include <linux/file.h>
70161+#include <linux/grsecurity.h>
70162+#include <linux/grinternal.h>
70163+
70164+void
70165+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
70166+{
70167+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
70168+ if ((grsec_enable_chdir && grsec_enable_group &&
70169+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
70170+ !grsec_enable_group)) {
70171+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
70172+ }
70173+#endif
70174+ return;
70175+}
70176diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
70177new file mode 100644
70178index 0000000..e10b319
70179--- /dev/null
70180+++ b/grsecurity/grsec_chroot.c
70181@@ -0,0 +1,370 @@
70182+#include <linux/kernel.h>
70183+#include <linux/module.h>
70184+#include <linux/sched.h>
70185+#include <linux/file.h>
70186+#include <linux/fs.h>
70187+#include <linux/mount.h>
70188+#include <linux/types.h>
70189+#include "../fs/mount.h"
70190+#include <linux/grsecurity.h>
70191+#include <linux/grinternal.h>
70192+
70193+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70194+int gr_init_ran;
70195+#endif
70196+
70197+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
70198+{
70199+#ifdef CONFIG_GRKERNSEC
70200+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
70201+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
70202+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70203+ && gr_init_ran
70204+#endif
70205+ )
70206+ task->gr_is_chrooted = 1;
70207+ else {
70208+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
70209+ if (task_pid_nr(task) == 1 && !gr_init_ran)
70210+ gr_init_ran = 1;
70211+#endif
70212+ task->gr_is_chrooted = 0;
70213+ }
70214+
70215+ task->gr_chroot_dentry = path->dentry;
70216+#endif
70217+ return;
70218+}
70219+
70220+void gr_clear_chroot_entries(struct task_struct *task)
70221+{
70222+#ifdef CONFIG_GRKERNSEC
70223+ task->gr_is_chrooted = 0;
70224+ task->gr_chroot_dentry = NULL;
70225+#endif
70226+ return;
70227+}
70228+
70229+int
70230+gr_handle_chroot_unix(const pid_t pid)
70231+{
70232+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
70233+ struct task_struct *p;
70234+
70235+ if (unlikely(!grsec_enable_chroot_unix))
70236+ return 1;
70237+
70238+ if (likely(!proc_is_chrooted(current)))
70239+ return 1;
70240+
70241+ rcu_read_lock();
70242+ read_lock(&tasklist_lock);
70243+ p = find_task_by_vpid_unrestricted(pid);
70244+ if (unlikely(p && !have_same_root(current, p))) {
70245+ read_unlock(&tasklist_lock);
70246+ rcu_read_unlock();
70247+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
70248+ return 0;
70249+ }
70250+ read_unlock(&tasklist_lock);
70251+ rcu_read_unlock();
70252+#endif
70253+ return 1;
70254+}
70255+
70256+int
70257+gr_handle_chroot_nice(void)
70258+{
70259+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
70260+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
70261+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
70262+ return -EPERM;
70263+ }
70264+#endif
70265+ return 0;
70266+}
70267+
70268+int
70269+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
70270+{
70271+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
70272+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
70273+ && proc_is_chrooted(current)) {
70274+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
70275+ return -EACCES;
70276+ }
70277+#endif
70278+ return 0;
70279+}
70280+
70281+int
70282+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
70283+{
70284+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
70285+ struct task_struct *p;
70286+ int ret = 0;
70287+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
70288+ return ret;
70289+
70290+ read_lock(&tasklist_lock);
70291+ do_each_pid_task(pid, type, p) {
70292+ if (!have_same_root(current, p)) {
70293+ ret = 1;
70294+ goto out;
70295+ }
70296+ } while_each_pid_task(pid, type, p);
70297+out:
70298+ read_unlock(&tasklist_lock);
70299+ return ret;
70300+#endif
70301+ return 0;
70302+}
70303+
70304+int
70305+gr_pid_is_chrooted(struct task_struct *p)
70306+{
70307+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
70308+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
70309+ return 0;
70310+
70311+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
70312+ !have_same_root(current, p)) {
70313+ return 1;
70314+ }
70315+#endif
70316+ return 0;
70317+}
70318+
70319+EXPORT_SYMBOL(gr_pid_is_chrooted);
70320+
70321+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
70322+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
70323+{
70324+ struct path path, currentroot;
70325+ int ret = 0;
70326+
70327+ path.dentry = (struct dentry *)u_dentry;
70328+ path.mnt = (struct vfsmount *)u_mnt;
70329+ get_fs_root(current->fs, &currentroot);
70330+ if (path_is_under(&path, &currentroot))
70331+ ret = 1;
70332+ path_put(&currentroot);
70333+
70334+ return ret;
70335+}
70336+#endif
70337+
70338+int
70339+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
70340+{
70341+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
70342+ if (!grsec_enable_chroot_fchdir)
70343+ return 1;
70344+
70345+ if (!proc_is_chrooted(current))
70346+ return 1;
70347+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
70348+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
70349+ return 0;
70350+ }
70351+#endif
70352+ return 1;
70353+}
70354+
70355+int
70356+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70357+ const time_t shm_createtime)
70358+{
70359+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
70360+ struct task_struct *p;
70361+ time_t starttime;
70362+
70363+ if (unlikely(!grsec_enable_chroot_shmat))
70364+ return 1;
70365+
70366+ if (likely(!proc_is_chrooted(current)))
70367+ return 1;
70368+
70369+ rcu_read_lock();
70370+ read_lock(&tasklist_lock);
70371+
70372+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
70373+ starttime = p->start_time.tv_sec;
70374+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
70375+ if (have_same_root(current, p)) {
70376+ goto allow;
70377+ } else {
70378+ read_unlock(&tasklist_lock);
70379+ rcu_read_unlock();
70380+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
70381+ return 0;
70382+ }
70383+ }
70384+ /* creator exited, pid reuse, fall through to next check */
70385+ }
70386+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
70387+ if (unlikely(!have_same_root(current, p))) {
70388+ read_unlock(&tasklist_lock);
70389+ rcu_read_unlock();
70390+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
70391+ return 0;
70392+ }
70393+ }
70394+
70395+allow:
70396+ read_unlock(&tasklist_lock);
70397+ rcu_read_unlock();
70398+#endif
70399+ return 1;
70400+}
70401+
70402+void
70403+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
70404+{
70405+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
70406+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
70407+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
70408+#endif
70409+ return;
70410+}
70411+
70412+int
70413+gr_handle_chroot_mknod(const struct dentry *dentry,
70414+ const struct vfsmount *mnt, const int mode)
70415+{
70416+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
70417+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
70418+ proc_is_chrooted(current)) {
70419+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
70420+ return -EPERM;
70421+ }
70422+#endif
70423+ return 0;
70424+}
70425+
70426+int
70427+gr_handle_chroot_mount(const struct dentry *dentry,
70428+ const struct vfsmount *mnt, const char *dev_name)
70429+{
70430+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
70431+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
70432+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
70433+ return -EPERM;
70434+ }
70435+#endif
70436+ return 0;
70437+}
70438+
70439+int
70440+gr_handle_chroot_pivot(void)
70441+{
70442+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
70443+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
70444+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
70445+ return -EPERM;
70446+ }
70447+#endif
70448+ return 0;
70449+}
70450+
70451+int
70452+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
70453+{
70454+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
70455+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
70456+ !gr_is_outside_chroot(dentry, mnt)) {
70457+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
70458+ return -EPERM;
70459+ }
70460+#endif
70461+ return 0;
70462+}
70463+
70464+extern const char *captab_log[];
70465+extern int captab_log_entries;
70466+
70467+int
70468+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
70469+{
70470+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70471+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
70472+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
70473+ if (cap_raised(chroot_caps, cap)) {
70474+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
70475+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
70476+ }
70477+ return 0;
70478+ }
70479+ }
70480+#endif
70481+ return 1;
70482+}
70483+
70484+int
70485+gr_chroot_is_capable(const int cap)
70486+{
70487+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70488+ return gr_task_chroot_is_capable(current, current_cred(), cap);
70489+#endif
70490+ return 1;
70491+}
70492+
70493+int
70494+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
70495+{
70496+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70497+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
70498+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
70499+ if (cap_raised(chroot_caps, cap)) {
70500+ return 0;
70501+ }
70502+ }
70503+#endif
70504+ return 1;
70505+}
70506+
70507+int
70508+gr_chroot_is_capable_nolog(const int cap)
70509+{
70510+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70511+ return gr_task_chroot_is_capable_nolog(current, cap);
70512+#endif
70513+ return 1;
70514+}
70515+
70516+int
70517+gr_handle_chroot_sysctl(const int op)
70518+{
70519+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
70520+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
70521+ proc_is_chrooted(current))
70522+ return -EACCES;
70523+#endif
70524+ return 0;
70525+}
70526+
70527+void
70528+gr_handle_chroot_chdir(const struct path *path)
70529+{
70530+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
70531+ if (grsec_enable_chroot_chdir)
70532+ set_fs_pwd(current->fs, path);
70533+#endif
70534+ return;
70535+}
70536+
70537+int
70538+gr_handle_chroot_chmod(const struct dentry *dentry,
70539+ const struct vfsmount *mnt, const int mode)
70540+{
70541+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
70542+ /* allow chmod +s on directories, but not files */
70543+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
70544+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
70545+ proc_is_chrooted(current)) {
70546+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
70547+ return -EPERM;
70548+ }
70549+#endif
70550+ return 0;
70551+}
70552diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
70553new file mode 100644
70554index 0000000..52b3e30
70555--- /dev/null
70556+++ b/grsecurity/grsec_disabled.c
70557@@ -0,0 +1,433 @@
70558+#include <linux/kernel.h>
70559+#include <linux/module.h>
70560+#include <linux/sched.h>
70561+#include <linux/file.h>
70562+#include <linux/fs.h>
70563+#include <linux/kdev_t.h>
70564+#include <linux/net.h>
70565+#include <linux/in.h>
70566+#include <linux/ip.h>
70567+#include <linux/skbuff.h>
70568+#include <linux/sysctl.h>
70569+
70570+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
70571+void
70572+pax_set_initial_flags(struct linux_binprm *bprm)
70573+{
70574+ return;
70575+}
70576+#endif
70577+
70578+#ifdef CONFIG_SYSCTL
70579+__u32
70580+gr_handle_sysctl(const struct ctl_table * table, const int op)
70581+{
70582+ return 0;
70583+}
70584+#endif
70585+
70586+#ifdef CONFIG_TASKSTATS
70587+int gr_is_taskstats_denied(int pid)
70588+{
70589+ return 0;
70590+}
70591+#endif
70592+
70593+int
70594+gr_acl_is_enabled(void)
70595+{
70596+ return 0;
70597+}
70598+
70599+void
70600+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
70601+{
70602+ return;
70603+}
70604+
70605+int
70606+gr_handle_rawio(const struct inode *inode)
70607+{
70608+ return 0;
70609+}
70610+
70611+void
70612+gr_acl_handle_psacct(struct task_struct *task, const long code)
70613+{
70614+ return;
70615+}
70616+
70617+int
70618+gr_handle_ptrace(struct task_struct *task, const long request)
70619+{
70620+ return 0;
70621+}
70622+
70623+int
70624+gr_handle_proc_ptrace(struct task_struct *task)
70625+{
70626+ return 0;
70627+}
70628+
70629+int
70630+gr_set_acls(const int type)
70631+{
70632+ return 0;
70633+}
70634+
70635+int
70636+gr_check_hidden_task(const struct task_struct *tsk)
70637+{
70638+ return 0;
70639+}
70640+
70641+int
70642+gr_check_protected_task(const struct task_struct *task)
70643+{
70644+ return 0;
70645+}
70646+
70647+int
70648+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70649+{
70650+ return 0;
70651+}
70652+
70653+void
70654+gr_copy_label(struct task_struct *tsk)
70655+{
70656+ return;
70657+}
70658+
70659+void
70660+gr_set_pax_flags(struct task_struct *task)
70661+{
70662+ return;
70663+}
70664+
70665+int
70666+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
70667+ const int unsafe_share)
70668+{
70669+ return 0;
70670+}
70671+
70672+void
70673+gr_handle_delete(const ino_t ino, const dev_t dev)
70674+{
70675+ return;
70676+}
70677+
70678+void
70679+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
70680+{
70681+ return;
70682+}
70683+
70684+void
70685+gr_handle_crash(struct task_struct *task, const int sig)
70686+{
70687+ return;
70688+}
70689+
70690+int
70691+gr_check_crash_exec(const struct file *filp)
70692+{
70693+ return 0;
70694+}
70695+
70696+int
70697+gr_check_crash_uid(const kuid_t uid)
70698+{
70699+ return 0;
70700+}
70701+
70702+void
70703+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
70704+ struct dentry *old_dentry,
70705+ struct dentry *new_dentry,
70706+ struct vfsmount *mnt, const __u8 replace)
70707+{
70708+ return;
70709+}
70710+
70711+int
70712+gr_search_socket(const int family, const int type, const int protocol)
70713+{
70714+ return 1;
70715+}
70716+
70717+int
70718+gr_search_connectbind(const int mode, const struct socket *sock,
70719+ const struct sockaddr_in *addr)
70720+{
70721+ return 0;
70722+}
70723+
70724+void
70725+gr_handle_alertkill(struct task_struct *task)
70726+{
70727+ return;
70728+}
70729+
70730+__u32
70731+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
70732+{
70733+ return 1;
70734+}
70735+
70736+__u32
70737+gr_acl_handle_hidden_file(const struct dentry * dentry,
70738+ const struct vfsmount * mnt)
70739+{
70740+ return 1;
70741+}
70742+
70743+__u32
70744+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
70745+ int acc_mode)
70746+{
70747+ return 1;
70748+}
70749+
70750+__u32
70751+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
70752+{
70753+ return 1;
70754+}
70755+
70756+__u32
70757+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
70758+{
70759+ return 1;
70760+}
70761+
70762+int
70763+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
70764+ unsigned int *vm_flags)
70765+{
70766+ return 1;
70767+}
70768+
70769+__u32
70770+gr_acl_handle_truncate(const struct dentry * dentry,
70771+ const struct vfsmount * mnt)
70772+{
70773+ return 1;
70774+}
70775+
70776+__u32
70777+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
70778+{
70779+ return 1;
70780+}
70781+
70782+__u32
70783+gr_acl_handle_access(const struct dentry * dentry,
70784+ const struct vfsmount * mnt, const int fmode)
70785+{
70786+ return 1;
70787+}
70788+
70789+__u32
70790+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
70791+ umode_t *mode)
70792+{
70793+ return 1;
70794+}
70795+
70796+__u32
70797+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
70798+{
70799+ return 1;
70800+}
70801+
70802+__u32
70803+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
70804+{
70805+ return 1;
70806+}
70807+
70808+__u32
70809+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
70810+{
70811+ return 1;
70812+}
70813+
70814+void
70815+grsecurity_init(void)
70816+{
70817+ return;
70818+}
70819+
70820+umode_t gr_acl_umask(void)
70821+{
70822+ return 0;
70823+}
70824+
70825+__u32
70826+gr_acl_handle_mknod(const struct dentry * new_dentry,
70827+ const struct dentry * parent_dentry,
70828+ const struct vfsmount * parent_mnt,
70829+ const int mode)
70830+{
70831+ return 1;
70832+}
70833+
70834+__u32
70835+gr_acl_handle_mkdir(const struct dentry * new_dentry,
70836+ const struct dentry * parent_dentry,
70837+ const struct vfsmount * parent_mnt)
70838+{
70839+ return 1;
70840+}
70841+
70842+__u32
70843+gr_acl_handle_symlink(const struct dentry * new_dentry,
70844+ const struct dentry * parent_dentry,
70845+ const struct vfsmount * parent_mnt, const struct filename *from)
70846+{
70847+ return 1;
70848+}
70849+
70850+__u32
70851+gr_acl_handle_link(const struct dentry * new_dentry,
70852+ const struct dentry * parent_dentry,
70853+ const struct vfsmount * parent_mnt,
70854+ const struct dentry * old_dentry,
70855+ const struct vfsmount * old_mnt, const struct filename *to)
70856+{
70857+ return 1;
70858+}
70859+
70860+int
70861+gr_acl_handle_rename(const struct dentry *new_dentry,
70862+ const struct dentry *parent_dentry,
70863+ const struct vfsmount *parent_mnt,
70864+ const struct dentry *old_dentry,
70865+ const struct inode *old_parent_inode,
70866+ const struct vfsmount *old_mnt, const struct filename *newname)
70867+{
70868+ return 0;
70869+}
70870+
70871+int
70872+gr_acl_handle_filldir(const struct file *file, const char *name,
70873+ const int namelen, const ino_t ino)
70874+{
70875+ return 1;
70876+}
70877+
70878+int
70879+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70880+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
70881+{
70882+ return 1;
70883+}
70884+
70885+int
70886+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
70887+{
70888+ return 0;
70889+}
70890+
70891+int
70892+gr_search_accept(const struct socket *sock)
70893+{
70894+ return 0;
70895+}
70896+
70897+int
70898+gr_search_listen(const struct socket *sock)
70899+{
70900+ return 0;
70901+}
70902+
70903+int
70904+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
70905+{
70906+ return 0;
70907+}
70908+
70909+__u32
70910+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
70911+{
70912+ return 1;
70913+}
70914+
70915+__u32
70916+gr_acl_handle_creat(const struct dentry * dentry,
70917+ const struct dentry * p_dentry,
70918+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
70919+ const int imode)
70920+{
70921+ return 1;
70922+}
70923+
70924+void
70925+gr_acl_handle_exit(void)
70926+{
70927+ return;
70928+}
70929+
70930+int
70931+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
70932+{
70933+ return 1;
70934+}
70935+
70936+void
70937+gr_set_role_label(const kuid_t uid, const kgid_t gid)
70938+{
70939+ return;
70940+}
70941+
70942+int
70943+gr_acl_handle_procpidmem(const struct task_struct *task)
70944+{
70945+ return 0;
70946+}
70947+
70948+int
70949+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
70950+{
70951+ return 0;
70952+}
70953+
70954+int
70955+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
70956+{
70957+ return 0;
70958+}
70959+
70960+int
70961+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70962+{
70963+ return 0;
70964+}
70965+
70966+int
70967+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70968+{
70969+ return 0;
70970+}
70971+
70972+int gr_acl_enable_at_secure(void)
70973+{
70974+ return 0;
70975+}
70976+
70977+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
70978+{
70979+ return dentry->d_sb->s_dev;
70980+}
70981+
70982+void gr_put_exec_file(struct task_struct *task)
70983+{
70984+ return;
70985+}
70986+
70987+#ifdef CONFIG_SECURITY
70988+EXPORT_SYMBOL(gr_check_user_change);
70989+EXPORT_SYMBOL(gr_check_group_change);
70990+#endif
70991diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
70992new file mode 100644
70993index 0000000..387032b
70994--- /dev/null
70995+++ b/grsecurity/grsec_exec.c
70996@@ -0,0 +1,187 @@
70997+#include <linux/kernel.h>
70998+#include <linux/sched.h>
70999+#include <linux/file.h>
71000+#include <linux/binfmts.h>
71001+#include <linux/fs.h>
71002+#include <linux/types.h>
71003+#include <linux/grdefs.h>
71004+#include <linux/grsecurity.h>
71005+#include <linux/grinternal.h>
71006+#include <linux/capability.h>
71007+#include <linux/module.h>
71008+#include <linux/compat.h>
71009+
71010+#include <asm/uaccess.h>
71011+
71012+#ifdef CONFIG_GRKERNSEC_EXECLOG
71013+static char gr_exec_arg_buf[132];
71014+static DEFINE_MUTEX(gr_exec_arg_mutex);
71015+#endif
71016+
71017+struct user_arg_ptr {
71018+#ifdef CONFIG_COMPAT
71019+ bool is_compat;
71020+#endif
71021+ union {
71022+ const char __user *const __user *native;
71023+#ifdef CONFIG_COMPAT
71024+ const compat_uptr_t __user *compat;
71025+#endif
71026+ } ptr;
71027+};
71028+
71029+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
71030+
71031+void
71032+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
71033+{
71034+#ifdef CONFIG_GRKERNSEC_EXECLOG
71035+ char *grarg = gr_exec_arg_buf;
71036+ unsigned int i, x, execlen = 0;
71037+ char c;
71038+
71039+ if (!((grsec_enable_execlog && grsec_enable_group &&
71040+ in_group_p(grsec_audit_gid))
71041+ || (grsec_enable_execlog && !grsec_enable_group)))
71042+ return;
71043+
71044+ mutex_lock(&gr_exec_arg_mutex);
71045+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
71046+
71047+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
71048+ const char __user *p;
71049+ unsigned int len;
71050+
71051+ p = get_user_arg_ptr(argv, i);
71052+ if (IS_ERR(p))
71053+ goto log;
71054+
71055+ len = strnlen_user(p, 128 - execlen);
71056+ if (len > 128 - execlen)
71057+ len = 128 - execlen;
71058+ else if (len > 0)
71059+ len--;
71060+ if (copy_from_user(grarg + execlen, p, len))
71061+ goto log;
71062+
71063+ /* rewrite unprintable characters */
71064+ for (x = 0; x < len; x++) {
71065+ c = *(grarg + execlen + x);
71066+ if (c < 32 || c > 126)
71067+ *(grarg + execlen + x) = ' ';
71068+ }
71069+
71070+ execlen += len;
71071+ *(grarg + execlen) = ' ';
71072+ *(grarg + execlen + 1) = '\0';
71073+ execlen++;
71074+ }
71075+
71076+ log:
71077+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
71078+ bprm->file->f_path.mnt, grarg);
71079+ mutex_unlock(&gr_exec_arg_mutex);
71080+#endif
71081+ return;
71082+}
71083+
71084+#ifdef CONFIG_GRKERNSEC
71085+extern int gr_acl_is_capable(const int cap);
71086+extern int gr_acl_is_capable_nolog(const int cap);
71087+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
71088+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
71089+extern int gr_chroot_is_capable(const int cap);
71090+extern int gr_chroot_is_capable_nolog(const int cap);
71091+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
71092+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
71093+#endif
71094+
71095+const char *captab_log[] = {
71096+ "CAP_CHOWN",
71097+ "CAP_DAC_OVERRIDE",
71098+ "CAP_DAC_READ_SEARCH",
71099+ "CAP_FOWNER",
71100+ "CAP_FSETID",
71101+ "CAP_KILL",
71102+ "CAP_SETGID",
71103+ "CAP_SETUID",
71104+ "CAP_SETPCAP",
71105+ "CAP_LINUX_IMMUTABLE",
71106+ "CAP_NET_BIND_SERVICE",
71107+ "CAP_NET_BROADCAST",
71108+ "CAP_NET_ADMIN",
71109+ "CAP_NET_RAW",
71110+ "CAP_IPC_LOCK",
71111+ "CAP_IPC_OWNER",
71112+ "CAP_SYS_MODULE",
71113+ "CAP_SYS_RAWIO",
71114+ "CAP_SYS_CHROOT",
71115+ "CAP_SYS_PTRACE",
71116+ "CAP_SYS_PACCT",
71117+ "CAP_SYS_ADMIN",
71118+ "CAP_SYS_BOOT",
71119+ "CAP_SYS_NICE",
71120+ "CAP_SYS_RESOURCE",
71121+ "CAP_SYS_TIME",
71122+ "CAP_SYS_TTY_CONFIG",
71123+ "CAP_MKNOD",
71124+ "CAP_LEASE",
71125+ "CAP_AUDIT_WRITE",
71126+ "CAP_AUDIT_CONTROL",
71127+ "CAP_SETFCAP",
71128+ "CAP_MAC_OVERRIDE",
71129+ "CAP_MAC_ADMIN",
71130+ "CAP_SYSLOG",
71131+ "CAP_WAKE_ALARM"
71132+};
71133+
71134+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
71135+
71136+int gr_is_capable(const int cap)
71137+{
71138+#ifdef CONFIG_GRKERNSEC
71139+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
71140+ return 1;
71141+ return 0;
71142+#else
71143+ return 1;
71144+#endif
71145+}
71146+
71147+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
71148+{
71149+#ifdef CONFIG_GRKERNSEC
71150+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
71151+ return 1;
71152+ return 0;
71153+#else
71154+ return 1;
71155+#endif
71156+}
71157+
71158+int gr_is_capable_nolog(const int cap)
71159+{
71160+#ifdef CONFIG_GRKERNSEC
71161+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
71162+ return 1;
71163+ return 0;
71164+#else
71165+ return 1;
71166+#endif
71167+}
71168+
71169+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
71170+{
71171+#ifdef CONFIG_GRKERNSEC
71172+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
71173+ return 1;
71174+ return 0;
71175+#else
71176+ return 1;
71177+#endif
71178+}
71179+
71180+EXPORT_SYMBOL(gr_is_capable);
71181+EXPORT_SYMBOL(gr_is_capable_nolog);
71182+EXPORT_SYMBOL(gr_task_is_capable);
71183+EXPORT_SYMBOL(gr_task_is_capable_nolog);
71184diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
71185new file mode 100644
71186index 0000000..06cc6ea
71187--- /dev/null
71188+++ b/grsecurity/grsec_fifo.c
71189@@ -0,0 +1,24 @@
71190+#include <linux/kernel.h>
71191+#include <linux/sched.h>
71192+#include <linux/fs.h>
71193+#include <linux/file.h>
71194+#include <linux/grinternal.h>
71195+
71196+int
71197+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
71198+ const struct dentry *dir, const int flag, const int acc_mode)
71199+{
71200+#ifdef CONFIG_GRKERNSEC_FIFO
71201+ const struct cred *cred = current_cred();
71202+
71203+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
71204+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
71205+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
71206+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
71207+ if (!inode_permission(dentry->d_inode, acc_mode))
71208+ 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));
71209+ return -EACCES;
71210+ }
71211+#endif
71212+ return 0;
71213+}
71214diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
71215new file mode 100644
71216index 0000000..8ca18bf
71217--- /dev/null
71218+++ b/grsecurity/grsec_fork.c
71219@@ -0,0 +1,23 @@
71220+#include <linux/kernel.h>
71221+#include <linux/sched.h>
71222+#include <linux/grsecurity.h>
71223+#include <linux/grinternal.h>
71224+#include <linux/errno.h>
71225+
71226+void
71227+gr_log_forkfail(const int retval)
71228+{
71229+#ifdef CONFIG_GRKERNSEC_FORKFAIL
71230+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
71231+ switch (retval) {
71232+ case -EAGAIN:
71233+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
71234+ break;
71235+ case -ENOMEM:
71236+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
71237+ break;
71238+ }
71239+ }
71240+#endif
71241+ return;
71242+}
71243diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
71244new file mode 100644
71245index 0000000..a88e901
71246--- /dev/null
71247+++ b/grsecurity/grsec_init.c
71248@@ -0,0 +1,272 @@
71249+#include <linux/kernel.h>
71250+#include <linux/sched.h>
71251+#include <linux/mm.h>
71252+#include <linux/gracl.h>
71253+#include <linux/slab.h>
71254+#include <linux/vmalloc.h>
71255+#include <linux/percpu.h>
71256+#include <linux/module.h>
71257+
71258+int grsec_enable_ptrace_readexec;
71259+int grsec_enable_setxid;
71260+int grsec_enable_symlinkown;
71261+kgid_t grsec_symlinkown_gid;
71262+int grsec_enable_brute;
71263+int grsec_enable_link;
71264+int grsec_enable_dmesg;
71265+int grsec_enable_harden_ptrace;
71266+int grsec_enable_harden_ipc;
71267+int grsec_enable_fifo;
71268+int grsec_enable_execlog;
71269+int grsec_enable_signal;
71270+int grsec_enable_forkfail;
71271+int grsec_enable_audit_ptrace;
71272+int grsec_enable_time;
71273+int grsec_enable_group;
71274+kgid_t grsec_audit_gid;
71275+int grsec_enable_chdir;
71276+int grsec_enable_mount;
71277+int grsec_enable_rofs;
71278+int grsec_deny_new_usb;
71279+int grsec_enable_chroot_findtask;
71280+int grsec_enable_chroot_mount;
71281+int grsec_enable_chroot_shmat;
71282+int grsec_enable_chroot_fchdir;
71283+int grsec_enable_chroot_double;
71284+int grsec_enable_chroot_pivot;
71285+int grsec_enable_chroot_chdir;
71286+int grsec_enable_chroot_chmod;
71287+int grsec_enable_chroot_mknod;
71288+int grsec_enable_chroot_nice;
71289+int grsec_enable_chroot_execlog;
71290+int grsec_enable_chroot_caps;
71291+int grsec_enable_chroot_sysctl;
71292+int grsec_enable_chroot_unix;
71293+int grsec_enable_tpe;
71294+kgid_t grsec_tpe_gid;
71295+int grsec_enable_blackhole;
71296+#ifdef CONFIG_IPV6_MODULE
71297+EXPORT_SYMBOL(grsec_enable_blackhole);
71298+#endif
71299+int grsec_lastack_retries;
71300+int grsec_enable_tpe_all;
71301+int grsec_enable_tpe_invert;
71302+int grsec_enable_socket_all;
71303+kgid_t grsec_socket_all_gid;
71304+int grsec_enable_socket_client;
71305+kgid_t grsec_socket_client_gid;
71306+int grsec_enable_socket_server;
71307+kgid_t grsec_socket_server_gid;
71308+int grsec_resource_logging;
71309+int grsec_disable_privio;
71310+int grsec_enable_log_rwxmaps;
71311+int grsec_lock;
71312+
71313+DEFINE_SPINLOCK(grsec_alert_lock);
71314+unsigned long grsec_alert_wtime = 0;
71315+unsigned long grsec_alert_fyet = 0;
71316+
71317+DEFINE_SPINLOCK(grsec_audit_lock);
71318+
71319+DEFINE_RWLOCK(grsec_exec_file_lock);
71320+
71321+char *gr_shared_page[4];
71322+
71323+char *gr_alert_log_fmt;
71324+char *gr_audit_log_fmt;
71325+char *gr_alert_log_buf;
71326+char *gr_audit_log_buf;
71327+
71328+void __init
71329+grsecurity_init(void)
71330+{
71331+ int j;
71332+ /* create the per-cpu shared pages */
71333+
71334+#ifdef CONFIG_X86
71335+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
71336+#endif
71337+
71338+ for (j = 0; j < 4; j++) {
71339+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
71340+ if (gr_shared_page[j] == NULL) {
71341+ panic("Unable to allocate grsecurity shared page");
71342+ return;
71343+ }
71344+ }
71345+
71346+ /* allocate log buffers */
71347+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
71348+ if (!gr_alert_log_fmt) {
71349+ panic("Unable to allocate grsecurity alert log format buffer");
71350+ return;
71351+ }
71352+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
71353+ if (!gr_audit_log_fmt) {
71354+ panic("Unable to allocate grsecurity audit log format buffer");
71355+ return;
71356+ }
71357+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
71358+ if (!gr_alert_log_buf) {
71359+ panic("Unable to allocate grsecurity alert log buffer");
71360+ return;
71361+ }
71362+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
71363+ if (!gr_audit_log_buf) {
71364+ panic("Unable to allocate grsecurity audit log buffer");
71365+ return;
71366+ }
71367+
71368+#ifdef CONFIG_GRKERNSEC_IO
71369+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
71370+ grsec_disable_privio = 1;
71371+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
71372+ grsec_disable_privio = 1;
71373+#else
71374+ grsec_disable_privio = 0;
71375+#endif
71376+#endif
71377+
71378+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
71379+ /* for backward compatibility, tpe_invert always defaults to on if
71380+ enabled in the kernel
71381+ */
71382+ grsec_enable_tpe_invert = 1;
71383+#endif
71384+
71385+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
71386+#ifndef CONFIG_GRKERNSEC_SYSCTL
71387+ grsec_lock = 1;
71388+#endif
71389+
71390+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
71391+ grsec_enable_log_rwxmaps = 1;
71392+#endif
71393+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
71394+ grsec_enable_group = 1;
71395+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
71396+#endif
71397+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
71398+ grsec_enable_ptrace_readexec = 1;
71399+#endif
71400+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
71401+ grsec_enable_chdir = 1;
71402+#endif
71403+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71404+ grsec_enable_harden_ptrace = 1;
71405+#endif
71406+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
71407+ grsec_enable_harden_ipc = 1;
71408+#endif
71409+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
71410+ grsec_enable_mount = 1;
71411+#endif
71412+#ifdef CONFIG_GRKERNSEC_LINK
71413+ grsec_enable_link = 1;
71414+#endif
71415+#ifdef CONFIG_GRKERNSEC_BRUTE
71416+ grsec_enable_brute = 1;
71417+#endif
71418+#ifdef CONFIG_GRKERNSEC_DMESG
71419+ grsec_enable_dmesg = 1;
71420+#endif
71421+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
71422+ grsec_enable_blackhole = 1;
71423+ grsec_lastack_retries = 4;
71424+#endif
71425+#ifdef CONFIG_GRKERNSEC_FIFO
71426+ grsec_enable_fifo = 1;
71427+#endif
71428+#ifdef CONFIG_GRKERNSEC_EXECLOG
71429+ grsec_enable_execlog = 1;
71430+#endif
71431+#ifdef CONFIG_GRKERNSEC_SETXID
71432+ grsec_enable_setxid = 1;
71433+#endif
71434+#ifdef CONFIG_GRKERNSEC_SIGNAL
71435+ grsec_enable_signal = 1;
71436+#endif
71437+#ifdef CONFIG_GRKERNSEC_FORKFAIL
71438+ grsec_enable_forkfail = 1;
71439+#endif
71440+#ifdef CONFIG_GRKERNSEC_TIME
71441+ grsec_enable_time = 1;
71442+#endif
71443+#ifdef CONFIG_GRKERNSEC_RESLOG
71444+ grsec_resource_logging = 1;
71445+#endif
71446+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
71447+ grsec_enable_chroot_findtask = 1;
71448+#endif
71449+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
71450+ grsec_enable_chroot_unix = 1;
71451+#endif
71452+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
71453+ grsec_enable_chroot_mount = 1;
71454+#endif
71455+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
71456+ grsec_enable_chroot_fchdir = 1;
71457+#endif
71458+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
71459+ grsec_enable_chroot_shmat = 1;
71460+#endif
71461+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
71462+ grsec_enable_audit_ptrace = 1;
71463+#endif
71464+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
71465+ grsec_enable_chroot_double = 1;
71466+#endif
71467+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
71468+ grsec_enable_chroot_pivot = 1;
71469+#endif
71470+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
71471+ grsec_enable_chroot_chdir = 1;
71472+#endif
71473+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
71474+ grsec_enable_chroot_chmod = 1;
71475+#endif
71476+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
71477+ grsec_enable_chroot_mknod = 1;
71478+#endif
71479+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
71480+ grsec_enable_chroot_nice = 1;
71481+#endif
71482+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
71483+ grsec_enable_chroot_execlog = 1;
71484+#endif
71485+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
71486+ grsec_enable_chroot_caps = 1;
71487+#endif
71488+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
71489+ grsec_enable_chroot_sysctl = 1;
71490+#endif
71491+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
71492+ grsec_enable_symlinkown = 1;
71493+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
71494+#endif
71495+#ifdef CONFIG_GRKERNSEC_TPE
71496+ grsec_enable_tpe = 1;
71497+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
71498+#ifdef CONFIG_GRKERNSEC_TPE_ALL
71499+ grsec_enable_tpe_all = 1;
71500+#endif
71501+#endif
71502+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
71503+ grsec_enable_socket_all = 1;
71504+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
71505+#endif
71506+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
71507+ grsec_enable_socket_client = 1;
71508+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
71509+#endif
71510+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
71511+ grsec_enable_socket_server = 1;
71512+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
71513+#endif
71514+#endif
71515+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
71516+ grsec_deny_new_usb = 1;
71517+#endif
71518+
71519+ return;
71520+}
71521diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
71522new file mode 100644
71523index 0000000..78d1680
71524--- /dev/null
71525+++ b/grsecurity/grsec_ipc.c
71526@@ -0,0 +1,48 @@
71527+#include <linux/kernel.h>
71528+#include <linux/mm.h>
71529+#include <linux/sched.h>
71530+#include <linux/file.h>
71531+#include <linux/ipc.h>
71532+#include <linux/ipc_namespace.h>
71533+#include <linux/grsecurity.h>
71534+#include <linux/grinternal.h>
71535+
71536+int
71537+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
71538+{
71539+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
71540+ int write;
71541+ int orig_granted_mode;
71542+ kuid_t euid;
71543+ kgid_t egid;
71544+
71545+ if (!grsec_enable_harden_ipc)
71546+ return 0;
71547+
71548+ euid = current_euid();
71549+ egid = current_egid();
71550+
71551+ write = requested_mode & 00002;
71552+ orig_granted_mode = ipcp->mode;
71553+
71554+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
71555+ orig_granted_mode >>= 6;
71556+ else {
71557+ /* if likely wrong permissions, lock to user */
71558+ if (orig_granted_mode & 0007)
71559+ orig_granted_mode = 0;
71560+ /* otherwise do a egid-only check */
71561+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
71562+ orig_granted_mode >>= 3;
71563+ /* otherwise, no access */
71564+ else
71565+ orig_granted_mode = 0;
71566+ }
71567+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
71568+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
71569+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
71570+ return 0;
71571+ }
71572+#endif
71573+ return 1;
71574+}
71575diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
71576new file mode 100644
71577index 0000000..5e05e20
71578--- /dev/null
71579+++ b/grsecurity/grsec_link.c
71580@@ -0,0 +1,58 @@
71581+#include <linux/kernel.h>
71582+#include <linux/sched.h>
71583+#include <linux/fs.h>
71584+#include <linux/file.h>
71585+#include <linux/grinternal.h>
71586+
71587+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
71588+{
71589+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
71590+ const struct inode *link_inode = link->dentry->d_inode;
71591+
71592+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
71593+ /* ignore root-owned links, e.g. /proc/self */
71594+ gr_is_global_nonroot(link_inode->i_uid) && target &&
71595+ !uid_eq(link_inode->i_uid, target->i_uid)) {
71596+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
71597+ return 1;
71598+ }
71599+#endif
71600+ return 0;
71601+}
71602+
71603+int
71604+gr_handle_follow_link(const struct inode *parent,
71605+ const struct inode *inode,
71606+ const struct dentry *dentry, const struct vfsmount *mnt)
71607+{
71608+#ifdef CONFIG_GRKERNSEC_LINK
71609+ const struct cred *cred = current_cred();
71610+
71611+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
71612+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
71613+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
71614+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
71615+ return -EACCES;
71616+ }
71617+#endif
71618+ return 0;
71619+}
71620+
71621+int
71622+gr_handle_hardlink(const struct dentry *dentry,
71623+ const struct vfsmount *mnt,
71624+ struct inode *inode, const int mode, const struct filename *to)
71625+{
71626+#ifdef CONFIG_GRKERNSEC_LINK
71627+ const struct cred *cred = current_cred();
71628+
71629+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
71630+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
71631+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
71632+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
71633+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
71634+ return -EPERM;
71635+ }
71636+#endif
71637+ return 0;
71638+}
71639diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
71640new file mode 100644
71641index 0000000..dbe0a6b
71642--- /dev/null
71643+++ b/grsecurity/grsec_log.c
71644@@ -0,0 +1,341 @@
71645+#include <linux/kernel.h>
71646+#include <linux/sched.h>
71647+#include <linux/file.h>
71648+#include <linux/tty.h>
71649+#include <linux/fs.h>
71650+#include <linux/mm.h>
71651+#include <linux/grinternal.h>
71652+
71653+#ifdef CONFIG_TREE_PREEMPT_RCU
71654+#define DISABLE_PREEMPT() preempt_disable()
71655+#define ENABLE_PREEMPT() preempt_enable()
71656+#else
71657+#define DISABLE_PREEMPT()
71658+#define ENABLE_PREEMPT()
71659+#endif
71660+
71661+#define BEGIN_LOCKS(x) \
71662+ DISABLE_PREEMPT(); \
71663+ rcu_read_lock(); \
71664+ read_lock(&tasklist_lock); \
71665+ read_lock(&grsec_exec_file_lock); \
71666+ if (x != GR_DO_AUDIT) \
71667+ spin_lock(&grsec_alert_lock); \
71668+ else \
71669+ spin_lock(&grsec_audit_lock)
71670+
71671+#define END_LOCKS(x) \
71672+ if (x != GR_DO_AUDIT) \
71673+ spin_unlock(&grsec_alert_lock); \
71674+ else \
71675+ spin_unlock(&grsec_audit_lock); \
71676+ read_unlock(&grsec_exec_file_lock); \
71677+ read_unlock(&tasklist_lock); \
71678+ rcu_read_unlock(); \
71679+ ENABLE_PREEMPT(); \
71680+ if (x == GR_DONT_AUDIT) \
71681+ gr_handle_alertkill(current)
71682+
71683+enum {
71684+ FLOODING,
71685+ NO_FLOODING
71686+};
71687+
71688+extern char *gr_alert_log_fmt;
71689+extern char *gr_audit_log_fmt;
71690+extern char *gr_alert_log_buf;
71691+extern char *gr_audit_log_buf;
71692+
71693+static int gr_log_start(int audit)
71694+{
71695+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
71696+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
71697+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71698+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
71699+ unsigned long curr_secs = get_seconds();
71700+
71701+ if (audit == GR_DO_AUDIT)
71702+ goto set_fmt;
71703+
71704+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
71705+ grsec_alert_wtime = curr_secs;
71706+ grsec_alert_fyet = 0;
71707+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
71708+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
71709+ grsec_alert_fyet++;
71710+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
71711+ grsec_alert_wtime = curr_secs;
71712+ grsec_alert_fyet++;
71713+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
71714+ return FLOODING;
71715+ }
71716+ else return FLOODING;
71717+
71718+set_fmt:
71719+#endif
71720+ memset(buf, 0, PAGE_SIZE);
71721+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
71722+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
71723+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
71724+ } else if (current->signal->curr_ip) {
71725+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
71726+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
71727+ } else if (gr_acl_is_enabled()) {
71728+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
71729+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
71730+ } else {
71731+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
71732+ strcpy(buf, fmt);
71733+ }
71734+
71735+ return NO_FLOODING;
71736+}
71737+
71738+static void gr_log_middle(int audit, const char *msg, va_list ap)
71739+ __attribute__ ((format (printf, 2, 0)));
71740+
71741+static void gr_log_middle(int audit, const char *msg, va_list ap)
71742+{
71743+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71744+ unsigned int len = strlen(buf);
71745+
71746+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
71747+
71748+ return;
71749+}
71750+
71751+static void gr_log_middle_varargs(int audit, const char *msg, ...)
71752+ __attribute__ ((format (printf, 2, 3)));
71753+
71754+static void gr_log_middle_varargs(int audit, const char *msg, ...)
71755+{
71756+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71757+ unsigned int len = strlen(buf);
71758+ va_list ap;
71759+
71760+ va_start(ap, msg);
71761+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
71762+ va_end(ap);
71763+
71764+ return;
71765+}
71766+
71767+static void gr_log_end(int audit, int append_default)
71768+{
71769+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
71770+ if (append_default) {
71771+ struct task_struct *task = current;
71772+ struct task_struct *parent = task->real_parent;
71773+ const struct cred *cred = __task_cred(task);
71774+ const struct cred *pcred = __task_cred(parent);
71775+ unsigned int len = strlen(buf);
71776+
71777+ 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));
71778+ }
71779+
71780+ printk("%s\n", buf);
71781+
71782+ return;
71783+}
71784+
71785+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
71786+{
71787+ int logtype;
71788+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
71789+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
71790+ void *voidptr = NULL;
71791+ int num1 = 0, num2 = 0;
71792+ unsigned long ulong1 = 0, ulong2 = 0;
71793+ struct dentry *dentry = NULL;
71794+ struct vfsmount *mnt = NULL;
71795+ struct file *file = NULL;
71796+ struct task_struct *task = NULL;
71797+ struct vm_area_struct *vma = NULL;
71798+ const struct cred *cred, *pcred;
71799+ va_list ap;
71800+
71801+ BEGIN_LOCKS(audit);
71802+ logtype = gr_log_start(audit);
71803+ if (logtype == FLOODING) {
71804+ END_LOCKS(audit);
71805+ return;
71806+ }
71807+ va_start(ap, argtypes);
71808+ switch (argtypes) {
71809+ case GR_TTYSNIFF:
71810+ task = va_arg(ap, struct task_struct *);
71811+ 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));
71812+ break;
71813+ case GR_SYSCTL_HIDDEN:
71814+ str1 = va_arg(ap, char *);
71815+ gr_log_middle_varargs(audit, msg, result, str1);
71816+ break;
71817+ case GR_RBAC:
71818+ dentry = va_arg(ap, struct dentry *);
71819+ mnt = va_arg(ap, struct vfsmount *);
71820+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
71821+ break;
71822+ case GR_RBAC_STR:
71823+ dentry = va_arg(ap, struct dentry *);
71824+ mnt = va_arg(ap, struct vfsmount *);
71825+ str1 = va_arg(ap, char *);
71826+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
71827+ break;
71828+ case GR_STR_RBAC:
71829+ str1 = va_arg(ap, char *);
71830+ dentry = va_arg(ap, struct dentry *);
71831+ mnt = va_arg(ap, struct vfsmount *);
71832+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
71833+ break;
71834+ case GR_RBAC_MODE2:
71835+ dentry = va_arg(ap, struct dentry *);
71836+ mnt = va_arg(ap, struct vfsmount *);
71837+ str1 = va_arg(ap, char *);
71838+ str2 = va_arg(ap, char *);
71839+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
71840+ break;
71841+ case GR_RBAC_MODE3:
71842+ dentry = va_arg(ap, struct dentry *);
71843+ mnt = va_arg(ap, struct vfsmount *);
71844+ str1 = va_arg(ap, char *);
71845+ str2 = va_arg(ap, char *);
71846+ str3 = va_arg(ap, char *);
71847+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
71848+ break;
71849+ case GR_FILENAME:
71850+ dentry = va_arg(ap, struct dentry *);
71851+ mnt = va_arg(ap, struct vfsmount *);
71852+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
71853+ break;
71854+ case GR_STR_FILENAME:
71855+ str1 = va_arg(ap, char *);
71856+ dentry = va_arg(ap, struct dentry *);
71857+ mnt = va_arg(ap, struct vfsmount *);
71858+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
71859+ break;
71860+ case GR_FILENAME_STR:
71861+ dentry = va_arg(ap, struct dentry *);
71862+ mnt = va_arg(ap, struct vfsmount *);
71863+ str1 = va_arg(ap, char *);
71864+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
71865+ break;
71866+ case GR_FILENAME_TWO_INT:
71867+ dentry = va_arg(ap, struct dentry *);
71868+ mnt = va_arg(ap, struct vfsmount *);
71869+ num1 = va_arg(ap, int);
71870+ num2 = va_arg(ap, int);
71871+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
71872+ break;
71873+ case GR_FILENAME_TWO_INT_STR:
71874+ dentry = va_arg(ap, struct dentry *);
71875+ mnt = va_arg(ap, struct vfsmount *);
71876+ num1 = va_arg(ap, int);
71877+ num2 = va_arg(ap, int);
71878+ str1 = va_arg(ap, char *);
71879+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
71880+ break;
71881+ case GR_TEXTREL:
71882+ file = va_arg(ap, struct file *);
71883+ ulong1 = va_arg(ap, unsigned long);
71884+ ulong2 = va_arg(ap, unsigned long);
71885+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
71886+ break;
71887+ case GR_PTRACE:
71888+ task = va_arg(ap, struct task_struct *);
71889+ 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));
71890+ break;
71891+ case GR_RESOURCE:
71892+ task = va_arg(ap, struct task_struct *);
71893+ cred = __task_cred(task);
71894+ pcred = __task_cred(task->real_parent);
71895+ ulong1 = va_arg(ap, unsigned long);
71896+ str1 = va_arg(ap, char *);
71897+ ulong2 = va_arg(ap, unsigned long);
71898+ 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));
71899+ break;
71900+ case GR_CAP:
71901+ task = va_arg(ap, struct task_struct *);
71902+ cred = __task_cred(task);
71903+ pcred = __task_cred(task->real_parent);
71904+ str1 = va_arg(ap, char *);
71905+ 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));
71906+ break;
71907+ case GR_SIG:
71908+ str1 = va_arg(ap, char *);
71909+ voidptr = va_arg(ap, void *);
71910+ gr_log_middle_varargs(audit, msg, str1, voidptr);
71911+ break;
71912+ case GR_SIG2:
71913+ task = va_arg(ap, struct task_struct *);
71914+ cred = __task_cred(task);
71915+ pcred = __task_cred(task->real_parent);
71916+ num1 = va_arg(ap, int);
71917+ 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));
71918+ break;
71919+ case GR_CRASH1:
71920+ task = va_arg(ap, struct task_struct *);
71921+ cred = __task_cred(task);
71922+ pcred = __task_cred(task->real_parent);
71923+ ulong1 = va_arg(ap, unsigned long);
71924+ 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);
71925+ break;
71926+ case GR_CRASH2:
71927+ task = va_arg(ap, struct task_struct *);
71928+ cred = __task_cred(task);
71929+ pcred = __task_cred(task->real_parent);
71930+ ulong1 = va_arg(ap, unsigned long);
71931+ 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);
71932+ break;
71933+ case GR_RWXMAP:
71934+ file = va_arg(ap, struct file *);
71935+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
71936+ break;
71937+ case GR_RWXMAPVMA:
71938+ vma = va_arg(ap, struct vm_area_struct *);
71939+ if (vma->vm_file)
71940+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
71941+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
71942+ str1 = "<stack>";
71943+ else if (vma->vm_start <= current->mm->brk &&
71944+ vma->vm_end >= current->mm->start_brk)
71945+ str1 = "<heap>";
71946+ else
71947+ str1 = "<anonymous mapping>";
71948+ gr_log_middle_varargs(audit, msg, str1);
71949+ break;
71950+ case GR_PSACCT:
71951+ {
71952+ unsigned int wday, cday;
71953+ __u8 whr, chr;
71954+ __u8 wmin, cmin;
71955+ __u8 wsec, csec;
71956+ char cur_tty[64] = { 0 };
71957+ char parent_tty[64] = { 0 };
71958+
71959+ task = va_arg(ap, struct task_struct *);
71960+ wday = va_arg(ap, unsigned int);
71961+ cday = va_arg(ap, unsigned int);
71962+ whr = va_arg(ap, int);
71963+ chr = va_arg(ap, int);
71964+ wmin = va_arg(ap, int);
71965+ cmin = va_arg(ap, int);
71966+ wsec = va_arg(ap, int);
71967+ csec = va_arg(ap, int);
71968+ ulong1 = va_arg(ap, unsigned long);
71969+ cred = __task_cred(task);
71970+ pcred = __task_cred(task->real_parent);
71971+
71972+ 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));
71973+ }
71974+ break;
71975+ default:
71976+ gr_log_middle(audit, msg, ap);
71977+ }
71978+ va_end(ap);
71979+ // these don't need DEFAULTSECARGS printed on the end
71980+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
71981+ gr_log_end(audit, 0);
71982+ else
71983+ gr_log_end(audit, 1);
71984+ END_LOCKS(audit);
71985+}
71986diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
71987new file mode 100644
71988index 0000000..f536303
71989--- /dev/null
71990+++ b/grsecurity/grsec_mem.c
71991@@ -0,0 +1,40 @@
71992+#include <linux/kernel.h>
71993+#include <linux/sched.h>
71994+#include <linux/mm.h>
71995+#include <linux/mman.h>
71996+#include <linux/grinternal.h>
71997+
71998+void
71999+gr_handle_ioperm(void)
72000+{
72001+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
72002+ return;
72003+}
72004+
72005+void
72006+gr_handle_iopl(void)
72007+{
72008+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
72009+ return;
72010+}
72011+
72012+void
72013+gr_handle_mem_readwrite(u64 from, u64 to)
72014+{
72015+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
72016+ return;
72017+}
72018+
72019+void
72020+gr_handle_vm86(void)
72021+{
72022+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
72023+ return;
72024+}
72025+
72026+void
72027+gr_log_badprocpid(const char *entry)
72028+{
72029+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
72030+ return;
72031+}
72032diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
72033new file mode 100644
72034index 0000000..cd9e124
72035--- /dev/null
72036+++ b/grsecurity/grsec_mount.c
72037@@ -0,0 +1,65 @@
72038+#include <linux/kernel.h>
72039+#include <linux/sched.h>
72040+#include <linux/mount.h>
72041+#include <linux/major.h>
72042+#include <linux/grsecurity.h>
72043+#include <linux/grinternal.h>
72044+
72045+void
72046+gr_log_remount(const char *devname, const int retval)
72047+{
72048+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72049+ if (grsec_enable_mount && (retval >= 0))
72050+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
72051+#endif
72052+ return;
72053+}
72054+
72055+void
72056+gr_log_unmount(const char *devname, const int retval)
72057+{
72058+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72059+ if (grsec_enable_mount && (retval >= 0))
72060+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
72061+#endif
72062+ return;
72063+}
72064+
72065+void
72066+gr_log_mount(const char *from, const char *to, const int retval)
72067+{
72068+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
72069+ if (grsec_enable_mount && (retval >= 0))
72070+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
72071+#endif
72072+ return;
72073+}
72074+
72075+int
72076+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
72077+{
72078+#ifdef CONFIG_GRKERNSEC_ROFS
72079+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
72080+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
72081+ return -EPERM;
72082+ } else
72083+ return 0;
72084+#endif
72085+ return 0;
72086+}
72087+
72088+int
72089+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
72090+{
72091+#ifdef CONFIG_GRKERNSEC_ROFS
72092+ struct inode *inode = dentry->d_inode;
72093+
72094+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
72095+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
72096+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
72097+ return -EPERM;
72098+ } else
72099+ return 0;
72100+#endif
72101+ return 0;
72102+}
72103diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
72104new file mode 100644
72105index 0000000..6ee9d50
72106--- /dev/null
72107+++ b/grsecurity/grsec_pax.c
72108@@ -0,0 +1,45 @@
72109+#include <linux/kernel.h>
72110+#include <linux/sched.h>
72111+#include <linux/mm.h>
72112+#include <linux/file.h>
72113+#include <linux/grinternal.h>
72114+#include <linux/grsecurity.h>
72115+
72116+void
72117+gr_log_textrel(struct vm_area_struct * vma)
72118+{
72119+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72120+ if (grsec_enable_log_rwxmaps)
72121+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
72122+#endif
72123+ return;
72124+}
72125+
72126+void gr_log_ptgnustack(struct file *file)
72127+{
72128+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72129+ if (grsec_enable_log_rwxmaps)
72130+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
72131+#endif
72132+ return;
72133+}
72134+
72135+void
72136+gr_log_rwxmmap(struct file *file)
72137+{
72138+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72139+ if (grsec_enable_log_rwxmaps)
72140+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
72141+#endif
72142+ return;
72143+}
72144+
72145+void
72146+gr_log_rwxmprotect(struct vm_area_struct *vma)
72147+{
72148+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72149+ if (grsec_enable_log_rwxmaps)
72150+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
72151+#endif
72152+ return;
72153+}
72154diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
72155new file mode 100644
72156index 0000000..f7f29aa
72157--- /dev/null
72158+++ b/grsecurity/grsec_ptrace.c
72159@@ -0,0 +1,30 @@
72160+#include <linux/kernel.h>
72161+#include <linux/sched.h>
72162+#include <linux/grinternal.h>
72163+#include <linux/security.h>
72164+
72165+void
72166+gr_audit_ptrace(struct task_struct *task)
72167+{
72168+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
72169+ if (grsec_enable_audit_ptrace)
72170+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
72171+#endif
72172+ return;
72173+}
72174+
72175+int
72176+gr_ptrace_readexec(struct file *file, int unsafe_flags)
72177+{
72178+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
72179+ const struct dentry *dentry = file->f_path.dentry;
72180+ const struct vfsmount *mnt = file->f_path.mnt;
72181+
72182+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
72183+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
72184+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
72185+ return -EACCES;
72186+ }
72187+#endif
72188+ return 0;
72189+}
72190diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
72191new file mode 100644
72192index 0000000..3860c7e
72193--- /dev/null
72194+++ b/grsecurity/grsec_sig.c
72195@@ -0,0 +1,236 @@
72196+#include <linux/kernel.h>
72197+#include <linux/sched.h>
72198+#include <linux/fs.h>
72199+#include <linux/delay.h>
72200+#include <linux/grsecurity.h>
72201+#include <linux/grinternal.h>
72202+#include <linux/hardirq.h>
72203+
72204+char *signames[] = {
72205+ [SIGSEGV] = "Segmentation fault",
72206+ [SIGILL] = "Illegal instruction",
72207+ [SIGABRT] = "Abort",
72208+ [SIGBUS] = "Invalid alignment/Bus error"
72209+};
72210+
72211+void
72212+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
72213+{
72214+#ifdef CONFIG_GRKERNSEC_SIGNAL
72215+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
72216+ (sig == SIGABRT) || (sig == SIGBUS))) {
72217+ if (task_pid_nr(t) == task_pid_nr(current)) {
72218+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
72219+ } else {
72220+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
72221+ }
72222+ }
72223+#endif
72224+ return;
72225+}
72226+
72227+int
72228+gr_handle_signal(const struct task_struct *p, const int sig)
72229+{
72230+#ifdef CONFIG_GRKERNSEC
72231+ /* ignore the 0 signal for protected task checks */
72232+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
72233+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
72234+ return -EPERM;
72235+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
72236+ return -EPERM;
72237+ }
72238+#endif
72239+ return 0;
72240+}
72241+
72242+#ifdef CONFIG_GRKERNSEC
72243+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
72244+
72245+int gr_fake_force_sig(int sig, struct task_struct *t)
72246+{
72247+ unsigned long int flags;
72248+ int ret, blocked, ignored;
72249+ struct k_sigaction *action;
72250+
72251+ spin_lock_irqsave(&t->sighand->siglock, flags);
72252+ action = &t->sighand->action[sig-1];
72253+ ignored = action->sa.sa_handler == SIG_IGN;
72254+ blocked = sigismember(&t->blocked, sig);
72255+ if (blocked || ignored) {
72256+ action->sa.sa_handler = SIG_DFL;
72257+ if (blocked) {
72258+ sigdelset(&t->blocked, sig);
72259+ recalc_sigpending_and_wake(t);
72260+ }
72261+ }
72262+ if (action->sa.sa_handler == SIG_DFL)
72263+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
72264+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
72265+
72266+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
72267+
72268+ return ret;
72269+}
72270+#endif
72271+
72272+#define GR_USER_BAN_TIME (15 * 60)
72273+#define GR_DAEMON_BRUTE_TIME (30 * 60)
72274+
72275+void gr_handle_brute_attach(int dumpable)
72276+{
72277+#ifdef CONFIG_GRKERNSEC_BRUTE
72278+ struct task_struct *p = current;
72279+ kuid_t uid = GLOBAL_ROOT_UID;
72280+ int daemon = 0;
72281+
72282+ if (!grsec_enable_brute)
72283+ return;
72284+
72285+ rcu_read_lock();
72286+ read_lock(&tasklist_lock);
72287+ read_lock(&grsec_exec_file_lock);
72288+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
72289+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
72290+ p->real_parent->brute = 1;
72291+ daemon = 1;
72292+ } else {
72293+ const struct cred *cred = __task_cred(p), *cred2;
72294+ struct task_struct *tsk, *tsk2;
72295+
72296+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
72297+ struct user_struct *user;
72298+
72299+ uid = cred->uid;
72300+
72301+ /* this is put upon execution past expiration */
72302+ user = find_user(uid);
72303+ if (user == NULL)
72304+ goto unlock;
72305+ user->suid_banned = 1;
72306+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
72307+ if (user->suid_ban_expires == ~0UL)
72308+ user->suid_ban_expires--;
72309+
72310+ /* only kill other threads of the same binary, from the same user */
72311+ do_each_thread(tsk2, tsk) {
72312+ cred2 = __task_cred(tsk);
72313+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
72314+ gr_fake_force_sig(SIGKILL, tsk);
72315+ } while_each_thread(tsk2, tsk);
72316+ }
72317+ }
72318+unlock:
72319+ read_unlock(&grsec_exec_file_lock);
72320+ read_unlock(&tasklist_lock);
72321+ rcu_read_unlock();
72322+
72323+ if (gr_is_global_nonroot(uid))
72324+ 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);
72325+ else if (daemon)
72326+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
72327+
72328+#endif
72329+ return;
72330+}
72331+
72332+void gr_handle_brute_check(void)
72333+{
72334+#ifdef CONFIG_GRKERNSEC_BRUTE
72335+ struct task_struct *p = current;
72336+
72337+ if (unlikely(p->brute)) {
72338+ if (!grsec_enable_brute)
72339+ p->brute = 0;
72340+ else if (time_before(get_seconds(), p->brute_expires))
72341+ msleep(30 * 1000);
72342+ }
72343+#endif
72344+ return;
72345+}
72346+
72347+void gr_handle_kernel_exploit(void)
72348+{
72349+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72350+ const struct cred *cred;
72351+ struct task_struct *tsk, *tsk2;
72352+ struct user_struct *user;
72353+ kuid_t uid;
72354+
72355+ if (in_irq() || in_serving_softirq() || in_nmi())
72356+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
72357+
72358+ uid = current_uid();
72359+
72360+ if (gr_is_global_root(uid))
72361+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
72362+ else {
72363+ /* kill all the processes of this user, hold a reference
72364+ to their creds struct, and prevent them from creating
72365+ another process until system reset
72366+ */
72367+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
72368+ GR_GLOBAL_UID(uid));
72369+ /* we intentionally leak this ref */
72370+ user = get_uid(current->cred->user);
72371+ if (user)
72372+ user->kernel_banned = 1;
72373+
72374+ /* kill all processes of this user */
72375+ read_lock(&tasklist_lock);
72376+ do_each_thread(tsk2, tsk) {
72377+ cred = __task_cred(tsk);
72378+ if (uid_eq(cred->uid, uid))
72379+ gr_fake_force_sig(SIGKILL, tsk);
72380+ } while_each_thread(tsk2, tsk);
72381+ read_unlock(&tasklist_lock);
72382+ }
72383+#endif
72384+}
72385+
72386+#ifdef CONFIG_GRKERNSEC_BRUTE
72387+static bool suid_ban_expired(struct user_struct *user)
72388+{
72389+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
72390+ user->suid_banned = 0;
72391+ user->suid_ban_expires = 0;
72392+ free_uid(user);
72393+ return true;
72394+ }
72395+
72396+ return false;
72397+}
72398+#endif
72399+
72400+int gr_process_kernel_exec_ban(void)
72401+{
72402+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72403+ if (unlikely(current->cred->user->kernel_banned))
72404+ return -EPERM;
72405+#endif
72406+ return 0;
72407+}
72408+
72409+int gr_process_kernel_setuid_ban(struct user_struct *user)
72410+{
72411+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
72412+ if (unlikely(user->kernel_banned))
72413+ gr_fake_force_sig(SIGKILL, current);
72414+#endif
72415+ return 0;
72416+}
72417+
72418+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
72419+{
72420+#ifdef CONFIG_GRKERNSEC_BRUTE
72421+ struct user_struct *user = current->cred->user;
72422+ if (unlikely(user->suid_banned)) {
72423+ if (suid_ban_expired(user))
72424+ return 0;
72425+ /* disallow execution of suid binaries only */
72426+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
72427+ return -EPERM;
72428+ }
72429+#endif
72430+ return 0;
72431+}
72432diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
72433new file mode 100644
72434index 0000000..4030d57
72435--- /dev/null
72436+++ b/grsecurity/grsec_sock.c
72437@@ -0,0 +1,244 @@
72438+#include <linux/kernel.h>
72439+#include <linux/module.h>
72440+#include <linux/sched.h>
72441+#include <linux/file.h>
72442+#include <linux/net.h>
72443+#include <linux/in.h>
72444+#include <linux/ip.h>
72445+#include <net/sock.h>
72446+#include <net/inet_sock.h>
72447+#include <linux/grsecurity.h>
72448+#include <linux/grinternal.h>
72449+#include <linux/gracl.h>
72450+
72451+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
72452+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
72453+
72454+EXPORT_SYMBOL(gr_search_udp_recvmsg);
72455+EXPORT_SYMBOL(gr_search_udp_sendmsg);
72456+
72457+#ifdef CONFIG_UNIX_MODULE
72458+EXPORT_SYMBOL(gr_acl_handle_unix);
72459+EXPORT_SYMBOL(gr_acl_handle_mknod);
72460+EXPORT_SYMBOL(gr_handle_chroot_unix);
72461+EXPORT_SYMBOL(gr_handle_create);
72462+#endif
72463+
72464+#ifdef CONFIG_GRKERNSEC
72465+#define gr_conn_table_size 32749
72466+struct conn_table_entry {
72467+ struct conn_table_entry *next;
72468+ struct signal_struct *sig;
72469+};
72470+
72471+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
72472+DEFINE_SPINLOCK(gr_conn_table_lock);
72473+
72474+extern const char * gr_socktype_to_name(unsigned char type);
72475+extern const char * gr_proto_to_name(unsigned char proto);
72476+extern const char * gr_sockfamily_to_name(unsigned char family);
72477+
72478+static __inline__ int
72479+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
72480+{
72481+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
72482+}
72483+
72484+static __inline__ int
72485+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
72486+ __u16 sport, __u16 dport)
72487+{
72488+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
72489+ sig->gr_sport == sport && sig->gr_dport == dport))
72490+ return 1;
72491+ else
72492+ return 0;
72493+}
72494+
72495+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
72496+{
72497+ struct conn_table_entry **match;
72498+ unsigned int index;
72499+
72500+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
72501+ sig->gr_sport, sig->gr_dport,
72502+ gr_conn_table_size);
72503+
72504+ newent->sig = sig;
72505+
72506+ match = &gr_conn_table[index];
72507+ newent->next = *match;
72508+ *match = newent;
72509+
72510+ return;
72511+}
72512+
72513+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
72514+{
72515+ struct conn_table_entry *match, *last = NULL;
72516+ unsigned int index;
72517+
72518+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
72519+ sig->gr_sport, sig->gr_dport,
72520+ gr_conn_table_size);
72521+
72522+ match = gr_conn_table[index];
72523+ while (match && !conn_match(match->sig,
72524+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
72525+ sig->gr_dport)) {
72526+ last = match;
72527+ match = match->next;
72528+ }
72529+
72530+ if (match) {
72531+ if (last)
72532+ last->next = match->next;
72533+ else
72534+ gr_conn_table[index] = NULL;
72535+ kfree(match);
72536+ }
72537+
72538+ return;
72539+}
72540+
72541+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
72542+ __u16 sport, __u16 dport)
72543+{
72544+ struct conn_table_entry *match;
72545+ unsigned int index;
72546+
72547+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
72548+
72549+ match = gr_conn_table[index];
72550+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
72551+ match = match->next;
72552+
72553+ if (match)
72554+ return match->sig;
72555+ else
72556+ return NULL;
72557+}
72558+
72559+#endif
72560+
72561+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
72562+{
72563+#ifdef CONFIG_GRKERNSEC
72564+ struct signal_struct *sig = task->signal;
72565+ struct conn_table_entry *newent;
72566+
72567+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
72568+ if (newent == NULL)
72569+ return;
72570+ /* no bh lock needed since we are called with bh disabled */
72571+ spin_lock(&gr_conn_table_lock);
72572+ gr_del_task_from_ip_table_nolock(sig);
72573+ sig->gr_saddr = inet->inet_rcv_saddr;
72574+ sig->gr_daddr = inet->inet_daddr;
72575+ sig->gr_sport = inet->inet_sport;
72576+ sig->gr_dport = inet->inet_dport;
72577+ gr_add_to_task_ip_table_nolock(sig, newent);
72578+ spin_unlock(&gr_conn_table_lock);
72579+#endif
72580+ return;
72581+}
72582+
72583+void gr_del_task_from_ip_table(struct task_struct *task)
72584+{
72585+#ifdef CONFIG_GRKERNSEC
72586+ spin_lock_bh(&gr_conn_table_lock);
72587+ gr_del_task_from_ip_table_nolock(task->signal);
72588+ spin_unlock_bh(&gr_conn_table_lock);
72589+#endif
72590+ return;
72591+}
72592+
72593+void
72594+gr_attach_curr_ip(const struct sock *sk)
72595+{
72596+#ifdef CONFIG_GRKERNSEC
72597+ struct signal_struct *p, *set;
72598+ const struct inet_sock *inet = inet_sk(sk);
72599+
72600+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
72601+ return;
72602+
72603+ set = current->signal;
72604+
72605+ spin_lock_bh(&gr_conn_table_lock);
72606+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
72607+ inet->inet_dport, inet->inet_sport);
72608+ if (unlikely(p != NULL)) {
72609+ set->curr_ip = p->curr_ip;
72610+ set->used_accept = 1;
72611+ gr_del_task_from_ip_table_nolock(p);
72612+ spin_unlock_bh(&gr_conn_table_lock);
72613+ return;
72614+ }
72615+ spin_unlock_bh(&gr_conn_table_lock);
72616+
72617+ set->curr_ip = inet->inet_daddr;
72618+ set->used_accept = 1;
72619+#endif
72620+ return;
72621+}
72622+
72623+int
72624+gr_handle_sock_all(const int family, const int type, const int protocol)
72625+{
72626+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
72627+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
72628+ (family != AF_UNIX)) {
72629+ if (family == AF_INET)
72630+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
72631+ else
72632+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
72633+ return -EACCES;
72634+ }
72635+#endif
72636+ return 0;
72637+}
72638+
72639+int
72640+gr_handle_sock_server(const struct sockaddr *sck)
72641+{
72642+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
72643+ if (grsec_enable_socket_server &&
72644+ in_group_p(grsec_socket_server_gid) &&
72645+ sck && (sck->sa_family != AF_UNIX) &&
72646+ (sck->sa_family != AF_LOCAL)) {
72647+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
72648+ return -EACCES;
72649+ }
72650+#endif
72651+ return 0;
72652+}
72653+
72654+int
72655+gr_handle_sock_server_other(const struct sock *sck)
72656+{
72657+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
72658+ if (grsec_enable_socket_server &&
72659+ in_group_p(grsec_socket_server_gid) &&
72660+ sck && (sck->sk_family != AF_UNIX) &&
72661+ (sck->sk_family != AF_LOCAL)) {
72662+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
72663+ return -EACCES;
72664+ }
72665+#endif
72666+ return 0;
72667+}
72668+
72669+int
72670+gr_handle_sock_client(const struct sockaddr *sck)
72671+{
72672+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
72673+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
72674+ sck && (sck->sa_family != AF_UNIX) &&
72675+ (sck->sa_family != AF_LOCAL)) {
72676+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
72677+ return -EACCES;
72678+ }
72679+#endif
72680+ return 0;
72681+}
72682diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
72683new file mode 100644
72684index 0000000..8159888
72685--- /dev/null
72686+++ b/grsecurity/grsec_sysctl.c
72687@@ -0,0 +1,479 @@
72688+#include <linux/kernel.h>
72689+#include <linux/sched.h>
72690+#include <linux/sysctl.h>
72691+#include <linux/grsecurity.h>
72692+#include <linux/grinternal.h>
72693+
72694+int
72695+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
72696+{
72697+#ifdef CONFIG_GRKERNSEC_SYSCTL
72698+ if (dirname == NULL || name == NULL)
72699+ return 0;
72700+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
72701+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
72702+ return -EACCES;
72703+ }
72704+#endif
72705+ return 0;
72706+}
72707+
72708+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
72709+static int __maybe_unused __read_only one = 1;
72710+#endif
72711+
72712+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
72713+ defined(CONFIG_GRKERNSEC_DENYUSB)
72714+struct ctl_table grsecurity_table[] = {
72715+#ifdef CONFIG_GRKERNSEC_SYSCTL
72716+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
72717+#ifdef CONFIG_GRKERNSEC_IO
72718+ {
72719+ .procname = "disable_priv_io",
72720+ .data = &grsec_disable_privio,
72721+ .maxlen = sizeof(int),
72722+ .mode = 0600,
72723+ .proc_handler = &proc_dointvec,
72724+ },
72725+#endif
72726+#endif
72727+#ifdef CONFIG_GRKERNSEC_LINK
72728+ {
72729+ .procname = "linking_restrictions",
72730+ .data = &grsec_enable_link,
72731+ .maxlen = sizeof(int),
72732+ .mode = 0600,
72733+ .proc_handler = &proc_dointvec,
72734+ },
72735+#endif
72736+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
72737+ {
72738+ .procname = "enforce_symlinksifowner",
72739+ .data = &grsec_enable_symlinkown,
72740+ .maxlen = sizeof(int),
72741+ .mode = 0600,
72742+ .proc_handler = &proc_dointvec,
72743+ },
72744+ {
72745+ .procname = "symlinkown_gid",
72746+ .data = &grsec_symlinkown_gid,
72747+ .maxlen = sizeof(int),
72748+ .mode = 0600,
72749+ .proc_handler = &proc_dointvec,
72750+ },
72751+#endif
72752+#ifdef CONFIG_GRKERNSEC_BRUTE
72753+ {
72754+ .procname = "deter_bruteforce",
72755+ .data = &grsec_enable_brute,
72756+ .maxlen = sizeof(int),
72757+ .mode = 0600,
72758+ .proc_handler = &proc_dointvec,
72759+ },
72760+#endif
72761+#ifdef CONFIG_GRKERNSEC_FIFO
72762+ {
72763+ .procname = "fifo_restrictions",
72764+ .data = &grsec_enable_fifo,
72765+ .maxlen = sizeof(int),
72766+ .mode = 0600,
72767+ .proc_handler = &proc_dointvec,
72768+ },
72769+#endif
72770+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
72771+ {
72772+ .procname = "ptrace_readexec",
72773+ .data = &grsec_enable_ptrace_readexec,
72774+ .maxlen = sizeof(int),
72775+ .mode = 0600,
72776+ .proc_handler = &proc_dointvec,
72777+ },
72778+#endif
72779+#ifdef CONFIG_GRKERNSEC_SETXID
72780+ {
72781+ .procname = "consistent_setxid",
72782+ .data = &grsec_enable_setxid,
72783+ .maxlen = sizeof(int),
72784+ .mode = 0600,
72785+ .proc_handler = &proc_dointvec,
72786+ },
72787+#endif
72788+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
72789+ {
72790+ .procname = "ip_blackhole",
72791+ .data = &grsec_enable_blackhole,
72792+ .maxlen = sizeof(int),
72793+ .mode = 0600,
72794+ .proc_handler = &proc_dointvec,
72795+ },
72796+ {
72797+ .procname = "lastack_retries",
72798+ .data = &grsec_lastack_retries,
72799+ .maxlen = sizeof(int),
72800+ .mode = 0600,
72801+ .proc_handler = &proc_dointvec,
72802+ },
72803+#endif
72804+#ifdef CONFIG_GRKERNSEC_EXECLOG
72805+ {
72806+ .procname = "exec_logging",
72807+ .data = &grsec_enable_execlog,
72808+ .maxlen = sizeof(int),
72809+ .mode = 0600,
72810+ .proc_handler = &proc_dointvec,
72811+ },
72812+#endif
72813+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72814+ {
72815+ .procname = "rwxmap_logging",
72816+ .data = &grsec_enable_log_rwxmaps,
72817+ .maxlen = sizeof(int),
72818+ .mode = 0600,
72819+ .proc_handler = &proc_dointvec,
72820+ },
72821+#endif
72822+#ifdef CONFIG_GRKERNSEC_SIGNAL
72823+ {
72824+ .procname = "signal_logging",
72825+ .data = &grsec_enable_signal,
72826+ .maxlen = sizeof(int),
72827+ .mode = 0600,
72828+ .proc_handler = &proc_dointvec,
72829+ },
72830+#endif
72831+#ifdef CONFIG_GRKERNSEC_FORKFAIL
72832+ {
72833+ .procname = "forkfail_logging",
72834+ .data = &grsec_enable_forkfail,
72835+ .maxlen = sizeof(int),
72836+ .mode = 0600,
72837+ .proc_handler = &proc_dointvec,
72838+ },
72839+#endif
72840+#ifdef CONFIG_GRKERNSEC_TIME
72841+ {
72842+ .procname = "timechange_logging",
72843+ .data = &grsec_enable_time,
72844+ .maxlen = sizeof(int),
72845+ .mode = 0600,
72846+ .proc_handler = &proc_dointvec,
72847+ },
72848+#endif
72849+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
72850+ {
72851+ .procname = "chroot_deny_shmat",
72852+ .data = &grsec_enable_chroot_shmat,
72853+ .maxlen = sizeof(int),
72854+ .mode = 0600,
72855+ .proc_handler = &proc_dointvec,
72856+ },
72857+#endif
72858+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
72859+ {
72860+ .procname = "chroot_deny_unix",
72861+ .data = &grsec_enable_chroot_unix,
72862+ .maxlen = sizeof(int),
72863+ .mode = 0600,
72864+ .proc_handler = &proc_dointvec,
72865+ },
72866+#endif
72867+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
72868+ {
72869+ .procname = "chroot_deny_mount",
72870+ .data = &grsec_enable_chroot_mount,
72871+ .maxlen = sizeof(int),
72872+ .mode = 0600,
72873+ .proc_handler = &proc_dointvec,
72874+ },
72875+#endif
72876+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
72877+ {
72878+ .procname = "chroot_deny_fchdir",
72879+ .data = &grsec_enable_chroot_fchdir,
72880+ .maxlen = sizeof(int),
72881+ .mode = 0600,
72882+ .proc_handler = &proc_dointvec,
72883+ },
72884+#endif
72885+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
72886+ {
72887+ .procname = "chroot_deny_chroot",
72888+ .data = &grsec_enable_chroot_double,
72889+ .maxlen = sizeof(int),
72890+ .mode = 0600,
72891+ .proc_handler = &proc_dointvec,
72892+ },
72893+#endif
72894+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
72895+ {
72896+ .procname = "chroot_deny_pivot",
72897+ .data = &grsec_enable_chroot_pivot,
72898+ .maxlen = sizeof(int),
72899+ .mode = 0600,
72900+ .proc_handler = &proc_dointvec,
72901+ },
72902+#endif
72903+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
72904+ {
72905+ .procname = "chroot_enforce_chdir",
72906+ .data = &grsec_enable_chroot_chdir,
72907+ .maxlen = sizeof(int),
72908+ .mode = 0600,
72909+ .proc_handler = &proc_dointvec,
72910+ },
72911+#endif
72912+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
72913+ {
72914+ .procname = "chroot_deny_chmod",
72915+ .data = &grsec_enable_chroot_chmod,
72916+ .maxlen = sizeof(int),
72917+ .mode = 0600,
72918+ .proc_handler = &proc_dointvec,
72919+ },
72920+#endif
72921+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
72922+ {
72923+ .procname = "chroot_deny_mknod",
72924+ .data = &grsec_enable_chroot_mknod,
72925+ .maxlen = sizeof(int),
72926+ .mode = 0600,
72927+ .proc_handler = &proc_dointvec,
72928+ },
72929+#endif
72930+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
72931+ {
72932+ .procname = "chroot_restrict_nice",
72933+ .data = &grsec_enable_chroot_nice,
72934+ .maxlen = sizeof(int),
72935+ .mode = 0600,
72936+ .proc_handler = &proc_dointvec,
72937+ },
72938+#endif
72939+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
72940+ {
72941+ .procname = "chroot_execlog",
72942+ .data = &grsec_enable_chroot_execlog,
72943+ .maxlen = sizeof(int),
72944+ .mode = 0600,
72945+ .proc_handler = &proc_dointvec,
72946+ },
72947+#endif
72948+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
72949+ {
72950+ .procname = "chroot_caps",
72951+ .data = &grsec_enable_chroot_caps,
72952+ .maxlen = sizeof(int),
72953+ .mode = 0600,
72954+ .proc_handler = &proc_dointvec,
72955+ },
72956+#endif
72957+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
72958+ {
72959+ .procname = "chroot_deny_sysctl",
72960+ .data = &grsec_enable_chroot_sysctl,
72961+ .maxlen = sizeof(int),
72962+ .mode = 0600,
72963+ .proc_handler = &proc_dointvec,
72964+ },
72965+#endif
72966+#ifdef CONFIG_GRKERNSEC_TPE
72967+ {
72968+ .procname = "tpe",
72969+ .data = &grsec_enable_tpe,
72970+ .maxlen = sizeof(int),
72971+ .mode = 0600,
72972+ .proc_handler = &proc_dointvec,
72973+ },
72974+ {
72975+ .procname = "tpe_gid",
72976+ .data = &grsec_tpe_gid,
72977+ .maxlen = sizeof(int),
72978+ .mode = 0600,
72979+ .proc_handler = &proc_dointvec,
72980+ },
72981+#endif
72982+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
72983+ {
72984+ .procname = "tpe_invert",
72985+ .data = &grsec_enable_tpe_invert,
72986+ .maxlen = sizeof(int),
72987+ .mode = 0600,
72988+ .proc_handler = &proc_dointvec,
72989+ },
72990+#endif
72991+#ifdef CONFIG_GRKERNSEC_TPE_ALL
72992+ {
72993+ .procname = "tpe_restrict_all",
72994+ .data = &grsec_enable_tpe_all,
72995+ .maxlen = sizeof(int),
72996+ .mode = 0600,
72997+ .proc_handler = &proc_dointvec,
72998+ },
72999+#endif
73000+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
73001+ {
73002+ .procname = "socket_all",
73003+ .data = &grsec_enable_socket_all,
73004+ .maxlen = sizeof(int),
73005+ .mode = 0600,
73006+ .proc_handler = &proc_dointvec,
73007+ },
73008+ {
73009+ .procname = "socket_all_gid",
73010+ .data = &grsec_socket_all_gid,
73011+ .maxlen = sizeof(int),
73012+ .mode = 0600,
73013+ .proc_handler = &proc_dointvec,
73014+ },
73015+#endif
73016+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
73017+ {
73018+ .procname = "socket_client",
73019+ .data = &grsec_enable_socket_client,
73020+ .maxlen = sizeof(int),
73021+ .mode = 0600,
73022+ .proc_handler = &proc_dointvec,
73023+ },
73024+ {
73025+ .procname = "socket_client_gid",
73026+ .data = &grsec_socket_client_gid,
73027+ .maxlen = sizeof(int),
73028+ .mode = 0600,
73029+ .proc_handler = &proc_dointvec,
73030+ },
73031+#endif
73032+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
73033+ {
73034+ .procname = "socket_server",
73035+ .data = &grsec_enable_socket_server,
73036+ .maxlen = sizeof(int),
73037+ .mode = 0600,
73038+ .proc_handler = &proc_dointvec,
73039+ },
73040+ {
73041+ .procname = "socket_server_gid",
73042+ .data = &grsec_socket_server_gid,
73043+ .maxlen = sizeof(int),
73044+ .mode = 0600,
73045+ .proc_handler = &proc_dointvec,
73046+ },
73047+#endif
73048+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
73049+ {
73050+ .procname = "audit_group",
73051+ .data = &grsec_enable_group,
73052+ .maxlen = sizeof(int),
73053+ .mode = 0600,
73054+ .proc_handler = &proc_dointvec,
73055+ },
73056+ {
73057+ .procname = "audit_gid",
73058+ .data = &grsec_audit_gid,
73059+ .maxlen = sizeof(int),
73060+ .mode = 0600,
73061+ .proc_handler = &proc_dointvec,
73062+ },
73063+#endif
73064+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
73065+ {
73066+ .procname = "audit_chdir",
73067+ .data = &grsec_enable_chdir,
73068+ .maxlen = sizeof(int),
73069+ .mode = 0600,
73070+ .proc_handler = &proc_dointvec,
73071+ },
73072+#endif
73073+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
73074+ {
73075+ .procname = "audit_mount",
73076+ .data = &grsec_enable_mount,
73077+ .maxlen = sizeof(int),
73078+ .mode = 0600,
73079+ .proc_handler = &proc_dointvec,
73080+ },
73081+#endif
73082+#ifdef CONFIG_GRKERNSEC_DMESG
73083+ {
73084+ .procname = "dmesg",
73085+ .data = &grsec_enable_dmesg,
73086+ .maxlen = sizeof(int),
73087+ .mode = 0600,
73088+ .proc_handler = &proc_dointvec,
73089+ },
73090+#endif
73091+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73092+ {
73093+ .procname = "chroot_findtask",
73094+ .data = &grsec_enable_chroot_findtask,
73095+ .maxlen = sizeof(int),
73096+ .mode = 0600,
73097+ .proc_handler = &proc_dointvec,
73098+ },
73099+#endif
73100+#ifdef CONFIG_GRKERNSEC_RESLOG
73101+ {
73102+ .procname = "resource_logging",
73103+ .data = &grsec_resource_logging,
73104+ .maxlen = sizeof(int),
73105+ .mode = 0600,
73106+ .proc_handler = &proc_dointvec,
73107+ },
73108+#endif
73109+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
73110+ {
73111+ .procname = "audit_ptrace",
73112+ .data = &grsec_enable_audit_ptrace,
73113+ .maxlen = sizeof(int),
73114+ .mode = 0600,
73115+ .proc_handler = &proc_dointvec,
73116+ },
73117+#endif
73118+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
73119+ {
73120+ .procname = "harden_ptrace",
73121+ .data = &grsec_enable_harden_ptrace,
73122+ .maxlen = sizeof(int),
73123+ .mode = 0600,
73124+ .proc_handler = &proc_dointvec,
73125+ },
73126+#endif
73127+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
73128+ {
73129+ .procname = "harden_ipc",
73130+ .data = &grsec_enable_harden_ipc,
73131+ .maxlen = sizeof(int),
73132+ .mode = 0600,
73133+ .proc_handler = &proc_dointvec,
73134+ },
73135+#endif
73136+ {
73137+ .procname = "grsec_lock",
73138+ .data = &grsec_lock,
73139+ .maxlen = sizeof(int),
73140+ .mode = 0600,
73141+ .proc_handler = &proc_dointvec,
73142+ },
73143+#endif
73144+#ifdef CONFIG_GRKERNSEC_ROFS
73145+ {
73146+ .procname = "romount_protect",
73147+ .data = &grsec_enable_rofs,
73148+ .maxlen = sizeof(int),
73149+ .mode = 0600,
73150+ .proc_handler = &proc_dointvec_minmax,
73151+ .extra1 = &one,
73152+ .extra2 = &one,
73153+ },
73154+#endif
73155+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
73156+ {
73157+ .procname = "deny_new_usb",
73158+ .data = &grsec_deny_new_usb,
73159+ .maxlen = sizeof(int),
73160+ .mode = 0600,
73161+ .proc_handler = &proc_dointvec,
73162+ },
73163+#endif
73164+ { }
73165+};
73166+#endif
73167diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
73168new file mode 100644
73169index 0000000..0dc13c3
73170--- /dev/null
73171+++ b/grsecurity/grsec_time.c
73172@@ -0,0 +1,16 @@
73173+#include <linux/kernel.h>
73174+#include <linux/sched.h>
73175+#include <linux/grinternal.h>
73176+#include <linux/module.h>
73177+
73178+void
73179+gr_log_timechange(void)
73180+{
73181+#ifdef CONFIG_GRKERNSEC_TIME
73182+ if (grsec_enable_time)
73183+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
73184+#endif
73185+ return;
73186+}
73187+
73188+EXPORT_SYMBOL(gr_log_timechange);
73189diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
73190new file mode 100644
73191index 0000000..ee57dcf
73192--- /dev/null
73193+++ b/grsecurity/grsec_tpe.c
73194@@ -0,0 +1,73 @@
73195+#include <linux/kernel.h>
73196+#include <linux/sched.h>
73197+#include <linux/file.h>
73198+#include <linux/fs.h>
73199+#include <linux/grinternal.h>
73200+
73201+extern int gr_acl_tpe_check(void);
73202+
73203+int
73204+gr_tpe_allow(const struct file *file)
73205+{
73206+#ifdef CONFIG_GRKERNSEC
73207+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
73208+ const struct cred *cred = current_cred();
73209+ char *msg = NULL;
73210+ char *msg2 = NULL;
73211+
73212+ // never restrict root
73213+ if (gr_is_global_root(cred->uid))
73214+ return 1;
73215+
73216+ if (grsec_enable_tpe) {
73217+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
73218+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
73219+ msg = "not being in trusted group";
73220+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
73221+ msg = "being in untrusted group";
73222+#else
73223+ if (in_group_p(grsec_tpe_gid))
73224+ msg = "being in untrusted group";
73225+#endif
73226+ }
73227+ if (!msg && gr_acl_tpe_check())
73228+ msg = "being in untrusted role";
73229+
73230+ // not in any affected group/role
73231+ if (!msg)
73232+ goto next_check;
73233+
73234+ if (gr_is_global_nonroot(inode->i_uid))
73235+ msg2 = "file in non-root-owned directory";
73236+ else if (inode->i_mode & S_IWOTH)
73237+ msg2 = "file in world-writable directory";
73238+ else if (inode->i_mode & S_IWGRP)
73239+ msg2 = "file in group-writable directory";
73240+
73241+ if (msg && msg2) {
73242+ char fullmsg[70] = {0};
73243+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
73244+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
73245+ return 0;
73246+ }
73247+ msg = NULL;
73248+next_check:
73249+#ifdef CONFIG_GRKERNSEC_TPE_ALL
73250+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
73251+ return 1;
73252+
73253+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
73254+ msg = "directory not owned by user";
73255+ else if (inode->i_mode & S_IWOTH)
73256+ msg = "file in world-writable directory";
73257+ else if (inode->i_mode & S_IWGRP)
73258+ msg = "file in group-writable directory";
73259+
73260+ if (msg) {
73261+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
73262+ return 0;
73263+ }
73264+#endif
73265+#endif
73266+ return 1;
73267+}
73268diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
73269new file mode 100644
73270index 0000000..ae02d8e
73271--- /dev/null
73272+++ b/grsecurity/grsec_usb.c
73273@@ -0,0 +1,15 @@
73274+#include <linux/kernel.h>
73275+#include <linux/grinternal.h>
73276+#include <linux/module.h>
73277+
73278+int gr_handle_new_usb(void)
73279+{
73280+#ifdef CONFIG_GRKERNSEC_DENYUSB
73281+ if (grsec_deny_new_usb) {
73282+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
73283+ return 1;
73284+ }
73285+#endif
73286+ return 0;
73287+}
73288+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
73289diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
73290new file mode 100644
73291index 0000000..9f7b1ac
73292--- /dev/null
73293+++ b/grsecurity/grsum.c
73294@@ -0,0 +1,61 @@
73295+#include <linux/err.h>
73296+#include <linux/kernel.h>
73297+#include <linux/sched.h>
73298+#include <linux/mm.h>
73299+#include <linux/scatterlist.h>
73300+#include <linux/crypto.h>
73301+#include <linux/gracl.h>
73302+
73303+
73304+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
73305+#error "crypto and sha256 must be built into the kernel"
73306+#endif
73307+
73308+int
73309+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
73310+{
73311+ char *p;
73312+ struct crypto_hash *tfm;
73313+ struct hash_desc desc;
73314+ struct scatterlist sg;
73315+ unsigned char temp_sum[GR_SHA_LEN];
73316+ volatile int retval = 0;
73317+ volatile int dummy = 0;
73318+ unsigned int i;
73319+
73320+ sg_init_table(&sg, 1);
73321+
73322+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
73323+ if (IS_ERR(tfm)) {
73324+ /* should never happen, since sha256 should be built in */
73325+ return 1;
73326+ }
73327+
73328+ desc.tfm = tfm;
73329+ desc.flags = 0;
73330+
73331+ crypto_hash_init(&desc);
73332+
73333+ p = salt;
73334+ sg_set_buf(&sg, p, GR_SALT_LEN);
73335+ crypto_hash_update(&desc, &sg, sg.length);
73336+
73337+ p = entry->pw;
73338+ sg_set_buf(&sg, p, strlen(p));
73339+
73340+ crypto_hash_update(&desc, &sg, sg.length);
73341+
73342+ crypto_hash_final(&desc, temp_sum);
73343+
73344+ memset(entry->pw, 0, GR_PW_LEN);
73345+
73346+ for (i = 0; i < GR_SHA_LEN; i++)
73347+ if (sum[i] != temp_sum[i])
73348+ retval = 1;
73349+ else
73350+ dummy = 1; // waste a cycle
73351+
73352+ crypto_free_hash(tfm);
73353+
73354+ return retval;
73355+}
73356diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
73357index 77ff547..181834f 100644
73358--- a/include/asm-generic/4level-fixup.h
73359+++ b/include/asm-generic/4level-fixup.h
73360@@ -13,8 +13,10 @@
73361 #define pmd_alloc(mm, pud, address) \
73362 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
73363 NULL: pmd_offset(pud, address))
73364+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
73365
73366 #define pud_alloc(mm, pgd, address) (pgd)
73367+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
73368 #define pud_offset(pgd, start) (pgd)
73369 #define pud_none(pud) 0
73370 #define pud_bad(pud) 0
73371diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
73372index b7babf0..97f4c4f 100644
73373--- a/include/asm-generic/atomic-long.h
73374+++ b/include/asm-generic/atomic-long.h
73375@@ -22,6 +22,12 @@
73376
73377 typedef atomic64_t atomic_long_t;
73378
73379+#ifdef CONFIG_PAX_REFCOUNT
73380+typedef atomic64_unchecked_t atomic_long_unchecked_t;
73381+#else
73382+typedef atomic64_t atomic_long_unchecked_t;
73383+#endif
73384+
73385 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
73386
73387 static inline long atomic_long_read(atomic_long_t *l)
73388@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
73389 return (long)atomic64_read(v);
73390 }
73391
73392+#ifdef CONFIG_PAX_REFCOUNT
73393+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
73394+{
73395+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73396+
73397+ return (long)atomic64_read_unchecked(v);
73398+}
73399+#endif
73400+
73401 static inline void atomic_long_set(atomic_long_t *l, long i)
73402 {
73403 atomic64_t *v = (atomic64_t *)l;
73404@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
73405 atomic64_set(v, i);
73406 }
73407
73408+#ifdef CONFIG_PAX_REFCOUNT
73409+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
73410+{
73411+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73412+
73413+ atomic64_set_unchecked(v, i);
73414+}
73415+#endif
73416+
73417 static inline void atomic_long_inc(atomic_long_t *l)
73418 {
73419 atomic64_t *v = (atomic64_t *)l;
73420@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
73421 atomic64_inc(v);
73422 }
73423
73424+#ifdef CONFIG_PAX_REFCOUNT
73425+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
73426+{
73427+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73428+
73429+ atomic64_inc_unchecked(v);
73430+}
73431+#endif
73432+
73433 static inline void atomic_long_dec(atomic_long_t *l)
73434 {
73435 atomic64_t *v = (atomic64_t *)l;
73436@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
73437 atomic64_dec(v);
73438 }
73439
73440+#ifdef CONFIG_PAX_REFCOUNT
73441+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
73442+{
73443+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73444+
73445+ atomic64_dec_unchecked(v);
73446+}
73447+#endif
73448+
73449 static inline void atomic_long_add(long i, atomic_long_t *l)
73450 {
73451 atomic64_t *v = (atomic64_t *)l;
73452@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
73453 atomic64_add(i, v);
73454 }
73455
73456+#ifdef CONFIG_PAX_REFCOUNT
73457+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
73458+{
73459+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73460+
73461+ atomic64_add_unchecked(i, v);
73462+}
73463+#endif
73464+
73465 static inline void atomic_long_sub(long i, atomic_long_t *l)
73466 {
73467 atomic64_t *v = (atomic64_t *)l;
73468@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
73469 atomic64_sub(i, v);
73470 }
73471
73472+#ifdef CONFIG_PAX_REFCOUNT
73473+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
73474+{
73475+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73476+
73477+ atomic64_sub_unchecked(i, v);
73478+}
73479+#endif
73480+
73481 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
73482 {
73483 atomic64_t *v = (atomic64_t *)l;
73484@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
73485 return atomic64_add_negative(i, v);
73486 }
73487
73488-static inline long atomic_long_add_return(long i, atomic_long_t *l)
73489+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
73490 {
73491 atomic64_t *v = (atomic64_t *)l;
73492
73493 return (long)atomic64_add_return(i, v);
73494 }
73495
73496+#ifdef CONFIG_PAX_REFCOUNT
73497+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
73498+{
73499+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73500+
73501+ return (long)atomic64_add_return_unchecked(i, v);
73502+}
73503+#endif
73504+
73505 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
73506 {
73507 atomic64_t *v = (atomic64_t *)l;
73508@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
73509 return (long)atomic64_inc_return(v);
73510 }
73511
73512+#ifdef CONFIG_PAX_REFCOUNT
73513+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
73514+{
73515+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
73516+
73517+ return (long)atomic64_inc_return_unchecked(v);
73518+}
73519+#endif
73520+
73521 static inline long atomic_long_dec_return(atomic_long_t *l)
73522 {
73523 atomic64_t *v = (atomic64_t *)l;
73524@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
73525
73526 typedef atomic_t atomic_long_t;
73527
73528+#ifdef CONFIG_PAX_REFCOUNT
73529+typedef atomic_unchecked_t atomic_long_unchecked_t;
73530+#else
73531+typedef atomic_t atomic_long_unchecked_t;
73532+#endif
73533+
73534 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
73535 static inline long atomic_long_read(atomic_long_t *l)
73536 {
73537@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
73538 return (long)atomic_read(v);
73539 }
73540
73541+#ifdef CONFIG_PAX_REFCOUNT
73542+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
73543+{
73544+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73545+
73546+ return (long)atomic_read_unchecked(v);
73547+}
73548+#endif
73549+
73550 static inline void atomic_long_set(atomic_long_t *l, long i)
73551 {
73552 atomic_t *v = (atomic_t *)l;
73553@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
73554 atomic_set(v, i);
73555 }
73556
73557+#ifdef CONFIG_PAX_REFCOUNT
73558+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
73559+{
73560+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73561+
73562+ atomic_set_unchecked(v, i);
73563+}
73564+#endif
73565+
73566 static inline void atomic_long_inc(atomic_long_t *l)
73567 {
73568 atomic_t *v = (atomic_t *)l;
73569@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
73570 atomic_inc(v);
73571 }
73572
73573+#ifdef CONFIG_PAX_REFCOUNT
73574+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
73575+{
73576+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73577+
73578+ atomic_inc_unchecked(v);
73579+}
73580+#endif
73581+
73582 static inline void atomic_long_dec(atomic_long_t *l)
73583 {
73584 atomic_t *v = (atomic_t *)l;
73585@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
73586 atomic_dec(v);
73587 }
73588
73589+#ifdef CONFIG_PAX_REFCOUNT
73590+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
73591+{
73592+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73593+
73594+ atomic_dec_unchecked(v);
73595+}
73596+#endif
73597+
73598 static inline void atomic_long_add(long i, atomic_long_t *l)
73599 {
73600 atomic_t *v = (atomic_t *)l;
73601@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
73602 atomic_add(i, v);
73603 }
73604
73605+#ifdef CONFIG_PAX_REFCOUNT
73606+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
73607+{
73608+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73609+
73610+ atomic_add_unchecked(i, v);
73611+}
73612+#endif
73613+
73614 static inline void atomic_long_sub(long i, atomic_long_t *l)
73615 {
73616 atomic_t *v = (atomic_t *)l;
73617@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
73618 atomic_sub(i, v);
73619 }
73620
73621+#ifdef CONFIG_PAX_REFCOUNT
73622+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
73623+{
73624+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73625+
73626+ atomic_sub_unchecked(i, v);
73627+}
73628+#endif
73629+
73630 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
73631 {
73632 atomic_t *v = (atomic_t *)l;
73633@@ -218,6 +356,16 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
73634 return (long)atomic_add_return(i, v);
73635 }
73636
73637+#ifdef CONFIG_PAX_REFCOUNT
73638+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
73639+{
73640+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73641+
73642+ return (long)atomic_add_return_unchecked(i, v);
73643+}
73644+
73645+#endif
73646+
73647 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
73648 {
73649 atomic_t *v = (atomic_t *)l;
73650@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
73651 return (long)atomic_inc_return(v);
73652 }
73653
73654+#ifdef CONFIG_PAX_REFCOUNT
73655+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
73656+{
73657+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
73658+
73659+ return (long)atomic_inc_return_unchecked(v);
73660+}
73661+#endif
73662+
73663 static inline long atomic_long_dec_return(atomic_long_t *l)
73664 {
73665 atomic_t *v = (atomic_t *)l;
73666@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
73667
73668 #endif /* BITS_PER_LONG == 64 */
73669
73670+#ifdef CONFIG_PAX_REFCOUNT
73671+static inline void pax_refcount_needs_these_functions(void)
73672+{
73673+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
73674+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
73675+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
73676+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
73677+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
73678+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
73679+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
73680+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
73681+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
73682+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
73683+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
73684+#ifdef CONFIG_X86
73685+ atomic_clear_mask_unchecked(0, NULL);
73686+ atomic_set_mask_unchecked(0, NULL);
73687+#endif
73688+
73689+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
73690+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
73691+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
73692+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
73693+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
73694+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
73695+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
73696+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
73697+}
73698+#else
73699+#define atomic_read_unchecked(v) atomic_read(v)
73700+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
73701+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
73702+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
73703+#define atomic_inc_unchecked(v) atomic_inc(v)
73704+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
73705+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
73706+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
73707+#define atomic_dec_unchecked(v) atomic_dec(v)
73708+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
73709+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
73710+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
73711+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
73712+
73713+#define atomic_long_read_unchecked(v) atomic_long_read(v)
73714+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
73715+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
73716+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
73717+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
73718+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
73719+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
73720+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
73721+#endif
73722+
73723 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
73724diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
73725index 33bd2de..f31bff97 100644
73726--- a/include/asm-generic/atomic.h
73727+++ b/include/asm-generic/atomic.h
73728@@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
73729 * Atomically clears the bits set in @mask from @v
73730 */
73731 #ifndef atomic_clear_mask
73732-static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
73733+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
73734 {
73735 unsigned long flags;
73736
73737diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
73738index b18ce4f..2ee2843 100644
73739--- a/include/asm-generic/atomic64.h
73740+++ b/include/asm-generic/atomic64.h
73741@@ -16,6 +16,8 @@ typedef struct {
73742 long long counter;
73743 } atomic64_t;
73744
73745+typedef atomic64_t atomic64_unchecked_t;
73746+
73747 #define ATOMIC64_INIT(i) { (i) }
73748
73749 extern long long atomic64_read(const atomic64_t *v);
73750@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
73751 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
73752 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
73753
73754+#define atomic64_read_unchecked(v) atomic64_read(v)
73755+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
73756+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
73757+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
73758+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
73759+#define atomic64_inc_unchecked(v) atomic64_inc(v)
73760+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
73761+#define atomic64_dec_unchecked(v) atomic64_dec(v)
73762+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
73763+
73764 #endif /* _ASM_GENERIC_ATOMIC64_H */
73765diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
73766index a60a7cc..0fe12f2 100644
73767--- a/include/asm-generic/bitops/__fls.h
73768+++ b/include/asm-generic/bitops/__fls.h
73769@@ -9,7 +9,7 @@
73770 *
73771 * Undefined if no set bit exists, so code should check against 0 first.
73772 */
73773-static __always_inline unsigned long __fls(unsigned long word)
73774+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
73775 {
73776 int num = BITS_PER_LONG - 1;
73777
73778diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
73779index 0576d1f..dad6c71 100644
73780--- a/include/asm-generic/bitops/fls.h
73781+++ b/include/asm-generic/bitops/fls.h
73782@@ -9,7 +9,7 @@
73783 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
73784 */
73785
73786-static __always_inline int fls(int x)
73787+static __always_inline int __intentional_overflow(-1) fls(int x)
73788 {
73789 int r = 32;
73790
73791diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
73792index b097cf8..3d40e14 100644
73793--- a/include/asm-generic/bitops/fls64.h
73794+++ b/include/asm-generic/bitops/fls64.h
73795@@ -15,7 +15,7 @@
73796 * at position 64.
73797 */
73798 #if BITS_PER_LONG == 32
73799-static __always_inline int fls64(__u64 x)
73800+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
73801 {
73802 __u32 h = x >> 32;
73803 if (h)
73804@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
73805 return fls(x);
73806 }
73807 #elif BITS_PER_LONG == 64
73808-static __always_inline int fls64(__u64 x)
73809+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
73810 {
73811 if (x == 0)
73812 return 0;
73813diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
73814index 1bfcfe5..e04c5c9 100644
73815--- a/include/asm-generic/cache.h
73816+++ b/include/asm-generic/cache.h
73817@@ -6,7 +6,7 @@
73818 * cache lines need to provide their own cache.h.
73819 */
73820
73821-#define L1_CACHE_SHIFT 5
73822-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
73823+#define L1_CACHE_SHIFT 5UL
73824+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
73825
73826 #endif /* __ASM_GENERIC_CACHE_H */
73827diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
73828index 0d68a1e..b74a761 100644
73829--- a/include/asm-generic/emergency-restart.h
73830+++ b/include/asm-generic/emergency-restart.h
73831@@ -1,7 +1,7 @@
73832 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
73833 #define _ASM_GENERIC_EMERGENCY_RESTART_H
73834
73835-static inline void machine_emergency_restart(void)
73836+static inline __noreturn void machine_emergency_restart(void)
73837 {
73838 machine_restart(NULL);
73839 }
73840diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
73841index 90f99c7..00ce236 100644
73842--- a/include/asm-generic/kmap_types.h
73843+++ b/include/asm-generic/kmap_types.h
73844@@ -2,9 +2,9 @@
73845 #define _ASM_GENERIC_KMAP_TYPES_H
73846
73847 #ifdef __WITH_KM_FENCE
73848-# define KM_TYPE_NR 41
73849+# define KM_TYPE_NR 42
73850 #else
73851-# define KM_TYPE_NR 20
73852+# define KM_TYPE_NR 21
73853 #endif
73854
73855 #endif
73856diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
73857index 9ceb03b..62b0b8f 100644
73858--- a/include/asm-generic/local.h
73859+++ b/include/asm-generic/local.h
73860@@ -23,24 +23,37 @@ typedef struct
73861 atomic_long_t a;
73862 } local_t;
73863
73864+typedef struct {
73865+ atomic_long_unchecked_t a;
73866+} local_unchecked_t;
73867+
73868 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
73869
73870 #define local_read(l) atomic_long_read(&(l)->a)
73871+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
73872 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
73873+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
73874 #define local_inc(l) atomic_long_inc(&(l)->a)
73875+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
73876 #define local_dec(l) atomic_long_dec(&(l)->a)
73877+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
73878 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
73879+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
73880 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
73881+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
73882
73883 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
73884 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
73885 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
73886 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
73887 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
73888+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
73889 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
73890 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
73891+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
73892
73893 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
73894+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
73895 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
73896 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
73897 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
73898diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
73899index 725612b..9cc513a 100644
73900--- a/include/asm-generic/pgtable-nopmd.h
73901+++ b/include/asm-generic/pgtable-nopmd.h
73902@@ -1,14 +1,19 @@
73903 #ifndef _PGTABLE_NOPMD_H
73904 #define _PGTABLE_NOPMD_H
73905
73906-#ifndef __ASSEMBLY__
73907-
73908 #include <asm-generic/pgtable-nopud.h>
73909
73910-struct mm_struct;
73911-
73912 #define __PAGETABLE_PMD_FOLDED
73913
73914+#define PMD_SHIFT PUD_SHIFT
73915+#define PTRS_PER_PMD 1
73916+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
73917+#define PMD_MASK (~(PMD_SIZE-1))
73918+
73919+#ifndef __ASSEMBLY__
73920+
73921+struct mm_struct;
73922+
73923 /*
73924 * Having the pmd type consist of a pud gets the size right, and allows
73925 * us to conceptually access the pud entry that this pmd is folded into
73926@@ -16,11 +21,6 @@ struct mm_struct;
73927 */
73928 typedef struct { pud_t pud; } pmd_t;
73929
73930-#define PMD_SHIFT PUD_SHIFT
73931-#define PTRS_PER_PMD 1
73932-#define PMD_SIZE (1UL << PMD_SHIFT)
73933-#define PMD_MASK (~(PMD_SIZE-1))
73934-
73935 /*
73936 * The "pud_xxx()" functions here are trivial for a folded two-level
73937 * setup: the pmd is never bad, and a pmd always exists (as it's folded
73938diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
73939index 810431d..0ec4804f 100644
73940--- a/include/asm-generic/pgtable-nopud.h
73941+++ b/include/asm-generic/pgtable-nopud.h
73942@@ -1,10 +1,15 @@
73943 #ifndef _PGTABLE_NOPUD_H
73944 #define _PGTABLE_NOPUD_H
73945
73946-#ifndef __ASSEMBLY__
73947-
73948 #define __PAGETABLE_PUD_FOLDED
73949
73950+#define PUD_SHIFT PGDIR_SHIFT
73951+#define PTRS_PER_PUD 1
73952+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
73953+#define PUD_MASK (~(PUD_SIZE-1))
73954+
73955+#ifndef __ASSEMBLY__
73956+
73957 /*
73958 * Having the pud type consist of a pgd gets the size right, and allows
73959 * us to conceptually access the pgd entry that this pud is folded into
73960@@ -12,11 +17,6 @@
73961 */
73962 typedef struct { pgd_t pgd; } pud_t;
73963
73964-#define PUD_SHIFT PGDIR_SHIFT
73965-#define PTRS_PER_PUD 1
73966-#define PUD_SIZE (1UL << PUD_SHIFT)
73967-#define PUD_MASK (~(PUD_SIZE-1))
73968-
73969 /*
73970 * The "pgd_xxx()" functions here are trivial for a folded two-level
73971 * setup: the pud is never bad, and a pud always exists (as it's folded
73972@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
73973 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
73974
73975 #define pgd_populate(mm, pgd, pud) do { } while (0)
73976+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
73977 /*
73978 * (puds are folded into pgds so this doesn't get actually called,
73979 * but the define is needed for a generic inline function.)
73980diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
73981index b12079a..86683e3 100644
73982--- a/include/asm-generic/pgtable.h
73983+++ b/include/asm-generic/pgtable.h
73984@@ -599,11 +599,10 @@ static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd)
73985 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
73986 barrier();
73987 #endif
73988- if (pmd_none(pmdval))
73989+ if (pmd_none(pmdval) || pmd_trans_huge(pmdval))
73990 return 1;
73991 if (unlikely(pmd_bad(pmdval))) {
73992- if (!pmd_trans_huge(pmdval))
73993- pmd_clear_bad(pmd);
73994+ pmd_clear_bad(pmd);
73995 return 1;
73996 }
73997 return 0;
73998@@ -737,6 +736,22 @@ static inline pmd_t pmd_mknuma(pmd_t pmd)
73999 }
74000 #endif /* CONFIG_NUMA_BALANCING */
74001
74002+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
74003+#ifdef CONFIG_PAX_KERNEXEC
74004+#error KERNEXEC requires pax_open_kernel
74005+#else
74006+static inline unsigned long pax_open_kernel(void) { return 0; }
74007+#endif
74008+#endif
74009+
74010+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
74011+#ifdef CONFIG_PAX_KERNEXEC
74012+#error KERNEXEC requires pax_close_kernel
74013+#else
74014+static inline unsigned long pax_close_kernel(void) { return 0; }
74015+#endif
74016+#endif
74017+
74018 #endif /* CONFIG_MMU */
74019
74020 #endif /* !__ASSEMBLY__ */
74021diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
74022index dc1269c..48a4f51 100644
74023--- a/include/asm-generic/uaccess.h
74024+++ b/include/asm-generic/uaccess.h
74025@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
74026 return __clear_user(to, n);
74027 }
74028
74029+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
74030+#ifdef CONFIG_PAX_MEMORY_UDEREF
74031+#error UDEREF requires pax_open_userland
74032+#else
74033+static inline unsigned long pax_open_userland(void) { return 0; }
74034+#endif
74035+#endif
74036+
74037+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
74038+#ifdef CONFIG_PAX_MEMORY_UDEREF
74039+#error UDEREF requires pax_close_userland
74040+#else
74041+static inline unsigned long pax_close_userland(void) { return 0; }
74042+#endif
74043+#endif
74044+
74045 #endif /* __ASM_GENERIC_UACCESS_H */
74046diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
74047index 83e2c31..eeb4a04 100644
74048--- a/include/asm-generic/vmlinux.lds.h
74049+++ b/include/asm-generic/vmlinux.lds.h
74050@@ -232,6 +232,7 @@
74051 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
74052 VMLINUX_SYMBOL(__start_rodata) = .; \
74053 *(.rodata) *(.rodata.*) \
74054+ *(.data..read_only) \
74055 *(__vermagic) /* Kernel version magic */ \
74056 . = ALIGN(8); \
74057 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
74058@@ -715,17 +716,18 @@
74059 * section in the linker script will go there too. @phdr should have
74060 * a leading colon.
74061 *
74062- * Note that this macros defines __per_cpu_load as an absolute symbol.
74063+ * Note that this macros defines per_cpu_load as an absolute symbol.
74064 * If there is no need to put the percpu section at a predetermined
74065 * address, use PERCPU_SECTION.
74066 */
74067 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
74068- VMLINUX_SYMBOL(__per_cpu_load) = .; \
74069- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
74070+ per_cpu_load = .; \
74071+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
74072 - LOAD_OFFSET) { \
74073+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
74074 PERCPU_INPUT(cacheline) \
74075 } phdr \
74076- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
74077+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
74078
74079 /**
74080 * PERCPU_SECTION - define output section for percpu area, simple version
74081diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
74082index 418d270..bfd2794 100644
74083--- a/include/crypto/algapi.h
74084+++ b/include/crypto/algapi.h
74085@@ -34,7 +34,7 @@ struct crypto_type {
74086 unsigned int maskclear;
74087 unsigned int maskset;
74088 unsigned int tfmsize;
74089-};
74090+} __do_const;
74091
74092 struct crypto_instance {
74093 struct crypto_alg alg;
74094diff --git a/include/drm/drmP.h b/include/drm/drmP.h
74095index b46fb45..b30d6d5 100644
74096--- a/include/drm/drmP.h
74097+++ b/include/drm/drmP.h
74098@@ -66,6 +66,7 @@
74099 #include <linux/workqueue.h>
74100 #include <linux/poll.h>
74101 #include <asm/pgalloc.h>
74102+#include <asm/local.h>
74103 #include <drm/drm.h>
74104 #include <drm/drm_sarea.h>
74105 #include <drm/drm_vma_manager.h>
74106@@ -277,10 +278,12 @@ do { \
74107 * \param cmd command.
74108 * \param arg argument.
74109 */
74110-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
74111+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
74112+ struct drm_file *file_priv);
74113+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
74114 struct drm_file *file_priv);
74115
74116-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
74117+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
74118 unsigned long arg);
74119
74120 #define DRM_IOCTL_NR(n) _IOC_NR(n)
74121@@ -296,10 +299,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
74122 struct drm_ioctl_desc {
74123 unsigned int cmd;
74124 int flags;
74125- drm_ioctl_t *func;
74126+ drm_ioctl_t func;
74127 unsigned int cmd_drv;
74128 const char *name;
74129-};
74130+} __do_const;
74131
74132 /**
74133 * Creates a driver or general drm_ioctl_desc array entry for the given
74134@@ -1027,7 +1030,7 @@ struct drm_info_list {
74135 int (*show)(struct seq_file*, void*); /** show callback */
74136 u32 driver_features; /**< Required driver features for this entry */
74137 void *data;
74138-};
74139+} __do_const;
74140
74141 /**
74142 * debugfs node structure. This structure represents a debugfs file.
74143@@ -1098,7 +1101,7 @@ struct drm_device {
74144
74145 /** \name Usage Counters */
74146 /*@{ */
74147- int open_count; /**< Outstanding files open */
74148+ local_t open_count; /**< Outstanding files open */
74149 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
74150 atomic_t vma_count; /**< Outstanding vma areas open */
74151 int buf_use; /**< Buffers in use -- cannot alloc */
74152@@ -1109,7 +1112,7 @@ struct drm_device {
74153 /*@{ */
74154 unsigned long counters;
74155 enum drm_stat_type types[15];
74156- atomic_t counts[15];
74157+ atomic_unchecked_t counts[15];
74158 /*@} */
74159
74160 struct list_head filelist;
74161diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
74162index f43d556..94d9343 100644
74163--- a/include/drm/drm_crtc_helper.h
74164+++ b/include/drm/drm_crtc_helper.h
74165@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
74166 struct drm_connector *connector);
74167 /* disable encoder when not in use - more explicit than dpms off */
74168 void (*disable)(struct drm_encoder *encoder);
74169-};
74170+} __no_const;
74171
74172 /**
74173 * drm_connector_helper_funcs - helper operations for connectors
74174diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
74175index 8a10f5c..5de7f5c 100644
74176--- a/include/drm/i915_pciids.h
74177+++ b/include/drm/i915_pciids.h
74178@@ -37,7 +37,7 @@
74179 */
74180 #define INTEL_VGA_DEVICE(id, info) { \
74181 0x8086, id, \
74182- ~0, ~0, \
74183+ PCI_ANY_ID, PCI_ANY_ID, \
74184 0x030000, 0xff0000, \
74185 (unsigned long) info }
74186
74187diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
74188index 72dcbe8..8db58d7 100644
74189--- a/include/drm/ttm/ttm_memory.h
74190+++ b/include/drm/ttm/ttm_memory.h
74191@@ -48,7 +48,7 @@
74192
74193 struct ttm_mem_shrink {
74194 int (*do_shrink) (struct ttm_mem_shrink *);
74195-};
74196+} __no_const;
74197
74198 /**
74199 * struct ttm_mem_global - Global memory accounting structure.
74200diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
74201index 4b840e8..155d235 100644
74202--- a/include/keys/asymmetric-subtype.h
74203+++ b/include/keys/asymmetric-subtype.h
74204@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
74205 /* Verify the signature on a key of this subtype (optional) */
74206 int (*verify_signature)(const struct key *key,
74207 const struct public_key_signature *sig);
74208-};
74209+} __do_const;
74210
74211 /**
74212 * asymmetric_key_subtype - Get the subtype from an asymmetric key
74213diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
74214index c1da539..1dcec55 100644
74215--- a/include/linux/atmdev.h
74216+++ b/include/linux/atmdev.h
74217@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
74218 #endif
74219
74220 struct k_atm_aal_stats {
74221-#define __HANDLE_ITEM(i) atomic_t i
74222+#define __HANDLE_ITEM(i) atomic_unchecked_t i
74223 __AAL_STAT_ITEMS
74224 #undef __HANDLE_ITEM
74225 };
74226@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
74227 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
74228 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
74229 struct module *owner;
74230-};
74231+} __do_const ;
74232
74233 struct atmphy_ops {
74234 int (*start)(struct atm_dev *dev);
74235diff --git a/include/linux/audit.h b/include/linux/audit.h
74236index 729a4d1..9b304ae 100644
74237--- a/include/linux/audit.h
74238+++ b/include/linux/audit.h
74239@@ -193,7 +193,7 @@ static inline void audit_ptrace(struct task_struct *t)
74240 extern unsigned int audit_serial(void);
74241 extern int auditsc_get_stamp(struct audit_context *ctx,
74242 struct timespec *t, unsigned int *serial);
74243-extern int audit_set_loginuid(kuid_t loginuid);
74244+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
74245
74246 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
74247 {
74248diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
74249index 7554fd4..0f86379 100644
74250--- a/include/linux/binfmts.h
74251+++ b/include/linux/binfmts.h
74252@@ -73,8 +73,10 @@ struct linux_binfmt {
74253 int (*load_binary)(struct linux_binprm *);
74254 int (*load_shlib)(struct file *);
74255 int (*core_dump)(struct coredump_params *cprm);
74256+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
74257+ void (*handle_mmap)(struct file *);
74258 unsigned long min_coredump; /* minimal dump size */
74259-};
74260+} __do_const;
74261
74262 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
74263
74264diff --git a/include/linux/bitops.h b/include/linux/bitops.h
74265index a3b6b82..2a7d758 100644
74266--- a/include/linux/bitops.h
74267+++ b/include/linux/bitops.h
74268@@ -91,7 +91,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
74269 * @word: value to rotate
74270 * @shift: bits to roll
74271 */
74272-static inline __u32 rol32(__u32 word, unsigned int shift)
74273+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
74274 {
74275 return (word << shift) | (word >> (32 - shift));
74276 }
74277@@ -101,7 +101,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
74278 * @word: value to rotate
74279 * @shift: bits to roll
74280 */
74281-static inline __u32 ror32(__u32 word, unsigned int shift)
74282+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
74283 {
74284 return (word >> shift) | (word << (32 - shift));
74285 }
74286@@ -157,7 +157,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
74287 return (__s32)(value << shift) >> shift;
74288 }
74289
74290-static inline unsigned fls_long(unsigned long l)
74291+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
74292 {
74293 if (sizeof(l) == 4)
74294 return fls(l);
74295diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
74296index 0e6f765..885bb2b 100644
74297--- a/include/linux/blkdev.h
74298+++ b/include/linux/blkdev.h
74299@@ -1537,7 +1537,7 @@ struct block_device_operations {
74300 /* this callback is with swap_lock and sometimes page table lock held */
74301 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
74302 struct module *owner;
74303-};
74304+} __do_const;
74305
74306 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
74307 unsigned long);
74308diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
74309index 7c2e030..b72475d 100644
74310--- a/include/linux/blktrace_api.h
74311+++ b/include/linux/blktrace_api.h
74312@@ -23,7 +23,7 @@ struct blk_trace {
74313 struct dentry *dir;
74314 struct dentry *dropped_file;
74315 struct dentry *msg_file;
74316- atomic_t dropped;
74317+ atomic_unchecked_t dropped;
74318 };
74319
74320 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
74321diff --git a/include/linux/cache.h b/include/linux/cache.h
74322index 4c57065..40346da 100644
74323--- a/include/linux/cache.h
74324+++ b/include/linux/cache.h
74325@@ -16,6 +16,14 @@
74326 #define __read_mostly
74327 #endif
74328
74329+#ifndef __read_only
74330+#ifdef CONFIG_PAX_KERNEXEC
74331+#error KERNEXEC requires __read_only
74332+#else
74333+#define __read_only __read_mostly
74334+#endif
74335+#endif
74336+
74337 #ifndef ____cacheline_aligned
74338 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
74339 #endif
74340diff --git a/include/linux/capability.h b/include/linux/capability.h
74341index a6ee1f9..e1ca49d 100644
74342--- a/include/linux/capability.h
74343+++ b/include/linux/capability.h
74344@@ -212,8 +212,13 @@ extern bool capable(int cap);
74345 extern bool ns_capable(struct user_namespace *ns, int cap);
74346 extern bool inode_capable(const struct inode *inode, int cap);
74347 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
74348+extern bool capable_nolog(int cap);
74349+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
74350+extern bool inode_capable_nolog(const struct inode *inode, int cap);
74351
74352 /* audit system wants to get cap info from files as well */
74353 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
74354
74355+extern int is_privileged_binary(const struct dentry *dentry);
74356+
74357 #endif /* !_LINUX_CAPABILITY_H */
74358diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
74359index 8609d57..86e4d79 100644
74360--- a/include/linux/cdrom.h
74361+++ b/include/linux/cdrom.h
74362@@ -87,7 +87,6 @@ struct cdrom_device_ops {
74363
74364 /* driver specifications */
74365 const int capability; /* capability flags */
74366- int n_minors; /* number of active minor devices */
74367 /* handle uniform packets for scsi type devices (scsi,atapi) */
74368 int (*generic_packet) (struct cdrom_device_info *,
74369 struct packet_command *);
74370diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
74371index 4ce9056..86caac6 100644
74372--- a/include/linux/cleancache.h
74373+++ b/include/linux/cleancache.h
74374@@ -31,7 +31,7 @@ struct cleancache_ops {
74375 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
74376 void (*invalidate_inode)(int, struct cleancache_filekey);
74377 void (*invalidate_fs)(int);
74378-};
74379+} __no_const;
74380
74381 extern struct cleancache_ops *
74382 cleancache_register_ops(struct cleancache_ops *ops);
74383diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
74384index 73bdb69..d66d47a 100644
74385--- a/include/linux/clk-provider.h
74386+++ b/include/linux/clk-provider.h
74387@@ -141,6 +141,7 @@ struct clk_ops {
74388 unsigned long);
74389 void (*init)(struct clk_hw *hw);
74390 };
74391+typedef struct clk_ops __no_const clk_ops_no_const;
74392
74393 /**
74394 * struct clk_init_data - holds init data that's common to all clocks and is
74395diff --git a/include/linux/compat.h b/include/linux/compat.h
74396index 345da00..b6eff26 100644
74397--- a/include/linux/compat.h
74398+++ b/include/linux/compat.h
74399@@ -313,7 +313,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
74400 compat_size_t __user *len_ptr);
74401
74402 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
74403-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
74404+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
74405 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
74406 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
74407 compat_ssize_t msgsz, int msgflg);
74408@@ -420,7 +420,7 @@ extern int compat_ptrace_request(struct task_struct *child,
74409 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
74410 compat_ulong_t addr, compat_ulong_t data);
74411 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
74412- compat_long_t addr, compat_long_t data);
74413+ compat_ulong_t addr, compat_ulong_t data);
74414
74415 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t);
74416 /*
74417diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
74418index ded4299..da50e3b 100644
74419--- a/include/linux/compiler-gcc4.h
74420+++ b/include/linux/compiler-gcc4.h
74421@@ -39,9 +39,29 @@
74422 # define __compiletime_warning(message) __attribute__((warning(message)))
74423 # define __compiletime_error(message) __attribute__((error(message)))
74424 #endif /* __CHECKER__ */
74425+
74426+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
74427+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
74428+#define __bos0(ptr) __bos((ptr), 0)
74429+#define __bos1(ptr) __bos((ptr), 1)
74430 #endif /* GCC_VERSION >= 40300 */
74431
74432 #if GCC_VERSION >= 40500
74433+
74434+#ifdef CONSTIFY_PLUGIN
74435+#define __no_const __attribute__((no_const))
74436+#define __do_const __attribute__((do_const))
74437+#endif
74438+
74439+#ifdef SIZE_OVERFLOW_PLUGIN
74440+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
74441+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
74442+#endif
74443+
74444+#ifdef LATENT_ENTROPY_PLUGIN
74445+#define __latent_entropy __attribute__((latent_entropy))
74446+#endif
74447+
74448 /*
74449 * Mark a position in code as unreachable. This can be used to
74450 * suppress control flow warnings after asm blocks that transfer
74451diff --git a/include/linux/compiler.h b/include/linux/compiler.h
74452index 92669cd..1771a15 100644
74453--- a/include/linux/compiler.h
74454+++ b/include/linux/compiler.h
74455@@ -5,11 +5,14 @@
74456
74457 #ifdef __CHECKER__
74458 # define __user __attribute__((noderef, address_space(1)))
74459+# define __force_user __force __user
74460 # define __kernel __attribute__((address_space(0)))
74461+# define __force_kernel __force __kernel
74462 # define __safe __attribute__((safe))
74463 # define __force __attribute__((force))
74464 # define __nocast __attribute__((nocast))
74465 # define __iomem __attribute__((noderef, address_space(2)))
74466+# define __force_iomem __force __iomem
74467 # define __must_hold(x) __attribute__((context(x,1,1)))
74468 # define __acquires(x) __attribute__((context(x,0,1)))
74469 # define __releases(x) __attribute__((context(x,1,0)))
74470@@ -17,20 +20,37 @@
74471 # define __release(x) __context__(x,-1)
74472 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
74473 # define __percpu __attribute__((noderef, address_space(3)))
74474+# define __force_percpu __force __percpu
74475 #ifdef CONFIG_SPARSE_RCU_POINTER
74476 # define __rcu __attribute__((noderef, address_space(4)))
74477+# define __force_rcu __force __rcu
74478 #else
74479 # define __rcu
74480+# define __force_rcu
74481 #endif
74482 extern void __chk_user_ptr(const volatile void __user *);
74483 extern void __chk_io_ptr(const volatile void __iomem *);
74484 #else
74485-# define __user
74486-# define __kernel
74487+# ifdef CHECKER_PLUGIN
74488+//# define __user
74489+//# define __force_user
74490+//# define __kernel
74491+//# define __force_kernel
74492+# else
74493+# ifdef STRUCTLEAK_PLUGIN
74494+# define __user __attribute__((user))
74495+# else
74496+# define __user
74497+# endif
74498+# define __force_user
74499+# define __kernel
74500+# define __force_kernel
74501+# endif
74502 # define __safe
74503 # define __force
74504 # define __nocast
74505 # define __iomem
74506+# define __force_iomem
74507 # define __chk_user_ptr(x) (void)0
74508 # define __chk_io_ptr(x) (void)0
74509 # define __builtin_warning(x, y...) (1)
74510@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
74511 # define __release(x) (void)0
74512 # define __cond_lock(x,c) (c)
74513 # define __percpu
74514+# define __force_percpu
74515 # define __rcu
74516+# define __force_rcu
74517 #endif
74518
74519 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
74520@@ -275,6 +297,26 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74521 # define __attribute_const__ /* unimplemented */
74522 #endif
74523
74524+#ifndef __no_const
74525+# define __no_const
74526+#endif
74527+
74528+#ifndef __do_const
74529+# define __do_const
74530+#endif
74531+
74532+#ifndef __size_overflow
74533+# define __size_overflow(...)
74534+#endif
74535+
74536+#ifndef __intentional_overflow
74537+# define __intentional_overflow(...)
74538+#endif
74539+
74540+#ifndef __latent_entropy
74541+# define __latent_entropy
74542+#endif
74543+
74544 /*
74545 * Tell gcc if a function is cold. The compiler will assume any path
74546 * directly leading to the call is unlikely.
74547@@ -284,6 +326,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74548 #define __cold
74549 #endif
74550
74551+#ifndef __alloc_size
74552+#define __alloc_size(...)
74553+#endif
74554+
74555+#ifndef __bos
74556+#define __bos(ptr, arg)
74557+#endif
74558+
74559+#ifndef __bos0
74560+#define __bos0(ptr)
74561+#endif
74562+
74563+#ifndef __bos1
74564+#define __bos1(ptr)
74565+#endif
74566+
74567 /* Simple shorthand for a section definition */
74568 #ifndef __section
74569 # define __section(S) __attribute__ ((__section__(#S)))
74570@@ -349,7 +407,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
74571 * use is to mediate communication between process-level code and irq/NMI
74572 * handlers, all running on the same CPU.
74573 */
74574-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
74575+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
74576+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
74577
74578 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
74579 #ifdef CONFIG_KPROBES
74580diff --git a/include/linux/completion.h b/include/linux/completion.h
74581index 3cd574d..240dcb0 100644
74582--- a/include/linux/completion.h
74583+++ b/include/linux/completion.h
74584@@ -78,16 +78,16 @@ static inline void init_completion(struct completion *x)
74585
74586 extern void wait_for_completion(struct completion *);
74587 extern void wait_for_completion_io(struct completion *);
74588-extern int wait_for_completion_interruptible(struct completion *x);
74589-extern int wait_for_completion_killable(struct completion *x);
74590+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
74591+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
74592 extern unsigned long wait_for_completion_timeout(struct completion *x,
74593- unsigned long timeout);
74594+ unsigned long timeout) __intentional_overflow(-1);
74595 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
74596- unsigned long timeout);
74597+ unsigned long timeout) __intentional_overflow(-1);
74598 extern long wait_for_completion_interruptible_timeout(
74599- struct completion *x, unsigned long timeout);
74600+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
74601 extern long wait_for_completion_killable_timeout(
74602- struct completion *x, unsigned long timeout);
74603+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
74604 extern bool try_wait_for_completion(struct completion *x);
74605 extern bool completion_done(struct completion *x);
74606
74607diff --git a/include/linux/configfs.h b/include/linux/configfs.h
74608index 34025df..d94bbbc 100644
74609--- a/include/linux/configfs.h
74610+++ b/include/linux/configfs.h
74611@@ -125,7 +125,7 @@ struct configfs_attribute {
74612 const char *ca_name;
74613 struct module *ca_owner;
74614 umode_t ca_mode;
74615-};
74616+} __do_const;
74617
74618 /*
74619 * Users often need to create attribute structures for their configurable
74620diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
74621index fcabc42..cba5d93 100644
74622--- a/include/linux/cpufreq.h
74623+++ b/include/linux/cpufreq.h
74624@@ -167,6 +167,7 @@ struct global_attr {
74625 ssize_t (*store)(struct kobject *a, struct attribute *b,
74626 const char *c, size_t count);
74627 };
74628+typedef struct global_attr __no_const global_attr_no_const;
74629
74630 #define define_one_global_ro(_name) \
74631 static struct global_attr _name = \
74632@@ -208,7 +209,7 @@ struct cpufreq_driver {
74633 int (*suspend) (struct cpufreq_policy *policy);
74634 int (*resume) (struct cpufreq_policy *policy);
74635 struct freq_attr **attr;
74636-};
74637+} __do_const;
74638
74639 /* flags */
74640 #define CPUFREQ_STICKY 0x01 /* the driver isn't removed even if
74641diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
74642index 781addc..d1e1fe6 100644
74643--- a/include/linux/cpuidle.h
74644+++ b/include/linux/cpuidle.h
74645@@ -50,7 +50,8 @@ struct cpuidle_state {
74646 int index);
74647
74648 int (*enter_dead) (struct cpuidle_device *dev, int index);
74649-};
74650+} __do_const;
74651+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
74652
74653 /* Idle State Flags */
74654 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
74655@@ -192,7 +193,7 @@ struct cpuidle_governor {
74656 void (*reflect) (struct cpuidle_device *dev, int index);
74657
74658 struct module *owner;
74659-};
74660+} __do_const;
74661
74662 #ifdef CONFIG_CPU_IDLE
74663
74664diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
74665index d08e4d2..95fad61 100644
74666--- a/include/linux/cpumask.h
74667+++ b/include/linux/cpumask.h
74668@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
74669 }
74670
74671 /* Valid inputs for n are -1 and 0. */
74672-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74673+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
74674 {
74675 return n+1;
74676 }
74677
74678-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74679+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
74680 {
74681 return n+1;
74682 }
74683
74684-static inline unsigned int cpumask_next_and(int n,
74685+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
74686 const struct cpumask *srcp,
74687 const struct cpumask *andp)
74688 {
74689@@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
74690 *
74691 * Returns >= nr_cpu_ids if no further cpus set.
74692 */
74693-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74694+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
74695 {
74696 /* -1 is a legal arg here. */
74697 if (n != -1)
74698@@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
74699 *
74700 * Returns >= nr_cpu_ids if no further cpus unset.
74701 */
74702-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74703+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
74704 {
74705 /* -1 is a legal arg here. */
74706 if (n != -1)
74707@@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
74708 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
74709 }
74710
74711-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
74712+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
74713 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
74714
74715 /**
74716diff --git a/include/linux/cred.h b/include/linux/cred.h
74717index 04421e8..6bce4ef 100644
74718--- a/include/linux/cred.h
74719+++ b/include/linux/cred.h
74720@@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
74721 static inline void validate_process_creds(void)
74722 {
74723 }
74724+static inline void validate_task_creds(struct task_struct *task)
74725+{
74726+}
74727 #endif
74728
74729 /**
74730diff --git a/include/linux/crypto.h b/include/linux/crypto.h
74731index b92eadf..b4ecdc1 100644
74732--- a/include/linux/crypto.h
74733+++ b/include/linux/crypto.h
74734@@ -373,7 +373,7 @@ struct cipher_tfm {
74735 const u8 *key, unsigned int keylen);
74736 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
74737 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
74738-};
74739+} __no_const;
74740
74741 struct hash_tfm {
74742 int (*init)(struct hash_desc *desc);
74743@@ -394,13 +394,13 @@ struct compress_tfm {
74744 int (*cot_decompress)(struct crypto_tfm *tfm,
74745 const u8 *src, unsigned int slen,
74746 u8 *dst, unsigned int *dlen);
74747-};
74748+} __no_const;
74749
74750 struct rng_tfm {
74751 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
74752 unsigned int dlen);
74753 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
74754-};
74755+} __no_const;
74756
74757 #define crt_ablkcipher crt_u.ablkcipher
74758 #define crt_aead crt_u.aead
74759diff --git a/include/linux/ctype.h b/include/linux/ctype.h
74760index 653589e..4ef254a 100644
74761--- a/include/linux/ctype.h
74762+++ b/include/linux/ctype.h
74763@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
74764 * Fast implementation of tolower() for internal usage. Do not use in your
74765 * code.
74766 */
74767-static inline char _tolower(const char c)
74768+static inline unsigned char _tolower(const unsigned char c)
74769 {
74770 return c | 0x20;
74771 }
74772diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
74773index 7925bf0..d5143d2 100644
74774--- a/include/linux/decompress/mm.h
74775+++ b/include/linux/decompress/mm.h
74776@@ -77,7 +77,7 @@ static void free(void *where)
74777 * warnings when not needed (indeed large_malloc / large_free are not
74778 * needed by inflate */
74779
74780-#define malloc(a) kmalloc(a, GFP_KERNEL)
74781+#define malloc(a) kmalloc((a), GFP_KERNEL)
74782 #define free(a) kfree(a)
74783
74784 #define large_malloc(a) vmalloc(a)
74785diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
74786index 5f1ab92..39c35ae 100644
74787--- a/include/linux/devfreq.h
74788+++ b/include/linux/devfreq.h
74789@@ -114,7 +114,7 @@ struct devfreq_governor {
74790 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
74791 int (*event_handler)(struct devfreq *devfreq,
74792 unsigned int event, void *data);
74793-};
74794+} __do_const;
74795
74796 /**
74797 * struct devfreq - Device devfreq structure
74798diff --git a/include/linux/device.h b/include/linux/device.h
74799index 2a9d6ed..d14551e3 100644
74800--- a/include/linux/device.h
74801+++ b/include/linux/device.h
74802@@ -313,7 +313,7 @@ struct subsys_interface {
74803 struct list_head node;
74804 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
74805 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
74806-};
74807+} __do_const;
74808
74809 int subsys_interface_register(struct subsys_interface *sif);
74810 void subsys_interface_unregister(struct subsys_interface *sif);
74811@@ -501,7 +501,7 @@ struct device_type {
74812 void (*release)(struct device *dev);
74813
74814 const struct dev_pm_ops *pm;
74815-};
74816+} __do_const;
74817
74818 /* interface for exporting device attributes */
74819 struct device_attribute {
74820@@ -511,11 +511,12 @@ struct device_attribute {
74821 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
74822 const char *buf, size_t count);
74823 };
74824+typedef struct device_attribute __no_const device_attribute_no_const;
74825
74826 struct dev_ext_attribute {
74827 struct device_attribute attr;
74828 void *var;
74829-};
74830+} __do_const;
74831
74832 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
74833 char *buf);
74834diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
74835index 3a8d0a2..c762be2 100644
74836--- a/include/linux/dma-mapping.h
74837+++ b/include/linux/dma-mapping.h
74838@@ -54,7 +54,7 @@ struct dma_map_ops {
74839 u64 (*get_required_mask)(struct device *dev);
74840 #endif
74841 int is_phys;
74842-};
74843+} __do_const;
74844
74845 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
74846
74847diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
74848index 0bc7275..4ccbf11 100644
74849--- a/include/linux/dmaengine.h
74850+++ b/include/linux/dmaengine.h
74851@@ -1078,9 +1078,9 @@ struct dma_pinned_list {
74852 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
74853 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
74854
74855-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
74856+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
74857 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
74858-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
74859+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
74860 struct dma_pinned_list *pinned_list, struct page *page,
74861 unsigned int offset, size_t len);
74862
74863diff --git a/include/linux/efi.h b/include/linux/efi.h
74864index 094ddd0..f1dfcd3 100644
74865--- a/include/linux/efi.h
74866+++ b/include/linux/efi.h
74867@@ -745,6 +745,7 @@ struct efivar_operations {
74868 efi_set_variable_t *set_variable;
74869 efi_query_variable_store_t *query_variable_store;
74870 };
74871+typedef struct efivar_operations __no_const efivar_operations_no_const;
74872
74873 struct efivars {
74874 /*
74875diff --git a/include/linux/elf.h b/include/linux/elf.h
74876index 40a3c0e0..4c45a38 100644
74877--- a/include/linux/elf.h
74878+++ b/include/linux/elf.h
74879@@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
74880 #define elf_note elf32_note
74881 #define elf_addr_t Elf32_Off
74882 #define Elf_Half Elf32_Half
74883+#define elf_dyn Elf32_Dyn
74884
74885 #else
74886
74887@@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
74888 #define elf_note elf64_note
74889 #define elf_addr_t Elf64_Off
74890 #define Elf_Half Elf64_Half
74891+#define elf_dyn Elf64_Dyn
74892
74893 #endif
74894
74895diff --git a/include/linux/err.h b/include/linux/err.h
74896index 15f92e0..e825a8e 100644
74897--- a/include/linux/err.h
74898+++ b/include/linux/err.h
74899@@ -19,12 +19,12 @@
74900
74901 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
74902
74903-static inline void * __must_check ERR_PTR(long error)
74904+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
74905 {
74906 return (void *) error;
74907 }
74908
74909-static inline long __must_check PTR_ERR(__force const void *ptr)
74910+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
74911 {
74912 return (long) ptr;
74913 }
74914diff --git a/include/linux/extcon.h b/include/linux/extcon.h
74915index fcb51c8..bdafcf6 100644
74916--- a/include/linux/extcon.h
74917+++ b/include/linux/extcon.h
74918@@ -134,7 +134,7 @@ struct extcon_dev {
74919 /* /sys/class/extcon/.../mutually_exclusive/... */
74920 struct attribute_group attr_g_muex;
74921 struct attribute **attrs_muex;
74922- struct device_attribute *d_attrs_muex;
74923+ device_attribute_no_const *d_attrs_muex;
74924 };
74925
74926 /**
74927diff --git a/include/linux/fb.h b/include/linux/fb.h
74928index ffac70a..ca3e711 100644
74929--- a/include/linux/fb.h
74930+++ b/include/linux/fb.h
74931@@ -304,7 +304,7 @@ struct fb_ops {
74932 /* called at KDB enter and leave time to prepare the console */
74933 int (*fb_debug_enter)(struct fb_info *info);
74934 int (*fb_debug_leave)(struct fb_info *info);
74935-};
74936+} __do_const;
74937
74938 #ifdef CONFIG_FB_TILEBLITTING
74939 #define FB_TILE_CURSOR_NONE 0
74940diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
74941index 085197b..0fa6f0b 100644
74942--- a/include/linux/fdtable.h
74943+++ b/include/linux/fdtable.h
74944@@ -95,7 +95,7 @@ struct files_struct *get_files_struct(struct task_struct *);
74945 void put_files_struct(struct files_struct *fs);
74946 void reset_files_struct(struct files_struct *);
74947 int unshare_files(struct files_struct **);
74948-struct files_struct *dup_fd(struct files_struct *, int *);
74949+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
74950 void do_close_on_exec(struct files_struct *);
74951 int iterate_fd(struct files_struct *, unsigned,
74952 int (*)(const void *, struct file *, unsigned),
74953diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
74954index 8293262..2b3b8bd 100644
74955--- a/include/linux/frontswap.h
74956+++ b/include/linux/frontswap.h
74957@@ -11,7 +11,7 @@ struct frontswap_ops {
74958 int (*load)(unsigned, pgoff_t, struct page *);
74959 void (*invalidate_page)(unsigned, pgoff_t);
74960 void (*invalidate_area)(unsigned);
74961-};
74962+} __no_const;
74963
74964 extern bool frontswap_enabled;
74965 extern struct frontswap_ops *
74966diff --git a/include/linux/fs.h b/include/linux/fs.h
74967index 164d2a9..0ffa41d0 100644
74968--- a/include/linux/fs.h
74969+++ b/include/linux/fs.h
74970@@ -1552,7 +1552,8 @@ struct file_operations {
74971 long (*fallocate)(struct file *file, int mode, loff_t offset,
74972 loff_t len);
74973 int (*show_fdinfo)(struct seq_file *m, struct file *f);
74974-};
74975+} __do_const;
74976+typedef struct file_operations __no_const file_operations_no_const;
74977
74978 struct inode_operations {
74979 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
74980@@ -2747,4 +2748,14 @@ static inline bool dir_relax(struct inode *inode)
74981 return !IS_DEADDIR(inode);
74982 }
74983
74984+static inline bool is_sidechannel_device(const struct inode *inode)
74985+{
74986+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
74987+ umode_t mode = inode->i_mode;
74988+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
74989+#else
74990+ return false;
74991+#endif
74992+}
74993+
74994 #endif /* _LINUX_FS_H */
74995diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
74996index 0efc3e6..e0e1e5f 100644
74997--- a/include/linux/fs_struct.h
74998+++ b/include/linux/fs_struct.h
74999@@ -6,7 +6,7 @@
75000 #include <linux/seqlock.h>
75001
75002 struct fs_struct {
75003- int users;
75004+ atomic_t users;
75005 spinlock_t lock;
75006 seqcount_t seq;
75007 int umask;
75008diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
75009index 7823e9e..56b6f2f 100644
75010--- a/include/linux/fscache-cache.h
75011+++ b/include/linux/fscache-cache.h
75012@@ -113,7 +113,7 @@ struct fscache_operation {
75013 fscache_operation_release_t release;
75014 };
75015
75016-extern atomic_t fscache_op_debug_id;
75017+extern atomic_unchecked_t fscache_op_debug_id;
75018 extern void fscache_op_work_func(struct work_struct *work);
75019
75020 extern void fscache_enqueue_operation(struct fscache_operation *);
75021@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
75022 INIT_WORK(&op->work, fscache_op_work_func);
75023 atomic_set(&op->usage, 1);
75024 op->state = FSCACHE_OP_ST_INITIALISED;
75025- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
75026+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
75027 op->processor = processor;
75028 op->release = release;
75029 INIT_LIST_HEAD(&op->pend_link);
75030diff --git a/include/linux/fscache.h b/include/linux/fscache.h
75031index 19b4645..3b73dfc 100644
75032--- a/include/linux/fscache.h
75033+++ b/include/linux/fscache.h
75034@@ -152,7 +152,7 @@ struct fscache_cookie_def {
75035 * - this is mandatory for any object that may have data
75036 */
75037 void (*now_uncached)(void *cookie_netfs_data);
75038-};
75039+} __do_const;
75040
75041 /*
75042 * fscache cached network filesystem type
75043diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
75044index 1c804b0..1432c2b 100644
75045--- a/include/linux/fsnotify.h
75046+++ b/include/linux/fsnotify.h
75047@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
75048 struct inode *inode = file_inode(file);
75049 __u32 mask = FS_ACCESS;
75050
75051+ if (is_sidechannel_device(inode))
75052+ return;
75053+
75054 if (S_ISDIR(inode->i_mode))
75055 mask |= FS_ISDIR;
75056
75057@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
75058 struct inode *inode = file_inode(file);
75059 __u32 mask = FS_MODIFY;
75060
75061+ if (is_sidechannel_device(inode))
75062+ return;
75063+
75064 if (S_ISDIR(inode->i_mode))
75065 mask |= FS_ISDIR;
75066
75067@@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
75068 */
75069 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
75070 {
75071- return kstrdup(name, GFP_KERNEL);
75072+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
75073 }
75074
75075 /*
75076diff --git a/include/linux/genhd.h b/include/linux/genhd.h
75077index 9f3c275..8bdff5d 100644
75078--- a/include/linux/genhd.h
75079+++ b/include/linux/genhd.h
75080@@ -194,7 +194,7 @@ struct gendisk {
75081 struct kobject *slave_dir;
75082
75083 struct timer_rand_state *random;
75084- atomic_t sync_io; /* RAID */
75085+ atomic_unchecked_t sync_io; /* RAID */
75086 struct disk_events *ev;
75087 #ifdef CONFIG_BLK_DEV_INTEGRITY
75088 struct blk_integrity *integrity;
75089@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
75090 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
75091
75092 /* drivers/char/random.c */
75093-extern void add_disk_randomness(struct gendisk *disk);
75094+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
75095 extern void rand_initialize_disk(struct gendisk *disk);
75096
75097 static inline sector_t get_start_sect(struct block_device *bdev)
75098diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
75099index 023bc34..b02b46a 100644
75100--- a/include/linux/genl_magic_func.h
75101+++ b/include/linux/genl_magic_func.h
75102@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
75103 },
75104
75105 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
75106-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
75107+static struct genl_ops ZZZ_genl_ops[] = {
75108 #include GENL_MAGIC_INCLUDE_FILE
75109 };
75110
75111diff --git a/include/linux/gfp.h b/include/linux/gfp.h
75112index 9b4dd49..61fd41d 100644
75113--- a/include/linux/gfp.h
75114+++ b/include/linux/gfp.h
75115@@ -35,6 +35,13 @@ struct vm_area_struct;
75116 #define ___GFP_NO_KSWAPD 0x400000u
75117 #define ___GFP_OTHER_NODE 0x800000u
75118 #define ___GFP_WRITE 0x1000000u
75119+
75120+#ifdef CONFIG_PAX_USERCOPY_SLABS
75121+#define ___GFP_USERCOPY 0x2000000u
75122+#else
75123+#define ___GFP_USERCOPY 0
75124+#endif
75125+
75126 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
75127
75128 /*
75129@@ -92,6 +99,7 @@ struct vm_area_struct;
75130 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
75131 #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
75132 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
75133+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
75134
75135 /*
75136 * This may seem redundant, but it's a way of annotating false positives vs.
75137@@ -99,7 +107,7 @@ struct vm_area_struct;
75138 */
75139 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
75140
75141-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
75142+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
75143 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
75144
75145 /* This equals 0, but use constants in case they ever change */
75146@@ -153,6 +161,8 @@ struct vm_area_struct;
75147 /* 4GB DMA on some platforms */
75148 #define GFP_DMA32 __GFP_DMA32
75149
75150+#define GFP_USERCOPY __GFP_USERCOPY
75151+
75152 /* Convert GFP flags to their corresponding migrate type */
75153 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
75154 {
75155diff --git a/include/linux/gracl.h b/include/linux/gracl.h
75156new file mode 100644
75157index 0000000..edb2cb6
75158--- /dev/null
75159+++ b/include/linux/gracl.h
75160@@ -0,0 +1,340 @@
75161+#ifndef GR_ACL_H
75162+#define GR_ACL_H
75163+
75164+#include <linux/grdefs.h>
75165+#include <linux/resource.h>
75166+#include <linux/capability.h>
75167+#include <linux/dcache.h>
75168+#include <asm/resource.h>
75169+
75170+/* Major status information */
75171+
75172+#define GR_VERSION "grsecurity 3.0"
75173+#define GRSECURITY_VERSION 0x3000
75174+
75175+enum {
75176+ GR_SHUTDOWN = 0,
75177+ GR_ENABLE = 1,
75178+ GR_SPROLE = 2,
75179+ GR_OLDRELOAD = 3,
75180+ GR_SEGVMOD = 4,
75181+ GR_STATUS = 5,
75182+ GR_UNSPROLE = 6,
75183+ GR_PASSSET = 7,
75184+ GR_SPROLEPAM = 8,
75185+ GR_RELOAD = 9,
75186+};
75187+
75188+/* Password setup definitions
75189+ * kernel/grhash.c */
75190+enum {
75191+ GR_PW_LEN = 128,
75192+ GR_SALT_LEN = 16,
75193+ GR_SHA_LEN = 32,
75194+};
75195+
75196+enum {
75197+ GR_SPROLE_LEN = 64,
75198+};
75199+
75200+enum {
75201+ GR_NO_GLOB = 0,
75202+ GR_REG_GLOB,
75203+ GR_CREATE_GLOB
75204+};
75205+
75206+#define GR_NLIMITS 32
75207+
75208+/* Begin Data Structures */
75209+
75210+struct sprole_pw {
75211+ unsigned char *rolename;
75212+ unsigned char salt[GR_SALT_LEN];
75213+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
75214+};
75215+
75216+struct name_entry {
75217+ __u32 key;
75218+ ino_t inode;
75219+ dev_t device;
75220+ char *name;
75221+ __u16 len;
75222+ __u8 deleted;
75223+ struct name_entry *prev;
75224+ struct name_entry *next;
75225+};
75226+
75227+struct inodev_entry {
75228+ struct name_entry *nentry;
75229+ struct inodev_entry *prev;
75230+ struct inodev_entry *next;
75231+};
75232+
75233+struct acl_role_db {
75234+ struct acl_role_label **r_hash;
75235+ __u32 r_size;
75236+};
75237+
75238+struct inodev_db {
75239+ struct inodev_entry **i_hash;
75240+ __u32 i_size;
75241+};
75242+
75243+struct name_db {
75244+ struct name_entry **n_hash;
75245+ __u32 n_size;
75246+};
75247+
75248+struct crash_uid {
75249+ uid_t uid;
75250+ unsigned long expires;
75251+};
75252+
75253+struct gr_hash_struct {
75254+ void **table;
75255+ void **nametable;
75256+ void *first;
75257+ __u32 table_size;
75258+ __u32 used_size;
75259+ int type;
75260+};
75261+
75262+/* Userspace Grsecurity ACL data structures */
75263+
75264+struct acl_subject_label {
75265+ char *filename;
75266+ ino_t inode;
75267+ dev_t device;
75268+ __u32 mode;
75269+ kernel_cap_t cap_mask;
75270+ kernel_cap_t cap_lower;
75271+ kernel_cap_t cap_invert_audit;
75272+
75273+ struct rlimit res[GR_NLIMITS];
75274+ __u32 resmask;
75275+
75276+ __u8 user_trans_type;
75277+ __u8 group_trans_type;
75278+ uid_t *user_transitions;
75279+ gid_t *group_transitions;
75280+ __u16 user_trans_num;
75281+ __u16 group_trans_num;
75282+
75283+ __u32 sock_families[2];
75284+ __u32 ip_proto[8];
75285+ __u32 ip_type;
75286+ struct acl_ip_label **ips;
75287+ __u32 ip_num;
75288+ __u32 inaddr_any_override;
75289+
75290+ __u32 crashes;
75291+ unsigned long expires;
75292+
75293+ struct acl_subject_label *parent_subject;
75294+ struct gr_hash_struct *hash;
75295+ struct acl_subject_label *prev;
75296+ struct acl_subject_label *next;
75297+
75298+ struct acl_object_label **obj_hash;
75299+ __u32 obj_hash_size;
75300+ __u16 pax_flags;
75301+};
75302+
75303+struct role_allowed_ip {
75304+ __u32 addr;
75305+ __u32 netmask;
75306+
75307+ struct role_allowed_ip *prev;
75308+ struct role_allowed_ip *next;
75309+};
75310+
75311+struct role_transition {
75312+ char *rolename;
75313+
75314+ struct role_transition *prev;
75315+ struct role_transition *next;
75316+};
75317+
75318+struct acl_role_label {
75319+ char *rolename;
75320+ uid_t uidgid;
75321+ __u16 roletype;
75322+
75323+ __u16 auth_attempts;
75324+ unsigned long expires;
75325+
75326+ struct acl_subject_label *root_label;
75327+ struct gr_hash_struct *hash;
75328+
75329+ struct acl_role_label *prev;
75330+ struct acl_role_label *next;
75331+
75332+ struct role_transition *transitions;
75333+ struct role_allowed_ip *allowed_ips;
75334+ uid_t *domain_children;
75335+ __u16 domain_child_num;
75336+
75337+ umode_t umask;
75338+
75339+ struct acl_subject_label **subj_hash;
75340+ __u32 subj_hash_size;
75341+};
75342+
75343+struct user_acl_role_db {
75344+ struct acl_role_label **r_table;
75345+ __u32 num_pointers; /* Number of allocations to track */
75346+ __u32 num_roles; /* Number of roles */
75347+ __u32 num_domain_children; /* Number of domain children */
75348+ __u32 num_subjects; /* Number of subjects */
75349+ __u32 num_objects; /* Number of objects */
75350+};
75351+
75352+struct acl_object_label {
75353+ char *filename;
75354+ ino_t inode;
75355+ dev_t device;
75356+ __u32 mode;
75357+
75358+ struct acl_subject_label *nested;
75359+ struct acl_object_label *globbed;
75360+
75361+ /* next two structures not used */
75362+
75363+ struct acl_object_label *prev;
75364+ struct acl_object_label *next;
75365+};
75366+
75367+struct acl_ip_label {
75368+ char *iface;
75369+ __u32 addr;
75370+ __u32 netmask;
75371+ __u16 low, high;
75372+ __u8 mode;
75373+ __u32 type;
75374+ __u32 proto[8];
75375+
75376+ /* next two structures not used */
75377+
75378+ struct acl_ip_label *prev;
75379+ struct acl_ip_label *next;
75380+};
75381+
75382+struct gr_arg {
75383+ struct user_acl_role_db role_db;
75384+ unsigned char pw[GR_PW_LEN];
75385+ unsigned char salt[GR_SALT_LEN];
75386+ unsigned char sum[GR_SHA_LEN];
75387+ unsigned char sp_role[GR_SPROLE_LEN];
75388+ struct sprole_pw *sprole_pws;
75389+ dev_t segv_device;
75390+ ino_t segv_inode;
75391+ uid_t segv_uid;
75392+ __u16 num_sprole_pws;
75393+ __u16 mode;
75394+};
75395+
75396+struct gr_arg_wrapper {
75397+ struct gr_arg *arg;
75398+ __u32 version;
75399+ __u32 size;
75400+};
75401+
75402+struct subject_map {
75403+ struct acl_subject_label *user;
75404+ struct acl_subject_label *kernel;
75405+ struct subject_map *prev;
75406+ struct subject_map *next;
75407+};
75408+
75409+struct acl_subj_map_db {
75410+ struct subject_map **s_hash;
75411+ __u32 s_size;
75412+};
75413+
75414+struct gr_policy_state {
75415+ struct sprole_pw **acl_special_roles;
75416+ __u16 num_sprole_pws;
75417+ struct acl_role_label *kernel_role;
75418+ struct acl_role_label *role_list;
75419+ struct acl_role_label *default_role;
75420+ struct acl_role_db acl_role_set;
75421+ struct acl_subj_map_db subj_map_set;
75422+ struct name_db name_set;
75423+ struct inodev_db inodev_set;
75424+};
75425+
75426+struct gr_alloc_state {
75427+ unsigned long alloc_stack_next;
75428+ unsigned long alloc_stack_size;
75429+ void **alloc_stack;
75430+};
75431+
75432+struct gr_reload_state {
75433+ struct gr_policy_state oldpolicy;
75434+ struct gr_alloc_state oldalloc;
75435+ struct gr_policy_state newpolicy;
75436+ struct gr_alloc_state newalloc;
75437+ struct gr_policy_state *oldpolicy_ptr;
75438+ struct gr_alloc_state *oldalloc_ptr;
75439+ unsigned char oldmode;
75440+};
75441+
75442+/* End Data Structures Section */
75443+
75444+/* Hash functions generated by empirical testing by Brad Spengler
75445+ Makes good use of the low bits of the inode. Generally 0-1 times
75446+ in loop for successful match. 0-3 for unsuccessful match.
75447+ Shift/add algorithm with modulus of table size and an XOR*/
75448+
75449+static __inline__ unsigned int
75450+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
75451+{
75452+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
75453+}
75454+
75455+ static __inline__ unsigned int
75456+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
75457+{
75458+ return ((const unsigned long)userp % sz);
75459+}
75460+
75461+static __inline__ unsigned int
75462+gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
75463+{
75464+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
75465+}
75466+
75467+static __inline__ unsigned int
75468+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
75469+{
75470+ return full_name_hash((const unsigned char *)name, len) % sz;
75471+}
75472+
75473+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
75474+ subj = NULL; \
75475+ iter = 0; \
75476+ while (iter < role->subj_hash_size) { \
75477+ if (subj == NULL) \
75478+ subj = role->subj_hash[iter]; \
75479+ if (subj == NULL) { \
75480+ iter++; \
75481+ continue; \
75482+ }
75483+
75484+#define FOR_EACH_SUBJECT_END(subj,iter) \
75485+ subj = subj->next; \
75486+ if (subj == NULL) \
75487+ iter++; \
75488+ }
75489+
75490+
75491+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
75492+ subj = role->hash->first; \
75493+ while (subj != NULL) {
75494+
75495+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
75496+ subj = subj->next; \
75497+ }
75498+
75499+#endif
75500+
75501diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
75502new file mode 100644
75503index 0000000..33ebd1f
75504--- /dev/null
75505+++ b/include/linux/gracl_compat.h
75506@@ -0,0 +1,156 @@
75507+#ifndef GR_ACL_COMPAT_H
75508+#define GR_ACL_COMPAT_H
75509+
75510+#include <linux/resource.h>
75511+#include <asm/resource.h>
75512+
75513+struct sprole_pw_compat {
75514+ compat_uptr_t rolename;
75515+ unsigned char salt[GR_SALT_LEN];
75516+ unsigned char sum[GR_SHA_LEN];
75517+};
75518+
75519+struct gr_hash_struct_compat {
75520+ compat_uptr_t table;
75521+ compat_uptr_t nametable;
75522+ compat_uptr_t first;
75523+ __u32 table_size;
75524+ __u32 used_size;
75525+ int type;
75526+};
75527+
75528+struct acl_subject_label_compat {
75529+ compat_uptr_t filename;
75530+ compat_ino_t inode;
75531+ __u32 device;
75532+ __u32 mode;
75533+ kernel_cap_t cap_mask;
75534+ kernel_cap_t cap_lower;
75535+ kernel_cap_t cap_invert_audit;
75536+
75537+ struct compat_rlimit res[GR_NLIMITS];
75538+ __u32 resmask;
75539+
75540+ __u8 user_trans_type;
75541+ __u8 group_trans_type;
75542+ compat_uptr_t user_transitions;
75543+ compat_uptr_t group_transitions;
75544+ __u16 user_trans_num;
75545+ __u16 group_trans_num;
75546+
75547+ __u32 sock_families[2];
75548+ __u32 ip_proto[8];
75549+ __u32 ip_type;
75550+ compat_uptr_t ips;
75551+ __u32 ip_num;
75552+ __u32 inaddr_any_override;
75553+
75554+ __u32 crashes;
75555+ compat_ulong_t expires;
75556+
75557+ compat_uptr_t parent_subject;
75558+ compat_uptr_t hash;
75559+ compat_uptr_t prev;
75560+ compat_uptr_t next;
75561+
75562+ compat_uptr_t obj_hash;
75563+ __u32 obj_hash_size;
75564+ __u16 pax_flags;
75565+};
75566+
75567+struct role_allowed_ip_compat {
75568+ __u32 addr;
75569+ __u32 netmask;
75570+
75571+ compat_uptr_t prev;
75572+ compat_uptr_t next;
75573+};
75574+
75575+struct role_transition_compat {
75576+ compat_uptr_t rolename;
75577+
75578+ compat_uptr_t prev;
75579+ compat_uptr_t next;
75580+};
75581+
75582+struct acl_role_label_compat {
75583+ compat_uptr_t rolename;
75584+ uid_t uidgid;
75585+ __u16 roletype;
75586+
75587+ __u16 auth_attempts;
75588+ compat_ulong_t expires;
75589+
75590+ compat_uptr_t root_label;
75591+ compat_uptr_t hash;
75592+
75593+ compat_uptr_t prev;
75594+ compat_uptr_t next;
75595+
75596+ compat_uptr_t transitions;
75597+ compat_uptr_t allowed_ips;
75598+ compat_uptr_t domain_children;
75599+ __u16 domain_child_num;
75600+
75601+ umode_t umask;
75602+
75603+ compat_uptr_t subj_hash;
75604+ __u32 subj_hash_size;
75605+};
75606+
75607+struct user_acl_role_db_compat {
75608+ compat_uptr_t r_table;
75609+ __u32 num_pointers;
75610+ __u32 num_roles;
75611+ __u32 num_domain_children;
75612+ __u32 num_subjects;
75613+ __u32 num_objects;
75614+};
75615+
75616+struct acl_object_label_compat {
75617+ compat_uptr_t filename;
75618+ compat_ino_t inode;
75619+ __u32 device;
75620+ __u32 mode;
75621+
75622+ compat_uptr_t nested;
75623+ compat_uptr_t globbed;
75624+
75625+ compat_uptr_t prev;
75626+ compat_uptr_t next;
75627+};
75628+
75629+struct acl_ip_label_compat {
75630+ compat_uptr_t iface;
75631+ __u32 addr;
75632+ __u32 netmask;
75633+ __u16 low, high;
75634+ __u8 mode;
75635+ __u32 type;
75636+ __u32 proto[8];
75637+
75638+ compat_uptr_t prev;
75639+ compat_uptr_t next;
75640+};
75641+
75642+struct gr_arg_compat {
75643+ struct user_acl_role_db_compat role_db;
75644+ unsigned char pw[GR_PW_LEN];
75645+ unsigned char salt[GR_SALT_LEN];
75646+ unsigned char sum[GR_SHA_LEN];
75647+ unsigned char sp_role[GR_SPROLE_LEN];
75648+ compat_uptr_t sprole_pws;
75649+ __u32 segv_device;
75650+ compat_ino_t segv_inode;
75651+ uid_t segv_uid;
75652+ __u16 num_sprole_pws;
75653+ __u16 mode;
75654+};
75655+
75656+struct gr_arg_wrapper_compat {
75657+ compat_uptr_t arg;
75658+ __u32 version;
75659+ __u32 size;
75660+};
75661+
75662+#endif
75663diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
75664new file mode 100644
75665index 0000000..323ecf2
75666--- /dev/null
75667+++ b/include/linux/gralloc.h
75668@@ -0,0 +1,9 @@
75669+#ifndef __GRALLOC_H
75670+#define __GRALLOC_H
75671+
75672+void acl_free_all(void);
75673+int acl_alloc_stack_init(unsigned long size);
75674+void *acl_alloc(unsigned long len);
75675+void *acl_alloc_num(unsigned long num, unsigned long len);
75676+
75677+#endif
75678diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
75679new file mode 100644
75680index 0000000..be66033
75681--- /dev/null
75682+++ b/include/linux/grdefs.h
75683@@ -0,0 +1,140 @@
75684+#ifndef GRDEFS_H
75685+#define GRDEFS_H
75686+
75687+/* Begin grsecurity status declarations */
75688+
75689+enum {
75690+ GR_READY = 0x01,
75691+ GR_STATUS_INIT = 0x00 // disabled state
75692+};
75693+
75694+/* Begin ACL declarations */
75695+
75696+/* Role flags */
75697+
75698+enum {
75699+ GR_ROLE_USER = 0x0001,
75700+ GR_ROLE_GROUP = 0x0002,
75701+ GR_ROLE_DEFAULT = 0x0004,
75702+ GR_ROLE_SPECIAL = 0x0008,
75703+ GR_ROLE_AUTH = 0x0010,
75704+ GR_ROLE_NOPW = 0x0020,
75705+ GR_ROLE_GOD = 0x0040,
75706+ GR_ROLE_LEARN = 0x0080,
75707+ GR_ROLE_TPE = 0x0100,
75708+ GR_ROLE_DOMAIN = 0x0200,
75709+ GR_ROLE_PAM = 0x0400,
75710+ GR_ROLE_PERSIST = 0x0800
75711+};
75712+
75713+/* ACL Subject and Object mode flags */
75714+enum {
75715+ GR_DELETED = 0x80000000
75716+};
75717+
75718+/* ACL Object-only mode flags */
75719+enum {
75720+ GR_READ = 0x00000001,
75721+ GR_APPEND = 0x00000002,
75722+ GR_WRITE = 0x00000004,
75723+ GR_EXEC = 0x00000008,
75724+ GR_FIND = 0x00000010,
75725+ GR_INHERIT = 0x00000020,
75726+ GR_SETID = 0x00000040,
75727+ GR_CREATE = 0x00000080,
75728+ GR_DELETE = 0x00000100,
75729+ GR_LINK = 0x00000200,
75730+ GR_AUDIT_READ = 0x00000400,
75731+ GR_AUDIT_APPEND = 0x00000800,
75732+ GR_AUDIT_WRITE = 0x00001000,
75733+ GR_AUDIT_EXEC = 0x00002000,
75734+ GR_AUDIT_FIND = 0x00004000,
75735+ GR_AUDIT_INHERIT= 0x00008000,
75736+ GR_AUDIT_SETID = 0x00010000,
75737+ GR_AUDIT_CREATE = 0x00020000,
75738+ GR_AUDIT_DELETE = 0x00040000,
75739+ GR_AUDIT_LINK = 0x00080000,
75740+ GR_PTRACERD = 0x00100000,
75741+ GR_NOPTRACE = 0x00200000,
75742+ GR_SUPPRESS = 0x00400000,
75743+ GR_NOLEARN = 0x00800000,
75744+ GR_INIT_TRANSFER= 0x01000000
75745+};
75746+
75747+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
75748+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
75749+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
75750+
75751+/* ACL subject-only mode flags */
75752+enum {
75753+ GR_KILL = 0x00000001,
75754+ GR_VIEW = 0x00000002,
75755+ GR_PROTECTED = 0x00000004,
75756+ GR_LEARN = 0x00000008,
75757+ GR_OVERRIDE = 0x00000010,
75758+ /* just a placeholder, this mode is only used in userspace */
75759+ GR_DUMMY = 0x00000020,
75760+ GR_PROTSHM = 0x00000040,
75761+ GR_KILLPROC = 0x00000080,
75762+ GR_KILLIPPROC = 0x00000100,
75763+ /* just a placeholder, this mode is only used in userspace */
75764+ GR_NOTROJAN = 0x00000200,
75765+ GR_PROTPROCFD = 0x00000400,
75766+ GR_PROCACCT = 0x00000800,
75767+ GR_RELAXPTRACE = 0x00001000,
75768+ //GR_NESTED = 0x00002000,
75769+ GR_INHERITLEARN = 0x00004000,
75770+ GR_PROCFIND = 0x00008000,
75771+ GR_POVERRIDE = 0x00010000,
75772+ GR_KERNELAUTH = 0x00020000,
75773+ GR_ATSECURE = 0x00040000,
75774+ GR_SHMEXEC = 0x00080000
75775+};
75776+
75777+enum {
75778+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
75779+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
75780+ GR_PAX_ENABLE_MPROTECT = 0x0004,
75781+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
75782+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
75783+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
75784+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
75785+ GR_PAX_DISABLE_MPROTECT = 0x0400,
75786+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
75787+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
75788+};
75789+
75790+enum {
75791+ GR_ID_USER = 0x01,
75792+ GR_ID_GROUP = 0x02,
75793+};
75794+
75795+enum {
75796+ GR_ID_ALLOW = 0x01,
75797+ GR_ID_DENY = 0x02,
75798+};
75799+
75800+#define GR_CRASH_RES 31
75801+#define GR_UIDTABLE_MAX 500
75802+
75803+/* begin resource learning section */
75804+enum {
75805+ GR_RLIM_CPU_BUMP = 60,
75806+ GR_RLIM_FSIZE_BUMP = 50000,
75807+ GR_RLIM_DATA_BUMP = 10000,
75808+ GR_RLIM_STACK_BUMP = 1000,
75809+ GR_RLIM_CORE_BUMP = 10000,
75810+ GR_RLIM_RSS_BUMP = 500000,
75811+ GR_RLIM_NPROC_BUMP = 1,
75812+ GR_RLIM_NOFILE_BUMP = 5,
75813+ GR_RLIM_MEMLOCK_BUMP = 50000,
75814+ GR_RLIM_AS_BUMP = 500000,
75815+ GR_RLIM_LOCKS_BUMP = 2,
75816+ GR_RLIM_SIGPENDING_BUMP = 5,
75817+ GR_RLIM_MSGQUEUE_BUMP = 10000,
75818+ GR_RLIM_NICE_BUMP = 1,
75819+ GR_RLIM_RTPRIO_BUMP = 1,
75820+ GR_RLIM_RTTIME_BUMP = 1000000
75821+};
75822+
75823+#endif
75824diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
75825new file mode 100644
75826index 0000000..d25522e
75827--- /dev/null
75828+++ b/include/linux/grinternal.h
75829@@ -0,0 +1,229 @@
75830+#ifndef __GRINTERNAL_H
75831+#define __GRINTERNAL_H
75832+
75833+#ifdef CONFIG_GRKERNSEC
75834+
75835+#include <linux/fs.h>
75836+#include <linux/mnt_namespace.h>
75837+#include <linux/nsproxy.h>
75838+#include <linux/gracl.h>
75839+#include <linux/grdefs.h>
75840+#include <linux/grmsg.h>
75841+
75842+void gr_add_learn_entry(const char *fmt, ...)
75843+ __attribute__ ((format (printf, 1, 2)));
75844+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
75845+ const struct vfsmount *mnt);
75846+__u32 gr_check_create(const struct dentry *new_dentry,
75847+ const struct dentry *parent,
75848+ const struct vfsmount *mnt, const __u32 mode);
75849+int gr_check_protected_task(const struct task_struct *task);
75850+__u32 to_gr_audit(const __u32 reqmode);
75851+int gr_set_acls(const int type);
75852+int gr_acl_is_enabled(void);
75853+char gr_roletype_to_char(void);
75854+
75855+void gr_handle_alertkill(struct task_struct *task);
75856+char *gr_to_filename(const struct dentry *dentry,
75857+ const struct vfsmount *mnt);
75858+char *gr_to_filename1(const struct dentry *dentry,
75859+ const struct vfsmount *mnt);
75860+char *gr_to_filename2(const struct dentry *dentry,
75861+ const struct vfsmount *mnt);
75862+char *gr_to_filename3(const struct dentry *dentry,
75863+ const struct vfsmount *mnt);
75864+
75865+extern int grsec_enable_ptrace_readexec;
75866+extern int grsec_enable_harden_ptrace;
75867+extern int grsec_enable_link;
75868+extern int grsec_enable_fifo;
75869+extern int grsec_enable_execve;
75870+extern int grsec_enable_shm;
75871+extern int grsec_enable_execlog;
75872+extern int grsec_enable_signal;
75873+extern int grsec_enable_audit_ptrace;
75874+extern int grsec_enable_forkfail;
75875+extern int grsec_enable_time;
75876+extern int grsec_enable_rofs;
75877+extern int grsec_deny_new_usb;
75878+extern int grsec_enable_chroot_shmat;
75879+extern int grsec_enable_chroot_mount;
75880+extern int grsec_enable_chroot_double;
75881+extern int grsec_enable_chroot_pivot;
75882+extern int grsec_enable_chroot_chdir;
75883+extern int grsec_enable_chroot_chmod;
75884+extern int grsec_enable_chroot_mknod;
75885+extern int grsec_enable_chroot_fchdir;
75886+extern int grsec_enable_chroot_nice;
75887+extern int grsec_enable_chroot_execlog;
75888+extern int grsec_enable_chroot_caps;
75889+extern int grsec_enable_chroot_sysctl;
75890+extern int grsec_enable_chroot_unix;
75891+extern int grsec_enable_symlinkown;
75892+extern kgid_t grsec_symlinkown_gid;
75893+extern int grsec_enable_tpe;
75894+extern kgid_t grsec_tpe_gid;
75895+extern int grsec_enable_tpe_all;
75896+extern int grsec_enable_tpe_invert;
75897+extern int grsec_enable_socket_all;
75898+extern kgid_t grsec_socket_all_gid;
75899+extern int grsec_enable_socket_client;
75900+extern kgid_t grsec_socket_client_gid;
75901+extern int grsec_enable_socket_server;
75902+extern kgid_t grsec_socket_server_gid;
75903+extern kgid_t grsec_audit_gid;
75904+extern int grsec_enable_group;
75905+extern int grsec_enable_log_rwxmaps;
75906+extern int grsec_enable_mount;
75907+extern int grsec_enable_chdir;
75908+extern int grsec_resource_logging;
75909+extern int grsec_enable_blackhole;
75910+extern int grsec_lastack_retries;
75911+extern int grsec_enable_brute;
75912+extern int grsec_enable_harden_ipc;
75913+extern int grsec_lock;
75914+
75915+extern spinlock_t grsec_alert_lock;
75916+extern unsigned long grsec_alert_wtime;
75917+extern unsigned long grsec_alert_fyet;
75918+
75919+extern spinlock_t grsec_audit_lock;
75920+
75921+extern rwlock_t grsec_exec_file_lock;
75922+
75923+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
75924+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
75925+ (tsk)->exec_file->f_path.mnt) : "/")
75926+
75927+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
75928+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
75929+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
75930+
75931+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
75932+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
75933+ (tsk)->exec_file->f_path.mnt) : "/")
75934+
75935+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
75936+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
75937+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
75938+
75939+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
75940+
75941+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
75942+
75943+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
75944+{
75945+ if (file1 && file2) {
75946+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
75947+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
75948+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
75949+ return true;
75950+ }
75951+
75952+ return false;
75953+}
75954+
75955+#define GR_CHROOT_CAPS {{ \
75956+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
75957+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
75958+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
75959+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
75960+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
75961+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
75962+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
75963+
75964+#define security_learn(normal_msg,args...) \
75965+({ \
75966+ read_lock(&grsec_exec_file_lock); \
75967+ gr_add_learn_entry(normal_msg "\n", ## args); \
75968+ read_unlock(&grsec_exec_file_lock); \
75969+})
75970+
75971+enum {
75972+ GR_DO_AUDIT,
75973+ GR_DONT_AUDIT,
75974+ /* used for non-audit messages that we shouldn't kill the task on */
75975+ GR_DONT_AUDIT_GOOD
75976+};
75977+
75978+enum {
75979+ GR_TTYSNIFF,
75980+ GR_RBAC,
75981+ GR_RBAC_STR,
75982+ GR_STR_RBAC,
75983+ GR_RBAC_MODE2,
75984+ GR_RBAC_MODE3,
75985+ GR_FILENAME,
75986+ GR_SYSCTL_HIDDEN,
75987+ GR_NOARGS,
75988+ GR_ONE_INT,
75989+ GR_ONE_INT_TWO_STR,
75990+ GR_ONE_STR,
75991+ GR_STR_INT,
75992+ GR_TWO_STR_INT,
75993+ GR_TWO_INT,
75994+ GR_TWO_U64,
75995+ GR_THREE_INT,
75996+ GR_FIVE_INT_TWO_STR,
75997+ GR_TWO_STR,
75998+ GR_THREE_STR,
75999+ GR_FOUR_STR,
76000+ GR_STR_FILENAME,
76001+ GR_FILENAME_STR,
76002+ GR_FILENAME_TWO_INT,
76003+ GR_FILENAME_TWO_INT_STR,
76004+ GR_TEXTREL,
76005+ GR_PTRACE,
76006+ GR_RESOURCE,
76007+ GR_CAP,
76008+ GR_SIG,
76009+ GR_SIG2,
76010+ GR_CRASH1,
76011+ GR_CRASH2,
76012+ GR_PSACCT,
76013+ GR_RWXMAP,
76014+ GR_RWXMAPVMA
76015+};
76016+
76017+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
76018+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
76019+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
76020+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
76021+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
76022+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
76023+#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)
76024+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
76025+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
76026+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
76027+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
76028+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
76029+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
76030+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
76031+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
76032+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
76033+#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)
76034+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
76035+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
76036+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
76037+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
76038+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
76039+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
76040+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
76041+#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)
76042+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
76043+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
76044+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
76045+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
76046+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
76047+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
76048+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
76049+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
76050+#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)
76051+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
76052+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
76053+
76054+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
76055+
76056+#endif
76057+
76058+#endif
76059diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
76060new file mode 100644
76061index 0000000..195cbe4
76062--- /dev/null
76063+++ b/include/linux/grmsg.h
76064@@ -0,0 +1,115 @@
76065+#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"
76066+#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"
76067+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
76068+#define GR_STOPMOD_MSG "denied modification of module state by "
76069+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
76070+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
76071+#define GR_IOPERM_MSG "denied use of ioperm() by "
76072+#define GR_IOPL_MSG "denied use of iopl() by "
76073+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
76074+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
76075+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
76076+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
76077+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
76078+#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"
76079+#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"
76080+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
76081+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
76082+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
76083+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
76084+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
76085+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
76086+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
76087+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
76088+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
76089+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
76090+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
76091+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
76092+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
76093+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
76094+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
76095+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
76096+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
76097+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
76098+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
76099+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
76100+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
76101+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
76102+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
76103+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
76104+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
76105+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
76106+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
76107+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
76108+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
76109+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
76110+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
76111+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
76112+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
76113+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
76114+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
76115+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
76116+#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"
76117+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
76118+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
76119+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
76120+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
76121+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
76122+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
76123+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
76124+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
76125+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
76126+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
76127+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
76128+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
76129+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
76130+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
76131+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
76132+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
76133+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
76134+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
76135+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
76136+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
76137+#define GR_FAILFORK_MSG "failed fork with errno %s by "
76138+#define GR_NICE_CHROOT_MSG "denied priority change by "
76139+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
76140+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
76141+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
76142+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
76143+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
76144+#define GR_TIME_MSG "time set by "
76145+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
76146+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
76147+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
76148+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
76149+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
76150+#define GR_BIND_MSG "denied bind() by "
76151+#define GR_CONNECT_MSG "denied connect() by "
76152+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
76153+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
76154+#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"
76155+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
76156+#define GR_CAP_ACL_MSG "use of %s denied for "
76157+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
76158+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
76159+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
76160+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
76161+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
76162+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
76163+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
76164+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
76165+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
76166+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
76167+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
76168+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
76169+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
76170+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
76171+#define GR_VM86_MSG "denied use of vm86 by "
76172+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
76173+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
76174+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
76175+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
76176+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
76177+#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 "
76178+#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 "
76179+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
76180diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
76181new file mode 100644
76182index 0000000..d8b5b48
76183--- /dev/null
76184+++ b/include/linux/grsecurity.h
76185@@ -0,0 +1,245 @@
76186+#ifndef GR_SECURITY_H
76187+#define GR_SECURITY_H
76188+#include <linux/fs.h>
76189+#include <linux/fs_struct.h>
76190+#include <linux/binfmts.h>
76191+#include <linux/gracl.h>
76192+
76193+/* notify of brain-dead configs */
76194+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
76195+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
76196+#endif
76197+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
76198+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
76199+#endif
76200+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
76201+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
76202+#endif
76203+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
76204+#error "CONFIG_PAX enabled, but no PaX options are enabled."
76205+#endif
76206+
76207+int gr_handle_new_usb(void);
76208+
76209+void gr_handle_brute_attach(int dumpable);
76210+void gr_handle_brute_check(void);
76211+void gr_handle_kernel_exploit(void);
76212+
76213+char gr_roletype_to_char(void);
76214+
76215+int gr_acl_enable_at_secure(void);
76216+
76217+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
76218+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
76219+
76220+void gr_del_task_from_ip_table(struct task_struct *p);
76221+
76222+int gr_pid_is_chrooted(struct task_struct *p);
76223+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
76224+int gr_handle_chroot_nice(void);
76225+int gr_handle_chroot_sysctl(const int op);
76226+int gr_handle_chroot_setpriority(struct task_struct *p,
76227+ const int niceval);
76228+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
76229+int gr_handle_chroot_chroot(const struct dentry *dentry,
76230+ const struct vfsmount *mnt);
76231+void gr_handle_chroot_chdir(const struct path *path);
76232+int gr_handle_chroot_chmod(const struct dentry *dentry,
76233+ const struct vfsmount *mnt, const int mode);
76234+int gr_handle_chroot_mknod(const struct dentry *dentry,
76235+ const struct vfsmount *mnt, const int mode);
76236+int gr_handle_chroot_mount(const struct dentry *dentry,
76237+ const struct vfsmount *mnt,
76238+ const char *dev_name);
76239+int gr_handle_chroot_pivot(void);
76240+int gr_handle_chroot_unix(const pid_t pid);
76241+
76242+int gr_handle_rawio(const struct inode *inode);
76243+
76244+void gr_handle_ioperm(void);
76245+void gr_handle_iopl(void);
76246+
76247+umode_t gr_acl_umask(void);
76248+
76249+int gr_tpe_allow(const struct file *file);
76250+
76251+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
76252+void gr_clear_chroot_entries(struct task_struct *task);
76253+
76254+void gr_log_forkfail(const int retval);
76255+void gr_log_timechange(void);
76256+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
76257+void gr_log_chdir(const struct dentry *dentry,
76258+ const struct vfsmount *mnt);
76259+void gr_log_chroot_exec(const struct dentry *dentry,
76260+ const struct vfsmount *mnt);
76261+void gr_log_remount(const char *devname, const int retval);
76262+void gr_log_unmount(const char *devname, const int retval);
76263+void gr_log_mount(const char *from, const char *to, const int retval);
76264+void gr_log_textrel(struct vm_area_struct *vma);
76265+void gr_log_ptgnustack(struct file *file);
76266+void gr_log_rwxmmap(struct file *file);
76267+void gr_log_rwxmprotect(struct vm_area_struct *vma);
76268+
76269+int gr_handle_follow_link(const struct inode *parent,
76270+ const struct inode *inode,
76271+ const struct dentry *dentry,
76272+ const struct vfsmount *mnt);
76273+int gr_handle_fifo(const struct dentry *dentry,
76274+ const struct vfsmount *mnt,
76275+ const struct dentry *dir, const int flag,
76276+ const int acc_mode);
76277+int gr_handle_hardlink(const struct dentry *dentry,
76278+ const struct vfsmount *mnt,
76279+ struct inode *inode,
76280+ const int mode, const struct filename *to);
76281+
76282+int gr_is_capable(const int cap);
76283+int gr_is_capable_nolog(const int cap);
76284+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76285+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
76286+
76287+void gr_copy_label(struct task_struct *tsk);
76288+void gr_handle_crash(struct task_struct *task, const int sig);
76289+int gr_handle_signal(const struct task_struct *p, const int sig);
76290+int gr_check_crash_uid(const kuid_t uid);
76291+int gr_check_protected_task(const struct task_struct *task);
76292+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
76293+int gr_acl_handle_mmap(const struct file *file,
76294+ const unsigned long prot);
76295+int gr_acl_handle_mprotect(const struct file *file,
76296+ const unsigned long prot);
76297+int gr_check_hidden_task(const struct task_struct *tsk);
76298+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
76299+ const struct vfsmount *mnt);
76300+__u32 gr_acl_handle_utime(const struct dentry *dentry,
76301+ const struct vfsmount *mnt);
76302+__u32 gr_acl_handle_access(const struct dentry *dentry,
76303+ const struct vfsmount *mnt, const int fmode);
76304+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
76305+ const struct vfsmount *mnt, umode_t *mode);
76306+__u32 gr_acl_handle_chown(const struct dentry *dentry,
76307+ const struct vfsmount *mnt);
76308+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
76309+ const struct vfsmount *mnt);
76310+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
76311+ const struct vfsmount *mnt);
76312+int gr_handle_ptrace(struct task_struct *task, const long request);
76313+int gr_handle_proc_ptrace(struct task_struct *task);
76314+__u32 gr_acl_handle_execve(const struct dentry *dentry,
76315+ const struct vfsmount *mnt);
76316+int gr_check_crash_exec(const struct file *filp);
76317+int gr_acl_is_enabled(void);
76318+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
76319+ const kgid_t gid);
76320+int gr_set_proc_label(const struct dentry *dentry,
76321+ const struct vfsmount *mnt,
76322+ const int unsafe_flags);
76323+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
76324+ const struct vfsmount *mnt);
76325+__u32 gr_acl_handle_open(const struct dentry *dentry,
76326+ const struct vfsmount *mnt, int acc_mode);
76327+__u32 gr_acl_handle_creat(const struct dentry *dentry,
76328+ const struct dentry *p_dentry,
76329+ const struct vfsmount *p_mnt,
76330+ int open_flags, int acc_mode, const int imode);
76331+void gr_handle_create(const struct dentry *dentry,
76332+ const struct vfsmount *mnt);
76333+void gr_handle_proc_create(const struct dentry *dentry,
76334+ const struct inode *inode);
76335+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
76336+ const struct dentry *parent_dentry,
76337+ const struct vfsmount *parent_mnt,
76338+ const int mode);
76339+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
76340+ const struct dentry *parent_dentry,
76341+ const struct vfsmount *parent_mnt);
76342+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
76343+ const struct vfsmount *mnt);
76344+void gr_handle_delete(const ino_t ino, const dev_t dev);
76345+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
76346+ const struct vfsmount *mnt);
76347+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
76348+ const struct dentry *parent_dentry,
76349+ const struct vfsmount *parent_mnt,
76350+ const struct filename *from);
76351+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
76352+ const struct dentry *parent_dentry,
76353+ const struct vfsmount *parent_mnt,
76354+ const struct dentry *old_dentry,
76355+ const struct vfsmount *old_mnt, const struct filename *to);
76356+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
76357+int gr_acl_handle_rename(struct dentry *new_dentry,
76358+ struct dentry *parent_dentry,
76359+ const struct vfsmount *parent_mnt,
76360+ struct dentry *old_dentry,
76361+ struct inode *old_parent_inode,
76362+ struct vfsmount *old_mnt, const struct filename *newname);
76363+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76364+ struct dentry *old_dentry,
76365+ struct dentry *new_dentry,
76366+ struct vfsmount *mnt, const __u8 replace);
76367+__u32 gr_check_link(const struct dentry *new_dentry,
76368+ const struct dentry *parent_dentry,
76369+ const struct vfsmount *parent_mnt,
76370+ const struct dentry *old_dentry,
76371+ const struct vfsmount *old_mnt);
76372+int gr_acl_handle_filldir(const struct file *file, const char *name,
76373+ const unsigned int namelen, const ino_t ino);
76374+
76375+__u32 gr_acl_handle_unix(const struct dentry *dentry,
76376+ const struct vfsmount *mnt);
76377+void gr_acl_handle_exit(void);
76378+void gr_acl_handle_psacct(struct task_struct *task, const long code);
76379+int gr_acl_handle_procpidmem(const struct task_struct *task);
76380+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
76381+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
76382+void gr_audit_ptrace(struct task_struct *task);
76383+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
76384+void gr_put_exec_file(struct task_struct *task);
76385+
76386+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
76387+
76388+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
76389+extern void gr_learn_resource(const struct task_struct *task, const int res,
76390+ const unsigned long wanted, const int gt);
76391+#else
76392+static inline void gr_learn_resource(const struct task_struct *task, const int res,
76393+ const unsigned long wanted, const int gt)
76394+{
76395+}
76396+#endif
76397+
76398+#ifdef CONFIG_GRKERNSEC_RESLOG
76399+extern void gr_log_resource(const struct task_struct *task, const int res,
76400+ const unsigned long wanted, const int gt);
76401+#else
76402+static inline void gr_log_resource(const struct task_struct *task, const int res,
76403+ const unsigned long wanted, const int gt)
76404+{
76405+}
76406+#endif
76407+
76408+#ifdef CONFIG_GRKERNSEC
76409+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
76410+void gr_handle_vm86(void);
76411+void gr_handle_mem_readwrite(u64 from, u64 to);
76412+
76413+void gr_log_badprocpid(const char *entry);
76414+
76415+extern int grsec_enable_dmesg;
76416+extern int grsec_disable_privio;
76417+
76418+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
76419+extern kgid_t grsec_proc_gid;
76420+#endif
76421+
76422+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76423+extern int grsec_enable_chroot_findtask;
76424+#endif
76425+#ifdef CONFIG_GRKERNSEC_SETXID
76426+extern int grsec_enable_setxid;
76427+#endif
76428+#endif
76429+
76430+#endif
76431diff --git a/include/linux/grsock.h b/include/linux/grsock.h
76432new file mode 100644
76433index 0000000..e7ffaaf
76434--- /dev/null
76435+++ b/include/linux/grsock.h
76436@@ -0,0 +1,19 @@
76437+#ifndef __GRSOCK_H
76438+#define __GRSOCK_H
76439+
76440+extern void gr_attach_curr_ip(const struct sock *sk);
76441+extern int gr_handle_sock_all(const int family, const int type,
76442+ const int protocol);
76443+extern int gr_handle_sock_server(const struct sockaddr *sck);
76444+extern int gr_handle_sock_server_other(const struct sock *sck);
76445+extern int gr_handle_sock_client(const struct sockaddr *sck);
76446+extern int gr_search_connect(struct socket * sock,
76447+ struct sockaddr_in * addr);
76448+extern int gr_search_bind(struct socket * sock,
76449+ struct sockaddr_in * addr);
76450+extern int gr_search_listen(struct socket * sock);
76451+extern int gr_search_accept(struct socket * sock);
76452+extern int gr_search_socket(const int domain, const int type,
76453+ const int protocol);
76454+
76455+#endif
76456diff --git a/include/linux/highmem.h b/include/linux/highmem.h
76457index 7fb31da..08b5114 100644
76458--- a/include/linux/highmem.h
76459+++ b/include/linux/highmem.h
76460@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
76461 kunmap_atomic(kaddr);
76462 }
76463
76464+static inline void sanitize_highpage(struct page *page)
76465+{
76466+ void *kaddr;
76467+ unsigned long flags;
76468+
76469+ local_irq_save(flags);
76470+ kaddr = kmap_atomic(page);
76471+ clear_page(kaddr);
76472+ kunmap_atomic(kaddr);
76473+ local_irq_restore(flags);
76474+}
76475+
76476 static inline void zero_user_segments(struct page *page,
76477 unsigned start1, unsigned end1,
76478 unsigned start2, unsigned end2)
76479diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
76480index 1c7b89a..7dda400 100644
76481--- a/include/linux/hwmon-sysfs.h
76482+++ b/include/linux/hwmon-sysfs.h
76483@@ -25,7 +25,8 @@
76484 struct sensor_device_attribute{
76485 struct device_attribute dev_attr;
76486 int index;
76487-};
76488+} __do_const;
76489+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
76490 #define to_sensor_dev_attr(_dev_attr) \
76491 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
76492
76493@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
76494 struct device_attribute dev_attr;
76495 u8 index;
76496 u8 nr;
76497-};
76498+} __do_const;
76499+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
76500 #define to_sensor_dev_attr_2(_dev_attr) \
76501 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
76502
76503diff --git a/include/linux/i2c.h b/include/linux/i2c.h
76504index 2ab11dc..663a3f2 100644
76505--- a/include/linux/i2c.h
76506+++ b/include/linux/i2c.h
76507@@ -366,6 +366,7 @@ struct i2c_algorithm {
76508 /* To determine what the adapter supports */
76509 u32 (*functionality) (struct i2c_adapter *);
76510 };
76511+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
76512
76513 /**
76514 * struct i2c_bus_recovery_info - I2C bus recovery information
76515diff --git a/include/linux/i2o.h b/include/linux/i2o.h
76516index d23c3c2..eb63c81 100644
76517--- a/include/linux/i2o.h
76518+++ b/include/linux/i2o.h
76519@@ -565,7 +565,7 @@ struct i2o_controller {
76520 struct i2o_device *exec; /* Executive */
76521 #if BITS_PER_LONG == 64
76522 spinlock_t context_list_lock; /* lock for context_list */
76523- atomic_t context_list_counter; /* needed for unique contexts */
76524+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
76525 struct list_head context_list; /* list of context id's
76526 and pointers */
76527 #endif
76528diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
76529index aff7ad8..3942bbd 100644
76530--- a/include/linux/if_pppox.h
76531+++ b/include/linux/if_pppox.h
76532@@ -76,7 +76,7 @@ struct pppox_proto {
76533 int (*ioctl)(struct socket *sock, unsigned int cmd,
76534 unsigned long arg);
76535 struct module *owner;
76536-};
76537+} __do_const;
76538
76539 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
76540 extern void unregister_pppox_proto(int proto_num);
76541diff --git a/include/linux/init.h b/include/linux/init.h
76542index f1c27a71..7d6010e 100644
76543--- a/include/linux/init.h
76544+++ b/include/linux/init.h
76545@@ -39,9 +39,17 @@
76546 * Also note, that this data cannot be "const".
76547 */
76548
76549+#define add_init_latent_entropy __latent_entropy
76550+
76551+#ifdef CONFIG_MEMORY_HOTPLUG
76552+#define add_meminit_latent_entropy
76553+#else
76554+#define add_meminit_latent_entropy __latent_entropy
76555+#endif
76556+
76557 /* These are for everybody (although not all archs will actually
76558 discard it in modules) */
76559-#define __init __section(.init.text) __cold notrace
76560+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
76561 #define __initdata __section(.init.data)
76562 #define __initconst __constsection(.init.rodata)
76563 #define __exitdata __section(.exit.data)
76564@@ -102,7 +110,7 @@
76565 #define __cpuexitconst
76566
76567 /* Used for MEMORY_HOTPLUG */
76568-#define __meminit __section(.meminit.text) __cold notrace
76569+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
76570 #define __meminitdata __section(.meminit.data)
76571 #define __meminitconst __constsection(.meminit.rodata)
76572 #define __memexit __section(.memexit.text) __exitused __cold notrace
76573diff --git a/include/linux/init_task.h b/include/linux/init_task.h
76574index 5cd0f09..c9f67cc 100644
76575--- a/include/linux/init_task.h
76576+++ b/include/linux/init_task.h
76577@@ -154,6 +154,12 @@ extern struct task_group root_task_group;
76578
76579 #define INIT_TASK_COMM "swapper"
76580
76581+#ifdef CONFIG_X86
76582+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
76583+#else
76584+#define INIT_TASK_THREAD_INFO
76585+#endif
76586+
76587 /*
76588 * INIT_TASK is used to set up the first task table, touch at
76589 * your own risk!. Base=0, limit=0x1fffff (=2MB)
76590@@ -193,6 +199,7 @@ extern struct task_group root_task_group;
76591 RCU_POINTER_INITIALIZER(cred, &init_cred), \
76592 .comm = INIT_TASK_COMM, \
76593 .thread = INIT_THREAD, \
76594+ INIT_TASK_THREAD_INFO \
76595 .fs = &init_fs, \
76596 .files = &init_files, \
76597 .signal = &init_signals, \
76598diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
76599index 5e865b5..71bd258 100644
76600--- a/include/linux/interrupt.h
76601+++ b/include/linux/interrupt.h
76602@@ -361,7 +361,7 @@ enum
76603 /* map softirq index to softirq name. update 'softirq_to_name' in
76604 * kernel/softirq.c when adding a new softirq.
76605 */
76606-extern char *softirq_to_name[NR_SOFTIRQS];
76607+extern const char * const softirq_to_name[NR_SOFTIRQS];
76608
76609 /* softirq mask and active fields moved to irq_cpustat_t in
76610 * asm/hardirq.h to get better cache usage. KAO
76611@@ -369,12 +369,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
76612
76613 struct softirq_action
76614 {
76615- void (*action)(struct softirq_action *);
76616-};
76617+ void (*action)(void);
76618+} __no_const;
76619
76620 asmlinkage void do_softirq(void);
76621 asmlinkage void __do_softirq(void);
76622-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
76623+extern void open_softirq(int nr, void (*action)(void));
76624 extern void softirq_init(void);
76625 extern void __raise_softirq_irqoff(unsigned int nr);
76626
76627diff --git a/include/linux/iommu.h b/include/linux/iommu.h
76628index 7ea319e..f9e971d 100644
76629--- a/include/linux/iommu.h
76630+++ b/include/linux/iommu.h
76631@@ -129,7 +129,7 @@ struct iommu_ops {
76632 u32 (*domain_get_windows)(struct iommu_domain *domain);
76633
76634 unsigned long pgsize_bitmap;
76635-};
76636+} __do_const;
76637
76638 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
76639 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
76640diff --git a/include/linux/ioport.h b/include/linux/ioport.h
76641index 89b7c24..382af74 100644
76642--- a/include/linux/ioport.h
76643+++ b/include/linux/ioport.h
76644@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
76645 int adjust_resource(struct resource *res, resource_size_t start,
76646 resource_size_t size);
76647 resource_size_t resource_alignment(struct resource *res);
76648-static inline resource_size_t resource_size(const struct resource *res)
76649+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
76650 {
76651 return res->end - res->start + 1;
76652 }
76653diff --git a/include/linux/irq.h b/include/linux/irq.h
76654index 56bb0dc..8ae94d62 100644
76655--- a/include/linux/irq.h
76656+++ b/include/linux/irq.h
76657@@ -333,7 +333,8 @@ struct irq_chip {
76658 void (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
76659
76660 unsigned long flags;
76661-};
76662+} __do_const;
76663+typedef struct irq_chip __no_const irq_chip_no_const;
76664
76665 /*
76666 * irq_chip specific flags
76667diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
76668index 0e5d9ec..46acb3a 100644
76669--- a/include/linux/irqchip/arm-gic.h
76670+++ b/include/linux/irqchip/arm-gic.h
76671@@ -59,9 +59,11 @@
76672
76673 #ifndef __ASSEMBLY__
76674
76675+#include <linux/irq.h>
76676+
76677 struct device_node;
76678
76679-extern struct irq_chip gic_arch_extn;
76680+extern irq_chip_no_const gic_arch_extn;
76681
76682 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
76683 u32 offset, struct device_node *);
76684diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
76685index d235e88..8ccbe74 100644
76686--- a/include/linux/jiffies.h
76687+++ b/include/linux/jiffies.h
76688@@ -292,14 +292,14 @@ extern unsigned long preset_lpj;
76689 /*
76690 * Convert various time units to each other:
76691 */
76692-extern unsigned int jiffies_to_msecs(const unsigned long j);
76693-extern unsigned int jiffies_to_usecs(const unsigned long j);
76694-extern unsigned long msecs_to_jiffies(const unsigned int m);
76695-extern unsigned long usecs_to_jiffies(const unsigned int u);
76696-extern unsigned long timespec_to_jiffies(const struct timespec *value);
76697+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
76698+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
76699+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
76700+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
76701+extern unsigned long timespec_to_jiffies(const struct timespec *value) __intentional_overflow(-1);
76702 extern void jiffies_to_timespec(const unsigned long jiffies,
76703 struct timespec *value);
76704-extern unsigned long timeval_to_jiffies(const struct timeval *value);
76705+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
76706 extern void jiffies_to_timeval(const unsigned long jiffies,
76707 struct timeval *value);
76708
76709diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
76710index 6883e19..e854fcb 100644
76711--- a/include/linux/kallsyms.h
76712+++ b/include/linux/kallsyms.h
76713@@ -15,7 +15,8 @@
76714
76715 struct module;
76716
76717-#ifdef CONFIG_KALLSYMS
76718+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
76719+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
76720 /* Lookup the address for a symbol. Returns 0 if not found. */
76721 unsigned long kallsyms_lookup_name(const char *name);
76722
76723@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
76724 /* Stupid that this does nothing, but I didn't create this mess. */
76725 #define __print_symbol(fmt, addr)
76726 #endif /*CONFIG_KALLSYMS*/
76727+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
76728+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
76729+extern unsigned long kallsyms_lookup_name(const char *name);
76730+extern void __print_symbol(const char *fmt, unsigned long address);
76731+extern int sprint_backtrace(char *buffer, unsigned long address);
76732+extern int sprint_symbol(char *buffer, unsigned long address);
76733+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
76734+const char *kallsyms_lookup(unsigned long addr,
76735+ unsigned long *symbolsize,
76736+ unsigned long *offset,
76737+ char **modname, char *namebuf);
76738+extern int kallsyms_lookup_size_offset(unsigned long addr,
76739+ unsigned long *symbolsize,
76740+ unsigned long *offset);
76741+#endif
76742
76743 /* This macro allows us to keep printk typechecking */
76744 static __printf(1, 2)
76745diff --git a/include/linux/key-type.h b/include/linux/key-type.h
76746index 518a53a..5e28358 100644
76747--- a/include/linux/key-type.h
76748+++ b/include/linux/key-type.h
76749@@ -125,7 +125,7 @@ struct key_type {
76750 /* internal fields */
76751 struct list_head link; /* link in types list */
76752 struct lock_class_key lock_class; /* key->sem lock class */
76753-};
76754+} __do_const;
76755
76756 extern struct key_type key_type_keyring;
76757
76758diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
76759index c6e091b..a940adf 100644
76760--- a/include/linux/kgdb.h
76761+++ b/include/linux/kgdb.h
76762@@ -52,7 +52,7 @@ extern int kgdb_connected;
76763 extern int kgdb_io_module_registered;
76764
76765 extern atomic_t kgdb_setting_breakpoint;
76766-extern atomic_t kgdb_cpu_doing_single_step;
76767+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
76768
76769 extern struct task_struct *kgdb_usethread;
76770 extern struct task_struct *kgdb_contthread;
76771@@ -254,7 +254,7 @@ struct kgdb_arch {
76772 void (*correct_hw_break)(void);
76773
76774 void (*enable_nmi)(bool on);
76775-};
76776+} __do_const;
76777
76778 /**
76779 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
76780@@ -279,7 +279,7 @@ struct kgdb_io {
76781 void (*pre_exception) (void);
76782 void (*post_exception) (void);
76783 int is_console;
76784-};
76785+} __do_const;
76786
76787 extern struct kgdb_arch arch_kgdb_ops;
76788
76789diff --git a/include/linux/kmod.h b/include/linux/kmod.h
76790index 0555cc6..40116ce 100644
76791--- a/include/linux/kmod.h
76792+++ b/include/linux/kmod.h
76793@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
76794 * usually useless though. */
76795 extern __printf(2, 3)
76796 int __request_module(bool wait, const char *name, ...);
76797+extern __printf(3, 4)
76798+int ___request_module(bool wait, char *param_name, const char *name, ...);
76799 #define request_module(mod...) __request_module(true, mod)
76800 #define request_module_nowait(mod...) __request_module(false, mod)
76801 #define try_then_request_module(x, mod...) \
76802@@ -57,6 +59,9 @@ struct subprocess_info {
76803 struct work_struct work;
76804 struct completion *complete;
76805 char *path;
76806+#ifdef CONFIG_GRKERNSEC
76807+ char *origpath;
76808+#endif
76809 char **argv;
76810 char **envp;
76811 int wait;
76812diff --git a/include/linux/kobject.h b/include/linux/kobject.h
76813index de6dcbcc..4735f88 100644
76814--- a/include/linux/kobject.h
76815+++ b/include/linux/kobject.h
76816@@ -115,7 +115,7 @@ struct kobj_type {
76817 struct attribute **default_attrs;
76818 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
76819 const void *(*namespace)(struct kobject *kobj);
76820-};
76821+} __do_const;
76822
76823 struct kobj_uevent_env {
76824 char *envp[UEVENT_NUM_ENVP];
76825@@ -138,6 +138,7 @@ struct kobj_attribute {
76826 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
76827 const char *buf, size_t count);
76828 };
76829+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
76830
76831 extern const struct sysfs_ops kobj_sysfs_ops;
76832
76833diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
76834index df32d25..fb52e27 100644
76835--- a/include/linux/kobject_ns.h
76836+++ b/include/linux/kobject_ns.h
76837@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
76838 const void *(*netlink_ns)(struct sock *sk);
76839 const void *(*initial_ns)(void);
76840 void (*drop_ns)(void *);
76841-};
76842+} __do_const;
76843
76844 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
76845 int kobj_ns_type_registered(enum kobj_ns_type type);
76846diff --git a/include/linux/kref.h b/include/linux/kref.h
76847index 484604d..0f6c5b6 100644
76848--- a/include/linux/kref.h
76849+++ b/include/linux/kref.h
76850@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
76851 static inline int kref_sub(struct kref *kref, unsigned int count,
76852 void (*release)(struct kref *kref))
76853 {
76854- WARN_ON(release == NULL);
76855+ BUG_ON(release == NULL);
76856
76857 if (atomic_sub_and_test((int) count, &kref->refcount)) {
76858 release(kref);
76859diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
76860index 0fbbc7a..db081e3 100644
76861--- a/include/linux/kvm_host.h
76862+++ b/include/linux/kvm_host.h
76863@@ -458,7 +458,7 @@ static inline void kvm_irqfd_exit(void)
76864 {
76865 }
76866 #endif
76867-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
76868+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
76869 struct module *module);
76870 void kvm_exit(void);
76871
76872@@ -632,7 +632,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
76873 struct kvm_guest_debug *dbg);
76874 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
76875
76876-int kvm_arch_init(void *opaque);
76877+int kvm_arch_init(const void *opaque);
76878 void kvm_arch_exit(void);
76879
76880 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
76881diff --git a/include/linux/libata.h b/include/linux/libata.h
76882index 9b50337..712d748 100644
76883--- a/include/linux/libata.h
76884+++ b/include/linux/libata.h
76885@@ -973,7 +973,7 @@ struct ata_port_operations {
76886 * fields must be pointers.
76887 */
76888 const struct ata_port_operations *inherits;
76889-};
76890+} __do_const;
76891
76892 struct ata_port_info {
76893 unsigned long flags;
76894diff --git a/include/linux/linkage.h b/include/linux/linkage.h
76895index d3e8ad2..a949f68 100644
76896--- a/include/linux/linkage.h
76897+++ b/include/linux/linkage.h
76898@@ -31,6 +31,7 @@
76899 #endif
76900
76901 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
76902+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
76903 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
76904
76905 /*
76906diff --git a/include/linux/list.h b/include/linux/list.h
76907index f4d8a2f..38e6e46 100644
76908--- a/include/linux/list.h
76909+++ b/include/linux/list.h
76910@@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
76911 extern void list_del(struct list_head *entry);
76912 #endif
76913
76914+extern void __pax_list_add(struct list_head *new,
76915+ struct list_head *prev,
76916+ struct list_head *next);
76917+static inline void pax_list_add(struct list_head *new, struct list_head *head)
76918+{
76919+ __pax_list_add(new, head, head->next);
76920+}
76921+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
76922+{
76923+ __pax_list_add(new, head->prev, head);
76924+}
76925+extern void pax_list_del(struct list_head *entry);
76926+
76927 /**
76928 * list_replace - replace old entry by new one
76929 * @old : the element to be replaced
76930@@ -145,6 +158,8 @@ static inline void list_del_init(struct list_head *entry)
76931 INIT_LIST_HEAD(entry);
76932 }
76933
76934+extern void pax_list_del_init(struct list_head *entry);
76935+
76936 /**
76937 * list_move - delete from one list and add as another's head
76938 * @list: the entry to move
76939diff --git a/include/linux/math64.h b/include/linux/math64.h
76940index 69ed5f5..243ed51 100644
76941--- a/include/linux/math64.h
76942+++ b/include/linux/math64.h
76943@@ -15,7 +15,7 @@
76944 * This is commonly provided by 32bit archs to provide an optimized 64bit
76945 * divide.
76946 */
76947-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76948+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76949 {
76950 *remainder = dividend % divisor;
76951 return dividend / divisor;
76952@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
76953 /**
76954 * div64_u64 - unsigned 64bit divide with 64bit divisor
76955 */
76956-static inline u64 div64_u64(u64 dividend, u64 divisor)
76957+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
76958 {
76959 return dividend / divisor;
76960 }
76961@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
76962 #define div64_ul(x, y) div_u64((x), (y))
76963
76964 #ifndef div_u64_rem
76965-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76966+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
76967 {
76968 *remainder = do_div(dividend, divisor);
76969 return dividend;
76970@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
76971 #endif
76972
76973 #ifndef div64_u64
76974-extern u64 div64_u64(u64 dividend, u64 divisor);
76975+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
76976 #endif
76977
76978 #ifndef div64_s64
76979@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
76980 * divide.
76981 */
76982 #ifndef div_u64
76983-static inline u64 div_u64(u64 dividend, u32 divisor)
76984+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
76985 {
76986 u32 remainder;
76987 return div_u64_rem(dividend, divisor, &remainder);
76988diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
76989index da6716b..2e31db3 100644
76990--- a/include/linux/mempolicy.h
76991+++ b/include/linux/mempolicy.h
76992@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
76993 }
76994
76995 #define vma_policy(vma) ((vma)->vm_policy)
76996+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
76997+{
76998+ vma->vm_policy = pol;
76999+}
77000
77001 static inline void mpol_get(struct mempolicy *pol)
77002 {
77003@@ -240,6 +244,9 @@ mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx)
77004 }
77005
77006 #define vma_policy(vma) NULL
77007+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
77008+{
77009+}
77010
77011 static inline int
77012 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
77013diff --git a/include/linux/mm.h b/include/linux/mm.h
77014index 8b6e55e..c4edf39 100644
77015--- a/include/linux/mm.h
77016+++ b/include/linux/mm.h
77017@@ -113,6 +113,11 @@ extern unsigned int kobjsize(const void *objp);
77018 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
77019 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
77020 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
77021+
77022+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
77023+#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
77024+#endif
77025+
77026 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
77027
77028 #ifdef CONFIG_MEM_SOFT_DIRTY
77029@@ -215,8 +220,8 @@ struct vm_operations_struct {
77030 /* called by access_process_vm when get_user_pages() fails, typically
77031 * for use by special VMAs that can switch between memory and hardware
77032 */
77033- int (*access)(struct vm_area_struct *vma, unsigned long addr,
77034- void *buf, int len, int write);
77035+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
77036+ void *buf, size_t len, int write);
77037 #ifdef CONFIG_NUMA
77038 /*
77039 * set_policy() op must add a reference to any non-NULL @new mempolicy
77040@@ -246,6 +251,7 @@ struct vm_operations_struct {
77041 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
77042 unsigned long size, pgoff_t pgoff);
77043 };
77044+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
77045
77046 struct mmu_gather;
77047 struct inode;
77048@@ -977,8 +983,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
77049 unsigned long *pfn);
77050 int follow_phys(struct vm_area_struct *vma, unsigned long address,
77051 unsigned int flags, unsigned long *prot, resource_size_t *phys);
77052-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
77053- void *buf, int len, int write);
77054+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
77055+ void *buf, size_t len, int write);
77056
77057 static inline void unmap_shared_mapping_range(struct address_space *mapping,
77058 loff_t const holebegin, loff_t const holelen)
77059@@ -1017,9 +1023,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
77060 }
77061 #endif
77062
77063-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
77064-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
77065- void *buf, int len, int write);
77066+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
77067+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
77068+ void *buf, size_t len, int write);
77069
77070 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
77071 unsigned long start, unsigned long nr_pages,
77072@@ -1051,34 +1057,6 @@ int set_page_dirty(struct page *page);
77073 int set_page_dirty_lock(struct page *page);
77074 int clear_page_dirty_for_io(struct page *page);
77075
77076-/* Is the vma a continuation of the stack vma above it? */
77077-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
77078-{
77079- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
77080-}
77081-
77082-static inline int stack_guard_page_start(struct vm_area_struct *vma,
77083- unsigned long addr)
77084-{
77085- return (vma->vm_flags & VM_GROWSDOWN) &&
77086- (vma->vm_start == addr) &&
77087- !vma_growsdown(vma->vm_prev, addr);
77088-}
77089-
77090-/* Is the vma a continuation of the stack vma below it? */
77091-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
77092-{
77093- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
77094-}
77095-
77096-static inline int stack_guard_page_end(struct vm_area_struct *vma,
77097- unsigned long addr)
77098-{
77099- return (vma->vm_flags & VM_GROWSUP) &&
77100- (vma->vm_end == addr) &&
77101- !vma_growsup(vma->vm_next, addr);
77102-}
77103-
77104 extern pid_t
77105 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
77106
77107@@ -1178,6 +1156,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
77108 }
77109 #endif
77110
77111+#ifdef CONFIG_MMU
77112+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
77113+#else
77114+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
77115+{
77116+ return __pgprot(0);
77117+}
77118+#endif
77119+
77120 int vma_wants_writenotify(struct vm_area_struct *vma);
77121
77122 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
77123@@ -1196,8 +1183,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
77124 {
77125 return 0;
77126 }
77127+
77128+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
77129+ unsigned long address)
77130+{
77131+ return 0;
77132+}
77133 #else
77134 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
77135+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
77136 #endif
77137
77138 #ifdef __PAGETABLE_PMD_FOLDED
77139@@ -1206,8 +1200,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
77140 {
77141 return 0;
77142 }
77143+
77144+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
77145+ unsigned long address)
77146+{
77147+ return 0;
77148+}
77149 #else
77150 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
77151+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
77152 #endif
77153
77154 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
77155@@ -1225,11 +1226,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
77156 NULL: pud_offset(pgd, address);
77157 }
77158
77159+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
77160+{
77161+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
77162+ NULL: pud_offset(pgd, address);
77163+}
77164+
77165 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
77166 {
77167 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
77168 NULL: pmd_offset(pud, address);
77169 }
77170+
77171+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
77172+{
77173+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
77174+ NULL: pmd_offset(pud, address);
77175+}
77176 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
77177
77178 #if USE_SPLIT_PTLOCKS
77179@@ -1517,7 +1530,7 @@ extern int install_special_mapping(struct mm_struct *mm,
77180 unsigned long addr, unsigned long len,
77181 unsigned long flags, struct page **pages);
77182
77183-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
77184+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
77185
77186 extern unsigned long mmap_region(struct file *file, unsigned long addr,
77187 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
77188@@ -1525,6 +1538,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77189 unsigned long len, unsigned long prot, unsigned long flags,
77190 unsigned long pgoff, unsigned long *populate);
77191 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
77192+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
77193
77194 #ifdef CONFIG_MMU
77195 extern int __mm_populate(unsigned long addr, unsigned long len,
77196@@ -1553,10 +1567,11 @@ struct vm_unmapped_area_info {
77197 unsigned long high_limit;
77198 unsigned long align_mask;
77199 unsigned long align_offset;
77200+ unsigned long threadstack_offset;
77201 };
77202
77203-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
77204-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
77205+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
77206+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
77207
77208 /*
77209 * Search for an unmapped address range.
77210@@ -1568,7 +1583,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
77211 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
77212 */
77213 static inline unsigned long
77214-vm_unmapped_area(struct vm_unmapped_area_info *info)
77215+vm_unmapped_area(const struct vm_unmapped_area_info *info)
77216 {
77217 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
77218 return unmapped_area(info);
77219@@ -1631,6 +1646,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
77220 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
77221 struct vm_area_struct **pprev);
77222
77223+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
77224+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
77225+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
77226+
77227 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
77228 NULL if none. Assume start_addr < end_addr. */
77229 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
77230@@ -1659,15 +1678,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
77231 return vma;
77232 }
77233
77234-#ifdef CONFIG_MMU
77235-pgprot_t vm_get_page_prot(unsigned long vm_flags);
77236-#else
77237-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
77238-{
77239- return __pgprot(0);
77240-}
77241-#endif
77242-
77243 #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE
77244 unsigned long change_prot_numa(struct vm_area_struct *vma,
77245 unsigned long start, unsigned long end);
77246@@ -1719,6 +1729,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
77247 static inline void vm_stat_account(struct mm_struct *mm,
77248 unsigned long flags, struct file *file, long pages)
77249 {
77250+
77251+#ifdef CONFIG_PAX_RANDMMAP
77252+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
77253+#endif
77254+
77255 mm->total_vm += pages;
77256 }
77257 #endif /* CONFIG_PROC_FS */
77258@@ -1800,7 +1815,7 @@ extern int unpoison_memory(unsigned long pfn);
77259 extern int sysctl_memory_failure_early_kill;
77260 extern int sysctl_memory_failure_recovery;
77261 extern void shake_page(struct page *p, int access);
77262-extern atomic_long_t num_poisoned_pages;
77263+extern atomic_long_unchecked_t num_poisoned_pages;
77264 extern int soft_offline_page(struct page *page, int flags);
77265
77266 extern void dump_page(struct page *page);
77267@@ -1837,5 +1852,11 @@ void __init setup_nr_node_ids(void);
77268 static inline void setup_nr_node_ids(void) {}
77269 #endif
77270
77271+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
77272+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
77273+#else
77274+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
77275+#endif
77276+
77277 #endif /* __KERNEL__ */
77278 #endif /* _LINUX_MM_H */
77279diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
77280index 8e082f1..f61f576 100644
77281--- a/include/linux/mm_types.h
77282+++ b/include/linux/mm_types.h
77283@@ -289,6 +289,8 @@ struct vm_area_struct {
77284 #ifdef CONFIG_NUMA
77285 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
77286 #endif
77287+
77288+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
77289 };
77290
77291 struct core_thread {
77292@@ -444,6 +446,24 @@ struct mm_struct {
77293 bool tlb_flush_pending;
77294 #endif
77295 struct uprobes_state uprobes_state;
77296+
77297+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
77298+ unsigned long pax_flags;
77299+#endif
77300+
77301+#ifdef CONFIG_PAX_DLRESOLVE
77302+ unsigned long call_dl_resolve;
77303+#endif
77304+
77305+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
77306+ unsigned long call_syscall;
77307+#endif
77308+
77309+#ifdef CONFIG_PAX_ASLR
77310+ unsigned long delta_mmap; /* randomized offset */
77311+ unsigned long delta_stack; /* randomized offset */
77312+#endif
77313+
77314 };
77315
77316 /* first nid will either be a valid NID or one of these values */
77317diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
77318index c5d5278..f0b68c8 100644
77319--- a/include/linux/mmiotrace.h
77320+++ b/include/linux/mmiotrace.h
77321@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
77322 /* Called from ioremap.c */
77323 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
77324 void __iomem *addr);
77325-extern void mmiotrace_iounmap(volatile void __iomem *addr);
77326+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
77327
77328 /* For anyone to insert markers. Remember trailing newline. */
77329 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
77330@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
77331 {
77332 }
77333
77334-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
77335+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
77336 {
77337 }
77338
77339diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
77340index bd791e4..8617c34f 100644
77341--- a/include/linux/mmzone.h
77342+++ b/include/linux/mmzone.h
77343@@ -396,7 +396,7 @@ struct zone {
77344 unsigned long flags; /* zone flags, see below */
77345
77346 /* Zone statistics */
77347- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
77348+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
77349
77350 /*
77351 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
77352diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
77353index 45e9214..a7227d6 100644
77354--- a/include/linux/mod_devicetable.h
77355+++ b/include/linux/mod_devicetable.h
77356@@ -13,7 +13,7 @@
77357 typedef unsigned long kernel_ulong_t;
77358 #endif
77359
77360-#define PCI_ANY_ID (~0)
77361+#define PCI_ANY_ID ((__u16)~0)
77362
77363 struct pci_device_id {
77364 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
77365@@ -139,7 +139,7 @@ struct usb_device_id {
77366 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
77367 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
77368
77369-#define HID_ANY_ID (~0)
77370+#define HID_ANY_ID (~0U)
77371 #define HID_BUS_ANY 0xffff
77372 #define HID_GROUP_ANY 0x0000
77373
77374@@ -467,7 +467,7 @@ struct dmi_system_id {
77375 const char *ident;
77376 struct dmi_strmatch matches[4];
77377 void *driver_data;
77378-};
77379+} __do_const;
77380 /*
77381 * struct dmi_device_id appears during expansion of
77382 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
77383diff --git a/include/linux/module.h b/include/linux/module.h
77384index 05f2447..2aee07c 100644
77385--- a/include/linux/module.h
77386+++ b/include/linux/module.h
77387@@ -17,9 +17,11 @@
77388 #include <linux/moduleparam.h>
77389 #include <linux/tracepoint.h>
77390 #include <linux/export.h>
77391+#include <linux/fs.h>
77392
77393 #include <linux/percpu.h>
77394 #include <asm/module.h>
77395+#include <asm/pgtable.h>
77396
77397 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
77398 #define MODULE_SIG_STRING "~Module signature appended~\n"
77399@@ -55,12 +57,13 @@ struct module_attribute {
77400 int (*test)(struct module *);
77401 void (*free)(struct module *);
77402 };
77403+typedef struct module_attribute __no_const module_attribute_no_const;
77404
77405 struct module_version_attribute {
77406 struct module_attribute mattr;
77407 const char *module_name;
77408 const char *version;
77409-} __attribute__ ((__aligned__(sizeof(void *))));
77410+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
77411
77412 extern ssize_t __modver_version_show(struct module_attribute *,
77413 struct module_kobject *, char *);
77414@@ -238,7 +241,7 @@ struct module
77415
77416 /* Sysfs stuff. */
77417 struct module_kobject mkobj;
77418- struct module_attribute *modinfo_attrs;
77419+ module_attribute_no_const *modinfo_attrs;
77420 const char *version;
77421 const char *srcversion;
77422 struct kobject *holders_dir;
77423@@ -287,19 +290,16 @@ struct module
77424 int (*init)(void);
77425
77426 /* If this is non-NULL, vfree after init() returns */
77427- void *module_init;
77428+ void *module_init_rx, *module_init_rw;
77429
77430 /* Here is the actual code + data, vfree'd on unload. */
77431- void *module_core;
77432+ void *module_core_rx, *module_core_rw;
77433
77434 /* Here are the sizes of the init and core sections */
77435- unsigned int init_size, core_size;
77436+ unsigned int init_size_rw, core_size_rw;
77437
77438 /* The size of the executable code in each section. */
77439- unsigned int init_text_size, core_text_size;
77440-
77441- /* Size of RO sections of the module (text+rodata) */
77442- unsigned int init_ro_size, core_ro_size;
77443+ unsigned int init_size_rx, core_size_rx;
77444
77445 /* Arch-specific module values */
77446 struct mod_arch_specific arch;
77447@@ -355,6 +355,10 @@ struct module
77448 #ifdef CONFIG_EVENT_TRACING
77449 struct ftrace_event_call **trace_events;
77450 unsigned int num_trace_events;
77451+ struct file_operations trace_id;
77452+ struct file_operations trace_enable;
77453+ struct file_operations trace_format;
77454+ struct file_operations trace_filter;
77455 #endif
77456 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
77457 unsigned int num_ftrace_callsites;
77458@@ -402,16 +406,46 @@ bool is_module_address(unsigned long addr);
77459 bool is_module_percpu_address(unsigned long addr);
77460 bool is_module_text_address(unsigned long addr);
77461
77462+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
77463+{
77464+
77465+#ifdef CONFIG_PAX_KERNEXEC
77466+ if (ktla_ktva(addr) >= (unsigned long)start &&
77467+ ktla_ktva(addr) < (unsigned long)start + size)
77468+ return 1;
77469+#endif
77470+
77471+ return ((void *)addr >= start && (void *)addr < start + size);
77472+}
77473+
77474+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
77475+{
77476+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
77477+}
77478+
77479+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
77480+{
77481+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
77482+}
77483+
77484+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
77485+{
77486+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
77487+}
77488+
77489+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
77490+{
77491+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
77492+}
77493+
77494 static inline int within_module_core(unsigned long addr, const struct module *mod)
77495 {
77496- return (unsigned long)mod->module_core <= addr &&
77497- addr < (unsigned long)mod->module_core + mod->core_size;
77498+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
77499 }
77500
77501 static inline int within_module_init(unsigned long addr, const struct module *mod)
77502 {
77503- return (unsigned long)mod->module_init <= addr &&
77504- addr < (unsigned long)mod->module_init + mod->init_size;
77505+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
77506 }
77507
77508 /* Search for module by name: must hold module_mutex. */
77509diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
77510index 560ca53..ef621ef 100644
77511--- a/include/linux/moduleloader.h
77512+++ b/include/linux/moduleloader.h
77513@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
77514 sections. Returns NULL on failure. */
77515 void *module_alloc(unsigned long size);
77516
77517+#ifdef CONFIG_PAX_KERNEXEC
77518+void *module_alloc_exec(unsigned long size);
77519+#else
77520+#define module_alloc_exec(x) module_alloc(x)
77521+#endif
77522+
77523 /* Free memory returned from module_alloc. */
77524 void module_free(struct module *mod, void *module_region);
77525
77526+#ifdef CONFIG_PAX_KERNEXEC
77527+void module_free_exec(struct module *mod, void *module_region);
77528+#else
77529+#define module_free_exec(x, y) module_free((x), (y))
77530+#endif
77531+
77532 /*
77533 * Apply the given relocation to the (simplified) ELF. Return -error
77534 * or 0.
77535@@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
77536 unsigned int relsec,
77537 struct module *me)
77538 {
77539+#ifdef CONFIG_MODULES
77540 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
77541+#endif
77542 return -ENOEXEC;
77543 }
77544 #endif
77545@@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
77546 unsigned int relsec,
77547 struct module *me)
77548 {
77549+#ifdef CONFIG_MODULES
77550 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
77551+#endif
77552 return -ENOEXEC;
77553 }
77554 #endif
77555diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
77556index c3eb102..073c4a6 100644
77557--- a/include/linux/moduleparam.h
77558+++ b/include/linux/moduleparam.h
77559@@ -295,7 +295,7 @@ static inline void __kernel_param_unlock(void)
77560 * @len is usually just sizeof(string).
77561 */
77562 #define module_param_string(name, string, len, perm) \
77563- static const struct kparam_string __param_string_##name \
77564+ static const struct kparam_string __param_string_##name __used \
77565 = { len, string }; \
77566 __module_param_call(MODULE_PARAM_PREFIX, name, \
77567 &param_ops_string, \
77568@@ -434,7 +434,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
77569 */
77570 #define module_param_array_named(name, array, type, nump, perm) \
77571 param_check_##type(name, &(array)[0]); \
77572- static const struct kparam_array __param_arr_##name \
77573+ static const struct kparam_array __param_arr_##name __used \
77574 = { .max = ARRAY_SIZE(array), .num = nump, \
77575 .ops = &param_ops_##type, \
77576 .elemsize = sizeof(array[0]), .elem = array }; \
77577diff --git a/include/linux/namei.h b/include/linux/namei.h
77578index 8e47bc7..c70fd73 100644
77579--- a/include/linux/namei.h
77580+++ b/include/linux/namei.h
77581@@ -19,7 +19,7 @@ struct nameidata {
77582 unsigned seq;
77583 int last_type;
77584 unsigned depth;
77585- char *saved_names[MAX_NESTED_LINKS + 1];
77586+ const char *saved_names[MAX_NESTED_LINKS + 1];
77587 };
77588
77589 /*
77590@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
77591
77592 extern void nd_jump_link(struct nameidata *nd, struct path *path);
77593
77594-static inline void nd_set_link(struct nameidata *nd, char *path)
77595+static inline void nd_set_link(struct nameidata *nd, const char *path)
77596 {
77597 nd->saved_names[nd->depth] = path;
77598 }
77599
77600-static inline char *nd_get_link(struct nameidata *nd)
77601+static inline const char *nd_get_link(const struct nameidata *nd)
77602 {
77603 return nd->saved_names[nd->depth];
77604 }
77605diff --git a/include/linux/net.h b/include/linux/net.h
77606index 8bd9d92..08b1c20 100644
77607--- a/include/linux/net.h
77608+++ b/include/linux/net.h
77609@@ -191,7 +191,7 @@ struct net_proto_family {
77610 int (*create)(struct net *net, struct socket *sock,
77611 int protocol, int kern);
77612 struct module *owner;
77613-};
77614+} __do_const;
77615
77616 struct iovec;
77617 struct kvec;
77618diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
77619index 25f5d2d1..5cf2120 100644
77620--- a/include/linux/netdevice.h
77621+++ b/include/linux/netdevice.h
77622@@ -1098,6 +1098,7 @@ struct net_device_ops {
77623 sa_family_t sa_family,
77624 __be16 port);
77625 };
77626+typedef struct net_device_ops __no_const net_device_ops_no_const;
77627
77628 /*
77629 * The DEVICE structure.
77630@@ -1169,7 +1170,7 @@ struct net_device {
77631 int iflink;
77632
77633 struct net_device_stats stats;
77634- atomic_long_t rx_dropped; /* dropped packets by core network
77635+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
77636 * Do not use this in drivers.
77637 */
77638
77639diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
77640index 708fe72ab9..77084a3 100644
77641--- a/include/linux/netfilter.h
77642+++ b/include/linux/netfilter.h
77643@@ -82,7 +82,7 @@ struct nf_sockopt_ops {
77644 #endif
77645 /* Use the module struct to lock set/get code in place */
77646 struct module *owner;
77647-};
77648+} __do_const;
77649
77650 /* Function to register/unregister hook points. */
77651 int nf_register_hook(struct nf_hook_ops *reg);
77652diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
77653index cadb740..d7c37c0 100644
77654--- a/include/linux/netfilter/nfnetlink.h
77655+++ b/include/linux/netfilter/nfnetlink.h
77656@@ -16,7 +16,7 @@ struct nfnl_callback {
77657 const struct nlattr * const cda[]);
77658 const struct nla_policy *policy; /* netlink attribute policy */
77659 const u_int16_t attr_count; /* number of nlattr's */
77660-};
77661+} __do_const;
77662
77663 struct nfnetlink_subsystem {
77664 const char *name;
77665diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
77666new file mode 100644
77667index 0000000..33f4af8
77668--- /dev/null
77669+++ b/include/linux/netfilter/xt_gradm.h
77670@@ -0,0 +1,9 @@
77671+#ifndef _LINUX_NETFILTER_XT_GRADM_H
77672+#define _LINUX_NETFILTER_XT_GRADM_H 1
77673+
77674+struct xt_gradm_mtinfo {
77675+ __u16 flags;
77676+ __u16 invflags;
77677+};
77678+
77679+#endif
77680diff --git a/include/linux/nls.h b/include/linux/nls.h
77681index 5dc635f..35f5e11 100644
77682--- a/include/linux/nls.h
77683+++ b/include/linux/nls.h
77684@@ -31,7 +31,7 @@ struct nls_table {
77685 const unsigned char *charset2upper;
77686 struct module *owner;
77687 struct nls_table *next;
77688-};
77689+} __do_const;
77690
77691 /* this value hold the maximum octet of charset */
77692 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
77693diff --git a/include/linux/notifier.h b/include/linux/notifier.h
77694index d14a4c3..a078786 100644
77695--- a/include/linux/notifier.h
77696+++ b/include/linux/notifier.h
77697@@ -54,7 +54,8 @@ struct notifier_block {
77698 notifier_fn_t notifier_call;
77699 struct notifier_block __rcu *next;
77700 int priority;
77701-};
77702+} __do_const;
77703+typedef struct notifier_block __no_const notifier_block_no_const;
77704
77705 struct atomic_notifier_head {
77706 spinlock_t lock;
77707diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
77708index b2a0f15..4d7da32 100644
77709--- a/include/linux/oprofile.h
77710+++ b/include/linux/oprofile.h
77711@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
77712 int oprofilefs_create_ro_ulong(struct dentry * root,
77713 char const * name, ulong * val);
77714
77715-/** Create a file for read-only access to an atomic_t. */
77716+/** Create a file for read-only access to an atomic_unchecked_t. */
77717 int oprofilefs_create_ro_atomic(struct dentry * root,
77718- char const * name, atomic_t * val);
77719+ char const * name, atomic_unchecked_t * val);
77720
77721 /** create a directory */
77722 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
77723diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
77724index 430dd96..544e26e 100644
77725--- a/include/linux/pci_hotplug.h
77726+++ b/include/linux/pci_hotplug.h
77727@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
77728 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
77729 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
77730 int (*reset_slot) (struct hotplug_slot *slot, int probe);
77731-};
77732+} __do_const;
77733+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
77734
77735 /**
77736 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
77737diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
77738index c8ba627..24bdfa8 100644
77739--- a/include/linux/perf_event.h
77740+++ b/include/linux/perf_event.h
77741@@ -327,8 +327,8 @@ struct perf_event {
77742
77743 enum perf_event_active_state state;
77744 unsigned int attach_state;
77745- local64_t count;
77746- atomic64_t child_count;
77747+ local64_t count; /* PaX: fix it one day */
77748+ atomic64_unchecked_t child_count;
77749
77750 /*
77751 * These are the total time in nanoseconds that the event
77752@@ -379,8 +379,8 @@ struct perf_event {
77753 * These accumulate total time (in nanoseconds) that children
77754 * events have been enabled and running, respectively.
77755 */
77756- atomic64_t child_total_time_enabled;
77757- atomic64_t child_total_time_running;
77758+ atomic64_unchecked_t child_total_time_enabled;
77759+ atomic64_unchecked_t child_total_time_running;
77760
77761 /*
77762 * Protect attach/detach and child_list:
77763@@ -702,7 +702,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
77764 entry->ip[entry->nr++] = ip;
77765 }
77766
77767-extern int sysctl_perf_event_paranoid;
77768+extern int sysctl_perf_event_legitimately_concerned;
77769 extern int sysctl_perf_event_mlock;
77770 extern int sysctl_perf_event_sample_rate;
77771 extern int sysctl_perf_cpu_time_max_percent;
77772@@ -717,19 +717,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
77773 loff_t *ppos);
77774
77775
77776+static inline bool perf_paranoid_any(void)
77777+{
77778+ return sysctl_perf_event_legitimately_concerned > 2;
77779+}
77780+
77781 static inline bool perf_paranoid_tracepoint_raw(void)
77782 {
77783- return sysctl_perf_event_paranoid > -1;
77784+ return sysctl_perf_event_legitimately_concerned > -1;
77785 }
77786
77787 static inline bool perf_paranoid_cpu(void)
77788 {
77789- return sysctl_perf_event_paranoid > 0;
77790+ return sysctl_perf_event_legitimately_concerned > 0;
77791 }
77792
77793 static inline bool perf_paranoid_kernel(void)
77794 {
77795- return sysctl_perf_event_paranoid > 1;
77796+ return sysctl_perf_event_legitimately_concerned > 1;
77797 }
77798
77799 extern void perf_event_init(void);
77800@@ -845,7 +850,7 @@ struct perf_pmu_events_attr {
77801 struct device_attribute attr;
77802 u64 id;
77803 const char *event_str;
77804-};
77805+} __do_const;
77806
77807 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
77808 static struct perf_pmu_events_attr _var = { \
77809diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
77810index b8809fe..ae4ccd0 100644
77811--- a/include/linux/pipe_fs_i.h
77812+++ b/include/linux/pipe_fs_i.h
77813@@ -47,10 +47,10 @@ struct pipe_inode_info {
77814 struct mutex mutex;
77815 wait_queue_head_t wait;
77816 unsigned int nrbufs, curbuf, buffers;
77817- unsigned int readers;
77818- unsigned int writers;
77819- unsigned int files;
77820- unsigned int waiting_writers;
77821+ atomic_t readers;
77822+ atomic_t writers;
77823+ atomic_t files;
77824+ atomic_t waiting_writers;
77825 unsigned int r_counter;
77826 unsigned int w_counter;
77827 struct page *tmp_page;
77828diff --git a/include/linux/platform_data/usb-ehci-s5p.h b/include/linux/platform_data/usb-ehci-s5p.h
77829index 5f28cae..3d23723 100644
77830--- a/include/linux/platform_data/usb-ehci-s5p.h
77831+++ b/include/linux/platform_data/usb-ehci-s5p.h
77832@@ -14,7 +14,7 @@
77833 struct s5p_ehci_platdata {
77834 int (*phy_init)(struct platform_device *pdev, int type);
77835 int (*phy_exit)(struct platform_device *pdev, int type);
77836-};
77837+} __no_const;
77838
77839 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
77840
77841diff --git a/include/linux/platform_data/usb-ohci-exynos.h b/include/linux/platform_data/usb-ohci-exynos.h
77842index c256c59..8ea94c7 100644
77843--- a/include/linux/platform_data/usb-ohci-exynos.h
77844+++ b/include/linux/platform_data/usb-ohci-exynos.h
77845@@ -14,7 +14,7 @@
77846 struct exynos4_ohci_platdata {
77847 int (*phy_init)(struct platform_device *pdev, int type);
77848 int (*phy_exit)(struct platform_device *pdev, int type);
77849-};
77850+} __no_const;
77851
77852 extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
77853
77854diff --git a/include/linux/pm.h b/include/linux/pm.h
77855index a224c7f..92d8a97 100644
77856--- a/include/linux/pm.h
77857+++ b/include/linux/pm.h
77858@@ -576,6 +576,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
77859 struct dev_pm_domain {
77860 struct dev_pm_ops ops;
77861 };
77862+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
77863
77864 /*
77865 * The PM_EVENT_ messages are also used by drivers implementing the legacy
77866diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
77867index 7c1d252..c5c773e 100644
77868--- a/include/linux/pm_domain.h
77869+++ b/include/linux/pm_domain.h
77870@@ -48,7 +48,7 @@ struct gpd_dev_ops {
77871
77872 struct gpd_cpu_data {
77873 unsigned int saved_exit_latency;
77874- struct cpuidle_state *idle_state;
77875+ cpuidle_state_no_const *idle_state;
77876 };
77877
77878 struct generic_pm_domain {
77879diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
77880index 6fa7cea..7bf6415 100644
77881--- a/include/linux/pm_runtime.h
77882+++ b/include/linux/pm_runtime.h
77883@@ -103,7 +103,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
77884
77885 static inline void pm_runtime_mark_last_busy(struct device *dev)
77886 {
77887- ACCESS_ONCE(dev->power.last_busy) = jiffies;
77888+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
77889 }
77890
77891 #else /* !CONFIG_PM_RUNTIME */
77892diff --git a/include/linux/pnp.h b/include/linux/pnp.h
77893index 195aafc..49a7bc2 100644
77894--- a/include/linux/pnp.h
77895+++ b/include/linux/pnp.h
77896@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
77897 struct pnp_fixup {
77898 char id[7];
77899 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
77900-};
77901+} __do_const;
77902
77903 /* config parameters */
77904 #define PNP_CONFIG_NORMAL 0x0001
77905diff --git a/include/linux/poison.h b/include/linux/poison.h
77906index 2110a81..13a11bb 100644
77907--- a/include/linux/poison.h
77908+++ b/include/linux/poison.h
77909@@ -19,8 +19,8 @@
77910 * under normal circumstances, used to verify that nobody uses
77911 * non-initialized list entries.
77912 */
77913-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
77914-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
77915+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
77916+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
77917
77918 /********** include/linux/timer.h **********/
77919 /*
77920diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
77921index d8b187c3..9a9257a 100644
77922--- a/include/linux/power/smartreflex.h
77923+++ b/include/linux/power/smartreflex.h
77924@@ -238,7 +238,7 @@ struct omap_sr_class_data {
77925 int (*notify)(struct omap_sr *sr, u32 status);
77926 u8 notify_flags;
77927 u8 class_type;
77928-};
77929+} __do_const;
77930
77931 /**
77932 * struct omap_sr_nvalue_table - Smartreflex n-target value info
77933diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
77934index 4ea1d37..80f4b33 100644
77935--- a/include/linux/ppp-comp.h
77936+++ b/include/linux/ppp-comp.h
77937@@ -84,7 +84,7 @@ struct compressor {
77938 struct module *owner;
77939 /* Extra skb space needed by the compressor algorithm */
77940 unsigned int comp_extra;
77941-};
77942+} __do_const;
77943
77944 /*
77945 * The return value from decompress routine is the length of the
77946diff --git a/include/linux/preempt.h b/include/linux/preempt.h
77947index f5d4723..a6ea2fa 100644
77948--- a/include/linux/preempt.h
77949+++ b/include/linux/preempt.h
77950@@ -18,8 +18,13 @@
77951 # define sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
77952 #endif
77953
77954+#define raw_add_preempt_count(val) do { preempt_count() += (val); } while (0)
77955+#define raw_sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
77956+
77957 #define inc_preempt_count() add_preempt_count(1)
77958+#define raw_inc_preempt_count() raw_add_preempt_count(1)
77959 #define dec_preempt_count() sub_preempt_count(1)
77960+#define raw_dec_preempt_count() raw_sub_preempt_count(1)
77961
77962 #define preempt_count() (current_thread_info()->preempt_count)
77963
77964@@ -64,6 +69,12 @@ do { \
77965 barrier(); \
77966 } while (0)
77967
77968+#define raw_preempt_disable() \
77969+do { \
77970+ raw_inc_preempt_count(); \
77971+ barrier(); \
77972+} while (0)
77973+
77974 #define sched_preempt_enable_no_resched() \
77975 do { \
77976 barrier(); \
77977@@ -72,6 +83,12 @@ do { \
77978
77979 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
77980
77981+#define raw_preempt_enable_no_resched() \
77982+do { \
77983+ barrier(); \
77984+ raw_dec_preempt_count(); \
77985+} while (0)
77986+
77987 #define preempt_enable() \
77988 do { \
77989 preempt_enable_no_resched(); \
77990@@ -116,8 +133,10 @@ do { \
77991 * region.
77992 */
77993 #define preempt_disable() barrier()
77994+#define raw_preempt_disable() barrier()
77995 #define sched_preempt_enable_no_resched() barrier()
77996 #define preempt_enable_no_resched() barrier()
77997+#define raw_preempt_enable_no_resched() barrier()
77998 #define preempt_enable() barrier()
77999
78000 #define preempt_disable_notrace() barrier()
78001diff --git a/include/linux/printk.h b/include/linux/printk.h
78002index e6131a78..8e9fb61 100644
78003--- a/include/linux/printk.h
78004+++ b/include/linux/printk.h
78005@@ -106,6 +106,8 @@ static inline __printf(1, 2) __cold
78006 void early_printk(const char *s, ...) { }
78007 #endif
78008
78009+extern int kptr_restrict;
78010+
78011 #ifdef CONFIG_PRINTK
78012 asmlinkage __printf(5, 0)
78013 int vprintk_emit(int facility, int level,
78014@@ -140,7 +142,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
78015
78016 extern int printk_delay_msec;
78017 extern int dmesg_restrict;
78018-extern int kptr_restrict;
78019
78020 extern void wake_up_klogd(void);
78021
78022diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
78023index 608e60a..c26f864 100644
78024--- a/include/linux/proc_fs.h
78025+++ b/include/linux/proc_fs.h
78026@@ -34,6 +34,19 @@ static inline struct proc_dir_entry *proc_create(
78027 return proc_create_data(name, mode, parent, proc_fops, NULL);
78028 }
78029
78030+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
78031+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
78032+{
78033+#ifdef CONFIG_GRKERNSEC_PROC_USER
78034+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
78035+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78036+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
78037+#else
78038+ return proc_create_data(name, mode, parent, proc_fops, NULL);
78039+#endif
78040+}
78041+
78042+
78043 extern void proc_set_size(struct proc_dir_entry *, loff_t);
78044 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
78045 extern void *PDE_DATA(const struct inode *);
78046diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
78047index 34a1e10..03a6d03 100644
78048--- a/include/linux/proc_ns.h
78049+++ b/include/linux/proc_ns.h
78050@@ -14,7 +14,7 @@ struct proc_ns_operations {
78051 void (*put)(void *ns);
78052 int (*install)(struct nsproxy *nsproxy, void *ns);
78053 unsigned int (*inum)(void *ns);
78054-};
78055+} __do_const;
78056
78057 struct proc_ns {
78058 void *ns;
78059diff --git a/include/linux/quota.h b/include/linux/quota.h
78060index cc7494a..1e27036 100644
78061--- a/include/linux/quota.h
78062+++ b/include/linux/quota.h
78063@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
78064
78065 extern bool qid_eq(struct kqid left, struct kqid right);
78066 extern bool qid_lt(struct kqid left, struct kqid right);
78067-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
78068+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
78069 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
78070 extern bool qid_valid(struct kqid qid);
78071
78072diff --git a/include/linux/random.h b/include/linux/random.h
78073index bf9085e..1e8bbcf 100644
78074--- a/include/linux/random.h
78075+++ b/include/linux/random.h
78076@@ -10,9 +10,19 @@
78077
78078
78079 extern void add_device_randomness(const void *, unsigned int);
78080+
78081+static inline void add_latent_entropy(void)
78082+{
78083+
78084+#ifdef LATENT_ENTROPY_PLUGIN
78085+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
78086+#endif
78087+
78088+}
78089+
78090 extern void add_input_randomness(unsigned int type, unsigned int code,
78091- unsigned int value);
78092-extern void add_interrupt_randomness(int irq, int irq_flags);
78093+ unsigned int value) __latent_entropy;
78094+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
78095
78096 extern void get_random_bytes(void *buf, int nbytes);
78097 extern void get_random_bytes_arch(void *buf, int nbytes);
78098@@ -23,16 +33,21 @@ extern int random_int_secret_init(void);
78099 extern const struct file_operations random_fops, urandom_fops;
78100 #endif
78101
78102-unsigned int get_random_int(void);
78103+unsigned int __intentional_overflow(-1) get_random_int(void);
78104 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
78105
78106-u32 prandom_u32(void);
78107+u32 prandom_u32(void) __intentional_overflow(-1);
78108 void prandom_bytes(void *buf, int nbytes);
78109 void prandom_seed(u32 seed);
78110
78111 u32 prandom_u32_state(struct rnd_state *);
78112 void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
78113
78114+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
78115+{
78116+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
78117+}
78118+
78119 /*
78120 * Handle minimum values for seeds
78121 */
78122diff --git a/include/linux/rculist.h b/include/linux/rculist.h
78123index 4106721..132d42c 100644
78124--- a/include/linux/rculist.h
78125+++ b/include/linux/rculist.h
78126@@ -44,6 +44,9 @@ extern void __list_add_rcu(struct list_head *new,
78127 struct list_head *prev, struct list_head *next);
78128 #endif
78129
78130+extern void __pax_list_add_rcu(struct list_head *new,
78131+ struct list_head *prev, struct list_head *next);
78132+
78133 /**
78134 * list_add_rcu - add a new entry to rcu-protected list
78135 * @new: new entry to be added
78136@@ -65,6 +68,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
78137 __list_add_rcu(new, head, head->next);
78138 }
78139
78140+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
78141+{
78142+ __pax_list_add_rcu(new, head, head->next);
78143+}
78144+
78145 /**
78146 * list_add_tail_rcu - add a new entry to rcu-protected list
78147 * @new: new entry to be added
78148@@ -87,6 +95,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
78149 __list_add_rcu(new, head->prev, head);
78150 }
78151
78152+static inline void pax_list_add_tail_rcu(struct list_head *new,
78153+ struct list_head *head)
78154+{
78155+ __pax_list_add_rcu(new, head->prev, head);
78156+}
78157+
78158 /**
78159 * list_del_rcu - deletes entry from list without re-initialization
78160 * @entry: the element to delete from the list.
78161@@ -117,6 +131,8 @@ static inline void list_del_rcu(struct list_head *entry)
78162 entry->prev = LIST_POISON2;
78163 }
78164
78165+extern void pax_list_del_rcu(struct list_head *entry);
78166+
78167 /**
78168 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
78169 * @n: the element to delete from the hash list.
78170diff --git a/include/linux/reboot.h b/include/linux/reboot.h
78171index 9e7db9e..7d4fd72 100644
78172--- a/include/linux/reboot.h
78173+++ b/include/linux/reboot.h
78174@@ -44,9 +44,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
78175 */
78176
78177 extern void migrate_to_reboot_cpu(void);
78178-extern void machine_restart(char *cmd);
78179-extern void machine_halt(void);
78180-extern void machine_power_off(void);
78181+extern void machine_restart(char *cmd) __noreturn;
78182+extern void machine_halt(void) __noreturn;
78183+extern void machine_power_off(void) __noreturn;
78184
78185 extern void machine_shutdown(void);
78186 struct pt_regs;
78187@@ -57,9 +57,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
78188 */
78189
78190 extern void kernel_restart_prepare(char *cmd);
78191-extern void kernel_restart(char *cmd);
78192-extern void kernel_halt(void);
78193-extern void kernel_power_off(void);
78194+extern void kernel_restart(char *cmd) __noreturn;
78195+extern void kernel_halt(void) __noreturn;
78196+extern void kernel_power_off(void) __noreturn;
78197
78198 extern int C_A_D; /* for sysctl */
78199 void ctrl_alt_del(void);
78200@@ -73,7 +73,7 @@ extern int orderly_poweroff(bool force);
78201 * Emergency restart, callable from an interrupt handler.
78202 */
78203
78204-extern void emergency_restart(void);
78205+extern void emergency_restart(void) __noreturn;
78206 #include <asm/emergency-restart.h>
78207
78208 #endif /* _LINUX_REBOOT_H */
78209diff --git a/include/linux/regset.h b/include/linux/regset.h
78210index 8e0c9fe..ac4d221 100644
78211--- a/include/linux/regset.h
78212+++ b/include/linux/regset.h
78213@@ -161,7 +161,8 @@ struct user_regset {
78214 unsigned int align;
78215 unsigned int bias;
78216 unsigned int core_note_type;
78217-};
78218+} __do_const;
78219+typedef struct user_regset __no_const user_regset_no_const;
78220
78221 /**
78222 * struct user_regset_view - available regsets
78223diff --git a/include/linux/relay.h b/include/linux/relay.h
78224index d7c8359..818daf5 100644
78225--- a/include/linux/relay.h
78226+++ b/include/linux/relay.h
78227@@ -157,7 +157,7 @@ struct rchan_callbacks
78228 * The callback should return 0 if successful, negative if not.
78229 */
78230 int (*remove_buf_file)(struct dentry *dentry);
78231-};
78232+} __no_const;
78233
78234 /*
78235 * CONFIG_RELAY kernel API, kernel/relay.c
78236diff --git a/include/linux/rio.h b/include/linux/rio.h
78237index b71d573..2f940bd 100644
78238--- a/include/linux/rio.h
78239+++ b/include/linux/rio.h
78240@@ -355,7 +355,7 @@ struct rio_ops {
78241 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
78242 u64 rstart, u32 size, u32 flags);
78243 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
78244-};
78245+} __no_const;
78246
78247 #define RIO_RESOURCE_MEM 0x00000100
78248 #define RIO_RESOURCE_DOORBELL 0x00000200
78249diff --git a/include/linux/rmap.h b/include/linux/rmap.h
78250index 6dacb93..6174423 100644
78251--- a/include/linux/rmap.h
78252+++ b/include/linux/rmap.h
78253@@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
78254 void anon_vma_init(void); /* create anon_vma_cachep */
78255 int anon_vma_prepare(struct vm_area_struct *);
78256 void unlink_anon_vmas(struct vm_area_struct *);
78257-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
78258-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
78259+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
78260+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
78261
78262 static inline void anon_vma_merge(struct vm_area_struct *vma,
78263 struct vm_area_struct *next)
78264diff --git a/include/linux/sched.h b/include/linux/sched.h
78265index b1e963e..114b8fd 100644
78266--- a/include/linux/sched.h
78267+++ b/include/linux/sched.h
78268@@ -62,6 +62,7 @@ struct bio_list;
78269 struct fs_struct;
78270 struct perf_event_context;
78271 struct blk_plug;
78272+struct linux_binprm;
78273
78274 /*
78275 * List of flags we want to share for kernel threads,
78276@@ -295,7 +296,7 @@ extern char __sched_text_start[], __sched_text_end[];
78277 extern int in_sched_functions(unsigned long addr);
78278
78279 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
78280-extern signed long schedule_timeout(signed long timeout);
78281+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
78282 extern signed long schedule_timeout_interruptible(signed long timeout);
78283 extern signed long schedule_timeout_killable(signed long timeout);
78284 extern signed long schedule_timeout_uninterruptible(signed long timeout);
78285@@ -306,6 +307,19 @@ struct nsproxy;
78286 struct user_namespace;
78287
78288 #ifdef CONFIG_MMU
78289+
78290+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
78291+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
78292+#else
78293+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
78294+{
78295+ return 0;
78296+}
78297+#endif
78298+
78299+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
78300+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
78301+
78302 extern void arch_pick_mmap_layout(struct mm_struct *mm);
78303 extern unsigned long
78304 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
78305@@ -585,6 +599,17 @@ struct signal_struct {
78306 #ifdef CONFIG_TASKSTATS
78307 struct taskstats *stats;
78308 #endif
78309+
78310+#ifdef CONFIG_GRKERNSEC
78311+ u32 curr_ip;
78312+ u32 saved_ip;
78313+ u32 gr_saddr;
78314+ u32 gr_daddr;
78315+ u16 gr_sport;
78316+ u16 gr_dport;
78317+ u8 used_accept:1;
78318+#endif
78319+
78320 #ifdef CONFIG_AUDIT
78321 unsigned audit_tty;
78322 unsigned audit_tty_log_passwd;
78323@@ -665,6 +690,14 @@ struct user_struct {
78324 struct key *session_keyring; /* UID's default session keyring */
78325 #endif
78326
78327+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78328+ unsigned char kernel_banned;
78329+#endif
78330+#ifdef CONFIG_GRKERNSEC_BRUTE
78331+ unsigned char suid_banned;
78332+ unsigned long suid_ban_expires;
78333+#endif
78334+
78335 /* Hash table maintenance information */
78336 struct hlist_node uidhash_node;
78337 kuid_t uid;
78338@@ -1150,8 +1183,8 @@ struct task_struct {
78339 struct list_head thread_group;
78340
78341 struct completion *vfork_done; /* for vfork() */
78342- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
78343- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
78344+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
78345+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
78346
78347 cputime_t utime, stime, utimescaled, stimescaled;
78348 cputime_t gtime;
78349@@ -1176,11 +1209,6 @@ struct task_struct {
78350 struct task_cputime cputime_expires;
78351 struct list_head cpu_timers[3];
78352
78353-/* process credentials */
78354- const struct cred __rcu *real_cred; /* objective and real subjective task
78355- * credentials (COW) */
78356- const struct cred __rcu *cred; /* effective (overridable) subjective task
78357- * credentials (COW) */
78358 char comm[TASK_COMM_LEN]; /* executable name excluding path
78359 - access with [gs]et_task_comm (which lock
78360 it with task_lock())
78361@@ -1197,6 +1225,10 @@ struct task_struct {
78362 #endif
78363 /* CPU-specific state of this task */
78364 struct thread_struct thread;
78365+/* thread_info moved to task_struct */
78366+#ifdef CONFIG_X86
78367+ struct thread_info tinfo;
78368+#endif
78369 /* filesystem information */
78370 struct fs_struct *fs;
78371 /* open file information */
78372@@ -1270,6 +1302,10 @@ struct task_struct {
78373 gfp_t lockdep_reclaim_gfp;
78374 #endif
78375
78376+/* process credentials */
78377+ const struct cred __rcu *real_cred; /* objective and real subjective task
78378+ * credentials (COW) */
78379+
78380 /* journalling filesystem info */
78381 void *journal_info;
78382
78383@@ -1308,6 +1344,10 @@ struct task_struct {
78384 /* cg_list protected by css_set_lock and tsk->alloc_lock */
78385 struct list_head cg_list;
78386 #endif
78387+
78388+ const struct cred __rcu *cred; /* effective (overridable) subjective task
78389+ * credentials (COW) */
78390+
78391 #ifdef CONFIG_FUTEX
78392 struct robust_list_head __user *robust_list;
78393 #ifdef CONFIG_COMPAT
78394@@ -1411,8 +1451,78 @@ struct task_struct {
78395 unsigned int sequential_io;
78396 unsigned int sequential_io_avg;
78397 #endif
78398+
78399+#ifdef CONFIG_GRKERNSEC
78400+ /* grsecurity */
78401+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
78402+ u64 exec_id;
78403+#endif
78404+#ifdef CONFIG_GRKERNSEC_SETXID
78405+ const struct cred *delayed_cred;
78406+#endif
78407+ struct dentry *gr_chroot_dentry;
78408+ struct acl_subject_label *acl;
78409+ struct acl_subject_label *tmpacl;
78410+ struct acl_role_label *role;
78411+ struct file *exec_file;
78412+ unsigned long brute_expires;
78413+ u16 acl_role_id;
78414+ u8 inherited;
78415+ /* is this the task that authenticated to the special role */
78416+ u8 acl_sp_role;
78417+ u8 is_writable;
78418+ u8 brute;
78419+ u8 gr_is_chrooted;
78420+#endif
78421+
78422 };
78423
78424+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
78425+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
78426+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
78427+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
78428+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
78429+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
78430+
78431+#ifdef CONFIG_PAX_SOFTMODE
78432+extern int pax_softmode;
78433+#endif
78434+
78435+extern int pax_check_flags(unsigned long *);
78436+
78437+/* if tsk != current then task_lock must be held on it */
78438+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
78439+static inline unsigned long pax_get_flags(struct task_struct *tsk)
78440+{
78441+ if (likely(tsk->mm))
78442+ return tsk->mm->pax_flags;
78443+ else
78444+ return 0UL;
78445+}
78446+
78447+/* if tsk != current then task_lock must be held on it */
78448+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
78449+{
78450+ if (likely(tsk->mm)) {
78451+ tsk->mm->pax_flags = flags;
78452+ return 0;
78453+ }
78454+ return -EINVAL;
78455+}
78456+#endif
78457+
78458+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
78459+extern void pax_set_initial_flags(struct linux_binprm *bprm);
78460+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
78461+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
78462+#endif
78463+
78464+struct path;
78465+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
78466+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
78467+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
78468+extern void pax_report_refcount_overflow(struct pt_regs *regs);
78469+
78470 /* Future-safe accessor for struct task_struct's cpus_allowed. */
78471 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
78472
78473@@ -1471,7 +1581,7 @@ struct pid_namespace;
78474 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
78475 struct pid_namespace *ns);
78476
78477-static inline pid_t task_pid_nr(struct task_struct *tsk)
78478+static inline pid_t task_pid_nr(const struct task_struct *tsk)
78479 {
78480 return tsk->pid;
78481 }
78482@@ -1921,7 +2031,9 @@ void yield(void);
78483 extern struct exec_domain default_exec_domain;
78484
78485 union thread_union {
78486+#ifndef CONFIG_X86
78487 struct thread_info thread_info;
78488+#endif
78489 unsigned long stack[THREAD_SIZE/sizeof(long)];
78490 };
78491
78492@@ -1954,6 +2066,7 @@ extern struct pid_namespace init_pid_ns;
78493 */
78494
78495 extern struct task_struct *find_task_by_vpid(pid_t nr);
78496+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
78497 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
78498 struct pid_namespace *ns);
78499
78500@@ -2118,7 +2231,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
78501 extern void exit_itimers(struct signal_struct *);
78502 extern void flush_itimer_signals(void);
78503
78504-extern void do_group_exit(int);
78505+extern __noreturn void do_group_exit(int);
78506
78507 extern int allow_signal(int);
78508 extern int disallow_signal(int);
78509@@ -2309,9 +2422,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
78510
78511 #endif
78512
78513-static inline int object_is_on_stack(void *obj)
78514+static inline int object_starts_on_stack(void *obj)
78515 {
78516- void *stack = task_stack_page(current);
78517+ const void *stack = task_stack_page(current);
78518
78519 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
78520 }
78521diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
78522index bf8086b..962b035 100644
78523--- a/include/linux/sched/sysctl.h
78524+++ b/include/linux/sched/sysctl.h
78525@@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
78526 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
78527
78528 extern int sysctl_max_map_count;
78529+extern unsigned long sysctl_heap_stack_gap;
78530
78531 extern unsigned int sysctl_sched_latency;
78532 extern unsigned int sysctl_sched_min_granularity;
78533diff --git a/include/linux/security.h b/include/linux/security.h
78534index 9d37e2b..43368e4 100644
78535--- a/include/linux/security.h
78536+++ b/include/linux/security.h
78537@@ -27,6 +27,7 @@
78538 #include <linux/slab.h>
78539 #include <linux/err.h>
78540 #include <linux/string.h>
78541+#include <linux/grsecurity.h>
78542
78543 struct linux_binprm;
78544 struct cred;
78545@@ -116,8 +117,6 @@ struct seq_file;
78546
78547 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
78548
78549-void reset_security_ops(void);
78550-
78551 #ifdef CONFIG_MMU
78552 extern unsigned long mmap_min_addr;
78553 extern unsigned long dac_mmap_min_addr;
78554diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
78555index dc368b8..e895209 100644
78556--- a/include/linux/semaphore.h
78557+++ b/include/linux/semaphore.h
78558@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
78559 }
78560
78561 extern void down(struct semaphore *sem);
78562-extern int __must_check down_interruptible(struct semaphore *sem);
78563+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
78564 extern int __must_check down_killable(struct semaphore *sem);
78565 extern int __must_check down_trylock(struct semaphore *sem);
78566 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
78567diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
78568index 4e32edc..f8f2d18 100644
78569--- a/include/linux/seq_file.h
78570+++ b/include/linux/seq_file.h
78571@@ -26,6 +26,9 @@ struct seq_file {
78572 struct mutex lock;
78573 const struct seq_operations *op;
78574 int poll_event;
78575+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
78576+ u64 exec_id;
78577+#endif
78578 #ifdef CONFIG_USER_NS
78579 struct user_namespace *user_ns;
78580 #endif
78581@@ -38,6 +41,7 @@ struct seq_operations {
78582 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
78583 int (*show) (struct seq_file *m, void *v);
78584 };
78585+typedef struct seq_operations __no_const seq_operations_no_const;
78586
78587 #define SEQ_SKIP 1
78588
78589diff --git a/include/linux/shm.h b/include/linux/shm.h
78590index 429c199..4d42e38 100644
78591--- a/include/linux/shm.h
78592+++ b/include/linux/shm.h
78593@@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
78594
78595 /* The task created the shm object. NULL if the task is dead. */
78596 struct task_struct *shm_creator;
78597+#ifdef CONFIG_GRKERNSEC
78598+ time_t shm_createtime;
78599+ pid_t shm_lapid;
78600+#endif
78601 };
78602
78603 /* shm_mode upper byte flags */
78604diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
78605index f66f346..2e304d5 100644
78606--- a/include/linux/skbuff.h
78607+++ b/include/linux/skbuff.h
78608@@ -639,7 +639,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
78609 extern struct sk_buff *__alloc_skb(unsigned int size,
78610 gfp_t priority, int flags, int node);
78611 extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
78612-static inline struct sk_buff *alloc_skb(unsigned int size,
78613+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
78614 gfp_t priority)
78615 {
78616 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
78617@@ -755,7 +755,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
78618 */
78619 static inline int skb_queue_empty(const struct sk_buff_head *list)
78620 {
78621- return list->next == (struct sk_buff *)list;
78622+ return list->next == (const struct sk_buff *)list;
78623 }
78624
78625 /**
78626@@ -768,7 +768,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
78627 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
78628 const struct sk_buff *skb)
78629 {
78630- return skb->next == (struct sk_buff *)list;
78631+ return skb->next == (const struct sk_buff *)list;
78632 }
78633
78634 /**
78635@@ -781,7 +781,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
78636 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
78637 const struct sk_buff *skb)
78638 {
78639- return skb->prev == (struct sk_buff *)list;
78640+ return skb->prev == (const struct sk_buff *)list;
78641 }
78642
78643 /**
78644@@ -1741,7 +1741,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
78645 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
78646 */
78647 #ifndef NET_SKB_PAD
78648-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
78649+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
78650 #endif
78651
78652 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
78653@@ -2339,7 +2339,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
78654 int noblock, int *err);
78655 extern unsigned int datagram_poll(struct file *file, struct socket *sock,
78656 struct poll_table_struct *wait);
78657-extern int skb_copy_datagram_iovec(const struct sk_buff *from,
78658+extern int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from,
78659 int offset, struct iovec *to,
78660 int size);
78661 extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
78662@@ -2618,6 +2618,9 @@ static inline void nf_reset(struct sk_buff *skb)
78663 nf_bridge_put(skb->nf_bridge);
78664 skb->nf_bridge = NULL;
78665 #endif
78666+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
78667+ skb->nf_trace = 0;
78668+#endif
78669 }
78670
78671 static inline void nf_reset_trace(struct sk_buff *skb)
78672diff --git a/include/linux/slab.h b/include/linux/slab.h
78673index 74f1058..914b7da 100644
78674--- a/include/linux/slab.h
78675+++ b/include/linux/slab.h
78676@@ -14,15 +14,29 @@
78677 #include <linux/gfp.h>
78678 #include <linux/types.h>
78679 #include <linux/workqueue.h>
78680-
78681+#include <linux/err.h>
78682
78683 /*
78684 * Flags to pass to kmem_cache_create().
78685 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
78686 */
78687 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
78688+
78689+#ifdef CONFIG_PAX_USERCOPY_SLABS
78690+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
78691+#else
78692+#define SLAB_USERCOPY 0x00000000UL
78693+#endif
78694+
78695 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
78696 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
78697+
78698+#ifdef CONFIG_PAX_MEMORY_SANITIZE
78699+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
78700+#else
78701+#define SLAB_NO_SANITIZE 0x00000000UL
78702+#endif
78703+
78704 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
78705 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
78706 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
78707@@ -91,10 +105,13 @@
78708 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
78709 * Both make kfree a no-op.
78710 */
78711-#define ZERO_SIZE_PTR ((void *)16)
78712+#define ZERO_SIZE_PTR \
78713+({ \
78714+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
78715+ (void *)(-MAX_ERRNO-1L); \
78716+})
78717
78718-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
78719- (unsigned long)ZERO_SIZE_PTR)
78720+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
78721
78722 #include <linux/kmemleak.h>
78723
78724@@ -135,6 +152,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
78725 void kfree(const void *);
78726 void kzfree(const void *);
78727 size_t ksize(const void *);
78728+const char *check_heap_object(const void *ptr, unsigned long n);
78729+bool is_usercopy_object(const void *ptr);
78730
78731 /*
78732 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
78733@@ -167,7 +186,7 @@ struct kmem_cache {
78734 unsigned int align; /* Alignment as calculated */
78735 unsigned long flags; /* Active flags on the slab */
78736 const char *name; /* Slab name for sysfs */
78737- int refcount; /* Use counter */
78738+ atomic_t refcount; /* Use counter */
78739 void (*ctor)(void *); /* Called on object slot creation */
78740 struct list_head list; /* List of all slab caches on the system */
78741 };
78742@@ -241,6 +260,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
78743 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
78744 #endif
78745
78746+#ifdef CONFIG_PAX_USERCOPY_SLABS
78747+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
78748+#endif
78749+
78750 /*
78751 * Figure out which kmalloc slab an allocation of a certain size
78752 * belongs to.
78753@@ -249,7 +272,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
78754 * 2 = 120 .. 192 bytes
78755 * n = 2^(n-1) .. 2^n -1
78756 */
78757-static __always_inline int kmalloc_index(size_t size)
78758+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
78759 {
78760 if (!size)
78761 return 0;
78762@@ -292,11 +315,11 @@ static __always_inline int kmalloc_index(size_t size)
78763 }
78764 #endif /* !CONFIG_SLOB */
78765
78766-void *__kmalloc(size_t size, gfp_t flags);
78767+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
78768 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
78769
78770 #ifdef CONFIG_NUMA
78771-void *__kmalloc_node(size_t size, gfp_t flags, int node);
78772+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
78773 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
78774 #else
78775 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
78776diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
78777index e9346b4..1494959 100644
78778--- a/include/linux/slab_def.h
78779+++ b/include/linux/slab_def.h
78780@@ -36,7 +36,7 @@ struct kmem_cache {
78781 /* 4) cache creation/removal */
78782 const char *name;
78783 struct list_head list;
78784- int refcount;
78785+ atomic_t refcount;
78786 int object_size;
78787 int align;
78788
78789@@ -52,10 +52,14 @@ struct kmem_cache {
78790 unsigned long node_allocs;
78791 unsigned long node_frees;
78792 unsigned long node_overflow;
78793- atomic_t allochit;
78794- atomic_t allocmiss;
78795- atomic_t freehit;
78796- atomic_t freemiss;
78797+ atomic_unchecked_t allochit;
78798+ atomic_unchecked_t allocmiss;
78799+ atomic_unchecked_t freehit;
78800+ atomic_unchecked_t freemiss;
78801+#ifdef CONFIG_PAX_MEMORY_SANITIZE
78802+ atomic_unchecked_t sanitized;
78803+ atomic_unchecked_t not_sanitized;
78804+#endif
78805
78806 /*
78807 * If debugging is enabled, then the allocator can add additional
78808diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
78809index cc0b67e..a0329b1 100644
78810--- a/include/linux/slub_def.h
78811+++ b/include/linux/slub_def.h
78812@@ -74,7 +74,7 @@ struct kmem_cache {
78813 struct kmem_cache_order_objects max;
78814 struct kmem_cache_order_objects min;
78815 gfp_t allocflags; /* gfp flags to use on each alloc */
78816- int refcount; /* Refcount for slab cache destroy */
78817+ atomic_t refcount; /* Refcount for slab cache destroy */
78818 void (*ctor)(void *);
78819 int inuse; /* Offset to metadata */
78820 int align; /* Alignment */
78821diff --git a/include/linux/smp.h b/include/linux/smp.h
78822index 731f523..3340268 100644
78823--- a/include/linux/smp.h
78824+++ b/include/linux/smp.h
78825@@ -186,7 +186,9 @@ static inline void __smp_call_function_single(int cpuid,
78826 #endif
78827
78828 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
78829+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
78830 #define put_cpu() preempt_enable()
78831+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
78832
78833 /*
78834 * Callback to arch code if there's nosmp or maxcpus=0 on the
78835diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
78836index 54f91d3..be2c379 100644
78837--- a/include/linux/sock_diag.h
78838+++ b/include/linux/sock_diag.h
78839@@ -11,7 +11,7 @@ struct sock;
78840 struct sock_diag_handler {
78841 __u8 family;
78842 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
78843-};
78844+} __do_const;
78845
78846 int sock_diag_register(const struct sock_diag_handler *h);
78847 void sock_diag_unregister(const struct sock_diag_handler *h);
78848diff --git a/include/linux/sonet.h b/include/linux/sonet.h
78849index 680f9a3..f13aeb0 100644
78850--- a/include/linux/sonet.h
78851+++ b/include/linux/sonet.h
78852@@ -7,7 +7,7 @@
78853 #include <uapi/linux/sonet.h>
78854
78855 struct k_sonet_stats {
78856-#define __HANDLE_ITEM(i) atomic_t i
78857+#define __HANDLE_ITEM(i) atomic_unchecked_t i
78858 __SONET_ITEMS
78859 #undef __HANDLE_ITEM
78860 };
78861diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
78862index 07d8e53..dc934c9 100644
78863--- a/include/linux/sunrpc/addr.h
78864+++ b/include/linux/sunrpc/addr.h
78865@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
78866 {
78867 switch (sap->sa_family) {
78868 case AF_INET:
78869- return ntohs(((struct sockaddr_in *)sap)->sin_port);
78870+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
78871 case AF_INET6:
78872- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
78873+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
78874 }
78875 return 0;
78876 }
78877@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
78878 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
78879 const struct sockaddr *src)
78880 {
78881- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
78882+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
78883 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
78884
78885 dsin->sin_family = ssin->sin_family;
78886@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
78887 if (sa->sa_family != AF_INET6)
78888 return 0;
78889
78890- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
78891+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
78892 }
78893
78894 #endif /* _LINUX_SUNRPC_ADDR_H */
78895diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
78896index 6740801..c535f27 100644
78897--- a/include/linux/sunrpc/clnt.h
78898+++ b/include/linux/sunrpc/clnt.h
78899@@ -96,7 +96,7 @@ struct rpc_procinfo {
78900 unsigned int p_timer; /* Which RTT timer to use */
78901 u32 p_statidx; /* Which procedure to account */
78902 const char * p_name; /* name of procedure */
78903-};
78904+} __do_const;
78905
78906 #ifdef __KERNEL__
78907
78908diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
78909index 6eecfc2..7ada79d 100644
78910--- a/include/linux/sunrpc/svc.h
78911+++ b/include/linux/sunrpc/svc.h
78912@@ -410,7 +410,7 @@ struct svc_procedure {
78913 unsigned int pc_count; /* call count */
78914 unsigned int pc_cachetype; /* cache info (NFS) */
78915 unsigned int pc_xdrressize; /* maximum size of XDR reply */
78916-};
78917+} __do_const;
78918
78919 /*
78920 * Function prototypes.
78921diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
78922index 0b8e3e6..33e0a01 100644
78923--- a/include/linux/sunrpc/svc_rdma.h
78924+++ b/include/linux/sunrpc/svc_rdma.h
78925@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
78926 extern unsigned int svcrdma_max_requests;
78927 extern unsigned int svcrdma_max_req_size;
78928
78929-extern atomic_t rdma_stat_recv;
78930-extern atomic_t rdma_stat_read;
78931-extern atomic_t rdma_stat_write;
78932-extern atomic_t rdma_stat_sq_starve;
78933-extern atomic_t rdma_stat_rq_starve;
78934-extern atomic_t rdma_stat_rq_poll;
78935-extern atomic_t rdma_stat_rq_prod;
78936-extern atomic_t rdma_stat_sq_poll;
78937-extern atomic_t rdma_stat_sq_prod;
78938+extern atomic_unchecked_t rdma_stat_recv;
78939+extern atomic_unchecked_t rdma_stat_read;
78940+extern atomic_unchecked_t rdma_stat_write;
78941+extern atomic_unchecked_t rdma_stat_sq_starve;
78942+extern atomic_unchecked_t rdma_stat_rq_starve;
78943+extern atomic_unchecked_t rdma_stat_rq_poll;
78944+extern atomic_unchecked_t rdma_stat_rq_prod;
78945+extern atomic_unchecked_t rdma_stat_sq_poll;
78946+extern atomic_unchecked_t rdma_stat_sq_prod;
78947
78948 #define RPCRDMA_VERSION 1
78949
78950diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
78951index 8d71d65..f79586e 100644
78952--- a/include/linux/sunrpc/svcauth.h
78953+++ b/include/linux/sunrpc/svcauth.h
78954@@ -120,7 +120,7 @@ struct auth_ops {
78955 int (*release)(struct svc_rqst *rq);
78956 void (*domain_release)(struct auth_domain *);
78957 int (*set_client)(struct svc_rqst *rq);
78958-};
78959+} __do_const;
78960
78961 #define SVC_GARBAGE 1
78962 #define SVC_SYSERR 2
78963diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
78964index a5ffd32..0935dea 100644
78965--- a/include/linux/swiotlb.h
78966+++ b/include/linux/swiotlb.h
78967@@ -60,7 +60,8 @@ extern void
78968
78969 extern void
78970 swiotlb_free_coherent(struct device *hwdev, size_t size,
78971- void *vaddr, dma_addr_t dma_handle);
78972+ void *vaddr, dma_addr_t dma_handle,
78973+ struct dma_attrs *attrs);
78974
78975 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
78976 unsigned long offset, size_t size,
78977diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
78978index 7fac04e..de57300 100644
78979--- a/include/linux/syscalls.h
78980+++ b/include/linux/syscalls.h
78981@@ -97,8 +97,14 @@ struct sigaltstack;
78982 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
78983
78984 #define __SC_DECL(t, a) t a
78985+#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))
78986 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
78987-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
78988+#define __SC_LONG(t, a) __typeof( \
78989+ __builtin_choose_expr( \
78990+ sizeof(t) > sizeof(int), \
78991+ (t) 0, \
78992+ __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
78993+ )) a
78994 #define __SC_CAST(t, a) (t) a
78995 #define __SC_ARGS(t, a) a
78996 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
78997@@ -363,11 +369,11 @@ asmlinkage long sys_sync(void);
78998 asmlinkage long sys_fsync(unsigned int fd);
78999 asmlinkage long sys_fdatasync(unsigned int fd);
79000 asmlinkage long sys_bdflush(int func, long data);
79001-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
79002- char __user *type, unsigned long flags,
79003+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
79004+ const char __user *type, unsigned long flags,
79005 void __user *data);
79006-asmlinkage long sys_umount(char __user *name, int flags);
79007-asmlinkage long sys_oldumount(char __user *name);
79008+asmlinkage long sys_umount(const char __user *name, int flags);
79009+asmlinkage long sys_oldumount(const char __user *name);
79010 asmlinkage long sys_truncate(const char __user *path, long length);
79011 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
79012 asmlinkage long sys_stat(const char __user *filename,
79013@@ -579,7 +585,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
79014 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
79015 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
79016 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
79017- struct sockaddr __user *, int);
79018+ struct sockaddr __user *, int) __intentional_overflow(0);
79019 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
79020 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
79021 unsigned int vlen, unsigned flags);
79022diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
79023index 27b3b0b..e093dd9 100644
79024--- a/include/linux/syscore_ops.h
79025+++ b/include/linux/syscore_ops.h
79026@@ -16,7 +16,7 @@ struct syscore_ops {
79027 int (*suspend)(void);
79028 void (*resume)(void);
79029 void (*shutdown)(void);
79030-};
79031+} __do_const;
79032
79033 extern void register_syscore_ops(struct syscore_ops *ops);
79034 extern void unregister_syscore_ops(struct syscore_ops *ops);
79035diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
79036index 14a8ff2..af52bad 100644
79037--- a/include/linux/sysctl.h
79038+++ b/include/linux/sysctl.h
79039@@ -34,13 +34,13 @@ struct ctl_table_root;
79040 struct ctl_table_header;
79041 struct ctl_dir;
79042
79043-typedef struct ctl_table ctl_table;
79044-
79045 typedef int proc_handler (struct ctl_table *ctl, int write,
79046 void __user *buffer, size_t *lenp, loff_t *ppos);
79047
79048 extern int proc_dostring(struct ctl_table *, int,
79049 void __user *, size_t *, loff_t *);
79050+extern int proc_dostring_modpriv(struct ctl_table *, int,
79051+ void __user *, size_t *, loff_t *);
79052 extern int proc_dointvec(struct ctl_table *, int,
79053 void __user *, size_t *, loff_t *);
79054 extern int proc_dointvec_minmax(struct ctl_table *, int,
79055@@ -115,7 +115,9 @@ struct ctl_table
79056 struct ctl_table_poll *poll;
79057 void *extra1;
79058 void *extra2;
79059-};
79060+} __do_const;
79061+typedef struct ctl_table __no_const ctl_table_no_const;
79062+typedef struct ctl_table ctl_table;
79063
79064 struct ctl_node {
79065 struct rb_node node;
79066diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
79067index 11baec7..706f99f 100644
79068--- a/include/linux/sysfs.h
79069+++ b/include/linux/sysfs.h
79070@@ -33,7 +33,8 @@ struct attribute {
79071 struct lock_class_key *key;
79072 struct lock_class_key skey;
79073 #endif
79074-};
79075+} __do_const;
79076+typedef struct attribute __no_const attribute_no_const;
79077
79078 /**
79079 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
79080@@ -62,7 +63,8 @@ struct attribute_group {
79081 struct attribute *, int);
79082 struct attribute **attrs;
79083 struct bin_attribute **bin_attrs;
79084-};
79085+} __do_const;
79086+typedef struct attribute_group __no_const attribute_group_no_const;
79087
79088 /**
79089 * Use these macros to make defining attributes easier. See include/linux/device.h
79090@@ -126,7 +128,8 @@ struct bin_attribute {
79091 char *, loff_t, size_t);
79092 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
79093 struct vm_area_struct *vma);
79094-};
79095+} __do_const;
79096+typedef struct bin_attribute __no_const bin_attribute_no_const;
79097
79098 /**
79099 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
79100diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
79101index 7faf933..9b85a0c 100644
79102--- a/include/linux/sysrq.h
79103+++ b/include/linux/sysrq.h
79104@@ -16,6 +16,7 @@
79105
79106 #include <linux/errno.h>
79107 #include <linux/types.h>
79108+#include <linux/compiler.h>
79109
79110 /* Enable/disable SYSRQ support by default (0==no, 1==yes). */
79111 #define SYSRQ_DEFAULT_ENABLE 1
79112@@ -36,7 +37,7 @@ struct sysrq_key_op {
79113 char *help_msg;
79114 char *action_msg;
79115 int enable_mask;
79116-};
79117+} __do_const;
79118
79119 #ifdef CONFIG_MAGIC_SYSRQ
79120
79121diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
79122index 4ae6f32..425d3e1 100644
79123--- a/include/linux/thread_info.h
79124+++ b/include/linux/thread_info.h
79125@@ -150,6 +150,15 @@ static inline bool test_and_clear_restore_sigmask(void)
79126 #error "no set_restore_sigmask() provided and default one won't work"
79127 #endif
79128
79129+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user);
79130+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
79131+{
79132+#ifndef CONFIG_PAX_USERCOPY_DEBUG
79133+ if (!__builtin_constant_p(n))
79134+#endif
79135+ __check_object_size(ptr, n, to_user);
79136+}
79137+
79138 #endif /* __KERNEL__ */
79139
79140 #endif /* _LINUX_THREAD_INFO_H */
79141diff --git a/include/linux/tty.h b/include/linux/tty.h
79142index 64f8646..1515fc7 100644
79143--- a/include/linux/tty.h
79144+++ b/include/linux/tty.h
79145@@ -197,7 +197,7 @@ struct tty_port {
79146 const struct tty_port_operations *ops; /* Port operations */
79147 spinlock_t lock; /* Lock protecting tty field */
79148 int blocked_open; /* Waiting to open */
79149- int count; /* Usage count */
79150+ atomic_t count; /* Usage count */
79151 wait_queue_head_t open_wait; /* Open waiters */
79152 wait_queue_head_t close_wait; /* Close waiters */
79153 wait_queue_head_t delta_msr_wait; /* Modem status change */
79154@@ -546,7 +546,7 @@ extern int tty_port_open(struct tty_port *port,
79155 struct tty_struct *tty, struct file *filp);
79156 static inline int tty_port_users(struct tty_port *port)
79157 {
79158- return port->count + port->blocked_open;
79159+ return atomic_read(&port->count) + port->blocked_open;
79160 }
79161
79162 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
79163diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
79164index 756a609..b302dd6 100644
79165--- a/include/linux/tty_driver.h
79166+++ b/include/linux/tty_driver.h
79167@@ -285,7 +285,7 @@ struct tty_operations {
79168 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
79169 #endif
79170 const struct file_operations *proc_fops;
79171-};
79172+} __do_const;
79173
79174 struct tty_driver {
79175 int magic; /* magic number for this structure */
79176diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
79177index f15c898..207b7d1 100644
79178--- a/include/linux/tty_ldisc.h
79179+++ b/include/linux/tty_ldisc.h
79180@@ -211,7 +211,7 @@ struct tty_ldisc_ops {
79181
79182 struct module *owner;
79183
79184- int refcount;
79185+ atomic_t refcount;
79186 };
79187
79188 struct tty_ldisc {
79189diff --git a/include/linux/types.h b/include/linux/types.h
79190index 4d118ba..c3ee9bf 100644
79191--- a/include/linux/types.h
79192+++ b/include/linux/types.h
79193@@ -176,10 +176,26 @@ typedef struct {
79194 int counter;
79195 } atomic_t;
79196
79197+#ifdef CONFIG_PAX_REFCOUNT
79198+typedef struct {
79199+ int counter;
79200+} atomic_unchecked_t;
79201+#else
79202+typedef atomic_t atomic_unchecked_t;
79203+#endif
79204+
79205 #ifdef CONFIG_64BIT
79206 typedef struct {
79207 long counter;
79208 } atomic64_t;
79209+
79210+#ifdef CONFIG_PAX_REFCOUNT
79211+typedef struct {
79212+ long counter;
79213+} atomic64_unchecked_t;
79214+#else
79215+typedef atomic64_t atomic64_unchecked_t;
79216+#endif
79217 #endif
79218
79219 struct list_head {
79220diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
79221index 5ca0951..ab496a5 100644
79222--- a/include/linux/uaccess.h
79223+++ b/include/linux/uaccess.h
79224@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
79225 long ret; \
79226 mm_segment_t old_fs = get_fs(); \
79227 \
79228- set_fs(KERNEL_DS); \
79229 pagefault_disable(); \
79230- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
79231- pagefault_enable(); \
79232+ set_fs(KERNEL_DS); \
79233+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
79234 set_fs(old_fs); \
79235+ pagefault_enable(); \
79236 ret; \
79237 })
79238
79239diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
79240index 8e522cbc..aa8572d 100644
79241--- a/include/linux/uidgid.h
79242+++ b/include/linux/uidgid.h
79243@@ -197,4 +197,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
79244
79245 #endif /* CONFIG_USER_NS */
79246
79247+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
79248+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
79249+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
79250+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
79251+
79252 #endif /* _LINUX_UIDGID_H */
79253diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
79254index 99c1b4d..562e6f3 100644
79255--- a/include/linux/unaligned/access_ok.h
79256+++ b/include/linux/unaligned/access_ok.h
79257@@ -4,34 +4,34 @@
79258 #include <linux/kernel.h>
79259 #include <asm/byteorder.h>
79260
79261-static inline u16 get_unaligned_le16(const void *p)
79262+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
79263 {
79264- return le16_to_cpup((__le16 *)p);
79265+ return le16_to_cpup((const __le16 *)p);
79266 }
79267
79268-static inline u32 get_unaligned_le32(const void *p)
79269+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
79270 {
79271- return le32_to_cpup((__le32 *)p);
79272+ return le32_to_cpup((const __le32 *)p);
79273 }
79274
79275-static inline u64 get_unaligned_le64(const void *p)
79276+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
79277 {
79278- return le64_to_cpup((__le64 *)p);
79279+ return le64_to_cpup((const __le64 *)p);
79280 }
79281
79282-static inline u16 get_unaligned_be16(const void *p)
79283+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
79284 {
79285- return be16_to_cpup((__be16 *)p);
79286+ return be16_to_cpup((const __be16 *)p);
79287 }
79288
79289-static inline u32 get_unaligned_be32(const void *p)
79290+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
79291 {
79292- return be32_to_cpup((__be32 *)p);
79293+ return be32_to_cpup((const __be32 *)p);
79294 }
79295
79296-static inline u64 get_unaligned_be64(const void *p)
79297+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
79298 {
79299- return be64_to_cpup((__be64 *)p);
79300+ return be64_to_cpup((const __be64 *)p);
79301 }
79302
79303 static inline void put_unaligned_le16(u16 val, void *p)
79304diff --git a/include/linux/usb.h b/include/linux/usb.h
79305index 6b02370..2355ffa 100644
79306--- a/include/linux/usb.h
79307+++ b/include/linux/usb.h
79308@@ -563,7 +563,7 @@ struct usb_device {
79309 int maxchild;
79310
79311 u32 quirks;
79312- atomic_t urbnum;
79313+ atomic_unchecked_t urbnum;
79314
79315 unsigned long active_duration;
79316
79317@@ -1639,7 +1639,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
79318
79319 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
79320 __u8 request, __u8 requesttype, __u16 value, __u16 index,
79321- void *data, __u16 size, int timeout);
79322+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
79323 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
79324 void *data, int len, int *actual_length, int timeout);
79325 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
79326diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
79327index e452ba6..78f8e80 100644
79328--- a/include/linux/usb/renesas_usbhs.h
79329+++ b/include/linux/usb/renesas_usbhs.h
79330@@ -39,7 +39,7 @@ enum {
79331 */
79332 struct renesas_usbhs_driver_callback {
79333 int (*notify_hotplug)(struct platform_device *pdev);
79334-};
79335+} __no_const;
79336
79337 /*
79338 * callback functions for platform
79339diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
79340index 6f8fbcf..8259001 100644
79341--- a/include/linux/vermagic.h
79342+++ b/include/linux/vermagic.h
79343@@ -25,9 +25,35 @@
79344 #define MODULE_ARCH_VERMAGIC ""
79345 #endif
79346
79347+#ifdef CONFIG_PAX_REFCOUNT
79348+#define MODULE_PAX_REFCOUNT "REFCOUNT "
79349+#else
79350+#define MODULE_PAX_REFCOUNT ""
79351+#endif
79352+
79353+#ifdef CONSTIFY_PLUGIN
79354+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
79355+#else
79356+#define MODULE_CONSTIFY_PLUGIN ""
79357+#endif
79358+
79359+#ifdef STACKLEAK_PLUGIN
79360+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
79361+#else
79362+#define MODULE_STACKLEAK_PLUGIN ""
79363+#endif
79364+
79365+#ifdef CONFIG_GRKERNSEC
79366+#define MODULE_GRSEC "GRSEC "
79367+#else
79368+#define MODULE_GRSEC ""
79369+#endif
79370+
79371 #define VERMAGIC_STRING \
79372 UTS_RELEASE " " \
79373 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
79374 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
79375- MODULE_ARCH_VERMAGIC
79376+ MODULE_ARCH_VERMAGIC \
79377+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
79378+ MODULE_GRSEC
79379
79380diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
79381index 502073a..a7de024 100644
79382--- a/include/linux/vga_switcheroo.h
79383+++ b/include/linux/vga_switcheroo.h
79384@@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
79385
79386 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
79387
79388-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
79389-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
79390+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
79391+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
79392 #else
79393
79394 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
79395@@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
79396
79397 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
79398
79399-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
79400-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
79401+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
79402+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
79403
79404 #endif
79405 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
79406diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
79407index 4b8a891..cb8df6e 100644
79408--- a/include/linux/vmalloc.h
79409+++ b/include/linux/vmalloc.h
79410@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
79411 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
79412 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
79413 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
79414+
79415+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
79416+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
79417+#endif
79418+
79419 /* bits [20..32] reserved for arch specific ioremap internals */
79420
79421 /*
79422@@ -142,7 +147,7 @@ extern void free_vm_area(struct vm_struct *area);
79423
79424 /* for /dev/kmem */
79425 extern long vread(char *buf, char *addr, unsigned long count);
79426-extern long vwrite(char *buf, char *addr, unsigned long count);
79427+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
79428
79429 /*
79430 * Internals. Dont't use..
79431diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
79432index e4b9480..5a5f65a 100644
79433--- a/include/linux/vmstat.h
79434+++ b/include/linux/vmstat.h
79435@@ -90,18 +90,18 @@ static inline void vm_events_fold_cpu(int cpu)
79436 /*
79437 * Zone based page accounting with per cpu differentials.
79438 */
79439-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
79440+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
79441
79442 static inline void zone_page_state_add(long x, struct zone *zone,
79443 enum zone_stat_item item)
79444 {
79445- atomic_long_add(x, &zone->vm_stat[item]);
79446- atomic_long_add(x, &vm_stat[item]);
79447+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
79448+ atomic_long_add_unchecked(x, &vm_stat[item]);
79449 }
79450
79451-static inline unsigned long global_page_state(enum zone_stat_item item)
79452+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
79453 {
79454- long x = atomic_long_read(&vm_stat[item]);
79455+ long x = atomic_long_read_unchecked(&vm_stat[item]);
79456 #ifdef CONFIG_SMP
79457 if (x < 0)
79458 x = 0;
79459@@ -109,10 +109,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
79460 return x;
79461 }
79462
79463-static inline unsigned long zone_page_state(struct zone *zone,
79464+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
79465 enum zone_stat_item item)
79466 {
79467- long x = atomic_long_read(&zone->vm_stat[item]);
79468+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
79469 #ifdef CONFIG_SMP
79470 if (x < 0)
79471 x = 0;
79472@@ -129,7 +129,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
79473 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
79474 enum zone_stat_item item)
79475 {
79476- long x = atomic_long_read(&zone->vm_stat[item]);
79477+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
79478
79479 #ifdef CONFIG_SMP
79480 int cpu;
79481@@ -220,8 +220,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
79482
79483 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
79484 {
79485- atomic_long_inc(&zone->vm_stat[item]);
79486- atomic_long_inc(&vm_stat[item]);
79487+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
79488+ atomic_long_inc_unchecked(&vm_stat[item]);
79489 }
79490
79491 static inline void __inc_zone_page_state(struct page *page,
79492@@ -232,8 +232,8 @@ static inline void __inc_zone_page_state(struct page *page,
79493
79494 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
79495 {
79496- atomic_long_dec(&zone->vm_stat[item]);
79497- atomic_long_dec(&vm_stat[item]);
79498+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
79499+ atomic_long_dec_unchecked(&vm_stat[item]);
79500 }
79501
79502 static inline void __dec_zone_page_state(struct page *page,
79503diff --git a/include/linux/xattr.h b/include/linux/xattr.h
79504index 91b0a68..0e9adf6 100644
79505--- a/include/linux/xattr.h
79506+++ b/include/linux/xattr.h
79507@@ -28,7 +28,7 @@ struct xattr_handler {
79508 size_t size, int handler_flags);
79509 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
79510 size_t size, int flags, int handler_flags);
79511-};
79512+} __do_const;
79513
79514 struct xattr {
79515 const char *name;
79516@@ -37,6 +37,9 @@ struct xattr {
79517 };
79518
79519 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
79520+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
79521+ssize_t pax_getxattr(struct dentry *, void *, size_t);
79522+#endif
79523 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
79524 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
79525 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
79526diff --git a/include/linux/zlib.h b/include/linux/zlib.h
79527index 9c5a6b4..09c9438 100644
79528--- a/include/linux/zlib.h
79529+++ b/include/linux/zlib.h
79530@@ -31,6 +31,7 @@
79531 #define _ZLIB_H
79532
79533 #include <linux/zconf.h>
79534+#include <linux/compiler.h>
79535
79536 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
79537 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
79538@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
79539
79540 /* basic functions */
79541
79542-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
79543+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
79544 /*
79545 Returns the number of bytes that needs to be allocated for a per-
79546 stream workspace with the specified parameters. A pointer to this
79547diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
79548index c768c9f..bdcaa5a 100644
79549--- a/include/media/v4l2-dev.h
79550+++ b/include/media/v4l2-dev.h
79551@@ -76,7 +76,7 @@ struct v4l2_file_operations {
79552 int (*mmap) (struct file *, struct vm_area_struct *);
79553 int (*open) (struct file *);
79554 int (*release) (struct file *);
79555-};
79556+} __do_const;
79557
79558 /*
79559 * Newer version of video_device, handled by videodev2.c
79560diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
79561index c9b1593..a572459 100644
79562--- a/include/media/v4l2-device.h
79563+++ b/include/media/v4l2-device.h
79564@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
79565 this function returns 0. If the name ends with a digit (e.g. cx18),
79566 then the name will be set to cx18-0 since cx180 looks really odd. */
79567 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
79568- atomic_t *instance);
79569+ atomic_unchecked_t *instance);
79570
79571 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
79572 Since the parent disappears this ensures that v4l2_dev doesn't have an
79573diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
79574index 9a36d92..0aafe2a 100644
79575--- a/include/net/9p/transport.h
79576+++ b/include/net/9p/transport.h
79577@@ -60,7 +60,7 @@ struct p9_trans_module {
79578 int (*cancel) (struct p9_client *, struct p9_req_t *req);
79579 int (*zc_request)(struct p9_client *, struct p9_req_t *,
79580 char *, char *, int , int, int, int);
79581-};
79582+} __do_const;
79583
79584 void v9fs_register_trans(struct p9_trans_module *m);
79585 void v9fs_unregister_trans(struct p9_trans_module *m);
79586diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
79587index 1a966af..2767cf6 100644
79588--- a/include/net/bluetooth/l2cap.h
79589+++ b/include/net/bluetooth/l2cap.h
79590@@ -551,7 +551,7 @@ struct l2cap_ops {
79591 void (*defer) (struct l2cap_chan *chan);
79592 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
79593 unsigned long len, int nb);
79594-};
79595+} __do_const;
79596
79597 struct l2cap_conn {
79598 struct hci_conn *hcon;
79599diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
79600index f2ae33d..c457cf0 100644
79601--- a/include/net/caif/cfctrl.h
79602+++ b/include/net/caif/cfctrl.h
79603@@ -52,7 +52,7 @@ struct cfctrl_rsp {
79604 void (*radioset_rsp)(void);
79605 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
79606 struct cflayer *client_layer);
79607-};
79608+} __no_const;
79609
79610 /* Link Setup Parameters for CAIF-Links. */
79611 struct cfctrl_link_param {
79612@@ -101,8 +101,8 @@ struct cfctrl_request_info {
79613 struct cfctrl {
79614 struct cfsrvl serv;
79615 struct cfctrl_rsp res;
79616- atomic_t req_seq_no;
79617- atomic_t rsp_seq_no;
79618+ atomic_unchecked_t req_seq_no;
79619+ atomic_unchecked_t rsp_seq_no;
79620 struct list_head list;
79621 /* Protects from simultaneous access to first_req list */
79622 spinlock_t info_list_lock;
79623diff --git a/include/net/flow.h b/include/net/flow.h
79624index 628e11b..4c475df 100644
79625--- a/include/net/flow.h
79626+++ b/include/net/flow.h
79627@@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
79628
79629 extern void flow_cache_flush(void);
79630 extern void flow_cache_flush_deferred(void);
79631-extern atomic_t flow_cache_genid;
79632+extern atomic_unchecked_t flow_cache_genid;
79633
79634 #endif
79635diff --git a/include/net/genetlink.h b/include/net/genetlink.h
79636index 8e0b6c8..73cf605 100644
79637--- a/include/net/genetlink.h
79638+++ b/include/net/genetlink.h
79639@@ -120,7 +120,7 @@ struct genl_ops {
79640 struct netlink_callback *cb);
79641 int (*done)(struct netlink_callback *cb);
79642 struct list_head ops_list;
79643-};
79644+} __do_const;
79645
79646 extern int __genl_register_family(struct genl_family *family);
79647
79648diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
79649index 734d9b5..48a9a4b 100644
79650--- a/include/net/gro_cells.h
79651+++ b/include/net/gro_cells.h
79652@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
79653 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
79654
79655 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
79656- atomic_long_inc(&dev->rx_dropped);
79657+ atomic_long_inc_unchecked(&dev->rx_dropped);
79658 kfree_skb(skb);
79659 return;
79660 }
79661diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
79662index de2c785..0588a6b 100644
79663--- a/include/net/inet_connection_sock.h
79664+++ b/include/net/inet_connection_sock.h
79665@@ -62,7 +62,7 @@ struct inet_connection_sock_af_ops {
79666 void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
79667 int (*bind_conflict)(const struct sock *sk,
79668 const struct inet_bind_bucket *tb, bool relax);
79669-};
79670+} __do_const;
79671
79672 /** inet_connection_sock - INET connection oriented sock
79673 *
79674diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
79675index 53f464d..0bd0b49 100644
79676--- a/include/net/inetpeer.h
79677+++ b/include/net/inetpeer.h
79678@@ -47,8 +47,8 @@ struct inet_peer {
79679 */
79680 union {
79681 struct {
79682- atomic_t rid; /* Frag reception counter */
79683- atomic_t ip_id_count; /* IP ID for the next packet */
79684+ atomic_unchecked_t rid; /* Frag reception counter */
79685+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
79686 };
79687 struct rcu_head rcu;
79688 struct inet_peer *gc_next;
79689@@ -178,16 +178,13 @@ static inline void inet_peer_refcheck(const struct inet_peer *p)
79690 /* can be called with or without local BH being disabled */
79691 static inline int inet_getid(struct inet_peer *p, int more)
79692 {
79693- int old, new;
79694+ int id;
79695 more++;
79696 inet_peer_refcheck(p);
79697- do {
79698- old = atomic_read(&p->ip_id_count);
79699- new = old + more;
79700- if (!new)
79701- new = 1;
79702- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
79703- return new;
79704+ id = atomic_add_return_unchecked(more, &p->ip_id_count);
79705+ if (!id)
79706+ id = atomic_inc_return_unchecked(&p->ip_id_count);
79707+ return id;
79708 }
79709
79710 #endif /* _NET_INETPEER_H */
79711diff --git a/include/net/ip.h b/include/net/ip.h
79712index 301f10c..b52cdaf 100644
79713--- a/include/net/ip.h
79714+++ b/include/net/ip.h
79715@@ -212,7 +212,7 @@ extern struct local_ports {
79716 } sysctl_local_ports;
79717 extern void inet_get_local_port_range(int *low, int *high);
79718
79719-extern unsigned long *sysctl_local_reserved_ports;
79720+extern unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
79721 static inline int inet_is_reserved_local_port(int port)
79722 {
79723 return test_bit(port, sysctl_local_reserved_ports);
79724diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
79725index cbf2be3..3683f6d 100644
79726--- a/include/net/ip_fib.h
79727+++ b/include/net/ip_fib.h
79728@@ -169,7 +169,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
79729
79730 #define FIB_RES_SADDR(net, res) \
79731 ((FIB_RES_NH(res).nh_saddr_genid == \
79732- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
79733+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
79734 FIB_RES_NH(res).nh_saddr : \
79735 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
79736 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
79737diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
79738index 772252d..1e69799 100644
79739--- a/include/net/ip_vs.h
79740+++ b/include/net/ip_vs.h
79741@@ -558,7 +558,7 @@ struct ip_vs_conn {
79742 struct ip_vs_conn *control; /* Master control connection */
79743 atomic_t n_control; /* Number of controlled ones */
79744 struct ip_vs_dest *dest; /* real server */
79745- atomic_t in_pkts; /* incoming packet counter */
79746+ atomic_unchecked_t in_pkts; /* incoming packet counter */
79747
79748 /* packet transmitter for different forwarding methods. If it
79749 mangles the packet, it must return NF_DROP or better NF_STOLEN,
79750@@ -705,7 +705,7 @@ struct ip_vs_dest {
79751 __be16 port; /* port number of the server */
79752 union nf_inet_addr addr; /* IP address of the server */
79753 volatile unsigned int flags; /* dest status flags */
79754- atomic_t conn_flags; /* flags to copy to conn */
79755+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
79756 atomic_t weight; /* server weight */
79757
79758 atomic_t refcnt; /* reference counter */
79759@@ -960,11 +960,11 @@ struct netns_ipvs {
79760 /* ip_vs_lblc */
79761 int sysctl_lblc_expiration;
79762 struct ctl_table_header *lblc_ctl_header;
79763- struct ctl_table *lblc_ctl_table;
79764+ ctl_table_no_const *lblc_ctl_table;
79765 /* ip_vs_lblcr */
79766 int sysctl_lblcr_expiration;
79767 struct ctl_table_header *lblcr_ctl_header;
79768- struct ctl_table *lblcr_ctl_table;
79769+ ctl_table_no_const *lblcr_ctl_table;
79770 /* ip_vs_est */
79771 struct list_head est_list; /* estimator list */
79772 spinlock_t est_lock;
79773diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
79774index 80ffde3..968b0f4 100644
79775--- a/include/net/irda/ircomm_tty.h
79776+++ b/include/net/irda/ircomm_tty.h
79777@@ -35,6 +35,7 @@
79778 #include <linux/termios.h>
79779 #include <linux/timer.h>
79780 #include <linux/tty.h> /* struct tty_struct */
79781+#include <asm/local.h>
79782
79783 #include <net/irda/irias_object.h>
79784 #include <net/irda/ircomm_core.h>
79785diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
79786index 714cc9a..ea05f3e 100644
79787--- a/include/net/iucv/af_iucv.h
79788+++ b/include/net/iucv/af_iucv.h
79789@@ -149,7 +149,7 @@ struct iucv_skb_cb {
79790 struct iucv_sock_list {
79791 struct hlist_head head;
79792 rwlock_t lock;
79793- atomic_t autobind_name;
79794+ atomic_unchecked_t autobind_name;
79795 };
79796
79797 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
79798diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
79799index df83f69..9b640b8 100644
79800--- a/include/net/llc_c_ac.h
79801+++ b/include/net/llc_c_ac.h
79802@@ -87,7 +87,7 @@
79803 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
79804 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
79805
79806-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
79807+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
79808
79809 extern int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
79810 extern int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
79811diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
79812index 6ca3113..f8026dd 100644
79813--- a/include/net/llc_c_ev.h
79814+++ b/include/net/llc_c_ev.h
79815@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
79816 return (struct llc_conn_state_ev *)skb->cb;
79817 }
79818
79819-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
79820-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
79821+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
79822+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
79823
79824 extern int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
79825 extern int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
79826diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
79827index 0e79cfb..f46db31 100644
79828--- a/include/net/llc_c_st.h
79829+++ b/include/net/llc_c_st.h
79830@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
79831 u8 next_state;
79832 llc_conn_ev_qfyr_t *ev_qualifiers;
79833 llc_conn_action_t *ev_actions;
79834-};
79835+} __do_const;
79836
79837 struct llc_conn_state {
79838 u8 current_state;
79839diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
79840index 37a3bbd..55a4241 100644
79841--- a/include/net/llc_s_ac.h
79842+++ b/include/net/llc_s_ac.h
79843@@ -23,7 +23,7 @@
79844 #define SAP_ACT_TEST_IND 9
79845
79846 /* All action functions must look like this */
79847-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
79848+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
79849
79850 extern int llc_sap_action_unitdata_ind(struct llc_sap *sap,
79851 struct sk_buff *skb);
79852diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
79853index 567c681..cd73ac0 100644
79854--- a/include/net/llc_s_st.h
79855+++ b/include/net/llc_s_st.h
79856@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
79857 llc_sap_ev_t ev;
79858 u8 next_state;
79859 llc_sap_action_t *ev_actions;
79860-};
79861+} __do_const;
79862
79863 struct llc_sap_state {
79864 u8 curr_state;
79865diff --git a/include/net/mac80211.h b/include/net/mac80211.h
79866index cc6035f..a8406fc 100644
79867--- a/include/net/mac80211.h
79868+++ b/include/net/mac80211.h
79869@@ -4361,7 +4361,7 @@ struct rate_control_ops {
79870 void (*add_sta_debugfs)(void *priv, void *priv_sta,
79871 struct dentry *dir);
79872 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
79873-};
79874+} __do_const;
79875
79876 static inline int rate_supported(struct ieee80211_sta *sta,
79877 enum ieee80211_band band,
79878diff --git a/include/net/neighbour.h b/include/net/neighbour.h
79879index 536501a..7c6193c 100644
79880--- a/include/net/neighbour.h
79881+++ b/include/net/neighbour.h
79882@@ -123,7 +123,7 @@ struct neigh_ops {
79883 void (*error_report)(struct neighbour *, struct sk_buff *);
79884 int (*output)(struct neighbour *, struct sk_buff *);
79885 int (*connected_output)(struct neighbour *, struct sk_buff *);
79886-};
79887+} __do_const;
79888
79889 struct pneigh_entry {
79890 struct pneigh_entry *next;
79891diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
79892index 9d22f08..980fbf8 100644
79893--- a/include/net/net_namespace.h
79894+++ b/include/net/net_namespace.h
79895@@ -120,7 +120,7 @@ struct net {
79896 struct netns_ipvs *ipvs;
79897 #endif
79898 struct sock *diag_nlsk;
79899- atomic_t fnhe_genid;
79900+ atomic_unchecked_t fnhe_genid;
79901 };
79902
79903 /*
79904@@ -277,7 +277,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
79905 #define __net_init __init
79906 #define __net_exit __exit_refok
79907 #define __net_initdata __initdata
79908+#ifdef CONSTIFY_PLUGIN
79909 #define __net_initconst __initconst
79910+#else
79911+#define __net_initconst __initdata
79912+#endif
79913 #endif
79914
79915 struct pernet_operations {
79916@@ -287,7 +291,7 @@ struct pernet_operations {
79917 void (*exit_batch)(struct list_head *net_exit_list);
79918 int *id;
79919 size_t size;
79920-};
79921+} __do_const;
79922
79923 /*
79924 * Use these carefully. If you implement a network device and it
79925@@ -335,23 +339,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
79926
79927 static inline int rt_genid_ipv4(struct net *net)
79928 {
79929- return atomic_read(&net->ipv4.rt_genid);
79930+ return atomic_read_unchecked(&net->ipv4.rt_genid);
79931 }
79932
79933 static inline void rt_genid_bump_ipv4(struct net *net)
79934 {
79935- atomic_inc(&net->ipv4.rt_genid);
79936+ atomic_inc_unchecked(&net->ipv4.rt_genid);
79937 }
79938
79939 #if IS_ENABLED(CONFIG_IPV6)
79940 static inline int rt_genid_ipv6(struct net *net)
79941 {
79942- return atomic_read(&net->ipv6.rt_genid);
79943+ return atomic_read_unchecked(&net->ipv6.rt_genid);
79944 }
79945
79946 static inline void rt_genid_bump_ipv6(struct net *net)
79947 {
79948- atomic_inc(&net->ipv6.rt_genid);
79949+ atomic_inc_unchecked(&net->ipv6.rt_genid);
79950 }
79951 #else
79952 static inline int rt_genid_ipv6(struct net *net)
79953@@ -373,12 +377,12 @@ static inline void rt_genid_bump_all(struct net *net)
79954
79955 static inline int fnhe_genid(struct net *net)
79956 {
79957- return atomic_read(&net->fnhe_genid);
79958+ return atomic_read_unchecked(&net->fnhe_genid);
79959 }
79960
79961 static inline void fnhe_genid_bump(struct net *net)
79962 {
79963- atomic_inc(&net->fnhe_genid);
79964+ atomic_inc_unchecked(&net->fnhe_genid);
79965 }
79966
79967 #endif /* __NET_NET_NAMESPACE_H */
79968diff --git a/include/net/netdma.h b/include/net/netdma.h
79969index 8ba8ce2..99b7fff 100644
79970--- a/include/net/netdma.h
79971+++ b/include/net/netdma.h
79972@@ -24,7 +24,7 @@
79973 #include <linux/dmaengine.h>
79974 #include <linux/skbuff.h>
79975
79976-int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
79977+int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
79978 struct sk_buff *skb, int offset, struct iovec *to,
79979 size_t len, struct dma_pinned_list *pinned_list);
79980
79981diff --git a/include/net/netlink.h b/include/net/netlink.h
79982index 9690b0f..87aded7 100644
79983--- a/include/net/netlink.h
79984+++ b/include/net/netlink.h
79985@@ -534,7 +534,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
79986 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
79987 {
79988 if (mark)
79989- skb_trim(skb, (unsigned char *) mark - skb->data);
79990+ skb_trim(skb, (const unsigned char *) mark - skb->data);
79991 }
79992
79993 /**
79994diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
79995index c9c0c53..53f24c3 100644
79996--- a/include/net/netns/conntrack.h
79997+++ b/include/net/netns/conntrack.h
79998@@ -12,10 +12,10 @@ struct nf_conntrack_ecache;
79999 struct nf_proto_net {
80000 #ifdef CONFIG_SYSCTL
80001 struct ctl_table_header *ctl_table_header;
80002- struct ctl_table *ctl_table;
80003+ ctl_table_no_const *ctl_table;
80004 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
80005 struct ctl_table_header *ctl_compat_header;
80006- struct ctl_table *ctl_compat_table;
80007+ ctl_table_no_const *ctl_compat_table;
80008 #endif
80009 #endif
80010 unsigned int users;
80011@@ -58,7 +58,7 @@ struct nf_ip_net {
80012 struct nf_icmp_net icmpv6;
80013 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
80014 struct ctl_table_header *ctl_table_header;
80015- struct ctl_table *ctl_table;
80016+ ctl_table_no_const *ctl_table;
80017 #endif
80018 };
80019
80020diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
80021index bf2ec22..5e7f9d9 100644
80022--- a/include/net/netns/ipv4.h
80023+++ b/include/net/netns/ipv4.h
80024@@ -67,7 +67,7 @@ struct netns_ipv4 {
80025 kgid_t sysctl_ping_group_range[2];
80026 long sysctl_tcp_mem[3];
80027
80028- atomic_t dev_addr_genid;
80029+ atomic_unchecked_t dev_addr_genid;
80030
80031 #ifdef CONFIG_IP_MROUTE
80032 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
80033@@ -77,6 +77,6 @@ struct netns_ipv4 {
80034 struct fib_rules_ops *mr_rules_ops;
80035 #endif
80036 #endif
80037- atomic_t rt_genid;
80038+ atomic_unchecked_t rt_genid;
80039 };
80040 #endif
80041diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
80042index 0fb2401..477d81c 100644
80043--- a/include/net/netns/ipv6.h
80044+++ b/include/net/netns/ipv6.h
80045@@ -71,8 +71,8 @@ struct netns_ipv6 {
80046 struct fib_rules_ops *mr6_rules_ops;
80047 #endif
80048 #endif
80049- atomic_t dev_addr_genid;
80050- atomic_t rt_genid;
80051+ atomic_unchecked_t dev_addr_genid;
80052+ atomic_unchecked_t rt_genid;
80053 };
80054
80055 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
80056diff --git a/include/net/ping.h b/include/net/ping.h
80057index 2b496e9..935fd8d 100644
80058--- a/include/net/ping.h
80059+++ b/include/net/ping.h
80060@@ -56,7 +56,7 @@ struct ping_iter_state {
80061 extern struct proto ping_prot;
80062 extern struct ping_table ping_table;
80063 #if IS_ENABLED(CONFIG_IPV6)
80064-extern struct pingv6_ops pingv6_ops;
80065+extern struct pingv6_ops *pingv6_ops;
80066 #endif
80067
80068 struct pingfakehdr {
80069diff --git a/include/net/protocol.h b/include/net/protocol.h
80070index 047c047..b9dad15 100644
80071--- a/include/net/protocol.h
80072+++ b/include/net/protocol.h
80073@@ -44,7 +44,7 @@ struct net_protocol {
80074 void (*err_handler)(struct sk_buff *skb, u32 info);
80075 unsigned int no_policy:1,
80076 netns_ok:1;
80077-};
80078+} __do_const;
80079
80080 #if IS_ENABLED(CONFIG_IPV6)
80081 struct inet6_protocol {
80082@@ -57,7 +57,7 @@ struct inet6_protocol {
80083 u8 type, u8 code, int offset,
80084 __be32 info);
80085 unsigned int flags; /* INET6_PROTO_xxx */
80086-};
80087+} __do_const;
80088
80089 #define INET6_PROTO_NOPOLICY 0x1
80090 #define INET6_PROTO_FINAL 0x2
80091diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
80092index 7026648..584cc8c 100644
80093--- a/include/net/rtnetlink.h
80094+++ b/include/net/rtnetlink.h
80095@@ -81,7 +81,7 @@ struct rtnl_link_ops {
80096 const struct net_device *dev);
80097 unsigned int (*get_num_tx_queues)(void);
80098 unsigned int (*get_num_rx_queues)(void);
80099-};
80100+} __do_const;
80101
80102 extern int __rtnl_link_register(struct rtnl_link_ops *ops);
80103 extern void __rtnl_link_unregister(struct rtnl_link_ops *ops);
80104diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
80105index 4ef75af..5aa073a 100644
80106--- a/include/net/sctp/sm.h
80107+++ b/include/net/sctp/sm.h
80108@@ -81,7 +81,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
80109 typedef struct {
80110 sctp_state_fn_t *fn;
80111 const char *name;
80112-} sctp_sm_table_entry_t;
80113+} __do_const sctp_sm_table_entry_t;
80114
80115 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
80116 * currently in use.
80117@@ -293,7 +293,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
80118 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
80119
80120 /* Extern declarations for major data structures. */
80121-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
80122+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
80123
80124
80125 /* Get the size of a DATA chunk payload. */
80126diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
80127index 2174d8d..71d5257 100644
80128--- a/include/net/sctp/structs.h
80129+++ b/include/net/sctp/structs.h
80130@@ -508,7 +508,7 @@ struct sctp_pf {
80131 struct sctp_association *asoc);
80132 void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
80133 struct sctp_af *af;
80134-};
80135+} __do_const;
80136
80137
80138 /* Structure to track chunk fragments that have been acked, but peer
80139diff --git a/include/net/sock.h b/include/net/sock.h
80140index 808cbc2..8617e9c 100644
80141--- a/include/net/sock.h
80142+++ b/include/net/sock.h
80143@@ -332,7 +332,7 @@ struct sock {
80144 unsigned int sk_napi_id;
80145 unsigned int sk_ll_usec;
80146 #endif
80147- atomic_t sk_drops;
80148+ atomic_unchecked_t sk_drops;
80149 int sk_rcvbuf;
80150
80151 struct sk_filter __rcu *sk_filter;
80152@@ -1194,7 +1194,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
80153 return ret >> PAGE_SHIFT;
80154 }
80155
80156-static inline long
80157+static inline long __intentional_overflow(-1)
80158 sk_memory_allocated(const struct sock *sk)
80159 {
80160 struct proto *prot = sk->sk_prot;
80161@@ -1821,7 +1821,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
80162 }
80163
80164 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
80165- char __user *from, char *to,
80166+ char __user *from, unsigned char *to,
80167 int copy, int offset)
80168 {
80169 if (skb->ip_summed == CHECKSUM_NONE) {
80170@@ -2083,7 +2083,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
80171 }
80172 }
80173
80174-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
80175+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
80176
80177 /**
80178 * sk_page_frag - return an appropriate page_frag
80179diff --git a/include/net/tcp.h b/include/net/tcp.h
80180index b1aa324..b8530ea 100644
80181--- a/include/net/tcp.h
80182+++ b/include/net/tcp.h
80183@@ -527,7 +527,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
80184 extern void tcp_xmit_retransmit_queue(struct sock *);
80185 extern void tcp_simple_retransmit(struct sock *);
80186 extern int tcp_trim_head(struct sock *, struct sk_buff *, u32);
80187-extern int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
80188+extern int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
80189
80190 extern void tcp_send_probe0(struct sock *);
80191 extern void tcp_send_partial(struct sock *);
80192@@ -699,8 +699,8 @@ struct tcp_skb_cb {
80193 struct inet6_skb_parm h6;
80194 #endif
80195 } header; /* For incoming frames */
80196- __u32 seq; /* Starting sequence number */
80197- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
80198+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
80199+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
80200 __u32 when; /* used to compute rtt's */
80201 __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
80202
80203@@ -714,7 +714,7 @@ struct tcp_skb_cb {
80204
80205 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
80206 /* 1 byte hole */
80207- __u32 ack_seq; /* Sequence number ACK'd */
80208+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
80209 };
80210
80211 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
80212diff --git a/include/net/xfrm.h b/include/net/xfrm.h
80213index e253bf0..2278b4b 100644
80214--- a/include/net/xfrm.h
80215+++ b/include/net/xfrm.h
80216@@ -287,7 +287,6 @@ struct xfrm_dst;
80217 struct xfrm_policy_afinfo {
80218 unsigned short family;
80219 struct dst_ops *dst_ops;
80220- void (*garbage_collect)(struct net *net);
80221 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
80222 const xfrm_address_t *saddr,
80223 const xfrm_address_t *daddr);
80224@@ -305,7 +304,7 @@ struct xfrm_policy_afinfo {
80225 struct net_device *dev,
80226 const struct flowi *fl);
80227 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
80228-};
80229+} __do_const;
80230
80231 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
80232 extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
80233@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
80234 int (*transport_finish)(struct sk_buff *skb,
80235 int async);
80236 void (*local_error)(struct sk_buff *skb, u32 mtu);
80237-};
80238+} __do_const;
80239
80240 extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
80241 extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
80242@@ -427,7 +426,7 @@ struct xfrm_mode {
80243 struct module *owner;
80244 unsigned int encap;
80245 int flags;
80246-};
80247+} __do_const;
80248
80249 /* Flags for xfrm_mode. */
80250 enum {
80251@@ -524,7 +523,7 @@ struct xfrm_policy {
80252 struct timer_list timer;
80253
80254 struct flow_cache_object flo;
80255- atomic_t genid;
80256+ atomic_unchecked_t genid;
80257 u32 priority;
80258 u32 index;
80259 struct xfrm_mark mark;
80260@@ -1164,6 +1163,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
80261 }
80262
80263 extern void xfrm_garbage_collect(struct net *net);
80264+extern void xfrm_garbage_collect_deferred(struct net *net);
80265
80266 #else
80267
80268@@ -1202,6 +1202,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
80269 static inline void xfrm_garbage_collect(struct net *net)
80270 {
80271 }
80272+static inline void xfrm_garbage_collect_deferred(struct net *net)
80273+{
80274+}
80275 #endif
80276
80277 static __inline__
80278diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
80279index 1017e0b..227aa4d 100644
80280--- a/include/rdma/iw_cm.h
80281+++ b/include/rdma/iw_cm.h
80282@@ -122,7 +122,7 @@ struct iw_cm_verbs {
80283 int backlog);
80284
80285 int (*destroy_listen)(struct iw_cm_id *cm_id);
80286-};
80287+} __no_const;
80288
80289 /**
80290 * iw_create_cm_id - Create an IW CM identifier.
80291diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
80292index e1379b4..67eafbe 100644
80293--- a/include/scsi/libfc.h
80294+++ b/include/scsi/libfc.h
80295@@ -762,6 +762,7 @@ struct libfc_function_template {
80296 */
80297 void (*disc_stop_final) (struct fc_lport *);
80298 };
80299+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
80300
80301 /**
80302 * struct fc_disc - Discovery context
80303@@ -866,7 +867,7 @@ struct fc_lport {
80304 struct fc_vport *vport;
80305
80306 /* Operational Information */
80307- struct libfc_function_template tt;
80308+ libfc_function_template_no_const tt;
80309 u8 link_up;
80310 u8 qfull;
80311 enum fc_lport_state state;
80312diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
80313index d65fbec..f80fef2 100644
80314--- a/include/scsi/scsi_device.h
80315+++ b/include/scsi/scsi_device.h
80316@@ -180,9 +180,9 @@ struct scsi_device {
80317 unsigned int max_device_blocked; /* what device_blocked counts down from */
80318 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
80319
80320- atomic_t iorequest_cnt;
80321- atomic_t iodone_cnt;
80322- atomic_t ioerr_cnt;
80323+ atomic_unchecked_t iorequest_cnt;
80324+ atomic_unchecked_t iodone_cnt;
80325+ atomic_unchecked_t ioerr_cnt;
80326
80327 struct device sdev_gendev,
80328 sdev_dev;
80329diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
80330index b797e8f..8e2c3aa 100644
80331--- a/include/scsi/scsi_transport_fc.h
80332+++ b/include/scsi/scsi_transport_fc.h
80333@@ -751,7 +751,8 @@ struct fc_function_template {
80334 unsigned long show_host_system_hostname:1;
80335
80336 unsigned long disable_target_scan:1;
80337-};
80338+} __do_const;
80339+typedef struct fc_function_template __no_const fc_function_template_no_const;
80340
80341
80342 /**
80343diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
80344index ae6c3b8..fd748ac 100644
80345--- a/include/sound/compress_driver.h
80346+++ b/include/sound/compress_driver.h
80347@@ -128,7 +128,7 @@ struct snd_compr_ops {
80348 struct snd_compr_caps *caps);
80349 int (*get_codec_caps) (struct snd_compr_stream *stream,
80350 struct snd_compr_codec_caps *codec);
80351-};
80352+} __no_const;
80353
80354 /**
80355 * struct snd_compr: Compressed device
80356diff --git a/include/sound/soc.h b/include/sound/soc.h
80357index d22cb0a..c6ba150 100644
80358--- a/include/sound/soc.h
80359+++ b/include/sound/soc.h
80360@@ -780,7 +780,7 @@ struct snd_soc_codec_driver {
80361 /* probe ordering - for components with runtime dependencies */
80362 int probe_order;
80363 int remove_order;
80364-};
80365+} __do_const;
80366
80367 /* SoC platform interface */
80368 struct snd_soc_platform_driver {
80369@@ -826,7 +826,7 @@ struct snd_soc_platform_driver {
80370 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
80371 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
80372 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
80373-};
80374+} __do_const;
80375
80376 struct snd_soc_platform {
80377 const char *name;
80378diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
80379index 23bfd10..1ff3e35 100644
80380--- a/include/target/target_core_base.h
80381+++ b/include/target/target_core_base.h
80382@@ -664,7 +664,7 @@ struct se_device {
80383 spinlock_t stats_lock;
80384 /* Active commands on this virtual SE device */
80385 atomic_t simple_cmds;
80386- atomic_t dev_ordered_id;
80387+ atomic_unchecked_t dev_ordered_id;
80388 atomic_t dev_ordered_sync;
80389 atomic_t dev_qf_count;
80390 int export_count;
80391diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
80392new file mode 100644
80393index 0000000..fb634b7
80394--- /dev/null
80395+++ b/include/trace/events/fs.h
80396@@ -0,0 +1,53 @@
80397+#undef TRACE_SYSTEM
80398+#define TRACE_SYSTEM fs
80399+
80400+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
80401+#define _TRACE_FS_H
80402+
80403+#include <linux/fs.h>
80404+#include <linux/tracepoint.h>
80405+
80406+TRACE_EVENT(do_sys_open,
80407+
80408+ TP_PROTO(const char *filename, int flags, int mode),
80409+
80410+ TP_ARGS(filename, flags, mode),
80411+
80412+ TP_STRUCT__entry(
80413+ __string( filename, filename )
80414+ __field( int, flags )
80415+ __field( int, mode )
80416+ ),
80417+
80418+ TP_fast_assign(
80419+ __assign_str(filename, filename);
80420+ __entry->flags = flags;
80421+ __entry->mode = mode;
80422+ ),
80423+
80424+ TP_printk("\"%s\" %x %o",
80425+ __get_str(filename), __entry->flags, __entry->mode)
80426+);
80427+
80428+TRACE_EVENT(open_exec,
80429+
80430+ TP_PROTO(const char *filename),
80431+
80432+ TP_ARGS(filename),
80433+
80434+ TP_STRUCT__entry(
80435+ __string( filename, filename )
80436+ ),
80437+
80438+ TP_fast_assign(
80439+ __assign_str(filename, filename);
80440+ ),
80441+
80442+ TP_printk("\"%s\"",
80443+ __get_str(filename))
80444+);
80445+
80446+#endif /* _TRACE_FS_H */
80447+
80448+/* This part must be outside protection */
80449+#include <trace/define_trace.h>
80450diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
80451index 1c09820..7f5ec79 100644
80452--- a/include/trace/events/irq.h
80453+++ b/include/trace/events/irq.h
80454@@ -36,7 +36,7 @@ struct softirq_action;
80455 */
80456 TRACE_EVENT(irq_handler_entry,
80457
80458- TP_PROTO(int irq, struct irqaction *action),
80459+ TP_PROTO(int irq, const struct irqaction *action),
80460
80461 TP_ARGS(irq, action),
80462
80463@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
80464 */
80465 TRACE_EVENT(irq_handler_exit,
80466
80467- TP_PROTO(int irq, struct irqaction *action, int ret),
80468+ TP_PROTO(int irq, const struct irqaction *action, int ret),
80469
80470 TP_ARGS(irq, action, ret),
80471
80472diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
80473index 7caf44c..23c6f27 100644
80474--- a/include/uapi/linux/a.out.h
80475+++ b/include/uapi/linux/a.out.h
80476@@ -39,6 +39,14 @@ enum machine_type {
80477 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
80478 };
80479
80480+/* Constants for the N_FLAGS field */
80481+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
80482+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
80483+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
80484+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
80485+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
80486+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
80487+
80488 #if !defined (N_MAGIC)
80489 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
80490 #endif
80491diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
80492index d876736..ccce5c0 100644
80493--- a/include/uapi/linux/byteorder/little_endian.h
80494+++ b/include/uapi/linux/byteorder/little_endian.h
80495@@ -42,51 +42,51 @@
80496
80497 static inline __le64 __cpu_to_le64p(const __u64 *p)
80498 {
80499- return (__force __le64)*p;
80500+ return (__force const __le64)*p;
80501 }
80502-static inline __u64 __le64_to_cpup(const __le64 *p)
80503+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
80504 {
80505- return (__force __u64)*p;
80506+ return (__force const __u64)*p;
80507 }
80508 static inline __le32 __cpu_to_le32p(const __u32 *p)
80509 {
80510- return (__force __le32)*p;
80511+ return (__force const __le32)*p;
80512 }
80513 static inline __u32 __le32_to_cpup(const __le32 *p)
80514 {
80515- return (__force __u32)*p;
80516+ return (__force const __u32)*p;
80517 }
80518 static inline __le16 __cpu_to_le16p(const __u16 *p)
80519 {
80520- return (__force __le16)*p;
80521+ return (__force const __le16)*p;
80522 }
80523 static inline __u16 __le16_to_cpup(const __le16 *p)
80524 {
80525- return (__force __u16)*p;
80526+ return (__force const __u16)*p;
80527 }
80528 static inline __be64 __cpu_to_be64p(const __u64 *p)
80529 {
80530- return (__force __be64)__swab64p(p);
80531+ return (__force const __be64)__swab64p(p);
80532 }
80533 static inline __u64 __be64_to_cpup(const __be64 *p)
80534 {
80535- return __swab64p((__u64 *)p);
80536+ return __swab64p((const __u64 *)p);
80537 }
80538 static inline __be32 __cpu_to_be32p(const __u32 *p)
80539 {
80540- return (__force __be32)__swab32p(p);
80541+ return (__force const __be32)__swab32p(p);
80542 }
80543-static inline __u32 __be32_to_cpup(const __be32 *p)
80544+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
80545 {
80546- return __swab32p((__u32 *)p);
80547+ return __swab32p((const __u32 *)p);
80548 }
80549 static inline __be16 __cpu_to_be16p(const __u16 *p)
80550 {
80551- return (__force __be16)__swab16p(p);
80552+ return (__force const __be16)__swab16p(p);
80553 }
80554 static inline __u16 __be16_to_cpup(const __be16 *p)
80555 {
80556- return __swab16p((__u16 *)p);
80557+ return __swab16p((const __u16 *)p);
80558 }
80559 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
80560 #define __le64_to_cpus(x) do { (void)(x); } while (0)
80561diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
80562index ef6103b..d4e65dd 100644
80563--- a/include/uapi/linux/elf.h
80564+++ b/include/uapi/linux/elf.h
80565@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
80566 #define PT_GNU_EH_FRAME 0x6474e550
80567
80568 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
80569+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
80570+
80571+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
80572+
80573+/* Constants for the e_flags field */
80574+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
80575+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
80576+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
80577+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
80578+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
80579+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
80580
80581 /*
80582 * Extended Numbering
80583@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
80584 #define DT_DEBUG 21
80585 #define DT_TEXTREL 22
80586 #define DT_JMPREL 23
80587+#define DT_FLAGS 30
80588+ #define DF_TEXTREL 0x00000004
80589 #define DT_ENCODING 32
80590 #define OLD_DT_LOOS 0x60000000
80591 #define DT_LOOS 0x6000000d
80592@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
80593 #define PF_W 0x2
80594 #define PF_X 0x1
80595
80596+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
80597+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
80598+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
80599+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
80600+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
80601+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
80602+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
80603+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
80604+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
80605+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
80606+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
80607+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
80608+
80609 typedef struct elf32_phdr{
80610 Elf32_Word p_type;
80611 Elf32_Off p_offset;
80612@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
80613 #define EI_OSABI 7
80614 #define EI_PAD 8
80615
80616+#define EI_PAX 14
80617+
80618 #define ELFMAG0 0x7f /* EI_MAG */
80619 #define ELFMAG1 'E'
80620 #define ELFMAG2 'L'
80621diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
80622index aa169c4..6a2771d 100644
80623--- a/include/uapi/linux/personality.h
80624+++ b/include/uapi/linux/personality.h
80625@@ -30,6 +30,7 @@ enum {
80626 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
80627 ADDR_NO_RANDOMIZE | \
80628 ADDR_COMPAT_LAYOUT | \
80629+ ADDR_LIMIT_3GB | \
80630 MMAP_PAGE_ZERO)
80631
80632 /*
80633diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
80634index 7530e74..e714828 100644
80635--- a/include/uapi/linux/screen_info.h
80636+++ b/include/uapi/linux/screen_info.h
80637@@ -43,7 +43,8 @@ struct screen_info {
80638 __u16 pages; /* 0x32 */
80639 __u16 vesa_attributes; /* 0x34 */
80640 __u32 capabilities; /* 0x36 */
80641- __u8 _reserved[6]; /* 0x3a */
80642+ __u16 vesapm_size; /* 0x3a */
80643+ __u8 _reserved[4]; /* 0x3c */
80644 } __attribute__((packed));
80645
80646 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
80647diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
80648index 0e011eb..82681b1 100644
80649--- a/include/uapi/linux/swab.h
80650+++ b/include/uapi/linux/swab.h
80651@@ -43,7 +43,7 @@
80652 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
80653 */
80654
80655-static inline __attribute_const__ __u16 __fswab16(__u16 val)
80656+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
80657 {
80658 #ifdef __HAVE_BUILTIN_BSWAP16__
80659 return __builtin_bswap16(val);
80660@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
80661 #endif
80662 }
80663
80664-static inline __attribute_const__ __u32 __fswab32(__u32 val)
80665+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
80666 {
80667 #ifdef __HAVE_BUILTIN_BSWAP32__
80668 return __builtin_bswap32(val);
80669@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
80670 #endif
80671 }
80672
80673-static inline __attribute_const__ __u64 __fswab64(__u64 val)
80674+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
80675 {
80676 #ifdef __HAVE_BUILTIN_BSWAP64__
80677 return __builtin_bswap64(val);
80678diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
80679index 6d67213..8dab561 100644
80680--- a/include/uapi/linux/sysctl.h
80681+++ b/include/uapi/linux/sysctl.h
80682@@ -155,7 +155,11 @@ enum
80683 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
80684 };
80685
80686-
80687+#ifdef CONFIG_PAX_SOFTMODE
80688+enum {
80689+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
80690+};
80691+#endif
80692
80693 /* CTL_VM names: */
80694 enum
80695diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
80696index e4629b9..6958086 100644
80697--- a/include/uapi/linux/xattr.h
80698+++ b/include/uapi/linux/xattr.h
80699@@ -63,5 +63,9 @@
80700 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
80701 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
80702
80703+/* User namespace */
80704+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
80705+#define XATTR_PAX_FLAGS_SUFFIX "flags"
80706+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
80707
80708 #endif /* _UAPI_LINUX_XATTR_H */
80709diff --git a/include/video/udlfb.h b/include/video/udlfb.h
80710index f9466fa..f4e2b81 100644
80711--- a/include/video/udlfb.h
80712+++ b/include/video/udlfb.h
80713@@ -53,10 +53,10 @@ struct dlfb_data {
80714 u32 pseudo_palette[256];
80715 int blank_mode; /*one of FB_BLANK_ */
80716 /* blit-only rendering path metrics, exposed through sysfs */
80717- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
80718- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
80719- atomic_t bytes_sent; /* to usb, after compression including overhead */
80720- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
80721+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
80722+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
80723+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
80724+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
80725 };
80726
80727 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
80728diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
80729index 30f5362..8ed8ac9 100644
80730--- a/include/video/uvesafb.h
80731+++ b/include/video/uvesafb.h
80732@@ -122,6 +122,7 @@ struct uvesafb_par {
80733 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
80734 u8 pmi_setpal; /* PMI for palette changes */
80735 u16 *pmi_base; /* protected mode interface location */
80736+ u8 *pmi_code; /* protected mode code location */
80737 void *pmi_start;
80738 void *pmi_pal;
80739 u8 *vbe_state_orig; /*
80740diff --git a/init/Kconfig b/init/Kconfig
80741index 3ecd8a1..627843f 100644
80742--- a/init/Kconfig
80743+++ b/init/Kconfig
80744@@ -1086,6 +1086,7 @@ endif # CGROUPS
80745
80746 config CHECKPOINT_RESTORE
80747 bool "Checkpoint/restore support" if EXPERT
80748+ depends on !GRKERNSEC
80749 default n
80750 help
80751 Enables additional kernel features in a sake of checkpoint/restore.
80752@@ -1557,7 +1558,7 @@ config SLUB_DEBUG
80753
80754 config COMPAT_BRK
80755 bool "Disable heap randomization"
80756- default y
80757+ default n
80758 help
80759 Randomizing heap placement makes heap exploits harder, but it
80760 also breaks ancient binaries (including anything libc5 based).
80761@@ -1832,7 +1833,7 @@ config INIT_ALL_POSSIBLE
80762 config STOP_MACHINE
80763 bool
80764 default y
80765- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
80766+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
80767 help
80768 Need stop_machine() primitive.
80769
80770diff --git a/init/Makefile b/init/Makefile
80771index 7bc47ee..6da2dc7 100644
80772--- a/init/Makefile
80773+++ b/init/Makefile
80774@@ -2,6 +2,9 @@
80775 # Makefile for the linux kernel.
80776 #
80777
80778+ccflags-y := $(GCC_PLUGINS_CFLAGS)
80779+asflags-y := $(GCC_PLUGINS_AFLAGS)
80780+
80781 obj-y := main.o version.o mounts.o
80782 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
80783 obj-y += noinitramfs.o
80784diff --git a/init/do_mounts.c b/init/do_mounts.c
80785index a51cddc..25c2768 100644
80786--- a/init/do_mounts.c
80787+++ b/init/do_mounts.c
80788@@ -357,11 +357,11 @@ static void __init get_fs_names(char *page)
80789 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
80790 {
80791 struct super_block *s;
80792- int err = sys_mount(name, "/root", fs, flags, data);
80793+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
80794 if (err)
80795 return err;
80796
80797- sys_chdir("/root");
80798+ sys_chdir((const char __force_user *)"/root");
80799 s = current->fs->pwd.dentry->d_sb;
80800 ROOT_DEV = s->s_dev;
80801 printk(KERN_INFO
80802@@ -482,18 +482,18 @@ void __init change_floppy(char *fmt, ...)
80803 va_start(args, fmt);
80804 vsprintf(buf, fmt, args);
80805 va_end(args);
80806- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
80807+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
80808 if (fd >= 0) {
80809 sys_ioctl(fd, FDEJECT, 0);
80810 sys_close(fd);
80811 }
80812 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
80813- fd = sys_open("/dev/console", O_RDWR, 0);
80814+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
80815 if (fd >= 0) {
80816 sys_ioctl(fd, TCGETS, (long)&termios);
80817 termios.c_lflag &= ~ICANON;
80818 sys_ioctl(fd, TCSETSF, (long)&termios);
80819- sys_read(fd, &c, 1);
80820+ sys_read(fd, (char __user *)&c, 1);
80821 termios.c_lflag |= ICANON;
80822 sys_ioctl(fd, TCSETSF, (long)&termios);
80823 sys_close(fd);
80824@@ -587,8 +587,8 @@ void __init prepare_namespace(void)
80825 mount_root();
80826 out:
80827 devtmpfs_mount("dev");
80828- sys_mount(".", "/", NULL, MS_MOVE, NULL);
80829- sys_chroot(".");
80830+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
80831+ sys_chroot((const char __force_user *)".");
80832 }
80833
80834 static bool is_tmpfs;
80835diff --git a/init/do_mounts.h b/init/do_mounts.h
80836index f5b978a..69dbfe8 100644
80837--- a/init/do_mounts.h
80838+++ b/init/do_mounts.h
80839@@ -15,15 +15,15 @@ extern int root_mountflags;
80840
80841 static inline int create_dev(char *name, dev_t dev)
80842 {
80843- sys_unlink(name);
80844- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
80845+ sys_unlink((char __force_user *)name);
80846+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
80847 }
80848
80849 #if BITS_PER_LONG == 32
80850 static inline u32 bstat(char *name)
80851 {
80852 struct stat64 stat;
80853- if (sys_stat64(name, &stat) != 0)
80854+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
80855 return 0;
80856 if (!S_ISBLK(stat.st_mode))
80857 return 0;
80858@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
80859 static inline u32 bstat(char *name)
80860 {
80861 struct stat stat;
80862- if (sys_newstat(name, &stat) != 0)
80863+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
80864 return 0;
80865 if (!S_ISBLK(stat.st_mode))
80866 return 0;
80867diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
80868index 3e0878e..8a9d7a0 100644
80869--- a/init/do_mounts_initrd.c
80870+++ b/init/do_mounts_initrd.c
80871@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
80872 {
80873 sys_unshare(CLONE_FS | CLONE_FILES);
80874 /* stdin/stdout/stderr for /linuxrc */
80875- sys_open("/dev/console", O_RDWR, 0);
80876+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
80877 sys_dup(0);
80878 sys_dup(0);
80879 /* move initrd over / and chdir/chroot in initrd root */
80880- sys_chdir("/root");
80881- sys_mount(".", "/", NULL, MS_MOVE, NULL);
80882- sys_chroot(".");
80883+ sys_chdir((const char __force_user *)"/root");
80884+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
80885+ sys_chroot((const char __force_user *)".");
80886 sys_setsid();
80887 return 0;
80888 }
80889@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
80890 create_dev("/dev/root.old", Root_RAM0);
80891 /* mount initrd on rootfs' /root */
80892 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
80893- sys_mkdir("/old", 0700);
80894- sys_chdir("/old");
80895+ sys_mkdir((const char __force_user *)"/old", 0700);
80896+ sys_chdir((const char __force_user *)"/old");
80897
80898 /* try loading default modules from initrd */
80899 load_default_modules();
80900@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
80901 current->flags &= ~PF_FREEZER_SKIP;
80902
80903 /* move initrd to rootfs' /old */
80904- sys_mount("..", ".", NULL, MS_MOVE, NULL);
80905+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
80906 /* switch root and cwd back to / of rootfs */
80907- sys_chroot("..");
80908+ sys_chroot((const char __force_user *)"..");
80909
80910 if (new_decode_dev(real_root_dev) == Root_RAM0) {
80911- sys_chdir("/old");
80912+ sys_chdir((const char __force_user *)"/old");
80913 return;
80914 }
80915
80916- sys_chdir("/");
80917+ sys_chdir((const char __force_user *)"/");
80918 ROOT_DEV = new_decode_dev(real_root_dev);
80919 mount_root();
80920
80921 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
80922- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
80923+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
80924 if (!error)
80925 printk("okay\n");
80926 else {
80927- int fd = sys_open("/dev/root.old", O_RDWR, 0);
80928+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
80929 if (error == -ENOENT)
80930 printk("/initrd does not exist. Ignored.\n");
80931 else
80932 printk("failed\n");
80933 printk(KERN_NOTICE "Unmounting old root\n");
80934- sys_umount("/old", MNT_DETACH);
80935+ sys_umount((char __force_user *)"/old", MNT_DETACH);
80936 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
80937 if (fd < 0) {
80938 error = fd;
80939@@ -127,11 +127,11 @@ int __init initrd_load(void)
80940 * mounted in the normal path.
80941 */
80942 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
80943- sys_unlink("/initrd.image");
80944+ sys_unlink((const char __force_user *)"/initrd.image");
80945 handle_initrd();
80946 return 1;
80947 }
80948 }
80949- sys_unlink("/initrd.image");
80950+ sys_unlink((const char __force_user *)"/initrd.image");
80951 return 0;
80952 }
80953diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
80954index 8cb6db5..d729f50 100644
80955--- a/init/do_mounts_md.c
80956+++ b/init/do_mounts_md.c
80957@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
80958 partitioned ? "_d" : "", minor,
80959 md_setup_args[ent].device_names);
80960
80961- fd = sys_open(name, 0, 0);
80962+ fd = sys_open((char __force_user *)name, 0, 0);
80963 if (fd < 0) {
80964 printk(KERN_ERR "md: open failed - cannot start "
80965 "array %s\n", name);
80966@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
80967 * array without it
80968 */
80969 sys_close(fd);
80970- fd = sys_open(name, 0, 0);
80971+ fd = sys_open((char __force_user *)name, 0, 0);
80972 sys_ioctl(fd, BLKRRPART, 0);
80973 }
80974 sys_close(fd);
80975@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
80976
80977 wait_for_device_probe();
80978
80979- fd = sys_open("/dev/md0", 0, 0);
80980+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
80981 if (fd >= 0) {
80982 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
80983 sys_close(fd);
80984diff --git a/init/init_task.c b/init/init_task.c
80985index ba0a7f36..2bcf1d5 100644
80986--- a/init/init_task.c
80987+++ b/init/init_task.c
80988@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
80989 * Initial thread structure. Alignment of this is handled by a special
80990 * linker map entry.
80991 */
80992+#ifdef CONFIG_X86
80993+union thread_union init_thread_union __init_task_data;
80994+#else
80995 union thread_union init_thread_union __init_task_data =
80996 { INIT_THREAD_INFO(init_task) };
80997+#endif
80998diff --git a/init/initramfs.c b/init/initramfs.c
80999index a67ef9d..2d17ed9 100644
81000--- a/init/initramfs.c
81001+++ b/init/initramfs.c
81002@@ -84,7 +84,7 @@ static void __init free_hash(void)
81003 }
81004 }
81005
81006-static long __init do_utime(char *filename, time_t mtime)
81007+static long __init do_utime(char __force_user *filename, time_t mtime)
81008 {
81009 struct timespec t[2];
81010
81011@@ -119,7 +119,7 @@ static void __init dir_utime(void)
81012 struct dir_entry *de, *tmp;
81013 list_for_each_entry_safe(de, tmp, &dir_list, list) {
81014 list_del(&de->list);
81015- do_utime(de->name, de->mtime);
81016+ do_utime((char __force_user *)de->name, de->mtime);
81017 kfree(de->name);
81018 kfree(de);
81019 }
81020@@ -281,7 +281,7 @@ static int __init maybe_link(void)
81021 if (nlink >= 2) {
81022 char *old = find_link(major, minor, ino, mode, collected);
81023 if (old)
81024- return (sys_link(old, collected) < 0) ? -1 : 1;
81025+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
81026 }
81027 return 0;
81028 }
81029@@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
81030 {
81031 struct stat st;
81032
81033- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
81034+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
81035 if (S_ISDIR(st.st_mode))
81036- sys_rmdir(path);
81037+ sys_rmdir((char __force_user *)path);
81038 else
81039- sys_unlink(path);
81040+ sys_unlink((char __force_user *)path);
81041 }
81042 }
81043
81044@@ -315,7 +315,7 @@ static int __init do_name(void)
81045 int openflags = O_WRONLY|O_CREAT;
81046 if (ml != 1)
81047 openflags |= O_TRUNC;
81048- wfd = sys_open(collected, openflags, mode);
81049+ wfd = sys_open((char __force_user *)collected, openflags, mode);
81050
81051 if (wfd >= 0) {
81052 sys_fchown(wfd, uid, gid);
81053@@ -327,17 +327,17 @@ static int __init do_name(void)
81054 }
81055 }
81056 } else if (S_ISDIR(mode)) {
81057- sys_mkdir(collected, mode);
81058- sys_chown(collected, uid, gid);
81059- sys_chmod(collected, mode);
81060+ sys_mkdir((char __force_user *)collected, mode);
81061+ sys_chown((char __force_user *)collected, uid, gid);
81062+ sys_chmod((char __force_user *)collected, mode);
81063 dir_add(collected, mtime);
81064 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
81065 S_ISFIFO(mode) || S_ISSOCK(mode)) {
81066 if (maybe_link() == 0) {
81067- sys_mknod(collected, mode, rdev);
81068- sys_chown(collected, uid, gid);
81069- sys_chmod(collected, mode);
81070- do_utime(collected, mtime);
81071+ sys_mknod((char __force_user *)collected, mode, rdev);
81072+ sys_chown((char __force_user *)collected, uid, gid);
81073+ sys_chmod((char __force_user *)collected, mode);
81074+ do_utime((char __force_user *)collected, mtime);
81075 }
81076 }
81077 return 0;
81078@@ -346,15 +346,15 @@ static int __init do_name(void)
81079 static int __init do_copy(void)
81080 {
81081 if (count >= body_len) {
81082- sys_write(wfd, victim, body_len);
81083+ sys_write(wfd, (char __force_user *)victim, body_len);
81084 sys_close(wfd);
81085- do_utime(vcollected, mtime);
81086+ do_utime((char __force_user *)vcollected, mtime);
81087 kfree(vcollected);
81088 eat(body_len);
81089 state = SkipIt;
81090 return 0;
81091 } else {
81092- sys_write(wfd, victim, count);
81093+ sys_write(wfd, (char __force_user *)victim, count);
81094 body_len -= count;
81095 eat(count);
81096 return 1;
81097@@ -365,9 +365,9 @@ static int __init do_symlink(void)
81098 {
81099 collected[N_ALIGN(name_len) + body_len] = '\0';
81100 clean_path(collected, 0);
81101- sys_symlink(collected + N_ALIGN(name_len), collected);
81102- sys_lchown(collected, uid, gid);
81103- do_utime(collected, mtime);
81104+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
81105+ sys_lchown((char __force_user *)collected, uid, gid);
81106+ do_utime((char __force_user *)collected, mtime);
81107 state = SkipIt;
81108 next_state = Reset;
81109 return 0;
81110@@ -583,7 +583,7 @@ static int __init populate_rootfs(void)
81111 {
81112 char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
81113 if (err)
81114- panic(err); /* Failed to decompress INTERNAL initramfs */
81115+ panic("%s", err); /* Failed to decompress INTERNAL initramfs */
81116 if (initrd_start) {
81117 #ifdef CONFIG_BLK_DEV_RAM
81118 int fd;
81119diff --git a/init/main.c b/init/main.c
81120index 63d3e8f..50bd5f8 100644
81121--- a/init/main.c
81122+++ b/init/main.c
81123@@ -103,6 +103,8 @@ static inline void mark_rodata_ro(void) { }
81124 extern void tc_init(void);
81125 #endif
81126
81127+extern void grsecurity_init(void);
81128+
81129 /*
81130 * Debug helper: via this flag we know that we are in 'early bootup code'
81131 * where only the boot processor is running with IRQ disabled. This means
81132@@ -156,6 +158,75 @@ static int __init set_reset_devices(char *str)
81133
81134 __setup("reset_devices", set_reset_devices);
81135
81136+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
81137+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
81138+static int __init setup_grsec_proc_gid(char *str)
81139+{
81140+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
81141+ return 1;
81142+}
81143+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
81144+#endif
81145+
81146+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
81147+unsigned long pax_user_shadow_base __read_only;
81148+EXPORT_SYMBOL(pax_user_shadow_base);
81149+extern char pax_enter_kernel_user[];
81150+extern char pax_exit_kernel_user[];
81151+#endif
81152+
81153+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
81154+static int __init setup_pax_nouderef(char *str)
81155+{
81156+#ifdef CONFIG_X86_32
81157+ unsigned int cpu;
81158+ struct desc_struct *gdt;
81159+
81160+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
81161+ gdt = get_cpu_gdt_table(cpu);
81162+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
81163+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
81164+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
81165+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
81166+ }
81167+ loadsegment(ds, __KERNEL_DS);
81168+ loadsegment(es, __KERNEL_DS);
81169+ loadsegment(ss, __KERNEL_DS);
81170+#else
81171+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
81172+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
81173+ clone_pgd_mask = ~(pgdval_t)0UL;
81174+ pax_user_shadow_base = 0UL;
81175+ setup_clear_cpu_cap(X86_FEATURE_PCID);
81176+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
81177+#endif
81178+
81179+ return 0;
81180+}
81181+early_param("pax_nouderef", setup_pax_nouderef);
81182+
81183+#ifdef CONFIG_X86_64
81184+static int __init setup_pax_weakuderef(char *str)
81185+{
81186+ if (clone_pgd_mask != ~(pgdval_t)0UL)
81187+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
81188+ return 1;
81189+}
81190+__setup("pax_weakuderef", setup_pax_weakuderef);
81191+#endif
81192+#endif
81193+
81194+#ifdef CONFIG_PAX_SOFTMODE
81195+int pax_softmode;
81196+
81197+static int __init setup_pax_softmode(char *str)
81198+{
81199+ get_option(&str, &pax_softmode);
81200+ return 1;
81201+}
81202+__setup("pax_softmode=", setup_pax_softmode);
81203+#endif
81204+
81205 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
81206 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
81207 static const char *panic_later, *panic_param;
81208@@ -682,25 +753,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
81209 {
81210 int count = preempt_count();
81211 int ret;
81212- char msgbuf[64];
81213+ const char *msg1 = "", *msg2 = "";
81214
81215 if (initcall_debug)
81216 ret = do_one_initcall_debug(fn);
81217 else
81218 ret = fn();
81219
81220- msgbuf[0] = 0;
81221-
81222 if (preempt_count() != count) {
81223- sprintf(msgbuf, "preemption imbalance ");
81224+ msg1 = " preemption imbalance";
81225 preempt_count() = count;
81226 }
81227 if (irqs_disabled()) {
81228- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
81229+ msg2 = " disabled interrupts";
81230 local_irq_enable();
81231 }
81232- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
81233+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
81234
81235+ add_latent_entropy();
81236 return ret;
81237 }
81238
81239@@ -807,10 +877,14 @@ static int run_init_process(const char *init_filename)
81240 {
81241 argv_init[0] = init_filename;
81242 return do_execve(init_filename,
81243- (const char __user *const __user *)argv_init,
81244- (const char __user *const __user *)envp_init);
81245+ (const char __user *const __force_user *)argv_init,
81246+ (const char __user *const __force_user *)envp_init);
81247 }
81248
81249+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
81250+extern int gr_init_ran;
81251+#endif
81252+
81253 static noinline void __init kernel_init_freeable(void);
81254
81255 static int __ref kernel_init(void *unused)
81256@@ -831,6 +905,11 @@ static int __ref kernel_init(void *unused)
81257 pr_err("Failed to execute %s\n", ramdisk_execute_command);
81258 }
81259
81260+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
81261+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
81262+ gr_init_ran = 1;
81263+#endif
81264+
81265 /*
81266 * We try each of these until one succeeds.
81267 *
81268@@ -885,7 +964,7 @@ static noinline void __init kernel_init_freeable(void)
81269 do_basic_setup();
81270
81271 /* Open the /dev/console on the rootfs, this should never fail */
81272- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
81273+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
81274 pr_err("Warning: unable to open an initial console.\n");
81275
81276 (void) sys_dup(0);
81277@@ -898,11 +977,13 @@ static noinline void __init kernel_init_freeable(void)
81278 if (!ramdisk_execute_command)
81279 ramdisk_execute_command = "/init";
81280
81281- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
81282+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
81283 ramdisk_execute_command = NULL;
81284 prepare_namespace();
81285 }
81286
81287+ grsecurity_init();
81288+
81289 /*
81290 * Ok, we have completed the initial bootup, and
81291 * we're essentially up and running. Get rid of the
81292diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
81293index b0e99de..09f385c 100644
81294--- a/ipc/ipc_sysctl.c
81295+++ b/ipc/ipc_sysctl.c
81296@@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
81297 static int proc_ipc_dointvec(ctl_table *table, int write,
81298 void __user *buffer, size_t *lenp, loff_t *ppos)
81299 {
81300- struct ctl_table ipc_table;
81301+ ctl_table_no_const ipc_table;
81302
81303 memcpy(&ipc_table, table, sizeof(ipc_table));
81304 ipc_table.data = get_ipc(table);
81305@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,
81306 static int proc_ipc_dointvec_minmax(ctl_table *table, int write,
81307 void __user *buffer, size_t *lenp, loff_t *ppos)
81308 {
81309- struct ctl_table ipc_table;
81310+ ctl_table_no_const ipc_table;
81311
81312 memcpy(&ipc_table, table, sizeof(ipc_table));
81313 ipc_table.data = get_ipc(table);
81314@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
81315 static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
81316 void __user *buffer, size_t *lenp, loff_t *ppos)
81317 {
81318- struct ctl_table ipc_table;
81319+ ctl_table_no_const ipc_table;
81320 size_t lenp_bef = *lenp;
81321 int rc;
81322
81323@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
81324 static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
81325 void __user *buffer, size_t *lenp, loff_t *ppos)
81326 {
81327- struct ctl_table ipc_table;
81328+ ctl_table_no_const ipc_table;
81329 memcpy(&ipc_table, table, sizeof(ipc_table));
81330 ipc_table.data = get_ipc(table);
81331
81332@@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
81333 static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
81334 void __user *buffer, size_t *lenp, loff_t *ppos)
81335 {
81336- struct ctl_table ipc_table;
81337+ ctl_table_no_const ipc_table;
81338 size_t lenp_bef = *lenp;
81339 int oldval;
81340 int rc;
81341diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
81342index 383d638..943fdbb 100644
81343--- a/ipc/mq_sysctl.c
81344+++ b/ipc/mq_sysctl.c
81345@@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
81346 static int proc_mq_dointvec_minmax(ctl_table *table, int write,
81347 void __user *buffer, size_t *lenp, loff_t *ppos)
81348 {
81349- struct ctl_table mq_table;
81350+ ctl_table_no_const mq_table;
81351 memcpy(&mq_table, table, sizeof(mq_table));
81352 mq_table.data = get_mq(table);
81353
81354diff --git a/ipc/mqueue.c b/ipc/mqueue.c
81355index ae1996d..a35f2cc 100644
81356--- a/ipc/mqueue.c
81357+++ b/ipc/mqueue.c
81358@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
81359 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
81360 info->attr.mq_msgsize);
81361
81362+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
81363 spin_lock(&mq_lock);
81364 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
81365 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
81366diff --git a/ipc/msg.c b/ipc/msg.c
81367index 558aa91..359e718 100644
81368--- a/ipc/msg.c
81369+++ b/ipc/msg.c
81370@@ -297,18 +297,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
81371 return security_msg_queue_associate(msq, msgflg);
81372 }
81373
81374+static struct ipc_ops msg_ops = {
81375+ .getnew = newque,
81376+ .associate = msg_security,
81377+ .more_checks = NULL
81378+};
81379+
81380 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
81381 {
81382 struct ipc_namespace *ns;
81383- struct ipc_ops msg_ops;
81384 struct ipc_params msg_params;
81385
81386 ns = current->nsproxy->ipc_ns;
81387
81388- msg_ops.getnew = newque;
81389- msg_ops.associate = msg_security;
81390- msg_ops.more_checks = NULL;
81391-
81392 msg_params.key = key;
81393 msg_params.flg = msgflg;
81394
81395diff --git a/ipc/sem.c b/ipc/sem.c
81396index db9d241..bc8427c 100644
81397--- a/ipc/sem.c
81398+++ b/ipc/sem.c
81399@@ -562,10 +562,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
81400 return 0;
81401 }
81402
81403+static struct ipc_ops sem_ops = {
81404+ .getnew = newary,
81405+ .associate = sem_security,
81406+ .more_checks = sem_more_checks
81407+};
81408+
81409 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
81410 {
81411 struct ipc_namespace *ns;
81412- struct ipc_ops sem_ops;
81413 struct ipc_params sem_params;
81414
81415 ns = current->nsproxy->ipc_ns;
81416@@ -573,10 +578,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
81417 if (nsems < 0 || nsems > ns->sc_semmsl)
81418 return -EINVAL;
81419
81420- sem_ops.getnew = newary;
81421- sem_ops.associate = sem_security;
81422- sem_ops.more_checks = sem_more_checks;
81423-
81424 sem_params.key = key;
81425 sem_params.flg = semflg;
81426 sem_params.u.nsems = nsems;
81427diff --git a/ipc/shm.c b/ipc/shm.c
81428index 7a51443..3a257d8 100644
81429--- a/ipc/shm.c
81430+++ b/ipc/shm.c
81431@@ -72,6 +72,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
81432 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
81433 #endif
81434
81435+#ifdef CONFIG_GRKERNSEC
81436+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
81437+ const time_t shm_createtime, const kuid_t cuid,
81438+ const int shmid);
81439+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
81440+ const time_t shm_createtime);
81441+#endif
81442+
81443 void shm_init_ns(struct ipc_namespace *ns)
81444 {
81445 ns->shm_ctlmax = SHMMAX;
81446@@ -554,6 +562,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
81447 shp->shm_lprid = 0;
81448 shp->shm_atim = shp->shm_dtim = 0;
81449 shp->shm_ctim = get_seconds();
81450+#ifdef CONFIG_GRKERNSEC
81451+ {
81452+ struct timespec timeval;
81453+ do_posix_clock_monotonic_gettime(&timeval);
81454+
81455+ shp->shm_createtime = timeval.tv_sec;
81456+ }
81457+#endif
81458 shp->shm_segsz = size;
81459 shp->shm_nattch = 0;
81460 shp->shm_file = file;
81461@@ -607,18 +623,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
81462 return 0;
81463 }
81464
81465+static struct ipc_ops shm_ops = {
81466+ .getnew = newseg,
81467+ .associate = shm_security,
81468+ .more_checks = shm_more_checks
81469+};
81470+
81471 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
81472 {
81473 struct ipc_namespace *ns;
81474- struct ipc_ops shm_ops;
81475 struct ipc_params shm_params;
81476
81477 ns = current->nsproxy->ipc_ns;
81478
81479- shm_ops.getnew = newseg;
81480- shm_ops.associate = shm_security;
81481- shm_ops.more_checks = shm_more_checks;
81482-
81483 shm_params.key = key;
81484 shm_params.flg = shmflg;
81485 shm_params.u.size = size;
81486@@ -1089,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81487 f_mode = FMODE_READ | FMODE_WRITE;
81488 }
81489 if (shmflg & SHM_EXEC) {
81490+
81491+#ifdef CONFIG_PAX_MPROTECT
81492+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
81493+ goto out;
81494+#endif
81495+
81496 prot |= PROT_EXEC;
81497 acc_mode |= S_IXUGO;
81498 }
81499@@ -1113,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81500 if (err)
81501 goto out_unlock;
81502
81503+#ifdef CONFIG_GRKERNSEC
81504+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
81505+ shp->shm_perm.cuid, shmid) ||
81506+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
81507+ err = -EACCES;
81508+ goto out_unlock;
81509+ }
81510+#endif
81511+
81512 ipc_lock_object(&shp->shm_perm);
81513
81514 /* check if shm_destroy() is tearing down shp */
81515@@ -1125,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
81516 path = shp->shm_file->f_path;
81517 path_get(&path);
81518 shp->shm_nattch++;
81519+#ifdef CONFIG_GRKERNSEC
81520+ shp->shm_lapid = current->pid;
81521+#endif
81522 size = i_size_read(path.dentry->d_inode);
81523 ipc_unlock_object(&shp->shm_perm);
81524 rcu_read_unlock();
81525diff --git a/ipc/util.c b/ipc/util.c
81526index 7684f41..5bf1880 100644
81527--- a/ipc/util.c
81528+++ b/ipc/util.c
81529@@ -71,6 +71,8 @@ struct ipc_proc_iface {
81530 int (*show)(struct seq_file *, void *);
81531 };
81532
81533+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
81534+
81535 static void ipc_memory_notifier(struct work_struct *work)
81536 {
81537 ipcns_notify(IPCNS_MEMCHANGED);
81538@@ -560,6 +562,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
81539 granted_mode >>= 6;
81540 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
81541 granted_mode >>= 3;
81542+
81543+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
81544+ return -1;
81545+
81546 /* is there some bit set in requested_mode but not in granted_mode? */
81547 if ((requested_mode & ~granted_mode & 0007) &&
81548 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
81549diff --git a/kernel/acct.c b/kernel/acct.c
81550index 8d6e145..33e0b1e 100644
81551--- a/kernel/acct.c
81552+++ b/kernel/acct.c
81553@@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
81554 */
81555 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
81556 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
81557- file->f_op->write(file, (char *)&ac,
81558+ file->f_op->write(file, (char __force_user *)&ac,
81559 sizeof(acct_t), &file->f_pos);
81560 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
81561 set_fs(fs);
81562diff --git a/kernel/audit.c b/kernel/audit.c
81563index 7ddfd8a..49766eb 100644
81564--- a/kernel/audit.c
81565+++ b/kernel/audit.c
81566@@ -118,7 +118,7 @@ u32 audit_sig_sid = 0;
81567 3) suppressed due to audit_rate_limit
81568 4) suppressed due to audit_backlog_limit
81569 */
81570-static atomic_t audit_lost = ATOMIC_INIT(0);
81571+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
81572
81573 /* The netlink socket. */
81574 static struct sock *audit_sock;
81575@@ -240,7 +240,7 @@ void audit_log_lost(const char *message)
81576 unsigned long now;
81577 int print;
81578
81579- atomic_inc(&audit_lost);
81580+ atomic_inc_unchecked(&audit_lost);
81581
81582 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
81583
81584@@ -259,7 +259,7 @@ void audit_log_lost(const char *message)
81585 printk(KERN_WARNING
81586 "audit: audit_lost=%d audit_rate_limit=%d "
81587 "audit_backlog_limit=%d\n",
81588- atomic_read(&audit_lost),
81589+ atomic_read_unchecked(&audit_lost),
81590 audit_rate_limit,
81591 audit_backlog_limit);
81592 audit_panic(message);
81593@@ -665,7 +665,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
81594 status_set.pid = audit_pid;
81595 status_set.rate_limit = audit_rate_limit;
81596 status_set.backlog_limit = audit_backlog_limit;
81597- status_set.lost = atomic_read(&audit_lost);
81598+ status_set.lost = atomic_read_unchecked(&audit_lost);
81599 status_set.backlog = skb_queue_len(&audit_skb_queue);
81600 audit_send_reply(NETLINK_CB(skb).portid, seq, AUDIT_GET, 0, 0,
81601 &status_set, sizeof(status_set));
81602@@ -1252,7 +1252,7 @@ void audit_log_n_hex(struct audit_buffer *ab, const unsigned char *buf,
81603 int i, avail, new_len;
81604 unsigned char *ptr;
81605 struct sk_buff *skb;
81606- static const unsigned char *hex = "0123456789ABCDEF";
81607+ static const unsigned char hex[] = "0123456789ABCDEF";
81608
81609 if (!ab)
81610 return;
81611diff --git a/kernel/auditsc.c b/kernel/auditsc.c
81612index 9845cb3..3ec9369 100644
81613--- a/kernel/auditsc.c
81614+++ b/kernel/auditsc.c
81615@@ -1962,7 +1962,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
81616 }
81617
81618 /* global counter which is incremented every time something logs in */
81619-static atomic_t session_id = ATOMIC_INIT(0);
81620+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
81621
81622 /**
81623 * audit_set_loginuid - set current task's audit_context loginuid
81624@@ -1986,7 +1986,7 @@ int audit_set_loginuid(kuid_t loginuid)
81625 return -EPERM;
81626 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
81627
81628- sessionid = atomic_inc_return(&session_id);
81629+ sessionid = atomic_inc_return_unchecked(&session_id);
81630 if (context && context->in_syscall) {
81631 struct audit_buffer *ab;
81632
81633diff --git a/kernel/capability.c b/kernel/capability.c
81634index 4e66bf9..cdccecf 100644
81635--- a/kernel/capability.c
81636+++ b/kernel/capability.c
81637@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
81638 * before modification is attempted and the application
81639 * fails.
81640 */
81641+ if (tocopy > ARRAY_SIZE(kdata))
81642+ return -EFAULT;
81643+
81644 if (copy_to_user(dataptr, kdata, tocopy
81645 * sizeof(struct __user_cap_data_struct))) {
81646 return -EFAULT;
81647@@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
81648 int ret;
81649
81650 rcu_read_lock();
81651- ret = security_capable(__task_cred(t), ns, cap);
81652+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
81653+ gr_task_is_capable(t, __task_cred(t), cap);
81654 rcu_read_unlock();
81655
81656- return (ret == 0);
81657+ return ret;
81658 }
81659
81660 /**
81661@@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
81662 int ret;
81663
81664 rcu_read_lock();
81665- ret = security_capable_noaudit(__task_cred(t), ns, cap);
81666+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
81667 rcu_read_unlock();
81668
81669- return (ret == 0);
81670+ return ret;
81671 }
81672
81673 /**
81674@@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
81675 BUG();
81676 }
81677
81678- if (security_capable(current_cred(), ns, cap) == 0) {
81679+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
81680 current->flags |= PF_SUPERPRIV;
81681 return true;
81682 }
81683@@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
81684 }
81685 EXPORT_SYMBOL(ns_capable);
81686
81687+bool ns_capable_nolog(struct user_namespace *ns, int cap)
81688+{
81689+ if (unlikely(!cap_valid(cap))) {
81690+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
81691+ BUG();
81692+ }
81693+
81694+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
81695+ current->flags |= PF_SUPERPRIV;
81696+ return true;
81697+ }
81698+ return false;
81699+}
81700+EXPORT_SYMBOL(ns_capable_nolog);
81701+
81702 /**
81703 * file_ns_capable - Determine if the file's opener had a capability in effect
81704 * @file: The file we want to check
81705@@ -432,6 +451,12 @@ bool capable(int cap)
81706 }
81707 EXPORT_SYMBOL(capable);
81708
81709+bool capable_nolog(int cap)
81710+{
81711+ return ns_capable_nolog(&init_user_ns, cap);
81712+}
81713+EXPORT_SYMBOL(capable_nolog);
81714+
81715 /**
81716 * inode_capable - Check superior capability over inode
81717 * @inode: The inode in question
81718@@ -453,3 +478,11 @@ bool inode_capable(const struct inode *inode, int cap)
81719 return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
81720 }
81721 EXPORT_SYMBOL(inode_capable);
81722+
81723+bool inode_capable_nolog(const struct inode *inode, int cap)
81724+{
81725+ struct user_namespace *ns = current_user_ns();
81726+
81727+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
81728+}
81729+EXPORT_SYMBOL(inode_capable_nolog);
81730diff --git a/kernel/cgroup.c b/kernel/cgroup.c
81731index b6fd783..7f526b7 100644
81732--- a/kernel/cgroup.c
81733+++ b/kernel/cgroup.c
81734@@ -5855,7 +5855,7 @@ static int cgroup_css_links_read(struct cgroup_subsys_state *css,
81735 struct css_set *cset = link->cset;
81736 struct task_struct *task;
81737 int count = 0;
81738- seq_printf(seq, "css_set %p\n", cset);
81739+ seq_printf(seq, "css_set %pK\n", cset);
81740 list_for_each_entry(task, &cset->tasks, cg_list) {
81741 if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
81742 seq_puts(seq, " ...\n");
81743diff --git a/kernel/compat.c b/kernel/compat.c
81744index 0a09e48..f44f3f0 100644
81745--- a/kernel/compat.c
81746+++ b/kernel/compat.c
81747@@ -13,6 +13,7 @@
81748
81749 #include <linux/linkage.h>
81750 #include <linux/compat.h>
81751+#include <linux/module.h>
81752 #include <linux/errno.h>
81753 #include <linux/time.h>
81754 #include <linux/signal.h>
81755@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
81756 mm_segment_t oldfs;
81757 long ret;
81758
81759- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
81760+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
81761 oldfs = get_fs();
81762 set_fs(KERNEL_DS);
81763 ret = hrtimer_nanosleep_restart(restart);
81764@@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
81765 oldfs = get_fs();
81766 set_fs(KERNEL_DS);
81767 ret = hrtimer_nanosleep(&tu,
81768- rmtp ? (struct timespec __user *)&rmt : NULL,
81769+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
81770 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
81771 set_fs(oldfs);
81772
81773@@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
81774 mm_segment_t old_fs = get_fs();
81775
81776 set_fs(KERNEL_DS);
81777- ret = sys_sigpending((old_sigset_t __user *) &s);
81778+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
81779 set_fs(old_fs);
81780 if (ret == 0)
81781 ret = put_user(s, set);
81782@@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
81783 mm_segment_t old_fs = get_fs();
81784
81785 set_fs(KERNEL_DS);
81786- ret = sys_old_getrlimit(resource, &r);
81787+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
81788 set_fs(old_fs);
81789
81790 if (!ret) {
81791@@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
81792 set_fs (KERNEL_DS);
81793 ret = sys_wait4(pid,
81794 (stat_addr ?
81795- (unsigned int __user *) &status : NULL),
81796- options, (struct rusage __user *) &r);
81797+ (unsigned int __force_user *) &status : NULL),
81798+ options, (struct rusage __force_user *) &r);
81799 set_fs (old_fs);
81800
81801 if (ret > 0) {
81802@@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
81803 memset(&info, 0, sizeof(info));
81804
81805 set_fs(KERNEL_DS);
81806- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
81807- uru ? (struct rusage __user *)&ru : NULL);
81808+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
81809+ uru ? (struct rusage __force_user *)&ru : NULL);
81810 set_fs(old_fs);
81811
81812 if ((ret < 0) || (info.si_signo == 0))
81813@@ -695,8 +696,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
81814 oldfs = get_fs();
81815 set_fs(KERNEL_DS);
81816 err = sys_timer_settime(timer_id, flags,
81817- (struct itimerspec __user *) &newts,
81818- (struct itimerspec __user *) &oldts);
81819+ (struct itimerspec __force_user *) &newts,
81820+ (struct itimerspec __force_user *) &oldts);
81821 set_fs(oldfs);
81822 if (!err && old && put_compat_itimerspec(old, &oldts))
81823 return -EFAULT;
81824@@ -713,7 +714,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
81825 oldfs = get_fs();
81826 set_fs(KERNEL_DS);
81827 err = sys_timer_gettime(timer_id,
81828- (struct itimerspec __user *) &ts);
81829+ (struct itimerspec __force_user *) &ts);
81830 set_fs(oldfs);
81831 if (!err && put_compat_itimerspec(setting, &ts))
81832 return -EFAULT;
81833@@ -732,7 +733,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
81834 oldfs = get_fs();
81835 set_fs(KERNEL_DS);
81836 err = sys_clock_settime(which_clock,
81837- (struct timespec __user *) &ts);
81838+ (struct timespec __force_user *) &ts);
81839 set_fs(oldfs);
81840 return err;
81841 }
81842@@ -747,7 +748,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
81843 oldfs = get_fs();
81844 set_fs(KERNEL_DS);
81845 err = sys_clock_gettime(which_clock,
81846- (struct timespec __user *) &ts);
81847+ (struct timespec __force_user *) &ts);
81848 set_fs(oldfs);
81849 if (!err && put_compat_timespec(&ts, tp))
81850 return -EFAULT;
81851@@ -767,7 +768,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
81852
81853 oldfs = get_fs();
81854 set_fs(KERNEL_DS);
81855- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
81856+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
81857 set_fs(oldfs);
81858
81859 err = compat_put_timex(utp, &txc);
81860@@ -787,7 +788,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
81861 oldfs = get_fs();
81862 set_fs(KERNEL_DS);
81863 err = sys_clock_getres(which_clock,
81864- (struct timespec __user *) &ts);
81865+ (struct timespec __force_user *) &ts);
81866 set_fs(oldfs);
81867 if (!err && tp && put_compat_timespec(&ts, tp))
81868 return -EFAULT;
81869@@ -799,9 +800,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
81870 long err;
81871 mm_segment_t oldfs;
81872 struct timespec tu;
81873- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
81874+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
81875
81876- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
81877+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
81878 oldfs = get_fs();
81879 set_fs(KERNEL_DS);
81880 err = clock_nanosleep_restart(restart);
81881@@ -833,8 +834,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
81882 oldfs = get_fs();
81883 set_fs(KERNEL_DS);
81884 err = sys_clock_nanosleep(which_clock, flags,
81885- (struct timespec __user *) &in,
81886- (struct timespec __user *) &out);
81887+ (struct timespec __force_user *) &in,
81888+ (struct timespec __force_user *) &out);
81889 set_fs(oldfs);
81890
81891 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
81892diff --git a/kernel/configs.c b/kernel/configs.c
81893index c18b1f1..b9a0132 100644
81894--- a/kernel/configs.c
81895+++ b/kernel/configs.c
81896@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
81897 struct proc_dir_entry *entry;
81898
81899 /* create the current config file */
81900+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
81901+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
81902+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
81903+ &ikconfig_file_ops);
81904+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81905+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
81906+ &ikconfig_file_ops);
81907+#endif
81908+#else
81909 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
81910 &ikconfig_file_ops);
81911+#endif
81912+
81913 if (!entry)
81914 return -ENOMEM;
81915
81916diff --git a/kernel/cred.c b/kernel/cred.c
81917index e0573a4..3874e41 100644
81918--- a/kernel/cred.c
81919+++ b/kernel/cred.c
81920@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
81921 validate_creds(cred);
81922 alter_cred_subscribers(cred, -1);
81923 put_cred(cred);
81924+
81925+#ifdef CONFIG_GRKERNSEC_SETXID
81926+ cred = (struct cred *) tsk->delayed_cred;
81927+ if (cred != NULL) {
81928+ tsk->delayed_cred = NULL;
81929+ validate_creds(cred);
81930+ alter_cred_subscribers(cred, -1);
81931+ put_cred(cred);
81932+ }
81933+#endif
81934 }
81935
81936 /**
81937@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
81938 * Always returns 0 thus allowing this function to be tail-called at the end
81939 * of, say, sys_setgid().
81940 */
81941-int commit_creds(struct cred *new)
81942+static int __commit_creds(struct cred *new)
81943 {
81944 struct task_struct *task = current;
81945 const struct cred *old = task->real_cred;
81946@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
81947
81948 get_cred(new); /* we will require a ref for the subj creds too */
81949
81950+ gr_set_role_label(task, new->uid, new->gid);
81951+
81952 /* dumpability changes */
81953 if (!uid_eq(old->euid, new->euid) ||
81954 !gid_eq(old->egid, new->egid) ||
81955@@ -479,6 +491,102 @@ int commit_creds(struct cred *new)
81956 put_cred(old);
81957 return 0;
81958 }
81959+#ifdef CONFIG_GRKERNSEC_SETXID
81960+extern int set_user(struct cred *new);
81961+
81962+void gr_delayed_cred_worker(void)
81963+{
81964+ const struct cred *new = current->delayed_cred;
81965+ struct cred *ncred;
81966+
81967+ current->delayed_cred = NULL;
81968+
81969+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
81970+ // from doing get_cred on it when queueing this
81971+ put_cred(new);
81972+ return;
81973+ } else if (new == NULL)
81974+ return;
81975+
81976+ ncred = prepare_creds();
81977+ if (!ncred)
81978+ goto die;
81979+ // uids
81980+ ncred->uid = new->uid;
81981+ ncred->euid = new->euid;
81982+ ncred->suid = new->suid;
81983+ ncred->fsuid = new->fsuid;
81984+ // gids
81985+ ncred->gid = new->gid;
81986+ ncred->egid = new->egid;
81987+ ncred->sgid = new->sgid;
81988+ ncred->fsgid = new->fsgid;
81989+ // groups
81990+ if (set_groups(ncred, new->group_info) < 0) {
81991+ abort_creds(ncred);
81992+ goto die;
81993+ }
81994+ // caps
81995+ ncred->securebits = new->securebits;
81996+ ncred->cap_inheritable = new->cap_inheritable;
81997+ ncred->cap_permitted = new->cap_permitted;
81998+ ncred->cap_effective = new->cap_effective;
81999+ ncred->cap_bset = new->cap_bset;
82000+
82001+ if (set_user(ncred)) {
82002+ abort_creds(ncred);
82003+ goto die;
82004+ }
82005+
82006+ // from doing get_cred on it when queueing this
82007+ put_cred(new);
82008+
82009+ __commit_creds(ncred);
82010+ return;
82011+die:
82012+ // from doing get_cred on it when queueing this
82013+ put_cred(new);
82014+ do_group_exit(SIGKILL);
82015+}
82016+#endif
82017+
82018+int commit_creds(struct cred *new)
82019+{
82020+#ifdef CONFIG_GRKERNSEC_SETXID
82021+ int ret;
82022+ int schedule_it = 0;
82023+ struct task_struct *t;
82024+
82025+ /* we won't get called with tasklist_lock held for writing
82026+ and interrupts disabled as the cred struct in that case is
82027+ init_cred
82028+ */
82029+ if (grsec_enable_setxid && !current_is_single_threaded() &&
82030+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
82031+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
82032+ schedule_it = 1;
82033+ }
82034+ ret = __commit_creds(new);
82035+ if (schedule_it) {
82036+ rcu_read_lock();
82037+ read_lock(&tasklist_lock);
82038+ for (t = next_thread(current); t != current;
82039+ t = next_thread(t)) {
82040+ if (t->delayed_cred == NULL) {
82041+ t->delayed_cred = get_cred(new);
82042+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
82043+ set_tsk_need_resched(t);
82044+ }
82045+ }
82046+ read_unlock(&tasklist_lock);
82047+ rcu_read_unlock();
82048+ }
82049+ return ret;
82050+#else
82051+ return __commit_creds(new);
82052+#endif
82053+}
82054+
82055 EXPORT_SYMBOL(commit_creds);
82056
82057 /**
82058diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
82059index 0506d44..2c20034 100644
82060--- a/kernel/debug/debug_core.c
82061+++ b/kernel/debug/debug_core.c
82062@@ -123,7 +123,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
82063 */
82064 static atomic_t masters_in_kgdb;
82065 static atomic_t slaves_in_kgdb;
82066-static atomic_t kgdb_break_tasklet_var;
82067+static atomic_unchecked_t kgdb_break_tasklet_var;
82068 atomic_t kgdb_setting_breakpoint;
82069
82070 struct task_struct *kgdb_usethread;
82071@@ -133,7 +133,7 @@ int kgdb_single_step;
82072 static pid_t kgdb_sstep_pid;
82073
82074 /* to keep track of the CPU which is doing the single stepping*/
82075-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
82076+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
82077
82078 /*
82079 * If you are debugging a problem where roundup (the collection of
82080@@ -541,7 +541,7 @@ return_normal:
82081 * kernel will only try for the value of sstep_tries before
82082 * giving up and continuing on.
82083 */
82084- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
82085+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
82086 (kgdb_info[cpu].task &&
82087 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
82088 atomic_set(&kgdb_active, -1);
82089@@ -635,8 +635,8 @@ cpu_master_loop:
82090 }
82091
82092 kgdb_restore:
82093- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
82094- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
82095+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
82096+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
82097 if (kgdb_info[sstep_cpu].task)
82098 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
82099 else
82100@@ -888,18 +888,18 @@ static void kgdb_unregister_callbacks(void)
82101 static void kgdb_tasklet_bpt(unsigned long ing)
82102 {
82103 kgdb_breakpoint();
82104- atomic_set(&kgdb_break_tasklet_var, 0);
82105+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
82106 }
82107
82108 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
82109
82110 void kgdb_schedule_breakpoint(void)
82111 {
82112- if (atomic_read(&kgdb_break_tasklet_var) ||
82113+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
82114 atomic_read(&kgdb_active) != -1 ||
82115 atomic_read(&kgdb_setting_breakpoint))
82116 return;
82117- atomic_inc(&kgdb_break_tasklet_var);
82118+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
82119 tasklet_schedule(&kgdb_tasklet_breakpoint);
82120 }
82121 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
82122diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
82123index 00eb8f7..d7e3244 100644
82124--- a/kernel/debug/kdb/kdb_main.c
82125+++ b/kernel/debug/kdb/kdb_main.c
82126@@ -1974,7 +1974,7 @@ static int kdb_lsmod(int argc, const char **argv)
82127 continue;
82128
82129 kdb_printf("%-20s%8u 0x%p ", mod->name,
82130- mod->core_size, (void *)mod);
82131+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
82132 #ifdef CONFIG_MODULE_UNLOAD
82133 kdb_printf("%4ld ", module_refcount(mod));
82134 #endif
82135@@ -1984,7 +1984,7 @@ static int kdb_lsmod(int argc, const char **argv)
82136 kdb_printf(" (Loading)");
82137 else
82138 kdb_printf(" (Live)");
82139- kdb_printf(" 0x%p", mod->module_core);
82140+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
82141
82142 #ifdef CONFIG_MODULE_UNLOAD
82143 {
82144diff --git a/kernel/events/core.c b/kernel/events/core.c
82145index 953c143..5646bb1 100644
82146--- a/kernel/events/core.c
82147+++ b/kernel/events/core.c
82148@@ -157,8 +157,15 @@ static struct srcu_struct pmus_srcu;
82149 * 0 - disallow raw tracepoint access for unpriv
82150 * 1 - disallow cpu events for unpriv
82151 * 2 - disallow kernel profiling for unpriv
82152+ * 3 - disallow all unpriv perf event use
82153 */
82154-int sysctl_perf_event_paranoid __read_mostly = 1;
82155+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
82156+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
82157+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
82158+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
82159+#else
82160+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
82161+#endif
82162
82163 /* Minimum for 512 kiB + 1 user control page */
82164 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
82165@@ -271,7 +278,7 @@ void perf_sample_event_took(u64 sample_len_ns)
82166 update_perf_cpu_limits();
82167 }
82168
82169-static atomic64_t perf_event_id;
82170+static atomic64_unchecked_t perf_event_id;
82171
82172 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
82173 enum event_type_t event_type);
82174@@ -2940,7 +2947,7 @@ static void __perf_event_read(void *info)
82175
82176 static inline u64 perf_event_count(struct perf_event *event)
82177 {
82178- return local64_read(&event->count) + atomic64_read(&event->child_count);
82179+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
82180 }
82181
82182 static u64 perf_event_read(struct perf_event *event)
82183@@ -3308,9 +3315,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
82184 mutex_lock(&event->child_mutex);
82185 total += perf_event_read(event);
82186 *enabled += event->total_time_enabled +
82187- atomic64_read(&event->child_total_time_enabled);
82188+ atomic64_read_unchecked(&event->child_total_time_enabled);
82189 *running += event->total_time_running +
82190- atomic64_read(&event->child_total_time_running);
82191+ atomic64_read_unchecked(&event->child_total_time_running);
82192
82193 list_for_each_entry(child, &event->child_list, child_list) {
82194 total += perf_event_read(child);
82195@@ -3725,10 +3732,10 @@ void perf_event_update_userpage(struct perf_event *event)
82196 userpg->offset -= local64_read(&event->hw.prev_count);
82197
82198 userpg->time_enabled = enabled +
82199- atomic64_read(&event->child_total_time_enabled);
82200+ atomic64_read_unchecked(&event->child_total_time_enabled);
82201
82202 userpg->time_running = running +
82203- atomic64_read(&event->child_total_time_running);
82204+ atomic64_read_unchecked(&event->child_total_time_running);
82205
82206 arch_perf_update_userpage(userpg, now);
82207
82208@@ -4279,7 +4286,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
82209
82210 /* Data. */
82211 sp = perf_user_stack_pointer(regs);
82212- rem = __output_copy_user(handle, (void *) sp, dump_size);
82213+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
82214 dyn_size = dump_size - rem;
82215
82216 perf_output_skip(handle, rem);
82217@@ -4370,11 +4377,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
82218 values[n++] = perf_event_count(event);
82219 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
82220 values[n++] = enabled +
82221- atomic64_read(&event->child_total_time_enabled);
82222+ atomic64_read_unchecked(&event->child_total_time_enabled);
82223 }
82224 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
82225 values[n++] = running +
82226- atomic64_read(&event->child_total_time_running);
82227+ atomic64_read_unchecked(&event->child_total_time_running);
82228 }
82229 if (read_format & PERF_FORMAT_ID)
82230 values[n++] = primary_event_id(event);
82231@@ -5112,12 +5119,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
82232 * need to add enough zero bytes after the string to handle
82233 * the 64bit alignment we do later.
82234 */
82235- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
82236+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
82237 if (!buf) {
82238 name = strncpy(tmp, "//enomem", sizeof(tmp));
82239 goto got_name;
82240 }
82241- name = d_path(&file->f_path, buf, PATH_MAX);
82242+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
82243 if (IS_ERR(name)) {
82244 name = strncpy(tmp, "//toolong", sizeof(tmp));
82245 goto got_name;
82246@@ -6639,7 +6646,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
82247 event->parent = parent_event;
82248
82249 event->ns = get_pid_ns(task_active_pid_ns(current));
82250- event->id = atomic64_inc_return(&perf_event_id);
82251+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
82252
82253 event->state = PERF_EVENT_STATE_INACTIVE;
82254
82255@@ -6938,6 +6945,11 @@ SYSCALL_DEFINE5(perf_event_open,
82256 if (flags & ~PERF_FLAG_ALL)
82257 return -EINVAL;
82258
82259+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
82260+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
82261+ return -EACCES;
82262+#endif
82263+
82264 err = perf_copy_attr(attr_uptr, &attr);
82265 if (err)
82266 return err;
82267@@ -7271,10 +7283,10 @@ static void sync_child_event(struct perf_event *child_event,
82268 /*
82269 * Add back the child's count to the parent's count:
82270 */
82271- atomic64_add(child_val, &parent_event->child_count);
82272- atomic64_add(child_event->total_time_enabled,
82273+ atomic64_add_unchecked(child_val, &parent_event->child_count);
82274+ atomic64_add_unchecked(child_event->total_time_enabled,
82275 &parent_event->child_total_time_enabled);
82276- atomic64_add(child_event->total_time_running,
82277+ atomic64_add_unchecked(child_event->total_time_running,
82278 &parent_event->child_total_time_running);
82279
82280 /*
82281diff --git a/kernel/events/internal.h b/kernel/events/internal.h
82282index ca65997..60df03d 100644
82283--- a/kernel/events/internal.h
82284+++ b/kernel/events/internal.h
82285@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
82286 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
82287 }
82288
82289-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
82290-static inline unsigned int \
82291+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
82292+static inline unsigned long \
82293 func_name(struct perf_output_handle *handle, \
82294- const void *buf, unsigned int len) \
82295+ const void user *buf, unsigned long len) \
82296 { \
82297 unsigned long size, written; \
82298 \
82299@@ -116,17 +116,17 @@ static inline int memcpy_common(void *dst, const void *src, size_t n)
82300 return n;
82301 }
82302
82303-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
82304+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
82305
82306 #define MEMCPY_SKIP(dst, src, n) (n)
82307
82308-DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP)
82309+DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP, )
82310
82311 #ifndef arch_perf_out_copy_user
82312 #define arch_perf_out_copy_user __copy_from_user_inatomic
82313 #endif
82314
82315-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
82316+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
82317
82318 /* Callchain handling */
82319 extern struct perf_callchain_entry *
82320diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
82321index ad8e1bd..fed7ba9 100644
82322--- a/kernel/events/uprobes.c
82323+++ b/kernel/events/uprobes.c
82324@@ -1556,7 +1556,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
82325 {
82326 struct page *page;
82327 uprobe_opcode_t opcode;
82328- int result;
82329+ long result;
82330
82331 pagefault_disable();
82332 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
82333diff --git a/kernel/exit.c b/kernel/exit.c
82334index a949819..a5f127d 100644
82335--- a/kernel/exit.c
82336+++ b/kernel/exit.c
82337@@ -172,6 +172,10 @@ void release_task(struct task_struct * p)
82338 struct task_struct *leader;
82339 int zap_leader;
82340 repeat:
82341+#ifdef CONFIG_NET
82342+ gr_del_task_from_ip_table(p);
82343+#endif
82344+
82345 /* don't need to get the RCU readlock here - the process is dead and
82346 * can't be modifying its own credentials. But shut RCU-lockdep up */
82347 rcu_read_lock();
82348@@ -329,7 +333,7 @@ int allow_signal(int sig)
82349 * know it'll be handled, so that they don't get converted to
82350 * SIGKILL or just silently dropped.
82351 */
82352- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
82353+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
82354 recalc_sigpending();
82355 spin_unlock_irq(&current->sighand->siglock);
82356 return 0;
82357@@ -698,6 +702,8 @@ void do_exit(long code)
82358 struct task_struct *tsk = current;
82359 int group_dead;
82360
82361+ set_fs(USER_DS);
82362+
82363 profile_task_exit(tsk);
82364
82365 WARN_ON(blk_needs_flush_plug(tsk));
82366@@ -714,7 +720,6 @@ void do_exit(long code)
82367 * mm_release()->clear_child_tid() from writing to a user-controlled
82368 * kernel address.
82369 */
82370- set_fs(USER_DS);
82371
82372 ptrace_event(PTRACE_EVENT_EXIT, code);
82373
82374@@ -773,6 +778,9 @@ void do_exit(long code)
82375 tsk->exit_code = code;
82376 taskstats_exit(tsk, group_dead);
82377
82378+ gr_acl_handle_psacct(tsk, code);
82379+ gr_acl_handle_exit();
82380+
82381 exit_mm(tsk);
82382
82383 if (group_dead)
82384@@ -894,7 +902,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
82385 * Take down every thread in the group. This is called by fatal signals
82386 * as well as by sys_exit_group (below).
82387 */
82388-void
82389+__noreturn void
82390 do_group_exit(int exit_code)
82391 {
82392 struct signal_struct *sig = current->signal;
82393diff --git a/kernel/fork.c b/kernel/fork.c
82394index 690cfac..3be2d98 100644
82395--- a/kernel/fork.c
82396+++ b/kernel/fork.c
82397@@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
82398 *stackend = STACK_END_MAGIC; /* for overflow detection */
82399
82400 #ifdef CONFIG_CC_STACKPROTECTOR
82401- tsk->stack_canary = get_random_int();
82402+ tsk->stack_canary = pax_get_random_long();
82403 #endif
82404
82405 /*
82406@@ -345,12 +345,80 @@ free_tsk:
82407 }
82408
82409 #ifdef CONFIG_MMU
82410-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82411+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
82412+{
82413+ struct vm_area_struct *tmp;
82414+ unsigned long charge;
82415+ struct file *file;
82416+ int retval;
82417+
82418+ charge = 0;
82419+ if (mpnt->vm_flags & VM_ACCOUNT) {
82420+ unsigned long len = vma_pages(mpnt);
82421+
82422+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
82423+ goto fail_nomem;
82424+ charge = len;
82425+ }
82426+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
82427+ if (!tmp)
82428+ goto fail_nomem;
82429+ *tmp = *mpnt;
82430+ tmp->vm_mm = mm;
82431+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
82432+ retval = vma_dup_policy(mpnt, tmp);
82433+ if (retval)
82434+ goto fail_nomem_policy;
82435+ if (anon_vma_fork(tmp, mpnt))
82436+ goto fail_nomem_anon_vma_fork;
82437+ tmp->vm_flags &= ~VM_LOCKED;
82438+ tmp->vm_next = tmp->vm_prev = NULL;
82439+ tmp->vm_mirror = NULL;
82440+ file = tmp->vm_file;
82441+ if (file) {
82442+ struct inode *inode = file_inode(file);
82443+ struct address_space *mapping = file->f_mapping;
82444+
82445+ get_file(file);
82446+ if (tmp->vm_flags & VM_DENYWRITE)
82447+ atomic_dec(&inode->i_writecount);
82448+ mutex_lock(&mapping->i_mmap_mutex);
82449+ if (tmp->vm_flags & VM_SHARED)
82450+ mapping->i_mmap_writable++;
82451+ flush_dcache_mmap_lock(mapping);
82452+ /* insert tmp into the share list, just after mpnt */
82453+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
82454+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
82455+ else
82456+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
82457+ flush_dcache_mmap_unlock(mapping);
82458+ mutex_unlock(&mapping->i_mmap_mutex);
82459+ }
82460+
82461+ /*
82462+ * Clear hugetlb-related page reserves for children. This only
82463+ * affects MAP_PRIVATE mappings. Faults generated by the child
82464+ * are not guaranteed to succeed, even if read-only
82465+ */
82466+ if (is_vm_hugetlb_page(tmp))
82467+ reset_vma_resv_huge_pages(tmp);
82468+
82469+ return tmp;
82470+
82471+fail_nomem_anon_vma_fork:
82472+ mpol_put(vma_policy(tmp));
82473+fail_nomem_policy:
82474+ kmem_cache_free(vm_area_cachep, tmp);
82475+fail_nomem:
82476+ vm_unacct_memory(charge);
82477+ return NULL;
82478+}
82479+
82480+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82481 {
82482 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
82483 struct rb_node **rb_link, *rb_parent;
82484 int retval;
82485- unsigned long charge;
82486
82487 uprobe_start_dup_mmap();
82488 down_write(&oldmm->mmap_sem);
82489@@ -379,55 +447,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82490
82491 prev = NULL;
82492 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
82493- struct file *file;
82494-
82495 if (mpnt->vm_flags & VM_DONTCOPY) {
82496 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
82497 -vma_pages(mpnt));
82498 continue;
82499 }
82500- charge = 0;
82501- if (mpnt->vm_flags & VM_ACCOUNT) {
82502- unsigned long len = vma_pages(mpnt);
82503-
82504- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
82505- goto fail_nomem;
82506- charge = len;
82507- }
82508- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
82509- if (!tmp)
82510- goto fail_nomem;
82511- *tmp = *mpnt;
82512- INIT_LIST_HEAD(&tmp->anon_vma_chain);
82513- retval = vma_dup_policy(mpnt, tmp);
82514- if (retval)
82515- goto fail_nomem_policy;
82516- tmp->vm_mm = mm;
82517- if (anon_vma_fork(tmp, mpnt))
82518- goto fail_nomem_anon_vma_fork;
82519- tmp->vm_flags &= ~VM_LOCKED;
82520- tmp->vm_next = tmp->vm_prev = NULL;
82521- file = tmp->vm_file;
82522- if (file) {
82523- struct inode *inode = file_inode(file);
82524- struct address_space *mapping = file->f_mapping;
82525-
82526- get_file(file);
82527- if (tmp->vm_flags & VM_DENYWRITE)
82528- atomic_dec(&inode->i_writecount);
82529- mutex_lock(&mapping->i_mmap_mutex);
82530- if (tmp->vm_flags & VM_SHARED)
82531- mapping->i_mmap_writable++;
82532- flush_dcache_mmap_lock(mapping);
82533- /* insert tmp into the share list, just after mpnt */
82534- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
82535- vma_nonlinear_insert(tmp,
82536- &mapping->i_mmap_nonlinear);
82537- else
82538- vma_interval_tree_insert_after(tmp, mpnt,
82539- &mapping->i_mmap);
82540- flush_dcache_mmap_unlock(mapping);
82541- mutex_unlock(&mapping->i_mmap_mutex);
82542+ tmp = dup_vma(mm, oldmm, mpnt);
82543+ if (!tmp) {
82544+ retval = -ENOMEM;
82545+ goto out;
82546 }
82547
82548 /*
82549@@ -459,6 +487,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
82550 if (retval)
82551 goto out;
82552 }
82553+
82554+#ifdef CONFIG_PAX_SEGMEXEC
82555+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
82556+ struct vm_area_struct *mpnt_m;
82557+
82558+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
82559+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
82560+
82561+ if (!mpnt->vm_mirror)
82562+ continue;
82563+
82564+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
82565+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
82566+ mpnt->vm_mirror = mpnt_m;
82567+ } else {
82568+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
82569+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
82570+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
82571+ mpnt->vm_mirror->vm_mirror = mpnt;
82572+ }
82573+ }
82574+ BUG_ON(mpnt_m);
82575+ }
82576+#endif
82577+
82578 /* a new mm has just been created */
82579 arch_dup_mmap(oldmm, mm);
82580 retval = 0;
82581@@ -468,14 +521,6 @@ out:
82582 up_write(&oldmm->mmap_sem);
82583 uprobe_end_dup_mmap();
82584 return retval;
82585-fail_nomem_anon_vma_fork:
82586- mpol_put(vma_policy(tmp));
82587-fail_nomem_policy:
82588- kmem_cache_free(vm_area_cachep, tmp);
82589-fail_nomem:
82590- retval = -ENOMEM;
82591- vm_unacct_memory(charge);
82592- goto out;
82593 }
82594
82595 static inline int mm_alloc_pgd(struct mm_struct *mm)
82596@@ -689,8 +734,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
82597 return ERR_PTR(err);
82598
82599 mm = get_task_mm(task);
82600- if (mm && mm != current->mm &&
82601- !ptrace_may_access(task, mode)) {
82602+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
82603+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
82604 mmput(mm);
82605 mm = ERR_PTR(-EACCES);
82606 }
82607@@ -912,13 +957,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
82608 spin_unlock(&fs->lock);
82609 return -EAGAIN;
82610 }
82611- fs->users++;
82612+ atomic_inc(&fs->users);
82613 spin_unlock(&fs->lock);
82614 return 0;
82615 }
82616 tsk->fs = copy_fs_struct(fs);
82617 if (!tsk->fs)
82618 return -ENOMEM;
82619+ /* Carry through gr_chroot_dentry and is_chrooted instead
82620+ of recomputing it here. Already copied when the task struct
82621+ is duplicated. This allows pivot_root to not be treated as
82622+ a chroot
82623+ */
82624+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
82625+
82626 return 0;
82627 }
82628
82629@@ -1129,7 +1181,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
82630 * parts of the process environment (as per the clone
82631 * flags). The actual kick-off is left to the caller.
82632 */
82633-static struct task_struct *copy_process(unsigned long clone_flags,
82634+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
82635 unsigned long stack_start,
82636 unsigned long stack_size,
82637 int __user *child_tidptr,
82638@@ -1201,6 +1253,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
82639 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
82640 #endif
82641 retval = -EAGAIN;
82642+
82643+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
82644+
82645 if (atomic_read(&p->real_cred->user->processes) >=
82646 task_rlimit(p, RLIMIT_NPROC)) {
82647 if (p->real_cred->user != INIT_USER &&
82648@@ -1450,6 +1505,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
82649 goto bad_fork_free_pid;
82650 }
82651
82652+ /* synchronizes with gr_set_acls()
82653+ we need to call this past the point of no return for fork()
82654+ */
82655+ gr_copy_label(p);
82656+
82657 if (likely(p->pid)) {
82658 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
82659
82660@@ -1535,6 +1595,8 @@ bad_fork_cleanup_count:
82661 bad_fork_free:
82662 free_task(p);
82663 fork_out:
82664+ gr_log_forkfail(retval);
82665+
82666 return ERR_PTR(retval);
82667 }
82668
82669@@ -1596,6 +1658,7 @@ long do_fork(unsigned long clone_flags,
82670
82671 p = copy_process(clone_flags, stack_start, stack_size,
82672 child_tidptr, NULL, trace);
82673+ add_latent_entropy();
82674 /*
82675 * Do this prior waking up the new thread - the thread pointer
82676 * might get invalid after that point, if the thread exits quickly.
82677@@ -1610,6 +1673,8 @@ long do_fork(unsigned long clone_flags,
82678 if (clone_flags & CLONE_PARENT_SETTID)
82679 put_user(nr, parent_tidptr);
82680
82681+ gr_handle_brute_check();
82682+
82683 if (clone_flags & CLONE_VFORK) {
82684 p->vfork_done = &vfork;
82685 init_completion(&vfork);
82686@@ -1726,7 +1791,7 @@ void __init proc_caches_init(void)
82687 mm_cachep = kmem_cache_create("mm_struct",
82688 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
82689 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
82690- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
82691+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
82692 mmap_init();
82693 nsproxy_cache_init();
82694 }
82695@@ -1766,7 +1831,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
82696 return 0;
82697
82698 /* don't need lock here; in the worst case we'll do useless copy */
82699- if (fs->users == 1)
82700+ if (atomic_read(&fs->users) == 1)
82701 return 0;
82702
82703 *new_fsp = copy_fs_struct(fs);
82704@@ -1873,7 +1938,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
82705 fs = current->fs;
82706 spin_lock(&fs->lock);
82707 current->fs = new_fs;
82708- if (--fs->users)
82709+ gr_set_chroot_entries(current, &current->fs->root);
82710+ if (atomic_dec_return(&fs->users))
82711 new_fs = NULL;
82712 else
82713 new_fs = fs;
82714diff --git a/kernel/futex.c b/kernel/futex.c
82715index 221a58f..1b8cfce 100644
82716--- a/kernel/futex.c
82717+++ b/kernel/futex.c
82718@@ -54,6 +54,7 @@
82719 #include <linux/mount.h>
82720 #include <linux/pagemap.h>
82721 #include <linux/syscalls.h>
82722+#include <linux/ptrace.h>
82723 #include <linux/signal.h>
82724 #include <linux/export.h>
82725 #include <linux/magic.h>
82726@@ -243,6 +244,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
82727 struct page *page, *page_head;
82728 int err, ro = 0;
82729
82730+#ifdef CONFIG_PAX_SEGMEXEC
82731+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
82732+ return -EFAULT;
82733+#endif
82734+
82735 /*
82736 * The futex address must be "naturally" aligned.
82737 */
82738@@ -441,7 +447,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
82739
82740 static int get_futex_value_locked(u32 *dest, u32 __user *from)
82741 {
82742- int ret;
82743+ unsigned long ret;
82744
82745 pagefault_disable();
82746 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
82747@@ -2734,6 +2740,7 @@ static int __init futex_init(void)
82748 {
82749 u32 curval;
82750 int i;
82751+ mm_segment_t oldfs;
82752
82753 /*
82754 * This will fail and we want it. Some arch implementations do
82755@@ -2745,8 +2752,11 @@ static int __init futex_init(void)
82756 * implementation, the non-functional ones will return
82757 * -ENOSYS.
82758 */
82759+ oldfs = get_fs();
82760+ set_fs(USER_DS);
82761 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
82762 futex_cmpxchg_enabled = 1;
82763+ set_fs(oldfs);
82764
82765 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
82766 plist_head_init(&futex_queues[i].chain);
82767diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
82768index f9f44fd..29885e4 100644
82769--- a/kernel/futex_compat.c
82770+++ b/kernel/futex_compat.c
82771@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
82772 return 0;
82773 }
82774
82775-static void __user *futex_uaddr(struct robust_list __user *entry,
82776+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
82777 compat_long_t futex_offset)
82778 {
82779 compat_uptr_t base = ptr_to_compat(entry);
82780diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
82781index 9b22d03..6295b62 100644
82782--- a/kernel/gcov/base.c
82783+++ b/kernel/gcov/base.c
82784@@ -102,11 +102,6 @@ void gcov_enable_events(void)
82785 }
82786
82787 #ifdef CONFIG_MODULES
82788-static inline int within(void *addr, void *start, unsigned long size)
82789-{
82790- return ((addr >= start) && (addr < start + size));
82791-}
82792-
82793 /* Update list and generate events when modules are unloaded. */
82794 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
82795 void *data)
82796@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
82797 prev = NULL;
82798 /* Remove entries located in module from linked list. */
82799 for (info = gcov_info_head; info; info = info->next) {
82800- if (within(info, mod->module_core, mod->core_size)) {
82801+ if (within_module_core_rw((unsigned long)info, mod)) {
82802 if (prev)
82803 prev->next = info->next;
82804 else
82805diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
82806index 383319b..56ebb13 100644
82807--- a/kernel/hrtimer.c
82808+++ b/kernel/hrtimer.c
82809@@ -1438,7 +1438,7 @@ void hrtimer_peek_ahead_timers(void)
82810 local_irq_restore(flags);
82811 }
82812
82813-static void run_hrtimer_softirq(struct softirq_action *h)
82814+static __latent_entropy void run_hrtimer_softirq(void)
82815 {
82816 hrtimer_peek_ahead_timers();
82817 }
82818diff --git a/kernel/irq_work.c b/kernel/irq_work.c
82819index 55fcce6..0e4cf34 100644
82820--- a/kernel/irq_work.c
82821+++ b/kernel/irq_work.c
82822@@ -189,12 +189,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
82823 return NOTIFY_OK;
82824 }
82825
82826-static struct notifier_block cpu_notify;
82827+static struct notifier_block cpu_notify = {
82828+ .notifier_call = irq_work_cpu_notify,
82829+ .priority = 0,
82830+};
82831
82832 static __init int irq_work_init_cpu_notifier(void)
82833 {
82834- cpu_notify.notifier_call = irq_work_cpu_notify;
82835- cpu_notify.priority = 0;
82836 register_cpu_notifier(&cpu_notify);
82837 return 0;
82838 }
82839diff --git a/kernel/jump_label.c b/kernel/jump_label.c
82840index 297a924..7290070 100644
82841--- a/kernel/jump_label.c
82842+++ b/kernel/jump_label.c
82843@@ -14,6 +14,7 @@
82844 #include <linux/err.h>
82845 #include <linux/static_key.h>
82846 #include <linux/jump_label_ratelimit.h>
82847+#include <linux/mm.h>
82848
82849 #ifdef HAVE_JUMP_LABEL
82850
82851@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
82852
82853 size = (((unsigned long)stop - (unsigned long)start)
82854 / sizeof(struct jump_entry));
82855+ pax_open_kernel();
82856 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
82857+ pax_close_kernel();
82858 }
82859
82860 static void jump_label_update(struct static_key *key, int enable);
82861@@ -358,10 +361,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
82862 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
82863 struct jump_entry *iter;
82864
82865+ pax_open_kernel();
82866 for (iter = iter_start; iter < iter_stop; iter++) {
82867 if (within_module_init(iter->code, mod))
82868 iter->code = 0;
82869 }
82870+ pax_close_kernel();
82871 }
82872
82873 static int
82874diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
82875index 3127ad5..159d880 100644
82876--- a/kernel/kallsyms.c
82877+++ b/kernel/kallsyms.c
82878@@ -11,6 +11,9 @@
82879 * Changed the compression method from stem compression to "table lookup"
82880 * compression (see scripts/kallsyms.c for a more complete description)
82881 */
82882+#ifdef CONFIG_GRKERNSEC_HIDESYM
82883+#define __INCLUDED_BY_HIDESYM 1
82884+#endif
82885 #include <linux/kallsyms.h>
82886 #include <linux/module.h>
82887 #include <linux/init.h>
82888@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
82889
82890 static inline int is_kernel_inittext(unsigned long addr)
82891 {
82892+ if (system_state != SYSTEM_BOOTING)
82893+ return 0;
82894+
82895 if (addr >= (unsigned long)_sinittext
82896 && addr <= (unsigned long)_einittext)
82897 return 1;
82898 return 0;
82899 }
82900
82901+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82902+#ifdef CONFIG_MODULES
82903+static inline int is_module_text(unsigned long addr)
82904+{
82905+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
82906+ return 1;
82907+
82908+ addr = ktla_ktva(addr);
82909+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
82910+}
82911+#else
82912+static inline int is_module_text(unsigned long addr)
82913+{
82914+ return 0;
82915+}
82916+#endif
82917+#endif
82918+
82919 static inline int is_kernel_text(unsigned long addr)
82920 {
82921 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
82922@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
82923
82924 static inline int is_kernel(unsigned long addr)
82925 {
82926+
82927+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82928+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
82929+ return 1;
82930+
82931+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
82932+#else
82933 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
82934+#endif
82935+
82936 return 1;
82937 return in_gate_area_no_mm(addr);
82938 }
82939
82940 static int is_ksym_addr(unsigned long addr)
82941 {
82942+
82943+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
82944+ if (is_module_text(addr))
82945+ return 0;
82946+#endif
82947+
82948 if (all_var)
82949 return is_kernel(addr);
82950
82951@@ -480,7 +519,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
82952
82953 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
82954 {
82955- iter->name[0] = '\0';
82956 iter->nameoff = get_symbol_offset(new_pos);
82957 iter->pos = new_pos;
82958 }
82959@@ -528,6 +566,11 @@ static int s_show(struct seq_file *m, void *p)
82960 {
82961 struct kallsym_iter *iter = m->private;
82962
82963+#ifdef CONFIG_GRKERNSEC_HIDESYM
82964+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
82965+ return 0;
82966+#endif
82967+
82968 /* Some debugging symbols have no name. Ignore them. */
82969 if (!iter->name[0])
82970 return 0;
82971@@ -541,6 +584,7 @@ static int s_show(struct seq_file *m, void *p)
82972 */
82973 type = iter->exported ? toupper(iter->type) :
82974 tolower(iter->type);
82975+
82976 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
82977 type, iter->name, iter->module_name);
82978 } else
82979@@ -566,7 +610,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
82980 struct kallsym_iter *iter;
82981 int ret;
82982
82983- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
82984+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
82985 if (!iter)
82986 return -ENOMEM;
82987 reset_iter(iter, 0);
82988diff --git a/kernel/kcmp.c b/kernel/kcmp.c
82989index e30ac0f..3528cac 100644
82990--- a/kernel/kcmp.c
82991+++ b/kernel/kcmp.c
82992@@ -99,6 +99,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
82993 struct task_struct *task1, *task2;
82994 int ret;
82995
82996+#ifdef CONFIG_GRKERNSEC
82997+ return -ENOSYS;
82998+#endif
82999+
83000 rcu_read_lock();
83001
83002 /*
83003diff --git a/kernel/kexec.c b/kernel/kexec.c
83004index 355e13a..06b25d2 100644
83005--- a/kernel/kexec.c
83006+++ b/kernel/kexec.c
83007@@ -1044,7 +1044,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
83008 unsigned long flags)
83009 {
83010 struct compat_kexec_segment in;
83011- struct kexec_segment out, __user *ksegments;
83012+ struct kexec_segment out;
83013+ struct kexec_segment __user *ksegments;
83014 unsigned long i, result;
83015
83016 /* Don't allow clients that don't understand the native
83017diff --git a/kernel/kmod.c b/kernel/kmod.c
83018index b086006..6d2e579 100644
83019--- a/kernel/kmod.c
83020+++ b/kernel/kmod.c
83021@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
83022 kfree(info->argv);
83023 }
83024
83025-static int call_modprobe(char *module_name, int wait)
83026+static int call_modprobe(char *module_name, char *module_param, int wait)
83027 {
83028 struct subprocess_info *info;
83029 static char *envp[] = {
83030@@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
83031 NULL
83032 };
83033
83034- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
83035+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
83036 if (!argv)
83037 goto out;
83038
83039@@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
83040 argv[1] = "-q";
83041 argv[2] = "--";
83042 argv[3] = module_name; /* check free_modprobe_argv() */
83043- argv[4] = NULL;
83044+ argv[4] = module_param;
83045+ argv[5] = NULL;
83046
83047 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
83048 NULL, free_modprobe_argv, NULL);
83049@@ -129,9 +130,8 @@ out:
83050 * If module auto-loading support is disabled then this function
83051 * becomes a no-operation.
83052 */
83053-int __request_module(bool wait, const char *fmt, ...)
83054+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
83055 {
83056- va_list args;
83057 char module_name[MODULE_NAME_LEN];
83058 unsigned int max_modprobes;
83059 int ret;
83060@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
83061 if (!modprobe_path[0])
83062 return 0;
83063
83064- va_start(args, fmt);
83065- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
83066- va_end(args);
83067+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
83068 if (ret >= MODULE_NAME_LEN)
83069 return -ENAMETOOLONG;
83070
83071@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
83072 if (ret)
83073 return ret;
83074
83075+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83076+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
83077+ /* hack to workaround consolekit/udisks stupidity */
83078+ read_lock(&tasklist_lock);
83079+ if (!strcmp(current->comm, "mount") &&
83080+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
83081+ read_unlock(&tasklist_lock);
83082+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
83083+ return -EPERM;
83084+ }
83085+ read_unlock(&tasklist_lock);
83086+ }
83087+#endif
83088+
83089 /* If modprobe needs a service that is in a module, we get a recursive
83090 * loop. Limit the number of running kmod threads to max_threads/2 or
83091 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
83092@@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
83093
83094 trace_module_request(module_name, wait, _RET_IP_);
83095
83096- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
83097+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
83098
83099 atomic_dec(&kmod_concurrent);
83100 return ret;
83101 }
83102+
83103+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
83104+{
83105+ va_list args;
83106+ int ret;
83107+
83108+ va_start(args, fmt);
83109+ ret = ____request_module(wait, module_param, fmt, args);
83110+ va_end(args);
83111+
83112+ return ret;
83113+}
83114+
83115+int __request_module(bool wait, const char *fmt, ...)
83116+{
83117+ va_list args;
83118+ int ret;
83119+
83120+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83121+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
83122+ char module_param[MODULE_NAME_LEN];
83123+
83124+ memset(module_param, 0, sizeof(module_param));
83125+
83126+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
83127+
83128+ va_start(args, fmt);
83129+ ret = ____request_module(wait, module_param, fmt, args);
83130+ va_end(args);
83131+
83132+ return ret;
83133+ }
83134+#endif
83135+
83136+ va_start(args, fmt);
83137+ ret = ____request_module(wait, NULL, fmt, args);
83138+ va_end(args);
83139+
83140+ return ret;
83141+}
83142+
83143 EXPORT_SYMBOL(__request_module);
83144 #endif /* CONFIG_MODULES */
83145
83146@@ -218,6 +271,19 @@ static int ____call_usermodehelper(void *data)
83147 */
83148 set_user_nice(current, 0);
83149
83150+#ifdef CONFIG_GRKERNSEC
83151+ /* this is race-free as far as userland is concerned as we copied
83152+ out the path to be used prior to this point and are now operating
83153+ on that copy
83154+ */
83155+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
83156+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) {
83157+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
83158+ retval = -EPERM;
83159+ goto fail;
83160+ }
83161+#endif
83162+
83163 retval = -ENOMEM;
83164 new = prepare_kernel_cred(current);
83165 if (!new)
83166@@ -260,6 +326,10 @@ static int call_helper(void *data)
83167
83168 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
83169 {
83170+#ifdef CONFIG_GRKERNSEC
83171+ kfree(info->path);
83172+ info->path = info->origpath;
83173+#endif
83174 if (info->cleanup)
83175 (*info->cleanup)(info);
83176 kfree(info);
83177@@ -303,7 +373,7 @@ static int wait_for_helper(void *data)
83178 *
83179 * Thus the __user pointer cast is valid here.
83180 */
83181- sys_wait4(pid, (int __user *)&ret, 0, NULL);
83182+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
83183
83184 /*
83185 * If ret is 0, either ____call_usermodehelper failed and the
83186@@ -542,7 +612,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
83187 goto out;
83188
83189 INIT_WORK(&sub_info->work, __call_usermodehelper);
83190+#ifdef CONFIG_GRKERNSEC
83191+ sub_info->origpath = path;
83192+ sub_info->path = kstrdup(path, gfp_mask);
83193+#else
83194 sub_info->path = path;
83195+#endif
83196 sub_info->argv = argv;
83197 sub_info->envp = envp;
83198
83199@@ -650,7 +725,7 @@ EXPORT_SYMBOL(call_usermodehelper);
83200 static int proc_cap_handler(struct ctl_table *table, int write,
83201 void __user *buffer, size_t *lenp, loff_t *ppos)
83202 {
83203- struct ctl_table t;
83204+ ctl_table_no_const t;
83205 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
83206 kernel_cap_t new_cap;
83207 int err, i;
83208diff --git a/kernel/kprobes.c b/kernel/kprobes.c
83209index a0d367a..11c18b6 100644
83210--- a/kernel/kprobes.c
83211+++ b/kernel/kprobes.c
83212@@ -31,6 +31,9 @@
83213 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
83214 * <prasanna@in.ibm.com> added function-return probes.
83215 */
83216+#ifdef CONFIG_GRKERNSEC_HIDESYM
83217+#define __INCLUDED_BY_HIDESYM 1
83218+#endif
83219 #include <linux/kprobes.h>
83220 #include <linux/hash.h>
83221 #include <linux/init.h>
83222@@ -135,12 +138,12 @@ enum kprobe_slot_state {
83223
83224 static void *alloc_insn_page(void)
83225 {
83226- return module_alloc(PAGE_SIZE);
83227+ return module_alloc_exec(PAGE_SIZE);
83228 }
83229
83230 static void free_insn_page(void *page)
83231 {
83232- module_free(NULL, page);
83233+ module_free_exec(NULL, page);
83234 }
83235
83236 struct kprobe_insn_cache kprobe_insn_slots = {
83237@@ -2066,7 +2069,7 @@ static int __init init_kprobes(void)
83238 {
83239 int i, err = 0;
83240 unsigned long offset = 0, size = 0;
83241- char *modname, namebuf[128];
83242+ char *modname, namebuf[KSYM_NAME_LEN];
83243 const char *symbol_name;
83244 void *addr;
83245 struct kprobe_blackpoint *kb;
83246@@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
83247 kprobe_type = "k";
83248
83249 if (sym)
83250- seq_printf(pi, "%p %s %s+0x%x %s ",
83251+ seq_printf(pi, "%pK %s %s+0x%x %s ",
83252 p->addr, kprobe_type, sym, offset,
83253 (modname ? modname : " "));
83254 else
83255- seq_printf(pi, "%p %s %p ",
83256+ seq_printf(pi, "%pK %s %pK ",
83257 p->addr, kprobe_type, p->addr);
83258
83259 if (!pp)
83260@@ -2192,7 +2195,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
83261 const char *sym = NULL;
83262 unsigned int i = *(loff_t *) v;
83263 unsigned long offset = 0;
83264- char *modname, namebuf[128];
83265+ char *modname, namebuf[KSYM_NAME_LEN];
83266
83267 head = &kprobe_table[i];
83268 preempt_disable();
83269diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
83270index 9659d38..bffd520 100644
83271--- a/kernel/ksysfs.c
83272+++ b/kernel/ksysfs.c
83273@@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
83274 {
83275 if (count+1 > UEVENT_HELPER_PATH_LEN)
83276 return -ENOENT;
83277+ if (!capable(CAP_SYS_ADMIN))
83278+ return -EPERM;
83279 memcpy(uevent_helper, buf, count);
83280 uevent_helper[count] = '\0';
83281 if (count && uevent_helper[count-1] == '\n')
83282@@ -172,7 +174,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
83283 return count;
83284 }
83285
83286-static struct bin_attribute notes_attr = {
83287+static bin_attribute_no_const notes_attr __read_only = {
83288 .attr = {
83289 .name = "notes",
83290 .mode = S_IRUGO,
83291diff --git a/kernel/lockdep.c b/kernel/lockdep.c
83292index e16c45b..6f49c48 100644
83293--- a/kernel/lockdep.c
83294+++ b/kernel/lockdep.c
83295@@ -596,6 +596,10 @@ static int static_obj(void *obj)
83296 end = (unsigned long) &_end,
83297 addr = (unsigned long) obj;
83298
83299+#ifdef CONFIG_PAX_KERNEXEC
83300+ start = ktla_ktva(start);
83301+#endif
83302+
83303 /*
83304 * static variable?
83305 */
83306@@ -736,6 +740,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
83307 if (!static_obj(lock->key)) {
83308 debug_locks_off();
83309 printk("INFO: trying to register non-static key.\n");
83310+ printk("lock:%pS key:%pS.\n", lock, lock->key);
83311 printk("the code is fine but needs lockdep annotation.\n");
83312 printk("turning off the locking correctness validator.\n");
83313 dump_stack();
83314@@ -3080,7 +3085,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
83315 if (!class)
83316 return 0;
83317 }
83318- atomic_inc((atomic_t *)&class->ops);
83319+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
83320 if (very_verbose(class)) {
83321 printk("\nacquire class [%p] %s", class->key, class->name);
83322 if (class->name_version > 1)
83323diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
83324index b2c71c5..7b88d63 100644
83325--- a/kernel/lockdep_proc.c
83326+++ b/kernel/lockdep_proc.c
83327@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
83328 return 0;
83329 }
83330
83331- seq_printf(m, "%p", class->key);
83332+ seq_printf(m, "%pK", class->key);
83333 #ifdef CONFIG_DEBUG_LOCKDEP
83334 seq_printf(m, " OPS:%8ld", class->ops);
83335 #endif
83336@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
83337
83338 list_for_each_entry(entry, &class->locks_after, entry) {
83339 if (entry->distance == 1) {
83340- seq_printf(m, " -> [%p] ", entry->class->key);
83341+ seq_printf(m, " -> [%pK] ", entry->class->key);
83342 print_name(m, entry->class);
83343 seq_puts(m, "\n");
83344 }
83345@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
83346 if (!class->key)
83347 continue;
83348
83349- seq_printf(m, "[%p] ", class->key);
83350+ seq_printf(m, "[%pK] ", class->key);
83351 print_name(m, class);
83352 seq_puts(m, "\n");
83353 }
83354@@ -495,7 +495,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
83355 if (!i)
83356 seq_line(m, '-', 40-namelen, namelen);
83357
83358- snprintf(ip, sizeof(ip), "[<%p>]",
83359+ snprintf(ip, sizeof(ip), "[<%pK>]",
83360 (void *)class->contention_point[i]);
83361 seq_printf(m, "%40s %14lu %29s %pS\n",
83362 name, stats->contention_point[i],
83363@@ -510,7 +510,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
83364 if (!i)
83365 seq_line(m, '-', 40-namelen, namelen);
83366
83367- snprintf(ip, sizeof(ip), "[<%p>]",
83368+ snprintf(ip, sizeof(ip), "[<%pK>]",
83369 (void *)class->contending_point[i]);
83370 seq_printf(m, "%40s %14lu %29s %pS\n",
83371 name, stats->contending_point[i],
83372diff --git a/kernel/module.c b/kernel/module.c
83373index dc58274..3ddfa55 100644
83374--- a/kernel/module.c
83375+++ b/kernel/module.c
83376@@ -61,6 +61,7 @@
83377 #include <linux/pfn.h>
83378 #include <linux/bsearch.h>
83379 #include <linux/fips.h>
83380+#include <linux/grsecurity.h>
83381 #include <uapi/linux/module.h>
83382 #include "module-internal.h"
83383
83384@@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
83385
83386 /* Bounds of module allocation, for speeding __module_address.
83387 * Protected by module_mutex. */
83388-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
83389+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
83390+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
83391
83392 int register_module_notifier(struct notifier_block * nb)
83393 {
83394@@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
83395 return true;
83396
83397 list_for_each_entry_rcu(mod, &modules, list) {
83398- struct symsearch arr[] = {
83399+ struct symsearch modarr[] = {
83400 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
83401 NOT_GPL_ONLY, false },
83402 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
83403@@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
83404 if (mod->state == MODULE_STATE_UNFORMED)
83405 continue;
83406
83407- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
83408+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
83409 return true;
83410 }
83411 return false;
83412@@ -491,7 +493,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
83413 if (!pcpusec->sh_size)
83414 return 0;
83415
83416- if (align > PAGE_SIZE) {
83417+ if (align-1 >= PAGE_SIZE) {
83418 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
83419 mod->name, align, PAGE_SIZE);
83420 align = PAGE_SIZE;
83421@@ -1097,7 +1099,7 @@ struct module_attribute module_uevent =
83422 static ssize_t show_coresize(struct module_attribute *mattr,
83423 struct module_kobject *mk, char *buffer)
83424 {
83425- return sprintf(buffer, "%u\n", mk->mod->core_size);
83426+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
83427 }
83428
83429 static struct module_attribute modinfo_coresize =
83430@@ -1106,7 +1108,7 @@ static struct module_attribute modinfo_coresize =
83431 static ssize_t show_initsize(struct module_attribute *mattr,
83432 struct module_kobject *mk, char *buffer)
83433 {
83434- return sprintf(buffer, "%u\n", mk->mod->init_size);
83435+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
83436 }
83437
83438 static struct module_attribute modinfo_initsize =
83439@@ -1321,7 +1323,7 @@ resolve_symbol_wait(struct module *mod,
83440 */
83441 #ifdef CONFIG_SYSFS
83442
83443-#ifdef CONFIG_KALLSYMS
83444+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
83445 static inline bool sect_empty(const Elf_Shdr *sect)
83446 {
83447 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
83448@@ -1461,7 +1463,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
83449 {
83450 unsigned int notes, loaded, i;
83451 struct module_notes_attrs *notes_attrs;
83452- struct bin_attribute *nattr;
83453+ bin_attribute_no_const *nattr;
83454
83455 /* failed to create section attributes, so can't create notes */
83456 if (!mod->sect_attrs)
83457@@ -1573,7 +1575,7 @@ static void del_usage_links(struct module *mod)
83458 static int module_add_modinfo_attrs(struct module *mod)
83459 {
83460 struct module_attribute *attr;
83461- struct module_attribute *temp_attr;
83462+ module_attribute_no_const *temp_attr;
83463 int error = 0;
83464 int i;
83465
83466@@ -1795,21 +1797,21 @@ static void set_section_ro_nx(void *base,
83467
83468 static void unset_module_core_ro_nx(struct module *mod)
83469 {
83470- set_page_attributes(mod->module_core + mod->core_text_size,
83471- mod->module_core + mod->core_size,
83472+ set_page_attributes(mod->module_core_rw,
83473+ mod->module_core_rw + mod->core_size_rw,
83474 set_memory_x);
83475- set_page_attributes(mod->module_core,
83476- mod->module_core + mod->core_ro_size,
83477+ set_page_attributes(mod->module_core_rx,
83478+ mod->module_core_rx + mod->core_size_rx,
83479 set_memory_rw);
83480 }
83481
83482 static void unset_module_init_ro_nx(struct module *mod)
83483 {
83484- set_page_attributes(mod->module_init + mod->init_text_size,
83485- mod->module_init + mod->init_size,
83486+ set_page_attributes(mod->module_init_rw,
83487+ mod->module_init_rw + mod->init_size_rw,
83488 set_memory_x);
83489- set_page_attributes(mod->module_init,
83490- mod->module_init + mod->init_ro_size,
83491+ set_page_attributes(mod->module_init_rx,
83492+ mod->module_init_rx + mod->init_size_rx,
83493 set_memory_rw);
83494 }
83495
83496@@ -1822,14 +1824,14 @@ void set_all_modules_text_rw(void)
83497 list_for_each_entry_rcu(mod, &modules, list) {
83498 if (mod->state == MODULE_STATE_UNFORMED)
83499 continue;
83500- if ((mod->module_core) && (mod->core_text_size)) {
83501- set_page_attributes(mod->module_core,
83502- mod->module_core + mod->core_text_size,
83503+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
83504+ set_page_attributes(mod->module_core_rx,
83505+ mod->module_core_rx + mod->core_size_rx,
83506 set_memory_rw);
83507 }
83508- if ((mod->module_init) && (mod->init_text_size)) {
83509- set_page_attributes(mod->module_init,
83510- mod->module_init + mod->init_text_size,
83511+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
83512+ set_page_attributes(mod->module_init_rx,
83513+ mod->module_init_rx + mod->init_size_rx,
83514 set_memory_rw);
83515 }
83516 }
83517@@ -1845,14 +1847,14 @@ void set_all_modules_text_ro(void)
83518 list_for_each_entry_rcu(mod, &modules, list) {
83519 if (mod->state == MODULE_STATE_UNFORMED)
83520 continue;
83521- if ((mod->module_core) && (mod->core_text_size)) {
83522- set_page_attributes(mod->module_core,
83523- mod->module_core + mod->core_text_size,
83524+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
83525+ set_page_attributes(mod->module_core_rx,
83526+ mod->module_core_rx + mod->core_size_rx,
83527 set_memory_ro);
83528 }
83529- if ((mod->module_init) && (mod->init_text_size)) {
83530- set_page_attributes(mod->module_init,
83531- mod->module_init + mod->init_text_size,
83532+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
83533+ set_page_attributes(mod->module_init_rx,
83534+ mod->module_init_rx + mod->init_size_rx,
83535 set_memory_ro);
83536 }
83537 }
83538@@ -1903,16 +1905,19 @@ static void free_module(struct module *mod)
83539
83540 /* This may be NULL, but that's OK */
83541 unset_module_init_ro_nx(mod);
83542- module_free(mod, mod->module_init);
83543+ module_free(mod, mod->module_init_rw);
83544+ module_free_exec(mod, mod->module_init_rx);
83545 kfree(mod->args);
83546 percpu_modfree(mod);
83547
83548 /* Free lock-classes: */
83549- lockdep_free_key_range(mod->module_core, mod->core_size);
83550+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
83551+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
83552
83553 /* Finally, free the core (containing the module structure) */
83554 unset_module_core_ro_nx(mod);
83555- module_free(mod, mod->module_core);
83556+ module_free_exec(mod, mod->module_core_rx);
83557+ module_free(mod, mod->module_core_rw);
83558
83559 #ifdef CONFIG_MPU
83560 update_protections(current->mm);
83561@@ -1982,9 +1987,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83562 int ret = 0;
83563 const struct kernel_symbol *ksym;
83564
83565+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83566+ int is_fs_load = 0;
83567+ int register_filesystem_found = 0;
83568+ char *p;
83569+
83570+ p = strstr(mod->args, "grsec_modharden_fs");
83571+ if (p) {
83572+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
83573+ /* copy \0 as well */
83574+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
83575+ is_fs_load = 1;
83576+ }
83577+#endif
83578+
83579 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
83580 const char *name = info->strtab + sym[i].st_name;
83581
83582+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83583+ /* it's a real shame this will never get ripped and copied
83584+ upstream! ;(
83585+ */
83586+ if (is_fs_load && !strcmp(name, "register_filesystem"))
83587+ register_filesystem_found = 1;
83588+#endif
83589+
83590 switch (sym[i].st_shndx) {
83591 case SHN_COMMON:
83592 /* We compiled with -fno-common. These are not
83593@@ -2005,7 +2032,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83594 ksym = resolve_symbol_wait(mod, info, name);
83595 /* Ok if resolved. */
83596 if (ksym && !IS_ERR(ksym)) {
83597+ pax_open_kernel();
83598 sym[i].st_value = ksym->value;
83599+ pax_close_kernel();
83600 break;
83601 }
83602
83603@@ -2024,11 +2053,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
83604 secbase = (unsigned long)mod_percpu(mod);
83605 else
83606 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
83607+ pax_open_kernel();
83608 sym[i].st_value += secbase;
83609+ pax_close_kernel();
83610 break;
83611 }
83612 }
83613
83614+#ifdef CONFIG_GRKERNSEC_MODHARDEN
83615+ if (is_fs_load && !register_filesystem_found) {
83616+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
83617+ ret = -EPERM;
83618+ }
83619+#endif
83620+
83621 return ret;
83622 }
83623
83624@@ -2112,22 +2150,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
83625 || s->sh_entsize != ~0UL
83626 || strstarts(sname, ".init"))
83627 continue;
83628- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
83629+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
83630+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
83631+ else
83632+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
83633 pr_debug("\t%s\n", sname);
83634 }
83635- switch (m) {
83636- case 0: /* executable */
83637- mod->core_size = debug_align(mod->core_size);
83638- mod->core_text_size = mod->core_size;
83639- break;
83640- case 1: /* RO: text and ro-data */
83641- mod->core_size = debug_align(mod->core_size);
83642- mod->core_ro_size = mod->core_size;
83643- break;
83644- case 3: /* whole core */
83645- mod->core_size = debug_align(mod->core_size);
83646- break;
83647- }
83648 }
83649
83650 pr_debug("Init section allocation order:\n");
83651@@ -2141,23 +2169,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
83652 || s->sh_entsize != ~0UL
83653 || !strstarts(sname, ".init"))
83654 continue;
83655- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
83656- | INIT_OFFSET_MASK);
83657+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
83658+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
83659+ else
83660+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
83661+ s->sh_entsize |= INIT_OFFSET_MASK;
83662 pr_debug("\t%s\n", sname);
83663 }
83664- switch (m) {
83665- case 0: /* executable */
83666- mod->init_size = debug_align(mod->init_size);
83667- mod->init_text_size = mod->init_size;
83668- break;
83669- case 1: /* RO: text and ro-data */
83670- mod->init_size = debug_align(mod->init_size);
83671- mod->init_ro_size = mod->init_size;
83672- break;
83673- case 3: /* whole init */
83674- mod->init_size = debug_align(mod->init_size);
83675- break;
83676- }
83677 }
83678 }
83679
83680@@ -2330,7 +2348,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
83681
83682 /* Put symbol section at end of init part of module. */
83683 symsect->sh_flags |= SHF_ALLOC;
83684- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
83685+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
83686 info->index.sym) | INIT_OFFSET_MASK;
83687 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
83688
83689@@ -2347,13 +2365,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
83690 }
83691
83692 /* Append room for core symbols at end of core part. */
83693- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
83694- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
83695- mod->core_size += strtab_size;
83696+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
83697+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
83698+ mod->core_size_rx += strtab_size;
83699
83700 /* Put string table section at end of init part of module. */
83701 strsect->sh_flags |= SHF_ALLOC;
83702- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
83703+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
83704 info->index.str) | INIT_OFFSET_MASK;
83705 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
83706 }
83707@@ -2371,12 +2389,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
83708 /* Make sure we get permanent strtab: don't use info->strtab. */
83709 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
83710
83711+ pax_open_kernel();
83712+
83713 /* Set types up while we still have access to sections. */
83714 for (i = 0; i < mod->num_symtab; i++)
83715 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
83716
83717- mod->core_symtab = dst = mod->module_core + info->symoffs;
83718- mod->core_strtab = s = mod->module_core + info->stroffs;
83719+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
83720+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
83721 src = mod->symtab;
83722 for (ndst = i = 0; i < mod->num_symtab; i++) {
83723 if (i == 0 ||
83724@@ -2388,6 +2408,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
83725 }
83726 }
83727 mod->core_num_syms = ndst;
83728+
83729+ pax_close_kernel();
83730 }
83731 #else
83732 static inline void layout_symtab(struct module *mod, struct load_info *info)
83733@@ -2421,17 +2443,33 @@ void * __weak module_alloc(unsigned long size)
83734 return vmalloc_exec(size);
83735 }
83736
83737-static void *module_alloc_update_bounds(unsigned long size)
83738+static void *module_alloc_update_bounds_rw(unsigned long size)
83739 {
83740 void *ret = module_alloc(size);
83741
83742 if (ret) {
83743 mutex_lock(&module_mutex);
83744 /* Update module bounds. */
83745- if ((unsigned long)ret < module_addr_min)
83746- module_addr_min = (unsigned long)ret;
83747- if ((unsigned long)ret + size > module_addr_max)
83748- module_addr_max = (unsigned long)ret + size;
83749+ if ((unsigned long)ret < module_addr_min_rw)
83750+ module_addr_min_rw = (unsigned long)ret;
83751+ if ((unsigned long)ret + size > module_addr_max_rw)
83752+ module_addr_max_rw = (unsigned long)ret + size;
83753+ mutex_unlock(&module_mutex);
83754+ }
83755+ return ret;
83756+}
83757+
83758+static void *module_alloc_update_bounds_rx(unsigned long size)
83759+{
83760+ void *ret = module_alloc_exec(size);
83761+
83762+ if (ret) {
83763+ mutex_lock(&module_mutex);
83764+ /* Update module bounds. */
83765+ if ((unsigned long)ret < module_addr_min_rx)
83766+ module_addr_min_rx = (unsigned long)ret;
83767+ if ((unsigned long)ret + size > module_addr_max_rx)
83768+ module_addr_max_rx = (unsigned long)ret + size;
83769 mutex_unlock(&module_mutex);
83770 }
83771 return ret;
83772@@ -2706,8 +2744,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
83773 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
83774 {
83775 const char *modmagic = get_modinfo(info, "vermagic");
83776+ const char *license = get_modinfo(info, "license");
83777 int err;
83778
83779+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
83780+ if (!license || !license_is_gpl_compatible(license))
83781+ return -ENOEXEC;
83782+#endif
83783+
83784 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
83785 modmagic = NULL;
83786
83787@@ -2733,7 +2777,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
83788 }
83789
83790 /* Set up license info based on the info section */
83791- set_license(mod, get_modinfo(info, "license"));
83792+ set_license(mod, license);
83793
83794 return 0;
83795 }
83796@@ -2814,7 +2858,7 @@ static int move_module(struct module *mod, struct load_info *info)
83797 void *ptr;
83798
83799 /* Do the allocs. */
83800- ptr = module_alloc_update_bounds(mod->core_size);
83801+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
83802 /*
83803 * The pointer to this block is stored in the module structure
83804 * which is inside the block. Just mark it as not being a
83805@@ -2824,11 +2868,11 @@ static int move_module(struct module *mod, struct load_info *info)
83806 if (!ptr)
83807 return -ENOMEM;
83808
83809- memset(ptr, 0, mod->core_size);
83810- mod->module_core = ptr;
83811+ memset(ptr, 0, mod->core_size_rw);
83812+ mod->module_core_rw = ptr;
83813
83814- if (mod->init_size) {
83815- ptr = module_alloc_update_bounds(mod->init_size);
83816+ if (mod->init_size_rw) {
83817+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
83818 /*
83819 * The pointer to this block is stored in the module structure
83820 * which is inside the block. This block doesn't need to be
83821@@ -2837,13 +2881,45 @@ static int move_module(struct module *mod, struct load_info *info)
83822 */
83823 kmemleak_ignore(ptr);
83824 if (!ptr) {
83825- module_free(mod, mod->module_core);
83826+ module_free(mod, mod->module_core_rw);
83827 return -ENOMEM;
83828 }
83829- memset(ptr, 0, mod->init_size);
83830- mod->module_init = ptr;
83831+ memset(ptr, 0, mod->init_size_rw);
83832+ mod->module_init_rw = ptr;
83833 } else
83834- mod->module_init = NULL;
83835+ mod->module_init_rw = NULL;
83836+
83837+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
83838+ kmemleak_not_leak(ptr);
83839+ if (!ptr) {
83840+ if (mod->module_init_rw)
83841+ module_free(mod, mod->module_init_rw);
83842+ module_free(mod, mod->module_core_rw);
83843+ return -ENOMEM;
83844+ }
83845+
83846+ pax_open_kernel();
83847+ memset(ptr, 0, mod->core_size_rx);
83848+ pax_close_kernel();
83849+ mod->module_core_rx = ptr;
83850+
83851+ if (mod->init_size_rx) {
83852+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
83853+ kmemleak_ignore(ptr);
83854+ if (!ptr && mod->init_size_rx) {
83855+ module_free_exec(mod, mod->module_core_rx);
83856+ if (mod->module_init_rw)
83857+ module_free(mod, mod->module_init_rw);
83858+ module_free(mod, mod->module_core_rw);
83859+ return -ENOMEM;
83860+ }
83861+
83862+ pax_open_kernel();
83863+ memset(ptr, 0, mod->init_size_rx);
83864+ pax_close_kernel();
83865+ mod->module_init_rx = ptr;
83866+ } else
83867+ mod->module_init_rx = NULL;
83868
83869 /* Transfer each section which specifies SHF_ALLOC */
83870 pr_debug("final section addresses:\n");
83871@@ -2854,16 +2930,45 @@ static int move_module(struct module *mod, struct load_info *info)
83872 if (!(shdr->sh_flags & SHF_ALLOC))
83873 continue;
83874
83875- if (shdr->sh_entsize & INIT_OFFSET_MASK)
83876- dest = mod->module_init
83877- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83878- else
83879- dest = mod->module_core + shdr->sh_entsize;
83880+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
83881+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
83882+ dest = mod->module_init_rw
83883+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83884+ else
83885+ dest = mod->module_init_rx
83886+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
83887+ } else {
83888+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
83889+ dest = mod->module_core_rw + shdr->sh_entsize;
83890+ else
83891+ dest = mod->module_core_rx + shdr->sh_entsize;
83892+ }
83893+
83894+ if (shdr->sh_type != SHT_NOBITS) {
83895+
83896+#ifdef CONFIG_PAX_KERNEXEC
83897+#ifdef CONFIG_X86_64
83898+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
83899+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
83900+#endif
83901+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
83902+ pax_open_kernel();
83903+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
83904+ pax_close_kernel();
83905+ } else
83906+#endif
83907
83908- if (shdr->sh_type != SHT_NOBITS)
83909 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
83910+ }
83911 /* Update sh_addr to point to copy in image. */
83912- shdr->sh_addr = (unsigned long)dest;
83913+
83914+#ifdef CONFIG_PAX_KERNEXEC
83915+ if (shdr->sh_flags & SHF_EXECINSTR)
83916+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
83917+ else
83918+#endif
83919+
83920+ shdr->sh_addr = (unsigned long)dest;
83921 pr_debug("\t0x%lx %s\n",
83922 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
83923 }
83924@@ -2920,12 +3025,12 @@ static void flush_module_icache(const struct module *mod)
83925 * Do it before processing of module parameters, so the module
83926 * can provide parameter accessor functions of its own.
83927 */
83928- if (mod->module_init)
83929- flush_icache_range((unsigned long)mod->module_init,
83930- (unsigned long)mod->module_init
83931- + mod->init_size);
83932- flush_icache_range((unsigned long)mod->module_core,
83933- (unsigned long)mod->module_core + mod->core_size);
83934+ if (mod->module_init_rx)
83935+ flush_icache_range((unsigned long)mod->module_init_rx,
83936+ (unsigned long)mod->module_init_rx
83937+ + mod->init_size_rx);
83938+ flush_icache_range((unsigned long)mod->module_core_rx,
83939+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
83940
83941 set_fs(old_fs);
83942 }
83943@@ -2982,8 +3087,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
83944 static void module_deallocate(struct module *mod, struct load_info *info)
83945 {
83946 percpu_modfree(mod);
83947- module_free(mod, mod->module_init);
83948- module_free(mod, mod->module_core);
83949+ module_free_exec(mod, mod->module_init_rx);
83950+ module_free_exec(mod, mod->module_core_rx);
83951+ module_free(mod, mod->module_init_rw);
83952+ module_free(mod, mod->module_core_rw);
83953 }
83954
83955 int __weak module_finalize(const Elf_Ehdr *hdr,
83956@@ -2996,7 +3103,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
83957 static int post_relocation(struct module *mod, const struct load_info *info)
83958 {
83959 /* Sort exception table now relocations are done. */
83960+ pax_open_kernel();
83961 sort_extable(mod->extable, mod->extable + mod->num_exentries);
83962+ pax_close_kernel();
83963
83964 /* Copy relocated percpu area over. */
83965 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
83966@@ -3050,16 +3159,16 @@ static int do_init_module(struct module *mod)
83967 MODULE_STATE_COMING, mod);
83968
83969 /* Set RO and NX regions for core */
83970- set_section_ro_nx(mod->module_core,
83971- mod->core_text_size,
83972- mod->core_ro_size,
83973- mod->core_size);
83974+ set_section_ro_nx(mod->module_core_rx,
83975+ mod->core_size_rx,
83976+ mod->core_size_rx,
83977+ mod->core_size_rx);
83978
83979 /* Set RO and NX regions for init */
83980- set_section_ro_nx(mod->module_init,
83981- mod->init_text_size,
83982- mod->init_ro_size,
83983- mod->init_size);
83984+ set_section_ro_nx(mod->module_init_rx,
83985+ mod->init_size_rx,
83986+ mod->init_size_rx,
83987+ mod->init_size_rx);
83988
83989 do_mod_ctors(mod);
83990 /* Start the module */
83991@@ -3121,11 +3230,12 @@ static int do_init_module(struct module *mod)
83992 mod->strtab = mod->core_strtab;
83993 #endif
83994 unset_module_init_ro_nx(mod);
83995- module_free(mod, mod->module_init);
83996- mod->module_init = NULL;
83997- mod->init_size = 0;
83998- mod->init_ro_size = 0;
83999- mod->init_text_size = 0;
84000+ module_free(mod, mod->module_init_rw);
84001+ module_free_exec(mod, mod->module_init_rx);
84002+ mod->module_init_rw = NULL;
84003+ mod->module_init_rx = NULL;
84004+ mod->init_size_rw = 0;
84005+ mod->init_size_rx = 0;
84006 mutex_unlock(&module_mutex);
84007 wake_up_all(&module_wq);
84008
84009@@ -3269,9 +3379,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
84010 if (err)
84011 goto free_unload;
84012
84013+ /* Now copy in args */
84014+ mod->args = strndup_user(uargs, ~0UL >> 1);
84015+ if (IS_ERR(mod->args)) {
84016+ err = PTR_ERR(mod->args);
84017+ goto free_unload;
84018+ }
84019+
84020 /* Set up MODINFO_ATTR fields */
84021 setup_modinfo(mod, info);
84022
84023+#ifdef CONFIG_GRKERNSEC_MODHARDEN
84024+ {
84025+ char *p, *p2;
84026+
84027+ if (strstr(mod->args, "grsec_modharden_netdev")) {
84028+ 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);
84029+ err = -EPERM;
84030+ goto free_modinfo;
84031+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
84032+ p += sizeof("grsec_modharden_normal") - 1;
84033+ p2 = strstr(p, "_");
84034+ if (p2) {
84035+ *p2 = '\0';
84036+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
84037+ *p2 = '_';
84038+ }
84039+ err = -EPERM;
84040+ goto free_modinfo;
84041+ }
84042+ }
84043+#endif
84044+
84045 /* Fix up syms, so that st_value is a pointer to location. */
84046 err = simplify_symbols(mod, info);
84047 if (err < 0)
84048@@ -3287,13 +3426,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
84049
84050 flush_module_icache(mod);
84051
84052- /* Now copy in args */
84053- mod->args = strndup_user(uargs, ~0UL >> 1);
84054- if (IS_ERR(mod->args)) {
84055- err = PTR_ERR(mod->args);
84056- goto free_arch_cleanup;
84057- }
84058-
84059 dynamic_debug_setup(info->debug, info->num_debug);
84060
84061 /* Finally it's fully formed, ready to start executing. */
84062@@ -3328,11 +3460,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
84063 ddebug_cleanup:
84064 dynamic_debug_remove(info->debug);
84065 synchronize_sched();
84066- kfree(mod->args);
84067- free_arch_cleanup:
84068 module_arch_cleanup(mod);
84069 free_modinfo:
84070 free_modinfo(mod);
84071+ kfree(mod->args);
84072 free_unload:
84073 module_unload_free(mod);
84074 unlink_mod:
84075@@ -3415,10 +3546,16 @@ static const char *get_ksymbol(struct module *mod,
84076 unsigned long nextval;
84077
84078 /* At worse, next value is at end of module */
84079- if (within_module_init(addr, mod))
84080- nextval = (unsigned long)mod->module_init+mod->init_text_size;
84081+ if (within_module_init_rx(addr, mod))
84082+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
84083+ else if (within_module_init_rw(addr, mod))
84084+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
84085+ else if (within_module_core_rx(addr, mod))
84086+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
84087+ else if (within_module_core_rw(addr, mod))
84088+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
84089 else
84090- nextval = (unsigned long)mod->module_core+mod->core_text_size;
84091+ return NULL;
84092
84093 /* Scan for closest preceding symbol, and next symbol. (ELF
84094 starts real symbols at 1). */
84095@@ -3669,7 +3806,7 @@ static int m_show(struct seq_file *m, void *p)
84096 return 0;
84097
84098 seq_printf(m, "%s %u",
84099- mod->name, mod->init_size + mod->core_size);
84100+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
84101 print_unload_info(m, mod);
84102
84103 /* Informative for users. */
84104@@ -3678,7 +3815,7 @@ static int m_show(struct seq_file *m, void *p)
84105 mod->state == MODULE_STATE_COMING ? "Loading":
84106 "Live");
84107 /* Used by oprofile and other similar tools. */
84108- seq_printf(m, " 0x%pK", mod->module_core);
84109+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
84110
84111 /* Taints info */
84112 if (mod->taints)
84113@@ -3714,7 +3851,17 @@ static const struct file_operations proc_modules_operations = {
84114
84115 static int __init proc_modules_init(void)
84116 {
84117+#ifndef CONFIG_GRKERNSEC_HIDESYM
84118+#ifdef CONFIG_GRKERNSEC_PROC_USER
84119+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
84120+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
84121+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
84122+#else
84123 proc_create("modules", 0, NULL, &proc_modules_operations);
84124+#endif
84125+#else
84126+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
84127+#endif
84128 return 0;
84129 }
84130 module_init(proc_modules_init);
84131@@ -3775,14 +3922,14 @@ struct module *__module_address(unsigned long addr)
84132 {
84133 struct module *mod;
84134
84135- if (addr < module_addr_min || addr > module_addr_max)
84136+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
84137+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
84138 return NULL;
84139
84140 list_for_each_entry_rcu(mod, &modules, list) {
84141 if (mod->state == MODULE_STATE_UNFORMED)
84142 continue;
84143- if (within_module_core(addr, mod)
84144- || within_module_init(addr, mod))
84145+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
84146 return mod;
84147 }
84148 return NULL;
84149@@ -3817,11 +3964,20 @@ bool is_module_text_address(unsigned long addr)
84150 */
84151 struct module *__module_text_address(unsigned long addr)
84152 {
84153- struct module *mod = __module_address(addr);
84154+ struct module *mod;
84155+
84156+#ifdef CONFIG_X86_32
84157+ addr = ktla_ktva(addr);
84158+#endif
84159+
84160+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
84161+ return NULL;
84162+
84163+ mod = __module_address(addr);
84164+
84165 if (mod) {
84166 /* Make sure it's within the text section. */
84167- if (!within(addr, mod->module_init, mod->init_text_size)
84168- && !within(addr, mod->module_core, mod->core_text_size))
84169+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
84170 mod = NULL;
84171 }
84172 return mod;
84173diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
84174index 7e3443f..b2a1e6b 100644
84175--- a/kernel/mutex-debug.c
84176+++ b/kernel/mutex-debug.c
84177@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
84178 }
84179
84180 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84181- struct thread_info *ti)
84182+ struct task_struct *task)
84183 {
84184 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
84185
84186 /* Mark the current thread as blocked on the lock: */
84187- ti->task->blocked_on = waiter;
84188+ task->blocked_on = waiter;
84189 }
84190
84191 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84192- struct thread_info *ti)
84193+ struct task_struct *task)
84194 {
84195 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
84196- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
84197- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
84198- ti->task->blocked_on = NULL;
84199+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
84200+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
84201+ task->blocked_on = NULL;
84202
84203 list_del_init(&waiter->list);
84204 waiter->task = NULL;
84205diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
84206index 0799fd3..d06ae3b 100644
84207--- a/kernel/mutex-debug.h
84208+++ b/kernel/mutex-debug.h
84209@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
84210 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
84211 extern void debug_mutex_add_waiter(struct mutex *lock,
84212 struct mutex_waiter *waiter,
84213- struct thread_info *ti);
84214+ struct task_struct *task);
84215 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
84216- struct thread_info *ti);
84217+ struct task_struct *task);
84218 extern void debug_mutex_unlock(struct mutex *lock);
84219 extern void debug_mutex_init(struct mutex *lock, const char *name,
84220 struct lock_class_key *key);
84221diff --git a/kernel/mutex.c b/kernel/mutex.c
84222index d24105b..15648eb 100644
84223--- a/kernel/mutex.c
84224+++ b/kernel/mutex.c
84225@@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
84226 node->locked = 1;
84227 return;
84228 }
84229- ACCESS_ONCE(prev->next) = node;
84230+ ACCESS_ONCE_RW(prev->next) = node;
84231 smp_wmb();
84232 /* Wait until the lock holder passes the lock down */
84233 while (!ACCESS_ONCE(node->locked))
84234@@ -156,7 +156,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
84235 while (!(next = ACCESS_ONCE(node->next)))
84236 arch_mutex_cpu_relax();
84237 }
84238- ACCESS_ONCE(next->locked) = 1;
84239+ ACCESS_ONCE_RW(next->locked) = 1;
84240 smp_wmb();
84241 }
84242
84243@@ -520,7 +520,7 @@ slowpath:
84244 goto skip_wait;
84245
84246 debug_mutex_lock_common(lock, &waiter);
84247- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
84248+ debug_mutex_add_waiter(lock, &waiter, task);
84249
84250 /* add waiting tasks to the end of the waitqueue (FIFO): */
84251 list_add_tail(&waiter.list, &lock->wait_list);
84252@@ -564,7 +564,7 @@ slowpath:
84253 schedule_preempt_disabled();
84254 spin_lock_mutex(&lock->wait_lock, flags);
84255 }
84256- mutex_remove_waiter(lock, &waiter, current_thread_info());
84257+ mutex_remove_waiter(lock, &waiter, task);
84258 /* set it to 0 if there are no waiters left: */
84259 if (likely(list_empty(&lock->wait_list)))
84260 atomic_set(&lock->count, 0);
84261@@ -601,7 +601,7 @@ skip_wait:
84262 return 0;
84263
84264 err:
84265- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
84266+ mutex_remove_waiter(lock, &waiter, task);
84267 spin_unlock_mutex(&lock->wait_lock, flags);
84268 debug_mutex_free_waiter(&waiter);
84269 mutex_release(&lock->dep_map, 1, ip);
84270diff --git a/kernel/notifier.c b/kernel/notifier.c
84271index 2d5cc4c..d9ea600 100644
84272--- a/kernel/notifier.c
84273+++ b/kernel/notifier.c
84274@@ -5,6 +5,7 @@
84275 #include <linux/rcupdate.h>
84276 #include <linux/vmalloc.h>
84277 #include <linux/reboot.h>
84278+#include <linux/mm.h>
84279
84280 /*
84281 * Notifier list for kernel code which wants to be called
84282@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
84283 while ((*nl) != NULL) {
84284 if (n->priority > (*nl)->priority)
84285 break;
84286- nl = &((*nl)->next);
84287+ nl = (struct notifier_block **)&((*nl)->next);
84288 }
84289- n->next = *nl;
84290+ pax_open_kernel();
84291+ *(const void **)&n->next = *nl;
84292 rcu_assign_pointer(*nl, n);
84293+ pax_close_kernel();
84294 return 0;
84295 }
84296
84297@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
84298 return 0;
84299 if (n->priority > (*nl)->priority)
84300 break;
84301- nl = &((*nl)->next);
84302+ nl = (struct notifier_block **)&((*nl)->next);
84303 }
84304- n->next = *nl;
84305+ pax_open_kernel();
84306+ *(const void **)&n->next = *nl;
84307 rcu_assign_pointer(*nl, n);
84308+ pax_close_kernel();
84309 return 0;
84310 }
84311
84312@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
84313 {
84314 while ((*nl) != NULL) {
84315 if ((*nl) == n) {
84316+ pax_open_kernel();
84317 rcu_assign_pointer(*nl, n->next);
84318+ pax_close_kernel();
84319 return 0;
84320 }
84321- nl = &((*nl)->next);
84322+ nl = (struct notifier_block **)&((*nl)->next);
84323 }
84324 return -ENOENT;
84325 }
84326diff --git a/kernel/panic.c b/kernel/panic.c
84327index b6c482c..5578061 100644
84328--- a/kernel/panic.c
84329+++ b/kernel/panic.c
84330@@ -407,7 +407,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
84331 disable_trace_on_warning();
84332
84333 pr_warn("------------[ cut here ]------------\n");
84334- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
84335+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
84336 raw_smp_processor_id(), current->pid, file, line, caller);
84337
84338 if (args)
84339@@ -461,7 +461,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
84340 */
84341 void __stack_chk_fail(void)
84342 {
84343- panic("stack-protector: Kernel stack is corrupted in: %p\n",
84344+ dump_stack();
84345+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
84346 __builtin_return_address(0));
84347 }
84348 EXPORT_SYMBOL(__stack_chk_fail);
84349diff --git a/kernel/pid.c b/kernel/pid.c
84350index 9b9a266..c20ef80 100644
84351--- a/kernel/pid.c
84352+++ b/kernel/pid.c
84353@@ -33,6 +33,7 @@
84354 #include <linux/rculist.h>
84355 #include <linux/bootmem.h>
84356 #include <linux/hash.h>
84357+#include <linux/security.h>
84358 #include <linux/pid_namespace.h>
84359 #include <linux/init_task.h>
84360 #include <linux/syscalls.h>
84361@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
84362
84363 int pid_max = PID_MAX_DEFAULT;
84364
84365-#define RESERVED_PIDS 300
84366+#define RESERVED_PIDS 500
84367
84368 int pid_max_min = RESERVED_PIDS + 1;
84369 int pid_max_max = PID_MAX_LIMIT;
84370@@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
84371 */
84372 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
84373 {
84374+ struct task_struct *task;
84375+
84376 rcu_lockdep_assert(rcu_read_lock_held(),
84377 "find_task_by_pid_ns() needs rcu_read_lock()"
84378 " protection");
84379- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
84380+
84381+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
84382+
84383+ if (gr_pid_is_chrooted(task))
84384+ return NULL;
84385+
84386+ return task;
84387 }
84388
84389 struct task_struct *find_task_by_vpid(pid_t vnr)
84390@@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
84391 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
84392 }
84393
84394+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
84395+{
84396+ rcu_lockdep_assert(rcu_read_lock_held(),
84397+ "find_task_by_pid_ns() needs rcu_read_lock()"
84398+ " protection");
84399+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
84400+}
84401+
84402 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
84403 {
84404 struct pid *pid;
84405diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
84406index 4208655..19f36a5 100644
84407--- a/kernel/pid_namespace.c
84408+++ b/kernel/pid_namespace.c
84409@@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
84410 void __user *buffer, size_t *lenp, loff_t *ppos)
84411 {
84412 struct pid_namespace *pid_ns = task_active_pid_ns(current);
84413- struct ctl_table tmp = *table;
84414+ ctl_table_no_const tmp = *table;
84415
84416 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
84417 return -EPERM;
84418diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
84419index c7f31aa..2b44977 100644
84420--- a/kernel/posix-cpu-timers.c
84421+++ b/kernel/posix-cpu-timers.c
84422@@ -1521,14 +1521,14 @@ struct k_clock clock_posix_cpu = {
84423
84424 static __init int init_posix_cpu_timers(void)
84425 {
84426- struct k_clock process = {
84427+ static struct k_clock process = {
84428 .clock_getres = process_cpu_clock_getres,
84429 .clock_get = process_cpu_clock_get,
84430 .timer_create = process_cpu_timer_create,
84431 .nsleep = process_cpu_nsleep,
84432 .nsleep_restart = process_cpu_nsleep_restart,
84433 };
84434- struct k_clock thread = {
84435+ static struct k_clock thread = {
84436 .clock_getres = thread_cpu_clock_getres,
84437 .clock_get = thread_cpu_clock_get,
84438 .timer_create = thread_cpu_timer_create,
84439diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
84440index 424c2d4..679242f 100644
84441--- a/kernel/posix-timers.c
84442+++ b/kernel/posix-timers.c
84443@@ -43,6 +43,7 @@
84444 #include <linux/hash.h>
84445 #include <linux/posix-clock.h>
84446 #include <linux/posix-timers.h>
84447+#include <linux/grsecurity.h>
84448 #include <linux/syscalls.h>
84449 #include <linux/wait.h>
84450 #include <linux/workqueue.h>
84451@@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
84452 * which we beg off on and pass to do_sys_settimeofday().
84453 */
84454
84455-static struct k_clock posix_clocks[MAX_CLOCKS];
84456+static struct k_clock *posix_clocks[MAX_CLOCKS];
84457
84458 /*
84459 * These ones are defined below.
84460@@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
84461 */
84462 static __init int init_posix_timers(void)
84463 {
84464- struct k_clock clock_realtime = {
84465+ static struct k_clock clock_realtime = {
84466 .clock_getres = hrtimer_get_res,
84467 .clock_get = posix_clock_realtime_get,
84468 .clock_set = posix_clock_realtime_set,
84469@@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
84470 .timer_get = common_timer_get,
84471 .timer_del = common_timer_del,
84472 };
84473- struct k_clock clock_monotonic = {
84474+ static struct k_clock clock_monotonic = {
84475 .clock_getres = hrtimer_get_res,
84476 .clock_get = posix_ktime_get_ts,
84477 .nsleep = common_nsleep,
84478@@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
84479 .timer_get = common_timer_get,
84480 .timer_del = common_timer_del,
84481 };
84482- struct k_clock clock_monotonic_raw = {
84483+ static struct k_clock clock_monotonic_raw = {
84484 .clock_getres = hrtimer_get_res,
84485 .clock_get = posix_get_monotonic_raw,
84486 };
84487- struct k_clock clock_realtime_coarse = {
84488+ static struct k_clock clock_realtime_coarse = {
84489 .clock_getres = posix_get_coarse_res,
84490 .clock_get = posix_get_realtime_coarse,
84491 };
84492- struct k_clock clock_monotonic_coarse = {
84493+ static struct k_clock clock_monotonic_coarse = {
84494 .clock_getres = posix_get_coarse_res,
84495 .clock_get = posix_get_monotonic_coarse,
84496 };
84497- struct k_clock clock_tai = {
84498+ static struct k_clock clock_tai = {
84499 .clock_getres = hrtimer_get_res,
84500 .clock_get = posix_get_tai,
84501 .nsleep = common_nsleep,
84502@@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
84503 .timer_get = common_timer_get,
84504 .timer_del = common_timer_del,
84505 };
84506- struct k_clock clock_boottime = {
84507+ static struct k_clock clock_boottime = {
84508 .clock_getres = hrtimer_get_res,
84509 .clock_get = posix_get_boottime,
84510 .nsleep = common_nsleep,
84511@@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
84512 return;
84513 }
84514
84515- posix_clocks[clock_id] = *new_clock;
84516+ posix_clocks[clock_id] = new_clock;
84517 }
84518 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
84519
84520@@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
84521 return (id & CLOCKFD_MASK) == CLOCKFD ?
84522 &clock_posix_dynamic : &clock_posix_cpu;
84523
84524- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
84525+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
84526 return NULL;
84527- return &posix_clocks[id];
84528+ return posix_clocks[id];
84529 }
84530
84531 static int common_timer_create(struct k_itimer *new_timer)
84532@@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
84533 struct k_clock *kc = clockid_to_kclock(which_clock);
84534 struct k_itimer *new_timer;
84535 int error, new_timer_id;
84536- sigevent_t event;
84537+ sigevent_t event = { };
84538 int it_id_set = IT_ID_NOT_SET;
84539
84540 if (!kc)
84541@@ -1011,6 +1012,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
84542 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
84543 return -EFAULT;
84544
84545+ /* only the CLOCK_REALTIME clock can be set, all other clocks
84546+ have their clock_set fptr set to a nosettime dummy function
84547+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
84548+ call common_clock_set, which calls do_sys_settimeofday, which
84549+ we hook
84550+ */
84551+
84552 return kc->clock_set(which_clock, &new_tp);
84553 }
84554
84555diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
84556index d444c4e..bc3de51 100644
84557--- a/kernel/power/Kconfig
84558+++ b/kernel/power/Kconfig
84559@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
84560 config HIBERNATION
84561 bool "Hibernation (aka 'suspend to disk')"
84562 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
84563+ depends on !GRKERNSEC_KMEM
84564+ depends on !PAX_MEMORY_SANITIZE
84565 select HIBERNATE_CALLBACKS
84566 select LZO_COMPRESS
84567 select LZO_DECOMPRESS
84568diff --git a/kernel/power/process.c b/kernel/power/process.c
84569index 06ec886..9dba35e 100644
84570--- a/kernel/power/process.c
84571+++ b/kernel/power/process.c
84572@@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
84573 unsigned int elapsed_msecs;
84574 bool wakeup = false;
84575 int sleep_usecs = USEC_PER_MSEC;
84576+ bool timedout = false;
84577
84578 do_gettimeofday(&start);
84579
84580@@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
84581
84582 while (true) {
84583 todo = 0;
84584+ if (time_after(jiffies, end_time))
84585+ timedout = true;
84586 read_lock(&tasklist_lock);
84587 do_each_thread(g, p) {
84588 if (p == current || !freeze_task(p))
84589 continue;
84590
84591- if (!freezer_should_skip(p))
84592+ if (!freezer_should_skip(p)) {
84593 todo++;
84594+ if (timedout) {
84595+ printk(KERN_ERR "Task refusing to freeze:\n");
84596+ sched_show_task(p);
84597+ }
84598+ }
84599 } while_each_thread(g, p);
84600 read_unlock(&tasklist_lock);
84601
84602@@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
84603 todo += wq_busy;
84604 }
84605
84606- if (!todo || time_after(jiffies, end_time))
84607+ if (!todo || timedout)
84608 break;
84609
84610 if (pm_wakeup_pending()) {
84611diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
84612index b4e8500..b457a6c 100644
84613--- a/kernel/printk/printk.c
84614+++ b/kernel/printk/printk.c
84615@@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
84616 if (from_file && type != SYSLOG_ACTION_OPEN)
84617 return 0;
84618
84619+#ifdef CONFIG_GRKERNSEC_DMESG
84620+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
84621+ return -EPERM;
84622+#endif
84623+
84624 if (syslog_action_restricted(type)) {
84625 if (capable(CAP_SYSLOG))
84626 return 0;
84627diff --git a/kernel/profile.c b/kernel/profile.c
84628index 6631e1e..310c266 100644
84629--- a/kernel/profile.c
84630+++ b/kernel/profile.c
84631@@ -37,7 +37,7 @@ struct profile_hit {
84632 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
84633 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
84634
84635-static atomic_t *prof_buffer;
84636+static atomic_unchecked_t *prof_buffer;
84637 static unsigned long prof_len, prof_shift;
84638
84639 int prof_on __read_mostly;
84640@@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
84641 hits[i].pc = 0;
84642 continue;
84643 }
84644- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
84645+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
84646 hits[i].hits = hits[i].pc = 0;
84647 }
84648 }
84649@@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
84650 * Add the current hit(s) and flush the write-queue out
84651 * to the global buffer:
84652 */
84653- atomic_add(nr_hits, &prof_buffer[pc]);
84654+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
84655 for (i = 0; i < NR_PROFILE_HIT; ++i) {
84656- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
84657+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
84658 hits[i].pc = hits[i].hits = 0;
84659 }
84660 out:
84661@@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
84662 {
84663 unsigned long pc;
84664 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
84665- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
84666+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
84667 }
84668 #endif /* !CONFIG_SMP */
84669
84670@@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
84671 return -EFAULT;
84672 buf++; p++; count--; read++;
84673 }
84674- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
84675+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
84676 if (copy_to_user(buf, (void *)pnt, count))
84677 return -EFAULT;
84678 read += count;
84679@@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
84680 }
84681 #endif
84682 profile_discard_flip_buffers();
84683- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
84684+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
84685 return count;
84686 }
84687
84688diff --git a/kernel/ptrace.c b/kernel/ptrace.c
84689index 1f4bcb3..99cf7ab 100644
84690--- a/kernel/ptrace.c
84691+++ b/kernel/ptrace.c
84692@@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request,
84693 if (seize)
84694 flags |= PT_SEIZED;
84695 rcu_read_lock();
84696- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
84697+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
84698 flags |= PT_PTRACE_CAP;
84699 rcu_read_unlock();
84700 task->ptrace = flags;
84701@@ -538,7 +538,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
84702 break;
84703 return -EIO;
84704 }
84705- if (copy_to_user(dst, buf, retval))
84706+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
84707 return -EFAULT;
84708 copied += retval;
84709 src += retval;
84710@@ -806,7 +806,7 @@ int ptrace_request(struct task_struct *child, long request,
84711 bool seized = child->ptrace & PT_SEIZED;
84712 int ret = -EIO;
84713 siginfo_t siginfo, *si;
84714- void __user *datavp = (void __user *) data;
84715+ void __user *datavp = (__force void __user *) data;
84716 unsigned long __user *datalp = datavp;
84717 unsigned long flags;
84718
84719@@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
84720 goto out;
84721 }
84722
84723+ if (gr_handle_ptrace(child, request)) {
84724+ ret = -EPERM;
84725+ goto out_put_task_struct;
84726+ }
84727+
84728 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
84729 ret = ptrace_attach(child, request, addr, data);
84730 /*
84731 * Some architectures need to do book-keeping after
84732 * a ptrace attach.
84733 */
84734- if (!ret)
84735+ if (!ret) {
84736 arch_ptrace_attach(child);
84737+ gr_audit_ptrace(child);
84738+ }
84739 goto out_put_task_struct;
84740 }
84741
84742@@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
84743 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
84744 if (copied != sizeof(tmp))
84745 return -EIO;
84746- return put_user(tmp, (unsigned long __user *)data);
84747+ return put_user(tmp, (__force unsigned long __user *)data);
84748 }
84749
84750 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
84751@@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
84752 }
84753
84754 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
84755- compat_long_t addr, compat_long_t data)
84756+ compat_ulong_t addr, compat_ulong_t data)
84757 {
84758 struct task_struct *child;
84759 long ret;
84760@@ -1197,14 +1204,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
84761 goto out;
84762 }
84763
84764+ if (gr_handle_ptrace(child, request)) {
84765+ ret = -EPERM;
84766+ goto out_put_task_struct;
84767+ }
84768+
84769 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
84770 ret = ptrace_attach(child, request, addr, data);
84771 /*
84772 * Some architectures need to do book-keeping after
84773 * a ptrace attach.
84774 */
84775- if (!ret)
84776+ if (!ret) {
84777 arch_ptrace_attach(child);
84778+ gr_audit_ptrace(child);
84779+ }
84780 goto out_put_task_struct;
84781 }
84782
84783diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
84784index b02a339..ce2d20c 100644
84785--- a/kernel/rcupdate.c
84786+++ b/kernel/rcupdate.c
84787@@ -312,10 +312,10 @@ int rcu_jiffies_till_stall_check(void)
84788 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
84789 */
84790 if (till_stall_check < 3) {
84791- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
84792+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
84793 till_stall_check = 3;
84794 } else if (till_stall_check > 300) {
84795- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
84796+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
84797 till_stall_check = 300;
84798 }
84799 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
84800diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
84801index 9ed6075..c9e8a63 100644
84802--- a/kernel/rcutiny.c
84803+++ b/kernel/rcutiny.c
84804@@ -45,7 +45,7 @@
84805 /* Forward declarations for rcutiny_plugin.h. */
84806 struct rcu_ctrlblk;
84807 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
84808-static void rcu_process_callbacks(struct softirq_action *unused);
84809+static void rcu_process_callbacks(void);
84810 static void __call_rcu(struct rcu_head *head,
84811 void (*func)(struct rcu_head *rcu),
84812 struct rcu_ctrlblk *rcp);
84813@@ -309,7 +309,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
84814 false));
84815 }
84816
84817-static void rcu_process_callbacks(struct softirq_action *unused)
84818+static __latent_entropy void rcu_process_callbacks(void)
84819 {
84820 __rcu_process_callbacks(&rcu_sched_ctrlblk);
84821 __rcu_process_callbacks(&rcu_bh_ctrlblk);
84822diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
84823index be63101..05cf721 100644
84824--- a/kernel/rcutorture.c
84825+++ b/kernel/rcutorture.c
84826@@ -170,12 +170,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
84827 { 0 };
84828 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
84829 { 0 };
84830-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
84831-static atomic_t n_rcu_torture_alloc;
84832-static atomic_t n_rcu_torture_alloc_fail;
84833-static atomic_t n_rcu_torture_free;
84834-static atomic_t n_rcu_torture_mberror;
84835-static atomic_t n_rcu_torture_error;
84836+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
84837+static atomic_unchecked_t n_rcu_torture_alloc;
84838+static atomic_unchecked_t n_rcu_torture_alloc_fail;
84839+static atomic_unchecked_t n_rcu_torture_free;
84840+static atomic_unchecked_t n_rcu_torture_mberror;
84841+static atomic_unchecked_t n_rcu_torture_error;
84842 static long n_rcu_torture_barrier_error;
84843 static long n_rcu_torture_boost_ktrerror;
84844 static long n_rcu_torture_boost_rterror;
84845@@ -293,11 +293,11 @@ rcu_torture_alloc(void)
84846
84847 spin_lock_bh(&rcu_torture_lock);
84848 if (list_empty(&rcu_torture_freelist)) {
84849- atomic_inc(&n_rcu_torture_alloc_fail);
84850+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
84851 spin_unlock_bh(&rcu_torture_lock);
84852 return NULL;
84853 }
84854- atomic_inc(&n_rcu_torture_alloc);
84855+ atomic_inc_unchecked(&n_rcu_torture_alloc);
84856 p = rcu_torture_freelist.next;
84857 list_del_init(p);
84858 spin_unlock_bh(&rcu_torture_lock);
84859@@ -310,7 +310,7 @@ rcu_torture_alloc(void)
84860 static void
84861 rcu_torture_free(struct rcu_torture *p)
84862 {
84863- atomic_inc(&n_rcu_torture_free);
84864+ atomic_inc_unchecked(&n_rcu_torture_free);
84865 spin_lock_bh(&rcu_torture_lock);
84866 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
84867 spin_unlock_bh(&rcu_torture_lock);
84868@@ -431,7 +431,7 @@ rcu_torture_cb(struct rcu_head *p)
84869 i = rp->rtort_pipe_count;
84870 if (i > RCU_TORTURE_PIPE_LEN)
84871 i = RCU_TORTURE_PIPE_LEN;
84872- atomic_inc(&rcu_torture_wcount[i]);
84873+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
84874 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
84875 rp->rtort_mbtest = 0;
84876 rcu_torture_free(rp);
84877@@ -821,7 +821,7 @@ rcu_torture_writer(void *arg)
84878 i = old_rp->rtort_pipe_count;
84879 if (i > RCU_TORTURE_PIPE_LEN)
84880 i = RCU_TORTURE_PIPE_LEN;
84881- atomic_inc(&rcu_torture_wcount[i]);
84882+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
84883 old_rp->rtort_pipe_count++;
84884 if (gp_normal == gp_exp)
84885 exp = !!(rcu_random(&rand) & 0x80);
84886@@ -839,7 +839,7 @@ rcu_torture_writer(void *arg)
84887 i = rp->rtort_pipe_count;
84888 if (i > RCU_TORTURE_PIPE_LEN)
84889 i = RCU_TORTURE_PIPE_LEN;
84890- atomic_inc(&rcu_torture_wcount[i]);
84891+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
84892 if (++rp->rtort_pipe_count >=
84893 RCU_TORTURE_PIPE_LEN) {
84894 rp->rtort_mbtest = 0;
84895@@ -938,7 +938,7 @@ static void rcu_torture_timer(unsigned long unused)
84896 return;
84897 }
84898 if (p->rtort_mbtest == 0)
84899- atomic_inc(&n_rcu_torture_mberror);
84900+ atomic_inc_unchecked(&n_rcu_torture_mberror);
84901 spin_lock(&rand_lock);
84902 cur_ops->read_delay(&rand);
84903 n_rcu_torture_timers++;
84904@@ -1008,7 +1008,7 @@ rcu_torture_reader(void *arg)
84905 continue;
84906 }
84907 if (p->rtort_mbtest == 0)
84908- atomic_inc(&n_rcu_torture_mberror);
84909+ atomic_inc_unchecked(&n_rcu_torture_mberror);
84910 cur_ops->read_delay(&rand);
84911 preempt_disable();
84912 pipe_count = p->rtort_pipe_count;
84913@@ -1071,11 +1071,11 @@ rcu_torture_printk(char *page)
84914 rcu_torture_current,
84915 rcu_torture_current_version,
84916 list_empty(&rcu_torture_freelist),
84917- atomic_read(&n_rcu_torture_alloc),
84918- atomic_read(&n_rcu_torture_alloc_fail),
84919- atomic_read(&n_rcu_torture_free));
84920+ atomic_read_unchecked(&n_rcu_torture_alloc),
84921+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
84922+ atomic_read_unchecked(&n_rcu_torture_free));
84923 cnt += sprintf(&page[cnt], "rtmbe: %d rtbke: %ld rtbre: %ld ",
84924- atomic_read(&n_rcu_torture_mberror),
84925+ atomic_read_unchecked(&n_rcu_torture_mberror),
84926 n_rcu_torture_boost_ktrerror,
84927 n_rcu_torture_boost_rterror);
84928 cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ",
84929@@ -1094,14 +1094,14 @@ rcu_torture_printk(char *page)
84930 n_barrier_attempts,
84931 n_rcu_torture_barrier_error);
84932 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
84933- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
84934+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
84935 n_rcu_torture_barrier_error != 0 ||
84936 n_rcu_torture_boost_ktrerror != 0 ||
84937 n_rcu_torture_boost_rterror != 0 ||
84938 n_rcu_torture_boost_failure != 0 ||
84939 i > 1) {
84940 cnt += sprintf(&page[cnt], "!!! ");
84941- atomic_inc(&n_rcu_torture_error);
84942+ atomic_inc_unchecked(&n_rcu_torture_error);
84943 WARN_ON_ONCE(1);
84944 }
84945 cnt += sprintf(&page[cnt], "Reader Pipe: ");
84946@@ -1115,7 +1115,7 @@ rcu_torture_printk(char *page)
84947 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
84948 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
84949 cnt += sprintf(&page[cnt], " %d",
84950- atomic_read(&rcu_torture_wcount[i]));
84951+ atomic_read_unchecked(&rcu_torture_wcount[i]));
84952 }
84953 cnt += sprintf(&page[cnt], "\n");
84954 if (cur_ops->stats)
84955@@ -1830,7 +1830,7 @@ rcu_torture_cleanup(void)
84956
84957 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
84958
84959- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
84960+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
84961 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
84962 else if (n_online_successes != n_online_attempts ||
84963 n_offline_successes != n_offline_attempts)
84964@@ -1952,18 +1952,18 @@ rcu_torture_init(void)
84965
84966 rcu_torture_current = NULL;
84967 rcu_torture_current_version = 0;
84968- atomic_set(&n_rcu_torture_alloc, 0);
84969- atomic_set(&n_rcu_torture_alloc_fail, 0);
84970- atomic_set(&n_rcu_torture_free, 0);
84971- atomic_set(&n_rcu_torture_mberror, 0);
84972- atomic_set(&n_rcu_torture_error, 0);
84973+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
84974+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
84975+ atomic_set_unchecked(&n_rcu_torture_free, 0);
84976+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
84977+ atomic_set_unchecked(&n_rcu_torture_error, 0);
84978 n_rcu_torture_barrier_error = 0;
84979 n_rcu_torture_boost_ktrerror = 0;
84980 n_rcu_torture_boost_rterror = 0;
84981 n_rcu_torture_boost_failure = 0;
84982 n_rcu_torture_boosts = 0;
84983 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
84984- atomic_set(&rcu_torture_wcount[i], 0);
84985+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
84986 for_each_possible_cpu(cpu) {
84987 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
84988 per_cpu(rcu_torture_count, cpu)[i] = 0;
84989diff --git a/kernel/rcutree.c b/kernel/rcutree.c
84990index 32618b3..c1fb822 100644
84991--- a/kernel/rcutree.c
84992+++ b/kernel/rcutree.c
84993@@ -382,9 +382,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
84994 rcu_prepare_for_idle(smp_processor_id());
84995 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
84996 smp_mb__before_atomic_inc(); /* See above. */
84997- atomic_inc(&rdtp->dynticks);
84998+ atomic_inc_unchecked(&rdtp->dynticks);
84999 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
85000- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
85001+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
85002
85003 /*
85004 * It is illegal to enter an extended quiescent state while
85005@@ -501,10 +501,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
85006 int user)
85007 {
85008 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
85009- atomic_inc(&rdtp->dynticks);
85010+ atomic_inc_unchecked(&rdtp->dynticks);
85011 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
85012 smp_mb__after_atomic_inc(); /* See above. */
85013- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
85014+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
85015 rcu_cleanup_after_idle(smp_processor_id());
85016 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
85017 if (!user && !is_idle_task(current)) {
85018@@ -623,14 +623,14 @@ void rcu_nmi_enter(void)
85019 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
85020
85021 if (rdtp->dynticks_nmi_nesting == 0 &&
85022- (atomic_read(&rdtp->dynticks) & 0x1))
85023+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
85024 return;
85025 rdtp->dynticks_nmi_nesting++;
85026 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
85027- atomic_inc(&rdtp->dynticks);
85028+ atomic_inc_unchecked(&rdtp->dynticks);
85029 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
85030 smp_mb__after_atomic_inc(); /* See above. */
85031- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
85032+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
85033 }
85034
85035 /**
85036@@ -649,9 +649,9 @@ void rcu_nmi_exit(void)
85037 return;
85038 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
85039 smp_mb__before_atomic_inc(); /* See above. */
85040- atomic_inc(&rdtp->dynticks);
85041+ atomic_inc_unchecked(&rdtp->dynticks);
85042 smp_mb__after_atomic_inc(); /* Force delay to next write. */
85043- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
85044+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
85045 }
85046
85047 /**
85048@@ -665,7 +665,7 @@ int rcu_is_cpu_idle(void)
85049 int ret;
85050
85051 preempt_disable();
85052- ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
85053+ ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
85054 preempt_enable();
85055 return ret;
85056 }
85057@@ -734,7 +734,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
85058 static int dyntick_save_progress_counter(struct rcu_data *rdp,
85059 bool *isidle, unsigned long *maxj)
85060 {
85061- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
85062+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
85063 rcu_sysidle_check_cpu(rdp, isidle, maxj);
85064 return (rdp->dynticks_snap & 0x1) == 0;
85065 }
85066@@ -751,7 +751,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
85067 unsigned int curr;
85068 unsigned int snap;
85069
85070- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
85071+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
85072 snap = (unsigned int)rdp->dynticks_snap;
85073
85074 /*
85075@@ -1341,9 +1341,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
85076 rdp = this_cpu_ptr(rsp->rda);
85077 rcu_preempt_check_blocked_tasks(rnp);
85078 rnp->qsmask = rnp->qsmaskinit;
85079- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
85080+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
85081 WARN_ON_ONCE(rnp->completed != rsp->completed);
85082- ACCESS_ONCE(rnp->completed) = rsp->completed;
85083+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
85084 if (rnp == rdp->mynode)
85085 __note_gp_changes(rsp, rnp, rdp);
85086 rcu_preempt_boost_start_gp(rnp);
85087@@ -1434,7 +1434,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
85088 */
85089 rcu_for_each_node_breadth_first(rsp, rnp) {
85090 raw_spin_lock_irq(&rnp->lock);
85091- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
85092+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
85093 rdp = this_cpu_ptr(rsp->rda);
85094 if (rnp == rdp->mynode)
85095 __note_gp_changes(rsp, rnp, rdp);
85096@@ -1766,7 +1766,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
85097 rsp->qlen += rdp->qlen;
85098 rdp->n_cbs_orphaned += rdp->qlen;
85099 rdp->qlen_lazy = 0;
85100- ACCESS_ONCE(rdp->qlen) = 0;
85101+ ACCESS_ONCE_RW(rdp->qlen) = 0;
85102 }
85103
85104 /*
85105@@ -2012,7 +2012,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
85106 }
85107 smp_mb(); /* List handling before counting for rcu_barrier(). */
85108 rdp->qlen_lazy -= count_lazy;
85109- ACCESS_ONCE(rdp->qlen) -= count;
85110+ ACCESS_ONCE_RW(rdp->qlen) -= count;
85111 rdp->n_cbs_invoked += count;
85112
85113 /* Reinstate batch limit if we have worked down the excess. */
85114@@ -2209,7 +2209,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
85115 /*
85116 * Do RCU core processing for the current CPU.
85117 */
85118-static void rcu_process_callbacks(struct softirq_action *unused)
85119+static __latent_entropy void rcu_process_callbacks(void)
85120 {
85121 struct rcu_state *rsp;
85122
85123@@ -2316,7 +2316,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
85124 WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
85125 if (debug_rcu_head_queue(head)) {
85126 /* Probable double call_rcu(), so leak the callback. */
85127- ACCESS_ONCE(head->func) = rcu_leak_callback;
85128+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
85129 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
85130 return;
85131 }
85132@@ -2344,7 +2344,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
85133 local_irq_restore(flags);
85134 return;
85135 }
85136- ACCESS_ONCE(rdp->qlen)++;
85137+ ACCESS_ONCE_RW(rdp->qlen)++;
85138 if (lazy)
85139 rdp->qlen_lazy++;
85140 else
85141@@ -2553,11 +2553,11 @@ void synchronize_sched_expedited(void)
85142 * counter wrap on a 32-bit system. Quite a few more CPUs would of
85143 * course be required on a 64-bit system.
85144 */
85145- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
85146+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
85147 (ulong)atomic_long_read(&rsp->expedited_done) +
85148 ULONG_MAX / 8)) {
85149 synchronize_sched();
85150- atomic_long_inc(&rsp->expedited_wrap);
85151+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
85152 return;
85153 }
85154
85155@@ -2565,7 +2565,7 @@ void synchronize_sched_expedited(void)
85156 * Take a ticket. Note that atomic_inc_return() implies a
85157 * full memory barrier.
85158 */
85159- snap = atomic_long_inc_return(&rsp->expedited_start);
85160+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
85161 firstsnap = snap;
85162 get_online_cpus();
85163 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
85164@@ -2578,14 +2578,14 @@ void synchronize_sched_expedited(void)
85165 synchronize_sched_expedited_cpu_stop,
85166 NULL) == -EAGAIN) {
85167 put_online_cpus();
85168- atomic_long_inc(&rsp->expedited_tryfail);
85169+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
85170
85171 /* Check to see if someone else did our work for us. */
85172 s = atomic_long_read(&rsp->expedited_done);
85173 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
85174 /* ensure test happens before caller kfree */
85175 smp_mb__before_atomic_inc(); /* ^^^ */
85176- atomic_long_inc(&rsp->expedited_workdone1);
85177+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
85178 return;
85179 }
85180
85181@@ -2594,7 +2594,7 @@ void synchronize_sched_expedited(void)
85182 udelay(trycount * num_online_cpus());
85183 } else {
85184 wait_rcu_gp(call_rcu_sched);
85185- atomic_long_inc(&rsp->expedited_normal);
85186+ atomic_long_inc_unchecked(&rsp->expedited_normal);
85187 return;
85188 }
85189
85190@@ -2603,7 +2603,7 @@ void synchronize_sched_expedited(void)
85191 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
85192 /* ensure test happens before caller kfree */
85193 smp_mb__before_atomic_inc(); /* ^^^ */
85194- atomic_long_inc(&rsp->expedited_workdone2);
85195+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
85196 return;
85197 }
85198
85199@@ -2615,10 +2615,10 @@ void synchronize_sched_expedited(void)
85200 * period works for us.
85201 */
85202 get_online_cpus();
85203- snap = atomic_long_read(&rsp->expedited_start);
85204+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
85205 smp_mb(); /* ensure read is before try_stop_cpus(). */
85206 }
85207- atomic_long_inc(&rsp->expedited_stoppedcpus);
85208+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
85209
85210 /*
85211 * Everyone up to our most recent fetch is covered by our grace
85212@@ -2627,16 +2627,16 @@ void synchronize_sched_expedited(void)
85213 * than we did already did their update.
85214 */
85215 do {
85216- atomic_long_inc(&rsp->expedited_done_tries);
85217+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
85218 s = atomic_long_read(&rsp->expedited_done);
85219 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
85220 /* ensure test happens before caller kfree */
85221 smp_mb__before_atomic_inc(); /* ^^^ */
85222- atomic_long_inc(&rsp->expedited_done_lost);
85223+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
85224 break;
85225 }
85226 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
85227- atomic_long_inc(&rsp->expedited_done_exit);
85228+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
85229
85230 put_online_cpus();
85231 }
85232@@ -2829,7 +2829,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
85233 * ACCESS_ONCE() to prevent the compiler from speculating
85234 * the increment to precede the early-exit check.
85235 */
85236- ACCESS_ONCE(rsp->n_barrier_done)++;
85237+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
85238 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
85239 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
85240 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
85241@@ -2879,7 +2879,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
85242
85243 /* Increment ->n_barrier_done to prevent duplicate work. */
85244 smp_mb(); /* Keep increment after above mechanism. */
85245- ACCESS_ONCE(rsp->n_barrier_done)++;
85246+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
85247 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
85248 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
85249 smp_mb(); /* Keep increment before caller's subsequent code. */
85250@@ -2924,10 +2924,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
85251 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
85252 init_callback_list(rdp);
85253 rdp->qlen_lazy = 0;
85254- ACCESS_ONCE(rdp->qlen) = 0;
85255+ ACCESS_ONCE_RW(rdp->qlen) = 0;
85256 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
85257 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
85258- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
85259+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
85260 rdp->cpu = cpu;
85261 rdp->rsp = rsp;
85262 rcu_boot_init_nocb_percpu_data(rdp);
85263@@ -2961,8 +2961,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
85264 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
85265 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
85266 rcu_sysidle_init_percpu_data(rdp->dynticks);
85267- atomic_set(&rdp->dynticks->dynticks,
85268- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
85269+ atomic_set_unchecked(&rdp->dynticks->dynticks,
85270+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
85271 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
85272
85273 /* Add CPU to rcu_node bitmasks. */
85274diff --git a/kernel/rcutree.h b/kernel/rcutree.h
85275index 5f97eab..db8f687 100644
85276--- a/kernel/rcutree.h
85277+++ b/kernel/rcutree.h
85278@@ -87,11 +87,11 @@ struct rcu_dynticks {
85279 long long dynticks_nesting; /* Track irq/process nesting level. */
85280 /* Process level is worth LLONG_MAX/2. */
85281 int dynticks_nmi_nesting; /* Track NMI nesting level. */
85282- atomic_t dynticks; /* Even value for idle, else odd. */
85283+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
85284 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
85285 long long dynticks_idle_nesting;
85286 /* irq/process nesting level from idle. */
85287- atomic_t dynticks_idle; /* Even value for idle, else odd. */
85288+ atomic_unchecked_t dynticks_idle; /* Even value for idle, else odd. */
85289 /* "Idle" excludes userspace execution. */
85290 unsigned long dynticks_idle_jiffies;
85291 /* End of last non-NMI non-idle period. */
85292@@ -427,17 +427,17 @@ struct rcu_state {
85293 /* _rcu_barrier(). */
85294 /* End of fields guarded by barrier_mutex. */
85295
85296- atomic_long_t expedited_start; /* Starting ticket. */
85297- atomic_long_t expedited_done; /* Done ticket. */
85298- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
85299- atomic_long_t expedited_tryfail; /* # acquisition failures. */
85300- atomic_long_t expedited_workdone1; /* # done by others #1. */
85301- atomic_long_t expedited_workdone2; /* # done by others #2. */
85302- atomic_long_t expedited_normal; /* # fallbacks to normal. */
85303- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
85304- atomic_long_t expedited_done_tries; /* # tries to update _done. */
85305- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
85306- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
85307+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
85308+ atomic_long_t expedited_done; /* Done ticket. */
85309+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
85310+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
85311+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
85312+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
85313+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
85314+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
85315+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
85316+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
85317+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
85318
85319 unsigned long jiffies_force_qs; /* Time at which to invoke */
85320 /* force_quiescent_state(). */
85321diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
85322index 130c97b..bcbe7f7 100644
85323--- a/kernel/rcutree_plugin.h
85324+++ b/kernel/rcutree_plugin.h
85325@@ -744,7 +744,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
85326 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
85327 {
85328 return !rcu_preempted_readers_exp(rnp) &&
85329- ACCESS_ONCE(rnp->expmask) == 0;
85330+ ACCESS_ONCE_RW(rnp->expmask) == 0;
85331 }
85332
85333 /*
85334@@ -900,7 +900,7 @@ void synchronize_rcu_expedited(void)
85335
85336 /* Clean up and exit. */
85337 smp_mb(); /* ensure expedited GP seen before counter increment. */
85338- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
85339+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
85340 unlock_mb_ret:
85341 mutex_unlock(&sync_rcu_preempt_exp_mutex);
85342 mb_ret:
85343@@ -1474,7 +1474,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
85344 free_cpumask_var(cm);
85345 }
85346
85347-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
85348+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
85349 .store = &rcu_cpu_kthread_task,
85350 .thread_should_run = rcu_cpu_kthread_should_run,
85351 .thread_fn = rcu_cpu_kthread,
85352@@ -1939,7 +1939,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
85353 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
85354 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
85355 cpu, ticks_value, ticks_title,
85356- atomic_read(&rdtp->dynticks) & 0xfff,
85357+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
85358 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
85359 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
85360 fast_no_hz);
85361@@ -2102,7 +2102,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
85362
85363 /* Enqueue the callback on the nocb list and update counts. */
85364 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
85365- ACCESS_ONCE(*old_rhpp) = rhp;
85366+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
85367 atomic_long_add(rhcount, &rdp->nocb_q_count);
85368 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
85369
85370@@ -2242,12 +2242,12 @@ static int rcu_nocb_kthread(void *arg)
85371 * Extract queued callbacks, update counts, and wait
85372 * for a grace period to elapse.
85373 */
85374- ACCESS_ONCE(rdp->nocb_head) = NULL;
85375+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
85376 tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
85377 c = atomic_long_xchg(&rdp->nocb_q_count, 0);
85378 cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
85379- ACCESS_ONCE(rdp->nocb_p_count) += c;
85380- ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
85381+ ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
85382+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
85383 rcu_nocb_wait_gp(rdp);
85384
85385 /* Each pass through the following loop invokes a callback. */
85386@@ -2269,8 +2269,8 @@ static int rcu_nocb_kthread(void *arg)
85387 list = next;
85388 }
85389 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
85390- ACCESS_ONCE(rdp->nocb_p_count) -= c;
85391- ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
85392+ ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
85393+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
85394 rdp->n_nocbs_invoked += c;
85395 }
85396 return 0;
85397@@ -2297,7 +2297,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
85398 t = kthread_run(rcu_nocb_kthread, rdp,
85399 "rcuo%c/%d", rsp->abbr, cpu);
85400 BUG_ON(IS_ERR(t));
85401- ACCESS_ONCE(rdp->nocb_kthread) = t;
85402+ ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
85403 }
85404 }
85405
85406@@ -2423,11 +2423,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
85407
85408 /* Record start of fully idle period. */
85409 j = jiffies;
85410- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
85411+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
85412 smp_mb__before_atomic_inc();
85413- atomic_inc(&rdtp->dynticks_idle);
85414+ atomic_inc_unchecked(&rdtp->dynticks_idle);
85415 smp_mb__after_atomic_inc();
85416- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
85417+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
85418 }
85419
85420 /*
85421@@ -2492,9 +2492,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
85422
85423 /* Record end of idle period. */
85424 smp_mb__before_atomic_inc();
85425- atomic_inc(&rdtp->dynticks_idle);
85426+ atomic_inc_unchecked(&rdtp->dynticks_idle);
85427 smp_mb__after_atomic_inc();
85428- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
85429+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
85430
85431 /*
85432 * If we are the timekeeping CPU, we are permitted to be non-idle
85433@@ -2535,7 +2535,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
85434 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
85435
85436 /* Pick up current idle and NMI-nesting counter and check. */
85437- cur = atomic_read(&rdtp->dynticks_idle);
85438+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
85439 if (cur & 0x1) {
85440 *isidle = false; /* We are not idle! */
85441 return;
85442@@ -2598,7 +2598,7 @@ static void rcu_sysidle(unsigned long j)
85443 case RCU_SYSIDLE_NOT:
85444
85445 /* First time all are idle, so note a short idle period. */
85446- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
85447+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
85448 break;
85449
85450 case RCU_SYSIDLE_SHORT:
85451@@ -2635,7 +2635,7 @@ static void rcu_sysidle(unsigned long j)
85452 static void rcu_sysidle_cancel(void)
85453 {
85454 smp_mb();
85455- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
85456+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
85457 }
85458
85459 /*
85460@@ -2683,7 +2683,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
85461 smp_mb(); /* grace period precedes setting inuse. */
85462
85463 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
85464- ACCESS_ONCE(rshp->inuse) = 0;
85465+ ACCESS_ONCE_RW(rshp->inuse) = 0;
85466 }
85467
85468 /*
85469diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
85470index cf6c174..a8f4b50 100644
85471--- a/kernel/rcutree_trace.c
85472+++ b/kernel/rcutree_trace.c
85473@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
85474 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
85475 rdp->passed_quiesce, rdp->qs_pending);
85476 seq_printf(m, " dt=%d/%llx/%d df=%lu",
85477- atomic_read(&rdp->dynticks->dynticks),
85478+ atomic_read_unchecked(&rdp->dynticks->dynticks),
85479 rdp->dynticks->dynticks_nesting,
85480 rdp->dynticks->dynticks_nmi_nesting,
85481 rdp->dynticks_fqs);
85482@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
85483 struct rcu_state *rsp = (struct rcu_state *)m->private;
85484
85485 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",
85486- atomic_long_read(&rsp->expedited_start),
85487+ atomic_long_read_unchecked(&rsp->expedited_start),
85488 atomic_long_read(&rsp->expedited_done),
85489- atomic_long_read(&rsp->expedited_wrap),
85490- atomic_long_read(&rsp->expedited_tryfail),
85491- atomic_long_read(&rsp->expedited_workdone1),
85492- atomic_long_read(&rsp->expedited_workdone2),
85493- atomic_long_read(&rsp->expedited_normal),
85494- atomic_long_read(&rsp->expedited_stoppedcpus),
85495- atomic_long_read(&rsp->expedited_done_tries),
85496- atomic_long_read(&rsp->expedited_done_lost),
85497- atomic_long_read(&rsp->expedited_done_exit));
85498+ atomic_long_read_unchecked(&rsp->expedited_wrap),
85499+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
85500+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
85501+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
85502+ atomic_long_read_unchecked(&rsp->expedited_normal),
85503+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
85504+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
85505+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
85506+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
85507 return 0;
85508 }
85509
85510diff --git a/kernel/resource.c b/kernel/resource.c
85511index 3f285dc..5755f62 100644
85512--- a/kernel/resource.c
85513+++ b/kernel/resource.c
85514@@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
85515
85516 static int __init ioresources_init(void)
85517 {
85518+#ifdef CONFIG_GRKERNSEC_PROC_ADD
85519+#ifdef CONFIG_GRKERNSEC_PROC_USER
85520+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
85521+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
85522+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
85523+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
85524+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
85525+#endif
85526+#else
85527 proc_create("ioports", 0, NULL, &proc_ioports_operations);
85528 proc_create("iomem", 0, NULL, &proc_iomem_operations);
85529+#endif
85530 return 0;
85531 }
85532 __initcall(ioresources_init);
85533diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
85534index 1d96dd0..994ff19 100644
85535--- a/kernel/rtmutex-tester.c
85536+++ b/kernel/rtmutex-tester.c
85537@@ -22,7 +22,7 @@
85538 #define MAX_RT_TEST_MUTEXES 8
85539
85540 static spinlock_t rttest_lock;
85541-static atomic_t rttest_event;
85542+static atomic_unchecked_t rttest_event;
85543
85544 struct test_thread_data {
85545 int opcode;
85546@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85547
85548 case RTTEST_LOCKCONT:
85549 td->mutexes[td->opdata] = 1;
85550- td->event = atomic_add_return(1, &rttest_event);
85551+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85552 return 0;
85553
85554 case RTTEST_RESET:
85555@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85556 return 0;
85557
85558 case RTTEST_RESETEVENT:
85559- atomic_set(&rttest_event, 0);
85560+ atomic_set_unchecked(&rttest_event, 0);
85561 return 0;
85562
85563 default:
85564@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85565 return ret;
85566
85567 td->mutexes[id] = 1;
85568- td->event = atomic_add_return(1, &rttest_event);
85569+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85570 rt_mutex_lock(&mutexes[id]);
85571- td->event = atomic_add_return(1, &rttest_event);
85572+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85573 td->mutexes[id] = 4;
85574 return 0;
85575
85576@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85577 return ret;
85578
85579 td->mutexes[id] = 1;
85580- td->event = atomic_add_return(1, &rttest_event);
85581+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85582 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
85583- td->event = atomic_add_return(1, &rttest_event);
85584+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85585 td->mutexes[id] = ret ? 0 : 4;
85586 return ret ? -EINTR : 0;
85587
85588@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
85589 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
85590 return ret;
85591
85592- td->event = atomic_add_return(1, &rttest_event);
85593+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85594 rt_mutex_unlock(&mutexes[id]);
85595- td->event = atomic_add_return(1, &rttest_event);
85596+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85597 td->mutexes[id] = 0;
85598 return 0;
85599
85600@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85601 break;
85602
85603 td->mutexes[dat] = 2;
85604- td->event = atomic_add_return(1, &rttest_event);
85605+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85606 break;
85607
85608 default:
85609@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85610 return;
85611
85612 td->mutexes[dat] = 3;
85613- td->event = atomic_add_return(1, &rttest_event);
85614+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85615 break;
85616
85617 case RTTEST_LOCKNOWAIT:
85618@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
85619 return;
85620
85621 td->mutexes[dat] = 1;
85622- td->event = atomic_add_return(1, &rttest_event);
85623+ td->event = atomic_add_return_unchecked(1, &rttest_event);
85624 return;
85625
85626 default:
85627diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
85628index 4a07353..66b5291 100644
85629--- a/kernel/sched/auto_group.c
85630+++ b/kernel/sched/auto_group.c
85631@@ -11,7 +11,7 @@
85632
85633 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
85634 static struct autogroup autogroup_default;
85635-static atomic_t autogroup_seq_nr;
85636+static atomic_unchecked_t autogroup_seq_nr;
85637
85638 void __init autogroup_init(struct task_struct *init_task)
85639 {
85640@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
85641
85642 kref_init(&ag->kref);
85643 init_rwsem(&ag->lock);
85644- ag->id = atomic_inc_return(&autogroup_seq_nr);
85645+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
85646 ag->tg = tg;
85647 #ifdef CONFIG_RT_GROUP_SCHED
85648 /*
85649diff --git a/kernel/sched/core.c b/kernel/sched/core.c
85650index 5ac63c9..d912786 100644
85651--- a/kernel/sched/core.c
85652+++ b/kernel/sched/core.c
85653@@ -2868,7 +2868,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
85654 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
85655 * or number of jiffies left till timeout) if completed.
85656 */
85657-long __sched
85658+long __sched __intentional_overflow(-1)
85659 wait_for_completion_interruptible_timeout(struct completion *x,
85660 unsigned long timeout)
85661 {
85662@@ -2885,7 +2885,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
85663 *
85664 * Return: -ERESTARTSYS if interrupted, 0 if completed.
85665 */
85666-int __sched wait_for_completion_killable(struct completion *x)
85667+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
85668 {
85669 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
85670 if (t == -ERESTARTSYS)
85671@@ -2906,7 +2906,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
85672 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
85673 * or number of jiffies left till timeout) if completed.
85674 */
85675-long __sched
85676+long __sched __intentional_overflow(-1)
85677 wait_for_completion_killable_timeout(struct completion *x,
85678 unsigned long timeout)
85679 {
85680@@ -3132,6 +3132,8 @@ int can_nice(const struct task_struct *p, const int nice)
85681 /* convert nice value [19,-20] to rlimit style value [1,40] */
85682 int nice_rlim = 20 - nice;
85683
85684+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
85685+
85686 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
85687 capable(CAP_SYS_NICE));
85688 }
85689@@ -3165,7 +3167,8 @@ SYSCALL_DEFINE1(nice, int, increment)
85690 if (nice > 19)
85691 nice = 19;
85692
85693- if (increment < 0 && !can_nice(current, nice))
85694+ if (increment < 0 && (!can_nice(current, nice) ||
85695+ gr_handle_chroot_nice()))
85696 return -EPERM;
85697
85698 retval = security_task_setnice(current, nice);
85699@@ -3327,6 +3330,7 @@ recheck:
85700 unsigned long rlim_rtprio =
85701 task_rlimit(p, RLIMIT_RTPRIO);
85702
85703+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
85704 /* can't set/change the rt policy */
85705 if (policy != p->policy && !rlim_rtprio)
85706 return -EPERM;
85707@@ -4456,7 +4460,7 @@ static void migrate_tasks(unsigned int dead_cpu)
85708
85709 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
85710
85711-static struct ctl_table sd_ctl_dir[] = {
85712+static ctl_table_no_const sd_ctl_dir[] __read_only = {
85713 {
85714 .procname = "sched_domain",
85715 .mode = 0555,
85716@@ -4473,17 +4477,17 @@ static struct ctl_table sd_ctl_root[] = {
85717 {}
85718 };
85719
85720-static struct ctl_table *sd_alloc_ctl_entry(int n)
85721+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
85722 {
85723- struct ctl_table *entry =
85724+ ctl_table_no_const *entry =
85725 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
85726
85727 return entry;
85728 }
85729
85730-static void sd_free_ctl_entry(struct ctl_table **tablep)
85731+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
85732 {
85733- struct ctl_table *entry;
85734+ ctl_table_no_const *entry;
85735
85736 /*
85737 * In the intermediate directories, both the child directory and
85738@@ -4491,22 +4495,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
85739 * will always be set. In the lowest directory the names are
85740 * static strings and all have proc handlers.
85741 */
85742- for (entry = *tablep; entry->mode; entry++) {
85743- if (entry->child)
85744- sd_free_ctl_entry(&entry->child);
85745+ for (entry = tablep; entry->mode; entry++) {
85746+ if (entry->child) {
85747+ sd_free_ctl_entry(entry->child);
85748+ pax_open_kernel();
85749+ entry->child = NULL;
85750+ pax_close_kernel();
85751+ }
85752 if (entry->proc_handler == NULL)
85753 kfree(entry->procname);
85754 }
85755
85756- kfree(*tablep);
85757- *tablep = NULL;
85758+ kfree(tablep);
85759 }
85760
85761 static int min_load_idx = 0;
85762 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
85763
85764 static void
85765-set_table_entry(struct ctl_table *entry,
85766+set_table_entry(ctl_table_no_const *entry,
85767 const char *procname, void *data, int maxlen,
85768 umode_t mode, proc_handler *proc_handler,
85769 bool load_idx)
85770@@ -4526,7 +4533,7 @@ set_table_entry(struct ctl_table *entry,
85771 static struct ctl_table *
85772 sd_alloc_ctl_domain_table(struct sched_domain *sd)
85773 {
85774- struct ctl_table *table = sd_alloc_ctl_entry(13);
85775+ ctl_table_no_const *table = sd_alloc_ctl_entry(13);
85776
85777 if (table == NULL)
85778 return NULL;
85779@@ -4561,9 +4568,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
85780 return table;
85781 }
85782
85783-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
85784+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
85785 {
85786- struct ctl_table *entry, *table;
85787+ ctl_table_no_const *entry, *table;
85788 struct sched_domain *sd;
85789 int domain_num = 0, i;
85790 char buf[32];
85791@@ -4590,11 +4597,13 @@ static struct ctl_table_header *sd_sysctl_header;
85792 static void register_sched_domain_sysctl(void)
85793 {
85794 int i, cpu_num = num_possible_cpus();
85795- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
85796+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
85797 char buf[32];
85798
85799 WARN_ON(sd_ctl_dir[0].child);
85800+ pax_open_kernel();
85801 sd_ctl_dir[0].child = entry;
85802+ pax_close_kernel();
85803
85804 if (entry == NULL)
85805 return;
85806@@ -4617,8 +4626,12 @@ static void unregister_sched_domain_sysctl(void)
85807 if (sd_sysctl_header)
85808 unregister_sysctl_table(sd_sysctl_header);
85809 sd_sysctl_header = NULL;
85810- if (sd_ctl_dir[0].child)
85811- sd_free_ctl_entry(&sd_ctl_dir[0].child);
85812+ if (sd_ctl_dir[0].child) {
85813+ sd_free_ctl_entry(sd_ctl_dir[0].child);
85814+ pax_open_kernel();
85815+ sd_ctl_dir[0].child = NULL;
85816+ pax_close_kernel();
85817+ }
85818 }
85819 #else
85820 static void register_sched_domain_sysctl(void)
85821diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
85822index 7765ad8..774519f 100644
85823--- a/kernel/sched/fair.c
85824+++ b/kernel/sched/fair.c
85825@@ -869,7 +869,7 @@ void task_numa_fault(int node, int pages, bool migrated)
85826
85827 static void reset_ptenuma_scan(struct task_struct *p)
85828 {
85829- ACCESS_ONCE(p->mm->numa_scan_seq)++;
85830+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
85831 p->mm->numa_scan_offset = 0;
85832 }
85833
85834@@ -5847,7 +5847,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
85835 * run_rebalance_domains is triggered when needed from the scheduler tick.
85836 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
85837 */
85838-static void run_rebalance_domains(struct softirq_action *h)
85839+static __latent_entropy void run_rebalance_domains(void)
85840 {
85841 int this_cpu = smp_processor_id();
85842 struct rq *this_rq = cpu_rq(this_cpu);
85843diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
85844index b3c5653..a4d192a 100644
85845--- a/kernel/sched/sched.h
85846+++ b/kernel/sched/sched.h
85847@@ -1004,7 +1004,7 @@ struct sched_class {
85848 #ifdef CONFIG_FAIR_GROUP_SCHED
85849 void (*task_move_group) (struct task_struct *p, int on_rq);
85850 #endif
85851-};
85852+} __do_const;
85853
85854 #define sched_class_highest (&stop_sched_class)
85855 #define for_each_class(class) \
85856diff --git a/kernel/signal.c b/kernel/signal.c
85857index ded28b9..6886c08 100644
85858--- a/kernel/signal.c
85859+++ b/kernel/signal.c
85860@@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep;
85861
85862 int print_fatal_signals __read_mostly;
85863
85864-static void __user *sig_handler(struct task_struct *t, int sig)
85865+static __sighandler_t sig_handler(struct task_struct *t, int sig)
85866 {
85867 return t->sighand->action[sig - 1].sa.sa_handler;
85868 }
85869
85870-static int sig_handler_ignored(void __user *handler, int sig)
85871+static int sig_handler_ignored(__sighandler_t handler, int sig)
85872 {
85873 /* Is it explicitly or implicitly ignored? */
85874 return handler == SIG_IGN ||
85875@@ -65,7 +65,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
85876
85877 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
85878 {
85879- void __user *handler;
85880+ __sighandler_t handler;
85881
85882 handler = sig_handler(t, sig);
85883
85884@@ -369,6 +369,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
85885 atomic_inc(&user->sigpending);
85886 rcu_read_unlock();
85887
85888+ if (!override_rlimit)
85889+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
85890+
85891 if (override_rlimit ||
85892 atomic_read(&user->sigpending) <=
85893 task_rlimit(t, RLIMIT_SIGPENDING)) {
85894@@ -496,7 +499,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
85895
85896 int unhandled_signal(struct task_struct *tsk, int sig)
85897 {
85898- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
85899+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
85900 if (is_global_init(tsk))
85901 return 1;
85902 if (handler != SIG_IGN && handler != SIG_DFL)
85903@@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
85904 }
85905 }
85906
85907+ /* allow glibc communication via tgkill to other threads in our
85908+ thread group */
85909+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
85910+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
85911+ && gr_handle_signal(t, sig))
85912+ return -EPERM;
85913+
85914 return security_task_kill(t, info, sig, 0);
85915 }
85916
85917@@ -1199,7 +1209,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
85918 return send_signal(sig, info, p, 1);
85919 }
85920
85921-static int
85922+int
85923 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85924 {
85925 return send_signal(sig, info, t, 0);
85926@@ -1236,6 +1246,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85927 unsigned long int flags;
85928 int ret, blocked, ignored;
85929 struct k_sigaction *action;
85930+ int is_unhandled = 0;
85931
85932 spin_lock_irqsave(&t->sighand->siglock, flags);
85933 action = &t->sighand->action[sig-1];
85934@@ -1250,9 +1261,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
85935 }
85936 if (action->sa.sa_handler == SIG_DFL)
85937 t->signal->flags &= ~SIGNAL_UNKILLABLE;
85938+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
85939+ is_unhandled = 1;
85940 ret = specific_send_sig_info(sig, info, t);
85941 spin_unlock_irqrestore(&t->sighand->siglock, flags);
85942
85943+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
85944+ normal operation */
85945+ if (is_unhandled) {
85946+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
85947+ gr_handle_crash(t, sig);
85948+ }
85949+
85950 return ret;
85951 }
85952
85953@@ -1319,8 +1339,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
85954 ret = check_kill_permission(sig, info, p);
85955 rcu_read_unlock();
85956
85957- if (!ret && sig)
85958+ if (!ret && sig) {
85959 ret = do_send_sig_info(sig, info, p, true);
85960+ if (!ret)
85961+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
85962+ }
85963
85964 return ret;
85965 }
85966@@ -2926,7 +2949,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
85967 int error = -ESRCH;
85968
85969 rcu_read_lock();
85970- p = find_task_by_vpid(pid);
85971+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
85972+ /* allow glibc communication via tgkill to other threads in our
85973+ thread group */
85974+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
85975+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
85976+ p = find_task_by_vpid_unrestricted(pid);
85977+ else
85978+#endif
85979+ p = find_task_by_vpid(pid);
85980 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
85981 error = check_kill_permission(sig, info, p);
85982 /*
85983@@ -3240,8 +3271,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
85984 }
85985 seg = get_fs();
85986 set_fs(KERNEL_DS);
85987- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
85988- (stack_t __force __user *) &uoss,
85989+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
85990+ (stack_t __force_user *) &uoss,
85991 compat_user_stack_pointer());
85992 set_fs(seg);
85993 if (ret >= 0 && uoss_ptr) {
85994diff --git a/kernel/smpboot.c b/kernel/smpboot.c
85995index eb89e18..a4e6792 100644
85996--- a/kernel/smpboot.c
85997+++ b/kernel/smpboot.c
85998@@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
85999 }
86000 smpboot_unpark_thread(plug_thread, cpu);
86001 }
86002- list_add(&plug_thread->list, &hotplug_threads);
86003+ pax_list_add(&plug_thread->list, &hotplug_threads);
86004 out:
86005 mutex_unlock(&smpboot_threads_lock);
86006 return ret;
86007@@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
86008 {
86009 get_online_cpus();
86010 mutex_lock(&smpboot_threads_lock);
86011- list_del(&plug_thread->list);
86012+ pax_list_del(&plug_thread->list);
86013 smpboot_destroy_threads(plug_thread);
86014 mutex_unlock(&smpboot_threads_lock);
86015 put_online_cpus();
86016diff --git a/kernel/softirq.c b/kernel/softirq.c
86017index d7d498d..94fe0f7 100644
86018--- a/kernel/softirq.c
86019+++ b/kernel/softirq.c
86020@@ -53,11 +53,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
86021 EXPORT_SYMBOL(irq_stat);
86022 #endif
86023
86024-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
86025+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
86026
86027 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
86028
86029-char *softirq_to_name[NR_SOFTIRQS] = {
86030+const char * const softirq_to_name[NR_SOFTIRQS] = {
86031 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
86032 "TASKLET", "SCHED", "HRTIMER", "RCU"
86033 };
86034@@ -248,7 +248,7 @@ restart:
86035 kstat_incr_softirqs_this_cpu(vec_nr);
86036
86037 trace_softirq_entry(vec_nr);
86038- h->action(h);
86039+ h->action();
86040 trace_softirq_exit(vec_nr);
86041 if (unlikely(prev_count != preempt_count())) {
86042 printk(KERN_ERR "huh, entered softirq %u %s %p"
86043@@ -412,7 +412,7 @@ void __raise_softirq_irqoff(unsigned int nr)
86044 or_softirq_pending(1UL << nr);
86045 }
86046
86047-void open_softirq(int nr, void (*action)(struct softirq_action *))
86048+void __init open_softirq(int nr, void (*action)(void))
86049 {
86050 softirq_vec[nr].action = action;
86051 }
86052@@ -468,7 +468,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
86053
86054 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
86055
86056-static void tasklet_action(struct softirq_action *a)
86057+static __latent_entropy void tasklet_action(void)
86058 {
86059 struct tasklet_struct *list;
86060
86061@@ -503,7 +503,7 @@ static void tasklet_action(struct softirq_action *a)
86062 }
86063 }
86064
86065-static void tasklet_hi_action(struct softirq_action *a)
86066+static __latent_entropy void tasklet_hi_action(void)
86067 {
86068 struct tasklet_struct *list;
86069
86070@@ -858,7 +858,7 @@ static struct notifier_block cpu_nfb = {
86071 .notifier_call = cpu_callback
86072 };
86073
86074-static struct smp_hotplug_thread softirq_threads = {
86075+static struct smp_hotplug_thread softirq_threads __read_only = {
86076 .store = &ksoftirqd,
86077 .thread_should_run = ksoftirqd_should_run,
86078 .thread_fn = run_ksoftirqd,
86079diff --git a/kernel/srcu.c b/kernel/srcu.c
86080index 01d5ccb..cdcbee6 100644
86081--- a/kernel/srcu.c
86082+++ b/kernel/srcu.c
86083@@ -300,9 +300,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
86084
86085 idx = ACCESS_ONCE(sp->completed) & 0x1;
86086 preempt_disable();
86087- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
86088+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
86089 smp_mb(); /* B */ /* Avoid leaking the critical section. */
86090- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
86091+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
86092 preempt_enable();
86093 return idx;
86094 }
86095diff --git a/kernel/sys.c b/kernel/sys.c
86096index c18ecca..b3c2dd2 100644
86097--- a/kernel/sys.c
86098+++ b/kernel/sys.c
86099@@ -149,6 +149,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
86100 error = -EACCES;
86101 goto out;
86102 }
86103+
86104+ if (gr_handle_chroot_setpriority(p, niceval)) {
86105+ error = -EACCES;
86106+ goto out;
86107+ }
86108+
86109 no_nice = security_task_setnice(p, niceval);
86110 if (no_nice) {
86111 error = no_nice;
86112@@ -352,6 +358,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
86113 goto error;
86114 }
86115
86116+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
86117+ goto error;
86118+
86119 if (rgid != (gid_t) -1 ||
86120 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
86121 new->sgid = new->egid;
86122@@ -387,6 +396,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
86123 old = current_cred();
86124
86125 retval = -EPERM;
86126+
86127+ if (gr_check_group_change(kgid, kgid, kgid))
86128+ goto error;
86129+
86130 if (ns_capable(old->user_ns, CAP_SETGID))
86131 new->gid = new->egid = new->sgid = new->fsgid = kgid;
86132 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
86133@@ -404,7 +417,7 @@ error:
86134 /*
86135 * change the user struct in a credentials set to match the new UID
86136 */
86137-static int set_user(struct cred *new)
86138+int set_user(struct cred *new)
86139 {
86140 struct user_struct *new_user;
86141
86142@@ -484,6 +497,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
86143 goto error;
86144 }
86145
86146+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
86147+ goto error;
86148+
86149 if (!uid_eq(new->uid, old->uid)) {
86150 retval = set_user(new);
86151 if (retval < 0)
86152@@ -534,6 +550,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
86153 old = current_cred();
86154
86155 retval = -EPERM;
86156+
86157+ if (gr_check_crash_uid(kuid))
86158+ goto error;
86159+ if (gr_check_user_change(kuid, kuid, kuid))
86160+ goto error;
86161+
86162 if (ns_capable(old->user_ns, CAP_SETUID)) {
86163 new->suid = new->uid = kuid;
86164 if (!uid_eq(kuid, old->uid)) {
86165@@ -603,6 +625,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
86166 goto error;
86167 }
86168
86169+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
86170+ goto error;
86171+
86172 if (ruid != (uid_t) -1) {
86173 new->uid = kruid;
86174 if (!uid_eq(kruid, old->uid)) {
86175@@ -685,6 +710,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
86176 goto error;
86177 }
86178
86179+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
86180+ goto error;
86181+
86182 if (rgid != (gid_t) -1)
86183 new->gid = krgid;
86184 if (egid != (gid_t) -1)
86185@@ -746,12 +774,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
86186 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
86187 ns_capable(old->user_ns, CAP_SETUID)) {
86188 if (!uid_eq(kuid, old->fsuid)) {
86189+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
86190+ goto error;
86191+
86192 new->fsuid = kuid;
86193 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
86194 goto change_okay;
86195 }
86196 }
86197
86198+error:
86199 abort_creds(new);
86200 return old_fsuid;
86201
86202@@ -784,12 +816,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
86203 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
86204 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
86205 ns_capable(old->user_ns, CAP_SETGID)) {
86206+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
86207+ goto error;
86208+
86209 if (!gid_eq(kgid, old->fsgid)) {
86210 new->fsgid = kgid;
86211 goto change_okay;
86212 }
86213 }
86214
86215+error:
86216 abort_creds(new);
86217 return old_fsgid;
86218
86219@@ -1169,19 +1205,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
86220 return -EFAULT;
86221
86222 down_read(&uts_sem);
86223- error = __copy_to_user(&name->sysname, &utsname()->sysname,
86224+ error = __copy_to_user(name->sysname, &utsname()->sysname,
86225 __OLD_UTS_LEN);
86226 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
86227- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
86228+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
86229 __OLD_UTS_LEN);
86230 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
86231- error |= __copy_to_user(&name->release, &utsname()->release,
86232+ error |= __copy_to_user(name->release, &utsname()->release,
86233 __OLD_UTS_LEN);
86234 error |= __put_user(0, name->release + __OLD_UTS_LEN);
86235- error |= __copy_to_user(&name->version, &utsname()->version,
86236+ error |= __copy_to_user(name->version, &utsname()->version,
86237 __OLD_UTS_LEN);
86238 error |= __put_user(0, name->version + __OLD_UTS_LEN);
86239- error |= __copy_to_user(&name->machine, &utsname()->machine,
86240+ error |= __copy_to_user(name->machine, &utsname()->machine,
86241 __OLD_UTS_LEN);
86242 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
86243 up_read(&uts_sem);
86244@@ -1383,6 +1419,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
86245 */
86246 new_rlim->rlim_cur = 1;
86247 }
86248+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
86249+ is changed to a lower value. Since tasks can be created by the same
86250+ user in between this limit change and an execve by this task, force
86251+ a recheck only for this task by setting PF_NPROC_EXCEEDED
86252+ */
86253+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
86254+ tsk->flags |= PF_NPROC_EXCEEDED;
86255 }
86256 if (!retval) {
86257 if (old_rlim)
86258diff --git a/kernel/sysctl.c b/kernel/sysctl.c
86259index b2f06f3..e6354ab 100644
86260--- a/kernel/sysctl.c
86261+++ b/kernel/sysctl.c
86262@@ -93,7 +93,6 @@
86263
86264
86265 #if defined(CONFIG_SYSCTL)
86266-
86267 /* External variables not in a header file. */
86268 extern int sysctl_overcommit_memory;
86269 extern int sysctl_overcommit_ratio;
86270@@ -119,17 +118,18 @@ extern int blk_iopoll_enabled;
86271
86272 /* Constants used for minimum and maximum */
86273 #ifdef CONFIG_LOCKUP_DETECTOR
86274-static int sixty = 60;
86275+static int sixty __read_only = 60;
86276 #endif
86277
86278-static int zero;
86279-static int __maybe_unused one = 1;
86280-static int __maybe_unused two = 2;
86281-static int __maybe_unused three = 3;
86282-static unsigned long one_ul = 1;
86283-static int one_hundred = 100;
86284+static int neg_one __read_only = -1;
86285+static int zero __read_only = 0;
86286+static int __maybe_unused one __read_only = 1;
86287+static int __maybe_unused two __read_only = 2;
86288+static int __maybe_unused three __read_only = 3;
86289+static unsigned long one_ul __read_only = 1;
86290+static int one_hundred __read_only = 100;
86291 #ifdef CONFIG_PRINTK
86292-static int ten_thousand = 10000;
86293+static int ten_thousand __read_only = 10000;
86294 #endif
86295
86296 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
86297@@ -176,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write,
86298 void __user *buffer, size_t *lenp, loff_t *ppos);
86299 #endif
86300
86301-#ifdef CONFIG_PRINTK
86302 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86303 void __user *buffer, size_t *lenp, loff_t *ppos);
86304-#endif
86305
86306 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
86307 void __user *buffer, size_t *lenp, loff_t *ppos);
86308@@ -210,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
86309
86310 #endif
86311
86312+extern struct ctl_table grsecurity_table[];
86313+
86314 static struct ctl_table kern_table[];
86315 static struct ctl_table vm_table[];
86316 static struct ctl_table fs_table[];
86317@@ -224,6 +224,20 @@ extern struct ctl_table epoll_table[];
86318 int sysctl_legacy_va_layout;
86319 #endif
86320
86321+#ifdef CONFIG_PAX_SOFTMODE
86322+static ctl_table pax_table[] = {
86323+ {
86324+ .procname = "softmode",
86325+ .data = &pax_softmode,
86326+ .maxlen = sizeof(unsigned int),
86327+ .mode = 0600,
86328+ .proc_handler = &proc_dointvec,
86329+ },
86330+
86331+ { }
86332+};
86333+#endif
86334+
86335 /* The default sysctl tables: */
86336
86337 static struct ctl_table sysctl_base_table[] = {
86338@@ -272,6 +286,22 @@ static int max_extfrag_threshold = 1000;
86339 #endif
86340
86341 static struct ctl_table kern_table[] = {
86342+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
86343+ {
86344+ .procname = "grsecurity",
86345+ .mode = 0500,
86346+ .child = grsecurity_table,
86347+ },
86348+#endif
86349+
86350+#ifdef CONFIG_PAX_SOFTMODE
86351+ {
86352+ .procname = "pax",
86353+ .mode = 0500,
86354+ .child = pax_table,
86355+ },
86356+#endif
86357+
86358 {
86359 .procname = "sched_child_runs_first",
86360 .data = &sysctl_sched_child_runs_first,
86361@@ -613,7 +643,7 @@ static struct ctl_table kern_table[] = {
86362 .data = &modprobe_path,
86363 .maxlen = KMOD_PATH_LEN,
86364 .mode = 0644,
86365- .proc_handler = proc_dostring,
86366+ .proc_handler = proc_dostring_modpriv,
86367 },
86368 {
86369 .procname = "modules_disabled",
86370@@ -780,16 +810,20 @@ static struct ctl_table kern_table[] = {
86371 .extra1 = &zero,
86372 .extra2 = &one,
86373 },
86374+#endif
86375 {
86376 .procname = "kptr_restrict",
86377 .data = &kptr_restrict,
86378 .maxlen = sizeof(int),
86379 .mode = 0644,
86380 .proc_handler = proc_dointvec_minmax_sysadmin,
86381+#ifdef CONFIG_GRKERNSEC_HIDESYM
86382+ .extra1 = &two,
86383+#else
86384 .extra1 = &zero,
86385+#endif
86386 .extra2 = &two,
86387 },
86388-#endif
86389 {
86390 .procname = "ngroups_max",
86391 .data = &ngroups_max,
86392@@ -1031,10 +1065,17 @@ static struct ctl_table kern_table[] = {
86393 */
86394 {
86395 .procname = "perf_event_paranoid",
86396- .data = &sysctl_perf_event_paranoid,
86397- .maxlen = sizeof(sysctl_perf_event_paranoid),
86398+ .data = &sysctl_perf_event_legitimately_concerned,
86399+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
86400 .mode = 0644,
86401- .proc_handler = proc_dointvec,
86402+ /* go ahead, be a hero */
86403+ .proc_handler = proc_dointvec_minmax_sysadmin,
86404+ .extra1 = &neg_one,
86405+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
86406+ .extra2 = &three,
86407+#else
86408+ .extra2 = &two,
86409+#endif
86410 },
86411 {
86412 .procname = "perf_event_mlock_kb",
86413@@ -1297,6 +1338,13 @@ static struct ctl_table vm_table[] = {
86414 .proc_handler = proc_dointvec_minmax,
86415 .extra1 = &zero,
86416 },
86417+ {
86418+ .procname = "heap_stack_gap",
86419+ .data = &sysctl_heap_stack_gap,
86420+ .maxlen = sizeof(sysctl_heap_stack_gap),
86421+ .mode = 0644,
86422+ .proc_handler = proc_doulongvec_minmax,
86423+ },
86424 #else
86425 {
86426 .procname = "nr_trim_pages",
86427@@ -1761,6 +1809,16 @@ int proc_dostring(struct ctl_table *table, int write,
86428 buffer, lenp, ppos);
86429 }
86430
86431+int proc_dostring_modpriv(struct ctl_table *table, int write,
86432+ void __user *buffer, size_t *lenp, loff_t *ppos)
86433+{
86434+ if (write && !capable(CAP_SYS_MODULE))
86435+ return -EPERM;
86436+
86437+ return _proc_do_string(table->data, table->maxlen, write,
86438+ buffer, lenp, ppos);
86439+}
86440+
86441 static size_t proc_skip_spaces(char **buf)
86442 {
86443 size_t ret;
86444@@ -1866,6 +1924,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
86445 len = strlen(tmp);
86446 if (len > *size)
86447 len = *size;
86448+ if (len > sizeof(tmp))
86449+ len = sizeof(tmp);
86450 if (copy_to_user(*buf, tmp, len))
86451 return -EFAULT;
86452 *size -= len;
86453@@ -2030,7 +2090,7 @@ int proc_dointvec(struct ctl_table *table, int write,
86454 static int proc_taint(struct ctl_table *table, int write,
86455 void __user *buffer, size_t *lenp, loff_t *ppos)
86456 {
86457- struct ctl_table t;
86458+ ctl_table_no_const t;
86459 unsigned long tmptaint = get_taint();
86460 int err;
86461
86462@@ -2058,7 +2118,6 @@ static int proc_taint(struct ctl_table *table, int write,
86463 return err;
86464 }
86465
86466-#ifdef CONFIG_PRINTK
86467 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86468 void __user *buffer, size_t *lenp, loff_t *ppos)
86469 {
86470@@ -2067,7 +2126,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
86471
86472 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
86473 }
86474-#endif
86475
86476 struct do_proc_dointvec_minmax_conv_param {
86477 int *min;
86478@@ -2214,8 +2272,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
86479 *i = val;
86480 } else {
86481 val = convdiv * (*i) / convmul;
86482- if (!first)
86483+ if (!first) {
86484 err = proc_put_char(&buffer, &left, '\t');
86485+ if (err)
86486+ break;
86487+ }
86488 err = proc_put_long(&buffer, &left, val, false);
86489 if (err)
86490 break;
86491@@ -2611,6 +2672,12 @@ int proc_dostring(struct ctl_table *table, int write,
86492 return -ENOSYS;
86493 }
86494
86495+int proc_dostring_modpriv(struct ctl_table *table, int write,
86496+ void __user *buffer, size_t *lenp, loff_t *ppos)
86497+{
86498+ return -ENOSYS;
86499+}
86500+
86501 int proc_dointvec(struct ctl_table *table, int write,
86502 void __user *buffer, size_t *lenp, loff_t *ppos)
86503 {
86504@@ -2667,5 +2734,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
86505 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
86506 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
86507 EXPORT_SYMBOL(proc_dostring);
86508+EXPORT_SYMBOL(proc_dostring_modpriv);
86509 EXPORT_SYMBOL(proc_doulongvec_minmax);
86510 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
86511diff --git a/kernel/taskstats.c b/kernel/taskstats.c
86512index 145bb4d..b2aa969 100644
86513--- a/kernel/taskstats.c
86514+++ b/kernel/taskstats.c
86515@@ -28,9 +28,12 @@
86516 #include <linux/fs.h>
86517 #include <linux/file.h>
86518 #include <linux/pid_namespace.h>
86519+#include <linux/grsecurity.h>
86520 #include <net/genetlink.h>
86521 #include <linux/atomic.h>
86522
86523+extern int gr_is_taskstats_denied(int pid);
86524+
86525 /*
86526 * Maximum length of a cpumask that can be specified in
86527 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
86528@@ -570,6 +573,9 @@ err:
86529
86530 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
86531 {
86532+ if (gr_is_taskstats_denied(current->pid))
86533+ return -EACCES;
86534+
86535 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
86536 return cmd_attr_register_cpumask(info);
86537 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
86538diff --git a/kernel/time.c b/kernel/time.c
86539index 7c7964c..2a0d412 100644
86540--- a/kernel/time.c
86541+++ b/kernel/time.c
86542@@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
86543 return error;
86544
86545 if (tz) {
86546+ /* we log in do_settimeofday called below, so don't log twice
86547+ */
86548+ if (!tv)
86549+ gr_log_timechange();
86550+
86551 sys_tz = *tz;
86552 update_vsyscall_tz();
86553 if (firsttime) {
86554diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
86555index 88c9c65..7497ebc 100644
86556--- a/kernel/time/alarmtimer.c
86557+++ b/kernel/time/alarmtimer.c
86558@@ -795,7 +795,7 @@ static int __init alarmtimer_init(void)
86559 struct platform_device *pdev;
86560 int error = 0;
86561 int i;
86562- struct k_clock alarm_clock = {
86563+ static struct k_clock alarm_clock = {
86564 .clock_getres = alarm_clock_getres,
86565 .clock_get = alarm_clock_get,
86566 .timer_create = alarm_timer_create,
86567diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
86568index 5cf6c70..ac341b0 100644
86569--- a/kernel/time/timekeeping.c
86570+++ b/kernel/time/timekeeping.c
86571@@ -15,6 +15,7 @@
86572 #include <linux/init.h>
86573 #include <linux/mm.h>
86574 #include <linux/sched.h>
86575+#include <linux/grsecurity.h>
86576 #include <linux/syscore_ops.h>
86577 #include <linux/clocksource.h>
86578 #include <linux/jiffies.h>
86579@@ -500,6 +501,8 @@ int do_settimeofday(const struct timespec *tv)
86580 if (!timespec_valid_strict(tv))
86581 return -EINVAL;
86582
86583+ gr_log_timechange();
86584+
86585 raw_spin_lock_irqsave(&timekeeper_lock, flags);
86586 write_seqcount_begin(&timekeeper_seq);
86587
86588diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
86589index 61ed862..3b52c65 100644
86590--- a/kernel/time/timer_list.c
86591+++ b/kernel/time/timer_list.c
86592@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
86593
86594 static void print_name_offset(struct seq_file *m, void *sym)
86595 {
86596+#ifdef CONFIG_GRKERNSEC_HIDESYM
86597+ SEQ_printf(m, "<%p>", NULL);
86598+#else
86599 char symname[KSYM_NAME_LEN];
86600
86601 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
86602 SEQ_printf(m, "<%pK>", sym);
86603 else
86604 SEQ_printf(m, "%s", symname);
86605+#endif
86606 }
86607
86608 static void
86609@@ -119,7 +123,11 @@ next_one:
86610 static void
86611 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
86612 {
86613+#ifdef CONFIG_GRKERNSEC_HIDESYM
86614+ SEQ_printf(m, " .base: %p\n", NULL);
86615+#else
86616 SEQ_printf(m, " .base: %pK\n", base);
86617+#endif
86618 SEQ_printf(m, " .index: %d\n",
86619 base->index);
86620 SEQ_printf(m, " .resolution: %Lu nsecs\n",
86621@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
86622 {
86623 struct proc_dir_entry *pe;
86624
86625+#ifdef CONFIG_GRKERNSEC_PROC_ADD
86626+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
86627+#else
86628 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
86629+#endif
86630 if (!pe)
86631 return -ENOMEM;
86632 return 0;
86633diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
86634index 0b537f2..40d6c20 100644
86635--- a/kernel/time/timer_stats.c
86636+++ b/kernel/time/timer_stats.c
86637@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
86638 static unsigned long nr_entries;
86639 static struct entry entries[MAX_ENTRIES];
86640
86641-static atomic_t overflow_count;
86642+static atomic_unchecked_t overflow_count;
86643
86644 /*
86645 * The entries are in a hash-table, for fast lookup:
86646@@ -140,7 +140,7 @@ static void reset_entries(void)
86647 nr_entries = 0;
86648 memset(entries, 0, sizeof(entries));
86649 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
86650- atomic_set(&overflow_count, 0);
86651+ atomic_set_unchecked(&overflow_count, 0);
86652 }
86653
86654 static struct entry *alloc_entry(void)
86655@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
86656 if (likely(entry))
86657 entry->count++;
86658 else
86659- atomic_inc(&overflow_count);
86660+ atomic_inc_unchecked(&overflow_count);
86661
86662 out_unlock:
86663 raw_spin_unlock_irqrestore(lock, flags);
86664@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
86665
86666 static void print_name_offset(struct seq_file *m, unsigned long addr)
86667 {
86668+#ifdef CONFIG_GRKERNSEC_HIDESYM
86669+ seq_printf(m, "<%p>", NULL);
86670+#else
86671 char symname[KSYM_NAME_LEN];
86672
86673 if (lookup_symbol_name(addr, symname) < 0)
86674- seq_printf(m, "<%p>", (void *)addr);
86675+ seq_printf(m, "<%pK>", (void *)addr);
86676 else
86677 seq_printf(m, "%s", symname);
86678+#endif
86679 }
86680
86681 static int tstats_show(struct seq_file *m, void *v)
86682@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
86683
86684 seq_puts(m, "Timer Stats Version: v0.2\n");
86685 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
86686- if (atomic_read(&overflow_count))
86687+ if (atomic_read_unchecked(&overflow_count))
86688 seq_printf(m, "Overflow: %d entries\n",
86689- atomic_read(&overflow_count));
86690+ atomic_read_unchecked(&overflow_count));
86691
86692 for (i = 0; i < nr_entries; i++) {
86693 entry = entries + i;
86694@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
86695 {
86696 struct proc_dir_entry *pe;
86697
86698+#ifdef CONFIG_GRKERNSEC_PROC_ADD
86699+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
86700+#else
86701 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
86702+#endif
86703 if (!pe)
86704 return -ENOMEM;
86705 return 0;
86706diff --git a/kernel/timer.c b/kernel/timer.c
86707index 4296d13..0164b04 100644
86708--- a/kernel/timer.c
86709+++ b/kernel/timer.c
86710@@ -1366,7 +1366,7 @@ void update_process_times(int user_tick)
86711 /*
86712 * This function runs timers and the timer-tq in bottom half context.
86713 */
86714-static void run_timer_softirq(struct softirq_action *h)
86715+static __latent_entropy void run_timer_softirq(void)
86716 {
86717 struct tvec_base *base = __this_cpu_read(tvec_bases);
86718
86719@@ -1429,7 +1429,7 @@ static void process_timeout(unsigned long __data)
86720 *
86721 * In all cases the return value is guaranteed to be non-negative.
86722 */
86723-signed long __sched schedule_timeout(signed long timeout)
86724+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
86725 {
86726 struct timer_list timer;
86727 unsigned long expire;
86728diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
86729index b8b8560..75b1a09 100644
86730--- a/kernel/trace/blktrace.c
86731+++ b/kernel/trace/blktrace.c
86732@@ -317,7 +317,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
86733 struct blk_trace *bt = filp->private_data;
86734 char buf[16];
86735
86736- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
86737+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
86738
86739 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
86740 }
86741@@ -375,7 +375,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
86742 return 1;
86743
86744 bt = buf->chan->private_data;
86745- atomic_inc(&bt->dropped);
86746+ atomic_inc_unchecked(&bt->dropped);
86747 return 0;
86748 }
86749
86750@@ -476,7 +476,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
86751
86752 bt->dir = dir;
86753 bt->dev = dev;
86754- atomic_set(&bt->dropped, 0);
86755+ atomic_set_unchecked(&bt->dropped, 0);
86756
86757 ret = -EIO;
86758 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
86759diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
86760index 1345d9f..db46efe 100644
86761--- a/kernel/trace/ftrace.c
86762+++ b/kernel/trace/ftrace.c
86763@@ -1944,12 +1944,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
86764 if (unlikely(ftrace_disabled))
86765 return 0;
86766
86767+ ret = ftrace_arch_code_modify_prepare();
86768+ FTRACE_WARN_ON(ret);
86769+ if (ret)
86770+ return 0;
86771+
86772 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
86773+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
86774 if (ret) {
86775 ftrace_bug(ret, ip);
86776- return 0;
86777 }
86778- return 1;
86779+ return ret ? 0 : 1;
86780 }
86781
86782 /*
86783@@ -4043,8 +4048,10 @@ static int ftrace_process_locs(struct module *mod,
86784 if (!count)
86785 return 0;
86786
86787+ pax_open_kernel();
86788 sort(start, count, sizeof(*start),
86789 ftrace_cmp_ips, ftrace_swap_ips);
86790+ pax_close_kernel();
86791
86792 start_pg = ftrace_allocate_pages(count);
86793 if (!start_pg)
86794@@ -4766,8 +4773,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
86795 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
86796
86797 static int ftrace_graph_active;
86798-static struct notifier_block ftrace_suspend_notifier;
86799-
86800 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
86801 {
86802 return 0;
86803@@ -4918,6 +4923,10 @@ static struct ftrace_ops fgraph_ops __read_mostly = {
86804 FTRACE_OPS_FL_RECURSION_SAFE,
86805 };
86806
86807+static struct notifier_block ftrace_suspend_notifier = {
86808+ .notifier_call = ftrace_suspend_notifier_call
86809+};
86810+
86811 int register_ftrace_graph(trace_func_graph_ret_t retfunc,
86812 trace_func_graph_ent_t entryfunc)
86813 {
86814@@ -4931,7 +4940,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
86815 goto out;
86816 }
86817
86818- ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
86819 register_pm_notifier(&ftrace_suspend_notifier);
86820
86821 ftrace_graph_active++;
86822diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
86823index cc2f66f..05edd54 100644
86824--- a/kernel/trace/ring_buffer.c
86825+++ b/kernel/trace/ring_buffer.c
86826@@ -352,9 +352,9 @@ struct buffer_data_page {
86827 */
86828 struct buffer_page {
86829 struct list_head list; /* list of buffer pages */
86830- local_t write; /* index for next write */
86831+ local_unchecked_t write; /* index for next write */
86832 unsigned read; /* index for next read */
86833- local_t entries; /* entries on this page */
86834+ local_unchecked_t entries; /* entries on this page */
86835 unsigned long real_end; /* real end of data */
86836 struct buffer_data_page *page; /* Actual data page */
86837 };
86838@@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
86839 unsigned long last_overrun;
86840 local_t entries_bytes;
86841 local_t entries;
86842- local_t overrun;
86843- local_t commit_overrun;
86844+ local_unchecked_t overrun;
86845+ local_unchecked_t commit_overrun;
86846 local_t dropped_events;
86847 local_t committing;
86848 local_t commits;
86849@@ -992,8 +992,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
86850 *
86851 * We add a counter to the write field to denote this.
86852 */
86853- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
86854- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
86855+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
86856+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
86857
86858 /*
86859 * Just make sure we have seen our old_write and synchronize
86860@@ -1021,8 +1021,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
86861 * cmpxchg to only update if an interrupt did not already
86862 * do it for us. If the cmpxchg fails, we don't care.
86863 */
86864- (void)local_cmpxchg(&next_page->write, old_write, val);
86865- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
86866+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
86867+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
86868
86869 /*
86870 * No need to worry about races with clearing out the commit.
86871@@ -1386,12 +1386,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
86872
86873 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
86874 {
86875- return local_read(&bpage->entries) & RB_WRITE_MASK;
86876+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
86877 }
86878
86879 static inline unsigned long rb_page_write(struct buffer_page *bpage)
86880 {
86881- return local_read(&bpage->write) & RB_WRITE_MASK;
86882+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
86883 }
86884
86885 static int
86886@@ -1486,7 +1486,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
86887 * bytes consumed in ring buffer from here.
86888 * Increment overrun to account for the lost events.
86889 */
86890- local_add(page_entries, &cpu_buffer->overrun);
86891+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
86892 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
86893 }
86894
86895@@ -2064,7 +2064,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
86896 * it is our responsibility to update
86897 * the counters.
86898 */
86899- local_add(entries, &cpu_buffer->overrun);
86900+ local_add_unchecked(entries, &cpu_buffer->overrun);
86901 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
86902
86903 /*
86904@@ -2214,7 +2214,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86905 if (tail == BUF_PAGE_SIZE)
86906 tail_page->real_end = 0;
86907
86908- local_sub(length, &tail_page->write);
86909+ local_sub_unchecked(length, &tail_page->write);
86910 return;
86911 }
86912
86913@@ -2249,7 +2249,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86914 rb_event_set_padding(event);
86915
86916 /* Set the write back to the previous setting */
86917- local_sub(length, &tail_page->write);
86918+ local_sub_unchecked(length, &tail_page->write);
86919 return;
86920 }
86921
86922@@ -2261,7 +2261,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
86923
86924 /* Set write to end of buffer */
86925 length = (tail + length) - BUF_PAGE_SIZE;
86926- local_sub(length, &tail_page->write);
86927+ local_sub_unchecked(length, &tail_page->write);
86928 }
86929
86930 /*
86931@@ -2287,7 +2287,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
86932 * about it.
86933 */
86934 if (unlikely(next_page == commit_page)) {
86935- local_inc(&cpu_buffer->commit_overrun);
86936+ local_inc_unchecked(&cpu_buffer->commit_overrun);
86937 goto out_reset;
86938 }
86939
86940@@ -2343,7 +2343,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
86941 cpu_buffer->tail_page) &&
86942 (cpu_buffer->commit_page ==
86943 cpu_buffer->reader_page))) {
86944- local_inc(&cpu_buffer->commit_overrun);
86945+ local_inc_unchecked(&cpu_buffer->commit_overrun);
86946 goto out_reset;
86947 }
86948 }
86949@@ -2391,7 +2391,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
86950 length += RB_LEN_TIME_EXTEND;
86951
86952 tail_page = cpu_buffer->tail_page;
86953- write = local_add_return(length, &tail_page->write);
86954+ write = local_add_return_unchecked(length, &tail_page->write);
86955
86956 /* set write to only the index of the write */
86957 write &= RB_WRITE_MASK;
86958@@ -2408,7 +2408,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
86959 kmemcheck_annotate_bitfield(event, bitfield);
86960 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
86961
86962- local_inc(&tail_page->entries);
86963+ local_inc_unchecked(&tail_page->entries);
86964
86965 /*
86966 * If this is the first commit on the page, then update
86967@@ -2441,7 +2441,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
86968
86969 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
86970 unsigned long write_mask =
86971- local_read(&bpage->write) & ~RB_WRITE_MASK;
86972+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
86973 unsigned long event_length = rb_event_length(event);
86974 /*
86975 * This is on the tail page. It is possible that
86976@@ -2451,7 +2451,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
86977 */
86978 old_index += write_mask;
86979 new_index += write_mask;
86980- index = local_cmpxchg(&bpage->write, old_index, new_index);
86981+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
86982 if (index == old_index) {
86983 /* update counters */
86984 local_sub(event_length, &cpu_buffer->entries_bytes);
86985@@ -2843,7 +2843,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
86986
86987 /* Do the likely case first */
86988 if (likely(bpage->page == (void *)addr)) {
86989- local_dec(&bpage->entries);
86990+ local_dec_unchecked(&bpage->entries);
86991 return;
86992 }
86993
86994@@ -2855,7 +2855,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
86995 start = bpage;
86996 do {
86997 if (bpage->page == (void *)addr) {
86998- local_dec(&bpage->entries);
86999+ local_dec_unchecked(&bpage->entries);
87000 return;
87001 }
87002 rb_inc_page(cpu_buffer, &bpage);
87003@@ -3139,7 +3139,7 @@ static inline unsigned long
87004 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
87005 {
87006 return local_read(&cpu_buffer->entries) -
87007- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
87008+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
87009 }
87010
87011 /**
87012@@ -3228,7 +3228,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
87013 return 0;
87014
87015 cpu_buffer = buffer->buffers[cpu];
87016- ret = local_read(&cpu_buffer->overrun);
87017+ ret = local_read_unchecked(&cpu_buffer->overrun);
87018
87019 return ret;
87020 }
87021@@ -3251,7 +3251,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
87022 return 0;
87023
87024 cpu_buffer = buffer->buffers[cpu];
87025- ret = local_read(&cpu_buffer->commit_overrun);
87026+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
87027
87028 return ret;
87029 }
87030@@ -3336,7 +3336,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
87031 /* if you care about this being correct, lock the buffer */
87032 for_each_buffer_cpu(buffer, cpu) {
87033 cpu_buffer = buffer->buffers[cpu];
87034- overruns += local_read(&cpu_buffer->overrun);
87035+ overruns += local_read_unchecked(&cpu_buffer->overrun);
87036 }
87037
87038 return overruns;
87039@@ -3512,8 +3512,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
87040 /*
87041 * Reset the reader page to size zero.
87042 */
87043- local_set(&cpu_buffer->reader_page->write, 0);
87044- local_set(&cpu_buffer->reader_page->entries, 0);
87045+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
87046+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
87047 local_set(&cpu_buffer->reader_page->page->commit, 0);
87048 cpu_buffer->reader_page->real_end = 0;
87049
87050@@ -3547,7 +3547,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
87051 * want to compare with the last_overrun.
87052 */
87053 smp_mb();
87054- overwrite = local_read(&(cpu_buffer->overrun));
87055+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
87056
87057 /*
87058 * Here's the tricky part.
87059@@ -4117,8 +4117,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
87060
87061 cpu_buffer->head_page
87062 = list_entry(cpu_buffer->pages, struct buffer_page, list);
87063- local_set(&cpu_buffer->head_page->write, 0);
87064- local_set(&cpu_buffer->head_page->entries, 0);
87065+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
87066+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
87067 local_set(&cpu_buffer->head_page->page->commit, 0);
87068
87069 cpu_buffer->head_page->read = 0;
87070@@ -4128,14 +4128,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
87071
87072 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
87073 INIT_LIST_HEAD(&cpu_buffer->new_pages);
87074- local_set(&cpu_buffer->reader_page->write, 0);
87075- local_set(&cpu_buffer->reader_page->entries, 0);
87076+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
87077+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
87078 local_set(&cpu_buffer->reader_page->page->commit, 0);
87079 cpu_buffer->reader_page->read = 0;
87080
87081 local_set(&cpu_buffer->entries_bytes, 0);
87082- local_set(&cpu_buffer->overrun, 0);
87083- local_set(&cpu_buffer->commit_overrun, 0);
87084+ local_set_unchecked(&cpu_buffer->overrun, 0);
87085+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
87086 local_set(&cpu_buffer->dropped_events, 0);
87087 local_set(&cpu_buffer->entries, 0);
87088 local_set(&cpu_buffer->committing, 0);
87089@@ -4540,8 +4540,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
87090 rb_init_page(bpage);
87091 bpage = reader->page;
87092 reader->page = *data_page;
87093- local_set(&reader->write, 0);
87094- local_set(&reader->entries, 0);
87095+ local_set_unchecked(&reader->write, 0);
87096+ local_set_unchecked(&reader->entries, 0);
87097 reader->read = 0;
87098 *data_page = bpage;
87099
87100diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
87101index b778e96..4e84621 100644
87102--- a/kernel/trace/trace.c
87103+++ b/kernel/trace/trace.c
87104@@ -3335,7 +3335,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
87105 return 0;
87106 }
87107
87108-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
87109+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
87110 {
87111 /* do nothing if flag is already set */
87112 if (!!(trace_flags & mask) == !!enabled)
87113diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
87114index 10c86fb..645ab0a 100644
87115--- a/kernel/trace/trace.h
87116+++ b/kernel/trace/trace.h
87117@@ -1029,7 +1029,7 @@ extern const char *__stop___tracepoint_str[];
87118 void trace_printk_init_buffers(void);
87119 void trace_printk_start_comm(void);
87120 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
87121-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
87122+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
87123
87124 /*
87125 * Normal trace_printk() and friends allocates special buffers
87126diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
87127index 26dc348..8708ca7 100644
87128--- a/kernel/trace/trace_clock.c
87129+++ b/kernel/trace/trace_clock.c
87130@@ -123,7 +123,7 @@ u64 notrace trace_clock_global(void)
87131 return now;
87132 }
87133
87134-static atomic64_t trace_counter;
87135+static atomic64_unchecked_t trace_counter;
87136
87137 /*
87138 * trace_clock_counter(): simply an atomic counter.
87139@@ -132,5 +132,5 @@ static atomic64_t trace_counter;
87140 */
87141 u64 notrace trace_clock_counter(void)
87142 {
87143- return atomic64_add_return(1, &trace_counter);
87144+ return atomic64_inc_return_unchecked(&trace_counter);
87145 }
87146diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
87147index 368a4d5..7b6d1d5 100644
87148--- a/kernel/trace/trace_events.c
87149+++ b/kernel/trace/trace_events.c
87150@@ -1673,7 +1673,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
87151 return 0;
87152 }
87153
87154-struct ftrace_module_file_ops;
87155 static void __add_event_to_tracers(struct ftrace_event_call *call);
87156
87157 /* Add an additional event_call dynamically */
87158diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
87159index b3dcfb2..ebee344 100644
87160--- a/kernel/trace/trace_mmiotrace.c
87161+++ b/kernel/trace/trace_mmiotrace.c
87162@@ -24,7 +24,7 @@ struct header_iter {
87163 static struct trace_array *mmio_trace_array;
87164 static bool overrun_detected;
87165 static unsigned long prev_overruns;
87166-static atomic_t dropped_count;
87167+static atomic_unchecked_t dropped_count;
87168
87169 static void mmio_reset_data(struct trace_array *tr)
87170 {
87171@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
87172
87173 static unsigned long count_overruns(struct trace_iterator *iter)
87174 {
87175- unsigned long cnt = atomic_xchg(&dropped_count, 0);
87176+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
87177 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
87178
87179 if (over > prev_overruns)
87180@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
87181 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
87182 sizeof(*entry), 0, pc);
87183 if (!event) {
87184- atomic_inc(&dropped_count);
87185+ atomic_inc_unchecked(&dropped_count);
87186 return;
87187 }
87188 entry = ring_buffer_event_data(event);
87189@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
87190 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
87191 sizeof(*entry), 0, pc);
87192 if (!event) {
87193- atomic_inc(&dropped_count);
87194+ atomic_inc_unchecked(&dropped_count);
87195 return;
87196 }
87197 entry = ring_buffer_event_data(event);
87198diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
87199index 34e7cba..6f9a729 100644
87200--- a/kernel/trace/trace_output.c
87201+++ b/kernel/trace/trace_output.c
87202@@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
87203
87204 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
87205 if (!IS_ERR(p)) {
87206- p = mangle_path(s->buffer + s->len, p, "\n");
87207+ p = mangle_path(s->buffer + s->len, p, "\n\\");
87208 if (p) {
87209 s->len = p - s->buffer;
87210 return 1;
87211@@ -893,14 +893,16 @@ int register_ftrace_event(struct trace_event *event)
87212 goto out;
87213 }
87214
87215+ pax_open_kernel();
87216 if (event->funcs->trace == NULL)
87217- event->funcs->trace = trace_nop_print;
87218+ *(void **)&event->funcs->trace = trace_nop_print;
87219 if (event->funcs->raw == NULL)
87220- event->funcs->raw = trace_nop_print;
87221+ *(void **)&event->funcs->raw = trace_nop_print;
87222 if (event->funcs->hex == NULL)
87223- event->funcs->hex = trace_nop_print;
87224+ *(void **)&event->funcs->hex = trace_nop_print;
87225 if (event->funcs->binary == NULL)
87226- event->funcs->binary = trace_nop_print;
87227+ *(void **)&event->funcs->binary = trace_nop_print;
87228+ pax_close_kernel();
87229
87230 key = event->type & (EVENT_HASHSIZE - 1);
87231
87232diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
87233index b20428c..4845a10 100644
87234--- a/kernel/trace/trace_stack.c
87235+++ b/kernel/trace/trace_stack.c
87236@@ -68,7 +68,7 @@ check_stack(unsigned long ip, unsigned long *stack)
87237 return;
87238
87239 /* we do not handle interrupt stacks yet */
87240- if (!object_is_on_stack(stack))
87241+ if (!object_starts_on_stack(stack))
87242 return;
87243
87244 local_irq_save(flags);
87245diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
87246index 13fb113..a6ced3f 100644
87247--- a/kernel/user_namespace.c
87248+++ b/kernel/user_namespace.c
87249@@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
87250 !kgid_has_mapping(parent_ns, group))
87251 return -EPERM;
87252
87253+#ifdef CONFIG_GRKERNSEC
87254+ /*
87255+ * This doesn't really inspire confidence:
87256+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
87257+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
87258+ * Increases kernel attack surface in areas developers
87259+ * previously cared little about ("low importance due
87260+ * to requiring "root" capability")
87261+ * To be removed when this code receives *proper* review
87262+ */
87263+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
87264+ !capable(CAP_SETGID))
87265+ return -EPERM;
87266+#endif
87267+
87268 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
87269 if (!ns)
87270 return -ENOMEM;
87271@@ -860,7 +875,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
87272 if (atomic_read(&current->mm->mm_users) > 1)
87273 return -EINVAL;
87274
87275- if (current->fs->users != 1)
87276+ if (atomic_read(&current->fs->users) != 1)
87277 return -EINVAL;
87278
87279 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
87280diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
87281index 4f69f9a..7c6f8f8 100644
87282--- a/kernel/utsname_sysctl.c
87283+++ b/kernel/utsname_sysctl.c
87284@@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
87285 static int proc_do_uts_string(ctl_table *table, int write,
87286 void __user *buffer, size_t *lenp, loff_t *ppos)
87287 {
87288- struct ctl_table uts_table;
87289+ ctl_table_no_const uts_table;
87290 int r;
87291 memcpy(&uts_table, table, sizeof(uts_table));
87292 uts_table.data = get_uts(table, write);
87293diff --git a/kernel/watchdog.c b/kernel/watchdog.c
87294index 4431610..4265616 100644
87295--- a/kernel/watchdog.c
87296+++ b/kernel/watchdog.c
87297@@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
87298 static void watchdog_nmi_disable(unsigned int cpu) { return; }
87299 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
87300
87301-static struct smp_hotplug_thread watchdog_threads = {
87302+static struct smp_hotplug_thread watchdog_threads __read_only = {
87303 .store = &softlockup_watchdog,
87304 .thread_should_run = watchdog_should_run,
87305 .thread_fn = watchdog,
87306diff --git a/kernel/workqueue.c b/kernel/workqueue.c
87307index 93c2652..66a1cfd 100644
87308--- a/kernel/workqueue.c
87309+++ b/kernel/workqueue.c
87310@@ -4668,7 +4668,7 @@ static void rebind_workers(struct worker_pool *pool)
87311 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
87312 worker_flags |= WORKER_REBOUND;
87313 worker_flags &= ~WORKER_UNBOUND;
87314- ACCESS_ONCE(worker->flags) = worker_flags;
87315+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
87316 }
87317
87318 spin_unlock_irq(&pool->lock);
87319diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
87320index 094f315..244a824 100644
87321--- a/lib/Kconfig.debug
87322+++ b/lib/Kconfig.debug
87323@@ -836,7 +836,7 @@ config DEBUG_MUTEXES
87324
87325 config DEBUG_WW_MUTEX_SLOWPATH
87326 bool "Wait/wound mutex debugging: Slowpath testing"
87327- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87328+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87329 select DEBUG_LOCK_ALLOC
87330 select DEBUG_SPINLOCK
87331 select DEBUG_MUTEXES
87332@@ -849,7 +849,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
87333
87334 config DEBUG_LOCK_ALLOC
87335 bool "Lock debugging: detect incorrect freeing of live locks"
87336- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87337+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87338 select DEBUG_SPINLOCK
87339 select DEBUG_MUTEXES
87340 select LOCKDEP
87341@@ -863,7 +863,7 @@ config DEBUG_LOCK_ALLOC
87342
87343 config PROVE_LOCKING
87344 bool "Lock debugging: prove locking correctness"
87345- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87346+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87347 select LOCKDEP
87348 select DEBUG_SPINLOCK
87349 select DEBUG_MUTEXES
87350@@ -914,7 +914,7 @@ config LOCKDEP
87351
87352 config LOCK_STAT
87353 bool "Lock usage statistics"
87354- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
87355+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
87356 select LOCKDEP
87357 select DEBUG_SPINLOCK
87358 select DEBUG_MUTEXES
87359@@ -1376,6 +1376,7 @@ config LATENCYTOP
87360 depends on DEBUG_KERNEL
87361 depends on STACKTRACE_SUPPORT
87362 depends on PROC_FS
87363+ depends on !GRKERNSEC_HIDESYM
87364 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
87365 select KALLSYMS
87366 select KALLSYMS_ALL
87367@@ -1392,7 +1393,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
87368 config DEBUG_STRICT_USER_COPY_CHECKS
87369 bool "Strict user copy size checks"
87370 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
87371- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
87372+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
87373 help
87374 Enabling this option turns a certain set of sanity checks for user
87375 copy operations into compile time failures.
87376@@ -1502,7 +1503,7 @@ endmenu # runtime tests
87377
87378 config PROVIDE_OHCI1394_DMA_INIT
87379 bool "Remote debugging over FireWire early on boot"
87380- depends on PCI && X86
87381+ depends on PCI && X86 && !GRKERNSEC
87382 help
87383 If you want to debug problems which hang or crash the kernel early
87384 on boot and the crashing machine has a FireWire port, you can use
87385@@ -1531,7 +1532,7 @@ config PROVIDE_OHCI1394_DMA_INIT
87386
87387 config FIREWIRE_OHCI_REMOTE_DMA
87388 bool "Remote debugging over FireWire with firewire-ohci"
87389- depends on FIREWIRE_OHCI
87390+ depends on FIREWIRE_OHCI && !GRKERNSEC
87391 help
87392 This option lets you use the FireWire bus for remote debugging
87393 with help of the firewire-ohci driver. It enables unfiltered
87394diff --git a/lib/Makefile b/lib/Makefile
87395index f3bb2cb..b358ace 100644
87396--- a/lib/Makefile
87397+++ b/lib/Makefile
87398@@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
87399
87400 obj-$(CONFIG_BTREE) += btree.o
87401 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
87402-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
87403+obj-y += list_debug.o
87404 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
87405
87406 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
87407diff --git a/lib/bitmap.c b/lib/bitmap.c
87408index 06f7e4f..f3cf2b0 100644
87409--- a/lib/bitmap.c
87410+++ b/lib/bitmap.c
87411@@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
87412 {
87413 int c, old_c, totaldigits, ndigits, nchunks, nbits;
87414 u32 chunk;
87415- const char __user __force *ubuf = (const char __user __force *)buf;
87416+ const char __user *ubuf = (const char __force_user *)buf;
87417
87418 bitmap_zero(maskp, nmaskbits);
87419
87420@@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
87421 {
87422 if (!access_ok(VERIFY_READ, ubuf, ulen))
87423 return -EFAULT;
87424- return __bitmap_parse((const char __force *)ubuf,
87425+ return __bitmap_parse((const char __force_kernel *)ubuf,
87426 ulen, 1, maskp, nmaskbits);
87427
87428 }
87429@@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
87430 {
87431 unsigned a, b;
87432 int c, old_c, totaldigits;
87433- const char __user __force *ubuf = (const char __user __force *)buf;
87434+ const char __user *ubuf = (const char __force_user *)buf;
87435 int exp_digit, in_range;
87436
87437 totaldigits = c = 0;
87438@@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
87439 {
87440 if (!access_ok(VERIFY_READ, ubuf, ulen))
87441 return -EFAULT;
87442- return __bitmap_parselist((const char __force *)ubuf,
87443+ return __bitmap_parselist((const char __force_kernel *)ubuf,
87444 ulen, 1, maskp, nmaskbits);
87445 }
87446 EXPORT_SYMBOL(bitmap_parselist_user);
87447diff --git a/lib/bug.c b/lib/bug.c
87448index 1686034..a9c00c8 100644
87449--- a/lib/bug.c
87450+++ b/lib/bug.c
87451@@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
87452 return BUG_TRAP_TYPE_NONE;
87453
87454 bug = find_bug(bugaddr);
87455+ if (!bug)
87456+ return BUG_TRAP_TYPE_NONE;
87457
87458 file = NULL;
87459 line = 0;
87460diff --git a/lib/debugobjects.c b/lib/debugobjects.c
87461index bf2c8b1..1d00ccf 100644
87462--- a/lib/debugobjects.c
87463+++ b/lib/debugobjects.c
87464@@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
87465 if (limit > 4)
87466 return;
87467
87468- is_on_stack = object_is_on_stack(addr);
87469+ is_on_stack = object_starts_on_stack(addr);
87470 if (is_on_stack == onstack)
87471 return;
87472
87473diff --git a/lib/devres.c b/lib/devres.c
87474index 8235331..5881053 100644
87475--- a/lib/devres.c
87476+++ b/lib/devres.c
87477@@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
87478 void devm_iounmap(struct device *dev, void __iomem *addr)
87479 {
87480 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
87481- (void *)addr));
87482+ (void __force *)addr));
87483 iounmap(addr);
87484 }
87485 EXPORT_SYMBOL(devm_iounmap);
87486@@ -224,7 +224,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
87487 {
87488 ioport_unmap(addr);
87489 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
87490- devm_ioport_map_match, (void *)addr));
87491+ devm_ioport_map_match, (void __force *)addr));
87492 }
87493 EXPORT_SYMBOL(devm_ioport_unmap);
87494 #endif /* CONFIG_HAS_IOPORT */
87495diff --git a/lib/div64.c b/lib/div64.c
87496index 4382ad7..08aa558 100644
87497--- a/lib/div64.c
87498+++ b/lib/div64.c
87499@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
87500 EXPORT_SYMBOL(__div64_32);
87501
87502 #ifndef div_s64_rem
87503-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
87504+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
87505 {
87506 u64 quotient;
87507
87508@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
87509 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
87510 */
87511 #ifndef div64_u64
87512-u64 div64_u64(u64 dividend, u64 divisor)
87513+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
87514 {
87515 u32 high = divisor >> 32;
87516 u64 quot;
87517diff --git a/lib/dma-debug.c b/lib/dma-debug.c
87518index d87a17a..ac0d79a 100644
87519--- a/lib/dma-debug.c
87520+++ b/lib/dma-debug.c
87521@@ -768,7 +768,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
87522
87523 void dma_debug_add_bus(struct bus_type *bus)
87524 {
87525- struct notifier_block *nb;
87526+ notifier_block_no_const *nb;
87527
87528 if (global_disable)
87529 return;
87530@@ -945,7 +945,7 @@ static void check_unmap(struct dma_debug_entry *ref)
87531
87532 static void check_for_stack(struct device *dev, void *addr)
87533 {
87534- if (object_is_on_stack(addr))
87535+ if (object_starts_on_stack(addr))
87536 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
87537 "stack [addr=%p]\n", addr);
87538 }
87539diff --git a/lib/inflate.c b/lib/inflate.c
87540index 013a761..c28f3fc 100644
87541--- a/lib/inflate.c
87542+++ b/lib/inflate.c
87543@@ -269,7 +269,7 @@ static void free(void *where)
87544 malloc_ptr = free_mem_ptr;
87545 }
87546 #else
87547-#define malloc(a) kmalloc(a, GFP_KERNEL)
87548+#define malloc(a) kmalloc((a), GFP_KERNEL)
87549 #define free(a) kfree(a)
87550 #endif
87551
87552diff --git a/lib/ioremap.c b/lib/ioremap.c
87553index 0c9216c..863bd89 100644
87554--- a/lib/ioremap.c
87555+++ b/lib/ioremap.c
87556@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
87557 unsigned long next;
87558
87559 phys_addr -= addr;
87560- pmd = pmd_alloc(&init_mm, pud, addr);
87561+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
87562 if (!pmd)
87563 return -ENOMEM;
87564 do {
87565@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
87566 unsigned long next;
87567
87568 phys_addr -= addr;
87569- pud = pud_alloc(&init_mm, pgd, addr);
87570+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
87571 if (!pud)
87572 return -ENOMEM;
87573 do {
87574diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
87575index bd2bea9..6b3c95e 100644
87576--- a/lib/is_single_threaded.c
87577+++ b/lib/is_single_threaded.c
87578@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
87579 struct task_struct *p, *t;
87580 bool ret;
87581
87582+ if (!mm)
87583+ return true;
87584+
87585 if (atomic_read(&task->signal->live) != 1)
87586 return false;
87587
87588diff --git a/lib/kobject.c b/lib/kobject.c
87589index 084f7b1..d265b8a 100644
87590--- a/lib/kobject.c
87591+++ b/lib/kobject.c
87592@@ -875,9 +875,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
87593
87594
87595 static DEFINE_SPINLOCK(kobj_ns_type_lock);
87596-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
87597+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
87598
87599-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
87600+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
87601 {
87602 enum kobj_ns_type type = ops->type;
87603 int error;
87604diff --git a/lib/list_debug.c b/lib/list_debug.c
87605index c24c2f7..f0296f4 100644
87606--- a/lib/list_debug.c
87607+++ b/lib/list_debug.c
87608@@ -11,7 +11,9 @@
87609 #include <linux/bug.h>
87610 #include <linux/kernel.h>
87611 #include <linux/rculist.h>
87612+#include <linux/mm.h>
87613
87614+#ifdef CONFIG_DEBUG_LIST
87615 /*
87616 * Insert a new entry between two known consecutive entries.
87617 *
87618@@ -19,21 +21,40 @@
87619 * the prev/next entries already!
87620 */
87621
87622+static bool __list_add_debug(struct list_head *new,
87623+ struct list_head *prev,
87624+ struct list_head *next)
87625+{
87626+ if (unlikely(next->prev != prev)) {
87627+ printk(KERN_ERR "list_add corruption. next->prev should be "
87628+ "prev (%p), but was %p. (next=%p).\n",
87629+ prev, next->prev, next);
87630+ BUG();
87631+ return false;
87632+ }
87633+ if (unlikely(prev->next != next)) {
87634+ printk(KERN_ERR "list_add corruption. prev->next should be "
87635+ "next (%p), but was %p. (prev=%p).\n",
87636+ next, prev->next, prev);
87637+ BUG();
87638+ return false;
87639+ }
87640+ if (unlikely(new == prev || new == next)) {
87641+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
87642+ new, prev, next);
87643+ BUG();
87644+ return false;
87645+ }
87646+ return true;
87647+}
87648+
87649 void __list_add(struct list_head *new,
87650- struct list_head *prev,
87651- struct list_head *next)
87652+ struct list_head *prev,
87653+ struct list_head *next)
87654 {
87655- WARN(next->prev != prev,
87656- "list_add corruption. next->prev should be "
87657- "prev (%p), but was %p. (next=%p).\n",
87658- prev, next->prev, next);
87659- WARN(prev->next != next,
87660- "list_add corruption. prev->next should be "
87661- "next (%p), but was %p. (prev=%p).\n",
87662- next, prev->next, prev);
87663- WARN(new == prev || new == next,
87664- "list_add double add: new=%p, prev=%p, next=%p.\n",
87665- new, prev, next);
87666+ if (!__list_add_debug(new, prev, next))
87667+ return;
87668+
87669 next->prev = new;
87670 new->next = next;
87671 new->prev = prev;
87672@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
87673 }
87674 EXPORT_SYMBOL(__list_add);
87675
87676-void __list_del_entry(struct list_head *entry)
87677+static bool __list_del_entry_debug(struct list_head *entry)
87678 {
87679 struct list_head *prev, *next;
87680
87681 prev = entry->prev;
87682 next = entry->next;
87683
87684- if (WARN(next == LIST_POISON1,
87685- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
87686- entry, LIST_POISON1) ||
87687- WARN(prev == LIST_POISON2,
87688- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
87689- entry, LIST_POISON2) ||
87690- WARN(prev->next != entry,
87691- "list_del corruption. prev->next should be %p, "
87692- "but was %p\n", entry, prev->next) ||
87693- WARN(next->prev != entry,
87694- "list_del corruption. next->prev should be %p, "
87695- "but was %p\n", entry, next->prev))
87696+ if (unlikely(next == LIST_POISON1)) {
87697+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
87698+ entry, LIST_POISON1);
87699+ BUG();
87700+ return false;
87701+ }
87702+ if (unlikely(prev == LIST_POISON2)) {
87703+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
87704+ entry, LIST_POISON2);
87705+ BUG();
87706+ return false;
87707+ }
87708+ if (unlikely(entry->prev->next != entry)) {
87709+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
87710+ "but was %p\n", entry, prev->next);
87711+ BUG();
87712+ return false;
87713+ }
87714+ if (unlikely(entry->next->prev != entry)) {
87715+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
87716+ "but was %p\n", entry, next->prev);
87717+ BUG();
87718+ return false;
87719+ }
87720+ return true;
87721+}
87722+
87723+void __list_del_entry(struct list_head *entry)
87724+{
87725+ if (!__list_del_entry_debug(entry))
87726 return;
87727
87728- __list_del(prev, next);
87729+ __list_del(entry->prev, entry->next);
87730 }
87731 EXPORT_SYMBOL(__list_del_entry);
87732
87733@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
87734 void __list_add_rcu(struct list_head *new,
87735 struct list_head *prev, struct list_head *next)
87736 {
87737- WARN(next->prev != prev,
87738- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
87739- prev, next->prev, next);
87740- WARN(prev->next != next,
87741- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
87742- next, prev->next, prev);
87743+ if (!__list_add_debug(new, prev, next))
87744+ return;
87745+
87746 new->next = next;
87747 new->prev = prev;
87748 rcu_assign_pointer(list_next_rcu(prev), new);
87749 next->prev = new;
87750 }
87751 EXPORT_SYMBOL(__list_add_rcu);
87752+#endif
87753+
87754+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
87755+{
87756+#ifdef CONFIG_DEBUG_LIST
87757+ if (!__list_add_debug(new, prev, next))
87758+ return;
87759+#endif
87760+
87761+ pax_open_kernel();
87762+ next->prev = new;
87763+ new->next = next;
87764+ new->prev = prev;
87765+ prev->next = new;
87766+ pax_close_kernel();
87767+}
87768+EXPORT_SYMBOL(__pax_list_add);
87769+
87770+void pax_list_del(struct list_head *entry)
87771+{
87772+#ifdef CONFIG_DEBUG_LIST
87773+ if (!__list_del_entry_debug(entry))
87774+ return;
87775+#endif
87776+
87777+ pax_open_kernel();
87778+ __list_del(entry->prev, entry->next);
87779+ entry->next = LIST_POISON1;
87780+ entry->prev = LIST_POISON2;
87781+ pax_close_kernel();
87782+}
87783+EXPORT_SYMBOL(pax_list_del);
87784+
87785+void pax_list_del_init(struct list_head *entry)
87786+{
87787+ pax_open_kernel();
87788+ __list_del(entry->prev, entry->next);
87789+ INIT_LIST_HEAD(entry);
87790+ pax_close_kernel();
87791+}
87792+EXPORT_SYMBOL(pax_list_del_init);
87793+
87794+void __pax_list_add_rcu(struct list_head *new,
87795+ struct list_head *prev, struct list_head *next)
87796+{
87797+#ifdef CONFIG_DEBUG_LIST
87798+ if (!__list_add_debug(new, prev, next))
87799+ return;
87800+#endif
87801+
87802+ pax_open_kernel();
87803+ new->next = next;
87804+ new->prev = prev;
87805+ rcu_assign_pointer(list_next_rcu(prev), new);
87806+ next->prev = new;
87807+ pax_close_kernel();
87808+}
87809+EXPORT_SYMBOL(__pax_list_add_rcu);
87810+
87811+void pax_list_del_rcu(struct list_head *entry)
87812+{
87813+#ifdef CONFIG_DEBUG_LIST
87814+ if (!__list_del_entry_debug(entry))
87815+ return;
87816+#endif
87817+
87818+ pax_open_kernel();
87819+ __list_del(entry->prev, entry->next);
87820+ entry->next = LIST_POISON1;
87821+ entry->prev = LIST_POISON2;
87822+ pax_close_kernel();
87823+}
87824+EXPORT_SYMBOL(pax_list_del_rcu);
87825diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
87826index 1a53d49..ace934c 100644
87827--- a/lib/percpu-refcount.c
87828+++ b/lib/percpu-refcount.c
87829@@ -29,7 +29,7 @@
87830 * can't hit 0 before we've added up all the percpu refs.
87831 */
87832
87833-#define PCPU_COUNT_BIAS (1U << 31)
87834+#define PCPU_COUNT_BIAS (1U << 30)
87835
87836 /**
87837 * percpu_ref_init - initialize a percpu refcount
87838diff --git a/lib/radix-tree.c b/lib/radix-tree.c
87839index 7811ed3..f80ca19 100644
87840--- a/lib/radix-tree.c
87841+++ b/lib/radix-tree.c
87842@@ -93,7 +93,7 @@ struct radix_tree_preload {
87843 int nr;
87844 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
87845 };
87846-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
87847+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
87848
87849 static inline void *ptr_to_indirect(void *ptr)
87850 {
87851diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
87852index bb2b201..46abaf9 100644
87853--- a/lib/strncpy_from_user.c
87854+++ b/lib/strncpy_from_user.c
87855@@ -21,7 +21,7 @@
87856 */
87857 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
87858 {
87859- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87860+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87861 long res = 0;
87862
87863 /*
87864diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
87865index a28df52..3d55877 100644
87866--- a/lib/strnlen_user.c
87867+++ b/lib/strnlen_user.c
87868@@ -26,7 +26,7 @@
87869 */
87870 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
87871 {
87872- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87873+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
87874 long align, res = 0;
87875 unsigned long c;
87876
87877diff --git a/lib/swiotlb.c b/lib/swiotlb.c
87878index 4e8686c..3e8c92f 100644
87879--- a/lib/swiotlb.c
87880+++ b/lib/swiotlb.c
87881@@ -664,7 +664,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
87882
87883 void
87884 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
87885- dma_addr_t dev_addr)
87886+ dma_addr_t dev_addr, struct dma_attrs *attrs)
87887 {
87888 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
87889
87890diff --git a/lib/usercopy.c b/lib/usercopy.c
87891index 4f5b1dd..7cab418 100644
87892--- a/lib/usercopy.c
87893+++ b/lib/usercopy.c
87894@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
87895 WARN(1, "Buffer overflow detected!\n");
87896 }
87897 EXPORT_SYMBOL(copy_from_user_overflow);
87898+
87899+void copy_to_user_overflow(void)
87900+{
87901+ WARN(1, "Buffer overflow detected!\n");
87902+}
87903+EXPORT_SYMBOL(copy_to_user_overflow);
87904diff --git a/lib/vsprintf.c b/lib/vsprintf.c
87905index d76555c..62d4bfe 100644
87906--- a/lib/vsprintf.c
87907+++ b/lib/vsprintf.c
87908@@ -16,6 +16,9 @@
87909 * - scnprintf and vscnprintf
87910 */
87911
87912+#ifdef CONFIG_GRKERNSEC_HIDESYM
87913+#define __INCLUDED_BY_HIDESYM 1
87914+#endif
87915 #include <stdarg.h>
87916 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
87917 #include <linux/types.h>
87918@@ -1155,7 +1158,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
87919 return number(buf, end, *(const netdev_features_t *)addr, spec);
87920 }
87921
87922+#ifdef CONFIG_GRKERNSEC_HIDESYM
87923+int kptr_restrict __read_mostly = 2;
87924+#else
87925 int kptr_restrict __read_mostly;
87926+#endif
87927
87928 /*
87929 * Show a '%p' thing. A kernel extension is that the '%p' is followed
87930@@ -1168,6 +1175,7 @@ int kptr_restrict __read_mostly;
87931 * - 'f' For simple symbolic function names without offset
87932 * - 'S' For symbolic direct pointers with offset
87933 * - 's' For symbolic direct pointers without offset
87934+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
87935 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
87936 * - 'B' For backtraced symbolic direct pointers with offset
87937 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
87938@@ -1232,12 +1240,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87939
87940 if (!ptr && *fmt != 'K') {
87941 /*
87942- * Print (null) with the same width as a pointer so it makes
87943+ * Print (nil) with the same width as a pointer so it makes
87944 * tabular output look nice.
87945 */
87946 if (spec.field_width == -1)
87947 spec.field_width = default_width;
87948- return string(buf, end, "(null)", spec);
87949+ return string(buf, end, "(nil)", spec);
87950 }
87951
87952 switch (*fmt) {
87953@@ -1247,6 +1255,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87954 /* Fallthrough */
87955 case 'S':
87956 case 's':
87957+#ifdef CONFIG_GRKERNSEC_HIDESYM
87958+ break;
87959+#else
87960+ return symbol_string(buf, end, ptr, spec, fmt);
87961+#endif
87962+ case 'A':
87963 case 'B':
87964 return symbol_string(buf, end, ptr, spec, fmt);
87965 case 'R':
87966@@ -1302,6 +1316,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87967 va_end(va);
87968 return buf;
87969 }
87970+ case 'P':
87971+ break;
87972 case 'K':
87973 /*
87974 * %pK cannot be used in IRQ context because its test
87975@@ -1363,6 +1379,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
87976 ((const struct file *)ptr)->f_path.dentry,
87977 spec, fmt);
87978 }
87979+
87980+#ifdef CONFIG_GRKERNSEC_HIDESYM
87981+ /* 'P' = approved pointers to copy to userland,
87982+ as in the /proc/kallsyms case, as we make it display nothing
87983+ for non-root users, and the real contents for root users
87984+ Also ignore 'K' pointers, since we force their NULLing for non-root users
87985+ above
87986+ */
87987+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
87988+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
87989+ dump_stack();
87990+ ptr = NULL;
87991+ }
87992+#endif
87993+
87994 spec.flags |= SMALL;
87995 if (spec.field_width == -1) {
87996 spec.field_width = default_width;
87997@@ -2086,11 +2117,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
87998 typeof(type) value; \
87999 if (sizeof(type) == 8) { \
88000 args = PTR_ALIGN(args, sizeof(u32)); \
88001- *(u32 *)&value = *(u32 *)args; \
88002- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
88003+ *(u32 *)&value = *(const u32 *)args; \
88004+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
88005 } else { \
88006 args = PTR_ALIGN(args, sizeof(type)); \
88007- value = *(typeof(type) *)args; \
88008+ value = *(const typeof(type) *)args; \
88009 } \
88010 args += sizeof(type); \
88011 value; \
88012@@ -2153,7 +2184,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
88013 case FORMAT_TYPE_STR: {
88014 const char *str_arg = args;
88015 args += strlen(str_arg) + 1;
88016- str = string(str, end, (char *)str_arg, spec);
88017+ str = string(str, end, str_arg, spec);
88018 break;
88019 }
88020
88021diff --git a/localversion-grsec b/localversion-grsec
88022new file mode 100644
88023index 0000000..7cd6065
88024--- /dev/null
88025+++ b/localversion-grsec
88026@@ -0,0 +1 @@
88027+-grsec
88028diff --git a/mm/Kconfig b/mm/Kconfig
88029index 394838f..0e5f816 100644
88030--- a/mm/Kconfig
88031+++ b/mm/Kconfig
88032@@ -317,10 +317,11 @@ config KSM
88033 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
88034
88035 config DEFAULT_MMAP_MIN_ADDR
88036- int "Low address space to protect from user allocation"
88037+ int "Low address space to protect from user allocation"
88038 depends on MMU
88039- default 4096
88040- help
88041+ default 32768 if ALPHA || ARM || PARISC || SPARC32
88042+ default 65536
88043+ help
88044 This is the portion of low virtual memory which should be protected
88045 from userspace allocation. Keeping a user from writing to low pages
88046 can help reduce the impact of kernel NULL pointer bugs.
88047@@ -351,7 +352,7 @@ config MEMORY_FAILURE
88048
88049 config HWPOISON_INJECT
88050 tristate "HWPoison pages injector"
88051- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
88052+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
88053 select PROC_PAGE_MONITOR
88054
88055 config NOMMU_INITIAL_TRIM_EXCESS
88056diff --git a/mm/backing-dev.c b/mm/backing-dev.c
88057index ce682f7..1fb54f9 100644
88058--- a/mm/backing-dev.c
88059+++ b/mm/backing-dev.c
88060@@ -12,7 +12,7 @@
88061 #include <linux/device.h>
88062 #include <trace/events/writeback.h>
88063
88064-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
88065+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
88066
88067 struct backing_dev_info default_backing_dev_info = {
88068 .name = "default",
88069@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
88070 return err;
88071
88072 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
88073- atomic_long_inc_return(&bdi_seq));
88074+ atomic_long_inc_return_unchecked(&bdi_seq));
88075 if (err) {
88076 bdi_destroy(bdi);
88077 return err;
88078diff --git a/mm/filemap.c b/mm/filemap.c
88079index ae4846f..b0acebe 100644
88080--- a/mm/filemap.c
88081+++ b/mm/filemap.c
88082@@ -1768,7 +1768,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
88083 struct address_space *mapping = file->f_mapping;
88084
88085 if (!mapping->a_ops->readpage)
88086- return -ENOEXEC;
88087+ return -ENODEV;
88088 file_accessed(file);
88089 vma->vm_ops = &generic_file_vm_ops;
88090 return 0;
88091@@ -1950,7 +1950,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
88092
88093 while (bytes) {
88094 char __user *buf = iov->iov_base + base;
88095- int copy = min(bytes, iov->iov_len - base);
88096+ size_t copy = min(bytes, iov->iov_len - base);
88097
88098 base = 0;
88099 left = __copy_from_user_inatomic(vaddr, buf, copy);
88100@@ -1979,7 +1979,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
88101 BUG_ON(!in_atomic());
88102 kaddr = kmap_atomic(page);
88103 if (likely(i->nr_segs == 1)) {
88104- int left;
88105+ size_t left;
88106 char __user *buf = i->iov->iov_base + i->iov_offset;
88107 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
88108 copied = bytes - left;
88109@@ -2007,7 +2007,7 @@ size_t iov_iter_copy_from_user(struct page *page,
88110
88111 kaddr = kmap(page);
88112 if (likely(i->nr_segs == 1)) {
88113- int left;
88114+ size_t left;
88115 char __user *buf = i->iov->iov_base + i->iov_offset;
88116 left = __copy_from_user(kaddr + offset, buf, bytes);
88117 copied = bytes - left;
88118@@ -2037,7 +2037,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
88119 * zero-length segments (without overruning the iovec).
88120 */
88121 while (bytes || unlikely(i->count && !iov->iov_len)) {
88122- int copy;
88123+ size_t copy;
88124
88125 copy = min(bytes, iov->iov_len - base);
88126 BUG_ON(!i->count || i->count < copy);
88127@@ -2108,6 +2108,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
88128 *pos = i_size_read(inode);
88129
88130 if (limit != RLIM_INFINITY) {
88131+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
88132 if (*pos >= limit) {
88133 send_sig(SIGXFSZ, current, 0);
88134 return -EFBIG;
88135diff --git a/mm/fremap.c b/mm/fremap.c
88136index bbc4d66..117b798 100644
88137--- a/mm/fremap.c
88138+++ b/mm/fremap.c
88139@@ -163,6 +163,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
88140 retry:
88141 vma = find_vma(mm, start);
88142
88143+#ifdef CONFIG_PAX_SEGMEXEC
88144+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
88145+ goto out;
88146+#endif
88147+
88148 /*
88149 * Make sure the vma is shared, that it supports prefaulting,
88150 * and that the remapped range is valid and fully within
88151diff --git a/mm/highmem.c b/mm/highmem.c
88152index b32b70c..e512eb0 100644
88153--- a/mm/highmem.c
88154+++ b/mm/highmem.c
88155@@ -138,8 +138,9 @@ static void flush_all_zero_pkmaps(void)
88156 * So no dangers, even with speculative execution.
88157 */
88158 page = pte_page(pkmap_page_table[i]);
88159+ pax_open_kernel();
88160 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
88161-
88162+ pax_close_kernel();
88163 set_page_address(page, NULL);
88164 need_flush = 1;
88165 }
88166@@ -198,9 +199,11 @@ start:
88167 }
88168 }
88169 vaddr = PKMAP_ADDR(last_pkmap_nr);
88170+
88171+ pax_open_kernel();
88172 set_pte_at(&init_mm, vaddr,
88173 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
88174-
88175+ pax_close_kernel();
88176 pkmap_count[last_pkmap_nr] = 1;
88177 set_page_address(page, (void *)vaddr);
88178
88179diff --git a/mm/hugetlb.c b/mm/hugetlb.c
88180index 0b7656e..d21cefc 100644
88181--- a/mm/hugetlb.c
88182+++ b/mm/hugetlb.c
88183@@ -2094,15 +2094,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
88184 struct hstate *h = &default_hstate;
88185 unsigned long tmp;
88186 int ret;
88187+ ctl_table_no_const hugetlb_table;
88188
88189 tmp = h->max_huge_pages;
88190
88191 if (write && h->order >= MAX_ORDER)
88192 return -EINVAL;
88193
88194- table->data = &tmp;
88195- table->maxlen = sizeof(unsigned long);
88196- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
88197+ hugetlb_table = *table;
88198+ hugetlb_table.data = &tmp;
88199+ hugetlb_table.maxlen = sizeof(unsigned long);
88200+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
88201 if (ret)
88202 goto out;
88203
88204@@ -2147,15 +2149,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
88205 struct hstate *h = &default_hstate;
88206 unsigned long tmp;
88207 int ret;
88208+ ctl_table_no_const hugetlb_table;
88209
88210 tmp = h->nr_overcommit_huge_pages;
88211
88212 if (write && h->order >= MAX_ORDER)
88213 return -EINVAL;
88214
88215- table->data = &tmp;
88216- table->maxlen = sizeof(unsigned long);
88217- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
88218+ hugetlb_table = *table;
88219+ hugetlb_table.data = &tmp;
88220+ hugetlb_table.maxlen = sizeof(unsigned long);
88221+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
88222 if (ret)
88223 goto out;
88224
88225@@ -2605,6 +2609,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
88226 return 1;
88227 }
88228
88229+#ifdef CONFIG_PAX_SEGMEXEC
88230+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
88231+{
88232+ struct mm_struct *mm = vma->vm_mm;
88233+ struct vm_area_struct *vma_m;
88234+ unsigned long address_m;
88235+ pte_t *ptep_m;
88236+
88237+ vma_m = pax_find_mirror_vma(vma);
88238+ if (!vma_m)
88239+ return;
88240+
88241+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88242+ address_m = address + SEGMEXEC_TASK_SIZE;
88243+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
88244+ get_page(page_m);
88245+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
88246+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
88247+}
88248+#endif
88249+
88250 /*
88251 * Hugetlb_cow() should be called with page lock of the original hugepage held.
88252 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
88253@@ -2721,6 +2746,11 @@ retry_avoidcopy:
88254 make_huge_pte(vma, new_page, 1));
88255 page_remove_rmap(old_page);
88256 hugepage_add_new_anon_rmap(new_page, vma, address);
88257+
88258+#ifdef CONFIG_PAX_SEGMEXEC
88259+ pax_mirror_huge_pte(vma, address, new_page);
88260+#endif
88261+
88262 /* Make the old page be freed below */
88263 new_page = old_page;
88264 }
88265@@ -2883,6 +2913,10 @@ retry:
88266 && (vma->vm_flags & VM_SHARED)));
88267 set_huge_pte_at(mm, address, ptep, new_pte);
88268
88269+#ifdef CONFIG_PAX_SEGMEXEC
88270+ pax_mirror_huge_pte(vma, address, page);
88271+#endif
88272+
88273 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
88274 /* Optimization, do the COW without a second fault */
88275 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
88276@@ -2912,6 +2946,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
88277 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
88278 struct hstate *h = hstate_vma(vma);
88279
88280+#ifdef CONFIG_PAX_SEGMEXEC
88281+ struct vm_area_struct *vma_m;
88282+#endif
88283+
88284 address &= huge_page_mask(h);
88285
88286 ptep = huge_pte_offset(mm, address);
88287@@ -2925,6 +2963,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
88288 VM_FAULT_SET_HINDEX(hstate_index(h));
88289 }
88290
88291+#ifdef CONFIG_PAX_SEGMEXEC
88292+ vma_m = pax_find_mirror_vma(vma);
88293+ if (vma_m) {
88294+ unsigned long address_m;
88295+
88296+ if (vma->vm_start > vma_m->vm_start) {
88297+ address_m = address;
88298+ address -= SEGMEXEC_TASK_SIZE;
88299+ vma = vma_m;
88300+ h = hstate_vma(vma);
88301+ } else
88302+ address_m = address + SEGMEXEC_TASK_SIZE;
88303+
88304+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
88305+ return VM_FAULT_OOM;
88306+ address_m &= HPAGE_MASK;
88307+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
88308+ }
88309+#endif
88310+
88311 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
88312 if (!ptep)
88313 return VM_FAULT_OOM;
88314diff --git a/mm/internal.h b/mm/internal.h
88315index 684f7aa..9eb9edc 100644
88316--- a/mm/internal.h
88317+++ b/mm/internal.h
88318@@ -97,6 +97,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
88319 * in mm/page_alloc.c
88320 */
88321 extern void __free_pages_bootmem(struct page *page, unsigned int order);
88322+extern void free_compound_page(struct page *page);
88323 extern void prep_compound_page(struct page *page, unsigned long order);
88324 #ifdef CONFIG_MEMORY_FAILURE
88325 extern bool is_free_buddy_page(struct page *page);
88326@@ -352,7 +353,7 @@ extern u32 hwpoison_filter_enable;
88327
88328 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
88329 unsigned long, unsigned long,
88330- unsigned long, unsigned long);
88331+ unsigned long, unsigned long) __intentional_overflow(-1);
88332
88333 extern void set_pageblock_order(void);
88334 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
88335diff --git a/mm/kmemleak.c b/mm/kmemleak.c
88336index e126b0e..e986018 100644
88337--- a/mm/kmemleak.c
88338+++ b/mm/kmemleak.c
88339@@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
88340
88341 for (i = 0; i < object->trace_len; i++) {
88342 void *ptr = (void *)object->trace[i];
88343- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
88344+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
88345 }
88346 }
88347
88348@@ -1851,7 +1851,7 @@ static int __init kmemleak_late_init(void)
88349 return -ENOMEM;
88350 }
88351
88352- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
88353+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
88354 &kmemleak_fops);
88355 if (!dentry)
88356 pr_warning("Failed to create the debugfs kmemleak file\n");
88357diff --git a/mm/maccess.c b/mm/maccess.c
88358index d53adf9..03a24bf 100644
88359--- a/mm/maccess.c
88360+++ b/mm/maccess.c
88361@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
88362 set_fs(KERNEL_DS);
88363 pagefault_disable();
88364 ret = __copy_from_user_inatomic(dst,
88365- (__force const void __user *)src, size);
88366+ (const void __force_user *)src, size);
88367 pagefault_enable();
88368 set_fs(old_fs);
88369
88370@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
88371
88372 set_fs(KERNEL_DS);
88373 pagefault_disable();
88374- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
88375+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
88376 pagefault_enable();
88377 set_fs(old_fs);
88378
88379diff --git a/mm/madvise.c b/mm/madvise.c
88380index 539eeb9..e24a987 100644
88381--- a/mm/madvise.c
88382+++ b/mm/madvise.c
88383@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
88384 pgoff_t pgoff;
88385 unsigned long new_flags = vma->vm_flags;
88386
88387+#ifdef CONFIG_PAX_SEGMEXEC
88388+ struct vm_area_struct *vma_m;
88389+#endif
88390+
88391 switch (behavior) {
88392 case MADV_NORMAL:
88393 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
88394@@ -126,6 +130,13 @@ success:
88395 /*
88396 * vm_flags is protected by the mmap_sem held in write mode.
88397 */
88398+
88399+#ifdef CONFIG_PAX_SEGMEXEC
88400+ vma_m = pax_find_mirror_vma(vma);
88401+ if (vma_m)
88402+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
88403+#endif
88404+
88405 vma->vm_flags = new_flags;
88406
88407 out:
88408@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
88409 struct vm_area_struct **prev,
88410 unsigned long start, unsigned long end)
88411 {
88412+
88413+#ifdef CONFIG_PAX_SEGMEXEC
88414+ struct vm_area_struct *vma_m;
88415+#endif
88416+
88417 *prev = vma;
88418 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
88419 return -EINVAL;
88420@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
88421 zap_page_range(vma, start, end - start, &details);
88422 } else
88423 zap_page_range(vma, start, end - start, NULL);
88424+
88425+#ifdef CONFIG_PAX_SEGMEXEC
88426+ vma_m = pax_find_mirror_vma(vma);
88427+ if (vma_m) {
88428+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
88429+ struct zap_details details = {
88430+ .nonlinear_vma = vma_m,
88431+ .last_index = ULONG_MAX,
88432+ };
88433+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
88434+ } else
88435+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
88436+ }
88437+#endif
88438+
88439 return 0;
88440 }
88441
88442@@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
88443 if (end < start)
88444 return error;
88445
88446+#ifdef CONFIG_PAX_SEGMEXEC
88447+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
88448+ if (end > SEGMEXEC_TASK_SIZE)
88449+ return error;
88450+ } else
88451+#endif
88452+
88453+ if (end > TASK_SIZE)
88454+ return error;
88455+
88456 error = 0;
88457 if (end == start)
88458 return error;
88459diff --git a/mm/memory-failure.c b/mm/memory-failure.c
88460index 9aea53f..f239c30 100644
88461--- a/mm/memory-failure.c
88462+++ b/mm/memory-failure.c
88463@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
88464
88465 int sysctl_memory_failure_recovery __read_mostly = 1;
88466
88467-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
88468+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
88469
88470 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
88471
88472@@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
88473 pfn, t->comm, t->pid);
88474 si.si_signo = SIGBUS;
88475 si.si_errno = 0;
88476- si.si_addr = (void *)addr;
88477+ si.si_addr = (void __user *)addr;
88478 #ifdef __ARCH_SI_TRAPNO
88479 si.si_trapno = trapno;
88480 #endif
88481@@ -762,7 +762,7 @@ static struct page_state {
88482 unsigned long res;
88483 char *msg;
88484 int (*action)(struct page *p, unsigned long pfn);
88485-} error_states[] = {
88486+} __do_const error_states[] = {
88487 { reserved, reserved, "reserved kernel", me_kernel },
88488 /*
88489 * free pages are specially detected outside this table:
88490@@ -1063,7 +1063,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88491 nr_pages = 1 << compound_order(hpage);
88492 else /* normal page or thp */
88493 nr_pages = 1;
88494- atomic_long_add(nr_pages, &num_poisoned_pages);
88495+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
88496
88497 /*
88498 * We need/can do nothing about count=0 pages.
88499@@ -1093,7 +1093,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88500 if (!PageHWPoison(hpage)
88501 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
88502 || (p != hpage && TestSetPageHWPoison(hpage))) {
88503- atomic_long_sub(nr_pages, &num_poisoned_pages);
88504+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88505 return 0;
88506 }
88507 set_page_hwpoison_huge_page(hpage);
88508@@ -1162,7 +1162,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
88509 }
88510 if (hwpoison_filter(p)) {
88511 if (TestClearPageHWPoison(p))
88512- atomic_long_sub(nr_pages, &num_poisoned_pages);
88513+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88514 unlock_page(hpage);
88515 put_page(hpage);
88516 return 0;
88517@@ -1380,7 +1380,7 @@ int unpoison_memory(unsigned long pfn)
88518 return 0;
88519 }
88520 if (TestClearPageHWPoison(p))
88521- atomic_long_dec(&num_poisoned_pages);
88522+ atomic_long_dec_unchecked(&num_poisoned_pages);
88523 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
88524 return 0;
88525 }
88526@@ -1394,7 +1394,7 @@ int unpoison_memory(unsigned long pfn)
88527 */
88528 if (TestClearPageHWPoison(page)) {
88529 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
88530- atomic_long_sub(nr_pages, &num_poisoned_pages);
88531+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
88532 freeit = 1;
88533 if (PageHuge(page))
88534 clear_page_hwpoison_huge_page(page);
88535@@ -1533,11 +1533,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
88536 if (PageHuge(page)) {
88537 set_page_hwpoison_huge_page(hpage);
88538 dequeue_hwpoisoned_huge_page(hpage);
88539- atomic_long_add(1 << compound_order(hpage),
88540+ atomic_long_add_unchecked(1 << compound_order(hpage),
88541 &num_poisoned_pages);
88542 } else {
88543 SetPageHWPoison(page);
88544- atomic_long_inc(&num_poisoned_pages);
88545+ atomic_long_inc_unchecked(&num_poisoned_pages);
88546 }
88547 }
88548 return ret;
88549@@ -1576,7 +1576,7 @@ static int __soft_offline_page(struct page *page, int flags)
88550 put_page(page);
88551 pr_info("soft_offline: %#lx: invalidated\n", pfn);
88552 SetPageHWPoison(page);
88553- atomic_long_inc(&num_poisoned_pages);
88554+ atomic_long_inc_unchecked(&num_poisoned_pages);
88555 return 0;
88556 }
88557
88558@@ -1621,7 +1621,7 @@ static int __soft_offline_page(struct page *page, int flags)
88559 if (!is_free_buddy_page(page))
88560 pr_info("soft offline: %#lx: page leaked\n",
88561 pfn);
88562- atomic_long_inc(&num_poisoned_pages);
88563+ atomic_long_inc_unchecked(&num_poisoned_pages);
88564 }
88565 } else {
88566 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
88567@@ -1682,11 +1682,11 @@ int soft_offline_page(struct page *page, int flags)
88568 if (PageHuge(page)) {
88569 set_page_hwpoison_huge_page(hpage);
88570 dequeue_hwpoisoned_huge_page(hpage);
88571- atomic_long_add(1 << compound_order(hpage),
88572+ atomic_long_add_unchecked(1 << compound_order(hpage),
88573 &num_poisoned_pages);
88574 } else {
88575 SetPageHWPoison(page);
88576- atomic_long_inc(&num_poisoned_pages);
88577+ atomic_long_inc_unchecked(&num_poisoned_pages);
88578 }
88579 }
88580 unset:
88581diff --git a/mm/memory.c b/mm/memory.c
88582index d176154..cd1b387 100644
88583--- a/mm/memory.c
88584+++ b/mm/memory.c
88585@@ -402,6 +402,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
88586 free_pte_range(tlb, pmd, addr);
88587 } while (pmd++, addr = next, addr != end);
88588
88589+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
88590 start &= PUD_MASK;
88591 if (start < floor)
88592 return;
88593@@ -416,6 +417,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
88594 pmd = pmd_offset(pud, start);
88595 pud_clear(pud);
88596 pmd_free_tlb(tlb, pmd, start);
88597+#endif
88598+
88599 }
88600
88601 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88602@@ -435,6 +438,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88603 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
88604 } while (pud++, addr = next, addr != end);
88605
88606+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
88607 start &= PGDIR_MASK;
88608 if (start < floor)
88609 return;
88610@@ -449,6 +453,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
88611 pud = pud_offset(pgd, start);
88612 pgd_clear(pgd);
88613 pud_free_tlb(tlb, pud, start);
88614+#endif
88615+
88616 }
88617
88618 /*
88619@@ -1636,12 +1642,6 @@ no_page_table:
88620 return page;
88621 }
88622
88623-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
88624-{
88625- return stack_guard_page_start(vma, addr) ||
88626- stack_guard_page_end(vma, addr+PAGE_SIZE);
88627-}
88628-
88629 /**
88630 * __get_user_pages() - pin user pages in memory
88631 * @tsk: task_struct of target task
88632@@ -1728,10 +1728,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88633
88634 i = 0;
88635
88636- do {
88637+ while (nr_pages) {
88638 struct vm_area_struct *vma;
88639
88640- vma = find_extend_vma(mm, start);
88641+ vma = find_vma(mm, start);
88642 if (!vma && in_gate_area(mm, start)) {
88643 unsigned long pg = start & PAGE_MASK;
88644 pgd_t *pgd;
88645@@ -1780,7 +1780,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88646 goto next_page;
88647 }
88648
88649- if (!vma ||
88650+ if (!vma || start < vma->vm_start ||
88651 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
88652 !(vm_flags & vma->vm_flags))
88653 return i ? : -EFAULT;
88654@@ -1809,11 +1809,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
88655 int ret;
88656 unsigned int fault_flags = 0;
88657
88658- /* For mlock, just skip the stack guard page. */
88659- if (foll_flags & FOLL_MLOCK) {
88660- if (stack_guard_page(vma, start))
88661- goto next_page;
88662- }
88663 if (foll_flags & FOLL_WRITE)
88664 fault_flags |= FAULT_FLAG_WRITE;
88665 if (nonblocking)
88666@@ -1893,7 +1888,7 @@ next_page:
88667 start += page_increm * PAGE_SIZE;
88668 nr_pages -= page_increm;
88669 } while (nr_pages && start < vma->vm_end);
88670- } while (nr_pages);
88671+ }
88672 return i;
88673 }
88674 EXPORT_SYMBOL(__get_user_pages);
88675@@ -2100,6 +2095,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
88676 page_add_file_rmap(page);
88677 set_pte_at(mm, addr, pte, mk_pte(page, prot));
88678
88679+#ifdef CONFIG_PAX_SEGMEXEC
88680+ pax_mirror_file_pte(vma, addr, page, ptl);
88681+#endif
88682+
88683 retval = 0;
88684 pte_unmap_unlock(pte, ptl);
88685 return retval;
88686@@ -2144,9 +2143,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
88687 if (!page_count(page))
88688 return -EINVAL;
88689 if (!(vma->vm_flags & VM_MIXEDMAP)) {
88690+
88691+#ifdef CONFIG_PAX_SEGMEXEC
88692+ struct vm_area_struct *vma_m;
88693+#endif
88694+
88695 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
88696 BUG_ON(vma->vm_flags & VM_PFNMAP);
88697 vma->vm_flags |= VM_MIXEDMAP;
88698+
88699+#ifdef CONFIG_PAX_SEGMEXEC
88700+ vma_m = pax_find_mirror_vma(vma);
88701+ if (vma_m)
88702+ vma_m->vm_flags |= VM_MIXEDMAP;
88703+#endif
88704+
88705 }
88706 return insert_page(vma, addr, page, vma->vm_page_prot);
88707 }
88708@@ -2229,6 +2240,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
88709 unsigned long pfn)
88710 {
88711 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
88712+ BUG_ON(vma->vm_mirror);
88713
88714 if (addr < vma->vm_start || addr >= vma->vm_end)
88715 return -EFAULT;
88716@@ -2476,7 +2488,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
88717
88718 BUG_ON(pud_huge(*pud));
88719
88720- pmd = pmd_alloc(mm, pud, addr);
88721+ pmd = (mm == &init_mm) ?
88722+ pmd_alloc_kernel(mm, pud, addr) :
88723+ pmd_alloc(mm, pud, addr);
88724 if (!pmd)
88725 return -ENOMEM;
88726 do {
88727@@ -2496,7 +2510,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
88728 unsigned long next;
88729 int err;
88730
88731- pud = pud_alloc(mm, pgd, addr);
88732+ pud = (mm == &init_mm) ?
88733+ pud_alloc_kernel(mm, pgd, addr) :
88734+ pud_alloc(mm, pgd, addr);
88735 if (!pud)
88736 return -ENOMEM;
88737 do {
88738@@ -2584,6 +2600,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
88739 copy_user_highpage(dst, src, va, vma);
88740 }
88741
88742+#ifdef CONFIG_PAX_SEGMEXEC
88743+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
88744+{
88745+ struct mm_struct *mm = vma->vm_mm;
88746+ spinlock_t *ptl;
88747+ pte_t *pte, entry;
88748+
88749+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
88750+ entry = *pte;
88751+ if (!pte_present(entry)) {
88752+ if (!pte_none(entry)) {
88753+ BUG_ON(pte_file(entry));
88754+ free_swap_and_cache(pte_to_swp_entry(entry));
88755+ pte_clear_not_present_full(mm, address, pte, 0);
88756+ }
88757+ } else {
88758+ struct page *page;
88759+
88760+ flush_cache_page(vma, address, pte_pfn(entry));
88761+ entry = ptep_clear_flush(vma, address, pte);
88762+ BUG_ON(pte_dirty(entry));
88763+ page = vm_normal_page(vma, address, entry);
88764+ if (page) {
88765+ update_hiwater_rss(mm);
88766+ if (PageAnon(page))
88767+ dec_mm_counter_fast(mm, MM_ANONPAGES);
88768+ else
88769+ dec_mm_counter_fast(mm, MM_FILEPAGES);
88770+ page_remove_rmap(page);
88771+ page_cache_release(page);
88772+ }
88773+ }
88774+ pte_unmap_unlock(pte, ptl);
88775+}
88776+
88777+/* PaX: if vma is mirrored, synchronize the mirror's PTE
88778+ *
88779+ * the ptl of the lower mapped page is held on entry and is not released on exit
88780+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
88781+ */
88782+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
88783+{
88784+ struct mm_struct *mm = vma->vm_mm;
88785+ unsigned long address_m;
88786+ spinlock_t *ptl_m;
88787+ struct vm_area_struct *vma_m;
88788+ pmd_t *pmd_m;
88789+ pte_t *pte_m, entry_m;
88790+
88791+ BUG_ON(!page_m || !PageAnon(page_m));
88792+
88793+ vma_m = pax_find_mirror_vma(vma);
88794+ if (!vma_m)
88795+ return;
88796+
88797+ BUG_ON(!PageLocked(page_m));
88798+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88799+ address_m = address + SEGMEXEC_TASK_SIZE;
88800+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88801+ pte_m = pte_offset_map(pmd_m, address_m);
88802+ ptl_m = pte_lockptr(mm, pmd_m);
88803+ if (ptl != ptl_m) {
88804+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88805+ if (!pte_none(*pte_m))
88806+ goto out;
88807+ }
88808+
88809+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
88810+ page_cache_get(page_m);
88811+ page_add_anon_rmap(page_m, vma_m, address_m);
88812+ inc_mm_counter_fast(mm, MM_ANONPAGES);
88813+ set_pte_at(mm, address_m, pte_m, entry_m);
88814+ update_mmu_cache(vma_m, address_m, pte_m);
88815+out:
88816+ if (ptl != ptl_m)
88817+ spin_unlock(ptl_m);
88818+ pte_unmap(pte_m);
88819+ unlock_page(page_m);
88820+}
88821+
88822+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
88823+{
88824+ struct mm_struct *mm = vma->vm_mm;
88825+ unsigned long address_m;
88826+ spinlock_t *ptl_m;
88827+ struct vm_area_struct *vma_m;
88828+ pmd_t *pmd_m;
88829+ pte_t *pte_m, entry_m;
88830+
88831+ BUG_ON(!page_m || PageAnon(page_m));
88832+
88833+ vma_m = pax_find_mirror_vma(vma);
88834+ if (!vma_m)
88835+ return;
88836+
88837+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88838+ address_m = address + SEGMEXEC_TASK_SIZE;
88839+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88840+ pte_m = pte_offset_map(pmd_m, address_m);
88841+ ptl_m = pte_lockptr(mm, pmd_m);
88842+ if (ptl != ptl_m) {
88843+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88844+ if (!pte_none(*pte_m))
88845+ goto out;
88846+ }
88847+
88848+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
88849+ page_cache_get(page_m);
88850+ page_add_file_rmap(page_m);
88851+ inc_mm_counter_fast(mm, MM_FILEPAGES);
88852+ set_pte_at(mm, address_m, pte_m, entry_m);
88853+ update_mmu_cache(vma_m, address_m, pte_m);
88854+out:
88855+ if (ptl != ptl_m)
88856+ spin_unlock(ptl_m);
88857+ pte_unmap(pte_m);
88858+}
88859+
88860+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
88861+{
88862+ struct mm_struct *mm = vma->vm_mm;
88863+ unsigned long address_m;
88864+ spinlock_t *ptl_m;
88865+ struct vm_area_struct *vma_m;
88866+ pmd_t *pmd_m;
88867+ pte_t *pte_m, entry_m;
88868+
88869+ vma_m = pax_find_mirror_vma(vma);
88870+ if (!vma_m)
88871+ return;
88872+
88873+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
88874+ address_m = address + SEGMEXEC_TASK_SIZE;
88875+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
88876+ pte_m = pte_offset_map(pmd_m, address_m);
88877+ ptl_m = pte_lockptr(mm, pmd_m);
88878+ if (ptl != ptl_m) {
88879+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
88880+ if (!pte_none(*pte_m))
88881+ goto out;
88882+ }
88883+
88884+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
88885+ set_pte_at(mm, address_m, pte_m, entry_m);
88886+out:
88887+ if (ptl != ptl_m)
88888+ spin_unlock(ptl_m);
88889+ pte_unmap(pte_m);
88890+}
88891+
88892+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
88893+{
88894+ struct page *page_m;
88895+ pte_t entry;
88896+
88897+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
88898+ goto out;
88899+
88900+ entry = *pte;
88901+ page_m = vm_normal_page(vma, address, entry);
88902+ if (!page_m)
88903+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
88904+ else if (PageAnon(page_m)) {
88905+ if (pax_find_mirror_vma(vma)) {
88906+ pte_unmap_unlock(pte, ptl);
88907+ lock_page(page_m);
88908+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
88909+ if (pte_same(entry, *pte))
88910+ pax_mirror_anon_pte(vma, address, page_m, ptl);
88911+ else
88912+ unlock_page(page_m);
88913+ }
88914+ } else
88915+ pax_mirror_file_pte(vma, address, page_m, ptl);
88916+
88917+out:
88918+ pte_unmap_unlock(pte, ptl);
88919+}
88920+#endif
88921+
88922 /*
88923 * This routine handles present pages, when users try to write
88924 * to a shared page. It is done by copying the page to a new address
88925@@ -2800,6 +2996,12 @@ gotten:
88926 */
88927 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
88928 if (likely(pte_same(*page_table, orig_pte))) {
88929+
88930+#ifdef CONFIG_PAX_SEGMEXEC
88931+ if (pax_find_mirror_vma(vma))
88932+ BUG_ON(!trylock_page(new_page));
88933+#endif
88934+
88935 if (old_page) {
88936 if (!PageAnon(old_page)) {
88937 dec_mm_counter_fast(mm, MM_FILEPAGES);
88938@@ -2851,6 +3053,10 @@ gotten:
88939 page_remove_rmap(old_page);
88940 }
88941
88942+#ifdef CONFIG_PAX_SEGMEXEC
88943+ pax_mirror_anon_pte(vma, address, new_page, ptl);
88944+#endif
88945+
88946 /* Free the old page.. */
88947 new_page = old_page;
88948 ret |= VM_FAULT_WRITE;
88949@@ -3128,6 +3334,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
88950 swap_free(entry);
88951 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
88952 try_to_free_swap(page);
88953+
88954+#ifdef CONFIG_PAX_SEGMEXEC
88955+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
88956+#endif
88957+
88958 unlock_page(page);
88959 if (page != swapcache) {
88960 /*
88961@@ -3151,6 +3362,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
88962
88963 /* No need to invalidate - it was non-present before */
88964 update_mmu_cache(vma, address, page_table);
88965+
88966+#ifdef CONFIG_PAX_SEGMEXEC
88967+ pax_mirror_anon_pte(vma, address, page, ptl);
88968+#endif
88969+
88970 unlock:
88971 pte_unmap_unlock(page_table, ptl);
88972 out:
88973@@ -3170,40 +3386,6 @@ out_release:
88974 }
88975
88976 /*
88977- * This is like a special single-page "expand_{down|up}wards()",
88978- * except we must first make sure that 'address{-|+}PAGE_SIZE'
88979- * doesn't hit another vma.
88980- */
88981-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
88982-{
88983- address &= PAGE_MASK;
88984- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
88985- struct vm_area_struct *prev = vma->vm_prev;
88986-
88987- /*
88988- * Is there a mapping abutting this one below?
88989- *
88990- * That's only ok if it's the same stack mapping
88991- * that has gotten split..
88992- */
88993- if (prev && prev->vm_end == address)
88994- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
88995-
88996- expand_downwards(vma, address - PAGE_SIZE);
88997- }
88998- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
88999- struct vm_area_struct *next = vma->vm_next;
89000-
89001- /* As VM_GROWSDOWN but s/below/above/ */
89002- if (next && next->vm_start == address + PAGE_SIZE)
89003- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
89004-
89005- expand_upwards(vma, address + PAGE_SIZE);
89006- }
89007- return 0;
89008-}
89009-
89010-/*
89011 * We enter with non-exclusive mmap_sem (to exclude vma changes,
89012 * but allow concurrent faults), and pte mapped but not yet locked.
89013 * We return with mmap_sem still held, but pte unmapped and unlocked.
89014@@ -3212,27 +3394,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
89015 unsigned long address, pte_t *page_table, pmd_t *pmd,
89016 unsigned int flags)
89017 {
89018- struct page *page;
89019+ struct page *page = NULL;
89020 spinlock_t *ptl;
89021 pte_t entry;
89022
89023- pte_unmap(page_table);
89024-
89025- /* Check if we need to add a guard page to the stack */
89026- if (check_stack_guard_page(vma, address) < 0)
89027- return VM_FAULT_SIGBUS;
89028-
89029- /* Use the zero-page for reads */
89030 if (!(flags & FAULT_FLAG_WRITE)) {
89031 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
89032 vma->vm_page_prot));
89033- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
89034+ ptl = pte_lockptr(mm, pmd);
89035+ spin_lock(ptl);
89036 if (!pte_none(*page_table))
89037 goto unlock;
89038 goto setpte;
89039 }
89040
89041 /* Allocate our own private page. */
89042+ pte_unmap(page_table);
89043+
89044 if (unlikely(anon_vma_prepare(vma)))
89045 goto oom;
89046 page = alloc_zeroed_user_highpage_movable(vma, address);
89047@@ -3256,6 +3434,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
89048 if (!pte_none(*page_table))
89049 goto release;
89050
89051+#ifdef CONFIG_PAX_SEGMEXEC
89052+ if (pax_find_mirror_vma(vma))
89053+ BUG_ON(!trylock_page(page));
89054+#endif
89055+
89056 inc_mm_counter_fast(mm, MM_ANONPAGES);
89057 page_add_new_anon_rmap(page, vma, address);
89058 setpte:
89059@@ -3263,6 +3446,12 @@ setpte:
89060
89061 /* No need to invalidate - it was non-present before */
89062 update_mmu_cache(vma, address, page_table);
89063+
89064+#ifdef CONFIG_PAX_SEGMEXEC
89065+ if (page)
89066+ pax_mirror_anon_pte(vma, address, page, ptl);
89067+#endif
89068+
89069 unlock:
89070 pte_unmap_unlock(page_table, ptl);
89071 return 0;
89072@@ -3406,6 +3595,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89073 */
89074 /* Only go through if we didn't race with anybody else... */
89075 if (likely(pte_same(*page_table, orig_pte))) {
89076+
89077+#ifdef CONFIG_PAX_SEGMEXEC
89078+ if (anon && pax_find_mirror_vma(vma))
89079+ BUG_ON(!trylock_page(page));
89080+#endif
89081+
89082 flush_icache_page(vma, page);
89083 entry = mk_pte(page, vma->vm_page_prot);
89084 if (flags & FAULT_FLAG_WRITE)
89085@@ -3427,6 +3622,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89086
89087 /* no need to invalidate: a not-present page won't be cached */
89088 update_mmu_cache(vma, address, page_table);
89089+
89090+#ifdef CONFIG_PAX_SEGMEXEC
89091+ if (anon)
89092+ pax_mirror_anon_pte(vma, address, page, ptl);
89093+ else
89094+ pax_mirror_file_pte(vma, address, page, ptl);
89095+#endif
89096+
89097 } else {
89098 if (cow_page)
89099 mem_cgroup_uncharge_page(cow_page);
89100@@ -3737,6 +3940,12 @@ static int handle_pte_fault(struct mm_struct *mm,
89101 if (flags & FAULT_FLAG_WRITE)
89102 flush_tlb_fix_spurious_fault(vma, address);
89103 }
89104+
89105+#ifdef CONFIG_PAX_SEGMEXEC
89106+ pax_mirror_pte(vma, address, pte, pmd, ptl);
89107+ return 0;
89108+#endif
89109+
89110 unlock:
89111 pte_unmap_unlock(pte, ptl);
89112 return 0;
89113@@ -3753,9 +3962,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
89114 pmd_t *pmd;
89115 pte_t *pte;
89116
89117+#ifdef CONFIG_PAX_SEGMEXEC
89118+ struct vm_area_struct *vma_m;
89119+#endif
89120+
89121 if (unlikely(is_vm_hugetlb_page(vma)))
89122 return hugetlb_fault(mm, vma, address, flags);
89123
89124+#ifdef CONFIG_PAX_SEGMEXEC
89125+ vma_m = pax_find_mirror_vma(vma);
89126+ if (vma_m) {
89127+ unsigned long address_m;
89128+ pgd_t *pgd_m;
89129+ pud_t *pud_m;
89130+ pmd_t *pmd_m;
89131+
89132+ if (vma->vm_start > vma_m->vm_start) {
89133+ address_m = address;
89134+ address -= SEGMEXEC_TASK_SIZE;
89135+ vma = vma_m;
89136+ } else
89137+ address_m = address + SEGMEXEC_TASK_SIZE;
89138+
89139+ pgd_m = pgd_offset(mm, address_m);
89140+ pud_m = pud_alloc(mm, pgd_m, address_m);
89141+ if (!pud_m)
89142+ return VM_FAULT_OOM;
89143+ pmd_m = pmd_alloc(mm, pud_m, address_m);
89144+ if (!pmd_m)
89145+ return VM_FAULT_OOM;
89146+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
89147+ return VM_FAULT_OOM;
89148+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
89149+ }
89150+#endif
89151+
89152 retry:
89153 pgd = pgd_offset(mm, address);
89154 pud = pud_alloc(mm, pgd, address);
89155@@ -3894,6 +4135,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
89156 spin_unlock(&mm->page_table_lock);
89157 return 0;
89158 }
89159+
89160+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
89161+{
89162+ pud_t *new = pud_alloc_one(mm, address);
89163+ if (!new)
89164+ return -ENOMEM;
89165+
89166+ smp_wmb(); /* See comment in __pte_alloc */
89167+
89168+ spin_lock(&mm->page_table_lock);
89169+ if (pgd_present(*pgd)) /* Another has populated it */
89170+ pud_free(mm, new);
89171+ else
89172+ pgd_populate_kernel(mm, pgd, new);
89173+ spin_unlock(&mm->page_table_lock);
89174+ return 0;
89175+}
89176 #endif /* __PAGETABLE_PUD_FOLDED */
89177
89178 #ifndef __PAGETABLE_PMD_FOLDED
89179@@ -3924,6 +4182,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
89180 spin_unlock(&mm->page_table_lock);
89181 return 0;
89182 }
89183+
89184+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
89185+{
89186+ pmd_t *new = pmd_alloc_one(mm, address);
89187+ if (!new)
89188+ return -ENOMEM;
89189+
89190+ smp_wmb(); /* See comment in __pte_alloc */
89191+
89192+ spin_lock(&mm->page_table_lock);
89193+#ifndef __ARCH_HAS_4LEVEL_HACK
89194+ if (pud_present(*pud)) /* Another has populated it */
89195+ pmd_free(mm, new);
89196+ else
89197+ pud_populate_kernel(mm, pud, new);
89198+#else
89199+ if (pgd_present(*pud)) /* Another has populated it */
89200+ pmd_free(mm, new);
89201+ else
89202+ pgd_populate_kernel(mm, pud, new);
89203+#endif /* __ARCH_HAS_4LEVEL_HACK */
89204+ spin_unlock(&mm->page_table_lock);
89205+ return 0;
89206+}
89207 #endif /* __PAGETABLE_PMD_FOLDED */
89208
89209 #if !defined(__HAVE_ARCH_GATE_AREA)
89210@@ -3937,7 +4219,7 @@ static int __init gate_vma_init(void)
89211 gate_vma.vm_start = FIXADDR_USER_START;
89212 gate_vma.vm_end = FIXADDR_USER_END;
89213 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
89214- gate_vma.vm_page_prot = __P101;
89215+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
89216
89217 return 0;
89218 }
89219@@ -4071,8 +4353,8 @@ out:
89220 return ret;
89221 }
89222
89223-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
89224- void *buf, int len, int write)
89225+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
89226+ void *buf, size_t len, int write)
89227 {
89228 resource_size_t phys_addr;
89229 unsigned long prot = 0;
89230@@ -4098,8 +4380,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
89231 * Access another process' address space as given in mm. If non-NULL, use the
89232 * given task for page fault accounting.
89233 */
89234-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89235- unsigned long addr, void *buf, int len, int write)
89236+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89237+ unsigned long addr, void *buf, size_t len, int write)
89238 {
89239 struct vm_area_struct *vma;
89240 void *old_buf = buf;
89241@@ -4107,7 +4389,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89242 down_read(&mm->mmap_sem);
89243 /* ignore errors, just check how much was successfully transferred */
89244 while (len) {
89245- int bytes, ret, offset;
89246+ ssize_t bytes, ret, offset;
89247 void *maddr;
89248 struct page *page = NULL;
89249
89250@@ -4166,8 +4448,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
89251 *
89252 * The caller must hold a reference on @mm.
89253 */
89254-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
89255- void *buf, int len, int write)
89256+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
89257+ void *buf, size_t len, int write)
89258 {
89259 return __access_remote_vm(NULL, mm, addr, buf, len, write);
89260 }
89261@@ -4177,11 +4459,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
89262 * Source/target buffer must be kernel space,
89263 * Do not walk the page table directly, use get_user_pages
89264 */
89265-int access_process_vm(struct task_struct *tsk, unsigned long addr,
89266- void *buf, int len, int write)
89267+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
89268+ void *buf, size_t len, int write)
89269 {
89270 struct mm_struct *mm;
89271- int ret;
89272+ ssize_t ret;
89273
89274 mm = get_task_mm(tsk);
89275 if (!mm)
89276diff --git a/mm/mempolicy.c b/mm/mempolicy.c
89277index 6b22d8f9..8b5f6cf 100644
89278--- a/mm/mempolicy.c
89279+++ b/mm/mempolicy.c
89280@@ -746,6 +746,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
89281 unsigned long vmstart;
89282 unsigned long vmend;
89283
89284+#ifdef CONFIG_PAX_SEGMEXEC
89285+ struct vm_area_struct *vma_m;
89286+#endif
89287+
89288 vma = find_vma(mm, start);
89289 if (!vma || vma->vm_start > start)
89290 return -EFAULT;
89291@@ -789,6 +793,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
89292 err = vma_replace_policy(vma, new_pol);
89293 if (err)
89294 goto out;
89295+
89296+#ifdef CONFIG_PAX_SEGMEXEC
89297+ vma_m = pax_find_mirror_vma(vma);
89298+ if (vma_m) {
89299+ err = vma_replace_policy(vma_m, new_pol);
89300+ if (err)
89301+ goto out;
89302+ }
89303+#endif
89304+
89305 }
89306
89307 out:
89308@@ -1252,6 +1266,17 @@ static long do_mbind(unsigned long start, unsigned long len,
89309
89310 if (end < start)
89311 return -EINVAL;
89312+
89313+#ifdef CONFIG_PAX_SEGMEXEC
89314+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
89315+ if (end > SEGMEXEC_TASK_SIZE)
89316+ return -EINVAL;
89317+ } else
89318+#endif
89319+
89320+ if (end > TASK_SIZE)
89321+ return -EINVAL;
89322+
89323 if (end == start)
89324 return 0;
89325
89326@@ -1480,8 +1505,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
89327 */
89328 tcred = __task_cred(task);
89329 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
89330- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
89331- !capable(CAP_SYS_NICE)) {
89332+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
89333 rcu_read_unlock();
89334 err = -EPERM;
89335 goto out_put;
89336@@ -1512,6 +1536,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
89337 goto out;
89338 }
89339
89340+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
89341+ if (mm != current->mm &&
89342+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
89343+ mmput(mm);
89344+ err = -EPERM;
89345+ goto out;
89346+ }
89347+#endif
89348+
89349 err = do_migrate_pages(mm, old, new,
89350 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
89351
89352diff --git a/mm/migrate.c b/mm/migrate.c
89353index e3cf71d..c94506c 100644
89354--- a/mm/migrate.c
89355+++ b/mm/migrate.c
89356@@ -1406,8 +1406,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
89357 */
89358 tcred = __task_cred(task);
89359 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
89360- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
89361- !capable(CAP_SYS_NICE)) {
89362+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
89363 rcu_read_unlock();
89364 err = -EPERM;
89365 goto out;
89366diff --git a/mm/mlock.c b/mm/mlock.c
89367index 192e6ee..b044449 100644
89368--- a/mm/mlock.c
89369+++ b/mm/mlock.c
89370@@ -14,6 +14,7 @@
89371 #include <linux/pagevec.h>
89372 #include <linux/mempolicy.h>
89373 #include <linux/syscalls.h>
89374+#include <linux/security.h>
89375 #include <linux/sched.h>
89376 #include <linux/export.h>
89377 #include <linux/rmap.h>
89378@@ -588,7 +589,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
89379 {
89380 unsigned long nstart, end, tmp;
89381 struct vm_area_struct * vma, * prev;
89382- int error;
89383+ int error = 0;
89384
89385 VM_BUG_ON(start & ~PAGE_MASK);
89386 VM_BUG_ON(len != PAGE_ALIGN(len));
89387@@ -597,6 +598,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
89388 return -EINVAL;
89389 if (end == start)
89390 return 0;
89391+ if (end > TASK_SIZE)
89392+ return -EINVAL;
89393+
89394 vma = find_vma(current->mm, start);
89395 if (!vma || vma->vm_start > start)
89396 return -ENOMEM;
89397@@ -608,6 +612,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
89398 for (nstart = start ; ; ) {
89399 vm_flags_t newflags;
89400
89401+#ifdef CONFIG_PAX_SEGMEXEC
89402+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
89403+ break;
89404+#endif
89405+
89406 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
89407
89408 newflags = vma->vm_flags & ~VM_LOCKED;
89409@@ -720,6 +729,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
89410 lock_limit >>= PAGE_SHIFT;
89411
89412 /* check against resource limits */
89413+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
89414 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
89415 error = do_mlock(start, len, 1);
89416 up_write(&current->mm->mmap_sem);
89417@@ -754,6 +764,11 @@ static int do_mlockall(int flags)
89418 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
89419 vm_flags_t newflags;
89420
89421+#ifdef CONFIG_PAX_SEGMEXEC
89422+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
89423+ break;
89424+#endif
89425+
89426 newflags = vma->vm_flags & ~VM_LOCKED;
89427 if (flags & MCL_CURRENT)
89428 newflags |= VM_LOCKED;
89429@@ -787,6 +802,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
89430 lock_limit >>= PAGE_SHIFT;
89431
89432 ret = -ENOMEM;
89433+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
89434 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
89435 capable(CAP_IPC_LOCK))
89436 ret = do_mlockall(flags);
89437diff --git a/mm/mmap.c b/mm/mmap.c
89438index 362e5f1..8968e02 100644
89439--- a/mm/mmap.c
89440+++ b/mm/mmap.c
89441@@ -36,6 +36,7 @@
89442 #include <linux/sched/sysctl.h>
89443 #include <linux/notifier.h>
89444 #include <linux/memory.h>
89445+#include <linux/random.h>
89446
89447 #include <asm/uaccess.h>
89448 #include <asm/cacheflush.h>
89449@@ -52,6 +53,16 @@
89450 #define arch_rebalance_pgtables(addr, len) (addr)
89451 #endif
89452
89453+static inline void verify_mm_writelocked(struct mm_struct *mm)
89454+{
89455+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
89456+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
89457+ up_read(&mm->mmap_sem);
89458+ BUG();
89459+ }
89460+#endif
89461+}
89462+
89463 static void unmap_region(struct mm_struct *mm,
89464 struct vm_area_struct *vma, struct vm_area_struct *prev,
89465 unsigned long start, unsigned long end);
89466@@ -71,16 +82,25 @@ static void unmap_region(struct mm_struct *mm,
89467 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
89468 *
89469 */
89470-pgprot_t protection_map[16] = {
89471+pgprot_t protection_map[16] __read_only = {
89472 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
89473 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
89474 };
89475
89476-pgprot_t vm_get_page_prot(unsigned long vm_flags)
89477+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
89478 {
89479- return __pgprot(pgprot_val(protection_map[vm_flags &
89480+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
89481 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
89482 pgprot_val(arch_vm_get_page_prot(vm_flags)));
89483+
89484+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89485+ if (!(__supported_pte_mask & _PAGE_NX) &&
89486+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
89487+ (vm_flags & (VM_READ | VM_WRITE)))
89488+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
89489+#endif
89490+
89491+ return prot;
89492 }
89493 EXPORT_SYMBOL(vm_get_page_prot);
89494
89495@@ -89,6 +109,7 @@ int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
89496 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
89497 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
89498 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
89499+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
89500 /*
89501 * Make sure vm_committed_as in one cacheline and not cacheline shared with
89502 * other variables. It can be updated by several CPUs frequently.
89503@@ -247,6 +268,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
89504 struct vm_area_struct *next = vma->vm_next;
89505
89506 might_sleep();
89507+ BUG_ON(vma->vm_mirror);
89508 if (vma->vm_ops && vma->vm_ops->close)
89509 vma->vm_ops->close(vma);
89510 if (vma->vm_file)
89511@@ -291,6 +313,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
89512 * not page aligned -Ram Gupta
89513 */
89514 rlim = rlimit(RLIMIT_DATA);
89515+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
89516 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
89517 (mm->end_data - mm->start_data) > rlim)
89518 goto out;
89519@@ -933,6 +956,12 @@ static int
89520 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
89521 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
89522 {
89523+
89524+#ifdef CONFIG_PAX_SEGMEXEC
89525+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
89526+ return 0;
89527+#endif
89528+
89529 if (is_mergeable_vma(vma, file, vm_flags) &&
89530 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
89531 if (vma->vm_pgoff == vm_pgoff)
89532@@ -952,6 +981,12 @@ static int
89533 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
89534 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
89535 {
89536+
89537+#ifdef CONFIG_PAX_SEGMEXEC
89538+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
89539+ return 0;
89540+#endif
89541+
89542 if (is_mergeable_vma(vma, file, vm_flags) &&
89543 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
89544 pgoff_t vm_pglen;
89545@@ -994,13 +1029,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
89546 struct vm_area_struct *vma_merge(struct mm_struct *mm,
89547 struct vm_area_struct *prev, unsigned long addr,
89548 unsigned long end, unsigned long vm_flags,
89549- struct anon_vma *anon_vma, struct file *file,
89550+ struct anon_vma *anon_vma, struct file *file,
89551 pgoff_t pgoff, struct mempolicy *policy)
89552 {
89553 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
89554 struct vm_area_struct *area, *next;
89555 int err;
89556
89557+#ifdef CONFIG_PAX_SEGMEXEC
89558+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
89559+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
89560+
89561+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
89562+#endif
89563+
89564 /*
89565 * We later require that vma->vm_flags == vm_flags,
89566 * so this tests vma->vm_flags & VM_SPECIAL, too.
89567@@ -1016,6 +1058,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89568 if (next && next->vm_end == end) /* cases 6, 7, 8 */
89569 next = next->vm_next;
89570
89571+#ifdef CONFIG_PAX_SEGMEXEC
89572+ if (prev)
89573+ prev_m = pax_find_mirror_vma(prev);
89574+ if (area)
89575+ area_m = pax_find_mirror_vma(area);
89576+ if (next)
89577+ next_m = pax_find_mirror_vma(next);
89578+#endif
89579+
89580 /*
89581 * Can it merge with the predecessor?
89582 */
89583@@ -1035,9 +1086,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89584 /* cases 1, 6 */
89585 err = vma_adjust(prev, prev->vm_start,
89586 next->vm_end, prev->vm_pgoff, NULL);
89587- } else /* cases 2, 5, 7 */
89588+
89589+#ifdef CONFIG_PAX_SEGMEXEC
89590+ if (!err && prev_m)
89591+ err = vma_adjust(prev_m, prev_m->vm_start,
89592+ next_m->vm_end, prev_m->vm_pgoff, NULL);
89593+#endif
89594+
89595+ } else { /* cases 2, 5, 7 */
89596 err = vma_adjust(prev, prev->vm_start,
89597 end, prev->vm_pgoff, NULL);
89598+
89599+#ifdef CONFIG_PAX_SEGMEXEC
89600+ if (!err && prev_m)
89601+ err = vma_adjust(prev_m, prev_m->vm_start,
89602+ end_m, prev_m->vm_pgoff, NULL);
89603+#endif
89604+
89605+ }
89606 if (err)
89607 return NULL;
89608 khugepaged_enter_vma_merge(prev);
89609@@ -1051,12 +1117,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
89610 mpol_equal(policy, vma_policy(next)) &&
89611 can_vma_merge_before(next, vm_flags,
89612 anon_vma, file, pgoff+pglen)) {
89613- if (prev && addr < prev->vm_end) /* case 4 */
89614+ if (prev && addr < prev->vm_end) { /* case 4 */
89615 err = vma_adjust(prev, prev->vm_start,
89616 addr, prev->vm_pgoff, NULL);
89617- else /* cases 3, 8 */
89618+
89619+#ifdef CONFIG_PAX_SEGMEXEC
89620+ if (!err && prev_m)
89621+ err = vma_adjust(prev_m, prev_m->vm_start,
89622+ addr_m, prev_m->vm_pgoff, NULL);
89623+#endif
89624+
89625+ } else { /* cases 3, 8 */
89626 err = vma_adjust(area, addr, next->vm_end,
89627 next->vm_pgoff - pglen, NULL);
89628+
89629+#ifdef CONFIG_PAX_SEGMEXEC
89630+ if (!err && area_m)
89631+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
89632+ next_m->vm_pgoff - pglen, NULL);
89633+#endif
89634+
89635+ }
89636 if (err)
89637 return NULL;
89638 khugepaged_enter_vma_merge(area);
89639@@ -1165,8 +1246,10 @@ none:
89640 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
89641 struct file *file, long pages)
89642 {
89643- const unsigned long stack_flags
89644- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
89645+
89646+#ifdef CONFIG_PAX_RANDMMAP
89647+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
89648+#endif
89649
89650 mm->total_vm += pages;
89651
89652@@ -1174,7 +1257,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
89653 mm->shared_vm += pages;
89654 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
89655 mm->exec_vm += pages;
89656- } else if (flags & stack_flags)
89657+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
89658 mm->stack_vm += pages;
89659 }
89660 #endif /* CONFIG_PROC_FS */
89661@@ -1212,7 +1295,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89662 * (the exception is when the underlying filesystem is noexec
89663 * mounted, in which case we dont add PROT_EXEC.)
89664 */
89665- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
89666+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
89667 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
89668 prot |= PROT_EXEC;
89669
89670@@ -1238,7 +1321,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89671 /* Obtain the address to map to. we verify (or select) it and ensure
89672 * that it represents a valid section of the address space.
89673 */
89674- addr = get_unmapped_area(file, addr, len, pgoff, flags);
89675+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
89676 if (addr & ~PAGE_MASK)
89677 return addr;
89678
89679@@ -1249,6 +1332,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89680 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
89681 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
89682
89683+#ifdef CONFIG_PAX_MPROTECT
89684+ if (mm->pax_flags & MF_PAX_MPROTECT) {
89685+
89686+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
89687+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
89688+ mm->binfmt->handle_mmap)
89689+ mm->binfmt->handle_mmap(file);
89690+#endif
89691+
89692+#ifndef CONFIG_PAX_MPROTECT_COMPAT
89693+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
89694+ gr_log_rwxmmap(file);
89695+
89696+#ifdef CONFIG_PAX_EMUPLT
89697+ vm_flags &= ~VM_EXEC;
89698+#else
89699+ return -EPERM;
89700+#endif
89701+
89702+ }
89703+
89704+ if (!(vm_flags & VM_EXEC))
89705+ vm_flags &= ~VM_MAYEXEC;
89706+#else
89707+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
89708+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
89709+#endif
89710+ else
89711+ vm_flags &= ~VM_MAYWRITE;
89712+ }
89713+#endif
89714+
89715+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89716+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
89717+ vm_flags &= ~VM_PAGEEXEC;
89718+#endif
89719+
89720 if (flags & MAP_LOCKED)
89721 if (!can_do_mlock())
89722 return -EPERM;
89723@@ -1260,6 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89724 locked += mm->locked_vm;
89725 lock_limit = rlimit(RLIMIT_MEMLOCK);
89726 lock_limit >>= PAGE_SHIFT;
89727+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
89728 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
89729 return -EAGAIN;
89730 }
89731@@ -1344,6 +1465,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
89732 vm_flags |= VM_NORESERVE;
89733 }
89734
89735+ if (!gr_acl_handle_mmap(file, prot))
89736+ return -EACCES;
89737+
89738 addr = mmap_region(file, addr, len, vm_flags, pgoff);
89739 if (!IS_ERR_VALUE(addr) &&
89740 ((vm_flags & VM_LOCKED) ||
89741@@ -1437,7 +1561,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
89742 vm_flags_t vm_flags = vma->vm_flags;
89743
89744 /* If it was private or non-writable, the write bit is already clear */
89745- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
89746+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
89747 return 0;
89748
89749 /* The backer wishes to know when pages are first written to? */
89750@@ -1483,7 +1607,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
89751 struct rb_node **rb_link, *rb_parent;
89752 unsigned long charged = 0;
89753
89754+#ifdef CONFIG_PAX_SEGMEXEC
89755+ struct vm_area_struct *vma_m = NULL;
89756+#endif
89757+
89758+ /*
89759+ * mm->mmap_sem is required to protect against another thread
89760+ * changing the mappings in case we sleep.
89761+ */
89762+ verify_mm_writelocked(mm);
89763+
89764 /* Check against address space limit. */
89765+
89766+#ifdef CONFIG_PAX_RANDMMAP
89767+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
89768+#endif
89769+
89770 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
89771 unsigned long nr_pages;
89772
89773@@ -1502,11 +1641,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
89774
89775 /* Clear old maps */
89776 error = -ENOMEM;
89777-munmap_back:
89778 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
89779 if (do_munmap(mm, addr, len))
89780 return -ENOMEM;
89781- goto munmap_back;
89782+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
89783 }
89784
89785 /*
89786@@ -1537,6 +1675,16 @@ munmap_back:
89787 goto unacct_error;
89788 }
89789
89790+#ifdef CONFIG_PAX_SEGMEXEC
89791+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
89792+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
89793+ if (!vma_m) {
89794+ error = -ENOMEM;
89795+ goto free_vma;
89796+ }
89797+ }
89798+#endif
89799+
89800 vma->vm_mm = mm;
89801 vma->vm_start = addr;
89802 vma->vm_end = addr + len;
89803@@ -1556,6 +1704,13 @@ munmap_back:
89804 if (error)
89805 goto unmap_and_free_vma;
89806
89807+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
89808+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
89809+ vma->vm_flags |= VM_PAGEEXEC;
89810+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
89811+ }
89812+#endif
89813+
89814 /* Can addr have changed??
89815 *
89816 * Answer: Yes, several device drivers can do it in their
89817@@ -1589,6 +1744,12 @@ munmap_back:
89818 }
89819
89820 vma_link(mm, vma, prev, rb_link, rb_parent);
89821+
89822+#ifdef CONFIG_PAX_SEGMEXEC
89823+ if (vma_m)
89824+ BUG_ON(pax_mirror_vma(vma_m, vma));
89825+#endif
89826+
89827 /* Once vma denies write, undo our temporary denial count */
89828 if (vm_flags & VM_DENYWRITE)
89829 allow_write_access(file);
89830@@ -1597,6 +1758,7 @@ out:
89831 perf_event_mmap(vma);
89832
89833 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
89834+ track_exec_limit(mm, addr, addr + len, vm_flags);
89835 if (vm_flags & VM_LOCKED) {
89836 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
89837 vma == get_gate_vma(current->mm)))
89838@@ -1629,6 +1791,12 @@ unmap_and_free_vma:
89839 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
89840 charged = 0;
89841 free_vma:
89842+
89843+#ifdef CONFIG_PAX_SEGMEXEC
89844+ if (vma_m)
89845+ kmem_cache_free(vm_area_cachep, vma_m);
89846+#endif
89847+
89848 kmem_cache_free(vm_area_cachep, vma);
89849 unacct_error:
89850 if (charged)
89851@@ -1636,7 +1804,63 @@ unacct_error:
89852 return error;
89853 }
89854
89855-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
89856+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
89857+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
89858+{
89859+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
89860+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
89861+
89862+ return 0;
89863+}
89864+#endif
89865+
89866+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
89867+{
89868+ if (!vma) {
89869+#ifdef CONFIG_STACK_GROWSUP
89870+ if (addr > sysctl_heap_stack_gap)
89871+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
89872+ else
89873+ vma = find_vma(current->mm, 0);
89874+ if (vma && (vma->vm_flags & VM_GROWSUP))
89875+ return false;
89876+#endif
89877+ return true;
89878+ }
89879+
89880+ if (addr + len > vma->vm_start)
89881+ return false;
89882+
89883+ if (vma->vm_flags & VM_GROWSDOWN)
89884+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
89885+#ifdef CONFIG_STACK_GROWSUP
89886+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
89887+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
89888+#endif
89889+ else if (offset)
89890+ return offset <= vma->vm_start - addr - len;
89891+
89892+ return true;
89893+}
89894+
89895+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
89896+{
89897+ if (vma->vm_start < len)
89898+ return -ENOMEM;
89899+
89900+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
89901+ if (offset <= vma->vm_start - len)
89902+ return vma->vm_start - len - offset;
89903+ else
89904+ return -ENOMEM;
89905+ }
89906+
89907+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
89908+ return vma->vm_start - len - sysctl_heap_stack_gap;
89909+ return -ENOMEM;
89910+}
89911+
89912+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
89913 {
89914 /*
89915 * We implement the search by looking for an rbtree node that
89916@@ -1684,11 +1908,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
89917 }
89918 }
89919
89920- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
89921+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
89922 check_current:
89923 /* Check if current node has a suitable gap */
89924 if (gap_start > high_limit)
89925 return -ENOMEM;
89926+
89927+ if (gap_end - gap_start > info->threadstack_offset)
89928+ gap_start += info->threadstack_offset;
89929+ else
89930+ gap_start = gap_end;
89931+
89932+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
89933+ if (gap_end - gap_start > sysctl_heap_stack_gap)
89934+ gap_start += sysctl_heap_stack_gap;
89935+ else
89936+ gap_start = gap_end;
89937+ }
89938+ if (vma->vm_flags & VM_GROWSDOWN) {
89939+ if (gap_end - gap_start > sysctl_heap_stack_gap)
89940+ gap_end -= sysctl_heap_stack_gap;
89941+ else
89942+ gap_end = gap_start;
89943+ }
89944 if (gap_end >= low_limit && gap_end - gap_start >= length)
89945 goto found;
89946
89947@@ -1738,7 +1980,7 @@ found:
89948 return gap_start;
89949 }
89950
89951-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
89952+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
89953 {
89954 struct mm_struct *mm = current->mm;
89955 struct vm_area_struct *vma;
89956@@ -1792,6 +2034,24 @@ check_current:
89957 gap_end = vma->vm_start;
89958 if (gap_end < low_limit)
89959 return -ENOMEM;
89960+
89961+ if (gap_end - gap_start > info->threadstack_offset)
89962+ gap_end -= info->threadstack_offset;
89963+ else
89964+ gap_end = gap_start;
89965+
89966+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
89967+ if (gap_end - gap_start > sysctl_heap_stack_gap)
89968+ gap_start += sysctl_heap_stack_gap;
89969+ else
89970+ gap_start = gap_end;
89971+ }
89972+ if (vma->vm_flags & VM_GROWSDOWN) {
89973+ if (gap_end - gap_start > sysctl_heap_stack_gap)
89974+ gap_end -= sysctl_heap_stack_gap;
89975+ else
89976+ gap_end = gap_start;
89977+ }
89978 if (gap_start <= high_limit && gap_end - gap_start >= length)
89979 goto found;
89980
89981@@ -1855,6 +2115,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
89982 struct mm_struct *mm = current->mm;
89983 struct vm_area_struct *vma;
89984 struct vm_unmapped_area_info info;
89985+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
89986
89987 if (len > TASK_SIZE - mmap_min_addr)
89988 return -ENOMEM;
89989@@ -1862,19 +2123,30 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
89990 if (flags & MAP_FIXED)
89991 return addr;
89992
89993+#ifdef CONFIG_PAX_RANDMMAP
89994+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
89995+#endif
89996+
89997 if (addr) {
89998 addr = PAGE_ALIGN(addr);
89999 vma = find_vma(mm, addr);
90000 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
90001- (!vma || addr + len <= vma->vm_start))
90002+ check_heap_stack_gap(vma, addr, len, offset))
90003 return addr;
90004 }
90005
90006 info.flags = 0;
90007 info.length = len;
90008 info.low_limit = TASK_UNMAPPED_BASE;
90009+
90010+#ifdef CONFIG_PAX_RANDMMAP
90011+ if (mm->pax_flags & MF_PAX_RANDMMAP)
90012+ info.low_limit += mm->delta_mmap;
90013+#endif
90014+
90015 info.high_limit = TASK_SIZE;
90016 info.align_mask = 0;
90017+ info.threadstack_offset = offset;
90018 return vm_unmapped_area(&info);
90019 }
90020 #endif
90021@@ -1893,6 +2165,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90022 struct mm_struct *mm = current->mm;
90023 unsigned long addr = addr0;
90024 struct vm_unmapped_area_info info;
90025+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
90026
90027 /* requested length too big for entire address space */
90028 if (len > TASK_SIZE - mmap_min_addr)
90029@@ -1901,12 +2174,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90030 if (flags & MAP_FIXED)
90031 return addr;
90032
90033+#ifdef CONFIG_PAX_RANDMMAP
90034+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
90035+#endif
90036+
90037 /* requesting a specific address */
90038 if (addr) {
90039 addr = PAGE_ALIGN(addr);
90040 vma = find_vma(mm, addr);
90041 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
90042- (!vma || addr + len <= vma->vm_start))
90043+ check_heap_stack_gap(vma, addr, len, offset))
90044 return addr;
90045 }
90046
90047@@ -1915,6 +2192,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90048 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
90049 info.high_limit = mm->mmap_base;
90050 info.align_mask = 0;
90051+ info.threadstack_offset = offset;
90052 addr = vm_unmapped_area(&info);
90053
90054 /*
90055@@ -1927,6 +2205,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
90056 VM_BUG_ON(addr != -ENOMEM);
90057 info.flags = 0;
90058 info.low_limit = TASK_UNMAPPED_BASE;
90059+
90060+#ifdef CONFIG_PAX_RANDMMAP
90061+ if (mm->pax_flags & MF_PAX_RANDMMAP)
90062+ info.low_limit += mm->delta_mmap;
90063+#endif
90064+
90065 info.high_limit = TASK_SIZE;
90066 addr = vm_unmapped_area(&info);
90067 }
90068@@ -2028,6 +2312,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
90069 return vma;
90070 }
90071
90072+#ifdef CONFIG_PAX_SEGMEXEC
90073+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
90074+{
90075+ struct vm_area_struct *vma_m;
90076+
90077+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
90078+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
90079+ BUG_ON(vma->vm_mirror);
90080+ return NULL;
90081+ }
90082+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
90083+ vma_m = vma->vm_mirror;
90084+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
90085+ BUG_ON(vma->vm_file != vma_m->vm_file);
90086+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
90087+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
90088+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
90089+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
90090+ return vma_m;
90091+}
90092+#endif
90093+
90094 /*
90095 * Verify that the stack growth is acceptable and
90096 * update accounting. This is shared with both the
90097@@ -2044,6 +2350,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90098 return -ENOMEM;
90099
90100 /* Stack limit test */
90101+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
90102 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
90103 return -ENOMEM;
90104
90105@@ -2054,6 +2361,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90106 locked = mm->locked_vm + grow;
90107 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
90108 limit >>= PAGE_SHIFT;
90109+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
90110 if (locked > limit && !capable(CAP_IPC_LOCK))
90111 return -ENOMEM;
90112 }
90113@@ -2083,37 +2391,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
90114 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
90115 * vma is the last one with address > vma->vm_end. Have to extend vma.
90116 */
90117+#ifndef CONFIG_IA64
90118+static
90119+#endif
90120 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
90121 {
90122 int error;
90123+ bool locknext;
90124
90125 if (!(vma->vm_flags & VM_GROWSUP))
90126 return -EFAULT;
90127
90128+ /* Also guard against wrapping around to address 0. */
90129+ if (address < PAGE_ALIGN(address+1))
90130+ address = PAGE_ALIGN(address+1);
90131+ else
90132+ return -ENOMEM;
90133+
90134 /*
90135 * We must make sure the anon_vma is allocated
90136 * so that the anon_vma locking is not a noop.
90137 */
90138 if (unlikely(anon_vma_prepare(vma)))
90139 return -ENOMEM;
90140+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
90141+ if (locknext && anon_vma_prepare(vma->vm_next))
90142+ return -ENOMEM;
90143 vma_lock_anon_vma(vma);
90144+ if (locknext)
90145+ vma_lock_anon_vma(vma->vm_next);
90146
90147 /*
90148 * vma->vm_start/vm_end cannot change under us because the caller
90149 * is required to hold the mmap_sem in read mode. We need the
90150- * anon_vma lock to serialize against concurrent expand_stacks.
90151- * Also guard against wrapping around to address 0.
90152+ * anon_vma locks to serialize against concurrent expand_stacks
90153+ * and expand_upwards.
90154 */
90155- if (address < PAGE_ALIGN(address+4))
90156- address = PAGE_ALIGN(address+4);
90157- else {
90158- vma_unlock_anon_vma(vma);
90159- return -ENOMEM;
90160- }
90161 error = 0;
90162
90163 /* Somebody else might have raced and expanded it already */
90164- if (address > vma->vm_end) {
90165+ 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)
90166+ error = -ENOMEM;
90167+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
90168 unsigned long size, grow;
90169
90170 size = address - vma->vm_start;
90171@@ -2148,6 +2467,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
90172 }
90173 }
90174 }
90175+ if (locknext)
90176+ vma_unlock_anon_vma(vma->vm_next);
90177 vma_unlock_anon_vma(vma);
90178 khugepaged_enter_vma_merge(vma);
90179 validate_mm(vma->vm_mm);
90180@@ -2162,6 +2483,8 @@ int expand_downwards(struct vm_area_struct *vma,
90181 unsigned long address)
90182 {
90183 int error;
90184+ bool lockprev = false;
90185+ struct vm_area_struct *prev;
90186
90187 /*
90188 * We must make sure the anon_vma is allocated
90189@@ -2175,6 +2498,15 @@ int expand_downwards(struct vm_area_struct *vma,
90190 if (error)
90191 return error;
90192
90193+ prev = vma->vm_prev;
90194+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
90195+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
90196+#endif
90197+ if (lockprev && anon_vma_prepare(prev))
90198+ return -ENOMEM;
90199+ if (lockprev)
90200+ vma_lock_anon_vma(prev);
90201+
90202 vma_lock_anon_vma(vma);
90203
90204 /*
90205@@ -2184,9 +2516,17 @@ int expand_downwards(struct vm_area_struct *vma,
90206 */
90207
90208 /* Somebody else might have raced and expanded it already */
90209- if (address < vma->vm_start) {
90210+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
90211+ error = -ENOMEM;
90212+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
90213 unsigned long size, grow;
90214
90215+#ifdef CONFIG_PAX_SEGMEXEC
90216+ struct vm_area_struct *vma_m;
90217+
90218+ vma_m = pax_find_mirror_vma(vma);
90219+#endif
90220+
90221 size = vma->vm_end - address;
90222 grow = (vma->vm_start - address) >> PAGE_SHIFT;
90223
90224@@ -2211,13 +2551,27 @@ int expand_downwards(struct vm_area_struct *vma,
90225 vma->vm_pgoff -= grow;
90226 anon_vma_interval_tree_post_update_vma(vma);
90227 vma_gap_update(vma);
90228+
90229+#ifdef CONFIG_PAX_SEGMEXEC
90230+ if (vma_m) {
90231+ anon_vma_interval_tree_pre_update_vma(vma_m);
90232+ vma_m->vm_start -= grow << PAGE_SHIFT;
90233+ vma_m->vm_pgoff -= grow;
90234+ anon_vma_interval_tree_post_update_vma(vma_m);
90235+ vma_gap_update(vma_m);
90236+ }
90237+#endif
90238+
90239 spin_unlock(&vma->vm_mm->page_table_lock);
90240
90241+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
90242 perf_event_mmap(vma);
90243 }
90244 }
90245 }
90246 vma_unlock_anon_vma(vma);
90247+ if (lockprev)
90248+ vma_unlock_anon_vma(prev);
90249 khugepaged_enter_vma_merge(vma);
90250 validate_mm(vma->vm_mm);
90251 return error;
90252@@ -2315,6 +2669,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
90253 do {
90254 long nrpages = vma_pages(vma);
90255
90256+#ifdef CONFIG_PAX_SEGMEXEC
90257+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
90258+ vma = remove_vma(vma);
90259+ continue;
90260+ }
90261+#endif
90262+
90263 if (vma->vm_flags & VM_ACCOUNT)
90264 nr_accounted += nrpages;
90265 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
90266@@ -2359,6 +2720,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
90267 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
90268 vma->vm_prev = NULL;
90269 do {
90270+
90271+#ifdef CONFIG_PAX_SEGMEXEC
90272+ if (vma->vm_mirror) {
90273+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
90274+ vma->vm_mirror->vm_mirror = NULL;
90275+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
90276+ vma->vm_mirror = NULL;
90277+ }
90278+#endif
90279+
90280 vma_rb_erase(vma, &mm->mm_rb);
90281 mm->map_count--;
90282 tail_vma = vma;
90283@@ -2384,14 +2755,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90284 struct vm_area_struct *new;
90285 int err = -ENOMEM;
90286
90287+#ifdef CONFIG_PAX_SEGMEXEC
90288+ struct vm_area_struct *vma_m, *new_m = NULL;
90289+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
90290+#endif
90291+
90292 if (is_vm_hugetlb_page(vma) && (addr &
90293 ~(huge_page_mask(hstate_vma(vma)))))
90294 return -EINVAL;
90295
90296+#ifdef CONFIG_PAX_SEGMEXEC
90297+ vma_m = pax_find_mirror_vma(vma);
90298+#endif
90299+
90300 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
90301 if (!new)
90302 goto out_err;
90303
90304+#ifdef CONFIG_PAX_SEGMEXEC
90305+ if (vma_m) {
90306+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
90307+ if (!new_m) {
90308+ kmem_cache_free(vm_area_cachep, new);
90309+ goto out_err;
90310+ }
90311+ }
90312+#endif
90313+
90314 /* most fields are the same, copy all, and then fixup */
90315 *new = *vma;
90316
90317@@ -2404,6 +2794,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90318 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
90319 }
90320
90321+#ifdef CONFIG_PAX_SEGMEXEC
90322+ if (vma_m) {
90323+ *new_m = *vma_m;
90324+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
90325+ new_m->vm_mirror = new;
90326+ new->vm_mirror = new_m;
90327+
90328+ if (new_below)
90329+ new_m->vm_end = addr_m;
90330+ else {
90331+ new_m->vm_start = addr_m;
90332+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
90333+ }
90334+ }
90335+#endif
90336+
90337 err = vma_dup_policy(vma, new);
90338 if (err)
90339 goto out_free_vma;
90340@@ -2423,6 +2829,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90341 else
90342 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
90343
90344+#ifdef CONFIG_PAX_SEGMEXEC
90345+ if (!err && vma_m) {
90346+ struct mempolicy *pol = vma_policy(new);
90347+
90348+ if (anon_vma_clone(new_m, vma_m))
90349+ goto out_free_mpol;
90350+
90351+ mpol_get(pol);
90352+ set_vma_policy(new_m, pol);
90353+
90354+ if (new_m->vm_file)
90355+ get_file(new_m->vm_file);
90356+
90357+ if (new_m->vm_ops && new_m->vm_ops->open)
90358+ new_m->vm_ops->open(new_m);
90359+
90360+ if (new_below)
90361+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
90362+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
90363+ else
90364+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
90365+
90366+ if (err) {
90367+ if (new_m->vm_ops && new_m->vm_ops->close)
90368+ new_m->vm_ops->close(new_m);
90369+ if (new_m->vm_file)
90370+ fput(new_m->vm_file);
90371+ mpol_put(pol);
90372+ }
90373+ }
90374+#endif
90375+
90376 /* Success. */
90377 if (!err)
90378 return 0;
90379@@ -2432,10 +2870,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90380 new->vm_ops->close(new);
90381 if (new->vm_file)
90382 fput(new->vm_file);
90383- unlink_anon_vmas(new);
90384 out_free_mpol:
90385 mpol_put(vma_policy(new));
90386 out_free_vma:
90387+
90388+#ifdef CONFIG_PAX_SEGMEXEC
90389+ if (new_m) {
90390+ unlink_anon_vmas(new_m);
90391+ kmem_cache_free(vm_area_cachep, new_m);
90392+ }
90393+#endif
90394+
90395+ unlink_anon_vmas(new);
90396 kmem_cache_free(vm_area_cachep, new);
90397 out_err:
90398 return err;
90399@@ -2448,6 +2894,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
90400 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
90401 unsigned long addr, int new_below)
90402 {
90403+
90404+#ifdef CONFIG_PAX_SEGMEXEC
90405+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
90406+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
90407+ if (mm->map_count >= sysctl_max_map_count-1)
90408+ return -ENOMEM;
90409+ } else
90410+#endif
90411+
90412 if (mm->map_count >= sysctl_max_map_count)
90413 return -ENOMEM;
90414
90415@@ -2459,11 +2914,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
90416 * work. This now handles partial unmappings.
90417 * Jeremy Fitzhardinge <jeremy@goop.org>
90418 */
90419+#ifdef CONFIG_PAX_SEGMEXEC
90420 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90421 {
90422+ int ret = __do_munmap(mm, start, len);
90423+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
90424+ return ret;
90425+
90426+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
90427+}
90428+
90429+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90430+#else
90431+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90432+#endif
90433+{
90434 unsigned long end;
90435 struct vm_area_struct *vma, *prev, *last;
90436
90437+ /*
90438+ * mm->mmap_sem is required to protect against another thread
90439+ * changing the mappings in case we sleep.
90440+ */
90441+ verify_mm_writelocked(mm);
90442+
90443 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
90444 return -EINVAL;
90445
90446@@ -2538,6 +3012,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
90447 /* Fix up all other VM information */
90448 remove_vma_list(mm, vma);
90449
90450+ track_exec_limit(mm, start, end, 0UL);
90451+
90452 return 0;
90453 }
90454
90455@@ -2546,6 +3022,13 @@ int vm_munmap(unsigned long start, size_t len)
90456 int ret;
90457 struct mm_struct *mm = current->mm;
90458
90459+
90460+#ifdef CONFIG_PAX_SEGMEXEC
90461+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
90462+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
90463+ return -EINVAL;
90464+#endif
90465+
90466 down_write(&mm->mmap_sem);
90467 ret = do_munmap(mm, start, len);
90468 up_write(&mm->mmap_sem);
90469@@ -2559,16 +3042,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
90470 return vm_munmap(addr, len);
90471 }
90472
90473-static inline void verify_mm_writelocked(struct mm_struct *mm)
90474-{
90475-#ifdef CONFIG_DEBUG_VM
90476- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
90477- WARN_ON(1);
90478- up_read(&mm->mmap_sem);
90479- }
90480-#endif
90481-}
90482-
90483 /*
90484 * this is really a simplified "do_mmap". it only handles
90485 * anonymous maps. eventually we may be able to do some
90486@@ -2582,6 +3055,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90487 struct rb_node ** rb_link, * rb_parent;
90488 pgoff_t pgoff = addr >> PAGE_SHIFT;
90489 int error;
90490+ unsigned long charged;
90491
90492 len = PAGE_ALIGN(len);
90493 if (!len)
90494@@ -2589,16 +3063,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90495
90496 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
90497
90498+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
90499+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
90500+ flags &= ~VM_EXEC;
90501+
90502+#ifdef CONFIG_PAX_MPROTECT
90503+ if (mm->pax_flags & MF_PAX_MPROTECT)
90504+ flags &= ~VM_MAYEXEC;
90505+#endif
90506+
90507+ }
90508+#endif
90509+
90510 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
90511 if (error & ~PAGE_MASK)
90512 return error;
90513
90514+ charged = len >> PAGE_SHIFT;
90515+
90516 /*
90517 * mlock MCL_FUTURE?
90518 */
90519 if (mm->def_flags & VM_LOCKED) {
90520 unsigned long locked, lock_limit;
90521- locked = len >> PAGE_SHIFT;
90522+ locked = charged;
90523 locked += mm->locked_vm;
90524 lock_limit = rlimit(RLIMIT_MEMLOCK);
90525 lock_limit >>= PAGE_SHIFT;
90526@@ -2615,21 +3103,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90527 /*
90528 * Clear old maps. this also does some error checking for us
90529 */
90530- munmap_back:
90531 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
90532 if (do_munmap(mm, addr, len))
90533 return -ENOMEM;
90534- goto munmap_back;
90535+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
90536 }
90537
90538 /* Check against address space limits *after* clearing old maps... */
90539- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
90540+ if (!may_expand_vm(mm, charged))
90541 return -ENOMEM;
90542
90543 if (mm->map_count > sysctl_max_map_count)
90544 return -ENOMEM;
90545
90546- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
90547+ if (security_vm_enough_memory_mm(mm, charged))
90548 return -ENOMEM;
90549
90550 /* Can we just expand an old private anonymous mapping? */
90551@@ -2643,7 +3130,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90552 */
90553 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90554 if (!vma) {
90555- vm_unacct_memory(len >> PAGE_SHIFT);
90556+ vm_unacct_memory(charged);
90557 return -ENOMEM;
90558 }
90559
90560@@ -2657,10 +3144,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
90561 vma_link(mm, vma, prev, rb_link, rb_parent);
90562 out:
90563 perf_event_mmap(vma);
90564- mm->total_vm += len >> PAGE_SHIFT;
90565+ mm->total_vm += charged;
90566 if (flags & VM_LOCKED)
90567- mm->locked_vm += (len >> PAGE_SHIFT);
90568+ mm->locked_vm += charged;
90569 vma->vm_flags |= VM_SOFTDIRTY;
90570+ track_exec_limit(mm, addr, addr + len, flags);
90571 return addr;
90572 }
90573
90574@@ -2722,6 +3210,7 @@ void exit_mmap(struct mm_struct *mm)
90575 while (vma) {
90576 if (vma->vm_flags & VM_ACCOUNT)
90577 nr_accounted += vma_pages(vma);
90578+ vma->vm_mirror = NULL;
90579 vma = remove_vma(vma);
90580 }
90581 vm_unacct_memory(nr_accounted);
90582@@ -2738,6 +3227,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
90583 struct vm_area_struct *prev;
90584 struct rb_node **rb_link, *rb_parent;
90585
90586+#ifdef CONFIG_PAX_SEGMEXEC
90587+ struct vm_area_struct *vma_m = NULL;
90588+#endif
90589+
90590+ if (security_mmap_addr(vma->vm_start))
90591+ return -EPERM;
90592+
90593 /*
90594 * The vm_pgoff of a purely anonymous vma should be irrelevant
90595 * until its first write fault, when page's anon_vma and index
90596@@ -2761,7 +3257,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
90597 security_vm_enough_memory_mm(mm, vma_pages(vma)))
90598 return -ENOMEM;
90599
90600+#ifdef CONFIG_PAX_SEGMEXEC
90601+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
90602+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90603+ if (!vma_m)
90604+ return -ENOMEM;
90605+ }
90606+#endif
90607+
90608 vma_link(mm, vma, prev, rb_link, rb_parent);
90609+
90610+#ifdef CONFIG_PAX_SEGMEXEC
90611+ if (vma_m)
90612+ BUG_ON(pax_mirror_vma(vma_m, vma));
90613+#endif
90614+
90615 return 0;
90616 }
90617
90618@@ -2780,6 +3290,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
90619 struct rb_node **rb_link, *rb_parent;
90620 bool faulted_in_anon_vma = true;
90621
90622+ BUG_ON(vma->vm_mirror);
90623+
90624 /*
90625 * If anonymous vma has not yet been faulted, update new pgoff
90626 * to match new location, to increase its chance of merging.
90627@@ -2844,6 +3356,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
90628 return NULL;
90629 }
90630
90631+#ifdef CONFIG_PAX_SEGMEXEC
90632+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
90633+{
90634+ struct vm_area_struct *prev_m;
90635+ struct rb_node **rb_link_m, *rb_parent_m;
90636+ struct mempolicy *pol_m;
90637+
90638+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
90639+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
90640+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
90641+ *vma_m = *vma;
90642+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
90643+ if (anon_vma_clone(vma_m, vma))
90644+ return -ENOMEM;
90645+ pol_m = vma_policy(vma_m);
90646+ mpol_get(pol_m);
90647+ set_vma_policy(vma_m, pol_m);
90648+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
90649+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
90650+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
90651+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
90652+ if (vma_m->vm_file)
90653+ get_file(vma_m->vm_file);
90654+ if (vma_m->vm_ops && vma_m->vm_ops->open)
90655+ vma_m->vm_ops->open(vma_m);
90656+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
90657+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
90658+ vma_m->vm_mirror = vma;
90659+ vma->vm_mirror = vma_m;
90660+ return 0;
90661+}
90662+#endif
90663+
90664 /*
90665 * Return true if the calling process may expand its vm space by the passed
90666 * number of pages
90667@@ -2855,6 +3400,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
90668
90669 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
90670
90671+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
90672 if (cur + npages > lim)
90673 return 0;
90674 return 1;
90675@@ -2925,6 +3471,22 @@ int install_special_mapping(struct mm_struct *mm,
90676 vma->vm_start = addr;
90677 vma->vm_end = addr + len;
90678
90679+#ifdef CONFIG_PAX_MPROTECT
90680+ if (mm->pax_flags & MF_PAX_MPROTECT) {
90681+#ifndef CONFIG_PAX_MPROTECT_COMPAT
90682+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
90683+ return -EPERM;
90684+ if (!(vm_flags & VM_EXEC))
90685+ vm_flags &= ~VM_MAYEXEC;
90686+#else
90687+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
90688+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
90689+#endif
90690+ else
90691+ vm_flags &= ~VM_MAYWRITE;
90692+ }
90693+#endif
90694+
90695 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
90696 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
90697
90698diff --git a/mm/mprotect.c b/mm/mprotect.c
90699index 7651a57..d761c62 100644
90700--- a/mm/mprotect.c
90701+++ b/mm/mprotect.c
90702@@ -23,10 +23,18 @@
90703 #include <linux/mmu_notifier.h>
90704 #include <linux/migrate.h>
90705 #include <linux/perf_event.h>
90706+#include <linux/sched/sysctl.h>
90707+
90708+#ifdef CONFIG_PAX_MPROTECT
90709+#include <linux/elf.h>
90710+#include <linux/binfmts.h>
90711+#endif
90712+
90713 #include <asm/uaccess.h>
90714 #include <asm/pgtable.h>
90715 #include <asm/cacheflush.h>
90716 #include <asm/tlbflush.h>
90717+#include <asm/mmu_context.h>
90718
90719 #ifndef pgprot_modify
90720 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
90721@@ -250,6 +258,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
90722 return pages;
90723 }
90724
90725+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
90726+/* called while holding the mmap semaphor for writing except stack expansion */
90727+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
90728+{
90729+ unsigned long oldlimit, newlimit = 0UL;
90730+
90731+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
90732+ return;
90733+
90734+ spin_lock(&mm->page_table_lock);
90735+ oldlimit = mm->context.user_cs_limit;
90736+ if ((prot & VM_EXEC) && oldlimit < end)
90737+ /* USER_CS limit moved up */
90738+ newlimit = end;
90739+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
90740+ /* USER_CS limit moved down */
90741+ newlimit = start;
90742+
90743+ if (newlimit) {
90744+ mm->context.user_cs_limit = newlimit;
90745+
90746+#ifdef CONFIG_SMP
90747+ wmb();
90748+ cpus_clear(mm->context.cpu_user_cs_mask);
90749+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
90750+#endif
90751+
90752+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
90753+ }
90754+ spin_unlock(&mm->page_table_lock);
90755+ if (newlimit == end) {
90756+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
90757+
90758+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
90759+ if (is_vm_hugetlb_page(vma))
90760+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
90761+ else
90762+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
90763+ }
90764+}
90765+#endif
90766+
90767 int
90768 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90769 unsigned long start, unsigned long end, unsigned long newflags)
90770@@ -262,11 +312,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90771 int error;
90772 int dirty_accountable = 0;
90773
90774+#ifdef CONFIG_PAX_SEGMEXEC
90775+ struct vm_area_struct *vma_m = NULL;
90776+ unsigned long start_m, end_m;
90777+
90778+ start_m = start + SEGMEXEC_TASK_SIZE;
90779+ end_m = end + SEGMEXEC_TASK_SIZE;
90780+#endif
90781+
90782 if (newflags == oldflags) {
90783 *pprev = vma;
90784 return 0;
90785 }
90786
90787+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
90788+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
90789+
90790+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
90791+ return -ENOMEM;
90792+
90793+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
90794+ return -ENOMEM;
90795+ }
90796+
90797 /*
90798 * If we make a private mapping writable we increase our commit;
90799 * but (without finer accounting) cannot reduce our commit if we
90800@@ -283,6 +351,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
90801 }
90802 }
90803
90804+#ifdef CONFIG_PAX_SEGMEXEC
90805+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
90806+ if (start != vma->vm_start) {
90807+ error = split_vma(mm, vma, start, 1);
90808+ if (error)
90809+ goto fail;
90810+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
90811+ *pprev = (*pprev)->vm_next;
90812+ }
90813+
90814+ if (end != vma->vm_end) {
90815+ error = split_vma(mm, vma, end, 0);
90816+ if (error)
90817+ goto fail;
90818+ }
90819+
90820+ if (pax_find_mirror_vma(vma)) {
90821+ error = __do_munmap(mm, start_m, end_m - start_m);
90822+ if (error)
90823+ goto fail;
90824+ } else {
90825+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
90826+ if (!vma_m) {
90827+ error = -ENOMEM;
90828+ goto fail;
90829+ }
90830+ vma->vm_flags = newflags;
90831+ error = pax_mirror_vma(vma_m, vma);
90832+ if (error) {
90833+ vma->vm_flags = oldflags;
90834+ goto fail;
90835+ }
90836+ }
90837+ }
90838+#endif
90839+
90840 /*
90841 * First try to merge with previous and/or next vma.
90842 */
90843@@ -313,9 +417,21 @@ success:
90844 * vm_flags and vm_page_prot are protected by the mmap_sem
90845 * held in write mode.
90846 */
90847+
90848+#ifdef CONFIG_PAX_SEGMEXEC
90849+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
90850+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
90851+#endif
90852+
90853 vma->vm_flags = newflags;
90854+
90855+#ifdef CONFIG_PAX_MPROTECT
90856+ if (mm->binfmt && mm->binfmt->handle_mprotect)
90857+ mm->binfmt->handle_mprotect(vma, newflags);
90858+#endif
90859+
90860 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
90861- vm_get_page_prot(newflags));
90862+ vm_get_page_prot(vma->vm_flags));
90863
90864 if (vma_wants_writenotify(vma)) {
90865 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
90866@@ -354,6 +470,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90867 end = start + len;
90868 if (end <= start)
90869 return -ENOMEM;
90870+
90871+#ifdef CONFIG_PAX_SEGMEXEC
90872+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
90873+ if (end > SEGMEXEC_TASK_SIZE)
90874+ return -EINVAL;
90875+ } else
90876+#endif
90877+
90878+ if (end > TASK_SIZE)
90879+ return -EINVAL;
90880+
90881 if (!arch_validate_prot(prot))
90882 return -EINVAL;
90883
90884@@ -361,7 +488,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90885 /*
90886 * Does the application expect PROT_READ to imply PROT_EXEC:
90887 */
90888- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
90889+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
90890 prot |= PROT_EXEC;
90891
90892 vm_flags = calc_vm_prot_bits(prot);
90893@@ -393,6 +520,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90894 if (start > vma->vm_start)
90895 prev = vma;
90896
90897+#ifdef CONFIG_PAX_MPROTECT
90898+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
90899+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
90900+#endif
90901+
90902 for (nstart = start ; ; ) {
90903 unsigned long newflags;
90904
90905@@ -403,6 +535,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90906
90907 /* newflags >> 4 shift VM_MAY% in place of VM_% */
90908 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
90909+ if (prot & (PROT_WRITE | PROT_EXEC))
90910+ gr_log_rwxmprotect(vma);
90911+
90912+ error = -EACCES;
90913+ goto out;
90914+ }
90915+
90916+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
90917 error = -EACCES;
90918 goto out;
90919 }
90920@@ -417,6 +557,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
90921 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
90922 if (error)
90923 goto out;
90924+
90925+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
90926+
90927 nstart = tmp;
90928
90929 if (nstart < prev->vm_end)
90930diff --git a/mm/mremap.c b/mm/mremap.c
90931index 0843feb..4f5b2e6 100644
90932--- a/mm/mremap.c
90933+++ b/mm/mremap.c
90934@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
90935 continue;
90936 pte = ptep_get_and_clear(mm, old_addr, old_pte);
90937 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
90938+
90939+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
90940+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
90941+ pte = pte_exprotect(pte);
90942+#endif
90943+
90944 pte = move_soft_dirty_pte(pte);
90945 set_pte_at(mm, new_addr, new_pte, pte);
90946 }
90947@@ -337,6 +343,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
90948 if (is_vm_hugetlb_page(vma))
90949 goto Einval;
90950
90951+#ifdef CONFIG_PAX_SEGMEXEC
90952+ if (pax_find_mirror_vma(vma))
90953+ goto Einval;
90954+#endif
90955+
90956 /* We can't remap across vm area boundaries */
90957 if (old_len > vma->vm_end - addr)
90958 goto Efault;
90959@@ -392,20 +403,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
90960 unsigned long ret = -EINVAL;
90961 unsigned long charged = 0;
90962 unsigned long map_flags;
90963+ unsigned long pax_task_size = TASK_SIZE;
90964
90965 if (new_addr & ~PAGE_MASK)
90966 goto out;
90967
90968- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
90969+#ifdef CONFIG_PAX_SEGMEXEC
90970+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
90971+ pax_task_size = SEGMEXEC_TASK_SIZE;
90972+#endif
90973+
90974+ pax_task_size -= PAGE_SIZE;
90975+
90976+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
90977 goto out;
90978
90979 /* Check if the location we're moving into overlaps the
90980 * old location at all, and fail if it does.
90981 */
90982- if ((new_addr <= addr) && (new_addr+new_len) > addr)
90983- goto out;
90984-
90985- if ((addr <= new_addr) && (addr+old_len) > new_addr)
90986+ if (addr + old_len > new_addr && new_addr + new_len > addr)
90987 goto out;
90988
90989 ret = do_munmap(mm, new_addr, new_len);
90990@@ -474,6 +490,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
90991 unsigned long ret = -EINVAL;
90992 unsigned long charged = 0;
90993 bool locked = false;
90994+ unsigned long pax_task_size = TASK_SIZE;
90995
90996 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
90997 return ret;
90998@@ -495,6 +512,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
90999 if (!new_len)
91000 return ret;
91001
91002+#ifdef CONFIG_PAX_SEGMEXEC
91003+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
91004+ pax_task_size = SEGMEXEC_TASK_SIZE;
91005+#endif
91006+
91007+ pax_task_size -= PAGE_SIZE;
91008+
91009+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
91010+ old_len > pax_task_size || addr > pax_task_size-old_len)
91011+ return ret;
91012+
91013 down_write(&current->mm->mmap_sem);
91014
91015 if (flags & MREMAP_FIXED) {
91016@@ -545,6 +573,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91017 new_addr = addr;
91018 }
91019 ret = addr;
91020+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
91021 goto out;
91022 }
91023 }
91024@@ -568,7 +597,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
91025 goto out;
91026 }
91027
91028+ map_flags = vma->vm_flags;
91029 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
91030+ if (!(ret & ~PAGE_MASK)) {
91031+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
91032+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
91033+ }
91034 }
91035 out:
91036 if (ret & ~PAGE_MASK)
91037diff --git a/mm/nommu.c b/mm/nommu.c
91038index ecd1f15..77039bd 100644
91039--- a/mm/nommu.c
91040+++ b/mm/nommu.c
91041@@ -64,7 +64,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
91042 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
91043 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
91044 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
91045-int heap_stack_gap = 0;
91046
91047 atomic_long_t mmap_pages_allocated;
91048
91049@@ -844,15 +843,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
91050 EXPORT_SYMBOL(find_vma);
91051
91052 /*
91053- * find a VMA
91054- * - we don't extend stack VMAs under NOMMU conditions
91055- */
91056-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
91057-{
91058- return find_vma(mm, addr);
91059-}
91060-
91061-/*
91062 * expand a stack to a given address
91063 * - not supported under NOMMU conditions
91064 */
91065@@ -1563,6 +1553,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
91066
91067 /* most fields are the same, copy all, and then fixup */
91068 *new = *vma;
91069+ INIT_LIST_HEAD(&new->anon_vma_chain);
91070 *region = *vma->vm_region;
91071 new->vm_region = region;
91072
91073@@ -1993,8 +1984,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
91074 }
91075 EXPORT_SYMBOL(generic_file_remap_pages);
91076
91077-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91078- unsigned long addr, void *buf, int len, int write)
91079+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91080+ unsigned long addr, void *buf, size_t len, int write)
91081 {
91082 struct vm_area_struct *vma;
91083
91084@@ -2035,8 +2026,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
91085 *
91086 * The caller must hold a reference on @mm.
91087 */
91088-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91089- void *buf, int len, int write)
91090+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
91091+ void *buf, size_t len, int write)
91092 {
91093 return __access_remote_vm(NULL, mm, addr, buf, len, write);
91094 }
91095@@ -2045,7 +2036,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91096 * Access another process' address space.
91097 * - source/target buffer must be kernel space
91098 */
91099-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
91100+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
91101 {
91102 struct mm_struct *mm;
91103
91104diff --git a/mm/page-writeback.c b/mm/page-writeback.c
91105index 6380758..4064aec 100644
91106--- a/mm/page-writeback.c
91107+++ b/mm/page-writeback.c
91108@@ -690,7 +690,7 @@ static inline long long pos_ratio_polynom(unsigned long setpoint,
91109 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
91110 * - the bdi dirty thresh drops quickly due to change of JBOD workload
91111 */
91112-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
91113+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
91114 unsigned long thresh,
91115 unsigned long bg_thresh,
91116 unsigned long dirty,
91117diff --git a/mm/page_alloc.c b/mm/page_alloc.c
91118index 317ea74..a4a1977 100644
91119--- a/mm/page_alloc.c
91120+++ b/mm/page_alloc.c
91121@@ -61,6 +61,7 @@
91122 #include <linux/page-debug-flags.h>
91123 #include <linux/hugetlb.h>
91124 #include <linux/sched/rt.h>
91125+#include <linux/random.h>
91126
91127 #include <asm/sections.h>
91128 #include <asm/tlbflush.h>
91129@@ -354,7 +355,7 @@ out:
91130 * This usage means that zero-order pages may not be compound.
91131 */
91132
91133-static void free_compound_page(struct page *page)
91134+void free_compound_page(struct page *page)
91135 {
91136 __free_pages_ok(page, compound_order(page));
91137 }
91138@@ -712,6 +713,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
91139 int i;
91140 int bad = 0;
91141
91142+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91143+ unsigned long index = 1UL << order;
91144+#endif
91145+
91146 trace_mm_page_free(page, order);
91147 kmemcheck_free_shadow(page, order);
91148
91149@@ -728,6 +733,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
91150 debug_check_no_obj_freed(page_address(page),
91151 PAGE_SIZE << order);
91152 }
91153+
91154+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91155+ for (; index; --index)
91156+ sanitize_highpage(page + index - 1);
91157+#endif
91158+
91159 arch_free_page(page, order);
91160 kernel_map_pages(page, 1 << order, 0);
91161
91162@@ -750,6 +761,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
91163 local_irq_restore(flags);
91164 }
91165
91166+#ifdef CONFIG_PAX_LATENT_ENTROPY
91167+bool __meminitdata extra_latent_entropy;
91168+
91169+static int __init setup_pax_extra_latent_entropy(char *str)
91170+{
91171+ extra_latent_entropy = true;
91172+ return 0;
91173+}
91174+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
91175+
91176+volatile u64 latent_entropy __latent_entropy;
91177+EXPORT_SYMBOL(latent_entropy);
91178+#endif
91179+
91180 void __init __free_pages_bootmem(struct page *page, unsigned int order)
91181 {
91182 unsigned int nr_pages = 1 << order;
91183@@ -765,6 +790,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
91184 __ClearPageReserved(p);
91185 set_page_count(p, 0);
91186
91187+#ifdef CONFIG_PAX_LATENT_ENTROPY
91188+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
91189+ u64 hash = 0;
91190+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
91191+ const u64 *data = lowmem_page_address(page);
91192+
91193+ for (index = 0; index < end; index++)
91194+ hash ^= hash + data[index];
91195+ latent_entropy ^= hash;
91196+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
91197+ }
91198+#endif
91199+
91200 page_zone(page)->managed_pages += nr_pages;
91201 set_page_refcounted(page);
91202 __free_pages(page, order);
91203@@ -870,8 +908,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
91204 arch_alloc_page(page, order);
91205 kernel_map_pages(page, 1 << order, 1);
91206
91207+#ifndef CONFIG_PAX_MEMORY_SANITIZE
91208 if (gfp_flags & __GFP_ZERO)
91209 prep_zero_page(page, order, gfp_flags);
91210+#endif
91211
91212 if (order && (gfp_flags & __GFP_COMP))
91213 prep_compound_page(page, order);
91214diff --git a/mm/page_io.c b/mm/page_io.c
91215index 8c79a47..a689e0d 100644
91216--- a/mm/page_io.c
91217+++ b/mm/page_io.c
91218@@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
91219 struct file *swap_file = sis->swap_file;
91220 struct address_space *mapping = swap_file->f_mapping;
91221 struct iovec iov = {
91222- .iov_base = kmap(page),
91223+ .iov_base = (void __force_user *)kmap(page),
91224 .iov_len = PAGE_SIZE,
91225 };
91226
91227diff --git a/mm/percpu.c b/mm/percpu.c
91228index 8c8e08f..73a5cda 100644
91229--- a/mm/percpu.c
91230+++ b/mm/percpu.c
91231@@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
91232 static unsigned int pcpu_high_unit_cpu __read_mostly;
91233
91234 /* the address of the first chunk which starts with the kernel static area */
91235-void *pcpu_base_addr __read_mostly;
91236+void *pcpu_base_addr __read_only;
91237 EXPORT_SYMBOL_GPL(pcpu_base_addr);
91238
91239 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
91240diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
91241index fd26d04..0cea1b0 100644
91242--- a/mm/process_vm_access.c
91243+++ b/mm/process_vm_access.c
91244@@ -13,6 +13,7 @@
91245 #include <linux/uio.h>
91246 #include <linux/sched.h>
91247 #include <linux/highmem.h>
91248+#include <linux/security.h>
91249 #include <linux/ptrace.h>
91250 #include <linux/slab.h>
91251 #include <linux/syscalls.h>
91252@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
91253 size_t iov_l_curr_offset = 0;
91254 ssize_t iov_len;
91255
91256+ return -ENOSYS; // PaX: until properly audited
91257+
91258 /*
91259 * Work out how many pages of struct pages we're going to need
91260 * when eventually calling get_user_pages
91261 */
91262 for (i = 0; i < riovcnt; i++) {
91263 iov_len = rvec[i].iov_len;
91264- if (iov_len > 0) {
91265- nr_pages_iov = ((unsigned long)rvec[i].iov_base
91266- + iov_len)
91267- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
91268- / PAGE_SIZE + 1;
91269- nr_pages = max(nr_pages, nr_pages_iov);
91270- }
91271+ if (iov_len <= 0)
91272+ continue;
91273+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
91274+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
91275+ nr_pages = max(nr_pages, nr_pages_iov);
91276 }
91277
91278 if (nr_pages == 0)
91279@@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
91280 goto free_proc_pages;
91281 }
91282
91283+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
91284+ rc = -EPERM;
91285+ goto put_task_struct;
91286+ }
91287+
91288 mm = mm_access(task, PTRACE_MODE_ATTACH);
91289 if (!mm || IS_ERR(mm)) {
91290 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
91291diff --git a/mm/rmap.c b/mm/rmap.c
91292index b9d2222..e4baa1f 100644
91293--- a/mm/rmap.c
91294+++ b/mm/rmap.c
91295@@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91296 struct anon_vma *anon_vma = vma->anon_vma;
91297 struct anon_vma_chain *avc;
91298
91299+#ifdef CONFIG_PAX_SEGMEXEC
91300+ struct anon_vma_chain *avc_m = NULL;
91301+#endif
91302+
91303 might_sleep();
91304 if (unlikely(!anon_vma)) {
91305 struct mm_struct *mm = vma->vm_mm;
91306@@ -172,6 +176,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91307 if (!avc)
91308 goto out_enomem;
91309
91310+#ifdef CONFIG_PAX_SEGMEXEC
91311+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
91312+ if (!avc_m)
91313+ goto out_enomem_free_avc;
91314+#endif
91315+
91316 anon_vma = find_mergeable_anon_vma(vma);
91317 allocated = NULL;
91318 if (!anon_vma) {
91319@@ -185,6 +195,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91320 /* page_table_lock to protect against threads */
91321 spin_lock(&mm->page_table_lock);
91322 if (likely(!vma->anon_vma)) {
91323+
91324+#ifdef CONFIG_PAX_SEGMEXEC
91325+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
91326+
91327+ if (vma_m) {
91328+ BUG_ON(vma_m->anon_vma);
91329+ vma_m->anon_vma = anon_vma;
91330+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
91331+ avc_m = NULL;
91332+ }
91333+#endif
91334+
91335 vma->anon_vma = anon_vma;
91336 anon_vma_chain_link(vma, avc, anon_vma);
91337 allocated = NULL;
91338@@ -195,12 +217,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
91339
91340 if (unlikely(allocated))
91341 put_anon_vma(allocated);
91342+
91343+#ifdef CONFIG_PAX_SEGMEXEC
91344+ if (unlikely(avc_m))
91345+ anon_vma_chain_free(avc_m);
91346+#endif
91347+
91348 if (unlikely(avc))
91349 anon_vma_chain_free(avc);
91350 }
91351 return 0;
91352
91353 out_enomem_free_avc:
91354+
91355+#ifdef CONFIG_PAX_SEGMEXEC
91356+ if (avc_m)
91357+ anon_vma_chain_free(avc_m);
91358+#endif
91359+
91360 anon_vma_chain_free(avc);
91361 out_enomem:
91362 return -ENOMEM;
91363@@ -236,7 +270,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
91364 * Attach the anon_vmas from src to dst.
91365 * Returns 0 on success, -ENOMEM on failure.
91366 */
91367-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
91368+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
91369 {
91370 struct anon_vma_chain *avc, *pavc;
91371 struct anon_vma *root = NULL;
91372@@ -269,7 +303,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
91373 * the corresponding VMA in the parent process is attached to.
91374 * Returns 0 on success, non-zero on failure.
91375 */
91376-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
91377+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
91378 {
91379 struct anon_vma_chain *avc;
91380 struct anon_vma *anon_vma;
91381@@ -373,8 +407,10 @@ static void anon_vma_ctor(void *data)
91382 void __init anon_vma_init(void)
91383 {
91384 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
91385- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
91386- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
91387+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
91388+ anon_vma_ctor);
91389+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
91390+ SLAB_PANIC|SLAB_NO_SANITIZE);
91391 }
91392
91393 /*
91394diff --git a/mm/shmem.c b/mm/shmem.c
91395index 8297623..6b9dfe9 100644
91396--- a/mm/shmem.c
91397+++ b/mm/shmem.c
91398@@ -33,7 +33,7 @@
91399 #include <linux/swap.h>
91400 #include <linux/aio.h>
91401
91402-static struct vfsmount *shm_mnt;
91403+struct vfsmount *shm_mnt;
91404
91405 #ifdef CONFIG_SHMEM
91406 /*
91407@@ -77,7 +77,7 @@ static struct vfsmount *shm_mnt;
91408 #define BOGO_DIRENT_SIZE 20
91409
91410 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
91411-#define SHORT_SYMLINK_LEN 128
91412+#define SHORT_SYMLINK_LEN 64
91413
91414 /*
91415 * shmem_fallocate and shmem_writepage communicate via inode->i_private
91416@@ -2232,6 +2232,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
91417 static int shmem_xattr_validate(const char *name)
91418 {
91419 struct { const char *prefix; size_t len; } arr[] = {
91420+
91421+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
91422+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
91423+#endif
91424+
91425 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
91426 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
91427 };
91428@@ -2287,6 +2292,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
91429 if (err)
91430 return err;
91431
91432+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
91433+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
91434+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
91435+ return -EOPNOTSUPP;
91436+ if (size > 8)
91437+ return -EINVAL;
91438+ }
91439+#endif
91440+
91441 return simple_xattr_set(&info->xattrs, name, value, size, flags);
91442 }
91443
91444@@ -2599,8 +2613,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
91445 int err = -ENOMEM;
91446
91447 /* Round up to L1_CACHE_BYTES to resist false sharing */
91448- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
91449- L1_CACHE_BYTES), GFP_KERNEL);
91450+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
91451 if (!sbinfo)
91452 return -ENOMEM;
91453
91454diff --git a/mm/slab.c b/mm/slab.c
91455index 2580db0..0523956 100644
91456--- a/mm/slab.c
91457+++ b/mm/slab.c
91458@@ -366,10 +366,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
91459 if ((x)->max_freeable < i) \
91460 (x)->max_freeable = i; \
91461 } while (0)
91462-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
91463-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
91464-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
91465-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
91466+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
91467+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
91468+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
91469+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
91470+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
91471+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
91472 #else
91473 #define STATS_INC_ACTIVE(x) do { } while (0)
91474 #define STATS_DEC_ACTIVE(x) do { } while (0)
91475@@ -386,6 +388,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
91476 #define STATS_INC_ALLOCMISS(x) do { } while (0)
91477 #define STATS_INC_FREEHIT(x) do { } while (0)
91478 #define STATS_INC_FREEMISS(x) do { } while (0)
91479+#define STATS_INC_SANITIZED(x) do { } while (0)
91480+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
91481 #endif
91482
91483 #if DEBUG
91484@@ -477,7 +481,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
91485 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
91486 */
91487 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
91488- const struct slab *slab, void *obj)
91489+ const struct slab *slab, const void *obj)
91490 {
91491 u32 offset = (obj - slab->s_mem);
91492 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
91493@@ -1571,12 +1575,12 @@ void __init kmem_cache_init(void)
91494 */
91495
91496 kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
91497- kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
91498+ kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
91499
91500 if (INDEX_AC != INDEX_NODE)
91501 kmalloc_caches[INDEX_NODE] =
91502 create_kmalloc_cache("kmalloc-node",
91503- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
91504+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
91505
91506 slab_early_init = 0;
91507
91508@@ -3577,6 +3581,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
91509 struct array_cache *ac = cpu_cache_get(cachep);
91510
91511 check_irq_off();
91512+
91513+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91514+ if (pax_sanitize_slab) {
91515+ if (!(cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))) {
91516+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
91517+
91518+ if (cachep->ctor)
91519+ cachep->ctor(objp);
91520+
91521+ STATS_INC_SANITIZED(cachep);
91522+ } else
91523+ STATS_INC_NOT_SANITIZED(cachep);
91524+ }
91525+#endif
91526+
91527 kmemleak_free_recursive(objp, cachep->flags);
91528 objp = cache_free_debugcheck(cachep, objp, caller);
91529
91530@@ -3805,6 +3824,7 @@ void kfree(const void *objp)
91531
91532 if (unlikely(ZERO_OR_NULL_PTR(objp)))
91533 return;
91534+ VM_BUG_ON(!virt_addr_valid(objp));
91535 local_irq_save(flags);
91536 kfree_debugcheck(objp);
91537 c = virt_to_cache(objp);
91538@@ -4246,14 +4266,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
91539 }
91540 /* cpu stats */
91541 {
91542- unsigned long allochit = atomic_read(&cachep->allochit);
91543- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
91544- unsigned long freehit = atomic_read(&cachep->freehit);
91545- unsigned long freemiss = atomic_read(&cachep->freemiss);
91546+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
91547+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
91548+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
91549+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
91550
91551 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
91552 allochit, allocmiss, freehit, freemiss);
91553 }
91554+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91555+ {
91556+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
91557+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
91558+
91559+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
91560+ }
91561+#endif
91562 #endif
91563 }
91564
91565@@ -4471,13 +4499,71 @@ static const struct file_operations proc_slabstats_operations = {
91566 static int __init slab_proc_init(void)
91567 {
91568 #ifdef CONFIG_DEBUG_SLAB_LEAK
91569- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
91570+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
91571 #endif
91572 return 0;
91573 }
91574 module_init(slab_proc_init);
91575 #endif
91576
91577+bool is_usercopy_object(const void *ptr)
91578+{
91579+ struct page *page;
91580+ struct kmem_cache *cachep;
91581+
91582+ if (ZERO_OR_NULL_PTR(ptr))
91583+ return false;
91584+
91585+ if (!slab_is_available())
91586+ return false;
91587+
91588+ if (!virt_addr_valid(ptr))
91589+ return false;
91590+
91591+ page = virt_to_head_page(ptr);
91592+
91593+ if (!PageSlab(page))
91594+ return false;
91595+
91596+ cachep = page->slab_cache;
91597+ return cachep->flags & SLAB_USERCOPY;
91598+}
91599+
91600+#ifdef CONFIG_PAX_USERCOPY
91601+const char *check_heap_object(const void *ptr, unsigned long n)
91602+{
91603+ struct page *page;
91604+ struct kmem_cache *cachep;
91605+ struct slab *slabp;
91606+ unsigned int objnr;
91607+ unsigned long offset;
91608+
91609+ if (ZERO_OR_NULL_PTR(ptr))
91610+ return "<null>";
91611+
91612+ if (!virt_addr_valid(ptr))
91613+ return NULL;
91614+
91615+ page = virt_to_head_page(ptr);
91616+
91617+ if (!PageSlab(page))
91618+ return NULL;
91619+
91620+ cachep = page->slab_cache;
91621+ if (!(cachep->flags & SLAB_USERCOPY))
91622+ return cachep->name;
91623+
91624+ slabp = page->slab_page;
91625+ objnr = obj_to_index(cachep, slabp, ptr);
91626+ BUG_ON(objnr >= cachep->num);
91627+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
91628+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
91629+ return NULL;
91630+
91631+ return cachep->name;
91632+}
91633+#endif
91634+
91635 /**
91636 * ksize - get the actual amount of memory allocated for a given object
91637 * @objp: Pointer to the object
91638diff --git a/mm/slab.h b/mm/slab.h
91639index a535033..2f98fe5 100644
91640--- a/mm/slab.h
91641+++ b/mm/slab.h
91642@@ -32,6 +32,15 @@ extern struct list_head slab_caches;
91643 /* The slab cache that manages slab cache information */
91644 extern struct kmem_cache *kmem_cache;
91645
91646+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91647+#ifdef CONFIG_X86_64
91648+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
91649+#else
91650+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
91651+#endif
91652+extern bool pax_sanitize_slab;
91653+#endif
91654+
91655 unsigned long calculate_alignment(unsigned long flags,
91656 unsigned long align, unsigned long size);
91657
91658@@ -67,7 +76,8 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
91659
91660 /* Legal flag mask for kmem_cache_create(), for various configurations */
91661 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
91662- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
91663+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
91664+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
91665
91666 #if defined(CONFIG_DEBUG_SLAB)
91667 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
91668@@ -231,6 +241,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
91669 return s;
91670
91671 page = virt_to_head_page(x);
91672+
91673+ BUG_ON(!PageSlab(page));
91674+
91675 cachep = page->slab_cache;
91676 if (slab_equal_or_root(cachep, s))
91677 return cachep;
91678diff --git a/mm/slab_common.c b/mm/slab_common.c
91679index e2e98af..3b1a163 100644
91680--- a/mm/slab_common.c
91681+++ b/mm/slab_common.c
91682@@ -23,11 +23,22 @@
91683
91684 #include "slab.h"
91685
91686-enum slab_state slab_state;
91687+enum slab_state slab_state __read_only;
91688 LIST_HEAD(slab_caches);
91689 DEFINE_MUTEX(slab_mutex);
91690 struct kmem_cache *kmem_cache;
91691
91692+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91693+bool pax_sanitize_slab __read_only = true;
91694+static int __init pax_sanitize_slab_setup(char *str)
91695+{
91696+ pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
91697+ printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
91698+ return 1;
91699+}
91700+__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
91701+#endif
91702+
91703 #ifdef CONFIG_DEBUG_VM
91704 static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
91705 size_t size)
91706@@ -212,7 +223,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
91707
91708 err = __kmem_cache_create(s, flags);
91709 if (!err) {
91710- s->refcount = 1;
91711+ atomic_set(&s->refcount, 1);
91712 list_add(&s->list, &slab_caches);
91713 memcg_cache_list_add(memcg, s);
91714 } else {
91715@@ -258,8 +269,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
91716
91717 get_online_cpus();
91718 mutex_lock(&slab_mutex);
91719- s->refcount--;
91720- if (!s->refcount) {
91721+ if (atomic_dec_and_test(&s->refcount)) {
91722 list_del(&s->list);
91723
91724 if (!__kmem_cache_shutdown(s)) {
91725@@ -305,7 +315,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
91726 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
91727 name, size, err);
91728
91729- s->refcount = -1; /* Exempt from merging for now */
91730+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
91731 }
91732
91733 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
91734@@ -318,7 +328,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
91735
91736 create_boot_cache(s, name, size, flags);
91737 list_add(&s->list, &slab_caches);
91738- s->refcount = 1;
91739+ atomic_set(&s->refcount, 1);
91740 return s;
91741 }
91742
91743@@ -330,6 +340,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
91744 EXPORT_SYMBOL(kmalloc_dma_caches);
91745 #endif
91746
91747+#ifdef CONFIG_PAX_USERCOPY_SLABS
91748+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
91749+EXPORT_SYMBOL(kmalloc_usercopy_caches);
91750+#endif
91751+
91752 /*
91753 * Conversion table for small slabs sizes / 8 to the index in the
91754 * kmalloc array. This is necessary for slabs < 192 since we have non power
91755@@ -394,6 +409,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
91756 return kmalloc_dma_caches[index];
91757
91758 #endif
91759+
91760+#ifdef CONFIG_PAX_USERCOPY_SLABS
91761+ if (unlikely((flags & GFP_USERCOPY)))
91762+ return kmalloc_usercopy_caches[index];
91763+
91764+#endif
91765+
91766 return kmalloc_caches[index];
91767 }
91768
91769@@ -450,7 +472,7 @@ void __init create_kmalloc_caches(unsigned long flags)
91770 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
91771 if (!kmalloc_caches[i]) {
91772 kmalloc_caches[i] = create_kmalloc_cache(NULL,
91773- 1 << i, flags);
91774+ 1 << i, SLAB_USERCOPY | flags);
91775 }
91776
91777 /*
91778@@ -459,10 +481,10 @@ void __init create_kmalloc_caches(unsigned long flags)
91779 * earlier power of two caches
91780 */
91781 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
91782- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
91783+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
91784
91785 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
91786- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
91787+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
91788 }
91789
91790 /* Kmalloc array is now usable */
91791@@ -495,6 +517,23 @@ void __init create_kmalloc_caches(unsigned long flags)
91792 }
91793 }
91794 #endif
91795+
91796+#ifdef CONFIG_PAX_USERCOPY_SLABS
91797+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
91798+ struct kmem_cache *s = kmalloc_caches[i];
91799+
91800+ if (s) {
91801+ int size = kmalloc_size(i);
91802+ char *n = kasprintf(GFP_NOWAIT,
91803+ "usercopy-kmalloc-%d", size);
91804+
91805+ BUG_ON(!n);
91806+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
91807+ size, SLAB_USERCOPY | flags);
91808+ }
91809+ }
91810+#endif
91811+
91812 }
91813 #endif /* !CONFIG_SLOB */
91814
91815@@ -535,6 +574,9 @@ void print_slabinfo_header(struct seq_file *m)
91816 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
91817 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
91818 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
91819+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91820+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
91821+#endif
91822 #endif
91823 seq_putc(m, '\n');
91824 }
91825diff --git a/mm/slob.c b/mm/slob.c
91826index 4bf8809..98a6914 100644
91827--- a/mm/slob.c
91828+++ b/mm/slob.c
91829@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
91830 /*
91831 * Return the size of a slob block.
91832 */
91833-static slobidx_t slob_units(slob_t *s)
91834+static slobidx_t slob_units(const slob_t *s)
91835 {
91836 if (s->units > 0)
91837 return s->units;
91838@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
91839 /*
91840 * Return the next free slob block pointer after this one.
91841 */
91842-static slob_t *slob_next(slob_t *s)
91843+static slob_t *slob_next(const slob_t *s)
91844 {
91845 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
91846 slobidx_t next;
91847@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
91848 /*
91849 * Returns true if s is the last free block in its page.
91850 */
91851-static int slob_last(slob_t *s)
91852+static int slob_last(const slob_t *s)
91853 {
91854 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
91855 }
91856
91857-static void *slob_new_pages(gfp_t gfp, int order, int node)
91858+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
91859 {
91860- void *page;
91861+ struct page *page;
91862
91863 #ifdef CONFIG_NUMA
91864 if (node != NUMA_NO_NODE)
91865@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
91866 if (!page)
91867 return NULL;
91868
91869- return page_address(page);
91870+ __SetPageSlab(page);
91871+ return page;
91872 }
91873
91874-static void slob_free_pages(void *b, int order)
91875+static void slob_free_pages(struct page *sp, int order)
91876 {
91877 if (current->reclaim_state)
91878 current->reclaim_state->reclaimed_slab += 1 << order;
91879- free_pages((unsigned long)b, order);
91880+ __ClearPageSlab(sp);
91881+ page_mapcount_reset(sp);
91882+ sp->private = 0;
91883+ __free_pages(sp, order);
91884 }
91885
91886 /*
91887@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
91888
91889 /* Not enough space: must allocate a new page */
91890 if (!b) {
91891- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
91892- if (!b)
91893+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
91894+ if (!sp)
91895 return NULL;
91896- sp = virt_to_page(b);
91897- __SetPageSlab(sp);
91898+ b = page_address(sp);
91899
91900 spin_lock_irqsave(&slob_lock, flags);
91901 sp->units = SLOB_UNITS(PAGE_SIZE);
91902 sp->freelist = b;
91903+ sp->private = 0;
91904 INIT_LIST_HEAD(&sp->list);
91905 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
91906 set_slob_page_free(sp, slob_list);
91907@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
91908 if (slob_page_free(sp))
91909 clear_slob_page_free(sp);
91910 spin_unlock_irqrestore(&slob_lock, flags);
91911- __ClearPageSlab(sp);
91912- page_mapcount_reset(sp);
91913- slob_free_pages(b, 0);
91914+ slob_free_pages(sp, 0);
91915 return;
91916 }
91917
91918+#ifdef CONFIG_PAX_MEMORY_SANITIZE
91919+ if (pax_sanitize_slab)
91920+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
91921+#endif
91922+
91923 if (!slob_page_free(sp)) {
91924 /* This slob page is about to become partially free. Easy! */
91925 sp->units = units;
91926@@ -424,11 +431,10 @@ out:
91927 */
91928
91929 static __always_inline void *
91930-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
91931+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
91932 {
91933- unsigned int *m;
91934- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
91935- void *ret;
91936+ slob_t *m;
91937+ void *ret = NULL;
91938
91939 gfp &= gfp_allowed_mask;
91940
91941@@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
91942
91943 if (!m)
91944 return NULL;
91945- *m = size;
91946+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
91947+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
91948+ m[0].units = size;
91949+ m[1].units = align;
91950 ret = (void *)m + align;
91951
91952 trace_kmalloc_node(caller, ret,
91953 size, size + align, gfp, node);
91954 } else {
91955 unsigned int order = get_order(size);
91956+ struct page *page;
91957
91958 if (likely(order))
91959 gfp |= __GFP_COMP;
91960- ret = slob_new_pages(gfp, order, node);
91961+ page = slob_new_pages(gfp, order, node);
91962+ if (page) {
91963+ ret = page_address(page);
91964+ page->private = size;
91965+ }
91966
91967 trace_kmalloc_node(caller, ret,
91968 size, PAGE_SIZE << order, gfp, node);
91969 }
91970
91971- kmemleak_alloc(ret, size, 1, gfp);
91972+ return ret;
91973+}
91974+
91975+static __always_inline void *
91976+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
91977+{
91978+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
91979+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
91980+
91981+ if (!ZERO_OR_NULL_PTR(ret))
91982+ kmemleak_alloc(ret, size, 1, gfp);
91983 return ret;
91984 }
91985
91986@@ -493,34 +517,112 @@ void kfree(const void *block)
91987 return;
91988 kmemleak_free(block);
91989
91990+ VM_BUG_ON(!virt_addr_valid(block));
91991 sp = virt_to_page(block);
91992- if (PageSlab(sp)) {
91993+ VM_BUG_ON(!PageSlab(sp));
91994+ if (!sp->private) {
91995 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
91996- unsigned int *m = (unsigned int *)(block - align);
91997- slob_free(m, *m + align);
91998- } else
91999+ slob_t *m = (slob_t *)(block - align);
92000+ slob_free(m, m[0].units + align);
92001+ } else {
92002+ __ClearPageSlab(sp);
92003+ page_mapcount_reset(sp);
92004+ sp->private = 0;
92005 __free_pages(sp, compound_order(sp));
92006+ }
92007 }
92008 EXPORT_SYMBOL(kfree);
92009
92010+bool is_usercopy_object(const void *ptr)
92011+{
92012+ if (!slab_is_available())
92013+ return false;
92014+
92015+ // PAX: TODO
92016+
92017+ return false;
92018+}
92019+
92020+#ifdef CONFIG_PAX_USERCOPY
92021+const char *check_heap_object(const void *ptr, unsigned long n)
92022+{
92023+ struct page *page;
92024+ const slob_t *free;
92025+ const void *base;
92026+ unsigned long flags;
92027+
92028+ if (ZERO_OR_NULL_PTR(ptr))
92029+ return "<null>";
92030+
92031+ if (!virt_addr_valid(ptr))
92032+ return NULL;
92033+
92034+ page = virt_to_head_page(ptr);
92035+ if (!PageSlab(page))
92036+ return NULL;
92037+
92038+ if (page->private) {
92039+ base = page;
92040+ if (base <= ptr && n <= page->private - (ptr - base))
92041+ return NULL;
92042+ return "<slob>";
92043+ }
92044+
92045+ /* some tricky double walking to find the chunk */
92046+ spin_lock_irqsave(&slob_lock, flags);
92047+ base = (void *)((unsigned long)ptr & PAGE_MASK);
92048+ free = page->freelist;
92049+
92050+ while (!slob_last(free) && (void *)free <= ptr) {
92051+ base = free + slob_units(free);
92052+ free = slob_next(free);
92053+ }
92054+
92055+ while (base < (void *)free) {
92056+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
92057+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
92058+ int offset;
92059+
92060+ if (ptr < base + align)
92061+ break;
92062+
92063+ offset = ptr - base - align;
92064+ if (offset >= m) {
92065+ base += size;
92066+ continue;
92067+ }
92068+
92069+ if (n > m - offset)
92070+ break;
92071+
92072+ spin_unlock_irqrestore(&slob_lock, flags);
92073+ return NULL;
92074+ }
92075+
92076+ spin_unlock_irqrestore(&slob_lock, flags);
92077+ return "<slob>";
92078+}
92079+#endif
92080+
92081 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
92082 size_t ksize(const void *block)
92083 {
92084 struct page *sp;
92085 int align;
92086- unsigned int *m;
92087+ slob_t *m;
92088
92089 BUG_ON(!block);
92090 if (unlikely(block == ZERO_SIZE_PTR))
92091 return 0;
92092
92093 sp = virt_to_page(block);
92094- if (unlikely(!PageSlab(sp)))
92095- return PAGE_SIZE << compound_order(sp);
92096+ VM_BUG_ON(!PageSlab(sp));
92097+ if (sp->private)
92098+ return sp->private;
92099
92100 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
92101- m = (unsigned int *)(block - align);
92102- return SLOB_UNITS(*m) * SLOB_UNIT;
92103+ m = (slob_t *)(block - align);
92104+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
92105 }
92106 EXPORT_SYMBOL(ksize);
92107
92108@@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
92109
92110 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
92111 {
92112- void *b;
92113+ void *b = NULL;
92114
92115 flags &= gfp_allowed_mask;
92116
92117 lockdep_trace_alloc(flags);
92118
92119+#ifdef CONFIG_PAX_USERCOPY_SLABS
92120+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
92121+#else
92122 if (c->size < PAGE_SIZE) {
92123 b = slob_alloc(c->size, flags, c->align, node);
92124 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
92125 SLOB_UNITS(c->size) * SLOB_UNIT,
92126 flags, node);
92127 } else {
92128- b = slob_new_pages(flags, get_order(c->size), node);
92129+ struct page *sp;
92130+
92131+ sp = slob_new_pages(flags, get_order(c->size), node);
92132+ if (sp) {
92133+ b = page_address(sp);
92134+ sp->private = c->size;
92135+ }
92136 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
92137 PAGE_SIZE << get_order(c->size),
92138 flags, node);
92139 }
92140+#endif
92141
92142 if (b && c->ctor)
92143 c->ctor(b);
92144@@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
92145
92146 static void __kmem_cache_free(void *b, int size)
92147 {
92148- if (size < PAGE_SIZE)
92149+ struct page *sp;
92150+
92151+ sp = virt_to_page(b);
92152+ BUG_ON(!PageSlab(sp));
92153+ if (!sp->private)
92154 slob_free(b, size);
92155 else
92156- slob_free_pages(b, get_order(size));
92157+ slob_free_pages(sp, get_order(size));
92158 }
92159
92160 static void kmem_rcu_free(struct rcu_head *head)
92161@@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head)
92162
92163 void kmem_cache_free(struct kmem_cache *c, void *b)
92164 {
92165+ int size = c->size;
92166+
92167+#ifdef CONFIG_PAX_USERCOPY_SLABS
92168+ if (size + c->align < PAGE_SIZE) {
92169+ size += c->align;
92170+ b -= c->align;
92171+ }
92172+#endif
92173+
92174 kmemleak_free_recursive(b, c->flags);
92175 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
92176 struct slob_rcu *slob_rcu;
92177- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
92178- slob_rcu->size = c->size;
92179+ slob_rcu = b + (size - sizeof(struct slob_rcu));
92180+ slob_rcu->size = size;
92181 call_rcu(&slob_rcu->head, kmem_rcu_free);
92182 } else {
92183- __kmem_cache_free(b, c->size);
92184+ __kmem_cache_free(b, size);
92185 }
92186
92187+#ifdef CONFIG_PAX_USERCOPY_SLABS
92188+ trace_kfree(_RET_IP_, b);
92189+#else
92190 trace_kmem_cache_free(_RET_IP_, b);
92191+#endif
92192+
92193 }
92194 EXPORT_SYMBOL(kmem_cache_free);
92195
92196diff --git a/mm/slub.c b/mm/slub.c
92197index 96f2169..9111a59 100644
92198--- a/mm/slub.c
92199+++ b/mm/slub.c
92200@@ -207,7 +207,7 @@ struct track {
92201
92202 enum track_item { TRACK_ALLOC, TRACK_FREE };
92203
92204-#ifdef CONFIG_SYSFS
92205+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92206 static int sysfs_slab_add(struct kmem_cache *);
92207 static int sysfs_slab_alias(struct kmem_cache *, const char *);
92208 static void sysfs_slab_remove(struct kmem_cache *);
92209@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
92210 if (!t->addr)
92211 return;
92212
92213- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
92214+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
92215 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
92216 #ifdef CONFIG_STACKTRACE
92217 {
92218@@ -2616,6 +2616,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
92219
92220 slab_free_hook(s, x);
92221
92222+#ifdef CONFIG_PAX_MEMORY_SANITIZE
92223+ if (pax_sanitize_slab && !(s->flags & SLAB_NO_SANITIZE)) {
92224+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
92225+ if (s->ctor)
92226+ s->ctor(x);
92227+ }
92228+#endif
92229+
92230 redo:
92231 /*
92232 * Determine the currently cpus per cpu slab.
92233@@ -2683,7 +2691,7 @@ static int slub_min_objects;
92234 * Merge control. If this is set then no merging of slab caches will occur.
92235 * (Could be removed. This was introduced to pacify the merge skeptics.)
92236 */
92237-static int slub_nomerge;
92238+static int slub_nomerge = 1;
92239
92240 /*
92241 * Calculate the order of allocation given an slab object size.
92242@@ -2960,6 +2968,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
92243 s->inuse = size;
92244
92245 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
92246+#ifdef CONFIG_PAX_MEMORY_SANITIZE
92247+ (pax_sanitize_slab && !(flags & SLAB_NO_SANITIZE)) ||
92248+#endif
92249 s->ctor)) {
92250 /*
92251 * Relocate free pointer after the object if it is not
92252@@ -3305,6 +3316,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
92253 EXPORT_SYMBOL(__kmalloc_node);
92254 #endif
92255
92256+bool is_usercopy_object(const void *ptr)
92257+{
92258+ struct page *page;
92259+ struct kmem_cache *s;
92260+
92261+ if (ZERO_OR_NULL_PTR(ptr))
92262+ return false;
92263+
92264+ if (!slab_is_available())
92265+ return false;
92266+
92267+ if (!virt_addr_valid(ptr))
92268+ return false;
92269+
92270+ page = virt_to_head_page(ptr);
92271+
92272+ if (!PageSlab(page))
92273+ return false;
92274+
92275+ s = page->slab_cache;
92276+ return s->flags & SLAB_USERCOPY;
92277+}
92278+
92279+#ifdef CONFIG_PAX_USERCOPY
92280+const char *check_heap_object(const void *ptr, unsigned long n)
92281+{
92282+ struct page *page;
92283+ struct kmem_cache *s;
92284+ unsigned long offset;
92285+
92286+ if (ZERO_OR_NULL_PTR(ptr))
92287+ return "<null>";
92288+
92289+ if (!virt_addr_valid(ptr))
92290+ return NULL;
92291+
92292+ page = virt_to_head_page(ptr);
92293+
92294+ if (!PageSlab(page))
92295+ return NULL;
92296+
92297+ s = page->slab_cache;
92298+ if (!(s->flags & SLAB_USERCOPY))
92299+ return s->name;
92300+
92301+ offset = (ptr - page_address(page)) % s->size;
92302+ if (offset <= s->object_size && n <= s->object_size - offset)
92303+ return NULL;
92304+
92305+ return s->name;
92306+}
92307+#endif
92308+
92309 size_t ksize(const void *object)
92310 {
92311 struct page *page;
92312@@ -3333,6 +3397,7 @@ void kfree(const void *x)
92313 if (unlikely(ZERO_OR_NULL_PTR(x)))
92314 return;
92315
92316+ VM_BUG_ON(!virt_addr_valid(x));
92317 page = virt_to_head_page(x);
92318 if (unlikely(!PageSlab(page))) {
92319 BUG_ON(!PageCompound(page));
92320@@ -3638,7 +3703,7 @@ static int slab_unmergeable(struct kmem_cache *s)
92321 /*
92322 * We may have set a slab to be unmergeable during bootstrap.
92323 */
92324- if (s->refcount < 0)
92325+ if (atomic_read(&s->refcount) < 0)
92326 return 1;
92327
92328 return 0;
92329@@ -3696,7 +3761,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
92330
92331 s = find_mergeable(memcg, size, align, flags, name, ctor);
92332 if (s) {
92333- s->refcount++;
92334+ atomic_inc(&s->refcount);
92335 /*
92336 * Adjust the object sizes so that we clear
92337 * the complete object on kzalloc.
92338@@ -3705,7 +3770,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
92339 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
92340
92341 if (sysfs_slab_alias(s, name)) {
92342- s->refcount--;
92343+ atomic_dec(&s->refcount);
92344 s = NULL;
92345 }
92346 }
92347@@ -3825,7 +3890,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
92348 }
92349 #endif
92350
92351-#ifdef CONFIG_SYSFS
92352+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92353 static int count_inuse(struct page *page)
92354 {
92355 return page->inuse;
92356@@ -4214,12 +4279,12 @@ static void resiliency_test(void)
92357 validate_slab_cache(kmalloc_caches[9]);
92358 }
92359 #else
92360-#ifdef CONFIG_SYSFS
92361+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92362 static void resiliency_test(void) {};
92363 #endif
92364 #endif
92365
92366-#ifdef CONFIG_SYSFS
92367+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92368 enum slab_stat_type {
92369 SL_ALL, /* All slabs */
92370 SL_PARTIAL, /* Only partially allocated slabs */
92371@@ -4459,7 +4524,7 @@ SLAB_ATTR_RO(ctor);
92372
92373 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
92374 {
92375- return sprintf(buf, "%d\n", s->refcount - 1);
92376+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
92377 }
92378 SLAB_ATTR_RO(aliases);
92379
92380@@ -4547,6 +4612,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
92381 SLAB_ATTR_RO(cache_dma);
92382 #endif
92383
92384+#ifdef CONFIG_PAX_USERCOPY_SLABS
92385+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
92386+{
92387+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
92388+}
92389+SLAB_ATTR_RO(usercopy);
92390+#endif
92391+
92392 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
92393 {
92394 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
92395@@ -4881,6 +4954,9 @@ static struct attribute *slab_attrs[] = {
92396 #ifdef CONFIG_ZONE_DMA
92397 &cache_dma_attr.attr,
92398 #endif
92399+#ifdef CONFIG_PAX_USERCOPY_SLABS
92400+ &usercopy_attr.attr,
92401+#endif
92402 #ifdef CONFIG_NUMA
92403 &remote_node_defrag_ratio_attr.attr,
92404 #endif
92405@@ -5113,6 +5189,7 @@ static char *create_unique_id(struct kmem_cache *s)
92406 return name;
92407 }
92408
92409+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92410 static int sysfs_slab_add(struct kmem_cache *s)
92411 {
92412 int err;
92413@@ -5136,7 +5213,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
92414 }
92415
92416 s->kobj.kset = slab_kset;
92417- err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, name);
92418+ err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, "%s", name);
92419 if (err) {
92420 kobject_put(&s->kobj);
92421 return err;
92422@@ -5170,6 +5247,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
92423 kobject_del(&s->kobj);
92424 kobject_put(&s->kobj);
92425 }
92426+#endif
92427
92428 /*
92429 * Need to buffer aliases during bootup until sysfs becomes
92430@@ -5183,6 +5261,7 @@ struct saved_alias {
92431
92432 static struct saved_alias *alias_list;
92433
92434+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
92435 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
92436 {
92437 struct saved_alias *al;
92438@@ -5205,6 +5284,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
92439 alias_list = al;
92440 return 0;
92441 }
92442+#endif
92443
92444 static int __init slab_sysfs_init(void)
92445 {
92446diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
92447index 27eeab3..7c3f7f2 100644
92448--- a/mm/sparse-vmemmap.c
92449+++ b/mm/sparse-vmemmap.c
92450@@ -130,7 +130,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
92451 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
92452 if (!p)
92453 return NULL;
92454- pud_populate(&init_mm, pud, p);
92455+ pud_populate_kernel(&init_mm, pud, p);
92456 }
92457 return pud;
92458 }
92459@@ -142,7 +142,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
92460 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
92461 if (!p)
92462 return NULL;
92463- pgd_populate(&init_mm, pgd, p);
92464+ pgd_populate_kernel(&init_mm, pgd, p);
92465 }
92466 return pgd;
92467 }
92468diff --git a/mm/sparse.c b/mm/sparse.c
92469index 4ac1d7e..bbfcb1f 100644
92470--- a/mm/sparse.c
92471+++ b/mm/sparse.c
92472@@ -745,7 +745,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
92473
92474 for (i = 0; i < PAGES_PER_SECTION; i++) {
92475 if (PageHWPoison(&memmap[i])) {
92476- atomic_long_sub(1, &num_poisoned_pages);
92477+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
92478 ClearPageHWPoison(&memmap[i]);
92479 }
92480 }
92481diff --git a/mm/swap.c b/mm/swap.c
92482index 759c3ca..7c1a5b4 100644
92483--- a/mm/swap.c
92484+++ b/mm/swap.c
92485@@ -77,6 +77,8 @@ static void __put_compound_page(struct page *page)
92486
92487 __page_cache_release(page);
92488 dtor = get_compound_page_dtor(page);
92489+ if (!PageHuge(page))
92490+ BUG_ON(dtor != free_compound_page);
92491 (*dtor)(page);
92492 }
92493
92494diff --git a/mm/swapfile.c b/mm/swapfile.c
92495index de7c904..c84bf11 100644
92496--- a/mm/swapfile.c
92497+++ b/mm/swapfile.c
92498@@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
92499
92500 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
92501 /* Activity counter to indicate that a swapon or swapoff has occurred */
92502-static atomic_t proc_poll_event = ATOMIC_INIT(0);
92503+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
92504
92505 static inline unsigned char swap_count(unsigned char ent)
92506 {
92507@@ -1949,7 +1949,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
92508 }
92509 filp_close(swap_file, NULL);
92510 err = 0;
92511- atomic_inc(&proc_poll_event);
92512+ atomic_inc_unchecked(&proc_poll_event);
92513 wake_up_interruptible(&proc_poll_wait);
92514
92515 out_dput:
92516@@ -1966,8 +1966,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
92517
92518 poll_wait(file, &proc_poll_wait, wait);
92519
92520- if (seq->poll_event != atomic_read(&proc_poll_event)) {
92521- seq->poll_event = atomic_read(&proc_poll_event);
92522+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
92523+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
92524 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
92525 }
92526
92527@@ -2065,7 +2065,7 @@ static int swaps_open(struct inode *inode, struct file *file)
92528 return ret;
92529
92530 seq = file->private_data;
92531- seq->poll_event = atomic_read(&proc_poll_event);
92532+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
92533 return 0;
92534 }
92535
92536@@ -2524,7 +2524,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
92537 (frontswap_map) ? "FS" : "");
92538
92539 mutex_unlock(&swapon_mutex);
92540- atomic_inc(&proc_poll_event);
92541+ atomic_inc_unchecked(&proc_poll_event);
92542 wake_up_interruptible(&proc_poll_wait);
92543
92544 if (S_ISREG(inode->i_mode))
92545diff --git a/mm/util.c b/mm/util.c
92546index eaf63fc2..32b2629 100644
92547--- a/mm/util.c
92548+++ b/mm/util.c
92549@@ -294,6 +294,12 @@ done:
92550 void arch_pick_mmap_layout(struct mm_struct *mm)
92551 {
92552 mm->mmap_base = TASK_UNMAPPED_BASE;
92553+
92554+#ifdef CONFIG_PAX_RANDMMAP
92555+ if (mm->pax_flags & MF_PAX_RANDMMAP)
92556+ mm->mmap_base += mm->delta_mmap;
92557+#endif
92558+
92559 mm->get_unmapped_area = arch_get_unmapped_area;
92560 }
92561 #endif
92562diff --git a/mm/vmalloc.c b/mm/vmalloc.c
92563index 1074543..136dbe0 100644
92564--- a/mm/vmalloc.c
92565+++ b/mm/vmalloc.c
92566@@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
92567
92568 pte = pte_offset_kernel(pmd, addr);
92569 do {
92570- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
92571- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
92572+
92573+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92574+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
92575+ BUG_ON(!pte_exec(*pte));
92576+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
92577+ continue;
92578+ }
92579+#endif
92580+
92581+ {
92582+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
92583+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
92584+ }
92585 } while (pte++, addr += PAGE_SIZE, addr != end);
92586 }
92587
92588@@ -120,16 +131,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
92589 pte = pte_alloc_kernel(pmd, addr);
92590 if (!pte)
92591 return -ENOMEM;
92592+
92593+ pax_open_kernel();
92594 do {
92595 struct page *page = pages[*nr];
92596
92597- if (WARN_ON(!pte_none(*pte)))
92598+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92599+ if (pgprot_val(prot) & _PAGE_NX)
92600+#endif
92601+
92602+ if (!pte_none(*pte)) {
92603+ pax_close_kernel();
92604+ WARN_ON(1);
92605 return -EBUSY;
92606- if (WARN_ON(!page))
92607+ }
92608+ if (!page) {
92609+ pax_close_kernel();
92610+ WARN_ON(1);
92611 return -ENOMEM;
92612+ }
92613 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
92614 (*nr)++;
92615 } while (pte++, addr += PAGE_SIZE, addr != end);
92616+ pax_close_kernel();
92617 return 0;
92618 }
92619
92620@@ -139,7 +163,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
92621 pmd_t *pmd;
92622 unsigned long next;
92623
92624- pmd = pmd_alloc(&init_mm, pud, addr);
92625+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
92626 if (!pmd)
92627 return -ENOMEM;
92628 do {
92629@@ -156,7 +180,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
92630 pud_t *pud;
92631 unsigned long next;
92632
92633- pud = pud_alloc(&init_mm, pgd, addr);
92634+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
92635 if (!pud)
92636 return -ENOMEM;
92637 do {
92638@@ -216,6 +240,12 @@ int is_vmalloc_or_module_addr(const void *x)
92639 if (addr >= MODULES_VADDR && addr < MODULES_END)
92640 return 1;
92641 #endif
92642+
92643+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
92644+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
92645+ return 1;
92646+#endif
92647+
92648 return is_vmalloc_addr(x);
92649 }
92650
92651@@ -236,8 +266,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
92652
92653 if (!pgd_none(*pgd)) {
92654 pud_t *pud = pud_offset(pgd, addr);
92655+#ifdef CONFIG_X86
92656+ if (!pud_large(*pud))
92657+#endif
92658 if (!pud_none(*pud)) {
92659 pmd_t *pmd = pmd_offset(pud, addr);
92660+#ifdef CONFIG_X86
92661+ if (!pmd_large(*pmd))
92662+#endif
92663 if (!pmd_none(*pmd)) {
92664 pte_t *ptep, pte;
92665
92666@@ -1303,6 +1339,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
92667 struct vm_struct *area;
92668
92669 BUG_ON(in_interrupt());
92670+
92671+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92672+ if (flags & VM_KERNEXEC) {
92673+ if (start != VMALLOC_START || end != VMALLOC_END)
92674+ return NULL;
92675+ start = (unsigned long)MODULES_EXEC_VADDR;
92676+ end = (unsigned long)MODULES_EXEC_END;
92677+ }
92678+#endif
92679+
92680 if (flags & VM_IOREMAP)
92681 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
92682
92683@@ -1528,6 +1574,11 @@ void *vmap(struct page **pages, unsigned int count,
92684 if (count > totalram_pages)
92685 return NULL;
92686
92687+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92688+ if (!(pgprot_val(prot) & _PAGE_NX))
92689+ flags |= VM_KERNEXEC;
92690+#endif
92691+
92692 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
92693 __builtin_return_address(0));
92694 if (!area)
92695@@ -1629,6 +1680,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
92696 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
92697 goto fail;
92698
92699+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
92700+ if (!(pgprot_val(prot) & _PAGE_NX))
92701+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
92702+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
92703+ else
92704+#endif
92705+
92706 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
92707 start, end, node, gfp_mask, caller);
92708 if (!area)
92709@@ -1805,10 +1863,9 @@ EXPORT_SYMBOL(vzalloc_node);
92710 * For tight control over page level allocator and protection flags
92711 * use __vmalloc() instead.
92712 */
92713-
92714 void *vmalloc_exec(unsigned long size)
92715 {
92716- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
92717+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
92718 NUMA_NO_NODE, __builtin_return_address(0));
92719 }
92720
92721@@ -2115,6 +2172,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
92722 {
92723 struct vm_struct *area;
92724
92725+ BUG_ON(vma->vm_mirror);
92726+
92727 size = PAGE_ALIGN(size);
92728
92729 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
92730@@ -2600,7 +2659,11 @@ static int s_show(struct seq_file *m, void *p)
92731 v->addr, v->addr + v->size, v->size);
92732
92733 if (v->caller)
92734+#ifdef CONFIG_GRKERNSEC_HIDESYM
92735+ seq_printf(m, " %pK", v->caller);
92736+#else
92737 seq_printf(m, " %pS", v->caller);
92738+#endif
92739
92740 if (v->nr_pages)
92741 seq_printf(m, " pages=%d", v->nr_pages);
92742diff --git a/mm/vmstat.c b/mm/vmstat.c
92743index 5a442a7..dbbda4a 100644
92744--- a/mm/vmstat.c
92745+++ b/mm/vmstat.c
92746@@ -20,6 +20,7 @@
92747 #include <linux/writeback.h>
92748 #include <linux/compaction.h>
92749 #include <linux/mm_inline.h>
92750+#include <linux/grsecurity.h>
92751
92752 #include "internal.h"
92753
92754@@ -79,7 +80,7 @@ void vm_events_fold_cpu(int cpu)
92755 *
92756 * vm_stat contains the global counters
92757 */
92758-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
92759+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
92760 EXPORT_SYMBOL(vm_stat);
92761
92762 #ifdef CONFIG_SMP
92763@@ -423,7 +424,7 @@ static inline void fold_diff(int *diff)
92764
92765 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
92766 if (diff[i])
92767- atomic_long_add(diff[i], &vm_stat[i]);
92768+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
92769 }
92770
92771 /*
92772@@ -455,7 +456,7 @@ static void refresh_cpu_vm_stats(void)
92773 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
92774 if (v) {
92775
92776- atomic_long_add(v, &zone->vm_stat[i]);
92777+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92778 global_diff[i] += v;
92779 #ifdef CONFIG_NUMA
92780 /* 3 seconds idle till flush */
92781@@ -517,7 +518,7 @@ void cpu_vm_stats_fold(int cpu)
92782
92783 v = p->vm_stat_diff[i];
92784 p->vm_stat_diff[i] = 0;
92785- atomic_long_add(v, &zone->vm_stat[i]);
92786+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92787 global_diff[i] += v;
92788 }
92789 }
92790@@ -537,8 +538,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
92791 if (pset->vm_stat_diff[i]) {
92792 int v = pset->vm_stat_diff[i];
92793 pset->vm_stat_diff[i] = 0;
92794- atomic_long_add(v, &zone->vm_stat[i]);
92795- atomic_long_add(v, &vm_stat[i]);
92796+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
92797+ atomic_long_add_unchecked(v, &vm_stat[i]);
92798 }
92799 }
92800 #endif
92801@@ -1148,10 +1149,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
92802 stat_items_size += sizeof(struct vm_event_state);
92803 #endif
92804
92805- v = kmalloc(stat_items_size, GFP_KERNEL);
92806+ v = kzalloc(stat_items_size, GFP_KERNEL);
92807 m->private = v;
92808 if (!v)
92809 return ERR_PTR(-ENOMEM);
92810+
92811+#ifdef CONFIG_GRKERNSEC_PROC_ADD
92812+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92813+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
92814+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
92815+ && !in_group_p(grsec_proc_gid)
92816+#endif
92817+ )
92818+ return (unsigned long *)m->private + *pos;
92819+#endif
92820+#endif
92821+
92822 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
92823 v[i] = global_page_state(i);
92824 v += NR_VM_ZONE_STAT_ITEMS;
92825@@ -1281,10 +1294,16 @@ static int __init setup_vmstat(void)
92826 start_cpu_timer(cpu);
92827 #endif
92828 #ifdef CONFIG_PROC_FS
92829- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
92830- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
92831- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
92832- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
92833+ {
92834+ mode_t gr_mode = S_IRUGO;
92835+#ifdef CONFIG_GRKERNSEC_PROC_ADD
92836+ gr_mode = S_IRUSR;
92837+#endif
92838+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
92839+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
92840+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
92841+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
92842+ }
92843 #endif
92844 return 0;
92845 }
92846diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
92847index 61fc573..b5e47d0 100644
92848--- a/net/8021q/vlan.c
92849+++ b/net/8021q/vlan.c
92850@@ -472,7 +472,7 @@ out:
92851 return NOTIFY_DONE;
92852 }
92853
92854-static struct notifier_block vlan_notifier_block __read_mostly = {
92855+static struct notifier_block vlan_notifier_block = {
92856 .notifier_call = vlan_device_event,
92857 };
92858
92859@@ -547,8 +547,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
92860 err = -EPERM;
92861 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
92862 break;
92863- if ((args.u.name_type >= 0) &&
92864- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
92865+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
92866 struct vlan_net *vn;
92867
92868 vn = net_generic(net, vlan_net_id);
92869diff --git a/net/9p/mod.c b/net/9p/mod.c
92870index 6ab36ae..6f1841b 100644
92871--- a/net/9p/mod.c
92872+++ b/net/9p/mod.c
92873@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
92874 void v9fs_register_trans(struct p9_trans_module *m)
92875 {
92876 spin_lock(&v9fs_trans_lock);
92877- list_add_tail(&m->list, &v9fs_trans_list);
92878+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
92879 spin_unlock(&v9fs_trans_lock);
92880 }
92881 EXPORT_SYMBOL(v9fs_register_trans);
92882@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
92883 void v9fs_unregister_trans(struct p9_trans_module *m)
92884 {
92885 spin_lock(&v9fs_trans_lock);
92886- list_del_init(&m->list);
92887+ pax_list_del_init((struct list_head *)&m->list);
92888 spin_unlock(&v9fs_trans_lock);
92889 }
92890 EXPORT_SYMBOL(v9fs_unregister_trans);
92891diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
92892index 3ffda1b..fceac96 100644
92893--- a/net/9p/trans_fd.c
92894+++ b/net/9p/trans_fd.c
92895@@ -432,7 +432,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
92896 oldfs = get_fs();
92897 set_fs(get_ds());
92898 /* The cast to a user pointer is valid due to the set_fs() */
92899- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
92900+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
92901 set_fs(oldfs);
92902
92903 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
92904diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
92905index 876fbe8..8bbea9f 100644
92906--- a/net/atm/atm_misc.c
92907+++ b/net/atm/atm_misc.c
92908@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
92909 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
92910 return 1;
92911 atm_return(vcc, truesize);
92912- atomic_inc(&vcc->stats->rx_drop);
92913+ atomic_inc_unchecked(&vcc->stats->rx_drop);
92914 return 0;
92915 }
92916 EXPORT_SYMBOL(atm_charge);
92917@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
92918 }
92919 }
92920 atm_return(vcc, guess);
92921- atomic_inc(&vcc->stats->rx_drop);
92922+ atomic_inc_unchecked(&vcc->stats->rx_drop);
92923 return NULL;
92924 }
92925 EXPORT_SYMBOL(atm_alloc_charge);
92926@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
92927
92928 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
92929 {
92930-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
92931+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
92932 __SONET_ITEMS
92933 #undef __HANDLE_ITEM
92934 }
92935@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
92936
92937 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
92938 {
92939-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
92940+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
92941 __SONET_ITEMS
92942 #undef __HANDLE_ITEM
92943 }
92944diff --git a/net/atm/lec.h b/net/atm/lec.h
92945index 4149db1..f2ab682 100644
92946--- a/net/atm/lec.h
92947+++ b/net/atm/lec.h
92948@@ -48,7 +48,7 @@ struct lane2_ops {
92949 const u8 *tlvs, u32 sizeoftlvs);
92950 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
92951 const u8 *tlvs, u32 sizeoftlvs);
92952-};
92953+} __no_const;
92954
92955 /*
92956 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
92957diff --git a/net/atm/proc.c b/net/atm/proc.c
92958index bbb6461..cf04016 100644
92959--- a/net/atm/proc.c
92960+++ b/net/atm/proc.c
92961@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
92962 const struct k_atm_aal_stats *stats)
92963 {
92964 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
92965- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
92966- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
92967- atomic_read(&stats->rx_drop));
92968+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
92969+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
92970+ atomic_read_unchecked(&stats->rx_drop));
92971 }
92972
92973 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
92974diff --git a/net/atm/resources.c b/net/atm/resources.c
92975index 0447d5d..3cf4728 100644
92976--- a/net/atm/resources.c
92977+++ b/net/atm/resources.c
92978@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
92979 static void copy_aal_stats(struct k_atm_aal_stats *from,
92980 struct atm_aal_stats *to)
92981 {
92982-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
92983+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
92984 __AAL_STAT_ITEMS
92985 #undef __HANDLE_ITEM
92986 }
92987@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
92988 static void subtract_aal_stats(struct k_atm_aal_stats *from,
92989 struct atm_aal_stats *to)
92990 {
92991-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
92992+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
92993 __AAL_STAT_ITEMS
92994 #undef __HANDLE_ITEM
92995 }
92996diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
92997index 919a5ce..cc6b444 100644
92998--- a/net/ax25/sysctl_net_ax25.c
92999+++ b/net/ax25/sysctl_net_ax25.c
93000@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
93001 {
93002 char path[sizeof("net/ax25/") + IFNAMSIZ];
93003 int k;
93004- struct ctl_table *table;
93005+ ctl_table_no_const *table;
93006
93007 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
93008 if (!table)
93009diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
93010index 0a8a80c..f7e89aa 100644
93011--- a/net/batman-adv/bat_iv_ogm.c
93012+++ b/net/batman-adv/bat_iv_ogm.c
93013@@ -121,7 +121,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
93014
93015 /* randomize initial seqno to avoid collision */
93016 get_random_bytes(&random_seqno, sizeof(random_seqno));
93017- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
93018+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
93019
93020 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
93021 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
93022@@ -703,9 +703,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
93023 batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff);
93024
93025 /* change sequence number to network order */
93026- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
93027+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
93028 batadv_ogm_packet->seqno = htonl(seqno);
93029- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
93030+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
93031
93032 batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn);
93033 batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc);
93034@@ -1111,7 +1111,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
93035 return;
93036
93037 /* could be changed by schedule_own_packet() */
93038- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
93039+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
93040
93041 if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)
93042 has_directlink_flag = 1;
93043diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
93044index c478e6b..469fd2f 100644
93045--- a/net/batman-adv/hard-interface.c
93046+++ b/net/batman-adv/hard-interface.c
93047@@ -453,7 +453,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
93048 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
93049 dev_add_pack(&hard_iface->batman_adv_ptype);
93050
93051- atomic_set(&hard_iface->frag_seqno, 1);
93052+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
93053 batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
93054 hard_iface->net_dev->name);
93055
93056diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
93057index 813db4e..847edac 100644
93058--- a/net/batman-adv/soft-interface.c
93059+++ b/net/batman-adv/soft-interface.c
93060@@ -263,7 +263,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
93061 primary_if->net_dev->dev_addr, ETH_ALEN);
93062
93063 /* set broadcast sequence number */
93064- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
93065+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
93066 bcast_packet->seqno = htonl(seqno);
93067
93068 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
93069@@ -483,7 +483,7 @@ static int batadv_softif_init_late(struct net_device *dev)
93070 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
93071
93072 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
93073- atomic_set(&bat_priv->bcast_seqno, 1);
93074+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
93075 atomic_set(&bat_priv->tt.vn, 0);
93076 atomic_set(&bat_priv->tt.local_changes, 0);
93077 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
93078diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
93079index b2c94e1..3d47e07 100644
93080--- a/net/batman-adv/types.h
93081+++ b/net/batman-adv/types.h
93082@@ -51,7 +51,7 @@
93083 struct batadv_hard_iface_bat_iv {
93084 unsigned char *ogm_buff;
93085 int ogm_buff_len;
93086- atomic_t ogm_seqno;
93087+ atomic_unchecked_t ogm_seqno;
93088 };
93089
93090 /**
93091@@ -76,7 +76,7 @@ struct batadv_hard_iface {
93092 int16_t if_num;
93093 char if_status;
93094 struct net_device *net_dev;
93095- atomic_t frag_seqno;
93096+ atomic_unchecked_t frag_seqno;
93097 uint8_t num_bcasts;
93098 struct kobject *hardif_obj;
93099 atomic_t refcount;
93100@@ -560,7 +560,7 @@ struct batadv_priv {
93101 #ifdef CONFIG_BATMAN_ADV_DEBUG
93102 atomic_t log_level;
93103 #endif
93104- atomic_t bcast_seqno;
93105+ atomic_unchecked_t bcast_seqno;
93106 atomic_t bcast_queue_left;
93107 atomic_t batman_queue_left;
93108 char num_ifaces;
93109diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
93110index 48b31d3..62a0bcb 100644
93111--- a/net/batman-adv/unicast.c
93112+++ b/net/batman-adv/unicast.c
93113@@ -272,7 +272,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
93114 frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail;
93115 frag2->flags = large_tail;
93116
93117- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
93118+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
93119 frag1->seqno = htons(seqno - 1);
93120 frag2->seqno = htons(seqno);
93121
93122diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
93123index fa4bf66..e92948f 100644
93124--- a/net/bluetooth/hci_sock.c
93125+++ b/net/bluetooth/hci_sock.c
93126@@ -932,7 +932,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
93127 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
93128 }
93129
93130- len = min_t(unsigned int, len, sizeof(uf));
93131+ len = min((size_t)len, sizeof(uf));
93132 if (copy_from_user(&uf, optval, len)) {
93133 err = -EFAULT;
93134 break;
93135diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
93136index 63fa111..b166ec6 100644
93137--- a/net/bluetooth/l2cap_core.c
93138+++ b/net/bluetooth/l2cap_core.c
93139@@ -3511,8 +3511,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
93140 break;
93141
93142 case L2CAP_CONF_RFC:
93143- if (olen == sizeof(rfc))
93144- memcpy(&rfc, (void *)val, olen);
93145+ if (olen != sizeof(rfc))
93146+ break;
93147+
93148+ memcpy(&rfc, (void *)val, olen);
93149
93150 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
93151 rfc.mode != chan->mode)
93152diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
93153index 0098af8..fb5a31f 100644
93154--- a/net/bluetooth/l2cap_sock.c
93155+++ b/net/bluetooth/l2cap_sock.c
93156@@ -485,7 +485,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
93157 struct sock *sk = sock->sk;
93158 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
93159 struct l2cap_options opts;
93160- int len, err = 0;
93161+ int err = 0;
93162+ size_t len = optlen;
93163 u32 opt;
93164
93165 BT_DBG("sk %p", sk);
93166@@ -507,7 +508,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
93167 opts.max_tx = chan->max_tx;
93168 opts.txwin_size = chan->tx_win;
93169
93170- len = min_t(unsigned int, sizeof(opts), optlen);
93171+ len = min(sizeof(opts), len);
93172 if (copy_from_user((char *) &opts, optval, len)) {
93173 err = -EFAULT;
93174 break;
93175@@ -587,7 +588,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93176 struct bt_security sec;
93177 struct bt_power pwr;
93178 struct l2cap_conn *conn;
93179- int len, err = 0;
93180+ int err = 0;
93181+ size_t len = optlen;
93182 u32 opt;
93183
93184 BT_DBG("sk %p", sk);
93185@@ -610,7 +612,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93186
93187 sec.level = BT_SECURITY_LOW;
93188
93189- len = min_t(unsigned int, sizeof(sec), optlen);
93190+ len = min(sizeof(sec), len);
93191 if (copy_from_user((char *) &sec, optval, len)) {
93192 err = -EFAULT;
93193 break;
93194@@ -707,7 +709,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
93195
93196 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
93197
93198- len = min_t(unsigned int, sizeof(pwr), optlen);
93199+ len = min(sizeof(pwr), len);
93200 if (copy_from_user((char *) &pwr, optval, len)) {
93201 err = -EFAULT;
93202 break;
93203diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
93204index c1c6028..17e8dcc 100644
93205--- a/net/bluetooth/rfcomm/sock.c
93206+++ b/net/bluetooth/rfcomm/sock.c
93207@@ -665,7 +665,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
93208 struct sock *sk = sock->sk;
93209 struct bt_security sec;
93210 int err = 0;
93211- size_t len;
93212+ size_t len = optlen;
93213 u32 opt;
93214
93215 BT_DBG("sk %p", sk);
93216@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
93217
93218 sec.level = BT_SECURITY_LOW;
93219
93220- len = min_t(unsigned int, sizeof(sec), optlen);
93221+ len = min(sizeof(sec), len);
93222 if (copy_from_user((char *) &sec, optval, len)) {
93223 err = -EFAULT;
93224 break;
93225diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
93226index 84fcf9f..e389b27 100644
93227--- a/net/bluetooth/rfcomm/tty.c
93228+++ b/net/bluetooth/rfcomm/tty.c
93229@@ -684,7 +684,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
93230 BT_DBG("tty %p id %d", tty, tty->index);
93231
93232 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
93233- dev->channel, dev->port.count);
93234+ dev->channel, atomic_read(&dev->port.count));
93235
93236 err = tty_port_open(&dev->port, tty, filp);
93237 if (err)
93238@@ -707,7 +707,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
93239 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
93240
93241 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
93242- dev->port.count);
93243+ atomic_read(&dev->port.count));
93244
93245 tty_port_close(&dev->port, tty, filp);
93246 }
93247diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
93248index 5180938..7c470c3 100644
93249--- a/net/bridge/netfilter/ebt_ulog.c
93250+++ b/net/bridge/netfilter/ebt_ulog.c
93251@@ -181,6 +181,7 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93252 ub->qlen++;
93253
93254 pm = nlmsg_data(nlh);
93255+ memset(pm, 0, sizeof(*pm));
93256
93257 /* Fill in the ulog data */
93258 pm->version = EBT_ULOG_VERSION;
93259@@ -193,8 +194,6 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93260 pm->hook = hooknr;
93261 if (uloginfo->prefix != NULL)
93262 strcpy(pm->prefix, uloginfo->prefix);
93263- else
93264- *(pm->prefix) = '\0';
93265
93266 if (in) {
93267 strcpy(pm->physindev, in->name);
93268@@ -204,16 +203,14 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
93269 strcpy(pm->indev, br_port_get_rcu(in)->br->dev->name);
93270 else
93271 strcpy(pm->indev, in->name);
93272- } else
93273- pm->indev[0] = pm->physindev[0] = '\0';
93274+ }
93275
93276 if (out) {
93277 /* If out exists, then out is a bridge port */
93278 strcpy(pm->physoutdev, out->name);
93279 /* rcu_read_lock()ed by nf_hook_slow */
93280 strcpy(pm->outdev, br_port_get_rcu(out)->br->dev->name);
93281- } else
93282- pm->outdev[0] = pm->physoutdev[0] = '\0';
93283+ }
93284
93285 if (skb_copy_bits(skb, -ETH_HLEN, pm->data, copy_len) < 0)
93286 BUG();
93287diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
93288index ac78024..161a80c 100644
93289--- a/net/bridge/netfilter/ebtables.c
93290+++ b/net/bridge/netfilter/ebtables.c
93291@@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
93292 tmp.valid_hooks = t->table->valid_hooks;
93293 }
93294 mutex_unlock(&ebt_mutex);
93295- if (copy_to_user(user, &tmp, *len) != 0){
93296+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
93297 BUGPRINT("c2u Didn't work\n");
93298 ret = -EFAULT;
93299 break;
93300@@ -2331,7 +2331,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
93301 goto out;
93302 tmp.valid_hooks = t->valid_hooks;
93303
93304- if (copy_to_user(user, &tmp, *len) != 0) {
93305+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
93306 ret = -EFAULT;
93307 break;
93308 }
93309@@ -2342,7 +2342,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
93310 tmp.entries_size = t->table->entries_size;
93311 tmp.valid_hooks = t->table->valid_hooks;
93312
93313- if (copy_to_user(user, &tmp, *len) != 0) {
93314+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
93315 ret = -EFAULT;
93316 break;
93317 }
93318diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
93319index 0f45522..dab651f 100644
93320--- a/net/caif/cfctrl.c
93321+++ b/net/caif/cfctrl.c
93322@@ -10,6 +10,7 @@
93323 #include <linux/spinlock.h>
93324 #include <linux/slab.h>
93325 #include <linux/pkt_sched.h>
93326+#include <linux/sched.h>
93327 #include <net/caif/caif_layer.h>
93328 #include <net/caif/cfpkt.h>
93329 #include <net/caif/cfctrl.h>
93330@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
93331 memset(&dev_info, 0, sizeof(dev_info));
93332 dev_info.id = 0xff;
93333 cfsrvl_init(&this->serv, 0, &dev_info, false);
93334- atomic_set(&this->req_seq_no, 1);
93335- atomic_set(&this->rsp_seq_no, 1);
93336+ atomic_set_unchecked(&this->req_seq_no, 1);
93337+ atomic_set_unchecked(&this->rsp_seq_no, 1);
93338 this->serv.layer.receive = cfctrl_recv;
93339 sprintf(this->serv.layer.name, "ctrl");
93340 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
93341@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
93342 struct cfctrl_request_info *req)
93343 {
93344 spin_lock_bh(&ctrl->info_list_lock);
93345- atomic_inc(&ctrl->req_seq_no);
93346- req->sequence_no = atomic_read(&ctrl->req_seq_no);
93347+ atomic_inc_unchecked(&ctrl->req_seq_no);
93348+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
93349 list_add_tail(&req->list, &ctrl->list);
93350 spin_unlock_bh(&ctrl->info_list_lock);
93351 }
93352@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
93353 if (p != first)
93354 pr_warn("Requests are not received in order\n");
93355
93356- atomic_set(&ctrl->rsp_seq_no,
93357+ atomic_set_unchecked(&ctrl->rsp_seq_no,
93358 p->sequence_no);
93359 list_del(&p->list);
93360 goto out;
93361diff --git a/net/can/af_can.c b/net/can/af_can.c
93362index 3ab8dd2..b9aef13 100644
93363--- a/net/can/af_can.c
93364+++ b/net/can/af_can.c
93365@@ -862,7 +862,7 @@ static const struct net_proto_family can_family_ops = {
93366 };
93367
93368 /* notifier block for netdevice event */
93369-static struct notifier_block can_netdev_notifier __read_mostly = {
93370+static struct notifier_block can_netdev_notifier = {
93371 .notifier_call = can_notifier,
93372 };
93373
93374diff --git a/net/can/gw.c b/net/can/gw.c
93375index 3f9b0f3..fc6d4fa 100644
93376--- a/net/can/gw.c
93377+++ b/net/can/gw.c
93378@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
93379 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
93380
93381 static HLIST_HEAD(cgw_list);
93382-static struct notifier_block notifier;
93383
93384 static struct kmem_cache *cgw_cache __read_mostly;
93385
93386@@ -954,6 +953,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
93387 return err;
93388 }
93389
93390+static struct notifier_block notifier = {
93391+ .notifier_call = cgw_notifier
93392+};
93393+
93394 static __init int cgw_module_init(void)
93395 {
93396 /* sanitize given module parameter */
93397@@ -969,7 +972,6 @@ static __init int cgw_module_init(void)
93398 return -ENOMEM;
93399
93400 /* set notifier */
93401- notifier.notifier_call = cgw_notifier;
93402 register_netdevice_notifier(&notifier);
93403
93404 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
93405diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
93406index 4a5df7b..9ad1f1d 100644
93407--- a/net/ceph/messenger.c
93408+++ b/net/ceph/messenger.c
93409@@ -186,7 +186,7 @@ static void con_fault(struct ceph_connection *con);
93410 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
93411
93412 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
93413-static atomic_t addr_str_seq = ATOMIC_INIT(0);
93414+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
93415
93416 static struct page *zero_page; /* used in certain error cases */
93417
93418@@ -197,7 +197,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
93419 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
93420 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
93421
93422- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
93423+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
93424 s = addr_str[i];
93425
93426 switch (ss->ss_family) {
93427diff --git a/net/compat.c b/net/compat.c
93428index dd32e34..6066f87 100644
93429--- a/net/compat.c
93430+++ b/net/compat.c
93431@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
93432 return -EFAULT;
93433 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
93434 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
93435- kmsg->msg_name = compat_ptr(tmp1);
93436- kmsg->msg_iov = compat_ptr(tmp2);
93437- kmsg->msg_control = compat_ptr(tmp3);
93438+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
93439+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
93440+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
93441 return 0;
93442 }
93443
93444@@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93445
93446 if (kern_msg->msg_namelen) {
93447 if (mode == VERIFY_READ) {
93448- int err = move_addr_to_kernel(kern_msg->msg_name,
93449+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
93450 kern_msg->msg_namelen,
93451 kern_address);
93452 if (err < 0)
93453@@ -99,7 +99,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93454 kern_msg->msg_name = NULL;
93455
93456 tot_len = iov_from_user_compat_to_kern(kern_iov,
93457- (struct compat_iovec __user *)kern_msg->msg_iov,
93458+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
93459 kern_msg->msg_iovlen);
93460 if (tot_len >= 0)
93461 kern_msg->msg_iov = kern_iov;
93462@@ -119,20 +119,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
93463
93464 #define CMSG_COMPAT_FIRSTHDR(msg) \
93465 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
93466- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
93467+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
93468 (struct compat_cmsghdr __user *)NULL)
93469
93470 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
93471 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
93472 (ucmlen) <= (unsigned long) \
93473 ((mhdr)->msg_controllen - \
93474- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
93475+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
93476
93477 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
93478 struct compat_cmsghdr __user *cmsg, int cmsg_len)
93479 {
93480 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
93481- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
93482+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
93483 msg->msg_controllen)
93484 return NULL;
93485 return (struct compat_cmsghdr __user *)ptr;
93486@@ -222,7 +222,7 @@ Efault:
93487
93488 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
93489 {
93490- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
93491+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
93492 struct compat_cmsghdr cmhdr;
93493 struct compat_timeval ctv;
93494 struct compat_timespec cts[3];
93495@@ -278,7 +278,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
93496
93497 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
93498 {
93499- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
93500+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
93501 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
93502 int fdnum = scm->fp->count;
93503 struct file **fp = scm->fp->fp;
93504@@ -366,7 +366,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
93505 return -EFAULT;
93506 old_fs = get_fs();
93507 set_fs(KERNEL_DS);
93508- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
93509+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
93510 set_fs(old_fs);
93511
93512 return err;
93513@@ -427,7 +427,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
93514 len = sizeof(ktime);
93515 old_fs = get_fs();
93516 set_fs(KERNEL_DS);
93517- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
93518+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
93519 set_fs(old_fs);
93520
93521 if (!err) {
93522@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93523 case MCAST_JOIN_GROUP:
93524 case MCAST_LEAVE_GROUP:
93525 {
93526- struct compat_group_req __user *gr32 = (void *)optval;
93527+ struct compat_group_req __user *gr32 = (void __user *)optval;
93528 struct group_req __user *kgr =
93529 compat_alloc_user_space(sizeof(struct group_req));
93530 u32 interface;
93531@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93532 case MCAST_BLOCK_SOURCE:
93533 case MCAST_UNBLOCK_SOURCE:
93534 {
93535- struct compat_group_source_req __user *gsr32 = (void *)optval;
93536+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
93537 struct group_source_req __user *kgsr = compat_alloc_user_space(
93538 sizeof(struct group_source_req));
93539 u32 interface;
93540@@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
93541 }
93542 case MCAST_MSFILTER:
93543 {
93544- struct compat_group_filter __user *gf32 = (void *)optval;
93545+ struct compat_group_filter __user *gf32 = (void __user *)optval;
93546 struct group_filter __user *kgf;
93547 u32 interface, fmode, numsrc;
93548
93549@@ -650,7 +650,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
93550 char __user *optval, int __user *optlen,
93551 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
93552 {
93553- struct compat_group_filter __user *gf32 = (void *)optval;
93554+ struct compat_group_filter __user *gf32 = (void __user *)optval;
93555 struct group_filter __user *kgf;
93556 int __user *koptlen;
93557 u32 interface, fmode, numsrc;
93558@@ -808,7 +808,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
93559
93560 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
93561 return -EINVAL;
93562- if (copy_from_user(a, args, nas[call]))
93563+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
93564 return -EFAULT;
93565 a0 = a[0];
93566 a1 = a[1];
93567diff --git a/net/core/datagram.c b/net/core/datagram.c
93568index af814e7..3d761de 100644
93569--- a/net/core/datagram.c
93570+++ b/net/core/datagram.c
93571@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
93572 }
93573
93574 kfree_skb(skb);
93575- atomic_inc(&sk->sk_drops);
93576+ atomic_inc_unchecked(&sk->sk_drops);
93577 sk_mem_reclaim_partial(sk);
93578
93579 return err;
93580diff --git a/net/core/dev.c b/net/core/dev.c
93581index 3d13874..6e78dc7 100644
93582--- a/net/core/dev.c
93583+++ b/net/core/dev.c
93584@@ -1680,14 +1680,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
93585 {
93586 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
93587 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
93588- atomic_long_inc(&dev->rx_dropped);
93589+ atomic_long_inc_unchecked(&dev->rx_dropped);
93590 kfree_skb(skb);
93591 return NET_RX_DROP;
93592 }
93593 }
93594
93595 if (unlikely(!is_skb_forwardable(dev, skb))) {
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@@ -2428,7 +2428,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
93602
93603 struct dev_gso_cb {
93604 void (*destructor)(struct sk_buff *skb);
93605-};
93606+} __no_const;
93607
93608 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
93609
93610@@ -3203,7 +3203,7 @@ enqueue:
93611
93612 local_irq_restore(flags);
93613
93614- atomic_long_inc(&skb->dev->rx_dropped);
93615+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
93616 kfree_skb(skb);
93617 return NET_RX_DROP;
93618 }
93619@@ -3275,7 +3275,7 @@ int netif_rx_ni(struct sk_buff *skb)
93620 }
93621 EXPORT_SYMBOL(netif_rx_ni);
93622
93623-static void net_tx_action(struct softirq_action *h)
93624+static __latent_entropy void net_tx_action(void)
93625 {
93626 struct softnet_data *sd = &__get_cpu_var(softnet_data);
93627
93628@@ -3609,7 +3609,7 @@ ncls:
93629 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
93630 } else {
93631 drop:
93632- atomic_long_inc(&skb->dev->rx_dropped);
93633+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
93634 kfree_skb(skb);
93635 /* Jamal, now you will not able to escape explaining
93636 * me how you were going to use this. :-)
93637@@ -4269,7 +4269,7 @@ void netif_napi_del(struct napi_struct *napi)
93638 }
93639 EXPORT_SYMBOL(netif_napi_del);
93640
93641-static void net_rx_action(struct softirq_action *h)
93642+static __latent_entropy void net_rx_action(void)
93643 {
93644 struct softnet_data *sd = &__get_cpu_var(softnet_data);
93645 unsigned long time_limit = jiffies + 2;
93646@@ -5973,7 +5973,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
93647 } else {
93648 netdev_stats_to_stats64(storage, &dev->stats);
93649 }
93650- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
93651+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
93652 return storage;
93653 }
93654 EXPORT_SYMBOL(dev_get_stats);
93655diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
93656index 5b7d0e1..cb960fc 100644
93657--- a/net/core/dev_ioctl.c
93658+++ b/net/core/dev_ioctl.c
93659@@ -365,9 +365,13 @@ void dev_load(struct net *net, const char *name)
93660 if (no_module && capable(CAP_NET_ADMIN))
93661 no_module = request_module("netdev-%s", name);
93662 if (no_module && capable(CAP_SYS_MODULE)) {
93663+#ifdef CONFIG_GRKERNSEC_MODHARDEN
93664+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
93665+#else
93666 if (!request_module("%s", name))
93667 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
93668 name);
93669+#endif
93670 }
93671 }
93672 EXPORT_SYMBOL(dev_load);
93673diff --git a/net/core/flow.c b/net/core/flow.c
93674index dfa602c..3103d88 100644
93675--- a/net/core/flow.c
93676+++ b/net/core/flow.c
93677@@ -61,7 +61,7 @@ struct flow_cache {
93678 struct timer_list rnd_timer;
93679 };
93680
93681-atomic_t flow_cache_genid = ATOMIC_INIT(0);
93682+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
93683 EXPORT_SYMBOL(flow_cache_genid);
93684 static struct flow_cache flow_cache_global;
93685 static struct kmem_cache *flow_cachep __read_mostly;
93686@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
93687
93688 static int flow_entry_valid(struct flow_cache_entry *fle)
93689 {
93690- if (atomic_read(&flow_cache_genid) != fle->genid)
93691+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
93692 return 0;
93693 if (fle->object && !fle->object->ops->check(fle->object))
93694 return 0;
93695@@ -258,7 +258,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
93696 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
93697 fcp->hash_count++;
93698 }
93699- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
93700+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
93701 flo = fle->object;
93702 if (!flo)
93703 goto ret_object;
93704@@ -279,7 +279,7 @@ nocache:
93705 }
93706 flo = resolver(net, key, family, dir, flo, ctx);
93707 if (fle) {
93708- fle->genid = atomic_read(&flow_cache_genid);
93709+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
93710 if (!IS_ERR(flo))
93711 fle->object = flo;
93712 else
93713diff --git a/net/core/iovec.c b/net/core/iovec.c
93714index 7d84ea1..55385ae 100644
93715--- a/net/core/iovec.c
93716+++ b/net/core/iovec.c
93717@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
93718 if (m->msg_namelen) {
93719 if (mode == VERIFY_READ) {
93720 void __user *namep;
93721- namep = (void __user __force *) m->msg_name;
93722+ namep = (void __force_user *) m->msg_name;
93723 err = move_addr_to_kernel(namep, m->msg_namelen,
93724 address);
93725 if (err < 0)
93726@@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
93727 }
93728
93729 size = m->msg_iovlen * sizeof(struct iovec);
93730- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
93731+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
93732 return -EFAULT;
93733
93734 m->msg_iov = iov;
93735diff --git a/net/core/neighbour.c b/net/core/neighbour.c
93736index 6072610..7374c18 100644
93737--- a/net/core/neighbour.c
93738+++ b/net/core/neighbour.c
93739@@ -2774,7 +2774,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
93740 void __user *buffer, size_t *lenp, loff_t *ppos)
93741 {
93742 int size, ret;
93743- struct ctl_table tmp = *ctl;
93744+ ctl_table_no_const tmp = *ctl;
93745
93746 tmp.extra1 = &zero;
93747 tmp.extra2 = &unres_qlen_max;
93748diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
93749index 2bf8329..7960607 100644
93750--- a/net/core/net-procfs.c
93751+++ b/net/core/net-procfs.c
93752@@ -283,8 +283,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
93753 else
93754 seq_printf(seq, "%04x", ntohs(pt->type));
93755
93756+#ifdef CONFIG_GRKERNSEC_HIDESYM
93757+ seq_printf(seq, " %-8s %pf\n",
93758+ pt->dev ? pt->dev->name : "", NULL);
93759+#else
93760 seq_printf(seq, " %-8s %pf\n",
93761 pt->dev ? pt->dev->name : "", pt->func);
93762+#endif
93763 }
93764
93765 return 0;
93766diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
93767index d954b56..b0a0f7a 100644
93768--- a/net/core/net-sysfs.c
93769+++ b/net/core/net-sysfs.c
93770@@ -1356,7 +1356,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr)
93771 }
93772 EXPORT_SYMBOL(netdev_class_remove_file);
93773
93774-int netdev_kobject_init(void)
93775+int __init netdev_kobject_init(void)
93776 {
93777 kobj_ns_type_register(&net_ns_type_operations);
93778 return class_register(&net_class);
93779diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
93780index 81d3a9a..a0bd7a8 100644
93781--- a/net/core/net_namespace.c
93782+++ b/net/core/net_namespace.c
93783@@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
93784 int error;
93785 LIST_HEAD(net_exit_list);
93786
93787- list_add_tail(&ops->list, list);
93788+ pax_list_add_tail((struct list_head *)&ops->list, list);
93789 if (ops->init || (ops->id && ops->size)) {
93790 for_each_net(net) {
93791 error = ops_init(ops, net);
93792@@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
93793
93794 out_undo:
93795 /* If I have an error cleanup all namespaces I initialized */
93796- list_del(&ops->list);
93797+ pax_list_del((struct list_head *)&ops->list);
93798 ops_exit_list(ops, &net_exit_list);
93799 ops_free_list(ops, &net_exit_list);
93800 return error;
93801@@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
93802 struct net *net;
93803 LIST_HEAD(net_exit_list);
93804
93805- list_del(&ops->list);
93806+ pax_list_del((struct list_head *)&ops->list);
93807 for_each_net(net)
93808 list_add_tail(&net->exit_list, &net_exit_list);
93809 ops_exit_list(ops, &net_exit_list);
93810@@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
93811 mutex_lock(&net_mutex);
93812 error = register_pernet_operations(&pernet_list, ops);
93813 if (!error && (first_device == &pernet_list))
93814- first_device = &ops->list;
93815+ first_device = (struct list_head *)&ops->list;
93816 mutex_unlock(&net_mutex);
93817 return error;
93818 }
93819diff --git a/net/core/netpoll.c b/net/core/netpoll.c
93820index fc75c9e..8c8e9be 100644
93821--- a/net/core/netpoll.c
93822+++ b/net/core/netpoll.c
93823@@ -428,7 +428,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
93824 struct udphdr *udph;
93825 struct iphdr *iph;
93826 struct ethhdr *eth;
93827- static atomic_t ip_ident;
93828+ static atomic_unchecked_t ip_ident;
93829 struct ipv6hdr *ip6h;
93830
93831 udp_len = len + sizeof(*udph);
93832@@ -499,7 +499,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
93833 put_unaligned(0x45, (unsigned char *)iph);
93834 iph->tos = 0;
93835 put_unaligned(htons(ip_len), &(iph->tot_len));
93836- iph->id = htons(atomic_inc_return(&ip_ident));
93837+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
93838 iph->frag_off = 0;
93839 iph->ttl = 64;
93840 iph->protocol = IPPROTO_UDP;
93841diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
93842index 2a0e21d..6ad7642 100644
93843--- a/net/core/rtnetlink.c
93844+++ b/net/core/rtnetlink.c
93845@@ -58,7 +58,7 @@ struct rtnl_link {
93846 rtnl_doit_func doit;
93847 rtnl_dumpit_func dumpit;
93848 rtnl_calcit_func calcit;
93849-};
93850+} __no_const;
93851
93852 static DEFINE_MUTEX(rtnl_mutex);
93853
93854@@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
93855 if (rtnl_link_ops_get(ops->kind))
93856 return -EEXIST;
93857
93858- if (!ops->dellink)
93859- ops->dellink = unregister_netdevice_queue;
93860+ if (!ops->dellink) {
93861+ pax_open_kernel();
93862+ *(void **)&ops->dellink = unregister_netdevice_queue;
93863+ pax_close_kernel();
93864+ }
93865
93866- list_add_tail(&ops->list, &link_ops);
93867+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
93868 return 0;
93869 }
93870 EXPORT_SYMBOL_GPL(__rtnl_link_register);
93871@@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
93872 for_each_net(net) {
93873 __rtnl_kill_links(net, ops);
93874 }
93875- list_del(&ops->list);
93876+ pax_list_del((struct list_head *)&ops->list);
93877 }
93878 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
93879
93880diff --git a/net/core/scm.c b/net/core/scm.c
93881index b442e7e..6f5b5a2 100644
93882--- a/net/core/scm.c
93883+++ b/net/core/scm.c
93884@@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
93885 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
93886 {
93887 struct cmsghdr __user *cm
93888- = (__force struct cmsghdr __user *)msg->msg_control;
93889+ = (struct cmsghdr __force_user *)msg->msg_control;
93890 struct cmsghdr cmhdr;
93891 int cmlen = CMSG_LEN(len);
93892 int err;
93893@@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
93894 err = -EFAULT;
93895 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
93896 goto out;
93897- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
93898+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
93899 goto out;
93900 cmlen = CMSG_SPACE(len);
93901 if (msg->msg_controllen < cmlen)
93902@@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
93903 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
93904 {
93905 struct cmsghdr __user *cm
93906- = (__force struct cmsghdr __user*)msg->msg_control;
93907+ = (struct cmsghdr __force_user *)msg->msg_control;
93908
93909 int fdmax = 0;
93910 int fdnum = scm->fp->count;
93911@@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
93912 if (fdnum < fdmax)
93913 fdmax = fdnum;
93914
93915- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
93916+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
93917 i++, cmfptr++)
93918 {
93919 struct socket *sock;
93920diff --git a/net/core/skbuff.c b/net/core/skbuff.c
93921index c28c7fe..a399a6d 100644
93922--- a/net/core/skbuff.c
93923+++ b/net/core/skbuff.c
93924@@ -3104,13 +3104,15 @@ void __init skb_init(void)
93925 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
93926 sizeof(struct sk_buff),
93927 0,
93928- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
93929+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
93930+ SLAB_NO_SANITIZE,
93931 NULL);
93932 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
93933 (2*sizeof(struct sk_buff)) +
93934 sizeof(atomic_t),
93935 0,
93936- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
93937+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
93938+ SLAB_NO_SANITIZE,
93939 NULL);
93940 }
93941
93942@@ -3541,6 +3543,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
93943 skb->tstamp.tv64 = 0;
93944 skb->pkt_type = PACKET_HOST;
93945 skb->skb_iif = 0;
93946+ skb->local_df = 0;
93947 skb_dst_drop(skb);
93948 skb->mark = 0;
93949 secpath_reset(skb);
93950diff --git a/net/core/sock.c b/net/core/sock.c
93951index 0b39e7a..5e9f91e 100644
93952--- a/net/core/sock.c
93953+++ b/net/core/sock.c
93954@@ -393,7 +393,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93955 struct sk_buff_head *list = &sk->sk_receive_queue;
93956
93957 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
93958- atomic_inc(&sk->sk_drops);
93959+ atomic_inc_unchecked(&sk->sk_drops);
93960 trace_sock_rcvqueue_full(sk, skb);
93961 return -ENOMEM;
93962 }
93963@@ -403,7 +403,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93964 return err;
93965
93966 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
93967- atomic_inc(&sk->sk_drops);
93968+ atomic_inc_unchecked(&sk->sk_drops);
93969 return -ENOBUFS;
93970 }
93971
93972@@ -423,7 +423,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
93973 skb_dst_force(skb);
93974
93975 spin_lock_irqsave(&list->lock, flags);
93976- skb->dropcount = atomic_read(&sk->sk_drops);
93977+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
93978 __skb_queue_tail(list, skb);
93979 spin_unlock_irqrestore(&list->lock, flags);
93980
93981@@ -443,7 +443,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
93982 skb->dev = NULL;
93983
93984 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
93985- atomic_inc(&sk->sk_drops);
93986+ atomic_inc_unchecked(&sk->sk_drops);
93987 goto discard_and_relse;
93988 }
93989 if (nested)
93990@@ -461,7 +461,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
93991 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
93992 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
93993 bh_unlock_sock(sk);
93994- atomic_inc(&sk->sk_drops);
93995+ atomic_inc_unchecked(&sk->sk_drops);
93996 goto discard_and_relse;
93997 }
93998
93999@@ -949,12 +949,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94000 struct timeval tm;
94001 } v;
94002
94003- int lv = sizeof(int);
94004- int len;
94005+ unsigned int lv = sizeof(int);
94006+ unsigned int len;
94007
94008 if (get_user(len, optlen))
94009 return -EFAULT;
94010- if (len < 0)
94011+ if (len > INT_MAX)
94012 return -EINVAL;
94013
94014 memset(&v, 0, sizeof(v));
94015@@ -1106,11 +1106,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94016
94017 case SO_PEERNAME:
94018 {
94019- char address[128];
94020+ char address[_K_SS_MAXSIZE];
94021
94022 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
94023 return -ENOTCONN;
94024- if (lv < len)
94025+ if (lv < len || sizeof address < len)
94026 return -EINVAL;
94027 if (copy_to_user(optval, address, len))
94028 return -EFAULT;
94029@@ -1183,7 +1183,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
94030
94031 if (len > lv)
94032 len = lv;
94033- if (copy_to_user(optval, &v, len))
94034+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
94035 return -EFAULT;
94036 lenout:
94037 if (put_user(len, optlen))
94038@@ -2326,7 +2326,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
94039 */
94040 smp_wmb();
94041 atomic_set(&sk->sk_refcnt, 1);
94042- atomic_set(&sk->sk_drops, 0);
94043+ atomic_set_unchecked(&sk->sk_drops, 0);
94044 }
94045 EXPORT_SYMBOL(sock_init_data);
94046
94047@@ -2451,6 +2451,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
94048 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
94049 int level, int type)
94050 {
94051+ struct sock_extended_err ee;
94052 struct sock_exterr_skb *serr;
94053 struct sk_buff *skb, *skb2;
94054 int copied, err;
94055@@ -2472,7 +2473,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
94056 sock_recv_timestamp(msg, sk, skb);
94057
94058 serr = SKB_EXT_ERR(skb);
94059- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
94060+ ee = serr->ee;
94061+ put_cmsg(msg, level, type, sizeof ee, &ee);
94062
94063 msg->msg_flags |= MSG_ERRQUEUE;
94064 err = copied;
94065diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
94066index a0e9cf6..ef7f9ed 100644
94067--- a/net/core/sock_diag.c
94068+++ b/net/core/sock_diag.c
94069@@ -9,26 +9,33 @@
94070 #include <linux/inet_diag.h>
94071 #include <linux/sock_diag.h>
94072
94073-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
94074+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
94075 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
94076 static DEFINE_MUTEX(sock_diag_table_mutex);
94077
94078 int sock_diag_check_cookie(void *sk, __u32 *cookie)
94079 {
94080+#ifndef CONFIG_GRKERNSEC_HIDESYM
94081 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
94082 cookie[1] != INET_DIAG_NOCOOKIE) &&
94083 ((u32)(unsigned long)sk != cookie[0] ||
94084 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
94085 return -ESTALE;
94086 else
94087+#endif
94088 return 0;
94089 }
94090 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
94091
94092 void sock_diag_save_cookie(void *sk, __u32 *cookie)
94093 {
94094+#ifdef CONFIG_GRKERNSEC_HIDESYM
94095+ cookie[0] = 0;
94096+ cookie[1] = 0;
94097+#else
94098 cookie[0] = (u32)(unsigned long)sk;
94099 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
94100+#endif
94101 }
94102 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
94103
94104@@ -113,8 +120,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
94105 mutex_lock(&sock_diag_table_mutex);
94106 if (sock_diag_handlers[hndl->family])
94107 err = -EBUSY;
94108- else
94109+ else {
94110+ pax_open_kernel();
94111 sock_diag_handlers[hndl->family] = hndl;
94112+ pax_close_kernel();
94113+ }
94114 mutex_unlock(&sock_diag_table_mutex);
94115
94116 return err;
94117@@ -130,7 +140,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
94118
94119 mutex_lock(&sock_diag_table_mutex);
94120 BUG_ON(sock_diag_handlers[family] != hnld);
94121+ pax_open_kernel();
94122 sock_diag_handlers[family] = NULL;
94123+ pax_close_kernel();
94124 mutex_unlock(&sock_diag_table_mutex);
94125 }
94126 EXPORT_SYMBOL_GPL(sock_diag_unregister);
94127diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
94128index cca4441..5e616de 100644
94129--- a/net/core/sysctl_net_core.c
94130+++ b/net/core/sysctl_net_core.c
94131@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
94132 {
94133 unsigned int orig_size, size;
94134 int ret, i;
94135- struct ctl_table tmp = {
94136+ ctl_table_no_const tmp = {
94137 .data = &size,
94138 .maxlen = sizeof(size),
94139 .mode = table->mode
94140@@ -199,7 +199,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
94141 void __user *buffer, size_t *lenp, loff_t *ppos)
94142 {
94143 char id[IFNAMSIZ];
94144- struct ctl_table tbl = {
94145+ ctl_table_no_const tbl = {
94146 .data = id,
94147 .maxlen = IFNAMSIZ,
94148 };
94149@@ -378,13 +378,12 @@ static struct ctl_table netns_core_table[] = {
94150
94151 static __net_init int sysctl_core_net_init(struct net *net)
94152 {
94153- struct ctl_table *tbl;
94154+ ctl_table_no_const *tbl = NULL;
94155
94156 net->core.sysctl_somaxconn = SOMAXCONN;
94157
94158- tbl = netns_core_table;
94159 if (!net_eq(net, &init_net)) {
94160- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
94161+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
94162 if (tbl == NULL)
94163 goto err_dup;
94164
94165@@ -394,17 +393,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
94166 if (net->user_ns != &init_user_ns) {
94167 tbl[0].procname = NULL;
94168 }
94169- }
94170-
94171- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
94172+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
94173+ } else
94174+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
94175 if (net->core.sysctl_hdr == NULL)
94176 goto err_reg;
94177
94178 return 0;
94179
94180 err_reg:
94181- if (tbl != netns_core_table)
94182- kfree(tbl);
94183+ kfree(tbl);
94184 err_dup:
94185 return -ENOMEM;
94186 }
94187@@ -419,7 +417,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
94188 kfree(tbl);
94189 }
94190
94191-static __net_initdata struct pernet_operations sysctl_core_ops = {
94192+static __net_initconst struct pernet_operations sysctl_core_ops = {
94193 .init = sysctl_core_net_init,
94194 .exit = sysctl_core_net_exit,
94195 };
94196diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
94197index dd4d506..fb2fb87 100644
94198--- a/net/decnet/af_decnet.c
94199+++ b/net/decnet/af_decnet.c
94200@@ -465,6 +465,7 @@ static struct proto dn_proto = {
94201 .sysctl_rmem = sysctl_decnet_rmem,
94202 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
94203 .obj_size = sizeof(struct dn_sock),
94204+ .slab_flags = SLAB_USERCOPY,
94205 };
94206
94207 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
94208diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
94209index 5325b54..a0d4d69 100644
94210--- a/net/decnet/sysctl_net_decnet.c
94211+++ b/net/decnet/sysctl_net_decnet.c
94212@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
94213
94214 if (len > *lenp) len = *lenp;
94215
94216- if (copy_to_user(buffer, addr, len))
94217+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
94218 return -EFAULT;
94219
94220 *lenp = len;
94221@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
94222
94223 if (len > *lenp) len = *lenp;
94224
94225- if (copy_to_user(buffer, devname, len))
94226+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
94227 return -EFAULT;
94228
94229 *lenp = len;
94230diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
94231index 008f337..b03b8c9 100644
94232--- a/net/ieee802154/6lowpan.c
94233+++ b/net/ieee802154/6lowpan.c
94234@@ -548,7 +548,7 @@ static int lowpan_header_create(struct sk_buff *skb,
94235 hc06_ptr += 3;
94236 } else {
94237 /* compress nothing */
94238- memcpy(hc06_ptr, &hdr, 4);
94239+ memcpy(hc06_ptr, hdr, 4);
94240 /* replace the top byte with new ECN | DSCP format */
94241 *hc06_ptr = tmp;
94242 hc06_ptr += 4;
94243diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
94244index cfeb85c..385989a 100644
94245--- a/net/ipv4/af_inet.c
94246+++ b/net/ipv4/af_inet.c
94247@@ -1675,13 +1675,9 @@ static int __init inet_init(void)
94248
94249 BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
94250
94251- sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
94252- if (!sysctl_local_reserved_ports)
94253- goto out;
94254-
94255 rc = proto_register(&tcp_prot, 1);
94256 if (rc)
94257- goto out_free_reserved_ports;
94258+ goto out;
94259
94260 rc = proto_register(&udp_prot, 1);
94261 if (rc)
94262@@ -1790,8 +1786,6 @@ out_unregister_udp_proto:
94263 proto_unregister(&udp_prot);
94264 out_unregister_tcp_proto:
94265 proto_unregister(&tcp_prot);
94266-out_free_reserved_ports:
94267- kfree(sysctl_local_reserved_ports);
94268 goto out;
94269 }
94270
94271diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
94272index a1b5bcb..62ec5c6 100644
94273--- a/net/ipv4/devinet.c
94274+++ b/net/ipv4/devinet.c
94275@@ -1533,7 +1533,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
94276 idx = 0;
94277 head = &net->dev_index_head[h];
94278 rcu_read_lock();
94279- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
94280+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
94281 net->dev_base_seq;
94282 hlist_for_each_entry_rcu(dev, head, index_hlist) {
94283 if (idx < s_idx)
94284@@ -1844,7 +1844,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
94285 idx = 0;
94286 head = &net->dev_index_head[h];
94287 rcu_read_lock();
94288- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
94289+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
94290 net->dev_base_seq;
94291 hlist_for_each_entry_rcu(dev, head, index_hlist) {
94292 if (idx < s_idx)
94293@@ -2069,7 +2069,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
94294 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
94295 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
94296
94297-static struct devinet_sysctl_table {
94298+static const struct devinet_sysctl_table {
94299 struct ctl_table_header *sysctl_header;
94300 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
94301 } devinet_sysctl = {
94302@@ -2191,7 +2191,7 @@ static __net_init int devinet_init_net(struct net *net)
94303 int err;
94304 struct ipv4_devconf *all, *dflt;
94305 #ifdef CONFIG_SYSCTL
94306- struct ctl_table *tbl = ctl_forward_entry;
94307+ ctl_table_no_const *tbl = NULL;
94308 struct ctl_table_header *forw_hdr;
94309 #endif
94310
94311@@ -2209,7 +2209,7 @@ static __net_init int devinet_init_net(struct net *net)
94312 goto err_alloc_dflt;
94313
94314 #ifdef CONFIG_SYSCTL
94315- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
94316+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
94317 if (tbl == NULL)
94318 goto err_alloc_ctl;
94319
94320@@ -2229,7 +2229,10 @@ static __net_init int devinet_init_net(struct net *net)
94321 goto err_reg_dflt;
94322
94323 err = -ENOMEM;
94324- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
94325+ if (!net_eq(net, &init_net))
94326+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
94327+ else
94328+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
94329 if (forw_hdr == NULL)
94330 goto err_reg_ctl;
94331 net->ipv4.forw_hdr = forw_hdr;
94332@@ -2245,8 +2248,7 @@ err_reg_ctl:
94333 err_reg_dflt:
94334 __devinet_sysctl_unregister(all);
94335 err_reg_all:
94336- if (tbl != ctl_forward_entry)
94337- kfree(tbl);
94338+ kfree(tbl);
94339 err_alloc_ctl:
94340 #endif
94341 if (dflt != &ipv4_devconf_dflt)
94342diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
94343index b3f627a..b0f3e99 100644
94344--- a/net/ipv4/fib_frontend.c
94345+++ b/net/ipv4/fib_frontend.c
94346@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
94347 #ifdef CONFIG_IP_ROUTE_MULTIPATH
94348 fib_sync_up(dev);
94349 #endif
94350- atomic_inc(&net->ipv4.dev_addr_genid);
94351+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94352 rt_cache_flush(dev_net(dev));
94353 break;
94354 case NETDEV_DOWN:
94355 fib_del_ifaddr(ifa, NULL);
94356- atomic_inc(&net->ipv4.dev_addr_genid);
94357+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94358 if (ifa->ifa_dev->ifa_list == NULL) {
94359 /* Last address was deleted from this interface.
94360 * Disable IP.
94361@@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
94362 #ifdef CONFIG_IP_ROUTE_MULTIPATH
94363 fib_sync_up(dev);
94364 #endif
94365- atomic_inc(&net->ipv4.dev_addr_genid);
94366+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
94367 rt_cache_flush(net);
94368 break;
94369 case NETDEV_DOWN:
94370diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
94371index d5dbca5..6251d5f 100644
94372--- a/net/ipv4/fib_semantics.c
94373+++ b/net/ipv4/fib_semantics.c
94374@@ -766,7 +766,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
94375 nh->nh_saddr = inet_select_addr(nh->nh_dev,
94376 nh->nh_gw,
94377 nh->nh_parent->fib_scope);
94378- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
94379+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
94380
94381 return nh->nh_saddr;
94382 }
94383diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
94384index 6acb541..9ea617d 100644
94385--- a/net/ipv4/inet_connection_sock.c
94386+++ b/net/ipv4/inet_connection_sock.c
94387@@ -37,7 +37,7 @@ struct local_ports sysctl_local_ports __read_mostly = {
94388 .range = { 32768, 61000 },
94389 };
94390
94391-unsigned long *sysctl_local_reserved_ports;
94392+unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
94393 EXPORT_SYMBOL(sysctl_local_reserved_ports);
94394
94395 void inet_get_local_port_range(int *low, int *high)
94396diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
94397index 5f64875..31cf54d 100644
94398--- a/net/ipv4/inet_diag.c
94399+++ b/net/ipv4/inet_diag.c
94400@@ -106,6 +106,10 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
94401
94402 r->id.idiag_sport = inet->inet_sport;
94403 r->id.idiag_dport = inet->inet_dport;
94404+
94405+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94406+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94407+
94408 r->id.idiag_src[0] = inet->inet_rcv_saddr;
94409 r->id.idiag_dst[0] = inet->inet_daddr;
94410
94411@@ -240,12 +244,19 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
94412
94413 r->idiag_family = tw->tw_family;
94414 r->idiag_retrans = 0;
94415+
94416 r->id.idiag_if = tw->tw_bound_dev_if;
94417 sock_diag_save_cookie(tw, r->id.idiag_cookie);
94418+
94419 r->id.idiag_sport = tw->tw_sport;
94420 r->id.idiag_dport = tw->tw_dport;
94421+
94422+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94423+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94424+
94425 r->id.idiag_src[0] = tw->tw_rcv_saddr;
94426 r->id.idiag_dst[0] = tw->tw_daddr;
94427+
94428 r->idiag_state = tw->tw_substate;
94429 r->idiag_timer = 3;
94430 r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
94431@@ -732,8 +743,13 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
94432
94433 r->id.idiag_sport = inet->inet_sport;
94434 r->id.idiag_dport = ireq->rmt_port;
94435+
94436+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
94437+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
94438+
94439 r->id.idiag_src[0] = ireq->loc_addr;
94440 r->id.idiag_dst[0] = ireq->rmt_addr;
94441+
94442 r->idiag_expires = jiffies_to_msecs(tmo);
94443 r->idiag_rqueue = 0;
94444 r->idiag_wqueue = 0;
94445diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
94446index 96da9c7..b956690 100644
94447--- a/net/ipv4/inet_hashtables.c
94448+++ b/net/ipv4/inet_hashtables.c
94449@@ -18,12 +18,15 @@
94450 #include <linux/sched.h>
94451 #include <linux/slab.h>
94452 #include <linux/wait.h>
94453+#include <linux/security.h>
94454
94455 #include <net/inet_connection_sock.h>
94456 #include <net/inet_hashtables.h>
94457 #include <net/secure_seq.h>
94458 #include <net/ip.h>
94459
94460+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
94461+
94462 /*
94463 * Allocate and initialize a new local port bind bucket.
94464 * The bindhash mutex for snum's hash chain must be held here.
94465@@ -554,6 +557,8 @@ ok:
94466 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
94467 spin_unlock(&head->lock);
94468
94469+ gr_update_task_in_ip_table(current, inet_sk(sk));
94470+
94471 if (tw) {
94472 inet_twsk_deschedule(tw, death_row);
94473 while (twrefcnt) {
94474diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
94475index 33d5537..da337a4 100644
94476--- a/net/ipv4/inetpeer.c
94477+++ b/net/ipv4/inetpeer.c
94478@@ -503,8 +503,8 @@ relookup:
94479 if (p) {
94480 p->daddr = *daddr;
94481 atomic_set(&p->refcnt, 1);
94482- atomic_set(&p->rid, 0);
94483- atomic_set(&p->ip_id_count,
94484+ atomic_set_unchecked(&p->rid, 0);
94485+ atomic_set_unchecked(&p->ip_id_count,
94486 (daddr->family == AF_INET) ?
94487 secure_ip_id(daddr->addr.a4) :
94488 secure_ipv6_id(daddr->addr.a6));
94489diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
94490index b66910a..cfe416e 100644
94491--- a/net/ipv4/ip_fragment.c
94492+++ b/net/ipv4/ip_fragment.c
94493@@ -282,7 +282,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
94494 return 0;
94495
94496 start = qp->rid;
94497- end = atomic_inc_return(&peer->rid);
94498+ end = atomic_inc_return_unchecked(&peer->rid);
94499 qp->rid = end;
94500
94501 rc = qp->q.fragments && (end - start) > max;
94502@@ -759,12 +759,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
94503
94504 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94505 {
94506- struct ctl_table *table;
94507+ ctl_table_no_const *table = NULL;
94508 struct ctl_table_header *hdr;
94509
94510- table = ip4_frags_ns_ctl_table;
94511 if (!net_eq(net, &init_net)) {
94512- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
94513+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
94514 if (table == NULL)
94515 goto err_alloc;
94516
94517@@ -775,9 +774,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94518 /* Don't export sysctls to unprivileged users */
94519 if (net->user_ns != &init_user_ns)
94520 table[0].procname = NULL;
94521- }
94522+ hdr = register_net_sysctl(net, "net/ipv4", table);
94523+ } else
94524+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
94525
94526- hdr = register_net_sysctl(net, "net/ipv4", table);
94527 if (hdr == NULL)
94528 goto err_reg;
94529
94530@@ -785,8 +785,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
94531 return 0;
94532
94533 err_reg:
94534- if (!net_eq(net, &init_net))
94535- kfree(table);
94536+ kfree(table);
94537 err_alloc:
94538 return -ENOMEM;
94539 }
94540diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
94541index d7aea4c..a8ee872 100644
94542--- a/net/ipv4/ip_gre.c
94543+++ b/net/ipv4/ip_gre.c
94544@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
94545 module_param(log_ecn_error, bool, 0644);
94546 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
94547
94548-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
94549+static struct rtnl_link_ops ipgre_link_ops;
94550 static int ipgre_tunnel_init(struct net_device *dev);
94551
94552 static int ipgre_net_id __read_mostly;
94553@@ -731,7 +731,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
94554 [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
94555 };
94556
94557-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
94558+static struct rtnl_link_ops ipgre_link_ops = {
94559 .kind = "gre",
94560 .maxtype = IFLA_GRE_MAX,
94561 .policy = ipgre_policy,
94562@@ -745,7 +745,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
94563 .fill_info = ipgre_fill_info,
94564 };
94565
94566-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
94567+static struct rtnl_link_ops ipgre_tap_ops = {
94568 .kind = "gretap",
94569 .maxtype = IFLA_GRE_MAX,
94570 .policy = ipgre_policy,
94571diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
94572index 23e6ab0..be67a57 100644
94573--- a/net/ipv4/ip_sockglue.c
94574+++ b/net/ipv4/ip_sockglue.c
94575@@ -1153,7 +1153,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
94576 len = min_t(unsigned int, len, opt->optlen);
94577 if (put_user(len, optlen))
94578 return -EFAULT;
94579- if (copy_to_user(optval, opt->__data, len))
94580+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
94581+ copy_to_user(optval, opt->__data, len))
94582 return -EFAULT;
94583 return 0;
94584 }
94585@@ -1284,7 +1285,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
94586 if (sk->sk_type != SOCK_STREAM)
94587 return -ENOPROTOOPT;
94588
94589- msg.msg_control = optval;
94590+ msg.msg_control = (void __force_kernel *)optval;
94591 msg.msg_controllen = len;
94592 msg.msg_flags = flags;
94593
94594diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
94595index 26847e1..75d2d2f 100644
94596--- a/net/ipv4/ip_vti.c
94597+++ b/net/ipv4/ip_vti.c
94598@@ -44,7 +44,7 @@
94599 #include <net/net_namespace.h>
94600 #include <net/netns/generic.h>
94601
94602-static struct rtnl_link_ops vti_link_ops __read_mostly;
94603+static struct rtnl_link_ops vti_link_ops;
94604
94605 static int vti_net_id __read_mostly;
94606 static int vti_tunnel_init(struct net_device *dev);
94607@@ -425,7 +425,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
94608 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
94609 };
94610
94611-static struct rtnl_link_ops vti_link_ops __read_mostly = {
94612+static struct rtnl_link_ops vti_link_ops = {
94613 .kind = "vti",
94614 .maxtype = IFLA_VTI_MAX,
94615 .policy = vti_policy,
94616diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
94617index efa1138..20dbba0 100644
94618--- a/net/ipv4/ipconfig.c
94619+++ b/net/ipv4/ipconfig.c
94620@@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
94621
94622 mm_segment_t oldfs = get_fs();
94623 set_fs(get_ds());
94624- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
94625+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
94626 set_fs(oldfs);
94627 return res;
94628 }
94629@@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
94630
94631 mm_segment_t oldfs = get_fs();
94632 set_fs(get_ds());
94633- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
94634+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
94635 set_fs(oldfs);
94636 return res;
94637 }
94638@@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
94639
94640 mm_segment_t oldfs = get_fs();
94641 set_fs(get_ds());
94642- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
94643+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
94644 set_fs(oldfs);
94645 return res;
94646 }
94647diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
94648index 7f80fb4..b0328f6 100644
94649--- a/net/ipv4/ipip.c
94650+++ b/net/ipv4/ipip.c
94651@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
94652 static int ipip_net_id __read_mostly;
94653
94654 static int ipip_tunnel_init(struct net_device *dev);
94655-static struct rtnl_link_ops ipip_link_ops __read_mostly;
94656+static struct rtnl_link_ops ipip_link_ops;
94657
94658 static int ipip_err(struct sk_buff *skb, u32 info)
94659 {
94660@@ -408,7 +408,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
94661 [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
94662 };
94663
94664-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
94665+static struct rtnl_link_ops ipip_link_ops = {
94666 .kind = "ipip",
94667 .maxtype = IFLA_IPTUN_MAX,
94668 .policy = ipip_policy,
94669diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
94670index 85a4f21..1beb1f5 100644
94671--- a/net/ipv4/netfilter/arp_tables.c
94672+++ b/net/ipv4/netfilter/arp_tables.c
94673@@ -880,14 +880,14 @@ static int compat_table_info(const struct xt_table_info *info,
94674 #endif
94675
94676 static int get_info(struct net *net, void __user *user,
94677- const int *len, int compat)
94678+ int len, int compat)
94679 {
94680 char name[XT_TABLE_MAXNAMELEN];
94681 struct xt_table *t;
94682 int ret;
94683
94684- if (*len != sizeof(struct arpt_getinfo)) {
94685- duprintf("length %u != %Zu\n", *len,
94686+ if (len != sizeof(struct arpt_getinfo)) {
94687+ duprintf("length %u != %Zu\n", len,
94688 sizeof(struct arpt_getinfo));
94689 return -EINVAL;
94690 }
94691@@ -924,7 +924,7 @@ static int get_info(struct net *net, void __user *user,
94692 info.size = private->size;
94693 strcpy(info.name, name);
94694
94695- if (copy_to_user(user, &info, *len) != 0)
94696+ if (copy_to_user(user, &info, len) != 0)
94697 ret = -EFAULT;
94698 else
94699 ret = 0;
94700@@ -1683,7 +1683,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
94701
94702 switch (cmd) {
94703 case ARPT_SO_GET_INFO:
94704- ret = get_info(sock_net(sk), user, len, 1);
94705+ ret = get_info(sock_net(sk), user, *len, 1);
94706 break;
94707 case ARPT_SO_GET_ENTRIES:
94708 ret = compat_get_entries(sock_net(sk), user, len);
94709@@ -1728,7 +1728,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
94710
94711 switch (cmd) {
94712 case ARPT_SO_GET_INFO:
94713- ret = get_info(sock_net(sk), user, len, 0);
94714+ ret = get_info(sock_net(sk), user, *len, 0);
94715 break;
94716
94717 case ARPT_SO_GET_ENTRIES:
94718diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
94719index d23118d..6ad7277 100644
94720--- a/net/ipv4/netfilter/ip_tables.c
94721+++ b/net/ipv4/netfilter/ip_tables.c
94722@@ -1068,14 +1068,14 @@ static int compat_table_info(const struct xt_table_info *info,
94723 #endif
94724
94725 static int get_info(struct net *net, void __user *user,
94726- const int *len, int compat)
94727+ int len, int compat)
94728 {
94729 char name[XT_TABLE_MAXNAMELEN];
94730 struct xt_table *t;
94731 int ret;
94732
94733- if (*len != sizeof(struct ipt_getinfo)) {
94734- duprintf("length %u != %zu\n", *len,
94735+ if (len != sizeof(struct ipt_getinfo)) {
94736+ duprintf("length %u != %zu\n", len,
94737 sizeof(struct ipt_getinfo));
94738 return -EINVAL;
94739 }
94740@@ -1112,7 +1112,7 @@ static int get_info(struct net *net, void __user *user,
94741 info.size = private->size;
94742 strcpy(info.name, name);
94743
94744- if (copy_to_user(user, &info, *len) != 0)
94745+ if (copy_to_user(user, &info, len) != 0)
94746 ret = -EFAULT;
94747 else
94748 ret = 0;
94749@@ -1966,7 +1966,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
94750
94751 switch (cmd) {
94752 case IPT_SO_GET_INFO:
94753- ret = get_info(sock_net(sk), user, len, 1);
94754+ ret = get_info(sock_net(sk), user, *len, 1);
94755 break;
94756 case IPT_SO_GET_ENTRIES:
94757 ret = compat_get_entries(sock_net(sk), user, len);
94758@@ -2013,7 +2013,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
94759
94760 switch (cmd) {
94761 case IPT_SO_GET_INFO:
94762- ret = get_info(sock_net(sk), user, len, 0);
94763+ ret = get_info(sock_net(sk), user, *len, 0);
94764 break;
94765
94766 case IPT_SO_GET_ENTRIES:
94767diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
94768index cbc2215..9cb993c 100644
94769--- a/net/ipv4/netfilter/ipt_ULOG.c
94770+++ b/net/ipv4/netfilter/ipt_ULOG.c
94771@@ -220,6 +220,7 @@ static void ipt_ulog_packet(struct net *net,
94772 ub->qlen++;
94773
94774 pm = nlmsg_data(nlh);
94775+ memset(pm, 0, sizeof(*pm));
94776
94777 /* We might not have a timestamp, get one */
94778 if (skb->tstamp.tv64 == 0)
94779@@ -238,8 +239,6 @@ static void ipt_ulog_packet(struct net *net,
94780 }
94781 else if (loginfo->prefix[0] != '\0')
94782 strncpy(pm->prefix, loginfo->prefix, sizeof(pm->prefix));
94783- else
94784- *(pm->prefix) = '\0';
94785
94786 if (in && in->hard_header_len > 0 &&
94787 skb->mac_header != skb->network_header &&
94788@@ -251,13 +250,9 @@ static void ipt_ulog_packet(struct net *net,
94789
94790 if (in)
94791 strncpy(pm->indev_name, in->name, sizeof(pm->indev_name));
94792- else
94793- pm->indev_name[0] = '\0';
94794
94795 if (out)
94796 strncpy(pm->outdev_name, out->name, sizeof(pm->outdev_name));
94797- else
94798- pm->outdev_name[0] = '\0';
94799
94800 /* copy_len <= skb->len, so can't fail. */
94801 if (skb_copy_bits(skb, 0, pm->payload, copy_len) < 0)
94802diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
94803index c482f7c..2784262 100644
94804--- a/net/ipv4/ping.c
94805+++ b/net/ipv4/ping.c
94806@@ -55,7 +55,7 @@
94807
94808
94809 struct ping_table ping_table;
94810-struct pingv6_ops pingv6_ops;
94811+struct pingv6_ops *pingv6_ops;
94812 EXPORT_SYMBOL_GPL(pingv6_ops);
94813
94814 static u16 ping_port_rover;
94815@@ -335,7 +335,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
94816 return -ENODEV;
94817 }
94818 }
94819- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
94820+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
94821 scoped);
94822 rcu_read_unlock();
94823
94824@@ -541,7 +541,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
94825 }
94826 #if IS_ENABLED(CONFIG_IPV6)
94827 } else if (skb->protocol == htons(ETH_P_IPV6)) {
94828- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
94829+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
94830 #endif
94831 }
94832
94833@@ -559,7 +559,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
94834 info, (u8 *)icmph);
94835 #if IS_ENABLED(CONFIG_IPV6)
94836 } else if (family == AF_INET6) {
94837- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
94838+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
94839 info, (u8 *)icmph);
94840 #endif
94841 }
94842@@ -841,7 +841,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
94843 return ip_recv_error(sk, msg, len, addr_len);
94844 #if IS_ENABLED(CONFIG_IPV6)
94845 } else if (family == AF_INET6) {
94846- return pingv6_ops.ipv6_recv_error(sk, msg, len,
94847+ return pingv6_ops->ipv6_recv_error(sk, msg, len,
94848 addr_len);
94849 #endif
94850 }
94851@@ -900,7 +900,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
94852 }
94853
94854 if (inet6_sk(sk)->rxopt.all)
94855- pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);
94856+ pingv6_ops->ip6_datagram_recv_ctl(sk, msg, skb);
94857 #endif
94858 } else {
94859 BUG();
94860@@ -1090,7 +1090,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
94861 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
94862 0, sock_i_ino(sp),
94863 atomic_read(&sp->sk_refcnt), sp,
94864- atomic_read(&sp->sk_drops), len);
94865+ atomic_read_unchecked(&sp->sk_drops), len);
94866 }
94867
94868 static int ping_v4_seq_show(struct seq_file *seq, void *v)
94869diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
94870index 7d3db78..9fd511d 100644
94871--- a/net/ipv4/raw.c
94872+++ b/net/ipv4/raw.c
94873@@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
94874 int raw_rcv(struct sock *sk, struct sk_buff *skb)
94875 {
94876 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
94877- atomic_inc(&sk->sk_drops);
94878+ atomic_inc_unchecked(&sk->sk_drops);
94879 kfree_skb(skb);
94880 return NET_RX_DROP;
94881 }
94882@@ -746,16 +746,20 @@ static int raw_init(struct sock *sk)
94883
94884 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
94885 {
94886+ struct icmp_filter filter;
94887+
94888 if (optlen > sizeof(struct icmp_filter))
94889 optlen = sizeof(struct icmp_filter);
94890- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
94891+ if (copy_from_user(&filter, optval, optlen))
94892 return -EFAULT;
94893+ raw_sk(sk)->filter = filter;
94894 return 0;
94895 }
94896
94897 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
94898 {
94899 int len, ret = -EFAULT;
94900+ struct icmp_filter filter;
94901
94902 if (get_user(len, optlen))
94903 goto out;
94904@@ -765,8 +769,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
94905 if (len > sizeof(struct icmp_filter))
94906 len = sizeof(struct icmp_filter);
94907 ret = -EFAULT;
94908- if (put_user(len, optlen) ||
94909- copy_to_user(optval, &raw_sk(sk)->filter, len))
94910+ filter = raw_sk(sk)->filter;
94911+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
94912 goto out;
94913 ret = 0;
94914 out: return ret;
94915@@ -995,7 +999,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
94916 0, 0L, 0,
94917 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
94918 0, sock_i_ino(sp),
94919- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
94920+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
94921 }
94922
94923 static int raw_seq_show(struct seq_file *seq, void *v)
94924diff --git a/net/ipv4/route.c b/net/ipv4/route.c
94925index 62290b5..f0d944f 100644
94926--- a/net/ipv4/route.c
94927+++ b/net/ipv4/route.c
94928@@ -2617,34 +2617,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
94929 .maxlen = sizeof(int),
94930 .mode = 0200,
94931 .proc_handler = ipv4_sysctl_rtcache_flush,
94932+ .extra1 = &init_net,
94933 },
94934 { },
94935 };
94936
94937 static __net_init int sysctl_route_net_init(struct net *net)
94938 {
94939- struct ctl_table *tbl;
94940+ ctl_table_no_const *tbl = NULL;
94941
94942- tbl = ipv4_route_flush_table;
94943 if (!net_eq(net, &init_net)) {
94944- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
94945+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
94946 if (tbl == NULL)
94947 goto err_dup;
94948
94949 /* Don't export sysctls to unprivileged users */
94950 if (net->user_ns != &init_user_ns)
94951 tbl[0].procname = NULL;
94952- }
94953- tbl[0].extra1 = net;
94954+ tbl[0].extra1 = net;
94955+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
94956+ } else
94957+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
94958
94959- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
94960 if (net->ipv4.route_hdr == NULL)
94961 goto err_reg;
94962 return 0;
94963
94964 err_reg:
94965- if (tbl != ipv4_route_flush_table)
94966- kfree(tbl);
94967+ kfree(tbl);
94968 err_dup:
94969 return -ENOMEM;
94970 }
94971@@ -2667,8 +2667,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
94972
94973 static __net_init int rt_genid_init(struct net *net)
94974 {
94975- atomic_set(&net->ipv4.rt_genid, 0);
94976- atomic_set(&net->fnhe_genid, 0);
94977+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
94978+ atomic_set_unchecked(&net->fnhe_genid, 0);
94979 get_random_bytes(&net->ipv4.dev_addr_genid,
94980 sizeof(net->ipv4.dev_addr_genid));
94981 return 0;
94982diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
94983index 540279f..9855b16 100644
94984--- a/net/ipv4/sysctl_net_ipv4.c
94985+++ b/net/ipv4/sysctl_net_ipv4.c
94986@@ -58,7 +58,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
94987 {
94988 int ret;
94989 int range[2];
94990- struct ctl_table tmp = {
94991+ ctl_table_no_const tmp = {
94992 .data = &range,
94993 .maxlen = sizeof(range),
94994 .mode = table->mode,
94995@@ -111,7 +111,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
94996 int ret;
94997 gid_t urange[2];
94998 kgid_t low, high;
94999- struct ctl_table tmp = {
95000+ ctl_table_no_const tmp = {
95001 .data = &urange,
95002 .maxlen = sizeof(urange),
95003 .mode = table->mode,
95004@@ -142,7 +142,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
95005 void __user *buffer, size_t *lenp, loff_t *ppos)
95006 {
95007 char val[TCP_CA_NAME_MAX];
95008- struct ctl_table tbl = {
95009+ ctl_table_no_const tbl = {
95010 .data = val,
95011 .maxlen = TCP_CA_NAME_MAX,
95012 };
95013@@ -161,7 +161,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
95014 void __user *buffer, size_t *lenp,
95015 loff_t *ppos)
95016 {
95017- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
95018+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
95019 int ret;
95020
95021 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
95022@@ -178,7 +178,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
95023 void __user *buffer, size_t *lenp,
95024 loff_t *ppos)
95025 {
95026- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
95027+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
95028 int ret;
95029
95030 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
95031@@ -204,15 +204,17 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write,
95032 struct mem_cgroup *memcg;
95033 #endif
95034
95035- struct ctl_table tmp = {
95036+ ctl_table_no_const tmp = {
95037 .data = &vec,
95038 .maxlen = sizeof(vec),
95039 .mode = ctl->mode,
95040 };
95041
95042 if (!write) {
95043- ctl->data = &net->ipv4.sysctl_tcp_mem;
95044- return proc_doulongvec_minmax(ctl, write, buffer, lenp, ppos);
95045+ ctl_table_no_const tcp_mem = *ctl;
95046+
95047+ tcp_mem.data = &net->ipv4.sysctl_tcp_mem;
95048+ return proc_doulongvec_minmax(&tcp_mem, write, buffer, lenp, ppos);
95049 }
95050
95051 ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos);
95052@@ -240,7 +242,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
95053 void __user *buffer, size_t *lenp,
95054 loff_t *ppos)
95055 {
95056- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
95057+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
95058 struct tcp_fastopen_context *ctxt;
95059 int ret;
95060 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
95061@@ -483,7 +485,7 @@ static struct ctl_table ipv4_table[] = {
95062 },
95063 {
95064 .procname = "ip_local_reserved_ports",
95065- .data = NULL, /* initialized in sysctl_ipv4_init */
95066+ .data = sysctl_local_reserved_ports,
95067 .maxlen = 65536,
95068 .mode = 0644,
95069 .proc_handler = proc_do_large_bitmap,
95070@@ -864,11 +866,10 @@ static struct ctl_table ipv4_net_table[] = {
95071
95072 static __net_init int ipv4_sysctl_init_net(struct net *net)
95073 {
95074- struct ctl_table *table;
95075+ ctl_table_no_const *table = NULL;
95076
95077- table = ipv4_net_table;
95078 if (!net_eq(net, &init_net)) {
95079- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
95080+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
95081 if (table == NULL)
95082 goto err_alloc;
95083
95084@@ -903,15 +904,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
95085
95086 tcp_init_mem(net);
95087
95088- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
95089+ if (!net_eq(net, &init_net))
95090+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
95091+ else
95092+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
95093 if (net->ipv4.ipv4_hdr == NULL)
95094 goto err_reg;
95095
95096 return 0;
95097
95098 err_reg:
95099- if (!net_eq(net, &init_net))
95100- kfree(table);
95101+ kfree(table);
95102 err_alloc:
95103 return -ENOMEM;
95104 }
95105@@ -933,16 +936,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
95106 static __init int sysctl_ipv4_init(void)
95107 {
95108 struct ctl_table_header *hdr;
95109- struct ctl_table *i;
95110-
95111- for (i = ipv4_table; i->procname; i++) {
95112- if (strcmp(i->procname, "ip_local_reserved_ports") == 0) {
95113- i->data = sysctl_local_reserved_ports;
95114- break;
95115- }
95116- }
95117- if (!i->procname)
95118- return -EINVAL;
95119
95120 hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
95121 if (hdr == NULL)
95122diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
95123index 068c8fb..a755c52 100644
95124--- a/net/ipv4/tcp_input.c
95125+++ b/net/ipv4/tcp_input.c
95126@@ -4435,7 +4435,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
95127 * simplifies code)
95128 */
95129 static void
95130-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
95131+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
95132 struct sk_buff *head, struct sk_buff *tail,
95133 u32 start, u32 end)
95134 {
95135@@ -5520,6 +5520,7 @@ discard:
95136 tcp_paws_reject(&tp->rx_opt, 0))
95137 goto discard_and_undo;
95138
95139+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
95140 if (th->syn) {
95141 /* We see SYN without ACK. It is attempt of
95142 * simultaneous connect with crossed SYNs.
95143@@ -5570,6 +5571,7 @@ discard:
95144 goto discard;
95145 #endif
95146 }
95147+#endif
95148 /* "fifth, if neither of the SYN or RST bits is set then
95149 * drop the segment and return."
95150 */
95151@@ -5616,7 +5618,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
95152 goto discard;
95153
95154 if (th->syn) {
95155- if (th->fin)
95156+ if (th->fin || th->urg || th->psh)
95157 goto discard;
95158 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
95159 return 1;
95160diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
95161index 5031f68..91569e2 100644
95162--- a/net/ipv4/tcp_ipv4.c
95163+++ b/net/ipv4/tcp_ipv4.c
95164@@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
95165 EXPORT_SYMBOL(sysctl_tcp_low_latency);
95166
95167
95168+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95169+extern int grsec_enable_blackhole;
95170+#endif
95171+
95172 #ifdef CONFIG_TCP_MD5SIG
95173 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
95174 __be32 daddr, __be32 saddr, const struct tcphdr *th);
95175@@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
95176 return 0;
95177
95178 reset:
95179+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95180+ if (!grsec_enable_blackhole)
95181+#endif
95182 tcp_v4_send_reset(rsk, skb);
95183 discard:
95184 kfree_skb(skb);
95185@@ -1974,12 +1981,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
95186 TCP_SKB_CB(skb)->sacked = 0;
95187
95188 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
95189- if (!sk)
95190+ if (!sk) {
95191+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95192+ ret = 1;
95193+#endif
95194 goto no_tcp_socket;
95195-
95196+ }
95197 process:
95198- if (sk->sk_state == TCP_TIME_WAIT)
95199+ if (sk->sk_state == TCP_TIME_WAIT) {
95200+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95201+ ret = 2;
95202+#endif
95203 goto do_time_wait;
95204+ }
95205
95206 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
95207 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
95208@@ -2033,6 +2047,10 @@ csum_error:
95209 bad_packet:
95210 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
95211 } else {
95212+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95213+ if (!grsec_enable_blackhole || (ret == 1 &&
95214+ (skb->dev->flags & IFF_LOOPBACK)))
95215+#endif
95216 tcp_v4_send_reset(NULL, skb);
95217 }
95218
95219diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
95220index 58a3e69..7f0626e 100644
95221--- a/net/ipv4/tcp_minisocks.c
95222+++ b/net/ipv4/tcp_minisocks.c
95223@@ -27,6 +27,10 @@
95224 #include <net/inet_common.h>
95225 #include <net/xfrm.h>
95226
95227+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95228+extern int grsec_enable_blackhole;
95229+#endif
95230+
95231 int sysctl_tcp_syncookies __read_mostly = 1;
95232 EXPORT_SYMBOL(sysctl_tcp_syncookies);
95233
95234@@ -711,7 +715,10 @@ embryonic_reset:
95235 * avoid becoming vulnerable to outside attack aiming at
95236 * resetting legit local connections.
95237 */
95238- req->rsk_ops->send_reset(sk, skb);
95239+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95240+ if (!grsec_enable_blackhole)
95241+#endif
95242+ req->rsk_ops->send_reset(sk, skb);
95243 } else if (fastopen) { /* received a valid RST pkt */
95244 reqsk_fastopen_remove(sk, req, true);
95245 tcp_reset(sk);
95246diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
95247index 611beab..c4b6e1d 100644
95248--- a/net/ipv4/tcp_probe.c
95249+++ b/net/ipv4/tcp_probe.c
95250@@ -245,7 +245,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
95251 if (cnt + width >= len)
95252 break;
95253
95254- if (copy_to_user(buf + cnt, tbuf, width))
95255+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
95256 return -EFAULT;
95257 cnt += width;
95258 }
95259diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
95260index 4b85e6f..22f9ac9 100644
95261--- a/net/ipv4/tcp_timer.c
95262+++ b/net/ipv4/tcp_timer.c
95263@@ -22,6 +22,10 @@
95264 #include <linux/gfp.h>
95265 #include <net/tcp.h>
95266
95267+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95268+extern int grsec_lastack_retries;
95269+#endif
95270+
95271 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
95272 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
95273 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
95274@@ -185,6 +189,13 @@ static int tcp_write_timeout(struct sock *sk)
95275 }
95276 }
95277
95278+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95279+ if ((sk->sk_state == TCP_LAST_ACK) &&
95280+ (grsec_lastack_retries > 0) &&
95281+ (grsec_lastack_retries < retry_until))
95282+ retry_until = grsec_lastack_retries;
95283+#endif
95284+
95285 if (retransmits_timed_out(sk, retry_until,
95286 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
95287 /* Has it gone just too far? */
95288diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
95289index 5e2c2f1..6473c22 100644
95290--- a/net/ipv4/udp.c
95291+++ b/net/ipv4/udp.c
95292@@ -87,6 +87,7 @@
95293 #include <linux/types.h>
95294 #include <linux/fcntl.h>
95295 #include <linux/module.h>
95296+#include <linux/security.h>
95297 #include <linux/socket.h>
95298 #include <linux/sockios.h>
95299 #include <linux/igmp.h>
95300@@ -112,6 +113,10 @@
95301 #include <net/busy_poll.h>
95302 #include "udp_impl.h"
95303
95304+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95305+extern int grsec_enable_blackhole;
95306+#endif
95307+
95308 struct udp_table udp_table __read_mostly;
95309 EXPORT_SYMBOL(udp_table);
95310
95311@@ -595,6 +600,9 @@ found:
95312 return s;
95313 }
95314
95315+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
95316+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
95317+
95318 /*
95319 * This routine is called by the ICMP module when it gets some
95320 * sort of error condition. If err < 0 then the socket should
95321@@ -892,9 +900,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
95322 dport = usin->sin_port;
95323 if (dport == 0)
95324 return -EINVAL;
95325+
95326+ err = gr_search_udp_sendmsg(sk, usin);
95327+ if (err)
95328+ return err;
95329 } else {
95330 if (sk->sk_state != TCP_ESTABLISHED)
95331 return -EDESTADDRREQ;
95332+
95333+ err = gr_search_udp_sendmsg(sk, NULL);
95334+ if (err)
95335+ return err;
95336+
95337 daddr = inet->inet_daddr;
95338 dport = inet->inet_dport;
95339 /* Open fast path for connected socket.
95340@@ -1141,7 +1158,7 @@ static unsigned int first_packet_length(struct sock *sk)
95341 IS_UDPLITE(sk));
95342 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
95343 IS_UDPLITE(sk));
95344- atomic_inc(&sk->sk_drops);
95345+ atomic_inc_unchecked(&sk->sk_drops);
95346 __skb_unlink(skb, rcvq);
95347 __skb_queue_tail(&list_kill, skb);
95348 }
95349@@ -1221,6 +1238,10 @@ try_again:
95350 if (!skb)
95351 goto out;
95352
95353+ err = gr_search_udp_recvmsg(sk, skb);
95354+ if (err)
95355+ goto out_free;
95356+
95357 ulen = skb->len - sizeof(struct udphdr);
95358 copied = len;
95359 if (copied > ulen)
95360@@ -1254,7 +1275,7 @@ try_again:
95361 if (unlikely(err)) {
95362 trace_kfree_skb(skb, udp_recvmsg);
95363 if (!peeked) {
95364- atomic_inc(&sk->sk_drops);
95365+ atomic_inc_unchecked(&sk->sk_drops);
95366 UDP_INC_STATS_USER(sock_net(sk),
95367 UDP_MIB_INERRORS, is_udplite);
95368 }
95369@@ -1542,7 +1563,7 @@ csum_error:
95370 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
95371 drop:
95372 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
95373- atomic_inc(&sk->sk_drops);
95374+ atomic_inc_unchecked(&sk->sk_drops);
95375 kfree_skb(skb);
95376 return -1;
95377 }
95378@@ -1561,7 +1582,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
95379 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
95380
95381 if (!skb1) {
95382- atomic_inc(&sk->sk_drops);
95383+ atomic_inc_unchecked(&sk->sk_drops);
95384 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
95385 IS_UDPLITE(sk));
95386 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
95387@@ -1733,6 +1754,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
95388 goto csum_error;
95389
95390 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
95391+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95392+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
95393+#endif
95394 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
95395
95396 /*
95397@@ -2165,7 +2189,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
95398 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
95399 0, sock_i_ino(sp),
95400 atomic_read(&sp->sk_refcnt), sp,
95401- atomic_read(&sp->sk_drops), len);
95402+ atomic_read_unchecked(&sp->sk_drops), len);
95403 }
95404
95405 int udp4_seq_show(struct seq_file *seq, void *v)
95406diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
95407index adf9983..8e45d0a 100644
95408--- a/net/ipv4/xfrm4_policy.c
95409+++ b/net/ipv4/xfrm4_policy.c
95410@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
95411 fl4->flowi4_tos = iph->tos;
95412 }
95413
95414-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
95415+static int xfrm4_garbage_collect(struct dst_ops *ops)
95416 {
95417 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
95418
95419- xfrm4_policy_afinfo.garbage_collect(net);
95420+ xfrm_garbage_collect_deferred(net);
95421 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
95422 }
95423
95424@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
95425
95426 static int __net_init xfrm4_net_init(struct net *net)
95427 {
95428- struct ctl_table *table;
95429+ ctl_table_no_const *table = NULL;
95430 struct ctl_table_header *hdr;
95431
95432- table = xfrm4_policy_table;
95433 if (!net_eq(net, &init_net)) {
95434- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
95435+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
95436 if (!table)
95437 goto err_alloc;
95438
95439 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
95440- }
95441-
95442- hdr = register_net_sysctl(net, "net/ipv4", table);
95443+ hdr = register_net_sysctl(net, "net/ipv4", table);
95444+ } else
95445+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
95446 if (!hdr)
95447 goto err_reg;
95448
95449@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
95450 return 0;
95451
95452 err_reg:
95453- if (!net_eq(net, &init_net))
95454- kfree(table);
95455+ kfree(table);
95456 err_alloc:
95457 return -ENOMEM;
95458 }
95459diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
95460index cd3fb30..b7dfef7 100644
95461--- a/net/ipv6/addrconf.c
95462+++ b/net/ipv6/addrconf.c
95463@@ -586,7 +586,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
95464 idx = 0;
95465 head = &net->dev_index_head[h];
95466 rcu_read_lock();
95467- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
95468+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
95469 net->dev_base_seq;
95470 hlist_for_each_entry_rcu(dev, head, index_hlist) {
95471 if (idx < s_idx)
95472@@ -2364,7 +2364,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
95473 p.iph.ihl = 5;
95474 p.iph.protocol = IPPROTO_IPV6;
95475 p.iph.ttl = 64;
95476- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
95477+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
95478
95479 if (ops->ndo_do_ioctl) {
95480 mm_segment_t oldfs = get_fs();
95481@@ -3977,7 +3977,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
95482 s_ip_idx = ip_idx = cb->args[2];
95483
95484 rcu_read_lock();
95485- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
95486+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
95487 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
95488 idx = 0;
95489 head = &net->dev_index_head[h];
95490@@ -4603,7 +4603,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
95491 dst_free(&ifp->rt->dst);
95492 break;
95493 }
95494- atomic_inc(&net->ipv6.dev_addr_genid);
95495+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
95496 rt_genid_bump_ipv6(net);
95497 }
95498
95499@@ -4624,7 +4624,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
95500 int *valp = ctl->data;
95501 int val = *valp;
95502 loff_t pos = *ppos;
95503- struct ctl_table lctl;
95504+ ctl_table_no_const lctl;
95505 int ret;
95506
95507 /*
95508@@ -4709,7 +4709,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
95509 int *valp = ctl->data;
95510 int val = *valp;
95511 loff_t pos = *ppos;
95512- struct ctl_table lctl;
95513+ ctl_table_no_const lctl;
95514 int ret;
95515
95516 /*
95517diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
95518index 8132b44..b8eca70 100644
95519--- a/net/ipv6/af_inet6.c
95520+++ b/net/ipv6/af_inet6.c
95521@@ -767,7 +767,7 @@ static int __net_init inet6_net_init(struct net *net)
95522
95523 net->ipv6.sysctl.bindv6only = 0;
95524 net->ipv6.sysctl.icmpv6_time = 1*HZ;
95525- atomic_set(&net->ipv6.rt_genid, 0);
95526+ atomic_set_unchecked(&net->ipv6.rt_genid, 0);
95527
95528 err = ipv6_init_mibs(net);
95529 if (err)
95530diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
95531index c66c6df..f375d3c 100644
95532--- a/net/ipv6/datagram.c
95533+++ b/net/ipv6/datagram.c
95534@@ -908,5 +908,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
95535 0,
95536 sock_i_ino(sp),
95537 atomic_read(&sp->sk_refcnt), sp,
95538- atomic_read(&sp->sk_drops));
95539+ atomic_read_unchecked(&sp->sk_drops));
95540 }
95541diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
95542index eef8d94..cfa1852 100644
95543--- a/net/ipv6/icmp.c
95544+++ b/net/ipv6/icmp.c
95545@@ -997,7 +997,7 @@ struct ctl_table ipv6_icmp_table_template[] = {
95546
95547 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
95548 {
95549- struct ctl_table *table;
95550+ ctl_table_no_const *table;
95551
95552 table = kmemdup(ipv6_icmp_table_template,
95553 sizeof(ipv6_icmp_table_template),
95554diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
95555index bf4a9a0..e5f6ac5 100644
95556--- a/net/ipv6/ip6_gre.c
95557+++ b/net/ipv6/ip6_gre.c
95558@@ -74,7 +74,7 @@ struct ip6gre_net {
95559 struct net_device *fb_tunnel_dev;
95560 };
95561
95562-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
95563+static struct rtnl_link_ops ip6gre_link_ops;
95564 static int ip6gre_tunnel_init(struct net_device *dev);
95565 static void ip6gre_tunnel_setup(struct net_device *dev);
95566 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
95567@@ -1286,7 +1286,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
95568 }
95569
95570
95571-static struct inet6_protocol ip6gre_protocol __read_mostly = {
95572+static struct inet6_protocol ip6gre_protocol = {
95573 .handler = ip6gre_rcv,
95574 .err_handler = ip6gre_err,
95575 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
95576@@ -1622,7 +1622,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
95577 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
95578 };
95579
95580-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
95581+static struct rtnl_link_ops ip6gre_link_ops = {
95582 .kind = "ip6gre",
95583 .maxtype = IFLA_GRE_MAX,
95584 .policy = ip6gre_policy,
95585@@ -1635,7 +1635,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
95586 .fill_info = ip6gre_fill_info,
95587 };
95588
95589-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
95590+static struct rtnl_link_ops ip6gre_tap_ops = {
95591 .kind = "ip6gretap",
95592 .maxtype = IFLA_GRE_MAX,
95593 .policy = ip6gre_policy,
95594diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
95595index c1e11b5..568e633 100644
95596--- a/net/ipv6/ip6_tunnel.c
95597+++ b/net/ipv6/ip6_tunnel.c
95598@@ -89,7 +89,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
95599
95600 static int ip6_tnl_dev_init(struct net_device *dev);
95601 static void ip6_tnl_dev_setup(struct net_device *dev);
95602-static struct rtnl_link_ops ip6_link_ops __read_mostly;
95603+static struct rtnl_link_ops ip6_link_ops;
95604
95605 static int ip6_tnl_net_id __read_mostly;
95606 struct ip6_tnl_net {
95607@@ -1699,7 +1699,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
95608 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
95609 };
95610
95611-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
95612+static struct rtnl_link_ops ip6_link_ops = {
95613 .kind = "ip6tnl",
95614 .maxtype = IFLA_IPTUN_MAX,
95615 .policy = ip6_tnl_policy,
95616diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
95617index d1e2e8e..51c19ae 100644
95618--- a/net/ipv6/ipv6_sockglue.c
95619+++ b/net/ipv6/ipv6_sockglue.c
95620@@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
95621 if (sk->sk_type != SOCK_STREAM)
95622 return -ENOPROTOOPT;
95623
95624- msg.msg_control = optval;
95625+ msg.msg_control = (void __force_kernel *)optval;
95626 msg.msg_controllen = len;
95627 msg.msg_flags = flags;
95628
95629diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
95630index 44400c2..8e11f52 100644
95631--- a/net/ipv6/netfilter/ip6_tables.c
95632+++ b/net/ipv6/netfilter/ip6_tables.c
95633@@ -1078,14 +1078,14 @@ static int compat_table_info(const struct xt_table_info *info,
95634 #endif
95635
95636 static int get_info(struct net *net, void __user *user,
95637- const int *len, int compat)
95638+ int len, int compat)
95639 {
95640 char name[XT_TABLE_MAXNAMELEN];
95641 struct xt_table *t;
95642 int ret;
95643
95644- if (*len != sizeof(struct ip6t_getinfo)) {
95645- duprintf("length %u != %zu\n", *len,
95646+ if (len != sizeof(struct ip6t_getinfo)) {
95647+ duprintf("length %u != %zu\n", len,
95648 sizeof(struct ip6t_getinfo));
95649 return -EINVAL;
95650 }
95651@@ -1122,7 +1122,7 @@ static int get_info(struct net *net, void __user *user,
95652 info.size = private->size;
95653 strcpy(info.name, name);
95654
95655- if (copy_to_user(user, &info, *len) != 0)
95656+ if (copy_to_user(user, &info, len) != 0)
95657 ret = -EFAULT;
95658 else
95659 ret = 0;
95660@@ -1976,7 +1976,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
95661
95662 switch (cmd) {
95663 case IP6T_SO_GET_INFO:
95664- ret = get_info(sock_net(sk), user, len, 1);
95665+ ret = get_info(sock_net(sk), user, *len, 1);
95666 break;
95667 case IP6T_SO_GET_ENTRIES:
95668 ret = compat_get_entries(sock_net(sk), user, len);
95669@@ -2023,7 +2023,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
95670
95671 switch (cmd) {
95672 case IP6T_SO_GET_INFO:
95673- ret = get_info(sock_net(sk), user, len, 0);
95674+ ret = get_info(sock_net(sk), user, *len, 0);
95675 break;
95676
95677 case IP6T_SO_GET_ENTRIES:
95678diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
95679index 253566a..9fa50c7 100644
95680--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
95681+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
95682@@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
95683
95684 static int nf_ct_frag6_sysctl_register(struct net *net)
95685 {
95686- struct ctl_table *table;
95687+ ctl_table_no_const *table = NULL;
95688 struct ctl_table_header *hdr;
95689
95690- table = nf_ct_frag6_sysctl_table;
95691 if (!net_eq(net, &init_net)) {
95692- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
95693+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
95694 GFP_KERNEL);
95695 if (table == NULL)
95696 goto err_alloc;
95697@@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
95698 table[0].data = &net->nf_frag.frags.timeout;
95699 table[1].data = &net->nf_frag.frags.low_thresh;
95700 table[2].data = &net->nf_frag.frags.high_thresh;
95701- }
95702-
95703- hdr = register_net_sysctl(net, "net/netfilter", table);
95704+ hdr = register_net_sysctl(net, "net/netfilter", table);
95705+ } else
95706+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
95707 if (hdr == NULL)
95708 goto err_reg;
95709
95710@@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
95711 return 0;
95712
95713 err_reg:
95714- if (!net_eq(net, &init_net))
95715- kfree(table);
95716+ kfree(table);
95717 err_alloc:
95718 return -ENOMEM;
95719 }
95720diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
95721index 827f795..7e28e82 100644
95722--- a/net/ipv6/output_core.c
95723+++ b/net/ipv6/output_core.c
95724@@ -9,8 +9,8 @@
95725
95726 void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
95727 {
95728- static atomic_t ipv6_fragmentation_id;
95729- int old, new;
95730+ static atomic_unchecked_t ipv6_fragmentation_id;
95731+ int id;
95732
95733 #if IS_ENABLED(CONFIG_IPV6)
95734 if (rt && !(rt->dst.flags & DST_NOPEER)) {
95735@@ -26,13 +26,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
95736 }
95737 }
95738 #endif
95739- do {
95740- old = atomic_read(&ipv6_fragmentation_id);
95741- new = old + 1;
95742- if (!new)
95743- new = 1;
95744- } while (atomic_cmpxchg(&ipv6_fragmentation_id, old, new) != old);
95745- fhdr->identification = htonl(new);
95746+ id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
95747+ if (!id)
95748+ id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
95749+ fhdr->identification = htonl(id);
95750 }
95751 EXPORT_SYMBOL(ipv6_select_ident);
95752
95753diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
95754index 7856e96..75ebc7f 100644
95755--- a/net/ipv6/ping.c
95756+++ b/net/ipv6/ping.c
95757@@ -246,6 +246,22 @@ static struct pernet_operations ping_v6_net_ops = {
95758 };
95759 #endif
95760
95761+static struct pingv6_ops real_pingv6_ops = {
95762+ .ipv6_recv_error = ipv6_recv_error,
95763+ .ip6_datagram_recv_ctl = ip6_datagram_recv_ctl,
95764+ .icmpv6_err_convert = icmpv6_err_convert,
95765+ .ipv6_icmp_error = ipv6_icmp_error,
95766+ .ipv6_chk_addr = ipv6_chk_addr,
95767+};
95768+
95769+static struct pingv6_ops dummy_pingv6_ops = {
95770+ .ipv6_recv_error = dummy_ipv6_recv_error,
95771+ .ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl,
95772+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
95773+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
95774+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
95775+};
95776+
95777 int __init pingv6_init(void)
95778 {
95779 #ifdef CONFIG_PROC_FS
95780@@ -253,11 +269,7 @@ int __init pingv6_init(void)
95781 if (ret)
95782 return ret;
95783 #endif
95784- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
95785- pingv6_ops.ip6_datagram_recv_ctl = ip6_datagram_recv_ctl;
95786- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
95787- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
95788- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
95789+ pingv6_ops = &real_pingv6_ops;
95790 return inet6_register_protosw(&pingv6_protosw);
95791 }
95792
95793@@ -266,11 +278,7 @@ int __init pingv6_init(void)
95794 */
95795 void pingv6_exit(void)
95796 {
95797- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
95798- pingv6_ops.ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl;
95799- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
95800- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
95801- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
95802+ pingv6_ops = &dummy_pingv6_ops;
95803 #ifdef CONFIG_PROC_FS
95804 unregister_pernet_subsys(&ping_v6_net_ops);
95805 #endif
95806diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
95807index 430067c..4adf088 100644
95808--- a/net/ipv6/raw.c
95809+++ b/net/ipv6/raw.c
95810@@ -385,7 +385,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
95811 {
95812 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
95813 skb_checksum_complete(skb)) {
95814- atomic_inc(&sk->sk_drops);
95815+ atomic_inc_unchecked(&sk->sk_drops);
95816 kfree_skb(skb);
95817 return NET_RX_DROP;
95818 }
95819@@ -413,7 +413,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
95820 struct raw6_sock *rp = raw6_sk(sk);
95821
95822 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
95823- atomic_inc(&sk->sk_drops);
95824+ atomic_inc_unchecked(&sk->sk_drops);
95825 kfree_skb(skb);
95826 return NET_RX_DROP;
95827 }
95828@@ -437,7 +437,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
95829
95830 if (inet->hdrincl) {
95831 if (skb_checksum_complete(skb)) {
95832- atomic_inc(&sk->sk_drops);
95833+ atomic_inc_unchecked(&sk->sk_drops);
95834 kfree_skb(skb);
95835 return NET_RX_DROP;
95836 }
95837@@ -607,7 +607,7 @@ out:
95838 return err;
95839 }
95840
95841-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
95842+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
95843 struct flowi6 *fl6, struct dst_entry **dstp,
95844 unsigned int flags)
95845 {
95846@@ -920,12 +920,15 @@ do_confirm:
95847 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
95848 char __user *optval, int optlen)
95849 {
95850+ struct icmp6_filter filter;
95851+
95852 switch (optname) {
95853 case ICMPV6_FILTER:
95854 if (optlen > sizeof(struct icmp6_filter))
95855 optlen = sizeof(struct icmp6_filter);
95856- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
95857+ if (copy_from_user(&filter, optval, optlen))
95858 return -EFAULT;
95859+ raw6_sk(sk)->filter = filter;
95860 return 0;
95861 default:
95862 return -ENOPROTOOPT;
95863@@ -938,6 +941,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
95864 char __user *optval, int __user *optlen)
95865 {
95866 int len;
95867+ struct icmp6_filter filter;
95868
95869 switch (optname) {
95870 case ICMPV6_FILTER:
95871@@ -949,7 +953,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
95872 len = sizeof(struct icmp6_filter);
95873 if (put_user(len, optlen))
95874 return -EFAULT;
95875- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
95876+ filter = raw6_sk(sk)->filter;
95877+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
95878 return -EFAULT;
95879 return 0;
95880 default:
95881diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
95882index 1aeb473..bea761c 100644
95883--- a/net/ipv6/reassembly.c
95884+++ b/net/ipv6/reassembly.c
95885@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
95886
95887 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95888 {
95889- struct ctl_table *table;
95890+ ctl_table_no_const *table = NULL;
95891 struct ctl_table_header *hdr;
95892
95893- table = ip6_frags_ns_ctl_table;
95894 if (!net_eq(net, &init_net)) {
95895- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
95896+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
95897 if (table == NULL)
95898 goto err_alloc;
95899
95900@@ -642,9 +641,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95901 /* Don't export sysctls to unprivileged users */
95902 if (net->user_ns != &init_user_ns)
95903 table[0].procname = NULL;
95904- }
95905+ hdr = register_net_sysctl(net, "net/ipv6", table);
95906+ } else
95907+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
95908
95909- hdr = register_net_sysctl(net, "net/ipv6", table);
95910 if (hdr == NULL)
95911 goto err_reg;
95912
95913@@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
95914 return 0;
95915
95916 err_reg:
95917- if (!net_eq(net, &init_net))
95918- kfree(table);
95919+ kfree(table);
95920 err_alloc:
95921 return -ENOMEM;
95922 }
95923diff --git a/net/ipv6/route.c b/net/ipv6/route.c
95924index 77308af..36ed509 100644
95925--- a/net/ipv6/route.c
95926+++ b/net/ipv6/route.c
95927@@ -3009,7 +3009,7 @@ struct ctl_table ipv6_route_table_template[] = {
95928
95929 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
95930 {
95931- struct ctl_table *table;
95932+ ctl_table_no_const *table;
95933
95934 table = kmemdup(ipv6_route_table_template,
95935 sizeof(ipv6_route_table_template),
95936diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
95937index b433884..3875266 100644
95938--- a/net/ipv6/sit.c
95939+++ b/net/ipv6/sit.c
95940@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
95941 static void ipip6_dev_free(struct net_device *dev);
95942 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
95943 __be32 *v4dst);
95944-static struct rtnl_link_ops sit_link_ops __read_mostly;
95945+static struct rtnl_link_ops sit_link_ops;
95946
95947 static int sit_net_id __read_mostly;
95948 struct sit_net {
95949@@ -1603,7 +1603,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
95950 unregister_netdevice_queue(dev, head);
95951 }
95952
95953-static struct rtnl_link_ops sit_link_ops __read_mostly = {
95954+static struct rtnl_link_ops sit_link_ops = {
95955 .kind = "sit",
95956 .maxtype = IFLA_IPTUN_MAX,
95957 .policy = ipip6_policy,
95958diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
95959index 107b2f1..72741a9 100644
95960--- a/net/ipv6/sysctl_net_ipv6.c
95961+++ b/net/ipv6/sysctl_net_ipv6.c
95962@@ -40,7 +40,7 @@ static struct ctl_table ipv6_rotable[] = {
95963
95964 static int __net_init ipv6_sysctl_net_init(struct net *net)
95965 {
95966- struct ctl_table *ipv6_table;
95967+ ctl_table_no_const *ipv6_table;
95968 struct ctl_table *ipv6_route_table;
95969 struct ctl_table *ipv6_icmp_table;
95970 int err;
95971diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
95972index 5c71501..7e8d5d3 100644
95973--- a/net/ipv6/tcp_ipv6.c
95974+++ b/net/ipv6/tcp_ipv6.c
95975@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
95976 inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
95977 }
95978
95979+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95980+extern int grsec_enable_blackhole;
95981+#endif
95982+
95983 static void tcp_v6_hash(struct sock *sk)
95984 {
95985 if (sk->sk_state != TCP_CLOSE) {
95986@@ -1397,6 +1401,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
95987 return 0;
95988
95989 reset:
95990+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
95991+ if (!grsec_enable_blackhole)
95992+#endif
95993 tcp_v6_send_reset(sk, skb);
95994 discard:
95995 if (opt_skb)
95996@@ -1479,12 +1486,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
95997 TCP_SKB_CB(skb)->sacked = 0;
95998
95999 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
96000- if (!sk)
96001+ if (!sk) {
96002+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96003+ ret = 1;
96004+#endif
96005 goto no_tcp_socket;
96006+ }
96007
96008 process:
96009- if (sk->sk_state == TCP_TIME_WAIT)
96010+ if (sk->sk_state == TCP_TIME_WAIT) {
96011+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96012+ ret = 2;
96013+#endif
96014 goto do_time_wait;
96015+ }
96016
96017 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
96018 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
96019@@ -1536,6 +1551,10 @@ csum_error:
96020 bad_packet:
96021 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
96022 } else {
96023+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96024+ if (!grsec_enable_blackhole || (ret == 1 &&
96025+ (skb->dev->flags & IFF_LOOPBACK)))
96026+#endif
96027 tcp_v6_send_reset(NULL, skb);
96028 }
96029
96030diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
96031index 3d2758d..626c422 100644
96032--- a/net/ipv6/udp.c
96033+++ b/net/ipv6/udp.c
96034@@ -53,6 +53,10 @@
96035 #include <trace/events/skb.h>
96036 #include "udp_impl.h"
96037
96038+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96039+extern int grsec_enable_blackhole;
96040+#endif
96041+
96042 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
96043 {
96044 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
96045@@ -417,7 +421,7 @@ try_again:
96046 if (unlikely(err)) {
96047 trace_kfree_skb(skb, udpv6_recvmsg);
96048 if (!peeked) {
96049- atomic_inc(&sk->sk_drops);
96050+ atomic_inc_unchecked(&sk->sk_drops);
96051 if (is_udp4)
96052 UDP_INC_STATS_USER(sock_net(sk),
96053 UDP_MIB_INERRORS,
96054@@ -665,7 +669,7 @@ csum_error:
96055 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
96056 drop:
96057 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
96058- atomic_inc(&sk->sk_drops);
96059+ atomic_inc_unchecked(&sk->sk_drops);
96060 kfree_skb(skb);
96061 return -1;
96062 }
96063@@ -723,7 +727,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
96064 if (likely(skb1 == NULL))
96065 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
96066 if (!skb1) {
96067- atomic_inc(&sk->sk_drops);
96068+ atomic_inc_unchecked(&sk->sk_drops);
96069 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
96070 IS_UDPLITE(sk));
96071 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
96072@@ -863,6 +867,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
96073 goto csum_error;
96074
96075 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
96076+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
96077+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
96078+#endif
96079 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
96080
96081 kfree_skb(skb);
96082diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
96083index 550b195..6acea83 100644
96084--- a/net/ipv6/xfrm6_policy.c
96085+++ b/net/ipv6/xfrm6_policy.c
96086@@ -212,11 +212,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
96087 }
96088 }
96089
96090-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
96091+static int xfrm6_garbage_collect(struct dst_ops *ops)
96092 {
96093 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
96094
96095- xfrm6_policy_afinfo.garbage_collect(net);
96096+ xfrm_garbage_collect_deferred(net);
96097 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
96098 }
96099
96100@@ -329,19 +329,19 @@ static struct ctl_table xfrm6_policy_table[] = {
96101
96102 static int __net_init xfrm6_net_init(struct net *net)
96103 {
96104- struct ctl_table *table;
96105+ ctl_table_no_const *table = NULL;
96106 struct ctl_table_header *hdr;
96107
96108- table = xfrm6_policy_table;
96109 if (!net_eq(net, &init_net)) {
96110- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
96111+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
96112 if (!table)
96113 goto err_alloc;
96114
96115 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
96116- }
96117+ hdr = register_net_sysctl(net, "net/ipv6", table);
96118+ } else
96119+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
96120
96121- hdr = register_net_sysctl(net, "net/ipv6", table);
96122 if (!hdr)
96123 goto err_reg;
96124
96125@@ -349,8 +349,7 @@ static int __net_init xfrm6_net_init(struct net *net)
96126 return 0;
96127
96128 err_reg:
96129- if (!net_eq(net, &init_net))
96130- kfree(table);
96131+ kfree(table);
96132 err_alloc:
96133 return -ENOMEM;
96134 }
96135diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
96136index 41ac7938..75e3bb1 100644
96137--- a/net/irda/ircomm/ircomm_tty.c
96138+++ b/net/irda/ircomm/ircomm_tty.c
96139@@ -319,11 +319,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96140 add_wait_queue(&port->open_wait, &wait);
96141
96142 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
96143- __FILE__, __LINE__, tty->driver->name, port->count);
96144+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96145
96146 spin_lock_irqsave(&port->lock, flags);
96147 if (!tty_hung_up_p(filp))
96148- port->count--;
96149+ atomic_dec(&port->count);
96150 port->blocked_open++;
96151 spin_unlock_irqrestore(&port->lock, flags);
96152
96153@@ -358,7 +358,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96154 }
96155
96156 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
96157- __FILE__, __LINE__, tty->driver->name, port->count);
96158+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96159
96160 schedule();
96161 }
96162@@ -368,12 +368,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
96163
96164 spin_lock_irqsave(&port->lock, flags);
96165 if (!tty_hung_up_p(filp))
96166- port->count++;
96167+ atomic_inc(&port->count);
96168 port->blocked_open--;
96169 spin_unlock_irqrestore(&port->lock, flags);
96170
96171 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
96172- __FILE__, __LINE__, tty->driver->name, port->count);
96173+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
96174
96175 if (!retval)
96176 port->flags |= ASYNC_NORMAL_ACTIVE;
96177@@ -447,12 +447,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
96178
96179 /* ++ is not atomic, so this should be protected - Jean II */
96180 spin_lock_irqsave(&self->port.lock, flags);
96181- self->port.count++;
96182+ atomic_inc(&self->port.count);
96183 spin_unlock_irqrestore(&self->port.lock, flags);
96184 tty_port_tty_set(&self->port, tty);
96185
96186 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
96187- self->line, self->port.count);
96188+ self->line, atomic_read(&self->port.count));
96189
96190 /* Not really used by us, but lets do it anyway */
96191 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
96192@@ -989,7 +989,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
96193 tty_kref_put(port->tty);
96194 }
96195 port->tty = NULL;
96196- port->count = 0;
96197+ atomic_set(&port->count, 0);
96198 spin_unlock_irqrestore(&port->lock, flags);
96199
96200 wake_up_interruptible(&port->open_wait);
96201@@ -1346,7 +1346,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
96202 seq_putc(m, '\n');
96203
96204 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
96205- seq_printf(m, "Open count: %d\n", self->port.count);
96206+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
96207 seq_printf(m, "Max data size: %d\n", self->max_data_size);
96208 seq_printf(m, "Max header size: %d\n", self->max_header_size);
96209
96210diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
96211index c4b7218..3e83259 100644
96212--- a/net/iucv/af_iucv.c
96213+++ b/net/iucv/af_iucv.c
96214@@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
96215
96216 write_lock_bh(&iucv_sk_list.lock);
96217
96218- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
96219+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
96220 while (__iucv_get_sock_by_name(name)) {
96221 sprintf(name, "%08x",
96222- atomic_inc_return(&iucv_sk_list.autobind_name));
96223+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
96224 }
96225
96226 write_unlock_bh(&iucv_sk_list.lock);
96227diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
96228index cd5b8ec..f205e6b 100644
96229--- a/net/iucv/iucv.c
96230+++ b/net/iucv/iucv.c
96231@@ -690,7 +690,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
96232 return NOTIFY_OK;
96233 }
96234
96235-static struct notifier_block __refdata iucv_cpu_notifier = {
96236+static struct notifier_block iucv_cpu_notifier = {
96237 .notifier_call = iucv_cpu_notify,
96238 };
96239
96240diff --git a/net/key/af_key.c b/net/key/af_key.c
96241index 545f047..9757a9d 100644
96242--- a/net/key/af_key.c
96243+++ b/net/key/af_key.c
96244@@ -3041,10 +3041,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
96245 static u32 get_acqseq(void)
96246 {
96247 u32 res;
96248- static atomic_t acqseq;
96249+ static atomic_unchecked_t acqseq;
96250
96251 do {
96252- res = atomic_inc_return(&acqseq);
96253+ res = atomic_inc_return_unchecked(&acqseq);
96254 } while (!res);
96255 return res;
96256 }
96257diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
96258index 9903ee5..18978be 100644
96259--- a/net/mac80211/cfg.c
96260+++ b/net/mac80211/cfg.c
96261@@ -826,7 +826,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
96262 ret = ieee80211_vif_use_channel(sdata, chandef,
96263 IEEE80211_CHANCTX_EXCLUSIVE);
96264 }
96265- } else if (local->open_count == local->monitors) {
96266+ } else if (local_read(&local->open_count) == local->monitors) {
96267 local->_oper_chandef = *chandef;
96268 ieee80211_hw_config(local, 0);
96269 }
96270@@ -3124,7 +3124,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
96271 else
96272 local->probe_req_reg--;
96273
96274- if (!local->open_count)
96275+ if (!local_read(&local->open_count))
96276 break;
96277
96278 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
96279@@ -3587,8 +3587,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
96280 if (chanctx_conf) {
96281 *chandef = chanctx_conf->def;
96282 ret = 0;
96283- } else if (local->open_count > 0 &&
96284- local->open_count == local->monitors &&
96285+ } else if (local_read(&local->open_count) > 0 &&
96286+ local_read(&local->open_count) == local->monitors &&
96287 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
96288 if (local->use_chanctx)
96289 *chandef = local->monitor_chandef;
96290diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
96291index 611abfc..8c2c7e4 100644
96292--- a/net/mac80211/ieee80211_i.h
96293+++ b/net/mac80211/ieee80211_i.h
96294@@ -28,6 +28,7 @@
96295 #include <net/ieee80211_radiotap.h>
96296 #include <net/cfg80211.h>
96297 #include <net/mac80211.h>
96298+#include <asm/local.h>
96299 #include "key.h"
96300 #include "sta_info.h"
96301 #include "debug.h"
96302@@ -945,7 +946,7 @@ struct ieee80211_local {
96303 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
96304 spinlock_t queue_stop_reason_lock;
96305
96306- int open_count;
96307+ local_t open_count;
96308 int monitors, cooked_mntrs;
96309 /* number of interfaces with corresponding FIF_ flags */
96310 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
96311diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
96312index fcecd63..a404454 100644
96313--- a/net/mac80211/iface.c
96314+++ b/net/mac80211/iface.c
96315@@ -519,7 +519,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96316 break;
96317 }
96318
96319- if (local->open_count == 0) {
96320+ if (local_read(&local->open_count) == 0) {
96321 res = drv_start(local);
96322 if (res)
96323 goto err_del_bss;
96324@@ -566,7 +566,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96325 res = drv_add_interface(local, sdata);
96326 if (res)
96327 goto err_stop;
96328- } else if (local->monitors == 0 && local->open_count == 0) {
96329+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
96330 res = ieee80211_add_virtual_monitor(local);
96331 if (res)
96332 goto err_stop;
96333@@ -675,7 +675,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96334 atomic_inc(&local->iff_promiscs);
96335
96336 if (coming_up)
96337- local->open_count++;
96338+ local_inc(&local->open_count);
96339
96340 if (hw_reconf_flags)
96341 ieee80211_hw_config(local, hw_reconf_flags);
96342@@ -713,7 +713,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
96343 err_del_interface:
96344 drv_remove_interface(local, sdata);
96345 err_stop:
96346- if (!local->open_count)
96347+ if (!local_read(&local->open_count))
96348 drv_stop(local);
96349 err_del_bss:
96350 sdata->bss = NULL;
96351@@ -852,7 +852,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96352 }
96353
96354 if (going_down)
96355- local->open_count--;
96356+ local_dec(&local->open_count);
96357
96358 switch (sdata->vif.type) {
96359 case NL80211_IFTYPE_AP_VLAN:
96360@@ -919,7 +919,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96361 }
96362 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
96363
96364- if (local->open_count == 0)
96365+ if (local_read(&local->open_count) == 0)
96366 ieee80211_clear_tx_pending(local);
96367
96368 /*
96369@@ -959,7 +959,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96370
96371 ieee80211_recalc_ps(local, -1);
96372
96373- if (local->open_count == 0) {
96374+ if (local_read(&local->open_count) == 0) {
96375 ieee80211_stop_device(local);
96376
96377 /* no reconfiguring after stop! */
96378@@ -970,7 +970,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
96379 ieee80211_configure_filter(local);
96380 ieee80211_hw_config(local, hw_reconf_flags);
96381
96382- if (local->monitors == local->open_count)
96383+ if (local->monitors == local_read(&local->open_count))
96384 ieee80211_add_virtual_monitor(local);
96385 }
96386
96387diff --git a/net/mac80211/main.c b/net/mac80211/main.c
96388index e765f77..dfd72e7 100644
96389--- a/net/mac80211/main.c
96390+++ b/net/mac80211/main.c
96391@@ -172,7 +172,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
96392 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
96393 IEEE80211_CONF_CHANGE_POWER);
96394
96395- if (changed && local->open_count) {
96396+ if (changed && local_read(&local->open_count)) {
96397 ret = drv_config(local, changed);
96398 /*
96399 * Goal:
96400diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
96401index 3401262..d5cd68d 100644
96402--- a/net/mac80211/pm.c
96403+++ b/net/mac80211/pm.c
96404@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96405 struct ieee80211_sub_if_data *sdata;
96406 struct sta_info *sta;
96407
96408- if (!local->open_count)
96409+ if (!local_read(&local->open_count))
96410 goto suspend;
96411
96412 ieee80211_scan_cancel(local);
96413@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96414 cancel_work_sync(&local->dynamic_ps_enable_work);
96415 del_timer_sync(&local->dynamic_ps_timer);
96416
96417- local->wowlan = wowlan && local->open_count;
96418+ local->wowlan = wowlan && local_read(&local->open_count);
96419 if (local->wowlan) {
96420 int err = drv_suspend(local, wowlan);
96421 if (err < 0) {
96422@@ -116,7 +116,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
96423 WARN_ON(!list_empty(&local->chanctx_list));
96424
96425 /* stop hardware - this must stop RX */
96426- if (local->open_count)
96427+ if (local_read(&local->open_count))
96428 ieee80211_stop_device(local);
96429
96430 suspend:
96431diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
96432index e126605..73d2c39 100644
96433--- a/net/mac80211/rate.c
96434+++ b/net/mac80211/rate.c
96435@@ -725,7 +725,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
96436
96437 ASSERT_RTNL();
96438
96439- if (local->open_count)
96440+ if (local_read(&local->open_count))
96441 return -EBUSY;
96442
96443 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
96444diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
96445index c97a065..ff61928 100644
96446--- a/net/mac80211/rc80211_pid_debugfs.c
96447+++ b/net/mac80211/rc80211_pid_debugfs.c
96448@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
96449
96450 spin_unlock_irqrestore(&events->lock, status);
96451
96452- if (copy_to_user(buf, pb, p))
96453+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
96454 return -EFAULT;
96455
96456 return p;
96457diff --git a/net/mac80211/util.c b/net/mac80211/util.c
96458index 69e4ef5..e8e4b92 100644
96459--- a/net/mac80211/util.c
96460+++ b/net/mac80211/util.c
96461@@ -1470,7 +1470,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
96462 }
96463 #endif
96464 /* everything else happens only if HW was up & running */
96465- if (!local->open_count)
96466+ if (!local_read(&local->open_count))
96467 goto wake_up;
96468
96469 /*
96470@@ -1695,7 +1695,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
96471 local->in_reconfig = false;
96472 barrier();
96473
96474- if (local->monitors == local->open_count && local->monitors > 0)
96475+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
96476 ieee80211_add_virtual_monitor(local);
96477
96478 /*
96479diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
96480index 6e839b6..002a233 100644
96481--- a/net/netfilter/Kconfig
96482+++ b/net/netfilter/Kconfig
96483@@ -950,6 +950,16 @@ config NETFILTER_XT_MATCH_ESP
96484
96485 To compile it as a module, choose M here. If unsure, say N.
96486
96487+config NETFILTER_XT_MATCH_GRADM
96488+ tristate '"gradm" match support'
96489+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
96490+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
96491+ ---help---
96492+ The gradm match allows to match on grsecurity RBAC being enabled.
96493+ It is useful when iptables rules are applied early on bootup to
96494+ prevent connections to the machine (except from a trusted host)
96495+ while the RBAC system is disabled.
96496+
96497 config NETFILTER_XT_MATCH_HASHLIMIT
96498 tristate '"hashlimit" match support'
96499 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
96500diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
96501index c3a0a12..90b587f 100644
96502--- a/net/netfilter/Makefile
96503+++ b/net/netfilter/Makefile
96504@@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
96505 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
96506 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
96507 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
96508+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
96509 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
96510 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
96511 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
96512diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
96513index f2e30fb..f131862 100644
96514--- a/net/netfilter/ipset/ip_set_core.c
96515+++ b/net/netfilter/ipset/ip_set_core.c
96516@@ -1819,7 +1819,7 @@ done:
96517 return ret;
96518 }
96519
96520-static struct nf_sockopt_ops so_set __read_mostly = {
96521+static struct nf_sockopt_ops so_set = {
96522 .pf = PF_INET,
96523 .get_optmin = SO_IP_SET,
96524 .get_optmax = SO_IP_SET + 1,
96525diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
96526index 4c8e5c0..5a79b4d 100644
96527--- a/net/netfilter/ipvs/ip_vs_conn.c
96528+++ b/net/netfilter/ipvs/ip_vs_conn.c
96529@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
96530 /* Increase the refcnt counter of the dest */
96531 ip_vs_dest_hold(dest);
96532
96533- conn_flags = atomic_read(&dest->conn_flags);
96534+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
96535 if (cp->protocol != IPPROTO_UDP)
96536 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
96537 flags = cp->flags;
96538@@ -900,7 +900,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
96539
96540 cp->control = NULL;
96541 atomic_set(&cp->n_control, 0);
96542- atomic_set(&cp->in_pkts, 0);
96543+ atomic_set_unchecked(&cp->in_pkts, 0);
96544
96545 cp->packet_xmit = NULL;
96546 cp->app = NULL;
96547@@ -1188,7 +1188,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
96548
96549 /* Don't drop the entry if its number of incoming packets is not
96550 located in [0, 8] */
96551- i = atomic_read(&cp->in_pkts);
96552+ i = atomic_read_unchecked(&cp->in_pkts);
96553 if (i > 8 || i < 0) return 0;
96554
96555 if (!todrop_rate[i]) return 0;
96556diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
96557index 3581736..c0453e9 100644
96558--- a/net/netfilter/ipvs/ip_vs_core.c
96559+++ b/net/netfilter/ipvs/ip_vs_core.c
96560@@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
96561 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
96562 /* do not touch skb anymore */
96563
96564- atomic_inc(&cp->in_pkts);
96565+ atomic_inc_unchecked(&cp->in_pkts);
96566 ip_vs_conn_put(cp);
96567 return ret;
96568 }
96569@@ -1706,7 +1706,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
96570 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
96571 pkts = sysctl_sync_threshold(ipvs);
96572 else
96573- pkts = atomic_add_return(1, &cp->in_pkts);
96574+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96575
96576 if (ipvs->sync_state & IP_VS_STATE_MASTER)
96577 ip_vs_sync_conn(net, cp, pkts);
96578diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
96579index a3df9bd..895ae09 100644
96580--- a/net/netfilter/ipvs/ip_vs_ctl.c
96581+++ b/net/netfilter/ipvs/ip_vs_ctl.c
96582@@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
96583 */
96584 ip_vs_rs_hash(ipvs, dest);
96585 }
96586- atomic_set(&dest->conn_flags, conn_flags);
96587+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
96588
96589 /* bind the service */
96590 old_svc = rcu_dereference_protected(dest->svc, 1);
96591@@ -1641,7 +1641,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
96592 * align with netns init in ip_vs_control_net_init()
96593 */
96594
96595-static struct ctl_table vs_vars[] = {
96596+static ctl_table_no_const vs_vars[] __read_only = {
96597 {
96598 .procname = "amemthresh",
96599 .maxlen = sizeof(int),
96600@@ -2062,7 +2062,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
96601 " %-7s %-6d %-10d %-10d\n",
96602 &dest->addr.in6,
96603 ntohs(dest->port),
96604- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
96605+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
96606 atomic_read(&dest->weight),
96607 atomic_read(&dest->activeconns),
96608 atomic_read(&dest->inactconns));
96609@@ -2073,7 +2073,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
96610 "%-7s %-6d %-10d %-10d\n",
96611 ntohl(dest->addr.ip),
96612 ntohs(dest->port),
96613- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
96614+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
96615 atomic_read(&dest->weight),
96616 atomic_read(&dest->activeconns),
96617 atomic_read(&dest->inactconns));
96618@@ -2551,7 +2551,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
96619
96620 entry.addr = dest->addr.ip;
96621 entry.port = dest->port;
96622- entry.conn_flags = atomic_read(&dest->conn_flags);
96623+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
96624 entry.weight = atomic_read(&dest->weight);
96625 entry.u_threshold = dest->u_threshold;
96626 entry.l_threshold = dest->l_threshold;
96627@@ -3094,7 +3094,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
96628 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
96629 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
96630 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
96631- (atomic_read(&dest->conn_flags) &
96632+ (atomic_read_unchecked(&dest->conn_flags) &
96633 IP_VS_CONN_F_FWD_MASK)) ||
96634 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
96635 atomic_read(&dest->weight)) ||
96636@@ -3684,7 +3684,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
96637 {
96638 int idx;
96639 struct netns_ipvs *ipvs = net_ipvs(net);
96640- struct ctl_table *tbl;
96641+ ctl_table_no_const *tbl;
96642
96643 atomic_set(&ipvs->dropentry, 0);
96644 spin_lock_init(&ipvs->dropentry_lock);
96645diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
96646index eff13c9..c1aab3e 100644
96647--- a/net/netfilter/ipvs/ip_vs_lblc.c
96648+++ b/net/netfilter/ipvs/ip_vs_lblc.c
96649@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
96650 * IPVS LBLC sysctl table
96651 */
96652 #ifdef CONFIG_SYSCTL
96653-static struct ctl_table vs_vars_table[] = {
96654+static ctl_table_no_const vs_vars_table[] __read_only = {
96655 {
96656 .procname = "lblc_expiration",
96657 .data = NULL,
96658diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
96659index 0b85500..8513fa5 100644
96660--- a/net/netfilter/ipvs/ip_vs_lblcr.c
96661+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
96662@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
96663 * IPVS LBLCR sysctl table
96664 */
96665
96666-static struct ctl_table vs_vars_table[] = {
96667+static ctl_table_no_const vs_vars_table[] __read_only = {
96668 {
96669 .procname = "lblcr_expiration",
96670 .data = NULL,
96671diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
96672index f448471..995f131 100644
96673--- a/net/netfilter/ipvs/ip_vs_sync.c
96674+++ b/net/netfilter/ipvs/ip_vs_sync.c
96675@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
96676 cp = cp->control;
96677 if (cp) {
96678 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
96679- pkts = atomic_add_return(1, &cp->in_pkts);
96680+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96681 else
96682 pkts = sysctl_sync_threshold(ipvs);
96683 ip_vs_sync_conn(net, cp->control, pkts);
96684@@ -771,7 +771,7 @@ control:
96685 if (!cp)
96686 return;
96687 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
96688- pkts = atomic_add_return(1, &cp->in_pkts);
96689+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
96690 else
96691 pkts = sysctl_sync_threshold(ipvs);
96692 goto sloop;
96693@@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
96694
96695 if (opt)
96696 memcpy(&cp->in_seq, opt, sizeof(*opt));
96697- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
96698+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
96699 cp->state = state;
96700 cp->old_state = cp->state;
96701 /*
96702diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
96703index c47444e..b0961c6 100644
96704--- a/net/netfilter/ipvs/ip_vs_xmit.c
96705+++ b/net/netfilter/ipvs/ip_vs_xmit.c
96706@@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
96707 else
96708 rc = NF_ACCEPT;
96709 /* do not touch skb anymore */
96710- atomic_inc(&cp->in_pkts);
96711+ atomic_inc_unchecked(&cp->in_pkts);
96712 goto out;
96713 }
96714
96715@@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
96716 else
96717 rc = NF_ACCEPT;
96718 /* do not touch skb anymore */
96719- atomic_inc(&cp->in_pkts);
96720+ atomic_inc_unchecked(&cp->in_pkts);
96721 goto out;
96722 }
96723
96724diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
96725index 2d3030a..7ba1c0a 100644
96726--- a/net/netfilter/nf_conntrack_acct.c
96727+++ b/net/netfilter/nf_conntrack_acct.c
96728@@ -60,7 +60,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
96729 #ifdef CONFIG_SYSCTL
96730 static int nf_conntrack_acct_init_sysctl(struct net *net)
96731 {
96732- struct ctl_table *table;
96733+ ctl_table_no_const *table;
96734
96735 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
96736 GFP_KERNEL);
96737diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
96738index 5d892fe..d2fc9d8 100644
96739--- a/net/netfilter/nf_conntrack_core.c
96740+++ b/net/netfilter/nf_conntrack_core.c
96741@@ -1600,6 +1600,10 @@ void nf_conntrack_init_end(void)
96742 #define DYING_NULLS_VAL ((1<<30)+1)
96743 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
96744
96745+#ifdef CONFIG_GRKERNSEC_HIDESYM
96746+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
96747+#endif
96748+
96749 int nf_conntrack_init_net(struct net *net)
96750 {
96751 int ret;
96752@@ -1614,7 +1618,11 @@ int nf_conntrack_init_net(struct net *net)
96753 goto err_stat;
96754 }
96755
96756+#ifdef CONFIG_GRKERNSEC_HIDESYM
96757+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08lx", atomic_inc_return_unchecked(&conntrack_cache_id));
96758+#else
96759 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
96760+#endif
96761 if (!net->ct.slabname) {
96762 ret = -ENOMEM;
96763 goto err_slabname;
96764diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
96765index 1df1761..ce8b88a 100644
96766--- a/net/netfilter/nf_conntrack_ecache.c
96767+++ b/net/netfilter/nf_conntrack_ecache.c
96768@@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
96769 #ifdef CONFIG_SYSCTL
96770 static int nf_conntrack_event_init_sysctl(struct net *net)
96771 {
96772- struct ctl_table *table;
96773+ ctl_table_no_const *table;
96774
96775 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
96776 GFP_KERNEL);
96777diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
96778index 974a2a4..52cc6ff 100644
96779--- a/net/netfilter/nf_conntrack_helper.c
96780+++ b/net/netfilter/nf_conntrack_helper.c
96781@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
96782
96783 static int nf_conntrack_helper_init_sysctl(struct net *net)
96784 {
96785- struct ctl_table *table;
96786+ ctl_table_no_const *table;
96787
96788 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
96789 GFP_KERNEL);
96790diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
96791index ce30041..3861b5d 100644
96792--- a/net/netfilter/nf_conntrack_proto.c
96793+++ b/net/netfilter/nf_conntrack_proto.c
96794@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
96795
96796 static void
96797 nf_ct_unregister_sysctl(struct ctl_table_header **header,
96798- struct ctl_table **table,
96799+ ctl_table_no_const **table,
96800 unsigned int users)
96801 {
96802 if (users > 0)
96803diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
96804index a99b6c3..cb372f9 100644
96805--- a/net/netfilter/nf_conntrack_proto_dccp.c
96806+++ b/net/netfilter/nf_conntrack_proto_dccp.c
96807@@ -428,7 +428,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
96808 const char *msg;
96809 u_int8_t state;
96810
96811- dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96812+ dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96813 BUG_ON(dh == NULL);
96814
96815 state = dccp_state_table[CT_DCCP_ROLE_CLIENT][dh->dccph_type][CT_DCCP_NONE];
96816@@ -457,7 +457,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
96817 out_invalid:
96818 if (LOG_INVALID(net, IPPROTO_DCCP))
96819 nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL,
96820- NULL, msg);
96821+ NULL, "%s", msg);
96822 return false;
96823 }
96824
96825@@ -486,7 +486,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
96826 u_int8_t type, old_state, new_state;
96827 enum ct_dccp_roles role;
96828
96829- dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96830+ dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96831 BUG_ON(dh == NULL);
96832 type = dh->dccph_type;
96833
96834@@ -577,7 +577,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
96835 unsigned int cscov;
96836 const char *msg;
96837
96838- dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &dh);
96839+ dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
96840 if (dh == NULL) {
96841 msg = "nf_ct_dccp: short packet ";
96842 goto out_invalid;
96843@@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
96844
96845 out_invalid:
96846 if (LOG_INVALID(net, IPPROTO_DCCP))
96847- nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, msg);
96848+ nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, "%s", msg);
96849 return -NF_ACCEPT;
96850 }
96851
96852diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
96853index f641751..d3c5b51 100644
96854--- a/net/netfilter/nf_conntrack_standalone.c
96855+++ b/net/netfilter/nf_conntrack_standalone.c
96856@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
96857
96858 static int nf_conntrack_standalone_init_sysctl(struct net *net)
96859 {
96860- struct ctl_table *table;
96861+ ctl_table_no_const *table;
96862
96863 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
96864 GFP_KERNEL);
96865diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
96866index 902fb0a..87f7fdb 100644
96867--- a/net/netfilter/nf_conntrack_timestamp.c
96868+++ b/net/netfilter/nf_conntrack_timestamp.c
96869@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
96870 #ifdef CONFIG_SYSCTL
96871 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
96872 {
96873- struct ctl_table *table;
96874+ ctl_table_no_const *table;
96875
96876 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
96877 GFP_KERNEL);
96878diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
96879index 85296d4..8becdec 100644
96880--- a/net/netfilter/nf_log.c
96881+++ b/net/netfilter/nf_log.c
96882@@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
96883
96884 #ifdef CONFIG_SYSCTL
96885 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
96886-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
96887+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
96888
96889 static int nf_log_proc_dostring(struct ctl_table *table, int write,
96890 void __user *buffer, size_t *lenp, loff_t *ppos)
96891@@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
96892 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
96893 mutex_unlock(&nf_log_mutex);
96894 } else {
96895+ ctl_table_no_const nf_log_table = *table;
96896+
96897 mutex_lock(&nf_log_mutex);
96898 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
96899 lockdep_is_held(&nf_log_mutex));
96900 if (!logger)
96901- table->data = "NONE";
96902+ nf_log_table.data = "NONE";
96903 else
96904- table->data = logger->name;
96905- r = proc_dostring(table, write, buffer, lenp, ppos);
96906+ nf_log_table.data = logger->name;
96907+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
96908 mutex_unlock(&nf_log_mutex);
96909 }
96910
96911diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
96912index f042ae5..30ea486 100644
96913--- a/net/netfilter/nf_sockopt.c
96914+++ b/net/netfilter/nf_sockopt.c
96915@@ -45,7 +45,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
96916 }
96917 }
96918
96919- list_add(&reg->list, &nf_sockopts);
96920+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
96921 out:
96922 mutex_unlock(&nf_sockopt_mutex);
96923 return ret;
96924@@ -55,7 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
96925 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
96926 {
96927 mutex_lock(&nf_sockopt_mutex);
96928- list_del(&reg->list);
96929+ pax_list_del((struct list_head *)&reg->list);
96930 mutex_unlock(&nf_sockopt_mutex);
96931 }
96932 EXPORT_SYMBOL(nf_unregister_sockopt);
96933diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
96934index d92cc31..e46f350 100644
96935--- a/net/netfilter/nfnetlink_log.c
96936+++ b/net/netfilter/nfnetlink_log.c
96937@@ -82,7 +82,7 @@ static int nfnl_log_net_id __read_mostly;
96938 struct nfnl_log_net {
96939 spinlock_t instances_lock;
96940 struct hlist_head instance_table[INSTANCE_BUCKETS];
96941- atomic_t global_seq;
96942+ atomic_unchecked_t global_seq;
96943 };
96944
96945 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
96946@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
96947 /* global sequence number */
96948 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
96949 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
96950- htonl(atomic_inc_return(&log->global_seq))))
96951+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
96952 goto nla_put_failure;
96953
96954 if (data_len) {
96955diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
96956new file mode 100644
96957index 0000000..c566332
96958--- /dev/null
96959+++ b/net/netfilter/xt_gradm.c
96960@@ -0,0 +1,51 @@
96961+/*
96962+ * gradm match for netfilter
96963